0a695432a0
Bugfix: GamePausedScreen did not correctly replace the GameScreen when going to MainMenu.
2014-11-04 21:31:47 +01:00
4017d369b1
Make sure Explosions cleanup after themselves.
...
Apparrently, == 0 was not enough.
2014-11-04 21:06:36 +01:00
48e3ac275c
Da hab ich doch glatt das super.update() übersehen.
2014-11-04 20:51:34 +01:00
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
c716bc2187
Minor Bugfix: Add missing super call, catch potential NullPointer.
2014-11-04 20:23:52 +01:00
95f3e05fed
Have the Screen call remove() on all Entities before removing them.
2014-11-04 20:23:21 +01:00
a91a60381c
Add canShoot attribute to ShootingEntity.
2014-11-04 20:22:51 +01:00
aedbd55159
Bugfix: Have the player actually deregister itself from the Keyboard on remove().
2014-11-04 19:53:44 +01:00
e87ec69e97
Actually have the entity take care of adding it to the current screen. Whoopsie.
2014-11-04 19:46:19 +01:00
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
881b802e7a
Create packages for enemies, shots and items.
2014-11-04 19:33:30 +01:00
e713ee4817
Make Explosions inherit Entity instead of LivingEntity.
2014-11-04 19:29:24 +01:00
799e175c5d
Make 'spawny' Explosions work threadless.
2014-11-04 19:27:35 +01:00
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
cf8ff46dfb
Add private constructors static classes.
2014-11-04 18:42:11 +01:00
380dbce420
Single Character Fix. :|
2014-11-04 17:55:27 +01:00
8db001047e
Cleanup imports, fix package for SoundSystem class.
2014-11-04 14:43:54 +01:00
97a1195faa
Merge branch 'master' of https://github.com/teamteamteam/SpaceScooter
2014-11-04 14:40:12 +01:00
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
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
f22d16941d
Jetzt sollten auch Jars plattformunabhängig laufen.
2014-11-02 01:39:12 +01:00
a4fa1edce9
Kompatibilität: Pfadangaben werden der Plattform angepasst.
...
Intern fahren wir weiterhin Angaben wie "images/background.png", im
Loader werden diese aber entsprechend in Plattformpfade übersetzt.
2014-11-02 01:33:10 +01:00
d3bd491f1d
Bugfix: Ersetzen des "/" durch eine entsprechende Konstante.
...
Jetzt sollte es aber wirklich hinhauen. ._.
2014-11-02 01:21:05 +01:00
8b7392ed64
Nochmal Bugfix zum Loader.
2014-11-02 00:54:41 +01:00
0a43ff0d05
Bugfix: Crash unter Windows durch den Loader.
2014-11-02 00:17:02 +01:00
8089702e4a
Menüs nutzen nun ENTER statt SPACE, kleines Bugfix im GameOver- und GamePausedScreen.
2014-11-01 13:50:44 +01:00
Licht
4fa7db8e6b
Merge branch 'master' of https://github.com/teamteamteam/SpaceScooter
...
Conflicts:
src/de/teamteamteam/spacescooter/screen/GameScreen.java
2014-10-31 12:14:32 +01:00
Licht
68a0d139af
Explosions added. They explode.
2014-10-31 12:10:41 +01:00
JJTCM
30ab43f032
Merge branch 'master' of ssh://github.com/teamteamteam/SpaceScooter
2014-10-31 11:15:17 +01:00
JJTCM
d013afb465
* Merge Confilct
2014-10-31 11:06:30 +01:00
Sosch
7563048cca
Enemy 2 und 3 eingefügt
2014-10-31 11:00:17 +01:00
JJTCM
3588532c24
Merge branch 'master' of https://github.com/teamteamteam/SpaceScooter
...
Conflicts:
src/de/teamteamteam/spacescooter/entity/Player.java
2014-10-31 10:53:18 +01:00
JJTCM
aaf970f2e4
* Added Gameover Screen
...
* Now with more Buttonmashing for Shooting
2014-10-31 10:46:39 +01:00
