Merge branch 'master' into new-netcode

Conflicts: Subsurface/Source/GUI/GUITextBlock.cs Subsurface/Source/GameMain.cs Subsurface/Source/Items/Components/Machines/Radar.cs Subsurface/Source/Networking/GameClient.cs
2017-05-17 18:51:22 +03:00
parent 1d3da3e70b 0aca8dbf9d
commit 095054182e
26 changed files with 261 additions and 207 deletions
@@ -365,8 +365,8 @@ namespace Barotrauma
            vsyncTickBox.OnSelected = (GUITickBox box) =>
            {
                VSyncEnabled = !VSyncEnabled;
-                GameMain.Graphics.SynchronizeWithVerticalRetrace = VSyncEnabled;
-                GameMain.Graphics.ApplyChanges();
+                GameMain.GraphicsDeviceManager.SynchronizeWithVerticalRetrace = VSyncEnabled;
+                GameMain.GraphicsDeviceManager.ApplyChanges();
                UnsavedSettings = true;

                return true;