68115 Commits

This Branch

This Branch

All Branches

• Fix conflicts
  o-dasher · 2024-07-14 21:55:48 -03:00
  5fc6f1f4a5
• Merge remote-tracking branch 'origin/master' into flashlight-customization
  o-dasher · 2024-07-14 21:55:37 -03:00
  c56cc97e38
• Merge pull request #28832 from nekodex/ui-sfx-tweaks

  UI SFX Tweaks/Updates

  Dean Herbert · 2024-07-13 23:24:06 +09:00
  c854dfd6fb
• Update resources
  Dean Herbert · 2024-07-13 20:22:52 +09:00
  9ed97d03a8
• Merge pull request #28683 from frenzibyte/footer-v2-integration

  Replace local footer in existing sheared overlays (e.g. mod select & first-run setup) with `ScreenFooter`

  Dean Herbert · 2024-07-12 22:45:06 +09:00
  eb3f480a2a
• Move logoContainer local again
  Dean Herbert · 2024-07-12 22:01:20 +09:00
  9a1939a922
• Move logo depth to a forward passing
  Dean Herbert · 2024-07-12 22:01:20 +09:00
  e8f7213b3b
• Use separate samples for scrolling to top and scrolling to previous
  Jamie Taylor · 2024-07-12 21:01:19 +09:00
  320df7da2b
• Update sample looping behaviour to better suit new sample
  Jamie Taylor · 2024-07-12 21:01:19 +09:00
  ad2b354d9c
• Merge pull request #28831 from peppy/tooltips

  Add tooltips to summary timeline display

  Bartłomiej Dach · 2024-07-12 12:54:03 +02:00
  152e2d0d60
• Apply tooltip to bookmark pieces too

  Bookmarks don't show on real beatmaps, but they do show in test scenes
  (namely `TestSceneEditorSummaryTimeline`).
  
  Also does some more changes to adjust the markers to the latest updates
  to other markers.

  Bartłomiej Dach · 2024-07-12 11:12:20 +02:00
  217b01d303
• Fix nullability issue
  Dean Herbert · 2024-07-12 18:11:23 +09:00
  2453e2fd00
• Merge branch 'master' into tooltips
  Bartłomiej Dach · 2024-07-12 11:01:03 +02:00
  5e00995948
• Merge pull request #28788 from bdach/timeline-redesign

  Redesign editor timelines to address most frequent user complaints

  Bartłomiej Dach · 2024-07-12 10:58:59 +02:00
  518dc17518
• Merge pull request #28808 from frenzibyte/fix-all-notifications

  Fix confirm exit dialog potentially showing incorrect number of ongoing operations

  Bartłomiej Dach · 2024-07-12 10:56:29 +02:00
  452fbed681
• Reduce opacity of centre marker slightly
  Dean Herbert · 2024-07-12 17:23:48 +09:00
  4be5d056c5
• Add a bit more padding between node overlays and hitobjects in timeline
  Dean Herbert · 2024-07-12 17:22:36 +09:00
  d2cb07b157
• Add tooltips to summary timeline display
  Dean Herbert · 2024-07-12 16:39:41 +09:00
  2454722601
• Adjust timeline centre marker visuals and bring in front of ticks
  Dean Herbert · 2024-07-12 16:37:03 +09:00
  275e7aa451
• Fix test regression
  Dean Herbert · 2024-07-12 16:29:41 +09:00
  43addc8400
• Adjust timeline centre marker visuals and bring in front of ticks
  Dean Herbert · 2024-07-12 16:29:40 +09:00
  ca2fc72959
• Adjust breaks in timeline to be centered with waveform / hitobjects
  Dean Herbert · 2024-07-12 15:45:58 +09:00
  f65ab6736d
• Add slight offset for timeline BPM display to avoid overlaps
  Dean Herbert · 2024-07-12 14:34:01 +09:00
  2ad2ae0c16
• Adjust timeline ticks to add a bit more body back
  Dean Herbert · 2024-07-12 14:29:18 +09:00
  9a7a0cdb34
• Adjust various visuals of summary timeline in a hope for user acceptance

  .. with a somewhat appealing design.

  Dean Herbert · 2024-07-12 13:57:42 +09:00
  685b19a571
• Change red shade for timing control points
  Dean Herbert · 2024-07-12 13:39:40 +09:00
  e6b7d2530e
• Add back BPM and adjust sizing of bottom bar a bit more
  Dean Herbert · 2024-07-12 12:34:43 +09:00
  fb4f620c90
• Merge pull request #28823 from frenzibyte/remove-volume-key-arrow-handling

  Remove key arrow handling in `VolumeOverlay` to avoid conflicting with ruleset key bindings (i.e. osu!catch)

  Dean Herbert · 2024-07-12 01:21:21 +09:00
  911fa31ac0
• Update TestSceneFreeModSelectOverlay to work again
  Salman Ahmed · 2024-07-11 15:31:23 +03:00
  3ea0f58daa
• Fix footer content not accessible by overlay when overriden by a subclass
  Salman Ahmed · 2024-07-11 15:31:02 +03:00
  d4a4a059d4
• Add screen footer to ScreenTestScene
  Salman Ahmed · 2024-07-11 15:30:07 +03:00
  7a5624fd0e
• Fix ModSelectOverlay not hiding without a footer
  Salman Ahmed · 2024-07-11 14:56:17 +03:00
  669e945fc3
• Enable NRT in VolumeOverlay
  Salman Ahmed · 2024-07-11 14:29:56 +03:00
  bd44c17079
• Remove key arrow handling in VolumeOverlay
  Salman Ahmed · 2024-07-11 14:29:33 +03:00
  3190f8bb7e
• Revert some changes

  I can see `IsDisplayingToast` being removed and `IsPresent` becoming `=> Notifications.Any()` but I'll just leave this for another day.

  Salman Ahmed · 2024-07-11 14:23:11 +03:00
  7b541d378c
• Merge pull request #28821 from peppy/fix-editor-dim

  Fix editor UI transparency being incorrectly opaque when hovering slider control points

  Bartłomiej Dach · 2024-07-11 12:05:10 +02:00
  ccc4d288b2
• Merge branch 'master' into timeline-redesign
  Dean Herbert · 2024-07-11 18:38:17 +09:00
  95464ebf36
• Fix editor UI remaining transparent when switching away from compose tab

  Could still happen if using the keyboard F-key shortcuts. In that case
  the composer becomes non-present, so its `Update()` can't really do
  anything.

  Bartłomiej Dach · 2024-07-11 11:23:09 +02:00
  6801ccbbc5
• Merge pull request #28800 from peppy/file-mounting-v3

  Add ability to edit beatmap content externally

  Bartłomiej Dach · 2024-07-11 10:47:36 +02:00
  f1fa34e5d5
• Merge pull request #28805 from frenzibyte/select-all-on-focus

  Select all text when focusing sample bank/volume textboxes in editor (and number boxes in general)

  Dean Herbert · 2024-07-11 17:33:30 +09:00
  c139478aa2
• Also apply to timing textboxes
  Dean Herbert · 2024-07-11 16:54:27 +09:00
  7b0c1e3498
• Add error logging on failure to begin/end external edit
  Bartłomiej Dach · 2024-07-11 09:54:12 +02:00
  cc0d7e9981
• Set locally modified state for all externally modified beatmap(sets) that could not be mapped to online
  Bartłomiej Dach · 2024-07-11 09:44:33 +02:00
  ac467cf73a
• Add failing test steps for locally modified state not being set
  Bartłomiej Dach · 2024-07-11 09:43:00 +02:00
  a859978efd
• Fix editor UI transparency being incorrectly opaque when hovering slider control points

  As mentioned at
  https://github.com/ppy/osu/pull/28787#issuecomment-2221150025.

  Dean Herbert · 2024-07-11 16:41:21 +09:00
  fe421edd8f
• Merge branch 'master' into file-mounting-v3
  Dean Herbert · 2024-07-11 15:54:54 +09:00
  b5bb94e4ec
• Merge pull request #28818 from peppy/configure-a-wait-what-the-foo-bar

  Fix incorrect continuation in `ImportAsUpdate` causing UI blockage

  Dean Herbert · 2024-07-11 15:54:42 +09:00
  b1dd2ead30
• Merge pull request #28809 from bdach/mania-timeline-zooms-composer

  Match mania editor playfield time range with timeline zoom

  Dan Balasescu · 2024-07-11 15:41:26 +09:00
  00cab0ec0a
• Merge branch 'master' into fix-all-notifications
  Bartłomiej Dach · 2024-07-11 08:35:57 +02:00
  bfe34c9671
• Attempt to fix test failures by forcing refresh
  Bartłomiej Dach · 2024-07-11 08:18:16 +02:00
  a9c8c6e74d