From f8514a0f3de72eafa9e6d46d4729a07a09a0312c Mon Sep 17 00:00:00 2001 From: Anuken Date: Sat, 20 Jan 2018 23:01:54 -0500 Subject: [PATCH] Changed application icon --- core/assets/sprites/icon.icns | Bin 2620 -> 4990 bytes core/assets/sprites/icon.png | Bin 326 -> 2124 bytes .../ui/dialogs/SettingsMenuDialog.java | 6 ++++-- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/core/assets/sprites/icon.icns b/core/assets/sprites/icon.icns index 56d331223f2d2cd942d5647556293608bb9cdfa1..93771cc76cfdd8aa9d30350b3b6d4d62bdb0304d 100644 GIT binary patch literal 4990 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 Dc>eu- diff --git a/core/assets/sprites/icon.png b/core/assets/sprites/icon.png index 2268830701f7bdc249ce1d71a398ba142d7b39ca..c2fa937fb5380fe5091de75deb488e98907b510a 100644 GIT binary patch delta 2066 zcmX@cbVgu8VErRTQDzJ2Am`931_t(t7j4@g9QyrU-7njXcRi2! zB^`gVaYM2uqv8?mLq^&zDV&o%JT^FYMQm_Rnc5+{+QX%T*NIWFH{ql*7q>vAN1%s_ zI%9v}qa)vX-fpy=7yi9AMd~ug${wrP?FZY{U<@fB_vw0#D#m~>Nbmm}e zkWg;tlU;QG{pJlD95@&Q>;2Pg)YI}G^wiC9tP%P5>!RMNjLu03Yf}v*6qL@KKW{9< zH@ksP-p*(D-MUj(Gu2xzun0J17zre+v^0Eg)M(rq*lIi>V#Bcor3dUBL=!_;yhP`4 zcW@ZGt=U@fUi!C^(aCq0*RA`R>mB;>p0Tm9bL6y;)RR$hA7__yC5h~-eNoT0*W{Y6 z(9hdPWn<*jc)q<&2-jBh48CNd+R|Y7?EltNapC4NhHgnc!Q1&1142a?U+jp;`Eckr zbJvb;*4eiws^XH)UIjg{UntM~*$pMH3F zI5_kCCZ6}U-P83qZ?jvHDw@iWWWbbPulM#qRB*b&hA349Hr0aS(z$_K-PYeu+fZ+R zOd>5kJ@D?ExjLsAmK^lle}6vLfolKAX)$rSKM$W`4iT&?TBBfmssFyC2i0jd#-Qp)V^&Cua*nKyxuu!nUw)$Jo zY2}Q|YbUQz`}<(;arXGdaX)jsIW7i=KDeW%nENY`<*01_e`)0n9`n7HYC7+~&;H=f zBlZcOW=>!9rMkB4UCzbVUpHJc+vfV<;2Y*`>5SJ+>y>*PPM2*sW-?daN#R&WVEydE z?3TFGzF!+mpXOe9;d4ZydF!^u{)eQTV_ci!&Pg=w2Op0<{E9=@vkul2CCSft*2#TJl%9b4bu*>9q@(W=5+ zQC2%(;geK_s(SyxDN|BA*SD+?2$eo&&eXYi!Nza-ADA}sX{=hLH6_(GQZyv=F8{W|NhMQy4QrvMVZ6Njs(9@}&24wp zIX_(Z$9Il{d$Hbi?!*^Uj=$e=%qLt>G(>lkDf46dlIxp-ao}2l}L2-|qQveEkv$LBD@WMTw~=?(KQ>foWfcYq5OE1f|+nn0!*qhNZbt`X=po?vo z$l}I5t5!5AclUAdw(ofPy}tg>h9d$Ocg?Gu_xacB^^a>8{NAaraBb7t`_KQ~JnwJ% z>`&3rsHGM16<@DjFE}^pxvs;p>D+?7Tluf5{m?uq6!PQvAwIX&r>at=Eh^uCw99!Y zaj+xjpu^gzSMhtkf7K2>95$tVUFpyFD-L)5?pk@k+}ym+b9DWS6kj(ff;xizQW z;-hO)$h{qN9zRw$PMT!lH_xWi@DTU=|J|=$`xwKVkKNKx&T@voPhP*RBCi^-sdbjUt>|%ye8Jp9XXe?a+|AunqIfv+@b&cY8#h;lE?)5DV1Ubu z<(gY=zd5HAs#B19@Xu96JB^jT9%p~tow46)PFa1HuB`dFTlMRB3d1s9Pq@1-C0y*} zCb7&}o1}C_ALlUd2yb%_Y(1cK%w5rB~hI5YwtaXaDQ>b%< z`pqjR3Nh!utC=%3r7eWXevakgQ*Mr{Z$Ex;uzJ}Xe;3ca>&!I_>W?j0C6T;riubgw z9f2>uMWwtJTcmh+V#)UA9JUE+eODxnnD^#dpDdlLlRYt2@>l@) z%#6&-=gn?@{`g2L+$?No@rHhtw-?L$R6GR)dkmjcp35-V#ky+E?y4~BirEW<4o00` z>OK9#J>g^((|MQq*Cp|)Tr<f|$uch6SJtc;zrhU8bS{_d@$as^xHFmu=Uxi$K zMb7I#-wN-qHB~uw>7>rNp2}lasuyW>HuXO~(9~n@bM9VN{^{qR&lXro_0F5yaj7$J z`?a8Hstar;?Dco&+Lm5tGw0OW$ya9l3g>FSX3-yU$s|{9tLNiR4$nz8#lOD1eE#He v&-12F9eie-`%Ihv^2cHW)*opWxz51Nz`)??>gTe~DWM4f5<~Y< delta 253 zcmX>jaExg}VEsc*Q4vX%wc6x=<1 z1Hv2m#2FYE)_J-(hD02GJI#>mr~*&h)?d^57^kzJdw=fUDeEbEtuYHa^36P&N-j8U z%FGqncYgm?P1VCwi_h7t4C4A-V?5cL|ABS!)SkB-m-~!!?8{s?v@n-GkyBRMEyu8C zLwYF7>E{fm|9psl*t%IrUF6^+K7~bs?@EpLy_*~VpYhcMrHV+tfM-)4@*lY)@oG88 zGwTaK>-bZ5KAG@k{{oI@))R{J)RKDo=e$U%zpUS~fa99g0eRmllXc~X%@{zy)78&q Iol`;+01km}0RR91 diff --git a/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java index 0587c22703..5adff6d807 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java @@ -81,8 +81,10 @@ public class SettingsMenuDialog extends SettingsDialog{ menu.addButton("$text.settings.graphics", () -> visible(1)); menu.row(); menu.addButton("$text.settings.sound", () -> visible(2)); - menu.row(); - menu.addButton("$text.settings.controls", Vars.ui.controls::show); + if(!Vars.android) { + menu.row(); + menu.addButton("$text.settings.controls", Vars.ui.controls::show); + } menu.row(); menu.addButton("$text.settings.language", Vars.ui.language::show);