Merge remote-tracking branch 'upstream/main' into experiments/moonsharp

[CI BUILD]
IxxyXR · Sep 19, 2023 · 34cd64c · 34cd64c
2 parents 3a7830e + 9a8badc
commit 34cd64c
Show file tree

Hide file tree

Showing 12 changed files with 555 additions and 6 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -205,6 +205,13 @@ jobs:
             cache: Android_GLES
             extraoptions: -btb-il2cpp
 
+          - name: Android Pico (CN)
+            targetPlatform: Android
+            vrsdk: Pico
+            cache: Android_GLES
+            # Pico requested Chinese build that doesn't have google/sketchfab login.
+            extraoptions: -btb-il2cpp -btb-disableAccountLogins
+
     steps:
       - name: Free extra space
         # This takes several minutes, so we only do it where required
@@ -381,7 +388,7 @@ jobs:
           echo -e "\n-define:PIMAX_SUPPORTED" | tee -a Assets/csc.rsp
 
       - name: Build project
-        uses: game-ci/unity-builder@v2
+        uses: game-ci/unity-builder@v3
         env:
           VERSION: ${{ needs.configuration.outputs.version}}
         with:

diff --git a/Assets/Editor/BuildTiltBrush.cs b/Assets/Editor/BuildTiltBrush.cs
@@ -73,6 +73,7 @@ public class TiltBuildOptions
         public string Stamp;
         public BuildOptions UnityOptions;
         public string Description;
+        public bool disableAccountLogins;
     }
 
     [Serializable()]
@@ -831,6 +832,20 @@ static void CommandLine()
                 {
                     i++;
                 }
+                else if (args[i] == "-btb-disableAccountLogins")
+                {
+                    tiltOptions.disableAccountLogins = true;
+                }
+                else if (args[i] == "-androidExportType")
+                {
+                    // Not supported in Open Brush (added to game-ci in v3)
+                    i++;
+                }
+                else if (args[i] == "-androidSymbolType")
+                {
+                    // Not supported in Open Brush (added to game-ci in v3)
+                    i++;
+                }
                 else
                 {
                     Die(3, "Unknown argument {0}", args[i]);
@@ -1457,7 +1472,7 @@ public static void DoBuild(TiltBuildOptions tiltOptions)
             config.m_AutoProfile = tiltOptions.AutoProfile;
             config.m_BuildStamp = stamp;
             //config.OnValidate(xrSdk, TargetToGroup(target));
-            config.DoBuildTimeConfiguration(target);
+            config.DoBuildTimeConfiguration(target, tiltOptions.disableAccountLogins);
             EditorUtility.SetDirty(config);
 
             if (GuiSelectedBuildTarget == BuildTarget.Android)
@@ -1705,6 +1720,29 @@ private static string FormatBuildStep(BuildStep step)
     // Returns null if no errors; otherwise a string with what went wrong.
     private static string FormatBuildReport(BuildReport report)
     {
+        // This format is required by the game-ci build action
+        Console.WriteLine(
+                $"{Environment.NewLine}" +
+                $"###########################{Environment.NewLine}" +
+                $"#      Build results      #{Environment.NewLine}" +
+                $"###########################{Environment.NewLine}" +
+                $"{Environment.NewLine}" +
+                $"Duration: {report.summary.totalTime.ToString()}{Environment.NewLine}" +
+                $"Warnings: {report.summary.totalWarnings.ToString()}{Environment.NewLine}"
+        );
+        // We have some "errors" that show up on Mac and Linux (IOException copying FBX and USD) that are ignored. The builds succeed, but for some reason they get reported anyway. To avoid confusing the analysis, print a 0 even if we have errors logged, provided that the build passed
+        if (report.summary.result == BuildResult.Succeeded)
+        {
+            Console.WriteLine($"Errors: 0{Environment.NewLine}");
+        }
+        else
+        {
+            Console.WriteLine($"Errors: {report.summary.totalErrors.ToString()}{Environment.NewLine}");
+        }
+        Console.WriteLine(
+                $"Size: {report.summary.totalSize.ToString()} bytes{Environment.NewLine}" +
+                $"{Environment.NewLine}"
+        );
         if (report.summary.result == BuildResult.Succeeded)
         {
             return null;

diff --git a/Assets/Prefabs/Panels/AdminPanel.prefab b/Assets/Prefabs/Panels/AdminPanel.prefab
@@ -3122,6 +3122,11 @@ PrefabInstance:
       propertyPath: m_LocalPosition.z
       value: -0.026
       objectReference: {fileID: 0}
+    - target: {fileID: 3477360781772463332, guid: e845ea7f1bc1b144f8087e425d81fb6f,
+        type: 3}
+      propertyPath: m_ScaleXOnly
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 3477360781772463332, guid: e845ea7f1bc1b144f8087e425d81fb6f,
         type: 3}
       propertyPath: m_HintDescription.m_TableEntryReference.m_KeyId

diff --git a/Assets/Prefabs/Panels/SettingsPanel.prefab b/Assets/Prefabs/Panels/SettingsPanel.prefab
@@ -889,7 +889,7 @@ MonoBehaviour:
   m_UseGazeRotation: 1
   m_MaxGazeRotation: 20
   m_GazeActivateSpeed: 8
-  m_InitialSpawnPos: {x: 0, y: 0, z: 0}
+  m_InitialSpawnPos: {x: 0, y: 13, z: 5}
   m_InitialSpawnRotEulers: {x: 0, y: 0, z: 0}
   m_WandAttachAngle: 0
   m_WandAttachYOffset: 0
@@ -899,6 +899,7 @@ MonoBehaviour:
   m_CanBeDetachedFromWand: 0
   m_PopUpGazeDuration: 0.2
   m_PromoBorders: []
+  m_ExperimentalModeToggle: {fileID: 7923957768018575614}
   references:
     version: 2
     RefIds: []

diff --git a/Assets/Prefabs/Panels/SettingsPanel_Mobile.prefab b/Assets/Prefabs/Panels/SettingsPanel_Mobile.prefab
@@ -1623,6 +1623,7 @@ MonoBehaviour:
   m_CanBeDetachedFromWand: 1
   m_PopUpGazeDuration: 0.2
   m_PromoBorders: []
+  m_ExperimentalModeToggle: {fileID: 6926684204091440275}
   references:
     version: 2
     RefIds: []