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
parent ab5fd4007d e424faf0e6
commit 396769317c
74 changed files with 334 additions and 328 deletions
@@ -28,7 +28,7 @@ public class Song {
 	private BufferedImage backgroundImage;
 	private BufferedImage bannerImage;

-	private List<SongInstance> songs;
+	public List<SongInstance> songs;

 	public Song() {
 		title = "";