diff --git a/core/src/mindustry/ClientLauncher.java b/core/src/mindustry/ClientLauncher.java index 7e07570470..ae8aae4ab3 100644 --- a/core/src/mindustry/ClientLauncher.java +++ b/core/src/mindustry/ClientLauncher.java @@ -69,6 +69,7 @@ public abstract class ClientLauncher extends ApplicationCore implements Platform return (Float.isNaN(result) || Float.isInfinite(result)) ? 1f : Mathf.clamp(result, 0.0001f, 60f / 10f); }); + UI.loadColors(); batch = new SortedSpriteBatch(); assets = new AssetManager(); assets.setLoader(Texture.class, "." + mapExtension, new MapPreviewLoader()); diff --git a/core/src/mindustry/core/UI.java b/core/src/mindustry/core/UI.java index 1b6b550461..3deb6bd4d8 100644 --- a/core/src/mindustry/core/UI.java +++ b/core/src/mindustry/core/UI.java @@ -101,8 +101,6 @@ public class UI implements ApplicationListener, Loadable{ @Override public void loadSync(){ - loadColors(); - Fonts.outline.getData().markupEnabled = true; Fonts.def.getData().markupEnabled = true; Fonts.def.setOwnsTexture(false); diff --git a/core/src/mindustry/logic/GlobalVarsDialog.java b/core/src/mindustry/logic/GlobalVarsDialog.java index 4d4e883f19..755c4a9886 100644 --- a/core/src/mindustry/logic/GlobalVarsDialog.java +++ b/core/src/mindustry/logic/GlobalVarsDialog.java @@ -22,7 +22,7 @@ public class GlobalVarsDialog extends BaseDialog{ } void setup(){ - float prefWidth = Math.min(Core.graphics.getWidth() * 0.9f / Scl.scl(1f) - 220f, 600f); + float prefWidth = Math.min(Core.graphics.getWidth() * 0.9f / Scl.scl(1f) - 240f, 600f); cont.clearChildren(); cont.pane(t -> {