(af16ecdfa) Merge branch 'dev' into human-ai

2019-05-16 05:14:00 +03:00
parent 8be0b0676e
commit bec7aadfa9
65 changed files with 1579 additions and 1449 deletions
@@ -20,6 +20,10 @@ namespace Barotrauma.Items.Components
        private bool unsentChanges;
        private float networkUpdateTimer;

+        public GUITickBox ActiveTickBox
+        {
+            get { return activeTickBox; }
+        }
        private GUITickBox activeTickBox, passiveTickBox;
        private GUITextBlock signalWarningText;