Merged branch master into master

This commit is contained in:
juanjp600
2016-08-29 17:55:46 -03:00
5 changed files with 31 additions and 10 deletions
+2 -2
View File
@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers // You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below: // by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")] // [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("0.5.0.3")] [assembly: AssemblyVersion("0.5.1.0")]
[assembly: AssemblyFileVersion("0.5.0.3")] [assembly: AssemblyFileVersion("0.5.1.0")]
+4 -4
View File
@@ -401,10 +401,10 @@ namespace Barotrauma
s.isHighLighted = false; s.isHighLighted = false;
if (s.damage < 0.01f) continue; if (s.damage < 0.01f) continue;
/* GUI.DrawRectangle(spriteBatch, GUI.DrawRectangle(spriteBatch,
new Vector2(s.rect.X + drawOffset.X, -(s.rect.Y + drawOffset.Y)), new Vector2(s.rect.Width, s.rect.Height), 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);*/ Color.Black * (s.damage / prefab.MaxHealth), true);
} }
/* /*
if(_convexHulls == null) return; if(_convexHulls == null) return;
+2 -2
View File
@@ -125,8 +125,8 @@ namespace Barotrauma.Networking
} }
public bool HasPermission(ClientPermissions permission) public bool HasPermission(ClientPermissions permission)
{ {
return Permissions.HasFlag(permission); return false; //Permissions.HasFlag(permission);
} }
public T GetVote<T>(VoteType voteType) public T GetVote<T>(VoteType voteType)
+2 -2
View File
@@ -832,8 +832,8 @@ namespace Barotrauma.Networking
} }
public bool HasPermission(ClientPermissions permission) public bool HasPermission(ClientPermissions permission)
{ {
return permissions.HasFlag(permission); return false;// permissions.HasFlag(permission);
} }
public override void Draw(Microsoft.Xna.Framework.Graphics.SpriteBatch spriteBatch) public override void Draw(Microsoft.Xna.Framework.Graphics.SpriteBatch spriteBatch)
+21
View File
@@ -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 v0.5.0.3
--------------------------------------------------------------------------------------------------------- ---------------------------------------------------------------------------------------------------------