add icons to option menu nav

This commit is contained in:
yugecin 2017-05-28 22:59:48 +02:00
parent ae1468a6ad
commit 7d9ea309bf
14 changed files with 22 additions and 10 deletions

View File

@ -20,6 +20,7 @@ The images included in opsu! belong to their respective authors.
* sherrie__fay * sherrie__fay
* kouyang * kouyang
* teinecthel * teinecthel
* Font Awesome by Dave Gandy - http://fontawesome.io
Projects Projects
-------- --------

BIN
res/menu-nav-advanced.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 923 B

BIN
res/menu-nav-audio.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 719 B

BIN
res/menu-nav-custom.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
res/menu-nav-dance.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 935 B

BIN
res/menu-nav-gameplay.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
res/menu-nav-general.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
res/menu-nav-graphics.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 647 B

BIN
res/menu-nav-input.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 KiB

BIN
res/menu-nav-pippi.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 841 B

BIN
res/menu-nav-skin.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

View File

@ -249,6 +249,16 @@ public enum GameImage {
CONTROL_SLIDER_BALL ("control-sliderball", "png", false, false), CONTROL_SLIDER_BALL ("control-sliderball", "png", false, false),
CONTROL_CHECK_ON ("control-check-on", "png", false, false), CONTROL_CHECK_ON ("control-check-on", "png", false, false),
CONTROL_CHECK_OFF ("control-check-off", "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) { VOLUME ("volume-bg", "png", false, false) {
@Override @Override
protected Image process_sub(Image img, int w, int h) { protected Image process_sub(Image img, int w, int h) {

View File

@ -513,6 +513,7 @@ public class MainMenu extends BaseOpsuState {
@Override @Override
public boolean mousePressed(int button, int x, int y) { public boolean mousePressed(int button, int x, int y) {
//BubNotifListener.EVENT.make().onBubNotif("hi", Colors.BUB_ORANGE);
// check mouse button // check mouse button
if (button == Input.MOUSE_MIDDLE_BUTTON) if (button == Input.MOUSE_MIDDLE_BUTTON)
return false; return false;

View File

@ -25,7 +25,7 @@ import static yugecin.opsudance.options.Options.*;
public class OptionGroups { public class OptionGroups {
public static final OptionTab[] normalOptions = new OptionTab[] { public static final OptionTab[] normalOptions = new OptionTab[] {
new OptionTab("General", GameImage.SEARCH), new OptionTab("General", GameImage.MENU_NAV_GENERAL),
new OptionTab("GENERAL", new Option[]{ new OptionTab("GENERAL", new Option[]{
OPTION_DISABLE_UPDATER, OPTION_DISABLE_UPDATER,
OPTION_ENABLE_WATCH_SERVICE OPTION_ENABLE_WATCH_SERVICE
@ -33,7 +33,7 @@ public class OptionGroups {
new OptionTab("LANGUAGE", new Option[]{ new OptionTab("LANGUAGE", new Option[]{
OPTION_SHOW_UNICODE, OPTION_SHOW_UNICODE,
}), }),
new OptionTab("Graphics", GameImage.SEARCH), new OptionTab("Graphics", GameImage.MENU_NAV_GRAPHICS),
new OptionTab("RENDERER", new Option[] { new OptionTab("RENDERER", new Option[] {
OPTION_SCREEN_RESOLUTION, OPTION_SCREEN_RESOLUTION,
OPTION_ALLOW_LARGER_RESOLUTIONS, OPTION_ALLOW_LARGER_RESOLUTIONS,
@ -56,7 +56,7 @@ public class OptionGroups {
OPTION_DANCING_CIRCLES, OPTION_DANCING_CIRCLES,
OPTION_DANCING_CIRCLES_MULTIPLIER, OPTION_DANCING_CIRCLES_MULTIPLIER,
}), }),
new OptionTab("Skin", GameImage.SEARCH), new OptionTab("Skin", GameImage.MENU_NAV_SKIN),
new OptionTab("SKIN", new Option[]{ new OptionTab("SKIN", new Option[]{
OPTION_SKIN, OPTION_SKIN,
OPTION_IGNORE_BEATMAP_SKINS, OPTION_IGNORE_BEATMAP_SKINS,
@ -71,7 +71,7 @@ public class OptionGroups {
OPTION_DISABLE_CURSOR OPTION_DISABLE_CURSOR
// TODO use combo colour as tint for slider ball option // 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[]{ new OptionTab("VOLUME", new Option[]{
OPTION_MASTER_VOLUME, OPTION_MASTER_VOLUME,
OPTION_MUSIC_VOLUME, OPTION_MUSIC_VOLUME,
@ -84,7 +84,7 @@ public class OptionGroups {
OPTION_DISABLE_SOUNDS, OPTION_DISABLE_SOUNDS,
OPTION_ENABLE_THEME_SONG OPTION_ENABLE_THEME_SONG
}), }),
new OptionTab("Gameplay", GameImage.SEARCH), new OptionTab("Gameplay", GameImage.MENU_NAV_GAMEPLAY),
new OptionTab("GENERAL", new Option[] { new OptionTab("GENERAL", new Option[] {
OPTION_BACKGROUND_DIM, OPTION_BACKGROUND_DIM,
OPTION_FORCE_DEFAULT_PLAYFIELD, OPTION_FORCE_DEFAULT_PLAYFIELD,
@ -98,7 +98,7 @@ public class OptionGroups {
OPTION_MAP_END_DELAY, OPTION_MAP_END_DELAY,
OPTION_EPILEPSY_WARNING, OPTION_EPILEPSY_WARNING,
}), }),
new OptionTab("Input", GameImage.SEARCH), new OptionTab("Input", GameImage.MENU_NAV_INPUT),
new OptionTab("KEY MAPPING", new Option[]{ new OptionTab("KEY MAPPING", new Option[]{
OPTION_KEY_LEFT, OPTION_KEY_LEFT,
OPTION_KEY_RIGHT, OPTION_KEY_RIGHT,
@ -107,7 +107,7 @@ public class OptionGroups {
OPTION_DISABLE_MOUSE_WHEEL, OPTION_DISABLE_MOUSE_WHEEL,
OPTION_DISABLE_MOUSE_BUTTONS, OPTION_DISABLE_MOUSE_BUTTONS,
}), }),
new OptionTab("Custom", GameImage.SEARCH), new OptionTab("Custom", GameImage.MENU_NAV_CUSTOM),
new OptionTab("DIFFICULTY", new Option[]{ new OptionTab("DIFFICULTY", new Option[]{
OPTION_FIXED_CS, OPTION_FIXED_CS,
OPTION_FIXED_HP, OPTION_FIXED_HP,
@ -118,7 +118,7 @@ public class OptionGroups {
OPTION_CHECKPOINT, OPTION_CHECKPOINT,
OPTION_REPLAY_SEEKING, OPTION_REPLAY_SEEKING,
}), }),
new OptionTab("Dance", GameImage.SEARCH), new OptionTab("Dance", GameImage.MENU_NAV_DANCE),
new OptionTab("MOVER", new Option[]{ new OptionTab("MOVER", new Option[]{
OPTION_DANCE_MOVER, OPTION_DANCE_MOVER,
OPTION_DANCE_EXGON_DELAY, OPTION_DANCE_EXGON_DELAY,
@ -145,7 +145,7 @@ public class OptionGroups {
new OptionTab("MIRROR", new Option[] { new OptionTab("MIRROR", new Option[] {
OPTION_DANCE_MIRROR, OPTION_DANCE_MIRROR,
}), }),
new OptionTab("Advanced Display", GameImage.SEARCH), new OptionTab("Advanced Display", GameImage.MENU_NAV_ADVANCED),
new OptionTab("OBJECTS", new Option[]{ new OptionTab("OBJECTS", new Option[]{
OPTION_DANCE_DRAW_APPROACH, OPTION_DANCE_DRAW_APPROACH,
OPTION_DANCE_OBJECT_COLOR_OVERRIDE, OPTION_DANCE_OBJECT_COLOR_OVERRIDE,
@ -165,7 +165,7 @@ public class OptionGroups {
OPTION_DANCE_REMOVE_BG, OPTION_DANCE_REMOVE_BG,
OPTION_DANCE_ENABLE_SB, OPTION_DANCE_ENABLE_SB,
}), }),
new OptionTab ("Pippi", GameImage.SEARCH), new OptionTab ("Pippi", GameImage.MENU_NAV_PIPPI),
new OptionTab ("GENERAL", new Option[]{ new OptionTab ("GENERAL", new Option[]{
OPTION_PIPPI_ENABLE, OPTION_PIPPI_ENABLE,
OPTION_PIPPI_RADIUS_PERCENT, OPTION_PIPPI_RADIUS_PERCENT,