diff --git a/build.gradle b/build.gradle index da94f43d1a..84899de744 100644 --- a/build.gradle +++ b/build.gradle @@ -25,7 +25,7 @@ allprojects { appName = 'Mindustry' gdxVersion = '1.9.8' aiVersion = '1.8.1' - uCoreVersion = '36de2b4' + uCoreVersion = '872bce6' getVersionString = { String buildVersion = getBuildVersion() diff --git a/core/assets/cursors/cursor.png b/core/assets/cursors/cursor.png new file mode 100644 index 0000000000..ece5696be0 Binary files /dev/null and b/core/assets/cursors/cursor.png differ diff --git a/core/assets/cursors/hand.png b/core/assets/cursors/hand.png new file mode 100644 index 0000000000..1613b1eac3 Binary files /dev/null and b/core/assets/cursors/hand.png differ diff --git a/core/assets/cursors/ibar.png b/core/assets/cursors/ibar.png new file mode 100644 index 0000000000..61ddc4b423 Binary files /dev/null and b/core/assets/cursors/ibar.png differ diff --git a/core/assets/version.properties b/core/assets/version.properties index 2126758c6b..59622ba94d 100644 --- a/core/assets/version.properties +++ b/core/assets/version.properties @@ -1,7 +1,7 @@ #Autogenerated file. Do not modify. -#Fri Mar 16 00:38:49 EDT 2018 +#Fri Mar 16 12:34:23 EDT 2018 version=release -androidBuildCode=414 +androidBuildCode=421 name=Mindustry code=3.4 build=custom build diff --git a/core/src/io/anuke/mindustry/core/Renderer.java b/core/src/io/anuke/mindustry/core/Renderer.java index 51c95ffcda..1faf54be0a 100644 --- a/core/src/io/anuke/mindustry/core/Renderer.java +++ b/core/src/io/anuke/mindustry/core/Renderer.java @@ -33,6 +33,7 @@ import io.anuke.ucore.function.Callable; import io.anuke.ucore.graphics.*; import io.anuke.ucore.modules.RendererModule; import io.anuke.ucore.scene.ui.layout.Unit; +import io.anuke.ucore.scene.utils.Cursors; import io.anuke.ucore.util.Angles; import io.anuke.ucore.util.Mathf; import io.anuke.ucore.util.Tmp; @@ -68,6 +69,12 @@ public class Renderer extends RendererModule{ } }); + Cursors.cursorScaling = 3; + Cursors.outlineColor = Color.valueOf("444444"); + Cursors.arrow = Cursors.loadCursor("cursor"); + Cursors.hand = Cursors.loadCursor("hand"); + Cursors.ibeam = Cursors.loadCursor("ibar"); + clearColor = Hue.lightness(0.4f); clearColor.a = 1f; @@ -427,7 +434,7 @@ public class Renderer extends RendererModule{ }else if(input.breakMode.delete && control.input().drawPlace() && (input.recipe == null || !state.inventory.hasItems(input.recipe.requirements)) - && (input.placeMode.delete || input.breakMode.both)){ + && (input.placeMode.delete || input.breakMode.both || !android)){ if(input.breakMode == PlaceMode.holdDelete) input.breakMode.draw(tilex, tiley, 0, 0);