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

31904 Commits

Author SHA1 Message Date
Bartłomiej Dach
f17b2f1359 Ensure track is looping in song select immediately 2020-09-12 20:43:17 +02: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
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
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
Joehu
6c9fcae69f Fix drag handles not showing on now playing playlist items 2020-09-10 10:48:00 -07:00
Andrei Zavatski
e5f70d8eae Simplify counter visibility changes in PaginatedContainerHeader 2020-09-10 20:31:00 +03:00
Andrei Zavatski
931e567c7e Replace counter font size with an actual value 2020-09-10 20:25:35 +03:00
Andrei Zavatski
9b504272e4 Make Header a property 2020-09-10 20:24:43 +03:00
Andrei Zavatski
e5d0f3b657 Merge remote-tracking branch 'refs/remotes/ppy/master' into profile-sections-update 2020-09-10 20:23:02 +03:00
Dean Herbert
bf1c5a3b1f
Merge pull request #10122 from smoogipoo/fix-only-bonus-maps
Fix maps with only bonus score having NaN scores
2020-09-11 01:44:35 +09:00
smoogipoo
447fd07b4e Fix maps with only bonus score having NaN scores 2020-09-11 01:13:55 +09:00
smoogipoo
314cd13b74 Fix song select filter ordering 2020-09-10 23:36:22 +09:00
Dan Balasescu
58186fc476
Merge pull request #10118 from peppy/fix-collection-delete-crash
Fix hard crash on deleting a collection with no collection selected
2020-09-10 20:23:21 +09:00
Dean Herbert
18d96738a1 Fix hard crash on deleting a collection with no collection selected 2020-09-10 19:52:34 +09:00
Dean Herbert
23b51e8f7f
Merge pull request #10106 from smoogipoo/score-recalc 2020-09-10 19:05:42 +09:00
Dan Balasescu
14dbeb58bc
Merge pull request #10116 from peppy/update-framework
Update framework
2020-09-10 18:37:29 +09:00
Dean Herbert
ef44c7d063
Merge branch 'master' into score-recalc 2020-09-10 18:30:41 +09:00
Dean Herbert
aae8b29a71
Merge pull request #10079 from smoogipoo/collection-database 2020-09-10 18:29:36 +09:00
Dean Herbert
df1537f2a0 Update framework 2020-09-10 18:10:39 +09:00
Dean Herbert
4faddd0088
Merge branch 'master' into collection-database 2020-09-10 00:07:49 +09:00
Dan Balasescu
75ebfe41e0
Merge pull request #10102 from peppy/editor-prompt-for-save
Prompt to save changes when exiting the editor
2020-09-09 23:56:41 +09:00
smoogipoo
6b56c6e83f Rename to CollectionMenuItem 2020-09-09 23:11:19 +09:00
smoogipoo
43525614ad Store raw BeatmapCollection in filter control 2020-09-09 23:10:21 +09:00
Dean Herbert
af412947b2
Merge branch 'master' into collection-database 2020-09-09 22:59:46 +09:00
Dean Herbert
aa2be09d4b
Merge pull request #10104 from smoogipoo/leaderboard-loading-spinner-fix
Fix leaderboard loading spinner disappearing too early
2020-09-09 22:49:27 +09:00
Dan Balasescu
989d44412e
Merge pull request #10097 from peppy/fix-overlay-sound-on-disabled
Fix overlay sound effects playing when open requested while disabled
2020-09-09 22:46:55 +09:00