 Remco
|
7263442ea3
|
Highscore + highscore bar added + life bar
|
2015-05-28 14:48:29 +02:00 |
|
|
Remco
|
a7c52c04b6
|
highscore added
|
2015-05-28 12:56:31 +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 |
|
|
Remco
|
2276964639
|
bug fixed
|
2015-05-28 10:13:39 +02:00 |
|
|
jancoow
|
ab3c3ae694
|
Fixed double method name
|
2015-05-28 09:49:40 +02:00 |
|
|
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
|
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 |
|
|
Remco
|
ad447eedf8
|
Waarschijnlijk de exception opgelost, ik krijg de expection zelf niet
|
2015-05-27 20:10:28 +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 |
|
|
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 |
|
|
Remco
|
54382e9c1d
|
Colors
|
2015-05-27 10:42:29 +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 |
|
|
jancoow
|
973aef2d59
|
Fixed full-screen method for linux/rpi
|
2015-05-26 12:05:52 +02:00 |
|
|
Remco
|
2af16890d4
|
Changed size to resolution of arcade screen
|
2015-05-26 11:30:03 +02:00 |
|
|
Janco Kock
|
e55f112d79
|
Merge pull request #2 from ProjectGroepA2/feature/controls
Feature/controls
|
2015-05-26 11:11:28 +02:00 |
|
|
kennyboy55
|
54090a86cb
|
Removed old files
|
2015-05-24 20:21:36 +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 |
|
|
kennyboy55
|
35884a2726
|
Removed old files
|
2015-05-22 12:37:41 +02:00 |
|
|
kennyboy55
|
c5c9b58b16
|
Bugfixes
|
2015-05-22 12:29:36 +02:00 |
|
|
Remco
|
0af599077e
|
Timer changed from control to model
|
2015-05-22 12:15:16 +02:00 |
|
|
kennyboy55
|
678201d118
|
Fixed buttons changing color
|
2015-05-21 22:10:11 +02:00 |
|
|
kennyboy55
|
36cbc2b012
|
Added option for PC/RASP
|
2015-05-21 21:21:23 +02:00 |
|
|
kennyboy55
|
f7175aa70a
|
Show joystick direction on screen
|
2015-05-21 21:21:09 +02:00 |
|
|
kennyboy55
|
27c04e2b2a
|
General bugfixed
|
2015-05-21 21:20:47 +02:00 |
|
|
kennyboy55
|
5683b38210
|
Implemented Joystick Listener
|
2015-05-21 21:20:01 +02:00 |
|
|
kennyboy55
|
28c8d35670
|
Removed unnecessary libraries
|
2015-05-21 19:48:43 +02:00 |
|
|
kennyboy55
|
564f10af62
|
Added working buttons stuff
|
2015-05-21 17:15:05 +02:00 |
|
|
Remco
|
09caaad7e1
|
Player added
|
2015-05-21 14:23:30 +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 |
|
|
kennyboy55
|
435296b9be
|
Fix for Janco
|
2015-05-03 21:57:46 +02:00 |
|
|
kennyboy55
|
39484a720d
|
Fixed size problem.
|
2015-05-03 21:44:28 +02:00 |
|
|
kennyboy55
|
c256cdfe13
|
First Commit
|
2015-05-03 21:42:27 +02:00 |
|
|
kennyboy55
|
985ff7c7bf
|
Initial commit
|
2015-05-03 20:31:43 +02:00 |
|