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

4145 Commits

Author SHA1 Message Date
Dan Balasescu
e07c44d79a Reword comment with a more diagrammatical explanation 2021-11-24 13:01:15 +09:00
Dan Balasescu
402de754f7 Make TravelDistance/TravelTime apply to the current object 2021-11-24 12:37:22 +09:00
Dan Balasescu
e67d9b1c21 Reorder members a bit 2021-11-24 12:14:52 +09:00
GoldenMine0502
9157b91e5f fix adding wrong values 2021-11-23 16:41:20 +09:00
MBmasher
7560d3de04 Remove decay factor in Flashlight skill 2021-11-22 10:52:04 +11:00
MBmasher
65ef030341 Further balancing 2021-11-22 08:59:41 +11:00
MBmasher
7833fab02d Balancing bonuses to adjust for corrected opacity formula 2021-11-22 08:41:56 +11:00
MBmasher
e9745a3ac4 Fix wrong opacity formula 2021-11-22 08:32:35 +11:00
MBmasher
e9a4ee6800 Cleaning up code 2021-11-21 23:53:40 +11:00
MBmasher
a57c277a58 Move preempt back to CreateDifficultyAttributes 2021-11-21 23:43:09 +11:00
MBmasher
afbec94124 Move opacity function to OsuDifficultyHitObject 2021-11-21 23:40:15 +11:00
Dean Herbert
9f688f6291 Stop persisting Skills in DifficultyAttributes 2021-11-21 12:15:32 +09:00
MBmasher
fe83b8fc77 Add line break 2021-11-18 10:50:32 +11:00
MBmasher
f4b23f0960 Remove setting preempt in CreateDifficultyAttributes 2021-11-18 10:37:07 +11:00
MBmasher
30e18f16d9 Change mods and preemptTime to readonly 2021-11-18 10:33:44 +11:00
MBmasher
92cf447180 Remove unnecessary braces 2021-11-18 10:32:41 +11:00
MBmasher
8e8571543d Removing unnecessary file 2021-11-18 09:48:18 +11:00
MBmasher
6a444b9edb Further balancing opacity/hidden bonus 2021-11-18 09:47:41 +11:00
Dean Herbert
fd0cae2bfb
Merge branch 'master' into difficulty-attribute-helpers 2021-11-17 20:49:31 +09:00
Dan Balasescu
815179f713 Use consts for attribute IDs 2021-11-17 20:31:18 +09:00
Dan Balasescu
43cbb23b15 Use ShouldSerializeFlashlightRating() to serialise database attribute 2021-11-17 20:23:08 +09:00
Dan Balasescu
2ae46f901e Add comment for implicitly-used method 2021-11-17 20:22:43 +09:00
MBmasher
63c5f7d9d7 Balancing opacity and hidden bonus 2021-11-17 11:39:12 +11:00
MBmasher
f2d05ea899 Remove strain being multiplied by max opacity bonus 2021-11-17 11:27:48 +11:00
Dan Balasescu
2c45a327bb Remove JsonIgnores, require opt-in properties 2021-11-15 19:54:35 +09:00
Dean Herbert
369b4ba789 Update DifficultyCalculator to take an IRulesetInfo 2021-11-15 19:16:48 +09:00
Dean Herbert
62d670a3ca Update DifficultyCalculator to take an IWorkingBeatmap 2021-11-15 19:16:48 +09:00
Dan Balasescu
c8a01c35f7 Remove extra members from FromDatabaseAttributes 2021-11-15 18:11:07 +09:00
Dan Balasescu
21c0882b74 Don't serialize FL rating without FL mod 2021-11-15 17:24:53 +09:00
Dan Balasescu
45382a8127 Ignore some properties 2021-11-15 16:32:25 +09:00
Dan Balasescu
0cfd6fdf04 Add to/from database mapping functions to difficulty attributes 2021-11-15 16:06:50 +09:00
Dan Balasescu
907499f73a Add json properties to difficulty attributes 2021-11-15 16:06:29 +09:00
MBmasher
efac11e886 Add extra bonus for hidden+flashlight 2021-11-12 21:42:27 +11:00
MBmasher
5a3be778a1 Resolve conflicts with recent slider hotfix 2021-11-12 21:41:01 +11:00
MBmasher
131e64e56c Add bonus based on opacity of hit objects 2021-11-12 21:29:51 +11:00
Dan Balasescu
a76247603f
Merge pull request #15564 from apollo-dw/sliderend-sr
Nerf dropped sliders in osu! difficulty calculation
2021-11-12 18:16:28 +09:00
Dan Balasescu
9fb2402781 Remove unnecessary parens 2021-11-12 17:31:25 +09:00
apollo-dw
cdfe022805 Fix potential NaN values 2021-11-12 00:56:08 +00:00
Bartłomiej Dach
8aa04864ce
Add support for converting sliders with repeats to streams 2021-11-11 23:25:49 +01:00
Bartłomiej Dach
0cd3f98598
Ensure samples & sample points are carried over during conversion 2021-11-11 21:43:06 +01:00
Bartłomiej Dach
27707d52ec
Implement slider-to-stream conversion 2021-11-11 21:01:30 +01:00
apollo-dw
c330093476 Add clamp back in 2021-11-11 14:42:54 +00:00
apollo-dw
1ba01a7e9a Fix circle-only map NaN values 2021-11-11 14:37:50 +00:00
apollo-dw
95bfb2c69b Clamp slider end estimate to 0 2021-11-11 12:46:22 +00:00
apollo-dw
7075108062 Clean up clamp logic relating to slider end estimate 2021-11-11 02:57:34 +00:00
apollo-dw
86c6837e5d Make slider nerf factor more lenient 2021-11-11 02:49:24 +00:00
apollo-dw
5df694e912 Estimate number of difficult sliders, and increase assumed slider radius 2021-11-11 00:42:06 +00:00
ekrctb
116b857cea
Merge branch 'master' into no-scope-catch 2021-11-10 20:50:31 +09:00
Bartłomiej Dach
6d04823b05
Remove unnecessary virtual specs 2021-11-10 12:00:36 +01:00
apollo-dw
2d2a6d8a18 Swap to a harsher formula for slider dropped nerf 2021-11-10 04:00:54 +00:00
apollo-dw
fe2f143e8a Nerf slider aim for plays with dropped slider ends 2021-11-10 00:59:28 +00:00
Semyon Rozhkov
41f4f0ab5e Different setting slider description in each mod 2021-11-10 03:57:22 +03:00
Semyon Rozhkov
64bc8da14c Add "No Scope" mod implementation for Catch 2021-11-09 17:11:19 +03:00
Dan Balasescu
2c1941eec6
Merge pull request #15514 from Wieku/fix-initial-strain
Change currentStrain to 0 for standard mode skills
2021-11-08 12:04:50 +09:00
Dean Herbert
17637d9dac
Merge pull request #15505 from peppy/use-class-rename
Rename `User` to `APIUser` and move to correct namespace
2021-11-08 11:48:19 +09:00
Sebastian Krajewski
b84b288c23 Merge branch 'master' of github.com:ppy/osu into fix-initial-strain 2021-11-08 02:07:08 +01:00
Sebastian Krajewski
bd35a3b7ba Change currentStrain to 0 for standard mode skills 2021-11-08 01:53:51 +01:00
Dan Balasescu
547feaa392
Merge branch 'master' into aim-refactor-ppcalc 2021-11-08 01:38:18 +09:00
Dan Balasescu
fd9e86d399
Merge pull request #14847 from emu1337/aim-refactor-velocity
osu! Difficulty Aim Overhaul: velocity change
2021-11-08 01:38:07 +09:00
smoogipoo
480a1604fa Rename constant 2021-11-08 00:47:22 +09:00
smoogipoo
84f3168a6c More comment refactorings 2021-11-08 00:46:35 +09:00
smoogipoo
5ada167709 Merge branch 'master' into aim-refactor-velocity 2021-11-08 00:32:40 +09:00
Bartłomiej Dach
cc73db09d3
Merge branch 'master' into relax-nan-fix 2021-11-07 16:31:59 +01:00
Dan Balasescu
c62b6ab492
Merge pull request #14846 from emu1337/aim-refactor-slider
osu! Difficulty Aim Overhaul: slider change
2021-11-08 00:31:37 +09:00
Xexxar
fed733202e removed unneeded comment 2021-11-07 14:59:25 +00:00
Xexxar
4493ca4dda Merge branch 'aim-refactor-velocity' into aim-refactor-ppcalc 2021-11-07 14:56:50 +00:00
Xexxar
86b635cdd3 refactor comments to be on previous line for readability 2021-11-07 14:56:23 +00:00
Dean Herbert
ca933c53ab
Fix weird english in old comment 2021-11-07 23:52:32 +09:00
Xexxar
80248f436d Merge branch 'aim-refactor-slider' into aim-refactor-velocity 2021-11-07 14:51:19 +00:00
Xexxar
e23b93bc4c Merge branch 'aim-refactor-slider' of https://github.com/emu1337/osu into aim-refactor-slider 2021-11-07 14:50:29 +00:00
Xexxar
03476e018e fixed comment 2021-11-07 14:49:26 +00:00
Bartłomiej Dach
6d30248cef
Merge branch 'master' into use-class-rename 2021-11-07 15:41:00 +01:00
smoogipoo
6aecd682af Refactor a bit 2021-11-07 23:26:13 +09:00
Xexxar
771620cef1 refactored duplicate code for simplicity 2021-11-07 14:21:18 +00:00
Sebastian Krajewski
91e261e256 Start comments with upper case 2021-11-07 14:51:17 +01:00
Sebastian Krajewski
fedbbc0210 Add a comment why Math.Min is used 2021-11-07 14:50:00 +01:00
Sebastian Krajewski
b1f3fee239 Add sanity check in Relax effectiveMissCount calculation 2021-11-07 05:54:17 +01:00
Dean Herbert
0ecf5f201c Rename User to APIUser and move to correct namespace 2021-11-07 11:26:01 +09:00
Xexxar
291ef1fe9c Merge branch 'aim-refactor-velocity' into aim-refactor-ppcalc 2021-11-07 01:50:59 +00:00
Xexxar
24ba515f09 Merge branch 'aim-refactor-slider' into aim-refactor-velocity 2021-11-07 01:50:47 +00:00
Xexxar
22b9d2e879 adjustment to decrease slider leniency 2021-11-07 01:50:17 +00:00
Xexxar
866c731b74 Merge branch 'aim-refactor-velocity' into aim-refactor-ppcalc 2021-11-07 01:09:09 +00:00
Xexxar
26ff292337 revert velchangetest change 2021-11-07 01:08:51 +00:00
Xexxar
fc25f9501f Merge branch 'aim-refactor-velocity' into aim-refactor-ppcalc 2021-11-07 00:13:37 +00:00
Xexxar
adeebd954a update to fix velocity change oversight 2021-11-07 00:13:13 +00:00
Xexxar
e0632c4b1f Merge branch 'aim-refactor-velocity' into aim-refactor-ppcalc 2021-11-06 22:28:13 +00:00
Xexxar
f135a98d69 updated for review, adding wide angle buff for velchanges 2021-11-06 22:27:58 +00:00
Xexxar
860f9f0860 Merge branch 'aim-refactor-velocity' into aim-refactor-ppcalc 2021-11-06 21:56:02 +00:00
Xexxar
bd58d2873e revert velocity multiplier to 0.75 2021-11-06 21:55:47 +00:00
Xexxar
0fdfa77185 Merge branch 'aim-refactor-velocity' into aim-refactor-ppcalc 2021-11-06 21:12:03 +00:00
Xexxar
7af1a0bf12 buffed velocity constant 2021-11-06 21:11:37 +00:00
Xexxar
454e51a4c5 Merge branch 'aim-refactor-slider' into aim-refactor-velocity 2021-11-06 21:11:14 +00:00
Xexxar
14a3e3bb06 nerfed approx slider window 2021-11-06 21:10:21 +00:00
Xexxar
fc33c96c38 Merge branch 'aim-refactor-velocity' into aim-refactor-ppcalc 2021-11-06 19:44:39 +00:00
Xexxar
e50c7fff2f Merge branch 'aim-refactor-slider' into aim-refactor-velocity 2021-11-06 19:44:21 +00:00
Xexxar
7d2c31f4df cleaned up code uglies 2021-11-06 19:42:54 +00:00
Xexxar
9b8b6846e9 restore original global multiplier so people dont mald 2021-11-06 19:22:30 +00:00
Xexxar
6f5cfe3268 Merge branch 'aim-refactor-velocity' into aim-refactor-ppcalc 2021-11-06 19:22:08 +00:00
Xexxar
beea8e8ba6 Merge branch 'aim-refactor-slider' into aim-refactor-velocity 2021-11-06 19:18:50 +00:00
Xexxar
7e47432f93 merged latest 2021-11-06 19:18:25 +00:00
Xexxar
3e08772660 updated slider to use lazytraveldistance code location 2021-11-06 19:16:58 +00:00
Dean Herbert
6399c695e8 Update usages of BufferedContainer in line with framework changes 2021-11-05 15:54:49 +09:00
smoogipoo
d76158cbad Resolve inspection 2021-11-04 09:20:46 +09:00
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
c3a31a019b Merge branch 'master' into aim-refactor-base 2021-11-03 00:32:51 +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
Dean Herbert
e0cdcdd7a4 Merge branch 'master' into spinner-judgement-fix 2021-10-29 12:13:42 +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
Dean Herbert
5c7623e68e
Merge pull request #15255 from goodtrailer/node-samples-ilist
Change IHasRepeats.NodeSamples to IList from List
2021-10-28 14:24:26 +09:00
Dean Herbert
add39fbd4f Merge branch 'master' into fix-skin-layout-editor-crash 2021-10-28 06:24:24 +09: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
Dean Herbert
838481bf3a
Merge pull request #15252 from jaswon/no-scope-breaks
Show cursor during breaks and spinners in no scope mod
2021-10-27 12:55:02 +09:00
Dean Herbert
d80a73b63d Use explicit primitive types 2021-10-27 12:53:02 +09:00
Bartłomiej Dach
670fcea68d
Rename some variables 2021-10-26 18:56:34 +02:00
smoogipoo
1147c6cbfc Remove unnecessary default value 2021-10-26 19:56:54 +09:00
Roxie Wattz
8b85c78b0d Add processing of Spinner approach circles 2021-10-25 20:16:45 -07:00
Dean Herbert
0757044b15 Refactor logic to work 2021-10-26 11:42:15 +09:00
Dean Herbert
e7b19cb724 Rename test and fix incorrect layout 2021-10-26 11:30:36 +09:00
Roxie Wattz
cf7fbf4b63 updated bdach's suggestion 2021-10-25 17:15:43 -07:00
Roxie Wattz
c9a2c6c031 Reworking the Ouendan 2 Hidden code AGAIN
Not finished. Will be finished in a later commit.
2021-10-25 14:09:22 -07:00
Roxie Wattz
7a92c7ab7e Move condition to separate switch statement
No clue if this is how peppy wanted me to do it but it still works
2021-10-25 00:25:32 -07:00
Roxie Wattz
cb36a23cdc
Update osu.Game.Rulesets.Osu/Mods/OsuModHidden.cs
Suggested by peppy. Changes name and description of setting

Co-authored-by: Dean Herbert <pe@ppy.sh>
2021-10-24 22:52:10 -07:00
Roxie Wattz
d1b720af16 Add Ouendan 2 reference 2021-10-24 21:51:12 -07:00
Roxie Wattz
6b9e8dbd2e Added the ouendan 2 style hidden
Added as an option for nostalgia nerds like me
2021-10-24 21:34:40 -07:00
Roxie is Flux3on
0c57453f4d Reverted special case code changes
As requested by @frenzibyte
2021-10-24 18:16:14 -07:00
Roxie is Flux3on
a8e3d0bacc Added an override for StackedEndPosition
This ensures the spinner's hit judgement will always be centre instead of in the top left corner.
2021-10-24 18:15:40 -07:00
Roxie is Flux3on
861cd4852a Made StackedEndPosition virtual
Done to allow overriding in the other object classes.
2021-10-24 18:14:37 -07:00
Roxie is Flux3on
386910ca2e Cut amount of code down for the spinner judgement fix 2021-10-24 15:29:47 -07:00
Roxie is Flux3on
b8308b9715 Corrected spinner judgement positions.
For some reason, spinner judgements would stack from the top left in an awkward fashion. This patch ensures that the judgement location will always be in the centre of the screen.
2021-10-24 15:28:38 -07:00
Dean Herbert
99d01f2162 Fix a couple of new layout inspections introduces in Rider 2021.3 EAP5 2021-10-24 23:51:49 +09:00
goodtrailer
4440b9ca11 Change IHasRepeats.NodeSamples to IList from List 2021-10-23 01:59:07 -07:00
Jason Won
9fcb3d9dd1 NoScopeMod: show cursor during breaks + spinners 2021-10-22 18:14:32 -04: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
Dean Herbert
93482414d6 Remove SkinConfiguration subclasses and allow configuration parsing for all skin types 2021-10-22 14:42:23 +09: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
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