Merge remote-tracking branch 'origin/master'

.travis.yml

@@ -1,14 +1,6 @@
-language: android
+
 jdk:
 - openjdk8
-android:
-  components:
-  - android-28
-  - extra-google-google_play_services
-  - extra-google-m2repository
-  - extra-android-m2repository
-  - addon-google_apis-google-28
-  - build-tools-28.0.3
 script:
 - "./gradlew test"
 - "./gradlew desktop:dist"

core/src/io/anuke/mindustry/entities/Player.java

@@ -316,7 +316,7 @@ public class Player extends Unit implements BuilderTrait, CarryTrait, ShooterTra
                 Draw.rect(mech.legRegion,
                         x + Angles.trnsx(baseRotation, ft * i + boostTrnsY, -boostTrnsX * i),
                         y + Angles.trnsy(baseRotation, ft * i + boostTrnsY, -boostTrnsX * i),
-                mech.legRegion.getRegionWidth() * i, mech.legRegion.getRegionHeight() - Mathf.clamp(ft * i, 0, 2), baseRotation - 90 + boostAng * i);
+                        mech.legRegion.getRegionWidth() * i, mech.legRegion.getRegionHeight() - Mathf.clamp(ft * i, 0, 2), baseRotation - 90 + boostAng * i);
             }
 
             Draw.rect(mech.baseRegion, x, y, baseRotation - 90);
@@ -431,16 +431,16 @@ public class Player extends Unit implements BuilderTrait, CarryTrait, ShooterTra
                     float rad = Mathf.absin(Timers.time(), 7f, 1f) + block.size * tilesize / 2f - 1;
 
                     Lines.square(
-                        request.x * tilesize + block.offset(),
+                            request.x * tilesize + block.offset(),
-                        request.y * tilesize + block.offset() - 1,
+                            request.y * tilesize + block.offset() - 1,
-                        rad);
+                            rad);
 
                     Draw.color(Palette.remove);
 
                     Lines.square(
-                        request.x * tilesize + block.offset(),
+                            request.x * tilesize + block.offset(),
-                        request.y * tilesize + block.offset(),
+                            request.y * tilesize + block.offset(),
-                        rad);
+                            rad);
                 }else{
                     //draw place request
                     Lines.stroke(2f);
@@ -450,16 +450,16 @@ public class Player extends Unit implements BuilderTrait, CarryTrait, ShooterTra
                     float rad = Mathf.absin(Timers.time(), 7f, 1f) - 2f + request.recipe.result.size * tilesize / 2f;
 
                     Lines.square(
-                        request.x * tilesize + request.recipe.result.offset(),
+                            request.x * tilesize + request.recipe.result.offset(),
-                        request.y * tilesize + request.recipe.result.offset() - 1,
+                            request.y * tilesize + request.recipe.result.offset() - 1,
-                        rad);
+                            rad);
 
                     Draw.color(Palette.accent);
 
                     Lines.square(
-                        request.x * tilesize + request.recipe.result.offset(),
+                            request.x * tilesize + request.recipe.result.offset(),
-                        request.y * tilesize + request.recipe.result.offset(),
+                            request.y * tilesize + request.recipe.result.offset(),
-                        rad);
+                            rad);
                 }
             }
 
@@ -714,11 +714,13 @@ public class Player extends Unit implements BuilderTrait, CarryTrait, ShooterTra
 
             //autofire: mobile only!
             if(mobile){
-
                 if(target == null){
                     isShooting = false;
                     if(Settings.getBool("autotarget")){
                         target = Units.getClosestTarget(team, x, y, getWeapon().getAmmo().getRange());
+                        if(target != null){
+                            setMineTile(null);
+                        }
                     }
                 }else if(target.isValid()){
                     //rotate toward and shoot the target

core/src/io/anuke/mindustry/input/MobileInput.java

@@ -86,14 +86,16 @@ public class MobileInput extends InputHandler implements GestureListener{
         Unit unit = Units.getClosestEnemy(player.getTeam(), x, y, 20f, u -> !u.isDead());
 
         if(unit != null){
-            threads.run(() -> player.target = unit);
+            player.setMineTile(null);
+            player.target = unit;
         }else{
             Tile tile = world.tileWorld(x, y);
             if(tile != null) tile = tile.target();
 
             if(tile != null && state.teams.areEnemies(player.getTeam(), tile.getTeam())){
                 TileEntity entity = tile.entity;
-                threads.run(() -> player.target = entity);
+                player.setMineTile(null);
+                player.target = entity;
             }
         }
     }

core/src/io/anuke/mindustry/ui/dialogs/FileChooser.java

@@ -52,7 +52,6 @@ public class FileChooser extends FloatingDialog{
     }
 
     private void setupWidgets(){
-        //getCell(content()).maxWidth(UIUtils.portrait() ? Gdx.graphics.getWidth() : Gdx.graphics.getWidth()/Unit.dp.scl(2f));
         content().margin(-10);
 
         Table content = new Table();
@@ -137,7 +136,7 @@ public class FileChooser extends FloatingDialog{
         icontable.add(up);
 
         Table fieldcontent = new Table();
-        fieldcontent.bottom().left().add(new Label("File Name:"));
+        fieldcontent.bottom().left().add(new Label("$text.filename"));
         fieldcontent.add(filefield).height(40f).fillX().expandX().padLeft(10f);
 
         Table buttons = new Table();

settings.gradle

@@ -1,4 +1,18 @@
-include 'desktop', 'html', 'core', 'android', 'kryonet', 'server', 'ios', 'annotations', 'tools', 'tests'
+include 'desktop', 'html', 'core', 'kryonet', 'server', 'ios', 'annotations', 'tools', 'tests'
+
+Properties properties = new Properties()
+
+if(new File(settingsDir, 'local.properties').exists()){
+    properties.load(new File(settingsDir, 'local.properties').newDataInputStream())
+
+    if(properties.containsKey("sdk.dir")){
+        include 'android'
+    }else{
+        println("No android SDK dir found Not loading Android module.")
+    }
+}else{
+    println("No local.properties found. Not loading Android module.")
+}
 
 if(System.properties["release"] == null || System.properties["release"] == "false"){
     if (new File(settingsDir, '../uCore').exists()) {