Commit Graph
17 Commits
Author SHA1 Message Date
Daniel 3fe5c0ad93 Nieuw Subtab 2015-06-04 11:24:54 +02:00
jancoow 1acba841fa Added slider menu 2015-06-04 08:27:37 +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 ab827600b1 Last fix 2015-06-02 11:26:46 +02:00
Remco 8cda332a95 fixed buggs 2015-06-02 11:14:05 +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
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
Daniel 22f0824e1c Menu Verandert, Menu State is TitleState en Menu = new Menu. 2015-05-30 21:50:41 +02:00
Daniel 50e2ea18dc Color Strike toegevoegt 2015-05-29 18:41:31 +02:00
Daniel 7251d919ae Menu added and having fun~! 2015-05-29 18:07:21 +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