h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 14:25:05 +08:00
Code Issues Releases Wiki Activity

Merge branch 'master' into global-mod-binding

Browse Source
This commit is contained in:
Dan Balasescu 2018-01-29 15:18:11 +09:00 committed by GitHub
commit 2bae22999d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu-framework

@ -1 +1 @@
Subproject commit 9c4b79ed97eb89dc163cca837e197bfbf41400e3
Subproject commit 2610a3133721b0bc4af852342aa2a179d0e66497

2
osu.Game/OsuGame.cs
View File

@ -116,7 +116,7 @@ namespace osu.Game
Task.Run(() => BeatmapManager.Import(paths.ToArray()));
}
dependencies.CacheAs<OsuGame>(this);
dependencies.CacheAs(this);
configRuleset = LocalConfig.GetBindable<int>(OsuSetting.Ruleset);
Ruleset.Value = RulesetStore.GetRuleset(configRuleset.Value) ?? RulesetStore.AvailableRulesets.First();

2
osu.Game/OsuGameBase.cs
View File

@ -95,7 +95,7 @@ namespace osu.Game
dependencies.Cache(new LargeTextureStore(new RawTextureLoaderStore(new NamespacedResourceStore<byte[]>(Resources, @"Textures"))));
dependencies.CacheAs<OsuGameBase>(this);
dependencies.CacheAs(this);
dependencies.Cache(LocalConfig);
runMigrations();

2
osu.Game/Screens/Select/SongSelect.cs
View File

@ -181,7 +181,7 @@ namespace osu.Game.Screens.Select
[BackgroundDependencyLoader(permitNulls: true)]
private void load(BeatmapManager beatmaps, AudioManager audio, DialogOverlay dialog, OsuGame osu, OsuColour colours)
{
dependencies.CacheAs<SongSelect>(this);
dependencies.CacheAs(this);
if (Footer != null)
{