Merge remote-tracking branch 'origin/main' into feature/plugin-scripting

Author: andybak

.github/dependabot.yml

@@ -9,3 +9,7 @@ updates:
       - "mikeage"
     assignees:
       - "mikeage"
+    groups:
+      all-actions-updates:
+        patterns:
+          - "**"

.github/workflows/build.yml

@@ -146,7 +146,7 @@ jobs:
           else
             if [[ ${{ github.ref }} == refs/pull/* ]]
             then
-              DESCRIPTION="PR#$(echo ${{ github.ref }} | sed -e 's#refs/pull/##' -e 's#/merge##')"
+              DESCRIPTION="PR$(echo ${{ github.ref }} | sed -e 's#refs/pull/##' -e 's#/merge##')"
             elif [[ ${{ github.ref }} == refs/heads/* ]]
             then
               DESCRIPTION="$(echo ${{ github.ref }} | sed -e 's#refs/heads/##')"
@@ -352,6 +352,7 @@ jobs:
         with:
           token: ${{ env.PHOTON_PAT }}
           repository: icosa-mirror/photon-fusion
+          ref: v1.1.8
           path: photon-fusion-mirror/
 
       - name: Copy photon files
@@ -801,14 +802,13 @@ jobs:
 
       - name: Publish
         uses: softprops/action-gh-release@v2
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           body: ${{ steps.changelog.outputs.changelog }}
           prerelease: ${{ needs.configuration.outputs.prerelease }}
           target_commitish: ${{ needs.configuration.outputs.currentrelease }}
           tag_name: ${{ needs.configuration.outputs.version }}
           files: releases/*
+          token: ${{ secrets.RELEASE_TOKEN }}
 
   publish_gitbook:
     name: Publish changelog from last major build to open-brush-docs

.github/workflows/pre-commit.yml

@@ -13,10 +13,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5.2.0
+      - uses: actions/setup-python@v5.3.0
         with:
           python-version: '3.12'
-      - uses: actions/setup-dotnet@v4.0.1
+      - uses: actions/setup-dotnet@v4.1.0
         with:
           dotnet-version: '8.0.x'
       - name: Install pre-commit

.github/workflows/third_party_notices.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5.2.0
+      - uses: actions/setup-python@v5.3.0
         with:
           python-version: '3.12'
       - name: Run the generator

Assets/Editor/BuildTiltBrush.cs

@@ -1032,7 +1032,7 @@ public TempSetAppNames(BuildTarget target, string Description)
 #endif
             if (!String.IsNullOrEmpty(Description))
             {
-                new_name += "-(" + Description + ")";
+                new_name += "-(" + Description.Replace("#", "") + ")";
                 new_identifier += "-" + Description.Replace("_", "").Replace("#", "").Replace("-", "");
             }
             if (m_IsAndroidOrIos)

Assets/Oculus/OculusProjectConfig.asset

@@ -41,5 +41,5 @@ MonoBehaviour:
   systemSplashScreen: {fileID: 0}
   systemSplashScreenType: 0
   _systemLoadingScreenBackground: 0
-  ovrPluginMd5Win64: d72fb658f3d9064293fb2241e5525905ccb3b1f136628c46b13f96b022789ce7
-  ovrPluginMd5Android: 5ef6da3aad630673da6447f50e1b2d8acae7582243502fb23d67a9160eb3e346
+  ovrPluginMd5Win64: d72fb658f3d9064293fb2241e55259057f9ac34a260fafcf32f36c4a3005911c
+  ovrPluginMd5Android: 5ef6da3aad630673da6447f50e1b2d8ae14dbda69fd9877bc13b87ed87f3752b

Assets/XR/Settings/Open XR Package Settings.asset

@@ -428,7 +428,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 1927c045052a06d49a9b21fdcaa26db6, type: 3}
   m_Name: OculusXRFeature Standalone
   m_EditorClassIdentifier: 
-  m_enabled: 1
+  m_enabled: 0
   nameUi: Meta XR Feature
   version: 0.0.1
   featureIdInternal: com.meta.openxr.feature.metaxr
@@ -647,7 +647,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 1927c045052a06d49a9b21fdcaa26db6, type: 3}
   m_Name: OculusXRFeature Android
   m_EditorClassIdentifier: 
-  m_enabled: 1
+  m_enabled: 0
   nameUi: Meta XR Feature
   version: 0.0.1
   featureIdInternal: com.meta.openxr.feature.metaxr

Assets/XR/Settings/OpenXR Editor Settings.asset

@@ -14,8 +14,6 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   Keys: 0100000007000000
   Values:
-  - featureSets:
-    - com.meta.openxr.featureset.metaxr
-  - featureSets:
-    - com.meta.openxr.featureset.metaxr
+  - featureSets: []
+  - featureSets: []
   m_vulkanAdditionalGraphicsQueue: 0

Assets/XR/XRGeneralSettings.asset

@@ -16,7 +16,7 @@ MonoBehaviour:
   m_AutomaticLoading: 0
   m_AutomaticRunning: 0
   m_Loaders:
-  - {fileID: 11400000, guid: df02db4506fe02b4892b2f1dab25abe6, type: 2}
+  - {fileID: 11400000, guid: 0aff50989b9ead845bdb50daaf977456, type: 2}
 --- !u!114 &-5428386068462531570
 MonoBehaviour:
   m_ObjectHideFlags: 0

Gemfile.lock

@@ -184,8 +184,7 @@ GEM
       trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
     retriable (3.1.2)
-    rexml (3.3.6)
-      strscan
+    rexml (3.3.9)
     rouge (2.0.7)
     ruby2_keywords (0.0.5)
     rubyzip (2.3.2)
@@ -199,7 +198,6 @@ GEM
       CFPropertyList
       naturally
     sshkey (3.0.0)
-    strscan (3.1.0)
     terminal-notifier (2.0.0)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)