Turret rotation fix, CharacterInventory networking bugfixes, prevent limbs clipping with other colliders when mirroring, fixed mantis animations, better looking explosions, spark effect when overvoltage breaks an item

This commit is contained in:
Regalis
2015-09-04 21:56:39 +03:00
parent 2f08dcf3f9
commit 0cbcdd0b03
35 changed files with 393 additions and 262 deletions
+10 -3
View File
@@ -284,6 +284,7 @@ namespace Subsurface
if (infoFrame.children.Find(c => c.UserData as string == "playyourself") == null)
{
var playYourself = new GUITickBox(new Rectangle(0, -20, 20, 20), "Play yourself", Alignment.TopLeft, playerFrame);
playYourself.Selected = Game1.Server.CharacterInfo != null;
playYourself.OnSelected = TogglePlayYourself;
playYourself.UserData = "playyourself";
}
@@ -373,6 +374,7 @@ namespace Subsurface
if (IsServer && Game1.Server != null)
{
Game1.Server.CharacterInfo = null;
Game1.Server.Character = null;
var playYourself = new GUITickBox(new Rectangle(0, -20, 20, 20), "Play yourself", Alignment.TopLeft, playerFrame);
playYourself.OnSelected = TogglePlayYourself;
@@ -577,9 +579,14 @@ namespace Subsurface
{
if (string.IsNullOrEmpty(newName)) return false;
Game1.Client.CharacterInfo.Name = newName;
Game1.Client.Name = newName;
Game1.Client.SendCharacterData();
if (Game1.NetworkMember == null || Game1.NetworkMember.CharacterInfo == null) return true;
Game1.NetworkMember.CharacterInfo.Name = newName;
if (Game1.Client != null)
{
Game1.Client.Name = newName;
Game1.Client.SendCharacterData();
}
textBox.Text = newName;
textBox.Selected = false;