(42d13c09f) Merge remote-tracking branch 'origin/tutorial-rework' into dev

2019-04-25 18:07:37 +03:00
parent 99344e4031
commit e83dba2959
53 changed files with 3623 additions and 550 deletions
@@ -10,6 +10,10 @@ namespace Barotrauma.Items.Components
 {
    partial class Pump : Powered, IServerSerializable, IClientSerializable
    {
+        public GUIScrollBar IsActiveSlider
+        {
+            get { return isActiveSlider; }
+        }
        private GUIScrollBar isActiveSlider;
        private GUIScrollBar pumpSpeedSlider;
        private GUITickBox powerIndicator;
@@ -49,7 +53,6 @@ namespace Barotrauma.Items.Components
            };
            var sliderHandle = isActiveSlider.GetChild<GUIButton>();
            sliderHandle.RectTransform.NonScaledSize = new Point(84, sliderHandle.Rect.Height);
-            
            isActiveSlider.OnMoved = (GUIScrollBar scrollBar, float barScroll) =>
            {
                bool active = scrollBar.BarScroll < 0.5f;