106 Commits

• Fix incorrect initialisation order causing mania key bindings to not work
  Dean Herbert · 2017-09-06 21:07:57 +09:00
  e834e0e958
• Fix typos
  Dean Herbert · 2017-08-24 20:32:55 +09:00
  2b667cf789
• Add more checks and remove direct cast
  Dean Herbert · 2017-08-24 20:31:57 +09:00
  c9f90efb8a
• Add documentation and regions to RulesetInputManager
  Dean Herbert · 2017-08-24 15:51:31 +09:00
  f0635af40d
• Update autoplay and replay handling to result in actions, not keys
  Dean Herbert · 2017-08-24 15:36:42 +09:00
  a7a7e0323f
• Move PlayerInputManager logic inside RulesetInputManager
  Dean Herbert · 2017-08-24 15:23:17 +09:00
  189988236b
• Make ScrollingPlayfield.Reversed protected; make ManiaPlayfield 'invertible'.
  smoogipooo · 2017-08-23 20:50:03 +09:00
  115e5c95af
• Merge branch 'master' into hardrock-flipping
  Dean Herbert · 2017-08-23 17:00:41 +09:00
  1f04995a73
• Fix replays not loading.
  smoogipooo · 2017-08-23 16:48:13 +09:00
  8ddc13e394
• Fix nullref.
  smoogipooo · 2017-08-23 13:39:51 +09:00
  84dd1283de
• Make RulesetContainer load KeyBindingInputManager in load()
  smoogipooo · 2017-08-23 12:47:47 +09:00
  be96fb32b3
• Merge branch 'master' into fix-speed-adjustments
  Dean Herbert · 2017-08-22 23:07:42 +09:00
  83bd430f89
• Add some more xmldoc.
  smoogipooo · 2017-08-22 21:08:27 +09:00
  f8576d44b1
• Merge branch 'master' into mania-key-conversion
  Dean Herbert · 2017-08-22 20:08:39 +09:00
  9f52ecbb8a
• Fix default comparator being inverted.
  smoogipooo · 2017-08-22 18:54:41 +09:00
  ad63cbf455
• Should be FirstOrDefault for hit objects occuriung before the first control point.
  smoogipooo · 2017-08-22 18:39:09 +09:00
  1964bc72e5
• Fix hit objects not getting added to the correct speed adjustment container.
  smoogipooo · 2017-08-22 18:37:10 +09:00
  137964b792
• Make the speed adjustment containers ordered decreasingly by their control point start time.
  smoogipooo · 2017-08-22 18:36:32 +09:00
  b46a51fd8b
• Explicitly store defaultSpeedAdjustment, and make it un-removable
  smoogipooo · 2017-08-22 16:15:50 +09:00
  0189f01402
• Fix further incorrect comparison.
  smoogipooo · 2017-08-22 16:10:58 +09:00
  5a3c0de7ad
• Add NUnit test for ScrollingHitObjectContainer

  Tests ordering of SpeedAdjustmentContainers and DrawableHitObjects added to the ScrollingHitObjectContainer.

  smoogipooo · 2017-08-22 16:06:19 +09:00
  d20ea97e7f
• Add RemoveSpeedAdjustment
  smoogipooo · 2017-08-22 16:06:14 +09:00
  c3cfad4eb5
• Fix incorrect sorting of hit objects into SpeedAdjustmentContainers
  smoogipooo · 2017-08-22 16:06:09 +09:00
  4fc77be624
• Fix possible CollectionModifiedException while adding new SpeedAdjustmentContainers
  smoogipooo · 2017-08-22 16:06:04 +09:00
  6f662d721c
• Fix incorrect inequality with multiple speed adjustments at the same start time.
  smoogipooo · 2017-08-22 16:05:53 +09:00
  5fcd94880d
• Fix cherry pick issues.
  smoogipooo · 2017-08-22 14:18:17 +09:00
  68c7226d12
• Fix dofficulty calculators not working and make mania set the correct key count for non-mania specific maps.
  smoogipooo · 2017-08-22 14:07:39 +09:00
  88151eff3f
• Only set the number of availableColumns once, at ManiaRulesetContainer level.

  # Conflicts:
  #	osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
  #	osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs
  #	osu.Game/Rulesets/UI/RulesetContainer.cs

  smoogipooo · 2017-08-22 14:07:37 +09:00
  4eec59f669
• Remove now unneeded ApplyBeatmap.
  smoogipooo · 2017-08-22 14:05:28 +09:00
  964982e2e6
• Merge branch 'master' into action-key-counter
  Dean Herbert · 2017-08-21 17:47:19 +09:00
  7903f49d27
• CI.
  smoogipooo · 2017-08-21 16:24:16 +09:00
  6e0d2182cb
• Remove the concept of "queued hit objects", add a default speed adjustment.
  smoogipooo · 2017-08-21 16:17:00 +09:00
  5d13efa76d
• Remove type check for now
  Dean Herbert · 2017-08-21 12:50:48 +09:00
  a63923a497
• Update KeyCounterCollection to support action-based buttons
  Dean Herbert · 2017-08-21 12:39:22 +09:00
  16e96888ab
• Merge upstream/master in.
  Dean Herbert · 2017-08-18 22:20:45 +09:00
  bc7621607a
• Initial refactoring of key binding logic
  Dean Herbert · 2017-08-14 20:19:25 +09:00
  7c9d6c9c83
• Remove various scrolling container optimisations (removing when not alive).
  smoogipooo · 2017-08-09 16:19:09 +09:00
  d83c218e08
• Merge remote-tracking branch 'upstream/master' into catch

  # Conflicts:
  #	osu.Desktop.Tests/Visual/TestCaseScrollingPlayfield.cs

  Dean Herbert · 2017-08-09 15:08:43 +09:00
  976cff9af6
• Applied suggested changes.
  smoogipooo · 2017-08-09 14:24:47 +09:00
  a20753abc6
• Remove unused using.
  smoogipooo · 2017-08-09 13:38:12 +09:00
  431a9649a4
• HitRenderer -> RulesetContainer
  Dean Herbert · 2017-08-09 13:28:29 +09:00
  723e27353c
• Give HitRenderer a reference to Ruleset

  Used to get correct bindings for a mode (ActionMappingInputManager).

  Dean Herbert · 2017-08-09 13:05:52 +09:00
  7c0e7ebcd0
• Make ScrollingPlayfield store a list of SpeedAdjustments instead of a Container.

  Because they're removed from the container when they're not alive, and any further adding methods fail.

  smoogipooo · 2017-08-09 12:45:50 +09:00
  1c5584f068
• Make HitRenderer's Playfield public so it can be used in testing.
  smoogipooo · 2017-08-09 12:24:38 +09:00
  dfb47b571a
• Add custom actions for Catch

  Reworks input management for rulesets

  Dean Herbert · 2017-08-09 11:50:34 +09:00
  b88f37de45
• Use CompositeDrawable for HitObjectContainer. Removes a looooooot of generics 👍.
  smoogipooo · 2017-08-08 17:37:11 +09:00
  cae21869d0
• Fix not removing queued hit objects.
  smoogipooo · 2017-08-08 13:23:46 +09:00
  e54abe8d0a
• Allow DrawableHitObjects to be removed from a Playfield

  (cherry picked from commit 3926238be9)

  Dean Herbert · 2017-08-08 13:02:51 +09:00
  a95aa90adc
• Add reversing capability to ScrollingPlayfield.
  smoogipooo · 2017-08-08 12:59:50 +09:00
  c5ce86b9f3
• Line endings + license headers.
  smoogipooo · 2017-08-07 18:03:44 +09:00
  bd2ef4dc6b