1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 16:22:57 +08:00
Commit Graph

27248 Commits

Author SHA1 Message Date
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
0019199082 Merge branch 'tournament-base-changes' into tournament-design-gameplay 2020-03-08 18:12:10 +09:00
Dean Herbert
0102aaf32a Move chat expand/contract logic local to tournament 2020-03-08 18:11:57 +09:00
Dean Herbert
8e4b15aaa5 Update test scene 2020-03-08 17:43:55 +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
3a3a2ad2a7 Fix video looping not propagating when set too early in initialisation 2020-03-08 16:04:51 +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
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
979988235d Increase flexibility of StarCounter component 2020-03-08 15:56:22 +09:00
Dean Herbert
9bd837da41 Update match score display 2020-03-08 15:55:54 +09:00
Dean Herbert
3807c449bd Update chat position 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
66e54ba983 Increase flexibility of StarCounter component 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
01e32896ee Make save changes button more prominent 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
129c8fe24f Add helper method to get winning team colour 2020-03-08 15:32:22 +09:00
Dean Herbert
3caffb81e1 Add new element colours to TournamentGame 2020-03-08 15:32:22 +09:00
Dean Herbert
c7c7e626b8
Merge pull request #8163 from bdach/fix-circle-piece-hitbox
Fix osu! hitbox accepting input outside of circle
2020-03-07 16:40:13 +09:00
Bartłomiej Dach
b608764554 Cover area just outside circle in test 2020-03-06 22:09:02 +01:00
Bartłomiej Dach
77fd748035 Fix incorrect circle piece hitbox
Hitboxes of circle pieces in osu! have regressed with commit 8592335.
The reason for the regression was that hit detection was moved from
DrawableHitCircle itself to a newly-introduced private HitArea class
(now named HitReceptor).

As HitArea inherited from Drawable, it would return IsHovered == true
over its entire bounding box. This meant that the hit area could wrongly
pick up actions that are not within circle radius and make them into
hits.

To resolve, make HitReceptor a CompositeDrawable and set its corner
radius to match the circle piece. This fixes the invalid hitbox, as
IsHovered takes radius into account.
2020-03-06 21:21:20 +01:00
Bartłomiej Dach
491840b17d Add failing tests 2020-03-06 21:10:23 +01:00
Dean Herbert
8ceaa39fb4
Merge pull request #8100 from smoogipoo/fix-testscene-rate
Fix test scene virtual track not respecting rate adjustments
2020-03-06 23:45:34 +09:00
Dean Herbert
d39e9df27f
Merge branch 'master' into fix-testscene-rate 2020-03-06 23:21:24 +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
Dean Herbert
3295f8657a Restore clamp behaviour 2020-03-06 22:44:11 +09:00
Dean Herbert
fa8e7adf07 Merge branch 'master' into fix-testscene-rate 2020-03-06 22:40: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
3f51effe98
Merge pull request #8149 from peppy/add-load-delay-for-avatars
Add a short load delay for avatars to avoid unnecessary fetching
2020-03-06 22:31:16 +09:00
Dan Balasescu
643b25e484
Merge branch 'master' into tourney-simplify-video-spec 2020-03-06 22:28:21 +09:00
Dan Balasescu
092c02c3b3
Merge pull request #8148 from peppy/fix-tournament-screen-aspect-in-tests
Ensure tournament screens respect aspect ratio in tests
2020-03-06 22:18:01 +09:00
Dan Balasescu
cac4c6b724
Merge branch 'master' into remove-layout-durations-tournament-editors 2020-03-06 22:09:48 +09:00
Dan Balasescu
28c665e7a6
Merge branch 'master' into add-load-delay-for-avatars 2020-03-06 22:09:47 +09:00
Dan Balasescu
fa8ee0ca0d
Merge branch 'master' into fix-tournament-screen-aspect-in-tests 2020-03-06 21:59:42 +09:00
Dean Herbert
b6a695ec11
Update framework (#8152)
Update framework
2020-03-06 19:19:51 +09:00
Dean Herbert
16cc49daa0 Update framework 2020-03-06 18:47:31 +09:00