67250 Commits

This Branch

This Branch

All Branches

• Avoid passing beatmap in from editor when it's already present
  Dean Herbert · 2024-05-29 21:32:55 +09:00
  d2c86b0813
• Merge branch 'master' into fix/editor-test-exit
  Dean Herbert · 2024-05-29 21:08:36 +09:00
  16e2fa2c6a
• Merge pull request #28339 from bdach/fix-legacy-body-piece-animation-not-resetting-sometimes

  Fix legacy mania note body animation not resetting sometimes

  Dan Balasescu · 2024-05-29 18:04:39 +09:00
  fa1da193ff
• Merge pull request #28309 from OliBomby/scale-tool

  Add precise scaling control to osu! editor

  Bartłomiej Dach · 2024-05-29 10:52:00 +02:00
  bf7dc715de
• Remove unused fields
  Bartłomiej Dach · 2024-05-29 10:18:22 +02:00
  84513343d6
• Merge branch 'master' into scale-tool
  Bartłomiej Dach · 2024-05-29 10:15:48 +02:00
  7b7e439d03
• Change editor scale hotkey to Ctrl-E

  Forgot that Ctrl-T was taken by the game-global toolbar already, so it
  wasn't working.

  Bartłomiej Dach · 2024-05-29 10:14:47 +02:00
  9477e3b67d
• Rename method
  Bartłomiej Dach · 2024-05-29 10:04:51 +02:00
  9bd4b0d613
• Simplify logic
  Bartłomiej Dach · 2024-05-29 10:01:04 +02:00
  ba40737356
• Use more generic tooltip copy
  Bartłomiej Dach · 2024-05-29 09:59:19 +02:00
  96a8bdf920
• Simplify toolbox button enable logic
  Bartłomiej Dach · 2024-05-29 09:49:16 +02:00
  bd5060965f
• Rename another method
  Bartłomiej Dach · 2024-05-29 09:43:09 +02:00
  4a8273b6ed
• Use better name if we're renaming
  Bartłomiej Dach · 2024-05-29 09:40:29 +02:00
  4c881b5633
• Merge pull request #28343 from Hecatia-Lapislazuli/reworked-slider-ball-rotation

  Always compute slider ball rotation based on tangent

  Dan Balasescu · 2024-05-29 14:23:19 +09:00
  ba3880ad54
• Merge pull request #24138 from tybug/negative-frame-handling

  Handle replay frames with negative time delta appropriately

  Dan Balasescu · 2024-05-29 13:46:24 +09:00
  98ad8f807a
• Merge branch 'master' into negative-frame-handling
  Dan Balasescu · 2024-05-29 13:14:59 +09:00
  655b0f5343
• SliderBall's rotation updates based on CurvePositionAt
  Aurelian · 2024-05-28 19:38:33 +02:00
  b74f66e335
• disable playfield centre origin when scaling slider and simplify logic
  OliBomby · 2024-05-28 18:27:01 +02:00
  9a18ba2699
• fix axis checkboxes being disabled in playfield origin scale
  OliBomby · 2024-05-28 17:24:31 +02:00
  9548585b15
• refactor CanScaleFromPlayfieldOrigin and GetClampedScale to derived class
  OliBomby · 2024-05-28 17:12:16 +02:00
  d143a697d2
• Bind axis checkbox disabled state to CanScaleX/Y
  OliBomby · 2024-05-28 16:57:24 +02:00
  7cdc755c16
• Merge pull request #28338 from peppy/update-framework

  Update framework

  Bartłomiej Dach · 2024-05-28 16:46:24 +02:00
  4828215674
• remove redundant CanScaleFromSelectionOrigin
  OliBomby · 2024-05-28 16:19:57 +02:00
  8eb23f8a60
• rename CanScaleSelectionOrigin/PlayfieldOrigin to make clear its not the origin being scaled
  OliBomby · 2024-05-28 16:14:16 +02:00
  a89ba33b47
• Change scale hotkey to Ctrl+T
  OliBomby · 2024-05-28 15:56:59 +02:00
  36453f6215
• Fix legacy mania note body animation not resetting sometimes

  Hopefully closes https://github.com/ppy/osu/issues/28284.
  
  As far as I can tell this is a somewhat difficult one to reproduce
  because it relies on a specific set of circumstances (at least the
  reproduction case that I found does). The reset to frame 0 would
  previously be called explicitly when `isHitting` changed:
  
      https://github.com/ppy/osu/blob/182ca145c78432f4b832c8ea407e107dfeaaa8ad/osu.Game.Rulesets.Mania/Skinning/Legacy/LegacyBodyPiece.cs#L144
  
  However, it can be the case that `bodyAnimation` is not loaded at the
  point of this call. This is significant because
  `SkinnableTextureAnimation` contains this logic:
  
      https://github.com/ppy/osu/blob/182ca145c78432f4b832c8ea407e107dfeaaa8ad/osu.Game/Skinning/LegacySkinExtensions.cs#L192-L211
  
  which cannot be moved any earlier (because any earlier the `Clock` may
  no longer be correct), and also causes the animation to be seeked
  forward while it is stopped.
  
  I can't figure out a decent way to layer this otherwise (by scheduling
  or whatever), so this commit is just applying the nuclear option of just
  seeking back to frame 0 on every update frame in which the body piece is
  not being hit.

  Bartłomiej Dach · 2024-05-28 15:29:15 +02:00
  bf0040447c
• Update framework
  Dean Herbert · 2024-05-28 21:29:29 +09:00
  c2e7cdfdcc
• Merge pull request #28183 from frenzibyte/footer-v2-back-button

  Add new footer back button and fix shearing being different between components

  Dean Herbert · 2024-05-28 18:49:24 +09:00
  182ca145c7
• Merge branch 'master' into footer-v2-back-button
  Dean Herbert · 2024-05-28 15:50:34 +09:00
  4408039b3e
• Merge pull request #28277 from bdach/total-score-without-mods-once-more

  Compute total score without mods during standardised score conversion

  Dan Balasescu · 2024-05-28 07:49:27 +09:00
  e2b4e25ffa
• Merge branch 'master' into total-score-without-mods-once-more
  Bartłomiej Dach · 2024-05-27 15:16:58 +02:00
  daee363743
• Merge pull request #28333 from peppy/preview-playlist-items

  Allow previewing audio of playlist items

  Bartłomiej Dach · 2024-05-27 14:22:49 +02:00
  c6c66fbd01
• Fix mod display not being aligned with mapper text
  Bartłomiej Dach · 2024-05-27 13:36:44 +02:00
  405c72c0d6
• Adjust size of play button / progress to match BeatmapCardThumbnail usage
  Dean Herbert · 2024-05-27 20:33:24 +09:00
  aad0982e26
• Pass the same thing in twice for better maybe
  Dean Herbert · 2024-05-27 20:30:01 +09:00
  75d961e6f2
• Standardise padding on both sides of difficulty icon
  Dean Herbert · 2024-05-27 19:59:25 +09:00
  d976224912
• Fix test failure
  Bartłomiej Dach · 2024-05-27 12:01:02 +02:00
  1f41261fc7
• Remove unused using directive
  Bartłomiej Dach · 2024-05-27 11:44:55 +02:00
  1e2cac3e92
• Allow previewing audio of playlist items
  Dean Herbert · 2024-05-27 17:09:37 +09:00
  b6471f0b9c
• Merge pull request #28332 from peppy/cinema-mod-overlay-hiding

  Fix cinema mod not hiding playfield skin layer

  Bartłomiej Dach · 2024-05-27 08:48:10 +02:00
  525663fc27
• Merge branch 'master' into cinema-mod-overlay-hiding
  Bartłomiej Dach · 2024-05-27 08:27:28 +02:00
  d22b72a75c
• Fix xmldoc reference
  Bartłomiej Dach · 2024-05-27 08:26:00 +02:00
  bdfce4b9da
• Merge pull request #28311 from Joppe27/taiko-glow-scale

  Correct scale of `taiko-glow` element to match stable

  Dean Herbert · 2024-05-27 15:19:06 +09:00
  5aa537f0c8
• Merge pull request #28327 from peppy/windows-16px-icon

  Revert windows 16px icon to original version

  Bartłomiej Dach · 2024-05-27 08:18:41 +02:00
  0aec8da102
• Fix cinema mod not hiding playfield skin layer
  Dean Herbert · 2024-05-27 14:52:28 +09:00
  11c3d11db9
• Share scale factor with hit target
  Dean Herbert · 2024-05-27 14:20:28 +09:00
  0d6adf160b
• Revert windows 16px icon to original version

  This also fixes the 48px version looking uncanny due to smaller paddings.

  Dean Herbert · 2024-05-27 11:42:36 +09:00
  a62b9fa633
• Correct scale of taiko-glow element
  Joppe27 · 2024-05-25 23:28:51 +02:00
  76f13b21da
• add axis toggles
  OliBomby · 2024-05-25 21:44:08 +02:00
  d4489545f2
• Enable scale buttons at the correct times
  OliBomby · 2024-05-25 20:35:06 +02:00
  37530eebcc