From 00bd47d493662f6e4f99d79ff56d712043380762 Mon Sep 17 00:00:00 2001 From: Vasilis Date: Wed, 26 Jun 2024 15:13:35 +0300 Subject: [PATCH] Update to latest robust (#3) --- RobustTemplateSingleplayer.sln | 30 +++++++++++++++--------------- RobustToolbox | 2 +- Template.Game/Template.Game.csproj | 1 + 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/RobustTemplateSingleplayer.sln b/RobustTemplateSingleplayer.sln index 91524e5..2da1c0c 100644 --- a/RobustTemplateSingleplayer.sln +++ b/RobustTemplateSingleplayer.sln @@ -9,8 +9,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "RobustToolbox", "RobustTool EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robust.Client", "RobustToolbox\Robust.Client\Robust.Client.csproj", "{2A829DE3-FCB2-4FEA-A6F3-B85122C8D11E}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robust.Physics", "RobustToolbox\Robust.Physics\Robust.Physics.csproj", "{97EBBD32-8980-4243-9F90-BC7075B3EC8F}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robust.Shared", "RobustToolbox\Robust.Shared\Robust.Shared.csproj", "{B4D5BABE-B7C5-4D73-9F8F-B5411866A1BE}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robust.Shared.Maths", "RobustToolbox\Robust.Shared.Maths\Robust.Shared.Maths.csproj", "{09D5BA00-5066-4FDF-81C5-DC5E469DB11F}" @@ -51,6 +49,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Avalonia.Base", "RobustTool EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robust.Shared.CompNetworkGenerator", "RobustToolbox\Robust.Shared.CompNetworkGenerator\Robust.Shared.CompNetworkGenerator.csproj", "{83FB6E90-85D6-442E-B5A6-C5D303FCF737}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robust.Serialization.Generator", "RobustToolbox\Robust.Serialization.Generator\Robust.Serialization.Generator.csproj", "{B3DB9D4B-8E3E-400F-99A2-0A43DAC282CC}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -88,18 +88,6 @@ Global {2A829DE3-FCB2-4FEA-A6F3-B85122C8D11E}.Release|x64.Build.0 = Release|Any CPU {2A829DE3-FCB2-4FEA-A6F3-B85122C8D11E}.Release|x86.ActiveCfg = Release|Any CPU {2A829DE3-FCB2-4FEA-A6F3-B85122C8D11E}.Release|x86.Build.0 = Release|Any CPU - {97EBBD32-8980-4243-9F90-BC7075B3EC8F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {97EBBD32-8980-4243-9F90-BC7075B3EC8F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {97EBBD32-8980-4243-9F90-BC7075B3EC8F}.Debug|x64.ActiveCfg = Debug|Any CPU - {97EBBD32-8980-4243-9F90-BC7075B3EC8F}.Debug|x64.Build.0 = Debug|Any CPU - {97EBBD32-8980-4243-9F90-BC7075B3EC8F}.Debug|x86.ActiveCfg = Debug|Any CPU - {97EBBD32-8980-4243-9F90-BC7075B3EC8F}.Debug|x86.Build.0 = Debug|Any CPU - {97EBBD32-8980-4243-9F90-BC7075B3EC8F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {97EBBD32-8980-4243-9F90-BC7075B3EC8F}.Release|Any CPU.Build.0 = Release|Any CPU - {97EBBD32-8980-4243-9F90-BC7075B3EC8F}.Release|x64.ActiveCfg = Release|Any CPU - {97EBBD32-8980-4243-9F90-BC7075B3EC8F}.Release|x64.Build.0 = Release|Any CPU - {97EBBD32-8980-4243-9F90-BC7075B3EC8F}.Release|x86.ActiveCfg = Release|Any CPU - {97EBBD32-8980-4243-9F90-BC7075B3EC8F}.Release|x86.Build.0 = Release|Any CPU {B4D5BABE-B7C5-4D73-9F8F-B5411866A1BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {B4D5BABE-B7C5-4D73-9F8F-B5411866A1BE}.Debug|Any CPU.Build.0 = Debug|Any CPU {B4D5BABE-B7C5-4D73-9F8F-B5411866A1BE}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -292,10 +280,21 @@ Global {83FB6E90-85D6-442E-B5A6-C5D303FCF737}.Release|x64.Build.0 = Release|Any CPU {83FB6E90-85D6-442E-B5A6-C5D303FCF737}.Release|x86.ActiveCfg = Release|Any CPU {83FB6E90-85D6-442E-B5A6-C5D303FCF737}.Release|x86.Build.0 = Release|Any CPU + {B3DB9D4B-8E3E-400F-99A2-0A43DAC282CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B3DB9D4B-8E3E-400F-99A2-0A43DAC282CC}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B3DB9D4B-8E3E-400F-99A2-0A43DAC282CC}.Debug|x64.ActiveCfg = Debug|Any CPU + {B3DB9D4B-8E3E-400F-99A2-0A43DAC282CC}.Debug|x64.Build.0 = Debug|Any CPU + {B3DB9D4B-8E3E-400F-99A2-0A43DAC282CC}.Debug|x86.ActiveCfg = Debug|Any CPU + {B3DB9D4B-8E3E-400F-99A2-0A43DAC282CC}.Debug|x86.Build.0 = Debug|Any CPU + {B3DB9D4B-8E3E-400F-99A2-0A43DAC282CC}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B3DB9D4B-8E3E-400F-99A2-0A43DAC282CC}.Release|Any CPU.Build.0 = Release|Any CPU + {B3DB9D4B-8E3E-400F-99A2-0A43DAC282CC}.Release|x64.ActiveCfg = Release|Any CPU + {B3DB9D4B-8E3E-400F-99A2-0A43DAC282CC}.Release|x64.Build.0 = Release|Any CPU + {B3DB9D4B-8E3E-400F-99A2-0A43DAC282CC}.Release|x86.ActiveCfg = Release|Any CPU + {B3DB9D4B-8E3E-400F-99A2-0A43DAC282CC}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(NestedProjects) = preSolution {2A829DE3-FCB2-4FEA-A6F3-B85122C8D11E} = {F5F87A9D-C304-4833-B107-D666317F6931} - {97EBBD32-8980-4243-9F90-BC7075B3EC8F} = {F5F87A9D-C304-4833-B107-D666317F6931} {B4D5BABE-B7C5-4D73-9F8F-B5411866A1BE} = {F5F87A9D-C304-4833-B107-D666317F6931} {09D5BA00-5066-4FDF-81C5-DC5E469DB11F} = {F5F87A9D-C304-4833-B107-D666317F6931} {7B565BBE-97BE-4964-BA30-E9B8F70978ED} = {F5F87A9D-C304-4833-B107-D666317F6931} @@ -316,5 +315,6 @@ Global {62452255-1DE7-4D37-BB01-A690EC7E3156} = {F5F87A9D-C304-4833-B107-D666317F6931} {A7C80535-9577-4DE1-9544-A2CC4FB6511C} = {F5F87A9D-C304-4833-B107-D666317F6931} {83FB6E90-85D6-442E-B5A6-C5D303FCF737} = {F5F87A9D-C304-4833-B107-D666317F6931} + {B3DB9D4B-8E3E-400F-99A2-0A43DAC282CC} = {F5F87A9D-C304-4833-B107-D666317F6931} EndGlobalSection EndGlobal diff --git a/RobustToolbox b/RobustToolbox index 3bd7309..860c9af 160000 --- a/RobustToolbox +++ b/RobustToolbox @@ -1 +1 @@ -Subproject commit 3bd7309536f066ec835ca1856b4821c4036ddd2b +Subproject commit 860c9af2bfbf1477b96519067ef5e62b2525d987 diff --git a/Template.Game/Template.Game.csproj b/Template.Game/Template.Game.csproj index d26ca55..f83a001 100644 --- a/Template.Game/Template.Game.csproj +++ b/Template.Game/Template.Game.csproj @@ -17,6 +17,7 @@ +