31755 Commits

This Branch

This Branch

All Branches

• Add basic support for drawing circles.

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

  smoogipooo · 2017-03-20 19:30:54 +09:00
  a7eb219d39
• Merge branch 'taiko_note_circle' into taiko_drawable_drawing
  smoogipooo · 2017-03-20 19:30:20 +09:00
  8f90bcf7fd
• Add license headers.
  smoogipooo · 2017-03-20 18:25:12 +09:00
  ed9c7c8008
• Add license headers.
  smoogipooo · 2017-03-20 18:24:28 +09:00
  34b734275b
• Merge branch 'taiko_hitobject_drawable' into taiko_bash_drawable

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

  smoogipooo · 2017-03-20 18:21:05 +09:00
  57c708619d
• Merge branch 'taiko_bash_base' into taiko_bash_drawable
  smoogipooo · 2017-03-20 18:20:44 +09:00
  b751cd4f29
• Merge branch 'master' into taiko_bash_drawable

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

  smoogipooo · 2017-03-20 18:20:32 +09:00
  3f7cd41490
• Fix unused usings.
  smoogipooo · 2017-03-20 18:18:25 +09:00
  75d09e7038
• Merge branch 'taiko_hitobject_drawable' into taiko_hit_drawables

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

  smoogipooo · 2017-03-20 18:18:17 +09:00
  da1b911da9
• Merge branch 'master' into taiko_hit_drawables

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

  smoogipooo · 2017-03-20 18:17:18 +09:00
  5a28833c32
• Merge branch 'taiko_hitobject_drawable' into taiko_drumroll_drawable

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

  smoogipooo · 2017-03-20 18:12:16 +09:00
  aaa368e014
• Suppress Resharper.
  smoogipooo · 2017-03-20 18:10:09 +09:00
  75fb7a3eb3
• Merge branch 'master' into taiko_hitobject_drawable

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

  smoogipooo · 2017-03-20 18:09:05 +09:00
  a27dae0beb
• Remove explicit namespacing.
  smoogipooo · 2017-03-20 18:07:44 +09:00
  409160859d
• Merge branch 'taiko_drumroll_base' into taiko_drumroll_drawable
  smoogipooo · 2017-03-20 18:06:00 +09:00
  70be33bde0
• Merge branch 'master' into taiko_drumroll_drawable

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

  smoogipooo · 2017-03-20 18:05:54 +09:00
  a3e406af6a
• License headers.
  smoogipooo · 2017-03-20 17:02:06 +09:00
  edd9a22177
• Merge branch 'master' into taiko_note_circle
  smoogipooo · 2017-03-20 16:55:08 +09:00
  f87f334dcd
• Move drum rolls to a new column in TestCaseTaikoHitObjects.
  smoogipooo · 2017-03-20 16:53:31 +09:00
  be1f28ad40
• Move pieces out of the visual test, fix up comments, rewrite FinisherPiece.
  smoogipooo · 2017-03-20 16:50:22 +09:00
  730824fa58
• Make bashes not use textawesome.
  smoogipooo · 2017-03-20 16:41:09 +09:00
  051ef61d48
• Add finisher notes.
  smoogipooo · 2017-03-20 15:09:27 +09:00
  29f303b4d0
• Fix colours.
  smoogipooo · 2017-03-20 14:39:29 +09:00
  caf3ec1400
• Hard-code text size in cases it wasn't set.
  smoogipooo · 2017-03-20 13:48:06 +09:00
  d27f37beb5
• Merge branch 'master' into textawesome_shadow
  Dan Balasescu · 2017-03-20 13:17:35 +09:00
  417045c37c
• Merge pull request #510 from smoogipooo/remove_type_enums

  Remove hit object types solution-wide.

  Dean Herbert · 2017-03-20 13:16:36 +09:00
  df17f2c996
• Merge branch 'taiko_bash_base' into taiko_conversion
  smoogipooo · 2017-03-20 13:12:40 +09:00
  61172958bb
• Merge branch 'taiko_drumroll_base' into taiko_conversion
  smoogipooo · 2017-03-20 13:12:32 +09:00
  962acca096
• Merge remote-tracking branch 'origin/master' into taiko_conversion
  smoogipooo · 2017-03-20 13:12:09 +09:00
  8435840fc7
• Remove hit object types solution-wide.
  smoogipooo · 2017-03-20 13:10:24 +09:00
  090e8bbb79
• Remove Type.
  smoogipooo · 2017-03-20 13:04:09 +09:00
  b9006e4026
• Merge remote-tracking branch 'origin/master' into taiko_bash_base
  smoogipooo · 2017-03-20 13:03:25 +09:00
  c3d10f8abf
• Remove Type.
  smoogipooo · 2017-03-20 13:02:52 +09:00
  b3b8fadf03
• Merge remote-tracking branch 'origin/master' into taiko_drumroll_base
  smoogipooo · 2017-03-20 13:01:43 +09:00
  7b7255863c
• Simplify fade out gradient code.
  Dean Herbert · 2017-03-19 21:49:29 +09:00
  09bf014ded
• Update framework.
  Dean Herbert · 2017-03-19 20:12:37 +09:00
  f785af1222
• Merge remote-tracking branch 'upstream/master' into DrabWeb/leaderboards
  Dean Herbert · 2017-03-19 18:51:53 +09:00
  5d0adc6454
• Inline single usage of EdgeEffect.
  Dean Herbert · 2017-03-19 18:51:40 +09:00
  256a3268ac
• Merge pull request #509 from peppy/fix-beatmap-options

  Fix beatmap options overlay inconsistencies

  Thomas Müller · 2017-03-19 09:37:59 +01:00
  139dd456fb
• Merge branch 'master' into fix-beatmap-options
  Thomas Müller · 2017-03-19 09:34:53 +01:00
  44f71b3975
• Merge pull request #508 from Tom94/hide-cursor

  Hide cursor

  Thomas Müller · 2017-03-19 09:28:55 +01:00
  36414e964a
• Merge branch 'master' into hide-cursor
  Thomas Müller · 2017-03-19 09:23:30 +01:00
  66cdc76621
• Update framework.
  Dean Herbert · 2017-03-19 17:22:47 +09:00
  034d818427
• Adjust sizing a touch.
  Dean Herbert · 2017-03-19 16:34:29 +09:00
  8cb334a118
• Merge pull request #500 from smoogipooo/explicit_expires

  Make DrawableHitObject expires explicit.

  Dean Herbert · 2017-03-19 12:47:43 +09:00
  af85bcaf1d
• Merge pull request #499 from smoogipooo/legacy_beatmap_flag

  Add legacy beatmap flag.

  Dean Herbert · 2017-03-19 12:39:41 +09:00
  6c12da54f1
• Formatting
  DrabWeb · 2017-03-19 00:14:23 -03:00
  5c645350f9
• Merge https://github.com/ppy/osu into leaderboards
  DrabWeb · 2017-03-19 00:10:08 -03:00
  4719817b45
• -IHasDrawableRepresentation, User.Region -> Country
  DrabWeb · 2017-03-19 00:09:58 -03:00
  b0e7296e25
• Merge pull request #498 from smoogipooo/taiko_hitobject_base

  Taiko hitobject base

  Dean Herbert · 2017-03-19 12:03:29 +09:00
  f237b5f1b8