Merge pull request #6359 from decentraland/release/2025-12-05

release: 2025-12-05

Author: anicalbano

.github/workflows/build-game-ci-image.yml

@@ -0,0 +1,72 @@
+name: Build GameCI Image
+
+on:
+  push:
+    branches:
+      - dev-game-ci-docker-image
+  workflow_dispatch:
+    inputs:
+      editor_version:
+        description: 'Unity Editor Version'
+        required: true
+        default: '6000.2.14f1'
+      change_set:
+        description: 'Unity Editor Changeset'
+        required: true
+        default: '589824c1fc31'
+      base_os:
+        description: 'Base OS'
+        required: true
+        default: 'ubuntu'
+        type: choice
+        options:
+          - ubuntu
+          - windows
+          - mac
+      target_platform:
+        description: 'Target Platform'
+        required: true
+        default: 'linux-il2cpp'
+        type: choice
+        options:
+          - linux-il2cpp
+          - windows-il2cpp
+          - mac-il2cpp
+          - android
+          - ios
+          - webgl
+      image_suffix:
+        description: 'Image Tag Suffix'
+        required: true
+        default: '3.2.0'
+
+jobs:
+  build:
+    runs-on: Ubuntu-Big
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Clone game-ci/docker
+        run: git clone https://github.com/game-ci/docker.git
+
+      - name: Login to GHCR
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build and Push Docker Image
+        working-directory: docker
+        run: |
+          IMAGE_NAME="ghcr.io/decentraland/unityci-editor:${{ inputs.base_os }}-${{ inputs.editor_version }}-${{ inputs.target_platform }}-${{ inputs.image_suffix }}"
+          
+          docker build . \
+            --file ./images/${{ inputs.base_os }}/editor/Dockerfile \
+            -t $IMAGE_NAME \
+            --build-arg version=${{ inputs.editor_version }} \
+            --build-arg changeSet=${{ inputs.change_set }} \
+            --build-arg module=${{ inputs.target_platform }}
+            
+          docker push $IMAGE_NAME

.github/workflows/test.yml

@@ -162,7 +162,7 @@ jobs:
           testMode: all
           sshAgent: ${{ env.SSH_AUTH_SOCK }}
           customImage: ${{ steps.img.outputs.ghcr }}
-          customParameters: -buildTarget StandaloneLinux64
+          customParameters: -buildTarget StandaloneLinux64 -testCategory "!Performance"
           githubToken: ${{ env.GITHUB_TOKEN }}
 
       - name: Report test results

Explorer/Assets/AddressableAssetsData/AssetGroups/UI.asset

@@ -660,6 +660,11 @@ MonoBehaviour:
     m_ReadOnly: 0
     m_SerializedLabels: []
     FlaggedDuringContentUpdateRestriction: 0
+  - m_GUID: cd3edf52c6206d44a9855feccaef9467
+    m_Address: HomeMarkerObject
+    m_ReadOnly: 0
+    m_SerializedLabels: []
+    FlaggedDuringContentUpdateRestriction: 0
   - m_GUID: d20747763091b4fc5a2d5b6d1ba0ea7d
     m_Address: HideCategory
     m_ReadOnly: 0

Explorer/Assets/DCL/AvatarRendering/Wearables/Equipped/EquippedWearables.cs

@@ -12,7 +12,7 @@ public class EquippedWearables : IEquippedWearables
         private readonly Dictionary<string, IWearable?> wearables = new ();
         private readonly HashSet<string> forceRenderCategories = new ();
         public IReadOnlyCollection<string> ForceRenderCategories => forceRenderCategories;
-        
+
         private Color hairColor;
         private Color eyesColor;
         private Color bodyshapeColor;
@@ -64,6 +64,12 @@ public void SetForceRender(IReadOnlyCollection<string> categories)
             foreach (string category in categories) { forceRenderCategories.Add(category); }
         }
 
+        public void Clear()
+        {
+            wearables.Clear();
+            forceRenderCategories.Clear();
+        }
+
         public IReadOnlyDictionary<string, IWearable?> Items() =>
             wearables;
     }

Explorer/Assets/DCL/AvatarRendering/Wearables/Equipped/IEquippedWearables.cs

@@ -20,5 +20,7 @@ public interface IEquippedWearables : IReadOnlyEquippedWearables
 
         IReadOnlyCollection<string> ForceRenderCategories { get; }
         void SetForceRender(IReadOnlyCollection<string> categories);
+
+        void Clear();
     }
 }

Explorer/Assets/DCL/Backpack/Assets/BackpackEmoteGridItem.prefab

@@ -32,11 +32,11 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 7150489433940370041}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 17.8, y: 14.3}
-  m_SizeDelta: {x: 22.0485, y: 15.8256}
-  m_Pivot: {x: 0.5, y: 0.5}
+  m_AnchorMin: {x: 1, y: 1}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: -8, y: -6}
+  m_SizeDelta: {x: 8, y: 15}
+  m_Pivot: {x: 1, y: 1}
 --- !u!222 &5317681409627806208
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -99,7 +99,7 @@ MonoBehaviour:
   m_fontSizeMin: 18
   m_fontSizeMax: 72
   m_fontStyle: 0
-  m_HorizontalAlignment: 1
+  m_HorizontalAlignment: 2
   m_VerticalAlignment: 512
   m_textAlignment: 65535
   m_characterSpacing: 0
@@ -156,6 +156,18 @@ PrefabInstance:
       propertyPath: m_Sprite
       value: 
       objectReference: {fileID: 21300000, guid: 05bc7d6b12857fb4b9b7634bf2a4f440, type: 3}
+    - target: {fileID: 1980564759514731697, guid: aabac5666448b4345a76347f94ea32a4, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 13
+      objectReference: {fileID: 0}
+    - target: {fileID: 1980564759514731697, guid: aabac5666448b4345a76347f94ea32a4, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 13
+      objectReference: {fileID: 0}
+    - target: {fileID: 1980564759514731697, guid: aabac5666448b4345a76347f94ea32a4, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: -22.9
+      objectReference: {fileID: 0}
     - target: {fileID: 2223197492931904286, guid: aabac5666448b4345a76347f94ea32a4, type: 3}
       propertyPath: m_IsActive
       value: 0
@@ -164,6 +176,26 @@ PrefabInstance:
       propertyPath: m_IsActive
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 4450241265784993082, guid: aabac5666448b4345a76347f94ea32a4, type: 3}
+      propertyPath: m_PixelsPerUnitMultiplier
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 4819163676585692057, guid: aabac5666448b4345a76347f94ea32a4, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5208444472304398528, guid: aabac5666448b4345a76347f94ea32a4, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 64
+      objectReference: {fileID: 0}
+    - target: {fileID: 5208444472304398528, guid: aabac5666448b4345a76347f94ea32a4, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 18
+      objectReference: {fileID: 0}
+    - target: {fileID: 5208444472304398528, guid: aabac5666448b4345a76347f94ea32a4, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 5713694319271036370, guid: aabac5666448b4345a76347f94ea32a4, type: 3}
       propertyPath: m_AnchoredPosition.y
       value: -5.4
@@ -260,6 +292,46 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: 6.5
       objectReference: {fileID: 0}
+    - target: {fileID: 8408020952229012759, guid: aabac5666448b4345a76347f94ea32a4, type: 3}
+      propertyPath: m_fontSize
+      value: 12
+      objectReference: {fileID: 0}
+    - target: {fileID: 8408020952229012759, guid: aabac5666448b4345a76347f94ea32a4, type: 3}
+      propertyPath: m_fontSizeBase
+      value: 12
+      objectReference: {fileID: 0}
+    - target: {fileID: 9067022865944045758, guid: aabac5666448b4345a76347f94ea32a4, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 9067022865944045758, guid: aabac5666448b4345a76347f94ea32a4, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 9067022865944045758, guid: aabac5666448b4345a76347f94ea32a4, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 9067022865944045758, guid: aabac5666448b4345a76347f94ea32a4, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 9067022865944045758, guid: aabac5666448b4345a76347f94ea32a4, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: -10
+      objectReference: {fileID: 0}
+    - target: {fileID: 9067022865944045758, guid: aabac5666448b4345a76347f94ea32a4, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 9067022865944045758, guid: aabac5666448b4345a76347f94ea32a4, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 9067022865944045758, guid: aabac5666448b4345a76347f94ea32a4, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 5
+      objectReference: {fileID: 0}
     m_RemovedComponents:
     - {fileID: 4151765688581695259, guid: aabac5666448b4345a76347f94ea32a4, type: 3}
     m_RemovedGameObjects: []
@@ -369,6 +441,7 @@ MonoBehaviour:
   <IsEquipped>k__BackingField: 0
   incompatibleWithBodyShapeContainer: {fileID: 3374162131891453127}
   incompatibleWithBodyShapeHoverContainer: {fileID: 4228669688390808703}
+  <SmartWearableBadgeContainer>k__BackingField: {fileID: 0}
   <EquipWearableAudio>k__BackingField: {fileID: 11400000, guid: d1d7149ae3c90e449b657edfd7109eff, type: 2}
   <UnEquipWearableAudio>k__BackingField: {fileID: 11400000, guid: b78ff33cb1d284d4b8938bf362676581, type: 2}
   <HoverAudio>k__BackingField: {fileID: 11400000, guid: 8b8a0a6a2ec74774c8d3ccac3b54e0e8, type: 2}

Explorer/Assets/DCL/Backpack/Assets/BackpackItem.prefab

@@ -314,15 +314,15 @@ RectTransform:
   m_GameObject: {fileID: 1244355273732304392}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1.4285713, z: 1}
+  m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 5208444472304398528}
   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: 7.3, y: 0}
-  m_SizeDelta: {x: 78, y: 32}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 5, y: 0}
+  m_SizeDelta: {x: -10, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6840915785996630964
 CanvasRenderer:
@@ -379,8 +379,8 @@ MonoBehaviour:
   m_faceColor:
     serializedVersion: 2
     rgba: 4294967295
-  m_fontSize: 14
-  m_fontSizeBase: 14
+  m_fontSize: 12
+  m_fontSizeBase: 12
   m_fontWeight: 400
   m_enableAutoSizing: 0
   m_fontSizeMin: 18
@@ -930,7 +930,7 @@ MonoBehaviour:
   m_FillClockwise: 1
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
+  m_PixelsPerUnitMultiplier: 2
 --- !u!1 &2976920167002589955
 GameObject:
   m_ObjectHideFlags: 0
@@ -1319,8 +1319,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: -27.3, y: -0.20000076}
-  m_SizeDelta: {x: 20, y: 25}
+  m_AnchoredPosition: {x: -22.9, y: -0.20000076}
+  m_SizeDelta: {x: 13, y: 13}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6720737872415695264
 CanvasRenderer:
@@ -1460,7 +1460,7 @@ RectTransform:
   m_GameObject: {fileID: 4819163676585692057}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 0.7, z: 1}
+  m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 9217649004948706053}
@@ -1471,7 +1471,7 @@ RectTransform:
   m_AnchorMin: {x: 1, y: 1}
   m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: -8, y: -8}
-  m_SizeDelta: {x: 78, y: 33}
+  m_SizeDelta: {x: 64, y: 18}
   m_Pivot: {x: 1, y: 1}
 --- !u!1 &6520438785063841496
 GameObject: