Commit Graph
198 Commits
Author SHA1 Message Date
kennyboy55 3dba4b6b92 Added SQL and Network 2015-06-12 12:40:23 +02:00
Bilel Bghiel 9f0752c577 Merge branch 'develop' of https://github.com/ProjectGroepA2/Arcade into coin 2015-06-12 11:42:46 +02:00
Bilel Bghiel 68f5f2392c - mooiere afdaling.
- scorebar vult pas nadat muntje 'erin valt'
2015-06-11 21:23:02 +02:00
kennyboy55 ce35aaf667 Added network joystick handling 2015-06-11 19:55:54 +02:00
jancoow 44f4444ad0 Network buttons 2015-06-11 19:11:38 +02:00
kennyboy55 22853812f3 Added border around enemies 2015-06-11 17:15:41 +02:00
kennyboy55 5e0a7512bb Merge remote-tracking branch 'origin/develop' into develop 2015-06-11 16:31:21 +02:00
kennyboy55 a9de8f077a Fixed IndexOutOfBounds 2015-06-11 16:31:03 +02:00
kennyboy55 86bd970fe1 Changing to network 2015-06-11 16:30:53 +02:00
Dofensmirtsz e979252aae Submenu fix, songselect fix 2015-06-11 15:38:11 +02:00
Bilel Bghiel 01169b0ab7 Coin on hit 2015-06-11 15:36:07 +02:00
Bilel Bghiel 1e09c3e024 Coin on hit 2015-06-11 14:33:33 +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
Dofensmirtsz 7dd4066a8a Aanwijzertje toegevoegt 2015-06-11 13:32:27 +02:00
Remco 6f17124e02 help line added, helps where the closest enemy is 2015-06-11 13:00:51 +02:00
Dofensmirtsz fc4410c160 Buttons verbeterd 2015-06-11 12:57:21 +02:00
kennyboy55 61757652c3 Fixed timing 2015-06-11 12:48:48 +02:00
kennyboy55 7671294207 Changed init 2015-06-11 12:48:42 +02:00
kennyboy55 2e24060a12 Fixed button leds 2015-06-11 12:48:28 +02:00
Dofensmirtsz 5d153d3a2c Kleuren scrollen mee met het liedje 2015-06-11 12:39:54 +02:00
Remco 69bc3c2bee Glowing hitArea if you hit the enemy 2015-06-11 11:28:45 +02:00
Daniel b28114c40b Help++ 2015-06-11 11:09:31 +02:00
kennyboy55 136d9fe2cf Objects stop on song end.
Added time and song name.
Changed WHITE to ORANGE.
2015-06-11 10:42:05 +02:00
jancoow 44cc0e38d5 Enabled keys on rpi 2015-06-08 14:55:44 +02:00
Daniel cce3c22deb Added Game Over State 2015-06-08 14:51:12 +02:00
Daniel 85107d85a9 Gameover toegevoegt 2015-06-08 14:50:38 +02:00
Dofensmirtsz 236b74ba7c Merge remote-tracking branch 'origin/develop' into develop 2015-06-08 14:22:49 +02:00
Dofensmirtsz 44f50f2698 Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
	image/Images.java
	model/gameState/TitleState.java
2015-06-08 14:22: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
Dofensmirtsz ad81242081 Afbeelding van knopdrukken toegevoegt 2015-06-08 14:13:29 +02:00
kennyboy55 634451fa20 Fixed leds 2015-06-08 14:13:25 +02:00
kennyboy55 1e70111800 Ignore Image files 2015-06-08 14:05:58 +02:00
jancoow ed1f44299e Bugfix/everything
# Conflicts:
#	model/SongHandler.java
#	model/gameState/PlayState.java
2015-06-08 14:01:07 +02:00
kennyboy55 861a973cde Fixed resetting playState 2015-06-08 13:54:26 +02:00
kennyboy55 8297ff79e8 Merge remote-tracking branch 'origin/bugfix/everything' into bugfix/everything 2015-06-08 13:45:47 +02:00
kennyboy55 0525163195 GamePlay fixes 2015-06-08 13:45:28 +02:00
jancoow 0e2c9a53bf Faster subscreen drawing 2015-06-08 13:37:54 +02:00
kennyboy55 a3069af5c0 Bugfix things 2015-06-08 12:50:51 +02:00
Dofensmirtsz 3f7cd5a964 Gradients veranderd naar plaatjes voor betere prestaties hue 2015-06-08 12:41:03 +02:00
kennyboy55 8766037def Fixed a lot of bugs 2015-06-08 11:41:01 +02:00
Dofensmirtsz d221bbf1b1 Pulse op button pressed 2015-06-08 10:10:33 +02:00
Dofensmirtsz bbc6747d41 Nu for real, playeranimatie 2015-06-08 09:53:16 +02:00
Dofensmirtsz 38c4785fd2 Merge remote-tracking branch 'origin/develop' into develop 2015-06-08 09:49:34 +02:00
Dofensmirtsz 1a11235534 Player is veranderd naar de regenboogshit, en de submenu cursor is gefixt (geen foutmeldingen meer) 2015-06-08 09:45:40 +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