Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release: 20240726 #6241

Merged
merged 4 commits into from
Jul 26, 2024
Merged

Release: 20240726 #6241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b3b170e
chore: update the auto assign review config (#6233)
aixaCode Jul 9, 2024
4fc34f2
ignore e@ preview messages (#6238)
gonpombo8 Jul 24, 2024
3f36ad1
style: emotes icon (#6237)
RominaMarchetti Jul 25, 2024
4a2f0ec
chore: disable sentry (#6240)
aixaCode Jul 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .github/auto_assign_config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,12 @@ reviewGroups:
- lorux0
- davidejensen
- popuz
- mikhail-dcl
- pravusjif
- mikhail-dcl
- dalkia
- AlejandroAlvarezMelucciDCL
qa:
- Ludmilafantaniella
- LucasLioyQA
- anicalbano

filterLabels:
Expand Down
3 changes: 1 addition & 2 deletions browser-interface/packages/entryPoints/startPreview.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,7 @@ export async function startPreview(unityInterface: IUnityInterface) {
const ws = new WebSocket(`${location.protocol === 'https:' ? 'wss' : 'ws'}://${document.location.host}`)

ws.addEventListener('message', (msg) => {
if (msg.data.startsWith('{')) {
logger.log('Update message from CLI', msg.data)
if (typeof msg.data === 'string' && msg.data.startsWith('{')) {
const message: sdk.Messages = JSON.parse(msg.data)
handleServerMessage(message)
}
Expand Down
2 changes: 1 addition & 1 deletion unity-renderer/Assets/Resources/Sentry/SentryOptions.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: -668357930, guid: 43ec428a58422470fa764bdba9d9bc19, type: 3}
m_Name: SentryOptions
m_EditorClassIdentifier:
<Enabled>k__BackingField: 1
<Enabled>k__BackingField: 0
<Dsn>k__BackingField: https://dsn.dsn/
<CaptureInEditor>k__BackingField: 1
<EnableLogDebouncing>k__BackingField: 1
Expand Down
4 changes: 2 additions & 2 deletions ...cripts/DCL/Controllers/HUD/AvatarEditorHUD/Resources/EmotesCustomization/EmoteCard.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1002,8 +1002,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 2, y: -2.3}
m_SizeDelta: {x: 20, y: 20}
m_AnchoredPosition: {x: 3, y: -3}
m_SizeDelta: {x: 18, y: 18}
m_Pivot: {x: 0, y: 1}
--- !u!222 &1067968680794964267
CanvasRenderer:
Expand Down
4 changes: 2 additions & 2 deletions ...ts/DCL/Controllers/HUD/AvatarEditorHUD/Resources/EmotesCustomization/EmoteSlotCard.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,8 +455,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 2, y: -2}
m_SizeDelta: {x: 11, y: 11}
m_AnchoredPosition: {x: 3, y: -3}
m_SizeDelta: {x: 10, y: 10}
m_Pivot: {x: 0, y: 1}
--- !u!222 &4850818203974739451
CanvasRenderer:
Expand Down
65 changes: 35 additions & 30 deletions ...ts/Scripts/MainScripts/DCL/Controllers/HUD/EmotesWheelHUD/Resources/EmotesWheelHUD.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -723,8 +723,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -6.0276356, y: 5.97242}
m_SizeDelta: {x: 7, y: 7}
m_AnchoredPosition: {x: -5, y: 5}
m_SizeDelta: {x: 10, y: 10}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2707474641924863602
CanvasRenderer:
Expand Down Expand Up @@ -754,7 +754,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 444dfe6ea294f4c22b1620698d4ce011, type: 3}
m_Sprite: {fileID: 21300000, guid: 05bc7d6b12857fb4b9b7634bf2a4f440, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
Expand Down Expand Up @@ -1218,8 +1218,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -6.0276356, y: 5.97242}
m_SizeDelta: {x: 7, y: 7}
m_AnchoredPosition: {x: -5, y: 5}
m_SizeDelta: {x: 10, y: 10}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5574777437422997797
CanvasRenderer:
Expand Down Expand Up @@ -1249,7 +1249,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 444dfe6ea294f4c22b1620698d4ce011, type: 3}
m_Sprite: {fileID: 21300000, guid: 05bc7d6b12857fb4b9b7634bf2a4f440, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
Expand Down Expand Up @@ -1925,8 +1925,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -6.0276356, y: 5.97242}
m_SizeDelta: {x: 7, y: 7}
m_AnchoredPosition: {x: -5, y: 5}
m_SizeDelta: {x: 10, y: 10}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7583685785367040411
CanvasRenderer:
Expand Down Expand Up @@ -1956,7 +1956,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 444dfe6ea294f4c22b1620698d4ce011, type: 3}
m_Sprite: {fileID: 21300000, guid: 05bc7d6b12857fb4b9b7634bf2a4f440, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
Expand Down Expand Up @@ -2589,8 +2589,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -6.0276356, y: 5.97242}
m_SizeDelta: {x: 7, y: 7}
m_AnchoredPosition: {x: -5, y: 5}
m_SizeDelta: {x: 10, y: 10}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &112968691304925994
CanvasRenderer:
Expand Down Expand Up @@ -2620,7 +2620,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 444dfe6ea294f4c22b1620698d4ce011, type: 3}
m_Sprite: {fileID: 21300000, guid: 05bc7d6b12857fb4b9b7634bf2a4f440, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
Expand Down Expand Up @@ -3709,8 +3709,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -6.0276356, y: 5.97242}
m_SizeDelta: {x: 7, y: 7}
m_AnchoredPosition: {x: -5, y: 5}
m_SizeDelta: {x: 10, y: 10}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &841014662171704921
CanvasRenderer:
Expand Down Expand Up @@ -3740,7 +3740,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 444dfe6ea294f4c22b1620698d4ce011, type: 3}
m_Sprite: {fileID: 21300000, guid: 05bc7d6b12857fb4b9b7634bf2a4f440, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
Expand Down Expand Up @@ -4450,8 +4450,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -6.0276356, y: 5.97242}
m_SizeDelta: {x: 7, y: 7}
m_AnchoredPosition: {x: -5, y: 5}
m_SizeDelta: {x: 10, y: 10}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5775258425258294350
CanvasRenderer:
Expand Down Expand Up @@ -4481,7 +4481,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 444dfe6ea294f4c22b1620698d4ce011, type: 3}
m_Sprite: {fileID: 21300000, guid: 05bc7d6b12857fb4b9b7634bf2a4f440, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
Expand Down Expand Up @@ -5154,8 +5154,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -6.0276356, y: 5.97242}
m_SizeDelta: {x: 7, y: 7}
m_AnchoredPosition: {x: -5, y: 5}
m_SizeDelta: {x: 10, y: 10}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6486707974257334458
CanvasRenderer:
Expand Down Expand Up @@ -5185,7 +5185,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 444dfe6ea294f4c22b1620698d4ce011, type: 3}
m_Sprite: {fileID: 21300000, guid: 05bc7d6b12857fb4b9b7634bf2a4f440, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
Expand Down Expand Up @@ -5627,8 +5627,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -6.0276356, y: 5.97242}
m_SizeDelta: {x: 7, y: 7}
m_AnchoredPosition: {x: -5, y: 5}
m_SizeDelta: {x: 10, y: 10}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5392225803950969162
CanvasRenderer:
Expand Down Expand Up @@ -5658,7 +5658,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 444dfe6ea294f4c22b1620698d4ce011, type: 3}
m_Sprite: {fileID: 21300000, guid: 05bc7d6b12857fb4b9b7634bf2a4f440, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
Expand Down Expand Up @@ -6454,8 +6454,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -6.0276356, y: 5.97242}
m_SizeDelta: {x: 7, y: 7}
m_AnchoredPosition: {x: -5, y: 5}
m_SizeDelta: {x: 10, y: 10}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4386616069319312971
CanvasRenderer:
Expand Down Expand Up @@ -6485,7 +6485,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 444dfe6ea294f4c22b1620698d4ce011, type: 3}
m_Sprite: {fileID: 21300000, guid: 05bc7d6b12857fb4b9b7634bf2a4f440, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
Expand Down Expand Up @@ -7756,8 +7756,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -6.0276356, y: 5.97242}
m_SizeDelta: {x: 7, y: 7}
m_AnchoredPosition: {x: -5, y: 5}
m_SizeDelta: {x: 10, y: 10}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1771334870392521315
CanvasRenderer:
Expand Down Expand Up @@ -7787,7 +7787,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 444dfe6ea294f4c22b1620698d4ce011, type: 3}
m_Sprite: {fileID: 21300000, guid: 05bc7d6b12857fb4b9b7634bf2a4f440, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
Expand Down Expand Up @@ -10707,6 +10707,11 @@ PrefabInstance:
propertyPath: m_Name
value: Thumbnail
objectReference: {fileID: 0}
- target: {fileID: 6719010960977733696, guid: 4849d2ed3b5a18948bf3cd46256869a4,
type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
Expand Down
6 changes: 3 additions & 3 deletions ...r/Assets/Scripts/MainScripts/DCL/Controllers/HUD/Passport/Resources/PlayerPassport.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9183,7 +9183,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 32, y: -28}
m_SizeDelta: {x: 23.2504, y: 20.0978}
m_SizeDelta: {x: 23.2504, y: 28}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &9085653859322830480
CanvasRenderer:
Expand Down Expand Up @@ -20432,7 +20432,7 @@ PrefabInstance:
- target: {fileID: 1616525665509150121, guid: 59dab406fb0f74972a9f59906589040d,
type: 3}
propertyPath: m_IsActive
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1659266317040970982, guid: 59dab406fb0f74972a9f59906589040d,
type: 3}
Expand Down Expand Up @@ -20542,7 +20542,7 @@ PrefabInstance:
- target: {fileID: 3255177139748142192, guid: 59dab406fb0f74972a9f59906589040d,
type: 3}
propertyPath: m_IsActive
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3355408138738260923, guid: 59dab406fb0f74972a9f59906589040d,
type: 3}
Expand Down
17 changes: 8 additions & 9 deletions ...nderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/TaskbarHUD/Resources/Taskbar.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1003,8 +1003,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0}
m_AnchorMax: {x: 0.5, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 40, y: 40}
m_AnchoredPosition: {x: 0, y: 3}
m_SizeDelta: {x: 34, y: 34}
m_Pivot: {x: 0.5, y: 0}
--- !u!222 &8871550248471926608
CanvasRenderer:
Expand Down Expand Up @@ -1072,7 +1072,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 05bc7d6b12857fb4b9b7634bf2a4f440, type: 3}
m_Sprite: {fileID: 21300000, guid: c6cb56bd6fdab4d49879218fffcfc7f7, type: 3}
m_Type: 0
m_PreserveAspect: 1
m_FillCenter: 1
Expand Down Expand Up @@ -1247,11 +1247,10 @@ MonoBehaviour:
m_EditorClassIdentifier:
showHideAnimator: {fileID: 0}
contentModerationButton: {fileID: 6832325096302936748}
contentModerationRatingText: {fileID: 3902808279478684175}
contentModerationRatingBackground: {fileID: 0}
backgroundColorForTeen: {r: 0, g: 0, b: 0, a: 0}
backgroundColorForAdult: {r: 0, g: 0, b: 0, a: 0}
backgroundColorForRestricted: {r: 0, g: 0, b: 0, a: 0}
flagImage: {fileID: 0}
teenFlagIcon: {fileID: 0}
adultFlagIcon: {fileID: 0}
restrictedFlagIcon: {fileID: 0}
--- !u!1 &3080350646182386195
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -3743,7 +3742,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 0, y: 9.199982}
m_AnchoredPosition: {x: 0, y: 12}
m_SizeDelta: {x: 100, y: 20}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4319298365752353504
Expand Down
4 changes: 2 additions & 2 deletions unity-renderer/Assets/Textures/UI/Common/EmotesIcon.png
100644 → 100755
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions unity-renderer/Assets/Textures/UI/Common/EmotesOff.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions unity-renderer/Assets/Textures/UI/Common/EmotesOn.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions unity-renderer/Assets/Textures/UI/Passport/PassportIcons/EmotesIcn.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading