 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 |
|