Commit Graph

38 Commits

Author SHA1 Message Date
Licht
543cc82344 Fixed grey background on the second explosion 2014-11-25 11:49:56 +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
Sosch
b034e68138 Shop überarbeitet 2014-11-11 14:25:46 +01:00
Licht
81dc747aba Added new Wasteland-thingy background 2014-11-11 10:46:20 +01:00
a4c788ad22 Create image folder for explosions. 2014-11-08 18:29:10 +01:00
c3fb13e3eb Create subfolders for shot images and item images. 2014-11-06 19:40:51 +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
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
Licht
3fdb185a24 Making the .png's 2014-10-28 13:05:12 +01:00
Licht
6bec22dafe Schiff-Bild hinzugefügt 2014-10-28 12:54:00 +01:00
Licht
033c45408e Shot-Bild hinzugefügt 2014-10-28 12:12:19 +01: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
JJTCM
5181be3619 * Player bleibt nun im Spelfeld
* Anfang der Gegner Kollision
* Experimenteller Timmer
2014-10-24 10:57:16 +02:00
475bdb73f4 Jetzt neu, mit Hintergründen. 2014-10-21 14:53:51 +02:00
2be8fa2bec Erster, sehr simpler Player mit buntem Bild funktioniert. 2014-10-21 12:58:44 +02:00