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

1012 Commits

Author SHA1 Message Date
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
apollo-dw
684b16cef5 Disambiguate object flipping and reflection methods 2022-12-07 21:09:53 +00:00
Pasi4K5
91e9c27507 Rename FlipSlider() to FlipSliderHorizontally 2022-12-07 00:48:25 +01:00
Pasi4K5
30952199b8 Allow random mod to flip sliders 2022-12-07 00:40:18 +01:00
Dean Herbert
896f2d8f74 Fix multiple instances of last hitobject time being calculated incorrectly 2022-12-01 18:04:06 +09:00
Dan Balasescu
7bc8908ca9 Partial everything 2022-11-27 00:00:27 +09:00
Dario Headley
a8c95c39ad Exclude sliderticks from the " freeze " 2022-11-14 16:18:46 +01:00
Dean Herbert
cd8dc9b17b Rename "Target" to "Target Practice" 2022-11-01 19:47:20 +09:00
Dan Balasescu
37407293aa Adjust target and hold off mod multipliers 2022-11-01 17:57:20 +09:00
Dean Herbert
521fbd2ea3
Merge pull request #20345 from mk56-spn/Freeze_frame_implementation
Add "Freeze Frame" mod
2022-10-26 01:28:23 +09:00
D.Headley
f4aae9138b Remove Incompatibility with HD 2022-10-25 08:48:45 +02:00
Dean Herbert
279ef556e3 Fix typon in comment 2022-10-25 13:27:26 +09:00
Dean Herbert
588fc750cd Change approach circles to all appear at the same time, but don't adjust AR 2022-10-25 13:26:32 +09:00
D.Headley
764bc1948f remove commented out Incompatible mod 2022-10-18 14:59:43 +02:00
D.Headley
acf3498f83 Code Quality 2022-10-18 13:49:10 +02:00
Dario Headley
e1a8bfa135 Fixed approachCircle preempt 2022-10-18 13:40:13 +02:00
Salman Ahmed
7e9229a117 Merge branch 'master' into no-scope-no-smoke 2022-10-15 16:42:34 +03:00
Salman Ahmed
ba72f13f54 Merge branch 'master' into hide-mouse-on-keyboard-input 2022-10-14 22:26:30 +03:00
Salman Ahmed
b1b97505ac Fix smoke displayed in "No scope" mod 2022-10-14 22:16:14 +03:00
Salman Ahmed
09cc89cfa0 Update existing usages of Cursor to handle null value 2022-10-13 00:17:08 +03:00
D.Headley
f67f6cc99c Fix switch case 2022-10-12 19:45:08 +02:00
D.Headley
83aedb1930 Make mod use new Combo, remove pointless test 2022-10-12 12:42:26 +02:00
Salman Ahmed
84fdd2e107 Improve flashlight display on break periods 2022-10-11 17:16:57 +03:00
Dean Herbert
5a5f3af27d Rename property and add xmldoc 2022-10-10 15:42:08 +09:00
MK56
8fe89d5de2
Merge branch 'ppy:master' into Freeze_frame_implementation 2022-10-07 22:23:51 +02:00
Dan Balasescu
8598eb29f8 Adjust flashlight to closely match classic 2022-10-03 18:38:05 +09:00
o-dasher
f3e25eacad Removes unnecessary setting sources specifications 2022-09-27 09:25:58 -04:00
o-dasher
537796c3a1 Cleanup mod bindings 2022-09-25 15:49:22 -04:00
Dean Herbert
9bbb53af40
Merge pull request #20370 from Pasi4K5/random-mod-customisation
Add mod settings `AngleSharpness` and `AngleVariety` to the random mod
2022-09-22 13:52:41 +09:00
Pasi4K5
b1ecac514a Correct comments 2022-09-20 23:13:38 +02:00
Pasi4K5
b7c1e8cc5a Remove setting AngleVariety 2022-09-20 23:11:38 +02:00
Pasi4K5
9eb0a21d75 Correct comments 2022-09-19 00:45:23 +02:00
D.Headley
6d3e42a248 Give enums descriptions, change acronym and remove icon 2022-09-18 23:56:26 +02:00
Pasi4K5
4263933c9e Add settings AngleSharpness and Angle variety 2022-09-18 23:43:14 +02:00
Salman Ahmed
557b39b69b Fix InputBlockingMod not always clearing last action on break periods 2022-09-16 20:01:19 +03:00
Mk-56spn
a0c493656f Remove Incompatibility with Approach Circle requiring mods 2022-09-16 15:27:36 +02:00
Mk-56spn
6db8f51c02 Improve Tests
Fix divisor in test


Add Copyright header
2022-09-16 13:45:18 +02:00
Mk-56spn
5a9b027ebc Use Enum for Settings 2022-09-16 02:57:21 +02:00
Mk-56spn
eb84c513e3 Add ability to adjust to BPM changes
fix first hitcircle being off time


Bpm changes not working fix
2022-09-16 02:14:14 +02:00
Mk-56spn
d2ac25870b Merge remote-tracking branch 'origin/Freeze_frame_implementation' into Freeze_frame_implementation 2022-09-10 14:08:38 +02:00
Mk-56spn
23d435bc42 name changes 2022-09-10 14:08:04 +02:00
MK56
33a435e2ef
Merge branch 'ppy:master' into Freeze_frame_implementation 2022-09-10 00:54:46 +02:00
Dean Herbert
a2f96ea120 Make random implicitly null to avoid potential incorrect behaviour in randomBool 2022-09-09 17:55:54 +09:00
Dean Herbert
5defb8b471
Merge branch 'master' into enhance-randomisation 2022-09-09 17:53:13 +09:00
Mk-56spn
e416c87970 readded approach circles 2022-09-08 15:17:22 +02:00
Mk-56spn
4a6c8785af Clean up 2022-09-08 11:14:56 +02:00
Mk-56spn
7f08de522d Fixed 2022-09-08 01:21:03 +02:00
MK56
e250885204
Merge branch 'ppy:master' into Freeze_frame_implementation 2022-09-08 00:10:44 +02:00
Mk-56spn
5a1b2f9a77 Freeze frame testing 2022-09-08 00:05:48 +02:00
Dean Herbert
b5b66de3c9 Fix target mod crashing if beatmap is played with a break after all hitobjects
Closes https://github.com/ppy/osu/issues/20161.
2022-09-07 17:46:51 +09:00
Dean Herbert
6af8143c8c Fix typing of new setting to allow it to be visible to tools export 2022-08-31 22:34:07 +09:00
Dean Herbert
780121eeee Add setting to toggle metronome in "Target" mod
As mentioned in https://github.com/ppy/osu/discussions/20006#discussioncomment-3496732.
2022-08-29 17:12:10 +09:00
o-dasher
4de6df71c5 No "gameplayClock" usage with playfield update mods 2022-08-24 20:59:32 -04:00
MK56
91742859f1
Merge branch 'ppy:master' into blink_implementation 2022-08-19 16:55:27 +02:00
Mk-56spn
7add3a6950 ar var test 2022-08-18 19:00:54 +02:00
Nao
c940f5abcb
Merge branch 'master' into ruleset-localization 2022-08-14 15:17:44 -04:00
Pasi4K5
5106c00a9c Improve code quality 2022-08-14 19:02:29 +02:00
Pasi4K5
7a41b9f25a Adjust angle and sectionOffset calculations 2022-08-13 03:11:58 +02:00
Pasi4K5
8c624d3269 Add comments and improve code readability 2022-08-13 00:57:49 +02:00
Pasi4K5
78fe72476d Adjust parameters 2022-08-13 00:01:40 +02:00
Dean Herbert
e5e9841652 Apply multiple other mod debuffs as decided in pull request discussion 2022-08-12 18:58:09 +09:00
naoei
3e38baca3c Change ruleset mod description types 2022-08-10 16:09:11 -04:00
Pascal Pomper
f98ee3ff24
Merge branch 'ppy:master' into enhance-randomisation 2022-08-10 12:22:39 +02:00
Dean Herbert
a5fac70c3b Rename variable to not include mode name itself 2022-08-01 23:30:00 +09:00
Dean Herbert
d09976bb39 Merge branch 'master' into Wiggle-strength-duration 2022-08-01 23:29:03 +09:00
Dan Balasescu
415d6def2d Remove unnecessary AsNonNull() 2022-08-01 13:22:58 +09:00
andy840119
632577389d Mark the property as non-nullable. 2022-07-31 21:43:16 +08:00
Salman Ahmed
72961ec336 Flip method parameters to make sense
See 537f64c75e (r931785228)
2022-07-28 08:04:55 +03:00
andy840119
537f64c75e Make original hit objects and random properties as local variable. 2022-07-27 22:15:41 +08:00
Salman Ahmed
89644a652e Separate combined fields 2022-07-27 10:13:44 +03:00
Pasi4K5
da7d297d85 Adjust parameters 2022-07-26 19:07:25 +02:00
andy840119
0fe64d1e80 Remove unused namespace. 2022-07-27 01:05:50 +08:00
為什麼
9134525111 Mark the property as nullable and add some assert check. 2022-07-26 23:58:50 +08:00
為什麼
deb39bd330 Mark the property as nullable or non-nullable. 2022-07-26 23:52:08 +08:00
為什麼
e28584da89 Remove nullable disable annotation in the Osu ruleset. 2022-07-26 23:25:28 +08:00
Salman Ahmed
f68c4e8890 Fix code formatting 2022-07-25 06:36:26 +03:00
mk-56
16e655766e Addressed pertinent issues 2022-07-23 23:30:57 +02:00
MK56
2a3d3a0660
Merge branch 'ppy:master' into Wiggle-strength-duration 2022-07-23 22:58:21 +02:00
Salman Ahmed
4210ec6502 Merge branch 'master' into remove-score-multiplier-on-custom-mod-settings 2022-07-19 19:21:26 +03:00
Salman Ahmed
32ba58109b Remove score multiplier on difficulty-increasing mods with customised settings 2022-07-18 07:29:03 +03:00
Salman Ahmed
0ac3391d54
Merge branch 'master' into cinema-repel-incompatible 2022-07-18 06:55:43 +03:00
tsunyoku
83429d2f22 make cinema incompatible with repel 2022-07-17 20:45:17 +01:00
tsunyoku
491558261f remove unnecessary type-specification 2022-07-17 20:44:06 +01:00
tsunyoku
e13c1254e5 make perfect incompatible with autopilot 2022-07-17 20:41:43 +01:00
Dean Herbert
b93b6ba2ca Change "single tap" mod acronym to not conflict with "strict tracking" 2022-07-16 17:19:55 +09:00
Dean Herbert
e2f2d5f794 Rename last action to better represent that it is only captured actions 2022-07-14 01:40:44 +09:00
James
4d9494d3b3 change LastPressedAction to have a private setter 2022-07-13 14:42:45 +01:00
James
af03002495 make flash duration and ruleset private 2022-07-13 14:31:09 +01:00
James
0da1bd393c privatise checkCorrectAction, add abstract CheckValidNewAction function 2022-07-13 14:29:27 +01:00
Dean Herbert
be3187c3a4 Remove remnant nullable disables 2022-07-13 22:05:56 +09:00
Dean Herbert
33dd9562cc Privatise some fields 2022-07-13 22:04:57 +09:00
Dean Herbert
5e6b9b96b0 Apply NRT to new InputBlockingMod class 2022-07-13 22:02:46 +09:00
tsunyoku
6755a771b4 make Cinema incompatible with InputBlockingMod 2022-07-13 07:49:08 +01:00
tsunyoku
e9b0a3e4fa make alternate and singletap incompatible with eachother 2022-07-13 07:35:53 +01:00
James
20d2b86193 make Single Tap incompatible with Autoplay, Cinema and Relax 2022-07-12 23:18:20 +01:00
James
c05263c3c3 add Single Tap mod 2022-07-12 23:15:18 +01:00
James
f90f93a43c abstract OsuModAlternate into InputBlockingMod 2022-07-12 23:15:18 +01:00
Gabe Livengood
b96734e31a
fix mod incompatibility between repel and relax 2022-07-12 08:43:48 -04:00
Dean Herbert
fa626a82b3 Add missed incompatilibity rules 2022-07-12 15:19:06 +09:00
Gabe Livengood
28278e2554
enable NRT again 2022-07-11 17:27:25 -04:00
Gabe Livengood
54fe84350c
reciprocate mod incompatibility 2022-07-11 17:23:32 -04:00