 Remco
|
663abb7043
|
fixed playstate
|
2015-06-02 11:19:20 +02:00 |
|
|
Remco
|
8cda332a95
|
fixed buggs
|
2015-06-02 11:14:05 +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 |
|
|
Remco
|
3fc6c98ea5
|
original game?
|
2015-06-02 09:59:26 +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 |
|
 Daniel
|
39e521421a
|
Nieuwe achtergrond
|
2015-05-31 20:30:47 +02:00 |
|
|
Daniel
|
77ff6ba0f5
|
test!
|
2015-05-31 15:12:46 +02:00 |
|
|
Daniel
|
4e0a94adeb
|
background verandert samen met het logo, test
|
2015-05-31 00:27:47 +02:00 |
|
|
Daniel
|
22f0824e1c
|
Menu Verandert, Menu State is TitleState en Menu = new Menu.
|
2015-05-30 21:50:41 +02:00 |
|
|
Daniel
|
50e2ea18dc
|
Color Strike toegevoegt
|
2015-05-29 18:41:31 +02:00 |
|
|
Daniel
|
7251d919ae
|
Menu added and having fun~!
|
2015-05-29 18:07:21 +02:00 |
|
 kennyboy55
|
7b21aa1e09
|
Added songs, new libraries and more code
|
2015-05-29 12:47:25 +02:00 |
|
|
kennyboy55
|
4f4b10fd89
|
Added so much shit
|
2015-05-29 00:03:01 +02:00 |
|
|
kennyboy55
|
34f5cf8034
|
Merge remote-tracking branch 'origin/feature/json' into feature/json
|
2015-05-28 23:12:45 +02:00 |
|
|
kennyboy55
|
c2674ae382
|
Implemented all csf handling
|
2015-05-28 23:11:35 +02:00 |
|
|
kennyboy55
|
526d400a9d
|
Update README.md
|
2015-05-28 19:25:48 +02:00 |
|
|
kennyboy55
|
9ba62993e8
|
Quick test class
|
2015-05-28 19:24:39 +02:00 |
|
|
kennyboy55
|
484d2aee81
|
Added Song and subclasses
|
2015-05-28 19:24:31 +02:00 |
|
|
kennyboy55
|
9eb634e3f6
|
JSON Parser for custom CSF Format
This JSON Parser will read a CSF File, parse it and turn it into a Song, SongInstances and ObjectInstances.
|
2015-05-28 19:24:07 +02:00 |
|
|
kennyboy55
|
05df81c4f6
|
Fixed Eclipse error
Might have broken some other stuff by doing this.
|
2015-05-28 19:23:18 +02:00 |
|
|
kennyboy55
|
c9af5e930b
|
Libary for JSON Parsing
|
2015-05-28 19:22:07 +02:00 |
|
|
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 |
|