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

3216 Commits

Author SHA1 Message Date
Salman Ahmed
6aa84424e4 Merge remote-tracking branch 'upstream/master' into fix-new-samples-starting-while-gameplay-paused 2020-09-19 05:53:04 +03:00
smoogipoo
c7d24203ce Make beatmap conversion support cancellation tokens 2020-09-17 17:40:05 +09:00
Dan Balasescu
93269606cd
Merge pull request #10163 from peppy/avoid-test-main-menu-track-change
Pause playback in present tests to avoid track inadvertently changing at menu
2020-09-16 14:56:15 +09:00
Salman Ahmed
105634c099 Add test case ensuring correct behaviour 2020-09-16 01:59:41 +03:00
Dean Herbert
dbfaa4a0df Remove beatmap paths from tests where they would result in exceptions 2020-09-15 22:50:44 +09:00
Dean Herbert
e43e12cb2d Pause playback in present tests to avoid track inadvertently changing at menu 2020-09-15 20:17:59 +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
Dean Herbert
d03bfec807
Merge branch 'master' into fix-test-storage-weirdness 2020-09-15 16:54:06 +09:00
Dan Balasescu
16ae83c499
Merge branch 'master' into editor-clipboard 2020-09-15 16:05:43 +09:00
Dan Balasescu
980511df9b
Merge pull request #10156 from Joehuu/add-collections-to-beatmap-options
Add manage collections button to beatmap options
2020-09-15 15:55:30 +09:00
Dean Herbert
9e73237a90 Fix score present tests potentially succeeding a step when they shouldn't 2020-09-15 15:21:03 +09:00
Dean Herbert
3242b10187 Change order of dependency caching to promote use of locals 2020-09-15 15:00:04 +09:00
Dean Herbert
15e423157b Fix tests that access LocalStorage before BDL 2020-09-15 14:17:40 +09:00
Joehu
c833f5fcc4 Reorder buttons to match stable 2020-09-14 11:23:41 -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
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
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
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
Joehu
e328b791df Add failing mod select input test 2020-09-13 11:49:16 -07:00
Dean Herbert
0079d94676 Merge branch 'master' into editor-clipboard 2020-09-13 22:30:13 +09:00
Dean Herbert
73dd21c8fc Add failing test 2020-09-11 20:27:07 +09:00
smoogipoo
4061480419 Rename menu item 2020-09-11 16:02:46 +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
Bartłomiej Dach
97690c818c Add regression test coverage 2020-09-11 00:12:05 +02: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
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
Dan Balasescu
53a9804455
Merge branch 'master' into add-editor-tool-icons 2020-09-09 21:21:56 +09:00
Dean Herbert
c6e72dabd3 Add test coverage 2020-09-09 20:04:25 +09:00
Dean Herbert
d3957e6155 Move title specification for settings groups to constructor
Using an abstract property was awkward for this as it is being consumed
in the underlying constructor but could not be dynamically set in time from a
derived class.
2020-09-09 18:50:31 +09:00
Dean Herbert
c9f5005efd Add icons for editor toolbox tools 2020-09-09 18:40:01 +09:00
smoogipoo
4ddf5f054b Rename BeatmapCollectionManager -> CollectionManager 2020-09-09 15:31:08 +09:00
Dean Herbert
66d3bda962
Merge branch 'master' into collection-database 2020-09-08 23:18:47 +09:00
Dan Balasescu
d09289b1ce
Merge pull request #10063 from frenzibyte/fix-music-controller-regressed
Move OsuGame-dependent music functionalities outside of MusicController
2020-09-08 22:26:35 +09:00
Dean Herbert
379fdadbe5 Add test scene for setup screen 2020-09-08 19:52:56 +09:00
smoogipoo
4962213cc4 Rename manage collections filter/text 2020-09-08 18:42:55 +09:00
Dean Herbert
e1053c4b6f Revert exposure changes to GlobalActionContainer 2020-09-08 18:36:11 +09:00
Dean Herbert
072aab90ab Merge branch 'master' into fix-music-controller-regressed 2020-09-08 18:26:15 +09:00
smoogipoo
f581df47c8 Add "New collection..." item to dropdown 2020-09-08 18:25:09 +09:00