(3b137aa1a) Merge remote-tracking branch 'origin/dev' into human-ai

2019-05-16 05:36:05 +03:00
parent 5ba3c802ea
commit 8280ed9c1a
24 changed files with 415 additions and 187 deletions
@@ -172,6 +172,8 @@ namespace Barotrauma

        private GUILayoutGroup subPreviewContainer;

+        private GUILayoutGroup subPreviewContainer;
+
        private GUIButton loadGameButton;
        
        public Action<Submarine, string, string> StartNewGame;
@@ -337,10 +339,20 @@ namespace Barotrauma
                }
            };

+
+            if (!isMultiplayer)
+            {
+                var disclaimerBtn = new GUIButton(new RectTransform(new Vector2(1.0f, 0.8f), rightColumn.RectTransform, Anchor.TopRight) { AbsoluteOffset = new Point(5) }, style: "GUINotificationButton")
+                {
+                    IgnoreLayoutGroups = true,
+                    OnClicked = (btn, userdata) => { GameMain.Instance.ShowCampaignDisclaimer(); return true; }
+                };
+                disclaimerBtn.RectTransform.MaxSize = new Point((int)(30 * GUI.Scale));
+            }
+
            leftColumn.Recalculate();
            rightColumn.Recalculate();

-
            UpdateSubList(submarines);
            UpdateLoadMenu(saveFiles);
        }