Salman Ahmed
0a368f13d9
Add default hyper-dash colour constant on Catcher
2020-03-26 05:42:11 +03: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
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
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
Dean Herbert
c30bfa79e7
Merge branch 'master' into correct-trail-animation-frame
2020-03-13 09:55:41 +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
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
Dean Herbert
1bad2ff879
Load all catcher states ahead-of-time to avoid blocking loads
2020-03-11 13:45:55 +09:00
Dean Herbert
eab544b49f
Add afterimage glow when entering hyperdash
2020-03-10 16:41:08 +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
Dean Herbert
2aa649e073
Fix catcher dropping juice streams due to it considering ignored judgements
2020-02-26 19:31:49 +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
a55b2b8918
Add explosion effect when catching fruit
2020-02-21 18:09:50 +09:00
Dean Herbert
a7e3e8ace9
Merge branch 'master' into catch-drawable-namespace
2020-02-21 10:31:31 +09:00
Dean Herbert
8f5d3896f6
Remove unnecessary cast by changing method siganture
2020-02-20 15:45:47 +09:00
Dean Herbert
ea0bbd2926
Rename drawable namespace to avoid clashes with framework class
2020-02-19 18:01:59 +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
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
a3e0f84fcc
Update catcher test to use SkinnableTestScene
2020-02-17 17:19:46 +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
49bf8d27d1
Move CreateScoreProcessor() to Ruleset
2019-12-17 20:08:13 +09:00
smoogipoo
5861eca80d
Make DrawableRuleset take a converted beatmap
2019-12-12 15:58:11 +09:00
smoogipoo
48f1dad4aa
Remove abstract ScoreProcessor class
2019-12-11 17:25:06 +09:00
Dean Herbert
1e71681916
Fix osu!catch catcher not scaling down correctly
2019-12-10 02:00:39 +09:00
Dean Herbert
63128c9465
Extend mouse hiding in catch to include catcher area
2019-11-29 18:25:11 +09:00
Dean Herbert
3864ea6ca3
Move position updating logic back to CatcherArea
2019-11-29 18:24:46 +09:00
Dean Herbert
4f081f2fe8
Remove catch-specific cursor provider
2019-11-29 17:38:28 +09:00
Dean Herbert
8ec25a6af2
Merge branch 'master' into ctb-relax
2019-11-29 16:28:06 +09:00
Huo Yaoyuan
818553027b
Merge branch 'master' into sharpen
2019-11-21 23:42:46 +08:00
Berkan Diler
6cab517b2d
.NET Standard 2.1 implements Math.Clamp , use it instead of MathHelper.Clamp from osuTK.
2019-11-20 13:37:47 +01:00
Huo Yaoyuan
7d7b9e36b2
Use compound assignment.
2019-11-12 19:53:50 +08:00
unknown
131809838f
pleasing CI
2019-11-03 16:22:07 +01:00
unknown
c180a71afe
even more formatting
2019-11-03 15:57:52 +01:00
unknown
9570f7c04b
more formatting
2019-11-03 15:34:09 +01:00
unknown
2a0db8aeac
add missing access modifier
2019-11-03 15:34:08 +01:00
unknown
883d5ed58e
formatting
2019-11-03 15:34:08 +01:00
unknown
bd5cb86b15
add license header
2019-11-03 15:34:08 +01:00
unknown
8e248d5cfa
add invisible cursor for ctb
2019-11-03 15:34:08 +01:00
Dean Herbert
82561aa44a
Fix catcher additive sprite rewinding and remove unnecessary update code
2019-09-13 22:44:40 +09:00
Dean Herbert
744085fa54
Fix exploding fruit not getting correct lifetime
2019-09-13 20:25:08 +09:00
Dean Herbert
ec7a50b75f
Fix already caught osu!catch objects not correctly disappearing
2019-09-08 00:10:31 +09:00
Dean Herbert
fdd3687437
Fix catcher additive sprites staying on screen during rewind
2019-09-08 00:09:24 +09:00
Dean Herbert
d1cdf49dd5
Revert SkinnableSprite lookups to old behaviour
2019-09-03 14:21:54 +09:00
Dean Herbert
a15828ab25
Introduce the concept of SkinComponents
...
Removes reliance on string lookups and better defines elements for introduction into database
2019-08-30 14:55:52 +09:00
smoogipoo
6ab2b20c70
Add an interface for working beatmaps
2019-08-29 19:38:44 +09:00
iiSaLMaN
62edfe7327
Correct comment
2019-08-26 15:16:01 +03:00
Dean Herbert
48716f8f2b
Update framework
2019-08-21 13:29:50 +09:00
Dean Herbert
9baf8160d1
Remove pointless SkinReloadableDrawable specification
2019-06-24 15:10:50 +09:00
Dean Herbert
d9f7011769
Use SkinnableSprite to reduce complexity of implementation
2019-06-24 15:10:50 +09:00
Lucas A
332ac0b82b
Fix CI inspections
2019-06-22 18:23:20 +02:00
Lucas A
e2f82ac29b
Move CatcherSprite to its own file + Make CatcherSprite a SkinReloadableDrawable
2019-06-22 17:53:00 +02:00
Arphox
07e17518e9
Fix all "Maintainability" CodeFactor issues
2019-06-11 10:28:16 +02:00
smoogipoo
d7c09e7dbd
Merge remote-tracking branch 'origin/master' into fix-new-inspections
...
# Conflicts:
# osu.Game.Rulesets.Catch/Judgements/CatchDropletJudgement.cs
# osu.Game.Rulesets.Catch/Judgements/CatchJudgement.cs
# osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
# osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs
# osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs
# osu.Game.Tests/Visual/SongSelect/TestCaseBeatmapScoresContainer.cs
# osu.Game/Graphics/OsuFont.cs
# osu.Game/Online/API/Requests/Responses/APILegacyScoreInfo.cs
# osu.Game/Overlays/Profile/Header/BadgeContainer.cs
# osu.Game/Overlays/Profile/ProfileHeader.cs
# osu.Game/Screens/Select/PlaySongSelect.cs
# osu.Game/Skinning/LegacySkinDecoder.cs
2019-05-07 13:20:17 +09:00
smoogipoo
0222424aef
Make mods IReadOnlyList<Mod> gamewide
...
Prevents potential multiple evaluations of enumerable.
2019-04-10 17:20:36 +09:00
smoogipoo
c584967eb1
Remove mods from workingbeatmap
2019-04-09 12:59:32 +09:00
Dean Herbert
c39c37a18d
Apply more missed cases
2019-04-01 12:44:46 +09:00
Dean Herbert
612db31c38
Apply newline additions
2019-04-01 12:16:32 +09:00
Dean Herbert
42eaabe24c
Fix editor blueprints being misplaced
...
Regressed with PlayfieldAdjustmentContainer changes.
2019-03-31 01:29:37 +09:00
Dean Herbert
14cef94a53
Merge remote-tracking branch 'upstream/master' into hitobject-drawable-representation
2019-03-29 12:59:26 +09:00
Dean Herbert
ed3746e166
Make PlayfieldAdjustmentContainer universal
2019-03-26 13:32:44 +09:00
Dean Herbert
9bf48863b0
Fix DrawableRuleset drawable creation method's name
2019-03-25 00:00:29 +09:00
Dean Herbert
7b6d882ce6
Remove double-generic type
2019-03-20 11:29:16 +09:00
Dean Herbert
baea7230bc
Rename RulesetContainer to DrawableRuleset
2019-03-19 23:47:31 +09:00
Dean Herbert
68f28326a2
Refactor RulesetContainer for readability
2019-03-19 20:21:31 +09:00
Dean Herbert
c496f6e56b
Fix usages of OnLoadComplete
2019-03-17 13:44:20 +09:00
Dean Herbert
42be7857d1
Use expression body for property get/set where possible
2019-02-28 13:58:19 +09:00
HoLLy
be6b5419c4
Remove uncommented line
...
Didn't mean to push this
2019-01-31 18:10:44 +01:00
HoLLy
30292f44da
Fix Catch diffcalc being off
2019-01-31 17:57:59 +01:00
Dean Herbert
8617aaa2a7
Update licence header (and remove year)
2019-01-24 17:43:03 +09:00
smoogipoo
2ee181daf7
Re-namespace replay-related classes
2018-11-28 17:20:37 +09:00
smoogipoo
f27bd3ef3e
OpenTK -> osuTK
2018-11-20 17:14:59 +09:00
jorolf
41a0f9896e
Merge branch 'master' into flashlight-mod
2018-11-15 00:35:42 +01:00
smoogipoo
d8e7ad8241
Fix post-rebase issues
2018-11-12 17:36:19 +09:00
smoogipoo
10543cf1b6
Move rest of ScrollingPlayfield into ScrollingRulesetContainer
2018-11-12 17:34:35 +09:00
smoogipoo
ad45bc7666
Move scroll direction to scrollinginfo
2018-11-12 17:34:35 +09:00
smoogipoo
7f0f143a1b
Move IScrollAlgorithm to ScrollingRulesetContainer + use DI
2018-11-12 17:34:35 +09:00
smoogipoo
aee7a80e71
ScrollAlgorithm -> ScrollVisualisationMethod
2018-11-12 17:26:37 +09:00
jorolf
023924396d
Move flashlight code from OsuModFlashlight to ModFlashlight and implement other modes and break time
2018-11-11 18:38:12 +01:00
smoogipoo
f66a9f4f1e
Rename IScrollChangeVisualiser -> IScrollAlgorithm
2018-11-08 14:04:21 +09:00
smoogipoo
70f1d17b7e
Merge remote-tracking branch 'origin/master' into editor-mask-placement
...
# Conflicts:
# osu.Game.Rulesets.Catch/UI/CatchRulesetContainer.cs
# osu.Game.Rulesets.Mania/Edit/ManiaEditRulesetContainer.cs
# osu.Game.Rulesets.Osu/Edit/OsuEditRulesetContainer.cs
# osu.Game/Rulesets/UI/RulesetContainer.cs
2018-10-16 17:28:16 +09:00
Dean Herbert
ffbc88c1bf
Merge branch 'master' into fix-catch-scale
2018-10-12 20:56:37 +09:00
smoogipoo
ff559a3a1b
Merge remote-tracking branch 'origin/master' into playfield-scaling-rework
...
# Conflicts:
# osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
# osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs
2018-10-05 10:40:16 +09:00
smoogipoo
d0007c047a
PlayfieldLayer -> PlayfieldAdjustmentContainer
2018-10-05 10:39:18 +09:00
smoogipoo
540a010fbb
Implement an intermediary EditRulesetContainer
2018-10-03 15:36:24 +09:00
Hanamuke
08f58047c2
Remade measurements, turns out the correction was not needed
2018-09-30 16:08:17 +02:00
smoogipoo
cdeb4913c4
Adjust catcher size to match stable
2018-09-21 15:53:15 +09:00
smoogipoo
c3fa7f167f
Move aspect adjustments out of CatchPlayfield
2018-09-21 15:53:06 +09:00
smoogipoo
0bc2bcaf14
Remove GetAspectAdjustedSize() and PlayfieldArea
2018-09-21 15:14:49 +09:00
smoogipoo
26094ea325
Simplify + rename playfield layers in Osu/Catch
2018-09-21 15:01:58 +09:00
smoogipoo
368ceec47c
Simplify creation of a playfield
2018-09-21 14:35:50 +09:00
smoogipoo
826dc6ceb7
Make Playfield not a ScalableContainer
2018-09-21 14:02:32 +09:00
Hanamuke
309d8c8cb4
CI
2018-09-19 18:43:39 +02:00
Hanamuke
e7d78b94ae
Remove ScrollingVisualisation from settings
2018-09-19 18:30:25 +02:00
Hanamuke
e3cc25a96a
Implement ConstantScrollingSpeedVisualiser
2018-09-18 20:21:10 +02:00
Dean Herbert
2d74c088ce
Add newline
2018-09-15 17:03:51 +09:00
Hanamuke
dd7f667fe3
Disable scrolling speed control for osu!catch
2018-09-15 00:18:42 +02:00
Hanamuke
9b6f5c9097
Fix redundant paranthesis
2018-09-13 17:29:10 +02:00
Hanamuke
7d3380db66
Fixed comment. Created static CatchArea.GetCatcheWidth method
2018-09-13 17:01:33 +02:00
Dean Herbert
65018705f4
Restore IsLoaded check
2018-09-06 13:09:57 +09:00
Dean Herbert
c03d1d9566
Attempt to fix CI failures on CatcherArea.Explode
2018-09-06 10:14:23 +09:00
Dean Herbert
03084aa04b
Revert async changes
2018-08-31 07:07:10 +09:00
smoogipoo
1b279d383f
Use GetAsync on all textures
2018-08-27 17:26:44 +09:00
smoogipoo
35b5aeb99a
Fix missed rename
2018-08-06 12:23:08 +09:00
smoogipoo
5fd4ed2f4e
Rename judgement-related methods/events + commenting
2018-08-06 10:55:25 +09:00
smoogipoo
9dff5cea07
Make Rulesets.Catch use the new judgement result structure
2018-08-02 20:37:07 +09:00
smoogipoo
71c49de031
Fix possible nullref if no fruits are ever caught
2018-07-26 21:00:18 +09:00
smoogipoo
827c5c4939
Remove scroll direction from ScrolingPlayfield constructor
2018-07-17 15:14:03 +09:00
Dean Herbert
1d6609d9f3
Add common custom words to dotsettings dictionary
...
Also fixes some typos and reduces spelling suggestions to hints.
2018-07-05 15:54:41 +09:00
Dean Herbert
f1a35f77d2
Make bananas explode even on miss
2018-06-29 16:49:01 +09:00
Dean Herbert
0940715631
Merge branch 'master' into catch-scoring
2018-06-29 14:59:15 +09:00
Dean Herbert
cc746c0dde
Merge remote-tracking branch 'upstream/master' into ekrctb-catch-stable-hyper
2018-06-26 13:02:39 +09:00
Dean Herbert
96191fc3ce
Move transition variable back to being local to function
2018-06-26 13:02:29 +09:00
ekrctb
d6084c0b30
Adapt to new input handling changes
2018-06-22 18:10:27 +09:00
smoogipoo
afcf91a4c5
What the...
2018-06-21 13:12:22 +09:00
smoogipoo
9314f49bc3
Expose the catch width from the Catcher
2018-06-21 12:57:59 +09:00
ekrctb
9194fd8dfe
don't expose HyperDashModifier directly
2018-06-20 20:08:27 +09:00
ekrctb
79c5596b27
Merge remote-tracking branch 'origin/master' into catch-stable-hyper
2018-06-20 19:06:54 +09:00
Dean Herbert
149d94116b
Fix droplets not bouncing off catcher's plate immediately
2018-06-15 15:44:47 +09:00
clayton
e44e08201b
Remove unnecessary usings and move Banana out of BananaShower
2018-06-11 12:43:01 -07:00
clayton
f486bcfee1
Add judgements to catch
2018-06-09 17:38:17 -07:00
ekrctb
25d3f0ead1
Revert TestCaseCatcherArea
2018-06-03 15:31:51 +09:00
ekrctb
9f27dd848a
HyperDashModifier >= 1
2018-06-03 15:29:56 +09:00
ekrctb
dd7d54bcc7
Merge remote-tracking branch 'origin/master' into catch-stable-hyper
2018-06-02 18:42:40 +09:00
Dean Herbert
b7511251d9
Remove pointless FillMode specification
2018-05-31 12:50:01 +09:00
Dean Herbert
3fe25fe67d
Fix catcher sizing to (roughly) match stable
2018-05-25 17:33:53 +09:00
Dean Herbert
5e4f83b80b
Add more correct catch playfield sizing
2018-05-25 17:33:27 +09:00
ekrctb
be323c7147
Fix InspectCode issues.
2018-05-25 02:14:56 +09:00
ekrctb
38e5e35743
modify catch hyperdash behavior
2018-05-25 01:20:05 +09:00
smoogipoo
4ecdea8b2e
Remove now-unnecessary IsForCurrentRuleset property of RulesetContainer
2018-05-07 10:17:54 +09:00
smoogipoo
03a5df84c6
Initial rework of beatmap conversion process
2018-04-19 22:04:12 +09:00
Dean Herbert
32a74f95a5
Normalize all the line endings
2018-04-13 18:26:38 +09:00
smoogipoo
551ba6ac4b
Fix ScalableContainer irrepairably altering content size
2018-04-02 13:06:06 +09:00
smoogipoo
187a025d36
Make hitobjects sorted by their start times
2018-03-29 16:07:31 +09:00
Dean Herbert
cb3d0db555
Move combo colours completely out of HitObjects
2018-03-20 15:50:12 +09:00
