259 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
• No longer flip legacy replay mouse positions.
  smoogipooo · 2017-08-23 15:30:17 +09:00
  7639e096d8
• Add variant names.
  smoogipooo · 2017-08-23 14:19:14 +09:00
  68e7cf854f
• 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
• Fix redundant initialiser
  Dean Herbert · 2017-08-22 23:43:10 +09:00
  ef2d9ffede
• Merge branch 'master' into fix_taiko_sizing
  Dean Herbert · 2017-08-22 23:19:41 +09:00
  6f8e85c2e1
• 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
• Determine size of ScrollingContainer a bit better to avoid taiko weirdness
  smoogipooo · 2017-08-22 20:53:19 +09:00
  d080a7e970
• Make hit objects put in ScrollingContainers strictly ordered by start time

  This won't change anything as is since all hit objects are given a depth at the moment.

  smoogipooo · 2017-08-22 20:51:20 +09:00
  db27551709
• Merge branch 'master' into mania-key-conversion
  Dean Herbert · 2017-08-22 20:08:39 +09:00
  9f52ecbb8a
• Fix ScrollingContainer possibly not getting the correct size to cover hit objects.
  smoogipooo · 2017-08-22 19:17:26 +09:00
  322dfe0250
• 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
• Set ScrollingAxes and RelativeChildOffset a bit more safely.
  smoogipooo · 2017-08-22 18:37:49 +09:00
  e5d985838f
• 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
• CI fixes.
  smoogipooo · 2017-08-22 16:06:25 +09:00
  a737f5fe0d
• 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
• Let's not construct scrolling containers in load() for now

  This isn't utilized at the moment, and we should be avoiding this here in the first place.

  smoogipooo · 2017-08-22 16:05:59 +09:00
  b7b8d8b764
• 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 master
  Dean Herbert · 2017-08-22 12:35:36 +09:00
  881eecb528
• Merge branch 'master' into action-key-counter
  Dean Herbert · 2017-08-21 17:47:19 +09:00
  7903f49d27
• Merge branch 'master' into fix-taiko-barlines
  Dean Herbert · 2017-08-21 16:46:25 +09:00
  52dadad1e1
• Merge branch 'master' into action-key-counter
  Dean Herbert · 2017-08-21 16:25:44 +09:00
  ea450fecf5
• 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
• Further support for null judgements.
  smoogipooo · 2017-08-21 15:35:16 +09:00
  7a5708ce92
• 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
• Make DifficultyControlPoint.SpeedMultiplier actually increase with an increasing speed. Fixes #1147
  smoogipooo · 2017-08-21 11:58:54 +09:00
  6a7b410bc3
• Merge upstream/master in.
  Dean Herbert · 2017-08-18 22:20:45 +09:00
  bc7621607a