1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-12 14:19:34 +08:00
Commit Graph

289 Commits

Author SHA1 Message Date
smoogipoo
19ce2d643e Remove unused using 2020-03-10 09:51:30 +09:00
Dean Herbert
e158cbfe24
Merge branch 'master' into tournament-design-schedule 2020-03-10 09:40:08 +09:00
Dan Balasescu
f5e134806a
Merge branch 'master' into tournament-design-gameplay 2020-03-09 19:33:53 +09:00
Dan Balasescu
3554cdda36
Merge pull request #8179 from peppy/tournament-design-win
Implement 2020 win screen design
2020-03-09 19:33:42 +09:00
Dan Balasescu
6d23c3b4ab
Merge pull request #8180 from peppy/tournament-design-intro
Implement 2020 intro screen design
2020-03-09 18:38:07 +09:00
Dan Balasescu
1fec5d17a8
Merge pull request #8174 from peppy/tournament-design-ladder
Implement 2020 ladder design
2020-03-09 18:15:59 +09:00
Dean Herbert
8b16dadfe5 Merge branch 'master' into tournament-design-gameplay 2020-03-09 15:09:02 +09:00
Dean Herbert
832e64cc95 Fix test failures due to null current match 2020-03-09 14:57:19 +09:00
Dan Balasescu
0ecf6a4ecd
Merge branch 'master' into tournament-design-win 2020-03-09 14:16:34 +09:00
Dan Balasescu
1e9adbba4e
Merge branch 'master' into tournament-design-intro 2020-03-09 14:16:22 +09:00
Dan Balasescu
fac5530cab
Merge branch 'master' into tournament-design-mappool 2020-03-09 14:16:05 +09:00
Dan Balasescu
0f44c0739a
Merge branch 'master' into tournament-design-ladder 2020-03-09 14:16:01 +09:00
smoogipoo
b61e56cda5 Resolve post-merge issue 2020-03-09 13:29:17 +09:00
Dean Herbert
dc201a68dc Merge branch 'tournament-drawable-team-tidy' into tournament-design-mappool 2020-03-08 20:16:48 +09:00
Dean Herbert
5f6ce7fde5 Merge branch 'tournament-drawable-team-tidy' into tournament-design-ladder 2020-03-08 20:16:35 +09:00
Dean Herbert
7f38ff8046 Merge branch 'tournament-drawable-team-tidy' into tournament-design-schedule 2020-03-08 20:16:12 +09:00
Dean Herbert
71824ce7d6 Merge branch 'tournament-drawable-team-tidy' into tournament-design-win 2020-03-08 20:14:59 +09:00
Dean Herbert
ba865aa195 Merge branch 'tournament-drawable-team-tidy' into tournament-design-intro 2020-03-08 20:14:15 +09:00
Dean Herbert
cc438210a3 Merge branch 'tournament-drawable-team-tidy' into tournament-design-gameplay 2020-03-08 20:13:29 +09:00
Dean Herbert
2fe32b7d2b Remove LadderInfo requirement in DrawableMatchTeam 2020-03-08 19:41:22 +09:00
Dean Herbert
9138bafbeb Fix alignment of flags on team intro screen 2020-03-08 18:49:06 +09:00
Dean Herbert
8b0b910196 Update song / chat / beatmap info display to reflect new design 2020-03-08 18:25:22 +09:00
Dean Herbert
3744aaf55f Update vertical alignment of chroma area 2020-03-08 18:16:32 +09:00
Dean Herbert
5d5910822b Initial pass of intro screen design update 2020-03-08 16:06:37 +09:00
Dean Herbert
a85cef2f06 Reset win screen video on display; add fade in transition 2020-03-08 16:05:37 +09:00
Dean Herbert
8ab9ca77d6 Fix next match timer not updating 2020-03-08 16:02:13 +09:00
Dean Herbert
6c0a27e0b9 Improve look of selected match 2020-03-08 16:02:13 +09:00
Dean Herbert
9934a97bd0 Limit upcoming matches displayed to 8 2020-03-08 16:01:41 +09:00
Dean Herbert
434feb5ac6 Fix alignment on schedule screen 2020-03-08 16:01:41 +09:00
Dean Herbert
059aea8ead Initial pass of schedule screen design update 2020-03-08 16:00:00 +09:00
Dean Herbert
9bd837da41 Update match score display 2020-03-08 15:55:54 +09:00
Dean Herbert
e25206728f Hide score displays during warmup 2020-03-08 15:55:54 +09:00
Dean Herbert
86b12a384b Initial pass of gameplay screen design update 2020-03-08 15:55:54 +09:00
Dean Herbert
ba6c4abbe6 Initial pass of ladder screen design update 2020-03-08 15:52:41 +09:00
Dean Herbert
2981730442 Initial pass of map pool screen design update 2020-03-08 15:49:37 +09:00
Dean Herbert
4d74493289 Initial pass of win screen design update 2020-03-08 15:38:10 +09:00
Dean Herbert
1c5d6e0cf4 Split out nested classes to higher level for better code sharing 2020-03-08 15:34:45 +09:00
Dean Herbert
aed52179f0 Fix weird reverse logic 2020-03-08 15:32:22 +09:00
Dean Herbert
aeb6bf5b46 Remove unnecessary width specification on editor screens 2020-03-08 15:32:22 +09:00
Dean Herbert
09bd5ad185
Merge pull request #8151 from peppy/tourney-simplify-video-spec
Simplify tournament video construction
2020-03-06 23:15:02 +09:00
Dan Balasescu
3d54334dd6
Merge pull request #8150 from peppy/remove-layout-durations-tournament-editors
Remove layout durations from tournament editor screens for better performance
2020-03-06 22:38:06 +09:00
Dan Balasescu
643b25e484
Merge branch 'master' into tourney-simplify-video-spec 2020-03-06 22:28:21 +09:00
Dean Herbert
0a72fa69ab Simplify video creation (and handle fallback better) 2020-03-06 18:39:12 +09:00
Dean Herbert
2d95f29925 Add gameplay screen specific video 2020-03-06 18:38:54 +09:00
Dean Herbert
88759e65a0 Remove layout durations from tournament editor screns for better performance 2020-03-06 16:31:36 +09:00
Dean Herbert
ac88ba717b Ensure screens respect aspect ratio in tests 2020-03-06 16:13:07 +09:00
Dan Balasescu
5eeed3faa1
Merge branch 'master' into owc-2019 2020-03-04 16:27:46 +09:00
Dean Herbert
c306d3de2e
Fix typo in button
Co-Authored-By: Dan Balasescu <smoogipoo@smgi.me>
2020-03-04 16:03:43 +09:00
Dan Balasescu
dadf151e7c
Merge branch 'master' into tournament-seeding-screen 2020-03-04 15:42:44 +09:00
Dan Balasescu
6f5d2da03e
Merge branch 'master' into add-torus-font 2020-03-04 13:56:30 +09:00