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

64269 Commits

Author SHA1 Message Date
Bartłomiej Dach
fcb6f40666
Prioritise hyperfruit over non-hyperfruit if simultaneous
In case of simultaneous hyperfruit and non-hyperfruit - which happen to
occur on some aspire maps - the desired behaviour is to hyperdash. This
did not previously occur, due to annoying details in how
`HitObjectContainer` is structured.

`HitObjectContainer`'s drawable comparer determines the order of
updating the objects. One could say that forcing the hyperfruit to be
updated last, after normal fruit, could help; unfortunately this is
complicated by the existence of juice streams and the fact that while a
juice stream can be terminated by a normal fruit that is coincidental
with a hyperfruit, the two are not comparable directly using the
comparer in any feasible way.

Therefore, apply a `Catcher`-level workaround that intends to handle
this locally; in short, if a hyperdash was toggled in a given frame, it
cannot be toggled off again in the same frame. This yields the desired
behaviour.
2023-12-04 09:30:18 +01:00
Bartłomiej Dach
bb198e0c5a
Add test coverage for missing hyperdashes on simultaneous notes 2023-12-04 09:26:23 +01:00
Bartłomiej Dach
0652ea316d
Merge branch 'master' into catch-hyperdash-stable-sort 2023-12-04 09:05:42 +01:00
Dan Balasescu
6f73d78bc9
Replicate integer calculations for catch hyperdash generation 2023-12-04 14:32:14 +09:00
Dan Balasescu
c755bcbec4
Add failing test 2023-12-04 14:30:08 +09:00
Dean Herbert
36b1369a4e
Merge pull request #25636 from Susko3/fix-older-android-storage
Request `READ_EXTERNAL_STORAGE` on older android versions
2023-12-04 12:11:08 +09:00
Dean Herbert
c2a4a6d8cb
Add inline comment matching framework 2023-12-04 12:10:31 +09:00
Dean Herbert
e06d5f5875
Merge pull request #25649 from smoogipoo/remove-mania-drain-again
Once again remove Mania passive HP drain
2023-12-04 12:03:32 +09:00
Dan Balasescu
8587652869
Fix countdown button being enabled 2023-12-04 11:00:11 +09:00
Dan Balasescu
9ccd33a1ec
Add comments to test 2023-12-04 10:20:53 +09:00
Dan Balasescu
c2644a5d5e
Correctly implement button enabled state 2023-12-04 10:18:37 +09:00
Dan Balasescu
b56a78c6ec
Adjust with framework changes 2023-12-04 08:51:21 +09:00
OliBomby
13b7f2fa42 Fix test cases 2023-12-03 22:42:48 +01:00
Dan Balasescu
d0acb7f4f9
Improve commenting
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2023-12-04 06:08:31 +09:00
OliBomby
060141866c Update SliderPlacementBlueprint.cs 2023-12-03 22:06:07 +01:00
OliBomby
b3d1a9ee2e Dont snap expected distance while drawing
This makes it 10 billion times smoother to draw, very nice
2023-12-03 22:03:51 +01:00
OliBomby
ca55a7b2bf call builder finish before ending curve 2023-12-03 21:43:37 +01:00
OliBomby
bcf2effae9 Remove the Linear segment simplification because it just makes things harder to edit afterwards if it made some segment linear type when you actually intended there to be some curve 2023-12-03 21:22:04 +01:00
OliBomby
34b5264616 fix the linear segment 2023-12-03 21:13:27 +01:00
OliBomby
ba2cc0243c update comment 2023-12-03 21:10:01 +01:00
OliBomby
8873824107 fix control points being cleared 2023-12-03 20:53:25 +01:00
OliBomby
4cd6efc8f7 update default parameters 2023-12-03 20:53:05 +01:00
OliBomby
595bc9398a update to new builder control point signature 2023-12-03 20:14:00 +01:00
Dan Balasescu
230278f2c9
Once again remove Mania passive HP drain 2023-12-03 01:47:20 +09:00
Bartłomiej Dach
ee2a06be2f
Merge pull request #25627 from Susko3/fix-overlapping-chat-links
Fix overlapping chat links crashing the game
2023-12-02 16:36:29 +01:00
Susko3
abb4c943a7 Rename to more readable names 2023-12-01 18:35:57 +01:00
Bartłomiej Dach
30a4e77097
Merge branch 'master' into fix-overlapping-chat-links 2023-12-01 14:30:55 +01:00
Bartłomiej Dach
7ac33bc3eb
Merge pull request #25626 from Susko3/cleanup-chat-link-test
Cleanup chat link tests
2023-12-01 14:28:46 +01:00
Bartłomiej Dach
28aa98ab6a
Merge branch 'master' into cleanup-chat-link-test 2023-12-01 13:34:42 +01:00
Dan Balasescu
f3530a79b1
Add test 2023-12-01 21:34:20 +09:00
Bartłomiej Dach
d97ae8df6a
Remove commented out italic code
It's a holdover from the Exo days (anyone remember those?) and hasn't
been relevant for years, so why keep it.
2023-12-01 13:31:11 +01:00
Bartłomiej Dach
cdaff30aa6
Update framework 2023-12-01 13:24:51 +01:00
Susko3
e0eea07a3f Request READ_EXTERNAL_STORAGE on older android versions 2023-12-01 13:01:49 +01:00
Bartłomiej Dach
3d1f10b9eb
Merge pull request #25618 from Joehuu/fix-chat-icon
Fix chat overlay top bar icon being incorrect
2023-12-01 13:00:39 +01:00
Dan Balasescu
1b0fc8ca9d
Refactor 2023-12-01 20:41:41 +09:00
Dan Balasescu
15c9416244
Rename method 2023-12-01 18:47:40 +09:00
Dan Balasescu
a94180c8c6
Rename LoadAborted -> GameplayAborted, AbortGameplayReal -> AbortMatch 2023-12-01 18:26:59 +09:00
Dan Balasescu
894c31753b
Add initial support for aborting multiplayer games 2023-12-01 15:31:06 +09:00
Susko3
d3517998cf Use common Overlaps() logic
This actually fixes the problem and makes the tests pass
2023-12-01 01:11:10 +01:00
Susko3
30bdd2d4c0 Extract Overlaps() logic to accept generic index and length 2023-12-01 01:07:23 +01:00
Susko3
152c7e513e Ignore overlapping links instead of crashing 2023-12-01 00:54:13 +01:00
Susko3
c395ae2460 Add failing tests
They throws `ArgumentOutOfRangeException` on the first drawable Update()
2023-12-01 00:51:20 +01:00
Susko3
7f9ae55f5e Add passing tests 2023-12-01 00:48:55 +01:00
Susko3
1a33bfbb3a Enable NRT 2023-12-01 00:37:16 +01:00
Susko3
fba6349c65 Remove unused properties 2023-12-01 00:36:40 +01:00
Susko3
21fedff54f Check number of links shown 2023-12-01 00:29:37 +01:00
Susko3
7b1ccb38cb Remove redundant string interpolation 2023-11-30 23:35:10 +01:00
Susko3
0520ac265f Move to TestCase-based test 2023-11-30 23:34:43 +01:00
Susko3
52ffbcc6db Move special cases to TestCase'd test 2023-11-30 23:29:22 +01:00
Susko3
3ca3f25492 Extract local method 2023-11-30 23:26:52 +01:00