1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-15 09:47:24 +08:00
Commit Graph

63004 Commits

Author SHA1 Message Date
Dan Balasescu
a120ea8464
Merge branch 'master' into fix-legacy-score-multipliers-2 2023-10-04 01:19:33 +09:00
Bartłomiej Dach
844a3b6c1b
Merge pull request #24980 from frenzibyte/gameplay-hud-redesign/health-display
Implement redesigned health bar display for "Argon" skin
2023-10-03 11:26:21 +02:00
Bartłomiej Dach
9c1f5c35d6
Merge pull request #24990 from peppy/argon-better-reverse
Add edge highlight to "argon" slider repeat arrow (and improve all skins' reverse arrow animations)
2023-10-03 10:55:11 +02:00
Dean Herbert
4f3c433946 Move vertex related constants local to method 2023-10-03 17:41:52 +09:00
Dean Herbert
32b2ac4974 Rename and refactor glow/miss bars to hopefully make more sense 2023-10-03 17:41:11 +09:00
Dean Herbert
4f9daa1c14 Tidy up ArgonHealthDisplay code quality 2023-10-03 17:32:35 +09:00
Dean Herbert
e1445fcc65 Adjust health display test scene's background colour to better visualise background fill 2023-10-03 17:17:42 +09:00
Dean Herbert
8178cf3a8d Tidy up background colour gradient logic
This changes things visually a touch, but I think it feels better.
And reads better.
2023-10-03 17:17:11 +09:00
Dean Herbert
2cbec6dbdf Update resources 2023-10-03 17:11:52 +09:00
Bartłomiej Dach
5338ba98f0
Merge pull request #24998 from peppy/better-nested-path-beatmap-import
Fix legacy beatmap importer not always handling nested paths correctly
2023-10-03 09:43:02 +02:00
Dean Herbert
b234a453da Fix legacy beatmap importer not always handling nested paths correctly
Addresses https://github.com/ppy/osu/discussions/24989.
2023-10-03 16:01:17 +09:00
Dean Herbert
16fcc4eaaa Fix incorrect anchor/origin causing rotation to look wrong on legacy skin arrows 2023-10-03 12:32:52 +09:00
Marvin Schürz
a171fa7649 Join multiplayer match when clicking the invite notification 2023-10-03 01:31:30 +02:00
Marvin Schürz
8e73dbc894 Load api room before displaying notification 2023-10-03 01:22:25 +02:00
Marvin Schürz
3879775219 Add room name to invite notification 2023-10-02 23:20:24 +02:00
Marvin Schürz
e81695bcac Display avatar in invitation notification 2023-10-02 23:10:51 +02:00
Marvin Schürz
251e4d4de9 Add localisation for inviting a player 2023-10-02 23:10:29 +02:00
Marvin Schürz
7629b725a2 Add invite button to UserPanel context menu 2023-10-02 22:55:53 +02:00
Marvin Schürz
574dc67a9e Add Invited task to multiplayer client 2023-10-02 22:53:28 +02:00
Marvin Schürz
d19cdbdefb Add InvitePlayer method to multiplayer server 2023-10-02 22:31:47 +02:00
Dean Herbert
3aa51301e8 Add null checks in disposal flow 2023-10-02 22:28:33 +09:00
Dean Herbert
94e49a34fd Adjust legacy reverse arrow implementation to match stable more closely 2023-10-02 22:26:57 +09:00
Dean Herbert
f0070eecf1 Add rotation support for very old skins 2023-10-02 20:09:39 +09:00
Dean Herbert
1bee7bf353 Add note about rotation 2023-10-02 19:22:24 +09:00
Dean Herbert
e4ac8362ec Update other implementations to use non-beat-sync logic 2023-10-02 19:20:11 +09:00
Dean Herbert
8010410487 Stop beat syncing (and close match stable's implementation of arrow animation) 2023-10-02 19:17:35 +09:00
Dean Herbert
ad4e988520 Adjust reverse arrows to bounce more 2023-10-02 18:43:50 +09:00
Dean Herbert
455fc228ad Add edge piece to argon reverse arrow 2023-10-02 18:43:50 +09:00
Dean Herbert
7dd9951c44 Split out reverse arrow implementations to allow better animation 2023-10-02 18:43:50 +09:00
Dean Herbert
82ba545358 Add initial animation for health bars 2023-10-02 17:01:58 +09:00
Dan Balasescu
b9ab4a2b7c Update score conversion to consider legacy multiplier 2023-10-02 16:56:15 +09:00
Dan Balasescu
da2a4681d9 Add method to retrieve legacy score multiplier 2023-10-02 16:52:01 +09:00
Dan Balasescu
b4b7a7ea5e Add LegacyBeatmapConversionDifficultyInfo abstraction 2023-10-02 16:52:01 +09:00
Dean Herbert
622cbc3af7 Adjust test scene to actually make HP bars fit 2023-10-02 16:07:45 +09:00
Dean Herbert
3a45bcad15 Improve flash and glow further 2023-10-02 02:11:07 +09:00
Dean Herbert
c4f47974bc Improve glow further 2023-10-02 02:11:07 +09:00
Dean Herbert
88d608e1fa Tidy up common animation code 2023-10-02 02:11:07 +09:00
Dean Herbert
df51e61234 Improve animation 2023-10-02 00:42:51 +09:00
Dean Herbert
22aa7ffd06 Use additive colour 2023-10-01 22:09:59 +09:00
Salman Ahmed
eef099e69d Do not display "miss" bar if health is already zero 2023-10-01 15:25:34 +03:00
Salman Ahmed
7825bea959 Use interpolation for health bar opacity instead of transforms 2023-10-01 15:25:23 +03:00
Salman Ahmed
8d389accf8 Cover "Argon" helath display in skin deserialisation tests 2023-10-01 15:12:24 +03:00
Salman Ahmed
30d9004ef9 Fix small mistake 2023-10-01 13:41:11 +03:00
Salman Ahmed
446c9c2efe Apply adjustments on the "miss" bar display 2023-10-01 13:39:36 +03:00
Salman Ahmed
9e2b8254d9 Add argon-specific health display test scene 2023-10-01 13:26:47 +03:00
Salman Ahmed
a331fb993a Adjust health bar outer stroke colour 2023-10-01 01:21:37 +03:00
Salman Ahmed
319208ca3d Adjust health bar glow intensity 2023-10-01 01:18:05 +03:00
Salman Ahmed
776536e816 Add "Argon" health display implementation 2023-10-01 00:56:16 +03:00
Salman Ahmed
33b0cb15a8 Add handling for miss judgements in HealthDisplay 2023-10-01 00:21:25 +03:00
Salman Ahmed
869f8e5e1b Adjust test scene to apply miss judgements as well 2023-10-01 00:21:24 +03:00