Commit Graph
34 Commits
Author SHA1 Message Date
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 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
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
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 85107d85a9 Gameover toegevoegt 2015-06-08 14:50:38 +02:00
kennyboy55 861a973cde Fixed resetting playState 2015-06-08 13:54:26 +02:00
kennyboy55 8766037def Fixed a lot of bugs 2015-06-08 11:41:01 +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
Dofensmirtsz 5f8e7706f2 Added SongInstanceDifficultyButtons :))))))) 2015-06-04 13:48:49 +02:00
Remco 1bf525c6b7 game logic fixed by tips of johan 2015-06-04 13:20:46 +02:00
Daniel 65e5cb3eac Difficulty Toegevoegt 2015-06-04 12:53:19 +02:00
jancoow 1acba841fa Added slider menu 2015-06-04 08:27:37 +02:00
Remco 76a41dbbd1 playable game 2015-06-02 15:47:23 +02:00
Remco 6a356982a6 game logic updated 2015-06-02 14:08:53 +02:00
Remco 0e62a2e2b0 fixed playarea 2015-06-02 11:24:26 +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 7251d919ae Menu added and having fun~! 2015-05-29 18:07:21 +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
Remco dc8f3c92e4 First bug free game? 2015-05-28 09:30:17 +02:00
Remco 0af599077e Timer changed from control to model 2015-05-22 12:15:16 +02:00