Merge remote-tracking branch 'origin/master'

core/src/mindustry/core/UI.java

@@ -562,15 +562,20 @@ public class UI implements ApplicationListener, Loadable{
     /** Shows a menu that fires a callback when an option is selected. If nothing is selected, -1 is returned. */
     public void showMenu(String title, String message, String[][] options, Intc callback){
         new Dialog(title){{
+            setFillParent(true);
+            removeChild(titleTable);
+            cont.add(titleTable).width(400f);
+
             cont.row();
-            cont.image().width(400f).pad(2).colspan(2).height(4f).color(Pal.accent);
+            cont.image().width(400f).pad(2).colspan(2).height(4f).color(Pal.accent).bottom();
-            cont.row();
-            cont.add(message).width(400f).wrap().get().setAlignment(Align.center);
             cont.row();
+            cont.pane(table -> {
+                table.add(message).width(400f).wrap().get().setAlignment(Align.center);
+                table.row();
 
                 int option = 0;
                 for(var optionsRow : options){
-                Table buttonRow = buttons.row().table().get().row();
+                    Table buttonRow = table.row().table().get().row();
                     int fullWidth = 400 - (optionsRow.length - 1) * 8; // adjust to count padding as well
                     int width = fullWidth / optionsRow.length;
                     int lastWidth = fullWidth - width * (optionsRow.length - 1); // take the rest of space for uneven table
@@ -587,6 +592,7 @@ public class UI implements ApplicationListener, Loadable{
                         option++;
                     }
                 }
+            }).growX();
             closeOnBack(() -> callback.get(-1));
         }}.show();
     }

core/src/mindustry/entities/units/AIController.java

@@ -147,6 +147,11 @@ public class AIController implements UnitController{
             //let uncontrollable weapons do their own thing
             if(!weapon.controllable || weapon.noAttack) continue;
 
+            if(!weapon.aiControllable){
+                mount.rotate = false;
+                continue;
+            }
+
             float mountX = unit.x + Angles.trnsx(rotation, weapon.x, weapon.y),
                 mountY = unit.y + Angles.trnsy(rotation, weapon.x, weapon.y);
 

core/src/mindustry/type/Weapon.java

@@ -53,6 +53,8 @@ public class Weapon implements Cloneable{
     public boolean alwaysContinuous;
     /** whether this weapon can be aimed manually by players */
     public boolean controllable = true;
+    /** whether this weapon can be automatically aimed by the unit */
+    public boolean aiControllable = true;
     /** whether this weapon is always shooting, regardless of targets ore cone */
     public boolean alwaysShooting = false;
     /** whether to automatically target relevant units in update(); only works when controllable = false. */