Dean Herbert 471b9daa93

Merge branch 'master' into mod-overlay ...

# Conflicts:
#	osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
#	osu.Game/Screens/Select/PlaySongSelect.cs
#	osu.Game/osu.Game.csproj

2017-03-02 20:27:04 +09:00

..

Backgrounds

Improve naming and correctness of triangles fading

2017-02-28 19:01:02 +01:00

Components

Add basic class structure for Beatmap/HitObject/SampleInfo/User.

2016-09-06 21:41:16 +09:00

Containers

Weld -> BindWith.

2017-02-27 12:24:53 +09:00

Cursor

Merge remote-tracking branch 'upstream/master' into warning_fixes

2017-02-28 13:49:19 +09:00

Processing

Update and standardise license headers.

2017-02-07 14:27:41 +09:00

Sprites

Implement notifications.

2017-02-10 16:30:23 +09:00

UserInterface

Fix some license headers.

2017-03-02 18:45:20 +09:00

OsuColour.cs

Remove unnecessary using statements

2017-02-23 21:38:10 +01:00

TextAwesome.cs

Merge https://github.com/ppy/osu into mod-overlay

2017-02-28 02:22:59 -04:00