Resolve merge conflicts in DirectOverlay

This commit is contained in:
Roman Kapustin
2018-06-08 21:03:16 +03:00
211 changed files with 3603 additions and 2405 deletions

View File

@ -145,7 +145,7 @@ namespace osu.Game.Overlays.Direct
return;
}
icon.Icon = playing ? FontAwesome.fa_pause : FontAwesome.fa_play;
icon.Icon = playing ? FontAwesome.fa_stop : FontAwesome.fa_play;
icon.FadeColour(playing || IsHovered ? hoverColour : Color4.White, 120, Easing.InOutQuint);
if (!playing)