diff --git a/CREDITS.md b/CREDITS.md index 6cee6517..60a41f41 100644 --- a/CREDITS.md +++ b/CREDITS.md @@ -20,6 +20,7 @@ The images included in opsu! belong to their respective authors. * sherrie__fay * kouyang * teinecthel +* Font Awesome by Dave Gandy - http://fontawesome.io Projects -------- diff --git a/res/menu-nav-advanced.png b/res/menu-nav-advanced.png new file mode 100644 index 00000000..22479e9b Binary files /dev/null and b/res/menu-nav-advanced.png differ diff --git a/res/menu-nav-audio.png b/res/menu-nav-audio.png new file mode 100644 index 00000000..b8881e70 Binary files /dev/null and b/res/menu-nav-audio.png differ diff --git a/res/menu-nav-custom.png b/res/menu-nav-custom.png new file mode 100644 index 00000000..a830bba3 Binary files /dev/null and b/res/menu-nav-custom.png differ diff --git a/res/menu-nav-dance.png b/res/menu-nav-dance.png new file mode 100644 index 00000000..21d50cf8 Binary files /dev/null and b/res/menu-nav-dance.png differ diff --git a/res/menu-nav-gameplay.png b/res/menu-nav-gameplay.png new file mode 100644 index 00000000..c81d92d5 Binary files /dev/null and b/res/menu-nav-gameplay.png differ diff --git a/res/menu-nav-general.png b/res/menu-nav-general.png new file mode 100644 index 00000000..bd42c489 Binary files /dev/null and b/res/menu-nav-general.png differ diff --git a/res/menu-nav-graphics.png b/res/menu-nav-graphics.png new file mode 100644 index 00000000..76cdfe6b Binary files /dev/null and b/res/menu-nav-graphics.png differ diff --git a/res/menu-nav-input.png b/res/menu-nav-input.png new file mode 100644 index 00000000..2347d907 Binary files /dev/null and b/res/menu-nav-input.png differ diff --git a/res/menu-nav-pippi.png b/res/menu-nav-pippi.png new file mode 100644 index 00000000..949789c3 Binary files /dev/null and b/res/menu-nav-pippi.png differ diff --git a/res/menu-nav-skin.png b/res/menu-nav-skin.png new file mode 100644 index 00000000..0fed5cc1 Binary files /dev/null and b/res/menu-nav-skin.png differ diff --git a/src/itdelatrisu/opsu/GameImage.java b/src/itdelatrisu/opsu/GameImage.java index e5126b3f..68002fc5 100644 --- a/src/itdelatrisu/opsu/GameImage.java +++ b/src/itdelatrisu/opsu/GameImage.java @@ -249,6 +249,16 @@ public enum GameImage { CONTROL_SLIDER_BALL ("control-sliderball", "png", false, false), CONTROL_CHECK_ON ("control-check-on", "png", false, false), CONTROL_CHECK_OFF ("control-check-off", "png", false, false), + MENU_NAV_AUDIO ("menu-nav-audio", "png", false, false), + MENU_NAV_CUSTOM ("menu-nav-custom", "png", false, false), + MENU_NAV_GAMEPLAY ("menu-nav-gameplay", "png", false, false), + MENU_NAV_GENERAL ("menu-nav-general", "png", false, false), + MENU_NAV_GRAPHICS ("menu-nav-graphics", "png", false, false), + MENU_NAV_INPUT ("menu-nav-input", "png", false, false), + MENU_NAV_SKIN ("menu-nav-skin", "png", false, false), + MENU_NAV_ADVANCED ("menu-nav-advanced", "png", false, false), + MENU_NAV_DANCE ("menu-nav-dance", "png", false, false), + MENU_NAV_PIPPI ("menu-nav-pippi", "png", false, false), VOLUME ("volume-bg", "png", false, false) { @Override protected Image process_sub(Image img, int w, int h) { diff --git a/src/itdelatrisu/opsu/states/MainMenu.java b/src/itdelatrisu/opsu/states/MainMenu.java index c711e05b..dbfe4a6a 100644 --- a/src/itdelatrisu/opsu/states/MainMenu.java +++ b/src/itdelatrisu/opsu/states/MainMenu.java @@ -513,6 +513,7 @@ public class MainMenu extends BaseOpsuState { @Override public boolean mousePressed(int button, int x, int y) { + //BubNotifListener.EVENT.make().onBubNotif("hi", Colors.BUB_ORANGE); // check mouse button if (button == Input.MOUSE_MIDDLE_BUTTON) return false; diff --git a/src/yugecin/opsudance/options/OptionGroups.java b/src/yugecin/opsudance/options/OptionGroups.java index e8d40d00..0df29f34 100644 --- a/src/yugecin/opsudance/options/OptionGroups.java +++ b/src/yugecin/opsudance/options/OptionGroups.java @@ -25,7 +25,7 @@ import static yugecin.opsudance.options.Options.*; public class OptionGroups { public static final OptionTab[] normalOptions = new OptionTab[] { - new OptionTab("General", GameImage.SEARCH), + new OptionTab("General", GameImage.MENU_NAV_GENERAL), new OptionTab("GENERAL", new Option[]{ OPTION_DISABLE_UPDATER, OPTION_ENABLE_WATCH_SERVICE @@ -33,7 +33,7 @@ public class OptionGroups { new OptionTab("LANGUAGE", new Option[]{ OPTION_SHOW_UNICODE, }), - new OptionTab("Graphics", GameImage.SEARCH), + new OptionTab("Graphics", GameImage.MENU_NAV_GRAPHICS), new OptionTab("RENDERER", new Option[] { OPTION_SCREEN_RESOLUTION, OPTION_ALLOW_LARGER_RESOLUTIONS, @@ -56,7 +56,7 @@ public class OptionGroups { OPTION_DANCING_CIRCLES, OPTION_DANCING_CIRCLES_MULTIPLIER, }), - new OptionTab("Skin", GameImage.SEARCH), + new OptionTab("Skin", GameImage.MENU_NAV_SKIN), new OptionTab("SKIN", new Option[]{ OPTION_SKIN, OPTION_IGNORE_BEATMAP_SKINS, @@ -71,7 +71,7 @@ public class OptionGroups { OPTION_DISABLE_CURSOR // TODO use combo colour as tint for slider ball option }), - new OptionTab("Audio", GameImage.SEARCH), + new OptionTab("Audio", GameImage.MENU_NAV_AUDIO), new OptionTab("VOLUME", new Option[]{ OPTION_MASTER_VOLUME, OPTION_MUSIC_VOLUME, @@ -84,7 +84,7 @@ public class OptionGroups { OPTION_DISABLE_SOUNDS, OPTION_ENABLE_THEME_SONG }), - new OptionTab("Gameplay", GameImage.SEARCH), + new OptionTab("Gameplay", GameImage.MENU_NAV_GAMEPLAY), new OptionTab("GENERAL", new Option[] { OPTION_BACKGROUND_DIM, OPTION_FORCE_DEFAULT_PLAYFIELD, @@ -98,7 +98,7 @@ public class OptionGroups { OPTION_MAP_END_DELAY, OPTION_EPILEPSY_WARNING, }), - new OptionTab("Input", GameImage.SEARCH), + new OptionTab("Input", GameImage.MENU_NAV_INPUT), new OptionTab("KEY MAPPING", new Option[]{ OPTION_KEY_LEFT, OPTION_KEY_RIGHT, @@ -107,7 +107,7 @@ public class OptionGroups { OPTION_DISABLE_MOUSE_WHEEL, OPTION_DISABLE_MOUSE_BUTTONS, }), - new OptionTab("Custom", GameImage.SEARCH), + new OptionTab("Custom", GameImage.MENU_NAV_CUSTOM), new OptionTab("DIFFICULTY", new Option[]{ OPTION_FIXED_CS, OPTION_FIXED_HP, @@ -118,7 +118,7 @@ public class OptionGroups { OPTION_CHECKPOINT, OPTION_REPLAY_SEEKING, }), - new OptionTab("Dance", GameImage.SEARCH), + new OptionTab("Dance", GameImage.MENU_NAV_DANCE), new OptionTab("MOVER", new Option[]{ OPTION_DANCE_MOVER, OPTION_DANCE_EXGON_DELAY, @@ -145,7 +145,7 @@ public class OptionGroups { new OptionTab("MIRROR", new Option[] { OPTION_DANCE_MIRROR, }), - new OptionTab("Advanced Display", GameImage.SEARCH), + new OptionTab("Advanced Display", GameImage.MENU_NAV_ADVANCED), new OptionTab("OBJECTS", new Option[]{ OPTION_DANCE_DRAW_APPROACH, OPTION_DANCE_OBJECT_COLOR_OVERRIDE, @@ -165,7 +165,7 @@ public class OptionGroups { OPTION_DANCE_REMOVE_BG, OPTION_DANCE_ENABLE_SB, }), - new OptionTab ("Pippi", GameImage.SEARCH), + new OptionTab ("Pippi", GameImage.MENU_NAV_PIPPI), new OptionTab ("GENERAL", new Option[]{ OPTION_PIPPI_ENABLE, OPTION_PIPPI_RADIUS_PERCENT,