1
0
mirror of https://github.com/ppy/osu.git synced 2025-01-19 02:52:54 +08:00
Commit Graph

15799 Commits

Author SHA1 Message Date
Dean Herbert
1174f46656
Add menu tip hinting at correct spelling of laser 2024-12-21 21:41:48 +09:00
Dean Herbert
9b1d94b5be
Merge branch 'master' into skinnable-mod-display 2024-12-20 21:27:31 +09:00
Dean Herbert
a9cf31f5d8
Usings 2024-12-20 21:27:24 +09:00
Bartłomiej Dach
e62b329d4a
Merge pull request #31143 from peppy/no-pause-cooldown-break-intro
Skip the pause cooldown when in intro / break time
2024-12-20 12:29:46 +01:00
Bartłomiej Dach
4551d59f39
Give skinnable mod display a minimum size
Co-authored-by: Dean Herbert <pe@ppy.sh>
2024-12-20 12:06:35 +01:00
Bartłomiej Dach
0a87fb5993
Merge branch 'master' into global-volume-scroll-better-maybe 2024-12-20 09:58:25 +01:00
Dean Herbert
48ce68694a
Add missing partial 2024-12-20 17:06:47 +09:00
Dean Herbert
5d17014698
Fix mouse wheel disable not working during gameplay 2024-12-20 16:31:06 +09:00
Dean Herbert
55dff1f0ef
Merge branch 'master' into skinnable-mod-display 2024-12-20 14:08:51 +09:00
Dean Herbert
7c1482366d
Remove unused using statements 2024-12-20 14:07:27 +09:00
Bartłomiej Dach
2cab8f4e8a
Add localisation support 2024-12-19 15:03:55 +01:00
Bartłomiej Dach
e458f540ac
Adjust formatting 2024-12-19 14:54:57 +01:00
Bartłomiej Dach
7d1473c5d0
Simplify expand/contract code 2024-12-19 14:52:27 +01:00
Bartłomiej Dach
772ac2d326
Fix mod display not fading out after start of play
This was very weird on master - `ModDisplay` applied a fade-in on the
`iconsContainer` that lasted 1000ms, and `HUDOverlay` would stack
another 200ms fade-in on top if a replay was loaded. Moving that first
fadeout to a higher level broke fade-out because transforms got
overwritten.
2024-12-19 14:48:18 +01:00
Dean Herbert
47d81e7dee
Fix null inspections on GameplayChatDisplay 2024-12-17 19:10:09 +09:00
Dean Herbert
bdd417c1a1
Move "global" scroll-adjusts-volume to a per-screen component-based implementation 2024-12-16 15:21:07 +09:00
Dean Herbert
85ada3275b
Skip the pause cooldown when in intro / break time
Had a quick look at adding test coverage in `TestScenePause` but the
setup to get into either of these states seems a bit annoying..
2024-12-16 14:14:30 +09:00
Bartłomiej Dach
9652c5a7ca
Merge pull request #31110 from peppy/timing-current-point-indicator
Change the way "current" points are hinted on timing screen
2024-12-16 13:27:06 +09:00
Bartłomiej Dach
573d709fae
Merge pull request #31109 from peppy/fix-editor-timing-undo-redo
Fix adjusting control point offset after undo/redo causing catastrophic failure
2024-12-16 12:40:22 +09:00
Bartłomiej Dach
98e8d0b497
Merge branch 'master' into timing-current-point-indicator 2024-12-16 12:22:14 +09:00
Bartłomiej Dach
1058abb4ab
Fix code quality 2024-12-16 12:22:06 +09:00
Dean Herbert
c93b6dba2b
Merge pull request #31108 from peppy/quick-retry-for-replays
Allow using "quick retry" shortcut in more cases from results screen
2024-12-13 08:18:59 -08:00
Dean Herbert
9025103b8b
Reword comment to hopefully be more understandable 2024-12-13 20:02:17 +09:00
Dean Herbert
da840e3fac
Change the way "current" points are hinted on timing screen
I actually thought things were bugged with the previous display method,
since the hinting was very similar to the hover colour/state.

I've adjusted this to hopefully give users a better idea of what this is
intending to show them.
2024-12-13 19:45:18 +09:00
Dean Herbert
64555debc2
Fix adjusting control point offset after undo/redo causing catastrophic failure
Closes https://github.com/ppy/osu/issues/31098.

Low effort fix because it was already half broken. The test was testing
in isolation but in actual editor usage it wasn't working as expected.
2024-12-13 19:33:51 +09:00
Dan Balasescu
35c70ceb18
Merge pull request #31106 from peppy/player-settings-fix-overlap-skins
Fix player settings overlay cog overlapping skin elements
2024-12-13 19:30:39 +09:00
Dean Herbert
4b0cdd761d
Add note about player settings overlay button 2024-12-13 18:58:20 +09:00
Dean Herbert
d00bc4bdd1
Also allow using "quick retry" for other replays 2024-12-13 18:14:45 +09:00
Dean Herbert
0e0d96829f
Fix "quick retry" hotkey not working for autoplay 2024-12-13 18:08:29 +09:00
Dean Herbert
a796af9511
Fix player settings overlay cog overlapping skin elements
This brings it down to be in line with the flowing elements that usually
do their best to not get in the way.

Decided against putting it in the `HUDOverlay` flow for simplicity. It
will work fine until it doesn't.
2024-12-13 17:28:15 +09:00
Dean Herbert
1e809c7f16
Fix player settings overlay appearing while in skin editor 2024-12-13 17:18:34 +09:00
Dean Herbert
313de33986
Adjust padding to avoid wrapping on checkbox text 2024-12-13 15:42:30 +09:00
Bartłomiej Dach
0328708889
Store value of toggle to setting 2024-12-12 15:17:39 +09:00
Bartłomiej Dach
61ee830588
Adjust copy 2024-12-12 15:17:39 +09:00
Bartłomiej Dach
d8d5a00f3b
Merge branch 'master' into filter-playing-rooms 2024-12-12 13:06:22 +09:00
Bartłomiej Dach
88241d5b95
Merge pull request #30838 from smoogipoo/better-room-status
Improve multiplayer room status handling
2024-12-12 13:05:59 +09:00
Dean Herbert
862b41c38e
Move BeatmapInfoWedgeV2 to correct namespace 2024-12-12 12:53:05 +09:00
Dean Herbert
e8c0e27cc0
Adjust in line with upstream changes 2024-12-11 18:17:59 +09:00
Dean Herbert
0aa17a905b
Increase timed update frequency and add inline comment 2024-12-11 18:08:34 +09:00
Dean Herbert
a3998fbd52
Merge branch 'master' into better-room-status 2024-12-11 18:06:55 +09:00
Bartłomiej Dach
4e4a99decc
Merge pull request #31076 from peppy/beatmap-store-interface
Access beatmap store via abstract base class
2024-12-11 17:48:32 +09:00
Dean Herbert
2a4f596f90
Merge branch 'master' into ios-beatmap-export 2024-12-10 23:59:15 -08:00
Dean Herbert
a868c33380
Remove BeatmapCarousel testing backdoor 2024-12-11 16:28:51 +09:00
Dean Herbert
c94b393e30
Access beatmap store via abstract base class
The intention here is to make things more testable going forward.
Specifically, to remove the "back-door" entrance into `BeatmapCarousel`
where `BeatmapSets` can be set by tests and bypas/block realm retrieval.
2024-12-11 16:28:51 +09:00
Dean Herbert
bab9b9c937
Remove no-longer-correct comment 2024-12-11 16:28:50 +09:00
Dean Herbert
de31a48beb
Some Carousel classes can be abstract 2024-12-11 16:28:50 +09:00
Bartłomiej Dach
89e3c551ff
Merge pull request #30860 from frenzibyte/editor-multiple-background-audio-files
Allow choosing different background/audio files for individual difficulties
2024-12-11 14:12:58 +09:00
Bartłomiej Dach
b37a06c0fe
Hide "show playing rooms" toggle when in filter mode it doesn't make sense with 2024-12-11 13:24:54 +09:00
Bartłomiej Dach
3352571f2a
Add ability to filter out currently playing rooms
Addresses https://osu.ppy.sh/community/forums/topics/2013293?n=1.
2024-12-11 13:24:08 +09:00
Bartłomiej Dach
637fe07b31
Rename Room{Status -> Mode}Filter
I need the "status" term free for an upcoming change. And web calls this
parameter "mode" as well:

	642e973f91/app/Models/Multiplayer/Room.php (L184-L199)

so it works in my head.
2024-12-11 12:36:42 +09:00