Merge remote-tracking branch 'origin/main' into feature/icosa-integra…

…tion # Conflicts: # Assets/Scripts/App.cs # Assets/Scripts/SketchControlsScript.cs # Assets/Scripts/UserConfig.cs # Packages/manifest.json
icosa-foundation · Nov 13, 2024 · 26da063 · 26da063
2 parents 430e328 + e2b0397
commit 26da063
Show file tree

Hide file tree

Showing 80 changed files with 9,938 additions and 2,641 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -9,3 +9,7 @@ updates:
       - "mikeage"
     assignees:
       - "mikeage"
+    groups:
+      all-actions-updates:
+        patterns:
+          - "**"
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -136,7 +136,7 @@ jobs:
         env:
           PRERELEASE: ${{ steps.version.outputs.prerelease }}
         run: |
-          # For a PR action (i.e., syncronize / open), the value of github.ref will be refs/pull/1234/merge
+          # For a PR action (i.e., synchronize / open), the value of github.ref will be refs/pull/1234/merge
           # For a push action, it will be either refs/heads/foo_branch_name OR refs/tags/v1234.
           # We want to use the base name for pushes of tags or to main, the PR number for PRs, and the branch name for named branches.
           if [[ "$PRERELEASE" == "false" || ${{ github.ref }} == refs/heads/main ]]
@@ -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
@@ -907,7 +907,7 @@ jobs:
       - name: Restore steam login config
         run: |
           mkdir -p /home/runner/Steam/config
-          echo "${{ secrets.STEAM_CONFIG_VDF}}" | base64 -d - > /home/runner/Steam/config/config.vdf
+          echo "${{ secrets.STEAM_CONFIG_VDF}}" | base64 -d - | gunzip - > /home/runner/Steam/config/config.vdf
           md5sum /home/runner/Steam/config/config.vdf
       - name: Download Build Artifacts (Windows OpenXR)
         uses: actions/download-artifact@v4
@@ -948,7 +948,7 @@ jobs:
           CHANNEL: beta
       - name: Update steam login secret
         run: |
-          base64 -i /home/runner/Steam/config/config.vdf | gh secret set --visibility all --org icosa-foundation STEAM_CONFIG_VDF
+          gzip /home/runner/Steam/config/config.vdf -c | base64 | gh secret set --visibility all --org icosa-foundation STEAM_CONFIG_VDF
           md5sum /home/runner/Steam/config/config.vdf
         env:
           GITHUB_TOKEN: ${{ secrets.SECRET_UPDATER_PAT }}

diff --git a/.github/workflows/pre-commit.yml b/.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

diff --git a/.github/workflows/third_party_notices.yml b/.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

diff --git a/Assets/Editor/BuildTiltBrush.cs b/Assets/Editor/BuildTiltBrush.cs
@@ -696,7 +696,7 @@ static void CommandLine()
         // Call these once to create the files. Normally (i.e., in a GUI build), they're created with
         // [UnityEditor.InitializeOnLoad], but in case they're missing, like in CI, make sure they're
         // there!
-        OVRProjectConfig defaultOculusProjectConfig = OVRProjectConfig.GetProjectConfig();
+        OVRProjectConfig defaultOculusProjectConfig = OVRProjectConfig.CachedProjectConfig;
         string useless_app_id = Assets.Oculus.VR.Editor.OVRPlatformToolSettings.AppID;
 #endif
 

diff --git a/Assets/Oculus/OculusProjectConfig.asset b/Assets/Oculus/OculusProjectConfig.asset
@@ -41,5 +41,5 @@ MonoBehaviour:
   systemSplashScreen: {fileID: 0}
   systemSplashScreenType: 0
   _systemLoadingScreenBackground: 0
-  ovrPluginMd5Win64: 33685b25e1b4f2b6c1632069bc88783632496c19eda9b55641c321c119bdf68c
-  ovrPluginMd5Android: b9e59102e373e2d7a97cd1dbe38cac15e89ec54c0a32b98491b3d09d93ccda7d
+  ovrPluginMd5Win64: d72fb658f3d9064293fb2241e5525905551003f900539e0b4fc00777d76dbee1
+  ovrPluginMd5Android: 5ef6da3aad630673da6447f50e1b2d8aba8131f9f19a0720cb301a8c9f89d2b5