Dean Herbert
0275e974e5
Merge branch 'master' into multiplayer-countdown-timers-2
2022-03-24 17:24:00 +09:00
Dean Herbert
e3f8bc0588
Revert Availability to private
2022-03-24 17:15:17 +09:00
Dan Balasescu
528ffea38d
Fix incorrect event binding
2022-03-24 17:11:08 +09:00
Dan Balasescu
dfa076c169
Refactor cancellation logic
2022-03-24 16:29:59 +09:00
Dan Balasescu
4c0d76573c
Asserate code is running on update thread
2022-03-24 15:51:30 +09:00
Dan Balasescu
f0d132b16e
Rename FinishCountdown() -> SkipToEndOfCountdown()
2022-03-24 15:21:46 +09:00
Dan Balasescu
d2ecc100e5
Revert unnecessary async change
2022-03-24 15:07:24 +09:00
Dan Balasescu
8f3a4df70a
Add explanation for try-catch
2022-03-24 15:07:24 +09:00
Dan Balasescu
d36944ac95
Dispose token manually
...
Cover more branches with cancellation source disposal
2022-03-24 15:07:24 +09:00
Dan Balasescu
96a447f68b
Rename Multiplayer prefix to button classes
2022-03-24 14:28:38 +09:00
Dan Balasescu
90c7945bca
Re-remove PopoverButton class with better test fix
2022-03-24 14:26:31 +09:00
Dan Balasescu
3b97de04b7
Merge pull request #17419 from peppy/fix-hitsound-regresssssssion
...
Fix hitsounds not always playing when they should
2022-03-24 11:53:18 +09:00
Dan Balasescu
547418e47e
Revert "Remove PopoverButton class"
...
This reverts commit 6b712be97d
2022-03-24 11:15:51 +09:00
Dean Herbert
c079a9cd32
Add comment regarding equality check importance in LegacyHitSampleInfo
2022-03-23 20:18:44 +09:00
Dean Herbert
997c091a8d
Revert "Remove IsLayered from LegacyHitSampleInfo comparison"
...
This reverts commit 4523393208
2022-03-23 20:15:17 +09:00
Dean Herbert
2ea9e5245c
Revert "Remove IsLayered from GetHasCode implementation"
...
This reverts commit 16ee6b5fc7
2022-03-23 20:15:13 +09:00
Dan Balasescu
34a367b369
Merge branch 'master' into multiplayer-countdown-timers-2
2022-03-23 15:40:50 +09:00
Dan Balasescu
a83a90e675
Rename countdown Delay -> Duration
2022-03-23 15:21:16 +09:00
Dan Balasescu
f7c0047206
Send time remaining in countdowns instead
2022-03-23 15:19:43 +09:00
Dan Balasescu
999ddff3d4
Merge pull request #17414 from peppy/update-localisation-analyser
...
Update LocalisationAnalyser to support .net6
2022-03-23 11:41:11 +09:00
Dean Herbert
657daf07d7
Update LocalisationAnalyser to support .net6
2022-03-23 11:03:24 +09:00
Dan Balasescu
d4ad4ac9db
Limit countdown updates to once per second
2022-03-23 10:50:05 +09:00
Dan Balasescu
6b712be97d
Remove PopoverButton class
2022-03-23 10:40:38 +09:00
Dan Balasescu
9138aaf780
Split MultiplayerReadyButton
2022-03-23 10:38:56 +09:00
Dan Balasescu
1ffa1e1219
Merge pull request #17400 from nagilson/screen-mod-retention
...
Fix mods from single player carrying over to multiplayer
2022-03-23 08:36:15 +09:00
Dan Balasescu
cda46ec8a3
Merge pull request #17403 from peppy/editor-exit-harsh-blocking
...
Disallow exiting the editor without saving (unless explicitly confirming)
2022-03-23 07:45:31 +09:00
Dan Balasescu
8591630e5c
Merge branch 'master' into editor-exit-harsh-blocking
2022-03-23 07:06:25 +09:00
Dan Balasescu
d84865ff76
Merge pull request #17384 from peppy/hold-to-discard-changes
...
Add hold-to-confirm flow for discarding editor changes
2022-03-23 07:05:56 +09:00
Bartłomiej Dach
51a1721bc9
Fix unprotected access to potentially-null DI'd dialog overlay
2022-03-22 22:10:05 +01:00
Bartłomiej Dach
f3aad77239
Remove unused local variable
2022-03-22 22:00:24 +01:00
Bartłomiej Dach
a38bafab91
Remove unused using directive
2022-03-22 22:00:05 +01:00
Bartłomiej Dach
8647bebdca
Merge branch 'master' into hold-to-discard-changes
2022-03-22 20:37:43 +01:00
Bartłomiej Dach
2f01129322
Merge pull request #17386 from peppy/skin-editor-eat-input
...
Fix keyboard controls not working to adjust skin settings
2022-03-22 19:52:01 +01:00
Bartłomiej Dach
8192fb47fe
Merge branch 'master' into skin-editor-eat-input
2022-03-22 19:22:48 +01:00
Bartłomiej Dach
c8d48f89e8
Remove unnecessary local
2022-03-22 19:13:22 +01:00
Bartłomiej Dach
94c5207f36
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.
2022-03-22 19:04:32 +01:00
Dean Herbert
6e55d7df02
Merge pull request #17406 from mcpower/vscode-recommended-extensions
...
Add C# extension to recommended VS Code extensions
2022-03-22 19:18:05 +09:00
mcpower
5631726164
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
2022-03-22 20:33:27 +11:00
Dean Herbert
804e856160
Move and refactor test in line with functionality changes
2022-03-22 17:38:43 +09:00
Dean Herbert
ff8352b749
Merge branch 'master' into screen-mod-retention
2022-03-22 17:27:26 +09:00
Dean Herbert
483fb84b56
Fix typo in FinishCountdown method
2022-03-22 16:50:13 +09:00
Dean Herbert
2c4a6c2465
Add missing async safeties to new tests
2022-03-22 16:46:42 +09:00
Dean Herbert
61ddf1e6cf
Disallow exiting the editor without saving (unless explicitly confirming)
2022-03-22 15:42:56 +09:00
Dean Herbert
f95bd89166
Revert editor exit behaviour to exit without changes for now
2022-03-22 14:46:57 +09:00
Dan Balasescu
056e568ffb
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
2022-03-22 14:41:07 +09:00
Dean Herbert
fb7f9a81db
Remove unnecessary equality check in skin editor construction path
2022-03-22 14:35:13 +09:00
Dean Herbert
0fcb3bdba9
Fix beatmap date added not being updated on reimporting a soft deleted beatmap
...
Addresses concerns raised in https://github.com/ppy/osu/discussions/17399 .
2022-03-22 14:10:36 +09:00
Dan Balasescu
4630aa15cc
Apply refactorings according to reviews
2022-03-22 12:54:19 +09:00
NAGILSON
33d97f53cb
Fill in assert details, remove whitespace
2022-03-21 22:58:53 -04:00
NAGILSON
aaf2edace9
remove code from old incorrect test
2022-03-21 22:48:08 -04:00
