h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-09-21 21:27:24 +08:00
Code Issues Releases Wiki Activity

Use consistent terminology format

Browse Source
This commit is contained in:
Joehu 2018-09-15 07:30:11 -07:00
parent 8cb0b5e98d
commit f99eff1192
16 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osu.Game.Rulesets.Osu/OsuInputManager.cs
View File

@ -48,10 +48,10 @@ namespace osu.Game.Rulesets.Osu
public enum OsuAction public enum OsuAction
{ {
[Description("Left Button")] [Description("Left button")]
LeftButton, LeftButton,
[Description("Right Button")] [Description("Right button")]
RightButton RightButton
} }
} }

8
osu.Game.Rulesets.Taiko/TaikoInputManager.cs
View File

@ -17,13 +17,13 @@ namespace osu.Game.Rulesets.Taiko
public enum TaikoAction public enum TaikoAction
{ {
[Description("Left (Rim)")] [Description("Left (rim)")]
LeftRim, LeftRim,
[Description("Left (Centre)")] [Description("Left (centre)")]
LeftCentre, LeftCentre,
[Description("Right (Centre)")] [Description("Right (centre)")]
RightCentre, RightCentre,
[Description("Right (Rim)")] [Description("Right (rim)")]
RightRim RightRim
} }
} }

8
osu.Game/Input/Bindings/GlobalActionContainer.cs
View File

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

2
osu.Game/Overlays/Settings/Sections/Audio/OffsetSettings.cs
View File

@ -19,7 +19,7 @@ namespace osu.Game.Overlays.Settings.Sections.Audio
{ {
new SettingsSlider<double, OffsetSlider> new SettingsSlider<double, OffsetSlider>
{ {
LabelText = "Audio Offset", LabelText = "Audio offset",
Bindable = config.GetBindable<double>(OsuSetting.AudioOffset), Bindable = config.GetBindable<double>(OsuSetting.AudioOffset),
KeyboardStep = 1f KeyboardStep = 1f
}, },

2
osu.Game/Overlays/Settings/Sections/Audio/VolumeSettings.cs
View File

@ -18,7 +18,7 @@ namespace osu.Game.Overlays.Settings.Sections.Audio
Children = new Drawable[] Children = new Drawable[]
{ {
new SettingsSlider<double> { LabelText = "Master", Bindable = audio.Volume, KeyboardStep = 0.01f }, new SettingsSlider<double> { LabelText = "Master", Bindable = audio.Volume, KeyboardStep = 0.01f },
new SettingsSlider<double> { LabelText = "Master (Window Inactive)", Bindable = config.GetBindable<double>(OsuSetting.VolumeInactive), KeyboardStep = 0.01f }, new SettingsSlider<double> { LabelText = "Master (window inactive)", Bindable = config.GetBindable<double>(OsuSetting.VolumeInactive), KeyboardStep = 0.01f },
new SettingsSlider<double> { LabelText = "Effect", Bindable = audio.VolumeSample, KeyboardStep = 0.01f }, new SettingsSlider<double> { LabelText = "Effect", Bindable = audio.VolumeSample, KeyboardStep = 0.01f },
new SettingsSlider<double> { LabelText = "Music", Bindable = audio.VolumeTrack, KeyboardStep = 0.01f }, new SettingsSlider<double> { LabelText = "Music", Bindable = audio.VolumeTrack, KeyboardStep = 0.01f },
}; };

2
osu.Game/Overlays/Settings/Sections/Input/KeyboardSettings.cs
View File

@ -15,7 +15,7 @@ namespace osu.Game.Overlays.Settings.Sections.Input
{ {
new SettingsButton new SettingsButton
{ {
Text = "Key Configuration", Text = "Key configuration",
Action = keyConfig.ToggleVisibility Action = keyConfig.ToggleVisibility
}, },
}; };

4
osu.Game/Overlays/Settings/Sections/Input/MouseSettings.cs
View File

@ -26,12 +26,12 @@ namespace osu.Game.Overlays.Settings.Sections.Input
{ {
new SettingsCheckbox new SettingsCheckbox
{ {
LabelText = "Raw Input", LabelText = "Raw input",
Bindable = rawInputToggle Bindable = rawInputToggle
}, },
sensitivity = new SensitivitySetting sensitivity = new SensitivitySetting
{ {
LabelText = "Cursor Sensitivity", LabelText = "Cursor sensitivity",
Bindable = config.GetBindable<double>(FrameworkSetting.CursorSensitivity) Bindable = config.GetBindable<double>(FrameworkSetting.CursorSensitivity)
}, },
new SettingsCheckbox new SettingsCheckbox

2
osu.Game/Rulesets/Objects/Drawables/DrawableHitObject.cs
View File

@ -145,7 +145,7 @@ namespace osu.Game.Rulesets.Objects.Drawables
public event Action<DrawableHitObject, ArmedState> ApplyCustomUpdateState; public event Action<DrawableHitObject, ArmedState> ApplyCustomUpdateState;
/// <summary> /// <summary>
/// Plays all the hitsounds for this <see cref="DrawableHitObject"/>. /// Plays all the hit sounds for this <see cref="DrawableHitObject"/>.
/// </summary> /// </summary>
public void PlaySamples() => Samples?.Play(); public void PlaySamples() => Samples?.Play();

8
osu.Game/Rulesets/UI/Scrolling/ScrollingDirection.cs
View File

@ -6,19 +6,19 @@ namespace osu.Game.Rulesets.UI.Scrolling
public enum ScrollingDirection public enum ScrollingDirection
{ {
/// <summary> /// <summary>
/// Hitobjects will scroll vertically from the bottom of the hitobject container. /// Hit objects will scroll vertically from the bottom of the hitobject container.
/// </summary> /// </summary>
Up, Up,
/// <summary> /// <summary>
/// Hitobjects will scroll vertically from the top of the hitobject container. /// Hit objects will scroll vertically from the top of the hitobject container.
/// </summary> /// </summary>
Down, Down,
/// <summary> /// <summary>
/// Hitobjects will scroll horizontally from the right of the hitobject container. /// Hit objects will scroll horizontally from the right of the hitobject container.
/// </summary> /// </summary>
Left, Left,
/// <summary> /// <summary>
/// Hitobjects will scroll horizontally from the left of the hitobject container. /// Hit objects will scroll horizontally from the left of the hitobject container.
/// </summary> /// </summary>
Right Right
} }

2
osu.Game/Screens/Edit/Components/PlaybackControl.cs
View File

@ -44,7 +44,7 @@ namespace osu.Game.Screens.Edit.Components
new OsuSpriteText new OsuSpriteText
{ {
Origin = Anchor.BottomLeft, Origin = Anchor.BottomLeft,
Text = "Playback Speed", Text = "Playback speed",
RelativePositionAxes = Axes.Y, RelativePositionAxes = Axes.Y,
Y = 0.5f, Y = 0.5f,
Padding = new MarginPadding { Left = 45 } Padding = new MarginPadding { Left = 45 }

4
osu.Game/Screens/Edit/Screens/Compose/Timeline/TimelineArea.cs
View File

@ -59,8 +59,8 @@ namespace osu.Game.Screens.Edit.Screens.Compose.Timeline
Spacing = new Vector2(0, 4), Spacing = new Vector2(0, 4),
Children = new[] Children = new[]
{ {
hitObjectsCheckbox = new OsuCheckbox { LabelText = "Hitobjects" }, hitObjectsCheckbox = new OsuCheckbox { LabelText = "Hit objects" },
hitSoundsCheckbox = new OsuCheckbox { LabelText = "Hitsounds" }, hitSoundsCheckbox = new OsuCheckbox { LabelText = "Hit sounds" },
waveformCheckbox = new OsuCheckbox { LabelText = "Waveform" } waveformCheckbox = new OsuCheckbox { LabelText = "Waveform" }
} }
} }

2
osu.Game/Screens/Play/PlayerSettings/VisualSettings.cs
View File

@ -38,7 +38,7 @@ namespace osu.Game.Screens.Play.PlayerSettings
}, },
showStoryboardToggle = new PlayerCheckbox { LabelText = "Storyboards" }, showStoryboardToggle = new PlayerCheckbox { LabelText = "Storyboards" },
beatmapSkinsToggle = new PlayerCheckbox { LabelText = "Beatmap skins" }, beatmapSkinsToggle = new PlayerCheckbox { LabelText = "Beatmap skins" },
beatmapHitsoundsToggle = new PlayerCheckbox { LabelText = "Beatmap hitsounds" } beatmapHitsoundsToggle = new PlayerCheckbox { LabelText = "Beatmap hit sounds" }
}; };
} }

4
osu.Game/Screens/Select/Filter/GroupMode.cs
View File

@ -21,8 +21,8 @@ namespace osu.Game.Screens.Select.Filter
DateAdded, DateAdded,
[Description("Difficulty")] [Description("Difficulty")]
Difficulty, Difficulty,
[Description("Favorites")] [Description("Favourites")]
Favorites, Favourites,
[Description("Length")] [Description("Length")]
Length, Length,
[Description("My Maps")] [Description("My Maps")]

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

@ -65,7 +65,7 @@ namespace osu.Game.Screens.Select
BeatmapOptions.AddButton(@"Remove", @"from unplayed", FontAwesome.fa_times_circle_o, colours.Purple, null, Key.Number1); BeatmapOptions.AddButton(@"Remove", @"from unplayed", FontAwesome.fa_times_circle_o, colours.Purple, null, Key.Number1);
BeatmapOptions.AddButton(@"Clear", @"local scores", FontAwesome.fa_eraser, colours.Purple, null, Key.Number2); BeatmapOptions.AddButton(@"Clear", @"local scores", FontAwesome.fa_eraser, colours.Purple, null, Key.Number2);
BeatmapOptions.AddButton(@"Edit", @"Beatmap", FontAwesome.fa_pencil, colours.Yellow, () => BeatmapOptions.AddButton(@"Edit", @"beatmap", FontAwesome.fa_pencil, colours.Yellow, () =>
{ {
ValidForResume = false; ValidForResume = false;
Push(new Editor()); Push(new Editor());

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

@ -205,7 +205,7 @@ namespace osu.Game.Screens.Select
Footer.AddButton(@"random", colours.Green, triggerRandom, Key.F2); Footer.AddButton(@"random", colours.Green, triggerRandom, Key.F2);
Footer.AddButton(@"options", colours.Blue, BeatmapOptions, Key.F3); Footer.AddButton(@"options", colours.Blue, BeatmapOptions, Key.F3);
BeatmapOptions.AddButton(@"Delete", @"Beatmap", FontAwesome.fa_trash, colours.Pink, () => delete(Beatmap.Value.BeatmapSetInfo), Key.Number4, float.MaxValue); BeatmapOptions.AddButton(@"Delete", @"beatmapset", FontAwesome.fa_trash, colours.Pink, () => delete(Beatmap.Value.BeatmapSetInfo), Key.Number4, float.MaxValue);
} }
if (this.beatmaps == null) if (this.beatmaps == null)

2
osu.Game/Storyboards/Drawables/DrawableStoryboardSample.cs
View File

@ -41,7 +41,7 @@ namespace osu.Game.Storyboards.Drawables
{ {
base.Update(); base.Update();
// TODO: this logic will need to be consolidated with other game samples like hitsounds. // TODO: this logic will need to be consolidated with other game samples like hit sounds.
if (Time.Current < sample.Time) if (Time.Current < sample.Time)
{ {
// We've rewound before the start time of the sample // We've rewound before the start time of the sample