Commit Graph

16 Commits

Author SHA1 Message Date
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
Dean Herbert
f91d2e2e07 Merge remote-tracking branch 'upstream/master' into tournament-tools 2018-11-22 10:25:30 +09:00
Dean Herbert
5621101d40 Adjust gameplay screen size 2018-11-18 12:39:25 +09:00
Dean Herbert
e6529eac3e Add automation of map pool and win screen workflows 2018-11-18 08:30:17 +09:00
Dean Herbert
4b047ad9cc Centralise chat display 2018-11-17 21:27:02 +09:00
Dean Herbert
c1e1306c97 Show controls above screens 2018-11-17 13:39:55 +09:00
Dean Herbert
cf0976955b Expose groupings editor 2018-11-16 20:30:12 +09:00
Dean Herbert
67bb428aef Move editing functionality to its own screen 2018-11-16 20:16:18 +09:00
Dean Herbert
be3904b647 Add win screen 2018-11-11 10:39:04 +09:00
Dean Herbert
eabcef3e12 Add schedule screen 2018-11-11 10:13:17 +09:00
Dean Herbert
b5c2d94cc4 Avoid rendering more than one video at once 2018-11-11 01:39:02 +09:00
Dean Herbert
5c84c3c0a8 Add support for picks and bans 2018-11-08 06:29:04 +09:00
Dean Herbert
a0d64c1b13 Add ability to select current match 2018-11-07 01:24:35 +09:00
Dean Herbert
968d39c0e6 Rearrange scenes 2018-11-06 20:13:09 +09:00
Dean Herbert
ca9df94ea2 Add skeleton for gameplay screen 2018-11-06 19:27:10 +09:00
Dean Herbert
9c5eddea54 Allow running tournament tools from main executable 2018-11-06 14:49:09 +09:00