jancoow
750f525c2d
Optimized code, everything is buffered in a buffered image now
2015-06-07 14:22:56 +02:00
jancoow
396769317c
Feature/menu
...
Conflicts:
audio/AudioPlayer.java
model/GameModel.java
model/SongHandler.java
model/gameState/MenuState.java
Menu now works togheter with the game. A lot of known bugs with audio player
2015-06-05 23:17:29 +02:00
Remco
76c288cfec
game logic fixed1.0
2015-06-05 11:48:09 +02:00
Remco
1bf525c6b7
game logic fixed by tips of johan
2015-06-04 13:20:46 +02:00
jancoow
058d18784f
Merge remote-tracking branch 'origin/feature/menu' into feature/menu
...
# Conflicts:
# model/gameState/MenuState.java
2015-06-02 12:00:27 +02:00
Daniel
10f73d6e91
Menu art verandert
2015-06-02 11:43:25 +02:00
jancoow
42ae80b1b3
Feature/json
...
# Conflicts:
# control/GameStateManager.java
# image/Images.java
# main/Window.java
# model/gameState/MenuState.java
2015-06-02 10:51:47 +02:00
jancoow
df207836e0
original game? (reverted from commit 3fc6c98ea5)
...
Fixed overwrited code
2015-06-02 10:22:52 +02:00
Remco
3fc6c98ea5
original game?
2015-06-02 09:59:26 +02:00
Daniel
39e521421a
Nieuwe achtergrond
2015-05-31 20:30:47 +02:00
Daniel
77ff6ba0f5
test!
2015-05-31 15:12:46 +02:00
Daniel
4e0a94adeb
background verandert samen met het logo, test
2015-05-31 00:27:47 +02:00
Daniel
22f0824e1c
Menu Verandert, Menu State is TitleState en Menu = new Menu.
2015-05-30 21:50:41 +02:00
jancoow
Remco
Daniel