diff --git a/Torch.Client.Tests/Torch.Client.Tests.csproj b/Torch.Client.Tests/Torch.Client.Tests.csproj index f57c10c..c1dc43a 100644 --- a/Torch.Client.Tests/Torch.Client.Tests.csproj +++ b/Torch.Client.Tests/Torch.Client.Tests.csproj @@ -86,6 +86,7 @@ + diff --git a/Torch.Client.Tests/app.config b/Torch.Client.Tests/app.config new file mode 100644 index 0000000..a73892d --- /dev/null +++ b/Torch.Client.Tests/app.config @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/Torch.Client/Torch.Client.csproj b/Torch.Client/Torch.Client.csproj index 82a74fa..1ecb37a 100644 --- a/Torch.Client/Torch.Client.csproj +++ b/Torch.Client/Torch.Client.csproj @@ -147,6 +147,7 @@ ResXFileCodeGenerator Resources.Designer.cs + SettingsSingleFileGenerator diff --git a/Torch.Client/TorchClientConfig.cs b/Torch.Client/TorchClientConfig.cs index fda35e0..ba6e5b3 100644 --- a/Torch.Client/TorchClientConfig.cs +++ b/Torch.Client/TorchClientConfig.cs @@ -23,6 +23,8 @@ namespace Torch.Client public bool NoGui { get; set; } = false; public bool RestartOnCrash { get; set; } = false; public string WaitForPID { get; set; } = null; + public string ChatName { get; set; } + public string ChatColor { get; set; } public bool Save(string path = null) { diff --git a/Torch.Client/app.config b/Torch.Client/app.config new file mode 100644 index 0000000..a73892d --- /dev/null +++ b/Torch.Client/app.config @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/Torch.Server.Tests/Torch.Server.Tests.csproj b/Torch.Server.Tests/Torch.Server.Tests.csproj index 157bedf..cf95a9a 100644 --- a/Torch.Server.Tests/Torch.Server.Tests.csproj +++ b/Torch.Server.Tests/Torch.Server.Tests.csproj @@ -92,6 +92,7 @@ + diff --git a/Torch.Server.Tests/app.config b/Torch.Server.Tests/app.config new file mode 100644 index 0000000..a73892d --- /dev/null +++ b/Torch.Server.Tests/app.config @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/Torch.Server/Initializer.cs b/Torch.Server/Initializer.cs index f9af400..78167b1 100644 --- a/Torch.Server/Initializer.cs +++ b/Torch.Server/Initializer.cs @@ -65,12 +65,6 @@ quit"; if (!File.Exists(apiTarget)) File.Copy(apiSource, apiTarget); - - var protoSource = Path.Combine(basePath, "DedicatedServer64", "protobuf-net.dll"); - var protoTarget = Path.Combine(basePath, "protobuf-net.dll"); - - if(!File.Exists(protoTarget)) - File.Copy(protoSource, protoTarget); _config = InitConfig(); if (!_config.Parse(args)) diff --git a/Torch.Server/Torch.Server.csproj b/Torch.Server/Torch.Server.csproj index 57b3dc8..02606b0 100644 --- a/Torch.Server/Torch.Server.csproj +++ b/Torch.Server/Torch.Server.csproj @@ -93,8 +93,8 @@ ..\packages\NLog.4.4.12\lib\net45\NLog.dll True - - ..\packages\protobuf-net.2.1.0\lib\net451\protobuf-net.dll + + ..\packages\protobuf-net.2.4.0\lib\net40\protobuf-net.dll False @@ -131,16 +131,19 @@ + + ..\packages\System.Security.AccessControl.4.4.0\lib\net461\System.Security.AccessControl.dll ..\packages\System.Security.Principal.Windows.4.4.0\lib\net461\System.Security.Principal.Windows.dll + @@ -362,6 +365,7 @@ ResXFileCodeGenerator Resources.Designer.cs + SettingsSingleFileGenerator diff --git a/Torch.Server/app.config b/Torch.Server/app.config new file mode 100644 index 0000000..a73892d --- /dev/null +++ b/Torch.Server/app.config @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/Torch.Server/packages.config b/Torch.Server/packages.config index 11d6e4d..8429d70 100644 --- a/Torch.Server/packages.config +++ b/Torch.Server/packages.config @@ -7,7 +7,7 @@ - + diff --git a/Torch.Tests/Torch.Tests.csproj b/Torch.Tests/Torch.Tests.csproj index 50977de..f4cf215 100644 --- a/Torch.Tests/Torch.Tests.csproj +++ b/Torch.Tests/Torch.Tests.csproj @@ -82,6 +82,7 @@ + diff --git a/Torch.Tests/app.config b/Torch.Tests/app.config new file mode 100644 index 0000000..a73892d --- /dev/null +++ b/Torch.Tests/app.config @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/Torch/Torch.csproj b/Torch/Torch.csproj index b1ab8fe..f499196 100644 --- a/Torch/Torch.csproj +++ b/Torch/Torch.csproj @@ -65,9 +65,8 @@ - - False - ..\GameBinaries\protobuf-net.dll + + ..\packages\protobuf-net.2.4.0\lib\net40\protobuf-net.dll ..\GameBinaries\Sandbox.Common.dll @@ -101,15 +100,18 @@ + + ..\packages\System.Security.AccessControl.4.4.0\lib\net461\System.Security.AccessControl.dll ..\packages\System.Security.Principal.Windows.4.4.0\lib\net461\System.Security.Principal.Windows.dll + ..\packages\ControlzEx.3.0.2.4\lib\net45\System.Windows.Interactivity.dll True @@ -320,6 +322,7 @@ + diff --git a/Torch/app.config b/Torch/app.config new file mode 100644 index 0000000..a73892d --- /dev/null +++ b/Torch/app.config @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/Torch/packages.config b/Torch/packages.config index e77c03c..702f58c 100644 --- a/Torch/packages.config +++ b/Torch/packages.config @@ -5,7 +5,7 @@ - +