Added fly-in when player starts game and when the player respawns + small fixes. #12

Merged
merged 7 commits into from Aug 6, 2013

Projects

None yet

2 participants

@frekfra
Contributor
frekfra commented Aug 6, 2013

Player ship will fly onto the screen when the game starts. During this time the ship cannot be harmed.
Corrected gun to use velocity instead of hardcoded values.
Increased speed for player bullets.

frekfra added some commits Aug 1, 2013
@frekfra frekfra Player now uses Gun class for weapon.
Player now has three lives. When player loses all health a life will be lost.
Added "graphical" heads-up-display with player lives, health, and current weapon name.
removed debug log from highscoreList class.
refactored gun parameter names.
3f331ce
@frekfra frekfra Merge remote-tracking branch 'upstream/master'
Conflicts:
	GDCalaga/highscore.dat
7baadc9
@frekfra frekfra Changed magic number velocity in Gun class to use constructor parameter.
Implemented fly-in sequence for when player starts/dies.
3c7d48b
@frekfra frekfra Update .gitignore
ignoring highscore.dat
43ea5d2
@frekfra frekfra Update .gitignore f7788bb
@frekfra frekfra Merge remote-tracking branch 'upstream/master'
Conflicts:
	GDCalaga/highscore.dat
	GDCalaga/src/org/gdc/gdcalaga/Gun.java
	GDCalaga/src/org/gdc/gdcalaga/PlayState.java
	GDCalaga/src/org/gdc/gdcalaga/Player.java
78571f0
@frekfra frekfra committing missing stuff from bad merge. 0630aec
@SubSage SubSage merged commit 2ffa8d8 into SubSage:master Aug 6, 2013
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment