Dean Herbert
8ad4c5f312
Merge pull request #513 from smoogipooo/taiko_drumroll_drawable
...
Drawable DrumRoll Implementation (Input only)
2017-03-28 14:21:44 +09:00
smoogipooo
ec9a027b59
ZZZZZZZzzzzzzzz.
2017-03-28 11:21:01 +09:00
smoogipooo
b7d9de57a2
Add rim hits.
2017-03-28 11:18:12 +09:00
smoogipooo
1faff828d1
Move piece to Pieces/.
2017-03-28 11:01:35 +09:00
smoogipooo
3f1e8ddcd1
License headers + general fixes.
2017-03-28 10:51:22 +09:00
smoogipooo
621bcaed59
Add drawable Hits/StrongHits.
2017-03-28 10:33:23 +09:00
smoogipooo
2211c08441
Properly set playfield scale.
2017-03-28 10:32:27 +09:00
smoogipooo
542cff0976
Move consts to CirclePiece.
2017-03-28 10:32:01 +09:00
smoogipooo
2ff4aa5346
Merge branch 'rename_accented' into taiko_hit_drawing
2017-03-28 10:04:52 +09:00
smoogipooo
4c7e523d18
Rename Accented to Strong.
2017-03-28 10:02:41 +09:00
smoogipooo
4bb60607e1
Add property to make the div2 internal.
2017-03-28 09:50:43 +09:00
smoogipooo
4c7a724beb
Merge remote-tracking branch 'origin/master' into taiko_drumroll_drawable
2017-03-28 09:44:50 +09:00
Dan Balasescu
a52991c101
Merge pull request #557 from peppy/update-grade-textures
...
Update grade textures.
2017-03-28 09:26:09 +09:00
Dean Herbert
36af868f44
Add missing licence header.
2017-03-28 00:13:38 +09:00
Dean Herbert
768b3c4b4b
Add better focus handling in the login form.
2017-03-28 00:08:27 +09:00
Dean Herbert
13272e6995
Make Avatar accept a user.
...
Add UpdateableAvatar to handle the toolbar use-case.
2017-03-28 00:08:26 +09:00
Dean Herbert
039f4a65dc
Combine user models.
2017-03-28 00:08:24 +09:00
Dean Herbert
55df07a872
Fix username being cleared when it shouldn't be.
2017-03-28 00:08:22 +09:00
Dean Herbert
0ad070c2d8
Update grade textures.
2017-03-27 22:24:47 +09:00
Dan Balasescu
74d003bbf6
Merge pull request #556 from peppy/fix-drag-regression
...
Fix regression in mouse dragging behaviour.
2017-03-27 21:38:24 +09:00
Dean Herbert
cc5154dd12
Fix regression in mouse dragging behaviour.
2017-03-27 17:55:57 +09:00
Dean Herbert
b8c8ca2f0e
Adjust input drum transition slightly.
2017-03-27 15:49:32 +09:00
Dean Herbert
d0b1fda24f
Fix merge fail.
2017-03-27 12:33:15 +09:00
Dean Herbert
4e50b28884
Merge branch 'master' into taiko_drumroll_drawable
2017-03-27 12:30:31 +09:00
Dean Herbert
d6d19d726b
Merge pull request #516 from smoogipooo/taiko_bash_drawable
...
Drawable Bash Implementation (Input only)
2017-03-27 12:20:05 +09:00
Dean Herbert
dfd40c6b29
Merge branch 'master' into taiko_drumroll_drawable
2017-03-27 11:51:10 +09:00
Dean Herbert
e81040cfa1
Merge branch 'master' into taiko_bash_drawable
2017-03-27 11:51:08 +09:00
Dean Herbert
806d8bfd1c
Merge pull request #554 from smoogipooo/better_taiko_keys
...
Move validKeys to DrawableTaikoHitObject. Cleanup + reword comments.
2017-03-27 11:22:41 +09:00
smoogipooo
bcaf2f9758
Use lambda expression.
2017-03-26 00:01:00 +09:00
smoogipooo
7c9900376f
Remove validKeys (now in DrawableTaikoHitObject).
2017-03-25 23:54:50 +09:00
smoogipooo
e5c674a051
Merge branch 'better_taiko_keys' into taiko_drumroll_drawable
...
Conflicts:
osu.Game.Modes.Taiko/Objects/Drawable/DrawableTaikoHitObject.cs
osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
2017-03-25 23:52:41 +09:00
smoogipooo
d9ecb430ed
Remove validKeys (now in DrawableTaikoHitObject).
2017-03-25 23:48:13 +09:00
smoogipooo
9b0a15cd6c
Fix post-merge errors.
2017-03-25 23:48:00 +09:00
smoogipooo
6e5db7b75d
Merge branch 'better_taiko_keys' into taiko_bash_drawable
...
Conflicts:
osu.Game.Modes.Taiko/Objects/Drawable/DrawableTaikoHitObject.cs
2017-03-25 23:44:40 +09:00
smoogipooo
989a6ab02b
Move validKeys to DrawableTaikoHitObject. Cleanup + reword comments.
2017-03-25 23:43:41 +09:00
Dean Herbert
a774a68456
Merge branch 'master' into taiko_bash_drawable
2017-03-25 22:01:50 +09:00
Dean Herbert
f150c0828c
Merge pull request #515 from smoogipooo/taiko_hit_drawables
...
Drawable Hit Implementation (Input only)
2017-03-25 21:44:02 +09:00
smoogipooo
cbb6930f76
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:58:02 +09:00
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
Dean Herbert
73d2f91086
Merge branch 'master' into taiko_hit_drawables
2017-03-25 20:23:33 +09:00
Dean Herbert
1e34d5e9b4
Merge pull request #548 from smoogipooo/replay_extensibility
...
Replay extensibility
2017-03-25 20:21:18 +09:00
smoogipooo
4762e043a0
Merge remote-tracking branch 'origin/master' into taiko_drumroll_drawable
2017-03-25 20:20:16 +09:00
Dean Herbert
64378f6445
Merge branch 'master' into replay_extensibility
2017-03-25 20:16:41 +09:00
smoogipooo
cb189bd006
Merge remote-tracking branch 'origin/master' into taiko_hit_drawables
2017-03-25 20:16:25 +09:00
Dean Herbert
0888234d36
Merge pull request #553 from ElegantMonkey/rename-dropdown-files
...
Rename OptionDropdown and OptionEnumDropdown files
2017-03-25 20:08:51 +09:00
ElegantMonkey
0678274118
Rename OptionDropdown and OptionEnumDropdown files
2017-03-25 07:45:04 -03:00
Dean Herbert
7a834a6cc1
Merge pull request #550 from smoogipooo/better_centre_symbol
...
Use less scaling factors.
2017-03-25 12:43:11 +09:00
