Skip to content

Commit

Permalink
Merge pull request #3063 from decentraland/release/release-07-01-2025
Browse files Browse the repository at this point in the history
release: 07-01-2025
  • Loading branch information
aixaCode authored Jan 8, 2025
2 parents 7d06c47 + b2e6a5a commit e1cf350
Show file tree
Hide file tree
Showing 516 changed files with 25,846 additions and 9,333 deletions.
17 changes: 7 additions & 10 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
---
name: Bug report
about: Create a report to help us improve
title: '[QA] Title'
title: '[QA] Section | Title'
labels: 'bug, new'
assignees: ''


---

### **Build version:**
### 🛠️ **Build version:**


### **Issue Description:**
### 📔 **Issue Description:**
<!-- Short description of the observed issue -->

### **STR:**
Expand All @@ -20,19 +20,16 @@ assignees: ''
2.
3.

### **Actual Result:**


### ✔️ **Expected Result:**

### **Actual Result with evidence:**

### **Repro Index:**
<!-- Starting on 0/10 attempts -->

### **Evidence:**
### **Repro Index:**
<!-- Starting on 0/10 attempts -->


#### **Additional Notes:**
### 🖥️ **Operative system and additional Notes:**
<!-- If the test is made on Mac, specify if the chip is M1 or Intel -->


Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,6 @@ MonoBehaviour:
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 183d02953ce77467786739e7cfb2d766
m_Address: Assets/DCL/InWorldCamera/PhotoDetail/Assets/PhotoDetailUI.prefab
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 19373184c73f36042a55739551bb8298
m_Address: Avatar_CelShading
m_ReadOnly: 0
Expand All @@ -77,6 +72,11 @@ MonoBehaviour:
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 26a5616becdfd49b4abfbee07ba3cbf2
m_Address: Assets/DCL/InWorldCamera/PhotoDetail/Prefabs/PhotoDetailUI.prefab
m_ReadOnly: 0
m_SerializedLabels: []
FlaggedDuringContentUpdateRestriction: 0
- m_GUID: 2a58c49334237a24781cae8b1e3fa351
m_Address: EmbeddedEmotes
m_ReadOnly: 0
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 15 additions & 0 deletions Explorer/Assets/DCL/AsyncLoadReporting/AsyncLoadProcessReport.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using Cysharp.Threading.Tasks;
using System;
using System.Threading;
using Utility.Types;

namespace DCL.AsyncLoadReporting
{
Expand Down Expand Up @@ -76,6 +77,20 @@ public void SetCancelled()
parent?.SetCancelled();
}


// if the operation has fully succeeded:
// 1. Set the progress to 1.0f
// 2. Cancel the loading screen

// if the internal operation didn't modify the loading report on its own, finalize it
public void SetResult(Result result)
{
if (result.Success)
SetProgress(1.0f);
else
SetException(new Exception(result.ErrorMessage!));
}

public AsyncLoadProcessReport CreateChildReport(float until) =>
new (this, ProgressCounter.Value, until, cancellationToken);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
"GUID:3c7b57a14671040bd8c549056adc04f5",
"GUID:3640f3c0b42946b0b8794a1ed8e06ca5",
"GUID:f51ebe6a0ceec4240a699833d6309b23",
"GUID:275e22790c04e9b47a5085d7b0c4432a"
"GUID:275e22790c04e9b47a5085d7b0c4432a",
"GUID:fa7b3fdbb04d67549916da7bd2af58ab"
],
"includePlatforms": [],
"excludePlatforms": [],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,10 @@ private enum ViewState
private StringVariable? profileNameLabel;
private float originalWorldAudioVolume;

public override CanvasOrdering.SortingLayer Layer => CanvasOrdering.SortingLayer.Overlay;
public override CanvasOrdering.SortingLayer Layer => CanvasOrdering.SortingLayer.Fullscreen;

public ReactiveProperty<AuthenticationStatus> CurrentState { get; } = new (AuthenticationStatus.Init);
public string CurrentRequestID { get; private set; } = string.Empty;

public AuthenticationScreenController(
ViewFactoryMethod viewFactory,
Expand Down Expand Up @@ -251,6 +252,8 @@ async UniTaskVoid StartLoginFlowUntilEndAsync(CancellationToken ct)
{
try
{
CurrentRequestID = string.Empty;

viewInstance!.ConnectingToServerContainer.SetActive(true);
viewInstance.LoginButton.interactable = false;

Expand Down Expand Up @@ -289,9 +292,10 @@ async UniTaskVoid StartLoginFlowUntilEndAsync(CancellationToken ct)
StartLoginFlowUntilEndAsync(loginCancellationToken.Token).Forget();
}

private void ShowVerification(int code, DateTime expiration)
private void ShowVerification(int code, DateTime expiration, string requestID)
{
viewInstance!.VerificationCodeLabel.text = code.ToString();
CurrentRequestID = requestID;

CancelVerificationCountdown();
verificationCountdownCancellationToken = new CancellationTokenSource();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
"GUID:1b8e1e1bd01505f478f0369c04a4fb2f",
"GUID:275e22790c04e9b47a5085d7b0c4432a",
"GUID:fc4fd35fb877e904d8cedee73b2256f6",
"GUID:fa7b3fdbb04d67549916da7bd2af58ab"
"GUID:fa7b3fdbb04d67549916da7bd2af58ab",
"GUID:fdc035e0abb695e408d8ccf2c3bd63a5"
],
"includePlatforms": [
"Editor"
Expand Down
4 changes: 2 additions & 2 deletions Explorer/Assets/DCL/Backpack/BackpackSearchController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,12 @@ public BackpackSearchController(SearchBarView view,

private void RestoreInput(string text)
{
inputBlock.Enable(InputMapComponent.Kind.SHORTCUTS);
inputBlock.Enable(InputMapComponent.Kind.SHORTCUTS, InputMapComponent.Kind.IN_WORLD_CAMERA);
}

private void DisableShortcutsInput(string text)
{
inputBlock.Disable(InputMapComponent.Kind.SHORTCUTS);
inputBlock.Disable(InputMapComponent.Kind.SHORTCUTS, InputMapComponent.Kind.IN_WORLD_CAMERA);
}

private void OnSearchEvent(string searchString)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ public enum DecentralandUrl

ArchipelagoStatus,
GatekeeperStatus,
ArchipelagoHotScenes,

DiscordLink,

Expand Down Expand Up @@ -43,6 +44,7 @@ public enum DecentralandUrl

CameraReelUsers,
CameraReelImages,
CameraReelPlaces,
CameraReelLink,
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@ public class DecentralandUrlsSource : IDecentralandUrlsSource
private readonly Dictionary<DecentralandUrl, string> cache = new ();
private readonly string environmentDomainLowerCase;
private readonly bool isLocalSceneDevelopment;


public string DecentralandDomain => environmentDomainLowerCase;

public DecentralandUrlsSource(DecentralandEnvironment environment, bool isLocalSceneDevelopment = false)
{
environmentDomainLowerCase = environment.ToString()!.ToLower();
this.isLocalSceneDevelopment = isLocalSceneDevelopment;

switch (environment)
{
case DecentralandEnvironment.Org:
Expand Down Expand Up @@ -95,11 +95,13 @@ private static string RawUrl(DecentralandUrl decentralandUrl) =>
DecentralandUrl.Market => $"https://market.decentraland.{ENV}",
DecentralandUrl.AssetBundlesCDN => ASSET_BUNDLE_URL,
DecentralandUrl.ArchipelagoStatus => $"https://archipelago-ea-stats.decentraland.{ENV}/status",
DecentralandUrl.ArchipelagoHotScenes => $"https://archipelago-ea-stats.decentraland.{ENV}/hot-scenes",
DecentralandUrl.GatekeeperStatus => $"https://comms-gatekeeper.decentraland.{ENV}/status",
DecentralandUrl.Genesis => GENESIS_URL,
DecentralandUrl.Badges => $"https://badges.decentraland.{ENV}",
DecentralandUrl.CameraReelUsers => $"https://camera-reel-service.decentraland.{ENV}/api/users",
DecentralandUrl.CameraReelImages => $"https://camera-reel-service.decentraland.{ENV}/api/images",
DecentralandUrl.CameraReelPlaces => $"https://camera-reel-service.decentraland.{ENV}/api/places",
DecentralandUrl.CameraReelLink => $"https://reels.decentraland.{ENV}",
_ => throw new ArgumentOutOfRangeException(nameof(decentralandUrl), decentralandUrl, null!)
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,10 @@ private void TeleportPlayer(Entity entity, CharacterController controller, ref C

switch (status.TaskStatus)
{
case UniTaskStatus.Pending:
// Teleport the character to a far away place while the teleport is executed
controller.transform.position = MordorConstants.PLAYER_MORDOR_POSITION;
return;
case UniTaskStatus.Succeeded:
ResolveAsSuccess(entity, in teleportIntent, controller, ref platformComponent);
return;
Expand Down
Loading

0 comments on commit e1cf350

Please sign in to comment.