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
..
BeatmapChoice.cs	Populate json with enums better	2018-11-09 17:54:05 +09:00
ConditionalMatchPairing.cs	Add conditional match support	2018-12-02 22:36:21 +09:00
DrawableMatchPairing.cs	Add conditional match support	2018-12-02 22:36:21 +09:00
DrawableMatchTeam.cs	Merge remote-tracking branch 'upstream/master' into tournament-tools	2018-11-22 10:25:30 +09:00
DrawableTournamentGrouping.cs	Merge remote-tracking branch 'upstream/master' into tournament-tools	2018-11-22 10:25:30 +09:00
GroupingBeatmap.cs	Populate beatmaps with api information when not present	2018-10-16 15:20:12 +09:00
LadderEditorInfo.cs	Move editing functionality to its own screen	2018-11-16 20:16:18 +09:00
LadderEditorSettings.cs	Add better date string formatting	2018-11-17 14:05:42 +09:00
MatchPairing.cs	Merge branch 'master' into tournament-tools	2019-02-02 19:09:48 +09:00
ProgressionPath.cs	Merge remote-tracking branch 'upstream/master' into tournament-tools	2018-11-22 10:25:30 +09:00
TournamentGrouping.cs	Update to support new dropdown logic	2018-11-15 14:12:41 +09:00
TournamentProgression.cs	Add loser progressions	2018-09-25 02:31:48 +09:00