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 'master' into audio-device-selection

Browse Source 
# Conflicts:
#	osu-framework
#	osu.Game/Overlays/Options/Sections/Audio/AudioDevicesOptions.cs
This commit is contained in:
Dean Herbert
2017-02-09 16:21:28 +09:00
parent 6add77c30b 1ace39254d
commit d05b544d0d
281 changed files with 2139 additions and 1872 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game/Overlays/Options/Sections/Gameplay/GeneralOptions.cs
View File

@ -1,5 +1,5 @@
//Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using osu.Framework.Allocation;
using osu.Framework.Configuration;

32
osu.Game/Overlays/Options/Sections/Gameplay/SongSelectOptions.cs
View File

@ -1,16 +1,16 @@
//Copyright (c) 2007-2016 ppy Pty Ltd <contact@ppy.sh>.
//Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using osu.Framework.Allocation;
using osu.Framework.Configuration;
using osu.Framework.Graphics;
using osu.Game.Configuration;
namespace osu.Game.Overlays.Options.Sections.Gameplay
{
public class SongSelectOptions : OptionsSubsection
{
protected override string Header => "Song Select";
// Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
using osu.Framework.Allocation;
using osu.Framework.Configuration;
using osu.Framework.Graphics;
using osu.Game.Configuration;
namespace osu.Game.Overlays.Options.Sections.Gameplay
{
public class SongSelectOptions : OptionsSubsection
{
protected override string Header => "Song Select";
[BackgroundDependencyLoader]
private void load(OsuConfigManager config)
@ -29,6 +29,6 @@ namespace osu.Game.Overlays.Options.Sections.Gameplay
},
};
}
}
}
}
}