Commit Graph

57 Commits

Author SHA1 Message Date
Sosch b335a59714 Merge branch 'master' of https://github.com/teamteamteam/SpaceScooter 2014-11-25 13:40:48 +01:00
Sosch e4ebc31a1b Add Beam (Button: x) 2014-11-25 13:39:23 +01:00
Jan Philipp Timme 922544effd LevelConfig should work now. Intervals are roughly seconds. 2014-11-25 13:37:13 +01:00
Jan Philipp Timme df8077874c Begin implementing spawning of stuff by ~name. :| 2014-11-25 12:43:39 +01:00
Licht 00f48ad4a7 Added EarthBackground 2014-11-25 12:33:58 +01:00
Licht 417c03b41c Added new Cloud Background 2014-11-25 12:21:20 +01:00
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
Jan Philipp Timme d2e28477f0 Add spawn-Rules to LevelConfigParser feature set. 2014-11-25 11:46:54 +01:00
Jan Philipp Timme 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 7437a5c18d Add rocket (fire button: y), add ItemRocket (increase rocket amount), add some comments 2014-11-24 23:33:56 +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 4e3964c31c Updated Items and added the first advanced Item-Icons 2014-11-18 13:08:08 +01:00
Licht 440325022b Added Image for Heal Power-Up 2014-11-18 12:18:44 +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
Jan Philipp Timme 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
Jan Philipp Timme cc980bbd12 Merge branch 'master' of /home/stud/timmeja/SpaceScooter 2014-11-11 15:14:26 +01:00
Jan Philipp Timme 981b2c7513 Add fire shots for Player and Enemy. 2014-11-11 15:04:27 +01:00
ramapcsx2 6b4a159cab hard limiting sounds and fade in/out for abgang.wav 2014-11-11 14:49:56 +01:00
Sosch b034e68138 Shop überarbeitet 2014-11-11 14:25:46 +01:00
Jan Philipp Timme 04944e0391 Create static java.util.Random wrapper, add shot hit sound. 2014-11-11 14:20:38 +01:00
Jan Philipp Timme 755fc2bc27 Reintroduce CollidableEntity, add Sounds for powerups, explosions and stuff. 2014-11-11 13:16:29 +01:00
Licht 81dc747aba Added new Wasteland-thingy background 2014-11-11 10:46:20 +01:00
Jan Philipp Timme a4c788ad22 Create image folder for explosions. 2014-11-08 18:29:10 +01:00
Jan Philipp Timme c3fb13e3eb Create subfolders for shot images and item images. 2014-11-06 19:40:51 +01:00
Jan Philipp Timme 2f6eddcb46 Add Sound support to Loader and Makefile. 2014-11-05 09:02:44 +01:00
lubiana 64c061b68f zwei enemies gepixelt 2014-11-05 01:00:16 +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
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 6b136e18e3 Big Explosion changed 2014-11-04 10:28:36 +01:00
Licht 8459b42451 2nd explosion added. (40% chance to spawn) 2014-11-02 01:57:54 +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
Jan Philipp Timme 52adadda88 Hintergrundbild verkleinert, Starbackground angepasst. 2014-10-30 23:46:38 +01:00
Licht 4a780ef39b Updated the Explosions; Cutted the Cat 2014-10-29 15:52:21 +01:00
Licht 8b5c77205c Explosion-Images added 2014-10-29 14:27:28 +01:00