1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-09 09:37:42 +08:00
Commit Graph

3396 Commits

Author SHA1 Message Date
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