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:
jancoow
2015-06-05 23:17:29 +02:00
74 changed files with 334 additions and 328 deletions
+2
View File
@@ -4,6 +4,7 @@ import java.awt.Dimension;
import java.awt.Graphics;
import java.awt.Graphics2D;
import java.awt.RenderingHints;
import java.awt.Toolkit;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
@@ -43,5 +44,6 @@ public class GameView extends JPanel{
RenderingHints.VALUE_ANTIALIAS_ON);
g2d.setRenderingHints(rh);
gsm.currentState.draw(g2d);
Toolkit.getDefaultToolkit().sync();
}
}