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
This commit is contained in:
jancoow
2015-06-05 23:17:29 +02:00
74 changed files with 334 additions and 328 deletions
+6
View File
@@ -51,6 +51,12 @@ public class PlayState extends GameState {
@Override
public void init() {
try {
Thread.sleep(2000);
} catch (InterruptedException e) {
e.printStackTrace();
}
sh.play();
for(int i=1; i<ButtonHandler.getButtons().size(); i++)