Dean Herbert
7b9f776a14
Merge pull request #31206 from peppy/christmas
...
Add christmas / seasonal mode
2024-12-23 16:49:38 +09:00
Dean Herbert
1174f46656
Add menu tip hinting at correct spelling of laser
2024-12-21 21:41:48 +09:00
Dean Herbert
881623d47d
Merge branch 'master' into christmas
2024-12-20 23:11:20 -08: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
Dean Herbert
c16bfa010b
Merge branch 'master' into christmas
2024-12-20 20:07:48 +09: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
Dean Herbert
139fb2cdd3
Revert and fix some tests still
2024-12-20 19:44:43 +09: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
f5b0198077
Fix test faiulres when seasonal set to true due to non-circles intro
2024-12-20 16:02:43 +09:00
Dean Herbert
3fc9990411
Fix some failing tests
2024-12-20 15:35:31 +09:00
Dean Herbert
8e9377914d
Subclass menu logo visualisation
2024-12-20 15:35:31 +09:00
Dean Herbert
ad4a8a1e0a
Subclass menu flashes instead of adding local code to it
2024-12-20 15:35:30 +09:00
Dean Herbert
2a720ef200
Move christmas intro screen to seasonal namespace
2024-12-20 15:28:24 +09:00
Dean Herbert
e5dbf9ce45
Subclass osu logo instead of adding much code to it
2024-12-20 15:28:24 +09:00
Dean Herbert
8c7af79f96
Tidy up for pull request attempt
2024-12-20 14:46:21 +09:00
Dean Herbert
4924a35c31
Fix light expiry
2024-12-20 14:46:21 +09:00
Dean Herbert
22f3831c0d
Add logo hat
2024-12-20 14:46:21 +09:00
Dean Herbert
0954e0b032
Add seasonal lighting
...
Replaces kiai fountains for now.
2024-12-20 14:46:20 +09:00
Dean Herbert
024029822a
Add christmas intro
2024-12-20 14:46:20 +09:00
Dean Herbert
618a9849e3
Increase intro time allowance to account for seasonal tracks with actual long intros
2024-12-20 14:46:20 +09:00
Dean Herbert
a4bf29e98f
Adjust menu logo visualiser to use seasonal colours
2024-12-20 14:19:12 +09:00
Dean Herbert
180a381b6f
Adjust menu side flashes to be brighter and coloured when seasonal active
2024-12-20 14:19:12 +09:00
Dean Herbert
80ae7942df
Add christmas-specific logo heartbeat
2024-12-20 14:19:12 +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
