4195 Commits

This Branch

This Branch

All Branches

• 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
• 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
• 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
• Update ManiaPlayfield.cs
  Dan Balasescu · 2017-05-03 20:11:24 +09:00
  5024a74192
• Reset column key when it can't be set.
  smoogipooo · 2017-05-03 19:43:20 +09:00
  8aa6bb636c
• Add revert to normal special style after all steps.
  smoogipooo · 2017-05-03 19:38:27 +09:00
  8d82a52942
• Rewrite a lot of ManiaPlayfield/Column to support left/right special styles and arbitrary number of columns.
  smoogipooo · 2017-05-03 19:38:15 +09:00
  14e4714f08
• Defer virtual method to load().
  smoogipooo · 2017-05-03 15:57:15 +09:00
  06e014708a
• Less array explicivity.
  Dan Balasescu · 2017-05-03 13:03:46 +09:00
  d21c3358b9
• CI cleanups.
  smoogipooo · 2017-05-03 12:58:46 +09:00
  7de36b7aa2
• Move classes out of test case.
  smoogipooo · 2017-05-03 12:37:47 +09:00
  71acf1c57d
• Create ManiaPlayfield, support up to 9 columns, improve testcase automation.
  smoogipooo · 2017-05-03 12:30:03 +09:00
  b4052a099f
• Merge pull request #703 from smoogipooo/taiko-fixes

  Fix taiko auto replay generation not working.

  Dean Herbert · 2017-05-03 11:30:02 +09:00
  8da5686007
• Oops i didn't save the solution.
  smoogipooo · 2017-05-03 11:25:54 +09:00
  4d27e0abb6
• Fix taiko auto replay generation not working.
  smoogipooo · 2017-05-03 11:22:09 +09:00
  60c2e2a90a
• Merge remote-tracking branch 'origin/master' into mania-stage
  smoogipooo · 2017-05-03 10:50:10 +09:00
  27e16b8cfd
• Merge pull request #696 from smoogipooo/custom-drawings-flags

  Custom drawings flags

  Dean Herbert · 2017-05-03 09:41:01 +09:00
  c8e5f8bd95
• Merge branch 'master' into custom-drawings-flags
  Dean Herbert · 2017-05-03 09:36:51 +09:00
  8825277656
• Use provided parameters to avoid a second lookup.
  Dean Herbert · 2017-05-02 21:40:06 +09:00
  a036b059e8
• Remove most options which have not yet been implemented.
  Dean Herbert · 2017-05-02 19:40:30 +09:00
  691742b828
• Formatting.
  Dean Herbert · 2017-05-02 18:53:33 +09:00
  f9de733128
• We only have one release stream, so let's unlock it.
  Dean Herbert · 2017-05-02 18:40:30 +09:00
  d4045ee2c0
• Fix options dropdown labels never being displayed.
  Dean Herbert · 2017-05-02 18:35:23 +09:00
  57c2dd1f49
• Merge pull request #698 from peppy/music-controller-fixes

  Music controller fixes

  Dan Balasescu · 2017-05-02 18:04:53 +09:00
  087f22e7ca
• Fix naming confusion.
  smoogipooo · 2017-05-02 18:00:37 +09:00
  8e88d86639
• Fix incorrect inheritance.
  smoogipooo · 2017-05-02 17:58:59 +09:00
  f1f7a26dbd
• Ensure all searchable terms are non-null non-empty.
  Dean Herbert · 2017-05-02 17:54:07 +09:00
  a993790a66
• Add support for framework-level mouse confining.
  Dean Herbert · 2017-05-02 17:45:42 +09:00
  1b0f353af3
• Improve organisation of some options and config code.
  Dean Herbert · 2017-05-02 17:45:22 +09:00
  bef15fe637
• Oops.
  smoogipooo · 2017-05-02 17:09:16 +09:00
  9ca8295149
• Remove silly platform specific logic.
  Dean Herbert · 2017-05-02 17:00:30 +09:00
  116e92a542
• Split up adding of local store from the ctor.
  smoogipooo · 2017-05-02 16:55:04 +09:00
  40d2fee1dc
• Make Team not inherit Country.
  smoogipooo · 2017-05-02 16:54:43 +09:00
  e2620e2840
• Use value because we need to.
  Dean Herbert · 2017-05-02 16:49:27 +09:00
  46ae8bc86b
• Base the music controller transform direction on relative indices in playlist.
  Dean Herbert · 2017-05-02 16:40:29 +09:00
  f1d0b77d10
• CI fixes.
  smoogipooo · 2017-05-02 16:33:48 +09:00
  ee0a5409bb
• Merge branch 'master' into custom-drawings-flags

  # Conflicts:
  #	osu-framework

  smoogipooo · 2017-05-02 16:29:54 +09:00
  9eaf6b3ccb
• Fix layout not being invalidated when re-filtering playlist display.
  Dean Herbert · 2017-05-02 16:26:11 +09:00
  beb98c14b6
• Merge pull request #697 from peppy/general-fixes

  Update framework with new DI changes.

  Dean Herbert · 2017-05-02 15:41:29 +09:00
  57e63b9934
• Update framework with new DI changes.
  Dean Herbert · 2017-05-02 15:32:47 +09:00
  d06b3c898f