RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2025-01-18 20:10:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/ppy/master' into changelog-stream-area-refactor

Browse Source
This commit is contained in:
Andrei Zavatski 2020-02-28 12:15:09 +03:00
commit 8fdf859375
6 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Beatmaps/Drawables/UpdateableBeatmapBackgroundSprite.cs
View File

@ -16,6 +16,8 @@ namespace osu.Game.Beatmaps.Drawables
{
public readonly Bindable<BeatmapInfo> Beatmap = new Bindable<BeatmapInfo>();
protected override double LoadDelay => 500;
[Resolved]
private BeatmapManager beatmaps { get; set; }

4
osu.Game/Configuration/SettingSourceAttribute.cs
View File

@ -8,7 +8,6 @@ using System.Reflection;
using JetBrains.Annotations;
using osu.Framework.Bindables;
using osu.Framework.Graphics;
using osu.Framework.Graphics.UserInterface;
using osu.Game.Overlays.Settings;
namespace osu.Game.Configuration
@ -105,7 +104,8 @@ namespace osu.Game.Configuration
var dropdownType = typeof(SettingsEnumDropdown<>).MakeGenericType(bindable.GetType().GetGenericArguments()[0]);
var dropdown = (Drawable)Activator.CreateInstance(dropdownType);
dropdown.GetType().GetProperty(nameof(IHasCurrentValue<object>.Current))?.SetValue(dropdown, obj);
dropdownType.GetProperty(nameof(SettingsDropdown<object>.LabelText))?.SetValue(dropdown, attr.Label);
dropdownType.GetProperty(nameof(SettingsDropdown<object>.Bindable))?.SetValue(dropdown, bindable);
yield return dropdown;

4
osu.Game/Online/Multiplayer/PlaylistItem.cs
View File

@ -65,9 +65,7 @@ namespace osu.Game.Online.Multiplayer
public void MapObjects(BeatmapManager beatmaps, RulesetStore rulesets)
{
// If we don't have an api beatmap, the request occurred as a result of room creation, so we can query the local beatmap instead
// Todo: Is this a bug? Room creation only returns the beatmap ID
Beatmap.Value = apiBeatmap == null ? beatmaps.QueryBeatmap(b => b.OnlineBeatmapID == BeatmapID) : apiBeatmap.ToBeatmap(rulesets);
Beatmap.Value = apiBeatmap.ToBeatmap(rulesets);
Ruleset.Value = rulesets.GetRuleset(RulesetID);
Ruleset rulesetInstance = Ruleset.Value.CreateInstance();

9
osu.Game/Online/Multiplayer/Room.cs
View File

@ -118,15 +118,6 @@ namespace osu.Game.Online.Multiplayer
if (DateTimeOffset.Now >= EndDate.Value)
Status.Value = new RoomStatusEnded();
// transfer local beatmaps across to ensure we have Metadata available (CreateRoomRequest does not give us metadata as expected)
foreach (var item in other.Playlist)
{
var localItem = Playlist.FirstOrDefault(i => i.BeatmapID == item.BeatmapID);
if (localItem != null)
item.Beatmap.Value.Metadata = localItem.Beatmap.Value.Metadata;
}
if (!Playlist.SequenceEqual(other.Playlist))
{
Playlist.Clear();

2
osu.Game/Overlays/Comments/DrawableComment.cs
View File

@ -384,7 +384,7 @@ namespace osu.Game.Overlays.Comments
protected override void OnExpandedChanged(ValueChangedEvent<bool> expanded)
{
text.Text = $@"{(expanded.NewValue ? "[+]" : "[-]")} replies ({count})";
text.Text = $@"{(expanded.NewValue ? "[-]" : "[+]")} replies ({count})";
}
}

2
osu.Game/Screens/Menu/IntroTriangles.cs
View File

@ -54,8 +54,6 @@ namespace osu.Game.Screens.Menu
{
base.LogoArriving(logo, resuming);
logo.Triangles = true;
if (!resuming)
{
PrepareMenuLoad();