Hochschulprojekte/SpaceScooter
0
0
Fork 0
Code Issues Pull Requests Activity
173 Commits 2 Branches 0 Tags
6b4a159cabca5827c668bc6ffd66dad0acdf033b
Commit Graph
173 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
ramapcsx2 6b4a159cab hard limiting sounds and fade in/out for abgang.wav 2014-11-11 14:49:56 +01:00
Sosch c0b62d59ac Merge branch 'master' of https://github.com/teamteamteam/SpaceScooter 
Conflicts:
	src/de/teamteamteam/spacescooter/gui/Credits.java
 2014-11-11 14:28:13 +01:00
Sosch b034e68138 Shop überarbeitet 2014-11-11 14:25:46 +01:00
JPT a10c798afd Add comments and add/remove method to Credit class. 2014-11-11 14:24:49 +01:00
JPT 04944e0391 Create static java.util.Random wrapper, add shot hit sound. 2014-11-11 14:20:38 +01:00
JJTCM 5d404e37bd Added getPlayer() 2014-11-11 14:11:54 +01:00
JPT 0a460e3ce2 Bugfix: SoundSystem now supports multiple sounds at once. 2014-11-11 13:46:54 +01:00
JJTCM c10faf966a More Error Handling for Health and ShieldBar 2014-11-11 13:40:55 +01:00
JJTCM 680aa57997 Merge branch 'master' of ssh://github.com/teamteamteam/SpaceScooter 2014-11-11 13:20:11 +01:00
JJTCM e928543e3f More Error Handling for Score 2014-11-11 13:19:41 +01:00
JPT 755fc2bc27 Reintroduce CollidableEntity, add Sounds for powerups, explosions and stuff. 2014-11-11 13:16:29 +01:00
JJTCM d36e1901e6 Merge branch 'master' of ssh://github.com/teamteamteam/SpaceScooter 
Conflicts:
	src/de/teamteamteam/spacescooter/entity/LivingEntity.java
	src/de/teamteamteam/spacescooter/entity/Player.java
 2014-11-11 13:04:53 +01:00
JJTCM 5982c0ced2 Added Score 
Added Interface fr Health, Sheild and Score
Resized Game Window for the Interface
Added Score for Enemy Kills
 2014-11-11 13:00:45 +01:00
JPT 95dff9397b Remove default Explosion from LivingEntity. 
Every Entity has to override explode() itself, otherwise
it will just not explode.
 2014-11-11 12:19:57 +01:00
JPT 671e9f5ef0 Create Animation, base Explosions on Animation, create MultiExplosion. 2014-11-11 12:19:57 +01:00
Sosch 223612de32 Erster shop screen (erreichbar über Hilfe Button im hauptmenu) und credits eingefügt 
llease enter the commit message for your changes. Lines starting
 2014-11-11 12:11:40 +01:00
Licht 81dc747aba Added new Wasteland-thingy background 2014-11-11 10:46:20 +01:00
JPT 248e5f685a Move RenderingHints into GameFrame method. 2014-11-10 20:40:06 +01:00
JPT c37662f7f8 Minor optimization in TimedThread class. 2014-11-09 23:03:28 +01:00
JPT d59fbafd8c Add preloading for non-anonymous classes. 2014-11-09 22:12:31 +01:00
ramapcsx2 189c526b67 Fixing ü via utf8-zeichentabelle.de. Also enabled anti aliasing for fonts 2014-11-09 19:36:43 +01:00
JPT e75f99d71b Remove EntityContainer.java. 2014-11-09 11:44:36 +01:00
JPT eccc317bea Remove the need for an Iterator within the lists remove method. 2014-11-09 11:33:50 +01:00
JPT 64039fdee7 Change error output in GameFrame.draw() to something more explanatory. 2014-11-09 11:17:56 +01:00
JPT 904e13f4cf Avoid creating tons of iterators instead of recycling them. 
Use reset() on the ConcurrentIterator before iterating.
 2014-11-09 11:10:19 +01:00
JPT ec48c042f6 Finalize methods in Screen and TimedThread. 2014-11-09 10:36:43 +01:00
JPT f8246956c4 Reuse free null-nodes in the list to add new entities. 2014-11-08 18:46:54 +01:00
JPT a4c788ad22 Create image folder for explosions. 2014-11-08 18:29:10 +01:00
JPT d5092bd668 Remove leftover Rectangle code. 2014-11-08 18:21:05 +01:00
JPT 50a898aeef Draw a small white border around the HealthBar. 2014-11-08 18:20:26 +01:00
JPT 1f78309a98 Use ints instead of Rectangles for collision detection. 2014-11-08 18:20:10 +01:00
JPT cf3e6b93a5 Add stat target to Makefile. 2014-11-08 17:43:56 +01:00
JPT 0d90b387c3 Set CollisionDamage for Player and Enemies. 2014-11-08 15:19:44 +01:00
JPT d444b36351 Bugfix: Enemies do not hurt the player, player does not properly die. 2014-11-08 15:17:45 +01:00
JPT 1086effdad Huge update. See detailed notes. 
Keine Lust auf englischen Text gerade, hier die Übersicht:
Es gibt jetzt eine eigene Datenstruktur, die im Grunde nichts weiter
ist, als eine recht stumpfe, verkettete Liste. Besonderheit: Sie macht
sich weniger Gedanken über Modifikationen während des Iterierens und
wächst momentan etwas stetig.

Es gibt eine neue Methode die() im LivingEntity, die per default
Explosion auslöst und das Entity danach wegräumt. Wenn Items gedroppt
werden sollen oder sonstwas passieren soll, bitte Overriden.

Die Kollisionserkennung wurde in den CollisionHelper ausgelagert,
zunächst aber noch mit Rectangles weitergeführt. Wer mutig genug ist,
darf sich gerne austoben und eine Kollisionserkennung mit vielen If und
ints bauen. :-)

LivingEntity implementiert zunächst Hittable.

Der Player kümmert sich selbst um Kollisionen mit Items aka aufsammeln.

Das Collidable-Interface enthält alles notwendige für
Kollisionserkennung auf int-Basis.

Der Screen gibt nur noch Iteratoren für die Entity-Liste aus.

Ich glaube, das wars.
 2014-11-08 15:09:29 +01:00
JPT dda0fb8313 Move Entity interfaces into a spi (Service Providing Interfaces) package. 2014-11-07 21:03:45 +01:00
JPT 17aafe11f9 Comment interfaces, expand the hittable interface. 2014-11-07 21:01:13 +01:00
JPT 2295d83ff9 The Entity now knows whether it is able to move. 2014-11-07 20:54:00 +01:00
JPT d9b7128456 Rename DamageValue to ShootDamage to avoid confusion with Shot logic. 2014-11-07 20:47:07 +01:00
JPT 3c5e96791b Move GameFrame to root package, healthbar to gui package. 
The Gui Package shall contain all elements that we create and use in our
game that are actual gui elements like menu buttons, health bars,
highscore stuff and more.
 2014-11-07 20:23:06 +01:00
JPT d4a19e76e0 Comment ShootingEntity. Make createShot private. 2014-11-07 20:20:23 +01:00
JPT c0211181e1 Comment the LivingEntity. 2014-11-07 20:08:34 +01:00
JPT f0a9e8a6ad Comment Entity, make x and y private, add transpose method for easy movement. 2014-11-07 20:00:07 +01:00
JPT 496e6792c3 Move package item from background to entity. 2014-11-06 23:29:33 +01:00
JPT 76b7b33938 Comment the Shot class. 2014-11-06 23:27:03 +01:00
JPT 506a5ae620 Document the double buffering, move GameFrame title to GameConfig. 2014-11-06 23:19:46 +01:00
JPT 1caf4818eb Add comments to screen package. 2014-11-06 23:09:27 +01:00
JPT a12ef61f7b Comment the SoundSystem. 2014-11-06 22:58:07 +01:00
JPT 3d80faddef Clarify naming in the Loader, add comments. 2014-11-06 22:46:40 +01:00
JPT b60abdc577 Remove unused method from Shot class. 2014-11-06 19:44:27 +01:00