Janco Kock
7507d0fd63
Merge pull request #16 from ProjectGroepA2/feature/database
...
Feature/database
2015-06-15 22:09:43 +02:00
Janco Kock
16c41b94d5
Merge pull request #15 from ProjectGroepA2/revert-14-coin
...
Revert "Coin"
2015-06-15 21:46:58 +02:00
Janco Kock
54156e52b3
Revert "Coin"
2015-06-15 21:43:12 +02:00
jancoow
1f0030b90d
Added webcam support + QR code generator.
...
Some cleanup
2015-06-15 19:29:55 +02:00
jancoow
44f4444ad0
Network buttons
2015-06-11 19:11:38 +02:00
jancoow
fd46800e80
Fixed menu merge errors
2015-06-11 14:32:25 +02:00
jancoow
409866ab75
Feature/menu
...
# Conflicts:
# model/gameState/MenuState.java
# model/objects/MenuButton.java
2015-06-11 14:22:22 +02:00
jancoow
a9201902e1
Feature/help
...
# Conflicts:
# model/gameState/PlayState.java
2015-06-11 14:15:27 +02:00
jancoow
04305bc4fb
Feature/glowing hit area
2015-06-11 14:03:42 +02:00
jancoow
44cc0e38d5
Enabled keys on rpi
2015-06-08 14:55:44 +02:00
jancoow
6735334064
Disabled GPIO pins and system out led
2015-06-08 14:20:16 +02:00
jancoow
38a0bc4620
Gradients veranderd naar plaatjes voor betere prestaties hue (reverted from commit 3f7cd5a964)
2015-06-08 14:13:46 +02:00
jancoow
ed1f44299e
Bugfix/everything
...
# Conflicts:
# model/SongHandler.java
# model/gameState/PlayState.java
2015-06-08 14:01:07 +02:00
jancoow
0e2c9a53bf
Faster subscreen drawing
2015-06-08 13:37:54 +02:00
jancoow
37b721215c
Optimized submenu
2015-06-08 09:16:03 +02:00
jancoow
d79d73fc9e
A lot of improvements for the RPI. Uses images cached on the gpu.
2015-06-07 23:46:43 +02:00
jancoow
750f525c2d
Optimized code, everything is buffered in a buffered image now
2015-06-07 14:22:56 +02:00
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
jancoow
ab5fd4007d
Changed sound player, code will work on java 7
2015-06-05 20:45:39 +02:00
jancoow
1acba841fa
Added slider menu
2015-06-04 08:27:37 +02:00
jancoow
058d18784f
Merge remote-tracking branch 'origin/feature/menu' into feature/menu
...
# Conflicts:
# model/gameState/MenuState.java
2015-06-02 12:00:27 +02:00
jancoow
ab827600b1
Last fix
2015-06-02 11:26:46 +02:00
jancoow
42ae80b1b3
Feature/json
...
# Conflicts:
# control/GameStateManager.java
# image/Images.java
# main/Window.java
# model/gameState/MenuState.java
2015-06-02 10:51:47 +02:00
jancoow
df207836e0
original game? (reverted from commit 3fc6c98ea5)
...
Fixed overwrited code
2015-06-02 10:22:52 +02:00
jancoow
d685ffc6ac
Added fade in animation
2015-05-31 22:55:38 +02:00
jancoow
b99c4aa67d
Added main menu for selecting songs
2015-05-31 21:05:32 +02:00
jancoow
ea6895c6c1
Code cleanup and some improvements
2015-05-28 12:25:42 +02:00
jancoow
fab4ac6ce7
Buttonpress improved
2015-05-28 11:58:19 +02:00
jancoow
ab3c3ae694
Fixed double method name
2015-05-28 09:49:40 +02:00
jancoow
7bb04196f7
Merge branch 'testGameSprint1' into develop
2015-05-28 07:43:08 +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
jancoow
07e35d02c8
Cursor remove on fullscreen on rpi
2015-05-27 12:03:01 +02:00
jancoow
6510d4b93a
Only full screen on rpi & enabled AA
2015-05-27 11:41:10 +02:00
jancoow
973aef2d59
Fixed full-screen method for linux/rpi
2015-05-26 12:05:52 +02:00
Janco Kock
e55f112d79
Merge pull request #2 from ProjectGroepA2/feature/controls
...
Feature/controls
2015-05-26 11:11:28 +02:00
Janco Kock
98013548f7
Delete .project
2015-05-24 20:13:59 +02:00
Janco Kock
8026bb7c84
Delete .gitignore
2015-05-24 20:13:49 +02:00
Janco Kock
cd2295b939
Delete .classpath
2015-05-24 20:13:44 +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
Janco Kock
1225a82a07
Merge pull request #1 from ProjectGroepA2/GpioButtons
...
Gpio buttons
2015-05-24 17:23:36 +02:00
jancoow
9be062fcd9
Added support for GPIO joystick
...
Users can now simply test on their own pc without argument added to the launch file
2015-05-24 15:50:01 +02:00
Janco Kock
bf2a183407
Merge pull request #1 from ProjectGroepA2/feature/player
...
Player added
2015-05-22 22:08:27 +02:00
jancoow
3bf8280f79
Changed button handler to work with GPIO pins on Rpi
2015-05-22 21:45:49 +02:00
jancoow
68d6c61ca5
Add some comments
2015-05-17 12:16:41 +02:00
jancoow
a2c4f6f9eb
Ledstrip now working in java.
2015-05-17 12:12:14 +02:00
jancoow
d8dbcc0719
Just some ideas for the custom button & joystick event listener
2015-05-04 00:33:08 +02:00
jancoow
2c7c917d02
Pushed some testing & coding ideas
2015-05-03 22:55:15 +02:00
Janco Kock