From 7d9ea309bfdb10d7fb8b249b52af788fde8333d4 Mon Sep 17 00:00:00 2001 From: yugecin Date: Sun, 28 May 2017 22:59:48 +0200 Subject: [PATCH] add icons to option menu nav --- CREDITS.md | 1 + res/menu-nav-advanced.png | Bin 0 -> 923 bytes res/menu-nav-audio.png | Bin 0 -> 719 bytes res/menu-nav-custom.png | Bin 0 -> 1082 bytes res/menu-nav-dance.png | Bin 0 -> 935 bytes res/menu-nav-gameplay.png | Bin 0 -> 1430 bytes res/menu-nav-general.png | Bin 0 -> 1332 bytes res/menu-nav-graphics.png | Bin 0 -> 647 bytes res/menu-nav-input.png | Bin 0 -> 1057 bytes res/menu-nav-pippi.png | Bin 0 -> 841 bytes res/menu-nav-skin.png | Bin 0 -> 1110 bytes src/itdelatrisu/opsu/GameImage.java | 10 +++++++++ src/itdelatrisu/opsu/states/MainMenu.java | 1 + .../opsudance/options/OptionGroups.java | 20 +++++++++--------- 14 files changed, 22 insertions(+), 10 deletions(-) create mode 100644 res/menu-nav-advanced.png create mode 100644 res/menu-nav-audio.png create mode 100644 res/menu-nav-custom.png create mode 100644 res/menu-nav-dance.png create mode 100644 res/menu-nav-gameplay.png create mode 100644 res/menu-nav-general.png create mode 100644 res/menu-nav-graphics.png create mode 100644 res/menu-nav-input.png create mode 100644 res/menu-nav-pippi.png create mode 100644 res/menu-nav-skin.png 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 0000000000000000000000000000000000000000..22479e9bfc84182650e3d4e100ece57fbb51fe20 GIT binary patch literal 923 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL5ULAh?3y^w370~qEv>0#LT=By}Z;C1rt33 zJqu|QzZ(n;%siehjv*CsZ)Yp!gg6ScX$x?$Ff}@ageVAbxVW-zTC`}9P@@Bo!@_it zrE!gelGX$c7gnGOun?3g{PW*CeY3fB@ovsXW$)h3ukkdtE}!{R|9jrOcdxG{ZTumx z*KAu*-J8R_dYjsr1m>JSqAy(I59lUb-6dpv!@>V-cU_bAfmPR!@`OEDet)$b)9N&F z;=$~vG3+tjNe%1% z%T3tY!uLV_on8h1mKzquizF5tb?n?L%XCtc=LffqtGR->{R>V1Nv-z}Tvn6Zz`e}I zQ_SMor+2SZFLdQG2wo$Ca1(HxWZX9c=ljJy6VJ=Usp!9j$1mO-;<8{>j- zUgn0-&E1kL@F9-AqAltK5LMNB=PUL(+|z2Z;1 z@*MPDE;VSFJ@@?q{sp3U8|)kQ&TZUMsdaKzGKg#La81Z{L8AtnNg|5xIP@6qSv`wk z0eLO_zmV$#89(2soH^NnJQuQliT+@)FpIKwzR3HaOuqUz&!u|}D%JX@fX2mK@=iQZ zdqDApFwj#6^bg#VV~l$Y^y#&N*E5on&-otMs=@Z+mpntHw@4$~B8dwvl4}fj81`mK zFszvsdq&~GlOx4j=B#c2S@ZR@YYnGt!sDC?v)Q70jMcjsqwX_i?`Kq5ZqTq>ZQdej zg-0$kd?utM^05WHTzH9xfi3TSdoABtb^{lV22!gHU{UET_ zd@pO*T5ZGTUYUmL4U1LX&y*gt-g{hO?vHJoZ~S7vwWlbb)5wAon0FXFUHx3vIVCg! E08Hg|4FCWD literal 0 HcmV?d00001 diff --git a/res/menu-nav-audio.png b/res/menu-nav-audio.png new file mode 100644 index 0000000000000000000000000000000000000000..b8881e700e86c45b6bd2afc05bb651359e747367 GIT binary patch literal 719 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL5ULAh?3y^w370~qEv>0#LT=By}Z;C1rt33 zJqu|QzZ(n;Ob(tdjv*CsS8s33m39B>I5qPP=ovmNV-L239S{ zh0g7KFC-86w8Yz29>2T$ID5@W=KTD$gB}a=_}UMf?$SR0)W1^uK6mXq6`jMi+IxQ- zw-Nib=aA8j^wZ^W+_sB1@T8tD|0h=Emniw-%BSNOHglaec&>MU;d9Yxj?;ARFEkdJ zrZ^4AFBX}`cn!$kEHceHdUs9xx!{O*FD5;;E?IV{NPRj;f#@`AiH$&su!y{zE1zVo z;uCi+oOrtYg)G*?~C>A-h5}*Y!ETtzfal8SX;-nDkH6RsRutu?B&9lqSKUYO*S72TGE~t z7SZ(uq-CPqtjI*oOU_hM{AIn-WUyKPRZJ~`R()#u=b81&yzyCRgx|N#XSnwIC+=*F zobK>GC?YTAnCgXUk!jLWwVYr0TAvfx;^{ z+_|Yb-Ql^W4)dD5ELPr$l1XP(FIaM&R`AwuJQonr7Fopk1sFXSc20LVuchNWx0v(G zoI^%4Vh_D{IzW~uPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02p*dSaefwW^{L9 za%BK;VQFr3E^cLXAT%y8E;t)BPS^kd1FK0yK~#8N<(nb2(=Zr?pFli;cmjbyAP@)y z;t9kP2qXf5Kp+qZ1OkCTAUFqsKp+qZ1OkCTA`wUg0)apv5C{YUfj}U}{oYx2vhJ?U zvb0;Xd(PK&|LM})G)a@R+nY=#W8svzB(92EQ;x(L;f_zj2DgZd;*t0y+Vod^70(2P z;?lC%;1+OBycN0nEG`R|_8d02K~9Lr;-4s?&e~vu8-h0eUX;`|;m$R~1~GRiXfxc)b=3!S~$( zeY2@1a3G$Gc>HnX4jh79eGyzimu4Hc#V^s+p*wg8eu!L!DR0V9nCA9TIFZhQ`_T|E zmS0y)h8_wx8KSyVNNvOI4`O2jA*QdTL~UYd9n!ujTy<~iuGm-sunM%!RM?4?V6JM4 zev0Fo<1*J5to}Tie)7G#|tCor&BK?)aPkOGL!qc{U4 z`+`(m7qk4$c6y>|J}Bb3800WSrdh@Lv)Et;>zEJXC5QVW9@~@d6~VZ^ zZ30D&VXDj(=QnZQTCu?uDPcYqog=r&Wky&}ptkS=1p8|}AhE#}C~ZC#wZWaUC^nc# zpXOV8?vmJG0#%p?8|mZZdh=j| zVkgXl3+{}0Xa;u5Jj7pi&OC&jF7qrhFgs%*^QmC&o~o@i4`HY4t*zOUlqo!CPtjJJ z2R2>r?D2%PxxB=Gce=Fo=7CMhv--KGDWYrjb`<7;O^SF$m1QXU3fAb_p6rgsJg_OL zQJDue^zbD#I`hEhj#yWtG!J1X_vK|YTJsQgaz}xqHV^TaRSRMC=Aju#Ercq}g9~;Q z0&@ZPyHR3;Qy3!iYARwl%s;sK>$*F3q)hhy1H$Io8kw4Wga7~l07*qoM6N<$g4gHP ArvLx| literal 0 HcmV?d00001 diff --git a/res/menu-nav-dance.png b/res/menu-nav-dance.png new file mode 100644 index 0000000000000000000000000000000000000000..21d50cf8a9536263b15ad739ee9fb4909d5aea24 GIT binary patch literal 935 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL5ULAh?3y^w370~qEv>0#LT=By}Z;C1rt33 zJqu|QzZ(n;%o3h1jv*CsZ)Yn`7BLiQ@mCN~7vNxd#KP3*pa5ei3H)II3b@a4P!RNB zc~r*$m1OD!s_9s|J7HDO&2uWo>o-TcE?sSRdG^USuTP#y**>ZHY}#gjy@tbQZfjn8 zb0YGC#GI!0376DAaLF*2#+Wa;*}3|G@rswMH*T(&kjDP5`Tl~?_=Bzser;0nHJ*OJ ze?!O~-;nySC7DlnD)_H;DZ78ocAn*y*WB@=Ams0@3Ckv`E38__?~*B1$-HP6W5|86 zC6>(UdVBQc8>i_XQ+JhdRm*wBFxn&dz-s&DK^)s1T;v_@ zsn67&_vmQQ@mxh;#`lM3c_|h+Z4RsHefIZi*K&)ZPmfhDiNrAK1}PSJMenM8wxq4l z`=f|@{LhU-nPLytZxvf9@UAI-L1<0&6aG!t9#wu_-~8o<(j}b(iy~sWLpY{8=0=^- z|IhP;f1m16<2PS!L@u#(HevZ^R>AS3>JO7fACKLedCa9xcZvEhiByzw;%c{a4xB%6 z-BIC8vkfXO{SEwEOiOgnMTOE?);Gp21s`2zao=?3nD(gCBz(hZfgGUn zbt&SC5#8#ScrF;TR0HK5t6DBBtx)o1{-b?I^B-T}b53PnX7>Y{eqC284|!ZZz`CUHq-0t>?&DMp6Uc?OqE444@FdKnt5{3SA_Bp4Z%yD>P-Rqrw3?O|vLR%Tdm zPS|Z0TNIN8W6t$U-}du7(42AWx(O3Q=6^G=FyC#_-1E=>|NQJh k#)B6xqkhDjvDY)yJU$@k5Y9din2#7dUHx3vIVCg!0RO&$+yDRo literal 0 HcmV?d00001 diff --git a/res/menu-nav-gameplay.png b/res/menu-nav-gameplay.png new file mode 100644 index 0000000000000000000000000000000000000000..c81d92d560b2edd071c0c16fb0cdc0b5c0d27ba5 GIT binary patch literal 1430 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 literal 0 HcmV?d00001 diff --git a/res/menu-nav-input.png b/res/menu-nav-input.png new file mode 100644 index 0000000000000000000000000000000000000000..2347d907b93ad47d32385bf241d122afd30e8022 GIT binary patch literal 1057 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL5ULAh?3y^w370~qEv>0#LT=By}Z;C1rt33 zJqu|QzZ(n;%#%D_978JN-p{jiJyr3C`@E z7E`xFQp$ zD#pl9+i*;3`BCPN-ZJ8UMfHzVKK!-ifRu4wr(xaOZNHS|IPDg_j=#vbr$gPp>0W1X z(#rYXY>nIFIwvp7e>7>um+eKy&sSQkOtK1hbGlcUz?!SQj6+f5`7(*$NheDp)^Jun z*YB>q=vHD>Z=UYn6YGCu%ihYv_q(_KQv6h2+?VwChn8G-b24FX2Vm z#ThaOj;)bCaD{y07B&M~&Y|WLK6BUqbtP_GAKK8LQu^=yYO%bLkE3E85-<0>1Nga&exXpp>)Q zOhrOb_3h^i$8Ua}2)LUUJ|t2v&LcUtWv^GBq1i?brn=5_AzuL~Sj@;!L6ef_qe#I=Wy#k?+H(0cpz zB-8JX3A-k8J$~*czV8%k1ex-;-BoY>^24dQ3R__B`%SOEopxn=fs9FF$o&r|bOB=hS!Qg!RqV zQa?1I+@^hfWkh|e#etOXH;*JX#fbjNa(W;Ir`|hN@*D@03J8-<(b>L#*r;_kAX}zvyi>9iZ zk9HerMo6JY1lXZ<|2K37vQ@kWqgUlP0f<5)>{#jB_7>nEwaN}Ak~yyIEK{HpCo tzqGqY|I^-cXF~^p0#LT=By}Z;C1rt33 zJqu|QzZ(n;OuIZ?978JNp3YD#7I745Q5N7}VQTDga8Z~5VmK%Wa;3%Ro7*>UeoxEKH=FI6d{$-6 z%ofwh8`6ZX`5c<%8DY$st(Hhg@J_?(r1(36KT6|`{0onp}ak@pChM~JZqAP`Jw&MJ!kR#N4*yBuO6)Q{`I8kTBX)G7yiGZ>W`)s zJb!hvH1P6DZkdFea^10=$6w4Uc>eC7ZQ$jJ+$_`nth}+cjx%h==|nA?O{TKD94z{~ zaiM$FC1TF=Be_eG}%)+Sh&2?!mGf+b(^-6n?NS$##2K z)O$PA3=_upN7a-f<;2tG^s=sQzZd^{zwV;wI|8pQr!6QDzP^Y(DU~V1ckLsl?2{ks ztNu?BJ(_%QZq`cvJ3p`8a{c#t$5Y08onjLOVv{VlvHYFU`5@#Hj?{v!gLHSf6UEo#5$Pk;{6RRpb6$Sd?E@(r yf-)EGdB#_Hab{a?#n(J*GLi-)5w+jEXP*zG$`&)o1ox#)9&t;ucLK6VB)ptMu literal 0 HcmV?d00001 diff --git a/res/menu-nav-skin.png b/res/menu-nav-skin.png new file mode 100644 index 0000000000000000000000000000000000000000..0fed5cc1ed515746f3788b67440fe1d0e6dbd52a GIT binary patch literal 1110 zcmV-c1gZOpP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02p*dSaefwW^{L9 za%BK;VQFr3E^cLXAT%y8E;t)BPS^kd1II~3K~#8N<(eI|6;T+5F9bmlTnK_72!abi z5ClOG1Q&uJ2rdLc5L{@jAP9mW2!b#O!XOBOAP9mW2!bF8g5dN%XWcn#e%?9rvw!By z>0RqtYvw!W%r|Gx?7hG5+k0oRSZpiD#1(NUUWfN(x&oZO;tgW~-Kv7);+Q4Dpymsn#aVn=sQj48{Iw+(B|K+L#)oo))}e}y$BW>@?Y zsYO}b`LAG&iFqP&=z?(mD_CPf=#ME!{6gdq&VK`IObAO;sYUmqn>qgttT7=uM*d}` zr!Ur+5a#5RV&JPRes*Dv2}#)iM115E&TlK$m=IpiR9YMHwPB43A?ZmWO5B59{Q_%D zOzf1Gh?4yP&Q~Yan3&k(z&+vo^uihwLogI8_kSszkKR~gAoNATQ1bj+g1Nu`lvv>j zO@^o&QamkRcQDpCf-{0YO5Lq3)V(drzhOog+X$=*w-z~uV2uOdCZ38ue}oXVe$&^* z(A&liXq2@>vBn;R6f|5T00|7;gvMY|tc{|ev?uhls6plTDn0hbuK??1K_+Yo-~0?G2gPTmb#WV zX#=!vGv!ayKZnluV-y_MkD)jqW}jNUE4eW#4w#Cj)~Je3DCLu%VoFUq4MMIJn>I1c zmhUGEvXp-LFejjwgTe1=d)DFqwoXRAiX< z#bhJC!x|0TG@~^$#LxkfRUqR0Ng};2tg(Y~^_B*q%1hczSD~`RiVd$ht3jg|EpuUw c{|}3ue=-|5hg=aJuK)l507*qoM6N<$g0uqb#Q*>R literal 0 HcmV?d00001 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,