smoogipoo a3470f9ec3 Merge remote-tracking branch 'origin/master' into disallow-beatmap-change ...

# Conflicts:
#	osu.Game/Overlays/Music/PlaylistOverlay.cs
#	osu.Game/Screens/OsuScreen.cs

a3470f9ec3 · 2018-05-28 18:01:15 +09:00

History

..

Backgrounds

Normalize all the line endings

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

Containers

Privatise the OsuGame beatmap, add local beatmap to OsuTestCase

2018-05-23 17:38:02 +09:00

Cursor

Forgot file name

2018-05-25 21:20:42 +02: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

Move screen titles to OsuScreen

2018-05-28 13:30:24 +09:00

DrawableDate.cs

Normalize all the line endings

2018-04-13 18:26:38 +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

Reword xmldoc

2018-04-13 21:15:08 +09:00

SpriteIcon.cs

Normalize all the line endings

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