smoogipoo ff559a3a1b Merge remote-tracking branch 'origin/master' into playfield-scaling-rework ... # Conflicts: # osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs # osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs		2018-10-05 10:40:16 +09:00
..
Beatmaps	Add more comprehensive tests	2018-08-17 10:04:00 +09:00
Chat	Normalize all the line endings	2018-04-13 18:26:38 +09:00
NonVisual	Fix up performance calculators	2018-06-14 16:04:48 +09:00
Resources	Add more comprehensive tests	2018-08-17 10:04:00 +09:00
Visual	Merge remote-tracking branch 'origin/master' into playfield-scaling-rework	2018-10-05 10:40:16 +09:00
osu.Game.Tests.csproj	Update remaining nuget deps	2018-08-01 19:17:16 +09:00
WaveformTestBeatmap.cs	Use existing instance of beatmap rather than adding more resources	2018-06-17 19:00:58 +09:00