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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 delta 253 zcmVV9ssPc zXH^8t=K#z6@L%DDvl1s1!Qu`eq7m+OGrsPfU;hE>kRo_l4p8Ql;Sa>z80x18<~z{& zeh+22FNB~7);ho+O?ou0cf&RS00000NkvXXu0mjf D4uNg~ 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);