Hochschulprojekte/SpaceScooter
0
0
Fork 0
Code Issues Pull Requests Activity

Commit Graph

  • 1f78309a98 Use ints instead of Rectangles for collision detection. JPT 2014-11-08 18:20:10 +01:00
  • cf3e6b93a5 Add stat target to Makefile. JPT 2014-11-08 17:43:56 +01:00
  • 0d90b387c3 Set CollisionDamage for Player and Enemies. JPT 2014-11-08 15:19:44 +01:00
  • d444b36351 Bugfix: Enemies do not hurt the player, player does not properly die. JPT 2014-11-08 15:17:45 +01:00
  • 1086effdad Huge update. See detailed notes. JPT 2014-11-08 15:09:29 +01:00
  • dda0fb8313 Move Entity interfaces into a spi (Service Providing Interfaces) package. JPT 2014-11-07 21:03:45 +01:00
  • 17aafe11f9 Comment interfaces, expand the hittable interface. JPT 2014-11-07 21:01:13 +01:00
  • 2295d83ff9 The Entity now knows whether it is able to move. JPT 2014-11-07 20:54:00 +01:00
  • d9b7128456 Rename DamageValue to ShootDamage to avoid confusion with Shot logic. JPT 2014-11-07 20:47:07 +01:00
  • 3c5e96791b Move GameFrame to root package, healthbar to gui package. JPT 2014-11-07 20:23:06 +01:00
  • d4a19e76e0 Comment ShootingEntity. Make createShot private. JPT 2014-11-07 20:20:23 +01:00
  • c0211181e1 Comment the LivingEntity. JPT 2014-11-07 20:08:34 +01:00
  • f0a9e8a6ad Comment Entity, make x and y private, add transpose method for easy movement. JPT 2014-11-07 20:00:07 +01:00
  • 496e6792c3 Move package item from background to entity. JPT 2014-11-06 23:29:33 +01:00
  • 76b7b33938 Comment the Shot class. JPT 2014-11-06 23:27:03 +01:00
  • 506a5ae620 Document the double buffering, move GameFrame title to GameConfig. JPT 2014-11-06 23:19:46 +01:00
  • 1caf4818eb Add comments to screen package. JPT 2014-11-06 23:09:27 +01:00
  • a12ef61f7b Comment the SoundSystem. JPT 2014-11-06 22:58:07 +01:00
  • 3d80faddef Clarify naming in the Loader, add comments. JPT 2014-11-06 22:46:40 +01:00
  • b60abdc577 Remove unused method from Shot class. JPT 2014-11-06 19:44:27 +01:00
  • c3fb13e3eb Create subfolders for shot images and item images. JPT 2014-11-06 19:40:51 +01:00
  • 8f4bad07a5 ist schöner so lubiana 2014-11-06 19:04:57 +01:00
  • 8a70490c47 Merge branch 'yoloshots' lubiana 2014-11-06 19:02:37 +01:00
  • 090b7ec5b3 Merge branch 'master' of github.com:teamteamteam/SpaceScooter lubiana 2014-11-06 19:02:23 +01:00
  • a3875a5e97 dumlubi ist dumm, rennt jetzt yoloshots lubiana 2014-11-06 19:02:03 +01:00
  • a16ef5d7a7 nullllpointrrrr lubiana 2014-11-06 18:51:08 +01:00
  • 6f2857946d 80 Zeichen pls lubiana 2014-11-06 18:41:03 +01:00
  • c4ab7c3530 Replace LinkedList with List, so it is possible to change its implementation later - if needed. JPT 2014-11-06 18:19:35 +01:00
  • 9542131e4a Avoid creating a new anonymous Runnable each frame. JPT 2014-11-06 17:34:20 +01:00
  • 1525c358c1 Merge branch 'master' of github.com:teamteamteam/SpaceScooter lubiana 2014-11-06 16:15:54 +01:00
  • 3df49e2be6 gegner ballern nun rot lubiana 2014-11-06 16:15:50 +01:00
  • eb4bdc6ada Remove @Override from Interface implementing methods in Player class. JPT 2014-11-06 14:58:09 +01:00
  • 46efd1e04e Create overridable method that actually spawns Shot objects. JPT 2014-11-05 22:54:54 +01:00
  • 0c270c8665 Implement asynchronous playing of sounds. JPT 2014-11-05 09:37:51 +01:00
  • 2f6eddcb46 Add Sound support to Loader and Makefile. JPT 2014-11-05 09:02:44 +01:00
  • 1f65979f41 Merge branch 'master' of github.com:teamteamteam/SpaceScooter lubiana 2014-11-05 01:00:25 +01:00
  • 64c061b68f zwei enemies gepixelt lubiana 2014-11-05 01:00:16 +01:00
  • b1e72da839 Cleanup unneccessary ArrayList in class Background. JPT 2014-11-04 23:28:57 +01:00
  • 0a695432a0 Bugfix: GamePausedScreen did not correctly replace the GameScreen when going to MainMenu. JPT 2014-11-04 21:31:47 +01:00
  • 4017d369b1 Make sure Explosions cleanup after themselves. JPT 2014-11-04 21:06:36 +01:00
  • 48e3ac275c Da hab ich doch glatt das super.update() übersehen. JPT 2014-11-04 20:51:34 +01:00
  • 74ba66451b Entities without image now have 0x0 dimensions. JPT 2014-11-04 20:35:13 +01:00
  • c716bc2187 Minor Bugfix: Add missing super call, catch potential NullPointer. JPT 2014-11-04 20:23:52 +01:00
  • 95f3e05fed Have the Screen call remove() on all Entities before removing them. JPT 2014-11-04 20:23:21 +01:00
  • a91a60381c Add canShoot attribute to ShootingEntity. JPT 2014-11-04 20:22:51 +01:00
  • aedbd55159 Bugfix: Have the player actually deregister itself from the Keyboard on remove(). JPT 2014-11-04 19:53:44 +01:00
  • e87ec69e97 Actually have the entity take care of adding it to the current screen. Whoopsie. JPT 2014-11-04 19:46:19 +01:00
  • e2c34366e3 Remove superfluos calls to currentScreen.addEntity() JPT 2014-11-04 19:41:15 +01:00
  • 881b802e7a Create packages for enemies, shots and items. JPT 2014-11-04 19:33:30 +01:00
  • e713ee4817 Make Explosions inherit Entity instead of LivingEntity. JPT 2014-11-04 19:29:24 +01:00
  • 799e175c5d Make 'spawny' Explosions work threadless. JPT 2014-11-04 19:27:35 +01:00
  • 16bcddb273 Improve implementation continuous/spontaneous fire. JPT 2014-11-04 19:07:44 +01:00
  • cf8ff46dfb Add private constructors static classes. JPT 2014-11-04 18:42:11 +01:00
  • 380dbce420 Single Character Fix. :| JPT 2014-11-04 17:55:27 +01:00
  • 8db001047e Cleanup imports, fix package for SoundSystem class. JPT 2014-11-04 14:43:54 +01:00
  • 97a1195faa Merge branch 'master' of https://github.com/teamteamteam/SpaceScooter JPT 2014-11-04 14:40:12 +01:00
  • f20ed560f3 Add first base for SoundSystem code. JPT 2014-11-04 14:39:47 +01:00
  • ef745a7450 dumme sachen wieder weg gemacht lubiana 2014-11-04 14:31:37 +01:00
  • a52e000905 Merge branch 'master' of ssh://github.com/teamteamteam/SpaceScooter JJTCM 2014-11-04 14:17:50 +01:00
  • 306150d159 Now with working Healthbar Shoot of Player inside own Thread JJTCM 2014-11-04 14:15:24 +01:00
  • c2de2567d2 Merge branch 'master' of github.com:teamteamteam/SpaceScooter lubiana 2014-11-04 14:06:07 +01:00
  • 0093078da7 verschiedene schuesse lubiana 2014-11-04 14:05:53 +01:00
  • 06ee87b85d Explosionen BOOM Licht 2014-11-04 13:49:44 +01:00
  • 1141a53481 Added Big Explosion, Structed explosion-handling Licht 2014-11-04 13:43:49 +01:00
  • 134483d375 Work on Healthbar Player Autoshoot (WIP) JJTCM 2014-11-04 13:42:58 +01:00
  • 8a77a346e4 Merge branch 'master' of https://github.com/teamteamteam/SpaceScooter Sosch 2014-11-04 13:36:13 +01:00
  • 9f7773ef5e Itemchance, 4 Test Items und schuss speed Sosch 2014-11-04 13:34:17 +01:00
  • dc78b353a6 Merge branch 'master' of github.com:teamteamteam/SpaceScooter lubiana 2014-11-04 13:07:05 +01:00
  • a72030ac44 some more shot assets lubiana 2014-11-04 13:07:01 +01:00
  • ec140905ee Changed Chance to Spawn for Explosions Licht 2014-11-04 10:34:03 +01:00
  • 6b136e18e3 Big Explosion changed Licht 2014-11-04 10:28:36 +01:00
  • f67a2573a9 Enemy 4 eingefügt Sosch 2014-11-04 10:01:13 +01:00
  • 964e684b9a Update RADME.md JPT 2014-11-03 13:31:54 +01:00
  • d934ff02bf Merge branch 'master' of https://github.com/teamteamteam/SpaceScooter Licht 2014-11-02 02:00:30 +01:00
  • 8459b42451 2nd explosion added. (40% chance to spawn) Licht 2014-11-02 01:57:54 +01:00
  • f22d16941d Jetzt sollten auch Jars plattformunabhängig laufen. JPT 2014-11-02 01:39:12 +01:00
  • a4fa1edce9 Kompatibilität: Pfadangaben werden der Plattform angepasst. JPT 2014-11-02 01:33:10 +01:00
  • d3bd491f1d Bugfix: Ersetzen des "/" durch eine entsprechende Konstante. JPT 2014-11-02 01:21:05 +01:00
  • 8b7392ed64 Nochmal Bugfix zum Loader. JPT 2014-11-02 00:54:41 +01:00
  • 0a43ff0d05 Bugfix: Crash unter Windows durch den Loader. JPT 2014-11-02 00:17:02 +01:00
  • 8089702e4a Menüs nutzen nun ENTER statt SPACE, kleines Bugfix im GameOver- und GamePausedScreen. JPT 2014-11-01 13:50:44 +01:00
  • 4fa7db8e6b Merge branch 'master' of https://github.com/teamteamteam/SpaceScooter Licht 2014-10-31 12:14:32 +01:00
  • 68a0d139af Explosions added. They explode. Licht 2014-10-31 12:10:41 +01:00
  • 30ab43f032 Merge branch 'master' of ssh://github.com/teamteamteam/SpaceScooter JJTCM 2014-10-31 11:15:17 +01:00
  • d013afb465 * Merge Confilct JJTCM 2014-10-31 11:06:30 +01:00
  • 7563048cca Enemy 2 und 3 eingefügt Sosch 2014-10-31 11:00:17 +01:00
  • 3588532c24 Merge branch 'master' of https://github.com/teamteamteam/SpaceScooter JJTCM 2014-10-31 10:53:18 +01:00
  • aaf970f2e4 * Added Gameover Screen * Now with more Buttonmashing for Shooting JJTCM 2014-10-31 10:46:39 +01:00
  • 617d0c2da1 Bild in Pausebildschirm über Loader laden. JPT 2014-10-31 10:13:24 +01:00
  • 676be810e5 Disable GameFrame being resizable. JPT 2014-10-31 10:05:23 +01:00
  • 9b2b295cdb yolo umlauts lubiana 2014-10-31 09:36:57 +01:00
  • 72be799fec Bugfix Sosch 2014-10-31 09:29:00 +01:00
  • efed113880 Merge branch 'menu' Sosch 2014-10-31 09:12:30 +01:00
  • b69bc9534f menü eingefügt Sosch 2014-10-31 09:07:42 +01:00
  • a6d7bd3b95 Schuss-Spawnposition für EnemyOne angepasst. JPT 2014-10-30 23:49:55 +01:00
  • 52adadda88 Hintergrundbild verkleinert, Starbackground angepasst. JPT 2014-10-30 23:46:38 +01:00
  • 81f3cb7536 Remove-Methode für Entity-Klasse hinzugefügt. Shots leben nicht außerhalb des Bildschirms weiter. JPT 2014-10-30 22:42:08 +01:00
  • 52f8cbcb4d Screen: Kommentierung, cleanup-Methode hinzugefügt. JPT 2014-10-30 21:53:35 +01:00
  • 6b23b3652b Umlagern des Ladens von Bildern, Einführung des (noch sehr kurzen) Ladebildschirmes. JPT 2014-10-30 20:21:11 +01:00
  • 8d009c94a6 Show the OS in Debug-Mode Licht 2014-10-29 16:20:12 +01:00