5 Commits

Include renames

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
jancoow	d685ffc6ac	Added fade in animation	2015-05-31 22:55:38 +02:00
jancoow	b99c4aa67d	Added main menu for selecting songs	2015-05-31 21:05:32 +02:00