Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UI#loadColors moved earlier in init

Browse Source
This commit is contained in:
Anuken
2024-02-10 17:20:35 -05:00
parent 4e8f54c06a
commit 1542f7c28e
3 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/mindustry/ClientLauncher.java
+1
View File
@@ -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); return (Float.isNaN(result) || Float.isInfinite(result)) ? 1f : Mathf.clamp(result, 0.0001f, 60f / 10f);
}); });
UI.loadColors();
batch = new SortedSpriteBatch(); batch = new SortedSpriteBatch();
assets = new AssetManager(); assets = new AssetManager();
assets.setLoader(Texture.class, "." + mapExtension, new MapPreviewLoader()); assets.setLoader(Texture.class, "." + mapExtension, new MapPreviewLoader());
core/src/mindustry/core/UI.java
-2
View File
@@ -101,8 +101,6 @@ public class UI implements ApplicationListener, Loadable{
@Override @Override
public void loadSync(){ public void loadSync(){
loadColors();
Fonts.outline.getData().markupEnabled = true; Fonts.outline.getData().markupEnabled = true;
Fonts.def.getData().markupEnabled = true; Fonts.def.getData().markupEnabled = true;
Fonts.def.setOwnsTexture(false); Fonts.def.setOwnsTexture(false);
core/src/mindustry/logic/GlobalVarsDialog.java
+1 -1
View File
@@ -22,7 +22,7 @@ public class GlobalVarsDialog extends BaseDialog{
} }
void setup(){ 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.clearChildren();
cont.pane(t -> { cont.pane(t -> {