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

451 Commits

Author SHA1 Message Date
smoogipoo
23dbf04764 Fix incorrect type 2021-11-04 09:17:51 +09:00
Xexxar
6c6a440f1b applied constants to numbers 2021-11-03 18:09:44 +00:00
Xexxar
7eb0edf046 added stanrs requested changes 2021-11-03 17:59:09 +00:00
Xexxar
8e0d845f21 added small length component to ARbuffs 2021-11-03 16:39:05 +00:00
Xexxar
a92e588389 Merge branch 'aim-refactor-velocity' into aim-refactor-ppcalc 2021-11-03 16:37:19 +00:00
Xexxar
45e0897530 Merge branch 'aim-refactor-slider' into aim-refactor-velocity 2021-11-03 16:37:02 +00:00
Xexxar
a32c97427d set angleBonus to take max of acute and wide multipliers 2021-11-03 16:36:39 +00:00
Xexxar
93ed97d11e increased global multiplier due to adjustment to sliders 2021-11-03 16:16:09 +00:00
Xexxar
a8d4d7ca2d Merge branch 'aim-refactor-velocity' into aim-refactor-ppcalc 2021-11-03 16:15:40 +00:00
Xexxar
d1ec245685 Merge branch 'aim-refactor-slider' into aim-refactor-velocity 2021-11-03 16:15:17 +00:00
Xexxar
7fc60a840e added radial leniency to movementdistance 2021-11-03 16:14:45 +00:00
Xexxar
8fdffbf08f adjusted global multiplier to better balance values against inflation 2021-11-03 16:02:23 +00:00
Xexxar
2d48301223 Merge branch 'aim-refactor-velocity' into aim-refactor-ppcalc 2021-11-03 15:55:01 +00:00
Xexxar
d74e181531 renamed prev to last 2021-11-03 15:54:49 +00:00
Xexxar
b9fc355f74 Merge branch 'aim-refactor-slider' into aim-refactor-velocity 2021-11-03 15:53:41 +00:00
Xexxar
b3b44c0795 merged in aim-base 2021-11-03 15:52:48 +00:00
Xexxar
9afca5c5b6 rewrote slider algorithm to be based on leniency and stored current cursor positions 2021-11-03 15:38:23 +00:00
smoogipoo
133218ecbb Document special MovementDistance for sliders, ensure always has a value 2021-11-03 01:04:07 +09:00
smoogipoo
b0d9c0eca3 Refactor variables for readability in angle calculations 2021-11-03 00:16:33 +09:00
smoogipoo
93c03b9d37 Refactor documentation around velocity calculations 2021-11-03 00:04:19 +09:00
smoogipoo
7e0629774b Rename variables for readability
In particular, "last" vs "prev" can get confusing because they mean the
same thing.
2021-11-02 23:51:10 +09:00
smoogipoo
5454de7ae8 Refactor xmldocs 2021-11-02 23:47:20 +09:00
smoogipoo
be8a1f60c0 Apply styling changes 2021-11-02 23:33:51 +09:00
Xexxar
9f5a7526ed merge in ppy/master 2021-10-28 14:47:28 +00:00
Xexxar
219880d719 add in stanrs review 2021-10-28 14:45:45 +00:00
Xexxar
bc98e8c97c Merge branch 'aim-refactor-velocity' into aim-refactor-ppcalc 2021-10-27 18:10:11 +00:00
Xexxar
09d4ed149c merged latest slider 2021-10-27 18:09:50 +00:00
Xexxar
7eb7d12589 updated sliders to handle increased tick rates better 2021-10-27 18:08:30 +00:00
Xexxar
626db1f274 updated sliders to handle increased tick rates better 2021-10-27 18:08:06 +00:00
Xexxar
ddf87316df updated to add nerf for repeated acute angles 2021-10-27 16:30:17 +00:00
Dean Herbert
6944151486 Apply batch fixing of built-in types using var 2021-10-27 13:04:41 +09:00
Xexxar
ceb2bdece9 Merge branch 'aim-refactor-velocity' into aim-refactor-ppcalc 2021-10-22 17:22:00 +00:00
Xexxar
b6e7d898f1 constant didnt update during last merge 2021-10-22 17:21:34 +00:00
Xexxar
19fb848ed2 Merge branch 'aim-refactor-velocity' into aim-refactor-ppcalc 2021-10-22 17:19:04 +00:00
Xexxar
b9748399c4 added velocity adjustment for sliders 2021-10-22 17:18:34 +00:00
Xexxar
06e7c3cd04 Merge branch 'aim-refactor-slider' into aim-refactor-velocity 2021-10-22 17:17:36 +00:00
Xexxar
62197fec3a updated sliders for rebalance again 2021-10-22 17:17:19 +00:00
Xexxar
ce8899e7c8 Merge branch 'aim-refactor-velocity' into aim-refactor-ppcalc 2021-10-21 21:38:37 +00:00
Xexxar
5ee2272d8a added slider changes 2021-10-21 21:37:38 +00:00
Xexxar
85f28a843a adjusted sliders further 2021-10-21 21:30:00 +00:00
Xexxar
ac22d31b34 Merge branch 'aim-refactor-velocity' into aim-refactor-ppcalc 2021-10-21 19:58:55 +00:00
Xexxar
534d1e72ce merged sliders 2021-10-21 19:58:41 +00:00
Xexxar
ec06e53212 further rebalancing of sliders 2021-10-21 19:58:02 +00:00
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
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
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
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
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
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
apollo-dw
310bf3e580 more code quality (oops) 2021-10-01 15:29:20 +01:00
apollo-dw
57b9a91cba trim whitespace cuz code quality 2021-10-01 15:26:59 +01:00
apollo-dw
7884dbbd11 adjust formulae 2021-10-01 15:04:44 +01:00
Dean Herbert
05996cc2e9 Add changes that got forgotted in branch surgery 2021-10-01 17:04:53 +09:00
Xexxar
d14eed88fd final clean up before PR 2021-09-29 19:14:54 +00: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
smoogipoo
e3b6c15a73 Merge branch 'master' into speedpp 2021-09-21 18:41:27 +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
Xexxar
cdd813926b nerf to high bpm rhythm changes, nerf to 1/3->1/4 2021-09-17 00:27:42 +00: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
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
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
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