smoogipooo
e7941859e4
Rename bash -> swell.
2017-03-25 20:57:49 +09:00
smoogipooo
a7cea811f4
Merge remote-tracking branch 'origin/master' into taiko_bash_drawable
...
Conflicts:
osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
2017-03-25 20:55:14 +09:00
smoogipooo
5bd9147661
Remove CreateCircle() - hitobjects should handle the addition of this to their hierarchy themselves.
...
CreateCircle() lends itself to a few issues:
- It can't be used for drum roll ticks unless it returned a Container instead, at which point the method loses its meaning, and I would rather that constructed in the ctor.
- Writing `return Accented ? new AccentedCirclePiece() : new CirclePiece()` in two places as the body of this method feels wrong - it's something I would expect to be taken care of in the base DrawableTaikoHitObject, but that leads back to #1 .
- Swells don't have an AccentedCirclePiece, so #2 becomes more problematic.
2017-03-25 20:53:45 +09:00
smoogipooo
be4ab13f4d
Rename finisher -> accented.
2017-03-25 20:30:26 +09:00
smoogipooo
cb189bd006
Merge remote-tracking branch 'origin/master' into taiko_hit_drawables
2017-03-25 20:16:25 +09:00
Dean Herbert
55d7b027d2
Merge branch 'master' into taiko_drumroll_drawable
2017-03-24 21:26:42 +09:00
smoogipooo
2ee68ae75a
Make CirclePiece use relative width (leaving length control to DrawableDrumRoll).
2017-03-24 20:10:17 +09:00
smoogipooo
fdd17c1575
Rewrite circle pieces to use custom graphics again.
...
Also using FontAwesome for now to enforce the same size, because otherwise you have to mess around with sprites + the custom graphics. This will all be changed when sprites are fixed to maintain aspect ratios and when glow/border use relative axes.
2017-03-24 20:08:40 +09:00
smoogipooo
405c6f9691
More explicative xmldoc.
2017-03-24 19:05:45 +09:00
smoogipooo
369e3903ac
Don't use a magic number.
2017-03-24 19:04:46 +09:00
smoogipooo
feecf23d9f
Don't force the size.
2017-03-24 19:04:32 +09:00
smoogipooo
df46d0f446
Cleanup.
2017-03-24 18:49:10 +09:00
smoogipooo
5281842965
Rewrite CirclePiece to be referenced to 128x128px and handle accented hits more sanely.
2017-03-24 18:37:56 +09:00
smoogipooo
47065d8031
Remove explicit alpha = 1.
2017-03-24 16:15:14 +09:00
smoogipooo
6753a22512
Fix post-merge issues.
2017-03-24 16:03:38 +09:00
smoogipooo
33c160efeb
Merge branch 'taiko_note_circle' into taiko_drawable_drawing
...
Conflicts:
osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
2017-03-24 16:02:49 +09:00
smoogipooo
d6d3eb99b7
Adjust comment.
2017-03-24 15:55:25 +09:00
smoogipooo
82752e0988
Moar cleanup.
2017-03-24 15:50:18 +09:00
smoogipooo
95183279f3
Rename ScrollingCirclePiece -> ScrollingPiece.
2017-03-24 15:44:43 +09:00
smoogipooo
eea24b2d82
Make sure icon is only instantiated once.
2017-03-24 15:43:17 +09:00
smoogipooo
aa9a65d69c
Move load below CreateIcon().
2017-03-24 15:42:48 +09:00
smoogipooo
99f1e86a5e
Fix something that was removed during merge conflicts.
2017-03-24 15:19:58 +09:00
smoogipooo
3cecffbc48
Merge branch 'taiko_note_circle' into taiko_drawable_drawing
...
Conflicts:
osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
2017-03-24 15:17:17 +09:00
smoogipooo
bb4b6b783c
Fix post-merge errors.
2017-03-24 15:14:49 +09:00
smoogipooo
20e80a758a
Merge branch 'master' into taiko_drawable_drawing
...
Conflicts:
osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
osu.Game.Modes.Taiko/Objects/Drawable/DrawableTaikoHitObject.cs
osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
2017-03-24 15:11:56 +09:00
smoogipooo
79fa9daec8
Fix post-merge errors.
2017-03-24 15:05:54 +09:00
smoogipooo
ce1257ba56
Merge branch 'master' into taiko_bash_drawable
...
Conflicts:
osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
2017-03-24 15:03:55 +09:00
smoogipooo
75dba19e7b
Merge branch 'master' into taiko_drumroll_drawable
2017-03-24 15:00:35 +09:00
smoogipooo
45b013c85f
Fix post-merge errors.
2017-03-24 14:59:59 +09:00
Dan Balasescu
bf3846eedb
Merge branch 'master' into taiko_hit_drawables
2017-03-24 14:55:07 +09:00
smoogipooo
cce5b4f80f
Make readonly.
2017-03-24 14:42:42 +09:00
Dan Balasescu
ac2d36da3b
Merge branch 'master' into taiko_note_circle
2017-03-24 14:33:08 +09:00
smoogipooo
730051520e
Add a way to determine the type of a Hit.
2017-03-24 14:23:32 +09:00
smoogipooo
afdb719c60
Rename finisher -> accented.
2017-03-24 11:09:01 +09:00
smoogipooo
60dcf2d14d
Make readonly.
2017-03-23 19:43:49 +09:00
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
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
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
Dan Balasescu
2d5bb326f0
Merge branch 'master' into taiko_drumroll_drawable
2017-03-23 17:55:08 +09:00
Dean Herbert
96fc8eef30
Merge branch 'master' into taiko_hitobject_drawable
2017-03-23 17:23:22 +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
Dan Balasescu
a40338614a
Merge branch 'master' into taiko_note_circle
2017-03-23 14:29:24 +09:00
Dean Herbert
acfa0c4762
Merge branch 'master' into taiko_base_hit
2017-03-23 14:26:35 +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
db8bf8a78f
Add Hit class, make TaikoHitObject abstract.
2017-03-23 11:21:45 +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
smoogipooo
5e0d9c3820
Cleanups + CircularContainer fixes.
2017-03-23 09:18:50 +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
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
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
9f3def05ef
Add test case for bar lines.
2017-03-21 21:27:20 +09:00
smoogipooo
b602b7a3ea
Add barline drawables.
2017-03-21 20:39:18 +09:00
smoogipooo
b05a12372a
Add base barline.
2017-03-21 18:44:49 +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
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
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
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
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
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
d478a58a89
Invert getters and setters for EndTime / Duration.
2017-03-17 14:43:00 +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
smoogipooo
28240fb3b5
Rename TaikoBaseHit -> TaikoHitObject.
2017-03-17 13:33:48 +09:00
smoogipooo
5a47fd659c
Fix up warnings, convert back to float position.
2017-03-14 13:11:07 +09:00
smoogipooo
f50e0bbf3c
Rework/rewrite beatmap parsing to parse to base hit objects, which mode-specific beatmap converters can then use.
2017-03-13 19:15:25 +09:00
Dean Herbert
0cad5d7d41
Fix most warnings.
2017-03-07 13:05:57 +09:00
Thomas Müller
1585ae842a
Update framework
2017-02-26 11:22:58 +09:00
Damnae
38b25a7df3
Add hit object stacking.
2017-02-09 07:28:40 +01:00
Dean Herbert
50bd80cb0c
Update and standardise license headers.
2017-02-07 14:27:41 +09:00
Dean Herbert
3ac89216bd
Standardise some naming and make hitcircles feel better.
2016-11-19 19:07:57 +09:00
Dean Herbert
4590be552f
Move play modes to their own projects.
2016-11-14 18:54:24 +09:00
