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

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	core/src/mindustry/ui/dialogs/PausedDialog.java
This commit is contained in:
Anuken
2020-10-11 10:51:46 -04:00
parent 3d99e38f10 cc051dd787
commit e11a8565d0
9 changed files with 85 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/mindustry/ui/dialogs/PausedDialog.java
View File

@@ -45,8 +45,8 @@ public class PausedDialog extends BaseDialog{
float dw = 220f;
cont.defaults().width(dw).height(55).pad(5f);
cont.button("@back", Icon.left, this::hide);
cont.button("@settings", Icon.settings, ui.settings::show);
cont.button("@back", Icon.left, this::hide).name("back");
cont.button("@settings", Icon.settings, ui.settings::show).name("settings");
if(!state.rules.tutorial){
if(!state.isCampaign() && !state.isEditor()){