(0c3442136) Merge branch 'dev' into docking-interface

2019-05-03 13:41:23 +03:00
parent 45ba589d96
commit fbb7daed00
53 changed files with 1442 additions and 713 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;