Merge remote-tracking branch 'origin/main' into feature/push-pull

icosa-foundation · Sep 15, 2024 · 2d91bb6 · 2d91bb6
2 parents 48defae + e14f94c
commit 2d91bb6
Show file tree

Hide file tree

Showing 40 changed files with 2,531 additions and 1,093 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
@@ -13,10 +13,27 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5.1.0
+      - uses: actions/setup-python@v5.2.0
         with:
           python-version: '3.12'
-      - uses: actions/setup-dotnet@v4.0.0
+      - uses: actions/setup-dotnet@v4.0.1
         with:
           dotnet-version: '8.0.x'
-      - uses: pre-commit/action@v3.0.1
+      - name: Install pre-commit
+        run: python -m pip install pre-commit
+        shell: bash
+      - name: Cache pre-commit environments
+        uses: actions/cache@v4
+        with:
+          path: ~/.cache/pre-commit
+          key: pre-commit-3|${{ env.pythonLocation }}|${{ hashFiles('.pre-commit-config.yaml') }}
+      - name: Setup pre-commit environments
+        run: pre-commit run
+      - name: Run pre-commit dotnet-format, with retries
+        uses: Wandalen/wretry.action@v3
+        with:
+          command: pre-commit run dotnet-format --show-diff-on-failure --color=always --all-files || { git checkout -- . ; exit 1 ; }  # In case dotnet-format fails, reset the changes it made. This way, we can differentiate between a NuGet failure and a real formatting issue
+      - name: Remove dotnet-format from the list of pre-commit jobs to run (since we already ran it)
+        run: yq eval 'del(.repos[] | select(.hooks[].id == "dotnet-format"))' -i .pre-commit-config.yaml
+      - name: Run the rest of pre-commit
+        run: pre-commit run --show-diff-on-failure --color=always --all-files
diff --git a/.github/workflows/test_unity_credentials.yml b/.github/workflows/test_unity_credentials.yml
@@ -6,8 +6,8 @@ on:
   workflow_dispatch:
 
 env:
-  UNITY_VERSION: "2019.4.25f1"
-  UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
+  UNITY_VERSION: "2021.3.30f1"
+  UNITY_EMAIL: ${{ vars.UNITY_EMAIL }}
   UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
   UNITY_SERIAL: ${{ secrets.UNITY_SERIAL }}
 

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.1.0
+      - uses: actions/setup-python@v5.2.0
         with:
           python-version: '3.12'
       - name: Run the generator

diff --git a/Assets/Editor/BuildTiltBrushPostProcess.cs b/Assets/Editor/BuildTiltBrushPostProcess.cs
@@ -69,6 +69,19 @@ public void OnPostGenerateGradleAndroidProject(string path)
             );
 #endif
 
+#if ENABLE_CONTEXTUAL_BOUNDARYLESS_APP
+            UnityEngine.Debug.Log("Add com.oculus.feature.CONTEXTUAL_BOUNDARYLESS_APP");
+            AddOrRemoveTag(doc,
+                    androidNamespaceURI,
+                    "/manifest",
+                    "uses-feature",
+                    "com.oculus.feature.CONTEXTUAL_BOUNDARYLESS_APP",
+                    true,
+                    true,
+                    "required", "true"
+            );
+#endif
+
 #if FORCE_HEADTRACKING
             UnityEngine.Debug.Log("Add android.hardware.vr.headtracking");
             AddOrRemoveTag(doc,

diff --git a/Assets/InputSystem.inputsettings.asset b/Assets/InputSystem.inputsettings.asset
@@ -19,9 +19,10 @@ MonoBehaviour:
   m_CompensateForScreenOrientation: 1
   m_BackgroundBehavior: 0
   m_EditorInputBehaviorInPlayMode: 0
+  m_InputActionPropertyDrawerMode: 0
   m_DefaultDeadzoneMin: 0.125
   m_DefaultDeadzoneMax: 0.925
-  m_DefaultButtonPressPoint: 0.125
+  m_DefaultButtonPressPoint: 0.05
   m_ButtonReleaseThreshold: 1
   m_DefaultTapTime: 0.2
   m_DefaultSlowTapTime: 0.5

diff --git a/Assets/Oculus/OculusProjectConfig.asset b/Assets/Oculus/OculusProjectConfig.asset
@@ -12,12 +12,11 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 05d394ae2a81edd4cbc3c51917e766e3, type: 3}
   m_Name: OculusProjectConfig
   m_EditorClassIdentifier: 
-  targetDeviceTypes: 0100000002000000
+  targetDeviceTypes: 01000000020000000300000004000000
   allowOptional3DofHeadTracking: 0
   handTrackingSupport: 0
   handTrackingFrequency: 0
   handTrackingVersion: 0
-  multimodalHandsControllersSupport: 0
   anchorSupport: 1
   sharedAnchorSupport: 1
   renderModelSupport: 0
@@ -27,16 +26,20 @@ MonoBehaviour:
   eyeTrackingSupport: 0
   virtualKeyboardSupport: 0
   sceneSupport: 1
+  boundaryVisibilitySupport: 0
   disableBackups: 0
   enableNSCConfig: 0
   securityXmlPath: 
   skipUnneededShaders: 0
+  enableIL2CPPLTO: 0
   focusAware: 1
   requiresSystemKeyboard: 0
   experimentalFeaturesEnabled: 0
   insightPassthroughEnabled: 0
   _insightPassthroughSupport: 1
+  _processorFavor: 0
   systemSplashScreen: {fileID: 0}
   systemSplashScreenType: 0
-  ovrPluginMd5Win64: 67e58deb5b905ae742512bbee3e06a70
-  ovrPluginMd5Android: 017d859ada160e45b27588f910d5d8d8
+  _systemLoadingScreenBackground: 0
+  ovrPluginMd5Win64: 33685b25e1b4f2b6c1632069bc88783632496c19eda9b55641c321c119bdf68c
+  ovrPluginMd5Android: b9e59102e373e2d7a97cd1dbe38cac15e89ec54c0a32b98491b3d09d93ccda7d
diff --git a/Assets/Plugins/Android/AndroidManifest.xml b/Assets/Plugins/Android/AndroidManifest.xml
@@ -16,8 +16,10 @@
             </intent-filter>
         </activity>
         <meta-data android:name="unityplayer.SkipPermissionsDialog" android:value="false" />
+        <meta-data android:name="pvr.app.type" android:value="vr" />
     </application>
     <uses-permission android:name="android.permission.RECORD_AUDIO" tools:node="remove"/>
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" tools:node="remove"/>
     <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="com.oculus.permission.USE_SCENE" />
 </manifest>
diff --git a/Assets/Prefabs/Panels/ReferencePanel/ReferencePanelIconBackgroundImage.prefab b/Assets/Prefabs/Panels/ReferencePanel/ReferencePanelIconBackgroundImage.prefab
@@ -144,6 +144,15 @@ MonoBehaviour:
   m_HoverScale: 1.2
   m_HoverBoxColliderGrow: 0.2
   m_AddOverlay: 0
+  m_ErrorHelpText:
+    m_TableReference:
+      m_TableCollectionName: GUID:c84355079ab3f3e4f8f3812258805f86
+    m_TableEntryReference:
+      m_KeyId: 238935604850335744
+      m_Key: 
+    m_FallbackState: 0
+    m_WaitForCompletion: 0
+    m_LocalVariables: []
   references:
     version: 2
     RefIds: []
diff --git a/Assets/Prefabs/Panels/ReferencePanel/ReferencePanelTabImage.prefab b/Assets/Prefabs/Panels/ReferencePanel/ReferencePanelTabImage.prefab
@@ -121,6 +121,24 @@ MonoBehaviour:
   m_HoverScale: 1.2
   m_HoverBoxColliderGrow: 0.2
   m_AddOverlay: 0
+  m_LoadHelpText:
+    m_TableReference:
+      m_TableCollectionName: GUID:c84355079ab3f3e4f8f3812258805f86
+    m_TableEntryReference:
+      m_KeyId: 238555522805800960
+      m_Key: 
+    m_FallbackState: 0
+    m_WaitForCompletion: 0
+    m_LocalVariables: []
+  m_ErrorHelpText:
+    m_TableReference:
+      m_TableCollectionName: GUID:c84355079ab3f3e4f8f3812258805f86
+    m_TableEntryReference:
+      m_KeyId: 238556149774557184
+      m_Key: 
+    m_FallbackState: 0
+    m_WaitForCompletion: 0
+    m_LocalVariables: []
   references:
     version: 2
     RefIds: []
@@ -207,6 +225,24 @@ MonoBehaviour:
   m_HoverScale: 1.2
   m_HoverBoxColliderGrow: 0.2
   m_AddOverlay: 0
+  m_LoadHelpText:
+    m_TableReference:
+      m_TableCollectionName: GUID:c84355079ab3f3e4f8f3812258805f86
+    m_TableEntryReference:
+      m_KeyId: 238555522805800960
+      m_Key: 
+    m_FallbackState: 0
+    m_WaitForCompletion: 0
+    m_LocalVariables: []
+  m_ErrorHelpText:
+    m_TableReference:
+      m_TableCollectionName: GUID:c84355079ab3f3e4f8f3812258805f86
+    m_TableEntryReference:
+      m_KeyId: 238556149774557184
+      m_Key: 
+    m_FallbackState: 0
+    m_WaitForCompletion: 0
+    m_LocalVariables: []
   references:
     version: 2
     RefIds: []
@@ -262,6 +298,24 @@ MonoBehaviour:
   m_HoverScale: 1.2
   m_HoverBoxColliderGrow: 0.2
   m_AddOverlay: 0
+  m_LoadHelpText:
+    m_TableReference:
+      m_TableCollectionName: GUID:c84355079ab3f3e4f8f3812258805f86
+    m_TableEntryReference:
+      m_KeyId: 238555522805800960
+      m_Key: 
+    m_FallbackState: 0
+    m_WaitForCompletion: 0
+    m_LocalVariables: []
+  m_ErrorHelpText:
+    m_TableReference:
+      m_TableCollectionName: GUID:c84355079ab3f3e4f8f3812258805f86
+    m_TableEntryReference:
+      m_KeyId: 238556149774557184
+      m_Key: 
+    m_FallbackState: 0
+    m_WaitForCompletion: 0
+    m_LocalVariables: []
   references:
     version: 2
     RefIds: []
@@ -317,6 +371,24 @@ MonoBehaviour:
   m_HoverScale: 1.2
   m_HoverBoxColliderGrow: 0.2
   m_AddOverlay: 0
+  m_LoadHelpText:
+    m_TableReference:
+      m_TableCollectionName: GUID:c84355079ab3f3e4f8f3812258805f86
+    m_TableEntryReference:
+      m_KeyId: 238555522805800960
+      m_Key: 
+    m_FallbackState: 0
+    m_WaitForCompletion: 0
+    m_LocalVariables: []
+  m_ErrorHelpText:
+    m_TableReference:
+      m_TableCollectionName: GUID:c84355079ab3f3e4f8f3812258805f86
+    m_TableEntryReference:
+      m_KeyId: 238556149774557184
+      m_Key: 
+    m_FallbackState: 0
+    m_WaitForCompletion: 0
+    m_LocalVariables: []
   references:
     version: 2
     RefIds: []
@@ -372,6 +444,24 @@ MonoBehaviour:
   m_HoverScale: 1.2
   m_HoverBoxColliderGrow: 0.2
   m_AddOverlay: 0
+  m_LoadHelpText:
+    m_TableReference:
+      m_TableCollectionName: GUID:c84355079ab3f3e4f8f3812258805f86
+    m_TableEntryReference:
+      m_KeyId: 238555522805800960
+      m_Key: 
+    m_FallbackState: 0
+    m_WaitForCompletion: 0
+    m_LocalVariables: []
+  m_ErrorHelpText:
+    m_TableReference:
+      m_TableCollectionName: GUID:c84355079ab3f3e4f8f3812258805f86
+    m_TableEntryReference:
+      m_KeyId: 238556149774557184
+      m_Key: 
+    m_FallbackState: 0
+    m_WaitForCompletion: 0
+    m_LocalVariables: []
   references:
     version: 2
     RefIds: []
@@ -427,6 +517,24 @@ MonoBehaviour:
   m_HoverScale: 1.2
   m_HoverBoxColliderGrow: 0.2
   m_AddOverlay: 0
+  m_LoadHelpText:
+    m_TableReference:
+      m_TableCollectionName: GUID:c84355079ab3f3e4f8f3812258805f86
+    m_TableEntryReference:
+      m_KeyId: 238555522805800960
+      m_Key: 
+    m_FallbackState: 0
+    m_WaitForCompletion: 0
+    m_LocalVariables: []
+  m_ErrorHelpText:
+    m_TableReference:
+      m_TableCollectionName: GUID:c84355079ab3f3e4f8f3812258805f86
+    m_TableEntryReference:
+      m_KeyId: 238556149774557184
+      m_Key: 
+    m_FallbackState: 0
+    m_WaitForCompletion: 0
+    m_LocalVariables: []
   references:
     version: 2
     RefIds: []
@@ -482,6 +590,24 @@ MonoBehaviour:
   m_HoverScale: 1.2
   m_HoverBoxColliderGrow: 0.2
   m_AddOverlay: 0
+  m_LoadHelpText:
+    m_TableReference:
+      m_TableCollectionName: GUID:c84355079ab3f3e4f8f3812258805f86
+    m_TableEntryReference:
+      m_KeyId: 238555522805800960
+      m_Key: 
+    m_FallbackState: 0
+    m_WaitForCompletion: 0
+    m_LocalVariables: []
+  m_ErrorHelpText:
+    m_TableReference:
+      m_TableCollectionName: GUID:c84355079ab3f3e4f8f3812258805f86
+    m_TableEntryReference:
+      m_KeyId: 238556149774557184
+      m_Key: 
+    m_FallbackState: 0
+    m_WaitForCompletion: 0
+    m_LocalVariables: []
   references:
     version: 2
     RefIds: []
@@ -537,6 +663,24 @@ MonoBehaviour:
   m_HoverScale: 1.2
   m_HoverBoxColliderGrow: 0.2
   m_AddOverlay: 0
+  m_LoadHelpText:
+    m_TableReference:
+      m_TableCollectionName: GUID:c84355079ab3f3e4f8f3812258805f86
+    m_TableEntryReference:
+      m_KeyId: 238555522805800960
+      m_Key: 
+    m_FallbackState: 0
+    m_WaitForCompletion: 0
+    m_LocalVariables: []
+  m_ErrorHelpText:
+    m_TableReference:
+      m_TableCollectionName: GUID:c84355079ab3f3e4f8f3812258805f86
+    m_TableEntryReference:
+      m_KeyId: 238556149774557184
+      m_Key: 
+    m_FallbackState: 0
+    m_WaitForCompletion: 0
+    m_LocalVariables: []
   references:
     version: 2
     RefIds: []
@@ -592,6 +736,24 @@ MonoBehaviour:
   m_HoverScale: 1.2
   m_HoverBoxColliderGrow: 0.2
   m_AddOverlay: 0
+  m_LoadHelpText:
+    m_TableReference:
+      m_TableCollectionName: GUID:c84355079ab3f3e4f8f3812258805f86
+    m_TableEntryReference:
+      m_KeyId: 238555522805800960
+      m_Key: 
+    m_FallbackState: 0
+    m_WaitForCompletion: 0
+    m_LocalVariables: []
+  m_ErrorHelpText:
+    m_TableReference:
+      m_TableCollectionName: GUID:c84355079ab3f3e4f8f3812258805f86
+    m_TableEntryReference:
+      m_KeyId: 238556149774557184
+      m_Key: 
+    m_FallbackState: 0
+    m_WaitForCompletion: 0
+    m_LocalVariables: []
   references:
     version: 2
     RefIds: []