Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Taiko Playfield Implementation #517

Merged
merged 38 commits into from
Mar 23, 2017
Merged
Changes from 1 commit
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
58be454
Late-add the HitObjects container in the Playfield.
smoogipoo Mar 21, 2017
27a21cd
Add taiko playfield.
smoogipoo Mar 21, 2017
10ed6ef
Move TaikoPlayfield to separate file.
smoogipoo Mar 21, 2017
9b5cb7e
Merge branch 'taiko_judgement_scoring' into taiko_playfield_2
smoogipoo Mar 21, 2017
4c398b1
Add explosion rings.
smoogipoo Mar 21, 2017
1ac9898
Add judgement texts.
smoogipoo Mar 21, 2017
4e7a44c
Add license + general fixes.
smoogipoo Mar 21, 2017
eec4a1b
Redesign HitTarget.
smoogipoo Mar 21, 2017
60e866a
Increase RingExplosion base size for finishers.
smoogipoo Mar 21, 2017
2cfab75
Remove now unnecessary field.
smoogipoo Mar 21, 2017
aac4f24
10% chance to get finisher hits in testcase.
smoogipoo Mar 21, 2017
7cb2377
Add a 1px offset for the playfield border.
smoogipoo Mar 21, 2017
e2b510f
Add comments.
smoogipoo Mar 21, 2017
259ed03
Reduce some container nesting.
smoogipoo Mar 21, 2017
afcd42b
Merge remote-tracking branch 'origin/master' into taiko_playfield_2
smoogipoo Mar 21, 2017
b769c43
Update framework.
smoogipoo Mar 21, 2017
e7a9307
Fix post-merge errors.
smoogipoo Mar 21, 2017
8f6cee2
Override is unnecessary.
smoogipoo Mar 21, 2017
790997d
Merge remote-tracking branch 'origin/master' into taiko_playfield_2
smoogipoo Mar 22, 2017
9c325dd
Cleanups + fix CircularContainer usages.
smoogipoo Mar 23, 2017
2c580f4
Merge branch 'master' into taiko_playfield_2
smoogipoo Mar 23, 2017
8b71d70
Add a way to get the score string from JugementInfo.
smoogipoo Mar 23, 2017
c9fe9e6
Make judgement text generic to be used between game modes.
smoogipoo Mar 23, 2017
39ff026
Reimplement JudgementText with the new DrawableJudgementInfo.
smoogipoo Mar 23, 2017
7f33e10
Renaming + don't use List.
smoogipoo Mar 23, 2017
00054f1
Comment out unused container for now.
smoogipoo Mar 23, 2017
cedcab1
s/Ring/Hit + privatize Judgement inside RingExplosion.
smoogipoo Mar 23, 2017
aa2b22f
Fix usings.
smoogipoo Mar 23, 2017
8e1eef2
Fix some lone newlines.
smoogipoo Mar 23, 2017
d441114
Merge branch 'master' into taiko_playfield_2
peppy Mar 23, 2017
9a3fd8b
Add readonly attributes.
peppy Mar 23, 2017
acfa4a4
JudgementText -> DrawableTaikoJudgementInfo.
peppy Mar 23, 2017
02fba00
Tidy up and tweak transitions of DrawableJudgementInfo.
peppy Mar 23, 2017
b83db18
HitExplosion -> DrawableOsuJudgementInfo.
peppy Mar 23, 2017
1af17fc
Remove cross-reference to osu.Game.Modes.Osu from Taiko.
peppy Mar 23, 2017
ef8830a
Adjust InputDrum's appearance a touch.
peppy Mar 23, 2017
ebb64e0
Add constant for HitTarget line thickness and make slightly thicker (…
peppy Mar 23, 2017
0863efb
Remove unused variable.
peppy Mar 23, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions osu.Game.Modes.Taiko/UI/HitTarget.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ internal class HitTarget : Container
{
private const float normal_diameter = TaikoHitObject.CIRCLE_RADIUS * 2 * TaikoPlayfield.PLAYFIELD_SCALE;
private const float finisher_diameter = normal_diameter * 1.5f;
private const float border_offset = 1;

This comment was marked as off-topic.


public HitTarget()
{
Expand All @@ -28,7 +29,9 @@ public HitTarget()
Anchor = Anchor.TopCentre,
Origin = Anchor.TopCentre,

Size = new Vector2(3, (TaikoPlayfield.PlayfieldHeight - finisher_diameter) / 2f),
Y = border_offset,

Size = new Vector2(3, (TaikoPlayfield.PlayfieldHeight - finisher_diameter) / 2f - border_offset),

Alpha = 0.1f
},
Expand Down Expand Up @@ -87,7 +90,9 @@ public HitTarget()
Anchor = Anchor.BottomCentre,
Origin = Anchor.BottomCentre,

Size = new Vector2(3, (TaikoPlayfield.PlayfieldHeight - finisher_diameter) / 2f),
Y = -border_offset,

Size = new Vector2(3, (TaikoPlayfield.PlayfieldHeight - finisher_diameter) / 2f - border_offset),

Alpha = 0.1f
},
Expand Down