1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-15 03:47:26 +08:00
Commit Graph

31926 Commits

Author SHA1 Message Date
Joehu
43daabc982 Remove unused using and move dialog to BDL 2020-09-14 12:10:00 -07:00
Joehu
c833f5fcc4 Reorder buttons to match stable 2020-09-14 11:23:41 -07:00
Joehu
57610ddad5 Fix beatmap options absorbing input from toolbar ruleset selector 2020-09-14 11:22:16 -07:00
Joehu
a09bd787f0 Add failing beatmap options input test 2020-09-14 11:21:39 -07:00
Joehu
c30174cea3 Add manage collections button to beatmap options 2020-09-14 11:21:23 -07:00
Joehu
ce9c63970c Fix button colors in beatmap options test 2020-09-14 11:20:43 -07:00
Joehu
1a8a7ae7f8 Remove hardcoded key param from AddButton 2020-09-14 11:19:18 -07:00
Joehu
368aca015a Move override methods to bottom 2020-09-14 11:18:00 -07:00
Dan Balasescu
16d32f5246
Merge pull request #10152 from peppy/fix-post-convert-json-serialize
Fix JSON serialization not working correctly for post-converted beatmaps
2020-09-14 21:53:32 +09:00
Dean Herbert
a8b405791a Fix non-convert slider and spinner serialization 2020-09-14 17:32:32 +09:00
Dean Herbert
3e7f70e225 Add failing test covering post-converted json serializing 2020-09-14 17:32:32 +09:00
Dan Balasescu
2c4aa42023
Merge pull request #10149 from Joehuu/fix-mod-select-absorbing-input
Fix mod select overlay absorbing input from toolbar ruleset selector
2020-09-14 17:20:05 +09:00
Dan Balasescu
5712d3f0aa
Merge pull request #10139 from peppy/editor-fix-multiple-selection
Fix editor selected hitobjects containing the selection up to five times
2020-09-14 17:19:56 +09:00
Dan Balasescu
3118f635f6
Merge branch 'master' into editor-fix-multiple-selection 2020-09-14 16:45:30 +09:00
Dean Herbert
b7a06524fb Update comment to make more sense 2020-09-14 15:47:10 +09:00
Dean Herbert
75e4f224e5 Add back accidentally removed remove 2020-09-14 15:47:04 +09:00
Bartłomiej Dach
b2fb17557b
Merge pull request #10150 from MiraiSubject/team-anchor-fix
Fix anchoring for TeamHeader in TeamDisplay
2020-09-13 22:31:33 +02:00
Shivam
9f1a231f92 Add anchor to the fillflowcontainer in TeamDisplay 2020-09-13 21:03:46 +02:00
Joehu
4dacdb9994 Fix mod select overlay absorbing input from toolbar ruleset selector 2020-09-13 11:50:21 -07:00
Joehu
e328b791df Add failing mod select input test 2020-09-13 11:49:16 -07:00
Dean Herbert
4cf4618bd1
Merge pull request #10134 from smoogipoo/nowplaying-collections-filter
Add collections filter to the now playing overlay
2020-09-12 22:39:29 +09:00
Dean Herbert
5e108e1d6a
Merge branch 'master' into nowplaying-collections-filter 2020-09-12 21:33:07 +09:00
Dean Herbert
94d929d8cd Remove unnecessary contains checks 2020-09-11 22:03:19 +09:00
Dan Balasescu
53fab11321
Merge pull request #10138 from peppy/editor-fix-masking
Fix editor hitobjects getting masked weirdly
2020-09-11 20:57:53 +09:00
Dan Balasescu
56b129eb93
Merge pull request #10137 from peppy/editor-exit-dialog-fix
Avoid editor confirm-save dialog looping infinitely when using keyboard shortcut to exit
2020-09-11 20:30:19 +09:00
Dean Herbert
22e6df02b6 Fix editor selected hitobjects containing the selection up to five times 2020-09-11 20:27:07 +09:00
Dean Herbert
73dd21c8fc Add failing test 2020-09-11 20:27:07 +09:00
Dean Herbert
432c3e17eb Fix toolbox becoming inoperable due to incorrect ordering 2020-09-11 20:23:34 +09:00
Dean Herbert
139a5acd1b Fix editor hitobjects getting masked weirdly
Closes #10124
2020-09-11 20:16:50 +09:00
Dean Herbert
2858296c25 Avoid editor confirm-save dialog looping infinitely when using keyboard shortcut to exit
Will now exit without saving if the keyboard shortcut is activated twice
in a row, as expected.

Closes #10136.
2020-09-11 19:58:37 +09:00
smoogipoo
b047fbb8ee Use bindable value for search text 2020-09-11 17:46:07 +09:00
smoogipoo
6327f12fe4 Disable manage collections item in now playing overlay 2020-09-11 16:58:18 +09:00
smoogipoo
fcc8683629 Hook up now playing overlay to collections 2020-09-11 16:46:11 +09:00
smoogipoo
a6a76de7a9 Re-expose sealed methods 2020-09-11 16:09:08 +09:00
smoogipoo
06c49070b1 Remove player collection settings 2020-09-11 16:04:09 +09:00
smoogipoo
4061480419 Rename menu item 2020-09-11 16:02:46 +09:00
smoogipoo
5b80a7db5f Re-namespace collections dropdown 2020-09-11 16:01:01 +09:00
Dan Balasescu
54520faa7e
Merge pull request #10082 from EVAST9919/profile-sections-update
Update section headers in ProfileOverlay in line with web
2020-09-11 14:53:17 +09:00
Dean Herbert
7f16a41cc3
Merge pull request #10121 from smoogipoo/fix-filtercontrol-order 2020-09-11 13:49:04 +09:00
Dean Herbert
033bd82953
Merge branch 'master' into fix-filtercontrol-order 2020-09-11 13:07:41 +09:00
Dan Balasescu
48db5739ed
Merge pull request #10126 from Joehuu/fix-playlist-item-no-drag-handle
Fix drag handles not showing on now playing playlist items
2020-09-11 12:31:57 +09:00
Dan Balasescu
088077aec2
Merge pull request #10131 from peppy/import-from-stable-collections
Import collections on initial import-from-stable step
2020-09-11 12:22:30 +09:00
smoogipoo
22c5e9f64f Rename missing parameter 2020-09-11 12:19:26 +09:00
smoogipoo
be5d143b5a Reorder params 2020-09-11 12:17:12 +09:00
Dean Herbert
b594a2a507 Import collections on initial import-from-stable step 2020-09-11 11:16:00 +09:00
Bartłomiej Dach
97690c818c Add regression test coverage 2020-09-11 00:12:05 +02:00
Joehu
370f22f975 Show drag handle by default on main class 2020-09-10 11:11:45 -07:00
Bartłomiej Dach
0fb0dc0fde
Merge branch 'master' into fix-filtercontrol-order 2020-09-10 20:07:31 +02:00
Andrei Zavatski
cfc6e2175d Add missing header to MostPlayedBeatmapsContainer 2020-09-10 20:58:37 +03:00
Andrei Zavatski
913e3faf60 Move PaginatedContainerWithHeader logic to a base class 2020-09-10 20:48:06 +03:00