1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-18 03:12:54 +08:00
Commit Graph

32123 Commits

Author SHA1 Message Date
Dean Herbert
f629c33dc0 Make explosion additive to match stable 2020-09-22 12:14:31 +09:00
Dean Herbert
c5717d8e41
Merge branch 'master' into catch-combo-counter 2020-09-22 11:33:07 +09:00
Dean Herbert
e52a330dd8
Merge pull request #10196 from bdach/missing-hit-explosions
Add support for legacy miss & strong hit explosions
2020-09-21 23:59:36 +09:00
Salman Ahmed
bfe332909c Remove "hide combo counter on break time" feature for being too complex
The combo counter will be hidden at most one second after the break has started anyways, so why not just remove this feature if the way of implementing it is complicated to be merged within the legacy counter implementation.
2020-09-21 14:32:14 +03:00
Dean Herbert
1e09d8fd1a
Merge branch 'master' into catch-combo-counter 2020-09-21 17:53:00 +09:00
Dean Herbert
896aa7f3ea
Merge pull request #10198 from peppy/readme-add-ruleset-templates 2020-09-21 17:49:24 +09:00
Dean Herbert
5b697580af Add mention of ruleset templates to readme 2020-09-21 16:38:16 +09:00
Bartłomiej Dach
a0573af0e1 Fix test failure due to uninitialised drawable hit object 2020-09-20 20:44:31 +02:00
Bartłomiej Dach
4072abaed8 Allow miss explosions to be displayed 2020-09-20 19:40:30 +02:00
Bartłomiej Dach
1c7556ea5d Schedule explosion addition to ensure both hits are processed 2020-09-20 19:40:30 +02:00
Bartłomiej Dach
074387c676 Show strong hit explosion where applicable 2020-09-20 19:40:30 +02:00
Bartłomiej Dach
919b19612f Add lookups for strong hit explosions 2020-09-20 19:40:30 +02:00
Bartłomiej Dach
026fc2023b Add visual tests for strong hit explosions 2020-09-20 19:40:30 +02:00
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