h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-28 21:23:04 +08:00
Code Issues Releases Wiki Activity

Merge pull request #1101 from peppy/global-bindings

Browse Source 
Fix some formatting regressions
This commit is contained in:
Thomas Müller 2017-08-13 11:22:17 +09:00 committed by GitHub
commit 07487b5ca9
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
osu.Game.Rulesets.Catch/CatchInputManager.cs
View File

@ -11,18 +11,19 @@ namespace osu.Game.Rulesets.Catch
{ {
public class CatchInputManager : DatabasedKeyBindingInputManager<CatchAction> public class CatchInputManager : DatabasedKeyBindingInputManager<CatchAction>
{ {
public CatchInputManager(RulesetInfo ruleset) : base(ruleset, simultaneousMode: SimultaneousBindingMode.Unique) public CatchInputManager(RulesetInfo ruleset)
: base(ruleset, simultaneousMode: SimultaneousBindingMode.Unique)
{ {
} }
protected override IEnumerable<KeyBinding> CreateDefaultMappings() => new[] protected override IEnumerable<KeyBinding> CreateDefaultMappings() => new[]
{ {
new KeyBinding( Key.Z, CatchAction.MoveLeft), new KeyBinding(Key.Z, CatchAction.MoveLeft),
new KeyBinding( Key.Left, CatchAction.MoveLeft), new KeyBinding(Key.Left, CatchAction.MoveLeft),
new KeyBinding( Key.X, CatchAction.MoveRight), new KeyBinding(Key.X, CatchAction.MoveRight),
new KeyBinding( Key.Right, CatchAction.MoveRight), new KeyBinding(Key.Right, CatchAction.MoveRight),
new KeyBinding( Key.LShift, CatchAction.Dash), new KeyBinding(Key.LShift, CatchAction.Dash),
new KeyBinding( Key.RShift, CatchAction.Dash), new KeyBinding(Key.RShift, CatchAction.Dash),
}; };
} }

2
osu.Game/Overlays/Settings/Sections/General/LoginSettings.cs
View File

@ -245,7 +245,7 @@ namespace osu.Game.Overlays.Settings.Sections.General
{ {
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
Text = "Register new account", Text = "Register new account",
//Binding = registerLink //Action = registerLink
} }
}; };
} }

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

@ -39,7 +39,7 @@ namespace osu.Game.Screens.Select
/// <param name="text">Text on the button.</param> /// <param name="text">Text on the button.</param>
/// <param name="colour">Colour of the button.</param> /// <param name="colour">Colour of the button.</param>
/// <param name="hotkey">Hotkey of the button.</param> /// <param name="hotkey">Hotkey of the button.</param>
/// <param name="action">Binding the button does.</param> /// <param name="action">Action the button does.</param>
/// <param name="depth"> /// <param name="depth">
/// <para>Higher depth to be put on the left, and lower to be put on the right.</para> /// <para>Higher depth to be put on the left, and lower to be put on the right.</para>
/// <para>Notice this is different to <see cref="Options.BeatmapOptionsOverlay"/>!</para> /// <para>Notice this is different to <see cref="Options.BeatmapOptionsOverlay"/>!</para>