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

Removed old korean font / Fixed targeting going through UI

Browse Source
This commit is contained in:
Anuken
2018-09-18 09:17:50 -04:00
parent 0968981aef
commit 0c63b27eea
5 changed files with 3 additions and 2455 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2447
core/assets/ui/korean.fnt
View File

File diff suppressed because it is too large Load Diff

BIN
core/assets/ui/korean.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 85 KiB

5
core/assets/ui/uiskin.json
View File

@@ -10,11 +10,6 @@ Font: {
markup: false, markup: false,
scale: 0.5 scale: 0.5
}, },
korean: {
file: korean.fnt,
markup: true,
scale: 0.5
},
trad-chinese: { trad-chinese: {
file: trad_chinese.fnt, file: trad_chinese.fnt,
markup: true, markup: true,

2
core/src/io/anuke/mindustry/core/UI.java
View File

@@ -117,7 +117,7 @@ public class UI extends SceneModule{
font.getData().setScale(Vars.fontScale); font.getData().setScale(Vars.fontScale);
font.getData().down += Unit.dp.scl(4f); font.getData().down += Unit.dp.scl(4f);
font.getData().lineHeight -= Unit.dp.scl(4.3f); font.getData().lineHeight -= Unit.dp.scl(4.3f);
}, skin.font(), skin.getFont("default-font-chat"), skin.getFont("korean"), skin.getFont("trad-chinese"), skin.getFont("simp-chinese")); }, skin.font(), skin.getFont("default-font-chat"), skin.getFont("trad-chinese"), skin.getFont("simp-chinese"));
} }
@Override @Override

4
core/src/io/anuke/mindustry/input/MobileInput.java
View File

@@ -546,14 +546,14 @@ public class MobileInput extends InputHandler implements GestureListener{
float worldx = Graphics.world(x, y).x, worldy = Graphics.world(x, y).y; float worldx = Graphics.world(x, y).x, worldy = Graphics.world(x, y).y;
checkTargets(worldx, worldy);
//get tile on cursor //get tile on cursor
Tile cursor = tileAt(x, y); Tile cursor = tileAt(x, y);
//ignore off-screen taps //ignore off-screen taps
if(cursor == null || ui.hasMouse(x, y)) return false; if(cursor == null || ui.hasMouse(x, y)) return false;
checkTargets(worldx, worldy);
//remove if request present //remove if request present
if(hasRequest(cursor)){ if(hasRequest(cursor)){
removeRequest(getRequest(cursor)); removeRequest(getRequest(cursor));