Merge pull request #5998 from decentraland/release/2025-10-28

release: 2025-10-28

Author: anicalbano

Explorer/Assets/AddressableAssetsData/AddressableAssetSettings.asset

@@ -15,7 +15,7 @@ MonoBehaviour:
   m_DefaultGroup: 47f803e1e9c5079449bd106df98a0b7d
   m_currentHash:
     serializedVersion: 2
-    Hash: 48ca44445a9b8f3500edf575c136972a
+    Hash: 61fd69a6987cc3e7c8154fed97a91062
   m_OptimizeCatalogSize: 0
   m_BuildRemoteCatalog: 0
   m_CatalogRequestsTimeout: 0
@@ -33,6 +33,7 @@ MonoBehaviour:
   m_UniqueBundleIds: 0
   m_EnableJsonCatalog: 0
   m_NonRecursiveBuilding: 1
+  m_AllowNestedBundleFolders: 0
   m_CCDEnabled: 0
   m_maxConcurrentWebRequests: 3
   m_UseUWRForLocalBundles: 0

Explorer/Assets/AddressableAssetsData/AssetGroups/UI.asset

@@ -60,6 +60,11 @@ MonoBehaviour:
     m_ReadOnly: 0
     m_SerializedLabels: []
     FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: 0e0dc1c6390d85440bdf622928e144f5
+    m_Address: Assets/Textures/Common/ModalDeleteImg_Addressable.png
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
   - m_GUID: 0fce4c1a785b1495bbf861787a9a3224
     m_Address: Assets/DCL/UI/ErrorPopup/Assets/ErrorPopup.prefab
     m_ReadOnly: 0
@@ -675,6 +680,11 @@ MonoBehaviour:
     m_ReadOnly: 0
     m_SerializedLabels: []
     FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: dd40e574a59d9b348a7c02ca96be6ae9
+    m_Address: Assets/DCL/Backpack/AvatarSection/Outfits/Slots/OutfitSlot.prefab
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
   - m_GUID: de88bd0dde8feda4393664330ac8afb4
     m_Address: Assets/DCL/UI/GenericContextMenu/Prefabs/ToggleWithTitleIconAndCheck.prefab
     m_ReadOnly: 0

Explorer/Assets/DCL/Audio/AudioConfigs/Backpack_OutfitDelete.asset

@@ -0,0 +1,20 @@
+%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: ea799a483c3f4db8afbf38b0e6c08665, type: 3}
+  m_Name: Backpack_OutfitDelete
+  m_EditorClassIdentifier: 
+  audioClips:
+  - {fileID: 8300000, guid: cd65f4b6efec96643b007cccb5848d22, type: 3}
+  relativeVolume: 1
+  audioCategory: 0
+  pitchVariation: 0
+  clipSelectionMode: 0

Explorer/Assets/DCL/Audio/AudioConfigs/Backpack_OutfitDelete.asset.meta

@@ -0,0 +1,20 @@
+%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: ea799a483c3f4db8afbf38b0e6c08665, type: 3}
+  m_Name: Backpack_OutfitSave
+  m_EditorClassIdentifier: 
+  audioClips:
+  - {fileID: 8300000, guid: dd25454bbe016694fb00b7931ce59934, type: 3}
+  relativeVolume: 1
+  audioCategory: 0
+  pitchVariation: 0
+  clipSelectionMode: 0

Explorer/Assets/DCL/Audio/AudioConfigs/Backpack_OutfitSave.asset

@@ -15,6 +15,7 @@
 using DCL.Audio.Jobs;
 using DCL.Landscape;
 using DCL.Landscape.Systems;
+using ECS;
 using Random = UnityEngine.Random;
 
 namespace DCL.Audio.Systems
@@ -29,8 +30,10 @@ namespace DCL.Audio.Systems
     public partial class LandscapeAudioCullingSystem : BaseUnityLoopSystem
     {
         private readonly TerrainGenerator terrainGenerator;
+        private readonly WorldTerrainGenerator worldTerrainGenerator;
         private readonly ILandscapeAudioSystemSettings landscapeAudioSystemSettings;
         private readonly WorldAudioPlaybackController worldAudioPlaybackController;
+        private readonly IRealmData realmData;
         private bool isTerrainViewInitialized;
 
         private NativeArray<LandscapeAudioState> landscapeAudioStates;
@@ -41,17 +44,22 @@ public partial class LandscapeAudioCullingSystem : BaseUnityLoopSystem
         private float audioListeningDistanceThreshold;
         private float audioMutingDistanceThreshold;
         private float oceanListeningDistanceThreshold;
+        private ITerrain terrain;
 
         private int updateFramesCounter;
 
         private LandscapeAudioCullingSystem(World world,
             TerrainGenerator terrainGenerator,
+            WorldTerrainGenerator worldTerrainGenerator,
             ILandscapeAudioSystemSettings landscapeAudioSystemSettings,
-            WorldAudioPlaybackController worldAudioPlaybackController) : base(world)
+            WorldAudioPlaybackController worldAudioPlaybackController,
+            IRealmData realmData) : base(world)
         {
             this.terrainGenerator = terrainGenerator;
+            this.worldTerrainGenerator = worldTerrainGenerator;
             this.landscapeAudioSystemSettings = landscapeAudioSystemSettings;
             this.worldAudioPlaybackController = worldAudioPlaybackController;
+            this.realmData = realmData;
         }
 
         public override void Initialize()
@@ -79,7 +87,18 @@ protected override void OnDispose()
 
         protected override void Update(float t)
         {
-            if (!terrainGenerator.IsTerrainShown) return;
+            ITerrain currentTerrain = realmData.IsGenesis() ? terrainGenerator : worldTerrainGenerator;
+            if (currentTerrain != terrain)
+            {
+                if (isTerrainViewInitialized)
+                    FlushPreviousAudioStates();
+
+                terrain = currentTerrain;
+                isTerrainViewInitialized = false;
+                updateFramesCounter = 0;
+            }
+
+            if (!terrain.IsTerrainShown) return;
 
             if (updateFramesCounter <= 0)
             {
@@ -101,13 +120,21 @@ protected override void Update(float t)
             else { updateFramesCounter--; }
         }
 
+        private void FlushPreviousAudioStates()
+        {
+            for (int i = 0; i < landscapeAudioStates.Length; i++)
+                worldAudioPlaybackController.ReleaseAudioSourcesFromTerrain(i, WorldAudioClipType.Landscape);
+            for (int i = 0; i < oceanAudioStates.Length; i++)
+                worldAudioPlaybackController.ReleaseAudioSourcesFromTerrain(i, WorldAudioClipType.Ocean);
+        }
+
         private void InitializeTerrainAudioStates()
         {
-            int parcelSize = terrainGenerator.ParcelSize;
-            ChunkModel[] terrainChunks = terrainGenerator.TerrainModel.ChunkModels;
+            int parcelSize = terrain.ParcelSize;
+            ChunkModel[] terrainChunks = terrain.TerrainModel.ChunkModels;
             landscapeAudioStates = new NativeArray<LandscapeAudioState>(terrainChunks.Length, Allocator.Persistent);
             landscapeAudioSourcesPositions = new NativeArray<NativeArray<int2>>(terrainChunks.Length, Allocator.Persistent);
-            int chunkSize = terrainGenerator.GetChunkSize();
+            int chunkSize = terrain.GetChunkSize();
             int halfTerrainChunkSize = chunkSize / 2;
             audioListeningDistanceThreshold = math.pow(halfTerrainChunkSize + landscapeAudioSystemSettings.ListeningDistanceThreshold, 2);
             audioMutingDistanceThreshold = math.pow(halfTerrainChunkSize + landscapeAudioSystemSettings.MutingDistanceThreshold, 2);
@@ -129,7 +156,7 @@ private void InitializeTerrainAudioStates()
         private void InitializeOceanAudioStates()
         {
             //To calculate the ocean audio, we will use the cliffs positions as the ocean grid does not match correctly with the world grid.
-            IReadOnlyList<Transform> cliffs = terrainGenerator.Cliffs;
+            IReadOnlyList<Transform> cliffs = terrain.Cliffs;
 
             oceanAudioStates = new NativeArray<LandscapeAudioState>(cliffs.Count, Allocator.Persistent);
 

Explorer/Assets/DCL/Audio/AudioConfigs/Backpack_OutfitSave.asset.meta

@@ -62,6 +62,7 @@ private enum ViewState
 
         private const int ANIMATION_DELAY = 300;
         private const float WINDOWED_RESOLUTION_RESIZE_COEFFICIENT = .75f;
+        private const int MAX_WINDOWED_WIDTH = 2560;
         private const FullScreenMode DEFAULT_SCREEN_MODE = FullScreenMode.FullScreenWindow;
 
         private const string REQUEST_BETA_ACCESS_LINK = "https://68zbqa0m12c.typeform.com/to/y9fZeNWm";
@@ -315,7 +316,10 @@ protected override async UniTask WaitForCloseIntentAsync(CancellationToken ct)
         private void StartLoginFlowUntilEnd()
         {
             CancelLoginProcess();
-            ForceResolutionAndWindowedMode();
+
+            // Checks the current screen mode because it could have been overridden with Alt+Enter
+            if (Screen.fullScreenMode != FullScreenMode.Windowed)
+                ForceResolutionAndWindowedMode();
 
             loginCancellationToken = new CancellationTokenSource();
             StartLoginFlowUntilEndAsync(loginCancellationToken.Token).Forget();
@@ -593,7 +597,8 @@ private void ForceResolutionAndWindowedMode()
         {
             Resolution current = Screen.currentResolution;
 
-            int targetWidth = (int)(current.width * WINDOWED_RESOLUTION_RESIZE_COEFFICIENT);
+            // To avoid ultra-wide window on ultra-wide screens
+            int targetWidth = Mathf.Min((int)(current.width * WINDOWED_RESOLUTION_RESIZE_COEFFICIENT), MAX_WINDOWED_WIDTH);
             int targetHeight = (int)(current.height * WINDOWED_RESOLUTION_RESIZE_COEFFICIENT);
 
             Screen.SetResolution(targetWidth, targetHeight, FullScreenMode.Windowed, current.refreshRateRatio);

Explorer/Assets/DCL/Audio/Systems/LandscapeAudioCullingSystem.cs

@@ -140,13 +140,14 @@ private WearablePromise CreateWearablePromise(PBAvatarShape pbAvatarShape, Parti
                 WearableComponentsUtils.CreateGetWearablesByPointersIntention(pbAvatarShape, pbAvatarShape.Wearables, Array.Empty<string>()),
                 partition);
 
-        private WearablePromise CreateWearablePromise(Profile profile, PartitionComponent partition) =>
-
+        private WearablePromise CreateWearablePromise(Profile profile, PartitionComponent partition)
+        {
             // profile.Avatar.Wearables should be shortened, but since GetWearablesByPointers already retrieves shortened-urns,
             // there is not need to convert
-            WearablePromise.Create(World,
+            return WearablePromise.Create(World,
                 WearableComponentsUtils.CreateGetWearablesByPointersIntention(profile.Avatar.BodyShape, profile.Avatar.Wearables, profile.Avatar.ForceRender),
                 partition);
+        }
 
         private void LoadAllEmotes(Profile profile, PartitionComponent partition)
         {

Explorer/Assets/DCL/AuthenticationScreenFlow/AuthenticationScreenController.cs

@@ -0,0 +1,22 @@
+namespace DCL.AvatarRendering.Emotes
+{
+    /// <summary>
+    /// Added to an entity that wants to play a <b>SCENE</b> emote for the time the emote is still being loaded.
+    /// The component purpose is to let other systems know that the scene is trying to play an emote, but that loading
+    /// of the emote isn't completed yet.
+    /// </summary>
+    /// <seealso cref="GetSceneEmoteFromLocalSceneIntention"/>
+    /// <seealso cref="GetSceneEmoteFromRealmIntention"/>
+    public struct CharacterWaitingSceneEmoteLoading
+    {
+        /// <summary>
+        /// Indicates when the loading started.
+        /// </summary>
+        public long FrameCount;
+
+        public CharacterWaitingSceneEmoteLoading(long frameCount = 0)
+        {
+            FrameCount = frameCount;
+        }
+    }
+}