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

Merge branch 'refs/heads/master' into dependency-injection

Browse Source 
# Conflicts:
#	osu-framework
#	osu.Game/GameModes/OsuGameMode.cs
#	osu.Game/GameModes/Play/Player.cs
#	osu.Game/OsuGame.cs
#	osu.Game/Overlays/MusicController.cs
#	osu.Game/Overlays/Options/EditorSection.cs
#	osu.Game/Overlays/Options/Input/MouseOptions.cs
#	osu.Game/Overlays/Options/Online/InGameChatOptions.cs
#	osu.Game/Overlays/Options/SkinSection.cs
This commit is contained in:
Dean Herbert
2016-11-12 19:44:16 +09:00
parent 0d4560a054 646fe5c5f4
commit cc0f61f545
82 changed files with 688 additions and 328 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Overlays/Options/Input/InputSection.cs
View File

@ -5,7 +5,7 @@ namespace osu.Game.Overlays.Options.Input
{
public class InputSection : OptionsSection
{
protected override string Header => "Input";
public override string Header => "Input";
public override FontAwesome Icon => FontAwesome.fa_keyboard_o;
public InputSection()

4
osu.Game/Overlays/Options/Input/MouseOptions.cs
View File

@ -17,8 +17,8 @@ namespace osu.Game.Overlays.Options.Input
{
}
[Initializer]
private void Load(OsuConfigManager config)
[BackgroundDependencyLoader]
private void load(OsuConfigManager config)
{
Children = new Drawable[]
{

4
osu.Game/Overlays/Options/Input/OtherInputOptions.cs
View File

@ -10,8 +10,8 @@ namespace osu.Game.Overlays.Options.Input
{
protected override string Header => "Other";
[Initializer]
private void Load(OsuConfigManager config)
[BackgroundDependencyLoader]
private void load(OsuConfigManager config)
{
Children = new Drawable[]
{