4267 Commits

This Branch

This Branch

All Branches

• Merge remote-tracking branch 'upstream/master' into new-option-search
  Dean Herbert · 2017-05-11 12:59:19 +09:00
  6c5490e31c
• 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 branch 'master' into new-option-search
  Dean Herbert · 2017-05-11 12:20:58 +09:00
  262b42efe3
• Update framework.
  Dean Herbert · 2017-05-10 14:15:11 +09:00
  2e7812956a
• 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
• 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
• Merge branch 'new-option-search' of github.com:Jorolf/osu into new-option-search
  Jorolf · 2017-05-08 18:30:33 +02:00
  9aaac4ab0c
• fix license header
  Jorolf · 2017-05-08 18:30:00 +02:00
  86f0173c6b
• Merge branch 'master' into new-option-search
  jorolf · 2017-05-08 17:25:47 +02:00
  3abf1b2a0b
• 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 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 branch 'master' into new-option-search
  Dean Herbert · 2017-05-08 10:49:49 +09:00
  5131371c93
• 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
• add search box and the ability to search
  Jorolf · 2017-05-07 20:35:57 +02:00
  3c4faae554
• Standardise usages of exceptions.
  Huo Yaoyuan · 2017-05-07 00:38:17 +08:00
  4f8549f220
• Merge branch 'option-item-refactor' of git://github.com/peppy/osu into new-option-search
  Jorolf · 2017-05-06 17:55:28 +02:00
  ef02f80881
• CI fixes.
  Huo Yaoyuan · 2017-05-06 16:06:38 +08:00
  f37c857af8
• Access database recursively.
  Huo Yaoyuan · 2017-05-06 15:37:53 +08:00
  767cfaaac3
• Use metadata field of WorkingBeatmap.
  Huo Yaoyuan · 2017-05-06 14:57:11 +08:00
  146d57953d
• Make metadata a member of WorkingBeatmap.
  Huo Yaoyuan · 2017-05-06 14:52:28 +08:00
  4f49151984
• Merge pull request #723 from skettios/master

  Fix ModSelectOverlay accepting escape when it shouldn't

  Dean Herbert · 2017-05-06 10:21:11 +09:00
  91ad0cb75e
• removed check if ModSelectOverlay is open
  skettios · 2017-05-05 18:16:48 -07:00
  36dff94802
• Fix ModSelectOverlay accepting escape when it shouldn't

  Because PlaySongSelect is suspending when selecting a song, we don't actually hide ModSelectOverlay.

  skettios · 2017-05-05 17:03:24 -07:00
  d129bd0c1f
• Made cursortrail work with multiple positions
  WebFreak001 · 2017-05-05 17:44:51 +02:00
  5aecc3d761
• Tidy up ModIcon.
  Dean Herbert · 2017-05-05 13:22:10 +09:00
  4b385ded26
• Add hover expand support.
  Dean Herbert · 2017-05-05 13:17:36 +09:00
  44f06e5423
• Remove unnecessary hide/show logic.

  Also change the way the overlay appears when actually playing.

  Dean Herbert · 2017-05-05 13:14:44 +09:00
  9c4f813da1
• CI Fixes.
  Dean Herbert · 2017-05-05 13:06:54 +09:00
  b547dd6893