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 branch 'master' into general-fixes

Browse Source
This commit is contained in:
Dean Herbert
2017-04-18 16:19:52 +09:00
committed by GitHub
parent 6dc15963e0 7fbbe74b65
commit 64a8992153
244 changed files with 1387 additions and 913 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -129,7 +129,7 @@ namespace osu.Game.Overlays.Toolbar
}
}
public void SetGameMode(RulesetInfo ruleset) => modeSelector.SetGameMode(ruleset);
public void SetRuleset(RulesetInfo ruleset) => modeSelector.SetRuleset(ruleset);
protected override void PopIn()
{

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

@ -75,7 +75,7 @@ namespace osu.Game.Overlays.Toolbar
Ruleset = ruleset,
Action = delegate
{
SetGameMode(ruleset);
SetRuleset(ruleset);
OnRulesetChange?.Invoke(ruleset);
}
});
@ -89,7 +89,7 @@ namespace osu.Game.Overlays.Toolbar
Size = new Vector2(modeButtons.DrawSize.X, 1);
}
public void SetGameMode(RulesetInfo ruleset)
public void SetRuleset(RulesetInfo ruleset)
{
foreach (ToolbarModeButton m in modeButtons.Children.Cast<ToolbarModeButton>())
{