Commit Graph

235 Commits

Author SHA1 Message Date
c5b76fbdf9 Cache inset offsets used to translate Graphics2D object. 2014-11-12 11:20:27 +01:00
61b80ff49e Use invokeAndWait() instead of invokeLater() for painting. 2014-11-12 10:47:50 +01:00
15eac026a7 Makefile handles music folder now, too. 2014-11-11 21:34:30 +01:00
361377a567 Throw in some music. Proof of concept. :/
We need to implement support for looping sounds and also stopping (all)
running sounds, so we don't end up in a big mash-up of noise.
2014-11-11 21:31:47 +01:00
dd6e5a7f2c Bugfix: Window decoration overlaps game content. 2014-11-11 19:58:33 +01:00
cc980bbd12 Merge branch 'master' of /home/stud/timmeja/SpaceScooter 2014-11-11 15:14:26 +01:00
a0cb033bb3 Remove debugging line. 2014-11-11 15:11:31 +01:00
25f3114c9f Merge branch 'master' of /home/stud/timmeja/SpaceScooter 2014-11-11 15:09:12 +01:00
981b2c7513 Add fire shots for Player and Enemy. 2014-11-11 15:04:27 +01:00
JJTCM
e4882f1315 Health and Shildbar now working with Percent Values 2014-11-11 14:59:37 +01:00
Sosch
5eec7ff7df Player kann nicht mehr in die interfaceBar fliegen 2014-11-11 14:57:01 +01:00
1c10c8bce0 Add a way to get the time a draw() or update() call took. 2014-11-11 14:54:46 +01:00
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
a10c798afd Add comments and add/remove method to Credit class. 2014-11-11 14:24:49 +01:00
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
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
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
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
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
248e5f685a Move RenderingHints into GameFrame method. 2014-11-10 20:40:06 +01:00
c37662f7f8 Minor optimization in TimedThread class. 2014-11-09 23:03:28 +01:00
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
e75f99d71b Remove EntityContainer.java. 2014-11-09 11:44:36 +01:00
eccc317bea Remove the need for an Iterator within the lists remove method. 2014-11-09 11:33:50 +01:00
64039fdee7 Change error output in GameFrame.draw() to something more explanatory. 2014-11-09 11:17:56 +01:00
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
ec48c042f6 Finalize methods in Screen and TimedThread. 2014-11-09 10:36:43 +01:00
f8246956c4 Reuse free null-nodes in the list to add new entities. 2014-11-08 18:46:54 +01:00
a4c788ad22 Create image folder for explosions. 2014-11-08 18:29:10 +01:00
d5092bd668 Remove leftover Rectangle code. 2014-11-08 18:21:05 +01:00
50a898aeef Draw a small white border around the HealthBar. 2014-11-08 18:20:26 +01:00
1f78309a98 Use ints instead of Rectangles for collision detection. 2014-11-08 18:20:10 +01:00
cf3e6b93a5 Add stat target to Makefile. 2014-11-08 17:43:56 +01:00
0d90b387c3 Set CollisionDamage for Player and Enemies. 2014-11-08 15:19:44 +01:00
d444b36351 Bugfix: Enemies do not hurt the player, player does not properly die. 2014-11-08 15:17:45 +01:00
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
dda0fb8313 Move Entity interfaces into a spi (Service Providing Interfaces) package. 2014-11-07 21:03:45 +01:00
17aafe11f9 Comment interfaces, expand the hittable interface. 2014-11-07 21:01:13 +01:00
2295d83ff9 The Entity now knows whether it is able to move. 2014-11-07 20:54:00 +01:00