1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 12:02:54 +08:00
Commit Graph

36194 Commits

Author SHA1 Message Date
smoogipoo
45e41aaeac Initial implementation of freemod selection overlay 2021-01-27 22:15:53 +09:00
smoogipoo
4019cc38e5 Allow footer buttons to be customised 2021-01-27 22:03:51 +09:00
smoogipoo
91d34d86f7 Abstractify ModSelectOverlay 2021-01-27 22:02:23 +09:00
smoogipoo
0ff300628e Fix type not being set 2021-01-27 20:07:22 +09:00
smoogipoo
f2fa51bf5e Make ModSections overrideable 2021-01-27 19:59:28 +09:00
smoogipoo
a800955bb1 Add mod validation utilities 2021-01-27 19:46:25 +09:00
Bartłomiej Dach
82848a7d70
Merge pull request #11556 from smoogipoo/fix-potential-mod-test-failures 2021-01-21 20:05:22 +01:00
Bartłomiej Dach
281fe6f6f9
Merge branch 'master' into fix-potential-mod-test-failures 2021-01-21 19:30:03 +01:00
Dan Balasescu
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
Dan Balasescu
0fa0e70bff
Merge branch 'master' into leave-channel-on-exiting-multiplayer 2021-01-21 19:04:33 +09:00
Dan Balasescu
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
Dan Balasescu
04095cd5b9
Merge branch 'master' into fix-editor-scroll-interruption 2021-01-21 17:46:18 +09:00
Dan Balasescu
9eb74e86ed
Apply comment suggestion
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2021-01-21 17:40:15 +09:00
Dean Herbert
e6980688f6 Leave the multiplayer channel when leaving multiplayer 2021-01-21 15:42:23 +09:00
smoogipoo
54dbb43f79 Fix more potential failures 2021-01-21 14:03:35 +09:00
smoogipoo
163a937e41 Fix mod test failing intermittently 2021-01-21 13:30:53 +09:00
Dan Balasescu
11a9a4c773
Merge pull request #11538 from EVAST9919/beatmapset-refactor
Make BeatmapSetOverlay use OverlayHeader
2021-01-21 13:14:02 +09:00
Dan Balasescu
c3675293fa
Merge branch 'master' into beatmapset-refactor 2021-01-21 12:38:34 +09:00
Dan Balasescu
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
Bartłomiej Dach
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
Bartłomiej Dach
7abe33ad0e Add failing test case 2021-01-21 00:04:15 +01:00
Dan Balasescu
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
Dan Balasescu
95f52ae054
Merge pull request #11536 from rednir/sort-skins-alphabetically
Sort SkinSection in alphabetical order
2021-01-20 21:49:31 +09:00
Dan Balasescu
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
smoogipoo
bba182a02d Fix test failure 2021-01-20 21:27:16 +09:00
Dan Balasescu
12f2067357
Merge branch 'master' into sort-skins-alphabetically 2021-01-20 21:15:16 +09:00
smoogipoo
eb85efcea2 Add check to playlists too 2021-01-20 20:59:28 +09:00
Dan Balasescu
250727cbd1
Merge branch 'master' into mp-initial-creation-screen-fix 2021-01-20 20:53:33 +09:00
Andrei Zavatski
2ca3ccad06 Move all the content to BeatmapSetHeaderContent drawable 2021-01-20 04:56:46 +03:00
Andrei Zavatski
94fee3800d Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmapset-refactor 2021-01-20 04:32:56 +03:00
Dean Herbert
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
Bartłomiej Dach
82e5a5bf6f Mark legacy beatmap skin colour test as abstract 2021-01-19 23:10:15 +01:00
Bartłomiej Dach
fd45d8c95a
Merge pull request #11531 from peppy/less-black-confirm-to-exit 2021-01-19 21:48:58 +01:00
Bartłomiej Dach
ac0835755a
Merge branch 'master' into less-black-confirm-to-exit 2021-01-19 20:50:50 +01:00
Bartłomiej Dach
3b49b7461e Schedule entire operation for safety
Also removes a redundant list copy.
2021-01-19 19:35:53 +01:00
Bartłomiej Dach
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
Bartłomiej Dach
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
rednir
206a0b8bac Fix firstNonDefault staying as -1 2021-01-19 16:55:50 +00:00
rednir
741d51893d Merge branch 'sort-skins-alphabetically' of https://github.com/rednir/osu into sort-skins-alphabetically 2021-01-19 16:17:06 +00:00
rednir
a880b8d21d Satisfy AppVeyor 2021-01-19 16:11:16 +00:00
rednir
14ff2af00e Satisfy AppVeyor 2021-01-19 15:37:59 +00:00
rednir
102d106ae7
Merge branch 'master' into sort-skins-alphabetically 2021-01-19 14:41:58 +00:00
Mysfit
052e9eef02 Added inline comments 2021-01-19 09:16:39 -05:00
rednir
7a47641c80 Merge branch 'sort-skins-alphabetically' of https://github.com/rednir/osu into sort-skins-alphabetically 2021-01-19 14:16:38 +00:00
rednir
b265d2dab4 Remove another whitespace 2021-01-19 14:16:22 +00:00
rednir
c5c5fdca45 Remove another whitespace 2021-01-19 14:10:08 +00:00
rednir
1d4c813ff6 Merge branch 'sort-skins-alphabetically' of https://github.com/rednir/osu into sort-skins-alphabetically 2021-01-19 14:03:31 +00:00
rednir
31e61326e1 Only user skins are sorted 2021-01-19 14:00:17 +00:00
Mysfit
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
Mysfit
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