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

46443 Commits

Author SHA1 Message Date
Bartłomiej Dach
6100bf66a6
Clean up cancellation handling in WorkingBeatmap
After the recent changes introducing cancellation support to
`WorkingBeatmap`, it turned out that if the cancellation support was
used, `GetPlayableBeatmap()` would raise timeout exceptions rather than
the expected `OperationCanceledException`.

To that end, split off a separate overload for the typical usage, that
catches `OperationCanceledException` and converts them to beatmap load
timeout exceptions, and use normal `OperationCanceledException`s in the
overload that requires a cancellation token to work.
2021-11-20 17:23:55 +01:00
Bartłomiej Dach
15feb17da8
Change difficulty cache storage type to nullable
The recent changes related to adding support for working beatmap load
cancellation exposed a flaw in the beatmap difficulty cache. With the
way the difficulty computation logic was written, any error in the
calculation process (including beatmap load timeout, or cancellation)
would result in a 0.00 star rating being permanently cached in memory
for the given beatmap.

To resolve, change the difficulty cache's return type to nullable.
In failure scenarios, `null` is returned, rather than
`default(StarDifficulty)` as done previously.
2021-11-20 17:00:50 +01:00
Dean Herbert
b1fcb840a9
Merge pull request #15581 from frenzibyte/update-ios-native-linking
Update iOS native references and linker flags in line with framework changes
2021-11-20 19:14:52 +09:00
Dean Herbert
0da4be6f7c
Merge branch 'master' into update-ios-native-linking 2021-11-20 18:47:01 +09:00
Salman Ahmed
f1bcd5ed22
Merge pull request #15689 from peppy/update-dependencies 2021-11-20 12:38:22 +03:00
Salman Ahmed
a8a2ffde42 Sync iOS transitive dependency versions with game 2021-11-20 12:11:09 +03:00
Dean Herbert
50e18ccebb Update dependencies in mobile props files 2021-11-20 15:14:06 +09:00
Dean Herbert
5afc7c80f6
Merge pull request #15687 from peppy/update-dependencies
Update all dependencies
2021-11-20 14:05:36 +09:00
Dean Herbert
e0629ba81c Update all dependencies 2021-11-20 13:31:10 +09:00
Salman Ahmed
96a5136c53 Update framework 2021-11-19 17:56:07 +03:00
Salman Ahmed
eb1a9aca8d Merge branch 'master' into update-ios-native-linking 2021-11-19 16:08:18 +03:00
Salman Ahmed
eb1bcf941f Sync DiffPlex dependency version with game project 2021-11-19 16:07:52 +03:00
Salman Ahmed
5d252f6fc0 Add rider autogenerated .idea files for iOS solution filter 2021-11-19 16:07:52 +03:00
Dan Balasescu
d397524878
Merge pull request #15676 from peppy/multiplayer-incorrect-beatmap-error
Show better error message when selecting an unavailable beatmap during multiplayer room creation
2021-11-19 18:59:46 +09:00
Dan Balasescu
a6444a8a64
Merge pull request #15677 from peppy/multiplayer-song-select-error-parsing
Only show user displayable portion of server errors when selecting a song in multiplayer
2021-11-19 18:57:51 +09:00
Dean Herbert
54facb79d6
Merge pull request #15680 from smoogipoo/nunit-blame
Run nunit in blame mode
2021-11-19 17:24:28 +09:00
Dan Balasescu
215c179b92 Run nunit in blame mode 2021-11-19 16:16:20 +09:00
Dan Balasescu
1aa7f681cf
Merge pull request #15678 from peppy/fix-another-test-nullref
Fix potential null reference in `FadeAccessibleBackground` test class
2021-11-19 16:03:27 +09:00
Dean Herbert
6dc6ca1bbb Fix potential null reference in FadeAccessibleBackground test class 2021-11-19 14:03:07 +09:00
Dean Herbert
284e554cbf Only show user displayable portion of server errors when seleting a song in multiplayer 2021-11-19 13:58:03 +09:00
Dan Balasescu
c6c6b04f2b
Merge pull request #15624 from Darius-Wattimena/fix-plate-clearing-missing-last-banana
Fix banana showers not clearing the plate when missing the last banana
2021-11-19 13:30:21 +09:00
Dean Herbert
c901a4fd7e Show better error message when selecting an unavailable beatmap during multiplayer room creation 2021-11-19 13:28:42 +09:00
Dean Herbert
77c0b8dfa9 Fix stray typo 2021-11-19 13:27:06 +09:00
Dan Balasescu
33294ffda6
Merge branch 'master' into fix-plate-clearing-missing-last-banana 2021-11-19 11:42:57 +09:00
Dan Balasescu
6ebe54b183
Merge pull request #15494 from Tollii/beatmap-cancellation-token
Add support for cancellation tokens for beatmap difficulty calculation
2021-11-19 10:54:32 +09:00
Darius Wattimena
38edeac710 Moved the logic to the bottom as placeCaughtObject is otherwise not called yet 2021-11-18 20:24:40 +01:00
Darius Wattimena
9685892b94 Added an extra unit test when actually catching the last banana to also clear the plate 2021-11-18 20:23:42 +01:00
Darius Wattimena
cfedbb92c1 Added a unit test to cover clearing of the plate when missing the last banana 2021-11-18 20:07:03 +01:00
Darius Wattimena
95891bc655 Moved clear plate logic to Catcher class 2021-11-18 20:03:41 +01:00
Dan Balasescu
2a5ecad771
Merge pull request #15670 from Joehuu/fix-score-panel-animation
Fix score panels sometimes jumping when toggling statistics fast
2021-11-19 01:18:22 +09:00
Dean Herbert
bf8507c7b9 Only apply default timeout when debugger not attached 2021-11-18 23:26:45 +09:00
Salman Ahmed
4c5599295c Update more obsolete usages 2021-11-18 15:32:19 +03:00
Joseph Madamba
a09589f833 Fix score panels sometimes jumping when toggling statistics fast 2021-11-17 23:15:51 -08:00
Dan Balasescu
698b6c4242
Merge pull request #15668 from peppy/key-repeat
Update `KeyBindingContainer` usage to block key repeat where applicable
2021-11-18 15:21:35 +09:00
Dean Herbert
e344e74352
Merge pull request #15664 from Joehuu/supporter-icon-link
Link osu!supporter icon to its web page
2021-11-18 14:02:15 +09:00
Dean Herbert
9ec6ecd3f6 Update framework 2021-11-18 13:39:25 +09:00
Dean Herbert
1fdf0e9770
Merge branch 'master' into supporter-icon-link 2021-11-18 13:36:14 +09:00
Dean Herbert
db4e4c982c Add hover effect to supporter button 2021-11-18 13:35:42 +09:00
Dean Herbert
cdb2a92f86 Disable key repeat for all ruleset handling cases 2021-11-18 13:13:36 +09:00
Dean Herbert
66c307e0ee Remove usage of key repeat helper method 2021-11-18 13:13:36 +09:00
Dean Herbert
d7b178ea37 Update test scenes which should not handle key repeat 2021-11-18 13:13:36 +09:00
Dean Herbert
7599efac30 Update editor cases where repeat should not be handled 2021-11-18 13:13:36 +09:00
Dean Herbert
3de8125eac Update UI cases where repeat should not be handled 2021-11-18 13:13:36 +09:00
Dean Herbert
5fb5e0035c
Merge pull request #15657 from smoogipoo/expose-calculate-accuracy
Expose LegacyScoreDecoder.PopulateAccuracy()
2021-11-18 11:33:25 +09:00
Joseph Madamba
cd5e379c48 Link osu!supporter icon to its web page 2021-11-17 14:43:34 -08:00
Bartłomiej Dach
1c13b39104
Revert incorrect ordering change 2021-11-17 22:10:46 +01:00
Bartłomiej Dach
8528cab40b
Add test coverage for ruleset load failure scenario 2021-11-17 22:10:45 +01:00
Bartłomiej Dach
8b134914cf
Merge branch 'master' into beatmap-cancellation-token 2021-11-17 21:52:30 +01:00
Dan Balasescu
e4aec3f519
Merge pull request #15648 from peppy/playlist-show-invalid-beatmaps
Highlight invalid playlist items during room creation
2021-11-17 22:24:22 +09:00
Dan Balasescu
860546bf63
Merge pull request #15634 from peppy/i-working-beatmap/simple-cases
Update all simple cases of switching to `IWorkingBeatmap`
2021-11-17 22:08:27 +09:00