Merge branch 'master' into fix-autoplay-button-deselect

This commit is contained in:
Dean Herbert
2018-03-16 17:31:14 +09:00
committed by GitHub
107 changed files with 483 additions and 310 deletions

View File

@ -21,7 +21,7 @@ namespace osu.Game.Overlays.Mods
public DifficultyIncreaseSection()
{
Header = @"Gameplay Difficulty Increase";
Header = @"Difficulty Increase";
}
}
}

View File

@ -21,7 +21,7 @@ namespace osu.Game.Overlays.Mods
public DifficultyReductionSection()
{
Header = @"Gameplay Difficulty Reduction";
Header = @"Difficulty Reduction";
}
}
}

View File

@ -287,7 +287,7 @@ namespace osu.Game.Overlays.Mods
Anchor = Anchor.TopCentre,
Action = modButtonPressed,
},
new AssistedSection
new SpecialSection
{
RelativeSizeAxes = Axes.X,
Origin = Anchor.TopCentre,

View File

@ -8,7 +8,7 @@ using osu.Game.Rulesets.Mods;
namespace osu.Game.Overlays.Mods
{
public class AssistedSection : ModSection
public class SpecialSection : ModSection
{
protected override Key[] ToggleKeys => new[] { Key.Z, Key.X, Key.C, Key.V, Key.B, Key.N, Key.M };
public override ModType ModType => ModType.Special;
@ -19,9 +19,9 @@ namespace osu.Game.Overlays.Mods
SelectedColour = colours.BlueLight;
}
public AssistedSection()
public SpecialSection()
{
Header = @"Assisted";
Header = @"Special";
}
}
}