RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into use-class-rename

This commit is contained in:
Bartłomiej Dach 2021-11-07 15:41:00 +01:00 committed by GitHub
parent 0ecf5f201c 5687aa640c
commit 6d30248cef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
23 changed files with 95 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Android.props
View File

@ -52,7 +52,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="ppy.osu.Game.Resources" Version="2021.1026.0" />
<PackageReference Include="ppy.osu.Framework.Android" Version="2021.1104.0" />
<PackageReference Include="ppy.osu.Framework.Android" Version="2021.1106.0" />
</ItemGroup>
<ItemGroup Label="Transitive Dependencies">
<!-- Realm needs to be directly referenced in all Xamarin projects, as it will not pull in its transitive dependencies otherwise. -->

6
osu.Game.Rulesets.Mania/Skinning/Default/DefaultBodyPiece.cs
View File

@ -86,20 +86,18 @@ public ForegroundPiece()
[BackgroundDependencyLoader]
private void load()
{
InternalChild = foregroundBuffer = new BufferedContainer
InternalChild = foregroundBuffer = new BufferedContainer(cachedFrameBuffer: true)
{
Blending = BlendingParameters.Additive,
RelativeSizeAxes = Axes.Both,
CacheDrawnFrameBuffer = true,
Children = new Drawable[]
{
new Box { RelativeSizeAxes = Axes.Both },
subtractionBuffer = new BufferedContainer
subtractionBuffer = new BufferedContainer(cachedFrameBuffer: true)
{
RelativeSizeAxes = Axes.Both,
// This is needed because we're blending with another object
BackgroundColour = Color4.White.Opacity(0),
CacheDrawnFrameBuffer = true,
// The 'hole' is achieved by subtracting the result of this container with the parent
Blending = new BlendingParameters { AlphaEquation = BlendingEquation.ReverseSubtract },
Child = subtractionLayer = new CircularContainer

3
osu.Game.Rulesets.Osu/Statistics/AccuracyHeatmap.cs
View File

@ -136,10 +136,9 @@ private void load()
}
}
},
bufferedGrid = new BufferedContainer
bufferedGrid = new BufferedContainer(cachedFrameBuffer: true)
{
RelativeSizeAxes = Axes.Both,
CacheDrawnFrameBuffer = true,
BackgroundColour = Color4Extensions.FromHex("#202624").Opacity(0),
Child = pointGrid = new GridContainer
{

3
osu.Game.Tests/Mods/ModDifficultyAdjustTest.cs
View File

@ -105,6 +105,9 @@ public void TestChangedSettingsRevertedToDefault()
testMod.ResetSettingsToDefaults();
Assert.That(testMod.DrainRate.Value, Is.Null);
// ReSharper disable once HeuristicUnreachableCode
// see https://youtrack.jetbrains.com/issue/RIDER-70159.
Assert.That(testMod.OverallDifficulty.Value, Is.Null);
var applied = applyDifficulty(new BeatmapDifficulty

16
osu.Game.Tests/NonVisual/FirstAvailableHitWindowsTest.cs
View File

@ -79,8 +79,17 @@ private class TestDrawableRuleset : DrawableRuleset
public List<HitObject> HitObjects;
public override IEnumerable<HitObject> Objects => HitObjects;
public override event Action<JudgementResult> NewResult;
public override event Action<JudgementResult> RevertResult;
public override event Action<JudgementResult> NewResult
{
add => throw new InvalidOperationException();
remove => throw new InvalidOperationException();
}
public override event Action<JudgementResult> RevertResult
{
add => throw new InvalidOperationException();
remove => throw new InvalidOperationException();
}
public override Playfield Playfield { get; }
public override Container Overlays { get; }
@ -95,9 +104,6 @@ private class TestDrawableRuleset : DrawableRuleset
public TestDrawableRuleset()
: base(new OsuRuleset())
{
// won't compile without this.
NewResult?.Invoke(null);
RevertResult?.Invoke(null);
}
public override void SetReplayScore(Score replayScore) => throw new NotImplementedException();

16
osu.Game.Tests/Visual/Gameplay/TestSceneHitErrorMeter.cs
View File

@ -235,8 +235,17 @@ private class TestDrawableRuleset : DrawableRuleset
public override IEnumerable<HitObject> Objects => new[] { new HitCircle { HitWindows = HitWindows } };
public override event Action<JudgementResult> NewResult;
public override event Action<JudgementResult> RevertResult;
public override event Action<JudgementResult> NewResult
{
add => throw new InvalidOperationException();
remove => throw new InvalidOperationException();
}
public override event Action<JudgementResult> RevertResult
{
add => throw new InvalidOperationException();
remove => throw new InvalidOperationException();
}
public override Playfield Playfield { get; }
public override Container Overlays { get; }
@ -251,9 +260,6 @@ private class TestDrawableRuleset : DrawableRuleset
public TestDrawableRuleset()
: base(new OsuRuleset())
{
// won't compile without this.
NewResult?.Invoke(null);
RevertResult?.Invoke(null);
}
public override void SetReplayScore(Score replayScore) => throw new NotImplementedException();

3
osu.Game/Graphics/Backgrounds/Background.cs
View File

@ -58,10 +58,9 @@ public void BlurTo(Vector2 newBlurSigma, double duration = 0, Easing easing = Ea
{
RemoveInternal(Sprite);
AddInternal(bufferedContainer = new BufferedContainer
AddInternal(bufferedContainer = new BufferedContainer(cachedFrameBuffer: true)
{
RelativeSizeAxes = Axes.Both,
CacheDrawnFrameBuffer = true,
RedrawOnScale = false,
Child = Sprite
});

3
osu.Game/Graphics/Sprites/GlowingSpriteText.cs
View File

@ -69,12 +69,11 @@ public GlowingSpriteText()
Children = new Drawable[]
{
new BufferedContainer
new BufferedContainer(cachedFrameBuffer: true)
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
BlurSigma = new Vector2(4),
CacheDrawnFrameBuffer = true,
RedrawOnScale = false,
RelativeSizeAxes = Axes.Both,
Blending = BlendingParameters.Additive,

40
osu.Game/Graphics/UserInterface/LoadingButton.cs
View File

@ -1,7 +1,9 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Input.Events;
using osu.Game.Graphics.Containers;
using osuTK;
@ -22,15 +24,9 @@ public bool IsLoading
Enabled.Value = !isLoading;
if (value)
{
loading.Show();
OnLoadStarted();
}
else
{
loading.Hide();
OnLoadFinished();
}
}
}
@ -44,18 +40,34 @@ public Vector2 LoadingAnimationSize
protected LoadingButton()
{
AddRange(new[]
Add(loading = new LoadingSpinner
{
CreateContent(),
loading = new LoadingSpinner
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Size = new Vector2(12)
}
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Size = new Vector2(12),
Depth = -1,
});
}
[BackgroundDependencyLoader]
private void load()
{
Add(CreateContent());
}
protected override void LoadComplete()
{
base.LoadComplete();
loading.State.BindValueChanged(s =>
{
if (s.NewValue == Visibility.Visible)
OnLoadStarted();
else
OnLoadFinished();
}, true);
}
protected override bool OnClick(ClickEvent e)
{
if (!Enabled.Value)

7
osu.Game/Overlays/BeatmapListing/BeatmapSearchMultipleSelectionFilterRow.cs
View File

@ -4,6 +4,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using JetBrains.Annotations;
using osu.Framework.Allocation;
using osu.Framework.Bindables;
using osu.Framework.Graphics;
@ -22,6 +23,11 @@ public class BeatmapSearchMultipleSelectionFilterRow<T> : BeatmapSearchFilterRow
public BeatmapSearchMultipleSelectionFilterRow(LocalisableString header)
: base(header)
{
}
[BackgroundDependencyLoader]
private void load()
{
Current.BindTo(filter.Current);
}
@ -31,6 +37,7 @@ public BeatmapSearchMultipleSelectionFilterRow(LocalisableString header)
/// <summary>
/// Creates a filter control that can be used to simultaneously select multiple values of type <typeparamref name="T"/>.
/// </summary>
[NotNull]
protected virtual MultipleSelectionFilter CreateMultipleSelectionFilter() => new MultipleSelectionFilter();
protected class MultipleSelectionFilter : FillFlowContainer<MultipleSelectionFilterTabItem>

10
osu.Game/Overlays/Changelog/ChangelogHeader.cs
View File

@ -26,6 +26,8 @@ public class ChangelogHeader : BreadcrumbControlOverlayHeader
public static LocalisableString ListingString => LayoutStrings.HeaderChangelogIndex;
private readonly Bindable<APIUpdateStream> currentStream = new Bindable<APIUpdateStream>();
private Box streamsBackground;
public ChangelogHeader()
@ -39,7 +41,7 @@ public ChangelogHeader()
Build.ValueChanged += showBuild;
Streams.Current.ValueChanged += e =>
currentStream.ValueChanged += e =>
{
if (e.NewValue?.LatestBuild != null && !e.NewValue.Equals(Build.Value?.UpdateStream))
Build.Value = e.NewValue.LatestBuild;
@ -67,7 +69,7 @@ private void showBuild(ValueChangedEvent<APIChangelogBuild> e)
else
{
Current.Value = ListingString;
Streams.Current.Value = null;
currentStream.Value = null;
}
}
@ -92,7 +94,7 @@ private void showBuild(ValueChangedEvent<APIChangelogBuild> e)
Horizontal = 65,
Vertical = 20
},
Child = Streams = new ChangelogUpdateStreamControl()
Child = Streams = new ChangelogUpdateStreamControl { Current = currentStream },
}
}
};
@ -110,7 +112,7 @@ private void updateCurrentStream()
if (Build.Value == null)
return;
Streams.Current.Value = Streams.Items.FirstOrDefault(s => s.Name == Build.Value.UpdateStream.Name);
currentStream.Value = Streams.Items.FirstOrDefault(s => s.Name == Build.Value.UpdateStream.Name);
}
private class ChangelogHeaderTitle : OverlayTitle

9
osu.Game/Overlays/Comments/CommentEditor.cs
View File

@ -175,6 +175,8 @@ private class CommitButton : LoadingButton
protected override IEnumerable<Drawable> EffectTargets => new[] { background };
private readonly string text;
[Resolved]
private OverlayColourProvider colourProvider { get; set; }
@ -184,10 +186,10 @@ private class CommitButton : LoadingButton
public CommitButton(string text)
{
this.text = text;
AutoSizeAxes = Axes.Both;
LoadingAnimationSize = new Vector2(10);
drawableText.Text = text;
}
[BackgroundDependencyLoader]
@ -232,7 +234,8 @@ private void onBlockedStateChanged(ValueChangedEvent<bool> isBlocked)
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Font = OsuFont.GetFont(size: 12, weight: FontWeight.Bold),
Margin = new MarginPadding { Horizontal = 20 }
Margin = new MarginPadding { Horizontal = 20 },
Text = text,
}
}
};

3
osu.Game/Overlays/NowPlayingOverlay.cs
View File

@ -366,14 +366,13 @@ private class Background : BufferedContainer
private readonly WorkingBeatmap beatmap;
public Background(WorkingBeatmap beatmap = null)
: base(cachedFrameBuffer: true)
{
this.beatmap = beatmap;
Depth = float.MaxValue;
RelativeSizeAxes = Axes.Both;
CacheDrawnFrameBuffer = true;
Children = new Drawable[]
{
sprite = new Sprite

12
osu.Game/Overlays/OverlayScrollContainer.cs
View File

@ -37,11 +37,7 @@ public OverlayScrollContainer()
Anchor = Anchor.BottomRight,
Origin = Anchor.BottomRight,
Margin = new MarginPadding(20),
Action = () =>
{
ScrollToStart();
Button.State = Visibility.Hidden;
}
Action = scrollToTop
});
}
@ -58,6 +54,12 @@ protected override void UpdateAfterChildren()
Button.State = Target > button_scroll_position ? Visibility.Visible : Visibility.Hidden;
}
private void scrollToTop()
{
ScrollToStart();
Button.State = Visibility.Hidden;
}
public class ScrollToTopButton : OsuHoverContainer
{
private const int fade_duration = 500;

7
osu.Game/Rulesets/Mods/ModAutoplay.cs
View File

@ -30,11 +30,6 @@ public abstract class ModAutoplay : Mod, IApplicableFailOverride, ICreateReplay
public override bool HasImplementation => GetType().GenericTypeArguments.Length == 0;
[Obsolete("Use the mod-supporting override")] // can be removed 20210731
public virtual Score CreateReplayScore(IBeatmap beatmap) => new Score { Replay = new Replay() };
#pragma warning disable 618
public virtual Score CreateReplayScore(IBeatmap beatmap, IReadOnlyList<Mod> mods) => CreateReplayScore(beatmap);
#pragma warning restore 618
public virtual Score CreateReplayScore(IBeatmap beatmap, IReadOnlyList<Mod> mods) => new Score { Replay = new Replay() };
}
}

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

@ -393,6 +393,7 @@ protected override void Update()
public class OutlineTriangle : BufferedContainer
{
public OutlineTriangle(bool outlineOnly, float size)
: base(cachedFrameBuffer: true)
{
Size = new Vector2(size);
@ -414,7 +415,6 @@ public OutlineTriangle(bool outlineOnly, float size)
}
Blending = BlendingParameters.Additive;
CacheDrawnFrameBuffer = true;
}
}
}

2
osu.Game/Screens/Play/Break/BlurredIcon.cs
View File

@ -32,9 +32,9 @@ public override Vector2 Size
}
public BlurredIcon()
: base(cachedFrameBuffer: true)
{
RelativePositionAxes = Axes.X;
CacheDrawnFrameBuffer = true;
Child = icon = new SpriteIcon
{
Origin = Anchor.Centre,

3
osu.Game/Screens/Play/SquareGraph.cs
View File

@ -98,9 +98,8 @@ protected override void Update()
/// </summary>
protected virtual void RecreateGraph()
{
var newColumns = new BufferedContainer<Column>
var newColumns = new BufferedContainer<Column>(cachedFrameBuffer: true)
{
CacheDrawnFrameBuffer = true,
RedrawOnScale = false,
RelativeSizeAxes = Axes.Both,
};

6
osu.Game/Screens/Ranking/Expanded/Accuracy/RankText.cs
View File

@ -51,13 +51,12 @@ private void load()
Font = OsuFont.Numeric.With(size: 76),
UseFullGlyphHeight = false
},
superFlash = new BufferedContainer
superFlash = new BufferedContainer(cachedFrameBuffer: true)
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
BlurSigma = new Vector2(85),
Size = new Vector2(600),
CacheDrawnFrameBuffer = true,
Blending = BlendingParameters.Additive,
Alpha = 0,
Children = new[]
@ -71,14 +70,13 @@ private void load()
},
},
},
flash = new BufferedContainer
flash = new BufferedContainer(cachedFrameBuffer: true)
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
BlurSigma = new Vector2(35),
BypassAutoSizeAxes = Axes.Both,
Size = new Vector2(200),
CacheDrawnFrameBuffer = true,
Blending = BlendingParameters.Additive,
Alpha = 0,
Scale = new Vector2(1.8f),

3
osu.Game/Screens/Select/BeatmapInfoWedgeBackground.cs
View File

@ -27,9 +27,8 @@ private void load()
{
RelativeSizeAxes = Axes.Both;
InternalChild = new BufferedContainer
InternalChild = new BufferedContainer(cachedFrameBuffer: true)
{
CacheDrawnFrameBuffer = true,
RelativeSizeAxes = Axes.Both,
Children = new Drawable[]
{

2
osu.Game/Screens/Select/Carousel/SetPanelBackground.cs
View File

@ -15,8 +15,8 @@ namespace osu.Game.Screens.Select.Carousel
public class SetPanelBackground : BufferedContainer
{
public SetPanelBackground(WorkingBeatmap working)
: base(cachedFrameBuffer: true)
{
CacheDrawnFrameBuffer = true;
RedrawOnScale = false;
Children = new Drawable[]

2
osu.Game/osu.Game.csproj
View File

@ -36,7 +36,7 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Realm" Version="10.6.0" />
<PackageReference Include="ppy.osu.Framework" Version="2021.1104.0" />
<PackageReference Include="ppy.osu.Framework" Version="2021.1106.0" />
<PackageReference Include="ppy.osu.Game.Resources" Version="2021.1026.0" />
<PackageReference Include="Sentry" Version="3.10.0" />
<PackageReference Include="SharpCompress" Version="0.30.0" />

4
osu.iOS.props
View File

@ -70,7 +70,7 @@
<Reference Include="System.Net.Http" />
</ItemGroup>
<ItemGroup Label="Package References">
<PackageReference Include="ppy.osu.Framework.iOS" Version="2021.1104.0" />
<PackageReference Include="ppy.osu.Framework.iOS" Version="2021.1106.0" />
<PackageReference Include="ppy.osu.Game.Resources" Version="2021.1026.0" />
</ItemGroup>
<!-- See https://github.com/dotnet/runtime/issues/35988 (can be removed after Xamarin uses net5.0 / net6.0) -->
@ -93,7 +93,7 @@
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.6" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="2.2.6" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="ppy.osu.Framework" Version="2021.1104.0" />
<PackageReference Include="ppy.osu.Framework" Version="2021.1106.0" />
<PackageReference Include="SharpCompress" Version="0.30.0" />
<PackageReference Include="NUnit" Version="3.13.2" />
<PackageReference Include="SharpRaven" Version="2.4.0" />