diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml index e322c6df18..8cae20eee7 100644 --- a/android/AndroidManifest.xml +++ b/android/AndroidManifest.xml @@ -24,6 +24,7 @@ android:name="mindustry.android.AndroidLauncher" android:label="@string/app_name" android:screenOrientation="user" + android:exported="true" android:configChanges="keyboard|keyboardHidden|orientation|screenSize|screenLayout"> diff --git a/android/build.gradle b/android/build.gradle index 5792f9a7de..54a8cb250e 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -7,7 +7,7 @@ buildscript{ } dependencies{ - classpath 'com.android.tools.build:gradle:7.0.3' + classpath 'com.android.tools.build:gradle:7.2.1' } } @@ -29,8 +29,8 @@ task deploy(type: Copy){ } android{ - buildToolsVersion '30.0.3' - compileSdkVersion 30 + buildToolsVersion '31.0.0' + compileSdkVersion 31 sourceSets{ main{ manifest.srcFile 'AndroidManifest.xml' @@ -56,7 +56,7 @@ android{ applicationId "io.anuke.mindustry" minSdkVersion 14 - targetSdkVersion 30 + targetSdkVersion 31 versionName versionNameResult versionCode = vcode diff --git a/build.gradle b/build.gradle index 755f62b572..3bfc84ed1e 100644 --- a/build.gradle +++ b/build.gradle @@ -16,7 +16,6 @@ buildscript{ } dependencies{ - classpath "com.mobidevelop.robovm:robovm-gradle-plugin:2.3.15" classpath "com.github.Anuken.Arc:packer:$arcHash" classpath "com.github.Anuken.Arc:arc-core:$arcHash" } @@ -255,42 +254,6 @@ project(":desktop"){ } } -project(":ios"){ - apply plugin: "java" - apply plugin: "robovm" - - task incrementConfig{ - def vfile = file('robovm.properties') - def bversion = getBuildVersion() - def props = new Properties() - if(vfile.exists()){ - props.load(new FileInputStream(vfile)) - }else{ - props['app.id'] = 'io.anuke.mindustry' - props['app.version'] = '7.0' - props['app.mainclass'] = 'mindustry.IOSLauncher' - props['app.executable'] = 'IOSLauncher' - props['app.name'] = 'Mindustry' - } - - props['app.build'] = (!props.containsKey("app.build") ? 40 : props['app.build'].toInteger() + 1) + "" - if(bversion != "custom build"){ - props['app.version'] = versionNumber + "." + bversion + (bversion.contains(".") ? "" : ".0") - } - props.store(vfile.newWriter(), null) - } - - dependencies{ - implementation project(":core") - - implementation arcModule("natives:natives-ios") - implementation arcModule("natives:natives-freetype-ios") - implementation arcModule("backends:backend-robovm") - - compileOnly project(":annotations") - } -} - project(":core"){ apply plugin: "java-library" apply plugin: "kotlin" diff --git a/core/src/mindustry/game/Rules.java b/core/src/mindustry/game/Rules.java index ef86b676bc..d78cceab71 100644 --- a/core/src/mindustry/game/Rules.java +++ b/core/src/mindustry/game/Rules.java @@ -124,7 +124,7 @@ public class Rules{ public Seq objectives = new Seq<>(); /** Flags set by objectives. Used in world processors. n*/ public ObjectSet objectiveFlags = new ObjectSet<>(); - /** HIGHLY UNSTABLE/EXPERIMENTAL. DO NOT USE THIS. */ + /** If true, fog of war is enabled. Enemy units and buildings are hidden unless in radar view. */ public boolean fog = false; /** If fog = true, this is whether static (black) fog is enabled. */ public boolean staticFog = true; diff --git a/ios/build.gradle b/ios/build.gradle index f6365cc5ca..4926f55140 100644 --- a/ios/build.gradle +++ b/ios/build.gradle @@ -1,3 +1,47 @@ +buildscript{ + repositories{ + mavenCentral() + } + + dependencies{ + classpath "com.mobidevelop.robovm:robovm-gradle-plugin:2.3.15" + } +} + +apply plugin: "java" +apply plugin: "robovm" + +task incrementConfig{ + def vfile = file('robovm.properties') + def bversion = getBuildVersion() + def props = new Properties() + if(vfile.exists()){ + props.load(new FileInputStream(vfile)) + }else{ + props['app.id'] = 'io.anuke.mindustry' + props['app.version'] = '7.0' + props['app.mainclass'] = 'mindustry.IOSLauncher' + props['app.executable'] = 'IOSLauncher' + props['app.name'] = 'Mindustry' + } + + props['app.build'] = (!props.containsKey("app.build") ? 40 : props['app.build'].toInteger() + 1) + "" + if(bversion != "custom build"){ + props['app.version'] = versionNumber + "." + bversion + (bversion.contains(".") ? "" : ".0") + } + props.store(vfile.newWriter(), null) +} + +dependencies{ + implementation project(":core") + + implementation arcModule("natives:natives-ios") + implementation arcModule("natives:natives-freetype-ios") + implementation arcModule("backends:backend-robovm") + + compileOnly project(":annotations") +} + sourceSets.main.java.srcDirs = ["src/"] ext{