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 18:43:35 -05:00
parent 75d2ea1519
commit f3d35e9537
5 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/io/anuke/mindustry/editor/MapLoadDialog.java
View File

@@ -4,11 +4,9 @@ import com.badlogic.gdx.utils.Scaling;
import io.anuke.mindustry.maps.Map; import io.anuke.mindustry.maps.Map;
import io.anuke.mindustry.ui.BorderImage; import io.anuke.mindustry.ui.BorderImage;
import io.anuke.mindustry.ui.dialogs.FloatingDialog; import io.anuke.mindustry.ui.dialogs.FloatingDialog;
import io.anuke.ucore.core.Core;
import io.anuke.ucore.function.Consumer; import io.anuke.ucore.function.Consumer;
import io.anuke.ucore.scene.ui.ButtonGroup; import io.anuke.ucore.scene.ui.ButtonGroup;
import io.anuke.ucore.scene.ui.ScrollPane; import io.anuke.ucore.scene.ui.ScrollPane;
import io.anuke.ucore.scene.ui.ScrollPane.ScrollPaneStyle;
import io.anuke.ucore.scene.ui.TextButton; import io.anuke.ucore.scene.ui.TextButton;
import io.anuke.ucore.scene.ui.layout.Table; import io.anuke.ucore.scene.ui.layout.Table;
@@ -69,7 +67,6 @@ public class MapLoadDialog extends FloatingDialog{
} }
if(world.maps.all().size == 0){ if(world.maps.all().size == 0){
pane.setStyle(Core.skin.get("clear", ScrollPaneStyle.class));
table.add("$text.maps.none").center(); table.add("$text.maps.none").center();
}else{ }else{
content().add("$text.editor.loadmap"); content().add("$text.editor.loadmap");

2
core/src/io/anuke/mindustry/ui/dialogs/AboutDialog.java
View File

@@ -108,7 +108,7 @@ public class AboutDialog extends FloatingDialog{
dialog.content().row(); dialog.content().row();
dialog.content().add("$text.contributors"); dialog.content().add("$text.contributors");
dialog.content().row(); dialog.content().row();
dialog.content().pane("clear", new Table(){{ dialog.content().pane(new Table(){{
int i = 0; int i = 0;
left(); left();
for(Contributor c : contributors){ for(Contributor c : contributors){

2
core/src/io/anuke/mindustry/ui/dialogs/MapsDialog.java
View File

@@ -116,7 +116,7 @@ public class MapsDialog extends FloatingDialog{
table.stack(new Image(map.texture).setScaling(Scaling.fit), new BorderImage(map.texture).setScaling(Scaling.fit)).size(mapsize); table.stack(new Image(map.texture).setScaling(Scaling.fit), new BorderImage(map.texture).setScaling(Scaling.fit)).size(mapsize);
table.table("clear", desc -> { table.table("flat", desc -> {
desc.top(); desc.top();
Table t = new Table(); Table t = new Table();
t.margin(6); t.margin(6);

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

@@ -150,7 +150,7 @@ public class HudFragment extends Fragment{
//paused table //paused table
parent.fill(t -> { parent.fill(t -> {
t.top().visible(() -> state.is(State.paused) && !Net.active()); t.top().visible(() -> state.is(State.paused) && !Net.active());
t.table("clear", top -> top.add("$text.paused").pad(6).get().setFontScale(1.5f)); t.table("button", top -> top.add("$text.paused").pad(6f));
}); });
parent.fill(t -> { parent.fill(t -> {

2
core/src/io/anuke/mindustry/world/consumers/Consume.java
View File

@@ -33,7 +33,7 @@ public abstract class Consume{
} }
public void build(Table table){ public void build(Table table){
Table t = new Table("clear"); Table t = new Table("flat");
t.margin(4); t.margin(4);
buildTooltip(t); buildTooltip(t);