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

Bugfixes for 3.3 beta

Browse Source
This commit is contained in:
Anuken
2018-01-10 10:28:43 -05:00
parent 0e14833b76
commit d6532c26bb
8 changed files with 31 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/src/io/anuke/mindustry/ui/dialogs/FileChooser.java
View File

@@ -8,6 +8,7 @@ import com.badlogic.gdx.utils.Array;
import com.badlogic.gdx.utils.Pools;
import io.anuke.mindustry.Mindustry;
import io.anuke.ucore.core.Core;
import io.anuke.ucore.core.Timers;
import io.anuke.ucore.function.Consumer;
import io.anuke.ucore.function.Predicate;
import io.anuke.ucore.scene.event.Touchable;
@@ -38,9 +39,6 @@ public class FileChooser extends FloatingDialog {
this.open = open;
this.filter = filter;
this.selectListener = result;
setupWidgets();
Mindustry.platforms.requestWritePerms();
}
private void setupWidgets(){
@@ -253,8 +251,13 @@ public class FileChooser extends FloatingDialog {
@Override
public Dialog show(){
super.show();
Core.scene.setScrollFocus(pane);
Mindustry.platforms.requestWritePerms();
Timers.runTask(2f, () -> {
content().clear();
setupWidgets();
super.show();
Core.scene.setScrollFocus(pane);
});
return this;
}

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

@@ -190,7 +190,7 @@ public class ChatFragment extends Table implements Fragment{
if(sender == null){ //no sender, this is a server message?
formattedMessage = message;
}else{
formattedMessage = "[ROYAL]["+sender+"]: [YELLOW]"+message;
formattedMessage = "[CORAL]["+sender+"]: [YELLOW]"+message;
}
}
}

3
core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java
View File

@@ -18,6 +18,7 @@ import io.anuke.ucore.scene.ui.ButtonGroup;
import io.anuke.ucore.scene.ui.ImageButton;
import io.anuke.ucore.scene.ui.Label;
import io.anuke.ucore.scene.ui.layout.Table;
import io.anuke.ucore.scene.ui.layout.Unit;
import io.anuke.ucore.util.Bundles;
import io.anuke.ucore.util.Mathf;
@@ -34,7 +35,7 @@ public class PlacementFragment implements Fragment{
InputHandler input = control.getInput();
float s = 50f;
float translation = 54f;
float translation = Unit.dp.scl(54f);
new table(){{
visible(() -> !GameState.is(State.menu));