Commit Graph

6 Commits

Author SHA1 Message Date
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
0cad5d7d41 Fix most warnings. 2017-03-07 13:05:57 +09:00
faf07ab51a Use generics everywhere. 2017-03-06 13:59:11 +09:00
10dfe47638 Add spinners and improve TestCaseHitObjects. 2017-02-15 01:23:20 +09:00
50bd80cb0c Update and standardise license headers. 2017-02-07 14:27:41 +09:00
40ea6e0d72 Fix incorrect folder name. 2016-12-08 21:36:34 +09:00