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

Cyrillic, chinese, korean fonts

Browse Source
This commit is contained in:
Anuken
2018-11-06 20:55:18 -05:00
parent 17d1db913f
commit a73a75a7f8
12 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
android/build.gradle
View File

@@ -37,7 +37,7 @@ dependencies {
natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-arm64-v8a" natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-arm64-v8a"
natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-x86" natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-x86"
natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-x86_64" natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-x86_64"
compile "com.badlogicgames.gdx:gdx-freetype:$gdxVersion" implementation "com.badlogicgames.gdx:gdx-freetype:$gdxVersion"
natives "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-armeabi" natives "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-armeabi"
natives "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-armeabi-v7a" natives "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-armeabi-v7a"
natives "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-arm64-v8a" natives "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-arm64-v8a"

BIN
core/assets-raw/fonts/chinese/wqy-microhei.ttc Normal file
View File

Binary file not shown.

BIN
core/assets-raw/fonts/cyrillic/Exo2-Regular.ttf Normal file
View File

Binary file not shown.

BIN
core/assets-raw/fonts/korean/Sunflower-Medium.ttf Normal file
View File

Binary file not shown.

BIN
core/assets-raw/fonts/pixel_UNEDITED.ttf Normal file
View File

Binary file not shown.

2
core/assets/bundles/bundle.properties
View File

@@ -189,7 +189,7 @@ text.changelog.current = [yellow][[Current version]
text.changelog.latest = [orange][[Latest version] text.changelog.latest = [orange][[Latest version]
text.loading = [accent]Loading... text.loading = [accent]Loading...
text.saving = [accent]Saving... text.saving = [accent]Saving...
text.wave = [orange]Wave {0} text.wave = [accent]Wave {0}
text.wave.waiting = [LIGHT_GRAY]Wave in {0} text.wave.waiting = [LIGHT_GRAY]Wave in {0}
text.waiting = [LIGHT_GRAY]Waiting... text.waiting = [LIGHT_GRAY]Waiting...
text.waiting.players = Waiting for players... text.waiting.players = Waiting for players...

2
core/assets/bundles/bundle_ko.properties
View File

@@ -285,7 +285,7 @@ text.settings.clearall = 모두 초기화
text.paused = 일시 정지 text.paused = 일시 정지
text.yes = 예 text.yes = 예
text.no = 아니오 text.no = 아니오
text.info.title = [accent]정보 text.info.title = 정보
text.error.title = [crimson]오류가 발생했습니다. text.error.title = [crimson]오류가 발생했습니다.
text.error.crashtitle = 오류가 발생했습니다. text.error.crashtitle = 오류가 발생했습니다.
text.blocks.blockinfo = 블록 정보 text.blocks.blockinfo = 블록 정보

4
core/assets/bundles/bundle_ru.properties
View File

@@ -189,8 +189,8 @@ text.changelog.current = [yellow][[Текущая версия]
text.changelog.latest = [orange][[Последняя версия] text.changelog.latest = [orange][[Последняя версия]
text.loading = [accent] Загрузка... text.loading = [accent] Загрузка...
text.saving = [accent]Сохранение.. text.saving = [accent]Сохранение..
text.wave = [orange]Волна {0} text.wave = [accent]Волна {0}
text.wave.waiting = Волна через {0} text.wave.waiting = [LIGHT_GRAY]Волна через {0}
text.waiting = Ожидание... text.waiting = Ожидание...
text.waiting.players = Ожидание игроков ... text.waiting.players = Ожидание игроков ...
text.wave.enemies = [LIGHT_GRAY]{0} противник. остался text.wave.enemies = [LIGHT_GRAY]{0} противник. остался

BIN
core/assets/fonts/pixel.ttf
View File

Binary file not shown.

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

@@ -174,7 +174,7 @@ public class Vars{
customMapDirectory = dataDirectory.child("maps/"); customMapDirectory = dataDirectory.child("maps/");
saveDirectory = dataDirectory.child("saves/"); saveDirectory = dataDirectory.child("saves/");
fontScale = Math.max(Unit.dp.scl(2f), 0.5f); fontScale = Math.max(Unit.dp.scl(1f), 0.5f);
baseCameraScale = Math.round(Unit.dp.scl(4)); baseCameraScale = Math.round(Unit.dp.scl(4));
} }
} }

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

@@ -98,10 +98,9 @@ public class UI extends SceneModule{
void generateFonts(){ void generateFonts(){
generator = new FreeTypeFontGenerator(Gdx.files.internal("fonts/pixel.ttf")); generator = new FreeTypeFontGenerator(Gdx.files.internal("fonts/pixel.ttf"));
FreeTypeFontParameter param = new FreeTypeFontParameter(); FreeTypeFontParameter param = new FreeTypeFontParameter();
param.size = 14; param.size = 14*2;
param.gamma = param.borderGamma = 0f;
param.shadowColor = Color.DARK_GRAY; param.shadowColor = Color.DARK_GRAY;
param.shadowOffsetY = 1; param.shadowOffsetY = 2;
param.incremental = true; param.incremental = true;
skin.add("default-font", generator.generateFont(param)); skin.add("default-font", generator.generateFont(param));

10
core/src/io/anuke/mindustry/maps/missions/WaveMission.java
View File

@@ -48,11 +48,11 @@ public class WaveMission extends Mission{
@Override @Override
public String displayString(){ public String displayString(){
return state.wave > target ? return state.wave > target ?
Bundles.format( Bundles.format(
Vars.unitGroups[Vars.waveTeam.ordinal()].size() > 1 ? Vars.unitGroups[Vars.waveTeam.ordinal()].size() > 1 ?
"text.mission.wave.enemies" : "text.mission.wave.enemies" :
"text.mission.wave.enemy", target, target, Vars.unitGroups[Vars.waveTeam.ordinal()].size()) : "text.mission.wave.enemy", target, target, Vars.unitGroups[Vars.waveTeam.ordinal()].size()) :
Bundles.format("text.mission.wave", state.wave, target, (int)(state.wavetime/60)); Bundles.format("text.mission.wave", state.wave, target, (int)(state.wavetime/60));
} }
@Override @Override