Merge remote-tracking branch 'upstream/master' into develop

This commit is contained in:
EvilFactory
2024-06-27 10:52:55 -03:00
32 changed files with 411 additions and 132 deletions

View File

@@ -1339,7 +1339,7 @@ namespace Barotrauma.Networking
if (GameMain.GameSession?.GameMode is CampaignMode campaign)
{
campaign.CampaignUI?.UpgradeStore?.RequestRefresh();
campaign.CampaignUI?.CrewManagement?.RefreshPermissions();
campaign.CampaignUI?.HRManagerUI?.RefreshUI();
}
}
@@ -1554,7 +1554,7 @@ namespace Barotrauma.Networking
}
else
{
GameMain.GameSession.StartRound(levelData, mirrorLevel);
GameMain.GameSession.StartRound(levelData, mirrorLevel, startOutpost: campaign?.GetPredefinedStartOutpost());
}
isOutpost = levelData.Type == LevelData.LevelType.Outpost;
}
@@ -1959,7 +1959,7 @@ namespace Barotrauma.Networking
if (GameMain.GameSession?.GameMode is CampaignMode campaign)
{
campaign.CampaignUI?.UpgradeStore?.RequestRefresh();
campaign.CampaignUI?.CrewManagement?.RefreshPermissions();
campaign.CampaignUI?.HRManagerUI?.RefreshUI();
}
}
}