From 5d19cc7cf13a121eac1f993de6767d6dd3406bbb Mon Sep 17 00:00:00 2001 From: John Gross Date: Thu, 6 Jun 2019 15:48:29 -0700 Subject: [PATCH] I think I fixed it --- Torch.Server/Torch.Server.csproj | 8 ++++++-- Torch.Server/app.config | 11 ----------- Torch.Server/packages.config | 1 + Torch/Torch.csproj | 8 ++++++++ Torch/VRageGame.cs | 2 ++ Torch/packages.config | 1 + 6 files changed, 18 insertions(+), 13 deletions(-) delete mode 100644 Torch.Server/app.config diff --git a/Torch.Server/Torch.Server.csproj b/Torch.Server/Torch.Server.csproj index 02606b0..c38317f 100644 --- a/Torch.Server/Torch.Server.csproj +++ b/Torch.Server/Torch.Server.csproj @@ -86,6 +86,7 @@ ..\packages\Microsoft.Win32.Registry.4.4.0\lib\net461\Microsoft.Win32.Registry.dll + ..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll @@ -130,6 +131,10 @@ ..\GameBinaries\Steamworks.NET.dll + + ..\packages\System.ComponentModel.Annotations.4.5.0\lib\net461\System.ComponentModel.Annotations.dll + True + @@ -365,7 +370,6 @@ ResXFileCodeGenerator Resources.Designer.cs - SettingsSingleFileGenerator @@ -509,6 +513,6 @@ - copy "$(SolutionDir)NLog.config" "$(TargetDir)" & copy "$(SolutionDir)NLog-user.config" "$(TargetDir)" + copy "$(SolutionDir)NLog.config" "$(TargetDir)" & copy "$(SolutionDir)NLog-user.config" "$(TargetDir)" & del "$(TargetDir)System.*" \ No newline at end of file diff --git a/Torch.Server/app.config b/Torch.Server/app.config deleted file mode 100644 index a73892d..0000000 --- a/Torch.Server/app.config +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/Torch.Server/packages.config b/Torch.Server/packages.config index 8429d70..24c621a 100644 --- a/Torch.Server/packages.config +++ b/Torch.Server/packages.config @@ -9,6 +9,7 @@ + \ No newline at end of file diff --git a/Torch/Torch.csproj b/Torch/Torch.csproj index f499196..ca60249 100644 --- a/Torch/Torch.csproj +++ b/Torch/Torch.csproj @@ -37,6 +37,7 @@ + @@ -99,6 +100,10 @@ ..\GameBinaries\Steamworks.NET.dll + + ..\packages\System.ComponentModel.Annotations.4.5.0\lib\net461\System.ComponentModel.Annotations.dll + True + @@ -163,6 +168,9 @@ ..\GameBinaries\VRage.OpenVRWrapper.dll False + + ..\bin\x64\Release\DedicatedServer64\VRage.Platform.Windows.dll + ..\GameBinaries\VRage.Render.dll False diff --git a/Torch/VRageGame.cs b/Torch/VRageGame.cs index 1065f49..b3460a4 100644 --- a/Torch/VRageGame.cs +++ b/Torch/VRageGame.cs @@ -31,6 +31,7 @@ using VRage.Game.ObjectBuilder; using VRage.Game.SessionComponents; using VRage.GameServices; using VRage.Network; +using VRage.Platform.Windows; using VRage.Plugins; using VRage.Steam; using VRage.Utils; @@ -156,6 +157,7 @@ namespace Torch _tweakGameSettings(); MyFileSystem.Reset(); + MyVRageWindows.Init(MySandboxGame.Log, Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "SpaceEngineersDedicated")); MyInitializer.InvokeBeforeRun(_appSteamId, _appName, _userDataPath); // MyInitializer.InitCheckSum(); diff --git a/Torch/packages.config b/Torch/packages.config index 702f58c..7f9ae61 100644 --- a/Torch/packages.config +++ b/Torch/packages.config @@ -7,6 +7,7 @@ + \ No newline at end of file