Merge pull request #4954 from decentraland/release/2025-08-05

release: 2025-08-05

Author: anicalbano

.github/ISSUE_TEMPLATE/bug_report.md

@@ -14,7 +14,7 @@ assignees: ''
 ### 📔 **Issue Description:**
 <!-- Short description of the observed issue -->
 
-### **STR:** 
+### 👣 **STR:** 
 
   1.
   2.
@@ -24,12 +24,15 @@ assignees: ''
 
 ### ❌ **Actual Result with evidence:**
 
+### ➗ **Reproduction:**
+<!-- Select one option bellow and add notes such as "Happens 100% or happens to one user" -->
+##### 🔁 Always - (note)
 
-### ➗ **Repro Index:**
-<!-- Starting on 0/10 attempts -->
+##### ⚠️ Intermittent - (note)
 
+##### ❓ Unknown - (note)
 
-### 🖥️ **Operative system and additional Notes:**
+#### 🖥️ **Operative system and additional Notes:**
 <!-- If the test is made on Mac, specify if the chip is M1 or Intel -->
 
 

Explorer/Assets/AddressableAssetsData/AddressableAssetSettings.asset

@@ -15,7 +15,7 @@ MonoBehaviour:
   m_DefaultGroup: 47f803e1e9c5079449bd106df98a0b7d
   m_currentHash:
     serializedVersion: 2
-    Hash: a6b474a8c1f3d2d1f0f9dc4906484622
+    Hash: 00000000000000000000000000000000
   m_OptimizeCatalogSize: 0
   m_BuildRemoteCatalog: 0
   m_CatalogRequestsTimeout: 0

Explorer/Assets/AddressableAssetsData/AssetGroups/Essentials.asset

@@ -20,6 +20,11 @@ MonoBehaviour:
     m_ReadOnly: 0
     m_SerializedLabels: []
     FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 03dabb815fc004f9581a9528b72c106f
+    m_Address: Assets/DCL/UI/GenericContextMenu/Prefabs/ButtonList.prefab
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
   - m_GUID: 04a7ffcd277754f7c91237894604f522
     m_Address: NftRarityBackgrounds
     m_ReadOnly: 0
@@ -110,6 +115,11 @@ MonoBehaviour:
     m_ReadOnly: 0
     m_SerializedLabels: []
     FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 33891647b85dc47319f39490bb24594d
+    m_Address: Assets/DCL/UI/GenericContextMenu/Prefabs/ToggleWithCheck.prefab
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
   - m_GUID: 35aa85d68d15435418848a03a2db81ec
     m_Address: Assets/TextMesh Pro/Fonts & Materials/Inter-Regular SDF.asset
     m_ReadOnly: 0
@@ -145,6 +155,11 @@ MonoBehaviour:
     m_ReadOnly: 0
     m_SerializedLabels: []
     FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 497073cedbc8540c2b17104cfee96158
+    m_Address: Assets/DCL/UI/GenericContextMenu/Prefabs/SubMenuButton.prefab
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
   - m_GUID: 4a2a7b610414b45c1b576946ce094877
     m_Address: NftCategoryIcons
     m_ReadOnly: 0
@@ -176,7 +191,7 @@ MonoBehaviour:
     m_SerializedLabels: []
     FlaggedDuringContentUpdateRestriction: 0
   - m_GUID: 52c856180dc5d6447b902f06d38f4161
-    m_Address: LightSourceDefaults
+    m_Address: LightSourceSettings
     m_ReadOnly: 0
     m_SerializedLabels: []
     FlaggedDuringContentUpdateRestriction: 0
@@ -285,6 +300,11 @@ MonoBehaviour:
     m_ReadOnly: 0
     m_SerializedLabels: []
     FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 7a24101494a664ee59a8952e20b8f441
+    m_Address: Assets/DCL/UI/GenericContextMenu/Prefabs/ControlsContainer.prefab
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
   - m_GUID: 7a43321b8055d407ba2e871e873c7062
     m_Address: EmoteWheelRarityBackgrounds.asset
     m_ReadOnly: 0
@@ -380,6 +400,11 @@ MonoBehaviour:
     m_ReadOnly: 0
     m_SerializedLabels: []
     FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: acb5d5500934645ac89935fe64d8bf01
+    m_Address: Assets/DCL/UI/GenericContextMenu/Prefabs/ButtonWithText.prefab
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
   - m_GUID: b028edf69a2c54c9194c4ce6524befff
     m_Address: ChatBubbleConfiguration
     m_ReadOnly: 0

Explorer/Assets/AddressableAssetsData/AssetGroups/Wearables.asset

@@ -15,13 +15,33 @@ MonoBehaviour:
   m_GroupName: Wearables
   m_GUID: 8180de1f5c609ab4eba3413c504ab316
   m_SerializeEntries:
-  - m_GUID: 2d002c6a594460f4cb42100b50e7e53a
-    m_Address: EMPTY_DEFAULT_WEARABLE
+  - m_GUID: 17775668c745d4edfae3bff500f95f32
+    m_Address: F_Eyes_00
     m_ReadOnly: 0
     m_SerializedLabels: []
     FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: 81ea8febf47eb484986af220584361dc
-    m_Address: DefaultWearableDefinition
+  - m_GUID: 1d6ca002a7e7b4f9c881a203eb97996f
+    m_Address: M_Mouth_00
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 41b6cad6750bc4b35ba63ebbeb956830
+    m_Address: M_EyeBrows_00
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 5de5609d1e6c441b5a7c56a77903cab7
+    m_Address: F_Mouth_00
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 9372c7ef01a5a4a52a0e9b3467605717
+    m_Address: M_Eyes_00
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: eae766b15f997414794bfd4f17de5949
+    m_Address: F_Eyebrows_00
     m_ReadOnly: 0
     m_SerializedLabels: []
     FlaggedDuringContentUpdateRestriction: 0

Explorer/Assets/DCL/ApplicationsGuards/ApplicationVersionGuard/ApplicationVersionGuard.cs

@@ -48,8 +48,8 @@ public async UniTask<string> GetLatestVersionAsync(CancellationToken ct)
                 ReportCategory.VERSION_CONTROL,
                 new WebRequestHeadersInfo());
 
-            GitHubRelease latestRelease = JsonUtility.FromJson<GitHubRelease>(response.body);
-            string latestVersion = latestRelease.tag_name.TrimStart('v');
+            ClientVersionInfo versionInfo = JsonUtility.FromJson<ClientVersionInfo>(response.body);
+            string latestVersion = versionInfo.version.TrimStart('v');
 
             return latestVersion;
         }
@@ -159,9 +159,10 @@ Application.platform is RuntimePlatform.OSXEditor or RuntimePlatform.OSXPlayer &
             SystemInfo.processorType.Contains("apple", StringComparison.OrdinalIgnoreCase);
 
         [Serializable]
-        private struct GitHubRelease
+        private struct ClientVersionInfo
         {
-            public string tag_name;
+            public string version;
+            public string timestamp;
         }
     }
 }

Explorer/Assets/DCL/AuthenticationScreenFlow/AuthenticationScreenCharacterPreviewController.cs

@@ -30,14 +30,14 @@ public AuthenticationScreenCharacterPreviewController(CharacterPreviewView view,
 
         public override void Initialize(Avatar avatar)
         {
+            playEmotesCts = playEmotesCts.SafeRestart();
+
             previewAvatarModel.Wearables = ShortenWearables(avatar);
             previewAvatarModel.Emotes = ShortenEmotes(avatar);
 
             base.Initialize(avatar);
             previewController!.Value.AddHeadIK();
-
-            playEmotesCts = playEmotesCts.SafeRestart();
-            PlayEmoteAndAwaitItAsync(settings.IntroEmoteURN, playEmotesCts.Token).Forget();
+            PlayEmote(settings.IntroEmoteURN);
         }
 
         public new void OnHide(bool triggerOnHideBusEvent = true)

Explorer/Assets/DCL/AvatarRendering/AvatarShape/Components/AvatarShapeComponent.cs

@@ -26,8 +26,10 @@ public struct AvatarShapeComponent
         public readonly List<CachedAttachment> InstantiatedWearables;
         public readonly List<Renderer> OutlineCompatibleRenderers;
 
+        public bool ShowOnlyWearables;
+
         public AvatarShapeComponent(string name, string id, BodyShape bodyShape, WearablePromise wearablePromise,
-            Color skinColor, Color hairColor, Color eyesColor)
+            Color skinColor, Color hairColor, Color eyesColor, bool showOnlyWearables = false)
         {
             ID = id;
             Name = name;
@@ -42,10 +44,14 @@ public AvatarShapeComponent(string name, string id, BodyShape bodyShape, Wearabl
             IsVisible = true;
             HiddenByModifierArea = false;
             IsPreview = false;
+            ShowOnlyWearables = showOnlyWearables;
         }
 
         public void CreateOutlineCompatibilityList()
         {
+            // TODO: support outline for wearables when body is invisible
+            if (ShowOnlyWearables) return;
+
             foreach (var wearable in InstantiatedWearables)
             {
                 if (wearable.OutlineCompatible)

Explorer/Assets/DCL/AvatarRendering/AvatarShape/ComputeShader/ComputeShaderSkinning.cs

@@ -1,12 +1,12 @@
 using DCL.AvatarRendering.AvatarShape.Components;
+using DCL.AvatarRendering.AvatarShape.Helpers;
+using DCL.AvatarRendering.Loading.Assets;
 using DCL.AvatarRendering.Wearables.Helpers;
+using DCL.Diagnostics;
 using DCL.Optimization.Pools;
+using System;
 using System.Collections.Generic;
 using System.Runtime.CompilerServices;
-using DCL.AvatarRendering.AvatarShape.Helpers;
-using DCL.AvatarRendering.Loading.Assets;
-using DCL.Diagnostics;
-using NUnit.Framework;
 using Unity.Collections;
 using Unity.Mathematics;
 using UnityEngine;
@@ -146,6 +146,17 @@ private void FillMeshArray(Mesh mesh, int currentMeshVertexCount, int vertexCoun
                 int currentVertexCount = meshData.Mesh.sharedMesh.vertexCount;
                 list.Add(SetupMaterial(meshData.Renderer, meshData.OriginalMaterial, auxVertCounter, avatarMaterial, avatarShapeComponent, facilFeatureTexture));
                 auxVertCounter += currentVertexCount;
+
+                if (avatarShapeComponent.ShowOnlyWearables)
+                {
+                    string name = meshData.OriginalMaterial.name;
+
+                    if (name.Contains(ComputeShaderConstants.SKIN_MATERIAL_NAME, StringComparison.OrdinalIgnoreCase)
+                        || name.Contains(ComputeShaderConstants.HAIR_MATERIAL_NAME, StringComparison.OrdinalIgnoreCase))
+                        meshData.Renderer.enabled = false;
+                }
+                else
+                    meshData.Renderer.enabled = true;
             }
 
             return list;

Explorer/Assets/DCL/AvatarRendering/AvatarShape/Helpers/AvatarShapeDefaults.cs

@@ -15,13 +15,53 @@ public static class AvatarShapeDefaults
             R = 0.283f, G = 0.142f, B = 0f,
         };
 
-        public static Color3 GetEyeColor(this PBAvatarShape self) =>
-            self.EyeColor ?? new Color3(NEUTRAL_COLOR);
+        public static Color4 GetEyeColor(this PBAvatarShape self)
+        {
+            Color3 rgb = self.EyeColor ?? NEUTRAL_COLOR;
+
+            return new Color4
+            {
+                A = self.GetAlpha(),
+                R = rgb.R,
+                G = rgb.G,
+                B = rgb.B,
+            };
+        }
+
+        public static Color4 GetHairColor(this PBAvatarShape self)
+        {
+            Color3 rgb = self.HairColor ?? NEUTRAL_COLOR;
+
+            return new Color4
+            {
+                A = self.GetAlpha(),
+                R = rgb.R,
+                G = rgb.G,
+                B = rgb.B,
+            };
+        }
+
+        public static Color4 GetSkinColor(this PBAvatarShape self)
+        {
+            Color3 rgb = self.SkinColor ?? NEUTRAL_COLOR;
+
+            return new Color4
+            {
+                A = self.GetAlpha(),
+                R = rgb.R,
+                G = rgb.G,
+                B = rgb.B,
+            };
+        }
+
+        private static float GetAlpha(this PBAvatarShape self)
+        {
+            var alpha = 1f;
 
-        public static Color3 GetHairColor(this PBAvatarShape self) =>
-            self.HairColor ?? new Color3(HAIR_DEFAULT_COLOR);
+            if (self.HasShowOnlyWearables)
+                alpha = self.ShowOnlyWearables ? 0f : 1f;
 
-        public static Color3 GetSkinColor(this PBAvatarShape self) =>
-            self.SkinColor ?? new Color3(NEUTRAL_COLOR);
+            return alpha;
+        }
     }
 }