 kennyboy55
|
9f2f84c608
|
Merge remote-tracking branch 'origin/pre-playState' into develop
Conflicts:
control/GameControl.java
control/GameStateManager.java
image/Images.java
|
2015-06-22 09:13:25 +02:00 |
|
 Bilel Bghiel
|
d92cd7333b
|
clean up 'n bugcrushing
|
2015-06-19 14:36:40 +02:00 |
|
 jancoow
|
d86d4dc62e
|
Remove some system outs
|
2015-06-19 10:25:44 +02:00 |
|
 Remco
|
df35dbeb8d
|
back to title when you wait too long
|
2015-06-18 16:32:47 +02:00 |
|
|
jancoow
|
1f0030b90d
|
Added webcam support + QR code generator.
Some cleanup
|
2015-06-15 19:29:55 +02:00 |
|
 Dofensmirtsz
|
b89ea8a5df
|
PREGAMESTATE YUYYYYY
|
2015-06-11 17:05:01 +02:00 |
|
|
kennyboy55
|
86bd970fe1
|
Changing to network
|
2015-06-11 16:30:53 +02:00 |
|
|
kennyboy55
|
61757652c3
|
Fixed timing
|
2015-06-11 12:48:48 +02:00 |
|
|
kennyboy55
|
0525163195
|
GamePlay fixes
|
2015-06-08 13:45:28 +02:00 |
|
|
kennyboy55
|
a3069af5c0
|
Bugfix things
|
2015-06-08 12:50:51 +02:00 |
|
|
jancoow
|
750f525c2d
|
Optimized code, everything is buffered in a buffered image now
|
2015-06-07 14:22:56 +02:00 |
|
|
jancoow
|
ab5fd4007d
|
Changed sound player, code will work on java 7
|
2015-06-05 20:45:39 +02:00 |
|
|
Remco
|
1bf525c6b7
|
game logic fixed by tips of johan
|
2015-06-04 13:20:46 +02:00 |
|
|
Remco
|
dc8f3c92e4
|
First bug free game?
|
2015-05-28 09:30:17 +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 |
|