Commit Graph

221 Commits

Author SHA1 Message Date
Licht
1d00e840ca Merge branch 'master' of https://github.com/teamteamteam/SpaceScooter 2014-11-25 11:50:33 +01:00
Licht
543cc82344 Fixed grey background on the second explosion 2014-11-25 11:49:56 +01:00
d2e28477f0 Add spawn-Rules to LevelConfigParser feature set. 2014-11-25 11:46:54 +01:00
Licht
4e5d6bcd52 Adding some comments 2014-11-25 11:42:20 +01:00
e17e3414cd Move level buildup logic into Level. 2014-11-25 11:03:14 +01:00
af5bc93004 Move GameOver check into Level. 2014-11-25 10:54:20 +01:00
d64eff31e0 Make the Makefile respect levels. 2014-11-25 10:46:44 +01:00
420cbd67b1 Create a basic test level config, make the Loader parse it and do first steps actually implementing the concept. 2014-11-25 10:45:26 +01:00
Sosch
aad17c1032 Let ItemIncreaseDamage spawn 2014-11-24 23:48:51 +01:00
Sosch
7437a5c18d Add rocket (fire button: y), add ItemRocket (increase rocket amount), add some comments 2014-11-24 23:33:56 +01:00
JJTCM
841875c09c Switch Shoot DMG 2014-11-18 14:36:18 +01:00
d1fa125b61 Begin working on level config implementation a little. 2014-11-18 14:31:26 +01:00
JJTCM
1455430046 Readded Enemys 2014-11-18 13:59:10 +01:00
JJTCM
5baeff583f Replace Player Iritaion with getPlayer()
Added a Boss
Fix Item Pickup
2014-11-18 13:59:09 +01:00
Licht
4cbb91fd43 DREVCKSFICKEKACKEKACKE 2014-11-18 13:50:36 +01:00
Licht
a3a8d690e5 Fixed some naming conventions 2014-11-18 13:45:51 +01:00
lubiana
51af2be9c6 Merge branch 'master' of github.com:teamteamteam/SpaceScooter 2014-11-18 13:43:09 +01:00
lubiana
7226db6ec7 ItemOneUp 2014-11-18 13:43:04 +01:00
Licht
4ea4eea6cf Added specified Items, updated some ItemsCollected-Methods 2014-11-18 13:41:21 +01:00
Licht
1759efd694 Added Nuke Item 2014-11-18 13:34:31 +01:00
lubiana
388417ea3e Merge branch 'master' of github.com:teamteamteam/SpaceScooter 2014-11-18 13:14:50 +01:00
lubiana
d0f8ed13b0 new player grpahipc, new item graphic 2014-11-18 13:14:43 +01:00
Licht
6b5af72666 Updatet a little change in the Items 2014-11-18 13:14:21 +01:00
Licht
d2bdb93e91 Merge branch 'master' of https://github.com/teamteamteam/SpaceScooter 2014-11-18 13:08:37 +01:00
Licht
4e3964c31c Updated Items and added the first advanced Item-Icons 2014-11-18 13:08:08 +01:00
ramapcsx2
887e388735 Merge branch 'master' of https://github.com/teamteamteam/SpaceScooter 2014-11-18 12:47:23 +01:00
ramapcsx2
e8122b50fb disable one expensive anti aliasing option. look is still good, performance++ 2014-11-18 12:46:18 +01:00
Licht
f75a93b5cf Merge branch 'master' of https://github.com/teamteamteam/SpaceScooter 2014-11-18 12:19:19 +01:00
Licht
440325022b Added Image for Heal Power-Up 2014-11-18 12:18:44 +01:00
ramapcsx2
cea77cd081 quick debug helper hack 2014-11-18 12:11:22 +01:00
9db6c3ad2f Add debug target to Makefile for computers without jar command. >.> 2014-11-18 09:52:06 +01:00
ramapcsx2
d857bf47db delete meta file 2014-11-18 00:30:45 +01:00
ramapcsx2
1d5f00f10a a bunch of sound effects, should we still need more 2014-11-18 00:28:14 +01:00
ramapcsx2
55fa6a3390 2 more sound effects 2014-11-17 23:56:32 +01:00
9b0ed3e3de Revert "Always enable opengl acceleration, no matter where."
This reverts commit 51038411fb.
2014-11-12 19:37:37 +01:00
51038411fb Always enable opengl acceleration, no matter where. 2014-11-12 19:32:57 +01:00
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