diff --git a/android/build.gradle b/android/build.gradle index 9fea3223d4..e7790fb299 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -37,7 +37,7 @@ dependencies { 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_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-v7a" natives "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-arm64-v8a" diff --git a/core/assets-raw/fonts/chinese/wqy-microhei.ttc b/core/assets-raw/fonts/chinese/wqy-microhei.ttc new file mode 100644 index 0000000000..2c9bc2d4e0 Binary files /dev/null and b/core/assets-raw/fonts/chinese/wqy-microhei.ttc differ diff --git a/core/assets-raw/fonts/cyrillic/Exo2-Regular.ttf b/core/assets-raw/fonts/cyrillic/Exo2-Regular.ttf new file mode 100644 index 0000000000..8e09f6fb43 Binary files /dev/null and b/core/assets-raw/fonts/cyrillic/Exo2-Regular.ttf differ diff --git a/core/assets-raw/fonts/korean/Sunflower-Medium.ttf b/core/assets-raw/fonts/korean/Sunflower-Medium.ttf new file mode 100644 index 0000000000..ad37058a5c Binary files /dev/null and b/core/assets-raw/fonts/korean/Sunflower-Medium.ttf differ diff --git a/core/assets-raw/fonts/pixel_UNEDITED.ttf b/core/assets-raw/fonts/pixel_UNEDITED.ttf new file mode 100644 index 0000000000..3be17ee696 Binary files /dev/null and b/core/assets-raw/fonts/pixel_UNEDITED.ttf differ diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index c88531311c..b4309f4ed7 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -189,7 +189,7 @@ text.changelog.current = [yellow][[Current version] text.changelog.latest = [orange][[Latest version] text.loading = [accent]Loading... text.saving = [accent]Saving... -text.wave = [orange]Wave {0} +text.wave = [accent]Wave {0} text.wave.waiting = [LIGHT_GRAY]Wave in {0} text.waiting = [LIGHT_GRAY]Waiting... text.waiting.players = Waiting for players... diff --git a/core/assets/bundles/bundle_ko.properties b/core/assets/bundles/bundle_ko.properties index 6e21b7a938..d10af67cd1 100644 --- a/core/assets/bundles/bundle_ko.properties +++ b/core/assets/bundles/bundle_ko.properties @@ -285,7 +285,7 @@ text.settings.clearall = 모두 초기화 text.paused = 일시 정지 text.yes = 예 text.no = 아니오 -text.info.title = [accent]정보 +text.info.title = 정보 text.error.title = [crimson]오류가 발생했습니다. text.error.crashtitle = 오류가 발생했습니다. text.blocks.blockinfo = 블록 정보 diff --git a/core/assets/bundles/bundle_ru.properties b/core/assets/bundles/bundle_ru.properties index 98b944445e..4db5ee314d 100644 --- a/core/assets/bundles/bundle_ru.properties +++ b/core/assets/bundles/bundle_ru.properties @@ -189,8 +189,8 @@ text.changelog.current = [yellow][[Текущая версия] text.changelog.latest = [orange][[Последняя версия] text.loading = [accent] Загрузка... text.saving = [accent]Сохранение.. -text.wave = [orange]Волна {0} -text.wave.waiting = Волна через {0} +text.wave = [accent]Волна {0} +text.wave.waiting = [LIGHT_GRAY]Волна через {0} text.waiting = Ожидание... text.waiting.players = Ожидание игроков ... text.wave.enemies = [LIGHT_GRAY]{0} противник. остался diff --git a/core/assets/fonts/pixel.ttf b/core/assets/fonts/pixel.ttf index 3be17ee696..137848310c 100644 Binary files a/core/assets/fonts/pixel.ttf and b/core/assets/fonts/pixel.ttf differ diff --git a/core/src/io/anuke/mindustry/Vars.java b/core/src/io/anuke/mindustry/Vars.java index 7efa15e16a..74e3228458 100644 --- a/core/src/io/anuke/mindustry/Vars.java +++ b/core/src/io/anuke/mindustry/Vars.java @@ -174,7 +174,7 @@ public class Vars{ customMapDirectory = dataDirectory.child("maps/"); 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)); } } diff --git a/core/src/io/anuke/mindustry/core/UI.java b/core/src/io/anuke/mindustry/core/UI.java index 3ea76879e6..d8f3d83ae5 100644 --- a/core/src/io/anuke/mindustry/core/UI.java +++ b/core/src/io/anuke/mindustry/core/UI.java @@ -98,10 +98,9 @@ public class UI extends SceneModule{ void generateFonts(){ generator = new FreeTypeFontGenerator(Gdx.files.internal("fonts/pixel.ttf")); FreeTypeFontParameter param = new FreeTypeFontParameter(); - param.size = 14; - param.gamma = param.borderGamma = 0f; + param.size = 14*2; param.shadowColor = Color.DARK_GRAY; - param.shadowOffsetY = 1; + param.shadowOffsetY = 2; param.incremental = true; skin.add("default-font", generator.generateFont(param)); diff --git a/core/src/io/anuke/mindustry/maps/missions/WaveMission.java b/core/src/io/anuke/mindustry/maps/missions/WaveMission.java index a23e822994..7a002d85b7 100644 --- a/core/src/io/anuke/mindustry/maps/missions/WaveMission.java +++ b/core/src/io/anuke/mindustry/maps/missions/WaveMission.java @@ -48,11 +48,11 @@ public class WaveMission extends Mission{ @Override public String displayString(){ return state.wave > target ? - Bundles.format( - Vars.unitGroups[Vars.waveTeam.ordinal()].size() > 1 ? - "text.mission.wave.enemies" : - "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( + Vars.unitGroups[Vars.waveTeam.ordinal()].size() > 1 ? + "text.mission.wave.enemies" : + "text.mission.wave.enemy", target, target, Vars.unitGroups[Vars.waveTeam.ordinal()].size()) : + Bundles.format("text.mission.wave", state.wave, target, (int)(state.wavetime/60)); } @Override