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
Salman Ahmed
34612ae233
Forward internal management to a container alongside tracker
2021-01-19 20:01:22 +03: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
Salman Ahmed
dba01cf2b1
Use beatmap "soleily" and remove no longer needed archive
2021-01-19 18:43:16 +03:00
rednir
14ff2af00e
Satisfy AppVeyor
2021-01-19 15:37:59 +00:00
Salman Ahmed
ed3dece9f8
Fix wrong importing of test beatmaps
...
Importing via `testBeatmapSet` causes the beatmapset hash to not be calculated due to no files existing in the importing process, which leads into not reusing existing test beatmaps due to no hash.
2021-01-19 18:36:08 +03: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
Mysfit
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
rednir
f1894a8bac
fixed itemUpdated()
2021-01-19 12:17:56 +00:00
Salman Ahmed
63b4c529a6
Add xmldoc explaining what the multiplayer beatmap tracker is for
2021-01-19 11:59:07 +03:00
Salman Ahmed
5a64abee64
Inline with above method
2021-01-19 11:59:07 +03:00
Dean Herbert
bdc426a498
Merge branch 'master' into multiplayer-beatmap-tracker
2021-01-19 17:39:47 +09:00
Mysfit
3a7608275d
Use fades instead of event listening. Fixed same issue in the playlist room creation.
2021-01-19 00:35:56 -05:00
Dean Herbert
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
Dean Herbert
35be91fc51
Update readme
2021-01-19 12:15:18 +09:00
Dean Herbert
1e99357a97
Update build configurations to net5.0 paths
2021-01-19 12:13:27 +09:00
Andrei Zavatski
f0add0a7cf
Make BeatmapSetOverlay use OverlayHeader
2021-01-19 01:34:37 +03:00
Mysfit
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
Bartłomiej Dach
b35d224efb
Merge branch 'master' into less-black-confirm-to-exit
2021-01-18 23:03:24 +01:00
Mysfit
5233a0449a
Hide main room subscreen on initial mp room creation. Toggle mp room subscreen visibility based on settings overlay visibility before room is created.
2021-01-18 16:08:06 -05:00
rednir
0b65c0cd25
Remove whitespace
2021-01-18 20:17:42 +00:00
rednir
233e50ba1a
Merge branch 'sort-skins-alphabetically' of https://github.com/rednir/osu into sort-skins-alphabetically
2021-01-18 20:09:56 +00:00
rednir
da89426a3b
Merge branch 'master' of https://github.com/ppy/osu into sort-skins-alphabetically
2021-01-18 20:09:15 +00:00
rednir
6a991fbc84
Merge branch 'master' into sort-skins-alphabetically
2021-01-18 20:08:53 +00:00
Salman Ahmed
63ca9de7e4
Rewerite beatmap term properly
...
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2021-01-18 23:00:07 +03:00
rednir
7476cb3047
Sort SkinSection in alphabetical order
2021-01-18 19:51:42 +00:00
Salman Ahmed
5e476fa189
Enforce one missed property back to single-floating type
2021-01-18 22:07:25 +03:00
