Commit Graph

31835 Commits

Author SHA1 Message Date
0275e974e5 Merge branch 'master' into multiplayer-countdown-timers-2 2022-03-24 17:24:00 +09:00
e3f8bc0588 Revert Availability to private 2022-03-24 17:15:17 +09:00
528ffea38d Fix incorrect event binding 2022-03-24 17:11:08 +09:00
dfa076c169 Refactor cancellation logic 2022-03-24 16:29:59 +09:00
4c0d76573c Asserate code is running on update thread 2022-03-24 15:51:30 +09:00
f0d132b16e Rename FinishCountdown() -> SkipToEndOfCountdown() 2022-03-24 15:21:46 +09:00
d2ecc100e5 Revert unnecessary async change 2022-03-24 15:07:24 +09:00
8f3a4df70a Add explanation for try-catch 2022-03-24 15:07:24 +09:00
d36944ac95 Dispose token manually
Cover more branches with cancellation source disposal
2022-03-24 15:07:24 +09:00
96a447f68b Rename Multiplayer prefix to button classes 2022-03-24 14:28:38 +09:00
90c7945bca Re-remove PopoverButton class with better test fix 2022-03-24 14:26:31 +09:00
547418e47e Revert "Remove PopoverButton class"
This reverts commit 6b712be97d.
2022-03-24 11:15:51 +09:00
c079a9cd32 Add comment regarding equality check importance in LegacyHitSampleInfo 2022-03-23 20:18:44 +09:00
997c091a8d Revert "Remove IsLayered from LegacyHitSampleInfo comparison"
This reverts commit 4523393208.
2022-03-23 20:15:17 +09:00
2ea9e5245c Revert "Remove IsLayered from GetHasCode implementation"
This reverts commit 16ee6b5fc7.
2022-03-23 20:15:13 +09:00
34a367b369 Merge branch 'master' into multiplayer-countdown-timers-2 2022-03-23 15:40:50 +09:00
a83a90e675 Rename countdown Delay -> Duration 2022-03-23 15:21:16 +09:00
f7c0047206 Send time remaining in countdowns instead 2022-03-23 15:19:43 +09:00
657daf07d7 Update LocalisationAnalyser to support .net6 2022-03-23 11:03:24 +09:00
d4ad4ac9db Limit countdown updates to once per second 2022-03-23 10:50:05 +09:00
6b712be97d Remove PopoverButton class 2022-03-23 10:40:38 +09:00
9138aaf780 Split MultiplayerReadyButton 2022-03-23 10:38:56 +09:00
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
8591630e5c Merge branch 'master' into editor-exit-harsh-blocking 2022-03-23 07:06:25 +09:00
51a1721bc9 Fix unprotected access to potentially-null DI'd dialog overlay 2022-03-22 22:10:05 +01:00
f3aad77239 Remove unused local variable 2022-03-22 22:00:24 +01:00
a38bafab91 Remove unused using directive 2022-03-22 22:00:05 +01:00
8647bebdca Merge branch 'master' into hold-to-discard-changes 2022-03-22 20:37:43 +01:00
8192fb47fe Merge branch 'master' into skin-editor-eat-input 2022-03-22 19:22:48 +01:00
ff8352b749 Merge branch 'master' into screen-mod-retention 2022-03-22 17:27:26 +09:00
483fb84b56 Fix typo in FinishCountdown method 2022-03-22 16:50:13 +09:00
61ddf1e6cf Disallow exiting the editor without saving (unless explicitly confirming) 2022-03-22 15:42:56 +09:00
f95bd89166 Revert editor exit behaviour to exit without changes for now 2022-03-22 14:46:57 +09:00
fb7f9a81db Remove unnecessary equality check in skin editor construction path 2022-03-22 14:35:13 +09:00
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
4630aa15cc Apply refactorings according to reviews 2022-03-22 12:54:19 +09:00
17b639b404 Implement suggested change to wipe mods on multiplayer screen 2022-03-21 22:42:17 -04:00
36772ec652 Merge pull request #17356 from apollo-dw/strict-tracking
Implement "Strict Tracking" mod in osu!
2022-03-22 07:32:36 +09:00
aea03ca21d Merge pull request #17359 from frenzibyte/fix-score-panel-max-combo
Improve method of retrieving beatmap maximum combo for results score panels
2022-03-22 06:28:30 +09:00
9a2691c1bc Remove unnecessary schedule 2022-03-21 23:54:47 +09:00
33acc5d720 Remove no longer valid comments 2022-03-21 14:06:53 +03:00
058fbbbe6c Remove unused using directive 2022-03-21 14:06:36 +03:00
2a696783af Remove unused const in SkinEditorOverlay 2022-03-21 17:33:56 +09:00
2f18c512cd Convert SkinEditorOverlay to an OverlayContainer to allow it to block input 2022-03-21 17:33:56 +09:00
3643f879e4 Add test coverage of skin editor settings slider not working via keyboard adjustments 2022-03-21 17:33:56 +09:00
36868dbdb4 Add the ability to override the user setting for hold-to-confirm containers
Sometimes the user is not right.
2022-03-21 16:07:27 +09:00
d811a70f4b Change button types on editor exit dialog to match purpose
Addresses https://github.com/ppy/osu/discussions/17363.
2022-03-21 16:06:59 +09:00
b42081dd9b Add DangerousButton for use in popup dialogs 2022-03-21 16:06:45 +09:00
31570d3114 Merge pull request #17252 from jai-x/new-chat-channel-control
Implement `ChannelListItem` for new chat design
2022-03-21 15:41:00 +09:00
3bb01fd595 Fix close button animation not being applied correct on mouse down due to conflicting scales 2022-03-21 14:41:57 +09:00