smoogipoo 5d59a1ffca Merge remote-tracking branch 'origin/master' into timeshift-wip ... # Conflicts: # osu.Game.Tests/Visual/TestCasePollingComponent.cs # osu.Game/Online/API/APIRequest.cs # osu.Game/osu.Game.csproj		2018-12-21 12:51:31 +09:00
..
Beatmaps	Fix incorrect controlpoint being applied to samples	2018-12-03 17:21:27 +09:00
Chat	Normalize all the line endings	2018-04-13 18:26:38 +09:00
NonVisual	Rename NoModMod	2018-11-30 17:35:13 +09:00
Resources	Fix incorrect controlpoint being applied to samples	2018-12-03 17:21:27 +09:00
Scores/IO	Change statistics to be int for now	2018-12-05 19:44:01 +09:00
ScrollAlgorithms	Add IScrollAlgorithm.TimeAt()	2018-11-12 17:43:22 +09:00
Visual	Merge remote-tracking branch 'origin/master' into timeshift-wip	2018-12-21 12:51:31 +09:00
osu.Game.Tests.csproj	Merge branch 'master' into netcoreapp22	2018-12-14 11:33:41 +09:00
WaveformTestBeatmap.cs	Use existing instance of beatmap rather than adding more resources	2018-06-17 19:00:58 +09:00