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

Merge

Browse Source
This commit is contained in:
Anuken
2020-02-19 13:10:25 -05:00
parent 71f1fb5d66 e8ca5fe211
commit 1d1c73fd6f
15 changed files with 189 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
core/src/mindustry/ui/dialogs/SchematicsDialog.java
View File

@@ -1,7 +1,7 @@
package mindustry.ui.dialogs;
import arc.*;
import arc.struct.*;
import arc.files.*;
import arc.graphics.*;
import arc.graphics.Texture.*;
import arc.graphics.g2d.*;
@@ -10,6 +10,7 @@ import arc.scene.ui.*;
import arc.scene.ui.ImageButton.*;
import arc.scene.ui.TextButton.*;
import arc.scene.ui.layout.*;
import arc.struct.*;
import arc.util.*;
import mindustry.core.GameState.*;
import mindustry.game.*;
@@ -214,14 +215,27 @@ public class SchematicsDialog extends FloatingDialog{
Core.app.setClipboardText(schematics.writeBase64(s));
}).marginLeft(12f);
t.row();
t.addImageTextButton("$schematic.exportfile", Icon.export, style, () -> platform.showFileChooser(false, schematicExtension, file -> {
dialog.hide();
try{
Schematics.write(s, file);
}catch(Exception e){
ui.showException(e);
t.addImageTextButton("$schematic.exportfile", Icon.export, style, () -> {
if(!ios){
platform.showFileChooser(false, schematicExtension, file -> {
dialog.hide();
try{
Schematics.write(s, file);
}catch(Throwable e){
ui.showException(e);
}
});
}else{
dialog.hide();
try{
Fi file = Core.files.local(s.name() + "." + schematicExtension);
Schematics.write(s, file);
platform.shareFile(file);
}catch(Throwable e){
ui.showException(e);
}
}
})).marginLeft(12f);
}).marginLeft(12f);
});
});

7
core/src/mindustry/ui/dialogs/SettingsMenuDialog.java
View File

@@ -330,7 +330,12 @@ public class SettingsMenuDialog extends SettingsDialog{
if(Shaders.shield != null){
graphics.checkPref("animatedshields", !mobile);
}
graphics.checkPref("bloom", !mobile, val -> renderer.toggleBloom(val));
if(!ios){
graphics.checkPref("bloom", !mobile, val -> renderer.toggleBloom(val));
}else{
Core.settings.put("bloom", false);
}
graphics.checkPref("pixelate", false, val -> {
if(val){
Events.fire(Trigger.enablePixelation);