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

1012 Commits

Author SHA1 Message Date
Dean Herbert
bf9f20705f
Simplify classic behaviour flag to only need to be specified on the slider itself 2023-11-02 18:31:29 +09:00
Dean Herbert
9c1f4b552e
Rename and invert flags for slider classic behaviours 2023-11-02 17:43:21 +09:00
Dean Herbert
48bdeaeff1
Fix another potential crash in bubbles mod
Storing `DrawableHitObject` for later use is not safe – especially
when accessing `HitObject` – as it's a pooled class. In the case here,
it's important to note that `PrepareForUse` can be called a frame or
more later in execution, which made this unsafe.

Closes https://github.com/ppy/osu/issues/24444.
2023-11-02 02:43:51 +09:00
Dean Herbert
24b1d1e955
Fix code quality fail 2023-10-27 18:18:07 +09:00
Termincc
8b9b085ef5
Address mod incompatibilities
Makes FreezeFrame and Transform mods incompatible.
2023-10-26 22:15:10 +10:00
Dean Herbert
686c45e21b
Merge branch 'master' into legacy-tick-test-coverage 2023-10-20 16:41:32 +09:00
Dean Herbert
54da6f1048
Merge pull request #25160 from bdach/repeat-arrow-hidden-fade
Adjust slider repeat transforms to closer match stable
2023-10-18 18:03:48 +09:00
Dan Balasescu
939b55020c
Merge branch 'master' into legacy-tick-test-coverage 2023-10-18 15:21:31 +09:00
Bartłomiej Dach
30e5f47007
Instantly fade out slider repeats when hidden is active 2023-10-17 14:15:21 +02:00
Dean Herbert
5341a335a6
Bypass Parent nullability checks for now 2023-10-17 17:48:45 +09:00
Dean Herbert
3849b11644
Fix "Hard Rock" mod affecting CS/AR in osu!mania
Closes https://github.com/ppy/osu/issues/25090.

Not sure if there are other exceptions we should account for here.
2023-10-12 19:48:47 +09:00
Dean Herbert
dd6d09189e Remove usage of LastTick in osu! ruleset 2023-09-29 16:58:17 +09:00
Dean Herbert
d7119674e8 Update comments to better explain what LastTick is doing 2023-09-29 14:40:44 +09:00
Dean Herbert
81485c548c Move LegacyLastTickOffset specification to generation code and stop passing everywhere 2023-09-29 14:32:29 +09:00
Salman Ahmed
734ee0e68b Simplify code 2023-09-24 02:22:50 +03:00
Fabian van Oeffelt
7c40072c47 Get first Spinner,Slider or HitCircle instead of only HitCircle
Fixes bug
2023-09-23 13:18:49 +02:00
Dean Herbert
e3e7a81ad9 Remove slider head circle movement (and remove setting from "classic" mod) 2023-09-14 17:49:41 +09:00
Bartłomiej Dach
e9b08219e9
Block input to objects lying under already-hit slider heads before slider is fully judged when classic note lock is active 2023-09-08 13:42:18 +02:00
Bartłomiej Dach
168a828f23
Revert "Block input to objects lying under already-hit hitcircles when classic note lock is active"
This reverts commit 03c61a573e.

The goal here was to handle an edge case discovered during work on note
lock, wherein it was determined that on stable hit circles would block
input from reaching objects underneath them. However, the change
mentioned above did that _too_ hard and caused overlaps to also be
blocked even long past a hit circle has been faded out.

Revert the change pending further (and more careful) investigation.
2023-09-08 10:11:21 +02:00
Bartłomiej Dach
323a4f4522
Only show preempt time when limits are extended 2023-09-07 08:30:02 +02:00
Bartłomiej Dach
bd633889e7
Remove local preempt time calculation
And just use a hitcircle, and read the actual value. Comes with 100%
less chance of forgetting to update either place in the future.
2023-09-07 08:23:50 +02:00
Bartłomiej Dach
9c6f77b26e
Fix too many things being exposed 2023-09-07 08:11:04 +02:00
Dean Herbert
e05d7d5f8d Inline local control 2023-09-07 14:22:06 +09:00
isakvik
2ab11ab568 adds new diffsetting control that shows millisecond values for approach rate override 2023-09-07 01:41:22 +02:00
isakvik
3db0d0d341 extendable minimum AR value for osu!std diff adjust mod, set to -10 2023-09-06 23:26:34 +02:00
Dean Herbert
1a37543d28 Rename SliderVelocity to SliderVelocityMultiplier to distinguish from Velocity 2023-09-06 19:01:08 +09:00
Bartłomiej Dach
03c61a573e
Block input to objects lying under already-hit hitcircles when classic note lock is active 2023-09-05 22:50:27 +02:00
Dean Herbert
0da37e4e99
Merge pull request #24701 from frenzibyte/remove-flashlight-slider-dim-transform
Apply flashlight slider dim immediately to match osu!(stable)
2023-09-04 16:35:30 +09:00
Salman Ahmed
920c6fa48f Update comment 2023-09-01 23:29:51 +03:00
Salman Ahmed
f74dfa9c6c Apply flashlight slider dim immediately to match osu!(stable) 2023-09-01 22:55:33 +03:00
Dean Herbert
90121814f9 Merge branch 'master' into stable-notelock 2023-09-01 17:15:48 +09:00
Salman Ahmed
993cebe785 Fix mod "Classic" interfering with DrawableHitCircle animation while in hit state 2023-08-30 21:42:47 +03:00
Bartłomiej Dach
7f215f163f
Use reduced hittable range with autopilot active 2023-08-24 08:52:49 +02:00
Liam DeVoe
6a81230298 rename ObjectOrderedHitPolicy to LegacyHitPolicy 2023-07-19 14:44:28 -04:00
Bartłomiej Dach
6d32206a08
Fix slider tails receiving wrong colours
Only visually apparent on legacy skins.
2023-06-19 17:47:01 +02:00
Dean Herbert
0900cebc0d Avoid doing expensive colour fetch operation every update 2023-06-19 20:12:17 +09:00
Dean Herbert
aa96fefae2 Merge branch 'master' into snap-colour-mod 2023-06-19 20:01:36 +09:00
John Biddle
d07437f810 Added recommendations from bdach:
Fixed null checking in ApplyToDrawableHitObject
Renamed mod to "Synesthesia"
Moved to the "Fun" mod category
2023-06-08 00:52:28 -07:00
Dean Herbert
247fa088db Add IHasNoTimedInputs interface to scope change further 2023-06-06 22:22:42 +09:00
Dean Herbert
a5fd833214 Fix "bubbles" mod not adding pool to hierarchy (and constructing too early) 2023-06-02 23:01:03 +09:00
John
ed850196d9 Reverted to applying the color change in OnUpdate, removed EnableComboColour flag from DrawableHitObject.cs 2023-05-30 01:43:08 -07:00
Dean Herbert
3e94d4bb5a Fix cursor ripples appearing in a weird place when "autopilot" mod is enabled 2023-05-30 15:18:23 +09:00
John
b7dc8d49ba Removed import for Allocation and other unnecessary [Resolved] tag missed in last commit 2023-05-16 21:14:55 -07:00
John
e2633ae993 Removed unnecessary [Resolved] attribute (thanks bdach)
Moved accent color assignment from OnUpdate to ApplyCustomUpdateState. In order to get this to work, a flag needed to be added to DrawableHitObject.cs to disable combo color updates also being applied.
2023-05-16 21:08:56 -07:00
Bartłomiej Dach
a6ddb107cd
Merge branch 'master' into master 2023-05-14 19:45:31 +02:00
alix
d503312788 updates and add changes 2023-05-14 13:37:44 -04:00
John
7a907f7207 Code quality improvements (thanks to ItsShamed): Removed #nullable disable, fixed incorrect LocalisableString, removed incorrect dependency injection for OsuColour, fixed nullable dependency for IBeatmap
Removed unnecessary usage of "this." caught by the CI code quality check
2023-05-12 22:13:39 -07:00
John
24f07633f3 Formatting fixes 2023-05-12 19:43:28 -07:00
John
e5884016ab Initial commit for the snap colour mod. Implements basic functionality. 2023-05-12 19:07:25 -07:00
alix
b3a5e4d305 nest class outside of OsuModRandom 2023-05-12 00:29:00 -04:00
alix
53ab780796 fix indents 2023-05-11 23:50:45 -04:00
alix
e50cab9e81 move class to the bottom of the file 2023-05-11 23:48:31 -04:00
alix
a4954e64ac fix precision from making mouse input also go 0.5 2023-05-11 23:45:41 -04:00
js1086
3bce7ac589 Copy SliderVelocity to strict tracking sliders 2023-05-11 19:07:22 +01:00
alix
4732c8a06c fix angle sharpness slider value from not always scaling by 0.5 2023-05-11 13:46:07 -04:00
Dean Herbert
e44672bdd5 Avoid using Schedule in transforms (doesn't handle rewind well) 2023-05-02 17:08:49 +09:00
Dean Herbert
7830711c8e Tidy up various code quality issues in OsuModBubbles 2023-05-02 17:08:37 +09:00
Dean Herbert
fb0e90913d Ensure lifetime start is also updated when reverting judgements 2023-05-02 17:07:12 +09:00
Dean Herbert
b2b9f2a036 Merge branch 'master' into bubble_mod_implementation_clean 2023-05-02 16:59:55 +09:00
Dan Balasescu
ad51f880e0 Remove overrides on DC/NC mods 2023-04-10 17:49:29 +09:00
Dan Balasescu
15f6bc155e Add progressive score multiplier for HT 2023-04-10 13:35:48 +09:00
Dan Balasescu
c923482976 Add progressive score multiplier for DT 2023-04-10 13:31:48 +09:00
Dean Herbert
7b34607676 Merge branch 'master' into bubble_mod_implementation_clean 2023-03-16 13:45:22 +09:00
Dean Herbert
a8c692a215
Merge pull request #22635 from peppy/use-overlays-container-more
Use `Overlays` container rather than `KeyBindingInputManager` for flashlight
2023-02-22 18:30:21 +09:00
Dean Herbert
ee87a29376
Merge pull request #22543 from Cwazywierdo/hitcircle-late-miss-fade
Fix hit circle late-miss fading differences compared to stable
2023-02-21 13:56:57 +09:00
MK56
b74c1c8334
Merge branch 'master' into bubble_mod_implementation_clean 2023-02-19 21:36:59 +01:00
Bartłomiej Dach
8a488ebccc
Actually simplify condition 2023-02-19 16:39:35 +01:00
Adam
58d64cdbd0 Clarify usingHiddenFading logic 2023-02-18 17:33:33 -06:00
Adam
e06502085e Enable fading when hidden only hides appreach circles 2023-02-16 16:31:42 -06:00
mk56-spn
d5bc8e2941 Code cleanup pass:
Make bubble transform logic more sane.

Extract bubble `getPosition()` method.

Address poorly named variables.
2023-02-16 11:12:30 +01:00
Dean Herbert
7afdcb9383 Merge branch 'master' into hide-resume-overlay 2023-02-16 15:42:14 +09:00
mk56-spn
8fc35b159f Remove dysfunctional slider colouring 2023-02-15 10:04:50 +01:00
mk56-spn
297963b461 Remove BubbleInfo struct and consume DrawableOsuHitObjects directly 2023-02-15 10:00:46 +01:00
mk56-spn
1d1c794ccf Invert pointless nested if statement 2023-02-15 09:37:47 +01:00
mk56-spn
e9a7d90273 make transform duration for bubble a method instead of a variable 2023-02-15 09:33:18 +01:00
mk56-spn
82292d6162 Make colouring for bubble more intuitive and remove unnecessary alpha assignment 2023-02-15 09:30:56 +01:00
Adam
5e774a28d8 Correct timings to match stable exactly + don't fade with hidden 2023-02-15 01:02:54 -06:00
mk56-spn
5db624159b Change bubble rewind removal to be in ApplyToDrawableHitObject method. 2023-02-14 18:06:43 +01:00
mk56-spn
92c61c7339 move logic for bubble invoking to ApplyToDrawableHitobject()` method 2023-02-14 16:31:34 +01:00
mk56-spn
2d49b5f9d6 Move bubbles to ruleset overlays container 2023-02-14 14:03:48 +01:00
mk56-spn
d100a4a491 Make lastJudgedHitObject nullable, and fix typo in name. 2023-02-14 10:12:37 +01:00
Dean Herbert
c540d78fbc Expose the actual KeyBindingInputManager
Turns out that `CreateInputManager` is called more than once, and some
mods (ie. `InputBlockingMod`) rely on consuming the "main" one. So let's
go back to accessing and exposing in `DrawableOsuRuleset` rather than
storing out own reference.
2023-02-14 18:10:26 +09:00
Dean Herbert
5ec5222d8a Expose and consume OsuInputManager explicitly 2023-02-14 17:36:07 +09:00
Pasi4K5
e4b84ebd0b Add UseResumeOverlay and use it for hiding the ResumeOverlay 2023-02-13 23:51:39 +01:00
mk56-spn
6ff6e06a69 Simplify bubble container structure, modify some comments 2023-02-12 11:37:07 +01:00
mk56-spn
5e0c4aa904 Refactor pooling for bubbles, tweak the animations a tad, add some clarifying comments 2023-02-12 00:59:46 +01:00
Adam
7bad0113cd Move early fade effect to classic mod setting 2023-02-09 16:20:11 -06:00
mk56-spn
f0d4b9f0ca Add inline comment for colour border override 2023-02-06 17:00:47 +01:00
Dean Herbert
abcb564a74 Code quality pass of OsuModBubbles 2023-02-06 17:35:43 +09:00
mk56-spn
3bdf83bf44 Redo the drawable structure of bubbledrawable to run and look better 2023-01-29 00:48:14 +01:00
mk56-spn
66da4c0288 Add colouration to the sliders to better match the vibrancy of the mod 2023-01-28 17:38:24 +01:00
mk56-spn
c3090dea5f Simplify animations 2023-01-28 00:30:30 +01:00
mk56-spn
7c81f1e75b Remove unnecessary BDL from bubble drawable
Improve animation duration formula
2023-01-27 12:53:19 +01:00
MK56
c50604f701
Merge branch 'master' into bubble_mod_implementation_clean 2023-01-27 11:58:56 +01:00
Pasi4K5
8b47af6503 Remove HidesResumeOverlay and set ResumeOverlay to null in OsuModAutopilot 2023-01-24 00:49:09 +01:00
Pasi4K5
75a1a2ec2f Hide ResumeOverlay when OsuModAutopilot is enabled 2023-01-22 03:44:59 +01:00
Gabe Livengood
dfbbc4002c address test failure 2023-01-17 10:22:58 -05:00
mk56-spn
ca84b885dc Add more detail to bubbles 2023-01-11 17:51:41 +01:00
mk56-spn
8a108b143e Address mod incompatibilities 2022-12-25 23:11:15 +01:00
mk56-spn
bbb22479a8 Add "ModBubbles" for the osu ruleset. 2022-12-25 23:09:52 +01:00