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

36588 Commits

Author SHA1 Message Date
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
Salman Ahmed
25f511fd5b Remove unnecessary full querying 2021-01-18 21:34:24 +03:00
Mysfit
2beb9d6a32 Merge branch 'master' of https://github.com/ppy/osu into master 2021-01-18 13:30:36 -05:00
Salman Ahmed
4a1acdece2 Merge branch 'multiplayer-beatmap-tracker' into ready-button-clean-up 2021-01-18 20:06:47 +03:00
Salman Ahmed
ddcfd854bd Wait for scheduled state changes before asserting 2021-01-18 19:20:19 +03:00
Salman Ahmed
dc91cebce9 Merge branch 'master' into multiplayer-beatmap-tracker 2021-01-18 19:15:45 +03:00
Dean Herbert
e74ecebfd6
nuget restore other rulesets 2021-01-18 23:45:57 +09:00
Dean Herbert
fda271d9d9
Merge pull request #11520 from frenzibyte/fix-item-download-button
Fix playlist item download button never shown back after hiding
2021-01-18 23:37:33 +09:00
Dean Herbert
000c7dd07b
Merge pull request #11502 from peppy/fix-spinner-spinning-weirdness
Fix some issues with spinner spin sound
2021-01-18 22:50:32 +09:00
Dean Herbert
dcb92e5b38
Merge pull request #11529 from peppy/fix-android-release
Restore nuget packages per project to avoid toolchain incompatibilities
2021-01-18 22:04:19 +09:00
Dean Herbert
ced7a36788 Update namespaces 2021-01-18 21:24:10 +09:00
Dean Herbert
12443e39ae Update framework 2021-01-18 19:16:32 +09:00
Dan Balasescu
95963f2fa2
Merge pull request #11526 from peppy/fix-editor-repeat-slider-adjustment
Fix sliders with an even number of repeats not allowing rotation/scale transforms
2021-01-18 18:56:25 +09:00
Dean Herbert
707d5346c9 Merge branch 'master' into fix-spinner-spinning-weirdness 2021-01-18 18:26:44 +09:00
Dean Herbert
0560eb4120 Reduce final fill alpha of main menu confirm-to-exit 2021-01-18 18:22:21 +09:00
Dean Herbert
46681322d0 Restore nuget packages per project to avoid toolchain incompatibilities with net50 2021-01-18 17:56:00 +09:00
Dean Herbert
1359153382 Revert "Test removing nuget restore from iOS/Android build scripts"
This reverts commit 39746cb3de.
2021-01-18 17:54:22 +09:00
Dean Herbert
0b165dce4b Fix multiplayer mod select showing autoplay as a choice 2021-01-18 17:50:32 +09:00
Dan Balasescu
7e30489167
Merge pull request #11525 from peppy/fix-editor-selection-box-non-visible-hitobjects
Fix selection box not updating with hitcircles/sliders far in the future or past
2021-01-18 17:34:25 +09:00
Dean Herbert
2f1d4bf51b Add missing braces 2021-01-18 17:13:47 +09:00
Dean Herbert
c79ab63743 Fix sliders with an even number of repeats not allowing rotation/scale transforms 2021-01-18 16:59:16 +09:00
Dean Herbert
02d2b2742b Fix selection box not updating with hitcircles/sliders far in the future or past 2021-01-18 16:57:36 +09:00