Sunpy/opsu-dance
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'orgin/master' into omaster

Browse Source 
Conflicts:
	src/itdelatrisu/opsu/GameImage.java
	src/itdelatrisu/opsu/OsuGroupNode.java
This commit is contained in:
fd
2015-02-17 22:49:19 -05:00
parent ffed4b260a 69f5aa5748
commit 65e538fbdc
27 changed files with 803 additions and 404 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/itdelatrisu/opsu/states/Game.java
View File

@@ -701,7 +701,7 @@ public class Game extends BasicGameState {
resetGameData();
// needs to play before setting position to resume without lag later
MusicController.play();
MusicController.play(false);
MusicController.setPosition(0);
MusicController.pause();