Commit Graph

41086 Commits

Author SHA1 Message Date
b1fd812805 Merge branch 'master' into more-ui-sfx 2021-06-18 23:24:19 +09:00
35f04430d0 Merge pull request #13527 from gagahpangeran/inter-font
Add inter font
2021-06-18 23:23:13 +09:00
36f0769f83 Merge branch 'master' into inter-font 2021-06-18 22:38:20 +09:00
1ec03bf6fa Update resources 2021-06-18 22:25:24 +09:00
1f6b4b10ab Update resources 2021-06-18 22:16:15 +09:00
390abccb4b Add workaround for dropdowns playing close animation on first display 2021-06-18 22:08:59 +09:00
5ce52b2669 fix ModButton duplicate click sound 2021-06-18 21:41:07 +09:00
6e4fc26e16 replace 'songselect' hover/click sounds with 'button' ones for now 2021-06-18 21:03:46 +09:00
953683044f fix checkbox sounds not being used for certain checkboxes 2021-06-18 21:00:08 +09:00
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
2dadc9d686 Remove unused using statement 2021-06-18 19:39:01 +09:00
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
78c5ccda60 Fix renaming a ruleset DLL causing a startup crash 2021-06-18 19:32:40 +09:00
d462394635 add sound to dropdowns 2021-06-18 19:16:28 +09:00
4feb7c848f add sound to tab controls 2021-06-18 19:16:00 +09:00
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
840d1abff0 Merge branch 'master' into storyboard-outro-logic-refactor 2021-06-18 11:57:38 +02:00
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
bab370c299 Merge branch 'master' into storyboard-outro-logic-refactor 2021-06-18 10:18:54 +02:00
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
0bc68a7018 Move xmldoc to method 2021-06-18 16:50:31 +09:00
19507e107e Reorder methods to make more sense 2021-06-18 16:46:40 +09:00
a7f40dc6d4 Merge branch 'remove-synchronous-prepare-score-method' into storyboard-outro-logic-refactor 2021-06-18 16:45:01 +09:00
45122594e5 Remove the synchronous version of PrepareScoreForResults
Replaces all existing usages with the `async` version.
2021-06-18 16:24:08 +09:00
f3426e38b4 Add note about delay parameter 2021-06-18 16:18:20 +09:00
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
06d1bd971c Default DrawableStoryboard to a completed state to avoid state change on empty storyboards 2021-06-18 16:08:49 +09:00
7ef8eac773 Remove unnecessary (and no longer correct) exception 2021-06-18 16:08:31 +09:00
752d0a9f0b add sound to scroll-to-top button 2021-06-18 16:08:14 +09:00
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
5cf2ac78fc Adjust font namespaces 2021-06-18 15:40:35 +09:00
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
93eec009f8 Merge pull request #13544 from smoogipoo/split-files
Move IApplicableToDrawableHitObjects to its own file
2021-06-18 13:54:03 +09:00
cdc1c60fab Merge branch 'master' into fix-mania-editor-crash 2021-06-18 13:49:25 +09:00
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
4de27429bc Change ModSelectOverlay to never deselect the user triggered selection 2021-06-18 13:17:55 +09:00
5933e0d2d9 Change CheckCompatibleSet to never deselect the current candidat when checking incompatibility 2021-06-18 13:17:32 +09:00
97cd1217a4 Move IApplicableToDrawableHitObjects to its own file 2021-06-18 13:06:13 +09:00
d238c7ff9c Merge pull request #13541 from peppy/player-completion-refactoring 2021-06-18 10:47:50 +09:00
f282326f9a Move score preparations back below ShowResults check 2021-06-17 19:04:52 +02:00
3a1444e75d Fix malformed xmldoc tag
Oops. Made a typo in the PR suggestion.
2021-06-17 19:02:56 +02:00
9facfe8964 Apply suggestions from code review
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2021-06-18 01:07:54 +09:00
e0a3696145 Merge branch 'master' into player-completion-refactoring 2021-06-17 23:51:42 +09:00
880a008e01 Merge pull request #13540 from peppy/player-pause-exit-results-flow-refactoring 2021-06-17 16:42:18 +02:00
aae2923e14 Merge branch 'master' into player-pause-exit-results-flow-refactoring 2021-06-17 16:05:09 +02:00
10b0d066be Reword comments slightly 2021-06-17 16:04:58 +02:00
561dbea9e1 Use xmldoc-specific syntax for nicer formatting 2021-06-17 15:26:50 +02:00
6cec1145e3 Merge pull request #13523 from ekrctb/applicable-to-dho
Reduce boilerplate of `IApplicableToDrawableHitObjects` by taking a single DHO instead of an enumerable
2021-06-17 19:59:06 +09:00
77a0e9145d Merge pull request #13539 from peppy/improve-updateable-avatar-tooltip-handling
Fix edges of participant tiles showing incorrect tooltip
2021-06-17 19:14:40 +09:00
d03c6da60c Refactor and redocument updateCompletionState() and surrounding methods 2021-06-17 19:13:53 +09:00