1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 23:23:04 +08:00
Commit Graph

314 Commits

Author SHA1 Message Date
Dean Herbert
f4dc604dbf Fix dragging tournament ladder too far causing it to disappear 2020-04-08 13:32:37 +09:00
Dean Herbert
27ae2d29aa Add ability to adjust (and save) chroma-key area width 2020-03-23 11:47:24 +09:00
Dean Herbert
2ca225877f Merge branch 'master' into tournament-mappool-flow-logic 2020-03-18 15:05:20 +09:00
Dean Herbert
99f28efc96 Automatically mark the currently selected match as stsrated on entering gameplay screen 2020-03-17 13:16:52 +09:00
Marcus "Mestro" Nordgren
24fe7538fd
Use new logo name for showcase screen 2020-03-16 13:09:15 +01:00
Dan Balasescu
0245bab7c6
Merge branch 'master' into user-cards-update 2020-03-16 14:27:21 +09:00
Dean Herbert
b902e50396 Add resolution selector in tournament setup screen 2020-03-13 15:44:23 +09:00
Dean Herbert
30ad580993 Fix map pool screen vertical layout 2020-03-13 14:34:33 +09:00
Dean Herbert
00d7dc19cc Update tests and logic 2020-03-13 14:25:58 +09:00
Dean Herbert
fbb7e9f12a Add tests (wip) 2020-03-13 14:25:58 +09:00
Dean Herbert
ef0acde458 Adjust to allow for extra row 2020-03-13 14:25:58 +09:00
Dan Balasescu
f37444ad18
Merge branch 'master' into tournament-header-logo 2020-03-12 18:12:08 +09:00
Dean Herbert
ec1c6f88ee Adjust metrics to align logo pieces correctly on gameplay / map pool 2020-03-12 14:27:56 +09:00
Dean Herbert
7b1ac03b18 Hide logo on gameplay screen 2020-03-12 14:27:56 +09:00
Dean Herbert
b6b802e821 Add back customisable header logo/text
Also adds test scene for MatchHeader component.
2020-03-12 14:27:56 +09:00
Dean Herbert
190ff97486 Rename classes to better suit purpose 2020-03-12 14:27:56 +09:00
Dean Herbert
efceeba076 Use fixed width for tournament score displays 2020-03-12 02:22:02 +09:00
Dan Balasescu
f49f9f40ae
Merge branch 'master' into tournament-design-seeding 2020-03-11 18:03:27 +09:00
Dean Herbert
02af3eefbd Merge branch 'master' into tournament-mappool-flow-logic 2020-03-11 14:40:18 +09:00
Dean Herbert
ed837d3115 Use framework extension method for FromHex 2020-03-11 10:18:41 +09:00
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
ece049e0c9 Merge branch 'tournament-drawable-team-tidy' into tournament-design-seeding 2020-03-08 20:15:48 +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
3ac599246d Initial pass of seeding screen design update 2020-03-08 16:03: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