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

9897 Commits

Author SHA1 Message Date
Jamie Taylor
753463fadb
Fix code style 2024-07-04 15:01:37 +09:00
Jamie Taylor
681398059e
Merge branch 'master' into audio-ducking-fx 2024-07-04 14:28:37 +09:00
Jamie Taylor
d948193757
Change Duck() to be IDisposable and prevent overlapping usages 2024-07-04 14:23:35 +09:00
Salman Ahmed
585e09981f Allow scrollbar to overlap content
The content is already padded enough to have the scrollbar sit on top.
Having the content change padding when the scrollbar appears gives an
unpleasent experience (especially when the scrollbar is hidden at first
but the user increases the content's height by clicking on a dropdown or
something)
2024-07-04 07:36:31 +03:00
Salman Ahmed
8658389854 Clarify how the panel blocks input 2024-07-04 07:34:19 +03:00
Bartłomiej Dach
e73faaefd2
Merge branch 'master' into editor-test-play 2024-07-03 13:54:47 +02:00
Jamie Taylor
d29d114133
Match prior ducking behaviour 2024-07-03 13:52:20 +09:00
Jamie Taylor
b972632e4f
Change default easing to match prior behaviour 2024-07-03 13:50:35 +09:00
Jamie Taylor
153138cdac
Use null to disable audio filter instead 2024-07-03 13:47:59 +09:00
Salman Ahmed
f1012070c4
Merge branch 'master' into mod-select-customisation-panel 2024-07-03 07:36:52 +03:00
Dean Herbert
5350945340
Update HasFlag usages 2024-07-03 00:19:04 +09:00
Bartłomiej Dach
d85c467856
Implement quick exit hotkeys for editor test play 2024-07-02 14:34:36 +02:00
Salman Ahmed
1d94c96a8e Display customisation header in disabled state when no customisable mod selected 2024-07-02 14:40:16 +03:00
Salman Ahmed
a65af8249c Fix first-run setup buttons reset after reopening from dismiss 2024-06-30 07:27:35 +03:00
Salman Ahmed
e57a0029f1 Remove local footer from ShearedOverlayContainer 2024-06-30 06:50:36 +03:00
Salman Ahmed
5dd822ea38 Migrate first-run setup overlay footer content 2024-06-30 06:50:36 +03:00
Salman Ahmed
48bf3f1385 Migrate mod select overlay footer content 2024-06-30 06:50:36 +03:00
Salman Ahmed
467d7c4f54 Refactor game-wide layout order of footer to fix depth issues with overlays and improve UX
With this new order, the logo can be easily moved to display in front of the footer in `SongSelectV2` without breaking experience when footer-based overlays are present. Such overlays (i.e. mod select overlay) will also be dimmed alongside the current screen when a game-wide overlay is open (e.g. settings).
2024-06-30 06:50:36 +03:00
Salman Ahmed
b8816bfc28 Update colour scheme of footer in line with visible overlay 2024-06-30 04:32:36 +03:00
Salman Ahmed
2319fa11ec Support performing custom overlay-specific action with back button 2024-06-30 04:32:36 +03:00
Salman Ahmed
916d0bfcc2 Temporarily show screen footer if hidden while overlay is present 2024-06-30 04:32:36 +03:00
Salman Ahmed
68b8a4fb2a Use ScreenFooter for displaying footer buttons from overlays 2024-06-30 04:32:36 +03:00
Salman Ahmed
c6c75ae48d Merge branch 'master' into footer-v2-side-buttons 2024-06-29 08:19:49 +03:00
Bartłomiej Dach
007bd3973a
Merge pull request #28653 from peppy/featured-artist-even-more-visible
Update beatmap listing filter overlay to better imply selected filters
2024-06-28 09:50:21 +02:00
Bartłomiej Dach
030bbf2641
Fix vertical overlaps on multiselection filters when they wrap 2024-06-28 09:07:29 +02:00
Dean Herbert
fa1527f446
Update design for selected filters to better imply that they are selected 2024-06-28 15:45:09 +09:00
Dan Balasescu
77b00dac7e
Fix low pass filter sometimes not applied in dialog overlays 2024-06-28 15:20:55 +09:00
Dean Herbert
c1bec7a7c3
Simplify colour logic for beatmap overlay filter rows 2024-06-28 14:55:55 +09:00
Salman Ahmed
86b8357b8b Improve UX & input handling when customisation panel is open 2024-06-28 08:53:31 +03:00
Dean Herbert
d370f50cc1
Syncrhronise colours across mod and preset tooltips 2024-06-28 13:16:54 +09:00
Dean Herbert
28d5278935
Show preset description text in tooltip popup
As proposed in https://github.com/ppy/osu/discussions/28610.
2024-06-28 13:16:53 +09:00
Salman Ahmed
167ffac218 Reorder container layout for popovers to recognize clicks on customisation panel
Basically moves `PopoverContainer` to cover both the columns and the customisation panel, so that if the customisation panel is clicked on, the popover container will notice that and hide popovers like the mod preset popover.
2024-06-28 06:35:21 +03:00
Dean Herbert
d722be16e3
Add missing base calls for safety 2024-06-25 23:41:43 +09:00
Salman Ahmed
a277d9df13 Kill focus from components when clicking on an empty space in the panel 2024-06-25 07:13:36 +03:00
Salman Ahmed
3f06a0ef9e Block certain operations when customisation panel is open
Normally I would just block keyboard input from going past `ModCustomisationPanel`, but it's a little complicated here since I'm dealing with global action key binding presses, and I also still want actions like `GlobalAction.Back` to get past the customisation panel even if it's expanded.
2024-06-25 06:16:46 +03:00
Salman Ahmed
57ee794398 Add extra margin to avoid 1px artifacts 2024-06-25 06:08:13 +03:00
Salman Ahmed
0a72394c8a Fix customisation panel conflicting with beatmap attributes when collapsed 2024-06-25 06:04:39 +03:00
Salman Ahmed
e23da93c09 Use new display on mod select overlay and remove old display 2024-06-23 08:22:50 +03:00
Salman Ahmed
04efa61156 Add different display for mod customisation 2024-06-23 08:22:13 +03:00
Jamie Taylor
2ffeb1b361
Add fallback behaviour for custom rulesets 2024-06-23 02:20:51 +09:00
Jamie Taylor
0d11b2b91c
Replace manual usages of AudioFilter with new ducking methods 2024-06-22 01:57:14 +09:00
Jamie Taylor
a56751511e
Apply a ducking effect to the currently playing track when switching ruleset 2024-06-22 01:36:30 +09:00
Bartłomiej Dach
659505f711
Adjust calls to GetContainingInputManager() 2024-06-18 07:41:19 +02:00
Bartłomiej Dach
8a4ae5d23d
Null-propagate all calls to GetContainingFocusManager() 2024-06-18 07:30:46 +02:00
Bartłomiej Dach
3afe98612c
Add RestoreState() to IEditorChangeHandler 2024-06-11 11:31:30 +02:00
Dean Herbert
dd3f4bcdab
Fix code quality and null handling 2024-06-07 00:01:50 +08:00
Xesquim
860afb8123 Creating method in ModUtils to calculate the rate for the song 2024-06-06 10:06:07 -03:00
Bartłomiej Dach
cb72630ce1
Fix compile failures 2024-05-31 08:09:06 +02:00
Dean Herbert
5dfeaa3c4a
Move dialog strings to more common class name 2024-05-31 11:46:32 +09:00
Bartłomiej Dach
7b7e439d03
Merge branch 'master' into scale-tool 2024-05-29 10:15:48 +02:00
Bartłomiej Dach
4c881b5633
Use better name if we're renaming 2024-05-29 09:40:29 +02:00
OliBomby
a89ba33b47 rename CanScaleSelectionOrigin/PlayfieldOrigin to make clear its not the origin being scaled 2024-05-28 16:14:16 +02:00
Dean Herbert
4408039b3e
Merge branch 'master' into footer-v2-back-button 2024-05-28 15:50:34 +09:00
Dean Herbert
b6471f0b9c
Allow previewing audio of playlist items 2024-05-27 17:09:37 +09:00
Bartłomiej Dach
c800bb5339
Merge branch 'master' into lazer-speedkeys 2024-05-24 13:19:26 +02:00
Bartłomiej Dach
cab8cf7410
Move mod speed hotkey handler to user mod select overlay
The very base class is the wrong place for it because
`FreeModSelectOverlay` inherits from it, and that one has different
assumptions and rules than "user" selection. In particular, in non-user
selection, more than one rate adjust mod may be active, which breaks the
mod speed hotkey's basic assumptions.
2024-05-24 13:14:06 +02:00
Bartłomiej Dach
b1b207960a
Actually use return value 2024-05-24 13:09:44 +02:00
Bartłomiej Dach
8cac87e496
Fix speed controls in mod select overlay not handling repeat 2024-05-24 13:09:07 +02:00
Bartłomiej Dach
345fb60679
Fix toast strings 2024-05-24 13:08:17 +02:00
Bartłomiej Dach
63406b6feb
Rewrite implementation 2024-05-24 13:03:42 +02:00
Bartłomiej Dach
8a2dd4d816
Merge branch 'master' into scaling 2024-05-23 15:10:40 +02:00
Bartłomiej Dach
ac5c031a3a
Simplify original state management in skin selection scale handler 2024-05-23 15:01:28 +02:00
Dean Herbert
66ceda1d67
Update focus specifications in line with framework changes 2024-05-22 21:32:49 +08:00
Fabian van Oeffelt
57da4229ff Add speed value to Toast 2024-05-22 13:58:59 +02:00
Dean Herbert
d0b1ebff5a
Revert "Temporary rollback of framework / SDL3"
This reverts commit d7d569cf4e.
2024-05-22 16:29:39 +08:00
Dean Herbert
f979200712
Use null conditional rather than implicit not-null 2024-05-22 12:06:51 +08:00
Dean Herbert
1fdebe94ac
Merge branch 'master' into lazer-speedkeys 2024-05-22 12:05:04 +08:00
Dean Herbert
02a388cba6
Fix enum not being at end (and adjust naming) 2024-05-22 12:03:48 +08:00
Fabian van Oeffelt
148afd1201 Change Speedchange behaviour to keep changing while holding key, Add Toast to nofity user what just happend 2024-05-21 14:47:34 +02:00
Dean Herbert
d7d569cf4e
Temporary rollback of framework / SDL3 2024-05-21 14:36:16 +08:00
Dean Herbert
e740b8bcc3
Fix single frame glitching in skin editor
https://github.com/ppy/osu/pull/28257#discussion_r1606999574
2024-05-21 14:36:11 +08:00
Dean Herbert
3b86da443b
Merge pull request #28257 from bdach/fix-skin-editor-spaz
Fix closest anchor selection spazzing out in multiple scenarios
2024-05-21 14:35:29 +08:00
Bartłomiej Dach
3da3b91be5
Improve closest origin selection to include effects of rotation/flip
Closes https://github.com/ppy/osu/issues/28237.

Solution as proposed here:
https://github.com/ppy/osu/pull/28089#issuecomment-2095372157

For flips and rotations by 90 degrees this does what you would expect it
to. For arbitrary rotations it *sort of kind of* attempts to do this but
the results are a bit wonky - probably still better than what was there
before, though?
2024-05-20 10:23:12 +02:00
Bartłomiej Dach
c03f68413a
Fix skin editor closest origin selection spazzing out on scaled sprites
Closes https://github.com/ppy/osu/issues/28215.

`drawable.Position` is a location in the parent's coordinate space, and
`drawable.OriginPosition` is in the drawable's local space and
additionally does not take scale into account.
2024-05-20 10:23:07 +02:00
Susko3
04acc58b74 Don't show warning on android
Unsure about iOS.
2024-05-19 14:12:21 +02:00
Fabian van Oeffelt
80064c4b98 Speedchange now also works in Modselect 2024-05-18 18:38:23 +02:00
Salman Ahmed
310b4d90cc Move SHEAR constant to OsuGame and revert back to 0.2x (i.e. master)
Discussed in [discord](https://discord.com/channels/188630481301012481/188630652340404224/1240490608934653984).
2024-05-16 07:28:02 +03:00
Salman Ahmed
9265290acf Change shear factor everywhere to 0.15x 2024-05-16 05:33:01 +03:00
Salman Ahmed
e3afd89dc8 Allow specifying height of ShearedButtons
Also includes a test case in `TestSceneShearedButton`s to ensure the buttons' shear factors don't change on different heights (I've encountered issues with that previously).
2024-05-16 05:02:56 +03:00
OliBomby
8df5f22b4e Merge remote-tracking branch 'upstream/master' into scaling 2024-05-15 23:05:19 +02:00
Dean Herbert
e887f93eca
Always show placeholder on unknown / missing country 2024-05-10 22:45:59 +08:00
Dean Herbert
b026309e36
Add setting to allow hiding all country flags
There have been enough requests for this at this point to implement it.
2024-05-10 20:32:21 +08:00
Dean Herbert
88b20b357a
Increase padding around text in dialogs 2024-05-09 14:38:10 +08:00
Ekischleki
e4bfa6f46b
Merge branch 'master' into Make-deletion-confirmation-less-confusing 2024-05-07 18:45:02 +02:00
Dean Herbert
1d6915478f
Add message letting users know that beatmaps are donwloading in the background 2024-05-07 14:26:49 +08:00
Susko3
f824bd1441 Fix userTriggered not being passed to private helper 2024-05-06 21:52:03 +02:00
Erik Wolfschläger
32444e0e30 Make deletion confirmation content less confusing 2024-05-06 18:11:40 +02:00
Bartłomiej Dach
d7a0fdce07
Merge pull request #28089 from peppy/use-closest-origin
Automatically choose origin (along with anchor) to make skin editor placement easier for users
2024-05-06 14:57:34 +02:00
Dean Herbert
29eef26a69
Merge pull request #28118 from bdach/scaling-mode-does-not-affect-skin-editor
Fix sizing of gameplay preview in skin editor not updating on scaling mode change
2024-05-06 18:46:48 +08:00
Bartłomiej Dach
353a07f7a5
Fix code quality inspection 2024-05-06 12:23:11 +02:00
Bartłomiej Dach
f066026503
Fix sizing of gameplay preview in skin editor not updating on scaling mode change
Closes https://github.com/ppy/osu/issues/28115.
2024-05-06 11:55:51 +02:00
Bartłomiej Dach
cf87e9cd40
Do not show integration settings on mobile
Closes https://github.com/ppy/osu/issues/28097.

The settings weren't actually doing anything at all there anyway.
2024-05-06 11:24:42 +02:00
Bartłomiej Dach
71776a583c
Merge branch 'master' into preset-td-autoplay 2024-05-06 09:02:08 +02:00
Bartłomiej Dach
4c7e6b125c
Add clarification comment 2024-05-06 08:49:30 +02:00
Dean Herbert
12cd3bbe1c
Fix incorrect scale handling due to selection point changes 2024-05-06 11:34:37 +08:00
Joseph Madamba
359238395f Fix now playing overlay text scroll breaking when toggling metadata language setting 2024-05-05 15:43:46 -07:00
cdwcgt
1f92f1d19b
remove blank line
nt
2024-05-04 20:41:36 +08:00
cdwcgt
fe30ca3d39
fix linq logic 2024-05-04 20:18:31 +08:00
cdwcgt
f9be9ed479
remove incompatible system mods before enable preset 2024-05-04 19:58:32 +08:00
Dean Herbert
2cb367fdce
Disable "origin" menu when in "Closest" placement mode 2024-05-04 13:29:05 +08:00