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
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
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
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
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
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
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
smoogipooo
7a220e7348
Using.
2017-03-24 22:17:18 +09:00
smoogipooo
c03bf4a5c3
Use less scaling factors.
2017-03-24 22:11:11 +09:00
Dean Herbert
796218cb00
Merge pull request #549 from smoogipooo/taiko_drawable_drawing
...
Add circle to DrawableTaikoHitObject.
2017-03-24 21:17:37 +09:00
smoogipooo
e079263205
Remove unused texture.
2017-03-24 20:54:09 +09:00
smoogipooo
81c592c04a
Resources...
2017-03-24 20:11:06 +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
8f7ed813a3
Cleanup.
2017-03-24 15:45:21 +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
