12 Commits
Author SHA1 Message Date
Daniel 85107d85a9 Gameover toegevoegt 2015-06-08 14:50:38 +02:00
kennyboy55 8766037def Fixed a lot of bugs 2015-06-08 11:41:01 +02:00
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 1bf525c6b7 game logic fixed by tips of johan 2015-06-04 13:20:46 +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 22f0824e1c Menu Verandert, Menu State is TitleState en Menu = new Menu. 2015-05-30 21:50:41 +02:00
kennyboy55 7b21aa1e09 Added songs, new libraries and more code 2015-05-29 12:47:25 +02:00
Remco dc8f3c92e4 First bug free game? 2015-05-28 09:30:17 +02:00
Remco 0af599077e Timer changed from control to model 2015-05-22 12:15:16 +02:00