h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-13 15:27:30 +08:00
Code Issues Releases Wiki Activity

Merge pull request #8901 from peppy/remove-additive-specs

Browse Source 
Move taiko additive blending locally to avoid applying to legacy skins
This commit is contained in:
Dan Balasescu 2020-04-30 10:56:05 +09:00 committed by GitHub
commit 1cb3f39f60
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game.Rulesets.Taiko/UI/DefaultHitExplosion.cs
View File

@ -26,6 +26,8 @@ namespace osu.Game.Rulesets.Taiko.UI
BorderColour = Color4.White; BorderColour = Color4.White;
BorderThickness = 1; BorderThickness = 1;
Blending = BlendingParameters.Additive;
Alpha = 0.15f; Alpha = 0.15f;
Masking = true; Masking = true;

2
osu.Game.Rulesets.Taiko/UI/KiaiHitExplosion.cs
View File

@ -31,6 +31,8 @@ namespace osu.Game.Rulesets.Taiko.UI
RelativeSizeAxes = Axes.Both; RelativeSizeAxes = Axes.Both;
Size = new Vector2(TaikoHitObject.DEFAULT_SIZE, 1); Size = new Vector2(TaikoHitObject.DEFAULT_SIZE, 1);
Blending = BlendingParameters.Additive;
Masking = true; Masking = true;
Alpha = 0.25f; Alpha = 0.25f;

3
osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs
View File

@ -68,7 +68,6 @@ namespace osu.Game.Rulesets.Taiko.UI
hitExplosionContainer = new Container<HitExplosion> hitExplosionContainer = new Container<HitExplosion>
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Blending = BlendingParameters.Additive,
}, },
HitTarget = new SkinnableDrawable(new TaikoSkinComponent(TaikoSkinComponents.HitTarget), _ => new TaikoHitTarget()) HitTarget = new SkinnableDrawable(new TaikoSkinComponent(TaikoSkinComponents.HitTarget), _ => new TaikoHitTarget())
{ {
@ -100,13 +99,11 @@ namespace osu.Game.Rulesets.Taiko.UI
Name = "Kiai hit explosions", Name = "Kiai hit explosions",
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
FillMode = FillMode.Fit, FillMode = FillMode.Fit,
Blending = BlendingParameters.Additive
}, },
judgementContainer = new JudgementContainer<DrawableTaikoJudgement> judgementContainer = new JudgementContainer<DrawableTaikoJudgement>
{ {
Name = "Judgements", Name = "Judgements",
RelativeSizeAxes = Axes.Y, RelativeSizeAxes = Axes.Y,
Blending = BlendingParameters.Additive
}, },
} }
}, },