smoogipoo
a78d1b4c2e
Update SR colours to match osu-web
2021-07-01 19:37:21 +09:00
smoogipoo
6dd3c6fe93
Make MultiSpectatorScreen and tests more resillient to timing
2021-06-29 22:45:51 +09:00
smoogipoo
bfdbe3c3fe
Fix clocks getting added a second time
2021-06-29 17:29:25 +09:00
smoogipoo
8e04d73b67
Merge branch 'rework-multiplayer-test-scenes' into spectator-start-at-end-2
2021-06-29 17:06:57 +09:00
smoogipoo
bcdf36e77b
Merge branch 'master' into spectator-start-at-end-2
2021-06-29 15:53:58 +09:00
smoogipoo
92fa99700e
Merge branch 'master' into rework-multiplayer-test-scenes
2021-06-29 15:39:59 +09:00
smoogipoo
a3b1e1d5fc
Check for null ruleset in FilterCriteria
2021-06-29 15:18:40 +09:00
Dean Herbert
f939e2603a
Merge branch 'master' into localisable-tooltips
2021-06-28 15:29:42 +09:00
Gagah Pangeran Rosfatiputra
2b1d3c8e9c
add od filter in search filter
2021-06-26 21:05:01 +07:00
Gagah Pangeran Rosfatiputra
8e1bcc4d6b
add overall difficulty in filter criteria
2021-06-26 21:02:31 +07:00
Bartłomiej Dach
ea384332c3
Merge branch 'master' into logo-transition-sound
2021-06-25 21:12:48 +02:00
Bartłomiej Dach
50c27d2635
Update usages of IHasTooltip in line with framework localisation changes
2021-06-25 19:10:04 +02:00
aitani9
6bc71590c5
Disable logo click sound when exiting
2021-06-25 09:21:26 -07:00
Dean Herbert
51dd7fc238
Merge pull request #13622 from aitani9/mod-settings-dropdown-height
...
Decrease the max dropdown height in mod settings
2021-06-25 17:42:47 +09:00
Dean Herbert
5883922177
Remove mod multiplier completely
2021-06-25 16:36:31 +09:00
aitani9
c8022126dc
Add logo sound case for transitioning to song select
2021-06-23 13:39:12 -07:00
Dean Herbert
151dfdfb79
Merge pull request #13627 from Joehuu/fix-multiplayer-exit-logic
...
Fix multiplayer leave dialog not working on all exit operations
2021-06-23 14:56:57 +09:00
Dean Herbert
f62b4f2d24
Merge pull request #13617 from ekrctb/catch-editor
...
Add "placeholder" (pre-MVP) implementation of osu!catch editor
2021-06-23 14:00:34 +09:00
ekrctb
0b351c9922
Fix "possible NRE" inspection
2021-06-23 10:57:04 +09:00
ekrctb
eec4457473
Add [CanBeNull] to methods returning null by default
2021-06-23 09:40:07 +09:00
Dean Herbert
4cb9c6a842
Merge pull request #13423 from frenzibyte/transformers-per-skin
...
Refactor ruleset skin transforming logic to be per-`ISkin` rather than one `ISkinSource`
2021-06-22 21:24:56 +09:00
ekrctb
a9c7830252
Fix NRE when hit object blueprint is not implemented
2021-06-22 17:20:13 +09:00
Salman Ahmed
b12adc6073
Remove all test skinning changes in favour of the ISkinSource.AllSources path
2021-06-22 10:48:03 +03:00
Dean Herbert
1fff9a93b9
Merge branch 'master' into skin-editor-closest-anchor
2021-06-22 16:41:51 +09:00
Dean Herbert
1b0aadcc6f
Merge branch 'master' into transformers-per-skin
2021-06-22 16:03:15 +09:00
Joseph Madamba
db86098062
Fix dialog not closing after spamming OS window close
2021-06-21 20:23:11 -07:00
Joseph Madamba
9bcd1e6922
Move confirm dialog logic to OnExiting
2021-06-21 20:22:18 -07:00
Joseph Madamba
00b4cf1829
Handle sub screen OnExiting logic on main screen
2021-06-21 20:20:43 -07:00
Dean Herbert
b1fd812805
Merge branch 'master' into more-ui-sfx
2021-06-18 23:24:19 +09:00
Jamie Taylor
6e4fc26e16
replace 'songselect' hover/click sounds with 'button' ones for now
2021-06-18 21:03:46 +09:00
Dean Herbert
c751e087ca
Merge branch 'master' into skin-editor-closest-anchor
2021-06-18 18:54:07 +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
7ef8eac773
Remove unnecessary (and no longer correct) exception
2021-06-18 16:08:31 +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
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
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
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
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
