Merge branch 'master' into return_to_large_logo_after_idle

This commit is contained in:
Dean Herbert
2018-10-12 22:14:23 +09:00
committed by GitHub
71 changed files with 638 additions and 579 deletions

View File

@ -71,17 +71,17 @@ namespace osu.Game.Input.Bindings
ToggleSettings,
[Description("Toggle osu!direct")]
ToggleDirect,
[Description("Increase Volume")]
[Description("Increase volume")]
IncreaseVolume,
[Description("Decrease Volume")]
[Description("Decrease volume")]
DecreaseVolume,
[Description("Toggle mute")]
ToggleMute,
// In-Game Keybindings
[Description("Skip Cutscene")]
[Description("Skip cutscene")]
SkipCutscene,
[Description("Quick Retry (Hold)")]
[Description("Quick retry (hold)")]
QuickRetry,
[Description("Take screenshot")]