diff --git a/build.gradle b/build.gradle index c94a79598a..357c3f3513 100644 --- a/build.gradle +++ b/build.gradle @@ -17,7 +17,7 @@ buildscript{ } dependencies{ - classpath 'com.mobidevelop.robovm:robovm-gradle-plugin:2.3.8' + classpath 'com.mobidevelop.robovm:robovm-gradle-plugin:2.3.11' classpath "com.github.anuken:packr:-SNAPSHOT" classpath "com.github.Anuken.Arc:packer:$arcHash" classpath "com.github.Anuken.Arc:arc-core:$arcHash" diff --git a/core/src/mindustry/editor/WaveGraph.java b/core/src/mindustry/editor/WaveGraph.java index 2436c62c2a..e908e7d934 100644 --- a/core/src/mindustry/editor/WaveGraph.java +++ b/core/src/mindustry/editor/WaveGraph.java @@ -81,7 +81,7 @@ public class WaveGraph extends Table{ for(int i = 0; i < values.length; i++){ float sum = 0; for(UnitType type : used.orderedItems()){ - sum += type.health * values[i][type.id]; + sum += (type.health) * values[i][type.id]; } float cx = graphX + i*spacing, cy = 2f + graphY + sum * (graphH - 4f) / maxHealth; @@ -160,7 +160,7 @@ public class WaveGraph extends Table{ used.add(spawn.type); } max = Math.max(max, values[index][spawn.type.id]); - healthsum += spawned * spawn.type.health; + healthsum += spawned * (spawn.type.health); sum += spawned; } maxTotal = Math.max(maxTotal, sum); diff --git a/ios/Info.plist.xml b/ios/Info.plist.xml index b93d1da2a7..7fbb619038 100644 --- a/ios/Info.plist.xml +++ b/ios/Info.plist.xml @@ -20,6 +20,8 @@ APPL CFBundleShortVersionString ${app.version} + UILaunchStoryboardName + LaunchScreen CFBundleIconName AppIcon CFBundleSignature @@ -53,6 +55,7 @@ UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown CFBundleDocumentTypes diff --git a/ios/data/Base.lproj/LaunchScreen.storyboard b/ios/data/Base.lproj/LaunchScreen.storyboard new file mode 100644 index 0000000000..be411aedcb --- /dev/null +++ b/ios/data/Base.lproj/LaunchScreen.storyboard @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file