50382 Commits

This Branch

This Branch

All Branches

• Update framework
  Dean Herbert · 2022-04-08 18:09:57 +09:00
  ea4ca6d2ad
• Merge pull request #17703 from peppy/fix-storyboard-fallback-animation-frame-count-weirdness

  Fix `DrawableStoryboardAnimation` to handle skin fallback frame count similar to stable

  Dan Balasescu · 2022-04-08 17:01:17 +09:00
  975bb8cc2a
• Merge pull request #17714 from bdach/mod-overlay/multimod-incompatibility

  Ensure that mods grouped into multi mods are pairwise incompatible

  Dan Balasescu · 2022-04-08 16:43:06 +09:00
  c48f8d7b9b
• Merge pull request #17721 from peppy/multiplayer-client-thread-safety

  Add and assert thread safety of `MultiplayerClient.Room`

  Dan Balasescu · 2022-04-08 16:31:08 +09:00
  21b81b693d
• Fix typo in DrawableOsuHitObject
  Dean Herbert · 2022-04-08 15:20:22 +09:00
  879267862c
• Remove secondary null checks which cannot exist (were on wrong thread)
  Dean Herbert · 2022-04-08 14:56:04 +09:00
  933a722cfc
• Move null assert in MultiplayerPlayer on to update thread
  Dean Herbert · 2022-04-08 14:53:14 +09:00
  24c2d465a9
• Move null check in JoinRoom on to update thread
  Dean Herbert · 2022-04-08 14:52:56 +09:00
  64c63fe93a
• Rename scheduleAsync to runOnUpdateThreadAsync
  Dean Herbert · 2022-04-08 14:43:53 +09:00
  d50f41225f
• Ensure all access to MultiplayerClient.Room is on the update thread

  This was an implicit requirement until now, but not well documented
  everywhere. Adding this makes it much easier to understand the
  requirement (and probably safer).

  Dean Herbert · 2022-04-08 14:42:56 +09:00
  9ba99ed57d
• Fix test failure due to checking incompaatibility of flattened multi mods
  Bartłomiej Dach · 2022-04-08 00:16:50 +02:00
  282b220d94
• Make all OsuModObjectScaleTween implementations incompatible with each other
  Bartłomiej Dach · 2022-04-07 22:38:47 +02:00
  e99d0f9fae
• Make OsuMod{Blinds,Flashlight} incompatible
  Bartłomiej Dach · 2022-04-07 22:38:46 +02:00
  5e02ba353b
• Make all ModRateAdjust implementations incompatible with each other
  Bartłomiej Dach · 2022-04-07 22:38:46 +02:00
  6630b38c08
• Add test checking incompatibility of multi mods
  Bartłomiej Dach · 2022-04-07 22:38:46 +02:00
  112096768b
• Merge branch 'master' into fix-storyboard-fallback-animation-frame-count-weirdness
  Bartłomiej Dach · 2022-04-07 21:49:32 +02:00
  8175741a6c
• Merge pull request #17704 from peppy/bindable-safety-skin-editor

  Fix multiple issues with bindable safety in `SkinEditor` components

  Bartłomiej Dach · 2022-04-07 21:43:56 +02:00
  d256bd2cc7
• Add null check guards to unsubscriptions in Dispose()
  Bartłomiej Dach · 2022-04-07 21:37:42 +02:00
  71c0216c55
• Remove unused using directives
  Bartłomiej Dach · 2022-04-07 21:24:50 +02:00
  04db80848b
• Merge branch 'master' into bindable-safety-skin-editor
  Bartłomiej Dach · 2022-04-07 20:59:44 +02:00
  3016ce7817
• Merge pull request #17670 from perrymacmurray/clock

  Add support for 12-hour time on toolbar clock

  Bartłomiej Dach · 2022-04-07 20:58:58 +02:00
  926710beac
• Merge branch 'master' into clock
  Bartłomiej Dach · 2022-04-07 20:27:23 +02:00
  e658b63dbc
• Fix regressed digital clock width conditional
  Salman Ahmed · 2022-04-07 19:24:15 +03:00
  a616f5bc2a
• Fix potential null ref if UpdateTargetScreen is called too early
  Dean Herbert · 2022-04-07 23:42:42 +09:00
  11b4c5ca87
• Update various licence years to 2022
  Dean Herbert · 2022-04-07 22:05:04 +09:00
  0e92486240
• Merge pull request #17708 from frenzibyte/fix-texture-lookups-no-longer-handling-paths

  Fix skin texture lookups not handling paths with extensions

  Dean Herbert · 2022-04-07 22:01:40 +09:00
  c40b1bf30c
• Fix Use24HourDisplay conditional flipped
  Salman Ahmed · 2022-04-07 15:56:28 +03:00
  c323020fcf
• Fix skin texture lookups not handling paths with extensions
  Salman Ahmed · 2022-04-07 15:07:30 +03:00
  fb9fe4213d
• Add further test coverage against paths with extensions
  Salman Ahmed · 2022-04-07 15:05:08 +03:00
  5b29ddd2ed
• Fix multiple issues with bindable safety in SkinEditor components
  Dean Herbert · 2022-04-07 19:12:12 +09:00
  a4d3afd06d
• Make string read better
  Dean Herbert · 2022-04-07 18:20:15 +09:00
  b2c0eaeab4
• Remove incorrect and pointless complexity to width changes
  Dean Herbert · 2022-04-07 18:16:14 +09:00
  555aee7b6a
• Move default specification to configuration initial value
  Dean Herbert · 2022-04-07 18:13:23 +09:00
  7530fe5adf
• Rename variable and fix inspections
  Dean Herbert · 2022-04-07 18:11:30 +09:00
  37509e04a9
• Fix failing tests
  Dean Herbert · 2022-04-07 17:52:08 +09:00
  0674862b6c
• Change DrawableStoryboardAnimation to derive from TextureAnimation
  Dean Herbert · 2022-04-07 17:35:59 +09:00
  040afff670
• Fix DrawableStoryboardAnimation to handle skin fallback frame count similar to stable

  Reasoning is explained in the inline comment (basically, stable doesn't
  care what the user specifies as the frame count when falling back to
  skin resources).
  
  This change also removes on to two layers of drawables, which should be
  a win in heavy storyboards.

  Dean Herbert · 2022-04-07 17:35:56 +09:00
  cbc4e5319d
• Split out GetTextures helper function for LegacySkins
  Dean Herbert · 2022-04-07 17:28:48 +09:00
  93bdca5211
• Merge pull request #17700 from peppy/fix-skin-lookups-extension-specified

  Fix filename lookups on `LegacySkin`s going awry when extension is specified

  Dan Balasescu · 2022-04-07 17:03:27 +09:00
  f0698937b7
• Merge pull request #17701 from peppy/fix-storyboard-animation-sizing

  Fix storyboard animations getting incorrect positioning due to size not being set

  Dan Balasescu · 2022-04-07 17:00:39 +09:00
  5af93bd85d
• Fix DrawableStoryboardAnimation not specifying sizing correctly

  Usually this would be handled by `TextureAnimation`, but because we are
  inheriting from `DrawableAnimation` here for reasons, we needed to
  implement this ourselves. Follows the implementation in
  `TextureAnimation`.

  Dean Herbert · 2022-04-07 15:18:55 +09:00
  a7e262627f
• Merge pull request #17698 from Joehuu/fix-replay-button-local-being-disabled

  Fix replay button being disabled when available locally but not online

  Dean Herbert · 2022-04-07 14:18:02 +09:00
  eb0653fa7b
• Fix filename lookups on LegacySkins going awry when extension is specified

  Due to the logic present to handle `@2x` fallback, the extension was
  potentially being added at the wrong point in the filename. This change
  ensures that the lookup filenames are always correct.
  
  Closes https://github.com/ppy/osu/issues/17690.

  Dean Herbert · 2022-04-07 14:16:19 +09:00
  205edb65a2
• Merge pull request #17699 from nekodex/mp-countdown-sfx-2

  Add MP lobby 'warning' SFX for the final seconds of countdown

  Dean Herbert · 2022-04-07 14:13:29 +09:00
  04235ca76e
• Add test coverage of skin lookups failing when @2x and extension are present
  Dean Herbert · 2022-04-07 14:11:38 +09:00
  b7f8716de9
• Update resources
  Dean Herbert · 2022-04-07 13:35:07 +09:00
  9ed4f31048
• Move enabled setting to each case
  Joseph Madamba · 2022-04-06 21:22:56 -07:00
  358931842f
• Add MP lobby 'warning' SFX for the final seconds of countdown
  Jamie Taylor · 2022-04-07 13:12:33 +09:00
  8a73831115
• Fix replay button being disabled when available locally but not online
  Joseph Madamba · 2022-04-06 20:43:56 -07:00
  4432a93d09
• Add failing replay button enabled test asserts
  Joseph Madamba · 2022-04-06 20:43:56 -07:00
  edb556643e