From 750039957c33d86fe2d0e49960be361f712854ec Mon Sep 17 00:00:00 2001 From: PJB3005 Date: Sun, 16 Nov 2025 15:00:40 +0100 Subject: [PATCH] Update RT to 264.0.0 --- Directory.Packages.props | 6 ++++++ Resources/Directory.Packages.props | 22 ++++++++++++++++++++++ Resources/keybinds.yml | 4 +++- RobustTemplateSingleplayer.sln | 20 ++++++++++++++++++++ RobustToolbox | 2 +- Template.Game/EntryPoint.cs | 13 ++++++++++--- Template.Game/Program.cs | 2 ++ Template.Game/Template.Game.csproj | 11 +++-------- Template.Game/app.config | 15 --------------- 9 files changed, 67 insertions(+), 28 deletions(-) create mode 100644 Directory.Packages.props create mode 100644 Resources/Directory.Packages.props delete mode 100644 Template.Game/app.config diff --git a/Directory.Packages.props b/Directory.Packages.props new file mode 100644 index 0000000..6930a47 --- /dev/null +++ b/Directory.Packages.props @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Resources/Directory.Packages.props b/Resources/Directory.Packages.props new file mode 100644 index 0000000..643b105 --- /dev/null +++ b/Resources/Directory.Packages.props @@ -0,0 +1,22 @@ + + + + + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + + + + \ No newline at end of file diff --git a/Resources/keybinds.yml b/Resources/keybinds.yml index dd40589..59428b2 100644 --- a/Resources/keybinds.yml +++ b/Resources/keybinds.yml @@ -186,4 +186,6 @@ binds: # These are all the current engine keybinds. type: State key: Tab mod1: Shift - \ No newline at end of file +- function: TextTabComplete + type: State + key: Tab \ No newline at end of file diff --git a/RobustTemplateSingleplayer.sln b/RobustTemplateSingleplayer.sln index 2da1c0c..54c4a29 100644 --- a/RobustTemplateSingleplayer.sln +++ b/RobustTemplateSingleplayer.sln @@ -51,6 +51,13 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robust.Shared.CompNetworkGe EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robust.Serialization.Generator", "RobustToolbox\Robust.Serialization.Generator\Robust.Serialization.Generator.csproj", "{B3DB9D4B-8E3E-400F-99A2-0A43DAC282CC}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Robust.Xaml", "RobustToolbox\Robust.Xaml\Robust.Xaml.csproj", "{D6ABF4A1-95C0-4930-9076-58413D0617BE}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Project Files", "Project Files", "{281D65F5-7202-471B-8B08-FCEC6ADED560}" + ProjectSection(SolutionItems) = preProject + Directory.Packages.props = Directory.Packages.props + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -292,6 +299,18 @@ Global {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 + {D6ABF4A1-95C0-4930-9076-58413D0617BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D6ABF4A1-95C0-4930-9076-58413D0617BE}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D6ABF4A1-95C0-4930-9076-58413D0617BE}.Debug|x64.ActiveCfg = Debug|Any CPU + {D6ABF4A1-95C0-4930-9076-58413D0617BE}.Debug|x64.Build.0 = Debug|Any CPU + {D6ABF4A1-95C0-4930-9076-58413D0617BE}.Debug|x86.ActiveCfg = Debug|Any CPU + {D6ABF4A1-95C0-4930-9076-58413D0617BE}.Debug|x86.Build.0 = Debug|Any CPU + {D6ABF4A1-95C0-4930-9076-58413D0617BE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D6ABF4A1-95C0-4930-9076-58413D0617BE}.Release|Any CPU.Build.0 = Release|Any CPU + {D6ABF4A1-95C0-4930-9076-58413D0617BE}.Release|x64.ActiveCfg = Release|Any CPU + {D6ABF4A1-95C0-4930-9076-58413D0617BE}.Release|x64.Build.0 = Release|Any CPU + {D6ABF4A1-95C0-4930-9076-58413D0617BE}.Release|x86.ActiveCfg = Release|Any CPU + {D6ABF4A1-95C0-4930-9076-58413D0617BE}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(NestedProjects) = preSolution {2A829DE3-FCB2-4FEA-A6F3-B85122C8D11E} = {F5F87A9D-C304-4833-B107-D666317F6931} @@ -316,5 +335,6 @@ Global {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} + {D6ABF4A1-95C0-4930-9076-58413D0617BE} = {F5F87A9D-C304-4833-B107-D666317F6931} EndGlobalSection EndGlobal diff --git a/RobustToolbox b/RobustToolbox index 860c9af..dbde802 160000 --- a/RobustToolbox +++ b/RobustToolbox @@ -1 +1 @@ -Subproject commit 860c9af2bfbf1477b96519067ef5e62b2525d987 +Subproject commit dbde8023ed256ac69ae4b419422c936f78361653 diff --git a/Template.Game/EntryPoint.cs b/Template.Game/EntryPoint.cs index f24b298..227adf6 100644 --- a/Template.Game/EntryPoint.cs +++ b/Template.Game/EntryPoint.cs @@ -1,5 +1,7 @@ using System.Globalization; using Robust.Client; +using Robust.Shared; +using Robust.Shared.Configuration; using Robust.Shared.ContentPack; using Robust.Shared.GameObjects; using Robust.Shared.IoC; @@ -25,12 +27,17 @@ public sealed class EntryPoint : GameClient // Default to en-US. // DEVNOTE: If you want your game to be multi-regional at runtime, you'll need to // do something more complicated here. - IoCManager.Resolve().LoadCulture(new CultureInfo(Culture)); + Dependencies.Resolve().LoadCulture(new CultureInfo(Culture)); + + // DEVNOTE: Set this to the name of your solution file to make XAML hot reload work. + Dependencies.Resolve().OverrideDefault( + CVars.XamlHotReloadMarkerName, + "RobustTemplateSingleplayer.sln"); } public override void Init() { - var factory = IoCManager.Resolve(); + var factory = Dependencies.Resolve(); // DEVNOTE: Registers all of your components. factory.DoAutoRegistrations(); @@ -53,7 +60,7 @@ public sealed class EntryPoint : GameClient // DEVNOTE: This starts the singleplayer mode, // which means you can start creating entities, spawning things... // If you want to have a main menu to start the game from instead, use the StateManager. - IoCManager.Resolve().StartSinglePlayer(); + Dependencies.Resolve().StartSinglePlayer(); } protected override void Dispose(bool disposing) diff --git a/Template.Game/Program.cs b/Template.Game/Program.cs index 858acc1..19b3302 100644 --- a/Template.Game/Program.cs +++ b/Template.Game/Program.cs @@ -1,9 +1,11 @@ +using System; using Robust.Client; namespace Template.Game; internal static class Program { + [STAThread] public static void Main(string[] args) { ContentStart.StartLibrary(args, new GameControllerOptions() diff --git a/Template.Game/Template.Game.csproj b/Template.Game/Template.Game.csproj index f83a001..9b226fc 100644 --- a/Template.Game/Template.Game.csproj +++ b/Template.Game/Template.Game.csproj @@ -1,19 +1,14 @@ - - - $(TargetFramework) latest false false ..\bin\Template.Game\ Exe - Template.Game - - - + + @@ -22,6 +17,6 @@ - + diff --git a/Template.Game/app.config b/Template.Game/app.config deleted file mode 100644 index e1d9d49..0000000 --- a/Template.Game/app.config +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file