diff --git a/core/assets/ui/square.fnt b/core/assets/ui/square.fnt index 6749561308..85e2b5833c 100644 --- a/core/assets/ui/square.fnt +++ b/core/assets/ui/square.fnt @@ -1,7 +1,7 @@ info face="5squared pixel Regular" size=32 bold=0 italic=0 charset="" unicode=0 stretchH=100 smooth=1 aa=1 padding=1,1,1,1 spacing=-2,-2 common lineHeight=44 base=36 scaleW=512 scaleH=512 pages=1 packed=0 page id=0 file="square.png" -chars count=296 +chars count=297 char id=0 x=238 y=72 width=22 height=22 xoffset=-1 yoffset=15 xadvance=16 page=0 chnl=0 char id=32 x=0 y=0 width=0 height=0 xoffset=-1 yoffset=35 xadvance=8 page=0 chnl=0 char id=33 x=498 y=38 width=6 height=22 xoffset=-1 yoffset=15 xadvance=8 page=0 chnl=0 @@ -298,4 +298,5 @@ char id=1102 x=146 y=233 width=20 height=20 xoffset=0 yoffset=16 char id=1070 x=146 y=233 width=20 height=20 xoffset=0 yoffset=16 xadvance=24 page=0 chnl=0 char id=1103 x=178 y=233 width=16 height=20 xoffset=0 yoffset=16 xadvance=20 page=0 chnl=0 char id=1071 x=178 y=233 width=16 height=20 xoffset=0 yoffset=16 xadvance=20 page=0 chnl=0 +char id=95 x=343 y=153 width=16 height=4 xoffset=0 yoffset=36 xadvance=20 page=0 chnl=0 kernings count=0 diff --git a/core/assets/ui/square.png b/core/assets/ui/square.png index 8ccb05eac7..5d78425193 100644 Binary files a/core/assets/ui/square.png and b/core/assets/ui/square.png differ diff --git a/core/src/io/anuke/mindustry/input/DesktopInput.java b/core/src/io/anuke/mindustry/input/DesktopInput.java index fcba93111f..493f4c49de 100644 --- a/core/src/io/anuke/mindustry/input/DesktopInput.java +++ b/core/src/io/anuke/mindustry/input/DesktopInput.java @@ -27,7 +27,7 @@ public class DesktopInput extends InputHandler{ @Override public float getCursorX(){ return (int)(Graphics.screen(mousex, mousey).x + 2); } @Override public float getCursorY(){ return (int)(Gdx.graphics.getHeight() - 1 - Graphics.screen(mousex, mousey).y); } @Override public boolean drawPlace(){ return !beganBreak; } - + @Override public void update(){ if(player.isDead()) return; diff --git a/core/src/io/anuke/mindustry/ui/FileChooser.java b/core/src/io/anuke/mindustry/ui/FileChooser.java index f968c7d89b..76a5ec0570 100644 --- a/core/src/io/anuke/mindustry/ui/FileChooser.java +++ b/core/src/io/anuke/mindustry/ui/FileChooser.java @@ -132,9 +132,6 @@ public class FileChooser extends FloatingDialog{ content.top().left(); content.add(icontable).expandX().fillX(); content.row(); - - //content.add(navigation).colspan(3).left().marginBottom(10f).expandX().fillX().height(40f); - //content.row(); content.center().add(pane).width(Gdx.graphics.getWidth()/Unit.dp.scl(2)).colspan(3).grow(); content.row(); @@ -147,7 +144,6 @@ public class FileChooser extends FloatingDialog{ content.add(buttons).growX(); content().add(content); - //content().add(icontable).expandY().top(); } private void updateFileFieldStatus(){