Commit Graph

6521 Commits

Author SHA1 Message Date
16ae83c499 Merge branch 'master' into editor-clipboard 2020-09-15 16:05:43 +09:00
6cbff98295 Merge branch 'master' into add-collections-to-beatmap-options 2020-09-15 15:23:33 +09:00
2c7492d717 Add null check in SongSelect disposal for safety 2020-09-15 14:34:58 +09:00
43daabc982 Remove unused using and move dialog to BDL 2020-09-14 12:10:00 -07:00
c833f5fcc4 Reorder buttons to match stable 2020-09-14 11:23:41 -07:00
57610ddad5 Fix beatmap options absorbing input from toolbar ruleset selector 2020-09-14 11:22:16 -07:00
c30174cea3 Add manage collections button to beatmap options 2020-09-14 11:21:23 -07:00
1a8a7ae7f8 Remove hardcoded key param from AddButton 2020-09-14 11:19:18 -07:00
368aca015a Move override methods to bottom 2020-09-14 11:18:00 -07:00
a377cccb4d Unsubscribe from track changed event on disposal 2020-09-14 17:10:35 +02:00
6ed4c7caef Merge branch 'master' into flaky-song-select-tests-v2 2020-09-14 16:42:40 +02:00
daf54c7eb9 Revert EditorBeatmap.Remove API 2020-09-14 17:55:41 +09:00
3118f635f6 Merge branch 'master' into editor-fix-multiple-selection 2020-09-14 16:45:30 +09:00
62c55165d4 Merge branch 'editor-fix-multiple-selection' into editor-clipboard 2020-09-14 15:47:20 +09:00
b7a06524fb Update comment to make more sense 2020-09-14 15:47:10 +09:00
75e4f224e5 Add back accidentally removed remove 2020-09-14 15:47:04 +09:00
692f2c8489 Simplify debounced update pathway 2020-09-14 14:58:00 +09:00
320e314356 Use minimum start time to handle SelectedHitObjects not being sorted 2020-09-13 22:53:30 +09:00
c573392bb2 Remove completed todo 2020-09-13 22:31:59 +09:00
0079d94676 Merge branch 'master' into editor-clipboard 2020-09-13 22:30:13 +09:00
f17b2f1359 Ensure track is looping in song select immediately 2020-09-12 20:43:17 +02:00
5e108e1d6a Merge branch 'master' into nowplaying-collections-filter 2020-09-12 21:33:07 +09:00
1a9f0ac16a Select new objects 2020-09-12 21:23:12 +09:00
3854caae9b Remove secondary schedule logic 2020-09-12 21:23:12 +09:00
81f30cd264 Select blueprint if object is already selected at the point of adding 2020-09-12 21:23:11 +09:00
2d9b0acabe Fix empty selection via keyboard shortcuts crashing 2020-09-12 21:23:10 +09:00
001cd1194c Consume BindCollectionChanged 2020-09-11 22:53:03 +09:00
94d929d8cd Remove unnecessary contains checks 2020-09-11 22:03:19 +09:00
08be45c9e7 Merge branch 'master' into editor-clipboard 2020-09-11 20:35:05 +09:00
97b995246a Merge branch 'editor-fix-multiple-selection' into editor-clipboard 2020-09-11 20:34:58 +09:00
22e6df02b6 Fix editor selected hitobjects containing the selection up to five times 2020-09-11 20:27:07 +09:00
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
de3d8e83e1 Add keyboard shortcuts 2020-09-11 19:55:41 +09:00
7d7401123c Add initial implementation of editor clipboard 2020-09-11 19:54:20 +09:00
8e028dd88f Fix incorrect ordering of ApplyDefaults for newly added objects 2020-09-11 19:54:11 +09:00
06c49070b1 Remove player collection settings 2020-09-11 16:04:09 +09:00
5b80a7db5f Re-namespace collections dropdown 2020-09-11 16:01:01 +09:00
033bd82953 Merge branch 'master' into fix-filtercontrol-order 2020-09-11 13:07:41 +09:00
b594a2a507 Import collections on initial import-from-stable step 2020-09-11 11:16:00 +09:00
314cd13b74 Fix song select filter ordering 2020-09-10 23:36:22 +09:00
18d96738a1 Fix hard crash on deleting a collection with no collection selected 2020-09-10 19:52:34 +09:00
ef44c7d063 Merge branch 'master' into score-recalc 2020-09-10 18:30:41 +09:00
4faddd0088 Merge branch 'master' into collection-database 2020-09-10 00:07:49 +09:00
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
6b56c6e83f Rename to CollectionMenuItem 2020-09-09 23:11:19 +09:00
43525614ad Store raw BeatmapCollection in filter control 2020-09-09 23:10:21 +09:00
af412947b2 Merge branch 'master' into collection-database 2020-09-09 22:59:46 +09:00
be2d34d5dc Merge branch 'master' into score-recalc 2020-09-09 21:31:31 +09:00
53a9804455 Merge branch 'master' into add-editor-tool-icons 2020-09-09 21:21:56 +09:00
1803ecad80 Add cancel exit button 2020-09-09 20:04:25 +09:00