54435 Commits

This Branch

This Branch

All Branches

• Update framework
  Dean Herbert · 2022-08-17 16:40:07 +09:00
  7191fbb6d6
• Merge pull request #19782 from OliBomby/slider-merger

  Add ability to merge hit objects in osu! editor to create sliders

  Dean Herbert · 2022-08-17 15:52:16 +09:00
  c3b3733307
• Merge pull request #19800 from peppy/fix-editor-ear-rape

  Fix slider ticks playing back at infinite rate while making changes to a slider in the editor

  Dan Balasescu · 2022-08-17 15:50:58 +09:00
  0cf3c5570a
• Merge pull request #19812 from peppy/improve-intro-timings-2

  Tweak intro timings more and ensure non-theme tracks play from preview point

  Dan Balasescu · 2022-08-17 15:50:42 +09:00
  aaaaff1bbf
• Fix nullref in tests as initialBeatmap may be null
  Dean Herbert · 2022-08-17 14:48:00 +09:00
  21b364cd77
• Restore original event flow to allow for OnSuspend case to work correctly
  Dean Herbert · 2022-08-17 14:32:21 +09:00
  6b9dec5996
• Move delegate debounce logic to Editor itself
  Dean Herbert · 2022-08-17 14:04:57 +09:00
  8ce50e98a6
• Remove newline
  Dan Balasescu · 2022-08-17 13:48:06 +09:00
  8b5ac55fca
• Merge branch 'master' into slider-merger
  Dean Herbert · 2022-08-17 13:36:15 +09:00
  615c5cf6ae
• Make changeHandler optional in convertToStream method to match new implementation
  Dean Herbert · 2022-08-17 13:35:44 +09:00
  0ff5547b83
• Tweak intro timings more and ensure non-theme tracks play from preview point
  Dean Herbert · 2022-08-17 13:20:40 +09:00
  d9346abb9c
• Allow preparing preview point without looping
  Dean Herbert · 2022-08-17 13:20:24 +09:00
  37799e3b31
• added test for objects which cant be merged
  OliBomby · 2022-08-16 23:05:35 +02:00
  d021218d78
• Merge pull request #19547 from peppy/editor-setup-no-state-change

  Fix multiple cases of mutations at editor setup screen not triggering a state save

  Bartłomiej Dach · 2022-08-16 22:19:12 +02:00
  f30d68cd4e
• Merge branch 'master' into editor-setup-no-state-change
  Bartłomiej Dach · 2022-08-16 21:46:43 +02:00
  1861f34427
• Merge pull request #19530 from peppy/store-modified-time

  Add `BeatmapInfo.LastUpdate` to track the time of local changes

  Dan Balasescu · 2022-08-16 20:20:41 +09:00
  e689d4be96
• Merge pull request #19594 from BlauFx/improve_retry_behaviour

  Skip song intro on quick restart

  Dan Balasescu · 2022-08-16 20:18:12 +09:00
  24fd411720
• Merge pull request #19802 from peppy/improve-intro-timings

  Improve intro timings when not using osu! theme

  Dan Balasescu · 2022-08-16 20:07:16 +09:00
  57f48ca4d0
• Merge pull request #19801 from peppy/fix-collection-reimport

  Fix re-importing existing collections not correctly adding new items

  Dan Balasescu · 2022-08-16 18:29:01 +09:00
  0769cdf050
• Improve intro timings when not using osu! theme

  Roughly as proposed in https://github.com/ppy/osu/discussions/19687.

  Dean Herbert · 2022-08-16 18:19:30 +09:00
  5ac314077a
• Fix re-importing existing collections not correctly adding new items
  Dean Herbert · 2022-08-16 16:43:05 +09:00
  1a7ddc0040
• Add a few more overlooked beatmap save states on setup screen modifications
  Dean Herbert · 2022-08-16 16:31:56 +09:00
  ee153a345c
• Merge branch 'master' into editor-setup-no-state-change
  Dean Herbert · 2022-08-16 16:28:29 +09:00
  5238a5c115
• Rename property to LastLocalUpdate
  Dean Herbert · 2022-08-16 16:01:19 +09:00
  11f38e539f
• Merge branch 'master' into store-modified-time
  Dean Herbert · 2022-08-16 15:53:51 +09:00
  c7db4a532c
• Avoid multiple iteration of LINQ query using a local
  Dean Herbert · 2022-08-16 15:39:23 +09:00
  0833a6fb9a
• Simplify context menu check by using existing mergeable object list
  Dean Herbert · 2022-08-16 15:39:23 +09:00
  7cc9fdbaa0
• Remove unnecessary null pre-checks
  Dean Herbert · 2022-08-16 15:36:43 +09:00
  ecb9351bab
• Use DI'd components from parent class rather than fetching locally
  Dean Herbert · 2022-08-16 15:35:32 +09:00
  e636fcd9b8
• Fix slider ticks playing back at infinite rate while making changes to a slider in the editor
  Dean Herbert · 2022-08-16 15:27:58 +09:00
  ea50936d71
• Merge pull request #19796 from peppy/fix-player-loader-tests-volume-adjustment

  Fix running `TestScenePlayerLoader` interactively leaving volume in a bad state

  Dan Balasescu · 2022-08-16 14:52:15 +09:00
  26568f7ac9
• Fix up flow of actual skip operation
  Dean Herbert · 2022-08-16 14:40:02 +09:00
  63819648df
• Make test actually test things
  Dean Herbert · 2022-08-16 14:40:02 +09:00
  9a1a7bae89
• Modify flow to avoid weird bindable and value resetting
  Dean Herbert · 2022-08-16 14:17:35 +09:00
  6761f869f9
• Fix running TestScenePlayerLoader interactively leaving volume in a bad state
  Dean Herbert · 2022-08-16 13:40:46 +09:00
  a15e6f19aa
• Merge branch 'master' into improve_retry_behaviour
  Dean Herbert · 2022-08-16 13:06:04 +09:00
  c9baadcf88
• remove nullable disable annotation
  OliBomby · 2022-08-15 21:15:23 +02:00
  d140e0df14
• Revert "remove copyright notice from new file"

  This reverts commit b5e5411348.

  OliBomby · 2022-08-15 21:11:06 +02:00
  7c2ada9b20
• remove copyright notice from new file
  OliBomby · 2022-08-15 18:07:55 +02:00
  b5e5411348
• added visual tests
  OliBomby · 2022-08-15 17:19:04 +02:00
  d261be8734
• added hotkey for merging selection
  OliBomby · 2022-08-15 17:18:55 +02:00
  3abc333813
• Merge pull request #19777 from peppy/even-nicer-frame-stability-clock

  Tidy up and document `FrameStabilityContainer`

  Bartłomiej Dach · 2022-08-15 17:06:59 +02:00
  adeabc632b
• Merge branch 'master' into even-nicer-frame-stability-clock
  Dan Balasescu · 2022-08-15 23:22:50 +09:00
  a2c911990c
• Merge pull request #19776 from peppy/even-less-gameplay-clock

  Remove `FrameStableClock` (and redirect usages to `FrameStabilityContainer`)

  Dan Balasescu · 2022-08-15 23:21:47 +09:00
  5a88f9c7ee
• Merge branch 'master' into even-less-gameplay-clock
  Bartłomiej Dach · 2022-08-15 13:23:42 +02:00
  1ef8bb2367
• Merge pull request #19775 from peppy/less-gameplay-clock

  Move all usage of `GameplayClock` to `IGameplayClock`

  Bartłomiej Dach · 2022-08-15 13:23:04 +02:00
  c334a84139
• Merge branch 'even-less-gameplay-clock' into even-nicer-frame-stability-clock
  Dean Herbert · 2022-08-15 20:22:30 +09:00
  43442dbf65
• Fix IsCatchingUp not being in correct state
  Dean Herbert · 2022-08-15 20:17:48 +09:00
  87760bbc06
• Seal FrameStabilityContainer

  No one should ever derive from this class. It is already too complex.

  Dean Herbert · 2022-08-15 19:31:02 +09:00
  1fc3d005c0
• Tidy up and document FrameStabilityContainer
  Dean Herbert · 2022-08-15 19:28:12 +09:00
  fff2b57905