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

Moved launch button to top right

Browse Source
This commit is contained in:
Anuken
2019-03-23 11:49:48 -04:00
parent ab52c65dcf
commit 7e7f95916b
3 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/io/anuke/mindustry/content/Blocks.java
+1 -1
View File
@@ -338,7 +338,7 @@ public class Blocks implements ContentList{
}}; }};
ignarock = new Floor("ignarock"){{ ignarock = new Floor("ignarock"){{
blendGroup = darksand;
}}; }};
hotrock = new Floor("hotrock"){{ hotrock = new Floor("hotrock"){{
core/src/io/anuke/mindustry/ui/fragments/HudFragment.java
+2 -5
View File
@@ -235,9 +235,8 @@ public class HudFragment extends Fragment{
//launch button //launch button
parent.fill(t -> { parent.fill(t -> {
t.top().visible(() -> !state.is(State.menu)); t.top().right().visible(() -> !state.is(State.menu));
TextButton[] testb = {null}; TextButton[] testb = {null};
TextButton button = Elements.newButton("$launch", () -> { TextButton button = Elements.newButton("$launch", () -> {
FloatingDialog dialog = new FloatingDialog("$launch"); FloatingDialog dialog = new FloatingDialog("$launch");
dialog.update(() -> { dialog.update(() -> {
@@ -282,10 +281,8 @@ public class HudFragment extends Fragment{
}); });
button.setDisabled(() -> state.enemies() > 0); button.setDisabled(() -> state.enemies() > 0);
button.getLabelCell().left().get().setAlignment(Align.left, Align.left); button.getLabelCell().left().get().setAlignment(Align.left, Align.left);
t.add(button).size(250f, 80f);
t.add(button).size(350f, 80f);
}); });
//paused table //paused table
core/src/io/anuke/mindustry/world/Tile.java
+1 -1
View File
@@ -476,7 +476,7 @@ public class Tile implements Position, TargetTrait{
Block block = block(); Block block = block();
Block floor = floor(); Block floor = floor();
return floor.name + ":" + block.name + "[" + x + "," + y + "] " + "entity=" + (entity == null ? "null" : (entity.getClass())) + return floor.name + ":" + block.name + ":" + content.block(ore) + "[" + x + "," + y + "] " + "entity=" + (entity == null ? "null" : (entity.getClass())) +
(link != 0 ? " link=[" + (Pack.leftByte(link) - 8) + ", " + (Pack.rightByte(link) - 8) + "]" : ""); (link != 0 ? " link=[" + (Pack.leftByte(link) - 8) + ", " + (Pack.rightByte(link) - 8) + "]" : "");
} }
} }