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

Merge branch 'master' into notification-thread-safety

Browse Source
This commit is contained in:
Dean Herbert
2017-10-20 11:48:14 +09:00
parent afaf3b4116 22d39c6bf7
commit 35ce6fd2bd
81 changed files with 1845 additions and 712 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Overlays/Direct/FilterControl.cs
View File

@ -39,7 +39,7 @@ namespace osu.Game.Overlays.Direct
DisplayStyleControl.Dropdown.AccentColour = colours.BlueDark;
Ruleset.BindTo(game?.Ruleset ?? new Bindable<RulesetInfo> { Value = rulesets.GetRuleset(0) });
foreach (var r in rulesets.AllRulesets)
foreach (var r in rulesets.AvailableRulesets)
{
modeButtons.Add(new RulesetToggleButton(Ruleset, r));
}

4
osu.Game/Overlays/KeyBinding/KeyBindingsSubsection.cs
View File

@ -37,8 +37,10 @@ namespace osu.Game.Overlays.KeyBinding
foreach (var defaultGroup in Defaults.GroupBy(d => d.Action))
{
int intKey = (int)defaultGroup.Key;
// one row per valid action.
Add(new KeyBindingRow(defaultGroup.Key, bindings.Where(b => b.Action.Equals((int)defaultGroup.Key)))
Add(new KeyBindingRow(defaultGroup.Key, bindings.Where(b => ((int)b.Action).Equals(intKey)))
{
AllowMainMouseButtons = Ruleset != null,
Defaults = defaultGroup.Select(d => d.KeyCombination)

2
osu.Game/Overlays/KeyBindingOverlay.cs
View File

@ -19,7 +19,7 @@ namespace osu.Game.Overlays
{
AddSection(new GlobalKeyBindingsSection(global));
foreach (var ruleset in rulesets.AllRulesets)
foreach (var ruleset in rulesets.AvailableRulesets)
AddSection(new RulesetBindingsSection(ruleset));
}

2
osu.Game/Overlays/Mods/ModSelectOverlay.cs
View File

@ -56,7 +56,7 @@ namespace osu.Game.Overlays.Mods
if (osu != null)
Ruleset.BindTo(osu.Ruleset);
else
Ruleset.Value = rulesets.AllRulesets.First();
Ruleset.Value = rulesets.AvailableRulesets.First();
Ruleset.ValueChanged += rulesetChanged;
Ruleset.TriggerChange();

2
osu.Game/Overlays/Settings/Sections/GameplaySection.cs
View File

@ -27,7 +27,7 @@ namespace osu.Game.Overlays.Settings.Sections
[BackgroundDependencyLoader]
private void load(RulesetStore rulesets)
{
foreach(Ruleset ruleset in rulesets.AllRulesets.Select(info => info.CreateInstance()))
foreach(Ruleset ruleset in rulesets.AvailableRulesets.Select(info => info.CreateInstance()))
{
SettingsSubsection section = ruleset.CreateSettings();
if (section != null)

2
osu.Game/Overlays/Settings/SettingsFooter.cs
View File

@ -27,7 +27,7 @@ namespace osu.Game.Overlays.Settings
var modes = new List<Drawable>();
foreach (var ruleset in rulesets.AllRulesets)
foreach (var ruleset in rulesets.AvailableRulesets)
{
var icon = new ConstrainedIconContainer
{

2
osu.Game/Overlays/Toolbar/ToolbarModeSelector.cs
View File

@ -67,7 +67,7 @@ namespace osu.Game.Overlays.Toolbar
[BackgroundDependencyLoader]
private void load(RulesetStore rulesets, OsuGame game)
{
foreach (var r in rulesets.AllRulesets)
foreach (var r in rulesets.AvailableRulesets)
{
modeButtons.Add(new ToolbarModeButton
{