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

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

Browse Source 
Conflicts:
	src/itdelatrisu/opsu/GameImage.java
This commit is contained in:
fd
2015-03-12 22:51:14 -04:00
parent 0b16f0e157 a19eb39259
commit be4cb6d608
34 changed files with 1757 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/itdelatrisu/opsu/GameImage.java
View File

@@ -87,6 +87,7 @@ public enum GameImage {
PAUSE_CONTINUE ("pause-continue", "png"),
PAUSE_RETRY ("pause-retry", "png"),
PAUSE_BACK ("pause-back", "png"),
PAUSE_REPLAY ("pause-replay", "png"),
PAUSE_OVERLAY ("pause-overlay", "png|jpg") {
@Override
protected Image process_sub(Image img, int w, int h) {
@@ -289,8 +290,6 @@ public enum GameImage {
MUSIC_PAUSE ("music-pause", "png", false, false),
MUSIC_NEXT ("music-next", "png", false, false),
MUSIC_PREVIOUS ("music-previous", "png", false, false),
RANKING_RETRY ("ranking-retry", "png", false, false),
RANKING_EXIT ("ranking-back", "png", false, false),
DOWNLOADS ("downloads", "png", false, false) {
@Override
protected Image process_sub(Image img, int w, int h) {