Unstable 1.2.4.0

This commit is contained in:
Markus Isberg
2023-11-30 13:53:00 +02:00
parent 8a2e2ea0ae
commit fb5ea537bf
210 changed files with 4201 additions and 1283 deletions
@@ -84,6 +84,7 @@ namespace Barotrauma
Graphics = GraphicsSettings.GetDefault(),
Audio = AudioSettings.GetDefault(),
#if CLIENT
DisableGlobalSpamList = false,
KeyMap = KeyMapping.GetDefault(),
InventoryKeyMap = InventoryKeyMapping.GetDefault()
#endif
@@ -156,6 +157,7 @@ namespace Barotrauma
public string RemoteMainMenuContentUrl;
#if CLIENT
public XElement SavedCampaignSettings;
public bool DisableGlobalSpamList;
#endif
#if DEBUG
public bool UseSteamMatchmaking;