Dean Herbert
36f0769f83
Merge branch 'master' into inter-font
2021-06-18 22:38:20 +09:00
Dean Herbert
1ec03bf6fa
Update resources
2021-06-18 22:25:24 +09:00
Dean Herbert
1f6b4b10ab
Update resources
2021-06-18 22:16:15 +09:00
Dean Herbert
390abccb4b
Add workaround for dropdowns playing close animation on first display
2021-06-18 22:08:59 +09:00
Jamie Taylor
5ce52b2669
fix ModButton duplicate click sound
2021-06-18 21:41:07 +09:00
Jamie Taylor
6e4fc26e16
replace 'songselect' hover/click sounds with 'button' ones for now
2021-06-18 21:03:46 +09:00
Jamie Taylor
953683044f
fix checkbox sounds not being used for certain checkboxes
2021-06-18 21:00:08 +09:00
Dean Herbert
5897475708
Merge pull request #13552 from peppy/fix-ruleset-dll-rename
...
Fix loading a ruleset with an updated internal name causing a potential startup crash
2021-06-18 20:18:54 +09:00
Dean Herbert
2dadc9d686
Remove unused using statement
2021-06-18 19:39:01 +09:00
Dan Balasescu
846647b5c5
Merge pull request #13549 from peppy/storyboard-outro-logic-refactor
...
Separate out storyboard outro logic as much as possible from score completion flow
2021-06-18 19:38:00 +09:00
Dean Herbert
78c5ccda60
Fix renaming a ruleset DLL causing a startup crash
2021-06-18 19:32:40 +09:00
smoogipoo
42c5a962fb
Add xmldoc remark
2021-06-18 19:27:10 +09:00
smoogipoo
36d51d5117
Don't set entry immediately
2021-06-18 19:23:37 +09:00
smoogipoo
36d2199a02
Add exception on Apply() while loading
2021-06-18 19:20:57 +09:00
Jamie Taylor
d462394635
add sound to dropdowns
2021-06-18 19:16:28 +09:00
Jamie Taylor
4feb7c848f
add sound to tab controls
2021-06-18 19:16:00 +09:00
Dan Balasescu
e0f4c792b8
Merge pull request #13546 from peppy/mods-can-specify-self-in-incompatible-list
...
Allow mods to specify incompatibility types which they implement themselves
2021-06-18 19:07:38 +09:00
Bartłomiej Dach
840d1abff0
Merge branch 'master' into storyboard-outro-logic-refactor
2021-06-18 11:57:38 +02:00
Dean Herbert
c751e087ca
Merge branch 'master' into skin-editor-closest-anchor
2021-06-18 18:54:07 +09:00
Dean Herbert
ed9654f9c6
Merge pull request #13491 from ekrctb/catcher-trail-sprite
...
Use common skinnable drawable for catcher and catcher trails
2021-06-18 18:33:02 +09:00
Dean Herbert
36b5414b1d
Update comment to hopefully explain a weird conditional better
2021-06-18 17:46:01 +09:00
Dean Herbert
5c59195e35
Remove beta package allowance
2021-06-18 17:34:45 +09:00
Bartłomiej Dach
bab370c299
Merge branch 'master' into storyboard-outro-logic-refactor
2021-06-18 10:18:54 +02:00
Dean Herbert
d5a1524eb0
Add missing rulesetID check for global action matching
2021-06-18 17:12:01 +09:00
Dean Herbert
d06e52505a
Fix thread safety of KeyBindingStore.GetReadableKeyCombinationsFor
2021-06-18 17:11:39 +09:00
Dan Balasescu
6605fa2797
Merge pull request #13551 from peppy/remove-synchronous-prepare-score-method
...
Remove the synchronous version of `PrepareScoreForResults`
2021-06-18 17:00:32 +09:00
Dean Herbert
c369beeaaa
Merge branch 'master' into realm-key-binding-store
2021-06-18 16:52:35 +09:00
Dean Herbert
0bc68a7018
Move xmldoc to method
2021-06-18 16:50:31 +09:00
Dean Herbert
19507e107e
Reorder methods to make more sense
2021-06-18 16:46:40 +09:00
Dean Herbert
a7f40dc6d4
Merge branch 'remove-synchronous-prepare-score-method' into storyboard-outro-logic-refactor
2021-06-18 16:45:01 +09:00
Dean Herbert
45122594e5
Remove the synchronous version of PrepareScoreForResults
...
Replaces all existing usages with the `async` version.
2021-06-18 16:24:08 +09:00
Dean Herbert
f3426e38b4
Add note about delay parameter
2021-06-18 16:18:20 +09:00
Dean Herbert
3819a1f03b
Remove exit override behaviour
...
I don't actually know under what scenario this could have been hit, and
actually caused expected behaviour. Consider that in the scenario I
describe in the comment (which I added yesterday), the user is
requesting a pause or exit which would be "cancelled showing the results
instead". But in such a scenario, `PerformExit` would first be run,
which cancels the `resultsDisplayDelegate` in the first place.
The only special case would be pressing the close button on the window
decoration? Which I don't think should be a special case in the first
place, so I'm just going to remove this for the time being to keep
things simple.
2021-06-18 16:12:35 +09:00
Dean Herbert
06d1bd971c
Default DrawableStoryboard to a completed state to avoid state change on empty storyboards
2021-06-18 16:08:49 +09:00
Dean Herbert
7ef8eac773
Remove unnecessary (and no longer correct) exception
2021-06-18 16:08:31 +09:00
Jamie Taylor
752d0a9f0b
add sound to scroll-to-top button
2021-06-18 16:08:14 +09:00
Dean Herbert
2bf855fcca
Move all storyboard outro skip logic out of updateCompletionState
...
This method should only be called to trigger the score completion
portion of player progression. The storyboard skip/end logic is now
handled separately in `progressToResults`.
2021-06-18 15:50:43 +09:00
smoogipoo
5cf2ac78fc
Adjust font namespaces
2021-06-18 15:40:35 +09:00
Dan Balasescu
2cd72a92e8
Merge pull request #13499 from ekrctb/fix-mania-editor-crash
...
Rewrite mania selection blueprint to use only `HitObject` (no `DrawableHitObject`) for layout
2021-06-18 15:10:28 +09:00
Dean Herbert
93eec009f8
Merge pull request #13544 from smoogipoo/split-files
...
Move IApplicableToDrawableHitObjects to its own file
2021-06-18 13:54:03 +09:00
Dan Balasescu
cdc1c60fab
Merge branch 'master' into fix-mania-editor-crash
2021-06-18 13:49:25 +09:00
Dean Herbert
860626152a
Mark all mods which adjust approach circle as incompatible with each other
...
Closes https://github.com/ppy/osu/issues/13543 .
2021-06-18 13:21:53 +09:00
Dean Herbert
4de27429bc
Change ModSelectOverlay to never deselect the user triggered selection
2021-06-18 13:17:55 +09:00
Dean Herbert
5933e0d2d9
Change CheckCompatibleSet to never deselect the current candidat when checking incompatibility
2021-06-18 13:17:32 +09:00
smoogipoo
97cd1217a4
Move IApplicableToDrawableHitObjects to its own file
2021-06-18 13:06:13 +09:00
Salman Ahmed
c9458fd9ce
Hide spinner approach circle in "Hidden" mod
2021-06-18 06:23:54 +03:00
Dean Herbert
d238c7ff9c
Merge pull request #13541 from peppy/player-completion-refactoring
2021-06-18 10:47:50 +09:00
Bartłomiej Dach
f282326f9a
Move score preparations back below ShowResults check
2021-06-17 19:04:52 +02:00
Bartłomiej Dach
3a1444e75d
Fix malformed xmldoc tag
...
Oops. Made a typo in the PR suggestion.
2021-06-17 19:02:56 +02:00
Dean Herbert
9facfe8964
Apply suggestions from code review
...
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2021-06-18 01:07:54 +09:00
