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

2022-12-09 17:33:44 -03:00
parent 83c9c25164 6f788fb8b4
commit 90c3cef977
416 changed files with 12674 additions and 5862 deletions
@@ -10,8 +10,6 @@ namespace Barotrauma
 {
    partial class GameScreen : Screen
    {
-        public override bool IsEditor => GameMain.GameSession?.GameMode is TestGameMode;
-
        private RenderTarget2D renderTargetBackground;
        private RenderTarget2D renderTarget;
        private RenderTarget2D renderTargetWater;