smoogipooo
|
99cd215f56
|
Merge branch 'taiko_drumroll_tick_judgements' into taiko_scoreprocessing
Conflicts:
osu.Game.Modes.Taiko/TaikoScoreProcessor.cs
|
2017-03-23 19:38:00 +09:00 |
|
smoogipooo
|
35f1f06ee2
|
Rename drum roll tick judgement.
|
2017-03-23 19:36:58 +09:00 |
|
smoogipooo
|
11fb404574
|
Merge remote-tracking branch 'origin/master' into taiko_drumroll_tick_judgements
Conflicts:
osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
|
2017-03-23 19:35:36 +09:00 |
|
smoogipooo
|
322a78830e
|
Implement Taiko score processing.
|
2017-03-23 19:24:23 +09:00 |
|
smoogipooo
|
768bc2bb5f
|
Make TaikoHitObject store whether the hit object is a finisher.
|
2017-03-23 19:14:21 +09:00 |
|
Dean Herbert
|
2cb801317d
|
JudgementInfo -> Judgement.
There is no case where we use the term "Judgement" without the suffix, so deemed it unnecessary.
|
2017-03-23 19:00:18 +09:00 |
|
smoogipooo
|
7d3846692a
|
Merge branch 'taiko_drumroll_tick_judgements' into taiko_scoreprocessing
|
2017-03-23 17:58:12 +09:00 |
|
smoogipooo
|
71c74ee4c2
|
Merge branch 'taiko_drumroll_tick_judgements' into taiko_drumroll_drawable
Conflicts:
osu.Game.Modes.Taiko/Judgements/TaikoDrumRollTickJudgementInfo.cs
|
2017-03-23 17:55:52 +09:00 |
|
Dan Balasescu
|
2d5bb326f0
|
Merge branch 'master' into taiko_drumroll_drawable
|
2017-03-23 17:55:08 +09:00 |
|
smoogipooo
|
0ac33b59e3
|
Add DrumRoll tick judgement info.
|
2017-03-23 17:52:46 +09:00 |
|
Dean Herbert
|
96fc8eef30
|
Merge branch 'master' into taiko_hitobject_drawable
|
2017-03-23 17:23:22 +09:00 |
|
Dean Herbert
|
1e1c46765a
|
Merge branch 'master' into taiko_conversion
|
2017-03-23 16:52:15 +09:00 |
|
Dean Herbert
|
315994f2b3
|
Merge pull request #538 from smoogipooo/taiko_base_hit
Add Hit class, make TaikoHitObject abstract.
|
2017-03-23 16:51:45 +09:00 |
|
Dean Herbert
|
ebb64e01d1
|
Add constant for HitTarget line thickness and make slightly thicker (displays better at lower resolutions).
|
2017-03-23 15:32:41 +09:00 |
|
Dean Herbert
|
ef8830aa7f
|
Adjust InputDrum's appearance a touch.
|
2017-03-23 15:28:17 +09:00 |
|
Dean Herbert
|
1af17fc108
|
Remove cross-reference to osu.Game.Modes.Osu from Taiko.
|
2017-03-23 15:12:08 +09:00 |
|
Dean Herbert
|
02fba000bc
|
Tidy up and tweak transitions of DrawableJudgementInfo.
|
2017-03-23 15:07:45 +09:00 |
|
Dean Herbert
|
acfa4a4aac
|
JudgementText -> DrawableTaikoJudgementInfo.
|
2017-03-23 14:52:18 +09:00 |
|
smoogipooo
|
3d1dad8185
|
Merge remote-tracking branch 'origin/master' into taiko_hitobject_drawable
Conflicts:
osu.Game.Modes.Taiko/Objects/Drawable/DrawableTaikoHit.cs
osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
|
2017-03-23 14:40:06 +09:00 |
|
Dean Herbert
|
9a3fd8bcf1
|
Add readonly attributes.
|
2017-03-23 14:37:00 +09:00 |
|
Dan Balasescu
|
a40338614a
|
Merge branch 'master' into taiko_note_circle
|
2017-03-23 14:29:24 +09:00 |
|
Dean Herbert
|
d441114011
|
Merge branch 'master' into taiko_playfield_2
|
2017-03-23 14:28:42 +09:00 |
|
Dean Herbert
|
acfa0c4762
|
Merge branch 'master' into taiko_base_hit
|
2017-03-23 14:26:35 +09:00 |
|
Dean Herbert
|
63948564c6
|
Merge branch 'master' into taiko_conversion
|
2017-03-23 14:26:24 +09:00 |
|
Dean Herbert
|
681ed38941
|
Use const whenever possible.
|
2017-03-23 13:52:38 +09:00 |
|
Dean Herbert
|
54e1b24fe9
|
Enforce readonly private members where possible.
|
2017-03-23 13:50:08 +09:00 |
|
smoogipooo
|
8e1eef25b4
|
Fix some lone newlines.
|
2017-03-23 13:20:17 +09:00 |
|
smoogipooo
|
aa2b22ff12
|
Fix usings.
|
2017-03-23 13:02:34 +09:00 |
|
smoogipooo
|
cedcab1e26
|
s/Ring/Hit + privatize Judgement inside RingExplosion.
|
2017-03-23 13:02:01 +09:00 |
|
smoogipooo
|
00054f1573
|
Comment out unused container for now.
|
2017-03-23 12:56:32 +09:00 |
|
smoogipooo
|
7f33e10db0
|
Renaming + don't use List.
|
2017-03-23 12:53:38 +09:00 |
|
smoogipooo
|
39ff026b27
|
Reimplement JudgementText with the new DrawableJudgementInfo.
|
2017-03-23 12:49:58 +09:00 |
|
smoogipooo
|
8b71d70633
|
Add a way to get the score string from JugementInfo.
|
2017-03-23 12:21:09 +09:00 |
|
smoogipooo
|
b77b039d73
|
Don't instantiate TaikoHitObject.
|
2017-03-23 11:25:38 +09:00 |
|
smoogipooo
|
f3907ba831
|
Merge branch 'taiko_base_hit' into taiko_conversion
|
2017-03-23 11:24:59 +09:00 |
|
Dan Balasescu
|
9a7504a622
|
Merge branch 'master' into taiko_conversion
|
2017-03-23 11:24:30 +09:00 |
|
smoogipooo
|
db8bf8a78f
|
Add Hit class, make TaikoHitObject abstract.
|
2017-03-23 11:21:45 +09:00 |
|
Dan Balasescu
|
2c580f43e9
|
Merge branch 'master' into taiko_playfield_2
|
2017-03-23 11:10:23 +09:00 |
|
smoogipooo
|
5daa574551
|
Don't set lifetime until LoadComplete (fixes possible clock nullref if added without a clock).
|
2017-03-23 11:05:58 +09:00 |
|
Dan Balasescu
|
39134d79a8
|
Merge branch 'master' into taiko_hitobject_drawable
|
2017-03-23 11:03:42 +09:00 |
|
Dean Herbert
|
53c6665e07
|
Merge branch 'master' into taiko_bash_base
|
2017-03-23 10:57:15 +09:00 |
|
Dean Herbert
|
bf94587ca7
|
Add TODO.
|
2017-03-23 10:56:30 +09:00 |
|
Dan Balasescu
|
e3bc837b61
|
Merge branch 'master' into taiko_drawable_drawing
|
2017-03-23 10:44:00 +09:00 |
|
smoogipooo
|
5e0d9c3820
|
Cleanups + CircularContainer fixes.
|
2017-03-23 09:18:50 +09:00 |
|
smoogipooo
|
9c325ddd33
|
Cleanups + fix CircularContainer usages.
|
2017-03-23 09:12:51 +09:00 |
|
smoogipooo
|
aa8780797e
|
Abstract class + move AccentColour to base.
|
2017-03-22 15:22:02 +09:00 |
|
smoogipooo
|
a72ae319a1
|
Override UpdateScrollPosition instead of Update.
|
2017-03-22 01:55:41 +09:00 |
|
smoogipooo
|
1532ae78a4
|
Fix post-merge errors.
|
2017-03-22 01:55:31 +09:00 |
|
smoogipooo
|
7cf935cef2
|
Merge branch 'taiko_hitobject_drawable' into taiko_bash_drawable
Conflicts:
osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
|
2017-03-22 01:53:44 +09:00 |
|
smoogipooo
|
a75a2e1794
|
Fix more post-merge errors.
|
2017-03-22 01:52:55 +09:00 |
|