Dean Herbert 712a2f6918 Merge remote-tracking branch 'upstream/master' into fix-playing-multiple-beatmap-preview-tracks		2019-11-12 15:10:42 +09:00
..
Beatmaps	Fix merge regressions	2019-10-30 18:45:50 +09:00
Chat	Change containment check to overlap	2019-10-25 00:42:58 +02:00
Editor	Merge remote-tracking branch 'upstream/master' into bindable-control-points	2019-10-28 11:52:04 +09:00
Gameplay	Fix hitobject combo colour potentially not getting adjusted	2019-10-18 17:32:11 +09:00
NonVisual	Apply brace style.	2019-11-11 20:13:13 +08:00
Resources	Fix control points being flushed too late	2019-10-30 18:02:18 +09:00
Scores/IO	Adjust test to assert that the import failed	2019-09-22 00:59:40 +09:00
ScrollAlgorithms	Update licence header (and remove year)	2019-01-24 17:43:03 +09:00
Skins	Apply other styles.	2019-11-11 20:27:04 +08:00
Visual	Merge remote-tracking branch 'upstream/master' into fix-playing-multiple-beatmap-preview-tracks	2019-11-12 15:10:42 +09:00
osu.Game.Tests.csproj	Bump Microsoft.NET.Test.Sdk from 16.3.0 to 16.4.0	2019-11-07 06:19:49 +00:00
WaveformTestBeatmap.cs	Migrate decoding to line-buffered reader	2019-09-15 01:28:07 +02:00