Merge remote-tracking branch 'upstream/main' into feature/snap-ghosts

.github/workflows/build.yml

@@ -12,7 +12,7 @@ on:  # yamllint disable-line rule:truthy
       - "v*"
 
 env:
-  UNITY_VERSION: "2021.3.16f1"
+  UNITY_VERSION: "2021.3.30f1"
   UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
   UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
   UNITY_SERIAL: ${{ secrets.UNITY_SERIAL }}
@@ -214,20 +214,19 @@ jobs:
 
     steps:
       - name: Free extra space
-        # This takes several minutes, so we only do it where required
-        # Ubuntu 22.04 20230517.1 added some new packages, so we'll enable this (temporarily, hopefully). See https://github.com/actions/runner-images/pull/7645/files#diff-d3f496e99457b699df2a5621c8f59cb52f60a050e1a88318af7d6f7069c12b2eR180 for details
-        if: matrix.targetPlatform == 'Android' # We needed this to build for Android with the Ubuntu 20.04 image, which started with 29GB free. The 22.04 starts with 37GB free, and this is enough.
+        # This takes several minutes, so we only do it where required. As of 12/10/2023, this increases free space from 18GB to 41GB
+        if: matrix.targetPlatform == 'Android' || matrix.targetPlatform == 'StandaloneWindows64'
         run: |
           echo "Initial free space"
           df -h /
           echo "Removing all pre-loaded docker images"
-          docker rmi $(docker image ls -aq)  # Removes ~4GB
+          docker rmi $(docker image ls -aq)  # Removes ~6GB
           df -h /
           echo "Listing 100 largest packages"
           dpkg-query -Wf '${Installed-Size}\t${Package}\n' | sort -rn | head -n 100
           echo "Removing unneeded large packages"
           sudo apt-get update
-          sudo apt-get remove -y '^ghc-.*' '^dotnet-.*' azure-cli 'google-cloud-*' powershell google-chrome-stable firefox microsoft-edge-stable 'php.*' 'mongodb-*' 'mysql-*' 'mariadb-*' 'temurin-*' 'openjdk-*' default-jre-headless  # Removes ~7.5 GB
+          sudo apt-get remove -y '^ghc-.*' '^dotnet-.*' azure-cli 'google-cloud-*' powershell google-chrome-stable firefox microsoft-edge-stable 'php.*' 'mongodb-*' 'mysql-*' 'mariadb-*' 'temurin-*' 'openjdk-*' default-jre-headless  # Removes ~5GB
           sudo apt-get autoremove -y
           sudo apt-get clean
           df -h /
@@ -236,7 +235,7 @@ jobs:
           echo "Removing remaining large directories"
           rm -rf /usr/share/dotnet/  # Removes ~1GB
           df -h /
-          rm -rf "$AGENT_TOOLSDIRECTORY"  # Removes ~7GB
+          rm -rf "$AGENT_TOOLSDIRECTORY"  # Removes ~11GB
           echo "Disk space after cleanup"
           df -h /
 

.github/workflows/pre-commit.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/[email protected].0
+      - uses: actions/[email protected].1
       - uses: actions/[email protected]
         with:
           dotnet-version: '7.0.x'

Assets/AddressableAssetsData/AddressableAssetSettings.asset

@@ -15,7 +15,7 @@ MonoBehaviour:
   m_DefaultGroup: 677cec2ce1ef8b5428e8380b98e780ba
   m_CachedHash:
     serializedVersion: 2
-    Hash: 4303d53b849fb06159dbca9e82eb6b6a
+    Hash: 2b7bea248e2793f7f7f356bce5824c4f
   m_OptimizeCatalogSize: 0
   m_BuildRemoteCatalog: 0
   m_BundleLocalCatalog: 0
@@ -73,6 +73,14 @@ MonoBehaviour:
   - {fileID: 11400000, guid: 25208916e01863d4b9f8b96ceb6ee7ff, type: 2}
   - {fileID: 11400000, guid: af49b136567ee4645a343a7c80d2005e, type: 2}
   - {fileID: 11400000, guid: 3ed81040fbcbe4a41b005c5191be0ed7, type: 2}
+  - {fileID: 11400000, guid: fafae1350b8e6e044980d2e066c397b9, type: 2}
+  - {fileID: 11400000, guid: 5bd7ddc2d7ad60441b8e23e02602c826, type: 2}
+  - {fileID: 11400000, guid: 5ff0cec3a3fae824cac5076181ed7515, type: 2}
+  - {fileID: 11400000, guid: 5591077cbc77f9449a1c1c3ae544a74f, type: 2}
+  - {fileID: 11400000, guid: ea30395bde565804981dbbe5eba5a2d8, type: 2}
+  - {fileID: 11400000, guid: 2de83983b4436b345a2c7457b7f51d0b, type: 2}
+  - {fileID: 11400000, guid: 39e2d84665e8d5c4ca68de8a2be822bb, type: 2}
+  - {fileID: 11400000, guid: 73724c687487b5c4097fb53e64a2a50d, type: 2}
   m_BuildSettings:
     m_CompileScriptsInVirtualMode: 0
     m_CleanupStreamingAssetsAfterBuilds: 1

Assets/AddressableAssetsData/AssetGroups/Localization-Asset-Tables-Chinese (Simplified) (zh).asset

@@ -16,14 +16,7 @@ MonoBehaviour:
   m_Data:
     m_SerializedData: []
   m_GUID: c3db699227f8ee04eab8d0d9270c14a8
-  m_SerializeEntries:
-  - m_GUID: 41773f6ad7caab84fbf1ad0f6f96fe9b
-    m_Address: Assets_zh
-    m_ReadOnly: 1
-    m_SerializedLabels:
-    - Locale-zh
-    - Preload
-    FlaggedDuringContentUpdateRestriction: 0
+  m_SerializeEntries: []
   m_ReadOnly: 1
   m_Settings: {fileID: 11400000, guid: 6a7373c58080f5b4b9733a6655fc804f, type: 2}
   m_SchemaSet:

Assets/AddressableAssetsData/AssetGroups/Localization-Asset-Tables-Chinese (Simplified).asset

@@ -0,0 +1,32 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: bbb281ee3bf0b054c82ac2347e9e782c, type: 3}
+  m_Name: Localization-Asset-Tables-Chinese (Simplified)
+  m_EditorClassIdentifier: 
+  m_GroupName: Localization-Asset-Tables-Chinese (Simplified)
+  m_Data:
+    m_SerializedData: []
+  m_GUID: e3c7e1095805f38428a330b8f2640c8b
+  m_SerializeEntries:
+  - m_GUID: 41773f6ad7caab84fbf1ad0f6f96fe9b
+    m_Address: Assets_zh
+    m_ReadOnly: 1
+    m_SerializedLabels:
+    - Locale-zh
+    - Preload
+    FlaggedDuringContentUpdateRestriction: 0
+  m_ReadOnly: 1
+  m_Settings: {fileID: 11400000, guid: 6a7373c58080f5b4b9733a6655fc804f, type: 2}
+  m_SchemaSet:
+    m_Schemas:
+    - {fileID: 11400000, guid: ee4b9f2370bc37644a292ef766e437c2, type: 2}
+    - {fileID: 11400000, guid: ff7879ea95e1be34793f7c8e22456952, type: 2}

Assets/AddressableAssetsData/AssetGroups/Localization-Asset-Tables-Debug (debug).asset

@@ -16,14 +16,7 @@ MonoBehaviour:
   m_Data:
     m_SerializedData: []
   m_GUID: 8c619321f3eec7d4b88451120f8d17dd
-  m_SerializeEntries:
-  - m_GUID: b46c5d7742c1248488d720e3a0a9e475
-    m_Address: Assets_debug
-    m_ReadOnly: 1
-    m_SerializedLabels:
-    - Locale-debug
-    - Preload
-    FlaggedDuringContentUpdateRestriction: 0
+  m_SerializeEntries: []
   m_ReadOnly: 1
   m_Settings: {fileID: 11400000, guid: 6a7373c58080f5b4b9733a6655fc804f, type: 2}
   m_SchemaSet:

Assets/AddressableAssetsData/AssetGroups/Localization-Asset-Tables-Debug.asset

@@ -0,0 +1,32 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: bbb281ee3bf0b054c82ac2347e9e782c, type: 3}
+  m_Name: Localization-Asset-Tables-Debug
+  m_EditorClassIdentifier: 
+  m_GroupName: Localization-Asset-Tables-Debug
+  m_Data:
+    m_SerializedData: []
+  m_GUID: 1696ea4cd260f534ca4ddc3c5bbcb745
+  m_SerializeEntries:
+  - m_GUID: b46c5d7742c1248488d720e3a0a9e475
+    m_Address: Assets_debug
+    m_ReadOnly: 1
+    m_SerializedLabels:
+    - Locale-debug
+    - Preload
+    FlaggedDuringContentUpdateRestriction: 0
+  m_ReadOnly: 1
+  m_Settings: {fileID: 11400000, guid: 6a7373c58080f5b4b9733a6655fc804f, type: 2}
+  m_SchemaSet:
+    m_Schemas:
+    - {fileID: 11400000, guid: aa81756bc04f31a47961011e15aecda3, type: 2}
+    - {fileID: 11400000, guid: b8d42d0764d369543a1952f5e1432a10, type: 2}

Assets/AddressableAssetsData/AssetGroups/Localization-Asset-Tables-English (en).asset

@@ -16,14 +16,7 @@ MonoBehaviour:
   m_Data:
     m_SerializedData: []
   m_GUID: 42b854e15fb0c624dabec4f3e2a6331c
-  m_SerializeEntries:
-  - m_GUID: 288d6c12b8e2ac844879b0b92860c3f4
-    m_Address: Assets_en
-    m_ReadOnly: 1
-    m_SerializedLabels:
-    - Locale-en
-    - Preload
-    FlaggedDuringContentUpdateRestriction: 0
+  m_SerializeEntries: []
   m_ReadOnly: 1
   m_Settings: {fileID: 11400000, guid: 6a7373c58080f5b4b9733a6655fc804f, type: 2}
   m_SchemaSet:

Assets/AddressableAssetsData/AssetGroups/Localization-Asset-Tables-English.asset

@@ -0,0 +1,32 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: bbb281ee3bf0b054c82ac2347e9e782c, type: 3}
+  m_Name: Localization-Asset-Tables-English
+  m_EditorClassIdentifier: 
+  m_GroupName: Localization-Asset-Tables-English
+  m_Data:
+    m_SerializedData: []
+  m_GUID: 1d449fd1f724d4c42aff58cb69505008
+  m_SerializeEntries:
+  - m_GUID: 288d6c12b8e2ac844879b0b92860c3f4
+    m_Address: Assets_en
+    m_ReadOnly: 1
+    m_SerializedLabels:
+    - Locale-en
+    - Preload
+    FlaggedDuringContentUpdateRestriction: 0
+  m_ReadOnly: 1
+  m_Settings: {fileID: 11400000, guid: 6a7373c58080f5b4b9733a6655fc804f, type: 2}
+  m_SchemaSet:
+    m_Schemas:
+    - {fileID: 11400000, guid: fce991259d3632d4b83c364f21ec50d9, type: 2}
+    - {fileID: 11400000, guid: 1538bee721a8fbb45999a2470f0bc2c0, type: 2}

Assets/AddressableAssetsData/AssetGroups/Localization-Asset-Tables-French (fr).asset

@@ -16,14 +16,7 @@ MonoBehaviour:
   m_Data:
     m_SerializedData: []
   m_GUID: c4f8bd3505b70154983c38d4cc63b4b8
-  m_SerializeEntries:
-  - m_GUID: 30b9ec52e78e3a344b908cbfce3ea407
-    m_Address: Assets_fr
-    m_ReadOnly: 1
-    m_SerializedLabels:
-    - Locale-fr
-    - Preload
-    FlaggedDuringContentUpdateRestriction: 0
+  m_SerializeEntries: []
   m_ReadOnly: 1
   m_Settings: {fileID: 11400000, guid: 6a7373c58080f5b4b9733a6655fc804f, type: 2}
   m_SchemaSet:

Assets/AddressableAssetsData/AssetGroups/Localization-Asset-Tables-French.asset

@@ -0,0 +1,32 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: bbb281ee3bf0b054c82ac2347e9e782c, type: 3}
+  m_Name: Localization-Asset-Tables-French
+  m_EditorClassIdentifier: 
+  m_GroupName: Localization-Asset-Tables-French
+  m_Data:
+    m_SerializedData: []
+  m_GUID: 6cef525f539134e439de204af7a31b2e
+  m_SerializeEntries:
+  - m_GUID: 30b9ec52e78e3a344b908cbfce3ea407
+    m_Address: Assets_fr
+    m_ReadOnly: 1
+    m_SerializedLabels:
+    - Locale-fr
+    - Preload
+    FlaggedDuringContentUpdateRestriction: 0
+  m_ReadOnly: 1
+  m_Settings: {fileID: 11400000, guid: 6a7373c58080f5b4b9733a6655fc804f, type: 2}
+  m_SchemaSet:
+    m_Schemas:
+    - {fileID: 11400000, guid: cd345f05ad1cf9649a01ace8879b96bf, type: 2}
+    - {fileID: 11400000, guid: 58bfaa656b697214fb4a534f24c39422, type: 2}

Assets/AddressableAssetsData/AssetGroups/Localization-Asset-Tables-German (de).asset

@@ -16,14 +16,7 @@ MonoBehaviour:
   m_Data:
     m_SerializedData: []
   m_GUID: 791b59b6e6f043c45bdf19100615e997
-  m_SerializeEntries:
-  - m_GUID: 881c4bfab93dccb4caa6d17d13d6ae3a
-    m_Address: Assets_de
-    m_ReadOnly: 1
-    m_SerializedLabels:
-    - Locale-de
-    - Preload
-    FlaggedDuringContentUpdateRestriction: 0
+  m_SerializeEntries: []
   m_ReadOnly: 1
   m_Settings: {fileID: 11400000, guid: 6a7373c58080f5b4b9733a6655fc804f, type: 2}
   m_SchemaSet:

Assets/AddressableAssetsData/AssetGroups/Localization-Asset-Tables-German.asset

@@ -0,0 +1,32 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: bbb281ee3bf0b054c82ac2347e9e782c, type: 3}
+  m_Name: Localization-Asset-Tables-German
+  m_EditorClassIdentifier: 
+  m_GroupName: Localization-Asset-Tables-German
+  m_Data:
+    m_SerializedData: []
+  m_GUID: 2ab88d7af7c4fde4eae90476d045fb1e
+  m_SerializeEntries:
+  - m_GUID: 881c4bfab93dccb4caa6d17d13d6ae3a
+    m_Address: Assets_de
+    m_ReadOnly: 1
+    m_SerializedLabels:
+    - Locale-de
+    - Preload
+    FlaggedDuringContentUpdateRestriction: 0
+  m_ReadOnly: 1
+  m_Settings: {fileID: 11400000, guid: 6a7373c58080f5b4b9733a6655fc804f, type: 2}
+  m_SchemaSet:
+    m_Schemas:
+    - {fileID: 11400000, guid: a5898fb02f874ba4593f522252592336, type: 2}
+    - {fileID: 11400000, guid: fd9d495546f88e048819a6428d288c51, type: 2}

Assets/AddressableAssetsData/AssetGroups/Localization-Asset-Tables-Japanese (ja).asset

@@ -16,14 +16,7 @@ MonoBehaviour:
   m_Data:
     m_SerializedData: []
   m_GUID: dba365da0c6ce5948a943a70792bd48c
-  m_SerializeEntries:
-  - m_GUID: a968012b190696a49bbe0314f4a802eb
-    m_Address: Assets_ja
-    m_ReadOnly: 1
-    m_SerializedLabels:
-    - Locale-ja
-    - Preload
-    FlaggedDuringContentUpdateRestriction: 0
+  m_SerializeEntries: []
   m_ReadOnly: 1
   m_Settings: {fileID: 11400000, guid: 6a7373c58080f5b4b9733a6655fc804f, type: 2}
   m_SchemaSet: