Commit Graph

307 Commits

Author SHA1 Message Date
ramapcsx2
258de7106d Merge branch 'master' of https://github.com/teamteamteam/SpaceScooter 2014-12-09 14:05:25 +01:00
ramapcsx2
68cdeddb73 encasing that thread work time takes too long in DEBUG 2014-12-09 14:04:19 +01:00
8621e07e3c Feature: Prototype for Fscking hardcore mode background. 2014-12-09 14:01:40 +01:00
ramapcsx2
042802ab87 Merge branch 'master' of https://github.com/teamteamteam/SpaceScooter 2014-12-09 13:47:44 +01:00
d12d00d1b2 Rename attributes of PlayerSession. 2014-12-09 13:45:52 +01:00
ramapcsx2
28cf8f845d Merge branch 'master' of https://github.com/teamteamteam/SpaceScooter 2014-12-09 13:20:14 +01:00
ramapcsx2
ced2501c84 balancing 2014-12-09 13:20:00 +01:00
ea15be2fd1 Feature: Proper gameover condition, GameWonScreen, nextLevel works. 2014-12-09 13:08:35 +01:00
ramapcsx2
f4699e28ee adequate rocket damage 2014-12-09 13:03:42 +01:00
Licht
c613829884 Adding new Boss Image 2014-12-09 12:58:13 +01:00
Licht
6610b5a509 Merge branch 'master' of https://github.com/teamteamteam/SpaceScooter 2014-12-09 12:22:26 +01:00
Licht
0f975030f7 Added new Enemy Spaceship 2014-12-09 12:22:00 +01:00
73f948b4e1 Feature: Add centered hitboxes that can have seperate dimensions. 2014-12-09 11:59:04 +01:00
ramapcsx2
be8f7a231f Merge branch 'master' of https://github.com/teamteamteam/SpaceScooter 2014-12-09 11:16:34 +01:00
ramapcsx2
e01463a543 make debug playing easier :p 2014-12-09 11:15:55 +01:00
c810d9d966 Bugfix: Level does not care after the last interval ended. 2014-12-09 11:15:48 +01:00
5610ff7806 Performance: Maybe this fixes very big frame times. 2014-12-09 11:03:02 +01:00
742ff1eafc Bugfix: Shield makes player get remaining damage as hp. 2014-12-09 11:01:43 +01:00
Sosch
9bba32307e Merge branch 'master' of https://github.com/teamteamteam/SpaceScooter 2014-12-04 21:47:57 +01:00
Sosch
d0956a20d2 Add a beam image, beam item, show your secondary weapon amount in the Interface bar.
Shop expanded: now you can select the secondary weapon.
2014-12-04 21:38:30 +01:00
343c26ecc8 Cache isJar value in CodeEnvironment instead of looking it up everytime somebody asks. 2014-12-04 18:05:12 +01:00
JJTCM
d1caeb341a Added DEBUG Code for the NUKE
Fix Boss Spawn at the End of the Level
2014-12-02 13:47:18 +01:00
Sosch
6be6a97306 add Highscore Screen 2014-12-02 13:34:59 +01:00
JJTCM
2ccc3ab483 Player now shoots two Shoots.
Halved Player DMG
Bugfix: Beam and Rocket oneshooting Enemys
Bugfix: Stuck Keys in Shop
Bugfix: Items eating Shoots
2014-12-02 13:21:57 +01:00
e8400f4f34 Add the other two Stones to the game. 2014-12-02 13:04:51 +01:00
f1c95bf4d9 Apply cool new position stuff to EnemyBoss. 2014-12-02 12:51:27 +01:00
110cc98c3b Make GameConfig actually final, move game screen dimensions into GameConfig. 2014-12-02 12:39:56 +01:00
1c80a8745a Add positional parameter to LevelConfig. 2014-12-02 12:29:03 +01:00
eeb2a9c875 Implement a delay on game over, so the player can explode properly and stuff. 2014-12-02 12:01:47 +01:00
lubiana
beba843420 meer steine 2014-12-02 12:01:02 +01:00
fc87ef9da8 Rename damagable to vulnerable so they can be distinguished easily. 2014-12-02 11:53:11 +01:00
bc68de5b99 Add first obstacle as proof of concept. 2014-12-02 11:50:46 +01:00
de685366ee Add damagable/vulnerable logic.
Also, add the other Backgrounds to spawnable Entities and
stuff.
2014-12-02 11:08:07 +01:00
lubiana
db0ecc13c0 Steineeee 2014-12-02 10:32:13 +01:00
ramapcsx2
eed6462541 whoops 2014-11-30 17:13:22 +01:00
ramapcsx2
f5444954ab Solved the boss hitpoint bar issue rather nicely :) 2014-11-30 17:06:55 +01:00
ramapcsx2
9b109fe722 Unify enemy delete routine for when they leave the screen 2014-11-30 16:54:30 +01:00
ramapcsx2
148c9ca491 Merge branch 'master' of https://github.com/teamteamteam/SpaceScooter 2014-11-30 15:56:08 +01:00
ramapcsx2
a7086fc3e8 Fixed enemies spawning out of game frame boundary 2014-11-30 15:54:37 +01:00
19369ece7a Actually use the backgroundMusic from the Level 2014-11-30 14:24:56 +01:00
8e82614874 Feature: Player now gains small immunity after an impact. 2014-11-30 14:11:21 +01:00
dba0f6990e Actually make the instance of GraphicsSettings private. 2014-11-30 11:11:35 +01:00
7023f5322b Make sure all BufferedImages are compatible to current settings. 2014-11-30 10:54:46 +01:00
cdee2a5f3d Bugfix: 'make debug' uses wrong classpath. 2014-11-29 23:36:03 +01:00
8ac78ec43c Disable transition effect when entering or leaving game pause. 2014-11-29 23:34:01 +01:00
0221bb957d Avoid division by zero in LivingEntity. 2014-11-29 17:31:11 +01:00
ea9dfbf774 Remove debugging line in GameScreen. 2014-11-29 17:13:40 +01:00
1b5eb872dd Allow Sounds to be stopped by interupting the Thread playing them. 2014-11-29 17:09:38 +01:00
573300ae49 Add fading transition for changing Screens. 2014-11-29 16:33:35 +01:00
ramapcsx2
af9a676cc6 more pleasent shoot sounds 2014-11-29 14:25:48 +01:00