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

Crash fixes

Browse Source
This commit is contained in:
Anuken
2018-11-28 08:53:03 -05:00
parent cc90e6d479
commit f2be23274e
11 changed files with 30 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/io/anuke/mindustry/ui/dialogs/PausedDialog.java
View File

@@ -3,6 +3,7 @@ package io.anuke.mindustry.ui.dialogs;
import com.badlogic.gdx.Input.Keys;
import io.anuke.mindustry.core.GameState.State;
import io.anuke.mindustry.net.Net;
import io.anuke.ucore.scene.style.Drawable;
import io.anuke.ucore.scene.ui.layout.Table;
import io.anuke.ucore.util.Bundles;
@@ -29,8 +30,9 @@ public class PausedDialog extends FloatingDialog{
void rebuild(){
missionTable.clear();
missionTable.background("underline");
missionTable.background((Drawable) null);
if(world.getSector() != null){
missionTable.background("underline");
missionTable.add(Bundles.format("text.sector", world.getSector().x + ", " + world.getSector().y));
}
}
@@ -49,7 +51,7 @@ public class PausedDialog extends FloatingDialog{
float dw = 210f;
content().defaults().width(dw).height(50).pad(5f);
content().addButton("$text.back", this::hide).colspan(2).width(dw*2 + 10f);
content().addButton("$text.back", this::hide).colspan(2).width(dw*2 + 20f);
content().row();
content().addButton("$text.unlocks", ui.unlocks::show);
@@ -61,7 +63,7 @@ public class PausedDialog extends FloatingDialog{
content().row();
content().addButton("$text.hostserver", ui.host::show).disabled(b -> Net.active()).colspan(2).width(dw*2 + 10f);
content().addButton("$text.hostserver", ui.host::show).disabled(b -> Net.active()).colspan(2).width(dw*2 + 20f);
content().row();

2
core/src/io/anuke/mindustry/ui/fragments/HudFragment.java
View File

@@ -193,7 +193,7 @@ public class HudFragment extends Fragment{
return coreAttackOpacity > 0;
});
t.table("clear", top -> top.add("$text.coreattack").pad(6)
t.table("button", top -> top.add("$text.coreattack").pad(2)
.update(label -> label.setColor(Hue.mix(Color.ORANGE, Color.SCARLET, Mathf.absin(Timers.time(), 2f, 1f)))));
});