1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-22 04:47:24 +08:00
Commit Graph

4367 Commits

Author SHA1 Message Date
Alden Wu
1581f1a0ff Convert constructor in abstract class to protected 2022-07-14 17:11:01 -07:00
Alden Wu
4453b0b3e8 Replace comment pointer with actual comment 2022-07-14 17:11:01 -07:00
Alden Wu
66932f1af6 Move shared followcircle code into abstract base class 2022-07-14 17:11:01 -07:00
StanR
760742e358 Move relax global multiplier to diffcalc 2022-07-14 00:42:50 +03:00
Dean Herbert
e2f2d5f794 Rename last action to better represent that it is only captured actions 2022-07-14 01:40:44 +09:00
Dean Herbert
0bc42ef67d
Merge branch 'master' into stable-slider-followcircle-anims 2022-07-14 00:24:33 +09:00
James
4d9494d3b3 change LastPressedAction to have a private setter 2022-07-13 14:42:45 +01:00
James
af03002495 make flash duration and ruleset private 2022-07-13 14:31:09 +01:00
James
0da1bd393c privatise checkCorrectAction, add abstract CheckValidNewAction function 2022-07-13 14:29:27 +01:00
Dean Herbert
be3187c3a4 Remove remnant nullable disables 2022-07-13 22:05:56 +09:00
Dean Herbert
33dd9562cc Privatise some fields 2022-07-13 22:04:57 +09:00
Dean Herbert
5e6b9b96b0 Apply NRT to new InputBlockingMod class 2022-07-13 22:02:46 +09:00
tsunyoku
6755a771b4 make Cinema incompatible with InputBlockingMod 2022-07-13 07:49:08 +01:00
tsunyoku
e9b0a3e4fa make alternate and singletap incompatible with eachother 2022-07-13 07:35:53 +01:00
James
20d2b86193 make Single Tap incompatible with Autoplay, Cinema and Relax 2022-07-12 23:18:20 +01:00
James
c05263c3c3 add Single Tap mod 2022-07-12 23:15:18 +01:00
James
f90f93a43c abstract OsuModAlternate into InputBlockingMod 2022-07-12 23:15:18 +01:00
StanR
0983e4f81e Increase 50s nerf again 2022-07-12 17:57:00 +03:00
Gabe Livengood
b96734e31a
fix mod incompatibility between repel and relax 2022-07-12 08:43:48 -04:00
StanR
e58c365276 Merge branch 'master' into pp-balancing 2022-07-12 10:53:31 +03:00
Dan Balasescu
7ab75606a1
Merge branch 'master' into velocitychanges 2022-07-12 16:52:57 +09:00
StanR
58c687172b Reduce low AR bonus 2022-07-12 10:52:44 +03:00
Dean Herbert
fa626a82b3 Add missed incompatilibity rules 2022-07-12 15:19:06 +09:00
Gabe Livengood
28278e2554
enable NRT again 2022-07-11 17:27:25 -04:00
Gabe Livengood
54fe84350c
reciprocate mod incompatibility 2022-07-11 17:23:32 -04:00
Alden Wu
48911b956a Remove ClearTransformsAfter call
A bit weird only having one call on its own; probably deserves an
entire PR dedicated to adding ClearTransformsAfter calls
2022-07-10 17:07:21 -07:00
Gabe Livengood
6443338251
use cursor position instead of destination for dampLength calculation
the destination vector is clamped within playfield borders, we want dampLength to be based on distance from the cursor.
2022-07-10 01:22:22 -04:00
Gabe Livengood
a606d545c1
update new usage of CalculatePossibleMovementBounds 2022-07-08 12:00:07 -04:00
Dean Herbert
36f129a9b6
Merge branch 'master' into osu-mod-repel 2022-07-09 00:26:49 +09:00
Dean Herbert
8071335f3a
Merge pull request #18596 from hlysine/fix-random-mod-slider
Fix random mod generating off-screen sliders
2022-07-08 19:28:34 +09:00
goodtrailer
84dcd042f4 Protect duration calculations against unstable fps 2022-07-07 20:30:31 -07:00
Gabe Livengood
62beae4063
add nullable directive 2022-07-06 17:18:21 -04:00
Gabe Livengood
b3f23d93e8
Merge branch 'master' into osu-mod-repel 2022-07-06 17:05:09 -04:00
Gabe Livengood
d5b4d14670
modify damp length to effectively invert repulsion strength 2022-07-06 17:01:14 -04:00
Salman Ahmed
7f94405c9e Rename method and make duration optional 2022-07-06 23:38:11 +03:00
Gabe Livengood
40e98f84f3
change default strength back to 0.5 2022-07-06 16:01:08 -04:00
Gabe Livengood
0281bf672c
operate on vectors instead of vector components 2022-07-06 15:58:25 -04:00
goodtrailer
72fb1ae892 Add forgotten unsubscribes 2022-07-05 21:04:13 -07:00
goodtrailer
1e6def8209 Fix spinner accent animation on rewind 2022-07-04 22:58:41 -07:00
apollo-dw
5b96f67a8b Remove non-overlapping velocity buff 2022-07-04 20:49:26 +01:00
StanR
4f77637946 Update desmos 2022-07-04 21:52:57 +03:00
StanR
bf738aa04f Account for extreme ODs in relax multipliers 2022-07-04 21:49:45 +03:00
StanR
afa3f8cda3 Make relax ok/meh multipliers dependent on OD 2022-07-04 20:53:20 +03:00
StanR
11eb344476 Reduce 50s nerf further 2022-07-04 20:28:15 +03:00
StanR
db8bb07c78 Reduce 50s nerf effect 2022-07-04 20:10:26 +03:00
StanR
212360f67e Make relax ok/meh nerfs less drastic, add flashlight nerf, remove ar bonus for relax 2022-07-04 19:59:30 +03:00
StanR
45258b3f14 Buff aim slightly 2022-07-04 19:53:34 +03:00
goodtrailer
e6a05ce3e2 Slow down legacy followcircle animations 2022-07-03 13:51:30 -07:00
Dan Balasescu
ccc322e100
Merge pull request #18985 from andy840119/remove-nullable-disable-in-the-replays
Remove nullable disable annotation in replays namespace
2022-07-03 21:19:36 +09:00
Dean Herbert
c07ee80dbe
Merge pull request #18977 from goodtrailer/stable-slider-ball-fadeout
Imitate stable's slider ball fade in/out animation
2022-07-02 18:47:31 +09:00
andy840119
19721a9bbb Remove the nullable disable annotation and fix the breaking api. 2022-07-02 13:33:05 +08:00
Dean Herbert
9a5431d93f Minor renaming / refactoring to use local parameter rather than DI'd object 2022-07-02 13:37:10 +09:00
goodtrailer
f2141715b8 Replace AsNonNull() with Assert() 2022-07-01 21:22:48 -07:00
goodtrailer
471b64bd20 Reinstate early return with comment
Whoops, didn't read the reply until after I pushed...
2022-07-01 21:19:54 -07:00
goodtrailer
6d6ffd35d0 Remove unused parameter 2022-07-01 21:14:53 -07:00
goodtrailer
2e3ff2c7e0 Prefer [Resolved] and LoadComplete 2022-07-01 21:12:36 -07:00
goodtrailer
76d4f86ca3 Make legacy slider ball fade out instantly 2022-07-01 18:21:03 -07:00
Dean Herbert
a17e18103f Improve description 2022-07-01 18:19:31 +09:00
Dean Herbert
cdc4caa8c4
Merge pull request #18945 from goodtrailer/separate-ball-followcircle
Separate slider ball and followcircle skinnables into default/legacy classes
2022-07-01 17:54:29 +09:00
Dan Balasescu
d4aa18112b
Merge pull request #15035 from emu1337/speed-acc-scaling
Change speed accuracy scaling to be closer to worst case scenario
2022-06-29 18:04:23 +09:00
goodtrailer
0e0e9968ac Split ball and followcircle into default/legacy files 2022-06-29 01:23:35 -07:00
Dan Balasescu
6d91c0f375 Resolve inspection issue 2022-06-29 16:57:11 +09:00
Dan Balasescu
ad95f037de Prevent another case of potential div-by-0 2022-06-29 16:42:53 +09:00
Dan Balasescu
e6ccca8045 Fix inspection 2022-06-29 16:29:17 +09:00
Dan Balasescu
0211fe7ae8 Fix exception + possible div-by-0 2022-06-29 16:29:14 +09:00
Dan Balasescu
2989803b71 Merge branch 'master' into speed-acc-scaling 2022-06-29 16:15:20 +09:00
Dan Balasescu
34b9118fb3 Cleanup by using const value 2022-06-29 16:10:06 +09:00
Dan Balasescu
7d743994bc Merge branch 'master' into FL-diffspike 2022-06-29 16:05:53 +09:00
Dean Herbert
8cda55e224
Merge pull request #18795 from smoogipoo/full-size-follow-circle
Track the full size of the follow circle at all times
2022-06-28 19:20:34 +09:00
Dan Balasescu
0fd2c010e5 Remove NRT disables from attributes classes 2022-06-27 16:07:15 +09:00
Dan Balasescu
0579780bb8 Add IBeatmapOnlineInfo parameter and use to extract more data 2022-06-27 16:07:15 +09:00
Dean Herbert
31a447fda0 Update parameter discards 2022-06-24 21:26:19 +09:00
Bartłomiej Dach
26c5b59f6d
Replace usages of string.To{Lower,Upper}() 2022-06-24 11:57:45 +02:00
Dan Balasescu
a7de43ade6 Add attribute ID 2022-06-21 19:31:45 +09:00
Dan Balasescu
ede5ca31a1 Always track final follow circle size 2022-06-21 18:10:11 +09:00
apollo-dw
630bd244d5 Inherit StrainSkill instead 2022-06-21 10:01:11 +01:00
apollo-dw
0f6f000188 Remove difficulty spike nerf 2022-06-21 09:13:44 +01:00
Dan Balasescu
e0c82d11ab Convert == usages to ReferenceEquals 2022-06-20 16:56:19 +09:00
emu1337
26b0815fc8 fixed casting the wrong skill 2022-06-20 04:19:07 +02:00
emu1337
ecbbd29c9b Merge branch 'master' into speed-acc-scaling
# Conflicts:
#	osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyAttributes.cs
#	osu.Game.Rulesets.Osu/Difficulty/OsuDifficultyCalculator.cs
#	osu.Game.Rulesets.Osu/Difficulty/OsuPerformanceCalculator.cs
#	osu.Game.Rulesets.Osu/Difficulty/Skills/Speed.cs
2022-06-20 04:15:35 +02:00
Dan Balasescu
1bd6198da2
Merge pull request #18692 from apollo-dw/dbltap
Rework doubletap detection in osu!'s Speed evaluator
2022-06-19 11:03:16 +09:00
apollo-dw
c4d69405bf Adjust speed ratio fraction to avoid division by 0 2022-06-17 21:18:16 +01:00
Dan Balasescu
f8830c6850 Automated #nullable processing 2022-06-17 16:37:17 +09:00
apollo-dw
2634e56944 Further adjustments 2022-06-14 16:16:12 +01:00
apollo-dw
737197591d Change doubletap algorithm 2022-06-13 17:49:56 +01:00
Dan Balasescu
f73142c50f Remove for loop 2022-06-13 20:43:56 +09:00
Dan Balasescu
b300bc1e24 Fix ever-increasing flashlight-strain 2022-06-13 20:41:32 +09:00
apollo-dw
4e3dd1ce18 Merge remote-tracking branch 'master/master' into evaluators 2022-06-13 12:27:02 +01:00
apollo-dw
add9b4a7a4 Merge branch 'master' into evaluators 2022-06-13 12:16:22 +01:00
apollo-dw
e7602563fb Fetch lastlast object from beatmap, not objects list 2022-06-10 10:28:14 +01:00
Gabe Livengood
2fe34f188f shamelessly copy osumodmagnetised 2022-06-09 18:52:10 -04:00
Gabe Livengood
569c39942a replace easement with easing 2022-06-09 18:26:18 -04:00
Gabe Livengood
4e01db03bb don't specify icon 2022-06-09 18:25:04 -04:00
Gabe Livengood
6e883a69d9 revert slider radius parameter addition 2022-06-09 18:07:37 -04:00
Dan Balasescu
6d2a2ba7d6 Rename Position -> Index 2022-06-09 18:49:11 +09:00
Dan Balasescu
f0ef2e610e Merge branch 'master' into dho 2022-06-09 18:29:14 +09:00
Gabe Livengood
f54a68f6ca
scale down repulsion strength 2022-06-08 01:00:47 -04:00
Gabe Livengood
f21c9fb520
add newline 2022-06-07 12:05:53 -04:00
Gabe Livengood
b7bdad4074
clamp sliders, expose slider bounds function 2022-06-07 09:36:44 -04:00
Henry Lin
de224e79c7 Limit slider rotation when the slider is too large 2022-06-07 10:32:51 +08:00
Salman Ahmed
b6e97e699a Remove unnecessary position specification 2022-06-07 00:34:18 +03:00
Salman Ahmed
4158146c71 Fix spinenr tick samples not positioned at centre
Causing samples to be played at left ear rather than centre.
2022-06-07 00:30:11 +03:00
Salman Ahmed
0eaf420fa1 Specify full size for spinner ticks container 2022-06-07 00:29:14 +03:00
Salman Ahmed
fe96e15b1b Update spinner approach circle to handle LegacySkinTransformer 2022-06-04 01:15:39 +03:00
apollo-dw
774ac13900 Add xmldocs 2022-05-28 14:09:08 +01:00
apollo-dw
b631cefc55 Move object difficulty calculation to evaluator methods 2022-05-28 13:29:09 +01:00
apollo-dw
777d9af0f5 Move object difficulty calculation to evaluator methods 2022-05-28 13:28:04 +01:00
Gabe Livengood
5d838628d7
add test, fix formatting, expose easing function 2022-05-27 23:15:19 -04:00
apollo-dw
66a6467403 Pass object position to the object 2022-05-26 19:26:14 +01:00
Henry Lin
e205aeff38
Merge branch 'master' into random-mod-slider-rotation 2022-05-26 22:51:34 +08:00
Gabe Livengood
10287e0150
initial implementation 2022-05-26 00:08:00 -04:00
Dan Balasescu
8a4f52287c Re-invert distances, cleanup, use actual normalised distance 2022-05-25 13:38:36 +09:00
Dan Balasescu
cde06ecf17 Apply code reviews 2022-05-25 13:03:08 +09:00
Dan Balasescu
7b2a5d4f76 Adjust xmldoc for correctness 2022-05-25 13:01:27 +09:00
apollo-dw
1ef711de41 Return null for out of range objects 2022-05-24 16:40:24 +01:00
apollo-dw
30b9e0e7ab Use object list size for object position 2022-05-24 16:30:25 +01:00
apollo-dw
5dbec92d9e Update comments 2022-05-23 22:17:29 +01:00
apollo-dw
903c4f7b3d Merge remote-tracking branch 'master/master' into dho 2022-05-23 13:39:04 +01:00
Jamieson Berida
c9b00a2302
Merge branch 'master' into fl-slider 2022-05-23 17:42:12 +10:00
apollo-dw
26985ca8af Store hitobject history in the hitobject 2022-05-22 16:26:22 +01:00
Dean Herbert
2e21d75b10 Move metronome into own class and rename to avoid conflict with mod sounds 2022-05-20 17:30:04 +09:00
Dan Balasescu
64a371638e
Merge pull request #18236 from peppy/snap-unification
Add `enum` to snap method as alternative to multiple nested invocations
2022-05-20 11:35:05 +09:00
Dean Herbert
a443200d0d Make dependency nullable to allow for safer disposal unbinding 2022-05-19 13:49:52 +09:00
Dean Herbert
cf3ead8047 Remove unused local 2022-05-13 22:06:30 +09:00
Dean Herbert
d9782b5ef6 Remove redundant parenthesis 2022-05-13 21:31:49 +09:00
Dean Herbert
38b8baf095 Remove unused border colour 2022-05-13 21:28:50 +09:00
Dean Herbert
1529162318 Remove circle scaling (apparently the fixed scale is required for spacing) 2022-05-13 21:28:45 +09:00
Dean Herbert
0318944b80 Fix incorrect alive criteria causing clicking future objects to be too greedy 2022-05-12 23:37:29 +09:00
Dean Herbert
51744e428f Merge branch 'master' into editor-readability 2022-05-12 22:56:55 +09:00
Dean Herbert
0c335592b3 Tidy up interpolation and move const to new home 2022-05-12 19:44:07 +09:00
Dean Herbert
f22ff4e087 Remove editor animation toggling (replaced by overlap markers) 2022-05-12 19:28:56 +09:00
Dean Herbert
be3d4c9bf5 Add circle overlap marker, bringing back stable-like visibility of circles in the past 2022-05-12 19:27:32 +09:00
Dean Herbert
1b2c07e142 Extend lifetime of OsuSelectionBlueprint to allow for lingering display 2022-05-12 19:25:51 +09:00
Dan Balasescu
b71274265f
Merge pull request #15665 from MBmasher/fl-opacity
Consider opacity of hit objects in Flashlight skill
2022-05-12 19:00:21 +09:00
Dan Balasescu
c3d472310f
Merge pull request #18237 from peppy/editor-animation-toggle-refresh-immediately
Fix toggling hit animations on the editor not applying immediately
2022-05-12 18:51:04 +09:00
Dan Balasescu
4463a26f4e Refactor opacity computation algorithm 2022-05-12 18:31:10 +09:00
Dean Herbert
f5649b926a Use AliveObjects rather than tracking all hitobjects manually 2022-05-12 18:04:26 +09:00
Dean Herbert
c4854d4004 Fix slider ball rotation becoming undefined when time is not flowing smoothly 2022-05-12 17:55:12 +09:00
Dean Herbert
10e41d018a Fix toggling hit animations on the editor not applying immediately 2022-05-12 17:36:35 +09:00
Dean Herbert
c0abce918f Add enum to snap method as alternative to mutliple nested invocations 2022-05-12 16:19:07 +09:00
Dan Balasescu
2d33859e7a
Merge pull request #18094 from apollo-dw/sliderticks
Reimplement slider ticks in Strict Tracking mod sliders
2022-05-09 17:16:47 +09:00
Dean Herbert
c7e7aa5962 Don't draw distance snap grid on the start time of the next object 2022-05-06 17:05:52 +09:00
Bartłomiej Dach
8b4e4b48d1
Merge branch 'master' into sliderticks 2022-05-05 14:38:09 +02:00
Bartłomiej Dach
2039d3db6a
Use standard slider ticks in strict tracking mod 2022-05-05 14:37:57 +02:00
Dan Balasescu
39d10487b9
Merge branch 'master' into snapping-tidy-distance 2022-05-05 19:55:55 +09:00
Bartłomiej Dach
5e4d07760d
Merge branch 'master' into snapping-tidy 2022-05-05 10:17:48 +02:00
Dean Herbert
19cf9dc20b Merge branch 'snapping-tidy-distance' 2022-05-05 16:51:32 +09:00
Dean Herbert
225fc65068 Merge branch 'snapping-tidy' 2022-05-05 16:51:31 +09:00
Dean Herbert
977e6d8a80 Add xmldoc for IDistanceSnapProvider and related properties 2022-05-05 16:25:45 +09:00
Dean Herbert
f6fc926f1a Add xmldoc and rename methods in IPositionSnapProvider for legibility 2022-05-05 15:58:21 +09:00