Commit Graph
93 Commits
Author SHA1 Message Date
Dofensmirtsz 1a3f2cbc17 getters gemaakt voor time,name, en score in highscore.
weergeven van highscores in menustate, geeft niks weer omdat de database leeg is.
2015-06-12 14:37:01 +02:00
kennyboy55 b4a223fdd1 Added SQLConnector to states 2015-06-12 13:15:06 +02:00
kennyboy55 3dba4b6b92 Added SQL and Network 2015-06-12 12:40:23 +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
Dofensmirtsz e979252aae Submenu fix, songselect fix 2015-06-11 15:38:11 +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 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
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 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 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
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
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
Dofensmirtsz e424faf0e6 Mooie aanwijzer voor submenu, met mooie spritesheet 2015-06-05 17:31:59 +02:00
Dofensmirtsz 30e630879a zat nog klein foutje in y-positie difficulties 2015-06-05 13:11:47 +02:00
Remco f9e6a90160 fixed button collors in song 2015-06-05 12:45:09 +02:00
Dofensmirtsz 560147a4d8 Difficulty Selection + press1 for gamestate in submenu 2015-06-05 12:17:22 +02:00
Remco 76c288cfec game logic fixed1.0 2015-06-05 11:48:09 +02:00
Dofensmirtsz ed18c37640 Mooie achtergronden gemaakt :^) 2015-06-05 11:21:54 +02:00
Dofensmirtsz 0b368b5dbf SongInstanceDifficultyButtonColor fixed en display en load etc. y0l0 2015-06-04 14:50:48 +02:00
kennyboy55 8f8a42e9ce Fixed SongInstanceDifficultyButtons and added colors 2015-06-04 14:17:11 +02:00
Dofensmirtsz 5f8e7706f2 Added SongInstanceDifficultyButtons :))))))) 2015-06-04 13:48:49 +02:00