(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
@@ -470,6 +470,7 @@ namespace Barotrauma
break;
case Tab.Credits:
titleText.Visible = false;
creditsPlayer.Restart();
break;
}
}