mirrors/Mindustry
1
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2026-01-18 15:21:50 -08:00
Code Issues Projects Releases Wiki Activity

Fixed some UI issues

Browse source
This commit is contained in:
Anuken 2018-01-10 15:10:44 -05:00
parent c195b27164
commit 5ce8cfb7e9
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
android/AndroidManifest.xml
View file

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="io.anuke.mindustry"
android:versionCode="49"
android:versionName="3.3b1" >
android:versionCode="50"
android:versionName="3.3b2" >
<uses-permission android:name="com.android.vending.BILLING" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />

2
core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java
View file

@ -109,7 +109,6 @@ public class SettingsMenuDialog extends SettingsDialog{
game.sliderPref("difficulty", 1, 0, 2, i -> Bundles.get("setting.difficulty." + (i == 0 ? "easy" : i == 1 ? "normal" : "hard")));
game.screenshakePref();
game.checkPref("smoothcam", true);
game.checkPref("indicators", true);
game.checkPref("effects", true);
game.sliderPref("sensitivity", 100, 10, 300, i -> i + "%");
game.sliderPref("saveinterval", 90, 10, 5*120, i -> Bundles.format("setting.seconds", i));
@ -117,6 +116,7 @@ public class SettingsMenuDialog extends SettingsDialog{
graphics.checkPref("fps", false);
graphics.checkPref("vsync", true, b -> Gdx.graphics.setVSync(b));
graphics.checkPref("lasers", true);
graphics.checkPref("indicators", true);
graphics.checkPref("healthbars", true);
graphics.checkPref("pixelate", true, b -> {
if(b){

4
desktop/src/io/anuke/mindustry/desktop/DesktopLauncher.java
View file

@ -86,13 +86,13 @@ public class DesktopLauncher {
DiscordRichPresence presence = new DiscordRichPresence();
if(!GameState.is(State.menu)){
presence.state = Strings.capitalize(Vars.control.getMode().toString()) + ", Solo";
presence.state = Strings.capitalize(Vars.control.getMode().name()) + ", Solo";
presence.details = Strings.capitalize(Vars.world.getMap().name) + " | Wave " + Vars.control.getWave();
presence.largeImageText = "Wave " + Vars.control.getWave();
if(Net.active() ){
presence.partyMax = 16;
presence.partySize = Vars.control.playerGroup.amount();
presence.state = Strings.capitalize(Vars.control.getMode().toString());
presence.state = Strings.capitalize(Vars.control.getMode().name());
}
}else{
if(Vars.ui.editor != null && Vars.ui.editor.isShown()){