Merge branch 'master' of https://github.com/Anuken/Mindustry into 4.0

# Conflicts:
#	core/assets/sprites/sprites.atlas
#	core/assets/version.properties
This commit is contained in:
Anuken
2018-03-09 20:58:21 -05:00
15 changed files with 2205 additions and 2237 deletions

View File

@@ -157,7 +157,8 @@ public class DesktopInput extends InputHandler{
}
boolean select(){
return !Inputs.keyDown("select") && !Inputs.keyRelease("select");
return !Inputs.keyDown("select") && !Inputs.keyRelease("select") &&
!Inputs.keyDown("break") && !Inputs.keyRelease("break");
}
public int tilex(){