1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 10:23:04 +08:00
Commit Graph

4265 Commits

Author SHA1 Message Date
Henry Lin
8e12a067df Remove an unused property 2022-03-09 21:04:35 +08:00
Henry Lin
6a507ca11b Rename identifiers to remove references to random mod 2022-03-09 20:52:11 +08:00
Henry Lin
37328f8d24 Extract hit object positioning logic to a separate class
It is intentional to not rename the identifiers at this point to produce a cleaner diff.
2022-03-09 20:36:31 +08:00
Dan Balasescu
1646e9d64c
Merge pull request #17153 from hlysine/osu-random-mod-logic-changes
Separate randomization and object positioning logic in osu random mod
2022-03-09 20:52:33 +09:00
Dan Balasescu
353b251d38 Attempt to merge conditional expression
Hoping to fix CI error, caused by older R# version.
2022-03-09 17:46:42 +09:00
Dean Herbert
75c6a676b4 Apply nullable to OsuModRandom rather than using jetbrains annotations 2022-03-09 16:58:36 +09:00
Henry Lin
e3cf2c6acd Merge getAbsoluteAngle into computeRandomisedPosition 2022-03-09 13:27:33 +08:00
Henry Lin
3ced5e7904 Rename Distance to DistanceFromPrevious 2022-03-09 13:09:33 +08:00
apollo-dw
e2001148d5 Implement strict tracking mod 2022-03-08 21:47:54 +00:00
Henry Lin
ae1c65c38d Add xmldoc 2022-03-08 12:07:10 +08:00
Henry Lin
8cfeffc085 Extract a major part of ApplyToBeatmap to a new method 2022-03-08 11:50:30 +08:00
Henry Lin
ded84cab3f Separate randomisation and object positioning logic 2022-03-08 11:45:16 +08:00
Siim Pender
a02adfdbd4 Fix crash on super high bpm kiai sections 2022-03-07 20:36:09 +02:00
Henry Lin
c9b205afeb Add adaptive speed mod 2022-03-02 09:57:52 +08:00
Dean Herbert
a41e1c80f1 Show hit error on results screen
Leading up to implementation of "local offset", this feels like a good
thing to have visible first and foremost.
2022-02-28 19:11:06 +09:00
Dean Herbert
692ddd5f52 Merge branch 'master' into issues/16839-spun-out-rate 2022-02-22 14:04:45 +09:00
Dan Balasescu
567da9214e Merge branch 'master' into osu-diff-calc-max-combo 2022-02-18 18:35:24 +09:00
Dan Balasescu
84e82ef5e4 Add XMLDocs to difficulty attribute properties 2022-02-16 14:09:19 +09:00
Dan Balasescu
215da7e933 Reimplement as extension method on IBeatmap
Implementation has changed slightly to support arbitrary levels of
nested hitobjects.
2022-02-16 12:06:49 +09:00
Salman Ahmed
19ee05c232 Add "distance spacing" multiplier for osu! ruleset
While osu!catch also implements a distance snap grid, it doesn't rely on
`GetBeatSnapDistanceAt` (unlike osu!), therefore it can't have the
"distance spacing" multiplier yet.
2022-02-15 02:21:53 +03:00
Kaleb
df9535d195
Update RPM calculation for readability
Multiply the 1.01 factor to the resulting RPM, not to the duration.
2022-02-13 14:28:40 -05:00
Kaleb
585bd541f3
Add missing parentheses to RPM calculation 2022-02-13 02:38:49 -05:00
Kaleb
f1535b74be
Give Spun Out mod dynamic spin rate 2022-02-13 02:16:06 -05:00
PercyDan
639d813d06
Don't override previous value
Co-authored-by: Salman Ahmed <frenzibyte@gmail.com>
2022-02-12 11:15:03 +08:00
PercyDan54
053f41d755
Simplify code 2022-02-12 10:06:43 +08:00
PercyDan54
2ed3d58531
Ignore short spinners for relax mod 2022-02-12 09:28:50 +08:00
Henry Lin
ee6d4b2583 Move performance breakdown to the top to prevent re-ordering after watching replay 2022-02-05 21:39:01 +08:00
Henry Lin
0b1fef38af Use the playable beatmap provided in CreateStatisticsForScore 2022-02-05 21:36:34 +08:00
Henry Lin
2e1a9f1379 Add performance breakdown as statistic item in extended statistics panel 2022-02-05 21:13:16 +08:00
Henry Lin
f29301cd1e
Merge branch 'master' into display-performance-attributes 2022-02-05 16:59:46 +08:00
Dean Herbert
df9d99f5aa Merge branch 'master' into extended-statistics-without-replay 2022-02-03 18:59:48 +09:00
Dean Herbert
2731d8e3c2
Merge pull request #16701 from LeNitrous/mod-alternate-osu
Add "Alternate" mod for osu! ruleset
2022-02-03 10:41:23 +09:00
Dean Herbert
be9df2ca11
Merge pull request #5774 from MaxOhn/aimassist-mod
Add "Aim Assist" mod
2022-02-03 10:40:43 +09:00
Bartłomiej Dach
82f9ad63f5
Fix flashlight size multiplier printing with too many decimal digits 2022-02-02 20:41:25 +01:00
Bartłomiej Dach
7463744407
Fix osu! autoplay-like mods not declaring incompatibility with AimAssist 2022-02-02 19:17:33 +01:00
Dean Herbert
19eb9ad8a7 Reorder StatisticsItem constructor to make a touch more sense 2022-02-02 23:02:38 +09:00
Henry Lin
6a482827fe Fix weird line breaking 2022-02-02 17:23:03 +08:00
Dean Herbert
6e41a6e704 Tidy up code into a presentable state 2022-02-02 16:27:16 +09:00
Dean Herbert
2e46404fe5 Remove spinner support for now 2022-02-02 16:26:00 +09:00
Dean Herbert
f07502ac5f Use simple damp easing rather than transforms 2022-02-02 16:15:06 +09:00
Dean Herbert
334ed2c9c4 Fix sliders moving before they are actually hit 2022-02-02 15:36:09 +09:00
Dean Herbert
6b31e7e9db Merge branch 'master' into aimassist-mod 2022-02-02 15:18:48 +09:00
Dean Herbert
e7d72f1823 Revert recent changes 2022-02-02 15:18:44 +09:00
Dean Herbert
a2affefb0a Avoid checking gameplay clock time in Update method 2022-02-02 14:33:17 +09:00
Henry Lin
c5c4c85006 Lazily create content of StatisticItem 2022-02-02 13:29:18 +08:00
Dean Herbert
c7a192cc5f Only handle LeftButton and RightButton actions
There are definitely going to be other actions used in the future, which
would immediately cause this mod to fail. Limiting handling to
left/right buttons only is the correct way forward.
2022-02-02 14:04:12 +09:00
Dean Herbert
fed63abd83 Sanitise interceptor logic to now require two separate check paths 2022-02-02 14:02:48 +09:00
Dean Herbert
0036d0e26d Move alternate mod to "conversion" category 2022-02-02 13:58:13 +09:00
Bartłomiej Dach
9227211a44
Privatise shouldAlternate 2022-01-31 22:56:27 +01:00
Dan Balasescu
0458d408bb Add replay statistics frames to FramedReplayInputHandler 2022-01-31 18:53:47 +09:00
Nitrous
40f43344f1
remove unused using 2022-01-29 23:31:26 +08:00
Nitrous
535216a0d3
rename CanIntercept to ShouldAlternate 2022-01-29 23:20:31 +08:00
Nitrous
24f9ef4005
make xmldoc more verbose 2022-01-29 22:31:04 +08:00
Nitrous
98d8b26a9c
move ModAlternate to OsuModAlternate and check if intro has ended 2022-01-29 21:49:40 +08:00
Nitrous
2326c36836
remove unused method and fix description 2022-01-29 21:09:36 +08:00
Nitrous
aa582fb0e1
add Alternate Mod 2022-01-29 20:38:12 +08:00
Bartłomiej Dach
a227af75ed
Simplify flashlight parameter passing flow 2022-01-24 21:03:02 +01:00
Bartłomiej Dach
5874475dff
Extract DefaultFlashlightSize to base flashlight class 2022-01-24 21:03:02 +01:00
Bartłomiej Dach
a7c0d507ce
Rename flashlight settings to be more accurate 2022-01-24 21:03:02 +01:00
mk-56
948867898c ModeMultiplier rename 2022-01-24 11:38:52 +01:00
mk-56
161a2a321e Remove bindable from ModeMultiplier 2022-01-24 09:07:07 +01:00
mk-56
ed84ae0ac0 Adjust values to Bdach's refined taste 2022-01-24 00:42:43 +01:00
Henry Lin
74a55ead77 Simplify combo counting logic 2022-01-23 13:00:54 +08:00
Henry Lin
f53ce5aedf Fix max combo calculation in osu diffcalc 2022-01-23 11:11:12 +08:00
mk-56
955bab926f Separate the settings for each modes radiuses 2022-01-22 19:38:56 +01:00
MK56
b5f813a949
Merge branch 'ppy:master' into Liswiera-FL-changes 2022-01-22 19:04:39 +01:00
Bartłomiej Dach
1ce0b18003
Merge branch 'master' into display-performance-attributes 2022-01-22 14:12:57 +01:00
Dan Balasescu
36d1cdb95a Merge branch 'master' into fl-opacity 2022-01-20 14:48:20 +09:00
Dan Balasescu
58bae9bda3
Merge pull request #16331 from stanriders/continuous-effective-misscount
Don't floor `effectiveMissCount`
2022-01-19 14:13:12 +09:00
mk-56
bd308ca38c Cleanup 2022-01-17 15:15:25 +01:00
Henry Lin
b81fc675e8 Include PropertyName in PerformanceDisplayAttribute 2022-01-17 20:45:25 +08:00
Henry Lin
d014fef179 Hide confusing attributes 2022-01-17 20:36:36 +08:00
Henry Lin
511a607599 Display performance breakdown in a tooltip 2022-01-17 18:28:17 +08:00
mk-56
ee4331dda4 Merge remote-tracking branch 'origin/Liswiera-FL-changes' into Liswiera-FL-changes 2022-01-15 21:44:03 +01:00
mk-56
2a59735525 Initial commit 2022-01-15 21:43:28 +01:00
Bartłomiej Dach
03e4ec4214
Merge branch 'master' into realm-integration/score-and-beatmaps 2022-01-15 14:45:42 +01:00
Salman Ahmed
3ab13dd78c Assign position to spinner ticks for correct positional playback 2022-01-15 14:24:52 +03:00
Susko3
19467e58c1 Remove unused params from BDL methods 2022-01-15 01:06:39 +01:00
Dean Herbert
4f8d29c1c0 Merge branch 'master' into realm-integration/score-and-beatmaps 2022-01-13 18:25:09 +09:00
Joseph Madamba
b245ffefc1 Merge remote-tracking branch 'upstream/master' into fix-remaining-identifier-names 2022-01-12 15:05:07 -08:00
Dean Herbert
51251e3204 Fix CI reported warnings 2022-01-12 22:39:00 +09:00
Dean Herbert
d8c52740cb
Merge pull request #16354 from bdach/slider-snapping
Apply slider snapping to current beat divisor more liberally to match user expectations
2022-01-12 11:18:18 +09:00
Dan Balasescu
b88a65166e Fix pp counter underflow with SpunOut mod 2022-01-11 10:22:16 +09:00
Bartłomiej Dach
c09f6ee052
Use slider snapping more liberally to match user expectations
Previously the slider path length would be snapped using the current
beat snap setting on *every* change of the slider path. As it turns out
this is unexpected behaviour in some situations (e.g. when reversing a
path, which is expected to preserve the previous duration, even though
the slider may be technically "unsnapped" at that point in time due to a
different beat snap setting being selected afterwards).
2022-01-07 16:02:04 +01:00
MaxOhn
b3230868cc use playfield clock 2022-01-06 16:31:30 +01:00
MaxOhn
197ada1a8c naive 10hz update 2022-01-06 16:04:38 +01:00
MaxOhn
b9d2a10530 adjustable assist strength + dont update spinner & running slider 2022-01-06 16:00:49 +01:00
MaxOhn
04d060aba3 update general playfield only once 2022-01-06 10:38:30 +01:00
Dean Herbert
ee24713002 Fix single sliders not being flippable due to incorrect precondition 2022-01-06 14:37:13 +09:00
StanR
dc755f4a7f Remove redundant casts 2022-01-05 15:07:02 +03:00
MaxOhn
5a62760fe4 hold spinners & minor adjustments 2022-01-05 13:05:22 +01:00
StanR
b317a95fe1 Don't floor effectiveMissCount 2022-01-05 14:36:07 +03:00
Dean Herbert
6779503e57 Refactor logic to avoid TimelineSelectionHandler having to block base calls 2022-01-05 16:56:54 +09:00
Dean Herbert
866ae3472b Add global flip hotkeys 2022-01-05 16:48:07 +09:00
MaxOhn
27a8bfa496 handle spinners and follow points 2022-01-04 22:17:50 +01:00
MaxOhn
612f69782b use Playfield.HitObjectContainer.AliveObjects 2022-01-04 14:29:44 +01:00
MaxOhn
168a105ed8 merged upstream 2022-01-04 09:34:02 +01:00
Dean Herbert
408e8d5710 Fix null reference causing crash in KiaiFlashingDrawable
Can occur if there is no fallback graphics available. Previously would
work as it was only setting the `Texture`.

As reported in https://github.com/ppy/osu/discussions/16281.
2021-12-30 22:21:39 +09:00
Joseph Madamba
c22a07d9fc Bump identifier typo inspection and fix remaining identifier names 2021-12-28 11:26:42 -08:00
Bartłomiej Dach
eea0fea69f
Add support for animated legacy hit circle overlay 2021-12-28 15:58:34 +01:00
Bartłomiej Dach
448c6ed515
Generalise KiaiFlashingSprite for arbitrary drawables 2021-12-28 15:58:34 +01:00
Bartłomiej Dach
63e0492725
Mark ShouldSerialize() methods as implicitly used 2021-12-28 09:02:03 +01:00
Joseph Madamba
7de43e3aba Fix most open compound words in identifiers being closed 2021-12-27 20:26:28 -08:00
Bartłomiej Dach
c6a5ac1c5f
Fix control point additions without a drag not being undoable 2021-12-23 09:32:52 +01:00
Bartłomiej Dach
cbda637d66
Fix drag after placement moving last placed point sometimes
More specifically, if the left mouse button was just pressed without a
drag, `OnDragEnd()` wouldn't fire, and the next drag would start moving
the last placed control point around regardless of where the mouse was.
2021-12-23 09:25:10 +01:00
Dean Herbert
b0df787b1a Move public method up and add xmldoc to second public method 2021-12-23 14:13:57 +09:00
Dean Herbert
60c9827187
Merge branch 'master' into move-many-slider-nodes-at-once 2021-12-23 14:11:04 +09:00
Bartłomiej Dach
c3fada1926
Replace assertion with soft null check
Surrounding `OnDrag{Start,End}` methods did so already.
2021-12-22 10:33:08 +01:00
Bartłomiej Dach
6330fa5dc5
Select newly created control point 2021-12-22 10:33:07 +01:00
Bartłomiej Dach
e22745397d
Fix right click deselecting clicked path piece with control held 2021-12-22 08:55:26 +01:00
Dan Balasescu
98f044881e
Merge branch 'master' into refactor-diffcalc 2021-12-22 12:31:28 +09:00
Dan Balasescu
e50609c546 Rename method 2021-12-22 12:28:07 +09:00
Bartłomiej Dach
e715bff535
Fix selections including head not correctly dragging if not started from head 2021-12-21 12:35:48 +01:00
StanR
40b3ce0ade Clean up comments 2021-12-21 14:03:24 +03:00
StanR
cca02a8016 Create PerformanceAttributes 2021-12-21 13:08:31 +03:00
MBmasher
2aafcd3628 Refactor code regarding hidden boolean 2021-12-21 20:58:05 +11:00
MBmasher
c5de203aa5 Multiply opacityBonus to base strain 2021-12-21 20:10:19 +11:00
MBmasher
5d8968498c Adjust skillMultiplier after merging #15728, #15867 2021-12-21 20:08:57 +11:00
MBmasher
3d3de00581 Move hidden initialisation to Flashlight constructor 2021-12-21 20:06:53 +11:00
MBmasher
a7aea49cb3 Rename osuPreviousHitObject to currentHitObject 2021-12-21 20:06:07 +11:00
MBmasher
0a33f336b0
Merge branch 'master' into fl-opacity 2021-12-21 19:48:49 +11:00
Dan Balasescu
05b79f864e
Merge pull request #15867 from MBmasher/fl-cumulative-strain
Fix cumulative strain time calculation in Flashlight skill
2021-12-21 17:19:09 +09:00
Dan Balasescu
f366cdc73e Extract initial set out of loop 2021-12-21 12:39:34 +09:00
Dan Balasescu
c21b2d1662 Fix incorrect variable 2021-12-21 12:39:09 +09:00
Dan Balasescu
e21dbf10ff Refactor further to remove indexing confusion 2021-12-21 12:25:32 +09:00
Dan Balasescu
377cb1d9e3
Merge pull request #15728 from MBmasher/fl-decay
Remove decay factor in Flashlight skill
2021-12-21 07:59:32 +09:00
Bartłomiej Dach
5ef4e23335
Fix selecting control points without control not deselecting other selected points 2021-12-20 22:41:24 +01:00
Bartłomiej Dach
bf8c87e9b7
Fix releasing mouse after drag deselecting dragged point 2021-12-20 22:41:23 +01:00
Bartłomiej Dach
d2417beeac
Implement drag operation for multiple path control points 2021-12-20 21:29:57 +01:00
Bartłomiej Dach
a9408485cc
Change control point piece selection logic to allow dragging multiple 2021-12-20 21:18:38 +01:00
Bartłomiej Dach
b0ca82e1e5
Move slider path point drag handling to visualiser 2021-12-20 20:56:06 +01:00
MBmasher
c71655a75e
Merge branch 'master' into fl-cumulative-strain 2021-12-21 06:06:19 +11:00
MBmasher
6caa950c44 Rename osuPrevious to osuLoop 2021-12-20 19:16:41 +11:00
StanR
2f2006715e Slightly refactor difficulty and pp calculators 2021-12-17 23:40:23 +03:00
Dean Herbert
abb617a3df Avoid blocking Active state propagation 2021-12-16 19:57:24 +09:00
Dean Herbert
6bffeb6a24
Merge branch 'master' into fix-autopilot-touch-devices 2021-12-15 12:04:35 +09:00
rumoi
e662a9f0c4 Remove redundant code. 2021-12-15 12:36:45 +13:00
rumoi
4664bb1d29 Remove uneeded complexity 2021-12-15 05:16:10 +13:00
rumoi
c87ff82c1c calculateRhythmBonus performance fix. 2021-12-14 09:25:29 +13:00
Salman Ahmed
cf30411288 Revert "Remove now redundant inclusion of TouchMoveEvent in OsuInputManager.Handle"
This reverts commit bc1f1f35b5.
2021-12-10 17:13:13 +03:00
Salman Ahmed
bc1f1f35b5 Remove now redundant inclusion of TouchMoveEvent in OsuInputManager.Handle
Now it's handled separately via the `HandleMouseTouchStateChange` override.
2021-12-10 16:44:16 +03:00
Dean Herbert
5a953f3811 Fix autopilot not working as expected on touch devices
Closes https://github.com/ppy/osu/issues/12731.

I haven't tested this, but quite confident it should work. Will test
later today unless someone else beats me.
2021-12-10 19:14:35 +09:00
Dan Balasescu
99991a6703 Minor cleanups, unifying wording a bit more 2021-12-08 15:59:15 +09:00
Dan Balasescu
1a09a3469a Merge branch 'master' into refactor-osu-difficulty-hit-object 2021-12-08 15:53:44 +09:00
Dan Balasescu
11104124f1 Restructure doc for easier readability 2021-12-08 15:52:59 +09:00
Dan Balasescu
814f072767 Use new LazyJumpDistance terminology in documentation 2021-12-08 15:17:56 +09:00
Dan Balasescu
7c0f7b1baa Use "x" for cursor position in diagrams 2021-12-08 14:57:21 +09:00
Dan Balasescu
bcda777071
Merge branch 'master' into speedbug 2021-12-07 23:43:17 +09:00
Dan Balasescu
ded86282c1 Rename + better documentation 2021-12-07 23:14:35 +09:00
Dan Balasescu
7c3d1d630e Merge branch 'master' into refactor-osu-difficulty-hit-object 2021-12-07 21:05:49 +09:00
MBmasher
9824d805ea Remove unnecessary clockRate in Opacity function 2021-11-30 14:36:38 +11:00
MBmasher
5884b058b9 Add blank line 2021-11-30 13:54:41 +11:00
MBmasher
3339afd648 Change input variable name in Opacity function 2021-11-30 13:52:58 +11:00
MBmasher
b0dc8bf061 Change Opacity function to take in absolute map time rather than relative time 2021-11-30 12:58:49 +11:00
MBmasher
4354699258 Fix cumulative strain time calculation in Flashlight skill 2021-11-30 12:51:23 +11:00
Dan Balasescu
383bf7cdfc Only allow HD combination alongside FL 2021-11-30 10:39:48 +09:00
Dan Balasescu
e6e6e2d951 Merge branch 'master' into fl-opacity 2021-11-30 10:00:44 +09:00
Bartłomiej Dach
5001412a0d
Reorder easing mapping to match enum order and throw on unknown animation style 2021-11-28 15:19:12 +01:00
Bartłomiej Dach
aba9ed624a
Remove unnecessary whitespace 2021-11-28 15:16:33 +01:00
mk-56
1ae41118cd Added gravity as a default. 2021-11-27 22:59:09 +01:00
mk-56
0df97744ad Moved linear to a better place.
i decided to go with leaving it under gravity, its plenty visible and fine there, since the public enum list self orders I wasn't sure about how i could set a default that wasn't the topmost option
2021-11-27 13:34:09 +01:00
MK-56
5e56122d65 Linear approach type moved per peppys request 2021-11-26 09:48:38 +01:00
MK56
5e0763ae33 Expand the functionality of Approach different 2021-11-25 10:24:00 +01:00
Dan Balasescu
3e4b774992 Invert lines for better chronological order 2021-11-25 14:08:08 +09:00
Dan Balasescu
b20ff22af0 Ensure travel distance is calculated for all sliders 2021-11-24 16:50:33 +09:00
Dan Balasescu
274444ed67 Add additional information to diagram 2021-11-24 13:22:52 +09:00
Dan Balasescu
b5747f351d Reword xmldocs 2021-11-24 13:11:44 +09:00
Dan Balasescu
a081038076 Normalized -> Normalised 2021-11-24 13:01:53 +09:00
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