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 const
s 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 LegacySkinTransformer
s to accept raw ISkin
s 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