4244 Commits

This Branch

This Branch

All Branches

• 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
• 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
• 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
• 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
• Adjust namespaces.

  Also adds transition, uses IHasCurrentValue, combines Mod TestCases and more.

  Dean Herbert · 2017-05-05 13:00:05 +09:00
  c9ba1ac4f6
• Refactor ModSection and ModIcon to avoid null mods.
  Dean Herbert · 2017-05-05 12:16:41 +09:00
  6298b3effd
• Adjust scale and CI fixes
  EVAST9919 · 2017-05-04 17:59:01 +03:00
  95f6c999bd
• Merge remote-tracking branch 'refs/remotes/ppy/master' into mods_refactor
  EVAST9919 · 2017-05-04 17:35:41 +03:00
  66c858030a
• Apply CI fixes.
  Dean Herbert · 2017-05-04 23:32:27 +09:00
  98b3b82c07
• Cleanup
  EVAST9919 · 2017-05-04 17:29:52 +03:00
  475eb6fe5f
• Add OptionItem class

  Allow for centalised logic for all option UI controls.

  Dean Herbert · 2017-05-04 23:07:48 +09:00
  153951d3dd
• Added testcase
  EVAST9919 · 2017-05-04 11:58:37 +03:00
  57c4232416
• Merge pull request #704 from smoogipooo/mania-stage

  Mania playfield

  Dean Herbert · 2017-05-04 17:02:42 +09:00
  b98ae5d7c3
• Merge branch 'master' into mania-stage
  Dean Herbert · 2017-05-04 16:58:16 +09:00
  efa60ee287
• Throw exception if SpecialColumnPosition is set after IsLoaded.
  smoogipooo · 2017-05-04 15:18:20 +09:00
  72b2467e74
• Make SpecialColumnPosition only have an effect during load().
  smoogipooo · 2017-05-04 15:12:32 +09:00
  e307b6d563
• ColumnStyle -> ColumnPosition.
  smoogipooo · 2017-05-04 14:54:31 +09:00
  a2bdd020e5
• Fix readonly warning
  WebFreak001 · 2017-05-03 18:48:17 +02:00
  063b606a12
• InputResample CursorTrail
  WebFreak001 · 2017-05-03 18:33:42 +02:00
  008ff9d2f9
• float value fix
  EVAST9919 · 2017-05-03 16:58:10 +03:00
  6063231e40
• Merge remote-tracking branch 'refs/remotes/ppy/master' into mods_refactor
  EVAST9919 · 2017-05-03 16:22:40 +03:00
  26985dbc62
• Merge pull request #699 from peppy/options-implementation

  Confine mouse mode and more

  Dean Herbert · 2017-05-03 22:02:58 +09:00
  v2017.503.0 f5981b1ab9
• Merge remote-tracking branch 'upstream/master' into options-implementation
  Dean Herbert · 2017-05-03 21:54:27 +09:00
  19f6d58723
• Update framework.
  Dean Herbert · 2017-05-03 21:29:42 +09:00
  c39b314ac2
• Trim whitespace.
  Dean Herbert · 2017-05-03 20:49:52 +09:00
  330dd458bd
• Add FPS display toggling.

  Kinda temporary but better than nothing.

  Dean Herbert · 2017-05-03 20:34:53 +09:00
  489f586887
• Merge branch 'master' into mania-stage
  Dan Balasescu · 2017-05-03 20:19:00 +09:00
  5574a8770b