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

35661 Commits

Author SHA1 Message Date
Dan Balasescu
5a28174448
Merge pull request #20488 from nanashi-1/toggle-score-overlay
Add toggle for solo gameplay leaderboard
2022-09-27 18:09:55 +09:00
Dean Herbert
3ece7205ed Fix potential crash when losing network connectivity at online play screen
Addresses #20448.
2022-09-27 17:52:34 +09:00
Dean Herbert
8b722f8817 Change default skin for new installations to "Argon"
Closes #20459.
2022-09-27 17:41:56 +09:00
Dean Herbert
461ba64bfa Flush toast tray on entering a no-notification section 2022-09-27 17:32:53 +09:00
Dean Herbert
c61f5403ab Increase delay back slightly on notifications posting after disabled period 2022-09-27 17:32:30 +09:00
Dean Herbert
0296685c74 Start key counter / gameplay leaderboard hidden to avoid initial fade out 2022-09-27 17:25:24 +09:00
Dean Herbert
a9088d9231 Add assert/log output when too many ticks are being displayed 2022-09-27 17:18:46 +09:00
Dean Herbert
e227519b09 Don't attempt to render timeline ticks until DrawWidth is above zero 2022-09-27 17:18:46 +09:00
Dean Herbert
ccae721af2 Ensure ZoomableScrollContainer content isn't shown until zoom is set 2022-09-27 17:07:11 +09:00
Dean Herbert
9dc0eb7fd0 Remove unused static 2022-09-27 17:04:56 +09:00
Dean Herbert
320f134634 Use same logic as KeyCounterDisplay 2022-09-27 15:01:18 +09:00
Dean Herbert
bac3108aea Remove unnecessary keywords 2022-09-27 14:29:59 +09:00
Dan Balasescu
aa3956cfbb
Merge pull request #20495 from Feodor0090/playlist-overflow-fix
Fix playlist overlay overflowing at high UI scales
2022-09-27 13:53:14 +09:00
Dean Herbert
de6709d12c Fix rank_history serialisation order dependence
```csharp
[network] 2022-09-26 18:18:39 [verbose]: Processing response from https://dev.ppy.sh/api/v2/me/ failed with Newtonsoft.Json.JsonSerializationException: Error setting value to 'rankHistory' on 'osu.Game.Online.API.Requests.Responses.APIUser'.
[network] 2022-09-26 18:18:39 [verbose]: ---> System.NullReferenceException: Object reference not set to an instance of an object.
[network] 2022-09-26 18:18:39 [verbose]: at osu.Game.Online.API.Requests.Responses.APIUser.set_rankHistory(APIRankHistory
value) in /tmp/osu/osu.Game/Online/API/Requests/Responses/APIUser.cs:line 231
```
2022-09-27 12:46:17 +09:00
Salman Ahmed
8aff856c79 Fix SkinnableTestScene sizing logic potentially failing to work 2022-09-27 05:18:17 +03:00
nanashi-1
5d18001d75 move config 2022-09-26 21:11:38 +08:00
nanashi-1
4295d9c169 revert 2022-09-26 21:11:14 +08:00
nanashi-1
ee4d1b2d58 add config visibility 2022-09-26 20:13:07 +08:00
nanashi-1
dc051a8b79 add gameplay leaderboard config 2022-09-26 20:08:58 +08:00
nanashi-1
bed25ff60e add gameplay leaderboard config string 2022-09-26 20:08:26 +08:00
nanashi-1
f81107eb5a add gameplay leaderboard config 2022-09-26 20:07:43 +08:00
Dan Balasescu
836da6a5e6
Merge pull request #20485 from peppy/leaderboard-nrt
Apply NRT to leaderboard hierarchy
2022-09-26 18:53:37 +09:00
Dan Balasescu
e5894ccd6f
Merge pull request #20478 from peppy/fix-progress-notification-fling
Fix progress notifications being able to be flung (and cancelled)
2022-09-26 18:21:12 +09:00
Dan Balasescu
f2eed881bd
Merge pull request #20480 from peppy/fix-drawable-mutation-tablet-settings
Fix potential crash from incorrect drawable mutation in tablet settings display
2022-09-26 18:16:52 +09:00
Dan Balasescu
525de8c140
Merge pull request #20479 from peppy/fix-drawable-mutation-misc
Fix potential crash on game exit due to incorrect scheduling of realm change handler
2022-09-26 18:02:28 +09:00
Dan Balasescu
987294f294
Merge pull request #20483 from peppy/music-controller-thread-safety
Move `MusicController` binds to `LoadComplete` for added thread safety
2022-09-26 17:59:02 +09:00
Dan Balasescu
c969afcb71
Merge branch 'master' into leaderboard-nrt 2022-09-26 17:12:19 +09:00
Dan Balasescu
28470bd5c0
Merge pull request #20486 from peppy/gameplay-leaderboard-nrt
Apply NRT to `GameplayLeaderboard` hierarchy
2022-09-26 17:11:51 +09:00
Dan Balasescu
426ab176d6
Merge pull request #20418 from peppy/fix-leaderboard-crash
Fix intermittent leaderboard crash due to request finishing after drawable is disposed
2022-09-26 17:10:32 +09:00
Dean Herbert
20da1051d9 Apply NRT to GameplayLeaderboard hierarchy
Just some cleanup work that I wanted to do as part of my last changes.
2022-09-26 16:21:24 +09:00
Dean Herbert
5fc836d1f0 Apply NRT to BeatmapLeaderboard / MatchLeaderboard 2022-09-26 16:17:28 +09:00
Dean Herbert
a1297af441 Apply NRT to base Leaderboard classes 2022-09-26 16:12:47 +09:00
Dean Herbert
32d56fe3a9 Use request cancellation and IsDisposed guard instead of more Schedule 2022-09-26 16:02:33 +09:00
Dean Herbert
4e9b25d8b0 Move MusicController binds to LoadComplete for added thread safety 2022-09-26 15:42:37 +09:00
Dean Herbert
43c16cb613 Fix potential crash from incorrect drawable mutation in tablet settings display 2022-09-26 15:10:02 +09:00
Dean Herbert
c4887269f7 Avoid performing a realm write if there are no changes pending in RulesetConfigManager 2022-09-26 14:55:23 +09:00
Dean Herbert
4bd96108c0 Fix crash on game exit due to incorrect scheduling of realm change handler 2022-09-26 14:45:17 +09:00
Dean Herbert
b6dd8168d2 Fix progress notifications being able to be flung 2022-09-26 14:33:12 +09:00
o-dasher
feadac1f79 Cleanup all other leftover binding instantiation 2022-09-25 16:02:40 -04:00
o-dasher
537796c3a1 Cleanup mod bindings 2022-09-25 15:49:22 -04:00
ansel
5d0b2d34c9 Make playlist to always be in screen bounds 2022-09-24 23:35:06 +03:00
ansel
6c8e587344 Move margin value to constant 2022-09-24 21:52:16 +03:00
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
Salman Ahmed
cdc3afac88 Fix update progress notification not closing on completion 2022-09-23 16:30:07 +03: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
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
6a0047b7a2 Update location of FullscreenCapability bindable 2022-09-22 21:01: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
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
Dean Herbert
e0f1f1a5e1 Update resources 2022-09-20 17:20:47 +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
Dan Balasescu
ef29987f36 Remove FinalNotification 2022-09-20 15:54:18 +09:00
Dan Balasescu
700000b583 Use custom notification with timer 2022-09-20 15:54:18 +09:00
アズタケ
d22d009fb3 fix review points. items not included in this localization were reverted. 2022-09-20 14:02:11 +09:00
Dean Herbert
b5771ece41 Reduce the amount by which clicking the mute notification incraeses volume 2022-09-20 13:00:08 +09:00
Dean Herbert
a9c120c214 Reduce volume requirement for showing muted notification to 1% 2022-09-20 12:46:35 +09:00
Alden Wu
74056201e7 Return smoke key to key overlay 2022-09-19 09:15:59 -07:00
Alden Wu
0316e3e706 Merge branch 'master' of https://github.com/ppy/osu into smoke 2022-09-19 09:07:17 -07:00
Dean Herbert
1c02fa8399 Update comment to not mention horizontal plane 2022-09-20 00:08:06 +09:00
Dean Herbert
46db3ad96d Move implementation to individual classes 2022-09-20 00:06:02 +09:00
Dean Herbert
03cc6b8af3 Fix parameter name 2022-09-19 23:44:03 +09:00
Dean Herbert
bd28c6f96d
Merge branch 'master' into localisation-settings 2022-09-19 23:37:26 +09:00
Dean Herbert
b55aa68177 Remove xmldoc on private fields 2022-09-19 23:16:46 +09:00
Dean Herbert
0f7b38f4c3 Add new default skin "argon" 2022-09-19 23:16:46 +09:00
Dean Herbert
cbb4845fa6
Merge pull request #20358 from o-dasher/simplify-flashlight
Fix flashlight shrinking at >100x rather than starting from 100x
2022-09-19 22:03:34 +09:00
Dean Herbert
494790294a Update SkinnableTestScene to show new default skin 2022-09-19 12:38:34 +09:00
Dean Herbert
0a625bd879 Fix mods potentially keeping reference to runtime gameplay elements
As noticed by smoogipoo during multiplayer match on the weekend.
2022-09-19 12:18:46 +09:00
Dean Herbert
454125123d Add failing test coverage showing mod reference leak path 2022-09-19 12:18:35 +09:00
Alden Wu
6852577dad Remove smoke from key overlay 2022-09-18 19:08:01 -07:00
Alden Wu
06178104c8 Show smoke in replays 2022-09-18 17:55:06 -07:00
Salman Ahmed
a413c7a3e6
Merge branch 'master' into fix-notification-count 2022-09-19 02:08:20 +03:00
O Thiago
a4e9c7711c Fix when flashlight shrinking takes place 2022-09-18 18:59:17 -04:00
O Thiago
407b104116 Revert changes
This reverts commit beef3b418a.

Revert "Use linq expression for handling breaks"

This reverts commit 8464a1941b.

Revert "renames variables to make more logical sense"

This reverts commit 3b87ecf56c.

Revert "Removes overhead when not combo based size"

This reverts commit ac4229e3d4.
2022-09-18 18:57:53 -04:00
Dean Herbert
0ac28cbecc Fix potential crash from missing DownloadProgress 2022-09-18 23:42:16 +09:00
Dean Herbert
6a06a5b1b5 Reword fallback instantiation handling comment to hopefully explain things better 2022-09-18 18:20:28 +09:00
Dean Herbert
d0b8409de5 Apply more renames 2022-09-18 18:19:00 +09:00
Dean Herbert
1914c41d0d
Merge pull request #20353 from Drison64/fix-timelineZoom-zero
EditorBeatmap's TimelineZoom should never be zero
2022-09-18 18:06:26 +09:00
Dan Balasescu
2dcaf7cfd8 Fix memory leak due to missing event unbind 2022-09-18 14:25:31 +09:00
O Thiago
ac4229e3d4 Removes overhead when not combo based size 2022-09-18 00:38:01 -04:00
O Thiago
3b87ecf56c renames variables to make more logical sense 2022-09-18 00:19:40 -04:00
O Thiago
8464a1941b Use linq expression for handling breaks 2022-09-17 23:49:23 -04:00
O Thiago
beef3b418a Simplifies size calculation 2022-09-17 23:41:23 -04:00
Drison64
c075d3de08 Create a test and a check if initial zoom value of ZoomableScrollContainer is in range 2022-09-17 22:43:40 +02:00
Ondřej Vajďák
9d94343317
Update osu.Game/Screens/Edit/Compose/Components/Timeline/Timeline.cs
Co-authored-by: Salman Ahmed <frenzibyte@gmail.com>
2022-09-17 19:51:44 +02:00
Drison64
c8768eb399 Changed == to <= on TimelineZoom check 2022-09-17 19:00:50 +02:00
Drison64
88e6ce575a Merge branch 'fix-timelineZoom-zero' of https://github.com/Drison64/osu into fix-timelineZoom-zero 2022-09-17 18:57:36 +02:00
Drison64
3c7ea5c8fa Update 2022-09-17 18:57:09 +02:00
Salman Ahmed
9a10ecb378 Clarify purpose of APIUserScoreAggregate 2022-09-17 19:37:30 +03:00
Dean Herbert
41e69fbca6 Remove "default" prefix from naming 2022-09-18 00:15:26 +09:00
Dean Herbert
1c4e02fae8 Explicitly order default skins in dropdown to get correct order 2022-09-18 00:12:43 +09:00
Dean Herbert
1b475f9360 Ensure skin InstantiationInfo is updated when saving 2022-09-18 00:12:43 +09:00
Dean Herbert
64ee210825 Add realm migration to update skin names 2022-09-18 00:12:43 +09:00
Dean Herbert
487378f732 Fallback to default skin if instantiation fails 2022-09-17 23:57:25 +09:00
Dean Herbert
3e28ab72ce Standardise default skin names 2022-09-17 23:57:25 +09:00
Dean Herbert
51841988bf Rename references to DefaultSkin to have Triangles suffix 2022-09-17 23:57:25 +09:00
Ondřej Vajďák
448485a56b
Merge branch 'master' into fix-timelineZoom-zero 2022-09-17 16:24:18 +02:00
HiddenNode
2dfa89c62e Clean up 2022-09-17 15:05:25 +01:00
Drison64
0b6a77bc8b EditorBeatmap's TimelineZoom should never be zero 2022-09-17 15:59:42 +02:00
HiddenNode
d580b07063 Refactor update condition logic 2022-09-17 14:40:36 +01:00
Dean Herbert
a1d830e47f Fix formatting 2022-09-17 22:22:56 +09:00
vegguid
0bfe967452 moved BindValueChanged to LoadComplete 2022-09-17 12:58:23 +02:00
HiddenNode
e3d5ba5301 Check if graph DrawSize changed 2022-09-17 11:44:25 +01:00
HiddenNode
0d76f4501d Revert "Set InvalidationSource to Self"
This reverts commit 2092008251.
2022-09-17 10:10:20 +01:00
Salman Ahmed
48527f2d07 Ignore case during logger name comparison 2022-09-16 22:50:49 +03:00
vegguid
288cc7b201 Fixed Leaderboard tooltip not following time format setting 2022-09-16 21:36:17 +02:00