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

32084 Commits

Author SHA1 Message Date
Dean Herbert
e119b78e81
Merge pull request #10193 from tilda/notification-consistency-collections-import
Change collection deletion notification to be consistent
2020-09-20 21:32:41 +09:00
S Stewart
d2f498a268 remove unnec using 2020-09-19 15:13:52 -05:00
S Stewart
c49dcca1ff spacing oops 2020-09-19 14:55:52 -05:00
S Stewart
e0cef6686d Change collection deletion notif to be consistent 2020-09-19 14:54:14 -05:00
Dean Herbert
eacf7210ae
Merge pull request #10191 from smoogipoo/fix-n-squared-diffcalc
Fix n^2 characteristic in taiko diffcalc
2020-09-19 19:57:47 +09:00
smoogipoo
847ec8c248 Fix n^2 characteristic in taiko diffcalc 2020-09-19 14:52:05 +09:00
Dan Balasescu
10400b4b3d
Merge pull request #10188 from peppy/fix-hitobjectupdate-postprocess-order
Ensure BeatmapProcessor.PostProcess is run before firing HitObjectUpdated events
2020-09-18 20:35:55 +09:00
Dan Balasescu
7eba30642e
Merge pull request #10177 from peppy/fix-import-tests-waiting
Fix import tests not waiting long enough before performing migration
2020-09-18 19:42:28 +09:00
Dean Herbert
1fcf443314 Ensure BeatmapProcessor.PostProcess is run before firing HitObjectUpdated events 2020-09-18 19:33:03 +09:00
Dean Herbert
3cef93ee27 Centralise import test helper methods 2020-09-18 18:05:33 +09:00
Dean Herbert
8e767729a2 Merge branch 'master' into fix-import-tests-waiting 2020-09-18 17:45:51 +09:00
Dan Balasescu
72a173d4fc
Merge pull request #10185 from Joehuu/fix-hovered-channel-tabs-color-when-unselected
Fix hovered tab items not showing hover state when deselected
2020-09-18 16:15:27 +09:00
Dan Balasescu
aa2612dd36
Merge branch 'master' into fix-import-tests-waiting 2020-09-18 15:43:33 +09:00
Dan Balasescu
68aaa309b8
Merge branch 'master' into fix-hovered-channel-tabs-color-when-unselected 2020-09-18 15:42:13 +09:00
Joehu
393ee1c9f5 Fix hovered osu tab items not showing hover state when deselected 2020-09-17 23:09:09 -07:00
Dean Herbert
9e02b63130
Merge pull request #10186 from smoogipoo/allow-one-object-edge-case
Allow one hitobject in taiko conversion edge case
2020-09-18 13:51:08 +09:00
smoogipoo
c62e4ef5e5 Allow one hitobject in taiko beatmap converter edge case 2020-09-18 13:06:41 +09:00
Joehu
2ad7e6ca88 Fix hovered channel tabs color when unselected 2020-09-17 19:10:58 -07:00
Dean Herbert
566525e58f
Merge pull request #10182 from Joehuu/chat-overlay-use-new-icon
Use new icon in chat overlay
2020-09-18 10:17:39 +09:00
Joehu
83d23c9547 Use new icon in chat overlay 2020-09-17 14:56:08 -07:00
Dean Herbert
0dceef8cd7
Merge pull request #10178 from smoogipoo/fix-taiko-endless-conversion
Fix potential endless taiko beatmap conversion
2020-09-17 23:31:27 +09:00
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
89a2f20922 Use new CleanRun host class in import tests 2020-09-17 16:12:30 +09:00
Dean Herbert
835c8d74b7 Wait for two update frames before attempting to migrate storage 2020-09-17 16:12:18 +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