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
..
Drawings	Merge branch 'master' into tournament-tools	2019-02-02 19:09:48 +09:00
Gameplay	Merge branch 'master' into tournament-tools	2019-02-02 19:09:48 +09:00
Groupings	Merge branch 'master' into tournament-tools	2019-02-02 19:09:48 +09:00
Ladder	Merge branch 'master' into tournament-tools	2019-02-02 19:09:48 +09:00
MapPool	Merge remote-tracking branch 'upstream/master' into tournament-tools	2018-11-22 10:25:30 +09:00
Schedule	Add conditional match support	2018-12-02 22:36:21 +09:00
Showcase	Merge branch 'master' into tournament-tools	2019-02-02 19:09:48 +09:00
TeamIntro	Fix alignment and fonts of tem intro screen	2018-11-22 16:23:44 +09:00
TeamWin	Merge remote-tracking branch 'upstream/master' into tournament-tools	2018-11-22 10:25:30 +09:00
BeatmapInfoScreen.cs	Merge branch 'master' into tournament-tools	2019-02-02 19:09:48 +09:00
IProvideVideo.cs	Avoid rendering more than one video at once	2018-11-11 01:39:02 +09:00
TournamentSceneManager.cs	Merge branch 'master' into tournament-tools	2019-02-02 19:09:48 +09:00
TournamentScreen.cs	Expose groupings editor	2018-11-16 20:30:12 +09:00