lubiana
8f4bad07a5
ist schöner so
2014-11-06 19:04:57 +01:00
lubiana
8a70490c47
Merge branch 'yoloshots'
2014-11-06 19:02:37 +01:00
lubiana
090b7ec5b3
Merge branch 'master' of github.com:teamteamteam/SpaceScooter
2014-11-06 19:02:23 +01:00
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
c4ab7c3530
Replace LinkedList with List, so it is possible to change its implementation later - if needed.
2014-11-06 18:19:35 +01:00
9542131e4a
Avoid creating a new anonymous Runnable each frame.
...
Since the Runnable that is passed to the EventQueue does never change,
it now is created in the constructor. This should avoid a lot of
overhead.
2014-11-06 17:34:20 +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
eb4bdc6ada
Remove @Override from Interface implementing methods in Player class.
2014-11-06 14:58:09 +01:00
46efd1e04e
Create overridable method that actually spawns Shot objects.
2014-11-05 22:54:54 +01:00
0c270c8665
Implement asynchronous playing of sounds.
2014-11-05 09:37:51 +01:00
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
b1e72da839
Cleanup unneccessary ArrayList in class Background.
2014-11-04 23:28:57 +01:00
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
