Skip to content

Commit 7893f70

Browse files
anicalbanoanicalbano
authored
Merge pull request #4020 from decentraland/release/2025-04-22
release: 2025-04-22
2 parents 3f668f0 + a51c6b1 commit 7893f70

File tree

4,223 files changed

+126641
-14079
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

4,223 files changed

+126641
-14079
lines changed

‎.github/workflows/build-unitycloud.yml

+11-1
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,17 @@ jobs:
235235
pip install -r scripts/cloudbuild/requirements.txt
236236
237237
- name: Execute Unity Cloud build
238+
uses: nick-fields/retry@v3
239+
with:
240+
timeout_minutes: 180 # matches your GLOBAL_TIMEOUT = 10800s
241+
max_attempts: 3
242+
retry_on: any
243+
retry_wait_seconds: 30
244+
on_retry_command: |
245+
echo "::warning::🔁 Unity Cloud Build retry triggered at $(date '+%Y-%m-%d %H:%M:%S')"
246+
command: |
247+
echo "🔧 Starting Unity Cloud Build attempt at $(date '+%Y-%m-%d %H:%M:%S')"
248+
python -u scripts/cloudbuild/build.py
238249
env:
239250
API_KEY: ${{ secrets.UNITY_CLOUD_API_KEY }}
240251
ORG_ID: ${{ secrets.UNITY_CLOUD_ORG_ID }}
@@ -263,7 +274,6 @@ jobs:
263274
PARAM_SEGMENT_WRITE_KEY: ${{ secrets.SEGMENT_WRITE_KEY }}
264275
PARAM_INSTALL_SOURCE: ${{ needs.prebuild.outputs.install_source }}
265276
PARAM_UNITY_EXTRA_PARAMS: '-disable-assembly-updater'
266-
run: python -u scripts/cloudbuild/build.py
267277

268278
- name: 'Tar artifact to maintain original permissions'
269279
if: matrix.target == 'macos'

‎.github/workflows/enforce-group-approvals.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ jobs:
7272
echo "✅ DEV Team Members: ${DEV_MEMBERS:-None}"
7373
7474
echo "🔍 Fetching PR reviews..."
75-
PR_REVIEWS_JSON=$(gh api "/repos/$REPO_OWNER/$REPO_NAME/pulls/$PR_NUMBER/reviews" --jq '.')
76-
PR_REVIEWS=$(jq -r '.[] | select(.state == "APPROVED") | .user.login' <<< "$PR_REVIEWS_JSON")
75+
PR_REVIEWS_JSON=$(gh pr view "$PR_NUMBER" --repo "$REPO_OWNER/$REPO_NAME" --json reviews -q '.reviews')
76+
PR_REVIEWS=$(jq -r '.[] | select(.state == "APPROVED") | .author.login' <<< "$PR_REVIEWS_JSON")
7777
echo "✅ Approved Reviews (before filtering): ${PR_REVIEWS:-None}"
7878
7979
echo "🔍 Fetching pending review requests..."

‎Explorer/.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,5 +76,5 @@ Assets/AddressableAssetsData/Windows.meta
7676
Assets/AddressableAssetsData/ProfileDataSourceSettings.asset
7777
Assets/AddressableAssetsData/ProfileDataSourceSettings.asset.meta
7878

79-
# Disk Caching
79+
# Disk caching
8080
DiskCache/

‎Explorer/Assets/AddressableAssetsData/AssetGroupTemplates/Packed Assets.asset

+6-4
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ MonoBehaviour:
3939
m_CacheClearBehavior: 0
4040
m_IncludeInBuild: 1
4141
m_BundledAssetProviderType:
42-
m_AssemblyName:
43-
m_ClassName:
42+
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
43+
m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.BundledAssetProvider
4444
m_ForceUniqueProvider: 0
4545
m_UseAssetBundleCache: 1
4646
m_UseAssetBundleCrc: 1
@@ -56,8 +56,10 @@ MonoBehaviour:
5656
m_Id:
5757
m_BundleMode: 0
5858
m_AssetBundleProviderType:
59-
m_AssemblyName:
60-
m_ClassName:
59+
m_AssemblyName: Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
60+
m_ClassName: UnityEngine.ResourceManagement.ResourceProviders.AssetBundleProvider
61+
m_UseDefaultSchemaSettings: 0
62+
m_SelectedPathPairIndex: 0
6163
m_BundleNaming: 0
6264
m_AssetLoadMode: 0
6365
--- !u!114 &7982239158356517158

‎Explorer/Assets/AddressableAssetsData/AssetGroups/Audio.asset

-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ MonoBehaviour:
1313
m_Name: Audio
1414
m_EditorClassIdentifier:
1515
m_GroupName: Audio
16-
m_Data:
17-
m_SerializedData: []
1816
m_GUID: 6afe569a142146542854ed2edc5deb37
1917
m_SerializeEntries:
2018
- m_GUID: 03db33273505e5d4ca2cfcdda86df7f4

‎Explorer/Assets/AddressableAssetsData/AssetGroups/Avatar.asset

+20-22
Original file line numberDiff line numberDiff line change
@@ -13,27 +13,30 @@ MonoBehaviour:
1313
m_Name: Avatar
1414
m_EditorClassIdentifier:
1515
m_GroupName: Avatar
16-
m_Data:
17-
m_SerializedData: []
1816
m_GUID: 1dd1efed42c2dcb48954101ce18c8946
1917
m_SerializeEntries:
18+
- m_GUID: 00657accebbe6c348b5208e385e5ec73
19+
m_Address: Assets/DCL/AvatarRendering/AvatarShape/Assets/Avatar_Facial_Features.mat
20+
m_ReadOnly: 0
21+
m_SerializedLabels: []
22+
FlaggedDuringContentUpdateRestriction: 0
2023
- m_GUID: 1b6579d7e91068e41872ba3a3eb66fdf
2124
m_Address: Avatar_Male_Mesh
2225
m_ReadOnly: 0
2326
m_SerializedLabels: []
2427
FlaggedDuringContentUpdateRestriction: 0
25-
- m_GUID: 8db46845fb5f52f44a71c2a0c2d92074
26-
m_Address: AvatarBase
28+
- m_GUID: 2df144b808932744487656f89a42fb11
29+
m_Address: FlatNormal_256_BC5.DDS
2730
m_ReadOnly: 0
2831
m_SerializedLabels: []
2932
FlaggedDuringContentUpdateRestriction: 0
30-
- m_GUID: ccf99be97dbda744981e8b0ec1ef8faf
31-
m_Address: Avatar_CelShading
33+
- m_GUID: 4428c33e669492748afd75828965504b
34+
m_Address: FlatNormal_512_BC5.DDS
3235
m_ReadOnly: 0
3336
m_SerializedLabels: []
3437
FlaggedDuringContentUpdateRestriction: 0
35-
- m_GUID: e18034962a56eac40ab5df62e159c314
36-
m_Address: Avatar Randomizer.asset
38+
- m_GUID: 4ae49825f39c564478515b4c2ae201af
39+
m_Address: Assets/DCL/AvatarRendering/AvatarShape/Assets/Avatar_Toon.mat
3740
m_ReadOnly: 0
3841
m_SerializedLabels: []
3942
FlaggedDuringContentUpdateRestriction: 0
@@ -42,8 +45,8 @@ MonoBehaviour:
4245
m_ReadOnly: 0
4346
m_SerializedLabels: []
4447
FlaggedDuringContentUpdateRestriction: 0
45-
- m_GUID: f3fd7329d073f964aaec82eb9acc9ed3
46-
m_Address: DefaultBlack_512_BC7.DDS
48+
- m_GUID: 8db46845fb5f52f44a71c2a0c2d92074
49+
m_Address: AvatarBase
4750
m_ReadOnly: 0
4851
m_SerializedLabels: []
4952
FlaggedDuringContentUpdateRestriction: 0
@@ -57,29 +60,24 @@ MonoBehaviour:
5760
m_ReadOnly: 0
5861
m_SerializedLabels: []
5962
FlaggedDuringContentUpdateRestriction: 0
60-
- m_GUID: 2df144b808932744487656f89a42fb11
61-
m_Address: FlatNormal_256_BC5.DDS
62-
m_ReadOnly: 0
63-
m_SerializedLabels: []
64-
FlaggedDuringContentUpdateRestriction: 0
65-
- m_GUID: 4428c33e669492748afd75828965504b
66-
m_Address: FlatNormal_512_BC5.DDS
63+
- m_GUID: ccf99be97dbda744981e8b0ec1ef8faf
64+
m_Address: Avatar_CelShading
6765
m_ReadOnly: 0
6866
m_SerializedLabels: []
6967
FlaggedDuringContentUpdateRestriction: 0
70-
- m_GUID: 4ae49825f39c564478515b4c2ae201af
71-
m_Address: Assets/DCL/AvatarRendering/AvatarShape/Assets/Avatar_Toon.mat
68+
- m_GUID: e18034962a56eac40ab5df62e159c314
69+
m_Address: Avatar Randomizer.asset
7270
m_ReadOnly: 0
7371
m_SerializedLabels: []
7472
FlaggedDuringContentUpdateRestriction: 0
75-
- m_GUID: 00657accebbe6c348b5208e385e5ec73
76-
m_Address: Assets/DCL/AvatarRendering/AvatarShape/Assets/Avatar_Facial_Features.mat
73+
- m_GUID: f3fd7329d073f964aaec82eb9acc9ed3
74+
m_Address: DefaultBlack_512_BC7.DDS
7775
m_ReadOnly: 0
7876
m_SerializedLabels: []
7977
FlaggedDuringContentUpdateRestriction: 0
8078
m_ReadOnly: 0
8179
m_Settings: {fileID: 11400000, guid: fc8a9d2b539788c47a5b305639fa8b34, type: 2}
8280
m_SchemaSet:
8381
m_Schemas:
84-
- {fileID: 11400000, guid: e4e44e1629d2cde4aa4efcbd0ddf1b8c, type: 2}
8582
- {fileID: 11400000, guid: 2094e3b64157b0243a16ba026d9ece3d, type: 2}
83+
- {fileID: 11400000, guid: e4e44e1629d2cde4aa4efcbd0ddf1b8c, type: 2}

‎Explorer/Assets/AddressableAssetsData/AssetGroups/Chat.asset

-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ MonoBehaviour:
1313
m_Name: Chat
1414
m_EditorClassIdentifier:
1515
m_GroupName: Chat
16-
m_Data:
17-
m_SerializedData: []
1816
m_GUID: 8b013415c163949639034d60860ef87f
1917
m_SerializeEntries:
2018
- m_GUID: 51646f2adc3264ba7bf9b4f90febbd22

‎Explorer/Assets/AddressableAssetsData/AssetGroups/Essentials.asset

-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ MonoBehaviour:
1313
m_Name: Essentials
1414
m_EditorClassIdentifier:
1515
m_GroupName: Essentials
16-
m_Data:
17-
m_SerializedData: []
1816
m_GUID: 47f803e1e9c5079449bd106df98a0b7d
1917
m_SerializeEntries:
2018
- m_GUID: 04a7ffcd277754f7c91237894604f522

‎Explorer/Assets/AddressableAssetsData/AssetGroups/Fonts.asset

+9-11
Original file line numberDiff line numberDiff line change
@@ -13,22 +13,20 @@ MonoBehaviour:
1313
m_Name: Fonts
1414
m_EditorClassIdentifier:
1515
m_GroupName: Fonts
16-
m_Data:
17-
m_SerializedData: []
1816
m_GUID: 46a61ae7805bf184ea0537d43a3e2938
1917
m_SerializeEntries:
20-
- m_GUID: df7484e24db0e46b081f24ec884a70cf
21-
m_Address: Inter-UI-Bold SDF.asset
18+
- m_GUID: 31ba3b0d216114210a567326130f98e0
19+
m_Address: Inter-SemiBold SDF Material - Stroke.mat
2220
m_ReadOnly: 0
2321
m_SerializedLabels: []
2422
FlaggedDuringContentUpdateRestriction: 0
25-
- m_GUID: 31ba3b0d216114210a567326130f98e0
26-
m_Address: Inter-SemiBold SDF Material - Stroke.mat
23+
- m_GUID: 68e6db2ebdc24f95958faec2be5558d6
24+
m_Address: TMP_SDF.shader
2725
m_ReadOnly: 0
2826
m_SerializedLabels: []
2927
FlaggedDuringContentUpdateRestriction: 0
30-
- m_GUID: fe393ace9b354375a9cb14cdbbc28be4
31-
m_Address: TMP_SDF-Mobile.shader
28+
- m_GUID: df7484e24db0e46b081f24ec884a70cf
29+
m_Address: Inter-UI-Bold SDF.asset
3230
m_ReadOnly: 0
3331
m_SerializedLabels: []
3432
FlaggedDuringContentUpdateRestriction: 0
@@ -37,14 +35,14 @@ MonoBehaviour:
3735
m_ReadOnly: 0
3836
m_SerializedLabels: []
3937
FlaggedDuringContentUpdateRestriction: 0
40-
- m_GUID: 68e6db2ebdc24f95958faec2be5558d6
41-
m_Address: TMP_SDF.shader
38+
- m_GUID: fe393ace9b354375a9cb14cdbbc28be4
39+
m_Address: TMP_SDF-Mobile.shader
4240
m_ReadOnly: 0
4341
m_SerializedLabels: []
4442
FlaggedDuringContentUpdateRestriction: 0
4543
m_ReadOnly: 0
4644
m_Settings: {fileID: 11400000, guid: fc8a9d2b539788c47a5b305639fa8b34, type: 2}
4745
m_SchemaSet:
4846
m_Schemas:
49-
- {fileID: 11400000, guid: a9172ec10378fc54f8ca9e9aa4281cfe, type: 2}
5047
- {fileID: 11400000, guid: 7093b7de9ef2a554aace072bb20fe37e, type: 2}
48+
- {fileID: 11400000, guid: a9172ec10378fc54f8ca9e9aa4281cfe, type: 2}

‎Explorer/Assets/AddressableAssetsData/AssetGroups/Interactables.asset

+13-15
Original file line numberDiff line numberDiff line change
@@ -13,22 +13,15 @@ MonoBehaviour:
1313
m_Name: Interactables
1414
m_EditorClassIdentifier:
1515
m_GroupName: Interactables
16-
m_Data:
17-
m_SerializedData: []
1816
m_GUID: 03287bc88d1666443b4c6e7373ace385
1917
m_SerializeEntries:
20-
- m_GUID: bf22911f490866b45b81ddea869255f2
21-
m_Address: Assets/DCL/Interaction/Assets/Cursor.png
22-
m_ReadOnly: 0
23-
m_SerializedLabels: []
24-
FlaggedDuringContentUpdateRestriction: 0
2518
- m_GUID: 23dcf75316411d344be316dc2cb0e41f
2619
m_Address: Assets/DCL/Interaction/Assets/CursorInteractive.png
2720
m_ReadOnly: 0
2821
m_SerializedLabels: []
2922
FlaggedDuringContentUpdateRestriction: 0
30-
- m_GUID: 98d75b092dc90bb49a14cf7e80096e01
31-
m_Address: Assets/DCL/Interaction/Assets/Crosshair.png
23+
- m_GUID: 25a27c814a51d4a67a7ebd0b3b672284
24+
m_Address: Assets/DCL/Input/Assets/CursorDragCamera.png
3225
m_ReadOnly: 0
3326
m_SerializedLabels: []
3427
FlaggedDuringContentUpdateRestriction: 0
@@ -37,18 +30,23 @@ MonoBehaviour:
3730
m_ReadOnly: 0
3831
m_SerializedLabels: []
3932
FlaggedDuringContentUpdateRestriction: 0
40-
- m_GUID: bf82184de91c3944b8de02d57d7dd151
41-
m_Address: Crosshair.uxml
33+
- m_GUID: 7382805fd18299d41925547efbad99f0
34+
m_Address: Assets/DCL/Input/Assets/CursorSettings.asset
4235
m_ReadOnly: 0
4336
m_SerializedLabels: []
4437
FlaggedDuringContentUpdateRestriction: 0
45-
- m_GUID: 25a27c814a51d4a67a7ebd0b3b672284
46-
m_Address: Assets/DCL/Input/Assets/CursorDragCamera.png
38+
- m_GUID: 98d75b092dc90bb49a14cf7e80096e01
39+
m_Address: Assets/DCL/Interaction/Assets/Crosshair.png
4740
m_ReadOnly: 0
4841
m_SerializedLabels: []
4942
FlaggedDuringContentUpdateRestriction: 0
50-
- m_GUID: 7382805fd18299d41925547efbad99f0
51-
m_Address: Assets/DCL/Input/Assets/CursorSettings.asset
43+
- m_GUID: bf22911f490866b45b81ddea869255f2
44+
m_Address: Assets/DCL/Interaction/Assets/Cursor.png
45+
m_ReadOnly: 0
46+
m_SerializedLabels: []
47+
FlaggedDuringContentUpdateRestriction: 0
48+
- m_GUID: bf82184de91c3944b8de02d57d7dd151
49+
m_Address: Crosshair.uxml
5250
m_ReadOnly: 0
5351
m_SerializedLabels: []
5452
FlaggedDuringContentUpdateRestriction: 0

‎Explorer/Assets/AddressableAssetsData/AssetGroups/LOD.asset

-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ MonoBehaviour:
1313
m_Name: LOD
1414
m_EditorClassIdentifier:
1515
m_GroupName: LOD
16-
m_Data:
17-
m_SerializedData: []
1816
m_GUID: 3f96e21930e98c5489bb8c8c57ed4c94
1917
m_SerializeEntries:
2018
- m_GUID: c9870b17ce36346458f07a63c096a16a

‎Explorer/Assets/AddressableAssetsData/AssetGroups/Landscape.asset

-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ MonoBehaviour:
1313
m_Name: Landscape
1414
m_EditorClassIdentifier:
1515
m_GroupName: Landscape
16-
m_Data:
17-
m_SerializedData: []
1816
m_GUID: 1646f20aac43b7e489a0df42ff7d2024
1917
m_SerializeEntries:
2018
- m_GUID: 034505001d7fc99419a8eefba5c708c7

‎Explorer/Assets/AddressableAssetsData/AssetGroups/MapFallback.asset

-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ MonoBehaviour:
1313
m_Name: MapFallback
1414
m_EditorClassIdentifier:
1515
m_GroupName: MapFallback
16-
m_Data:
17-
m_SerializedData: []
1816
m_GUID: 252df334c0d72452a9d633172f0d664d
1917
m_SerializeEntries:
2018
- m_GUID: 0071e477d02b34317b64d4eb2f3a927f

‎Explorer/Assets/AddressableAssetsData/AssetGroups/Materials.asset

-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ MonoBehaviour:
1313
m_Name: Materials
1414
m_EditorClassIdentifier:
1515
m_GroupName: Materials
16-
m_Data:
17-
m_SerializedData: []
1816
m_GUID: 2fec862f89f4d0a459a47ad60d35dc5d
1917
m_SerializeEntries: []
2018
m_ReadOnly: 0

0 commit comments

Comments
 (0)