61410 Commits

This Branch

This Branch

All Branches

• Fix post-merge errors.
  smoogipooo · 2017-03-22 01:55:31 +09:00
  1532ae78a4
• Merge branch 'taiko_hitobject_drawable' into taiko_bash_drawable

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

  smoogipooo · 2017-03-22 01:53:44 +09:00
  7cf935cef2
• Fix more post-merge errors.
  smoogipooo · 2017-03-22 01:52:55 +09:00
  a75a2e1794
• Override UpdateScrollPosition instead of Update.
  smoogipooo · 2017-03-22 01:51:53 +09:00
  90c441f614
• Fix post-merge errors.
  smoogipooo · 2017-03-22 01:51:44 +09:00
  b3e8a2257c
• Merge branch 'taiko_hitobject_drawable' into taiko_drumroll_drawable

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

  smoogipooo · 2017-03-22 01:49:45 +09:00
  b9f1b44ca4
• Fix post-merge errors.
  smoogipooo · 2017-03-22 01:48:51 +09:00
  e4926d54ab
• Merge branch 'taiko_hitobject_drawable' into taiko_hit_drawables

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

  smoogipooo · 2017-03-22 01:47:25 +09:00
  1bfc4d484d
• Make UpdateScrollPosition virtual.
  smoogipooo · 2017-03-22 01:46:06 +09:00
  24e78d015e
• Merge remote-tracking branch 'origin/master' into taiko_hitobject_drawable

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

  smoogipooo · 2017-03-22 01:45:02 +09:00
  62dcd4fa59
• Override is unnecessary.
  smoogipooo · 2017-03-22 01:43:20 +09:00
  8f6cee2544
• Fix post-merge errors.
  smoogipooo · 2017-03-22 01:42:40 +09:00
  e7a93073a4
• Update framework.
  smoogipooo · 2017-03-22 01:39:39 +09:00
  b769c43660
• Merge remote-tracking branch 'origin/master' into taiko_playfield_2
  smoogipooo · 2017-03-22 01:38:53 +09:00
  afcd42b06d
• A bit more protection.
  smoogipooo · 2017-03-22 01:35:39 +09:00
  b3dde2c399
• Merge remote-tracking branch 'origin/master' into taiko_bash_base

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

  smoogipooo · 2017-03-22 01:34:47 +09:00
  cf251618c7
• A bit more protection.
  smoogipooo · 2017-03-22 01:33:22 +09:00
  712d2e194c
• Merge remote-tracking branch 'origin/master' into taiko_drumroll_base

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

  smoogipooo · 2017-03-22 01:27:07 +09:00
  a346191ca7
• renamed CursorSize to MenuCursorSize
  Jorolf · 2017-03-21 17:16:23 +01:00
  82d6129063
• Merge pull request #521 from EVAST9919/fixes

  Fixes

  Dean Herbert · 2017-03-22 00:30:57 +09:00
  7d8c2c9a15
• Hide letterbox position sliders
  Andrey Zavadskiy · 2017-03-21 18:24:19 +03:00
  943bd737c4
• Hide options when entering the game
  Andrey Zavadskiy · 2017-03-21 18:20:15 +03:00
  4fa6db6cfa
• Fix typo in font name declaration.
  Dean Herbert · 2017-03-21 22:51:49 +09:00
  0b2bb2ea0e
• Merge pull request #514 from smoogipooo/taiko_judgement_scoring

  Add TaikoJudgementInfo.

  Dean Herbert · 2017-03-21 22:39:34 +09:00
  993f68bc61
• Merge pull request #519 from smoogipooo/parse_timesignature

  Parse time signature from legacy beatmap control points.

  Dean Herbert · 2017-03-21 22:24:29 +09:00
  d5af15579c
• Rename MAX_SCORE -> MAX_HIT_RESULT.
  smoogipooo · 2017-03-21 21:38:39 +09:00
  863f49c2bd
• Renamings.
  smoogipooo · 2017-03-21 21:36:05 +09:00
  d9524f692d
• End letter oppression.
  smoogipooo · 2017-03-21 21:31:31 +09:00
  ad74797cd4
• Add test case for bar lines.
  smoogipooo · 2017-03-21 21:27:20 +09:00
  9f3def05ef
• Woops forgot to commit framework.
  smoogipooo · 2017-03-21 21:26:55 +09:00
  e1f8f44b32
• Implement barline conversion from control points.
  smoogipooo · 2017-03-21 21:26:29 +09:00
  507e453409
• Merge branch 'parse_timesignature' into taiko_barlines
  smoogipooo · 2017-03-21 21:22:56 +09:00
  e8a0d6f898
• Merge pull request #518 from smoogipooo/late_add_hitobjects_container

  Late-add the HitObjects container in the Playfield.

  Dean Herbert · 2017-03-21 21:19:47 +09:00
  12fc8b8553
• Parse time signature from legacy beatmap control points.
  smoogipooo · 2017-03-21 21:18:08 +09:00
  a272675705
• Add barline drawables.
  smoogipooo · 2017-03-21 20:39:18 +09:00
  b602b7a3ea
• Merge branch 'taiko_playfield_2' into taiko_barlines

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

  smoogipooo · 2017-03-21 20:24:33 +09:00
  4bc038addd
• Add base barline.
  smoogipooo · 2017-03-21 18:44:49 +09:00
  b05a12372a
• Reduce some container nesting.
  smoogipooo · 2017-03-21 18:28:04 +09:00
  259ed03610
• Add comments.
  smoogipooo · 2017-03-21 18:26:19 +09:00
  e2b510f3f0
• Add a 1px offset for the playfield border.
  smoogipooo · 2017-03-21 18:13:10 +09:00
  7cb237798a
• 10% chance to get finisher hits in testcase.
  smoogipooo · 2017-03-21 17:55:18 +09:00
  aac4f24a2e
• Remove now unnecessary field.
  smoogipooo · 2017-03-21 17:50:05 +09:00
  2cfab75bc7
• Increase RingExplosion base size for finishers.

  Subtle but looks good imo (checked with flyte).

  smoogipooo · 2017-03-21 17:49:22 +09:00
  60e866aebd
• Redesign HitTarget.
  smoogipooo · 2017-03-21 17:48:19 +09:00
  eec4a1b5d3
• Late-add the HitObjects container in the Playfield.

  Allows derivers to define the Content container in the constructor, to redirect the positioning of the HitObjects container.

  smoogipooo · 2017-03-21 16:46:43 +09:00
  66752af81f
• Merge branch 'master' into taiko_judgement_scoring
  Dan Balasescu · 2017-03-21 16:44:31 +09:00
  7bda1866fd
• Add license + general fixes.
  smoogipooo · 2017-03-21 16:41:58 +09:00
  4e7a44cd44
• Add judgement texts.
  smoogipooo · 2017-03-21 16:33:25 +09:00
  1ac9898a36
• Add explosion rings.
  smoogipooo · 2017-03-21 15:54:57 +09:00
  4c398b106d
• Merge branch 'taiko_judgement_scoring' into taiko_playfield_2
  smoogipooo · 2017-03-21 15:33:59 +09:00
  9b5cb7ec23