1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-15 05:07:50 +08:00
Commit Graph

10 Commits

Author SHA1 Message Date
Dean Herbert
fcab21908b Update in line with screen changes 2019-02-17 18:20:03 +09:00
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
160984719d Add team and star displays 2018-11-08 20:38:14 +09:00
Dean Herbert
e4a767d656 Move control panel logic to its own class 2018-11-08 03:51:39 +09:00
Dean Herbert
fb93aea909 Use logo-less video by default 2018-11-05 23:15:30 +09:00
Dean Herbert
7e092c6084 Read videos from storage 2018-11-04 21:15:06 +09:00
Dean Herbert
b610095ff5 Update drawings design 2018-11-04 04:58:40 +09:00
Dean Herbert
3d3a7f714d Move and use shared components 2018-09-21 18:18:28 +09:00
Dean Herbert
51dcfeee92 Move existing tournament resources to new project 2018-09-21 18:18:28 +09:00