Commit Graph
14 Commits
Author SHA1 Message Date
Dofensmirtsz bbc6747d41 Nu for real, playeranimatie 2015-06-08 09:53:16 +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
Remco f9e6a90160 fixed button collors in song 2015-06-05 12:45:09 +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 76a41dbbd1 playable game 2015-06-02 15:47:23 +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
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 c2674ae382 Implemented all csf handling 2015-05-28 23:11:35 +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