Merge branch 'Facepunch:master' into fromhost_fix

Author: andy013

.github/workflows/pull_request.yml

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

public/.github/workflows/formatting.yml …ub/workflows/pull_request_formatting.ymlpublic/.github/workflows/formatting.yml renamed to .github/workflows/pull_request_formatting.yml public/.github/workflows/formatting.yml renamed to .github/workflows/pull_request_formatting.yml

@@ -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/IPhysicsJoint.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/common/Physics/IPhysicsWorld.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/engine/engine.globals.def

@@ -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.*",

engine/Sandbox.Access/Rules/BaseAccess.cs

@@ -136,6 +136,7 @@ internal static int RegisterHandle( IntPtr ptr, uint type )
 			if ( type == Types.PhysicsSphericalJoint ) return New( ptr, ( h ) => new Sandbox.Physics.BallSocketJoint( h ) );
 			if ( type == Types.PhysicsPulleyJoint ) return New( ptr, ( h ) => new Sandbox.Physics.PulleyJoint( h ) );
 			if ( type == Types.PhysicsMotorJoint ) return New( ptr, ( h ) => new Sandbox.Physics.ControlJoint( h ) );
+			if ( type == Types.PhysicsWheelJoint ) return New( ptr, ( h ) => new Sandbox.Physics.WheelJoint( h ) );
 			if ( type == Types.PhysicsJoint ) return New( ptr, ( h ) => new Sandbox.Physics.PhysicsJoint( h ) );
 
 			if ( type == Types.PhysicsConicalJoint ) return New( ptr, ( h ) => new Sandbox.Physics.PhysicsJoint( h ) );
@@ -193,6 +194,7 @@ static class Types
 			internal static uint PhysicsPrismaticJoint { get; } = StringToken.FindOrCreate( "PhysicsPrismaticJoint" );
 			internal static uint PhysicsConicalJoint { get; } = StringToken.FindOrCreate( "PhysicsConicalJoint" );
 			internal static uint PhysicsMotorJoint { get; } = StringToken.FindOrCreate( "PhysicsMotorJoint" );
+			internal static uint PhysicsWheelJoint { get; } = StringToken.FindOrCreate( "PhysicsWheelJoint" );
 			internal static uint PhysicsPulleyJoint { get; } = StringToken.FindOrCreate( "PhysicsPulleyJoint" );
 			internal static uint PhysicsGenericJoint { get; } = StringToken.FindOrCreate( "PhysicsGenericJoint" );
 			internal static uint PhysicsNullJoint { get; } = StringToken.FindOrCreate( "PhysicsNullJoint" );

engine/Sandbox.Engine/Core/Interop/Handle.cs

@@ -44,6 +44,7 @@
 		<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="10.0.0" />
 		<PackageReference Include="Svg.Skia" Version="2.0.0.4" />
 		<PackageReference Include="Azure.Messaging.WebPubSub.Client" Version="1.0.0" />
+		<PackageReference Include="System.Numerics.Tensors" Version="10.0.0" />
 	</ItemGroup>
 
 	<ItemGroup>

engine/Sandbox.Engine/Sandbox.Engine.csproj

@@ -332,7 +332,7 @@ internal void HandleImpactDamage( Collision collision )
 		if ( !EnableImpactDamage ) return;
 		if ( IsProxy ) return;
 
-		var speed = collision.Contact.Speed.Length;
+		var speed = collision.Contact.NormalSpeed;
 		var minSpeed = MinImpactDamageSpeed;
 		if ( minSpeed <= 0 )
 			minSpeed = 500f;
@@ -477,10 +477,23 @@ internal void UpdateTransformFromBody()
 	/// </summary>
 	internal Transform? TargetTransform { get; set; }
 
+	/// <summary>
+	/// Linear velocity before physics step. Internal until someone needs them.
+	/// </summary>
+	internal Vector3 PreVelocity { get; private set; }
+
+	/// <summary>
+	/// Angular velocity before physics step. Internal until someone needs them.
+	/// </summary>
+	internal Vector3 PreAngularVelocity { get; private set; }
+
 	void IScenePhysicsEvents.PrePhysicsStep()
 	{
 		if ( !_body.IsValid() ) return;
 
+		PreVelocity = _body.Velocity;
+		PreAngularVelocity = _body.AngularVelocity;
+
 		if ( TargetTransform.HasValue )
 		{
 			// Editor transform uses velocity to move.