Merge branch 'master' into new-netcode

Conflicts:
	Subsurface/Source/GameMain.cs
	Subsurface/Source/Networking/ChatMessage.cs
	Subsurface/Source/Networking/NetworkMember.cs
	Subsurface/Source/Screens/NetLobbyScreen.cs

Subsurface/Source/Screens/EditCharacterScreen.cs

@@ -145,7 +145,7 @@ namespace Barotrauma
 
             //-------------------- HUD -----------------------------
 
-            spriteBatch.Begin();
+            spriteBatch.Begin(SpriteSortMode.Immediate, null, null, null, GameMain.ScissorTestEnable);
 
             GUIpanel.Draw(spriteBatch);
 

Subsurface/Source/Screens/EditMapScreen.cs

@@ -193,10 +193,10 @@ namespace Barotrauma
                 var catButton = new GUIButton(new Rectangle(0, y, 0, 20), category.ToString(), Alignment.Left, "", leftPanel);
                 catButton.UserData = i;
                 catButton.OnClicked = SelectTab;
-                y+=25;
+                y += 25;
 
                 GUItabs[i] = new GUIFrame(new Rectangle(GameMain.GraphicsWidth / 2 - width / 2, GameMain.GraphicsHeight / 2 - height / 2, width, height), "");
-                GUItabs[i].Padding = new Vector4(10.0f, 30.0f, 10.0f, 10.0f);
+                GUItabs[i].Padding = new Vector4(10.0f, 30.0f, 10.0f, 20.0f);
 
                 new GUITextBlock(new Rectangle(-200, 0, 100, 15), "Filter", "", Alignment.TopRight, Alignment.CenterRight, GUItabs[i], false, GUI.SmallFont);
 
@@ -1103,7 +1103,7 @@ namespace Barotrauma
 
             //-------------------- HUD -----------------------------
 
-            spriteBatch.Begin();
+            spriteBatch.Begin(SpriteSortMode.Immediate, null, null, null, GameMain.ScissorTestEnable);
 
             if (Submarine.MainSub != null)
             {

Subsurface/Source/Screens/GameScreen.cs

@@ -201,7 +201,7 @@ namespace Barotrauma
 
             DrawMap(graphics, spriteBatch);
 
-            spriteBatch.Begin();
+            spriteBatch.Begin(SpriteSortMode.Immediate, null, null, null, GameMain.ScissorTestEnable);
 
             if (Character.Controlled != null && Character.Controlled.SelectedConstruction != null)
             {

Subsurface/Source/Screens/LobbyScreen.cs

@@ -369,10 +369,8 @@ namespace Barotrauma
             }
 
             graphics.Clear(Color.Black);
-
-            //GameMain.GameScreen.DrawMap(graphics, spriteBatch);
-
-            spriteBatch.Begin();
+            
+            spriteBatch.Begin(SpriteSortMode.Immediate, null, null, null, GameMain.ScissorTestEnable);
 
             Sprite backGround = GameMain.GameSession.Map.CurrentLocation.Type.Background;
             spriteBatch.Draw(backGround.Texture, Vector2.Zero, null, Color.White, 0.0f, Vector2.Zero,

Subsurface/Source/Screens/MainMenuScreen.cs

@@ -500,8 +500,8 @@ namespace Barotrauma
             GameMain.TitleScreen.Draw(spriteBatch, graphics, (float)deltaTime);
 
             //Game1.GameScreen.DrawMap(graphics, spriteBatch);
-            
-            spriteBatch.Begin(0, BlendState.AlphaBlend);
+
+            spriteBatch.Begin(SpriteSortMode.Immediate, null, null, null, GameMain.ScissorTestEnable);
 
             buttonsTab.Draw(spriteBatch);
             if (selectedTab>0) menuTabs[(int)selectedTab].Draw(spriteBatch);

Subsurface/Source/Screens/NetLobbyScreen.cs

@@ -3,9 +3,6 @@ using Lidgren.Network;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
 using Barotrauma.Networking;
-using FarseerPhysics;
-using FarseerPhysics.Factories;
-using FarseerPhysics.Dynamics;
 using System.IO;
 using System.Linq;
 using System.Collections.Generic;
@@ -198,6 +195,7 @@ namespace Barotrauma
 
             chatBox = new GUIListBox(new Rectangle(0,0,0,chatFrame.Rect.Height-80), Color.White, "", chatFrame);            
             textBox = new GUITextBox(new Rectangle(0, 25, 0, 25), Alignment.Bottom, "", chatFrame);
+            textBox.MaxTextWidth = textBox.Rect.Width * 2;
             textBox.Font = GUI.SmallFont;
 
             //player info panel ------------------------------------------------------------
@@ -1015,7 +1013,7 @@ namespace Barotrauma
         {
             graphics.Clear(Color.Black);
             
-            spriteBatch.Begin();
+            spriteBatch.Begin(SpriteSortMode.Immediate, null, null, null, GameMain.ScissorTestEnable);
 
             if (backgroundSprite!=null)
             {
@@ -1041,16 +1039,15 @@ namespace Barotrauma
         {
             float prevSize = chatBox.BarSize;
 
-            while (chatBox.CountChildren>20)
+            while (chatBox.CountChildren > 20)
             {
                 chatBox.RemoveChild(chatBox.children[1]);
             }
-
-            GUITextBlock msg = new GUITextBlock(new Rectangle(0, 0, chatBox.Rect.Width, 0),
+            
+            GUITextBlock msg = new GUITextBlock(new Rectangle(0, 0, chatBox.Rect.Width-20, 0),
                 message.TextWithSender, 
                 ((chatBox.CountChildren % 2) == 0) ? Color.Transparent : Color.Black*0.1f, message.Color, 
-                Alignment.Left, "", null, true);
-            msg.Font = GUI.SmallFont;
+                Alignment.Left, Alignment.TopLeft, "", null, true, GUI.SmallFont);
             msg.UserData = message;
             msg.CanBeFocused = false;
 

Subsurface/Source/Screens/ServerListScreen.cs

@@ -322,7 +322,7 @@ namespace Barotrauma
             GameMain.TitleScreen.DrawLoadingText = false;
             GameMain.TitleScreen.Draw(spriteBatch, graphics, (float)deltaTime);
 
-            spriteBatch.Begin();
+            spriteBatch.Begin(SpriteSortMode.Immediate, null, null, null, GameMain.ScissorTestEnable);
 
             menu.Draw(spriteBatch);