1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 17:02:55 +08:00
Commit Graph

49896 Commits

Author SHA1 Message Date
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
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
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
NAGILSON
74ce009ed8 [WIP] Multiplayer Mods Regression Test 2022-03-21 22:46:20 -04:00
NAGILSON
17b639b404 Implement suggested change to wipe mods on multiplayer screen 2022-03-21 22:42:17 -04:00
Dan Balasescu
36772ec652
Merge pull request #17356 from apollo-dw/strict-tracking
Implement "Strict Tracking" mod in osu!
2022-03-22 07:32:36 +09:00
Dan Balasescu
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
Dean Herbert
9a2691c1bc Remove unnecessary schedule 2022-03-21 23:54:47 +09:00
Salman Ahmed
33acc5d720 Remove no longer valid comments 2022-03-21 14:06:53 +03:00
Salman Ahmed
058fbbbe6c Remove unused using directive 2022-03-21 14:06:36 +03:00
Salman Ahmed
5184a84478
Merge pull request #17387 from peppy/fix-follow-point-looping 2022-03-21 13:55:17 +03:00
Dean Herbert
e4b2242719 Fix follow point animations not looping
Because they do in stable. I don't know why but let's go with it.

Resolves issue reported in https://github.com/ppy/osu/discussions/17072.
2022-03-21 18:29:13 +09:00
Dean Herbert
ed66f86ac6 Update editor exit-without-safe tests to account for hold behaviour 2022-03-21 17:52:54 +09:00
Dean Herbert
2a696783af Remove unused const in SkinEditorOverlay 2022-03-21 17:33:56 +09:00
Dean Herbert
2f18c512cd Convert SkinEditorOverlay to an OverlayContainer to allow it to block input 2022-03-21 17:33:56 +09:00
Dean Herbert
3643f879e4 Add test coverage of skin editor settings slider not working via keyboard adjustments 2022-03-21 17:33:56 +09:00
Dean Herbert
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
Dean Herbert
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
Dean Herbert
b42081dd9b Add DangerousButton for use in popup dialogs 2022-03-21 16:06:45 +09:00
Dean Herbert
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
Dean Herbert
3bb01fd595 Fix close button animation not being applied correct on mouse down due to conflicting scales 2022-03-21 14:41:57 +09:00
Dean Herbert
7ca3beb7cc Also add fade to ChannelItem selected box 2022-03-21 14:41:42 +09:00
Dean Herbert
428e439f40 Remove space between '#' and channel name
This was in flyte's design (he was following discord) but doesn't feel
too correct when it's not aligned with anything else. We can revisit
this if/when we have better glyphs to represent channel types.
2022-03-21 14:36:56 +09:00
Dean Herbert
16caf2d30b Add slight animation when highlighting an unread channel 2022-03-21 14:34:54 +09:00
Dean Herbert
5104e4db21 Add step to TestSceneChannelListItem to actually select an item 2022-03-21 14:33:50 +09:00
Salman Ahmed
72c8ce7885
Merge pull request #17379 from peppy/fix-skin-editor-player-overlays 2022-03-21 08:32:08 +03:00
Dean Herbert
692362131e Add animation when mention pill appears (or a new message arrives) 2022-03-21 14:31:51 +09:00
Dean Herbert
11b050b66b Add slight fade when hovering ChannelListItems 2022-03-21 14:28:14 +09:00
Dean Herbert
9eda2f2df1 Remove box surrounding close button 2022-03-21 14:25:29 +09:00
Dean Herbert
f922a6b556 Rename renaming button/pill classes 2022-03-21 14:15:22 +09:00