Merge branch 'master' of https://github.com/Regalis11/Barotrauma into develop

This commit is contained in:
EvilFactory
2023-10-19 12:18:30 -03:00
613 changed files with 22122 additions and 11481 deletions

View File

@@ -8,7 +8,7 @@ namespace Barotrauma.Tutorials
{
enum AutoPlayVideo { Yes, No };
enum TutorialSegmentType { MessageBox, InfoBox, Objective };
enum SegmentType { MessageBox, InfoBox, Objective };
sealed class Tutorial
{
@@ -108,7 +108,7 @@ namespace Barotrauma.Tutorials
GameMain.GameSession.StartRound(LevelSeed);
}
GameMain.GameSession.EventManager.ActiveEvents.Clear();
GameMain.GameSession.EventManager.ClearEvents();
GameMain.GameSession.EventManager.Enabled = true;
GameMain.GameScreen.Select();