Merge branch 'continuous-sectors' of https://github.com/Anuken/Mindustry

# Conflicts: # core/assets/bundles/bundle.properties
2018-09-24 22:57:49 -04:00
parent 4ee17a656f af86564adc
commit d5bb1b72b9
62 changed files with 1218 additions and 263 deletions
--- a/core/src/io/anuke/mindustry/input/DesktopInput.java
+++ b/core/src/io/anuke/mindustry/input/DesktopInput.java
@@ -206,6 +206,10 @@ public class DesktopInput extends InputHandler{
            return;
        }

+        if(Inputs.keyTap(section, "deselect")){
+            player.setMineTile(null);
+        }
+
        if(!ui.hasMouse()){
            if(Inputs.keyTap(section, "select")){
                if(isPlacing()){