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

35504 Commits

Author SHA1 Message Date
Salman Ahmed
ddbbd594c6
Merge branch 'master' into fix-main-menu-storyboard-crash 2022-09-23 18:56:17 +03:00
Salman Ahmed
835cae3087 Remove null conditional 2022-09-23 17:06:55 +03: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
8a7526aaa3
Merge pull request #20344 from frenzibyte/better-tablet-notifications
Improve tablet error/warning notifications messaging
2022-09-22 22:45:27 +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
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
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
37e2579244 Fix reversed checks 2022-09-22 20:35:26 +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
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
Dean Herbert
74aefdc5bd Move basic transformer behaviour to base abstract class 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
b321afc3a6 Update framework 2022-09-22 18:04:31 +09:00
Dean Herbert
2bc6b4e84f
Merge branch 'master' into Colour_hit_meter_improved 2022-09-22 15:52:06 +09:00
Dean Herbert
f0dcda9acc Decrease precision of spacing setting 2022-09-22 15:49:02 +09:00
Dean Herbert
26d98323ff Fix bindable flow, code quality, everything 2022-09-22 15:45:23 +09:00
Dean Herbert
0f663deda0 Fix changing shape causing alpha to be permanently reset to zero 2022-09-22 15:24:57 +09:00
Dean Herbert
ae70b2c32f Fix other weirdness in variable and description naming 2022-09-22 15:21:27 +09:00
Dean Herbert
19db7c5977 Remove "Opacity" setting
This should be implemented at a higher level
2022-09-22 15:19:01 +09:00
Dean Herbert
f3898da37a Rename judgement count to not mention "shape" 2022-09-22 15:18:20 +09:00
Dan Balasescu
729322c505
Merge pull request #20396 from peppy/files-folder-notice
Add warning message in `files` folder to avoid accidental deletion
2022-09-22 15:18:18 +09:00
Dean Herbert
7d93fa9f65
Merge branch 'master' into Colour_hit_meter_improved 2022-09-22 15:11:58 +09:00
Dan Balasescu
70bab81282
Merge pull request #20377 from peppy/argon-skin
Add new default "argon" skin
2022-09-22 14:50:43 +09:00
Dean Herbert
78625fda7d Improve exception when attempting to call DrawableHitObject.ClearInternal 2022-09-22 14:44:03 +09:00
Dean Herbert
db21601632 Add warning message in files folder to avoid accidental deletion
This is a pretty standard practice for applications that have data
stored in folders where a user may accidentally determine that the
content is unnecessary.

Aims to address cases like
https://github.com/ppy/osu/discussions/20394#discussioncomment-3705694.
It's not the first time this has come up, and definitely won't be the
last.
2022-09-22 13:17:24 +09:00
Dan Balasescu
2b8b138079 Add "keybindings" search term to settings 2022-09-21 18:46:28 +09:00
Dean Herbert
992441b9de Disable alpha component parsing in beatmap / skin colour sections 2022-09-21 16:11:41 +09:00
Dean Herbert
5b73f24864 Fix outdated scores being held by BeatmapLeaderboard after external beatmap switch 2022-09-21 15:21:32 +09:00
Dean Herbert
29c4d06d36 Merge branch 'fix-gameplay-leaderboard-layout' into gameplay-leaderboards 2022-09-21 14:58:58 +09:00
Dean Herbert
b04871f40a Animate scroll for a better visual experience 2022-09-21 14:51:12 +09:00
Dean Herbert
087ca59ebb Add extra margin space to flow equal to height of leaderboard
This ensures the content is always on screen, but also accounts for the
fact that scroll operations without animation were actually forcing the
local score to a location it can't usually reside at.

Basically, the local score was in the scroll extension region (due to always trying
to scroll the local player to the middle of the display, but there being
no other content below the local player to scroll up by).
2022-09-21 14:51:12 +09:00
Dean Herbert
4385001d28 Fix solo leaderboard seeing imported score via realm subscription flow 2022-09-21 13:59:11 +09:00
Dean Herbert
a8338c4efd Add local score after existing scores to avoid initial re-sort 2022-09-21 13:38:40 +09:00
Dean Herbert
4492a26b59
Merge branch 'master' into argon-skin 2022-09-21 13:00:16 +09:00
Dan Balasescu
8bf196d561
Merge pull request #20354 from peppy/default-skin-refactor
Rename default skin to make way for new version
2022-09-21 11:48:38 +09:00
Salman Ahmed
dcfb6a2f06 Fix progress notifications no longer blocking close on click 2022-09-21 00:15:50 +03:00
Salman Ahmed
b8f2e13503 Avoid catching all exceptions raising from skin instance creation 2022-09-20 22:27:27 +03:00
Dean Herbert
8837618ab1
Merge pull request #20342 from smoogipoo/server-shutdown-countdown
Implement server shutdown countdown + notification
2022-09-20 20:51:16 +09:00
Dan Balasescu
d777afc454 Remove countdown at under 5 seconds 2022-09-20 19:55:44 +09:00
Dan Balasescu
7f15dc6e6c
Merge pull request #20321 from HiddenNode/fix_graph_info_overlap
Fix Progress bar info text overlapping with progress graph
2022-09-20 19:30:51 +09:00
Dan Balasescu
80d8eedb7c
Merge pull request #20366 from peppy/fix-nullable-download-progress
Fix multiplayer crashes due to incorrect download state
2022-09-20 17:16:11 +09:00
Dean Herbert
68c040175a Ensure Leaderboard.Scores is updated immediately via request flow 2022-09-20 17:02:57 +09:00
Dan Balasescu
2499493347
Merge pull request #20375 from peppy/fix-score-reference-leak
Fix mods potentially keeping reference to runtime gameplay elements
2022-09-20 16:26:31 +09:00
Dan Balasescu
b84f716c22 Display seconds when hours>0 to be more lively 2022-09-20 16:02:31 +09:00