b60abdc577
Remove unused method from Shot class.
2014-11-06 19:44:27 +01:00
c3fb13e3eb
Create subfolders for shot images and item images.
2014-11-06 19:40:51 +01:00
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
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
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
617d0c2da1
Bild in Pausebildschirm über Loader laden.
2014-10-31 10:13:24 +01:00
676be810e5
Disable GameFrame being resizable.
2014-10-31 10:05:23 +01:00
lubiana
9b2b295cdb
yolo umlauts
2014-10-31 09:36:57 +01:00
Sosch
72be799fec
Bugfix
2014-10-31 09:29:00 +01:00
Sosch
efed113880
Merge branch 'menu'
...
Conflicts:
src/de/teamteamteam/spacescooter/entity/EnemyOne.java
src/de/teamteamteam/spacescooter/entity/Player.java
2014-10-31 09:12:30 +01:00
Sosch
b69bc9534f
menü eingefügt
2014-10-31 09:07:42 +01:00
a6d7bd3b95
Schuss-Spawnposition für EnemyOne angepasst.
2014-10-30 23:49:55 +01:00
52adadda88
Hintergrundbild verkleinert, Starbackground angepasst.
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.
2014-10-30 22:42:08 +01:00
52f8cbcb4d
Screen: Kommentierung, cleanup-Methode hinzugefügt.
2014-10-30 21:53:35 +01:00
6b23b3652b
Umlagern des Ladens von Bildern, Einführung des (noch sehr kurzen) Ladebildschirmes.
2014-10-30 20:21:11 +01:00
Licht
8d009c94a6
Show the OS in Debug-Mode
2014-10-29 16:20:12 +01:00
84e4ea98f0
Wechsel auf Graphics2D mit mehr Features für später.
2014-10-28 20:32:39 +01:00
04e2bcb3f2
Add DEBUG value in GameConfig.
2014-10-28 17:20:55 +01:00
8228c6de20
Add GamePausedScreen.
2014-10-28 17:17:13 +01:00
4717280ffc
Refactoring Kollisionserkennung grob fertig.
2014-10-28 16:45:35 +01:00
32f9a72c77
Refactor collision handling.
2014-10-28 16:40:33 +01:00
a1545b9c30
Erste Schadensverrechnung bei Kollision.
2014-10-28 16:08:50 +01:00
c772ec9b8f
Erste Kollisionsbehandlung.
2014-10-28 15:51:19 +01:00
27f1f486d5
Enemies können jetzt schießen. Wir auch.
2014-10-28 15:35:17 +01:00
65a4d2a682
Leichte Vereinfachung an der Entity-Api.
2014-10-28 15:15:21 +01:00
4ebe78b848
Entity-Api durchstrukturiert und an GameScreen gekoppelt.
2014-10-28 14:58:19 +01:00
lubiana
a9bbc264eb
Merge branch 'master' of github.com:teamteamteam/SpaceScooter
2014-10-28 13:44:42 +01:00
lubiana
ac97f95ca8
Enemy angefangen, HP zu CollidableEntity geaddet
2014-10-28 13:44:09 +01:00
70ae98a4c7
Verhindern von OutOfBounds bei dem Keyboard.
2014-10-28 13:19:08 +01:00
5004e2cc0e
Simple demo using the screens.
2014-10-28 11:56:13 +01:00
b118a5a024
Einführung von Screens.
2014-10-28 11:40:14 +01:00
dde94437fc
Packages haben nun grundsätzlich singulare Namen.
2014-10-28 10:26:54 +01:00
3e7d54902f
Add GraphicsSettings to retrieve refresh rate (and more).
2014-10-26 12:14:24 +01:00
ddde7ddde3
Move setHZ() calls to Main.java.
2014-10-26 11:46:17 +01:00
95dee0b409
Rename TimingThread to TimedThread.
2014-10-26 11:26:55 +01:00
b132fac7b0
Use Thread.yield() in order to make active waiting less painful.
2014-10-24 23:45:31 +02:00
f26c9366cd
Optimize the two threads and how drawing is handled.
2014-10-24 23:22:26 +02:00
a733187887
Create TimingThread to better control worker timings.
2014-10-24 21:38:36 +02:00
b42c8f3a1a
Timing-Test
2014-10-24 17:27:52 +02:00
4555e8792f
Delete unneeded files that went through the merge.
2014-10-24 11:54:02 +02:00
72b914cd3b
Merge mit erster Fensterkollision und Enemy-Implementation.
...
Conflicts:
src/de/teamteamteam/spacescooter/Main.java
src/de/teamteamteam/spacescooter/background/StarBackground.java
src/de/teamteamteam/spacescooter/entities/Player.java
2014-10-24 11:16:16 +02:00
11bd4bff13
Fix sleeping, now everything runs smooooooooothly.
2014-10-24 11:11:15 +02:00
JJTCM
5181be3619
* Player bleibt nun im Spelfeld
...
* Anfang der Gegner Kollision
* Experimenteller Timmer
2014-10-24 10:57:16 +02:00
a276298174
Merge Threads into GameThread, Introduce interfaces for Entities.
...
Background now inherits Entity, too.
Fixed imports all over the place.
2014-10-24 10:52:49 +02:00
475bdb73f4
Jetzt neu, mit Hintergründen.
2014-10-21 14:53:51 +02:00
0fd68d8b44
Bugfix: Exceptionfreies Zeichnen.
2014-10-21 14:02:28 +02:00
061ab3c9c1
Entities verwalten sich jetzt ein Stück weit selbst.
2014-10-21 13:40:13 +02:00
2be8fa2bec
Erster, sehr simpler Player mit buntem Bild funktioniert.
2014-10-21 12:58:44 +02:00
Mogk
5ec52879ac
Erster Prototyp
2014-10-21 11:25:49 +02:00
