Bilel Bghiel f72d54202f Merge branch 'fix' of https://github.com/ProjectGroepA2/Arcade into develop ...

Conflicts:
	control/GameStateManager.java
	model/objects/InfoPanel.java

2015-06-19 11:36:19 +02:00

..

GameOverState.java

While on gamestate and you press the start button you go back to the title_state

2015-06-19 11:17:36 +02:00

GameState.java

Audio stopt bij wisselen tussen schermen

2015-06-18 16:24:03 +02:00

MenuState.java

joystick bugg fix?

2015-06-19 10:57:31 +02:00

PlayState.java

Merge branch 'fix' of https://github.com/ProjectGroepA2/Arcade into develop

2015-06-19 11:36:19 +02:00

TitleState.java

Verbetercode.

2015-06-16 17:30:34 +02:00