Update RT to 264.0.0

This commit is contained in:
PJB3005 2025-11-16 15:00:40 +01:00
parent 05cb8ad033
commit 750039957c
No known key found for this signature in database
9 changed files with 67 additions and 28 deletions

6
Directory.Packages.props Normal file
View file

@ -0,0 +1,6 @@
<Project>
<Import Project="RobustToolbox/Directory.Packages.props" />
<ItemGroup>
<!-- Put versions for any additional NuGet packages you might want to use here. -->
</ItemGroup>
</Project>

View file

@ -0,0 +1,22 @@
<Project>
<Import Project="RobustToolbox/Directory.Packages.props" />
<ItemGroup>
<!--
Remove EF Core packages from Robust. They're only used by Robust.Benchmarks anyways.
-->
<PackageVersion Remove="Npgsql.EntityFrameworkCore.PostgreSQL" />
<PackageVersion Remove="Microsoft.EntityFrameworkCore.Design" />
<PackageVersion Include="CsvHelper" Version="33.0.1" />
<PackageVersion Include="ImGui.NET" Version="1.87.3" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageVersion>
<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="9.0.1" />
<PackageVersion Include="NetCord" Version="1.0.0-alpha.388" />
<PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.3" />
<PackageVersion Include="OpenTK" Version="4.9.4" />
<PackageVersion Include="Veldrid" Version="4.8.0" />
<PackageVersion Include="Veldrid.SPIRV" Version="1.0.15" />
</ItemGroup>
</Project>

View file

@ -186,4 +186,6 @@ binds: # These are all the current engine keybinds.
type: State
key: Tab
mod1: Shift
- function: TextTabComplete
type: State
key: Tab

View file

@ -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

@ -1 +1 @@
Subproject commit 860c9af2bfbf1477b96519067ef5e62b2525d987
Subproject commit dbde8023ed256ac69ae4b419422c936f78361653

View file

@ -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<ILocalizationManager>().LoadCulture(new CultureInfo(Culture));
Dependencies.Resolve<ILocalizationManager>().LoadCulture(new CultureInfo(Culture));
// DEVNOTE: Set this to the name of your solution file to make XAML hot reload work.
Dependencies.Resolve<IConfigurationManager>().OverrideDefault(
CVars.XamlHotReloadMarkerName,
"RobustTemplateSingleplayer.sln");
}
public override void Init()
{
var factory = IoCManager.Resolve<IComponentFactory>();
var factory = Dependencies.Resolve<IComponentFactory>();
// 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<IBaseClient>().StartSinglePlayer();
Dependencies.Resolve<IBaseClient>().StartSinglePlayer();
}
protected override void Dispose(bool disposing)

View file

@ -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()

View file

@ -1,19 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\RobustToolbox\MSBuild\Robust.Properties.targets" />
<PropertyGroup>
<!-- Work around https://github.com/dotnet/project-system/issues/4314 -->
<TargetFramework>$(TargetFramework)</TargetFramework>
<LangVersion>latest</LangVersion>
<IsPackable>false</IsPackable>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<OutputPath>..\bin\Template.Game\</OutputPath> <!-- This is important for gamepack mounting purposes. -->
<OutputType Condition="'$(FullRelease)' != 'True'">Exe</OutputType>
<RootNamespace>Template.Game</RootNamespace>
</PropertyGroup>
<Import Project="..\RobustToolbox\MSBuild\Robust.DefineConstants.targets" />
<ItemGroup>
<PackageReference Include="Nett" Version="0.15.0" />
<PackageReference Include="JetBrains.Annotations" Version="2020.1.0" PrivateAssets="All" />
<PackageReference Include="Nett" />
<PackageReference Include="JetBrains.Annotations" PrivateAssets="All" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\RobustToolbox\Lidgren.Network\Lidgren.Network.csproj" />
@ -22,6 +17,6 @@
<ProjectReference Include="..\RobustToolbox\Robust.Shared\Robust.Shared.csproj" />
<ProjectReference Include="..\RobustToolbox\Robust.Client\Robust.Client.csproj" />
</ItemGroup>
<Import Project="..\RobustToolbox\MSBuild\Robust.Engine.targets" />
<Import Project="..\RobustToolbox\MSBuild\Robust.Properties.targets" />
<Import Project="..\RobustToolbox\MSBuild\XamlIL.targets" />
</Project>

View file

@ -1,15 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="ICSharpCode.SharpZipLib" publicKeyToken="1b03e6acf1164f73" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-0.86.0.518" newVersion="0.86.0.518" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>