Commit Graph
7 Commits
Author SHA1 Message Date
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