Dean Herbert 7ce5fc08ee Merge branch 'master' into skip-button ... # Conflicts: # osu.Game/Graphics/UserInterface/BackButton.cs # osu.Game/Screens/Play/Player.cs # osu.Game/osu.Game.csproj		2017-02-01 14:05:58 +09:00
..
Backgrounds	Make triangles opaque.	2017-01-30 16:53:12 +09:00
Components	Add basic class structure for Beatmap/HitObject/SampleInfo/User.	2016-09-06 21:41:16 +09:00
Containers	Add missing licence headers.	2016-12-06 19:07:15 +09:00
Cursor	Use new framework-level triangles.	2016-12-01 19:12:35 +01:00
Processing	Use DrawSize instead of Size whereever Size was previously read due to framework changes.	2016-10-18 18:53:31 +02:00
UserInterface	Merge branch 'master' into skip-button	2017-02-01 14:05:58 +09:00
OsuColour.cs	Merge branch 'master' into add-flash-effects	2017-01-30 21:47:05 +09:00
TextAwesome.cs	Update FontAwesome definitions.	2016-11-07 17:59:00 +09:00