sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-05 15:44:04 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into replay

Browse Source 
# Conflicts:
#	osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
#	osu.Desktop/OsuGameDesktop.cs
#	osu.Game.Modes.Osu/Objects/Drawables/DrawableHitCircle.cs
#	osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs
#	osu.Game/Database/BeatmapDatabase.cs
#	osu.Game/Graphics/Cursor/OsuCursorContainer.cs
#	osu.Game/IPC/BeatmapImporter.cs
#	osu.Game/Modes/Mod.cs
#	osu.Game/Modes/Objects/Drawables/DrawableHitObject.cs
#	osu.Game/Modes/UI/Playfield.cs
#	osu.Game/Screens/Play/Player.cs
#	osu.Game/Screens/Play/PlayerInputManager.cs
This commit is contained in:
Dean Herbert
2017-03-07 13:50:08 +09:00
parent bc74f453aa 688388333b
commit 4430255ec4
171 changed files with 513 additions and 462 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Overlays/Mods/AssistedSection.cs
View File

@ -9,7 +9,7 @@ namespace osu.Game.Overlays.Mods
{
public class AssistedSection : ModSection
{
protected override Key[] ToggleKeys => new Key[] { Key.Z, Key.X, Key.C, Key.V, Key.B, Key.N, Key.M };
protected override Key[] ToggleKeys => new[] { Key.Z, Key.X, Key.C, Key.V, Key.B, Key.N, Key.M };
[BackgroundDependencyLoader]
private void load(OsuColour colours)

2
osu.Game/Overlays/Mods/DifficultyIncreaseSection.cs
View File

@ -9,7 +9,7 @@ namespace osu.Game.Overlays.Mods
{
public class DifficultyIncreaseSection : ModSection
{
protected override Key[] ToggleKeys => new Key[] { Key.A, Key.S, Key.D, Key.F, Key.G, Key.H, Key.J, Key.K, Key.L };
protected override Key[] ToggleKeys => new[] { Key.A, Key.S, Key.D, Key.F, Key.G, Key.H, Key.J, Key.K, Key.L };
[BackgroundDependencyLoader]
private void load(OsuColour colours)

2
osu.Game/Overlays/Mods/DifficultyReductionSection.cs
View File

@ -9,7 +9,7 @@ namespace osu.Game.Overlays.Mods
{
public class DifficultyReductionSection : ModSection
{
protected override Key[] ToggleKeys => new Key[] { Key.Q, Key.W, Key.E, Key.R, Key.T, Key.Y, Key.U, Key.I, Key.O, Key.P };
protected override Key[] ToggleKeys => new[] { Key.Q, Key.W, Key.E, Key.R, Key.T, Key.Y, Key.U, Key.I, Key.O, Key.P };
[BackgroundDependencyLoader]
private void load(OsuColour colours)

17
osu.Game/Overlays/Mods/ModButton.cs
View File

@ -113,23 +113,24 @@ namespace osu.Game.Overlays.Mods
if (mod is MultiMod)
{
mods = ((MultiMod)mod).Mods;
Mods = ((MultiMod)mod).Mods;
}
else
{
mods = new Mod[] { mod };
Mods = new[] { mod };
}
createIcons();
if (mods.Length > 0)
if (Mods.Length > 0)
{
displayMod(mods[0]);
displayMod(Mods[0]);
}
}
}
private Mod[] mods;
public Mod[] Mods => mods; // the mods from Mod, only multiple if Mod is a MultiMod
public Mod[] Mods { get; private set; }
// the mods from Mod, only multiple if Mod is a MultiMod
public Mod SelectedMod => Mods.ElementAtOrDefault(selectedMod);
@ -202,7 +203,7 @@ namespace osu.Game.Overlays.Mods
{
if (Mods.Length > 1)
{
iconsContainer.Add(icons = new ModIcon[]
iconsContainer.Add(icons = new[]
{
new ModIcon
{
@ -222,7 +223,7 @@ namespace osu.Game.Overlays.Mods
}
else
{
iconsContainer.Add(icons = new ModIcon[]
iconsContainer.Add(icons = new[]
{
new ModIcon
{

4
osu.Game/Overlays/Mods/ModSection.cs
View File

@ -15,7 +15,7 @@ using osu.Game.Modes;
namespace osu.Game.Overlays.Mods
{
class AlwaysPresentFlowContainer : FillFlowContainer
internal class AlwaysPresentFlowContainer : FillFlowContainer
{
public override bool IsPresent => true;
}
@ -85,7 +85,7 @@ namespace osu.Game.Overlays.Mods
}
private Color4 colour = Color4.White;
new public Color4 Colour
public new Color4 Colour
{
get
{