 Remco
|
6808919490
|
Merge branch 'develop' of https://github.com/ProjectGroepA2/Arcade into develop
Conflicts:
main/Window.java
model/drawObjects/Player.java
model/gameState/PlayState.java
|
2015-05-28 09:45:41 +02:00 |
|
|
Remco
|
dc8f3c92e4
|
First bug free game?
|
2015-05-28 09:30:17 +02:00 |
|
 jancoow
|
30def21275
|
Feature/test game sprint1
# Conflicts:
# control/GameControl.java
# main/Main.java
# main/Window.java
Sprint 1 finished
|
2015-05-28 07:37:59 +02:00 |
|
 kennyboy55
|
7fa92e3cbf
|
Delete JoyStick.java
|
2015-05-27 13:35:08 +02:00 |
|
|
kennyboy55
|
ad7fcae6fb
|
Delete Button.java
|
2015-05-27 13:35:02 +02:00 |
|
|
Remco
|
3bc4f55f5a
|
GameSprint1Done, little bug. When aiming right down not possible to hit with button 1 and 3 :S
|
2015-05-26 22:14:44 +02:00 |
|
|
kennyboy55
|
adab5234bb
|
Added ButtonRelease(ButtonEvent e)
|
2015-05-26 13:04:59 +02:00 |
|
|
Remco
|
2af16890d4
|
Changed size to resolution of arcade screen
|
2015-05-26 11:30:03 +02:00 |
|
|
kennyboy55
|
54090a86cb
|
Removed old files
|
2015-05-24 20:21:36 +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
|
0af599077e
|
Timer changed from control to model
|
2015-05-22 12:15: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 |
|