1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 04:13:00 +08:00
Commit Graph

32184 Commits

Author SHA1 Message Date
Dean Herbert
75d0797cf8
Merge pull request #10146 from bdach/flaky-song-select-tests-v2 2020-09-15 14:17:27 +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
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
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
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
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
70bc0b2bd0 Add back inadvertently removed spacing 2020-09-14 17:52:59 +09:00
Dean Herbert
dafbeda681 Add test coverage for spinners too 2020-09-14 17:48:29 +09:00
Dean Herbert
36a234e5d9 Add slider specific clipboard test 2020-09-14 17:43:27 +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
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
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
66faae2a6b Add basic clipboards tests 2020-09-14 15:27:16 +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
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
3e37f27a66 Fix regressed tests due to schedule changes 2020-09-13 23:22:19 +09: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
fcf3a1d13c Encapsulate combo display better 2020-09-12 22:40:34 +02: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
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
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