45b10e48e0
Merge branch 'master' of https://github.com/ppy/osu
2021-01-21 15:23:22 +01:00
1ae3f1b9eb
Merge pull request #11557 from peppy/leave-channel-on-exiting-multiplayer
...
Leave the multiplayer channel when leaving multiplayer
2021-01-21 19:35:12 +09:00
0fa0e70bff
Merge branch 'master' into leave-channel-on-exiting-multiplayer
2021-01-21 19:04:33 +09:00
658370ff38
Merge pull request #11499 from peppy/fix-editor-scroll-interruption
...
Fix inability to interrupt timeline flick-scrolls by other means
2021-01-21 18:39:11 +09:00
04095cd5b9
Merge branch 'master' into fix-editor-scroll-interruption
2021-01-21 17:46:18 +09:00
9eb74e86ed
Apply comment suggestion
...
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com >
2021-01-21 17:40:15 +09:00
e6980688f6
Leave the multiplayer channel when leaving multiplayer
2021-01-21 15:42:23 +09:00
11a9a4c773
Merge pull request #11538 from EVAST9919/beatmapset-refactor
...
Make BeatmapSetOverlay use OverlayHeader
2021-01-21 13:14:02 +09:00
c3675293fa
Merge branch 'master' into beatmapset-refactor
2021-01-21 12:38:34 +09:00
edf9fe5611
Merge pull request #11553 from bdach/fix-taiko-beatmap-hang
...
Fix HOC not propagating DHO results applied on kill
2021-01-21 12:18:40 +09:00
1d9aaac2c2
Fix HOC not propagating DHO results applied on kill
...
`DrawableHitObject.OnKilled()` calls `UpdateResult()` to clean up a
hitobject's state definitively with regards to the judgement result
before returning the DHO back to the pool.
As it turns out, if a consumer was relying on this code path (as taiko
was in the case of nested strong hit objects), it would not work
properly with pooling, due to `HitObjectContainer` unsubscribing from
`On{New,Revert}Result` *before* calling the DHO's `OnKilled()`.
This in turn would lead to users potentially getting stuck in gameplay,
due to `ScoreProcessor` not receiving all results via that event path.
To resolve, change the call ordering to allow hit result changes applied
in `OnKilled()` to propagate normally.
2021-01-21 00:05:37 +01:00
7abe33ad0e
Add failing test case
2021-01-21 00:04:15 +01:00
7da7079ef2
Merge pull request #11537 from Mysfit/mp-initial-creation-screen-fix
...
Fix match/playlist room screen showing briefly behind initial room settings window on creation.
2021-01-20 22:05:14 +09:00
95f52ae054
Merge pull request #11536 from rednir/sort-skins-alphabetically
...
Sort SkinSection in alphabetical order
2021-01-20 21:49:31 +09:00
455383c3c0
Merge pull request #11528 from peppy/fix-autoplay-in-multiplayer
...
Fix multiplayer mod select showing autoplay as a choice
2021-01-20 21:49:16 +09:00
bba182a02d
Fix test failure
2021-01-20 21:27:16 +09:00
12f2067357
Merge branch 'master' into sort-skins-alphabetically
2021-01-20 21:15:16 +09:00
eb85efcea2
Add check to playlists too
2021-01-20 20:59:28 +09:00
250727cbd1
Merge branch 'master' into mp-initial-creation-screen-fix
2021-01-20 20:53:33 +09:00
2ca3ccad06
Move all the content to BeatmapSetHeaderContent drawable
2021-01-20 04:56:46 +03:00
94fee3800d
Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmapset-refactor
2021-01-20 04:32:56 +03:00
2fabfe54a0
Merge pull request #11546 from bdach/mark-test-as-abstract
...
Mark legacy beatmap skin colour test as abstract
2021-01-20 10:03:40 +09:00
82e5a5bf6f
Mark legacy beatmap skin colour test as abstract
2021-01-19 23:10:15 +01:00
fd45d8c95a
Merge pull request #11531 from peppy/less-black-confirm-to-exit
2021-01-19 21:48:58 +01:00
ac0835755a
Merge branch 'master' into less-black-confirm-to-exit
2021-01-19 20:50:50 +01:00
3b49b7461e
Schedule entire operation for safety
...
Also removes a redundant list copy.
2021-01-19 19:35:53 +01:00
78e590d25d
Refactor skin sorting method
...
* Rename to `sortUserSkins` to convey meaning better.
* Sort in-place instead of slicing the list.
* Change to `void` to avoid misleading users that the method returns
a new list instance.
* Fix typo in comment.
2021-01-19 18:36:42 +01:00
b00c6a1d60
Make first non-default skin index a property
...
The previous code was very brittle - it was not always updating
properly, and seems to have worked either by a carefully crafted set of
circumstances, or just plain coincidence.
Having this be a get-only property avoids potential error in the future
caused by not updating the index properly, at the expense of an added
linear lookup.
2021-01-19 18:31:37 +01:00
206a0b8bac
Fix firstNonDefault staying as -1
2021-01-19 16:55:50 +00:00
741d51893d
Merge branch 'sort-skins-alphabetically' of https://github.com/rednir/osu into sort-skins-alphabetically
2021-01-19 16:17:06 +00:00
a880b8d21d
Satisfy AppVeyor
2021-01-19 16:11:16 +00:00
14ff2af00e
Satisfy AppVeyor
2021-01-19 15:37:59 +00:00
102d106ae7
Merge branch 'master' into sort-skins-alphabetically
2021-01-19 14:41:58 +00:00
052e9eef02
Added inline comments
2021-01-19 09:16:39 -05:00
7a47641c80
Merge branch 'sort-skins-alphabetically' of https://github.com/rednir/osu into sort-skins-alphabetically
2021-01-19 14:16:38 +00:00
b265d2dab4
Remove another whitespace
2021-01-19 14:16:22 +00:00
c5c5fdca45
Remove another whitespace
2021-01-19 14:10:08 +00:00
1d4c813ff6
Merge branch 'sort-skins-alphabetically' of https://github.com/rednir/osu into sort-skins-alphabetically
2021-01-19 14:03:31 +00:00
31e61326e1
Only user skins are sorted
2021-01-19 14:00:17 +00:00
33677f5770
Use BindValueChanged to show main content for new multiplayer and playlist rooms when the settings overlay is hidden.
2021-01-19 08:52:43 -05:00
6d1d488831
Revert "Use the client.RoomUpdated action instead of binding the value of the settings overlay visibility and creating an event from it based on its ValueChanged action."
...
This reverts commit cbfb999c28
2021-01-19 08:24:14 -05:00
9b7187e3c8
Revert "Use fades instead of event listening. Fixed same issue in the playlist room creation."
...
This reverts commit 3a7608275d
2021-01-19 08:23:31 -05:00
f1894a8bac
fixed itemUpdated()
2021-01-19 12:17:56 +00:00
3a7608275d
Use fades instead of event listening. Fixed same issue in the playlist room creation.
2021-01-19 00:35:56 -05:00
bf7ce18fc0
Merge pull request #11539 from peppy/update-build-configs
...
Update various references to previous .NET version
2021-01-19 12:49:21 +09:00
35be91fc51
Update readme
2021-01-19 12:15:18 +09:00
1e99357a97
Update build configurations to net5.0 paths
2021-01-19 12:13:27 +09:00
f0add0a7cf
Make BeatmapSetOverlay use OverlayHeader
2021-01-19 01:34:37 +03:00
cbfb999c28
Use the client.RoomUpdated action instead of binding the value of the settings overlay visibility and creating an event from it based on its ValueChanged action.
2021-01-18 17:13:24 -05:00
b35d224efb
Merge branch 'master' into less-black-confirm-to-exit
2021-01-18 23:03:24 +01:00
