1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-15 05:57:29 +08:00
Commit Graph

55833 Commits

Author SHA1 Message Date
Dean Herbert
7bacd36825
Merge pull request #20417 from peppy/fix-main-menu-storyboard-crash
Fix crash when storyboard attempts to play at main menu
2022-09-24 02:09:46 +09:00
Salman Ahmed
ddbbd594c6
Merge branch 'master' into fix-main-menu-storyboard-crash 2022-09-23 18:56:17 +03:00
Salman Ahmed
f88ef39659
Merge pull request #20419 from peppy/fix-drawable-mutation-batch
Fix off-thread drawable mutation in multiplayer settings overlay when an error occurs
2022-09-23 18:13:06 +03:00
Salman Ahmed
835cae3087 Remove null conditional 2022-09-23 17:06:55 +03:00
Salman Ahmed
cdc3afac88 Fix update progress notification not closing on completion 2022-09-23 16:30:07 +03:00
Salman Ahmed
4bd92b89bc Change test scene to ensure progress notification is closed on completion 2022-09-23 16:29:19 +03:00
Dean Herbert
965d0603ce Fix slider tick colour not being applied properly 2022-09-23 21:11:25 +09:00
Dean Herbert
0fa5e1b28e Fix intermittent leaderboard crash due to request finishing after drawable is disposed 2022-09-23 20:18:44 +09:00
Dean Herbert
4e9053b099 Fix crash when storyboard attempts to play at main menu 2022-09-23 20:10:57 +09:00
Dean Herbert
a65a76f7de Fix off-thread drawable mutation in multiplayer settings overlay when an error occurs
Closes #20413.
2022-09-23 20:05:32 +09:00
Dean Herbert
2a5556de33
Merge pull request #20406 from frenzibyte/argon-spinner
Add very basic "argon" spinner
2022-09-23 14:56:05 +09:00
Dean Herbert
a94b4e402e
Merge branch 'master' into argon-spinner 2022-09-23 14:22:53 +09:00
Dean Herbert
e0cdd4830d
Merge pull request #20408 from Pasi4K5/random-mod-test
Add `TestSceneOsuModRandom`
2022-09-23 13:40:06 +09:00
Pasi4K5
d538295ad5 Add TestSceneOsuModRandom 2022-09-22 23:04:43 +02:00
Salman Ahmed
a771d4031f Separate triangles-specific test steps to own scene 2022-09-22 21:27:06 +03:00
Salman Ahmed
49af80e17b Remove 1.3x scale and adjust metrics with it 2022-09-22 20:39:42 +03:00
Salman Ahmed
e9c3478f69 Add very basic "argon" spinner 2022-09-22 20:39:42 +03:00
Dan Balasescu
835db18bd1
Merge pull request #20405 from peppy/adjust-animations-a-bit
Adjust argon animations a bit
2022-09-23 01:38:31 +09:00
Dean Herbert
3811ea113d Adjust argon animations a bit 2022-09-23 00:54:24 +09:00
Dean Herbert
8a7526aaa3
Merge pull request #20344 from frenzibyte/better-tablet-notifications
Improve tablet error/warning notifications messaging
2022-09-22 22:45:27 +09:00
Dean Herbert
dc7b62fbff
Merge pull request #20404 from peppy/argon-cursor
Add basic "argon" cursor
2022-09-22 22:44:38 +09:00
Dan Balasescu
9f92925ecd
Merge branch 'master' into argon-cursor 2022-09-22 21:46:37 +09:00
Dan Balasescu
44ae9a5048
Merge pull request #20403 from peppy/argon-follow-point
Add very basic follow point implementation for argon skin
2022-09-22 21:45:56 +09:00
Dan Balasescu
61a41d9533
Merge pull request #20402 from peppy/argon-combo-colours
Add argon combo colours
2022-09-22 21:33:20 +09:00
Dean Herbert
e95758cfcd Add basic "argon" cursor 2022-09-22 21:21:30 +09:00
Dan Balasescu
1d1012e196
Merge pull request #20286 from peppy/gameplay-leaderboards
Add basic gameplay leaderboard display
2022-09-22 21:16:12 +09:00
Dan Balasescu
7527d815e8 Remove unused using 2022-09-22 20:58:23 +09:00
Dan Balasescu
445e026a32
Merge pull request #20389 from peppy/fix-gameplay-leaderboard-layout
Fix gameplay leaderboard sometimes not showing up
2022-09-22 20:51:54 +09:00
Dean Herbert
a2ff31f37d Fix failing test 2022-09-22 20:43:38 +09:00
Dean Herbert
37e2579244 Fix reversed checks 2022-09-22 20:35:26 +09:00
Dean Herbert
8875f7ee43 Add very basic follow point implementation for argon skin
This is just something to look better than the glowing mess which
triangles fallback was providing. This element hasn't been designed yet,
so I'm just filling in with something amicable for the time being.
2022-09-22 20:24:29 +09:00
Dan Balasescu
5dbe73ad0e
Merge pull request #20398 from peppy/fix-missing-notelock-shake
Fix "note lock" shake not always animating
2022-09-22 20:07:38 +09:00
Dan Balasescu
7508592789 Clean up some checks 2022-09-22 19:56:24 +09:00
Dean Herbert
8f7a306d81 Inline comment regarding margin necessity 2022-09-22 19:53:16 +09:00
Dean Herbert
5243ff3c22 Add argon combo colours
I'm 99% sure these are just test colours flyte was using, but they look good
so let's go with them. I've added two new colours to increase the default
combo colour rotation to 6. The initial ordering still matches, for whatever
that's worth.
2022-09-22 19:49:32 +09:00
Dan Balasescu
a612fe70f9
Merge pull request #20401 from peppy/fix-argon-sprite-lookup
Fix "argon" skin not supporting user loaded sprites in gameplay
2022-09-22 19:40:31 +09:00
Dan Balasescu
4528c1037b Resolve CI inspections 2022-09-22 19:26:27 +09:00
Salman Ahmed
fd92bcdff2
Ignore case sensitivity during message comparison
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2022-09-22 13:21:27 +03:00
Salman Ahmed
794a131954 Update method name and conditions 2022-09-22 13:17:01 +03:00
Dan Balasescu
68e274b92d
Merge pull request #20400 from peppy/fix-argon-reverse-arrow-colour
Fix argon reverse arrow becoming white after switching skins
2022-09-22 19:01:19 +09:00
Dan Balasescu
cf3eacee00
Merge pull request #20399 from peppy/argon-judgement
Add "argon" skin judgement bubbles
2022-09-22 19:01:04 +09:00
Dean Herbert
74aefdc5bd Move basic transformer behaviour to base abstract class 2022-09-22 18:53:43 +09:00
Dean Herbert
f8e9a960ba Fix argon skin not forwarding resource lookups to user backing 2022-09-22 18:53:43 +09:00
Dean Herbert
ea7c5458fe Fix sprite dropdown not showing resources from non-legacy skins during gameplay 2022-09-22 18:53:43 +09:00
Salman Ahmed
fa3f53f39f Remove tablet prefix from error notification 2022-09-22 12:37:24 +03:00
Dean Herbert
68015ef10c Fix argon reverse arrow becoming white after switching skins 2022-09-22 18:12:28 +09:00
Dean Herbert
b321afc3a6 Update framework 2022-09-22 18:04:31 +09:00
Dean Herbert
0458305a23 Add argon judgement bubbles 2022-09-22 17:50:21 +09:00
Dean Herbert
a7eb9d8b78
Merge pull request #20111 from mk56-spn/Colour_hit_meter_improved
Add customisation settings of colour hit error display
2022-09-22 16:28:31 +09:00
Dean Herbert
2bc6b4e84f
Merge branch 'master' into Colour_hit_meter_improved 2022-09-22 15:52:06 +09:00