diff --git a/build.gradle b/build.gradle index e8c8736405..aef6ada66d 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,7 @@ buildscript{ dependencies{ classpath 'com.mobidevelop.robovm:robovm-gradle-plugin:2.3.6' - classpath "com.badlogicgames.gdx:gdx-tools:1.9.9" + classpath "com.badlogicgames.gdx:gdx-tools:1.9.10" classpath "com.badlogicgames.packr:packr:2.1-SNAPSHOT" } } @@ -22,7 +22,7 @@ allprojects{ versionModifier = 'beta' if(!project.hasProperty("versionType")) versionType = 'official' appName = 'Mindustry' - gdxVersion = '1.9.9' + gdxVersion = '1.9.10' roboVMVersion = '2.3.6' arcHash = null diff --git a/core/assets-raw/sprites/ui/icons/icon-check.png b/core/assets-raw/sprites/ui/icons/icon-check.png index 2bdb607f2a..db96907362 100644 Binary files a/core/assets-raw/sprites/ui/icons/icon-check.png and b/core/assets-raw/sprites/ui/icons/icon-check.png differ diff --git a/core/assets/maps/saltcrags.msav b/core/assets/maps/crags.msav similarity index 100% rename from core/assets/maps/saltcrags.msav rename to core/assets/maps/crags.msav diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index 27ccf5b53a..f44786d497 100644 Binary files a/core/assets/sprites/sprites.png and b/core/assets/sprites/sprites.png differ diff --git a/core/assets/sprites/sprites4.png b/core/assets/sprites/sprites4.png index d6cfcd83d1..c393f59e54 100644 Binary files a/core/assets/sprites/sprites4.png and b/core/assets/sprites/sprites4.png differ diff --git a/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java b/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java index f3d47d61e8..a54f6c7039 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java @@ -349,6 +349,6 @@ public class PlacementFragment extends Fragment{ /** Returns the block currently being hovered over in the world. */ Block tileDisplayBlock(){ - return hoverTile == null ? null : hoverTile.block().synthetic() ? hoverTile.block() : hoverTile.overlay().itemDrop != null ? hoverTile.overlay() : null; + return hoverTile == null ? null : hoverTile.block().synthetic() ? hoverTile.block() : hoverTile.drop() != null ? hoverTile.overlay().itemDrop != null ? hoverTile.overlay() : hoverTile.floor() : null; } } \ No newline at end of file diff --git a/ios/src/io/anuke/mindustry/IOSLauncher.java b/ios/src/io/anuke/mindustry/IOSLauncher.java index 1c01b4307d..bc1ed315a5 100644 --- a/ios/src/io/anuke/mindustry/IOSLauncher.java +++ b/ios/src/io/anuke/mindustry/IOSLauncher.java @@ -96,6 +96,7 @@ public class IOSLauncher extends IOSApplication.Delegate{ FileHandle file = Core.files.absolute(getDocumentsDirectory()).child(url.getLastPathComponent()); Core.files.absolute(url.getPath()).copyTo(file); + //TODO detect if it's a map or save if(file.extension().equalsIgnoreCase(saveExtension)){ //open save if(SaveIO.isSaveValid(file)){