(0b88fdd81) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev

This commit is contained in:
Joonas Rikkonen
2019-05-16 06:49:30 +03:00
parent af7fcb823d
commit 970a5a8732
34 changed files with 432 additions and 182 deletions
@@ -36,6 +36,7 @@ namespace Barotrauma.Items.Components
{
UserData = ciElement
};
tickBox.TextBlock.AutoScale = true;
tickBox.OnSelected += (tBox) =>
{
if (GameMain.Client == null)
@@ -57,6 +58,7 @@ namespace Barotrauma.Items.Components
{
UserData = ciElement
};
btn.TextBlock.AutoScale = true;
btn.OnClicked += (_, userdata) =>
{
if (GameMain.Client == null)