Merge remote-tracking branch 'origin/master' into timingchange-rework

# Conflicts:
#	osu-framework
This commit is contained in:
smoogipooo
2017-06-12 13:09:02 +09:00
50 changed files with 105 additions and 204 deletions

View File

@ -176,14 +176,14 @@ namespace osu.Game.Rulesets.Mania.UI
background.Colour = accentColour;
hitTargetBar.EdgeEffect = new EdgeEffect
hitTargetBar.EdgeEffect = new EdgeEffectParameters
{
Type = EdgeEffectType.Glow,
Radius = 5,
Colour = accentColour.Opacity(0.5f),
};
keyIcon.EdgeEffect = new EdgeEffect
keyIcon.EdgeEffect = new EdgeEffectParameters
{
Type = EdgeEffectType.Glow,
Radius = 5,