Merge branch 'Facepunch:master' into categorize-base-components

Author: Nolankicks

.github/workflows/pull_request.yml

@@ -13,7 +13,7 @@ jobs:
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |
-            const requiredChecks = ['Tests', 'Formatting'];
+            const requiredChecks = ['format', 'tests'];
 
             const pr = context.payload.pull_request;
             if (!pr) {
@@ -33,16 +33,8 @@ jobs:
 
               if (!match || match.conclusion !== 'success') {
                 const status = match ? (match.conclusion ?? match.status ?? 'unknown') : 'missing';
-                core.warning(`Required check '${requiredCheck}' did not pass (${status}). Removing triaged label.`);
-
-                await github.rest.issues.removeLabel({
-                  owner: context.repo.owner,
-                  repo: context.repo.repo,
-                  issue_number: pr.number,
-                  name: 'triaged'
-                });
-
-                throw new Error('Cannot triage until required checks succeed.');
+                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.');
               }
             }
 

.github/workflows/pull_request_checks.yml

@@ -8,7 +8,7 @@ permissions:
   contents: read
 
 jobs:
-  format:
+  tests:
     runs-on: [ windows-latest ]
     steps:
       - name: Full Checkout

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/Sandbox.Engine/Game/Game/Game.Scene.cs

@@ -70,9 +70,12 @@ internal static void Render( SwapChainHandle_t swapChain )
 
 	internal static void Shutdown()
 	{
+		IsClosing = true;
 		IsPlaying = false;
 
 		ActiveScene?.Destroy();
 		ActiveScene = null;
+
+		IsClosing = false;
 	}
 }

engine/Sandbox.Engine/Protocol.cs

@@ -13,7 +13,7 @@ public static class Protocol
 	/// <summary>
 	/// We cannot talk to servers or clients with a network protocol different to this.
 	/// </summary>
-	public static int Network => 1094;
+	public static int Network => 1095;
 }
 
 // Api Versions
@@ -24,6 +24,7 @@ public static class Protocol
 
 
 // Network Versions
+// 1095. 23rd November 2025 - Snapshot parent salt
 // 1094. 10th November 2025 - Network visibility
 // 1093. 13th October 2025 - LZ4 compression
 // 1092. 1st October 2025 - Networking optimizations

engine/Sandbox.Engine/Resources/Model/Model.Physics.cs

@@ -214,6 +214,7 @@ public sealed class BodyPart
 		public float AngularDamping => native.m_flAngularDamping;
 		public bool OverrideMassCenter => native.m_bOverrideMassCenter;
 		public Vector3 MassCenterOverride => native.m_vMassCenterOverride;
+		public float GravityScale => native.m_flGravityScale;
 
 		internal BodyPart( PhysicsGroupDescription physicsGroupDescription, string boneName, VPhysXBodyPart_t vPhysXBodyPart_t, Transform transform )
 		{

engine/Sandbox.Engine/Scene/Components/Collider/ModelCollider.cs

@@ -142,6 +142,12 @@ protected override IEnumerable<PhysicsShape> CreatePhysicsShapes( PhysicsBody ta
 
 			if ( part.AngularDamping > 0 )
 				targetBody.AngularDamping = part.AngularDamping;
+
+			if ( part.GravityScale != 1.0f )
+			{
+				targetBody.DefaultGravityScale = part.GravityScale;
+				targetBody.GravityScale = part.GravityScale;
+			}
 		}
 	}
 

engine/Sandbox.Engine/Scene/Components/Collider/ModelPhysics.PhysicsCreate.cs

@@ -184,6 +184,7 @@ private void CreateParts( PhysicsGroupDescription physics, Transform world, Comp
 			body.MassOverride = part.Mass;
 			body.OverrideMassCenter = part.OverrideMassCenter;
 			body.MassCenterOverride = part.MassCenterOverride;
+			body.GravityScale = part.GravityScale;
 			body.GameObjectSource = GameObject;
 
 			var bodyTransform = body.WorldTransform;

engine/Sandbox.Engine/Scene/GameObject/GameObject.Network.cs

@@ -279,12 +279,13 @@ void Msg_RequestTakeOwnership( ushort snapshotVersion )
 	/// Set the parent of this networked object.
 	/// </summary>
 	[Rpc.Broadcast]
-	void Msg_SetParent( Guid id, Transform transform, ushort snapshotVersion )
+	void Msg_SetParent( Guid id, bool keepWorldPosition )
 	{
 		if ( _net is null ) return;
 
 		var caller = Rpc.Caller;
-		if ( caller == Connection.Local ) return;
+		if ( caller == Connection.Local )
+			return;
 
 		// Can this caller set the parent?
 		if ( !caller.IsHost && !_net.HasControl( caller ) )
@@ -302,8 +303,7 @@ void Msg_SetParent( Guid id, Transform transform, ushort snapshotVersion )
 				return;
 		}
 
-		_net.LocalSnapshotState.Version = snapshotVersion;
-		SetParentFromNetwork( parentObject, transform );
+		SetParentFromNetwork( parentObject, keepWorldPosition );
 	}
 
 	/// <summary>