h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-25 17:32:55 +08:00
Code Issues Releases Wiki Activity
69,401 Commits 6 Branches 666 Tags 365 MiB
ae75bfd966
Commit Graph

1347 Commits

Author SHA1 Message Date
Dean Herbert
714f55b6bc Clone control points when copying to HitObjects 2021-09-10 14:36:39 +09:00
Dean Herbert
a3d9ab1e2e Move approach rate to EffectControlPoint 2021-09-03 16:58:16 +09:00
Dean Herbert
071c56e90b Update usages of DifficultyPointAt 2021-09-03 16:58:16 +09:00
Dean Herbert
b907c2f4f6 Fix osu! judgements getting scaled twice over different durations 2021-09-02 16:31:43 +09:00
Dean Herbert
738ce0f689 Fix repeat arrows being hidden beneath head circles in legacy skins 
Aims to make minimal changes to `DrawableSlider` itself. I'm not super
happy about the slider ball being moved above the head circle, but it
*is* what people are used to so no one except for me is going to
complain.

Supersedes and closes https://github.com/ppy/osu/pull/14561.
 2021-09-01 19:41:49 +09:00
Dan Balasescu
f0296e5d12
Merge branch 'master' into avoid-default-skin-judgement-transform-overhead 2021-08-27 10:02:40 +09:00
Dan Balasescu
a28bc9f6b2
Merge branch 'master' into path-control-point-bindable-removal 2021-08-27 09:37:37 +09:00
Salman Ahmed
b9ea984c36 Remove redundant default value 2021-08-26 08:18:58 +03:00
Dean Herbert
8cfb3d456b Avoid expensive text spacing transforms for now 2021-08-26 13:15:27 +09:00
Dean Herbert
69064c1938 Avoid unnecessary unbind operations when constructing FollowPointLifetimeEntry 2021-08-26 12:35:31 +09:00
Dean Herbert
6dcd9427ac Remove bindable usage in PathControlPoint 
This is quite a breaking change, but I think it is beneficial due to the large amount of usage of this class.

I originally intended just to remove the allocations of the two delegates handling the `Changed` flow internally, but as nothing was really using the bindables for anything more than a general "point has changed" case, this felt like a better direction.
 2021-08-26 12:33:53 +09:00
Salman Ahmed
523c154f15 Add ComboIndexWithOffsetsBindable and bind similar to ComboIndexBindable 2021-07-22 16:40:33 +03:00
Dean Herbert
399c3b0be8 Rename property, reword xmldoc and improve readability of update code 2021-07-21 17:32:56 +09:00
Salman Ahmed
9d92b795fa Revert making ComboOffsets legacy and define BeatmapSkinComboIndex instead 2021-07-20 14:15:43 +03:00
Salman Ahmed
554652b033 Merge branch 'refactor-combo-colour-retrieval' into legacy-beatmap-combo-offset 2021-07-20 10:11:52 +03:00
Salman Ahmed
68e28f4903 Implement IHasApproachCircle in DrawableHitCircle as well 2021-06-21 07:35:07 +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
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
Salman Ahmed
c9458fd9ce Hide spinner approach circle in "Hidden" mod 2021-06-18 06:23:54 +03: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
Dean Herbert
6017ef3825
Merge branch 'master' into fix-skin-sample-lookup 2021-06-08 17:37:36 +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
ekrctb
d7da66d876 Bring back scheduling of follow point update 2021-06-04 18:41:02 +09:00
ekrctb
0098ac2760 Remove one TODO 
It can be removed because pooled drawables are always ready, and `FollowPointConnection` is also ready when applied.
 2021-06-04 17:09:59 +09:00
ekrctb
bc892086fe Resolve nullable inspection, enable nullable for FollowPointLifetimeEntry 2021-06-04 17:09:59 +09:00
ekrctb
b373b120ff Use general lifetime container for follow point container 2021-06-04 16:31:50 +09:00
ekrctb
c06ff3c623 Remove defunct Animate calls 2021-06-02 11:46:28 +09:00
ekrctb
b82190e157 Fix hit circle animation reset when skin is changed 
The transforms applied in `Animate` call was not applied because the piece is recreated.
 2021-06-02 11:32:24 +09:00
Dean Herbert
6268bbea85 Merge branch 'master' into fix-skin-sample-lookup 2021-05-28 14:47:35 +09:00
Dean Herbert
70a844ac10 Remove allowFallback parameters completely 2021-05-27 14:50:42 +09:00
Endrik Tombak
9ac4ef273e Make DrawableSliderTail not require ITrackSnaking 2021-05-26 23:21:05 +03:00
smoogipoo
3db995c778 Fix sliders jumping around the screen on movement 2021-05-24 17:15:57 +09:00
Dean Herbert
8336428574 Add regression test for spinner sample actually transforming its frequency 2021-05-24 15:10:33 +09:00
Dean Herbert
1410b8f36d Fix follow points displaying at incorrect locations when dragging a slider out-of-bounds 2021-05-05 18:30:57 +09:00
Salman Ahmed
cd6d070b4a Consider "combo offsets" as legacy logic and separate from combo information 2021-05-05 07:43:08 +03:00
Dean Herbert
d10aac851d Extract scale constant 2021-04-26 15:30:22 +09:00
Dean Herbert
4da964c3f3 Expose DrawableSliderRepeat's arrow and move transforms to children 2021-04-26 15:22:42 +09:00
Dean Herbert
aa7ade8186 Expose presence of MainCirclePiece via an interface 2021-04-26 15:22:17 +09:00
Salman Ahmed
0b9172a1dc Animate back slider repeat and tail circle pieces 2021-04-26 02:39:49 +03:00
Dean Herbert
47a4a07024 Split out animation triggering of MainCirclePiece to be interface driven 2021-04-21 19:15:10 +09:00
Dean Herbert
ac0ed72d04 Keep hitcircles aligned with view in "Barrel Roll" mod 2021-04-20 18:36:11 +09:00
Dean Herbert
e2470d757e
Merge branch 'master' into legacy-spm-counter 2021-04-12 12:52:52 +09:00
smoogipoo
f2e811928b Rework slider hackery to not overwrite Samples 2021-04-09 15:28:08 +09:00
smoogipoo
8efa381d3a Actually use whistle sample for sliderwhistle 2021-04-08 23:13:16 +09:00
smoogipoo
7d291ed7d7 Don't serialise OriginalSamples 2021-04-08 20:57:50 +09:00
smoogipoo
7713c8a45f Add support for sliderwhistle 2021-04-08 20:20:09 +09:00
smoogipoo
9c3d15171c Reword xmldoc slightly 2021-04-02 18:00:28 +09:00
Amber
5ac36a2462 Switch AlwaysPlaySample to SamplePlaysOnlyOnHit in DrawableSliderTail for conformity 2021-04-02 03:56:23 -05:00
Amber
5063cd957f Force hit sample to play when Classic mod is enabled 2021-04-02 02:54:35 -05:00
Dean Herbert
9504fe3f3c Inline add of spm calculation (no need for it to be a separate call) 2021-03-30 13:43:05 +09:00
Salman Ahmed
0bf84e473d Refactor spinner SPM counter for skinning purposes 2021-03-30 04:19:23 +03:00
Dean Herbert
c715b9b89e Merge branch 'master' into legacy-spinner-bonus 2021-03-25 18:09:25 +09:00
Dean Herbert
64e85ba995 Always fade out approach circles at a HitObject's start time to better match stable 2021-03-23 19:19:07 +09:00
Dean Herbert
098005393e Remove unnecessary null checks and debug code 2021-03-23 10:38:37 +09:00
Dean Herbert
c4d08463ad Fix spinners playing looping sound too long in the editor 
The `OnComplete` event was never being run due to the transform playing
out longer than the spinner's lifetime. I've matched the durations, but
also moved the `Stop()` call to what I deem a safer place to run it (I
did notice that without this it would still potentially never fire).

Note that this is more noticeable in the editor because of lifetime
extension. In gameplay, the returning of a spinner to the pool will
clean things up (but in the editor that can take longer, depending on
timeline zoom level).

Another thing worth mentioning is that the fade doesn't actually work.
This is due to https://github.com/ppy/osu-framework/pull/4212.

Closes #12119.
 2021-03-22 16:04:51 +09:00
Salman Ahmed
98f6e16113 Move default spinner bonus counter to new DefaultSpinner 2021-03-13 05:59:42 +03:00
Salman Ahmed
8fdab5a7de Revert legacy spinner presence changes and bonus counter component 
No longer necessary, after inlining legacy coordinates logic to `LegacySpinner` and limiting precisely-positioned legacy components there
 2021-03-13 05:57:47 +03:00
Salman Ahmed
020a03e01e Use sensible "score per tick" constant 2021-03-13 05:56:28 +03:00
Salman Ahmed
c4048c9831 Merge branch 'master' into legacy-spinner-bonus 2021-03-13 05:54:34 +03:00
Dean Herbert
1591d593e2 Move spin start time to inside result and switch to standard state handling 2021-03-11 12:58:15 +09:00
Dean Herbert
4e8bcc9265 Fix SPM counter decreasing after spinner has already been completed 2021-03-09 16:54:46 +09:00
Dean Herbert
5a6864eb78 Fix SPM counter immediately disappearing on completion of spinners 2021-03-09 16:54:46 +09:00
Salman Ahmed
3f1d36ee6b Add default spinner bonus counter piece 2021-03-06 20:27:56 +03:00
Salman Ahmed
c441e993ff Separate "gained bonus" to a read-only bindable 2021-03-06 20:27:56 +03:00
smoogipoo
d3f0c0730d Merge branch 'master' into non-concurrent-sample-playback 2021-02-12 17:22:15 +09:00
Dan Balasescu
cb4d119f23
Merge pull request #11740 from peppy/editor-fix-slider-samples-new-placement 
Fix newly placed sliders in the editor not playing hitsounds
 2021-02-12 13:31:00 +09:00
Dean Herbert
db79080bc4 Fix GetNodeSamples potentially returning a live reference and overwriting existing samples 2021-02-11 17:14:49 +09:00
Dean Herbert
4710a12774
Merge branch 'master' into classic-mode-flags 2021-02-11 16:21:55 +09:00
smoogipoo
5d1d6ec1cb Fix inverted calculation 2021-02-10 22:09:24 +09:00
smoogipoo
20a6405fd2 Add explanatory comments + const 2021-02-10 22:06:19 +09:00
smoogipoo
bd2486e5a0 Fix grammatical error in comment 2021-02-10 21:27:12 +09:00
smoogipoo
1d425b8322 Simplify case 2021-02-10 21:25:31 +09:00
smoogipoo
4a391ce03d Fix div-by-0 when 0 ticks are hit 2021-02-10 21:24:41 +09:00
smoogipoo
be9b07a4cf Merge branch 'master' into difficulty-adjustment-extension 2021-02-10 20:42:08 +09:00
smoogipoo
0dcdad9839 Adjust comment for DrawableSliderHead 2021-02-10 19:04:23 +09:00
smoogipoo
a16f4cee3a Adjust DrawableSlider comment 2021-02-10 18:52:39 +09:00
smoogipoo
2fcc4213e1 Rename IgnoreJudgement -> OnlyJudgeNestedObjects 2021-02-10 18:46:26 +09:00
smoogipoo
cf06684ad1 Judge heads as slider ticks instead 2021-02-10 18:38:31 +09:00
smoogipoo
d955200e07 Prevent invalid hit results for ignored slider heads 2021-02-08 11:10:14 +09:00
smoogipoo
a5855f5d28 Move follow circle tracking to DrawableSliderHead 2021-02-05 17:33:48 +09:00
smoogipoo
3aa3692ed4 Disable snaking out when tracking is disabled 2021-02-05 15:56:13 +09:00
smoogipoo
2f22dbe06b Make sliders display judgements when not ignored 2021-02-03 22:42:50 +09:00
smoogipoo
03b7817887 Add flags to return to classic slider scoring 2021-02-03 22:12:20 +09:00
smoogipoo
623b47f9af Add flag to toggle follow circle tracking for slider heads 2021-02-03 21:55:19 +09:00
Dean Herbert
d521bfc251 Don't directly update HandleUserInput (as it is used by mods) 2021-01-30 02:35:11 +09:00
Dean Herbert
5a306dfc2b Fix unused using 2021-01-29 20:22:25 +09:00
Dean Herbert
f25809d35f Ensure spinners only handle input during their hittable time 
While this was already being enforced inside of `CheckForResult`, the
internal tracking values of rotation were still being incremented as
long as the `DrawableSpinner` was present. This resulted in incorrect
SPM values being displayed if a user was to start spinning before the
object's `StartTime`.

Kind of annoying to write a test for (there's no setup for spinners yet)
but am willing to do so if that is deemed necessary.

Closes https://github.com/ppy/osu/issues/11600.
 2021-01-29 19:55:55 +09:00
smoogipoo
de9d075f94 Initial sample + samplechannel rework 2021-01-19 17:11:40 +09:00
Dean Herbert
14b3323682 Use OnComplete instead of Finally to avoid potentially stopping on aborted transforms 2021-01-15 17:18:15 +09:00
Dean Herbert
311f8b7017 Only restart spinning sample if it was not already playing 2021-01-15 17:17:51 +09:00
Dean Herbert
767c76921f Adjust transition time of spinner sound 2021-01-15 17:17:28 +09:00
smoogipoo
47a93d8614 Adjust osu! hitobject fade-ins to support AR>10 2020-12-10 00:37:19 +09:00
ekrctb
626956febd Move some files from Drawables to Skinning.Default namespace 2020-12-04 20:25:12 +09:00
ekrctb
245be2c5ed Adjust namespace 2020-12-04 20:21:53 +09:00
ekrctb
a12b049154 Move piece files in Osu ruleset 2020-12-04 20:11:35 +09:00
Dean Herbert
5db15a6b26
Merge branch 'master' into fix-hidden-mod-crash 2020-12-04 12:50:02 +09:00
Dean Herbert
5ded4b9faa
Merge branch 'master' into dho-remove-onparentreceived 2020-12-04 11:04:56 +09:00
smoogipoo
09af4bbd57 Merge branch 'dho-remove-onparentreceived' into fix-hidden-mod-crash 2020-12-03 20:10:16 +09:00
smoogipoo
0bdf99b97a Remove OnParentReceived() 2020-12-03 20:08:42 +09:00
smoogipoo
73e99718bc Change order of OnParentReceived() 2020-12-03 20:06:26 +09:00
smoogipoo
e3bbc2b128 Rework osu! hidden mod to avoid storing hitobjects 2020-12-03 14:45:56 +09:00
smoogipoo
e831c797f3 Merge branch 'master' into hit-sample-pooling 2020-12-02 14:45:24 +09:00
Dean Herbert
71a121389b
Merge pull request #11033 from smoogipoo/immutable-hit-samples 
Make HitSampleInfo immutable
 2020-12-02 14:44:26 +09:00
Dan Balasescu
46a57921e2
Merge branch 'master' into osu-fade-slider-body-on-hit 2020-12-02 11:03:04 +09:00
smoogipoo
2bb7484608 Merge branch 'immutable-hit-samples' into hit-sample-pooling 2020-12-01 16:05:28 +09:00
smoogipoo
5760e1c1fc Make HitSampleInfo immutable 2020-12-01 15:37:51 +09:00
Dean Herbert
dd05c56a08 Fix sliders playing hit animations when completely missed 2020-12-01 15:34:29 +09:00
Dean Herbert
f8ef822e73 Add short fade to better hide transition on default skin 2020-12-01 15:21:32 +09:00
Dean Herbert
d0852d7f4a Hide slider body immediately on successful hit when snaking is enabled 2020-12-01 14:56:41 +09:00
Dean Herbert
8d101efb24 Remove unused proxy layer 2020-12-01 14:56:14 +09:00
Dean Herbert
51741c4791
Merge branch 'master' into hit-sample-pooling 2020-11-30 22:25:28 +09:00
smoogipoo
f589da4317 Fix compilation error 2020-11-30 19:24:38 +09:00
smoogipoo
4bbeb9ebd4 Merge branch 'master' into hit-sample-pooling 2020-11-30 18:31:58 +09:00
smoogipoo
8f48389f89 Merge branch 'master' into improve-dho-time-offsets 2020-11-30 18:01:48 +09:00
Dean Herbert
5bc76cac58 Remove unused using statement 2020-11-27 17:01:07 +09:00
Dean Herbert
1246c8ba5f Reduce the opacity of the default skin slider ball 
Previous value was [hitting pure white on some brighter combo
colours](https://github.com/ppy/osu/issues/10910#issuecomment-734354812).
 2020-11-27 15:22:29 +09:00
Dean Herbert
bcc197f9fe
Merge branch 'master' into improve-dho-time-offsets 2020-11-27 15:03:56 +09:00
ekrctb
fe85b7d482 Remove unused import 2020-11-27 10:18:00 +09:00
ekrctb
57454bbb1c Remove hitObject argument from OnApply and OnFree 2020-11-27 10:13:05 +09:00
smoogipoo
0414e5c550 Add MaximumJudgementOffset to DrawableHitObject, use in more places 2020-11-26 01:12:42 +09:00
smoogipoo
c744db1b57 Rewind pooled DHOs into better states 2020-11-26 00:42:25 +09:00
Dan Balasescu
87ce8a53ff
Merge branch 'master' into on-drawable-hitobject-added 2020-11-24 16:09:57 +09:00
Bartłomiej Dach
1c31a4a6b6 Expose animation start time as mutable in interface 2020-11-22 13:11:22 +01:00
ekrctb
c506b438bf Remove more code and make some methods private 2020-11-22 18:51:16 +09:00
Bartłomiej Dach
240c1b0aef Add support for changing animation start time after load 2020-11-21 20:06:30 +01:00
ekrctb
295ca38cda Merge remote-tracking branch 'origin/master' into on-drawable-hitobject-added 2020-11-21 15:25:16 +09:00
Dan Balasescu
4213d6bdba
Merge pull request #10890 from peppy/legacy-jugement-match-stable-transforms 
Adjust judgement animations to match stable
 2020-11-20 21:47:21 +09:00
Dan Balasescu
79752bcb19
Merge branch 'master' into legacy-jugement-match-stable-transforms 2020-11-20 20:51:27 +09:00
ekrctb
cd16a3fa61 Use event instead of using custom pools (osu) 2020-11-20 17:56:47 +09:00
smoogipoo
7bd75eca81 Separate classes 2020-11-20 16:53:08 +09:00
smoogipoo
c1f56cd0ba Remove aliveness hackery 2020-11-20 16:52:27 +09:00
smoogipoo
85eb98a7ec Clean up some code reuse 2020-11-20 16:43:07 +09:00
smoogipoo
2418f17b0c Fix lifetime not being set correctly in some cases 2020-11-20 16:19:02 +09:00
smoogipoo
2ed2ddfe8a Rename methods 2020-11-20 15:39:29 +09:00
smoogipoo
33eea64cfc Fix follow points not updating on positional changes 2020-11-20 15:31:04 +09:00
smoogipoo
2fc53a278d Add back reorder support 2020-11-20 14:10:28 +09:00
smoogipoo
17ff7fe163 Fix failing test due to early lifetime end 2020-11-20 13:55:27 +09:00
smoogipoo
a3145ed96d Fix test compile errors 2020-11-20 13:54:41 +09:00
smoogipoo
d467a00eea Add initial followpoint pooling implementation 2020-11-20 00:11:31 +09:00
smoogipoo
688a04c2ff Make slider/spinner use pooled samples 2020-11-19 20:40:30 +09:00
Dean Herbert
7f3c8ad744
Merge pull request #10872 from smoogipoo/fix-missing-triangles 2020-11-19 14:11:08 +09:00
Dean Herbert
3024ae6d86 Add better test coverage of hit lighting (and ensure reset after animation reapplication) 2020-11-19 14:10:07 +09:00
Bartłomiej Dach
24d7fa03d8
Merge branch 'master' into legacy-jugement-match-stable-transforms 2020-11-18 20:33:58 +01:00
Bartłomiej Dach
5156de3a10
Merge branch 'master' into fix-judgement-transform-logic 2020-11-18 19:20:11 +01:00
Dean Herbert
d017e725fb Add comment for future todo task 2020-11-18 19:03:34 +09:00
Dean Herbert
9d3de5bca0 Fix hit lighting dictating lifetime even when not present in skin 2020-11-18 19:03:34 +09:00
Dean Herbert
72a15ef2dc Handle DrawableJudgement lifetime more flexibly 2020-11-18 19:03:34 +09:00
Dean Herbert
94886a09b2 Remove fades from DrawableJudgement itself 2020-11-18 19:03:34 +09:00
smoogipoo
ce4baf328d Move into OnApply() to resolve one-frame issues 2020-11-17 23:35:36 +09:00
smoogipoo
04805b78c3 Tighten osu! ruleset lifetime expiry for past hitobjects 2020-11-17 23:20:19 +09:00
Dean Herbert
8247e6ce91 Move result type to ctor 2020-11-17 15:43:54 +09:00
Dean Herbert
f465dd5a5e Move all extended animation logic out of DrawableJudgement 2020-11-17 14:59:34 +09:00
Dean Herbert
82c3925a37 Remove unused DrawableOsuJudgement constructors 2020-11-17 14:13:51 +09:00
Dean Herbert
9dfa4249e0 Make Apply non-virtual 2020-11-17 14:05:13 +09:00
smoogipoo
c101f32db8 Reset osu! triangle pieces on hitobject application 2020-11-17 13:06:52 +09:00
smoogipoo
84b42f207d Fix triangles disappearing after a while 2020-11-16 23:14:20 +09:00
smoogipoo
4cf6aca873 Fix slider ball tint not working 2020-11-16 22:40:25 +09:00
Bartłomiej Dach
532680bb36 Manually reset rest of rotation tracker state on object application 2020-11-14 23:23:11 +01:00
Bartłomiej Dach
727a886fb3 Move spinner completion info into judgement 2020-11-14 23:08:47 +01:00
Bartłomiej Dach
af392e3995 Move rate adjusted spinner rotation into judgement result 2020-11-14 21:10:12 +01:00
Dean Herbert
7ac4d2c4be Move "drawable" to first prefix 2020-11-14 18:05:30 +09:00
Dean Herbert
90f37ff4ab Rejig namespaces 2020-11-14 18:04:59 +09:00
smoogipoo
3f0a127196 Fix slider/spinner samples not being disposed 2020-11-12 18:51:58 +09:00
smoogipoo
3f78d81386 Add nested osu! hitobject pooling 2020-11-12 15:59:48 +09:00
smoogipoo
bf72961959 Add top-level osu! hitobject pooling 2020-11-12 15:39:02 +09:00
smoogipoo
606cfacedf Fix state update exception in a better way 2020-11-11 19:01:12 +09:00
Dean Herbert
a82291f31f
Merge pull request #10776 from smoogipoo/fix-possible-nullref 
Fix possible nullref with non-attached hitobjects
 2020-11-11 11:14:57 +09:00
smoogipoo
81844878b0 Fix possible nullref with non-attached hitobjects 2020-11-11 00:29:34 +09:00
smoogipoo
b1e039bcec Prevent overrides from messing with application/freeing 2020-11-07 00:40:26 +09:00
smoogipoo
3a4bd73823 Fix DHOs being freed when not expected 2020-11-07 00:25:26 +09:00
smoogipoo
e190afbfed Remove initial value changed invocations 2020-11-07 00:00:25 +09:00
smoogipoo
33b629a87a Make top-level osu! objects use new methods 2020-11-06 23:09:23 +09:00
Dean Herbert
e0ef777e87
Merge branch 'master' into fix-hitcircle-glow-on-skin-change 2020-11-06 16:47:56 +09:00
Dean Herbert
0cadb31947 Merge branch 'master' into drawable-hit-object-hit-state-fix 2020-11-05 17:07:52 +09:00
Dean Herbert
4a4fa96fef
Merge pull request #10692 from smoogipoo/followpointrenderer-hitobject 2020-11-05 16:39:05 +09:00
Dean Herbert
54775ccacf
Merge pull request #10690 from smoogipoo/osu-remove-hitobject-references 2020-11-05 16:22:13 +09:00
Dean Herbert
a43166e8a9
Merge branch 'master' into followpointrenderer-hitobject 2020-11-05 15:42:09 +09:00
Dean Herbert
c26fd4dc3d
Merge pull request #10691 from smoogipoo/osu-lighting-colour-reuse 
Remove AccentColour binding from judgement lighting
 2020-11-05 15:37:28 +09:00
Dean Herbert
4457e363d3 Bring back local variables to reduce two-level-deep variable access 2020-11-05 15:22:40 +09:00
smoogipoo
9c1c9945af Make FollowPointRenderer use hitobject models 2020-11-05 15:01:45 +09:00
smoogipoo
9ac822beed Remove AccentColour binding from judgement lighting 2020-11-05 14:49:15 +09:00
smoogipoo
400fcedf0f Remove stored hitobject references from skinnable components 2020-11-05 14:40:48 +09:00
smoogipoo
9a7fcadabc Use BDL for top-level osu! DHOs 2020-11-05 13:51:46 +09:00
Dean Herbert
65fb8628e0 Use HitStateUpdateTime 2020-11-04 17:30:11 +09:00
Dean Herbert
e5a5c3713d Merge branch 'drawable-hit-object-hit-state-fix' into fix-hitcircle-glow-on-skin-change 2020-11-04 17:15:20 +09:00
Dean Herbert
a3dc1d5730 Update existing implementations 2020-11-04 17:14:23 +09:00
Dean Herbert
b069372b29 Fix skin changes resulting in incorrectly applied transforms in MainCirclePiece 2020-11-03 17:49:48 +09:00
smoogipoo
696e3d53af Fix slider samples being overwritten by the last node 2020-10-09 20:50:09 +09:00
Dean Herbert
ed982e8dd1 Make stacked hitcircles more visible when using default skin 2020-10-06 14:09:31 +09:00
Dean Herbert
f0b5ba9534
Merge branch 'master' into skin-slider-end-circle-support 2020-10-05 17:45:51 +09:00
Dan Balasescu
692ca87bec
Merge branch 'master' into fix-spinner-rewind-crash 2020-10-05 15:32:52 +09:00
Dean Herbert
5dea37792c
Merge branch 'master' into health-adjustments 2020-10-04 21:38:40 +09:00
Bartłomiej Dach
26eff0120d Apply same fix for miss-triggering case 
See 5888ecd - the same fix is applied here, but in the miss case.
 2020-10-03 21:11:34 +02:00
Dean Herbert
5888ecdeb1 Fix spinner crashing on rewind 2020-10-04 01:08:24 +09:00
Bartłomiej Dach
db31280671 Award health for completed slider tails 2020-10-03 12:16:22 +02:00
Bartłomiej Dach
1f0620ffd4 Replace assignment references to HitResult.Miss with Judgement.MinResult 2020-10-02 23:31:24 +02:00
Bartłomiej Dach
2b1ef16f89 Replace comparison references to HitResult.Miss with IsHit 2020-10-02 23:31:24 +02:00
Dean Herbert
b1e7a5113e
Merge pull request #10328 from smoogipoo/fix-spinner-transforms 
Fix spinners not transforming correctly
 2020-10-02 23:51:09 +09:00
Dean Herbert
a3ecc6c5a4 Remove redundant array type specification 2020-10-02 19:56:24 +09:00
Dean Herbert
5a6c45e2ff Fix hidden mod support for sliderendcircle 2020-10-02 18:41:28 +09:00
smoogipoo
fe818a020a Fix spinners not transforming correctly 2020-10-02 16:17:57 +09:00
Dean Herbert
dde7f706aa Avoid rapid triangle repositioning during editor slider placement 2020-10-02 15:51:14 +09:00
Dean Herbert
ad4cac13ac Add preempt adjustment and fade in first end circle with slider to match stable 2020-10-02 15:21:52 +09:00
Dean Herbert
2975ea9210 Adjust repeat/tail fade in to match stable closer 2020-10-02 14:50:03 +09:00
Dean Herbert
2427ae43da Share fade in logic with repeats 2020-10-02 14:50:03 +09:00
Dean Herbert
5d2a8ec764 Add final sliderendcircle display support 2020-10-02 14:50:03 +09:00
Dean Herbert
fce3eacd7d Move tail circle to display beneath ticks etc. 2020-10-02 14:50:03 +09:00
smoogipoo
ba76089219 Fix spinner flashing yellow glow before completion 2020-10-01 20:24:32 +09:00
Dan Balasescu
3a81602d0c
Merge pull request #10286 from peppy/fix-hitobject-sample-stuck-on-future-seek 
Fix HitObject samples getting stuck in a playing state on seeking far into the future
 2020-10-01 18:08:17 +09:00
Dean Herbert
b7ac779760 Merge branch 'master' into fix-hitobject-sample-stuck-on-future-seek 2020-10-01 16:46:14 +09:00
smoogipoo
7890319802 Merge branch 'master' into adjust-hit-result-types 2020-10-01 16:19:07 +09:00
smoogipoo
cb6b35116a Merge branch 'master' into scoring-standardisation 2020-10-01 12:28:51 +09:00
smoogipoo
3c9ee6abc1 Use local static to determine score per spinner tick 2020-10-01 12:15:34 +09:00
Dean Herbert
4b70fe8585 Merge branch 'fix-storyboard-sample-pausing' into fix-hitobject-sample-stuck-on-future-seek 2020-09-30 22:46:09 +09:00
Dean Herbert
7f579850dd
Merge branch 'master' into fix-editor-silence-on-seek 2020-09-30 17:03:23 +09:00
Dean Herbert
414c40d298 Reverse inheritance order of SkinnableSound's pause logic 2020-09-30 15:45:14 +09:00
Dean Herbert
59ce9fcab9 Merge branch 'master' into fix-editor-silence-on-seek 2020-09-30 15:35:55 +09:00
smoogipoo
f439c1afbc Make osu/taiko/catch use Ok+Great 2020-09-29 17:16:55 +09:00
smoogipoo
cd895c792c Merge branch 'master' into scoring-standardisation 2020-09-29 17:04:59 +09:00
smoogipoo
a77741927c Use new hit results in osu 2020-09-29 16:33:38 +09:00
Dean Herbert
5d1c377379 Fix HitObject samples getting stuck in a playing state on seeking far into the future 2020-09-29 15:07:55 +09:00
Dean Herbert
d6f3beffb6 Use existing bindable flow instead 2020-09-29 12:50:17 +09:00
Dean Herbert
cc9bf67d42
Merge branch 'master' into fix-spinner-rpm-user-rate-adjust 2020-09-29 12:10:24 +09:00
smoogipoo
b6bc829bd5 Guard against nulls (load not run) 2020-09-28 17:46:22 +09:00
Dean Herbert
e60e47ff66 Unbind events on disposal 2020-09-28 17:41:10 +09:00
Dean Herbert
8692c24dfc Fix extending spinners in editor causing them to disappear temporarily 2020-09-28 17:20:36 +09:00
Dean Herbert
7df8b5bce7 Merge branch 'master' into fix-spinner-rpm-user-rate-adjust 2020-09-25 13:17:03 +09:00
Dean Herbert
ba160aab76 Fix large construction/disposal overhead on beatmaps with hitobjects at same point in time 2020-09-23 15:41:43 +09:00
Dean Herbert
b1f7cfbd5b Reduce children levels in RingPiece 2020-09-22 17:34:21 +09:00
Dean Herbert
25bf160d94 Fix missing GameplayClock in some tests 2020-09-21 22:30:14 +09:00
Dean Herbert
3f788da06d Fix SPM changing incorrectly with playback rate changes 2020-09-21 19:39:54 +09:00
smoogipoo
009e1b4445 Make Spinner use cancellation token 2020-09-17 17:05:24 +09:00
Dean Herbert
a8b405791a Fix non-convert slider and spinner serialization 2020-09-14 17:32:32 +09:00
smoogipoo
acbeb5406f Add/improve xmldoc 2020-08-31 13:33:41 +09:00
smoogipoo
da07354f05 Fix some judgements potentially giving wrong score 2020-08-18 19:51:16 +09:00
Bartłomiej Dach
5f35b3ebb9 Fix constant casing 2020-08-15 20:44:02 +02:00
Ron B
390e872730
Fix acoording to review 2020-08-15 21:34:17 +03:00
Ron B
a1079bac32
Move frequency values into consts 2020-08-15 21:19:47 +03:00
Ron B
40445d0005
replicate osu-stable behaviour for spinningSample frequency 2020-08-15 21:07:44 +03:00
Ron B
07c25d5a78
Move spinnerFrequencyModulate set to ApplySkin 2020-08-15 20:51:33 +03:00
Ron B
5c11270b98
Add SpinnerFrequencyModulate skin config option 2020-08-15 20:12:06 +03:00
Dean Herbert
05b06e7451
Merge branch 'master' into fix-skinnable-sound-mute 2020-08-12 22:01:04 +09:00
Bartłomiej Dach
cca78235d5 Replace CumulativeRotation with RateAdjustedRotation 2020-08-10 23:02:06 +02:00
Dean Herbert
365aae799e
Merge branch 'master' into fix-skinnable-sound-mute 2020-08-10 23:55:51 +09:00
Bartłomiej Dach
a636c7052c Merge branch 'master' into adujustable-skinnablesound 2020-08-08 21:51:47 +02:00
Dean Herbert
0d1f273603 Merge branch 'master' into fix-skinnable-sound-mute 2020-08-08 23:24:03 +09:00
smoogipoo
3c3756e42d Merge branch 'master' into expand-number-piece-on-old-skins 2020-08-07 16:36:58 +09:00
Dean Herbert
e3105fd4c8 Add more resilient logic for whether to avoid playing SkinnableSound on no volume 2020-08-06 19:16:26 +09:00
smoogipoo
9a00ad48c6 Update components to use extension methods 2020-08-06 14:43:39 +09:00
Dean Herbert
bb73489ae5 Fix very short spinners being impossible to complete 2020-08-05 18:46:58 +09:00
Salman Ahmed
2771c95bec Merge remote-tracking branch 'upstream/master' into expand-number-piece-on-old-skins 2020-08-04 22:17:54 +03:00
smoogipoo
cd9896c35e Merge branch 'master' into spinner-spinning 2020-08-01 01:06:53 +09:00
Dean Herbert
180afff805 Ensure damp is always positive exponent 2020-08-01 00:39:04 +09:00
Dean Herbert
bb01ee5be9 Fix trackign alpha not being applied 2020-08-01 00:27:00 +09:00
Dean Herbert
86784e30ad Fix spacing 2020-07-31 09:54:30 +09:00
Dean Herbert
cd570433f4 Move private methods to bottom of class 2020-07-31 09:04:20 +09:00
Dean Herbert
8e49256a5c Rename and split up statement to make more legible 2020-07-31 09:03:29 +09:00
Dean Herbert
38a4bdf068 Add spinner spin sample support 2020-07-30 19:34:59 +09:00
Dean Herbert
c1085d49d3 Add more xmldoc 2020-07-30 12:55:34 +09:00
Dean Herbert
54fee7e716 Simplify and standardise scale for default display 2020-07-30 11:50:13 +09:00
Dean Herbert
64c7ae7686 Fix hit transforms not playing out correctly 2020-07-30 11:25:49 +09:00
Dean Herbert
2b71ffa2ed Add back legacy implementations 2020-07-29 22:32:21 +09:00
Dean Herbert
023feaf438 Refactor to centralise implementation into a single component 
Turns out this is a better way forward.
 2020-07-29 22:31:52 +09:00
Dean Herbert
2a5e9fed4d Move default background implementation out of DrawableSpinner 2020-07-29 18:15:19 +09:00
Dean Herbert
2cd6e89cb0 Move default centre implementation out of DrawableSpinner 2020-07-29 18:02:12 +09:00
Dean Herbert
1c00cf95d5 Add initial support for spinner middle skinning 2020-07-29 16:55:47 +09:00
Dean Herbert
e98154b432 Add initial support for spinner background layer 2020-07-29 16:37:32 +09:00
Dean Herbert
d01d1ce3f1 Add initial support for spinner disc skinning 2020-07-29 16:25:10 +09:00
Dean Herbert
afceab685b
Merge pull request #9688 from peppy/less-spinner-bonus-score 
Reduce spinner tick and bonus score
 2020-07-28 14:21:48 +09:00
Dean Herbert
dc577aa6fa Fix display of bonus score 2020-07-28 11:22:58 +09:00
Bartłomiej Dach
7ad3101d08 Bring back custom fade-out delay if hit lighting is on 2020-07-27 19:21:01 +02:00
Bartłomiej Dach
21ae33e284 Determine whether to show lighting at prepare time 2020-07-27 19:07:21 +02:00
Bartłomiej Dach
bbc7d69524 Add failing test cases 2020-07-27 19:07:21 +02:00
Dean Herbert
10101d5b31 Reduce spinner tick and bonus score 2020-07-27 18:06:14 +09:00
Dean Herbert
a6a7961af9 Change div to subtraction to fix calculation 2020-07-24 22:09:25 +09:00
Dean Herbert
dd45f0bd40 Adjust max spins to "match" stable 2020-07-24 21:10:46 +09:00
Dean Herbert
82e4050fdd Fix xmldoc 2020-07-24 19:41:34 +09:00
Dean Herbert
eb84f25036 Adjust maximum spins to roughly match stable 2020-07-24 19:34:13 +09:00
Dean Herbert
0050f6348f
Merge branch 'master' into add-spinner-bonus-score 2020-07-23 23:05:04 +09:00
smoogipoo
c348599189 Merge branch 'master' into add-slider-slide-support 2020-07-23 21:24:45 +09:00
smoogipoo
f883cb85d7 Null out the sample too 2020-07-23 21:24:31 +09:00
Dan Balasescu
f106106dc4
Merge pull request #9648 from peppy/fix-slider-ball-rotation 
Fix slider ball rotation being applied to follow circle and specular layer
 2020-07-23 19:39:58 +09:00
Dean Herbert
113fac84dd Fix circle container type 2020-07-22 21:14:04 +09:00
Dean Herbert
bd6a51f545 Hide slider repeat judgements temporarily 2020-07-22 19:30:10 +09:00
Dean Herbert
53a9ac3c1a Fix slider ball rotation being applied to follow circle and specular layer 2020-07-22 19:06:39 +09:00
Dean Herbert
2126f6bffc Add slider "sliding" sample support 2020-07-22 16:37:58 +09:00
Dean Herbert
bc079fccf5 Add health drain for spinner ticks 2020-07-21 19:52:16 +09:00
Dean Herbert
1560e1786a Revert back to bool for application 2020-07-21 19:48:44 +09:00
Dean Herbert
7f2ae694cc Simplify rewind handling 2020-07-21 19:21:30 +09:00
Dean Herbert
947f4e0d4c Move tick handling to DrawableSpinner itself 2020-07-21 19:20:19 +09:00
Dean Herbert
05102bc1ba Split ticks up into bonus and non-bonus 2020-07-21 18:22:37 +09:00
Salman Ahmed
35ad409da6 Fix spinner bonus ticks samples not actually playing 2020-07-21 06:59:29 +03:00
Dean Herbert
4dd40542d5 Rename rotation set method to match others 2020-07-21 11:31:29 +09:00
Dean Herbert
f48984920d Change bonus volume logic to work 2020-07-21 11:31:29 +09:00
Dean Herbert
35d53139e7 Merge branch 'master' into add-spinner-bonus-score 2020-07-21 11:21:17 +09:00
Dean Herbert
e06d3c5812 Minor adjustments to tick clearance 2020-07-20 17:52:59 +09:00
Dean Herbert
4cbc176cb6 Add less fill and more transparency 2020-07-20 17:50:11 +09:00
Dean Herbert
33e58bb7db Fix sizing and colour not correct on hit 2020-07-20 17:22:30 +09:00
Dean Herbert
55d921ef85 Improve feel of animation 2020-07-20 17:22:30 +09:00
smoogipoo
8a3cadc111 Fix judgement animations not resetting on use 2020-07-13 21:21:59 +09:00
Dean Herbert
dd025262d0 Fix one more nullref 2020-07-10 22:48:34 +09:00
Dean Herbert
0a61f80c8b Remove result nullable check 2020-07-10 22:39:35 +09:00
Dean Herbert
13205319f3 Fix null reference if hit lighting is disabled 2020-07-10 22:37:29 +09:00
Dean Herbert
f872343bab Make Apply virtual to further simplify application process 2020-07-10 18:35:20 +09:00
Dean Herbert
3138cc455c
Merge branch 'master' into judgement-pooling 2020-07-10 17:15:19 +09:00
Dean Herbert
efb2c2f4ae Rename variable to be more clear on purpose 2020-07-09 12:01:00 +09:00
Bartłomiej Dach
4cd874280c Add clarifying xmldoc for RotationAbsolute 2020-07-08 22:37:50 +02:00
Bartłomiej Dach
213dfac344 Fix broken spinner rotation logic 2020-07-08 22:37:50 +02:00
Dean Herbert
e6ec883084 Remove slider tail circle judgement requirements 2020-07-08 20:21:44 +09:00
Bartłomiej Dach
d229993e5c Use RotationAbsolute instead 2020-07-05 02:12:26 +02:00
Bartłomiej Dach
cd6bdcdb88 Replace further spinner transforms with manual lerp 2020-07-05 00:25:01 +02:00
Dean Herbert
ffec4298a7 Use DrawablePool for DrawableJudgements 2020-07-04 16:45:50 +09:00
Dean Herbert
9119f41604 Merge branch 'master' into results-screen-statistics-overlapping-transition 2020-06-24 18:22:51 +09:00
Dean Herbert
14ad3835ff Update naming 2020-06-23 21:27:01 +09:00
smoogipoo
eab00ec9d9 Move hit events to the ScoreProcessor 2020-06-19 19:58:35 +09:00
smoogipoo
900da88498 Populate hit offsets from score processor 2020-06-15 22:44:55 +09:00
smoogipoo
f3b5149648 Move some suggestions to warnings, resolve issues 2020-06-03 16:48:44 +09:00
Dan Balasescu
64d1b4b11b
Merge branch 'master' into move-setter-to-duration 2020-06-01 15:55:48 +09:00
Dean Herbert
cbd563e80b Rename to IHasDuration 2020-05-27 12:38:39 +09:00
Dean Herbert
b8e0a6f127 Move sett from EndTime to Duration 2020-05-27 12:37:44 +09:00
Dean Herbert
6b5b215299 Split out IHasPath from IHasCurve to better define hitobjects 2020-05-26 17:44:47 +09:00
smoogipoo
4719fcc291 Actually use the cancellation token 2020-05-15 18:17:39 +09:00
smoogipoo
98125102a7 Add cancellation token support to CreateNestedHitObjects() 2020-05-15 18:07:41 +09:00
smoogipoo
efff2bf15d Add HitObject to DefaultsApplied event 2020-05-08 18:49:19 +09:00
alex
0e2ccac33b Add spaces to comments 2020-05-04 18:36:24 -07:00
smoogipoo
4e4fe5cc90 Fix slider heads not being blocked when hit out of order 2020-04-17 14:33:29 +09:00
Dean Herbert
65b96079a0 Move dampening to base implementation and change range to 0..1 2020-04-13 13:01:02 +09:00
Fire937
22d89dbff7 Merge branch 'master' of https://github.com/ppy/osu into stereo-shifted-playback 2020-04-12 01:46:32 +02:00
Fire937
f274ec297c Add positional sound support for all rulesets 
The SamplePlaybackBalance is calculated in a way that the balance
remains between -0.4 and 0.4.
Positional sound is not supported in osu!taiko.
 2020-04-12 01:33:25 +02:00
smoogipoo
10e849d196 Separate into separate class 2020-04-10 02:02:09 +09:00
smoogipoo
a2f5a469cf Merge branch 'master' into add-notelock 2020-04-10 01:18:54 +09:00
Dean Herbert
87b29007c2
Merge pull request #8626 from LittleEndu/arrow-easing 
Don't allow new transformations for reverse arrow after it's hit
 2020-04-08 23:34:02 +09:00
Dean Herbert
067ec27859 Also fix slider repeat circles 2020-04-08 18:59:31 +09:00
Dean Herbert
f3e909539d Fix slider ball and follow circle blending for legacy skins 2020-04-08 18:39:18 +09:00
Endrik Tombak
0b70c20aa3 Merge branch 'master' of https://github.com/ppy/osu into arrow-easing 2020-04-07 17:16:56 +03:00
Endrik Tombak
16d906d769 Get rid of unnecessary removal 2020-04-07 17:16:06 +03:00
Dan Balasescu
bbbc13021b
Merge branch 'master' into fix-sliderball-acent-colour 2020-04-07 13:53:48 +09:00
Dean Herbert
66b8a8ad2e Remove stray default value specification 2020-04-06 12:45:58 +09:00
Endrik Tombak
23c3be0969 Rename variable 2020-04-05 13:39:31 +03:00
Endrik Tombak
a3626333be Use DI instead 2020-04-05 13:36:52 +03:00
Endrik Tombak
1f6a4fa4b8 Remove transformations 2020-04-05 12:45:10 +03:00
Dean Herbert
e340d2628b Fix sliderball accent colour not being set correctly 2020-04-05 03:17:11 +09:00
Dean Herbert
7a9d878a34
Merge branch 'master' into fix-follow-point-transforms 2020-03-31 20:03:42 +09:00
Dean Herbert
6907522cd7
Merge pull request #8486 from LittleEndu/fix-snaking-arrow 
Make reverse arrows not follow snaking when they are already hit
 2020-03-30 18:35:17 +09:00
Dean Herbert
c4df49954f Reword comment 2020-03-30 18:35:01 +09:00
smoogipoo
0d20292992 Fix ticks/spinners contributing to notelock 2020-03-30 16:14:56 +09:00
smoogipoo
3f8fbebbb4 Merge branch 'master' into add-notelock 2020-03-30 15:01:39 +09:00
Dan Balasescu
a0b8243f4c
Merge branch 'master' into slider-start-circle 2020-03-30 14:49:17 +09:00