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

32061 Commits

Author SHA1 Message Date
Dean Herbert
fdbd7b8a05
Merge branch 'master' into fix-taiko-endless-conversion 2020-09-17 22:31:35 +09:00
Dean Herbert
141fbbf5bb
Merge pull request #10180 from smoogipoo/beatmap-conversion-cancellation
Make beatmap conversion support cancellation tokens
2020-09-17 22:30:46 +09:00
smoogipoo
de5ef8a471 Rework to support obsoletion 2020-09-17 21:37:32 +09:00
smoogipoo
e71991a53c Add default token 2020-09-17 18:37:48 +09:00
Dean Herbert
ffa02a2836
Merge pull request #10179 from smoogipoo/fix-spinner-nested-objects 2020-09-17 17:47:48 +09:00
smoogipoo
c7d24203ce Make beatmap conversion support cancellation tokens 2020-09-17 17:40:05 +09:00
smoogipoo
009e1b4445 Make Spinner use cancellation token 2020-09-17 17:05:24 +09:00
smoogipoo
73a7b759cb Add missing obsoletion notice 2020-09-17 17:04:44 +09:00
Dan Balasescu
0d889f8cc0
Merge pull request #10173 from Joehuu/fix-profile-section-tab-control-input
Fix profile section tab control not absorbing input from behind
2020-09-17 16:53:18 +09:00
smoogipoo
81f0a06fc4 Fix potential endless taiko beatmap conversion 2020-09-17 16:30:34 +09:00
Dean Herbert
dd7c3dbc5b
Merge pull request #10133 from peppy/better-skin-hashing 2020-09-17 15:18:09 +09:00
Dan Balasescu
aee8121cb0
Merge branch 'master' into better-skin-hashing 2020-09-17 13:48:14 +09:00
Dan Balasescu
030d1c1966
Merge pull request #10171 from peppy/fix-key-binding-destruction
Fix global bindings being lost when running tests under headless contexts
2020-09-17 13:48:02 +09:00
Dean Herbert
0b289d2e77 Add hostname differentiation to beatmap tests too 2020-09-17 13:07:05 +09:00
Dean Herbert
d2580ebc70 Attempt to fix tests by avoiding clash between import tests names 2020-09-17 13:01:34 +09:00
Dean Herbert
0d9f531e19 Merge branch 'fix-key-binding-destruction' into better-skin-hashing 2020-09-17 13:01:14 +09:00
Dean Herbert
1a3dd7ac76 Merge branch 'master' into better-skin-hashing 2020-09-17 13:01:14 +09:00
Dean Herbert
3529a1bfea Fix global bindings being lost when running tests under headless contexts 2020-09-17 13:01:14 +09:00
Dean Herbert
c7e4b192ae
Merge branch 'master' into better-skin-hashing 2020-09-17 12:30:14 +09:00
Joehu
9063c60b9c Fix profile section tab control not absorbing input from behind 2020-09-16 12:00:27 -07:00
Dean Herbert
ff5b292302 Fix global bindings being lost when running tests under headless contexts 2020-09-16 19:36:36 +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
Dan Balasescu
cd9ed572b8
Merge pull request #10170 from Joehuu/remember-mods-filter
Remember leaderboard mods filter selection in song select
2020-09-16 14:56:01 +09:00
Joehu
c6386ea605 Remember leaderboard mods filter selection in song select 2020-09-15 21:53:35 -07:00
Dean Herbert
53f9381ad9
Merge branch 'master' into better-skin-hashing 2020-09-16 00:25:33 +09:00
Dean Herbert
9a3a543575
Merge pull request #10167 from peppy/fix-filter-control-null
Fix potential nullref in FilterControl during asynchronous load
2020-09-16 00:24:36 +09:00
Dan Balasescu
41416124bf
Merge pull request #10166 from peppy/remove-unnecessary-paths
Remove beatmap paths from tests where they would result in exceptions
2020-09-15 23:50:27 +09:00
Dean Herbert
3c70b3127c Fix potential nullref in FilterControl during asynchronous load 2020-09-15 23:19:31 +09: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
71f32a2e37
Merge pull request #10159 from peppy/fix-test-storage-weirdness
Fix headless test storage misdirection
2020-09-15 20:03:51 +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
c179f9eb93 Merge branch 'master' into fix-test-storage-weirdness 2020-09-15 19:01:16 +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
Dan Balasescu
3b136abd35
Merge pull request #10162 from Morilli/scrollspeed-slider-fix
Fix mania scrollspeed slider precision
2020-09-15 16:28:43 +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
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
b5fbdfbf90
Merge pull request #10161 from peppy/fix-test-incorrect-screen
Fix score present tests potentially succeeding a step when they shouldn't
2020-09-15 15:50:08 +09:00
Morilli
9c041dbac2 Fix mania scrollspeed slider precision 2020-09-15 08:24:01 +02:00
Dan Balasescu
6cbff98295
Merge branch 'master' into add-collections-to-beatmap-options 2020-09-15 15:23:33 +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
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
3242b10187 Change order of dependency caching to promote use of locals 2020-09-15 15:00:04 +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