Merge branch 'master' into realm-integration/score-and-beatmaps

This commit is contained in:
Bartłomiej Dach
2022-01-15 14:45:42 +01:00
86 changed files with 169 additions and 171 deletions

View File

@ -2,7 +2,6 @@
// See the LICENCE file in the repository root for full licence text.
using osu.Framework.Allocation;
using osu.Framework.Configuration;
using osu.Framework.Graphics;
using osu.Framework.Localisation;
using osu.Framework.Platform;
@ -16,7 +15,7 @@ namespace osu.Game.Overlays.Settings.Sections.DebugSettings
protected override LocalisableString Header => DebugSettingsStrings.MemoryHeader;
[BackgroundDependencyLoader]
private void load(FrameworkDebugConfigManager config, GameHost host, RealmContextFactory realmFactory)
private void load(GameHost host, RealmContextFactory realmFactory)
{
Children = new Drawable[]
{

View File

@ -19,7 +19,7 @@ namespace osu.Game.Overlays.Settings
public class SettingsFooter : FillFlowContainer
{
[BackgroundDependencyLoader]
private void load(OsuGameBase game, OsuColour colours, RulesetStore rulesets)
private void load(OsuGameBase game, RulesetStore rulesets)
{
RelativeSizeAxes = Axes.X;
AutoSizeAxes = Axes.Y;

View File

@ -65,7 +65,7 @@ namespace osu.Game.Overlays.Settings
}
[BackgroundDependencyLoader]
private void load(OverlayColourProvider colourProvider, OsuColour colours)
private void load(OverlayColourProvider colourProvider)
{
AddRangeInternal(new Drawable[]
{