Add Discord link and fix more placement bugs
This commit is contained in:
@@ -123,7 +123,7 @@ public class BlocksFragment implements Fragment{
|
||||
|
||||
row();
|
||||
add(stack).colspan(Section.values().length);
|
||||
get().pad(10f);
|
||||
margin(10f);
|
||||
|
||||
get().padLeft(0f);
|
||||
get().padRight(0f);
|
||||
|
||||
@@ -169,7 +169,7 @@ public class HudFragment implements Fragment{
|
||||
(control.getTutorial().active() || Vars.control.getMode() == GameMode.sandbox) ? "waiting..." : "Wave in " + (int) (control.getWaveCountdown() / 60f))
|
||||
.minWidth(140).units(Unit.dp).left();
|
||||
|
||||
get().pad(Unit.dp.inPixels(12));
|
||||
margin(12f);
|
||||
get().padLeft(6);
|
||||
}}.left().end();
|
||||
|
||||
@@ -206,7 +206,7 @@ public class HudFragment implements Fragment{
|
||||
for(int i = 0; i < control.getItems().length; i ++){
|
||||
int amount = control.getItems()[i];
|
||||
if(amount == 0) continue;
|
||||
String formatted = Mindustry.formatter.format(amount);
|
||||
String formatted = Mindustry.platforms.format(amount);
|
||||
if(amount > 99999999){
|
||||
formatted = "inf";
|
||||
}
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
package io.anuke.mindustry.ui.fragments;
|
||||
|
||||
import static io.anuke.mindustry.Vars.*;
|
||||
|
||||
import com.badlogic.gdx.Gdx;
|
||||
|
||||
import io.anuke.mindustry.Mindustry;
|
||||
@@ -14,6 +12,11 @@ import io.anuke.ucore.scene.builders.imagebutton;
|
||||
import io.anuke.ucore.scene.builders.table;
|
||||
import io.anuke.ucore.scene.ui.layout.Unit;
|
||||
|
||||
import static io.anuke.mindustry.Vars.android;
|
||||
import static io.anuke.mindustry.Vars.control;
|
||||
import static io.anuke.mindustry.Vars.gwt;
|
||||
import static io.anuke.mindustry.Vars.ui;
|
||||
|
||||
public class MenuFragment implements Fragment{
|
||||
|
||||
public void build(){
|
||||
@@ -77,9 +80,14 @@ public class MenuFragment implements Fragment{
|
||||
//settings icon
|
||||
new table(){{
|
||||
atop().aright();
|
||||
if(Mindustry.hasDiscord){
|
||||
new imagebutton("icon-discord", Unit.dp.inPixels(30f), ()->{
|
||||
ui.showDiscord();
|
||||
}).margin(14);
|
||||
}
|
||||
new imagebutton("icon-info", Unit.dp.inPixels(30f), ()->{
|
||||
ui.showAbout();
|
||||
}).get().pad(Unit.dp.inPixels(14));
|
||||
}).margin(14);
|
||||
}}.end().visible(()->GameState.is(State.menu));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -46,7 +46,7 @@ public class PlacementFragment implements Fragment{
|
||||
row();
|
||||
|
||||
new table("pane"){{
|
||||
get().pad(5);
|
||||
margin(5f);
|
||||
aleft();
|
||||
ButtonGroup<ImageButton> group = new ButtonGroup<>();
|
||||
|
||||
@@ -94,7 +94,7 @@ public class PlacementFragment implements Fragment{
|
||||
row();
|
||||
|
||||
new table("pane"){{
|
||||
get().pad(5);
|
||||
margin(5f);
|
||||
touchable(Touchable.enabled);
|
||||
aleft();
|
||||
ButtonGroup<ImageButton> group = new ButtonGroup<>();
|
||||
|
||||
Reference in New Issue
Block a user