4287 Commits

This Branch

This Branch

All Branches

• Fix broken test cases, remove some recursive lookup methods.
  Dean Herbert · 2017-05-11 19:38:28 +09:00
  a2f6d8a3e6
• Merge pull request #730 from smoogipooo/mania-notes

  Mania notes

  Dean Herbert · 2017-05-11 18:16:33 +09:00
  18b7c8e783
• Fix taiko right background not scaling with the playfield as intended.
  smoogipooo · 2017-05-11 17:18:22 +09:00
  6cc54773e8
• Fix post-merge breakage
  Dean Herbert · 2017-05-11 17:16:01 +09:00
  6fd95e0c52
• Merge branch 'master' into mania-notes
  Dean Herbert · 2017-05-11 17:13:29 +09:00
  bc54b3c85f
• Combine DrawableHitObject classes into one
  Dean Herbert · 2017-05-11 17:07:46 +09:00
  b0e522345c
• Merge pull request #733 from smoogipooo/hitrenderer-improvements

  Hitrenderer improvements

  Dean Herbert · 2017-05-11 15:16:45 +09:00
  057d0cd523
• Fix possible nullrefs.
  smoogipooo · 2017-05-11 14:50:18 +09:00
  a762f820c6
• More concrete method to determine if all hit objects have been judged.

  Covers the case where nested hit objects are involved.

  smoogipooo · 2017-05-11 14:48:08 +09:00
  2d2d1beddd
• Make Playfield.HitObjects internal to playfields.

  Because not all playfields will be using this.

  smoogipooo · 2017-05-11 14:44:11 +09:00
  6445bea864
• CI fixes.
  smoogipooo · 2017-05-11 13:55:52 +09:00
  cdf827df8e
• Merge remote-tracking branch 'origin/master' into mania-notes
  smoogipooo · 2017-05-11 13:01:00 +09:00
  94585672b6
• Merge pull request #732 from peppy/general-fixes

  Update framework

  Dean Herbert · 2017-05-11 12:57:12 +09:00
  ab58acad81
• Merge branch 'master' into general-fixes
  Dan Balasescu · 2017-05-11 12:29:10 +09:00
  78ed48d5ef
• Merge pull request #724 from huoyaoyuan/metadata

  WorkingBeatmap enhancement

  Dean Herbert · 2017-05-11 12:28:15 +09:00
  672c22178a
• Merge branch 'master' into metadata
  Dean Herbert · 2017-05-11 12:23:00 +09:00
  70ef503403
• Merge (fix conflicting framework)
  Dean Herbert · 2017-05-11 11:17:44 +09:00
  fe47451dbc
• Update framework.
  smoogipooo · 2017-05-10 17:38:59 +09:00
  4614904409
• Add xmldoc to HitWindows.cs.
  smoogipooo · 2017-05-10 17:29:54 +09:00
  3b533de8ac
• Update framework.
  Dean Herbert · 2017-05-10 14:15:11 +09:00
  2e7812956a
• Fix unnecessary newline.
  Dan Balasescu · 2017-05-09 21:08:53 +09:00
  cdd71b496d
• Merge pull request #731 from smoogipooo/general-fixes

  Update framework.

  Dean Herbert · 2017-05-09 21:06:40 +09:00
  76380a0792
• Update framework.
  smoogipooo · 2017-05-09 21:00:40 +09:00
  e1ed785cbf
• Fix exception.
  smoogipooo · 2017-05-09 20:55:38 +09:00
  89bfc0ff22
• Cleanups.
  smoogipooo · 2017-05-09 20:55:20 +09:00
  5b323ad483
• Rewrite notes to have time-relative position and length.
  smoogipooo · 2017-05-09 20:33:59 +09:00
  d852567d1d
• Merge remote-tracking branch 'origin/master' into mania-notes
  smoogipooo · 2017-05-09 19:31:35 +09:00
  ea76eff1e1
• Merge pull request #729 from huoyaoyuan/tidy-up

  Tidy up

  Dean Herbert · 2017-05-09 10:41:24 +09:00
  db6e952ddd
• Merge branch 'master' into tidy-up
  Dean Herbert · 2017-05-09 10:27:29 +09:00
  ab1768ef80
• MatchCreate.ValidForResume = false.
  Huo Yaoyuan · 2017-05-08 19:55:04 +08:00
  cb21e98ae1
• Avoid extra MemoryStream in ArchiveReader.
  Huo Yaoyuan · 2017-05-08 19:41:22 +08:00
  01616cc27c
• Handle overlay in ToolbarOverlayToggleButton.
  Huo Yaoyuan · 2017-05-08 19:37:41 +08:00
  ced2332d20
• Generic infer for IJsonSerializable.DeepClone.
  Huo Yaoyuan · 2017-05-08 19:33:37 +08:00
  e466380ee2
• Simplify constructor of SampleInfoList.
  Huo Yaoyuan · 2017-05-08 19:30:55 +08:00
  345f80b775
• Use readonly fields.
  Huo Yaoyuan · 2017-05-08 18:56:04 +08:00
  dff05bec79
• Remove unnecessary arguments in WorkingBeatmap's constructor.
  Huo Yaoyuan · 2017-05-08 16:42:53 +08:00
  4c26a02e99
• Merge pull request #717 from WebFreak001/master

  InputResample CursorTrail

  Dean Herbert · 2017-05-08 13:15:48 +09:00
  v2017.508.0 e6402afe8b
• Add non-null assurance.
  Dean Herbert · 2017-05-08 12:45:55 +09:00
  9f1f926634
• Merge branch 'master' into mania-notes

  # Conflicts:
  #	osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj

  smoogipooo · 2017-05-08 12:12:40 +09:00
  e3b01e7b8c
• Merge branch 'master' into master
  Dean Herbert · 2017-05-08 11:59:01 +09:00
  a38e95c607
• Merge pull request #720 from peppy/hud-mod-display

  HUD Mod display

  Dan Balasescu · 2017-05-08 11:55:19 +09:00
  82a8ce2468
• Avoid polluting Player with HUD-specific code.
  Dean Herbert · 2017-05-08 11:48:40 +09:00
  48368779ab
• Make field readonly.
  Dean Herbert · 2017-05-08 11:47:06 +09:00
  10910cfcef
• Refactor colour selection.
  Dean Herbert · 2017-05-08 11:33:22 +09:00
  2f4fad9d41
• Merge remote-tracking branch 'ppy/master' into hud-mod-display
  Dean Herbert · 2017-05-08 10:56:34 +09:00
  df4a737c9b
• Merge pull request #718 from peppy/option-item-refactor

  Add OptionItem class

  Dean Herbert · 2017-05-08 10:41:49 +09:00
  ad4ec7023f
• Merge branch 'master' into option-item-refactor
  Dan Balasescu · 2017-05-08 10:13:21 +09:00
  11c2e66cee
• Use controlWithCurrent as per comment.
  Dan Balasescu · 2017-05-08 10:11:45 +09:00
  fbf05f12fc
• Merge pull request #674 from peppy/vscode-updates

  Update vscode launch/task configuration.

  Dan Balasescu · 2017-05-08 09:07:31 +09:00
  3adc203a86
• Merge branch 'master' into vscode-updates
  Dan Balasescu · 2017-05-08 08:59:23 +09:00
  6d51ef2cc3