49931 Commits

This Branch

This Branch

All Branches

• Merge branch 'master' into fix-realm-import-test-assert-failure
  Bartłomiej Dach · 2022-03-24 21:48:10 +01:00
  b76cd2beae
• Merge pull request #17326 from smoogipoo/multiplayer-countdown-timers-2

  Implement multiplayer countdown timers

  Dean Herbert · 2022-03-24 17:50:53 +09:00
  d7faff15c0
• Merge branch 'master' into multiplayer-countdown-timers-2
  Dean Herbert · 2022-03-24 17:24:00 +09:00
  0275e974e5
• Revert Availability to private
  Dean Herbert · 2022-03-24 17:15:17 +09:00
  e3f8bc0588
• Fix incorrect event binding
  Dan Balasescu · 2022-03-24 17:11:08 +09:00
  528ffea38d
• Refactor cancellation logic
  Dan Balasescu · 2022-03-24 16:29:59 +09:00
  dfa076c169
• Asserate code is running on update thread
  Dan Balasescu · 2022-03-24 15:51:30 +09:00
  4c0d76573c
• Rename FinishCountdown() -> SkipToEndOfCountdown()
  Dan Balasescu · 2022-03-24 15:21:46 +09:00
  f0d132b16e
• Revert unnecessary async change
  Dan Balasescu · 2022-03-24 15:07:24 +09:00
  d2ecc100e5
• Add explanation for try-catch
  Dan Balasescu · 2022-03-24 15:07:24 +09:00
  8f3a4df70a
• Dispose token manually

  Cover more branches with cancellation source disposal

  Dan Balasescu · 2022-03-24 15:07:24 +09:00
  d36944ac95
• Rename Multiplayer prefix to button classes
  Dan Balasescu · 2022-03-24 14:28:38 +09:00
  96a447f68b
• Re-remove PopoverButton class with better test fix
  Dan Balasescu · 2022-03-24 14:26:31 +09:00
  90c7945bca
• Fix realm potentially not being refreshed in time for test asserts in BeatmapImporterTests

  As seen at https://github.com/ppy/osu/runs/5659368512?check_suite_focus=true
  
  Went through every usage of `.Import` and added either an
  `EnsureLoaded`, or where that provides too many checks, an explicit
  `realm.Refresh()`.

  Dean Herbert · 2022-03-24 12:59:17 +09:00
  4d0b4c2541
• Merge pull request #17419 from peppy/fix-hitsound-regresssssssion

  Fix hitsounds not always playing when they should

  Dan Balasescu · 2022-03-24 11:53:18 +09:00
  3b97de04b7
• Revert "Remove PopoverButton class"

  This reverts commit 6b712be97d.

  Dan Balasescu · 2022-03-24 11:15:51 +09:00
  547418e47e
• Add comment regarding equality check importance in LegacyHitSampleInfo
  Dean Herbert · 2022-03-23 20:18:44 +09:00
  c079a9cd32
• Revert "Remove IsLayered from LegacyHitSampleInfo comparison"

  This reverts commit 4523393208.

  Dean Herbert · 2022-03-23 20:15:17 +09:00
  997c091a8d
• Revert "Remove IsLayered from GetHasCode implementation"

  This reverts commit 16ee6b5fc7.

  Dean Herbert · 2022-03-23 20:15:13 +09:00
  2ea9e5245c
• Merge branch 'master' into multiplayer-countdown-timers-2
  Dan Balasescu · 2022-03-23 15:40:50 +09:00
  34a367b369
• Rename countdown Delay -> Duration
  Dan Balasescu · 2022-03-23 15:21:16 +09:00
  a83a90e675
• Send time remaining in countdowns instead
  Dan Balasescu · 2022-03-23 15:19:43 +09:00
  f7c0047206
• Merge pull request #17414 from peppy/update-localisation-analyser

  Update LocalisationAnalyser to support .net6

  Dan Balasescu · 2022-03-23 11:41:11 +09:00
  999ddff3d4
• Update LocalisationAnalyser to support .net6
  Dean Herbert · 2022-03-23 11:03:24 +09:00
  657daf07d7
• Limit countdown updates to once per second
  Dan Balasescu · 2022-03-23 10:50:05 +09:00
  d4ad4ac9db
• Remove PopoverButton class
  Dan Balasescu · 2022-03-23 10:40:38 +09:00
  6b712be97d
• Split MultiplayerReadyButton
  Dan Balasescu · 2022-03-23 10:38:56 +09:00
  9138aaf780
• Merge pull request #17400 from nagilson/screen-mod-retention

  Fix mods from single player carrying over to multiplayer

  Dan Balasescu · 2022-03-23 08:36:15 +09:00
  1ffa1e1219
• Merge pull request #17403 from peppy/editor-exit-harsh-blocking

  Disallow exiting the editor without saving (unless explicitly confirming)

  Dan Balasescu · 2022-03-23 07:45:31 +09:00
  cda46ec8a3
• Merge branch 'master' into editor-exit-harsh-blocking
  Dan Balasescu · 2022-03-23 07:06:25 +09:00
  8591630e5c
• Merge pull request #17384 from peppy/hold-to-discard-changes

  Add hold-to-confirm flow for discarding editor changes

  Dan Balasescu · 2022-03-23 07:05:56 +09:00
  d84865ff76
• Fix unprotected access to potentially-null DI'd dialog overlay
  Bartłomiej Dach · 2022-03-22 22:10:05 +01:00
  51a1721bc9
• Remove unused local variable
  Bartłomiej Dach · 2022-03-22 22:00:24 +01:00
  f3aad77239
• Remove unused using directive
  Bartłomiej Dach · 2022-03-22 22:00:05 +01:00
  a38bafab91
• Merge branch 'master' into hold-to-discard-changes
  Bartłomiej Dach · 2022-03-22 20:37:43 +01:00
  8647bebdca
• Merge pull request #17386 from peppy/skin-editor-eat-input

  Fix keyboard controls not working to adjust skin settings

  Bartłomiej Dach · 2022-03-22 19:52:01 +01:00
  2f01129322
• Merge branch 'master' into skin-editor-eat-input
  Bartłomiej Dach · 2022-03-22 19:22:48 +01:00
  8192fb47fe
• Remove unnecessary local
  Bartłomiej Dach · 2022-03-22 19:13:22 +01:00
  c8d48f89e8
• Fix test not actually testing desired scenario anymore

  The test was checking the test scene's own `SelectedMods` bindable
  rather than the multiplayer screen's, and the former was never actually
  being mutated by anything. Therefore the case would pass even on
  `master` with the fix reverted.

  Bartłomiej Dach · 2022-03-22 19:04:32 +01:00
  94c5207f36
• Merge pull request #17406 from mcpower/vscode-recommended-extensions

  Add C# extension to recommended VS Code extensions

  Dean Herbert · 2022-03-22 19:18:05 +09:00
  6e55d7df02
• Add C# extension to recommended VS Code extensions

  The [official C# extension] is maintained by Microsoft and enables
  IDE-like support for C# in VS Code.
  
  If a user opens this repository in VS Code, they will be prompted to
  install it if they haven't already installed it. After installation, the
  extension will also prompt the user to install the .NET SDK if it's not
  found.
  
  [official C# extension]: https://marketplace.visualstudio.com/items?itemName=ms-dotnettools.csharp

  mcpower · 2022-03-22 20:33:27 +11:00
  5631726164
• Move and refactor test in line with functionality changes
  Dean Herbert · 2022-03-22 17:38:43 +09:00
  804e856160
• Merge branch 'master' into screen-mod-retention
  Dean Herbert · 2022-03-22 17:27:26 +09:00
  ff8352b749
• Fix typo in FinishCountdown method
  Dean Herbert · 2022-03-22 16:50:13 +09:00
  483fb84b56
• Add missing async safeties to new tests
  Dean Herbert · 2022-03-22 16:46:42 +09:00
  2c4a6c2465
• Disallow exiting the editor without saving (unless explicitly confirming)
  Dean Herbert · 2022-03-22 15:42:56 +09:00
  61ddf1e6cf
• Revert editor exit behaviour to exit without changes for now
  Dean Herbert · 2022-03-22 14:46:57 +09:00
  f95bd89166
• Merge pull request #17401 from peppy/update-date-added-on-use-existing

  Fix beatmap date added not being updated on reimporting a soft deleted beatmap

  Dan Balasescu · 2022-03-22 14:41:07 +09:00
  056e568ffb
• Remove unnecessary equality check in skin editor construction path
  Dean Herbert · 2022-03-22 14:35:13 +09:00
  fb7f9a81db
• Fix beatmap date added not being updated on reimporting a soft deleted beatmap

  Addresses concerns raised in https://github.com/ppy/osu/discussions/17399.

  Dean Herbert · 2022-03-22 14:10:36 +09:00
  0fcb3bdba9