1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 15:33:05 +08:00
Commit Graph

41405 Commits

Author SHA1 Message Date
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
Dean Herbert
e0a3696145
Merge branch 'master' into player-completion-refactoring 2021-06-17 23:51:42 +09:00
Bartłomiej Dach
880a008e01
Merge pull request #13540 from peppy/player-pause-exit-results-flow-refactoring 2021-06-17 16:42:18 +02:00
Bartłomiej Dach
aae2923e14 Merge branch 'master' into player-pause-exit-results-flow-refactoring 2021-06-17 16:05:09 +02:00
Bartłomiej Dach
10b0d066be Reword comments slightly 2021-06-17 16:04:58 +02:00
Bartłomiej Dach
561dbea9e1 Use xmldoc-specific syntax for nicer formatting 2021-06-17 15:26:50 +02:00
Dan Balasescu
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
Dan Balasescu
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
Dean Herbert
d03c6da60c Refactor and redocument updateCompletionState() and surrounding methods 2021-06-17 19:13:53 +09:00
Dean Herbert
246ab41cc6 Remove special casing for user exit during storyboard outro 2021-06-17 18:11:15 +09:00
Dean Herbert
7cbebe6d11 Rewrite xmldoc and inline comments for PerformExit 2021-06-17 18:10:59 +09:00
Dan Balasescu
a72151d4e1
Merge pull request #13535 from peppy/fix-hitcircle-approach-circle-early-hit
Fix approach circle fade not running early on an early user hit
2021-06-17 16:37:11 +09:00
Dan Balasescu
79af80833f
Merge pull request #13537 from peppy/fix-author-info
Improve code quality of `AuthorInfo`
2021-06-17 16:34:45 +09:00
Dan Balasescu
b043f63fe4
Merge pull request #13538 from peppy/remove-redundant-not-null
Remove redundant `NotNull` attributes in `nullable` classes
2021-06-17 16:34:32 +09:00
Dean Herbert
a0e5301c9f Update usages of showGuestOnNull 2021-06-17 16:33:43 +09:00
Dean Herbert
808b2baa41 Consume new behaviour to fix UserTile discrepancy
Closes https://github.com/ppy/osu/issues/13522.
2021-06-17 16:31:12 +09:00
Dean Herbert
d9cc1c227b Allow UpdateableAvatar to handle displaying username as tooltip 2021-06-17 16:31:12 +09:00
smoogipoo
ccba6b5ac2 Fix test failures 2021-06-17 16:13:47 +09:00
Dean Herbert
9495f87f04 Remove redundant NotNull attributes in nullable classes 2021-06-17 16:07:32 +09:00
Dean Herbert
8da0431fa0 Improve code quality of AuthorInfo 2021-06-17 16:05:50 +09:00
Dean Herbert
8e45f26617
Merge branch 'master' into applicable-to-dho 2021-06-17 15:23:56 +09:00
Dean Herbert
a46f730a69 Fix approach circle fade not running early on an early user hit
Regressed in https://github.com/ppy/osu/pull/12153.
Closes https://github.com/ppy/osu/issues/13531.
2021-06-17 15:09:05 +09:00
Dean Herbert
6d0b3efa23 Reorganise existing tests into hits and misses 2021-06-17 15:08:09 +09:00
Dean Herbert
249ae3141e Add early/late tests for hit circles 2021-06-17 15:06:56 +09:00
Salman Ahmed
9d9892e99e Add legacy spinner approach circle implementation 2021-06-17 04:58:18 +03:00
ekrctb
e7954ecb60 Use property instead of backing field consistently 2021-06-17 10:31:20 +09:00
ekrctb
a4f362dca6 Remove lifetime override of DrawableManiaHitObject
The `AlwaysAlive` logic is now in all DHOs and it is now not necessary (and potentially conflicting).
2021-06-17 10:15:24 +09:00
ekrctb
9dcd0bf311 Remove IPlayfieldProvider by caching Playfield 2021-06-17 10:15:24 +09:00
Salman Ahmed
780388d174 Fix incorrect return value 2021-06-17 03:48:29 +03:00
Bartłomiej Dach
418dbf3f3e
Merge branch 'master' into fix-mania-editor-crash 2021-06-16 18:26:33 +02:00
Bartłomiej Dach
044ff9d1d2
Merge pull request #13516 from smoogipoo/beatmap-listing-enum-localisation 2021-06-16 18:26:02 +02:00
Bartłomiej Dach
191f47f5ee
Merge branch 'master' into beatmap-listing-enum-localisation 2021-06-16 17:44:16 +02:00