Merge branch 'Facepunch:master' into feature/fix-regex

Author: scomitch

.github/workflows/pull_request.yml

@@ -1,4 +1,4 @@
-name: Pull Request
+name: PR Triage
 on:
   pull_request_target:
     types: [ labeled ]
@@ -8,10 +8,48 @@ jobs:
     runs-on: ubuntu-latest
     if: github.event.label.name == 'triaged'
     steps:
+      - name: Ensure PR checks passed
+        uses: actions/github-script@v7
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          script: |
+            const requiredChecks = ['format', 'tests'];
+
+            const pr = context.payload.pull_request;
+            if (!pr) {
+              throw new Error('No pull request found in event payload.');
+            }
+
+            const { data } = await github.rest.checks.listForRef({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              ref: pr.head.sha,
+              per_page: 100
+            });
+
+            const checkRuns = data.check_runs ?? [];
+            for (const requiredCheck of requiredChecks) {
+              const match = checkRuns.find(run => (run.name ?? '') === requiredCheck);
+
+              if (!match || match.conclusion !== 'success') {
+                const status = match ? (match.conclusion ?? match.status ?? 'unknown') : 'missing';
+                core.warning(`Required check '${requiredCheck}' did not pass (${status}).`);
+                throw new Error('Cannot triage until required checks succeed. Remove and re-add the triaged label to retry.');
+              }
+            }
+
       - name: Repository Dispatch
-        uses: peter-evans/repository-dispatch@v4
+        uses: actions/github-script@v7
+        env:
+          DISPATCH_CONTEXT: ${{ toJson(github) }}
         with:
-          token: ${{ secrets.SBOXBOT_TOKEN }}
-          repository: Facepunch/sbox
-          event-type: pr-triaged
-          client-payload: '{"github": ${{ toJson(github) }}}'
+          github-token: ${{ secrets.SBOXBOT_TOKEN }}
+          script: |
+            const clientPayload = JSON.parse(process.env.DISPATCH_CONTEXT);
+
+            await github.rest.repos.createDispatchEvent({
+              owner: 'Facepunch',
+              repo: 'sbox',
+              event_type: 'pr-triaged',
+              client_payload: { github: clientPayload }
+            });

.github/workflows/pull_request_checks.yml

@@ -1,4 +1,4 @@
-name: Pull Request Checks
+name: Tests
 
 on:
   pull_request:
@@ -8,7 +8,7 @@ permissions:
   contents: read
 
 jobs:
-  format:
+  tests:
     runs-on: [ windows-latest ]
     steps:
       - name: Full Checkout
@@ -22,11 +22,8 @@ jobs:
         with:
           dotnet-version: '10.0.x'
 
-      - name: Format
-        run: dotnet run --project .\engine\Tools\SboxBuild\SboxBuild.csproj -- format --verify
-
-      - name: Bootstrap
-        run: .\Bootstrap.bat
+      - name: Build
+        run: dotnet run --project .\engine\Tools\SboxBuild\SboxBuild.csproj -- build --config Developer
 
       - name: Test
         run: dotnet run --project .\engine\Tools\SboxBuild\SboxBuild.csproj -- test

.github/workflows/pull_request_formatting.yml

@@ -0,0 +1,27 @@
+name: Formatting
+
+on:
+  pull_request:
+    branches: [ master ]
+
+permissions:
+  contents: read
+
+jobs:
+  format:
+    runs-on: [ windows-latest ]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          clean: true
+          fetch-depth: 1
+          persist-credentials: false
+
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v5
+        with:
+          dotnet-version: '10.0.x'
+
+      - name: Format
+        run: dotnet run --project .\engine\Tools\SboxBuild\SboxBuild.csproj -- format --verify

engine/Definitions/common/Physics/IPhysicsJoint.def

@@ -79,6 +79,43 @@ native class IPhysicsJoint as NativeEngine.IPhysicsJoint
 	float Motor_GetAngularDampingRatio();
 	float Motor_GetMaxSpringForce();
 	float Motor_GetMaxSpringTorque();
+
+	void Wheel_EnableSuspension( bool flag );
+	bool Wheel_IsSuspensionEnabled();
+	void Wheel_SetSuspensionHertz( float hertz );
+	float Wheel_GetSuspensionHertz();
+	void Wheel_SetSuspensionDampingRatio( float dampingRatio );
+	float Wheel_GetSuspensionDampingRatio();
+	void Wheel_EnableSuspensionLimit( bool flag );
+	bool Wheel_IsSuspensionLimitEnabled();
+	float Wheel_GetLowerSuspensionLimit();
+	float Wheel_GetUpperSuspensionLimit();
+	void Wheel_SetSuspensionLimits( float lower, float upper );
+	void Wheel_EnableSpinMotor( bool flag );
+	bool Wheel_IsSpinMotorEnabled();
+	void Wheel_SetSpinMotorSpeed( float speed );
+	float Wheel_GetSpinMotorSpeed();
+	void Wheel_SetMaxSpinTorque( float torque );
+	float Wheel_GetMaxSpinTorque();
+	void Wheel_EnableSteering( bool flag );
+	bool Wheel_IsSteeringEnabled();
+	void Wheel_SetSteeringHertz( float hertz );
+	float Wheel_GetSteeringHertz();
+	void Wheel_SetSteeringDampingRatio( float dampingRatio );
+	float Wheel_GetSteeringDampingRatio();
+	void Wheel_SetMaxSteeringTorque( float torque );
+	float Wheel_GetMaxSteeringTorque();
+	void Wheel_EnableSteeringLimit( bool flag );
+	bool Wheel_IsSteeringLimitEnabled();
+	float Wheel_GetLowerSteeringLimit();
+	float Wheel_GetUpperSteeringLimit();
+	void Wheel_SetSteeringLimits( float lowerRadians, float upperRadians );
+	void Wheel_SetTargetSteeringAngle( float radians );
+	float Wheel_GetTargetSteeringAngle();
+	float Wheel_GetSpinSpeed();
+	float Wheel_GetSpinTorque();
+	float Wheel_GetSteeringAngle();
+	float Wheel_GetSteeringTorque();
 }
 
 managed static class Sandbox.Physics.PhysicsEngine

engine/Definitions/common/Physics/IPhysicsWorld.def

@@ -43,6 +43,7 @@ native class IPhysicsWorld
 	IPhysicsJoint AddPrismaticJoint( IPhysicsBody pBody1, IPhysicsBody pBody2, Transform localFrame1, Transform localFrame2 );
 	IPhysicsJoint AddSphericalJoint( IPhysicsBody pBody1, IPhysicsBody pBody2, Transform localFrame1, Transform localFrame2 );
 	IPhysicsJoint AddMotorJoint( IPhysicsBody pBody1, IPhysicsBody pBody2, Transform localFrame1, Transform localFrame2 );
+	IPhysicsJoint AddWheelJoint( IPhysicsBody pBody1, IPhysicsBody pBody2, Transform localFrame1, Transform localFrame2 );
 
 	//
 	// Sets the collision rules using a json serialized Sandbox.Internal.CollisionRules

engine/Definitions/engine/engine.globals.def

@@ -66,27 +66,6 @@ native static class global as NativeEngine.EngineGlobal
 	bool SourceEngineFrame( CMaterialSystem2AppSystemDict appDict, double currentTime, double previousTime );
 	void SourceEngineShutdown( CMaterialSystem2AppSystemDict appDict, bool forced );
 
-	inline void UpdateWindowSize()
-	{
-		VideoModeChange_t* pModeChange = g_pEngineServiceMgr->GetVideoModeChange();
-		if ( pModeChange )
-		{
-			g_pRenderService->SetVideoMode( pModeChange->m_deviceInfo );
-			pModeChange->ModeChangeComplete();
-		}
-
-		SwapChainHandle_t m_hSwapChain = g_pEngineServiceMgr->GetEngineSwapChain();
-		RenderViewport_t renderViewport;
-		renderViewport.Init( 0, 0, 512, 512, 0, 1 );
-
-		CRenderContextPtr pRenderContext( g_pRenderDevice, RenderTargetDesc_t( m_hSwapChain, RENDER_SRGB ), "Clear" );
-		pRenderContext->Clear( Vector4D( 0, 0, 0, 0 ) );
-		pRenderContext->SetViewports( 1, &renderViewport );
-
-		pRenderContext->Submit();
-		g_pRenderDevice->Present( m_hSwapChain );
-	}
-
 	inline float GetDiagonalDpi()
 	{
 		return Plat_GetDPI();

engine/Definitions/resources/CPhysAggregateData.def

@@ -77,6 +77,7 @@ native class VPhysXBodyPart_t
 	float m_flInertiaScale;
 	float m_flLinearDamping;
 	float m_flAngularDamping;
+	float m_flGravityScale;
 
 	bool m_bOverrideMassCenter;
 	Vector3 m_vMassCenterOverride;

engine/Definitions/tools/widgetutil.def

@@ -17,7 +17,7 @@ native static class WidgetUtil Native.WidgetUtil
 	static void PostKeyEvent( QWidget target, int key );
 
 	static void PaintSetFont( QPainter painter, string fontName, int size, int weight, bool italic, bool heightInPixels );
-	static SwapChainHandle_t CreateSwapChain( QWidget target );
+	static SwapChainHandle_t CreateSwapChain( QWidget target, RenderMultisampleType_t nMSAAAmount );
 
 	static void SetWindowNoActivate( QWidget widget );
 

engine/Mounting/Sandbox.Mounting/MountedGame/BaseGameMount.cs

@@ -63,7 +63,7 @@ internal async Task MountInternal()
 
 		await Mount( new MountContext( this ) );
 
-		foreach ( var entry in _entries )
+		foreach ( var entry in _entries.Values )
 		{
 			RootFolder.AddResource( entry );
 		}
@@ -81,7 +81,7 @@ internal void ShutdownInternal()
 
 		Shutdown();
 
-		foreach ( var entry in _entries )
+		foreach ( var entry in _entries.Values )
 		{
 			entry?.ShutdownInternal();
 		}
@@ -98,19 +98,18 @@ protected virtual void Shutdown()
 
 	}
 
-	readonly List<ResourceLoader> _entries = [];
+	readonly Dictionary<string, ResourceLoader> _entries = [];
 
 	/// <summary>
 	/// All of the resources in this game
 	/// </summary>
-	public IReadOnlyCollection<ResourceLoader> Resources => _entries.AsReadOnly();
+	public IReadOnlyCollection<ResourceLoader> Resources => _entries.Values;
 
 	public ResourceFolder RootFolder { get; internal set; }
 
 	internal void RegisterFileInternal( ResourceLoader entry )
 	{
-		_entries.Add( entry );
-
+		_entries[entry.Path] = entry;
 	}
 
 	/// <summary>

engine/Sandbox.Access/Rules/BaseAccess.cs

@@ -18,6 +18,7 @@ internal static partial class Rules
 		"System.Private.CoreLib/System.Collections.*",
 		"System.Collections/System.Collections.*",
 		"System.Collections.Immutable/System.Collections.Immutable.*",
+		"System.Collections.Immutable/System.Collections.Frozen.*",
 		"System.Collections.Immutable/System.Linq.ImmutableArrayExtensions.*",
 		"System.ObjectModel/System.Collections.ObjectModel.*",
 		"System.ObjectModel/System.Collections.Specialized.*",