mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-21 09:47:14 +07:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken 2018-05-24 11:21:16 -04:00
commit ba0c7907ca
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/io/anuke/mindustry/ui/dialogs/AboutDialog.java
View File

@ -26,6 +26,10 @@ public class AboutDialog extends FloatingDialog {
ScrollPane pane = new ScrollPane(in, "clear");
for(LinkEntry link : Links.getLinks()){
if(ios && link.name.equals("google-play")){ //because Apple doesn't like me mentioning android
continue;
}
Table table = new Table("button");
table.margin(0);
table.table(img -> {

2
ios/robovm.properties
View File

@ -2,5 +2,5 @@ app.version=3.5
app.id=io.anuke.mindustry
app.mainclass=io.anuke.mindustry.IOSLauncher
app.executable=IOSLauncher
app.build=6
app.build=10
app.name=Mindustry

7
ios/src/io/anuke/mindustry/IOSLauncher.java
View File

@ -12,7 +12,6 @@ import io.anuke.mindustry.core.ThreadHandler;
import io.anuke.mindustry.io.SaveIO;
import io.anuke.mindustry.io.Saves.SaveSlot;
import io.anuke.mindustry.net.Net;
import io.anuke.ucore.core.Timers;
import io.anuke.ucore.scene.ui.TextField;
import io.anuke.ucore.scene.ui.layout.Unit;
import io.anuke.ucore.util.Bundles;
@ -116,10 +115,10 @@ public class IOSLauncher extends IOSApplication.Delegate {
}
void openURL(NSURL url){
FileHandle file = Gdx.files.absolute(getDocumentsDirectory()).child(url.getLastPathComponent());
Gdx.files.absolute(url.getPath()).copyTo(file);
Timers.runTask(30f, () -> {
Gdx.app.postRunnable(() -> {
FileHandle file = Gdx.files.absolute(getDocumentsDirectory()).child(url.getLastPathComponent());
Gdx.files.absolute(url.getPath()).copyTo(file);
if(file.extension().equalsIgnoreCase("mins")){ //open save