1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-12 01:47:24 +08:00
Commit Graph

337 Commits

Author SHA1 Message Date
smoogipooo
315deb6f12 Fix post-merge errors. 2017-03-23 19:43:00 +09:00
smoogipooo
217fd14595 Merge branch 'taiko_drumroll_tick_judgements' into taiko_drumroll_drawable 2017-03-23 19:40:14 +09:00
smoogipooo
a0c0a0fcfe Fix post-merge errors. 2017-03-23 19:39:30 +09:00
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
smoogipooo
90c441f614 Override UpdateScrollPosition instead of Update. 2017-03-22 01:51:53 +09:00
smoogipooo
b3e8a2257c Fix post-merge errors. 2017-03-22 01:51:44 +09:00
smoogipooo
b9f1b44ca4 Merge branch 'taiko_hitobject_drawable' into taiko_drumroll_drawable
Conflicts:
	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
2017-03-22 01:49:45 +09:00
smoogipooo
e4926d54ab Fix post-merge errors. 2017-03-22 01:48:51 +09:00
smoogipooo
1bfc4d484d Merge branch 'taiko_hitobject_drawable' into taiko_hit_drawables
Conflicts:
	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
2017-03-22 01:47:25 +09:00
smoogipooo
24e78d015e Make UpdateScrollPosition virtual. 2017-03-22 01:46:06 +09:00
smoogipooo
62dcd4fa59 Merge remote-tracking branch 'origin/master' into taiko_hitobject_drawable
Conflicts:
	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
2017-03-22 01:45:02 +09:00
smoogipooo
e7a93073a4 Fix post-merge errors. 2017-03-22 01:42:40 +09:00
smoogipooo
afcd42b06d Merge remote-tracking branch 'origin/master' into taiko_playfield_2 2017-03-22 01:38:53 +09:00
smoogipooo
b3dde2c399 A bit more protection. 2017-03-22 01:35:39 +09:00
smoogipooo
cf251618c7 Merge remote-tracking branch 'origin/master' into taiko_bash_base
Conflicts:
	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
2017-03-22 01:34:47 +09:00
smoogipooo
712d2e194c A bit more protection. 2017-03-22 01:33:22 +09:00
smoogipooo
a346191ca7 Merge remote-tracking branch 'origin/master' into taiko_drumroll_base
Conflicts:
	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
2017-03-22 01:27:07 +09:00
smoogipooo
863f49c2bd Rename MAX_SCORE -> MAX_HIT_RESULT. 2017-03-21 21:38:39 +09:00
smoogipooo
d9524f692d Renamings. 2017-03-21 21:36:05 +09:00
smoogipooo
ad74797cd4 End letter oppression. 2017-03-21 21:31:31 +09:00
smoogipooo
259ed03610 Reduce some container nesting. 2017-03-21 18:28:04 +09:00
smoogipooo
e2b510f3f0 Add comments. 2017-03-21 18:26:19 +09:00
smoogipooo
7cb237798a Add a 1px offset for the playfield border. 2017-03-21 18:13:10 +09:00
smoogipooo
2cfab75bc7 Remove now unnecessary field. 2017-03-21 17:50:05 +09:00
smoogipooo
60e866aebd Increase RingExplosion base size for finishers.
Subtle but looks good imo (checked with flyte).
2017-03-21 17:49:22 +09:00
smoogipooo
eec4a1b5d3 Redesign HitTarget. 2017-03-21 17:48:19 +09:00
Dan Balasescu
7bda1866fd Merge branch 'master' into taiko_judgement_scoring 2017-03-21 16:44:31 +09:00
smoogipooo
4e7a44cd44 Add license + general fixes. 2017-03-21 16:41:58 +09:00
smoogipooo
1ac9898a36 Add judgement texts. 2017-03-21 16:33:25 +09:00
smoogipooo
4c398b106d Add explosion rings. 2017-03-21 15:54:57 +09:00
smoogipooo
9b5cb7ec23 Merge branch 'taiko_judgement_scoring' into taiko_playfield_2 2017-03-21 15:33:59 +09:00
smoogipooo
10ed6ef10d Move TaikoPlayfield to separate file. 2017-03-21 15:09:54 +09:00
smoogipooo
a7eb219d39 Add basic support for drawing circles.
Conflicts:
	osu.Game.Modes.Taiko/Objects/Drawable/DrawableTaikoHitObject.cs
2017-03-20 19:30:54 +09:00
smoogipooo
ed9c7c8008 Add license headers. 2017-03-20 18:25:12 +09:00
smoogipooo
34b734275b Add license headers. 2017-03-20 18:24:28 +09:00
smoogipooo
57c708619d Merge branch 'taiko_hitobject_drawable' into taiko_bash_drawable
Conflicts:
	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
2017-03-20 18:21:05 +09:00
smoogipooo
b751cd4f29 Merge branch 'taiko_bash_base' into taiko_bash_drawable 2017-03-20 18:20:44 +09:00
smoogipooo
3f7cd41490 Merge branch 'master' into taiko_bash_drawable
Conflicts:
	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
2017-03-20 18:20:32 +09:00
smoogipooo
75d09e7038 Fix unused usings. 2017-03-20 18:18:25 +09:00
smoogipooo
da1b911da9 Merge branch 'taiko_hitobject_drawable' into taiko_hit_drawables
Conflicts:
	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
2017-03-20 18:18:17 +09:00
smoogipooo
5a28833c32 Merge branch 'master' into taiko_hit_drawables
Conflicts:
	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
2017-03-20 18:17:18 +09:00
smoogipooo
aaa368e014 Merge branch 'taiko_hitobject_drawable' into taiko_drumroll_drawable
Conflicts:
	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
2017-03-20 18:12:16 +09:00
smoogipooo
75fb7a3eb3 Suppress Resharper. 2017-03-20 18:10:09 +09:00
smoogipooo
a27dae0beb Merge branch 'master' into taiko_hitobject_drawable
Conflicts:
	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
2017-03-20 18:09:05 +09:00
smoogipooo
409160859d Remove explicit namespacing. 2017-03-20 18:07:44 +09:00
smoogipooo
70be33bde0 Merge branch 'taiko_drumroll_base' into taiko_drumroll_drawable 2017-03-20 18:06:00 +09:00
smoogipooo
a3e406af6a Merge branch 'master' into taiko_drumroll_drawable
Conflicts:
	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
2017-03-20 18:05:54 +09:00
smoogipooo
edd9a22177 License headers. 2017-03-20 17:02:06 +09:00
smoogipooo
f87f334dcd Merge branch 'master' into taiko_note_circle 2017-03-20 16:55:08 +09:00
smoogipooo
730824fa58 Move pieces out of the visual test, fix up comments, rewrite FinisherPiece. 2017-03-20 16:50:22 +09:00
smoogipooo
61172958bb Merge branch 'taiko_bash_base' into taiko_conversion 2017-03-20 13:12:40 +09:00
smoogipooo
962acca096 Merge branch 'taiko_drumroll_base' into taiko_conversion 2017-03-20 13:12:32 +09:00
smoogipooo
8435840fc7 Merge remote-tracking branch 'origin/master' into taiko_conversion 2017-03-20 13:12:09 +09:00
smoogipooo
090e8bbb79 Remove hit object types solution-wide. 2017-03-20 13:10:24 +09:00
smoogipooo
b9006e4026 Remove Type. 2017-03-20 13:04:09 +09:00
smoogipooo
c3d10f8abf Merge remote-tracking branch 'origin/master' into taiko_bash_base 2017-03-20 13:03:25 +09:00
smoogipooo
b3b8fadf03 Remove Type. 2017-03-20 13:02:52 +09:00
smoogipooo
7b7255863c Merge remote-tracking branch 'origin/master' into taiko_drumroll_base 2017-03-20 13:01:43 +09:00
Dean Herbert
73ffbf8142 Remove unnecessary using. 2017-03-19 11:52:16 +09:00
smoogipooo
4b3308fd1d Remove TaikoHitObject Type, we won't be using this going forward. 2017-03-18 18:40:26 +09:00
smoogipooo
f4f5715906 Resharper. 2017-03-18 18:37:48 +09:00
smoogipooo
77bdfe880a Fix post-merge errors. 2017-03-18 18:34:45 +09:00
smoogipooo
b629766892 Add initial taiko note circles. 2017-03-17 22:01:06 +09:00
smoogipooo
605f733cf9 Add back the bash conversion factor. 2017-03-17 19:52:24 +09:00
smoogipooo
7f7e8047d4 Don't convert originally taiko hitobjects. 2017-03-17 19:51:56 +09:00
smoogipooo
ecd6958eea Add basic DrawableDrumRoll (no graphics yet, just input). 2017-03-17 19:30:22 +09:00
smoogipooo
7860199fbd Fix post-merge errors. 2017-03-17 19:27:06 +09:00
smoogipooo
04bc37b079 Merge branch 'taiko_hitobject_drawable' into taiko_drumroll_drawable 2017-03-17 19:26:30 +09:00
smoogipooo
e3afa9bf71 Fix post-merge errors. 2017-03-17 19:25:55 +09:00
smoogipooo
39c2703fef Merge branch 'taiko_hitobject_drawable' into taiko_bash_drawable 2017-03-17 19:24:57 +09:00
smoogipooo
ad396c65ee Fix post-merge errors. 2017-03-17 19:24:39 +09:00
smoogipooo
558641c317 Merge branch 'taiko_hitobject_drawable' into taiko_hit_drawables 2017-03-17 19:23:57 +09:00
smoogipooo
5136064cb3 Revert "Make DrawableTaikoHitObject generic."
This reverts commit 0e4ed829f2.
2017-03-17 19:23:18 +09:00
smoogipooo
1ede12d847 Add basic DrawableDrumRollTick (no graphics yet, just input). 2017-03-17 19:08:50 +09:00
smoogipooo
1e7511a923 Merge branch 'taiko_judgement_scoring' into taiko_drumroll_drawable
Conflicts:
	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
2017-03-17 19:01:02 +09:00
smoogipooo
e977f25cc4 Merge branch 'taiko_drumroll_base' into taiko_drumroll_drawable
Conflicts:
	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
2017-03-17 19:00:35 +09:00
smoogipooo
a2d07acb4b Fix post-merge errors. 2017-03-17 18:59:21 +09:00
smoogipooo
91775b33e3 Merge branch 'taiko_bash_base' into taiko_bash_drawable
Conflicts:
	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
2017-03-17 18:58:48 +09:00
smoogipooo
e2673a94bf Merge branch 'taiko_hitobject_drawable' into taiko_bash_drawable 2017-03-17 18:57:17 +09:00
smoogipooo
938da01540 Fix post-merge errors. 2017-03-17 18:56:58 +09:00
smoogipooo
9f4f297bb7 Merge branch 'taiko_hitobject_drawable' into taiko_hit_drawables 2017-03-17 18:56:24 +09:00
smoogipooo
0e4ed829f2 Make DrawableTaikoHitObject generic. 2017-03-17 18:55:54 +09:00
smoogipooo
891bd011c6 Add basic DrawableBash (no graphics yet, just input). 2017-03-17 18:54:44 +09:00
smoogipooo
e37def94f8 Merge branch 'taiko_judgement_scoring' into taiko_bash_drawable
Conflicts:
	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
2017-03-17 18:51:56 +09:00
smoogipooo
1892d86921 Add basic DrawableHitFinisher (no graphics yet, just input). 2017-03-17 17:38:49 +09:00
smoogipooo
863d4959af Make OnKeyDown non-sealed. 2017-03-17 17:38:24 +09:00
smoogipooo
6a1c6f962e Merge branch 'taiko_judgement_scoring' into taiko_hit_drawables
Conflicts:
	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
2017-03-17 17:08:11 +09:00
smoogipooo
977b506587 Add TaikoJudgementInfo. 2017-03-17 17:06:34 +09:00
smoogipooo
f26cf7bf68 Add basic DrawableHit (no graphics yet, just input). 2017-03-17 16:55:57 +09:00
smoogipooo
35f63cb2aa Set Anchor/Origin and RelativePositionAxes. 2017-03-17 16:10:40 +09:00
smoogipooo
cdfe95c159 Add AcentColour and xmldoc. 2017-03-17 16:05:16 +09:00
smoogipooo
f48af91686 Appease the resharper gods. 2017-03-17 15:45:54 +09:00
smoogipooo
2e0d100a22 Add base DrawableTaikoHitObject, remove DrawableTaikoHit. 2017-03-17 15:19:56 +09:00
smoogipooo
4a85b899c9 Fix up VelocityAdjustment value. 2017-03-17 14:44:48 +09:00
smoogipooo
fa22bb9211 Merge branch 'taiko_bash_base' into taiko_conversion 2017-03-17 14:43:17 +09:00
smoogipooo
d478a58a89 Invert getters and setters for EndTime / Duration. 2017-03-17 14:43:00 +09:00
smoogipooo
ccc2253068 Implement basic Taiko HitObject conversion. 2017-03-17 14:39:59 +09:00
smoogipooo
d7af3d1d56 Merge branch 'taiko_bash_base' into taiko_conversion
Conflicts:
	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
2017-03-17 14:03:56 +09:00
smoogipooo
d2194e3d2a Implement Bash. 2017-03-17 14:01:32 +09:00
smoogipooo
12de3f6657 Implement DrumRoll + DrumRollTick. 2017-03-17 13:56:14 +09:00
smoogipooo
b399c6adbb Implement TaikoHitObject. 2017-03-17 13:38:48 +09:00