(a410fd46c) Trying to help the merge script through a jungle of merges

2019-06-04 16:19:53 +03:00
parent 5208b922d8
commit bea7b58ff3
84 changed files with 1720 additions and 929 deletions
@@ -40,6 +40,9 @@ namespace Barotrauma.SpriteDeformations
        [Serialize(false, true)]
        public bool UseMovementSine { get; set; }

+        [Serialize(false, true)]
+        public bool StopWhenHostIsDead { get; set; }
+
        /// <summary>
        /// Only used if UseMovementSine is enabled. Multiplier for Pi.
        /// </summary>