(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
@@ -562,6 +562,7 @@ namespace Barotrauma
                    }
                };
                itemEditor.AddCustomContent(buttonContainer, itemEditor.ContentCount);
+                GUITextBlock.AutoScaleAndNormalize(buttonContainer.Children.Select(b => ((GUIButton)b).TextBlock));
            }

            foreach (ItemComponent ic in components)