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
This commit is contained in:
@@ -7,7 +7,7 @@ import control.button.ButtonHandler;
|
||||
|
||||
public class GameModel{
|
||||
|
||||
public static Color[] colors = {Color.MAGENTA,Color.RED,Color.GREEN,Color.YELLOW,Color.CYAN,Color.WHITE};
|
||||
public static Color[] colors = {Color.GREEN,Color.YELLOW,Color.RED,Color.MAGENTA,Color.CYAN,Color.WHITE};
|
||||
private GameStateManager gsm;
|
||||
private SongHandler sh;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user