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 |
|
Sosch
|
b034e68138
|
Shop überarbeitet
|
2014-11-11 14:25:46 +01:00 |
|
|
|
a10c798afd
|
Add comments and add/remove method to Credit class.
|
2014-11-11 14:24:49 +01:00 |
|
|
|
04944e0391
|
Create static java.util.Random wrapper, add shot hit sound.
|
2014-11-11 14:20:38 +01:00 |
|
JJTCM
|
5d404e37bd
|
Added getPlayer()
|
2014-11-11 14:11:54 +01:00 |
|
|
|
0a460e3ce2
|
Bugfix: SoundSystem now supports multiple sounds at once.
|
2014-11-11 13:46:54 +01:00 |
|
JJTCM
|
c10faf966a
|
More Error Handling for Health and ShieldBar
|
2014-11-11 13:40:55 +01:00 |
|
JJTCM
|
680aa57997
|
Merge branch 'master' of ssh://github.com/teamteamteam/SpaceScooter
|
2014-11-11 13:20:11 +01:00 |
|
JJTCM
|
e928543e3f
|
More Error Handling for Score
|
2014-11-11 13:19:41 +01:00 |
|
|
|
755fc2bc27
|
Reintroduce CollidableEntity, add Sounds for powerups, explosions and stuff.
|
2014-11-11 13:16:29 +01:00 |
|
JJTCM
|
d36e1901e6
|
Merge branch 'master' of ssh://github.com/teamteamteam/SpaceScooter
Conflicts:
src/de/teamteamteam/spacescooter/entity/LivingEntity.java
src/de/teamteamteam/spacescooter/entity/Player.java
|
2014-11-11 13:04:53 +01:00 |
|
JJTCM
|
5982c0ced2
|
Added Score
Added Interface fr Health, Sheild and Score
Resized Game Window for the Interface
Added Score for Enemy Kills
|
2014-11-11 13:00:45 +01:00 |
|
|
|
95dff9397b
|
Remove default Explosion from LivingEntity.
Every Entity has to override explode() itself, otherwise
it will just not explode.
|
2014-11-11 12:19:57 +01:00 |
|
|
|
671e9f5ef0
|
Create Animation, base Explosions on Animation, create MultiExplosion.
|
2014-11-11 12:19:57 +01:00 |
|
Sosch
|
223612de32
|
Erster shop screen (erreichbar über Hilfe Button im hauptmenu) und credits eingefügt
llease enter the commit message for your changes. Lines starting
|
2014-11-11 12:11:40 +01:00 |
|
Licht
|
81dc747aba
|
Added new Wasteland-thingy background
|
2014-11-11 10:46:20 +01:00 |
|
