Merged branch master into master

Subsurface/Properties/AssemblyInfo.cs

@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.5.0.3")]
-[assembly: AssemblyFileVersion("0.5.0.3")]
+[assembly: AssemblyVersion("0.5.1.0")]
+[assembly: AssemblyFileVersion("0.5.1.0")]

Subsurface/Source/Map/Structure.cs

@@ -401,10 +401,10 @@ namespace Barotrauma
                 s.isHighLighted = false;
                 
                 if (s.damage < 0.01f) continue;
-                
-               /* GUI.DrawRectangle(spriteBatch,
-                   new Vector2(s.rect.X + drawOffset.X, -(s.rect.Y + drawOffset.Y)), new Vector2(s.rect.Width, s.rect.Height),
-                    Color.Black * (s.damage / prefab.MaxHealth), true);*/ 
+
+                 GUI.DrawRectangle(spriteBatch,
+                    new Vector2(s.rect.X + drawOffset.X, -(s.rect.Y + drawOffset.Y)), new Vector2(s.rect.Width, s.rect.Height),
+                     Color.Black * (s.damage / prefab.MaxHealth), true); 
             }
             /*
             if(_convexHulls == null) return;

Subsurface/Source/Networking/Client.cs

@@ -125,8 +125,8 @@ namespace Barotrauma.Networking
         }
 
         public bool HasPermission(ClientPermissions permission)
-        {
-            return Permissions.HasFlag(permission);
+        {
+            return false; //Permissions.HasFlag(permission);
         }
 
         public T GetVote<T>(VoteType voteType)

Subsurface/Source/Networking/GameClient.cs

@@ -832,8 +832,8 @@ namespace Barotrauma.Networking
         }
 
         public bool HasPermission(ClientPermissions permission)
-        {
-            return permissions.HasFlag(permission);
+        {
+            return false;// permissions.HasFlag(permission);
         }
 
         public override void Draw(Microsoft.Xna.Framework.Graphics.SpriteBatch spriteBatch)

Subsurface/changelog.txt

@@ -1,3 +1,24 @@
+---------------------------------------------------------------------------------------------------------
+v0.5.1.0
+---------------------------------------------------------------------------------------------------------
+
+- getting attacked by a husk will slowly turn the victim into a husk
+
+- spam filter
+- added server options to the ingame HUD
+- fixed tiger thresher spawning on Linux
+- a more secure password authentication method (again)
+- ingame players can't receive messages from lobby players anymore
+- more server-side security checks
+
+- medical doctors always have a high enough medical skill to fabricate any drug
+- ai-controlled crew can be spawned using the console in multiplayer
+- it's possible to manually attack when controlling a creature
+- randomly spawned artifacts are spread out better throughout the level
+- characters won't let go of a person they're dragging when entering/exiting the sub
+- respawned players get the same ID card tags they would've gotten if they had spawned inside the main sub
+- highlighted characters glow in the dark
+
 ---------------------------------------------------------------------------------------------------------
 v0.5.0.3
 ---------------------------------------------------------------------------------------------------------