release: 2022-11-24 (#417)

* updated manifest and packages-lock * fixed path for unity-renderer * aligned package-lock for RPC; adapted MinimapHUDDesktop to the changed signature in the interface * pointed to the release merge to main from unity-renderer
decentraland · Nov 24, 2022 · a0d1c16 · a0d1c16
1 parent ad3486c
commit a0d1c16
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 17 deletions.
diff --git a/unity-renderer-desktop/Assets/Scripts/MainScripts/DCL/Controllers/HUD/HUDDesktop.asmdef b/unity-renderer-desktop/Assets/Scripts/MainScripts/DCL/Controllers/HUD/HUDDesktop.asmdef
@@ -16,7 +16,8 @@
         "GUID:ddbcaa1d8ce9f489bb115e9daa589565",
         "GUID:8ea35c85a2f0dc44788f8c3945cee408",
         "GUID:0e967802b778d404eac1ca5ea340e290",
-        "GUID:2f3b53e8380cc4aae947b17780173adb"
+        "GUID:2f3b53e8380cc4aae947b17780173adb",
+        "GUID:fbcc413e192ef9048811d47ab0aca0c0"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],

diff --git a/unity-renderer-desktop/Assets/Scripts/MainScripts/DCL/Controllers/HUD/HUDDesktopFactory.cs b/unity-renderer-desktop/Assets/Scripts/MainScripts/DCL/Controllers/HUD/HUDDesktopFactory.cs
@@ -1,4 +1,5 @@
 using DCL;
+using DCL.Controllers.HUD;
 using MainScripts.DCL.Controllers.HUD.Profile;
 using MainScripts.DCL.Controllers.HUD.SettingsPanelHUDDesktop.Scripts;
 
@@ -19,7 +20,7 @@ public override IHUD CreateHUD(HUDElementID hudElementId)
                 hudElement = new ProfileHUDControllerDesktop(new UserProfileWebInterfaceBridge());
                 break;
             case HUDElementID.MINIMAP:
-                hudElement = new MinimapHUDControllerDesktop(MinimapMetadataController.i, new WebInterfaceHomeLocationController());
+                hudElement = new MinimapHUDControllerDesktop(MinimapMetadataController.i, new WebInterfaceHomeLocationController(), DCL.Environment.i);
                 break;
             case HUDElementID.LOADING:
                 hudElement = new LoadingHUDControllerDesktop();

diff --git a/...top/Assets/Scripts/MainScripts/DCL/Controllers/HUD/Minimap/MinimapHUDControllerDesktop.cs b/...top/Assets/Scripts/MainScripts/DCL/Controllers/HUD/Minimap/MinimapHUDControllerDesktop.cs
@@ -1,16 +1,20 @@
-using UnityEngine;
 
-public class MinimapHUDControllerDesktop : MinimapHUDController
+namespace DCL.Controllers.HUD
 {
-    protected override MinimapHUDView CreateView()
+    public class MinimapHUDControllerDesktop : MinimapHUDController
     {
-        return MinimapHUDViewDesktop.Create(this);
-    }
+        protected override MinimapHUDView CreateView()
+        {
+            return MinimapHUDViewDesktop.Create(this);
+        }
 
-    public MinimapHUDControllerDesktop(MinimapMetadataController minimapMetadataController, IHomeLocationController locationController) : base(minimapMetadataController, locationController)
-    {
-    }
-    public MinimapHUDControllerDesktop(MinimapHUDModel model, MinimapMetadataController minimapMetadataController, IHomeLocationController locationController) : base(model, minimapMetadataController, locationController)
-    {
+        public MinimapHUDControllerDesktop(MinimapMetadataController minimapMetadataController, IHomeLocationController locationController,  global::DCL.Environment.Model environment) 
+            : base(minimapMetadataController, locationController, environment)
+        {
+        }
+        public MinimapHUDControllerDesktop(MinimapHUDModel model, MinimapMetadataController minimapMetadataController, IHomeLocationController locationController,  global::DCL.Environment.Model environment) 
+            : base(model, minimapMetadataController, locationController, environment)
+        {
+        }
     }
 }
diff --git a/...r-desktop/Assets/Scripts/MainScripts/DCL/Controllers/HUD/Minimap/MinimapHUDDesktop.asmdef b/...r-desktop/Assets/Scripts/MainScripts/DCL/Controllers/HUD/Minimap/MinimapHUDDesktop.asmdef
@@ -5,7 +5,8 @@
         "GUID:692b6c9fa5079416bb81826fb3806890",
         "GUID:b1087c5731ff68448a0a9c625bb7e52d",
         "GUID:0e967802b778d404eac1ca5ea340e290",
-        "GUID:2f3b53e8380cc4aae947b17780173adb"
+        "GUID:2f3b53e8380cc4aae947b17780173adb",
+        "GUID:fbcc413e192ef9048811d47ab0aca0c0"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],

diff --git a/unity-renderer-desktop/Packages/packages-lock.json b/unity-renderer-desktop/Packages/packages-lock.json
@@ -19,14 +19,14 @@
       "depth": 0,
       "source": "git",
       "dependencies": {},
-      "hash": "9e2163616b9c527fa9461544e2bcc5f93fd12d83"
+      "hash": "e999268305432098f1eece2df35bf28043e47243"
     },
     "com.decentraland.rpc-csharp": {
       "version": "https://github.com/decentraland/rpc-csharp.git?path=rpc-csharp/src",
       "depth": 0,
       "source": "git",
       "dependencies": {},
-      "hash": "31340a3706dda78916910dc2b925756fd3ee0ece"
+      "hash": "1037ec392e68a966591e1710a8687a9a8602afd5"
     },
     "com.decentraland.unity-renderer": {
       "version": "git+https://github.com/decentraland/unity-renderer.git?path=unity-renderer/Assets#main",
@@ -79,7 +79,7 @@
         "com.unity.modules.vr": "1.0.0",
         "com.unity.modules.xr": "1.0.0"
       },
-      "hash": "7908797d621bdbb0e9daaa51cb91873748c3f4d3"
+      "hash": "f0f33a05d738f6313111a6eb6e860c686b4cc32b"
     },
     "com.decentraland.videoplayer": {
       "version": "git+https://github.com/decentraland/DCLVideoPlayerUnity.git?path=Assets#main",
@@ -586,4 +586,4 @@
       }
     }
   }
-}
+}