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

@ -19,7 +19,6 @@ using osu.Game.Database;
using osu.Game.IO.Archives;
using osu.Game.Overlays;
using osu.Game.Screens.Backgrounds;
using osu.Game.Skinning;
using osuTK;
using osuTK.Graphics;
@ -85,7 +84,7 @@ namespace osu.Game.Screens.Menu
private BeatmapManager beatmaps { get; set; }
[BackgroundDependencyLoader]
private void load(OsuConfigManager config, SkinManager skinManager, Framework.Game game, RealmContextFactory realmContextFactory)
private void load(OsuConfigManager config, Framework.Game game, RealmContextFactory realmContextFactory)
{
// prevent user from changing beatmap while the intro is still running.
beatmap = Beatmap.BeginLease(false);