Dean Herbert 482a01e7ba Merge branch 'master' into tournament-tools ... # Conflicts: # osu.Game/Online/API/Requests/Responses/APIBeatmap.cs # osu.Game/OsuGameBase.cs # osu.Game/Overlays/ChatOverlay.cs # osu.Game/Screens/Menu/MainMenu.cs # osu.Game/Screens/Tournament/Drawings.cs # osu.Game/Screens/Tournament/Teams/DrawingsTeam.cs # osu.Game/osu.Game.csproj # osu.sln		2019-02-02 19:09:48 +09:00
..
osu___Tournament_.xml	Add rider config for tournament run	2018-11-06 17:01:22 +09:00
osu_.xml	Add polling time to ctor	2018-12-14 19:17:21 +09:00
RulesetTests__catch_.xml	Fix targeting netcoreapp2.1 in many places	2018-12-21 10:24:32 +09:00
RulesetTests__mania_.xml	Fix targeting netcoreapp2.1 in many places	2018-12-21 10:24:32 +09:00
RulesetTests__osu__.xml	Fix targeting netcoreapp2.1 in many places	2018-12-21 10:24:32 +09:00
RulesetTests__taiko_.xml	Fix targeting netcoreapp2.1 in many places	2018-12-21 10:24:32 +09:00
TournamentTests.xml	Add tournament tests rider configuration	2018-09-21 18:18:28 +09:00
VisualTests.xml	Fix targeting netcoreapp2.1 in many places	2018-12-21 10:24:32 +09:00