1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 15:07:44 +08:00
Commit Graph

2230 Commits

Author SHA1 Message Date
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
Dean Herbert
de50b725d5 Fix mod failure checks executing actual game logic 2020-05-12 20:08:35 +09:00
smoogipoo
f195933844 Fix hardrock potentially taking a long time to load 2020-05-11 13:03:59 +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
ca692f30e6 Do full placement on mouse down 2020-04-24 12:27:56 +09:00
smoogipoo
8d5732aabd Make placements happen on mouse down 2020-04-23 12:17:11 +09:00
Dean Herbert
1f0b7465e2 Add back missing line 2020-04-21 16:06:40 +09:00
Dean Herbert
5e3fad86cf Fix relax replays playing back incorrectly 2020-04-21 15:28:25 +09:00
Dan Balasescu
eb7b04d8bc
Merge branch 'master' into fix-osu-hidden-mod-alt 2020-04-20 17:47:27 +09:00
smoogipoo
355e682e24 Fix typo in exception 2020-04-20 13:23:27 +09:00
Dean Herbert
8c85602ad0 Use foreach for conformity 2020-04-20 11:00:42 +09:00
Dean Herbert
e1acfd26a6 Simplify return logic 2020-04-20 10:59:44 +09:00
Dean Herbert
28318a0140 Add mention of notelock in xmldoc (potentially easier to find class) 2020-04-20 10:59:08 +09:00
smoogipoo
bbcbd7e3fb Simplify by removing custom enumerator 2020-04-17 14:48:12 +09:00
smoogipoo
2dee5e03e3 Dispose enumerators for safety 2020-04-17 14:40:29 +09:00
smoogipoo
4e4fe5cc90 Fix slider heads not being blocked when hit out of order 2020-04-17 14:33:29 +09:00
smoogipoo
a4a7823817 Add fail-safe to ensure hittability after a hit 2020-04-17 14:22:03 +09:00
smoogipoo
62f77a05be Optimise by removing state machine 2020-04-17 14:00:00 +09:00
smoogipoo
3daacbc2d2 Initial inefficient refactor of hitobject enumeration 2020-04-17 13:34:20 +09:00
Dean Herbert
9dda7da489 Fix spinners being considered the "first object" for increased visibility in hidden 2020-04-16 14:11:38 +09:00
Dean Herbert
2b2ab2bf19 Show new segments as red points even when hovered 2020-04-13 21:59:23 +09:00
smoogipoo
4cfc686683 Fix excption with 0 control points 2020-04-13 21:41:18 +09:00
Dean Herbert
63de493c85
Merge branch 'master' into fix-red-point-placement 2020-04-13 20:56:50 +09:00
Dean Herbert
64422fbf6d
Merge pull request #8697 from smoogipoo/more-change-state-support
Add change state support to more Editor components
2020-04-13 20:19:04 +09:00
Dean Herbert
d56b6900ad
Merge pull request #8737 from smoogipoo/fix-overlapping-controlpoints
Fix connections hidden due to overlapping controlpoints
2020-04-13 20:06:24 +09:00
Dean Herbert
ca5971578a
Merge branch 'master' into more-change-state-support 2020-04-13 19:13:07 +09:00
Dean Herbert
0e88c28060 Merge branch 'editor-undo-redo' into more-change-state-support 2020-04-13 18:07:00 +09:00
smoogipoo
9a65aa18d7 Fix connections hidden due to overlapping controlpoints 2020-04-13 16:13:14 +09:00
smoogipoo
2c20328a70 Rework control point placement for better progression 2020-04-13 15:31:46 +09:00
smoogipoo
e17d5bdbaf Improve red slider control point placement logic 2020-04-13 13:57:40 +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
6988df30bd Rename variable, add comment 2020-04-10 03:12:13 +09:00
smoogipoo
42b3ff805b Rename methods + fix incorrect method usage 2020-04-10 03:07:44 +09:00
smoogipoo
b54bbc5f6a Improve commenting + refactor 2020-04-10 02:41:48 +09:00
smoogipoo
10e849d196 Separate into separate class 2020-04-10 02:02:09 +09:00
smoogipoo
ea1bec85ae Simplify code/language 2020-04-10 01:41:00 +09:00
smoogipoo
b8d7b78b55 Remove unnecessary null set 2020-04-10 01:21:37 +09:00
smoogipoo
116b952dfe Change param to hitobject rather than result 2020-04-10 01:20:43 +09:00
smoogipoo
a2f5a469cf Merge branch 'master' into add-notelock 2020-04-10 01:18:54 +09:00
smoogipoo
575b061dd7 Add change state support to more editor components 2020-04-09 22:02:42 +09:00
smoogipoo
ee6ea08cf8 Cleanup handling of hitobject updates 2020-04-09 20:16:44 +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
a4b4b7df21 Fix follow points not starting at correct time 2020-04-06 13:04:46 +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
bc6c6228ac Tidy up a touch 2020-04-05 14:13:06 +09:00
Endrik Tombak
36ad1cbd79 Format the code 2020-04-04 23:17:55 +03:00
Endrik
634a8f9ff4
Return inline 2020-04-04 23:05:10 +03:00
Dean Herbert
e340d2628b Fix sliderball accent colour not being set correctly 2020-04-05 03:17:11 +09:00
Endrik Tombak
e1a67bdb96 Move implementation to transformer 2020-04-04 11:13:25 +03:00
Endrik Tombak
d73c791a10 Support this typo for old skins 2020-04-03 20:56:52 +03:00
smoogipoo
1f797207f7 Rework lookups to not require total playfield columns 2020-04-03 12:31:05 +09:00
Dean Herbert
a3d4212462 Fix weird slider ball sizing 2020-04-02 19:56:33 +09:00
Dean Herbert
7a9d878a34
Merge branch 'master' into fix-follow-point-transforms 2020-03-31 20:03:42 +09:00
Dan Balasescu
7ff3a1d28d
Merge branch 'master' into fix-relax-mod-keypresses 2020-03-31 17:55:28 +09:00
Dean Herbert
8a998d600d Fix relax mod pressing too many keys 2020-03-31 15:17:27 +09:00
Andrei Zavatski
9890544b36 Move implementation to better place 2020-03-30 13:42:18 +03:00
Andrei Zavatski
f96229c572 Add support for HitCircleOverlayAboveNumber legacy skin property 2020-03-30 13:21:22 +03: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
796976db3c Completely ignore spinners from note lock 2020-03-30 17:00:53 +09:00
smoogipoo
744f6c3ca7 Rename method + adjust comments 2020-03-30 16:33:46 +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
Dan Balasescu
03cd9aa060
Merge branch 'master' into spun-out 2020-03-30 12:31:53 +09:00
Endrik Tombak
2ab8267f84 Add a comment 2020-03-29 10:50:43 +03:00
Dean Herbert
2abb8a37df
Merge branch 'master' into show-mod-settings-tooltip 2020-03-29 14:35:04 +09:00
Dean Herbert
d1b01095ee Rewrite to reduce code changes and complexities in hit object implementation 2020-03-29 14:31:03 +09:00
Dean Herbert
b259708915
Merge branch 'master' into spun-out 2020-03-29 13:24:48 +09:00
Endrik Tombak
d3114ca858 Don't snake when hit 2020-03-28 23:12:13 +02:00
Dean Herbert
fb4b334ce2 Add support for legacy skin sliderstartcircle / sliderstartcircleoverlay 2020-03-28 14:10:26 +09:00
Dan Balasescu
3763457a1d
Merge pull request #8451 from peppy/fix-slider-end-sounds
Only play slider end sounds if tracking
2020-03-27 20:38:59 +09:00
Dean Herbert
d36f5fb96f Fix animated follow points not (re)animating after rewind 2020-03-27 18:03:02 +09:00
Dean Herbert
f80efd10c2 Avoid using a miss judgement 2020-03-26 19:54:17 +09:00
Dean Herbert
6555ab6ede Only play slider end sounds if tracking 2020-03-26 17:18:27 +09:00
Dean Herbert
8e4896fbbe Make slider judgements count towards base score / accuracy 2020-03-26 17:13:53 +09:00
Dean Herbert
8a2aac5f83 Rename conversion methods for clarity 2020-03-25 20:21:34 +09:00
Dean Herbert
388cf5c83a Fix catch positional data being incorrectly recorded 2020-03-24 15:38:54 +09:00
Dean Herbert
022465f546 Add encoding and import support 2020-03-24 14:51:52 +09:00
Dean Herbert
546772192c Add helper method to convert to legacy mods enums 2020-03-24 13:07:51 +09:00
Dean Herbert
14a85a84bf Add proper screen space - gamefield mapping 2020-03-23 20:06:18 +09:00
Dean Herbert
6d48068061 Move replay recorder to final location 2020-03-23 20:04:15 +09:00
杜Nate
9ea0137b01
Merge branch 'master' into spun-out 2020-03-23 18:13:53 +08:00
Dean Herbert
232c255986 Basic test scene setup 2020-03-23 17:33:02 +09:00
Dean Herbert
4f9ac7b81e Merge branch 'master' into show-mod-settings-tooltip 2020-03-23 14:57:54 +09:00
Liam DeVoe
1da590c63f use N1 format instead of 0.# 2020-03-22 22:54:21 -04:00
Liam DeVoe
afe7397d89 remove unnecessary using statements 2020-03-22 22:50:52 -04:00
Liam DeVoe
67667b3d22 enforce precision for ModDifficultyAdjust and derived classes 2020-03-22 21:22:46 -04:00
Liam DeVoe
63e9b2a299 use string.Empty, use base SettingDescription for [Osu/Catch]ModDifficultyAdjust 2020-03-22 18:50:09 -04:00
Dean Herbert
19b6e496ef Fix (very) long spinners degrading in performance due to high transform count 2020-03-22 04:18:03 +09:00
Liam DeVoe
a440d15620 simplify array initializationstatement 2020-03-20 16:58:02 -04:00
Liam DeVoe
e84b40f8ed remove unnecessary ToString calls 2020-03-20 16:53:40 -04:00
Liam DeVoe
cda1efef0b move overridability to SettingDescription method 2020-03-20 16:34:36 -04:00
Liam DeVoe
7bdbdd25f8 Revert "use SettingSource to define IconTooltip format"
This reverts commit 5a6d8f1932.
2020-03-20 16:05:12 -04:00
Liam DeVoe
52469fccbe
Merge branch 'master' into show-mod-settings-tooltip 2020-03-20 13:41:04 -04:00
Liam DeVoe
5a6d8f1932 use SettingSource to define IconTooltip format 2020-03-20 12:47:17 -04:00
Dean Herbert
d96f684077
Merge pull request #8358 from peppy/remove-slider-implicit-judgement
Remove slider implicit judgement
2020-03-20 01:13:58 +09:00
Dean Herbert
6b482c057a
Merge pull request #8362 from peppy/fix-slidertick-judgement-accuracy
Fix slider ticks/repeats contributing to accuracy
2020-03-20 01:13:49 +09:00
smoogipoo
12a48d2774 Cause all earlier hitobjects to get missed 2020-03-19 19:16:24 +09:00
Dean Herbert
0c1f385d5a Add OsuIgnoreJudgement to get correct result type 2020-03-19 18:19:10 +09:00
smoogipoo
f285b43a74 Allow simultaneous hitobjects 2020-03-19 17:45:08 +09:00
Dean Herbert
114b46c4f0 Change slider tail to give repeat judgement; slider itself to give none (managed by head already) 2020-03-19 15:01:14 +09:00
Dean Herbert
08b5ab8ec4 SliderRepeatPoint -> SliderRepeat 2020-03-19 14:42:02 +09:00
Dean Herbert
94c3ffb6e5 Fix slider ticks contributing to accuracy 2020-03-19 14:36:15 +09:00
Liam DeVoe
7a0a633ef9 don't use ToString, proper indent level 2020-03-19 00:06:55 -04:00
Liam DeVoe
18bf7c913b show mod settings in ModIcon tooltip 2020-03-18 23:43:26 -04:00
Dean Herbert
1c0c269852 Reduce allocations of followpoints by reusing existing 2020-03-19 00:34:24 +09:00
Dan Balasescu
1d680b7a00
Better english
Co-Authored-By: Dean Herbert <pe@ppy.sh>
2020-03-18 19:13:25 +09:00
smoogipoo
210e5c672f Merge branch 'master' into add-notelock 2020-03-18 16:24:31 +09:00
Dean Herbert
d6be8eec0c Merge branch 'master' into click-disabled-difficulty-icons 2020-03-16 11:30:57 +09:00
Andrei Zavatski
c271d17557 Remove useless field 2020-03-14 14:07:52 +03:00
Andrei Zavatski
74c9d5fc93 Use AccentColour 2020-03-14 13:45:55 +03:00
Andrei Zavatski
7e9d28b1b1 Fix slider ball colour affects follow circle 2020-03-13 13:42:33 +03:00
Dean Herbert
ed837d3115 Use framework extension method for FromHex 2020-03-11 10:18:41 +09:00
smoogipoo
742698acab Add notelock implementation 2020-03-10 15:30:24 +09:00
smoogipoo
9d5327b1ac Fix osu! shaking instead of missing for early hits 2020-03-10 15:00:23 +09:00
Bartłomiej Dach
77fd748035 Fix incorrect circle piece hitbox
Hitboxes of circle pieces in osu! have regressed with commit 8592335.
The reason for the regression was that hit detection was moved from
DrawableHitCircle itself to a newly-introduced private HitArea class
(now named HitReceptor).

As HitArea inherited from Drawable, it would return IsHovered == true
over its entire bounding box. This meant that the hit area could wrongly
pick up actions that are not within circle radius and make them into
hits.

To resolve, make HitReceptor a CompositeDrawable and set its corner
radius to match the circle piece. This fixes the invalid hitbox, as
IsHovered takes radius into account.
2020-03-06 21:21:20 +01:00
杜Nate
cf88e3ff19
Merge branch 'master' into spun-out 2020-03-04 17:38:35 +08:00
mcendu
e2ea92e21f Use framework method to convert rad to deg 2020-03-04 13:51:12 +08:00
smoogipoo
5e218697c5 Use stacked positions 2020-03-04 09:46:53 +09:00
smoogipoo
da89798765 Merge remote-tracking branch 'origin/master' into layout-rework 2020-02-26 15:06:40 +09:00
Dan Balasescu
ff063b229b
Merge pull request #7973 from peppy/fix-dho-lifetimes-via-judgements
Fix hitobjects with unknown lifetimes by enforcing non-null judgement
2020-02-25 20:38:29 +09:00
smoogipoo
f71c45cb1b Remove shallPropagate 2020-02-25 11:30:33 +09:00
smoogipoo
6c28fd21c7 osu-side changes 2020-02-24 20:52:15 +09:00
Dean Herbert
e6cfafffe9 Fix incorrect LifetimeStart and add todo regarding Expire usage 2020-02-24 12:24:15 +09:00
Dean Herbert
ffc7eaa3f2 Fix hitobjects with unknown lifetimes by enforcing non-null judgement
We've seen multiple cases where DrawableHitObject are stuck in the lifetime management container
due to not implementing a judgement (meaning they are never "hit" or "missed"). To avoid this going forward
CreateJudgement() must be implemented and return a non-null judgement.

This fixes BananaShower and JuiceStreams in osu!catch.

This also makes HitObject abstract and cleans up convert HitObject implementations.
2020-02-23 13:49:06 +09:00
Dean Herbert
090d9d9350 Make FollowPointRenderer a LifetimeManagementContainer 2020-02-23 04:37:04 +09:00
Dean Herbert
cb9a7ee0bb Give FollowPointConnections a valid lifetime 2020-02-23 04:36:50 +09:00
Dean Herbert
00b4fc1e1f Add fill to default skin slider ball when tracking 2020-02-21 17:38:23 +09:00
smoogipoo
958c891d15 Update with framework-side bindable list changes 2020-02-17 15:06:14 +09:00
杜Nate
b6378c7ae2
fix speed
* Original /40 is due to documentation error.

Co-Authored-By: clayton <me@clayton.cc>
2020-02-16 17:50:52 +08:00
Dean Herbert
6cfa182fe4 Don't transform repeat points 2020-02-16 15:35:12 +09:00
Dean Herbert
cd4643593f Fix transform mod not being applied correctly 2020-02-16 11:58:41 +09:00
Dean Herbert
5e8df45c00
Merge branch 'master' into improve-relax-key-down-up 2020-02-15 11:07:19 +09:00
Dan Balasescu
6cd91de8f7
Merge branch 'master' into fix-2b-relax 2020-02-14 19:21:06 +09:00
Dean Herbert
61a7f04efb Add a sane key up delay to relax mod 2020-02-14 17:13:50 +09:00
Dean Herbert
4ce687d608 Move public methods up 2020-02-14 17:03:23 +09:00
Dean Herbert
cd2d1b0669 Fix 2B maps not playing correctly with relax mod enabled 2020-02-14 17:00:55 +09:00