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

2019-05-23 16:28:04 +03:00
parent 44a5c9e588
commit e9d31ed0be
6 changed files with 57 additions and 28 deletions
@@ -36,7 +36,8 @@ namespace Barotrauma
        [Serialize(1.0f, true), Editable(MIN_SCALE, MAX_SCALE, DecimalCount = 3)]
        public float JointScale { get; set; }

-        [Serialize(1f, true), Editable(DecimalCount = 2)]
+        // Don't show in the editor, because shouldn't be edited in runtime.  Requires that the limb scale and the collider sizes are adjusted. TODO: automatize.
+        [Serialize(1f, false)]
        public float TextureScale { get; set; }

        [Serialize(45f, true), Editable(0f, 1000f)]