Merge branch 'master' into new-netcode

Conflicts:
	Subsurface/Properties/AssemblyInfo.cs
	Subsurface/Source/Characters/Animation/HumanoidAnimController.cs
	Subsurface/Source/Characters/Character.cs
	Subsurface/Source/Items/Components/Door.cs
	Subsurface/Source/Items/Components/Power/PowerContainer.cs
	Subsurface/Source/Items/Components/Signal/Wire.cs
	Subsurface/Source/Items/Item.cs
	Subsurface/Source/Networking/ChatMessage.cs
	Subsurface/Source/Networking/GameClient.cs
	Subsurface/Source/Networking/GameServer.cs
	Subsurface/Source/Networking/GameServerLogin.cs
	Subsurface/Source/Networking/GameServerSettings.cs
	Subsurface/Source/Networking/NetworkMember.cs

Subsurface/Source/Items/Components/Machines/Deconstructor.cs

@@ -85,6 +85,11 @@ namespace Barotrauma.Items.Components
             GuiFrame.Draw(spriteBatch);
         }
 
+        public override void AddToGUIUpdateList()
+        {
+            GuiFrame.AddToGUIUpdateList();
+        }
+
         public override void UpdateHUD(Character character)
         {
             GuiFrame.Update((float)Timing.Step);

Subsurface/Source/Items/Components/Machines/Engine.cs

@@ -114,7 +114,11 @@ namespace Barotrauma.Items.Components
             //GUI.DrawRectangle(spriteBatch, new Rectangle(x, y, width, height), Color.Black, true);
 
             spriteBatch.DrawString(GUI.Font, "Force: " + (int)(targetForce) + " %", new Vector2(GuiFrame.Rect.X + 30, GuiFrame.Rect.Y + 30), Color.White);
-      
+        }
+
+        public override void AddToGUIUpdateList()
+        {
+            GuiFrame.AddToGUIUpdateList();
         }
 
         public override void UpdateHUD(Character character)

Subsurface/Source/Items/Components/Machines/Fabricator.cs

@@ -379,6 +379,11 @@ namespace Barotrauma.Items.Components
             GuiFrame.Draw(spriteBatch);
         }
 
+        public override void AddToGUIUpdateList()
+        {
+            GuiFrame.AddToGUIUpdateList();
+        }
+
         public override void UpdateHUD(Character character)
         {
             FabricableItem targetItem = itemList.SelectedData as FabricableItem;

Subsurface/Source/Items/Components/Machines/MiniMap.cs

@@ -190,7 +190,7 @@ namespace Barotrauma.Items.Components
                         Color.Black * 0.5f, 2, GUI.SmallFont);                    
                 }
                                 
-                GUI.DrawRectangle(spriteBatch, hullRect, borderColor, 2);
+                GUI.DrawRectangle(spriteBatch, hullRect, borderColor, false, 0.0f, 2);
             }
         }
 

Subsurface/Source/Items/Components/Machines/Pump.cs

@@ -185,6 +185,11 @@ namespace Barotrauma.Items.Components
      
         }
 
+        public override void AddToGUIUpdateList()
+        {
+            GuiFrame.AddToGUIUpdateList();
+        }
+
         public override void UpdateHUD(Character character)
         {
             GuiFrame.Update(1.0f / 60.0f);

Subsurface/Source/Items/Components/Machines/Radar.cs

@@ -70,6 +70,7 @@ namespace Barotrauma.Items.Components
                 return true;
             };
 
+            GuiFrame.CanBeFocused = false;
         }
 
         public override void Update(float deltaTime, Camera cam)
@@ -108,6 +109,11 @@ namespace Barotrauma.Items.Components
             return pingState > 1.0f;
         }
 
+        public override void AddToGUIUpdateList()
+        {
+            GuiFrame.AddToGUIUpdateList();
+        }
+
         public override void UpdateHUD(Character character)
         {
             GuiFrame.Update((float)Timing.Step);

Subsurface/Source/Items/Components/Machines/Reactor.cs

@@ -487,6 +487,11 @@ namespace Barotrauma.Items.Components
             //y = y - 260;
         }
 
+        public override void AddToGUIUpdateList()
+        {
+            GuiFrame.AddToGUIUpdateList();
+        }
+
         public override void UpdateHUD(Character character)
         {
             GuiFrame.Update(1.0f / 60.0f);

Subsurface/Source/Items/Components/Machines/Steering.cs

@@ -223,20 +223,28 @@ namespace Barotrauma.Items.Components
             if (Vector2.Distance(PlayerInput.MousePosition, new Vector2(velRect.Center.X, velRect.Center.Y)) < 200.0f)
             {
                 GUI.DrawRectangle(spriteBatch, new Rectangle((int)targetVelPos.X -10, (int)targetVelPos.Y - 10, 20, 20), Color.Red);
-
-                if (PlayerInput.LeftButtonHeld())
-                {
-                    TargetVelocity = PlayerInput.MousePosition - new Vector2(velRect.Center.X, velRect.Center.Y);
-                    targetVelocity.Y = -targetVelocity.Y;
-
-                    unsentChanges = true;
-                }
             }
         }
 
+        public override void AddToGUIUpdateList()
+        {
+            GuiFrame.AddToGUIUpdateList();
+        }
+
         public override void UpdateHUD(Character character)
         {
             GuiFrame.Update(1.0f / 60.0f);
+
+            if (Vector2.Distance(PlayerInput.MousePosition, new Vector2(GuiFrame.Rect.Center.X, GuiFrame.Rect.Center.Y)) < 200.0f)
+            {
+                if (PlayerInput.LeftButtonHeld())
+                {
+                    TargetVelocity = PlayerInput.MousePosition - new Vector2(GuiFrame.Rect.Center.X, GuiFrame.Rect.Center.Y);
+                    targetVelocity.Y = -targetVelocity.Y;
+
+                    unsentChanges = true;
+                }
+            }
         }
 
         private void UpdateAutoPilot(float deltaTime)
@@ -433,10 +441,10 @@ namespace Barotrauma.Items.Components
 
             maintainPosTickBox.Selected = false;
             posToMaintain = null;
+            tickBox.Selected = true;
 
             UpdatePath();
             
-            tickBox.Selected = true;
 
             return true;
         }