(ce8e185aa) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev

2019-04-16 17:12:09 +03:00
parent bd07acf26d
commit 6262b3ea54
96 changed files with 1972 additions and 825 deletions
@@ -360,7 +360,7 @@ namespace Barotrauma
                        Vector2 relativeCursorPos = cursorPosition - AimRefPosition;
                        tempBuffer.Write((UInt16)(65535.0 * Math.Atan2(relativeCursorPos.Y, relativeCursorPos.X) / (2.0 * Math.PI)));
                    }
-                    tempBuffer.Write(IsRagdolled);
+                    tempBuffer.Write(IsRagdolled || IsUnconscious || Stun > 0.0f || IsDead);

                    tempBuffer.Write(AnimController.Dir > 0.0f);
                }