Alden Wu
929eb8559e
Fix LegacySmoke alpha calculations
2022-10-03 16:02:33 -07:00
Dean Herbert
0bac5ef465
Merge branch 'master' into smoke
2022-10-03 21:29:42 +09:00
Dan Balasescu
8598eb29f8
Adjust flashlight to closely match classic
2022-10-03 18:38:05 +09:00
Dan Balasescu
1890a66b28
Merge pull request #20509 from o-dasher/cleanup-setting-sources
...
Removes unnecessary setting sources specifications
2022-09-28 17:55:42 +09:00
Dan Balasescu
cbed268ac9
Merge pull request #20510 from sw1tchbl4d3r/high_bpm_judgements
...
Clamp `LifetimeStart` of `HitObject`s to their judgement windows
2022-09-28 17:49:35 +09:00
sw1tchbl4d3
0cffbb7562
Clamp LifetimeStart of HitObject's to their judgement windows
2022-09-27 16:54:24 +02:00
o-dasher
f3e25eacad
Removes unnecessary setting sources specifications
2022-09-27 09:25:58 -04:00
abstrakt
6e1edc4d8d
Use the StackedEndPosition to determine the jump distance in the FlashlightEvaluator.
...
Signed-off-by: abstrakt <abstrakt.osu@gmail.com>
2022-09-26 14:06:35 +02:00
Dean Herbert
a7449380cd
Fix osu! slider ticks appearing too late
2022-09-26 14:11:59 +09:00
o-dasher
537796c3a1
Cleanup mod bindings
2022-09-25 15:49:22 -04:00
Dean Herbert
965d0603ce
Fix slider tick colour not being applied properly
2022-09-23 21:11:25 +09:00
Dean Herbert
a94b4e402e
Merge branch 'master' into argon-spinner
2022-09-23 14:22:53 +09:00
Salman Ahmed
49af80e17b
Remove 1.3x scale and adjust metrics with it
2022-09-22 20:39:42 +03:00
Salman Ahmed
e9c3478f69
Add very basic "argon" spinner
2022-09-22 20:39:42 +03:00
Dean Herbert
3811ea113d
Adjust argon animations a bit
2022-09-23 00:54:24 +09:00
Dan Balasescu
9f92925ecd
Merge branch 'master' into argon-cursor
2022-09-22 21:46:37 +09:00
Dan Balasescu
44ae9a5048
Merge pull request #20403 from peppy/argon-follow-point
...
Add very basic follow point implementation for argon skin
2022-09-22 21:45:56 +09:00
Dean Herbert
e95758cfcd
Add basic "argon" cursor
2022-09-22 21:21:30 +09:00
Dean Herbert
8875f7ee43
Add very basic follow point implementation for argon skin
...
This is just something to look better than the glowing mess which
triangles fallback was providing. This element hasn't been designed yet,
so I'm just filling in with something amicable for the time being.
2022-09-22 20:24:29 +09:00
Dan Balasescu
5dbe73ad0e
Merge pull request #20398 from peppy/fix-missing-notelock-shake
...
Fix "note lock" shake not always animating
2022-09-22 20:07:38 +09:00
Dan Balasescu
a612fe70f9
Merge pull request #20401 from peppy/fix-argon-sprite-lookup
...
Fix "argon" skin not supporting user loaded sprites in gameplay
2022-09-22 19:40:31 +09:00
Dan Balasescu
68e274b92d
Merge pull request #20400 from peppy/fix-argon-reverse-arrow-colour
...
Fix argon reverse arrow becoming white after switching skins
2022-09-22 19:01:19 +09:00
Dean Herbert
74aefdc5bd
Move basic transformer behaviour to base abstract class
2022-09-22 18:53:43 +09:00
Dean Herbert
f8e9a960ba
Fix argon skin not forwarding resource lookups to user backing
2022-09-22 18:53:43 +09:00
Dean Herbert
ea7c5458fe
Fix sprite dropdown not showing resources from non-legacy skins during gameplay
2022-09-22 18:53:43 +09:00
Dean Herbert
68015ef10c
Fix argon reverse arrow becoming white after switching skins
2022-09-22 18:12:28 +09:00
Dean Herbert
0458305a23
Add argon judgement bubbles
2022-09-22 17:50:21 +09:00
Dean Herbert
c354e828af
Merge pull request #20385 from B3nn1/slider-controlpoint-snapping
...
Add snapping for slider control points in the editor
2022-09-22 15:06:47 +09:00
Dean Herbert
749053481a
Update osu! hitobject implementation to avoid triggering ClearInternal
2022-09-22 15:04:20 +09:00
Dean Herbert
b844d76311
Move Shake logic local to hitcircle/slider
2022-09-22 15:04:20 +09:00
Dan Balasescu
70bab81282
Merge pull request #20377 from peppy/argon-skin
...
Add new default "argon" skin
2022-09-22 14:50:43 +09:00
Dean Herbert
2bdc6417e9
Mark DrawableOsuHitObject abstract for clarity
2022-09-22 14:44:03 +09:00
Dean Herbert
9bbb53af40
Merge pull request #20370 from Pasi4K5/random-mod-customisation
...
Add mod settings `AngleSharpness` and `AngleVariety` to the random mod
2022-09-22 13:52:41 +09:00
B3nn1
112bbe2296
Always use Parent.ToScreenSpace() in PathControlPointVisualiser
2022-09-21 18:56:22 +02:00
B3nn1
5d54354588
Add missing ToScreenSpace() call
2022-09-21 18:53:25 +02:00
Dean Herbert
4492a26b59
Merge branch 'master' into argon-skin
2022-09-21 13:00:16 +09:00
Dan Balasescu
1e9b60f07f
Merge pull request #16524 from stanriders/move-td-reduction
...
Fix touch device difficulty reduction not affecting star rating
2022-09-21 12:51:14 +09:00
B3nn1
368229f324
Remove unnecessary brackets
2022-09-21 01:25:01 +02:00
B3nn1
fe9e8635fc
Fix snapping of already existing slider control points in the editor
2022-09-21 01:04:39 +02:00
Pasi4K5
b1ecac514a
Correct comments
2022-09-20 23:13:38 +02:00
Pasi4K5
b7c1e8cc5a
Remove setting AngleVariety
2022-09-20 23:11:38 +02:00
Alden Wu
092e6cfa1d
Lock smoke bounds to playfield
2022-09-20 12:03:07 -07:00
Alden Wu
ddbd69dc67
Replace LifetimeAfterSmokeEnd with abstract LifetimeEnd
2022-09-20 09:44:01 -07:00
Dan Balasescu
3ec16063bd
And another invalidate
2022-09-20 21:01:18 +09:00
Dan Balasescu
102c140967
Remove another invalidate
2022-09-20 20:59:58 +09:00
Dan Balasescu
c28ed477e1
Expose less stuff, clean up implementation
2022-09-20 20:54:49 +09:00
Dan Balasescu
ff6e4e3a96
Privatise setters
2022-09-20 20:42:12 +09:00
Dan Balasescu
9f23210e7e
Use British-English
2022-09-20 20:40:20 +09:00
Dan Balasescu
5d3c6efcc5
Dispose quad batch
2022-09-20 20:40:20 +09:00
Dan Balasescu
f7962c993d
Reduce the number of points
2022-09-20 20:40:20 +09:00
Dan Balasescu
5d73de9021
Perform matrix mults on the GPU
2022-09-20 20:40:20 +09:00
Alden Wu
90a05f4bed
Cap smoke on point count + omit invisible vertices
2022-09-20 01:40:20 -07:00
B3nn1
b0a3c9152a
Enable snapping for slider control points in the editor
2022-09-19 21:33:38 +02:00
Alden Wu
c3b8e1d718
Fix test and spawn smoke immediately
2022-09-19 10:16:05 -07:00
Alden Wu
74056201e7
Return smoke key to key overlay
2022-09-19 09:15:59 -07:00
Alden Wu
0316e3e706
Merge branch 'master' of https://github.com/ppy/osu into smoke
2022-09-19 09:07:17 -07:00
Dean Herbert
c8206b747b
Fix border / slider body metrics
2022-09-19 23:16:46 +09:00
Dean Herbert
4eae5f8733
Add back outer fill for hitcircles (but not slider head circles)
2022-09-19 23:16:46 +09:00
Dean Herbert
edc624c4be
Tweak slider ball fade to be less present after slider ends
2022-09-19 23:16:46 +09:00
Dean Herbert
4f1530c2db
Add slider follow circle
2022-09-19 23:16:46 +09:00
Dean Herbert
3c0983b0db
Add slider reverse arrow
2022-09-19 23:16:46 +09:00
Dean Herbert
d4e2f70f87
Add slider score point
2022-09-19 23:16:46 +09:00
Dean Herbert
ef6ea49b18
Add slider ball
2022-09-19 23:16:46 +09:00
Dean Herbert
cd84503e62
Add slider body
2022-09-19 23:16:46 +09:00
Dean Herbert
403cc59208
Further animation tweaks and better documentation
2022-09-19 23:16:46 +09:00
Dean Herbert
02fbb04ba8
Add basic argon judgement
2022-09-19 23:16:46 +09:00
Dean Herbert
4a86fe1ca9
Tweak main circle animations
2022-09-19 23:16:46 +09:00
Dean Herbert
b766493776
Add basic argon skin transformer for osu! ruleset
2022-09-19 23:16:46 +09:00
Alden Wu
8204090e47
Scale smoke radius based on texture width
2022-09-19 00:07:22 -07:00
Alden Wu
3eb28881e4
Temp default smoke scale/rotation anims
2022-09-18 22:14:54 -07:00
Alden Wu
8474335aea
Remove hacky LifetimeEnd workaround
2022-09-18 22:08:45 -07:00
Alden Wu
a0e31018a1
Copy stable smoke's fade/alpha values, blending, scale, and rotation
2022-09-18 22:06:07 -07:00
Alden Wu
6852577dad
Remove smoke from key overlay
2022-09-18 19:08:01 -07:00
Alden Wu
0138663bdc
Fix InspectCode errors
2022-09-18 18:32:33 -07:00
Alden Wu
06178104c8
Show smoke in replays
2022-09-18 17:55:06 -07:00
Pasi4K5
9eb0a21d75
Correct comments
2022-09-19 00:45:23 +02:00
D.Headley
6d3e42a248
Give enums descriptions, change acronym and remove icon
2022-09-18 23:56:26 +02:00
Pasi4K5
4263933c9e
Add settings AngleSharpness and Angle variety
2022-09-18 23:43:14 +02:00
Alden Wu
613564b5b9
Full legacy smoke implementation and temp default smoke
2022-09-18 12:10:01 -07:00
Alden Wu
493efd84a3
Basic smoke path implementation
2022-09-18 12:08:34 -07:00
Salman Ahmed
557b39b69b
Fix InputBlockingMod not always clearing last action on break periods
2022-09-16 20:01:19 +03:00
Mk-56spn
fae1d4ff5c
Merge remote-tracking branch 'origin/Freeze_frame_implementation' into Freeze_frame_implementation
2022-09-16 15:27:45 +02:00
Mk-56spn
a0c493656f
Remove Incompatibility with Approach Circle requiring mods
2022-09-16 15:27:36 +02:00
MK56
3fe94b1620
Merge branch 'ppy:master' into Freeze_frame_implementation
2022-09-16 14:29:44 +02:00
Mk-56spn
6db8f51c02
Improve Tests
...
Fix divisor in test
Add Copyright header
2022-09-16 13:45:18 +02:00
Dean Herbert
289e6ad977
Fix follow point animations in legacy skins not always starting at correct point in time
2022-09-16 15:12:05 +09:00
Dan Balasescu
fcba917419
Merge pull request #20320 from peppy/skin-transformers
...
Allow skin transformers to be created for all skins
2022-09-16 12:58:46 +09:00
Mk-56spn
5a9b027ebc
Use Enum for Settings
2022-09-16 02:57:21 +02:00
Mk-56spn
eb84c513e3
Add ability to adjust to BPM changes
...
fix first hitcircle being off time
Bpm changes not working fix
2022-09-16 02:14:14 +02:00
Dan Balasescu
a3d9a4d723
Merge pull request #20160 from apollo-dw/od
...
Retrieve great hit window from the hit object in osu! difficulty calculation
2022-09-15 20:38:35 +09:00
Dean Herbert
c7f8f948b9
Rename CreateLegacySkinProvider to CreateSkinTransformer and apply to all skins
2022-09-15 20:18:10 +09:00
Dean Herbert
4af76b9f48
Apply the same change to HandleFlip
2022-09-15 19:55:18 +09:00
Dean Herbert
c203a030c1
Update osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointPiece.cs
...
Co-authored-by: apollo <83023433+apollo-dw@users.noreply.github.com>
2022-09-15 04:28:07 +09:00
Dean Herbert
87384db872
Fix slider rotation causing thousands of new drawables to be created
2022-09-15 00:51:08 +09:00
StanR
1801ae3c6a
Move flashlight TD difficulty reduction to diffcalc
2022-09-14 17:40:22 +03:00
Dan Balasescu
4004d57448
Merge branch 'master' into move-td-reduction
2022-09-13 16:12:26 +09:00
Dan Balasescu
7f291552c7
Merge pull request #20258 from peppy/fix-slider-leak-editor
...
Fix bindable event binds to `HitObject` directly
2022-09-12 19:47:10 +09:00
Dean Herbert
89e128c0f3
Fix bindable event binds to HitObject directly
2022-09-12 17:35:56 +09:00
Mk-56spn
d2ac25870b
Merge remote-tracking branch 'origin/Freeze_frame_implementation' into Freeze_frame_implementation
2022-09-10 14:08:38 +02:00
Mk-56spn
23d435bc42
name changes
2022-09-10 14:08:04 +02:00
andy840119
3d7367a842
Move the CreateConvertibleReplayFrame() into the base ruleset class for avoid api breaking change in the customized ruleset.
2022-09-10 11:07:23 +08:00
andy840119
2f91b5c846
Add missing import.
2022-09-10 10:46:10 +08:00
andy840119
e62999fb16
Merge branch 'master' of https://github.com/ppy/osu into remove-the-nullable-disable-in-the-ruleset
...
# Conflicts:
# osu.Game.Rulesets.Catch/CatchRuleset.cs
# osu.Game.Rulesets.Osu/OsuRuleset.cs
# osu.Game.Rulesets.Taiko/TaikoRuleset.cs
# osu.Game/Rulesets/Ruleset.cs
2022-09-10 10:40:12 +08:00
MK56
33a435e2ef
Merge branch 'ppy:master' into Freeze_frame_implementation
2022-09-10 00:54:46 +02:00
StanR
6338b87c63
attributes
2022-09-09 17:31:52 +03:00
StanR
c2e3fcfa3f
Merge branch 'master' into move-td-reduction
2022-09-09 17:24:58 +03:00
Dean Herbert
31cd7cdca0
Refactor IsHitObjectOnBeat to be understandable
2022-09-09 18:00:51 +09:00
Dean Herbert
a2f96ea120
Make random implicitly null to avoid potential incorrect behaviour in randomBool
2022-09-09 17:55:54 +09:00
Dean Herbert
5defb8b471
Merge branch 'master' into enhance-randomisation
2022-09-09 17:53:13 +09:00
Mk-56spn
e416c87970
readded approach circles
2022-09-08 15:17:22 +02:00
Mk-56spn
4a6c8785af
Clean up
2022-09-08 11:14:56 +02:00
Mk-56spn
7f08de522d
Fixed
2022-09-08 01:21:03 +02:00
MK56
e250885204
Merge branch 'ppy:master' into Freeze_frame_implementation
2022-09-08 00:10:44 +02:00
Mk-56spn
5a1b2f9a77
Freeze frame testing
2022-09-08 00:05:48 +02:00
apollo-dw
1997519364
Don't use full hit window in rhythm
2022-09-07 13:25:35 +01:00
Dean Herbert
6a03b4e0de
Merge branch 'master' into true-gameplay-rate
2022-09-07 20:01:03 +09:00
Dean Herbert
b5b66de3c9
Fix target mod crashing if beatmap is played with a break after all hitobjects
...
Closes https://github.com/ppy/osu/issues/20161 .
2022-09-07 17:46:51 +09:00
apollo-dw
b5779508d0
Retrieve great hit window from the hit object
2022-09-06 17:10:32 +01:00
Dean Herbert
bc1212f4e6
Change NonGameplayAdjustments to GameplayAdjustments and convert TrueGameplayRate to extension method
2022-09-06 22:26:46 +09:00
Dean Herbert
f1d9b225a7
Remove probably pointless comment
2022-09-05 16:40:10 +09:00
Dean Herbert
8af8adf22d
Fix incorrect slider length in timeline when non-default velocity is inherited from previous object
2022-09-05 16:17:26 +09:00
Salman Ahmed
ff4a051c05
Merge branch 'master' into remove-dispose-updates
2022-09-03 16:14:50 +03:00
Dan Balasescu
9645bfe708
Bump difficulty calculator versions
2022-09-02 16:27:25 +09:00
Dean Herbert
6a35b233e5
Merge branch 'master' into remove-dispose-updates
2022-09-01 23:03:19 +09:00
Bartłomiej Dach
cd72f087b3
Merge branch 'master' into fix-merge-crash
2022-08-31 21:25:53 +02:00
Dean Herbert
6af8143c8c
Fix typing of new setting to allow it to be visible to tools export
2022-08-31 22:34:07 +09:00
Dan Balasescu
8c202ce141
Merge pull request #20033 from apollo-dw/speed-notes-fix
...
Fix relevant note count summation in osu!'s Speed skill
2022-08-31 19:15:40 +09:00
Dan Balasescu
837b19ab24
Merge pull request #19919 from khang06/nan-sv
...
Emulate osu!stable's NaN slider velocity behavior
2022-08-31 19:06:49 +09:00
Dean Herbert
a15ea71aed
Merge branch 'master' into fix-merge-crash
2022-08-31 13:28:57 +09:00
apollo-dw
ad650adab0
Fix speed note count sum
2022-08-30 18:03:44 +01:00
Dean Herbert
706ac3e44f
Merge pull request #19982 from OliBomby/fix-illegal-merge
...
Fixed 0 length merge being allowed
2022-08-30 12:28:18 +09:00
OliBomby
44916c51d7
Updated canMerge check to be totally accurate
2022-08-30 00:18:55 +02:00
Dean Herbert
2e5770be4e
Move helper method to bottom of class
2022-08-30 02:51:42 +09:00
OliBomby
d50e9caa11
Moved guards to separate canMerge method
2022-08-29 18:58:29 +02:00
OliBomby
a296c1ec81
remove call to changeHandler BeginChange
2022-08-29 16:05:35 +02:00
Dan Balasescu
e34c8e4975
Merge pull request #19716 from MBmasher/fl-grid
...
Nerf repeated angles in Flashlight skill
2022-08-29 21:15:45 +09:00
Dan Balasescu
e3e204001e
Merge pull request #19907 from peppy/ruleset-api-versioning
...
Add ruleset API versioning
2022-08-29 18:50:01 +09:00
Dean Herbert
780121eeee
Add setting to toggle metronome in "Target" mod
...
As mentioned in https://github.com/ppy/osu/discussions/20006#discussioncomment-3496732 .
2022-08-29 17:12:10 +09:00
Dean Herbert
105aa01e7d
Update usages of RemoveInternal
2022-08-29 15:57:40 +09:00
Dean Herbert
a215d009fe
Update Remove/RemoveRange/RemoveAll calls in line with framework changes
2022-08-29 15:57:40 +09:00
Dean Herbert
90b9c02ac6
Remove "internal" identifier as unnecessary
2022-08-29 14:01:15 +09:00
OliBomby
ff2eac79d1
fix same time merge causing crash
2022-08-27 17:43:32 +02:00
OliBomby
16e0ec2f88
Fixed 0 length merge being allowed
2022-08-27 13:53:50 +02:00
MBmasher
b082dc1fe4
Slightly buff flashlight multiplier
2022-08-27 18:31:07 +10:00
Dean Herbert
69cbc0125b
Merge pull request #19964 from nanashi-1/merge-hitobject-hitsound-fix
...
Fix hitobjects merge feature in editor not adding any hitsounds
2022-08-26 20:05:02 +09:00
MBmasher
454d868dd5
Remove unnecessary using call
2022-08-26 20:42:02 +10:00
MBmasher
249c3f868f
Compare raw angle values instead of rounding angles
2022-08-26 20:40:18 +10:00
MBmasher
5082ee26cf
Ensure a negative value cannot be added to angleRepeatCount
2022-08-26 20:30:14 +10:00
MBmasher
08cb70b093
Lessen repeated angle nerf for objects further back in time
2022-08-26 20:27:31 +10:00
Dean Herbert
03dcfed384
Merge branch 'master' into slider-splitter
2022-08-26 19:10:33 +09:00
Dean Herbert
47cb163015
Refactor splitting logic and comments slightly
2022-08-26 19:09:03 +09:00
Dean Herbert
f54047d17b
Move selection clearing to top
2022-08-26 18:55:20 +09:00
MBmasher
d8854413cb
Add newline
2022-08-26 12:38:36 +10:00
MBmasher
6651e76e2e
Remove whitespace
2022-08-26 12:37:56 +10:00
MBmasher
b0e7f63361
Update angle multiplier to nerf repeated angles
2022-08-26 12:34:33 +10:00
nanashi
4fc96f0389
Merge branch 'ppy:master' into merge-hitobject-hitsound-fix
2022-08-25 19:34:05 +08:00
nanashi-1
2d2bfac5e9
used firstHitObject.Samples as samples for mergedHitObject
2022-08-25 17:49:38 +08:00
Dean Herbert
3ca4bdc087
Add ToArray() calls to removal iteration for safety
2022-08-25 15:13:38 +09:00
Dean Herbert
091c51e664
Fix SliderPath.Version bindings not being correctly cleaned up on path changes
2022-08-25 15:00:32 +09:00
o-dasher
4de6df71c5
No "gameplayClock" usage with playfield update mods
2022-08-24 20:59:32 -04:00
Khang
9c6968e96d
Remove unused import in Slider
2022-08-24 02:54:40 -04:00
OliBomby
631ea9a3ed
added a gap between objects and made it theoretically possible to retain sample control point
2022-08-23 23:29:59 +02:00
OliBomby
1f9cdff013
remove these lines
2022-08-23 22:19:40 +02:00
Khang
ec9daec93b
Remove unnecessary workaround
2022-08-23 14:18:40 -04:00
Khang
c1ced85b5e
Move GenerateTicks to LegacyDifficultyControlPoint and remove support for NaN slider velocity support for other rulesets (at least for now)
2022-08-23 14:07:18 -04:00
Khang
a81672f3dc
Use an infinite tick distance instead of directly disabling tick generation for SliderEventGenerator
2022-08-22 23:31:24 -04:00
Khang
9f08c474ca
Treat NaN slider velocity timing points as 1.0x but without slider ticks
2022-08-22 21:58:38 -04:00
Dean Herbert
f5710d8000
Add ruleset API versioning
2022-08-22 16:35:08 +09:00
naoei
29ef1c8db8
Check if StatisticItem.Name is null or empty
2022-08-20 21:48:53 -04:00
Nao
189a407cb1
Merge branch 'master' into ruleset-localization
2022-08-20 21:39:10 -04:00
Dean Herbert
885ea4270b
Reorder context menu items and tidy up surrounding code
2022-08-20 14:03:54 +09:00
Dean Herbert
36e202c70e
Add inline comment explaining necessity to use AddRange for slider transform operations
2022-08-20 11:38:43 +09:00
OliBomby
65f7ecec83
moving all controlpoints at once for slider
2022-08-20 00:26:04 +02:00
OliBomby
d1519343f6
Improved visual tests for slider splitting
2022-08-19 18:29:01 +02:00
MK56
91742859f1
Merge branch 'ppy:master' into blink_implementation
2022-08-19 16:55:27 +02:00
OliBomby
89eb0a4079
Added TestScene for slider splitting
2022-08-19 01:10:54 +02:00
Mk-56spn
7add3a6950
ar var test
2022-08-18 19:00:54 +02:00
OliBomby
cb6339a20b
added slider splitting option
2022-08-18 01:29:03 +02:00
Dan Balasescu
237637f0c4
Merge pull request #19804 from stanriders/clamp-sb-estimation
...
Clamp effective miss count to maximum amount of possible breaks
2022-08-17 18:58:12 +09:00
Dean Herbert
615c5cf6ae
Merge branch 'master' into slider-merger
2022-08-17 13:36:15 +09:00
Dean Herbert
0ff5547b83
Make changeHandler optional in convertToStream method to match new implementation
2022-08-17 13:35:44 +09:00
StanR
43e471c2a5
Clamp effective miss count to maximum amount of possible braks
2022-08-16 16:12:13 +03:00
Dean Herbert
ee153a345c
Add a few more overlooked beatmap save states on setup screen modifications
2022-08-16 16:31:56 +09:00
Dean Herbert
0833a6fb9a
Avoid multiple iteration of LINQ query using a local
2022-08-16 15:39:23 +09:00
Dean Herbert
7cc9fdbaa0
Simplify context menu check by using existing mergeable object list
2022-08-16 15:39:23 +09:00
Dean Herbert
ecb9351bab
Remove unnecessary null pre-checks
2022-08-16 15:36:43 +09:00
Dean Herbert
e636fcd9b8
Use DI'd components from parent class rather than fetching locally
2022-08-16 15:35:32 +09:00
OliBomby
3abc333813
added hotkey for merging selection
2022-08-15 17:18:55 +02:00
Dean Herbert
c8764cb333
Move all usage of GameplayClock to IGameplayClock
2022-08-15 18:30:53 +09:00
Nao
c940f5abcb
Merge branch 'master' into ruleset-localization
2022-08-14 15:17:44 -04:00
naoei
45e9eda9e7
Localise hit result name
2022-08-14 14:57:02 -04:00
naoei
18ce784ae0
Allow StatisticItem's name param to be nullable
2022-08-14 14:51:35 -04:00
Pasi4K5
5106c00a9c
Improve code quality
2022-08-14 19:02:29 +02:00
Pasi4K5
7a41b9f25a
Adjust angle and sectionOffset calculations
2022-08-13 03:11:58 +02:00
Pasi4K5
8c624d3269
Add comments and improve code readability
2022-08-13 00:57:49 +02:00
Pasi4K5
78fe72476d
Adjust parameters
2022-08-13 00:01:40 +02:00
Dean Herbert
e5e9841652
Apply multiple other mod debuffs as decided in pull request discussion
2022-08-12 18:58:09 +09:00
MBmasher
21c5fed45f
Adjust capitalisation
2022-08-12 14:09:16 +10:00
MBmasher
f70588a423
Add newline before brace
2022-08-12 14:08:32 +10:00
MBmasher
037f56077b
Apply Flashlight grid nerf
2022-08-12 13:29:04 +10:00
OliBomby
3525dfb0f1
added merging feature
2022-08-12 01:17:33 +02:00
Dan Balasescu
61a3758cd9
Merge branch 'master' into pp-balancing
2022-08-11 19:46:16 +09:00
naoei
a42b8092af
Change message type osu resume overlay
2022-08-10 16:09:58 -04:00
naoei
3e38baca3c
Change ruleset mod description types
2022-08-10 16:09:11 -04:00
Dan Balasescu
7cac089246
Merge branch 'master' into fl-slider
2022-08-10 21:19:05 +09:00
Pascal Pomper
f98ee3ff24
Merge branch 'ppy:master' into enhance-randomisation
2022-08-10 12:22:39 +02:00
Dean Herbert
e1189da824
Merge branch 'master' into irenderer-glwrapper
2022-08-08 12:31:53 +09:00
Dan Balasescu
6afff72865
Fix CI inspections / refactor to single enumeration
2022-08-05 20:54:10 +09:00
Dan Balasescu
802dc90cb1
Adjust using directives for vertices
2022-08-05 20:37:33 +09:00
Dean Herbert
a682a823f4
Fix test failures where Beatmap is not provided
2022-08-05 18:20:37 +09:00
Dean Herbert
9a4d0494de
Adjust various pooling defaults to better handle more intense beatmaps
2022-08-05 18:09:07 +09:00
Dean Herbert
8ae5429602
Adjust slider pooling based on beatmap
...
Handles edge cases like mentioned in https://github.com/ppy/osu/issues/19585 .
2022-08-05 18:08:05 +09:00
Dan Balasescu
2c6c315e3a
Merge branch 'master' into pp-balancing
2022-08-04 15:40:46 +09:00
Dan Balasescu
b4e55f7309
Apply IRenderer changes
2022-08-02 19:50:57 +09:00
Dan Balasescu
a2a913ab52
Merge branch 'irenderer-batches' into irenderer-textures
2022-08-02 19:25:08 +09:00
Dean Herbert
a5fac70c3b
Rename variable to not include mode name itself
2022-08-01 23:30:00 +09:00
Dean Herbert
d09976bb39
Merge branch 'master' into Wiggle-strength-duration
2022-08-01 23:29:03 +09:00
Dean Herbert
e0940c6c22
Update animations to final versions
2022-08-01 18:03:32 +09:00
Dean Herbert
0d9edcfa24
Merge branch 'master' into stable-slider-tick-anims
2022-08-01 17:40:16 +09:00
Dan Balasescu
415d6def2d
Remove unnecessary AsNonNull()
2022-08-01 13:22:58 +09:00
andy840119
632577389d
Mark the property as non-nullable.
2022-07-31 21:43:16 +08:00
Dan Balasescu
09979d44aa
Apply DrawNode batching changes
2022-07-29 23:32:09 +09:00
Dan Balasescu
155dac55d0
Apply DrawNode parameter changes
2022-07-29 22:33:34 +09:00
Salman Ahmed
72961ec336
Flip method parameters to make sense
...
See 537f64c75e (r931785228)
2022-07-28 08:04:55 +03:00
andy840119
537f64c75e
Make original hit objects and random properties as local variable.
2022-07-27 22:15:41 +08:00
Salman Ahmed
89644a652e
Separate combined fields
2022-07-27 10:13:44 +03:00
Pasi4K5
da7d297d85
Adjust parameters
2022-07-26 19:07:25 +02:00
andy840119
0fe64d1e80
Remove unused namespace.
2022-07-27 01:05:50 +08:00
為什麼
9134525111
Mark the property as nullable and add some assert check.
2022-07-26 23:58:50 +08:00
為什麼
deb39bd330
Mark the property as nullable or non-nullable.
2022-07-26 23:52:08 +08:00
為什麼
e28584da89
Remove nullable disable annotation in the Osu ruleset.
2022-07-26 23:25:28 +08:00
Salman Ahmed
f68c4e8890
Fix code formatting
2022-07-25 06:36:26 +03:00
mk-56
16e655766e
Addressed pertinent issues
2022-07-23 23:30:57 +02:00
MK56
2a3d3a0660
Merge branch 'ppy:master' into Wiggle-strength-duration
2022-07-23 22:58:21 +02:00
MBmasher
267d55a6a8
Remove osuSlider from statement
2022-07-23 14:48:39 +10:00
MBmasher
230943f698
Merge branch 'fl-slider' of https://github.com/mbmasher/osu into fl-slider
2022-07-23 14:40:54 +10:00
MBmasher
f44a5def90
Move repeat bonus to TravelDistance
2022-07-23 14:40:16 +10:00
Dan Balasescu
71912e10c4
Merge branch 'master' into fl-slider
2022-07-22 15:22:50 +09:00
Alden Wu
c2c2c505a4
Combine FollowCircle and TickFollowCircle classes
2022-07-21 19:46:46 -07:00
Dean Herbert
726042d9ec
Use switch instead of or
2022-07-21 23:16:28 +09:00
Dean Herbert
aca19a005e
Add versioning to difficulty calculators
2022-07-21 18:15:25 +09:00
Alden Wu
23fd514ca3
Use DrawableSliderTail instead of DrawableSlider
2022-07-20 18:07:02 -07:00
StanR
163c3f9c2d
Adjust multipliers to account for speed changes
2022-07-20 16:10:34 +03:00
StanR
35e841de95
Move base performance multiplier to a const
2022-07-20 15:54:49 +03:00
StanR
9c9f32b435
Merge branch 'master' into pp-balancing
2022-07-20 15:40:29 +03:00
Salman Ahmed
6ce6f6f7df
Merge branch 'master' into remove-score-multiplier-on-custom-mod-settings
2022-07-20 08:57:43 +03:00
Dan Balasescu
ec789c2f71
Merge pull request #19128 from peppy/default-follow-circle-improvements
...
Adjust default follow circle animations to feel nicer
2022-07-20 14:57:03 +09:00
Salman Ahmed
4210ec6502
Merge branch 'master' into remove-score-multiplier-on-custom-mod-settings
2022-07-19 19:21:26 +03:00
Dean Herbert
06ae30a7d2
Fix slider velocity not using previous value if slider is not adjacent
2022-07-19 22:54:11 +09:00
Dan Balasescu
cfb2adfd27
Merge branch 'master' into velocitychanges
2022-07-19 19:57:47 +09:00
Alden Wu
5cb0920cfb
Revert OnSliderTail() to OnSliderEnd()
...
In light of the comment added in the previous commit, slider tail
and end are not actually the same.
2022-07-19 02:27:04 -07:00
Alden Wu
e1f7db6e7d
Fix around some comments
2022-07-19 02:25:14 -07:00
Alden Wu
d213f56f79
Align legacy followcircle anims to slider ticks
2022-07-19 02:08:53 -07:00
Dean Herbert
e346624b14
Fix animation changes incorrectly applying to successful completion of sliders
2022-07-19 15:51:02 +09:00
Dean Herbert
101d270615
Merge branch 'master' into default-follow-circle-improvements
2022-07-19 15:50:47 +09:00
Salman Ahmed
d8cce5fe36
Fix OsuHitObject not using property wrapper properly
2022-07-19 07:52:12 +03:00
Salman Ahmed
8f80a22ef9
Fix osu! and catch hitobjects no longer scaled to 1 by default
2022-07-19 07:00:13 +03:00
Salman Ahmed
1051009827
Change bindable properties in all HitObjects to be lazily initialised
2022-07-19 05:39:10 +03:00
StanR
633f6fe620
Increase global multiplier
2022-07-18 21:58:11 +03:00
MBmasher
42b9dc877d
Divide slider bonus by repeat count
2022-07-18 16:14:06 +10:00
MBmasher
72c096f9af
Update xmldoc
2022-07-18 15:59:20 +10:00
MBmasher
7c680afc3c
Change initialisation of osuSlider
2022-07-18 15:59:00 +10:00
MBmasher
204fbde07b
Remove debug code
2022-07-18 15:58:32 +10:00
MBmasher
8413c40442
Remove debug code
2022-07-18 15:58:09 +10:00
Salman Ahmed
32ba58109b
Remove score multiplier on difficulty-increasing mods with customised settings
2022-07-18 07:29:03 +03:00
Salman Ahmed
0ac3391d54
Merge branch 'master' into cinema-repel-incompatible
2022-07-18 06:55:43 +03:00
tsunyoku
83429d2f22
make cinema incompatible with repel
2022-07-17 20:45:17 +01:00
tsunyoku
491558261f
remove unnecessary type-specification
2022-07-17 20:44:06 +01:00
tsunyoku
e13c1254e5
make perfect incompatible with autopilot
2022-07-17 20:41:43 +01:00
StanR
de38b54c10
Merge branch 'master' into pp-balancing
2022-07-17 20:53:05 +03:00
MBmasher
68caafa210
Update xmldoc
2022-07-17 17:02:30 +10:00
MBmasher
dae698638c
Add repeat bonus to Flashlight, move repeat multiplier to AimEvaluator
2022-07-17 16:56:05 +10:00
MBmasher
a950deb7db
Re-implement slider changes to FlashlightEvaluator
2022-07-17 16:27:55 +10:00
Jamieson Berida
a0dd6cbab3
Merge branch 'master' into fl-slider
2022-07-17 16:18:18 +10:00
Dean Herbert
b93b6ba2ca
Change "single tap" mod acronym to not conflict with "strict tracking"
2022-07-16 17:19:55 +09:00
Salman Ahmed
887f2721b0
Merge branch 'master' into default-follow-circle-improvements
2022-07-15 18:39:57 +03:00
Dean Herbert
775c6c8374
Fix potential crash in editor from transform time going below zero
2022-07-15 19:29:37 +09:00
Dean Herbert
afec7941ff
Adjust default follow circle animations to feel nicer
2022-07-15 17:28:42 +09:00
Dean Herbert
23a0e25c8c
Merge branch 'master' into stable-slider-followcircle-anims
2022-07-15 17:27:48 +09:00
Dean Herbert
7ed4eb5815
Adjust transform logic to match osu-stable (and add TODOs for remaining oversights)
2022-07-15 17:17:55 +09:00
Dean Herbert
0ade8db550
Tidy up nullability and casting
2022-07-15 16:40:48 +09:00
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
