3061 Commits

This Branch

This Branch

All Branches

• Fix merge fail.
  Dean Herbert · 2017-03-27 12:33:15 +09:00
  d0b1fda24f
• Merge branch 'master' into taiko_drumroll_drawable
  Dean Herbert · 2017-03-27 12:30:31 +09:00
  4e50b28884
• Merge pull request #516 from smoogipooo/taiko_bash_drawable

  Drawable Bash Implementation (Input only)

  Dean Herbert · 2017-03-27 12:20:05 +09:00
  d6d19d726b
• Merge branch 'master' into taiko_drumroll_drawable
  Dean Herbert · 2017-03-27 11:51:10 +09:00
  dfd40c6b29
• Merge branch 'master' into taiko_bash_drawable
  Dean Herbert · 2017-03-27 11:51:08 +09:00
  e81040cfa1
• Merge pull request #554 from smoogipooo/better_taiko_keys

  Move validKeys to DrawableTaikoHitObject. Cleanup + reword comments.

  Dean Herbert · 2017-03-27 11:22:41 +09:00
  806d8bfd1c
• Use lambda expression.
  smoogipooo · 2017-03-26 00:01:00 +09:00
  bcaf2f9758
• Remove validKeys (now in DrawableTaikoHitObject).
  smoogipooo · 2017-03-25 23:54:50 +09:00
  7c9900376f
• 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

  smoogipooo · 2017-03-25 23:52:41 +09:00
  e5c674a051
• Remove validKeys (now in DrawableTaikoHitObject).
  smoogipooo · 2017-03-25 23:48:13 +09:00
  d9ecb430ed
• Fix post-merge errors.
  smoogipooo · 2017-03-25 23:48:00 +09:00
  9b0a15cd6c
• Merge branch 'better_taiko_keys' into taiko_bash_drawable

  Conflicts:
  	osu.Game.Modes.Taiko/Objects/Drawable/DrawableTaikoHitObject.cs

  smoogipooo · 2017-03-25 23:44:40 +09:00
  6e5db7b75d
• Move validKeys to DrawableTaikoHitObject. Cleanup + reword comments.
  smoogipooo · 2017-03-25 23:43:41 +09:00
  989a6ab02b
• Merge branch 'master' into taiko_bash_drawable
  Dean Herbert · 2017-03-25 22:01:50 +09:00
  a774a68456
• Merge pull request #515 from smoogipooo/taiko_hit_drawables

  Drawable Hit Implementation (Input only)

  Dean Herbert · 2017-03-25 21:44:02 +09:00
  f150c0828c
• 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.

  smoogipooo · 2017-03-25 20:58:02 +09:00
  cbb6930f76
• Rename bash -> swell.
  smoogipooo · 2017-03-25 20:57:49 +09:00
  e7941859e4
• Merge remote-tracking branch 'origin/master' into taiko_bash_drawable

  Conflicts:
  	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj

  smoogipooo · 2017-03-25 20:55:14 +09:00
  a7cea811f4
• 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.

  smoogipooo · 2017-03-25 20:53:45 +09:00
  5bd9147661
• Rename finisher -> accented.
  smoogipooo · 2017-03-25 20:30:26 +09:00
  be4ab13f4d
• Merge branch 'master' into taiko_hit_drawables
  Dean Herbert · 2017-03-25 20:23:33 +09:00
  73d2f91086
• Merge pull request #548 from smoogipooo/replay_extensibility

  Replay extensibility

  Dean Herbert · 2017-03-25 20:21:18 +09:00
  1e34d5e9b4
• Merge remote-tracking branch 'origin/master' into taiko_drumroll_drawable
  smoogipooo · 2017-03-25 20:20:16 +09:00
  4762e043a0
• Merge branch 'master' into replay_extensibility
  Dean Herbert · 2017-03-25 20:16:41 +09:00
  64378f6445
• Merge remote-tracking branch 'origin/master' into taiko_hit_drawables
  smoogipooo · 2017-03-25 20:16:25 +09:00
  cb189bd006
• Merge pull request #553 from ElegantMonkey/rename-dropdown-files

  Rename OptionDropdown and OptionEnumDropdown files

  Dean Herbert · 2017-03-25 20:08:51 +09:00
  0888234d36
• Rename OptionDropdown and OptionEnumDropdown files
  ElegantMonkey · 2017-03-25 07:45:04 -03:00
  0678274118
• Merge pull request #550 from smoogipooo/better_centre_symbol

  Use less scaling factors.

  Dean Herbert · 2017-03-25 12:43:11 +09:00
  7a834a6cc1
• Using.
  smoogipooo · 2017-03-24 22:17:18 +09:00
  7a220e7348
• Use less scaling factors.
  smoogipooo · 2017-03-24 22:11:11 +09:00
  c03bf4a5c3
• Merge branch 'master' into taiko_drumroll_drawable
  Dean Herbert · 2017-03-24 21:26:42 +09:00
  55d7b027d2
• Merge pull request #549 from smoogipooo/taiko_drawable_drawing

  Add circle to DrawableTaikoHitObject.

  Dean Herbert · 2017-03-24 21:17:37 +09:00
  796218cb00
• Remove unused texture.
  smoogipooo · 2017-03-24 20:54:09 +09:00
  e079263205
• Resources...
  smoogipooo · 2017-03-24 20:11:06 +09:00
  81c592c04a
• Make CirclePiece use relative width (leaving length control to DrawableDrumRoll).
  smoogipooo · 2017-03-24 20:10:17 +09:00
  2ee68ae75a
• 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.

  smoogipooo · 2017-03-24 20:08:40 +09:00
  fdd17c1575
• More explicative xmldoc.
  smoogipooo · 2017-03-24 19:05:45 +09:00
  405c6f9691
• Don't use a magic number.
  smoogipooo · 2017-03-24 19:04:46 +09:00
  369e3903ac
• Don't force the size.
  smoogipooo · 2017-03-24 19:04:32 +09:00
  feecf23d9f
• Cleanup.
  smoogipooo · 2017-03-24 18:49:10 +09:00
  df46d0f446
• Rewrite CirclePiece to be referenced to 128x128px and handle accented hits more sanely.
  smoogipooo · 2017-03-24 18:37:56 +09:00
  5281842965
• Remove explicit alpha = 1.
  smoogipooo · 2017-03-24 16:15:14 +09:00
  47065d8031
• Fix post-merge issues.
  smoogipooo · 2017-03-24 16:03:38 +09:00
  6753a22512
• Merge branch 'taiko_note_circle' into taiko_drawable_drawing

  Conflicts:
  	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj

  smoogipooo · 2017-03-24 16:02:49 +09:00
  33c160efeb
• Adjust comment.
  smoogipooo · 2017-03-24 15:55:25 +09:00
  d6d3eb99b7
• Moar cleanup.
  smoogipooo · 2017-03-24 15:50:18 +09:00
  82752e0988
• Cleanup.
  smoogipooo · 2017-03-24 15:45:21 +09:00
  8f7ed813a3
• Rename ScrollingCirclePiece -> ScrollingPiece.
  smoogipooo · 2017-03-24 15:44:43 +09:00
  95183279f3
• Make sure icon is only instantiated once.
  smoogipooo · 2017-03-24 15:43:17 +09:00
  eea24b2d82
• Move load below CreateIcon().
  smoogipooo · 2017-03-24 15:42:48 +09:00
  aa9a65d69c