Dean Herbert
3c70b3127c
Fix potential nullref in FilterControl during asynchronous load
2020-09-15 23:19:31 +09:00
Dan Balasescu
8f5115b4e8
Merge branch 'master' into fix-test-storage-weirdness
2020-09-15 19:32:52 +09:00
Dean Herbert
f7c9c80566
Force OsuGameTests to use a unique storage each run
2020-09-15 19:01:32 +09:00
Dan Balasescu
0761aab42f
Merge branch 'master' into catch-combo-counter
2020-09-15 17:20:31 +09:00
Dan Balasescu
fc15b4546d
Merge pull request #10140 from peppy/editor-clipboard
...
Editor clipboard support
2020-09-15 17:15:49 +09:00
Dean Herbert
d03bfec807
Merge branch 'master' into fix-test-storage-weirdness
2020-09-15 16:54:06 +09:00
Dean Herbert
7f2ce14f36
Merge pull request #9294 from smoogipoo/morth-taiko-changes
2020-09-15 16:11:17 +09:00
Dan Balasescu
16ae83c499
Merge branch 'master' into editor-clipboard
2020-09-15 16:05:43 +09:00
Dan Balasescu
6cbff98295
Merge branch 'master' into add-collections-to-beatmap-options
2020-09-15 15:23:33 +09:00
Dan Balasescu
3e1c517700
Merge pull request #10160 from peppy/ss-dispose-null-check
...
Add null check in SongSelect disposal for safety
2020-09-15 15:06:17 +09:00
Dean Herbert
914785ce17
Merge branch 'master' into fix-test-storage-weirdness
2020-09-15 14:49:10 +09:00
Dean Herbert
0446bc8610
Fix game.ini getting left over by PlayerTestScene subclasses
2020-09-15 14:43:24 +09:00
Dean Herbert
2c7492d717
Add null check in SongSelect disposal for safety
2020-09-15 14:34:58 +09:00
Dean Herbert
879979ef57
Move host lookup to inside lazy retrieval to handle edge cases
2020-09-15 14:25:31 +09:00
Dean Herbert
234152b2fe
Use host storage as LocalStorage for headless test runs
2020-09-15 14:17:40 +09:00
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
c30174cea3
Add manage collections button to beatmap options
2020-09-14 11:21:23 -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
Bartłomiej Dach
a377cccb4d
Unsubscribe from track changed event on disposal
2020-09-14 17:10:35 +02:00
Bartłomiej Dach
6ed4c7caef
Merge branch 'master' into flaky-song-select-tests-v2
2020-09-14 16:42:40 +02:00
Dean Herbert
be8877b0f4
Merge branch 'master' into better-skin-hashing
2020-09-14 23:32:17 +09:00
Dean Herbert
1884e0167b
Eagerly populate skin metadata to allow usage in hashing computation
2020-09-14 23:31:03 +09:00
Dean Herbert
91d37e0459
Fix typo in comment
2020-09-14 20:17:00 +09:00
Dean Herbert
2b48ae42be
Merge branch 'master' into better-skin-hashing
2020-09-14 20:16:33 +09:00
Dean Herbert
daf54c7eb9
Revert EditorBeatmap.Remove API
2020-09-14 17:55:41 +09:00
Dean Herbert
6b60888139
Merge branch 'fix-post-convert-json-serialize' into editor-clipboard
2020-09-14 17:38:53 +09:00
Dean Herbert
a8b405791a
Fix non-convert slider and spinner serialization
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
3118f635f6
Merge branch 'master' into editor-fix-multiple-selection
2020-09-14 16:45:30 +09:00
Dean Herbert
62c55165d4
Merge branch 'editor-fix-multiple-selection' into editor-clipboard
2020-09-14 15:47:20 +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
Dean Herbert
0ef4dfc192
Move more logic to base EditorTestScene
2020-09-14 15:27:08 +09:00
Dean Herbert
da02ee8828
Add ability to create a TestBeatmap with no HitObjects
2020-09-14 15:26:57 +09:00
Dean Herbert
692f2c8489
Simplify debounced update pathway
2020-09-14 14:58:00 +09:00
Joehu
4dacdb9994
Fix mod select overlay absorbing input from toolbar ruleset selector
2020-09-13 11:50:21 -07:00
Dean Herbert
320e314356
Use minimum start time to handle SelectedHitObjects not being sorted
2020-09-13 22:53:30 +09:00
Dean Herbert
c573392bb2
Remove completed todo
2020-09-13 22:31:59 +09:00
Dean Herbert
0079d94676
Merge branch 'master' into editor-clipboard
2020-09-13 22:30:13 +09:00
Bartłomiej Dach
3db0e7cd75
Generalise LegacyRollingCounter
2020-09-12 22:40:32 +02:00
Bartłomiej Dach
f17b2f1359
Ensure track is looping in song select immediately
2020-09-12 20:43:17 +02:00
Dean Herbert
5e108e1d6a
Merge branch 'master' into nowplaying-collections-filter
2020-09-12 21:33:07 +09:00
Dean Herbert
1a9f0ac16a
Select new objects
2020-09-12 21:23:12 +09:00
Dean Herbert
3854caae9b
Remove secondary schedule logic
2020-09-12 21:23:12 +09:00
Dean Herbert
81f30cd264
Select blueprint if object is already selected at the point of adding
2020-09-12 21:23:11 +09:00
Dean Herbert
2d9b0acabe
Fix empty selection via keyboard shortcuts crashing
2020-09-12 21:23:10 +09:00
Dean Herbert
001cd1194c
Consume BindCollectionChanged
2020-09-11 22:53:03 +09:00
Dean Herbert
cb14d847de
Update framework
2020-09-11 22:40:12 +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
Dean Herbert
08be45c9e7
Merge branch 'master' into editor-clipboard
2020-09-11 20:35:05 +09:00
Dean Herbert
97b995246a
Merge branch 'editor-fix-multiple-selection' into editor-clipboard
2020-09-11 20:34:58 +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
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
Dean Herbert
de3d8e83e1
Add keyboard shortcuts
2020-09-11 19:55:41 +09:00
Dean Herbert
7d7401123c
Add initial implementation of editor clipboard
2020-09-11 19:54:20 +09:00
Dean Herbert
8e028dd88f
Fix incorrect ordering of ApplyDefaults for newly added objects
2020-09-11 19:54:11 +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
Dean Herbert
ef77658311
Add coverage of case where skin.ini doesn't specify name/author
2020-09-11 16:29:14 +09:00
Dean Herbert
15b533f2a4
Hash skins based on name, not skin.ini contents
...
It is feasible that a user may be changing the contents of skin.ini
without changing the skin name / author. Such changes should not create
a new skin if already imported.
2020-09-11 16:20:54 +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
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
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
a350802158
Fix wrong mono streak length handling in corner case
2020-09-10 20:50:26 +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
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
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
df1537f2a0
Update framework
2020-09-10 18:10:39 +09:00
smoogipoo
d700ae55fb
Merge branch 'master' into morth-taiko-changes
2020-09-10 16:34:09 +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