curioustorvald/Terrarum
1
0
Fork 0
mirror of https://github.com/curioustorvald/Terrarum.git synced 2026-03-14 07:36:06 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'inventory-ui-transition-container' into master

Browse Source
This commit is contained in:
minjaesong
2020-09-17 11:24:15 +09:00
parent 28369f8eeb f2902b38b2
commit 24b7331af3
32 changed files with 517 additions and 265 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/net/torvald/terrarum/AppLoader.java
View File

@@ -213,6 +213,8 @@ public class AppLoader implements ApplicationListener {
public static final int minimumW = 1080;
public static final int minimumH = 720;
public static final String FONT_DIR = "assets/graphics/fonts/terrarum-sans-bitmap";
private static ShaderProgram shaderBayerSkyboxFill; // ONLY to be used by the splash screen
@@ -483,14 +485,12 @@ public class AppLoader implements ApplicationListener {
}*/
fontGame = new GameFontBase("assets/graphics/fonts/terrarum-sans-bitmap", false, true,
fontGame = new GameFontBase(FONT_DIR, false, true,
false, Texture.TextureFilter.Nearest, Texture.TextureFilter.Nearest, false, 256, false
);
Lang.invoke();
// make loading list
CommonResourcePool.INSTANCE.loadAll();
}