1
0
mirror of https://github.com/ppy/osu.git synced 2025-02-01 14:22:56 +08:00
Commit Graph

4378 Commits

Author SHA1 Message Date
Dan Balasescu
63e6b0e050
Merge pull request #31603 from peppy/input-amendments
Tidy up various input handling anomalies
2025-01-22 18:05:06 +09:00
Dean Herbert
4cf4b8c73d
Switch IsImportant to init property isntead of virtual 2025-01-22 16:41:26 +09:00
Dan Balasescu
8f8246278a
Merge pull request #31527 from bdach/spectator-list-ready
Show spectating users during gameplay
2025-01-21 18:54:11 +09:00
Bartłomiej Dach
0265a29000
Move bindings to LoadComplete() 2025-01-21 10:02:16 +01:00
Dean Herbert
b6e7b43b11
Remove unnecessary input blocking
This was already done by `OverlayContainer`.
2025-01-21 16:40:36 +09:00
Rudi Herouard
89586d5ab2 Fix settings in replay hiding when dragging a slider 2025-01-20 13:43:45 +01:00
Dean Herbert
c4509bbe12
Merge pull request #31539 from Rudicito/seek-in-replay-scaled-by-replay-speed
Seek in replay scaled by replay speed
2025-01-20 15:15:50 +09:00
Bartłomiej Dach
3c4bfc0a01
Merge spectator list classes into one skinnable 2025-01-17 11:23:14 +01:00
Dean Herbert
c8b38f05d5
Add note about the visibility logic because it tripped me up 2025-01-17 17:14:06 +09:00
Dean Herbert
f59762f0cb
Playing -> PlayingState 2025-01-17 17:11:40 +09:00
Bartłomiej Dach
7d026761fc
Merge pull request #31533 from peppy/fix-gameplay-offset-adjust-limitations
Fix gameplay offset adjustment limits not being enforced
2025-01-17 08:21:24 +01:00
Rudi Herouard
5fc277aa7f Seek in replay scaled by replay speed 2025-01-16 21:53:56 +01:00
Bartłomiej Dach
5c799d733f
Bind to playing state via GameplayState instead to fix more tests 2025-01-16 15:25:56 +01:00
Bartłomiej Dach
0c54853710
Merge branch 'spectator-list-visuals' into spectator-list-ready 2025-01-16 15:13:04 +01:00
Bartłomiej Dach
81f54507dd
Fix potential index accounting mistake when creating spectator list with spectators already present
Noticed by accident, but if the `BindCollectionChanged()` callback fires
immediately in `LoadComplete()` when set up and there are spectators
present already, then `NewStartingIndex` in the related event is -1:

	b03f83de36/src/libraries/System.ObjectModel/src/System/Collections/Specialized/NotifyCollectionChangedEventArgs.cs (L84-L92)

which kinda breaks the math introducing off-by-ones and in result causes
11 items to be displayed together rather than 10.
2025-01-16 14:29:41 +01:00
Bartłomiej Dach
e3b780d0fb
Merge branch 'master' into spectator-list-visuals 2025-01-16 14:07:53 +01:00
Dean Herbert
e47244989a
Adjust animations a bit
Removed autosize duration stuff because it looks weird when the list is
shown from scratch where users are already fully populated in it.
2025-01-16 19:23:54 +09:00
Dean Herbert
32906aefde
Add gradient on final spectator if more than list capacity are displayed 2025-01-16 19:05:19 +09:00
Dean Herbert
996798d2df
Avoid list width changing when spectator count changes 2025-01-16 19:02:14 +09:00
Dean Herbert
1d240eb405
Fix gameplay limitations for adjusting offset not actually being applied 2025-01-16 18:05:59 +09:00
Bartłomiej Dach
12b2631e5e
Add a skinnable variant of spectator list & hook it up to online data 2025-01-15 14:29:53 +01:00
Bartłomiej Dach
43fc48a3f3
Add client methods allowing users to be notified of who is watching them 2025-01-15 14:18:01 +01:00
Bartłomiej Dach
582c5180b9
Implement spectator list display
- First step for https://github.com/ppy/osu/issues/22087
- Supersedes / closes https://github.com/ppy/osu/pull/22795

Roughly uses design shown in
https://github.com/ppy/osu/pull/22795#issuecomment-1579936284 with some
modifications to better fit everything else, and some customisation
options so it can fit better on other skins.
2025-01-15 14:17:53 +01:00
Bartłomiej Dach
614243fef4
Merge pull request #31506 from peppy/fix-storyboard-break-overhead
Fix stutter on intensive storyboards when entering break time with 100% background dim
2025-01-15 08:23:58 +01:00
Rudi Herouard
57a9911b22 Apply beatmap offset on every beatmap set difficulty if they have the same audio 2025-01-15 04:12:54 +01:00
Dean Herbert
77db355809
Ensure storyboards are still updated even when dim is 100%
This avoids piled-up overhead when entering break time. It's not great,
but it is what we need for now to avoid weirdness.
2025-01-14 16:22:10 +09:00
Dean Herbert
94ea003d90
Update game ScrollContainer usage in line with framework changes
See https://github.com/ppy/osu-framework/pull/6467.
2025-01-11 01:42:59 +09:00
Dean Herbert
2a28c5f4de
Add static memory of last applied offset score
I don't really like adding this new session static, but we don't have a
better place to put this.
2025-01-02 16:20:25 +09:00
Dean Herbert
58dcb25bd5
Revert "Clear previous LastLocalUserScore when returning to song select"
This reverts commit ced8dda1a2.
2025-01-02 15:59:00 +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
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
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
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
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
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
Thomas Müller
0a00f7a7c2 Implement skinnable mod display
Also makes the mod display initialization sequence (start expanded, then
unexpand) controlled by HUDOverlay rather than mod display itself. This
enabled different treatment depending on whether the mod display is
viewed in the skin editor or in the player.

Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2024-12-07 12:06:33 +09:00