(965c31410a) Unstable v0.10.4.0

2020-07-21 08:57:50 -03:00
parent 4f8bd39789
commit 33d3a41104
546 changed files with 45952 additions and 25762 deletions
@@ -8,7 +8,7 @@ namespace Barotrauma
 {
    partial class JobPrefab : IPrefab, IDisposable
    {
-        public GUIButton CreateInfoFrame(int variant)
+        public GUIButton CreateInfoFrame(out GUIComponent buttonContainer)
        {
            int width = 500, height = 400;

@@ -34,6 +34,8 @@ namespace Barotrauma
                    font: GUI.SmallFont);
            }

+            buttonContainer = paddedFrame;
+
            /*if (!ItemIdentifiers.TryGetValue(variant, out var itemIdentifiers)) { return backFrame; }
            var itemContainer = new GUILayoutGroup(new RectTransform(new Vector2(0.45f, 0.5f), paddedFrame.RectTransform, Anchor.TopRight)
            { RelativeOffset = new Vector2(0.0f, 0.2f + descriptionBlock.RectTransform.RelativeSize.Y) })
@@ -54,7 +56,6 @@ namespace Barotrauma
            return frameHolder;
        }

-
        public class OutfitPreview
        {
            /// <summary>