Hochschulprojekte/SpaceScooter
0
0
Fork 0
Code Issues Pull Requests Activity
117 Commits 2 Branches 0 Tags
a3875a5e97ff4b8d144fd7f92db2a56d094a95bf
Commit Graph
117 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
lubiana a3875a5e97 dumlubi ist dumm, rennt jetzt 2014-11-06 19:02:03 +01:00
lubiana a16ef5d7a7 nullllpointrrrr 2014-11-06 18:51:08 +01:00
lubiana 6f2857946d 80 Zeichen pls 2014-11-06 18:41:03 +01:00
lubiana 1525c358c1 Merge branch 'master' of github.com:teamteamteam/SpaceScooter 2014-11-06 16:15:54 +01:00
lubiana 3df49e2be6 gegner ballern nun rot 2014-11-06 16:15:50 +01:00
JPT eb4bdc6ada Remove @Override from Interface implementing methods in Player class. 2014-11-06 14:58:09 +01:00
JPT 46efd1e04e Create overridable method that actually spawns Shot objects. 2014-11-05 22:54:54 +01:00
JPT 0c270c8665 Implement asynchronous playing of sounds. 2014-11-05 09:37:51 +01:00
JPT 2f6eddcb46 Add Sound support to Loader and Makefile. 2014-11-05 09:02:44 +01:00
lubiana 1f65979f41 Merge branch 'master' of github.com:teamteamteam/SpaceScooter 2014-11-05 01:00:25 +01:00
lubiana 64c061b68f zwei enemies gepixelt 2014-11-05 01:00:16 +01:00
JPT b1e72da839 Cleanup unneccessary ArrayList in class Background. 2014-11-04 23:28:57 +01:00
JPT 0a695432a0 Bugfix: GamePausedScreen did not correctly replace the GameScreen when going to MainMenu. 2014-11-04 21:31:47 +01:00
JPT 4017d369b1 Make sure Explosions cleanup after themselves. 
Apparrently, == 0 was not enough.
 2014-11-04 21:06:36 +01:00
JPT 48e3ac275c Da hab ich doch glatt das super.update() übersehen. 2014-11-04 20:51:34 +01:00
JPT 74ba66451b Entities without image now have 0x0 dimensions. 
Maybe this is just an ugly hack until we move the setImage() part into
the constructor call to make sure every Entity _HAS_ an image before
updating and painting occurs.
 2014-11-04 20:35:13 +01:00
JPT c716bc2187 Minor Bugfix: Add missing super call, catch potential NullPointer. 2014-11-04 20:23:52 +01:00
JPT 95f3e05fed Have the Screen call remove() on all Entities before removing them. 2014-11-04 20:23:21 +01:00
JPT a91a60381c Add canShoot attribute to ShootingEntity. 2014-11-04 20:22:51 +01:00
JPT aedbd55159 Bugfix: Have the player actually deregister itself from the Keyboard on remove(). 2014-11-04 19:53:44 +01:00
JPT e87ec69e97 Actually have the entity take care of adding it to the current screen. Whoopsie. 2014-11-04 19:46:19 +01:00
JPT e2c34366e3 Remove superfluos calls to currentScreen.addEntity() 
Since the entity class itself takes care that all entities are on the
screen, you don't need to worry about this. :-)
 2014-11-04 19:41:15 +01:00
JPT 881b802e7a Create packages for enemies, shots and items. 2014-11-04 19:33:30 +01:00
JPT e713ee4817 Make Explosions inherit Entity instead of LivingEntity. 2014-11-04 19:29:24 +01:00
JPT 799e175c5d Make 'spawny' Explosions work threadless. 2014-11-04 19:27:35 +01:00
JPT 16bcddb273 Improve implementation continuous/spontaneous fire. 
Das Keyboard bietet nun allen, die den KeyboardListener implementieren,
den Service, sich an ihm zu registrieren.
Ist dies erfolgt, so reicht es die Events an die registrierten Listener
weiter.
Auf diese Weise wurde das Dauerfeuer und Spontanfeuer implementiert.
 2014-11-04 19:07:44 +01:00
JPT cf8ff46dfb Add private constructors static classes. 2014-11-04 18:42:11 +01:00
JPT 380dbce420 Single Character Fix. :| 2014-11-04 17:55:27 +01:00
JPT 8db001047e Cleanup imports, fix package for SoundSystem class. 2014-11-04 14:43:54 +01:00
JPT 97a1195faa Merge branch 'master' of https://github.com/teamteamteam/SpaceScooter 2014-11-04 14:40:12 +01:00
JPT f20ed560f3 Add first base for SoundSystem code. 2014-11-04 14:39:47 +01:00
lubiana ef745a7450 dumme sachen wieder weg gemacht 2014-11-04 14:31:37 +01:00
JJTCM a52e000905 Merge branch 'master' of ssh://github.com/teamteamteam/SpaceScooter 
Conflicts:
	src/de/teamteamteam/spacescooter/screen/GameScreen.java
 2014-11-04 14:17:50 +01:00
JJTCM 306150d159 Now with working Healthbar 
Shoot of Player inside own Thread
 2014-11-04 14:15:24 +01:00
lubiana c2de2567d2 Merge branch 'master' of github.com:teamteamteam/SpaceScooter 2014-11-04 14:06:07 +01:00
lubiana 0093078da7 verschiedene schuesse 2014-11-04 14:05:53 +01:00
Licht 06ee87b85d Explosionen BOOM 2014-11-04 13:49:44 +01:00
Licht 1141a53481 Added Big Explosion, Structed explosion-handling 2014-11-04 13:43:49 +01:00
JJTCM 134483d375 Work on Healthbar 
Player Autoshoot (WIP)
 2014-11-04 13:42:58 +01:00
Sosch 8a77a346e4 Merge branch 'master' of https://github.com/teamteamteam/SpaceScooter 2014-11-04 13:36:13 +01:00
Sosch 9f7773ef5e Itemchance, 4 Test Items und schuss speed 2014-11-04 13:34:17 +01:00
lubiana dc78b353a6 Merge branch 'master' of github.com:teamteamteam/SpaceScooter 2014-11-04 13:07:05 +01:00
lubiana a72030ac44 some more shot assets 2014-11-04 13:07:01 +01:00
Licht ec140905ee Changed Chance to Spawn for Explosions 2014-11-04 10:34:03 +01:00
Licht 6b136e18e3 Big Explosion changed 2014-11-04 10:28:36 +01:00
Sosch f67a2573a9 Enemy 4 eingefügt 2014-11-04 10:01:13 +01:00
JPT 964e684b9a Update RADME.md 2014-11-03 13:44:32 +01:00
Licht d934ff02bf Merge branch 'master' of https://github.com/teamteamteam/SpaceScooter 2014-11-02 02:00:30 +01:00
Licht 8459b42451 2nd explosion added. (40% chance to spawn) 2014-11-02 01:57:54 +01:00
JPT f22d16941d Jetzt sollten auch Jars plattformunabhängig laufen. 2014-11-02 01:39:12 +01:00