Skip to content

Commit bf9648c

Browse files
LudmilafantaniellaLudmilafantaniella
authored
Merge pull request decentraland#6241 from decentraland/release/release20240726
Release: 20240726
2 parents d4a0e99 + 4a2f0ec commit bf9648c

File tree

12 files changed

+63
-59
lines changed

12 files changed

+63
-59
lines changed

‎.github/auto_assign_config.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,12 @@ reviewGroups:
1010
- lorux0
1111
- davidejensen
1212
- popuz
13-
- mikhail-dcl
1413
- pravusjif
14+
- mikhail-dcl
15+
- dalkia
16+
- AlejandroAlvarezMelucciDCL
1517
qa:
1618
- Ludmilafantaniella
17-
- LucasLioyQA
1819
- anicalbano
1920

2021
filterLabels:

‎browser-interface/packages/entryPoints/startPreview.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,7 @@ export async function startPreview(unityInterface: IUnityInterface) {
3535
const ws = new WebSocket(`${location.protocol === 'https:' ? 'wss' : 'ws'}://${document.location.host}`)
3636

3737
ws.addEventListener('message', (msg) => {
38-
if (msg.data.startsWith('{')) {
39-
logger.log('Update message from CLI', msg.data)
38+
if (typeof msg.data === 'string' && msg.data.startsWith('{')) {
4039
const message: sdk.Messages = JSON.parse(msg.data)
4140
handleServerMessage(message)
4241
}

‎unity-renderer/Assets/Resources/Sentry/SentryOptions.asset

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ MonoBehaviour:
1212
m_Script: {fileID: -668357930, guid: 43ec428a58422470fa764bdba9d9bc19, type: 3}
1313
m_Name: SentryOptions
1414
m_EditorClassIdentifier:
15-
<Enabled>k__BackingField: 1
15+
<Enabled>k__BackingField: 0
1616
<Dsn>k__BackingField: https://dsn.dsn/
1717
<CaptureInEditor>k__BackingField: 1
1818
<EnableLogDebouncing>k__BackingField: 1

‎unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/AvatarEditorHUD/Resources/EmotesCustomization/EmoteCard.prefab

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1002,8 +1002,8 @@ RectTransform:
10021002
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
10031003
m_AnchorMin: {x: 0, y: 1}
10041004
m_AnchorMax: {x: 0, y: 1}
1005-
m_AnchoredPosition: {x: 2, y: -2.3}
1006-
m_SizeDelta: {x: 20, y: 20}
1005+
m_AnchoredPosition: {x: 3, y: -3}
1006+
m_SizeDelta: {x: 18, y: 18}
10071007
m_Pivot: {x: 0, y: 1}
10081008
--- !u!222 &1067968680794964267
10091009
CanvasRenderer:

‎unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/AvatarEditorHUD/Resources/EmotesCustomization/EmoteSlotCard.prefab

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -455,8 +455,8 @@ RectTransform:
455455
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
456456
m_AnchorMin: {x: 0, y: 1}
457457
m_AnchorMax: {x: 0, y: 1}
458-
m_AnchoredPosition: {x: 2, y: -2}
459-
m_SizeDelta: {x: 11, y: 11}
458+
m_AnchoredPosition: {x: 3, y: -3}
459+
m_SizeDelta: {x: 10, y: 10}
460460
m_Pivot: {x: 0, y: 1}
461461
--- !u!222 &4850818203974739451
462462
CanvasRenderer:

‎unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/EmotesWheelHUD/Resources/EmotesWheelHUD.prefab

Lines changed: 35 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -723,8 +723,8 @@ RectTransform:
723723
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
724724
m_AnchorMin: {x: 0.5, y: 0.5}
725725
m_AnchorMax: {x: 0.5, y: 0.5}
726-
m_AnchoredPosition: {x: -6.0276356, y: 5.97242}
727-
m_SizeDelta: {x: 7, y: 7}
726+
m_AnchoredPosition: {x: -5, y: 5}
727+
m_SizeDelta: {x: 10, y: 10}
728728
m_Pivot: {x: 0.5, y: 0.5}
729729
--- !u!222 &2707474641924863602
730730
CanvasRenderer:
@@ -754,7 +754,7 @@ MonoBehaviour:
754754
m_OnCullStateChanged:
755755
m_PersistentCalls:
756756
m_Calls: []
757-
m_Sprite: {fileID: 21300000, guid: 444dfe6ea294f4c22b1620698d4ce011, type: 3}
757+
m_Sprite: {fileID: 21300000, guid: 05bc7d6b12857fb4b9b7634bf2a4f440, type: 3}
758758
m_Type: 0
759759
m_PreserveAspect: 0
760760
m_FillCenter: 1
@@ -1218,8 +1218,8 @@ RectTransform:
12181218
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
12191219
m_AnchorMin: {x: 0.5, y: 0.5}
12201220
m_AnchorMax: {x: 0.5, y: 0.5}
1221-
m_AnchoredPosition: {x: -6.0276356, y: 5.97242}
1222-
m_SizeDelta: {x: 7, y: 7}
1221+
m_AnchoredPosition: {x: -5, y: 5}
1222+
m_SizeDelta: {x: 10, y: 10}
12231223
m_Pivot: {x: 0.5, y: 0.5}
12241224
--- !u!222 &5574777437422997797
12251225
CanvasRenderer:
@@ -1249,7 +1249,7 @@ MonoBehaviour:
12491249
m_OnCullStateChanged:
12501250
m_PersistentCalls:
12511251
m_Calls: []
1252-
m_Sprite: {fileID: 21300000, guid: 444dfe6ea294f4c22b1620698d4ce011, type: 3}
1252+
m_Sprite: {fileID: 21300000, guid: 05bc7d6b12857fb4b9b7634bf2a4f440, type: 3}
12531253
m_Type: 0
12541254
m_PreserveAspect: 0
12551255
m_FillCenter: 1
@@ -1925,8 +1925,8 @@ RectTransform:
19251925
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
19261926
m_AnchorMin: {x: 0.5, y: 0.5}
19271927
m_AnchorMax: {x: 0.5, y: 0.5}
1928-
m_AnchoredPosition: {x: -6.0276356, y: 5.97242}
1929-
m_SizeDelta: {x: 7, y: 7}
1928+
m_AnchoredPosition: {x: -5, y: 5}
1929+
m_SizeDelta: {x: 10, y: 10}
19301930
m_Pivot: {x: 0.5, y: 0.5}
19311931
--- !u!222 &7583685785367040411
19321932
CanvasRenderer:
@@ -1956,7 +1956,7 @@ MonoBehaviour:
19561956
m_OnCullStateChanged:
19571957
m_PersistentCalls:
19581958
m_Calls: []
1959-
m_Sprite: {fileID: 21300000, guid: 444dfe6ea294f4c22b1620698d4ce011, type: 3}
1959+
m_Sprite: {fileID: 21300000, guid: 05bc7d6b12857fb4b9b7634bf2a4f440, type: 3}
19601960
m_Type: 0
19611961
m_PreserveAspect: 0
19621962
m_FillCenter: 1
@@ -2589,8 +2589,8 @@ RectTransform:
25892589
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
25902590
m_AnchorMin: {x: 0.5, y: 0.5}
25912591
m_AnchorMax: {x: 0.5, y: 0.5}
2592-
m_AnchoredPosition: {x: -6.0276356, y: 5.97242}
2593-
m_SizeDelta: {x: 7, y: 7}
2592+
m_AnchoredPosition: {x: -5, y: 5}
2593+
m_SizeDelta: {x: 10, y: 10}
25942594
m_Pivot: {x: 0.5, y: 0.5}
25952595
--- !u!222 &112968691304925994
25962596
CanvasRenderer:
@@ -2620,7 +2620,7 @@ MonoBehaviour:
26202620
m_OnCullStateChanged:
26212621
m_PersistentCalls:
26222622
m_Calls: []
2623-
m_Sprite: {fileID: 21300000, guid: 444dfe6ea294f4c22b1620698d4ce011, type: 3}
2623+
m_Sprite: {fileID: 21300000, guid: 05bc7d6b12857fb4b9b7634bf2a4f440, type: 3}
26242624
m_Type: 0
26252625
m_PreserveAspect: 0
26262626
m_FillCenter: 1
@@ -3709,8 +3709,8 @@ RectTransform:
37093709
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
37103710
m_AnchorMin: {x: 0.5, y: 0.5}
37113711
m_AnchorMax: {x: 0.5, y: 0.5}
3712-
m_AnchoredPosition: {x: -6.0276356, y: 5.97242}
3713-
m_SizeDelta: {x: 7, y: 7}
3712+
m_AnchoredPosition: {x: -5, y: 5}
3713+
m_SizeDelta: {x: 10, y: 10}
37143714
m_Pivot: {x: 0.5, y: 0.5}
37153715
--- !u!222 &841014662171704921
37163716
CanvasRenderer:
@@ -3740,7 +3740,7 @@ MonoBehaviour:
37403740
m_OnCullStateChanged:
37413741
m_PersistentCalls:
37423742
m_Calls: []
3743-
m_Sprite: {fileID: 21300000, guid: 444dfe6ea294f4c22b1620698d4ce011, type: 3}
3743+
m_Sprite: {fileID: 21300000, guid: 05bc7d6b12857fb4b9b7634bf2a4f440, type: 3}
37443744
m_Type: 0
37453745
m_PreserveAspect: 0
37463746
m_FillCenter: 1
@@ -4450,8 +4450,8 @@ RectTransform:
44504450
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
44514451
m_AnchorMin: {x: 0.5, y: 0.5}
44524452
m_AnchorMax: {x: 0.5, y: 0.5}
4453-
m_AnchoredPosition: {x: -6.0276356, y: 5.97242}
4454-
m_SizeDelta: {x: 7, y: 7}
4453+
m_AnchoredPosition: {x: -5, y: 5}
4454+
m_SizeDelta: {x: 10, y: 10}
44554455
m_Pivot: {x: 0.5, y: 0.5}
44564456
--- !u!222 &5775258425258294350
44574457
CanvasRenderer:
@@ -4481,7 +4481,7 @@ MonoBehaviour:
44814481
m_OnCullStateChanged:
44824482
m_PersistentCalls:
44834483
m_Calls: []
4484-
m_Sprite: {fileID: 21300000, guid: 444dfe6ea294f4c22b1620698d4ce011, type: 3}
4484+
m_Sprite: {fileID: 21300000, guid: 05bc7d6b12857fb4b9b7634bf2a4f440, type: 3}
44854485
m_Type: 0
44864486
m_PreserveAspect: 0
44874487
m_FillCenter: 1
@@ -5154,8 +5154,8 @@ RectTransform:
51545154
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
51555155
m_AnchorMin: {x: 0.5, y: 0.5}
51565156
m_AnchorMax: {x: 0.5, y: 0.5}
5157-
m_AnchoredPosition: {x: -6.0276356, y: 5.97242}
5158-
m_SizeDelta: {x: 7, y: 7}
5157+
m_AnchoredPosition: {x: -5, y: 5}
5158+
m_SizeDelta: {x: 10, y: 10}
51595159
m_Pivot: {x: 0.5, y: 0.5}
51605160
--- !u!222 &6486707974257334458
51615161
CanvasRenderer:
@@ -5185,7 +5185,7 @@ MonoBehaviour:
51855185
m_OnCullStateChanged:
51865186
m_PersistentCalls:
51875187
m_Calls: []
5188-
m_Sprite: {fileID: 21300000, guid: 444dfe6ea294f4c22b1620698d4ce011, type: 3}
5188+
m_Sprite: {fileID: 21300000, guid: 05bc7d6b12857fb4b9b7634bf2a4f440, type: 3}
51895189
m_Type: 0
51905190
m_PreserveAspect: 0
51915191
m_FillCenter: 1
@@ -5627,8 +5627,8 @@ RectTransform:
56275627
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
56285628
m_AnchorMin: {x: 0.5, y: 0.5}
56295629
m_AnchorMax: {x: 0.5, y: 0.5}
5630-
m_AnchoredPosition: {x: -6.0276356, y: 5.97242}
5631-
m_SizeDelta: {x: 7, y: 7}
5630+
m_AnchoredPosition: {x: -5, y: 5}
5631+
m_SizeDelta: {x: 10, y: 10}
56325632
m_Pivot: {x: 0.5, y: 0.5}
56335633
--- !u!222 &5392225803950969162
56345634
CanvasRenderer:
@@ -5658,7 +5658,7 @@ MonoBehaviour:
56585658
m_OnCullStateChanged:
56595659
m_PersistentCalls:
56605660
m_Calls: []
5661-
m_Sprite: {fileID: 21300000, guid: 444dfe6ea294f4c22b1620698d4ce011, type: 3}
5661+
m_Sprite: {fileID: 21300000, guid: 05bc7d6b12857fb4b9b7634bf2a4f440, type: 3}
56625662
m_Type: 0
56635663
m_PreserveAspect: 0
56645664
m_FillCenter: 1
@@ -6454,8 +6454,8 @@ RectTransform:
64546454
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
64556455
m_AnchorMin: {x: 0.5, y: 0.5}
64566456
m_AnchorMax: {x: 0.5, y: 0.5}
6457-
m_AnchoredPosition: {x: -6.0276356, y: 5.97242}
6458-
m_SizeDelta: {x: 7, y: 7}
6457+
m_AnchoredPosition: {x: -5, y: 5}
6458+
m_SizeDelta: {x: 10, y: 10}
64596459
m_Pivot: {x: 0.5, y: 0.5}
64606460
--- !u!222 &4386616069319312971
64616461
CanvasRenderer:
@@ -6485,7 +6485,7 @@ MonoBehaviour:
64856485
m_OnCullStateChanged:
64866486
m_PersistentCalls:
64876487
m_Calls: []
6488-
m_Sprite: {fileID: 21300000, guid: 444dfe6ea294f4c22b1620698d4ce011, type: 3}
6488+
m_Sprite: {fileID: 21300000, guid: 05bc7d6b12857fb4b9b7634bf2a4f440, type: 3}
64896489
m_Type: 0
64906490
m_PreserveAspect: 0
64916491
m_FillCenter: 1
@@ -7756,8 +7756,8 @@ RectTransform:
77567756
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
77577757
m_AnchorMin: {x: 0.5, y: 0.5}
77587758
m_AnchorMax: {x: 0.5, y: 0.5}
7759-
m_AnchoredPosition: {x: -6.0276356, y: 5.97242}
7760-
m_SizeDelta: {x: 7, y: 7}
7759+
m_AnchoredPosition: {x: -5, y: 5}
7760+
m_SizeDelta: {x: 10, y: 10}
77617761
m_Pivot: {x: 0.5, y: 0.5}
77627762
--- !u!222 &1771334870392521315
77637763
CanvasRenderer:
@@ -7787,7 +7787,7 @@ MonoBehaviour:
77877787
m_OnCullStateChanged:
77887788
m_PersistentCalls:
77897789
m_Calls: []
7790-
m_Sprite: {fileID: 21300000, guid: 444dfe6ea294f4c22b1620698d4ce011, type: 3}
7790+
m_Sprite: {fileID: 21300000, guid: 05bc7d6b12857fb4b9b7634bf2a4f440, type: 3}
77917791
m_Type: 0
77927792
m_PreserveAspect: 0
77937793
m_FillCenter: 1
@@ -10707,6 +10707,11 @@ PrefabInstance:
1070710707
propertyPath: m_Name
1070810708
value: Thumbnail
1070910709
objectReference: {fileID: 0}
10710+
- target: {fileID: 6719010960977733696, guid: 4849d2ed3b5a18948bf3cd46256869a4,
10711+
type: 3}
10712+
propertyPath: m_IsActive
10713+
value: 1
10714+
objectReference: {fileID: 0}
1071010715
m_RemovedComponents: []
1071110716
m_RemovedGameObjects: []
1071210717
m_AddedGameObjects: []

‎unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/Passport/Resources/PlayerPassport.prefab

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9183,7 +9183,7 @@ RectTransform:
91839183
m_AnchorMin: {x: 0, y: 1}
91849184
m_AnchorMax: {x: 0, y: 1}
91859185
m_AnchoredPosition: {x: 32, y: -28}
9186-
m_SizeDelta: {x: 23.2504, y: 20.0978}
9186+
m_SizeDelta: {x: 23.2504, y: 28}
91879187
m_Pivot: {x: 0.5, y: 0.5}
91889188
--- !u!222 &9085653859322830480
91899189
CanvasRenderer:
@@ -20432,7 +20432,7 @@ PrefabInstance:
2043220432
- target: {fileID: 1616525665509150121, guid: 59dab406fb0f74972a9f59906589040d,
2043320433
type: 3}
2043420434
propertyPath: m_IsActive
20435-
value: 1
20435+
value: 0
2043620436
objectReference: {fileID: 0}
2043720437
- target: {fileID: 1659266317040970982, guid: 59dab406fb0f74972a9f59906589040d,
2043820438
type: 3}
@@ -20542,7 +20542,7 @@ PrefabInstance:
2054220542
- target: {fileID: 3255177139748142192, guid: 59dab406fb0f74972a9f59906589040d,
2054320543
type: 3}
2054420544
propertyPath: m_IsActive
20545-
value: 1
20545+
value: 0
2054620546
objectReference: {fileID: 0}
2054720547
- target: {fileID: 3355408138738260923, guid: 59dab406fb0f74972a9f59906589040d,
2054820548
type: 3}

‎unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/TaskbarHUD/Resources/Taskbar.prefab

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1003,8 +1003,8 @@ RectTransform:
10031003
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
10041004
m_AnchorMin: {x: 0.5, y: 0}
10051005
m_AnchorMax: {x: 0.5, y: 0}
1006-
m_AnchoredPosition: {x: 0, y: 0}
1007-
m_SizeDelta: {x: 40, y: 40}
1006+
m_AnchoredPosition: {x: 0, y: 3}
1007+
m_SizeDelta: {x: 34, y: 34}
10081008
m_Pivot: {x: 0.5, y: 0}
10091009
--- !u!222 &8871550248471926608
10101010
CanvasRenderer:
@@ -1072,7 +1072,7 @@ MonoBehaviour:
10721072
m_OnCullStateChanged:
10731073
m_PersistentCalls:
10741074
m_Calls: []
1075-
m_Sprite: {fileID: 21300000, guid: 05bc7d6b12857fb4b9b7634bf2a4f440, type: 3}
1075+
m_Sprite: {fileID: 21300000, guid: c6cb56bd6fdab4d49879218fffcfc7f7, type: 3}
10761076
m_Type: 0
10771077
m_PreserveAspect: 1
10781078
m_FillCenter: 1
@@ -1247,11 +1247,10 @@ MonoBehaviour:
12471247
m_EditorClassIdentifier:
12481248
showHideAnimator: {fileID: 0}
12491249
contentModerationButton: {fileID: 6832325096302936748}
1250-
contentModerationRatingText: {fileID: 3902808279478684175}
1251-
contentModerationRatingBackground: {fileID: 0}
1252-
backgroundColorForTeen: {r: 0, g: 0, b: 0, a: 0}
1253-
backgroundColorForAdult: {r: 0, g: 0, b: 0, a: 0}
1254-
backgroundColorForRestricted: {r: 0, g: 0, b: 0, a: 0}
1250+
flagImage: {fileID: 0}
1251+
teenFlagIcon: {fileID: 0}
1252+
adultFlagIcon: {fileID: 0}
1253+
restrictedFlagIcon: {fileID: 0}
12551254
--- !u!1 &3080350646182386195
12561255
GameObject:
12571256
m_ObjectHideFlags: 0
@@ -3743,7 +3742,7 @@ RectTransform:
37433742
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
37443743
m_AnchorMin: {x: 0.5, y: 1}
37453744
m_AnchorMax: {x: 0.5, y: 1}
3746-
m_AnchoredPosition: {x: 0, y: 9.199982}
3745+
m_AnchoredPosition: {x: 0, y: 12}
37473746
m_SizeDelta: {x: 100, y: 20}
37483747
m_Pivot: {x: 0.5, y: 0.5}
37493748
--- !u!222 &4319298365752353504

‎unity-renderer/Assets/Textures/UI/Common/EmotesIcon.png

100644100755
Lines changed: 2 additions & 2 deletions
Loading

‎unity-renderer/Assets/Textures/UI/Common/EmotesOff.png

Lines changed: 2 additions & 2 deletions
Loading

0 commit comments

Comments
 (0)