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

Minimap tweaks

Browse Source
This commit is contained in:
Anuken
2019-12-29 18:56:29 -05:00
parent b952ee0725
commit 39db62e3a5
3 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/core/Control.java
View File

@@ -456,7 +456,7 @@ public class Control implements ApplicationListener, Loadable{
state.set(state.is(State.playing) ? State.paused : State.playing); state.set(state.is(State.playing) ? State.paused : State.playing);
} }
if(Core.input.keyTap(Binding.menu) && !ui.restart.isShown()){ if(Core.input.keyTap(Binding.menu) && !ui.restart.isShown() && !ui.minimapfrag.shown()){
if(ui.chatfrag.shown()){ if(ui.chatfrag.shown()){
ui.chatfrag.hide(); ui.chatfrag.hide();
}else if(!ui.paused.isShown() && !scene.hasDialog()){ }else if(!ui.paused.isShown() && !scene.hasDialog()){

8
core/src/mindustry/ui/fragments/MinimapFragment.java
View File

@@ -9,6 +9,7 @@ import arc.scene.*;
import arc.scene.event.*; import arc.scene.event.*;
import arc.scene.ui.layout.*; import arc.scene.ui.layout.*;
import mindustry.gen.*; import mindustry.gen.*;
import mindustry.input.*;
import mindustry.ui.*; import mindustry.ui.*;
import static mindustry.Vars.*; import static mindustry.Vars.*;
@@ -46,7 +47,7 @@ public class MinimapFragment extends Fragment{
elem.setFillParent(true); elem.setFillParent(true);
elem.setBounds(0, 0, Core.graphics.getWidth(), Core.graphics.getHeight()); elem.setBounds(0, 0, Core.graphics.getWidth(), Core.graphics.getHeight());
if(Core.input.keyTap(KeyCode.ESCAPE) || Core.input.keyTap(KeyCode.BACK)){ if(Core.input.keyTap(Binding.menu)){
shown = false; shown = false;
} }
}); });
@@ -98,10 +99,7 @@ public class MinimapFragment extends Fragment{
t.row(); t.row();
t.add().growY(); t.add().growY();
t.row(); t.row();
t.addImageTextButton("$back", Icon.backSmall, () -> shown = false).size(220f, 60f).pad(10f);
if(mobile){
t.addImageTextButton("$back", Icon.backSmall, () -> shown = false).size(220f, 60f).pad(12f);
}
}); });
} }

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.0-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists