jancoow
396769317c
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
2015-06-05 23:17:29 +02:00
Remco
1bf525c6b7
game logic fixed by tips of johan
2015-06-04 13:20:46 +02:00
jancoow
1acba841fa
Added slider menu
2015-06-04 08:27:37 +02:00
Remco
dc8f3c92e4
First bug free game?
2015-05-28 09:30:17 +02:00
Remco
2af16890d4
Changed size to resolution of arcade screen
2015-05-26 11:30:03 +02:00
jancoow
ff0dafcee0
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
2015-05-24 20:09:58 +02:00
jancoow
2338366080
Moved to main directory instead of src folder
2015-05-24 18:03:16 +02:00
Remco
09caaad7e1
Player added
2015-05-21 14:23:30 +02:00
kennyboy55
e3a1ad7866
First Commit
2015-05-03 19:30:17 +02:00
jancoow
Remco
kennyboy55