Merge pull request #6230 from decentraland/release/release20240702

Release:20240702
decentraland · Jul 2, 2024 · d4a0e99 · d4a0e99
2 parents efe43ee + f782a12
commit d4a0e99
Show file tree

Hide file tree

Showing 5 changed files with 85 additions and 16 deletions.
diff --git a/.github/auto_assign_config.yml b/.github/auto_assign_config.yml
@@ -10,7 +10,6 @@ reviewGroups:
     - lorux0
     - davidejensen
     - popuz
-    - Kinerius
     - mikhail-dcl
     - pravusjif
   qa:

diff --git a/scripts/package-lock.json b/scripts/package-lock.json
diff --git a/scripts/package.json b/scripts/package.json
@@ -16,7 +16,7 @@
     "typescript": "^4.2.3"
   },
   "dependencies": {
-    "@dcl/protocol": "^1.0.0-9115457439.commit-926ebd1",
+    "@dcl/protocol": "^1.0.0-9466805132.commit-365e0bb",
     "@protobuf-ts/protoc": "^2.8.2",
     "@types/fs-extra": "^11.0.1",
     "@types/glob": "^8.0.1",

diff --git a/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIText/UiTextHandler.cs b/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/UIText/UiTextHandler.cs
@@ -38,7 +38,13 @@ public void OnComponentRemoved(IParcelScene scene, IDCLEntity entity)
 
         public void OnComponentModelUpdated(IParcelScene scene, IDCLEntity entity, PBUiText model)
         {
+            var wrapMode = WhiteSpace.NoWrap; // Default mode is No Wrap enabled
+
+            if (model.HasTextWrap && model.TextWrap == TextWrap.TwWrap)
+                wrapMode = WhiteSpace.Normal;
+
             uiElement.text = model.Value;
+            uiElement.style.whiteSpace = wrapMode;
             uiElement.style.color = model.GetColor().ToUnityColor();
             uiElement.style.fontSize = model.GetFontSize();
             uiElement.style.unityTextAlign = model.GetTextAlign().ToUnityTextAlign();

diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/DecentralandProtocol/UiText.gen.cs b/unity-renderer/Assets/Scripts/MainScripts/DCL/DecentralandProtocol/UiText.gen.cs