mirror of
https://github.com/Anuken/Mindustry.git
synced 2025-02-24 05:28:42 +07:00
Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
bb7da46301
@ -207,6 +207,7 @@ public class HudFragment extends Fragment{
|
|||||||
|
|
||||||
//fps display
|
//fps display
|
||||||
cont.table(info -> {
|
cont.table(info -> {
|
||||||
|
info.touchable(Touchable.disabled);
|
||||||
info.top().left().margin(4).visible(() -> Core.settings.getBool("fps") && shown);
|
info.top().left().margin(4).visible(() -> Core.settings.getBool("fps") && shown);
|
||||||
info.update(() -> info.setTranslation(state.rules.waves || state.isEditor() ? 0f : -Scl.scl(dsize * 4 + 3), 0));
|
info.update(() -> info.setTranslation(state.rules.waves || state.isEditor() ? 0f : -Scl.scl(dsize * 4 + 3), 0));
|
||||||
IntFormat fps = new IntFormat("fps");
|
IntFormat fps = new IntFormat("fps");
|
||||||
@ -225,7 +226,8 @@ public class HudFragment extends Fragment{
|
|||||||
t.row();
|
t.row();
|
||||||
//position
|
//position
|
||||||
t.label(() -> player.tileX() + "," + player.tileY())
|
t.label(() -> player.tileX() + "," + player.tileY())
|
||||||
.visible(() -> Core.settings.getBool("position") && !state.rules.tutorial);
|
.visible(() -> Core.settings.getBool("position") && !state.rules.tutorial)
|
||||||
|
.touchable(Touchable.disabled);
|
||||||
t.top().right();
|
t.top().right();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user