sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-03 22:56:36 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame-rankings

Browse Source
This commit is contained in:
Andrei Zavatski
2020-02-19 16:23:18 +03:00
parent ab84f4085a 02f3e78b14
commit 5d813bf421
213 changed files with 5117 additions and 2615 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
osu.Game/OsuGame.cs
View File

@ -150,10 +150,8 @@ namespace osu.Game
dependencies = new DependencyContainer(base.CreateChildDependencies(parent));
[BackgroundDependencyLoader]
private void load(FrameworkConfigManager frameworkConfig)
private void load()
{
this.frameworkConfig = frameworkConfig;
if (!Host.IsPrimaryInstance && !DebugUtils.IsDebugBuild)
{
Logger.Log(@"osu! does not support multiple running instances.", LoggingTarget.Runtime, LogLevel.Error);
@ -882,7 +880,8 @@ namespace osu.Game
private Container topMostOverlayContent;
private FrameworkConfigManager frameworkConfig;
[Resolved]
private FrameworkConfigManager frameworkConfig { get; set; }
private ScalingContainer screenContainer;