Merge branch 'Facepunch:master' into master

Author: chesiren

.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/Sandbox.Tools/Scene/Session/SceneEditorSession.cs

@@ -75,11 +75,11 @@ void CreateSceneDock()
 		SceneDock = EditorTypeLibrary.Create<Widget>( "SceneDock", new object[] { this } );
 		SceneDock.Name = $"SceneDock:{(Scene.Source?.ResourcePath ?? "untitled")}";
 
-		SetDockProperties();
-
 		SceneDock.Parent = EditorWindow;
 		SceneDock.Visible = true;
 
+		UpdateEditorTitle();
+
 		Dock();
 	}
 
@@ -204,25 +204,6 @@ public void Tick()
 		}
 	}
 
-	[EditorEvent.Frame]
-	private void SetDockProperties()
-	{
-		if ( !SceneDock.IsValid() )
-			return;
-
-		var title = Scene.Name.Trim();
-
-		if ( IsPrefabSession )
-		{
-			SceneDock.SetWindowIcon( "home_repair_service" );
-			SceneDock.WindowTitle = $"Prefab: {title}";
-		}
-		else
-		{
-			SceneDock.SetWindowIcon( "grid_4x4" );
-		}
-	}
-
 	internal void UpdateEditorTitle()
 	{
 		if ( !SceneDock.IsValid() )
@@ -235,8 +216,18 @@ internal void UpdateEditorTitle()
 
 		if ( SceneDock is not null )
 		{
-			SceneDock.WindowTitle = name;
 			SceneDock.Name = $"SceneDock:{(Scene.Source?.ResourcePath ?? "untitled")}";
+
+			if ( IsPrefabSession )
+			{
+				SceneDock.SetWindowIcon( "home_repair_service" );
+				SceneDock.WindowTitle = $"Prefab: {name}";
+			}
+			else
+			{
+				SceneDock.SetWindowIcon( "grid_4x4" );
+				SceneDock.WindowTitle = name;
+			}
 		}
 	}
 

engine/Tools/SboxBuild/Pipelines/Deploy.cs

@@ -23,12 +23,6 @@ public static Pipeline Create( BuildTarget target, bool clean = false )
 		builder.AddStep( new BuildShaders( "Build Shaders" ) );
 		builder.AddStep( new BuildContent( "Build Content" ) );
 
-		if ( target == BuildTarget.Staging )
-		{
-			// Sync to public repository
-			builder.AddStep( new SyncPublicRepo( "Sync to Public Repository" ) );
-		}
-
 		// Testing
 		builder.AddStep( new Test( "Tests" ) );
 

engine/Tools/SboxBuild/Program.cs

@@ -201,7 +201,7 @@ private static void AddSyncPublicRepo( RootCommand rootCommand )
 		var option = new Option<bool>(
 			"--dry-run",
 			description: "Whether to perform a dry run",
-			getDefaultValue: () => true );
+			getDefaultValue: () => false );
 
 		syncCommand.AddOption( option );
 

engine/Tools/SboxBuild/Steps/SyncPublicRepo.cs

@@ -152,8 +152,14 @@ private bool SyncToPublicRepository()
 			var uploadedArtifacts = new HashSet<ArtifactFileInfo>();
 			var uploadedArtifactHashes = new HashSet<string>( StringComparer.OrdinalIgnoreCase );
 
-			// Upload build artifacts from original repository
-			if ( !TryUploadBuildArtifacts( repositoryRoot, remoteBase, dryRun, ref uploadedArtifacts, uploadedArtifactHashes ) )
+			// Upload windows binaries
+			if ( !TryUploadBuildArtifacts( repositoryRoot, remoteBase, "win64", dryRun, ref uploadedArtifacts, uploadedArtifactHashes ) )
+			{
+				return false;
+			}
+
+			// Upload linux binaries
+			if ( !TryUploadBuildArtifacts( repositoryRoot, remoteBase, "linuxsteamrt64", dryRun, ref uploadedArtifacts, uploadedArtifactHashes ) )
 			{
 				return false;
 			}
@@ -263,9 +269,9 @@ private static bool CleanIgnoredFiles( string relativeRepoPath )
 		return false;
 	}
 
-	private static bool TryUploadBuildArtifacts( string repositoryRoot, string remoteBase, bool skipUpload, ref HashSet<ArtifactFileInfo> artifacts, HashSet<string> uploadedHashes )
+	private static bool TryUploadBuildArtifacts( string repositoryRoot, string remoteBase, string platform, bool skipUpload, ref HashSet<ArtifactFileInfo> artifacts, HashSet<string> uploadedHashes )
 	{
-		var buildArtifactsRoot = Path.Combine( repositoryRoot, "game", "bin", "win64" );
+		var buildArtifactsRoot = Path.Combine( repositoryRoot, "game", "bin", platform );
 		if ( !Directory.Exists( buildArtifactsRoot ) )
 		{
 			Log.Info( $"Build artifacts directory not found, skipping upload: {buildArtifactsRoot}" );
@@ -436,7 +442,7 @@ private string PushToPublicRepository( string relativeRepoPath )
 			}
 		}
 
-		if ( !Utility.RunProcess( "git", $"push public {PUBLIC_BRANCH} --force", relativeRepoPath ) )
+		if ( !Utility.RunProcess( "git", $"push public {PUBLIC_BRANCH}", relativeRepoPath ) )
 		{
 			Log.Error( "Failed to push to public repository" );
 			return null;
@@ -486,32 +492,19 @@ private static HashSet<string> GetCurrentLfsFiles( string relativeRepoPath )
 
 	private static HashSet<string> GetAllPublicLfsFiles( string relativeRepoPath )
 	{
-		// Get base set
 		var trackedFiles = GetCurrentLfsFiles( relativeRepoPath );
 
-		// Extend with all lfs files from first commit to HEAD
-		var firstCommitHash = string.Empty;
-		if ( !Utility.RunProcess( "git", "rev-list --max-parents=0 HEAD", relativeRepoPath, onDataReceived: ( _, e ) =>
+		if ( !Utility.RunProcess( "git", "lfs ls-files --all --deleted --name-only", relativeRepoPath, onDataReceived: ( _, e ) =>
 		{
-			if ( !string.IsNullOrWhiteSpace( e.Data ) )
+			if ( string.IsNullOrWhiteSpace( e.Data ) )
 			{
-				firstCommitHash = e.Data.Trim();
+				return;
 			}
-		} ) )
-		{
-			Log.Error( "Failed find first commit" );
-			return null;
-		}
 
-		if ( !Utility.RunProcess( "git", $"lfs ls-files --name-only {firstCommitHash} HEAD", relativeRepoPath, onDataReceived: ( _, e ) =>
-		{
-			if ( !string.IsNullOrWhiteSpace( e.Data ) )
-			{
-				trackedFiles.Add( ToForwardSlash( e.Data.Trim() ) );
-			}
+			trackedFiles.Add( ToForwardSlash( e.Data.Trim() ) );
 		} ) )
 		{
-			Log.Error( "Failed to list LFS tracked files" );
+			Log.Error( "Failed to list historical LFS tracked files" );
 			return null;
 		}
 

game/addons/menu/Assets/scenes/avatar.scene

@@ -6894,12 +6894,12 @@
   "__references": [
     "facepunch.beech_bush_large#108296",
     "facepunch.beech_hedge_40x128_corner#108300",
-    "facepunch.beech_hedge_40x128#29090",
+    "facepunch.beech_hedge_40x128#108298",
     "facepunch.binbag_a2#17182",
     "facepunch.binbag_pile_a2#17187",
     "facepunch.floor_grass_a#18648",
-    "facepunch.grass_clump_a#47110",
-    "facepunch.grass_clump_b#29063",
+    "facepunch.grass_clump_a#126338",
+    "facepunch.grass_clump_b#126339",
     "facepunch.leaf_a1#56169",
     "facepunch.leaf_a2#56170",
     "facepunch.leaf_a3#56171",
@@ -6909,9 +6909,9 @@
     "facepunch.old_bench#108398",
     "facepunch.pine_bush_regular_a#108316",
     "facepunch.pine_bush_regular_c#108318",
-    "facepunch.rock_scatter_01#47198",
-    "facepunch.rock_scatter_pile_02#47202",
-    "facepunch.rock_scatter_pile_05#47205",
+    "facepunch.rock_scatter_01#116941",
+    "facepunch.rock_scatter_pile_02#116945",
+    "facepunch.rock_scatter_pile_05#116942",
     "facepunch.street_bin_rubbish#33657",
     "facepunch.studio_light_projector#29115",
     "facepunch.summer_flowers_01#47032",
@@ -6921,7 +6921,7 @@
     "facepunch.trash_pile_c_04#37374",
     "facepunch.trash_pile_c_05#37530",
     "facepunch.trash_pile_c_cigs_01#37375",
-    "facepunch.tree_oak_big_a#38050"
+    "facepunch.tree_oak_big_a#117390"
   ],
   "__version": 3
 }

game/addons/menu/Assets/scenes/menu-main.scene

@@ -7769,7 +7769,7 @@
     "facepunch.binbag_pile_a2#17187",
     "facepunch.floor_asphalt_b#85368",
     "facepunch.floor_grass_a#18648",
-    "facepunch.metal_wheely_bin#33619",
+    "facepunch.metal_wheely_bin#108386",
     "facepunch.pizza_box_gib#29074"
   ],
   "__version": 3

game/addons/tools/Code/Editor/AssetBrowser/AssetBrowser.cs

@@ -397,7 +397,7 @@ public virtual void UpdateAssetList()
 		bool recursive = ShowRecursiveFiles || !Search.IsEmpty;
 		AssetList.FullPathMode = recursive;
 
-		Path.UpdateSegments();
+		Path.Rebuild();
 		RefreshTask = UpdateAssetListAsync( recursive, refreshToken.Token );
 	}
 

game/addons/tools/Code/Editor/AssetBrowser/ChipsWidget.cs

@@ -65,7 +65,7 @@ public void AddOption( AssetTagSystem.TagDefinition option )
 		if ( Chips.Any( x => x.Value.Equals( option ) ) )
 			return;
 
-		Scroller.FixedHeight = 24;
+		Scroller.FixedHeight = Theme.RowHeight;
 
 		Scroller.Canvas.Layout.Add( new Chip( option, this )
 		{
@@ -80,7 +80,7 @@ public void AddOption( Package.TagEntry tag )
 		if ( Chips.Any( x => x.Value.Equals( tag ) ) )
 			return;
 
-		Scroller.FixedHeight = 24;
+		Scroller.FixedHeight = Theme.RowHeight;
 
 		Scroller.Canvas.Layout.Add( new Chip( tag, this )
 		{
@@ -132,7 +132,7 @@ protected override Vector2 SizeHint()
 		var totalWidth = textSize.x + iconSize.x;
 		if ( IsActive ) totalWidth += 8;
 
-		var totalSize = new Vector2( totalWidth, 22 ) + padding;
+		var totalSize = new Vector2( totalWidth, Theme.RowHeight ) + padding;
 		return totalSize;
 	}