Dean Herbert 4430255ec4 Merge remote-tracking branch 'upstream/master' into replay ... # Conflicts: # osu.Desktop.VisualTests/Tests/TestCasePlayer.cs # osu.Desktop/OsuGameDesktop.cs # osu.Game.Modes.Osu/Objects/Drawables/DrawableHitCircle.cs # osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs # osu.Game/Database/BeatmapDatabase.cs # osu.Game/Graphics/Cursor/OsuCursorContainer.cs # osu.Game/IPC/BeatmapImporter.cs # osu.Game/Modes/Mod.cs # osu.Game/Modes/Objects/Drawables/DrawableHitObject.cs # osu.Game/Modes/UI/Playfield.cs # osu.Game/Screens/Play/Player.cs # osu.Game/Screens/Play/PlayerInputManager.cs		2017-03-07 13:50:08 +09:00
..
Backgrounds	Fix most warnings.	2017-03-07 13:05:57 +09:00
Components	Add basic class structure for Beatmap/HitObject/SampleInfo/User.	2016-09-06 21:41:16 +09:00
Containers	Fix most warnings.	2017-03-07 13:05:57 +09:00
Cursor	Merge remote-tracking branch 'upstream/master' into replay	2017-03-07 13:50:08 +09:00
Processing	Fix most warnings.	2017-03-07 13:05:57 +09:00
Sprites	Implement notifications.	2017-02-10 16:30:23 +09:00
UserInterface	Fix most warnings.	2017-03-07 13:05:57 +09:00
OsuColour.cs	Use Color4Extensions from Framework and remove redundant Name	2017-03-04 19:42:37 +01:00
TextAwesome.cs	Don't expicitly set origin of TextAwesome.	2017-03-06 17:06:48 +09:00