Salman Ahmed
7e82f5740b
Add a skin extension for simplifying falling back on hyper-dash colours
2020-04-03 19:35:50 +03:00
Dean Herbert
53c99d137a
Merge branch 'master' into mania-config-lookup-refactor
2020-04-03 22:22:59 +09:00
Dean Herbert
51db361c32
Update usages of Animation and Video in line with framework changes
2020-04-03 16:00:06 +09:00
smoogipoo
1f797207f7
Rework lookups to not require total playfield columns
2020-04-03 12:31:05 +09:00
Dean Herbert
f653d37058
Merge pull request #8521 from peppy/remove-scale-down-to-fit
...
Remove ScaleDownToFit as it was implemented without enough safety
2020-03-31 23:22:04 +09:00
Dean Herbert
03b90fe2db
Remove local application of same margin in CatchDifficultyCalculator
2020-03-31 19:01:49 +09:00
Dean Herbert
b7d73f96ea
Fix osu!catch catcher hit area being too large
2020-03-31 18:33:09 +09:00
Dean Herbert
1fce7cce01
Remove ScaleDownToFit as it was not implemented without enough safety
2020-03-31 13:50:04 +09:00
Salman Ahmed
16a4525a9c
CatchSkinConfiguration -> CatchSkinColour
2020-03-30 09:33:47 +03:00
Dean Herbert
2abb8a37df
Merge branch 'master' into show-mod-settings-tooltip
2020-03-29 14:35:04 +09:00
Salman Ahmed
c2e31f53f1
Merge remote-tracking branch 'upstream/master' into catch-hyperdash-fruit-colouring
2020-03-28 07:44:11 +03:00
Dean Herbert
2949e8dc27
Reduce spread of stacked fruit
2020-03-26 16:58:23 +09:00
Salman Ahmed
fecafc2e48
Fix additive target accidentally clears all of the added containers
...
It sets the AdditiveTarget on the object initializer but then the catcher is set to Child which wipes up all of the existing children (containers added by Catcher through AdditiveTarget setter)
2020-03-26 09:14:44 +03:00
Salman Ahmed
302fdd834a
Add support for custom hyper-dash catcher colouring
2020-03-26 09:11:59 +03:00
Salman Ahmed
e3a7c8a124
Make catcher trails colouring per container
2020-03-26 09:11:31 +03:00
Salman Ahmed
d995f3e1cc
Add support for custom hyper-dash legacy fruit colouring
2020-03-26 05:42:13 +03:00
Salman Ahmed
6f2cc5471a
Add support for custom hyper-dash fruit colouring
2020-03-26 05:42:12 +03:00
Salman Ahmed
0a368f13d9
Add default hyper-dash colour constant on Catcher
2020-03-26 05:42:11 +03:00
Salman Ahmed
e6b2e3b0ed
Add osu!catch skin configurations
2020-03-26 05:42:11 +03: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
96a849f897
Add remaining replay recorders
2020-03-24 14:55:49 +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
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
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
5a6d8f1932
use SettingSource to define IconTooltip format
2020-03-20 12:47:17 -04: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
Bartłomiej Dach
f904859943
Remove leftover unused private methods
2020-03-15 15:45:13 +01:00
Dean Herbert
d3f23b766e
Move across to new file in line with master
2020-03-14 17:06:23 +09:00
Dean Herbert
9ea0e83f3d
Merge branch 'master' into correct-trail-animation-frame
2020-03-14 16:57:35 +09:00
Dean Herbert
45dfb22bd5
Centralise additive texture creation
2020-03-14 16:39:44 +09:00
Dean Herbert
63b4fa0d56
Merge branch 'master' into correct-trail-animation-frame
2020-03-14 16:12:52 +09:00
Dean Herbert
1523c4c63f
Merge branch 'master' into catcher-area-file-cleanup
2020-03-14 15:41:26 +09:00
Dean Herbert
202c8cdad8
Add braces to satisfy codefactor
2020-03-14 15:35:59 +09:00
Dean Herbert
1733519c3a
Split out CatcherArea nested classes and reorder methods
2020-03-13 12:59:30 +09:00
smoogipoo
c8cdc5fda5
Expose half catcher width to movement skill
2020-03-13 12:43:01 +09:00
Dean Herbert
c30bfa79e7
Merge branch 'master' into correct-trail-animation-frame
2020-03-13 09:55:41 +09:00
Dean Herbert
cc8a413f6b
Merge pull request #8230 from EVAST9919/catcher-fix
...
Fix catcher showing miss sprite upon missing bananas
2020-03-12 20:10:36 +09:00
Andrei Zavatski
bc2a1cdb62
Apply suggestions
2020-03-12 12:04:36 +03:00
Andrei Zavatski
e46c070d95
Add test scene
2020-03-11 23:09:29 +03:00
Andrei Zavatski
09b9983286
Fix CatcherAnimationState is Fail if missing banana shower
2020-03-11 21:14:07 +03:00
smoogipoo
5c051027e7
Fix different offset being applied from stable
2020-03-11 18:43:08 +09:00
smoogipoo
919410c627
Remove always-false condition
2020-03-11 18:39:50 +09:00
smoogipoo
f8e7579f45
Fix juice stream position reset not ever being applied
2020-03-11 18:38:05 +09:00
smoogipoo
5b03b3e363
Fix hyperdashes not recalculated with HR application
2020-03-11 18:36:37 +09:00
Dan Balasescu
42bc8bc50d
Merge pull request #8199 from peppy/add-banana-scale-rotate
...
Add random rotation and scale factors to osu!catch bananas
2020-03-11 16:31:18 +09:00
Dean Herbert
966e5bbc8a
User helper function to reduce copy paste
2020-03-11 15:54:21 +09:00
Dan Balasescu
03c8140d3c
Merge branch 'master' into add-catcher-animation-states
2020-03-11 14:53:14 +09:00
Dean Herbert
73b225ad62
Make catcher's trail reflect the current animation frame rather than play the full animation
2020-03-11 14:28:13 +09:00
Dan Balasescu
affb227b38
Merge pull request #8200 from peppy/add-hyperdash-afterimage
...
Add afterimage glow when entering hyperdash
2020-03-11 13:56:19 +09:00
Dan Balasescu
cd5f0d6e96
Merge pull request #8201 from peppy/fix-hyperdash-test
...
Fix hyperdash test having a zero-length juice stream
2020-03-11 13:46:59 +09:00
Dean Herbert
1bad2ff879
Load all catcher states ahead-of-time to avoid blocking loads
2020-03-11 13:45:55 +09:00
Dan Balasescu
460f564b2b
Merge branch 'master' into add-hyperdash-afterimage
2020-03-11 12:58:24 +09:00
Dan Balasescu
ba98155832
Merge branch 'master' into fix-hyperdash-test
2020-03-11 12:56:40 +09:00
Dan Balasescu
df52b58543
Merge branch 'master' into remove-tiny-droplet-samples
2020-03-11 12:46:16 +09:00
Dan Balasescu
27c31969fd
Merge branch 'master' into fix-catch-hitobject-fadein
2020-03-11 11:49:11 +09:00
Dean Herbert
66a0f3334d
Merge branch 'master' into fix-perfect-judgements
2020-03-10 23:50:57 +09:00
Dean Herbert
8ec2c35c4f
Change origin of nested objects inside JuiceStream to fix visibility issues
2020-03-10 19:35:10 +09:00
Dean Herbert
9ad519e5a5
Remove fade and custom InitialLifetimeOffset
2020-03-10 19:35:10 +09:00
Dean Herbert
4daba48a1d
Stop rotating DrawableCatchHitObjects at the top level
2020-03-10 19:30:31 +09:00
Dean Herbert
14192c069f
Don't play samples on catching a tiny droplet
2020-03-10 18:05:44 +09:00
Dean Herbert
5329b222f6
Fix hyperdash test having a zero-length juice stream
2020-03-10 17:49:51 +09:00
Dean Herbert
eab544b49f
Add afterimage glow when entering hyperdash
2020-03-10 16:41:08 +09:00
Dean Herbert
2b33594400
Add random rotation and scale factors to osu!catch bananas
2020-03-10 15:59:13 +09:00
Dean Herbert
7069cef9ce
Add catcher kiai/fail animation states
2020-03-10 15:28:37 +09:00
Dan Balasescu
a6cf6207aa
Merge pull request #8192 from peppy/fix-hyperdash
...
Fix hyperdash not initiating correctly when juice streams are present
2020-03-10 14:00:44 +09:00
Dean Herbert
0d18ea1d29
Add animation and fallback catcher support
2020-03-10 12:36:25 +09:00
Dean Herbert
e7f1f0f38b
Fix hyperdash not initiating correctly when juice streams are present
2020-03-10 10:21:32 +09:00
smoogipoo
6d051d9e42
Fix perfect mod failure cases
2020-03-02 13:25:56 +09:00
Dean Herbert
b5306d16cf
Merge pull request #8005 from peppy/fix-catcher-dropping-streams
...
Fix catcher dropping juice streams due to it considering ignored judgements
2020-02-26 20:58:22 +09:00
Dean Herbert
2aa649e073
Fix catcher dropping juice streams due to it considering ignored judgements
2020-02-26 19:31:49 +09:00
Dean Herbert
e5927447fc
Fix hyperdash fruit not visible on custom skins
2020-02-26 19:22:46 +09:00
Dean Herbert
015a39abc7
Fix hyperdash fruit not visible on default skin
2020-02-26 19:22:31 +09:00
Bartłomiej Dach
bf36dc10a5
Fix invalid cast
...
Since introduction of IgnoreJudgement and its usage in JuiceStream
and BananaShower the hard cast in CatcherArea that was used to check
if the drawable hit object should cause the fruits on the plate explode
at the end of combo caused a hard crash instead, since IgnoreJudgement
was no longer deriving from CatchJudgement.
Replace the hard cast with a soft pattern-matched cast.
2020-02-25 23:21:54 +01: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
a55b2b8918
Add explosion effect when catching fruit
2020-02-21 18:09:50 +09:00
Dan Balasescu
8d48008dd5
Merge branch 'master' into split-out-pulp-formations
2020-02-21 11:45:06 +09:00
Dean Herbert
9344f62cf0
Merge branch 'master' into catch-droplet-rotation
2020-02-21 11:09:02 +09:00
Dean Herbert
a7e3e8ace9
Merge branch 'master' into catch-drawable-namespace
2020-02-21 10:31:31 +09:00
Dean Herbert
8a6a424893
Merge branch 'master' into catch-droplet-rotation
2020-02-21 10:31:02 +09:00
smoogipoo
6468bfa543
Apply adjustments
2020-02-21 10:01:38 +09:00
Dean Herbert
049975b5a4
Use kebaberize shorthand
2020-02-20 15:45:54 +09:00
Dean Herbert
8f5d3896f6
Remove unnecessary cast by changing method siganture
2020-02-20 15:45:47 +09:00
Dean Herbert
5551343cf3
Throw instead of null return
2020-02-20 15:45:25 +09:00
Dean Herbert
2869128e11
Update in line with combo colour API changes
2020-02-20 15:41:57 +09:00
Dean Herbert
13873ff1b6
Split out pulp formations into own piece classes
2020-02-19 23:32:56 +09:00
Dean Herbert
ea0bbd2926
Rename drawable namespace to avoid clashes with framework class
2020-02-19 18:01:59 +09:00
Dean Herbert
7b27f6b378
Add droplet rotation animation
2020-02-19 17:55:40 +09:00
Dean Herbert
e1140d7c91
Fix caught fruit radius being incorrect due to moved scale
2020-02-19 17:28:40 +09:00
Dean Herbert
4c4140ae54
Adjust droplets to match stable
2020-02-19 15:55:22 +09:00
Dean Herbert
5261579531
Fix indices in beatmap not being transferred to children (and being off by one)
2020-02-19 15:37:12 +09:00
Dean Herbert
69b5d5606a
Fix nested catch objects not having a correct IndexInBeatmap
2020-02-19 15:32:24 +09:00
Dean Herbert
3f99d25e37
Use new UpdateComboColour method to simplify colouring
2020-02-19 15:28:29 +09:00
Dean Herbert
26fe15b038
Fix fruit representation not cycling as often as it should
2020-02-19 14:41:25 +09:00
Dean Herbert
aeb45c8442
Fix ordering of fruits to match stable
2020-02-19 14:31:43 +09:00
Dean Herbert
24e33abcbf
Fix banana colouring for skins
2020-02-19 14:31:32 +09:00
Dean Herbert
3eeb60f60f
Centralise and fix scaling
2020-02-19 14:31:14 +09:00
Dean Herbert
ce1a57550f
Add droplet skinning support
2020-02-19 13:29:05 +09:00
Dean Herbert
0f85e81240
Fix handling of bindable changes in accent colour
2020-02-19 12:10:09 +09:00
Dean Herbert
f245fe5934
Fix catch combo colouring
2020-02-19 10:28:20 +09:00
Dean Herbert
ab863cdfd9
Fix incorrect scaling factor being applied
2020-02-19 09:52:29 +09:00
Dean Herbert
73e5018696
Move radius adjust local to fruit piece
2020-02-19 09:39:56 +09:00
Dean Herbert
ded7f5ff1b
Merge branch 'master' into catch-fruit-skinning
2020-02-19 09:38:03 +09:00
Dean Herbert
65320ace47
Merge branch 'master' into fix-catch-skin-change
2020-02-18 13:41:00 +09:00
Dean Herbert
79f3249d37
Fix typo in method
2020-02-18 13:40:50 +09:00
Dean Herbert
b4887f9120
Fix dropping fruit as well (with tidying along the way)
2020-02-18 12:24:22 +09:00
Dean Herbert
c51e5a8c1d
Fix osu!catch fruit exploding multiple timed is skin is changed during explode animation
2020-02-18 12:11:30 +09:00
Dean Herbert
89bff32274
Fix metrics not matching between skins and lazer
2020-02-17 19:16:40 +09:00
Dean Herbert
2133ba38e5
Add overlay layer
2020-02-17 19:07:43 +09:00
Dean Herbert
7ce00bebf0
Add basic structure for skinning fruits
2020-02-17 18:47:22 +09:00
Dean Herbert
a3e0f84fcc
Update catcher test to use SkinnableTestScene
2020-02-17 17:19:46 +09:00
Dean Herbert
bb541f5ae4
Update inspectcode version and fix new issues
2020-02-15 11:54:29 +09:00
smoogipoo
cf12ffd27e
Merge remote-tracking branch 'origin/master' into sorcerer-catch-changes
...
# Conflicts:
# osu.Game.Rulesets.Catch/Difficulty/CatchPerformanceCalculator.cs
2020-02-13 17:18:32 +09:00
Dean Herbert
53b62816f8
Add index constants for cross-class safety
2020-02-13 14:07:37 +09:00
voidedWarranties
ca237fd987
Simplify ordering by using only numbers, add xmldoc
2020-02-10 16:21:49 -08:00
voidedWarranties
ea521b466f
Switch numerical consts to an enum
2020-02-09 21:37:40 -08:00
voidedWarranties
137181017b
Naming consistency with osu!web
2020-02-09 20:36:54 -08:00
voidedWarranties
88a56d00bf
Allow specifying order to SettingSource
2020-02-09 20:11:37 -08:00
Dean Herbert
daf5fa9da4
Throw NotSupportedException instead
2020-02-06 13:16:32 +09:00
Dean Herbert
cd6902a312
Make EndTime and RepeatCount settable
2020-02-05 17:52:51 +09:00
Dean Herbert
d8ce1fd86c
Fix osu!catch not handling all vertical space
2020-01-30 13:23:39 +09:00
smoogipoo
7b2f58eb30
Apply OnRelease method signature refactorings
2020-01-22 13:22:34 +09:00
smoogipoo
91735ff367
Update MathUtils namespace usages
2020-01-09 13:43:44 +09:00
smoogipoo
97b5d71ee4
Adjust catch HP increase values
2020-01-07 15:09:30 +09:00
Albie Spriddell
3a903339d6
add playingverb and database migrations
2020-01-03 11:39:15 +00:00
Dean Herbert
2c8879f0fb
Lock user adjusted difficulty settings when changing beatmap
2019-12-27 19:05:17 +09:00
smoogipoo
522847987b
Implement break/gameplay start times
2019-12-26 15:00:58 +09:00
smoogipoo
90cb9d9162
Simplify scoreprocesor/healthprocessor implementations
2019-12-26 14:59:49 +09:00
smoogipoo
7414a6aadd
Merge remote-tracking branch 'huoyaoyuan/master' into health-processor
...
# Conflicts:
# osu.Game.Rulesets.Catch/CatchRuleset.cs
# osu.Game.Rulesets.Mania/ManiaRuleset.cs
# osu.Game.Rulesets.Taiko/TaikoRuleset.cs
2019-12-26 14:56:54 +09:00
Dan Balasescu
9702cc9809
Merge branch 'master' into remove-legacy-id
2019-12-25 21:01:12 +09:00
Dean Herbert
504a55e803
Merge branch 'master' into better-beatmap-conversion
2019-12-25 19:52:06 +09:00
Dean Herbert
911dc2d98d
Fix code inspections
2019-12-25 15:20:10 +09:00
Dean Herbert
52ba0cd816
Rename method to be more appropriate
...
Also adds xmldoc.
2019-12-25 15:20:04 +09:00
Dean Herbert
0677f746aa
Provide the ruleset to converter classes
2019-12-24 16:02:16 +09:00
Dean Herbert
a324bfbc2c
Remove LegacyID from Ruleset
2019-12-24 13:48:27 +09:00
smoogipoo
6e7426a098
Simplify/improve beatmap conversion precheck
2019-12-23 17:44:18 +09:00
unknown
fe73b9f8d3
make HP and OD generic and instantiate CS and AR to modes that need it
2019-12-22 16:45:32 +08:00
unknown
08b477ed52
make ModDifficultyAdjust abstract
2019-12-20 18:30:23 +08:00
smoogipoo
76f2fb378f
Separate score and health parts of ScoreProcessor
2019-12-19 20:03:14 +09:00
Dean Herbert
ea661fce21
Merge branch 'master' into adjustable-map-settings
2019-12-18 18:44:11 +09:00
Dean Herbert
51a01c7006
Merge pull request #7256 from peppy/remove-ruleset-ctor-param
...
Remove RulesetInfo parameter from Ruleset constructor
2019-12-18 18:42:42 +09:00
smoogipoo
2a128340d0
Merge remote-tracking branch 'refs/remotes/origin/master' into nightcore-beats
2019-12-18 17:58:37 +09:00
