1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-27 08:42:55 +08:00
Commit Graph

22 Commits

Author SHA1 Message Date
Dean Herbert
e678a068b6 Bring design up-to-date with 2019 standards 2020-03-03 19:20:42 +09:00
Dan Balasescu
1c1a49011b
Merge branch 'master' into infrastructure 2019-11-08 19:10:49 +09:00
Dean Herbert
c1ad3114d6 Merge remote-tracking branch 'upstream/master' into tournament-improve-transitions 2019-11-08 19:09:19 +09:00
Dean Herbert
12b855d68f Make drawing screen transition properly 2019-11-08 17:56:11 +09:00
Dean Herbert
8bcbc93501 Fix tournament buttons playing sound effects 2019-11-08 17:00:47 +09:00
Huo Yaoyuan
3ad0369d7b Resolve new diagnostics in C# 7.3 2019-10-30 23:13:11 +08:00
Dean Herbert
711214ed09 Use OsuButton everywhere 2019-06-18 17:17:46 +09:00
Dean Herbert
96e24ebd20 General namespace tidy-up 2019-06-18 14:51:48 +09:00
Dean Herbert
93fc14426b Convert TournamentTeam props to use binadbles 2019-06-17 19:11:57 +09:00
Dean Herbert
7b56180b8b Merge remote-tracking branch 'upstream/master' into tournament-tools 2019-05-15 12:08:23 +09:00
Dean Herbert
cf63ee4948 Update licence headers 2019-03-04 13:24:19 +09:00
Dean Herbert
132ce541f3 Fix obsolete font usages 2019-03-04 12:06:41 +09:00
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