Avans/Arcade
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/pre-playState' into develop

Browse Source 
Conflicts:
	control/GameControl.java
	control/GameStateManager.java
	image/Images.java
This commit is contained in:
kennyboy55
2015-06-22 09:13:25 +02:00
parent 93e4cb3d6e 665f04ceef
commit 9f2f84c608
6 changed files with 107 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
model/gameState/MenuState.java
+1 -1
View File
@@ -170,7 +170,7 @@ public class MenuState extends GameState {
}
if(e.getButton().getButtonID() == 1){
sh.close();
gsm.setState(control.GameStateManager.State.PLAY_STATE);
gsm.setState(control.GameStateManager.State.PRE_GAME_STATE);
}
}else{ //Screen for selecting song
if(e.getButton().getButtonID() == 1){