6712 Commits

This Branch

This Branch

All Branches

• 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 remote-tracking branch 'origin/master' into fix-speed-adjustments
  smoogipooo · 2017-08-22 19:50:48 +09:00
  4c66a20d4e
• Fix ScrollingContainer possibly not getting the correct size to cover hit objects.
  smoogipooo · 2017-08-22 19:17:26 +09:00
  322dfe0250
• Merge pull request #1162 from peppy/nullref-fix

  Fix a nullref when reaching the results screen with no user provided

  Dan Balasescu · 2017-08-22 18:56:06 +09:00
  ad16f41e26
• Fix up + make test case more sane.
  smoogipooo · 2017-08-22 18:55:27 +09:00
  d64071f3de
• 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
• Remove permitNulls
  Dean Herbert · 2017-08-22 18:28:32 +09:00
  c5a20e3372
• Merge branch 'master' into nullref-fix
  Dean Herbert · 2017-08-22 18:19:15 +09:00
  acf5442ca3
• Merge pull request #1165 from peppy/move-screen-restrictions

  Fix backwards conditional causing crash at song select

  Dean Herbert · 2017-08-22 18:16:34 +09:00
  236a9ea728
• Merge branch 'master' into move-screen-restrictions
  Dean Herbert · 2017-08-22 17:52:59 +09:00
  fc076eaff3
• Merge pull request #1164 from smoogipooo/fix-speed-adjustments

  Fix hit objects not being given the correct speed adjustments

  Dean Herbert · 2017-08-22 17:52:44 +09:00
  398169782e
• Merge remote-tracking branch 'peppy/move-screen-restrictions' into fix-speed-adjustments
  smoogipooo · 2017-08-22 17:25:24 +09:00
  790e0561df
• Fix backwards conditional
  Dean Herbert · 2017-08-22 17:21:19 +09:00
  8f32fd28c9
• Merge branch 'master' into fix-speed-adjustments
  Dean Herbert · 2017-08-22 17:07:31 +09:00
  8df72e0fec
• Ensure score's user is set directly from API

  Previously would fail in visualtests due to `OsuGame` case.

  Dean Herbert · 2017-08-22 16:59:54 +09:00
  803cbddfe2
• Merge pull request #1163 from peppy/move-screen-restrictions

  Move beatmap/ruleset change restrictions to OsuGame

  Dan Balasescu · 2017-08-22 16:48:13 +09:00
  841805f8f0
• 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
• Move beatmap/ruleset change restrictions to OsuGame

  Allows test cases to more freely exist

  Dean Herbert · 2017-08-22 15:59:32 +09:00
  09dd0cabd6
• Merge pull request #1090 from tgi74/master

  Fix replays crashing and not finding their associated beatmap

  Dean Herbert · 2017-08-22 12:59:49 +09:00
  3254e16e9c
• Add comment and index on column
  Dean Herbert · 2017-08-22 12:42:35 +09:00
  31bb1ebe0e
• Merge branch 'master' into master
  Dean Herbert · 2017-08-22 12:35:36 +09:00
  881eecb528
• Merge pull request #1140 from jorolf/mask-settings-overlay

  mask the settings overlay

  Dean Herbert · 2017-08-22 00:30:11 +09:00
  7c0c0775ee
• Merge branch 'master' into mask-settings-overlay
  Dean Herbert · 2017-08-22 00:22:39 +09:00
  7693fc1382
• Merge pull request #1154 from peppy/chat-local-echo-v2

  Add local chat echo support

  Dan Balasescu · 2017-08-22 00:04:44 +09:00
  v2017.821.1 24eeaea5db
• Update framework
  Dean Herbert · 2017-08-21 23:46:37 +09:00
  5c489eb3f0
• Remove unnecessary using
  Dean Herbert · 2017-08-21 23:41:51 +09:00
  a9fe1d94f7
• Review fixes
  Dean Herbert · 2017-08-21 23:34:08 +09:00
  7d1c270126
• Restore usage of AddRange
  Dean Herbert · 2017-08-21 18:51:14 +09:00
  1d0b89d592
• Merge branch 'master' into chat-local-echo-v2
  Dean Herbert · 2017-08-21 18:27:32 +09:00
  102caf4b91
• Merge pull request #1151 from peppy/action-key-counter

  Update KeyCounterCollection to support action-based buttons

  Dean Herbert · 2017-08-21 18:27:24 +09:00
  fb43895908
• Merge branch 'master' into action-key-counter
  Dean Herbert · 2017-08-21 17:47:19 +09:00
  7903f49d27
• Add spaces for smoogipoo
  Dean Herbert · 2017-08-21 17:44:39 +09:00
  9ba2258f80
• Add local chat echo support
  Dean Herbert · 2017-08-21 17:43:26 +09:00
  877c69d5fe
• Merge pull request #1153 from smoogipooo/fix-taiko-barlines

  Fix taiko major bar lines not showing triangles

  Dean Herbert · 2017-08-21 17:10:11 +09:00
  5068bbfd87
• Merge branch 'master' into fix-taiko-barlines
  Dean Herbert · 2017-08-21 16:53:47 +09:00
  4ea82694bd
• Merge pull request #1150 from smoogipooo/fix-taiko-drumroll-conversion

  Fix TaikoBeatmapConverter attempting to convert taiko-specific drum rolls to hits

  Dean Herbert · 2017-08-21 16:53:31 +09:00
  26788e73c7
• Merge branch 'master' into fix-taiko-barlines
  Dean Herbert · 2017-08-21 16:46:25 +09:00
  52dadad1e1