Merge branch 'dev' into feat/e@-preview

decentraland · Jul 24, 2024 · 29b51f3 · 29b51f3
2 parents ec2af3d + b3b170e
commit 29b51f3
Show file tree

Hide file tree

Showing 14 changed files with 111 additions and 37 deletions.
diff --git a/.github/auto_assign_config.yml b/.github/auto_assign_config.yml
@@ -10,12 +10,12 @@ reviewGroups:
     - lorux0
     - davidejensen
     - popuz
-    - Kinerius
-    - mikhail-dcl
     - pravusjif
+    - mikhail-dcl
+    - dalkia
+    - AlejandroAlvarezMelucciDCL
   qa:
     - Ludmilafantaniella
-    - LucasLioyQA
     - anicalbano
 
 filterLabels:

diff --git a/browser-interface/packages/config/index.ts b/browser-interface/packages/config/index.ts
@@ -197,7 +197,7 @@ export namespace ethereumConfigurations {
     wss: 'wss://rpc.decentraland.org/mainnet',
     http: 'https://rpc.decentraland.org/mainnet',
     etherscan: 'https://etherscan.io',
-    names: 'https://api.thegraph.com/subgraphs/name/decentraland/marketplace',
+    names: 'https://subgraph.decentraland.org/marketplace',
 
     // contracts
     LANDProxy: assertValue(contractInfo.mainnet.LANDProxy),

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/DCLPlugins/ECS7/ECSComponents/VideoPlayer/VideoPlayerHandler.cs b/unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/VideoPlayer/VideoPlayerHandler.cs
@@ -89,7 +89,8 @@ public void OnComponentModelUpdated(IParcelScene scene, IDCLEntity entity, PBVid
             {
                 videoPlayer?.Dispose();
 
-                var id = entity.entityId.ToString();
+                var entityId = entity.entityId.ToString();
+                string id = scene.sceneData.sceneNumber > 0 ? scene.sceneData.sceneNumber + entityId : scene.GetHashCode() + entityId;
 
                 VideoType videoType = VideoType.Common;
                 if (model.Src.StartsWith("livekit-video://"))

diff --git a/unity-renderer/Assets/DCLPlugins/SentryPlugin/SentryPlugin.cs b/unity-renderer/Assets/DCLPlugins/SentryPlugin/SentryPlugin.cs
@@ -13,6 +13,7 @@ public class SentryPlugin : IPlugin
 
         public SentryPlugin()
         {
+            /*
             // Sentry doesn't provide a public getter accessor to its instance
             // So we unfortunately need a bit of magic
             Type type = typeof(SentrySdk);
@@ -24,11 +25,14 @@ public SentryPlugin()
             }
 
             controller = new SentryController(DataStore.i.player, DataStore.i.realm, info.GetValue(null) as IHub);
+            */
         }
 
         public void Dispose()
         {
+            /*
             controller?.Dispose();
+            */
         }
     }
 }
diff --git a/unity-renderer/Assets/Plugins/IntercomWindow/IntercomWindow.jslib b/unity-renderer/Assets/Plugins/IntercomWindow/IntercomWindow.jslib
@@ -4,11 +4,11 @@ var IntercomWindow = {
     const windowHeight = window.innerHeight
     const windowWidth = window.innerWidth
     const popupHeight = Math.min(700, windowHeight)
-    const popupWidth = Math.min(400, windowWidth)
+    const popupWidth = Math.min(450, windowWidth)
     const top = Math.max(windowHeight - popupHeight, 0)
     const left = Math.max(windowWidth - popupWidth - 20, 0)
 
-    window.open('https://intercom.decentraland.org', 'intercom', `popup,top=${top},left=${left},width=${popupWidth},height=${popupHeight}`)
+    window.open('https://decentraland.org/help', 'intercom', `popup,top=${top},left=${left},width=${popupWidth},height=${popupHeight}`)
   }
 };
 

diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Components/Video/Tests/WebVideoPlayerShould.cs b/unity-renderer/Assets/Scripts/MainScripts/DCL/Components/Video/Tests/WebVideoPlayerShould.cs
@@ -1,4 +1,3 @@
-using System.Collections;
 using DCL.Components.Video.Plugin;
 using NSubstitute;
 using NUnit.Framework;
@@ -161,7 +160,7 @@ public void SetErrorStateWhenUpdateIsCalled()
 
             plugin.Received(1).GetError(ID);
             Assert.IsTrue(webVideoPlayer.isError);
-            UnityEngine.TestTools.LogAssert.Expect(LogType.Error, ERROR_MESSAGE);
+            LogAssert.Expect(LogType.Error, ERROR_MESSAGE);
         }
 
         [Test]
@@ -187,7 +186,7 @@ public void DontDoAnythingWhenErrorStateIsSet()
             plugin.Received(0).SetPlaybackRate(ID, Arg.Any<float>());
             plugin.Received(0).GetTime(ID);
             plugin.Received(0).GetDuration(ID);
-            UnityEngine.TestTools.LogAssert.Expect(LogType.Error, ERROR_MESSAGE);
+            LogAssert.Expect(LogType.Error, ERROR_MESSAGE);
         }
 
         [Test]
@@ -210,4 +209,4 @@ public void ReturnValidNumberWhenVideoDurationIsNaN()
             Assert.AreEqual(-1, duration);
         }
     }
-}
+}
diff --git a/.../Scripts/MainScripts/DCL/Controllers/HUD/HelpAndSupportHUD/HelpAndSupportHUDController.cs b/.../Scripts/MainScripts/DCL/Controllers/HUD/HelpAndSupportHUD/HelpAndSupportHUDController.cs
@@ -9,7 +9,7 @@ namespace DCL.HelpAndSupportHUD
 {
     public class HelpAndSupportHUDController : IHUD
     {
-        internal const string CONTACT_SUPPORT_URL = "https://intercom.decentraland.org";
+        internal const string CONTACT_SUPPORT_URL = "https://decentraland.org/help";
         internal const string JOIN_DISCORD_URL = "https://dcl.gg/discord";
         internal const string FAQ_URL = "https://docs.decentraland.org/decentraland/faq/";
         public IHelpAndSupportHUDView view {  get; }

diff --git a/...enderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/TaskbarHUD/TaskbarHUDController.cs b/...enderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/TaskbarHUD/TaskbarHUDController.cs
@@ -14,7 +14,7 @@
 
 public class TaskbarHUDController : IHUD
 {
-    private const string INTERCOM_URL = "https://intercom.decentraland.org/";
+    private const string INTERCOM_URL = "https://decentraland.org/help/";
 
     private readonly IChatController chatController;
     private readonly IFriendsController friendsController;

diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/DecentralandProtocol/UiText.gen.cs b/unity-renderer/Assets/Scripts/MainScripts/DCL/DecentralandProtocol/UiText.gen.cs
diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/ServiceProviders/TheGraph/TheGraph.cs b/unity-renderer/Assets/Scripts/MainScripts/DCL/ServiceProviders/TheGraph/TheGraph.cs
@@ -11,12 +11,12 @@
 public class TheGraph : ITheGraph
 {
     private const float DEFAULT_CACHE_TIME = 5 * 60;
-    private const string LAND_SUBGRAPH_URL_ORG = "https://api.thegraph.com/subgraphs/name/decentraland/land-manager";
-    private const string LAND_SUBGRAPH_URL_ZONE = "https://api.thegraph.com/subgraphs/name/decentraland/land-manager-sepolia";
-    private const string MANA_SUBGRAPH_URL_ETHEREUM = "https://api.thegraph.com/subgraphs/name/decentraland/mana-ethereum-mainnet";
-    private const string MANA_SUBGRAPH_URL_POLYGON = "https://api.thegraph.com/subgraphs/name/decentraland/mana-matic-mainnet";
-    private const string NFT_COLLECTIONS_SUBGRAPH_URL_ETHEREUM = "https://api.thegraph.com/subgraphs/name/decentraland/collections-ethereum-mainnet";
-    private const string NFT_COLLECTIONS_SUBGRAPH_URL_MATIC = "https://api.thegraph.com/subgraphs/name/decentraland/collections-matic-mainnet";
+    private const string LAND_SUBGRAPH_URL_ORG = "https://subgraph.decentraland.org/land-manager";
+    private const string LAND_SUBGRAPH_URL_ZONE = "https://api.studio.thegraph.com/query/49472/land-manager-sepolia/version/latest";
+    private const string MANA_SUBGRAPH_URL_ETHEREUM = "https://subgraph.decentraland.org/mana-ethereum-mainnet";
+    private const string MANA_SUBGRAPH_URL_POLYGON = "https://subgraph.decentraland.org/mana-matic-mainnet";
+    private const string NFT_COLLECTIONS_SUBGRAPH_URL_ETHEREUM = "https://subgraph.decentraland.org/collections-ethereum-mainnet";
+    private const string NFT_COLLECTIONS_SUBGRAPH_URL_MATIC = "https://subgraph.decentraland.org/collections-matic-mainnet";
 
     private readonly IDataCache<List<Land>> landQueryCache = new DataCache<List<Land>>();
 

diff --git a/...y-renderer/Assets/Scripts/MainScripts/DCL/WorldRuntime/DebugController/DebugController.cs b/...y-renderer/Assets/Scripts/MainScripts/DCL/WorldRuntime/DebugController/DebugController.cs
@@ -83,7 +83,7 @@ public void ShowFPSPanel()
         {
             isFPSPanelVisible.Set(true);
         }
-        
+
         public void ToggleFPSPanel()
         {
             isFPSPanelVisible.Set(!isFPSPanelVisible.Get());
@@ -182,7 +182,7 @@ public void SetAnimationCulling(bool enabled)
         {
             Environment.i.platform.cullingController.SetAnimationCulling(enabled);
         }
-       
+
 
         public void Dispose()
         {
@@ -215,4 +215,4 @@ private void OnKernelConfigChanged(KernelConfigModel current, KernelConfigModel
             previewSceneLimitsWarning?.SetActive(enablePrevewSceneLimitWarning);
         }
     }
-}
+}