Merge remote-tracking branch 'arcade-controls/develop' into feature/controls

Conflicts:
	README.md
	control/GameControl.java
	main/Main.java
	main/Window.java
	model/GameModel.java
	view/GameView.java
This commit is contained in:
jancoow
2015-05-24 20:09:58 +02:00
19 changed files with 671 additions and 46 deletions
+2 -2
View File
@@ -1,2 +1,2 @@
# Arcade
Arcade game for the fourth term at Avans Hogeschool Breda.
branch for the buttons and joystick for gpio raspberry