Avans/Arcade
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
247 Commits 5 Branches 0 Tags
feature/InfoPanel
Commit Graph
247 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Daniel 3fe5c0ad93 Nieuw Subtab 2015-06-04 11:24:54 +02:00
Daniel 2c960355a3 Fixed songs dir 2015-06-04 10:06:55 +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
jancoow 058d18784f Merge remote-tracking branch 'origin/feature/menu' into feature/menu 
# Conflicts:
#	model/gameState/MenuState.java
 2015-06-02 12:00:27 +02:00
Daniel 10f73d6e91 Menu art verandert 2015-06-02 11:43:25 +02:00
jancoow ab827600b1 Last fix 2015-06-02 11:26:46 +02:00
Remco 0e62a2e2b0 fixed playarea 2015-06-02 11:24:26 +02:00
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