Dean Herbert ffcad6e0f1 Merge remote-tracking branch 'upstream/master' into tgi74-hit-shake ...

# Conflicts:
#	osu.Game.Rulesets.Osu.Tests/TestCaseHitCircle.cs
#	osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
#	osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SliderBall.cs

2018-08-24 15:26:36 +09:00

..

Backgrounds

Normalize all the line endings

2018-04-13 18:26:38 +09:00

Containers

Merge remote-tracking branch 'upstream/master' into tgi74-hit-shake

2018-08-24 15:26:36 +09:00

Cursor

Update framework

2018-07-21 16:21:53 +09:00

Sprites

Normalize all the line endings

2018-04-13 18:26:38 +09:00

Textures

Normalize all the line endings

2018-04-13 18:26:38 +09:00

UserInterface

Remove extra newlines

2018-08-21 19:16:07 +09:00

DrawableDate.cs

Move to local components namespace

2018-06-28 19:23:56 +09:00

IHasAccentColour.cs

Normalize all the line endings

2018-04-13 18:26:38 +09:00

OsuColour.cs

Normalize all the line endings

2018-04-13 18:26:38 +09:00

ScreenshotManager.cs

Adjust with framework-side screenchanges

2018-08-17 14:30:44 +09:00

SpriteIcon.cs

Don't use in invalidation logic to avoid incorrect execution

2018-07-16 16:39:52 +09:00