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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Epowerj
2022-11-01 01:53:26 -04:00
parent f6d344e5a5 68bde6f900
commit f9cc84aeb1
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/mindustry/content/UnitTypes.java
+1
View File
@@ -4285,6 +4285,7 @@ public class UnitTypes{
engineOffset = 6.5f; engineOffset = 6.5f;
payloadCapacity = 0f; payloadCapacity = 0f;
targetable = false; targetable = false;
bounded = false;
outlineColor = Pal.darkOutline; outlineColor = Pal.darkOutline;
isEnemy = false; isEnemy = false;
core/src/mindustry/core/Control.java
+2
View File
@@ -651,9 +651,11 @@ public class Control implements ApplicationListener, Loadable{
ui.chatfrag.hide(); ui.chatfrag.hide();
}else if(!ui.paused.isShown() && !scene.hasDialog()){ }else if(!ui.paused.isShown() && !scene.hasDialog()){
ui.paused.show(); ui.paused.show();
if(!net.active()){
state.set(State.paused); state.set(State.paused);
} }
} }
}
if(!mobile && Core.input.keyTap(Binding.screenshot) && !scene.hasField() && !scene.hasKeyboard()){ if(!mobile && Core.input.keyTap(Binding.screenshot) && !scene.hasField() && !scene.hasKeyboard()){
renderer.takeMapScreenshot(); renderer.takeMapScreenshot();
core/src/mindustry/ui/fragments/HudFragment.java
+1 -1
View File
@@ -99,7 +99,7 @@ public class HudFragment{
//"waiting for players" //"waiting for players"
parent.fill(t -> { parent.fill(t -> {
t.name = "waiting"; t.name = "waiting";
t.visible(() -> netServer.isWaitingForPlayers()).touchable = Touchable.disabled; t.visible(() -> netServer.isWaitingForPlayers() && state.isPaused() && shown).touchable = Touchable.disabled;
t.table(Styles.black6, top -> top.add("@waiting.players").style(Styles.outlineLabel).pad(18f)); t.table(Styles.black6, top -> top.add("@waiting.players").style(Styles.outlineLabel).pad(18f));
}); });