19539 Commits

This Branch

This Branch

All Branches

• Merge remote-tracking branch 'refs/remotes/ppy/master' into pause_buttons_refactor
  Andrey Zavadskiy · 2017-04-01 21:03:19 +03:00
  3574dac780
• Cleanups.
  smoogipooo · 2017-04-02 02:06:58 +09:00
  2510a9fd32
• changed SpriteText to OsuSpriteText
  Jorolf · 2017-04-01 18:12:44 +02:00
  017281246d
• Fix post-merge errors.
  smoogipooo · 2017-04-01 23:59:44 +09:00
  38bbf2ac77
• Merge remote-tracking branch 'origin/master' into taiko_barlines

  Conflicts:
  	osu.Desktop.VisualTests/Tests/TestCaseTaikoPlayfield.cs
  	osu.Game.Modes.Taiko/UI/TaikoHitRenderer.cs
  	osu.Game.Modes.Taiko/UI/TaikoPlayfield.cs
  	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj

  smoogipooo · 2017-04-01 23:57:02 +09:00
  b4ed8aeb98
• fix errors from merge
  Jorolf · 2017-04-01 14:16:18 +02:00
  d0b4f86725
• Merge branch 'master' of git://github.com/ppy/osu into details
  Jorolf · 2017-04-01 14:12:20 +02:00
  072a77b4d9
• Move input to HudOverlay
  Andrey Zavadskiy · 2017-04-01 14:46:45 +03:00
  9d027a61cd
• Merge remote-tracking branch 'refs/remotes/ppy/master' into hud_visibility
  Andrey Zavadskiy · 2017-04-01 14:04:48 +03:00
  06850f7e1f
• (de)creases for misses.
  smoogipooo · 2017-04-01 16:34:30 +09:00
  efb589cc08
• consecutiveHits -> rollingHits.
  smoogipooo · 2017-04-01 16:32:31 +09:00
  b5ef0ae0d8
• Don't call Reset() from within TestCaseTaikoHitObjects.
  Dean Herbert · 2017-04-01 16:16:34 +09:00
  d1e3bbb5f4
• Remove unnecessary usings.
  Dean Herbert · 2017-04-01 16:07:54 +09:00
  782c6bf28e
• Merge remote-tracking branch 'upstream/master' into taiko_drumroll_drawing

  # Conflicts:
  #	osu.Desktop.VisualTests/Tests/TestCaseTaikoPlayfield.cs

  Dean Herbert · 2017-04-01 16:02:32 +09:00
  d610b9e884
• Merge pull request #579 from peppy/general-fixes

  Framework & VisualTests update

  Dan Balasescu · 2017-04-01 15:44:13 +09:00
  9bd19e99ee
• Merge branch 'master' into general-fixes
  Dean Herbert · 2017-04-01 15:40:20 +09:00
  062d99607b
• Merge remote-tracking branch 'upstream/master' into taiko_drumroll_drawing
  Dean Herbert · 2017-04-01 14:53:25 +09:00
  041e4f921a
• remove unnecessary code
  Jorolf · 2017-03-31 22:32:09 +02:00
  e380254386
• removed wrong using >.>
  Jorolf · 2017-03-31 21:24:05 +02:00
  1f19d72474
• remove unused using-directive
  Jorolf · 2017-03-31 21:19:23 +02:00
  d8bb72dd78
• add license header
  Jorolf · 2017-03-31 21:13:20 +02:00
  50b8580141
• Merge branch 'master' into details
  Jorolf · 2017-03-31 21:10:45 +02:00
  47698be1f5
• Hud Visibility
  Andrey Zavadskiy · 2017-03-31 16:43:31 +03:00
  d7c39a00b4
• Update framework again.
  Dean Herbert · 2017-03-31 18:13:24 +09:00
  904efb2916
• Fix nullref.
  Dean Herbert · 2017-03-31 18:05:24 +09:00
  01538ed7d7
• Bring VisualTests up-to-date.
  Dean Herbert · 2017-03-31 18:00:14 +09:00
  2b847aa2f4
• CheckBox -> Checkbox.
  Dean Herbert · 2017-03-31 17:38:33 +09:00
  24d06fa92d
• Merge pull request #568 from smoogipooo/taiko_replays

  Taiko replays

  Dean Herbert · 2017-03-31 17:27:25 +09:00
  ba7f1233b3
• Merge branch 'master' into taiko_replays
  Dean Herbert · 2017-03-31 17:10:56 +09:00
  1110747648
• Merge pull request #571 from smoogipooo/partial-judgements

  Implement partial judgements + make Result non-nullable.

  Dean Herbert · 2017-03-31 17:07:32 +09:00
  f42935eccf
• Merge branch 'master' into partial-judgements
  Dean Herbert · 2017-03-31 16:53:49 +09:00
  14fcc197e9
• Merge pull request #577 from smoogipooo/accented-interface

  Accented interface

  Dean Herbert · 2017-03-31 16:46:56 +09:00
  b078dfdc4e
• Merge remote-tracking branch 'upstream/master' into partial-judgements

  # Conflicts:
  #	osu.Game/osu.Game.csproj

  Dean Herbert · 2017-03-31 16:46:40 +09:00
  50c328f1b4
• Merge remote-tracking branch 'upstream/master' into accented-interface
  Dean Herbert · 2017-03-31 16:38:19 +09:00
  5d25fa3282
• Update to match new replay structure.
  smoogipooo · 2017-03-31 16:20:31 +09:00
  8f37d1ad91
• Merge branch 'master' into taiko_replays
  smoogipooo · 2017-03-31 16:11:58 +09:00
  fb6f27a439
• Merge pull request #578 from peppy/framed-replay

  Add FramedReplay and use where legacy is not needed.

  Dan Balasescu · 2017-03-31 16:05:48 +09:00
  8773dfcc49
• Update framework.
  Dean Herbert · 2017-03-31 16:03:59 +09:00
  75bdccdc3e
• Add some commenting.
  Dean Herbert · 2017-03-31 16:01:48 +09:00
  3f080ab424
• Allow SetReplay to receive null.
  Dean Herbert · 2017-03-31 16:00:40 +09:00
  cf87330f80
• Refactor ReplayInputHandler creation for more flexibility.
  Dean Herbert · 2017-03-31 15:59:53 +09:00
  fa7c72a099
• Move FramedReplayInputHandler to own file and un-nest.
  Dean Herbert · 2017-03-31 15:32:34 +09:00
  0f4b98ce73
• Fix file naming.
  Dean Herbert · 2017-03-31 15:21:30 +09:00
  c531d774b7
• Merge branch 'master' into accented-interface
  Dan Balasescu · 2017-03-31 15:08:22 +09:00
  9be60e7a25
• Don't need Drawable type.
  smoogipooo · 2017-03-31 15:06:33 +09:00
  a48224bd6d
• IAccented -> IHasAccentColour.
  smoogipooo · 2017-03-31 15:06:31 +09:00
  43c306d658
• Add back Capacity.
  smoogipooo · 2017-03-31 13:33:19 +09:00
  09b98d71a7
• Update framework.
  Dean Herbert · 2017-03-31 12:58:54 +09:00
  79031b9e74
• Add null-checks to comparers.
  Dean Herbert · 2017-03-31 12:55:43 +09:00
  0bcec4e61a
• Add FramedReplay and use where legacy is not needed.
  Dean Herbert · 2017-03-31 12:43:42 +09:00
  e7ecc479c9