Merge remote-tracking branch 'origin/master' into optimise-diffcalc

This commit is contained in:
smoogipoo
2018-10-12 12:26:15 +09:00
22 changed files with 52 additions and 63 deletions

View File

@ -37,6 +37,11 @@ namespace osu.Game.Rulesets.Osu.Mods
var osuObject = (OsuHitObject)drawable.HitObject;
Vector2 origin = drawable.Position;
// Wiggle the repeat points with the slider instead of independently.
// Also fixes an issue with repeat points being positioned incorrectly.
if (osuObject is RepeatPoint)
return;
Random objRand = new Random((int)osuObject.StartTime);
// Wiggle all objects during TimePreempt

View File

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