some powerup stuff
that's it
more power, more up
Merge remote-tracking branch 'origin' into powerup-polish
power up size fix
application of powerups
added respawn timer
mostly working
fixed respawining
Merge remote-tracking branch 'origin/restart_remove_on_death' into more-camera
conditional update
showing adrenaline
As close as we'll get to a death camera
Merge pull request #36 from 5-second-rule/powerup-polish

Powerup polish
Merge pull request #37 from 5-second-rule/ui-adrenaline

Ui adrenaline
Merge remote-tracking branch 'origin/master' into more-camera

Conflicts:
	game-core/Player.h
Merge pull request #38 from 5-second-rule/more-camera

More camera
Merge branch 'master' into countdown

Conflicts:
	game-media/UIData.cpp
	game-media/UIData.h
merged with master