5545 Commits

This Branch

This Branch

All Branches

• Merge pull request #940 from peppy/update-framework

  Update framework

  Dan Balasescu · 2017-06-16 21:15:07 +09:00
  v2017.616.0 f41789889b
• Update framework
  Dean Herbert · 2017-06-16 21:08:23 +09:00
  7128d73178
• Merge pull request #929 from smoogipooo/timingchange-rework

  Refactor TimingChange to make it easier to follow

  Dean Herbert · 2017-06-16 17:29:03 +09:00
  fc34a55db8
• Merge branch 'master' into timingchange-rework
  Dean Herbert · 2017-06-16 17:04:43 +09:00
  f2cac17188
• Merge pull request #938 from MrTheMake/numpad-enter

  Handle the numpad's Enter in cases where only the normal Enter was handled

  Dean Herbert · 2017-06-16 15:38:45 +09:00
  62a0c780af
• Merge branch 'master' into numpad-enter
  Dean Herbert · 2017-06-16 15:32:52 +09:00
  ae79ba48be
• We no longer need to pass in the control point.
  smoogipooo · 2017-06-16 13:12:36 +09:00
  ea87aca032
• CI fixes.
  smoogipooo · 2017-06-16 13:09:06 +09:00
  874db28478
• Implement proper expiry in test case.
  smoogipooo · 2017-06-16 13:06:44 +09:00
  c8a1933874
• Remove gross autoSizingAxes and life time.
  smoogipooo · 2017-06-16 13:00:08 +09:00
  5bac0919f0
• CI fixes.

  Update SpeedAdjustmentCollection.cs

  Dan Balasescu · 2017-06-16 11:48:14 +09:00
  6bfb716cc6
• We don't need to use Cached just yet.

  This was here to support dynamic re-ordering of hit objects and speed adjustment containers, however there needs to be more work done to TimingControlPoints/MultiplierControlPoints in general before this is possible.

  smoogipooo · 2017-06-16 10:53:02 +09:00
  41c6140435
• A bit more cleanup.
  smoogipooo · 2017-06-16 10:06:47 +09:00
  5d7336b235
• We don't need this to be protected anymore.
  smoogipooo · 2017-06-16 09:54:16 +09:00
  ff84a11c37
• Make SpeedAdjustmentCollection support unordered adds of speed adjustments and hit objects.
  smoogipooo · 2017-06-16 09:38:06 +09:00
  03b2b254ba
• Handle the numpad's Enter in cases where only the normal Enter was handled
  MrTheMake · 2017-06-15 23:06:28 +02:00
  06089a74e3
• Move speed adjustment code from ManiaHitRenderer to SpeedAdjustedHitRenderer.
  smoogipooo · 2017-06-15 19:34:28 +09:00
  fda220acbc
• Merge branch 'master' into timingchange-rework
  Dan Balasescu · 2017-06-15 16:23:51 +09:00
  6fd37ebc32
• Add comment.
  smoogipooo · 2017-06-15 16:15:41 +09:00
  aa830e435a
• Make hitobjects a bit more visual
  Dean Herbert · 2017-06-15 15:17:05 +09:00
  f07a31b2ca
• Add current time labels
  Dean Herbert · 2017-06-15 15:06:38 +09:00
  6679575c13
• Enforce exception better
  Dean Herbert · 2017-06-15 14:53:39 +09:00
  32226f90db
• Add a check to make sure all hitobjects use relativepositionaxes
  Dean Herbert · 2017-06-15 14:42:25 +09:00
  585e7ba312
• Add labels to playfield area
  Dean Herbert · 2017-06-15 14:40:30 +09:00
  021019648e
• Use a relative width definition
  Dean Herbert · 2017-06-15 14:36:41 +09:00
  149eaa64de
• Add xmldoc to MultiplierControlPoint
  Dean Herbert · 2017-06-15 14:20:54 +09:00
  63ca8a428d
• Set a more sane default for TimingControlPoint's BeatLength
  Dean Herbert · 2017-06-15 14:19:06 +09:00
  f439237bd7
• Tidy up testcase a bit
  Dean Herbert · 2017-06-15 14:16:47 +09:00
  cfb7e4f61a
• Merge pull request #931 from peppy/fix-hacky-tabs

  Fix hacky channel selector tab

  Dan Balasescu · 2017-06-13 19:51:51 +09:00
  df79fff996
• Merge remote-tracking branch 'origin/master' into fix-hacky-tabs
  smoogipooo · 2017-06-13 19:46:01 +09:00
  99a93d98dc
• Update framework.
  smoogipooo · 2017-06-13 19:45:01 +09:00
  cd2db315b8
• Merge pull request #932 from peppy/nuget-update

  Update nuget packages

  Dan Balasescu · 2017-06-13 16:07:19 +09:00
  0e7afc91fa
• Add readonly
  Dean Herbert · 2017-06-13 15:54:26 +09:00
  3ca80eb149
• Merge branch 'improved-loading-animation' into nuget-update
  Dean Herbert · 2017-06-13 15:50:21 +09:00
  19236dcd1e
• Merge branch 'master' into us
  Dean Herbert · 2017-06-13 15:46:53 +09:00
  178e2b716e
• Merge pull request #930 from EVAST9919/context_menu

  Context menu (osu-side)

  Dean Herbert · 2017-06-13 15:40:33 +09:00
  d6e042aec0
• Adjust appearance slightly
  Dean Herbert · 2017-06-13 15:27:47 +09:00
  700d6f9d38
• Move MenuItemType to correct namespace
  Dean Herbert · 2017-06-13 15:20:21 +09:00
  679786c76f
• Update framework
  Dean Herbert · 2017-06-13 14:01:56 +09:00
  cec9053f0b
• Update nuget packages

  - [ ] Depends on framework partner in crime https://github.com/ppy/osu-framework/pull/820

  Dean Herbert · 2017-06-13 11:50:46 +09:00
  41d4aee4f5
• Forgot to add dropdown-like animation
  EVAST9919 · 2017-06-12 13:39:45 +03:00
  9f8c66b8c6
• CI fixes
  EVAST9919 · 2017-06-12 13:37:13 +03:00
  41eb084191
• Context Menu
  EVAST9919 · 2017-06-12 12:56:07 +03:00
  1711258038
• update framework
  EVAST9919 · 2017-06-12 12:55:58 +03:00
  6c71e8447c
• Fix hacky tabs
  Dean Herbert · 2017-06-12 18:39:22 +09:00
  3efe8629d6
• Remove unused using.
  smoogipooo · 2017-06-12 17:32:28 +09:00
  95db62c385
• Add small test case to demonstrate usage.
  smoogipooo · 2017-06-12 17:31:24 +09:00
  56244e0134
• Improve the loading animation and use it in multiple places

  - Supersedes https://github.com/ppy/osu/pull/926.
  - [ ] Depends on https://github.com/ppy/osu-framework/pull/817.

  Dean Herbert · 2017-06-12 17:04:42 +09:00
  e94425f311
• Cleanups + xmldoc rewordings/improvements.
  smoogipooo · 2017-06-12 15:20:34 +09:00
  ba8014bbd9
• Merge remote-tracking branch 'origin/master' into timingchange-rework

  # Conflicts:
  #	osu-framework

  smoogipooo · 2017-06-12 13:09:02 +09:00
  419682b740