38668 Commits

This Branch

This Branch

All Branches

• Merge branch 'master' into editor-file-drop-support
  Dean Herbert · 2020-10-05 17:48:06 +09:00
  2ed43c14f8
• Merge branch 'master' into skin-slider-end-circle-support
  Dean Herbert · 2020-10-05 17:45:51 +09:00
  f0b5ba9534
• Merge branch 'master' into dynamic-difficulty-icon
  Dean Herbert · 2020-10-05 17:37:01 +09:00
  365a38e92f
• Merge branch 'master' into more-timeline-toggles
  Dan Balasescu · 2020-10-05 17:33:18 +09:00
  16a599850c
• Merge pull request #10371 from peppy/fix-gameplay-seek-sample-pausing

  Fix seeking in replays not correctly pausing samples

  Dan Balasescu · 2020-10-05 17:13:43 +09:00
  12c84df208
• Merge pull request #10373 from peppy/fix-hitobject-samples-cut-off

  Don't stop non-looping samples immediately when pausing

  Dan Balasescu · 2020-10-05 17:13:11 +09:00
  0c93de858e
• Merge pull request #10352 from peppy/fix-spinner-rewind-crash

  Fix spinner crashing on rewind

  Dan Balasescu · 2020-10-05 16:26:22 +09:00
  38b99a5f42
• Rename method back and add xmldoc
  Dean Herbert · 2020-10-05 16:24:02 +09:00
  c622adde7a
• Merge branch 'master' into fix-gameplay-seek-sample-pausing
  Dean Herbert · 2020-10-05 16:21:28 +09:00
  d43ea68709
• Fix incorrect parent state transfer
  Dean Herbert · 2020-10-05 16:20:29 +09:00
  0605bb9b8d
• Merge pull request #10330 from peppy/editor-timing-screen-change-handling

  Add change handler callbacks from timing screen / components

  Dan Balasescu · 2020-10-05 16:10:46 +09:00
  421e061fd1
• Merge branch 'master' into editor-timing-screen-change-handling
  Dan Balasescu · 2020-10-05 15:40:43 +09:00
  d3e1da5922
• Merge branch 'master' into fix-spinner-rewind-crash
  Dan Balasescu · 2020-10-05 15:32:52 +09:00
  692ca87bec
• Update tests
  Dean Herbert · 2020-10-05 15:18:28 +09:00
  a69b1636be
• Fix missing line
  Dean Herbert · 2020-10-05 15:12:34 +09:00
  9f43dedf59
• Don't stop non-looping samples immediately when pausing
  Dean Herbert · 2020-10-05 15:07:46 +09:00
  758088672c
• Merge pull request #10366 from peppy/fix-editor-save-new-beatmap

  Fix editor persisting new beatmap even when user chooses not to

  Dan Balasescu · 2020-10-05 14:38:43 +09:00
  39f1ceb2ad
• Fix StabilityGameClock not being updated
  Dean Herbert · 2020-10-05 14:27:51 +09:00
  ae8bf8cdd4
• Fix sample disabled status not being updated correctly from seek state
  Dean Herbert · 2020-10-05 14:27:51 +09:00
  e4710f82ec
• Fix FrameStabilityContainer not re-caching its GameplayClock correctly
  Dean Herbert · 2020-10-05 14:27:51 +09:00
  af7d10afe0
• Remove unnecessary IsSeeking checks from taiko drum implementation
  Dean Herbert · 2020-10-05 14:27:51 +09:00
  2a46f905ff
• Add failing test coverage of gameplay sample pausing (during seek)
  Dean Herbert · 2020-10-05 14:27:51 +09:00
  e1c4c8f3d5
• Add comment making mania test behaviour clearer
  Dean Herbert · 2020-10-05 14:22:48 +09:00
  7fead6ee41
• Account for potentially longer non-last objects
  Dean Herbert · 2020-10-05 14:04:04 +09:00
  4b81880655
• Ensure there's a buffer after the last hitobject to allow certain replay tests to complete correctly
  Dean Herbert · 2020-10-05 13:29:36 +09:00
  21bf93a7c2
• Ensure virtual track time is long enough for test beatmaps
  Dean Herbert · 2020-10-05 13:23:37 +09:00
  a8cbd400d3
• Merge pull request #10349 from bdach/health-adjustments
  Dean Herbert · 2020-10-05 11:02:13 +09:00
  e41085dbb5
• Allow confineMouseTracker to be null
  Shane Woolcock · 2020-10-05 11:54:39 +10:30
  a483dfd2d7
• Use current OverlayActivationMode to determine confine logic
  Shane Woolcock · 2020-10-05 11:11:46 +10:30
  5859755886
• Merge branch 'master' into confine-during-gameplay

  # Conflicts:
  #	osu.Game/Configuration/OsuConfigManager.cs
  #	osu.Game/OsuGame.cs
  #	osu.Game/Screens/Play/Player.cs

  Shane Woolcock · 2020-10-05 10:23:37 +10:30
  4b6f893408
• Merge pull request #10365 from peppy/update-framework

  Update framework

  Dean Herbert · 2020-10-05 00:21:01 +09:00
  e56b2ad06b
• Merge pull request #10363 from bdach/fix-spinners-crashing-on-unpause

  Fix spinners crashing on unpause

  Dean Herbert · 2020-10-05 00:06:31 +09:00
  e3d9687be4
• Add test coverage of exit-without-save
  Dean Herbert · 2020-10-04 23:57:35 +09:00
  432ba7cdf9
• Change exit logic to be more test-friendly
  Dean Herbert · 2020-10-04 23:57:28 +09:00
  9ca0e48acc
• Update framework
  Dean Herbert · 2020-10-04 23:47:47 +09:00
  1b02c814d6
• Fix the editor saving new beatmaps even when the user chooses not to
  Dean Herbert · 2020-10-04 23:47:16 +09:00
  02e4f3ddaf
• Ensure true gameplay rate is finite when paused externally
  Bartłomiej Dach · 2020-10-04 14:54:51 +02:00
  6f2b991b32
• Add failing test cases
  Bartłomiej Dach · 2020-10-04 14:54:51 +02:00
  ad42ce5639
• Merge branch 'master' into health-adjustments
  Dean Herbert · 2020-10-04 21:38:40 +09:00
  5dea37792c
• Merge pull request #10343 from bdach/hitresult-miss-fixes

  Replace direct references to HitResult.Miss wherever applicable

  Dean Herbert · 2020-10-04 21:36:26 +09:00
  ec30ca24c5
• Merge branch 'master' into osu-selection-scaling
  Bartłomiej Dach · 2020-10-04 13:28:59 +02:00
  a366591d6d
• Merge branch 'master' into more-timeline-toggles
  Bartłomiej Dach · 2020-10-04 12:53:10 +02:00
  7957773d58
• Merge pull request #10331 from peppy/fix-broken-ctor-tests

  Fix tests specifying steps in their constructors

  Bartłomiej Dach · 2020-10-04 12:51:36 +02:00
  1559bc7c3b
• Merge branch 'master' into fix-broken-ctor-tests
  Bartłomiej Dach · 2020-10-04 11:31:36 +02:00
  439f4a2e3f
• Apply same fix for miss-triggering case

  See 5888ecd - the same fix is applied here, but in the miss case.

  Bartłomiej Dach · 2020-10-03 21:11:34 +02:00
  26eff0120d
• Fix spinner crashing on rewind
  Dean Herbert · 2020-10-04 01:08:24 +09:00
  5888ecdeb1
• Rename HitCirclesCount -> HitCircleCount.
  Lucas A · 2020-10-03 16:52:33 +02:00
  27cc6c5046
• Remove unused WorkingBeatmap argument.
  Lucas A · 2020-10-03 16:51:22 +02:00
  d7747ebb2d
• Merge branch 'master' into health-adjustments
  Dean Herbert · 2020-10-03 22:50:19 +09:00
  a864f2906f
• Test HitResultExtensions methods
  Endrik Tombak · 2020-10-03 14:21:40 +03:00
  d87e4c524c