1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-21 14:02:54 +08:00
Commit Graph

4123 Commits

Author SHA1 Message Date
Xexxar
b51a8dead5 Merge branch 'aim-refactor-velocity' into aim-refactor-ppcalc 2021-10-21 19:29:30 +00:00
Xexxar
be2f9603c9 merged slider updates 2021-10-21 19:29:06 +00:00
Xexxar
e3a0e4749e removed excess acute anglebuff and buffed sliders to comp 2021-10-21 19:28:06 +00:00
Xexxar
55809c43ee Merge branch 'aim-refactor-velocity' into aim-refactor-ppcalc 2021-10-21 18:38:59 +00:00
Xexxar
692c7b4be1 Merge branch 'aim-refactor-slider' into aim-refactor-velocity 2021-10-21 18:38:32 +00:00
Xexxar
b1c18d1f36 Merge branch 'aim-refactor-base' into aim-refactor-slider 2021-10-21 18:37:22 +00:00
Xexxar
2f8972b529 reverted overwritten file 2021-10-21 18:37:06 +00:00
Xexxar
ca3259d4e9 Merge branch 'aim-refactor-velocity' into aim-refactor-ppcalc 2021-10-21 17:22:33 +00:00
Xexxar
fd991296fa Merge branch 'aim-refactor-slider' into aim-refactor-velocity 2021-10-21 17:22:09 +00:00
Xexxar
613a548583 Merge branch 'aim-refactor-base' into aim-refactor-slider 2021-10-21 17:21:52 +00:00
Xexxar
d6aa2fe6e4 identified case with spinner where / 0 could theoretically be possible 2021-10-21 17:21:34 +00:00
Xexxar
a23330c49b removed comment 2021-10-21 17:21:03 +00:00
Xexxar
dba0ee0b1d added ppcalc changes to build 2021-10-21 17:18:24 +00:00
Xexxar
81e817f881 updated to latest version of velchange 2021-10-21 17:07:56 +00:00
Xexxar
276b4afdb0 removed unnecessary test code 2021-10-21 16:14:31 +00:00
Xexxar
4fe007aa2e new slider travel dist algorithm 2021-10-21 16:08:35 +00:00
Xexxar
bef6e100fa Merge branch 'aim-refactor-base' into aim-refactor-slider 2021-10-21 16:01:38 +00:00
Xexxar
cb605f9156 removed ppCalc changes and sliderabuseChecks 2021-10-21 16:00:57 +00:00
Xexxar
750c5a0181 Merge remote-tracking branch 'ppy/master' into aim-refactor-base 2021-10-21 15:45:31 +00:00
Xexxar
c074304ec3 updated to latest version of base 2021-10-17 04:48:57 +00:00
Xexxar
14d405786e resolved nans and added stacked slider fix 2021-10-17 03:56:53 +00:00
smoogipoo
30eb08d394 Merge branch 'master' into aim-refactor-base 2021-10-17 12:00:39 +09:00
smoogipoo
80827b741f Merge branch 'master' into effective-miss-count 2021-10-16 21:43:34 +09:00
StanR
ccaac97794 Clamp comboBasedMissCount 2021-10-16 14:50:15 +03:00
StanR
c8d99e68a5 Remove calculation for scores with combo above threshold, avoid division by zero 2021-10-15 16:51:05 +03:00
smoogipoo
1a18d3598a Merge branch 'master' into fix-invisible-sinners 2021-10-15 20:45:40 +09:00
Dean Herbert
30c3fcb4ea Merge branch 'master' into slider-timeline-velcotiy-adjust-v2 2021-10-15 19:45:04 +09:00
Dean Herbert
4cba1fce07
Merge pull request #15111 from jaswon/ghost-mod
Add "no scope" mod for osu
2021-10-15 15:44:05 +09:00
Dean Herbert
3a7eb7dd25 Make const private 2021-10-15 14:27:20 +09:00
Dean Herbert
6a80a417bd Use Interpolation.Lerp instead of transforms
Better handles cases where the combo may be changing faster than the
transition length.
2021-10-15 14:25:51 +09:00
Jason Won
538d980072 Rename Mod 2021-10-15 00:22:57 -04:00
Jason Won
2dfc42dd53 revert interpolation changes + fix cursor trail 2021-10-14 23:34:43 -04:00
Jason Won
23b50a054b address comments 2021-10-14 20:50:47 -04:00
Jason Won
6b1534f5a6 Add "ghost" mod for osu 2021-10-14 18:30:55 -04:00
smoogipoo
901f107b2e Merge branch 'master' into slider-timeline-velcotiy-adjust-v2 2021-10-14 17:25:51 +09:00
StanR
205d95e8c6 Approximate amount of effective misses using combo 2021-10-13 20:04:34 +03:00
Xexxar
4edf559408 adjusted constant to 1.5 from 2.0 for acute 2021-10-13 16:45:58 +00:00
Xexxar
cde4b0b17c forgot to add double delcaration, remember to test 2021-10-13 16:25:16 +00:00
Xexxar
0b794728ea updated to latest version with slider calc 2021-10-13 16:17:49 +00:00
Xexxar
0292fe1c83 removed residual code leftover 2021-10-13 16:04:39 +00:00
Xexxar
200149c9d7 updated to newly refactored aim 2021-10-13 15:41:24 +00:00
Dan Balasescu
e49f1f6e6b
Merge branch 'master' into no-more-difficulty-control-points-info 2021-10-13 20:17:57 +09:00
Xexxar
56daac73f2 merged ppy/master 2021-10-10 17:12:49 +00:00
Dean Herbert
b8fe744d2b
Merge pull request #15008 from stanriders/remove-int-casts
Remove int casts in difficulty calculation
2021-10-10 16:48:37 +09:00
smoogipoo
e7a3467655 Merge branch 'master' into skillsrework 2021-10-10 16:16:54 +09:00
StanR
abd32e30f1
Update osu.Game.Rulesets.Osu/Difficulty/Preprocessing/OsuDifficultyHitObject.cs
Co-authored-by: Liam DeVoe <orionldevoe@gmail.com>
2021-10-09 21:11:24 +03:00
StanR
3b0b8707fe Reduce nesting, check all objects for spinners 2021-10-09 20:28:42 +03:00
StanR
b72b071c25 Fix instant spinners giving insane amounts of strain 2021-10-09 12:35:17 +03:00
StanR
37632fe4dc Remove int casts in difficulty calculation, fixup some comments 2021-10-09 12:08:57 +03:00
smoogipoo
f0affa9f5a Don't refer to BeatmapInfo 2021-10-08 19:50:31 +09:00
smoogipoo
3a4807a032 Merge branch 'master' into blinds-pp 2021-10-08 19:45:59 +09:00
smoogipoo
bc37cb6f43 Merge branch 'master' into no-more-difficulty-control-points-info 2021-10-08 18:41:17 +09:00
smoogipoo
cefef81cdf Merge branch 'master' into skillsrework 2021-10-08 18:21:51 +09:00
Dan Balasescu
5b89293fa3
Merge pull request #14942 from apollo-dw/relax-osu-pp
Implement Relax difficulty calculation in osu!
2021-10-08 16:47:43 +09:00
apollo-dw
57c069e0e1 Remove unused strings 2021-10-06 23:50:23 +01:00
apollo-dw
d6eab02d92 Return 0 for speed with relax 2021-10-06 16:53:33 +01:00
apollo-dw
34269d48e5 Use global multipliers instead of multiplying skill values 2021-10-06 12:25:19 +01:00
Dean Herbert
b339c149d8 Copy BaseDifficulty to Beatmap<T> and move all write operations across 2021-10-06 15:10:45 +09:00
emu1337
d17beb9bbe improved overall balance 2021-10-06 01:39:01 +02:00
emu1337
3cb816b6cd fixed some nerfs not carrying to the next iteration 2021-10-05 21:19:00 +02:00
Dean Herbert
bd84a8b749 Merge branch 'new-interfaces' into beatmap-difficulty-more-interface-usage 2021-10-05 18:21:21 +09:00
Dean Herbert
1d99bc280f Merge branch 'master' into new-interfaces 2021-10-04 20:42:40 +09:00
Dan Balasescu
aa1bfc16d2
Merge pull request #14929 from peppy/gameplay-state
Replace `GameplayBeatmap` with `GameplayState`
2021-10-04 15:56:44 +09:00
Xexxar
94f8692b00 removed acc changes to put in seperate PR 2021-10-03 17:42:49 +00:00
Xexxar
bc3ae4c4f8 changed function names to be consistent 2021-10-03 17:36:34 +00:00
Xexxar
6d134b2a83 resolved code cleanliness issues 2021-10-03 17:32:03 +00:00
Xexxar
ba2c44a2f4 reworked strain to fix issue with overlapping hitwindo 2021-10-03 17:31:56 +00:00
Bartłomiej Dach
5e5cdaab5e
Privatise setter
Co-authored-by: Dean Herbert <pe@ppy.sh>
2021-10-03 19:14:01 +02:00
Bartłomiej Dach
abe0ced48c
Proxy slider head circle number along with overlay 2021-10-03 15:53:49 +02:00
apollo-dw
03f0a36589 additional balancing 2021-10-03 11:53:14 +01:00
apollo-dw
bc1ff019da Implement relax checks 2021-10-03 11:27:17 +01:00
apollo-dw
a5025dc8b8 Buff base multiplier 2021-10-01 22:23:16 +01:00
Dean Herbert
32afd3f426 Replace all basic usages 2021-10-02 02:22:23 +09:00
apollo-dw
310bf3e580 more code quality (oops) 2021-10-01 15:29:20 +01:00
apollo-dw
7d77c279e1 Merge branch 'blinds-pp' of https://github.com/mrowswares/osu into blinds-pp 2021-10-01 15:27:17 +01:00
apollo-dw
57b9a91cba trim whitespace cuz code quality 2021-10-01 15:26:59 +01:00
apollo
d13e8c0354
Merge branch 'ppy:master' into blinds-pp 2021-10-01 15:24:13 +01:00
apollo-dw
7884dbbd11 adjust formulae 2021-10-01 15:04:44 +01:00
Dean Herbert
ac471a0ec1 Merge branch 'no-more-difficulty-control-points-info' into slider-timeline-velcotiy-adjust-v2 2021-10-01 17:46:58 +09:00
Dean Herbert
05996cc2e9 Add changes that got forgotted in branch surgery 2021-10-01 17:04:53 +09:00
Dean Herbert
a92d499d7a Convert usages of BeatmapDifficulty to IBeatmapDifficultyInfo 2021-10-01 16:55:50 +09:00
Xexxar
d14eed88fd final clean up before PR 2021-09-29 19:14:54 +00:00
Dean Herbert
46bafb6252 Merge branch 'master' into no-more-difficulty-control-points-info 2021-09-28 13:53:56 +09:00
Bartłomiej Dach
5bd09a4a30
Rename inner lambda parameter 2021-09-27 22:21:14 +02:00
Bartłomiej Dach
7a0499ad07
Fix repeat arrow texture not falling back to default legacy skin 2021-09-27 21:45:26 +02:00
Xexxar
7001578045
Update osu.Game.Rulesets.Osu/Difficulty/Preprocessing/OsuDifficultyHitObject.cs
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2021-09-26 20:39:57 -05:00
Xexxar
e4fb5a01c9 readded missing aim nerf for low acc 2021-09-26 21:58:26 +00:00
Xexxar
c4430182dd used new slider bonus alg to not overbuff slider jumps 2021-09-26 21:32:36 +00:00
Xexxar
81921bee11 updated rhythmbonus to be OD sensitive 2021-09-26 19:46:24 +00:00
apollo-dw
b6f494cbb7 accuracy and speed changes pt 1 2021-09-25 17:34:24 +01:00
Xexxar
b7444ee9eb replaced original velocity alg 2021-09-25 04:20:35 +00:00
Xexxar
ffa0fac5eb refactored to clean up issues with streams 2021-09-25 04:08:05 +00:00
Xexxar
2508171d41 nerfed rhythm further to attempt to balance 2021-09-25 03:52:05 +00:00
Xexxar
9802f4fc90 added wide angle buff to velchange 2021-09-25 03:37:19 +00:00
Xexxar
010078778e velocity buff isolation + small refactor 2021-09-25 03:27:07 +00:00
Xexxar
8c6a035369 added slider calc bonus 2021-09-25 03:04:22 +00:00
Xexxar
587cf09d2a base change of aim refactor, isolated 2021-09-25 03:02:33 +00:00
Xexxar
0129762104 merged in strainTime change and augmented rhythm calc 2021-09-25 02:52:10 +00:00
apollo-dw
70119d3a43 add drain rate term 2021-09-24 15:02:19 +01:00
apollo-dw
c62e429cea buff miss factor 2021-09-22 19:02:25 +01:00
apollo-dw
857ce721da share BlindsMultiplier everywhere, make it completely negate HD pp 2021-09-22 16:48:11 +01:00
apollo-dw
e52621c60f basically disable HD pp when blinds enabled 2021-09-22 16:38:50 +01:00
apollo-dw
85fd4bdbf8 add accuracy nerf 2021-09-22 16:19:41 +01:00
apollo-dw
2bac15ca1a base formula implementation 2021-09-22 14:17:27 +01:00
Dan Balasescu
512af8809e
Merge pull request #14617 from apollo-dw/speedpp
Remove speed caps in osu! difficulty calculation
2021-09-22 12:10:16 +09:00
Dean Herbert
60c9e9f704
Merge pull request #14805 from bdach/rectangular-snap-grid
Add rectangular snap grid to osu! editor composer
2021-09-22 00:12:03 +09:00
Dean Herbert
59d6a718d6 Fix value not being loaded from beatmap in case of most dense grid setting 2021-09-21 20:09:34 +09:00
smoogipoo
e3b6c15a73 Merge branch 'master' into speedpp 2021-09-21 18:41:27 +09:00
smoogipoo
6c91d39c15 Remove GameplayClock dependency 2021-09-21 14:48:46 +09:00
smoogipoo
f0971cb90c Fix kiai spawner using wrong current time 2021-09-21 14:40:33 +09:00
smoogipoo
b9c91111d2 Add some whitespace 2021-09-21 12:43:29 +09:00
Dan Balasescu
6d6ad126a4
Merge branch 'master' into fl-total-sr 2021-09-21 12:31:40 +09:00
Dan Balasescu
204ee2e281
Merge branch 'master' into fl-skill 2021-09-21 12:06:28 +09:00
Bartłomiej Dach
c911332540
Merge branch 'master' into correct-reverse-arrow-depth 2021-09-20 22:32:28 +02:00
Bartłomiej Dach
d15bd5a15e
Store grid size back to beatmap on change 2021-09-20 20:39:39 +02:00
Bartłomiej Dach
0d7dac03f4
Start with largest grid size 2021-09-20 20:34:22 +02:00
Bartłomiej Dach
52542374e8
Fix rectangular grid snap being always active 2021-09-20 20:14:28 +02:00
Bartłomiej Dach
b5af01f456
Always show rectangular grid in osu! composer 2021-09-20 20:13:06 +02:00
Dean Herbert
20eeb36567 Avoid AliveObject enumeration when not in kiai section 2021-09-20 18:49:36 +09:00
Dean Herbert
cdef6d0cf5 Add key binding support for grid mode cycle 2021-09-20 16:43:15 +09:00
Bartłomiej Dach
4e094b2127
Implement grid size toggling matching stable 2021-09-19 20:26:02 +02:00
Bartłomiej Dach
e1738025d4
Add basic integration of rectangular grid to osu! composer 2021-09-19 18:07:20 +02:00
Opelkuh
761da45f6a Revert af4c3727d77a16e2534df9bbf452336b5c544342 2021-09-19 14:00:56 +02:00
Opelkuh
af4c3727d7 Fix build errors 2021-09-19 04:39:35 +02:00
Opelkuh
1d7d779f66 Merge branch 'master' into add-legacy-star-particles 2021-09-19 04:34:35 +02:00
Opelkuh
3f8454cb76 Remove abstract from ParticleSpewer 2021-09-19 03:19:16 +02:00
Bartłomiej Dach
36237398fa
Remove accidental leftover nullable BDL spec 2021-09-18 18:24:36 +02:00
Bartłomiej Dach
c23354bb67
Remove unused setter 2021-09-18 16:28:44 +02:00
Bartłomiej Dach
59657aca9a
Remove redundant qualifier 2021-09-18 16:28:25 +02:00
Bartłomiej Dach
79438c19a4
Fix slider parts not reproxying after first hitobject freed 2021-09-18 16:27:30 +02:00
Xexxar
cdd813926b nerf to high bpm rhythm changes, nerf to 1/3->1/4 2021-09-17 00:27:42 +00:00
Dean Herbert
fde7c88999
Merge branch 'master' into update-framework 2021-09-16 22:49:02 +09:00
smoogipoo
bcbd0e0961 Revert ctor param 2021-09-16 20:06:20 +09:00
smoogipoo
d8f27633a4 Fix legacy approach circles accepting alpha 2021-09-16 19:35:15 +09:00
smoogipoo
f9d5abff8a Update with keybinding changes 2021-09-16 18:26:12 +09:00
Dean Herbert
2df4073946 SpawnParticle -> CreateParticle (and set time outside of virtual call)
Allows easier overriding (no need to call the `base.CreateParticle` call
and worry about overwriting the time value.
2021-09-16 16:52:46 +09:00
Dean Herbert
29ce2f05bd Remove implied defaults 2021-09-16 16:44:46 +09:00
smoogipoo
7976442aec Fix CI issues 2021-09-16 14:20:42 +09:00
smoogipoo
2dd9d457e8 Merge branch 'master' into speedpp 2021-09-16 14:18:47 +09:00
Opelkuh
32d65adb35 Fix cursor particle scale 2021-09-15 21:22:37 +02:00
apollo-dw
2637c063a9 forgot a deltatime 2021-09-15 15:40:26 +01:00
apollo-dw
2c3e7bfd2d moved 2b straintime cap up to 25ms 2021-09-15 15:27:36 +01:00
apollo-dw
463b92fcca remove unused strings 2021-09-15 12:41:29 +01:00
apollo-dw
cf63a45f32 swap speedwindowratio in cap so values are correct 2021-09-15 12:36:15 +01:00
apollo-dw
2fe0681310 elaborate comment 2021-09-15 12:03:47 +01:00
apollo-dw
7f6722e43f throw math.max(N, 1) into straintime 2021-09-15 11:24:48 +01:00
apollo-dw
4017598af0 simplify algebra down 2021-09-15 11:15:05 +01:00
apollo-dw
3a16ec277a refactor speed window ratios 2021-09-15 11:12:36 +01:00
apollo-dw
a0bd73c356 refactor hit window calc 2021-09-15 10:52:50 +01:00
apollo-dw
49658b6f82 set greatWindow to readonly 2021-09-15 10:29:30 +01:00
apollo-dw
6d254fba0a digestify speed return 2021-09-15 10:27:18 +01:00
MBmasher
a8539bc75b Add newline to end of file 2021-09-15 19:04:36 +10:00
MBmasher
33e1273df8 Include Flashlight in total SR calculation 2021-09-15 19:03:42 +10:00
MBmasher
31baac5879
Merge branch 'master' into fl-skill 2021-09-15 11:50:25 +10:00
apollo-dw
8796e45f63 prevent 2B objects from dividing by zero 2021-09-14 15:22:03 +01:00
Dean Herbert
2114a4729c Set a sane default for new slider blueprints 2021-09-14 18:28:27 +09:00
smoogipoo
81ced68f89 Merge branch 'master' into display-sr-changes 2021-09-14 13:32:58 +09:00
MBmasher
c4fbae136a Rename FlashlightStrain to FlashlightRating 2021-09-14 10:34:21 +10:00
MBmasher
453d63cd5c Merge branch 'fl-skill' of https://github.com/mbmasher/osu into fl-skill 2021-09-14 10:23:41 +10:00
MBmasher
178a3d1132 Remove redundant check 2021-09-14 10:23:11 +10:00
Opelkuh
d13ff12a3e Remove hardcoded particle scale 2021-09-14 00:36:52 +02:00
Opelkuh
c4886be7e1 Add StarBreakAdditive config support 2021-09-14 00:36:01 +02:00
Opelkuh
9fd616c578 Tiny refactor 2021-09-14 00:16:42 +02:00
Opelkuh
224244801f Remove Particles namespace 2021-09-13 21:44:27 +02:00
Opelkuh
16f98357e6 Add cursor particles tests 2021-09-13 21:44:25 +02:00
Opelkuh
82d16ab394 Fix LegacyCursorParticles texture null reference 2021-09-13 21:44:24 +02:00
Opelkuh
a688e69859 Scale down cursor particles 2021-09-13 21:44:24 +02:00
Opelkuh
911282234e Rename legacy cursor particle classes 2021-09-13 21:44:23 +02:00
Opelkuh
8862d3fa1e Add OsuSkinComponents.CursorParticles 2021-09-13 21:44:23 +02:00
Opelkuh
99eff4f41f Move cursor particles under OsuCursorContainer 2021-09-13 21:44:22 +02:00
Opelkuh
c2f7b01ca4 Change particle AngularVelocity into StartAngle and EndAngle 2021-09-13 21:44:21 +02:00
Opelkuh
6d68da8ff0 Remove StartScale from ParticleSpewer particles 2021-09-13 21:44:20 +02:00
Opelkuh
db662f8c5c Add ParticleParent option to ParticleSpewer 2021-09-13 21:44:20 +02:00
Opelkuh
5b1b36436f Add cursor velocity to star particles 2021-09-13 21:44:19 +02:00
Opelkuh
ee4006f3d7 Add legacy cursor star particles 2021-09-13 21:44:18 +02:00
apollo-dw
68050a4073 Merge branch 'speedpp' of https://github.com/mrowswares/osu into speedpp 2021-09-13 14:51:19 +01:00
apollo-dw
e9f7258f2b adjust hitwindow nerf to be harsher 2021-09-13 14:50:40 +01:00
smoogipoo
0dc31a476f Invert condition to reduce nesting 2021-09-13 16:39:05 +09:00
Xexxar
44163dc9ec updated to use deltaTime not stainTime for more accuracy 2021-09-12 18:14:05 +00:00
Xexxar
b05963cc50 update to fix review issues 2021-09-12 16:08:17 +00:00
Xexxar
a6c3798491 Merge remote-tracking branch 'ppy/master' into skillsrework 2021-09-12 12:45:59 +00:00
smoogipoo
aafbc3e0e4 Merge branch 'master' into fl-skill 2021-09-10 16:39:39 +09:00
Dean Herbert
714f55b6bc Clone control points when copying to HitObjects 2021-09-10 14:36:39 +09:00
Dan Balasescu
ceca229dbc
Merge branch 'master' into speedpp 2021-09-07 18:54:49 +09:00
Dean Herbert
0500cd578a Merge branch 'master' into no-more-difficulty-control-points-info 2021-09-06 21:06:12 +09:00
Dean Herbert
25420af078 Rename method to drop redundant ruleset suffix 2021-09-05 13:34:23 +09:00
apollo-dw
3fce3f620f use OsuHitWindows, amend comment 2021-09-04 16:56:15 +01:00
Dean Herbert
d4e5a612ea Update IPositionalSnapProvider to take a HitObject as reference, rather than raw time
This allows fetching the correct `DifficultyControlPoint` from the
hitobject. Nothing more.
2021-09-03 17:11:12 +09:00
Dean Herbert
a3d9ab1e2e Move approach rate to EffectControlPoint 2021-09-03 16:58:16 +09:00
Dean Herbert
071c56e90b Update usages of DifficultyPointAt 2021-09-03 16:58:16 +09:00
apollo-dw
8654a0af05 remove unnecessary min & renamed variable so its more descriptive 2021-09-03 03:01:25 +01:00
apollo-dw
bf87a4b2d3 interpolate the doubletap cheese nerf instead 2021-09-03 02:39:21 +01:00
apollo-dw
0beef9c1e7 made double cheese detection stricter 2021-09-03 02:20:22 +01:00
Bartłomiej Dach
a2d2ed2ef6
Add stack leniency setting for osu! 2021-09-02 23:29:14 +02:00
apollo-dw
57a2ba9aa8 remove "straintime" 2021-09-02 18:29:55 +01:00
apollo-dw
0d60076f34 fix doubletap cheese detect (base on hitwindow) 2021-09-02 17:14:23 +01:00
apollo-dw
d9cc497801 refactoring 2021-09-02 17:02:23 +01:00
apollo-dw
3e98c71ece cap deltatime to hitwindow sorta 2021-09-02 16:48:34 +01:00
apollo-dw
711baa12ba emu's doubletap cheese nerf 2021-09-02 16:31:31 +01:00
Dean Herbert
b907c2f4f6 Fix osu! judgements getting scaled twice over different durations 2021-09-02 16:31:43 +09:00
Dean Herbert
738ce0f689 Fix repeat arrows being hidden beneath head circles in legacy skins
Aims to make minimal changes to `DrawableSlider` itself. I'm not super
happy about the slider ball being moved above the head circle, but it
*is* what people are used to so no one except for me is going to
complain.

Supersedes and closes https://github.com/ppy/osu/pull/14561.
2021-09-01 19:41:49 +09:00
Dean Herbert
4f9c3fde07 Move alpha adjustment back to LegacySliderBody to correctly handle default legacy skin 2021-09-01 15:10:56 +09:00
Dean Herbert
7a447f5128 Mark SankingSliderBody as abstract 2021-09-01 15:10:24 +09:00
Dean Herbert
3f93aa1507 Fix traceable sliders incorrectly being opaque
Closes https://github.com/ppy/osu/issues/14449.
Regressed in https://github.com/ppy/osu/pull/14205.
2021-08-31 20:13:54 +09:00
mrowswares
a190038c33 remove writelines 2021-08-29 20:16:13 +01:00
mrowswares
1ca0223c71 remove straintime & speed skill caps, implement basic doubletap cheese detection 2021-08-29 17:19:26 +01:00
Dan Balasescu
f0296e5d12
Merge branch 'master' into avoid-default-skin-judgement-transform-overhead 2021-08-27 10:02:40 +09:00
Dan Balasescu
a28bc9f6b2
Merge branch 'master' into path-control-point-bindable-removal 2021-08-27 09:37:37 +09:00
Salman Ahmed
b9ea984c36 Remove redundant default value 2021-08-26 08:18:58 +03:00
Dean Herbert
17f6efc6fe Fix missed cases of incorrect .Value usage
Changing from `Bindable` to `Nullable` comes with its issues...
2021-08-26 14:02:57 +09:00
Dean Herbert
8cfb3d456b Avoid expensive text spacing transforms for now 2021-08-26 13:15:27 +09:00
Dean Herbert
69064c1938 Avoid unnecessary unbind operations when constructing FollowPointLifetimeEntry 2021-08-26 12:35:31 +09:00
Dean Herbert
6dcd9427ac Remove bindable usage in PathControlPoint
This is quite a breaking change, but I think it is beneficial due to the large amount of usage of this class.

I originally intended just to remove the allocations of the two delegates handling the `Changed` flow internally, but as nothing was really using the bindables for anything more than a general "point has changed" case, this felt like a better direction.
2021-08-26 12:33:53 +09:00
MBmasher
c91feb2968 Fix multiplying instead of dividing by scalingFactor 2021-08-25 11:18:21 +10:00
MBmasher
7188a3268f Apply a nerf to stacks for Flashlight skill 2021-08-24 14:01:54 +10:00
Xexxar
aaffc05b82 removed accuracy penalty for misses 2021-08-21 17:56:45 +00:00
Xexxar
0402f85eb0 left residual code from testing prevprevdeltas 2021-08-21 17:29:17 +00:00
Xexxar
536aef6f2f merged latest from origin 2021-08-21 17:25:06 +00:00
Xexxar
270f497af8 penalized 1/1->1/2->1/4 rhythm transitions 2021-08-21 17:23:17 +00:00
Bartłomiej Dach
812c85f3de
Clean up code style issues 2021-08-21 17:26:05 +02:00
Xexxar
a46ae855aa implemented object count limitation for rhythm build up 2021-08-20 15:40:34 +00:00
Dan Balasescu
6128a38054
Merge branch 'master' into cursor-trail-middle 2021-08-20 13:28:51 +09:00
Xexxar
d36eb269b4 fixed code quality issues 2021-08-19 20:11:18 +00:00
Xexxar
5b2cfcc2ff adjusted low acc nerf on speed 2021-08-19 15:27:37 +00:00
Xexxar
b44e6f634d noticed a bug with double applying historicaldecay 2021-08-19 15:05:39 +00:00
Xexxar
7b70d41a93 forgot about the / 0 2021-08-19 14:49:44 +00:00
Xexxar
0effc8f5d8 refactored speed skill, implemented better acc pp 2021-08-19 14:12:03 +00:00
Xexxar
9cd82ea75f merged master 2021-08-18 19:03:16 +00:00
ekrctb
3d88a745cd Fix osu editor transforms not specified in the absolute time 2021-08-18 14:27:16 +09:00
Xexxar
b9ba4c1d97 finalized change for PR 2021-08-17 19:25:49 +00:00
Xexxar
ac1ed00f3e added initial balance of rhythm complexity to tap 2021-08-17 14:39:43 +00:00
Xexxar
471ae9664e cleaned up jank 2021-08-17 13:47:45 +00:00
Xexxar
c99a96a8c8 initial rhythm calc testing 2021-08-17 13:39:18 +00:00
Xexxar
9b21016eed accidently renamed osuStrainSkill, fixed 2021-08-16 22:46:56 +00:00
Xexxar
5561e4852e removed stuff 2021-08-16 22:23:40 +00:00
Xexxar
ae076c9a4e merged latest ppy/master 2021-08-16 22:20:12 +00:00
Xexxar
176b3e7533 changed decay system to allow for customizing the currentStrain 2021-08-16 22:14:29 +00:00
Endrik Tombak
ef367c6547 Move implementation to be legacy only 2021-08-16 22:52:19 +03:00
Endrik Tombak
314c342841 Avoid drawing segments of cursor trail near current cursor position 2021-08-16 22:13:01 +03:00
Xexxar
7d46b3f9c5 initial testing and debugging 2021-08-16 16:06:50 +00:00
Xexxar
19cdd5c323 recoded and added rhythm complexity calculator (untested) 2021-08-16 15:25:35 +00:00
emu1337
df6e4664e0 changed history length in speed 2021-08-16 16:42:07 +02:00
emu1337
29a22bd11f added rhythm multiplier for strain sections 2021-08-15 20:48:00 +02:00
Dean Herbert
8742fa3f68
Merge pull request #13971 from aitani9/fix-blinds-barrel-roll-compatibility
Make blinds move correctly when barrel roll mod is active
2021-08-13 18:48:13 +09:00
smoogipoo
55ddc2c6e3 Merge branch 'master' into fix-blinds-barrel-roll-compatibility 2021-08-13 12:45:04 +09:00
smoogipoo
7cc0a2a76f Refactor to fix InterpolateMovements=false 2021-08-13 12:10:33 +09:00
smoogipoo
5241029513 Use new FadeExponent shader uniform 2021-08-13 10:27:26 +09:00
TheOmyNomy
1069f9d501 Always add cursor trail for legacy cursor with disjoint trail 2021-08-13 00:13:03 +10:00
smoogipoo
fbaa480b3e Fix out-of-order hits in editor causing exceptions 2021-08-12 10:08:54 +09:00
MBmasher
eaa0d38315 Add a buff to short maps for Flashlight skill 2021-08-12 10:00:24 +10:00
MBmasher
b06226e738 Change comments 2021-08-12 09:54:25 +10:00
MBmasher
27918583e1 Increase the multiplier when hidden is applied on the Flashlight skill 2021-08-11 15:55:13 +10:00
MBmasher
1cadcb43d9 Apply nerf to Flashlight skill on high star maps 2021-08-11 15:54:30 +10:00
smoogipoo
2196ae9ca2 Merge branch 'master' into display-sr-changes 2021-08-11 13:02:34 +09:00
MBmasher
b1d25346a2 Move HistoryLength override from OsuStrainSkill to Flashlight 2021-08-11 13:30:40 +10:00
MBmasher
cee69eaad0 Add a nerf to FL for TD plays 2021-08-11 06:14:38 +10:00
smoogipoo
f86ef54e93 Fix incorrect legacy slider body alpha 2021-08-10 17:38:51 +09:00
MBmasher
f4ceb17064 Cleanup of code 2021-08-10 16:06:20 +10:00
TheOmyNomy
24accdcab0 Add LegacyUtils class with non linear colour interpolation method 2021-08-09 18:56:47 +10:00
MBmasher
6b1a4a53d4 Cleanup of code 2021-08-09 08:31:28 +10:00
MBmasher
acdd08c966 Add Flashlight skill 2021-08-08 23:56:03 +10:00
TheOmyNomy
140d29d537 Use helper methods instead of local valueAt() method 2021-08-08 23:54:35 +10:00
TheOmyNomy
9e805dcd44 Fix legacy slider body colour interpolation 2021-08-08 21:27:32 +10:00
02Naitsirk
db1f43f6eb
Multiply star rating by a constant 2021-08-03 18:57:33 -04:00
Bartłomiej Dach
ea2ef55a8b
Remove unnecessary whitespace 2021-08-01 15:27:05 +02:00
Bartłomiej Dach
f868a201f5
Ensure proxied judgement content is correctly depth-ordered 2021-08-01 15:21:31 +02:00
02Naitsirk
5b5cf30cbd
Fix incorrect performance formula
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2021-07-31 12:23:03 -04:00
Henry Lin
7251c28c4a Merge branch 'master' into mod-muted 2021-07-29 21:14:03 +08:00
Henry Lin
935984d200 Rename MetronomeBeatContainer to Metronome 2021-07-29 15:17:21 +08:00
Henry Lin
0196141335 Remove unused constants 2021-07-29 14:52:40 +08:00
Henry Lin
18e760ee91 Extract metronome from OsuModTarget 2021-07-29 14:52:18 +08:00
Henry Lin
22d83c75e3 Revert imports re-ordering
Out of the scope of this PR
2021-07-28 18:32:38 +08:00
Henry Lin
58bbe9db7e Added muted mod 2021-07-28 18:21:08 +08:00
Dean Herbert
4a4d9b0dc6 Update description to match mania mirror implementation 2021-07-28 19:20:40 +09:00
Gabe Livengood
712bc578dc
update setting name and description 2021-07-27 17:45:52 -04:00
Salman Ahmed
5cb02002d7 Fix flipped xmldoc 2021-07-27 18:24:17 +03:00
Salman Ahmed
ed903c60ea Fix code style issues and remove unused using directives 2021-07-27 18:24:17 +03:00
Gabe Livengood
c741366c72
review modifications: change xmldocs, change reflection method name, remove reflection method returns, simplify incompat. mod list 2021-07-27 09:01:01 -04:00
Gabe Livengood
c7c261ba03
review modifications: change xmldoc wording, configure with enum instead of bool, declare incompatibility with hr 2021-07-26 17:48:03 -04:00
Gabe Livengood
49160e4482
review modifications: maniamodmirror inheritance, reflection utilities, vertical flip option 2021-07-26 10:46:41 -04:00
Gabe Livengood
eb585a6120
Add "Mirror" mod 2021-07-25 20:40:50 -04:00
Dean Herbert
50a2abbe7f
Merge pull request #12683 from frenzibyte/legacy-beatmap-combo-offset
Apply combo offsets "colour hax" only on beatmap skins
2021-07-23 14:30:18 +09:00
aitani9
715f3e3f7c Make blinds move correctly whenever the playfield is rotated 2021-07-22 14:07:41 -07:00
aitani9
80cb7c77b9 Calculate the diagonal length using Vector2.LengthFast instead of manually 2021-07-22 14:04:01 -07:00
aitani9
e6b28e1386 Rename origin to center for clarity 2021-07-22 14:01:31 -07:00
02Naitsirk
b31fef7e00
Implement total SR formula that better correlates with pp 2021-07-22 13:49:47 -04:00
Dean Herbert
3392086d1c
Merge pull request #13984 from ekrctb/catch-editor-reverse
Implement "reverse pattern" in catch editor
2021-07-23 01:12:13 +09:00
Salman Ahmed
523c154f15 Add ComboIndexWithOffsetsBindable and bind similar to ComboIndexBindable 2021-07-22 16:40:33 +03:00
Dean Herbert
cde8ae6f18
Merge pull request #13483 from emu1337/diffspike-balance
Spike difficulty / AR&FL adjustments
2021-07-22 19:28:22 +09:00
ekrctb
cc01b9e639 Extract SliderPath reverse logic to be used in other rulesets 2021-07-22 16:14:43 +09:00
aitani9
283d953c4f Fix blinds moving when barrel roll mod is active 2021-07-21 14:07:00 -07:00
Dean Herbert
adda96ac86
Merge pull request #13962 from ekrctb/platform-action
Adapt to framework `PlatformAction` type change
2021-07-21 18:17:38 +09:00
Dean Herbert
399c3b0be8 Rename property, reword xmldoc and improve readability of update code 2021-07-21 17:32:56 +09:00
ekrctb
1bac471b49 Adapt to PlatformAction type change 2021-07-21 16:12:53 +09:00
ekrctb
1bff4373b3 Allow specifying flipping support of selection box different from scaling 2021-07-21 15:59:45 +09:00
emu1337
84fd59777c Merge branch 'master' into diffspike-balance 2021-07-20 19:39:41 +02:00
Salman Ahmed
9d92b795fa Revert making ComboOffsets legacy and define BeatmapSkinComboIndex instead 2021-07-20 14:15:43 +03:00
Salman Ahmed
554652b033 Merge branch 'refactor-combo-colour-retrieval' into legacy-beatmap-combo-offset 2021-07-20 10:11:52 +03:00
Henry Lin
1c6a13fca7 Disallow mistimed event firing 2021-07-20 10:31:19 +08:00
Henry Lin
a387d8df74 Use BeatSyncClock 2021-07-20 10:30:40 +08:00
Bartłomiej Dach
fb5d25405e
Replace calls to obsoleted GetOrDefault() extension 2021-07-18 21:52:16 +02:00
Bartłomiej Dach
6e065362be
Merge branch 'master' into osu-target-mod 2021-07-18 18:22:36 +02:00
Henry Lin
fdebe4b94a Code formatting fixes 2021-07-18 22:01:26 +08:00
Dean Herbert
49f0c707f6 Move approach circle hiding within BeginAbsoluteSequence 2021-07-18 22:34:28 +09:00
Dan Balasescu
da7e880e46
Merge pull request #13893 from peppy/mouse-settings-localisation
Add localisation coverage of `MouseSettings`
2021-07-16 23:25:12 +09:00
Dean Herbert
8cdc3536f4
Merge pull request #13826 from stanriders/buff-ar
Change approach rate bonuses to be less punishing on mid-length maps
2021-07-16 22:47:10 +09:00
Dean Herbert
304eac26d3 Merge branch 'master' into osu-target-mod 2021-07-15 16:51:02 +09:00
Dean Herbert
ea87869753 Fix metronome playing during intro time 2021-07-15 16:50:55 +09:00
Dean Herbert
c38590f1ff Use a slightly more appropriate metronome sound 2021-07-15 16:43:24 +09:00
Dean Herbert
5b91111eda Update SettingsSubsection.Header to accept a LocalisableString 2021-07-15 13:09:51 +09:00
Dean Herbert
e7b78b1ea5 Adjust transform logic to hopefully be a bit easier to parse 2021-07-13 20:26:05 +09:00
Dean Herbert
4314946e10 Reorganise functions to order more logically (hitcircle before slider methods) 2021-07-13 19:37:17 +09:00
Dean Herbert
6b663037e4 Use switch for pattern matching 2021-07-13 19:37:02 +09:00
Dean Herbert
db8ffc6316
Merge branch 'master' into osu-random-mod-improvements 2021-07-13 19:31:37 +09:00
Naxess
3a5912e35e Add new checks to verifiers 2021-07-13 10:53:25 +02:00
Naxess
53c0298b5e Add too short spinners check and tests 2021-07-13 10:51:40 +02:00
Naxess
fec9448301 Add too short sliders check and tests 2021-07-13 10:50:41 +02:00
Bartłomiej Dach
63dedb36de Rename variable 2021-07-11 16:49:23 +02:00
Bartłomiej Dach
7aecafeecb Rename constant to reflect its purpose 2021-07-11 16:46:30 +02:00
Henry Lin
c181a724c6 Refactor hit object clamping 2021-07-11 22:01:28 +08:00
Bartłomiej Dach
e10b7867c1 Rewrite method again to hopefully help readability 2021-07-10 12:13:36 +02:00
Dean Herbert
90326f8864 Standardise variables 2021-07-09 13:24:26 +09:00
StanR
02298c2cf4 Fix incorrect curve, move total hits factor into a separate variable for clarity 2021-07-09 00:06:05 +03:00
StanR
592d3fdf00 Cleanup 2021-07-08 11:54:58 +03:00
StanR
c67f756c75 Change approach rate bonuses to be less punishing on mid-length maps 2021-07-08 11:52:43 +03:00
Dean Herbert
88b00123f6 Use existing reflection methods to avoid manual binding of ExtendedLimits 2021-07-08 17:49:00 +09:00
Dean Herbert
bd7c334588 Avoid the need for per-settings control classes 2021-07-08 17:49:00 +09:00
Dean Herbert
a6e94dd491 Add back extended limits support 2021-07-08 17:49:00 +09:00
Dean Herbert
c4313d6e96 Initial implementation of new flow (only working for approach rate) 2021-07-08 17:48:08 +09:00
Dean Herbert
0e4f4a6fde Initial storage changes 2021-07-08 14:28:13 +09:00
Dean Herbert
d07c469a89
Merge pull request #13783 from smoogipoo/smooth-auto-gen
Make osu! auto generator interpolate during key-up frames
2021-07-06 15:04:40 +09:00
Henry Lin
50e316fca4
Merge branch 'master' into osu-target-mod 2021-07-06 12:02:51 +08:00
Bartłomiej Dach
8e102280b7 Revert & disable case with two contradicting inspections
Leaving the `false` default value without the suppression triggers
`RedundantArgumentDefaultValue`, while removing it triggers
`BaseMethodCallWithDefaultParameter`.

Disable the former, because a single redundant parameter is less bad
than silent breakage if the default value of `propagateChildren` in the
base method ever changes.
2021-07-05 20:21:44 +02:00
PercyDan54
e1c646b9b2
Remove redundant arguments 2021-07-05 23:52:39 +08:00
smoogipoo
8b7ccdc8b5 Adjust comment 2021-07-05 18:51:23 +09:00
smoogipoo
7d6ab08bb3 Remove unnecessary conditional 2021-07-05 18:49:09 +09:00
smoogipoo
695af31c58 Start alternating at 225BPM as previously 2021-07-05 18:43:27 +09:00
smoogipoo
2b8efe21ca Don't ease with 0 time difference 2021-07-05 17:52:10 +09:00
smoogipoo
12ca845e55 Use marker class (cleanup) 2021-07-05 17:24:23 +09:00
smoogipoo
6a2c0f772e Always apply easing, adjust heuristic a bit 2021-07-05 17:22:48 +09:00
smoogipoo
96c0ab8ded Adjust last frame position when not waiting 2021-07-05 17:11:59 +09:00
Henry Lin
eecf4af029 Rename getSliderBoundingBox and add comments 2021-07-05 09:16:01 +08:00
Dean Herbert
ec71deec51 Remove some mentions of "lazer"
I am aware there are more throughout the codebase but intentionally left
the remaining mentioned for one reason or another. The intention here is
to mainly change user-facing versioning to change the positioning of the
"lazer" term (to be where we would expect "cuttingedge" or "beta" to
be).
2021-07-04 12:41:27 +09:00
Henry Lin
d1862d8cff Rename map to mapRange 2021-07-04 10:01:56 +08:00
Henry Lin
1470bb1563 Use IHidesApproachCircles 2021-07-03 13:02:39 +08:00
Henry Lin
f18c17d1a8
Merge branch 'master' into osu-target-mod 2021-07-03 13:00:52 +08:00
Henry Lin
b0a619bb4c Prevent multiple enumeration in checkForOverlap 2021-07-01 12:49:34 +08:00
Henry Lin
34be437d7a Added definitelyBigger 2021-07-01 12:21:41 +08:00
Henry Lin
58f80abe32 Several requested changes
- Rename `origHitObjects` to `originalHitObjects`
- Use `Value` instead of `GetValueOrDefault()`
- Remove `endObj`
- Added comments
- Rename `closestIdx` to `precedingIndex`
- Changed an `almostEquals` call
2021-07-01 11:57:57 +08:00
Henry Lin
c69455cfd0 Fixed slider bounding box calculation 2021-07-01 11:20:55 +08:00
Henry Lin
7585f1f790 Move special case handling back to moveSliderIntoPlayfield 2021-07-01 11:03:22 +08:00
Henry Lin
6e1839fcf2 Rename shift_object_count to objects_to_shift_before_slider 2021-07-01 11:03:22 +08:00
Henry Lin
328dcb4d6b Use Math.Clamp instead of MathHelper.Clamp 2021-07-01 11:03:22 +08:00
Henry Lin
3c1f0452a2 Refactor and rename getMinSliderMargin to getSliderBoundingBox. 2021-07-01 11:03:22 +08:00
Bartłomiej Dach
913f7602e4 Change seed control type in line with changes 2021-06-30 20:41:08 +02:00
Bartłomiej Dach
c0613a3e4f Merge branch 'master' into osu-target-mod 2021-06-30 20:27:55 +02:00
Salman Ahmed
4b56d94a98 Revert accidentally pushed part of change 2021-06-30 10:26:34 +03:00
Salman Ahmed
e3344c33ea Better convey reason of "Spin In" incompatibility with "Hidden" 2021-06-30 09:57:15 +03:00
Henry Lin
3f185a0622 Fixed an exception when clamping large sliders 2021-06-30 10:35:06 +08:00
Salman Ahmed
dbe3150f88 Mention about marker interfaces even more explicitly 2021-06-29 11:37:08 +03:00
Salman Ahmed
7997d57030 Mention interfaces being "markers" for the time being 2021-06-29 11:25:35 +03:00
Henry Lin
8d1eae7c70 Use IndexInCurrentCombo 2021-06-29 14:25:45 +08:00
Henry Lin
2722565204 Take circle radius into account when clamping to playfield 2021-06-29 13:36:30 +08:00
Henry Lin
0c5777c2c8 Added comments 2021-06-29 12:56:05 +08:00
Henry Lin
d4ff4b26f5 Split part of addHitSamples to a subroutine 2021-06-29 12:49:25 +08:00
Henry Lin
96e09605d8 Osu random mod improvements
- Reduce "jump streams" by increasing maximum jump angle and variance in jump angle
- Reduce weird jumps to sliders by shifting hit circles in front of sliders
2021-06-29 12:33:40 +08:00
Salman Ahmed
69dac018c7 Make OsuModSpinIn as incompatible with other IHidesApproachCircles mods
Respecting the TODO comment above it, mark `OsuModSpinIn` as
incompatible with other `IHidesApproachCircles` mods as well.
2021-06-28 21:20:07 +03:00
Salman Ahmed
baf736026b Mark IHidesApproachCircles mods as incompatible with IRequiresApproachCircles 2021-06-28 21:20:07 +03:00
Salman Ahmed
6a67a6736a Mark IRequireApproachCircles mods as incompatible with IHidesApproachCircles 2021-06-28 21:20:07 +03:00
Salman Ahmed
006cc331c8 Separate IMutateApproachCircles to requiring and hiding 2021-06-28 21:20:07 +03:00
Henry Lin
ea8993d6d6 Use IHasRepeats instead of IHasPathWithRepeats 2021-06-28 11:33:19 +08:00
Henry Lin
3eaa04115f Use OsuHitObjectGenerationUtils 2021-06-26 11:34:10 +08:00
Henry Lin
c543080923 Merge branch 'master' into osu-target-mod 2021-06-26 11:26:00 +08:00
Bartłomiej Dach
50c27d2635 Update usages of IHasTooltip in line with framework localisation changes 2021-06-25 19:10:04 +02:00
Henry Lin
ec8810cc2b Use MathF instead of (float)Math 2021-06-25 09:44:23 +08:00
Henry Lin
26086ca1ef Rename VectorUtils to OsuHitObjectGenerationUtils 2021-06-25 09:43:14 +08:00
Henry Lin
3fcda83713 Rename VectorHelper to VectorUtils 2021-06-24 22:00:19 +08:00
Henry Lin
1a47bc254d Increase acceptable difference for Precision calls 2021-06-24 14:55:49 +08:00
Henry Lin
be55c7e075 Minor fixes in comments 2021-06-24 13:39:50 +08:00
Henry Lin
153e204d20 Cap rotation ratio to 1 2021-06-24 13:22:10 +08:00
Henry Lin
2268d7f8a5 Extract utility methods into helper class; Better xmldoc and naming 2021-06-24 13:19:42 +08:00
Henry Lin
6629f8706a Directly fade to gray instead of computing the color values 2021-06-24 12:31:25 +08:00
Henry Lin
877c775e35 Added comments 2021-06-24 12:20:46 +08:00
Henry Lin
f8fe4ab482 Refactor and rename isOverlappingWithRecent 2021-06-24 12:02:48 +08:00
Henry Lin
71b5ed16c0 Avoid using osuTK constants; Use MathF 2021-06-24 11:37:00 +08:00
Henry Lin
f74275a3b5 Moved RNG initialisation to a better place 2021-06-24 11:29:10 +08:00
Henry Lin
6fca8ba5b0 Better explanation for fixComboInfo 2021-06-24 11:21:43 +08:00
Henry Lin
6202eed5e2 Moved a misplaced ! 2021-06-24 10:56:14 +08:00
Henry Lin
04510f1ace Removed odd-looking decrement and checks in addHitSamples 2021-06-24 10:54:21 +08:00
Henry Lin
58b439b728 Switch to IHasPathWithRepeats 2021-06-24 10:38:21 +08:00
Henry Lin
98003ec548 Avoid modulo when finding slider node index 2021-06-24 10:33:54 +08:00
Henry Lin
3eab540bcc Converted an inline lambda into a method (isInsideBreakPeriod); moved origHitObjects to be a private class field 2021-06-24 10:07:29 +08:00
Henry Lin
dae7b8025d Converted an inline lambda into a method (getBeatsForTimingPoint) 2021-06-24 09:51:45 +08:00
Henry Lin
a7ea7b8b0b Use GetEndTime() instead of a switch expression 2021-06-24 09:34:39 +08:00
Henry Lin
b7dd26612d Reordered things and added regions 2021-06-23 16:50:05 +08:00
Henry Lin
6dc5f406b2 Implement IMutateApproachCircles 2021-06-23 16:29:36 +08:00
Henry Lin
10541dbc0a Merge branch 'master' into osu-target-mod
# Conflicts:
#	osu.Game.Rulesets.Osu/Mods/OsuModTraceable.cs
#	osu.Game/Rulesets/Mods/IHasSeed.cs
2021-06-23 16:26:23 +08:00
Henry Lin
5a031eada8 Revert "Display results after fail"
This commit reverts 7815b3c7
2021-06-23 16:22:10 +08:00
Dean Herbert
4cb9c6a842
Merge pull request #13423 from frenzibyte/transformers-per-skin
Refactor ruleset skin transforming logic to be per-`ISkin` rather than one `ISkinSource`
2021-06-22 21:24:56 +09:00
Dean Herbert
6c3d2315d0
Merge pull request #13606 from Naxesss/low-diff-checks
Add low difficulty spacing checks
2021-06-22 16:29:37 +09:00
Dean Herbert
1b0aadcc6f Merge branch 'master' into transformers-per-skin 2021-06-22 16:03:15 +09:00
Dean Herbert
e9339d6100 Move some inline comments on consts to xmldoc instead 2021-06-22 15:16:19 +09:00
Naxess
2f3f4f3e4b Add new checks to verifier 2021-06-21 15:30:45 +02:00
Naxess
fcb918d0e1 Add time distance equality check 2021-06-21 15:30:23 +02:00
Naxess
3eb088f89a Add low difficulty overlaps check 2021-06-21 15:30:04 +02:00
Salman Ahmed
999bf27eae Remove unnecessary abstraction of ApproachCircle property 2021-06-21 12:07:00 +03:00
Henry Lin
e52a58c1bc Switched to a more reasonable sample sound for now 2021-06-21 16:24:37 +08:00
Salman Ahmed
ba15f7c19b Move ApproachCircle out of the scale container and revert relevant changes 2021-06-21 10:47:38 +03:00
Salman Ahmed
036b745425 Remove no longer needed LegacySpinnerApproachCircle 2021-06-21 08:41:10 +03:00
Salman Ahmed
42edbe4fb9 Move ApproachCircle implementation into per-style 2021-06-21 08:40:38 +03:00
Salman Ahmed
68e28f4903 Implement IHasApproachCircle in DrawableHitCircle as well 2021-06-21 07:35:07 +03:00
Salman Ahmed
01478d780d Generalize IHasSpinnerApproachCircle from being spinner-specifc 2021-06-21 03:43:11 +03:00
Salman Ahmed
72155a7c52 Replace if pattern-matching check with switch cases instead 2021-06-21 03:37:50 +03:00
Salman Ahmed
c3217fd8b1 Remove leftover approach circle skin component 2021-06-19 20:10:32 +03:00
Salman Ahmed
c04b09520d Replace spinner approach circle proxying logic with hooking up to OnSkinChange in mod 2021-06-19 20:06:28 +03:00
Henry Lin
c867940584 Marked target mod and traceable mod as incompatible; extracted playfield clamping logic
Nothing is visible when target mod and traceable mod are enabled together.
2021-06-19 12:26:16 +08:00
Henry Lin
b09165a074 Remove the circle size buff 2021-06-19 11:13:19 +08:00
Henry Lin
0cf3119006 Guard against edge cases 2021-06-19 11:12:29 +08:00
Henry Lin
ca8f08ca84 Avoid overlapping with recent circles 2021-06-19 10:04:48 +08:00
Salman Ahmed
d6b9436151 Proxy spinner approach circle before the spinner overlay components 2021-06-18 20:34:25 +03:00
Salman Ahmed
843c8bd7a4 Move spinner approach circle to its own SkinnableDrawable 2021-06-18 20:33:50 +03:00
Salman Ahmed
f7b5341663 Merge branch 'master' into legacy-spinner-approach-circle 2021-06-18 19:50:52 +03:00
Bartłomiej Dach
afc89b39d9 Use StateUpdateTime for transform clearing logic
`MainCirclePiece` specifies a state transform starting at
`StateUpdateTime`, which is earlier than the previously-used
`HitStateUpdateTime`. Change the transform clearing logic to use the
former to ensure that exactly all animation transforms are cleared.
2021-06-18 16:04:11 +02:00
Bartłomiej Dach
e94fbd83e2 Ensure editor ruleset animation disable execution order 2021-06-18 16:04:11 +02:00
Bartłomiej Dach
e2a370f602 Add coverage for hit circle fade-out duration 2021-06-18 16:04:11 +02:00
Henry Lin
cca26d4651 Take circle radius into account when clamping hit objects to playfield 2021-06-18 16:05:09 +08:00
Henry Lin
f5134c7fc2 Extract constants and add xmldoc 2021-06-18 14:39:46 +08:00
Henry Lin
dca2d8af4f Animate circles undimming 2021-06-18 13:18:44 +08:00
Dean Herbert
860626152a Mark all mods which adjust approach circle as incompatible with each other
Closes https://github.com/ppy/osu/issues/13543.
2021-06-18 13:21:53 +09:00
Salman Ahmed
c9458fd9ce Hide spinner approach circle in "Hidden" mod 2021-06-18 06:23:54 +03:00
Henry Lin
639e8b62b9 Make circles light up 1 beat length before start time 2021-06-18 11:20:04 +08:00
emu1337
8c4e60e5cc xmldoc and refactoring 2021-06-17 21:41:06 +02:00
Henry Lin
b7f43405fc Dim circles instead of fade; improved hit samples; changed jump distance to be closer to cuttingedge 2021-06-17 22:01:58 +08:00
Dan Balasescu
6cec1145e3
Merge pull request #13523 from ekrctb/applicable-to-dho
Reduce boilerplate of `IApplicableToDrawableHitObjects` by taking a single DHO instead of an enumerable
2021-06-17 19:59:06 +09:00
Henry Lin
f22beaeb5b Increase distance between combos; pull circles closer to center 2021-06-17 14:30:59 +08:00
Dean Herbert
a46f730a69 Fix approach circle fade not running early on an early user hit
Regressed in https://github.com/ppy/osu/pull/12153.
Closes https://github.com/ppy/osu/issues/13531.
2021-06-17 15:09:05 +09:00
Henry Lin
14622f4734 Improved guesstimations; fixed hit samples 2021-06-17 10:20:50 +08:00
Salman Ahmed
9d9892e99e Add legacy spinner approach circle implementation 2021-06-17 04:58:18 +03:00
emu1337
2665a873f8 fixed an error with extremely short maps 2021-06-16 19:55:19 +02:00
emu1337
41662a1643 refactored for clarity 2021-06-16 19:54:22 +02:00
emu1337
18fe05b7b5 diffspikes balance 2021-06-16 15:13:46 +02:00
ekrctb
90a13b8ed3 Use IApplicableToDrawableHitObject for OsuModApproachDifferent
Replacing the obsolete interface.
2021-06-16 22:05:40 +09:00
ekrctb
b6a9fa9999 Merge branch 'master' into applicable-to-dho 2021-06-16 22:04:10 +09:00
ekrctb
af80418ee8 Implement IApplicableToDrawableHitObject for mods
A breaking change in `ModWithVisibilityAdjustment` if the method was overriden.
2021-06-16 18:52:01 +09:00
Dean Herbert
7891ee4f32 Change order of settings to make scrolling easier
There's an issue with dropdown menus nested inside a scroll view being
very frustrating to scroll to off-screen items. This works around that
to some extent by giving the user more "parent-scrollable" space to
mouse wheel or drag over.
2021-06-16 17:32:31 +09:00
Dean Herbert
0c1023da31 Simplify transform logic 2021-06-16 17:27:52 +09:00
Dean Herbert
ee5f4f1856 Remove default (and make default "Gravity") 2021-06-16 17:27:43 +09:00
Dean Herbert
4b45d8318e
Merge branch 'master' into transformers-per-skin 2021-06-16 16:37:28 +09:00
Dean Herbert
f6f1a068b2 Rename "easing" references to be "style" instead 2021-06-16 15:15:12 +09:00
Dean Herbert
b1dd502e06 Rename class to match new name 2021-06-16 15:09:42 +09:00
Dean Herbert
2ce487bdac Rename mod and fix easing mappings / naming 2021-06-16 14:31:22 +09:00
Dean Herbert
c5f76c7352
Merge branch 'master' into AddApproachCircleMod 2021-06-16 14:30:58 +09:00
emu1337
be68950c30 refactoring 2021-06-16 03:34:46 +02:00
Salman Ahmed
52145c9237 Assign skinnable colour to spinner-background with correct default 2021-06-15 16:17:05 +03:00
Salman Ahmed
a85a592f70 Add lookup for spinner background colour 2021-06-15 16:16:25 +03:00
Henry Lin
4ffff06dcb Break ApplyToBeatmap into subroutines 2021-06-15 11:06:56 +08:00
emu1337
e987a511ba diffspike & wide angle balance 2021-06-14 19:22:35 +02:00
emu1337
fea7b029aa refactored diffspike nerf 2021-06-14 19:18:49 +02:00
Henry Lin
04c0db6dce Code cleanup 2021-06-14 21:34:34 +08:00
emu1337
4c949d9829 reduced diffspike nerf 2021-06-13 21:20:08 +02:00
emu1337
3309ab2be3 balance changes 2021-06-13 15:18:35 +02:00
Salman Ahmed
fbb856d84b Call base when overriding lookup methods
Rather than arbitrarily accessing `Skin` here and there.
2021-06-11 12:44:44 +03:00
Dan Balasescu
35d5632355
Merge pull request #13378 from Syriiin/diffcalc/refactor/auto-properties
Refactor DifficultyAttributes to use auto properties over public fields
2021-06-10 18:42:11 +09:00
Salman Ahmed
dde84e5cbd Merge branch 'master' into transformers-per-skin 2021-06-10 11:58:52 +03:00
Dan Balasescu
a44fd887ee
Merge branch 'master' into no-unranked-display 2021-06-10 17:09:46 +09:00
Henry Lin
12a17d0983 Extract seed setting contorl to IHasSeed 2021-06-10 15:31:20 +08:00
Henry Lin
80f38b347b Merge branch 'ppy:master' into osu-target-mod 2021-06-10 15:13:27 +08:00
Henry Lin
7815b3c72b Display results after fail 2021-06-10 10:58:42 +08:00
Salman Ahmed
cf40282f1f Convert LegacySkinTransformers to accept raw ISkins rather than a full ISkinSource 2021-06-09 22:49:31 +03:00
ekrctb
5418e895ae Remove useless ClearTransforms
The transforms are cleared by DHO before `ApplyCustomUpdateState` is invoked.
2021-06-09 16:50:13 +09:00
Bartłomiej Dach
020c63017e Fix inspectcode issues 2021-06-09 09:21:02 +02:00
ekrctb
610cdaea98 Fix circle piece animation is sometimes not playing when a replay is rewound 2021-06-09 16:14:55 +09:00
Dean Herbert
85abee5fc7 Remove difficulty calculator exceptions
I don't think there's any reason difficulty calculators shouldn't be
able to calculate for autoplays.
2021-06-09 14:33:35 +09:00
Dean Herbert
d0e9f8ef90 Replace and obsolete Ranked flag with IsUserPlayable 2021-06-09 14:17:03 +09:00
ekrctb
555ab8fccd Fix event not unregistered on dispose 2021-06-09 12:35:14 +09:00
Dean Herbert
e914fbf449
Merge pull request #13396 from ekrctb/fix-circle-piece
Fix hit circle animation is removed when a replay is rewound
2021-06-09 11:39:38 +09:00
ekrctb
4707918c6a Fix hit circle animation when a replay is rewound 2021-06-09 10:53:52 +09:00
Dean Herbert
475788041a
Merge pull request #13337 from Pasi4K5/fix-sliders-out-of-screen
Fix sliders sometimes being outside of the playfield with osu! random mod enabled
2021-06-08 21:18:21 +09:00
Samuel Cattini-Schultz
f1bef989b7 Refactor DifficultyAttributes to use auto properties over public fields 2021-06-08 19:43:59 +10:00
Dean Herbert
6017ef3825
Merge branch 'master' into fix-skin-sample-lookup 2021-06-08 17:37:36 +09:00
Dan Balasescu
791855dfa0
Merge branch 'master' into legacy-skin-default-fallback 2021-06-08 16:54:26 +09:00
Dean Herbert
e0f568aa8f Merge branch 'legacy-skin-default-fallback' into fix-skin-sample-lookup 2021-06-08 15:19:52 +09:00
Dean Herbert
88b87b98a8 Fix slider ball layer sources 2021-06-08 12:10:14 +09:00
Dean Herbert
277eb9fa6e Fix slider repeat arrow not updating rotation immediately while paused in editor
A bit of a local solution, but not sure there's a better way to handle
this.

Closes #13342.
2021-06-07 15:58:43 +09:00
Dean Herbert
d26c9a66c2 Merge branch 'legacy-skin-default-fallback' into fix-skin-sample-lookup 2021-06-07 12:01:19 +09:00
Dean Herbert
9ebafb1ec0 Fix cursor trail logic 2021-06-06 22:26:27 +09:00
Pasi4K5
b214f2ae0e Remove repeat and simplify getMinSliderMargin 2021-06-05 17:13:08 +02:00
Pasi4K5
f59263932a Use SliderPath.GetPathToProgress for getting the SliderPath's positions 2021-06-05 17:04:58 +02:00
Pasi4K5
b4f190c6ff Rename iteration variable 2021-06-04 17:22:36 +02:00
Pasi4K5
32e41048ff Fix System.ArgumentException caused by sliders bigger than the playfield 2021-06-04 16:50:27 +02:00
Pasi4K5
6357d1363c Add comment for slider_path_checking_rate 2021-06-04 16:26:40 +02:00
Pasi4K5
a0a6f3ef81 Replace Vector2 methods with math operators 2021-06-04 16:23:03 +02:00
Pasi4K5
9f2a9608f2 Rework slider positioning 2021-06-04 16:17:54 +02:00
ekrctb
d7da66d876 Bring back scheduling of follow point update 2021-06-04 18:41:02 +09:00
ekrctb
0098ac2760 Remove one TODO
It can be removed because pooled drawables are always ready, and `FollowPointConnection` is also ready when applied.
2021-06-04 17:09:59 +09:00
ekrctb
bc892086fe Resolve nullable inspection, enable nullable for FollowPointLifetimeEntry 2021-06-04 17:09:59 +09:00
ekrctb
b373b120ff Use general lifetime container for follow point container 2021-06-04 16:31:50 +09:00
Dean Herbert
06275a6a7d Merge branch 'master' into legacy-skin-default-fallback 2021-06-04 16:00:30 +09:00
Dean Herbert
f62a2747f6 Add legacy implementation 2021-06-04 14:51:35 +09:00
Dean Herbert
5953674737 Tidy up constants 2021-06-04 14:14:51 +09:00