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

4349 Commits

Author SHA1 Message Date
Salman Alshamrani
6d0d7f3e75 Don't play fail animation if restarting on failure 2024-11-24 04:45:48 -05:00
Salman Alshamrani
f3155bfc7d Fix pause shortcut on multiplayer not delayed 2024-11-24 04:24:31 -05:00
Dean Herbert
086a34f5c0
Merge branch 'master' into beatmap-info-purge 2024-11-22 18:47:32 +09:00
Dean Herbert
ae98f63b51
Fix beatmap load not continuing when when settings slider is focused
Regressed with recent sliderbar focus changes.

Closes #30716.
2024-11-21 02:28:35 +09:00
Fivoka
7726ca02b0 Changed multiplier from 2 to 3.5 2024-11-20 12:29:29 +01:00
Dean Herbert
6fba6de4dc
Merge branch 'master' into multiplayer-remove-cmc-and-composite 2024-11-20 17:24:55 +09:00
Salman Alshamrani
b014bfea3e Fix key counter not updating activation state on initial load 2024-11-17 09:56:19 -05:00
Dean Herbert
0a1f589c80
Fix black layer not fading fast enough when exiting quickly from quick restart 2024-11-16 11:52:02 +09:00
Bartłomiej Dach
21d407680b
Merge pull request #30623 from peppy/fix-flash-transition-player
Fix occasional flash when quick exiting / retrying from player
2024-11-15 08:42:43 +01:00
Dean Herbert
1a31e56d4a
Fix double restart call still existing 2024-11-14 23:59:55 +09:00
Bartłomiej Dach
5d3f55fe4d
Fill out xmldoc 2024-11-14 15:05:46 +01:00
Dean Herbert
d1b5d31ea6
Add explicit parameter in 2024-11-14 22:23:42 +09:00
Dean Herbert
3262b6d989
Refactor to avoid dual-boolean mess 2024-11-14 22:10:45 +09:00
Dean Herbert
afeb138ea0
Fix occasional flash when quick exiting / retrying from player
The gist of the issue is that `fadeOut` was being called *twice* in the
quick exit/retry scenarios, causing weirdness with transforms.

I've restructured things to ensure it's only called once.
2024-11-14 21:54:34 +09:00
Bartłomiej Dach
bd1d3cad49
Do not show timing distribution graph in offset control if there's not enough timed hits
Intended to address concerns raised in
https://github.com/ppy/osu/pull/30620#issuecomment-2475744164.
2024-11-14 13:17:03 +01:00
Bartłomiej Dach
1355fa636d
Merge pull request #30603 from peppy/quick-restart-faster-better
Make quick restart even faster
2024-11-14 12:30:13 +01:00
Dean Herbert
36d48a01c8
Add missing expire call
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2024-11-14 19:33:34 +09:00
Dean Herbert
9849a88eef
Adjust transition further to avoid brief "jumpscare" display of metadata 2024-11-14 18:28:27 +09:00
Dean Herbert
2dbc275bb8
Make quick restart even faster 2024-11-13 18:11:25 +09:00
Dean Herbert
2ae8c36d17
Increase idle time before gameplay loads when hovering controls 2024-11-13 17:39:21 +09:00
Dan Balasescu
99762da7b8
Make RoomID non-bindable
Most important changes are to `RoomSubScreen` and `PlaylistsRoomSubScreen`, because those are the only two cases that now bind to the event instead.
2024-11-13 16:28:54 +09:00
Joseph Madamba
9acfb3c900
Fix break overlay grades not using localised string 2024-11-09 16:45:18 -08:00
Bartłomiej Dach
b0c6042b2a
Fix HUD elements shifting in unintended manner when partially off-screen flipped skin elements are present
Closes https://github.com/ppy/osu/issues/30286.
2024-11-07 14:01:34 +01:00
cdwcgt
69b5bd3b50
Fix existing friend logic 2024-11-01 12:53:13 +08:00
Bartłomiej Dach
9902c22f5c
Do not fall back to beatmap's original ruleset if conversion fails
I don't know why this was ever a good idea, and would say that we want
this to fail *hard* not soft. If things ever get in this state, things
have gone *seriously* wrong elsewhere, and need to be fixed there.
2024-10-25 13:16:24 +02:00
Bartłomiej Dach
e89a4561ab
Fix playfield skinning layer no longer correctly rotating with the playfield
Closes https://github.com/ppy/osu/issues/30353.

Regressed in
4a39873e2a.
2024-10-21 13:49:12 +02:00
Bartłomiej Dach
47f10693c4
Add relative size toggle to DefaultSongProgress too 2024-10-18 11:43:03 +02:00
Bartłomiej Dach
bb4f3c71e0
Add localisation support for "use relative size" setting label 2024-10-18 11:39:55 +02:00
SupDos
7d0da79db7 Add Use relative size setting to ArgonSongProgress 2024-10-18 01:47:54 +02:00
Dean Herbert
b29a17364d
Remove hold-to-confirm delay when pausing using keyboard shortcuts 2024-10-16 20:41:24 +09:00
Dean Herbert
868a7db9e9
Start preparing player earlier when quick retrying
Should help with https://github.com/ppy/osu/issues/9039.
2024-10-13 22:29:00 +09:00
Bartłomiej Dach
938c3d78ce
Fix argon song progress bar tooltip showing during active gameplay
Closes https://github.com/ppy/osu/issues/30197.

Pretty bad one, might be worth a hotfix...
2024-10-10 14:36:28 +02:00
Dan Balasescu
8dece70097
Merge branch 'master' into updates-outside-of-gameplay-only-2 2024-10-07 17:41:42 +09:00
Dan Balasescu
944f8f5f67
Merge pull request #30078 from CloneWith/update/progresshover
Add progress tooltip for ArgonSongProgressBar
2024-10-07 15:20:50 +09:00
Dean Herbert
6e4eed657c
Fix weird mouse position handling and don't return true to event 2024-10-07 14:32:31 +09:00
Dean Herbert
b5cc45bdda
Simplify format code (and adjust formatting slightly) 2024-10-07 14:26:42 +09:00
CloneWith
d7ba4ce7f2
Refactor progress tooltip updating method
* Rewrite calculating logic
* Remove useless variables
2024-10-04 23:30:50 +08:00
CloneWith
fd5655455a
Adjust tooltip text format 2024-10-04 16:56:16 +08:00
CloneWith
2d7fdaf892
Override OnMouseMove for cursor position fetching 2024-10-04 16:42:48 +08:00
Dean Herbert
24d6ea5444
Change failed states to be considered as NotPlaying 2024-10-03 17:11:41 +09:00
CloneWith
5dd28d5352
Fix extra newline 2024-10-01 21:08:31 +08:00
CloneWith
5af05f1cc9
Use play length for timestamp calculation 2024-10-01 20:53:15 +08:00
CloneWith
4f16ecdf1b
Add progress tooltip for ArgonSongProgressBar 2024-10-01 20:22:46 +08:00
Dean Herbert
8773c34fdd
Rename enum to non-plural now that it won't conflict 2024-10-01 19:55:46 +09:00
Dean Herbert
8dba4cf760
Passing means NotPlaying 2024-10-01 19:55:31 +09:00
Dean Herbert
3d54f4a5ab
Make states better defined 2024-10-01 17:53:58 +09:00
Dean Herbert
ad3007eaad
Adjust ILocalUserPlayInfo to expose whether gameplay is in a paused/break state 2024-10-01 17:53:46 +09:00
Bartłomiej Dach
a00ed8dd77
Merge pull request #29914 from peppy/fix-judgement-counter-sync
Fix judgement counter not showing correct counts when spectating user mid-play
2024-09-27 10:57:26 +02:00
Dean Herbert
1dd6082aa9
Rename method to be more appropriate 2024-09-27 16:56:22 +09:00
Dean Herbert
19a96bcc50
Merge pull request #29967 from bdach/storyboard-full-dim
Continue displaying storyboard even if fully dimmed in specific circumstances
2024-09-27 16:33:58 +09:00
Dean Herbert
5efdc6cdd7
Merge pull request #29936 from u4vh3/skinning-colour-customisation
Add colour customisation to layout editor
2024-09-27 14:20:58 +09:00
Bartłomiej Dach
9f4e48dde7
Actually use bindables rather than stick things in Update() 2024-09-24 15:15:28 +02:00
Dean Herbert
b7d8cb2371
Merge pull request #29968 from bdach/cache-for-spectate-screen
Use cache for beatmap lookups on spectate screen
2024-09-24 20:59:33 +09:00
Bartłomiej Dach
4f57a67ea4
Merge branch 'master' into skinning-colour-customisation 2024-09-24 13:02:22 +02:00
Bartłomiej Dach
4c2ebdb2db
Simplify accent colour assignment in argon wedge piece 2024-09-24 12:53:54 +02:00
Bartłomiej Dach
4b349ba387
Use cache for beatmap lookups on spectate screen
@peppy noticed recently that attempting to spectate just a few users was
very likely to end up in requests very quickly being rejected with code
429 ("Too Many Requests").

I'm somewhat certain that the reason for that is that a significant
number of players is wont to retry a lot in quick succession. That means
that spectator server is going to note a lot of gameplay start and end
messages in quick succession, too. And as it turns out, every gameplay
start would end up triggering a new beatmap set fetch request:

	ccf1acce56/osu.Game/Screens/Spectate/SpectatorScreen.cs (L131-L134)
	ccf1acce56/osu.Game/Screens/Play/SoloSpectatorScreen.cs (L168-L172)
	ccf1acce56/osu.Game/Screens/Play/SoloSpectatorScreen.cs (L243-L256)

To attempt to curtail that, use the beatmap cache instead, which should
prevent these unnecessary requests from firing in the first place,
therefore reducing the chance of the client getting throttled.

This technically means that a different endpoint is used to fetch the
data (`GET /beatmaps/?ids[]=` rather than `GET
/beatmapsets/lookup?beatmap_id={id}`), but docs claim that both should
return the same data, and it looks to work fine in practice.
2024-09-23 12:15:19 +02:00
Bartłomiej Dach
0f758ca25f
Continue displaying storyboard even if fully dimmed in specific circumstances
Closes https://github.com/ppy/osu/issues/9315.
Closes https://github.com/ppy/osu/issues/29867.

Notably, this does nothing about
https://github.com/ppy/osu/issues/25075, but I'm not sure what to do
with that one in the first place.
2024-09-23 11:19:31 +02:00
Bartłomiej Dach
881c9dfbba
Fix score being cloned in async method causing random errors (again)
Compare: https://github.com/ppy/osu/pull/24548.

I don't have a reproduction scenario (judging from the stack trace
of the crash it's likely to be nigh-impossible to concoct a reliable
one), but there is some circumstantial evidence that this might help,
namely that that previous fix above worked, and the pathway that's
failing here is similarly async to the one that pull fixed. So I'm just
gonna start with that and hope that it does the job.
2024-09-23 09:51:02 +02:00
Daniel Cios
ec575e9de4 Rename Colour to AccentColour 2024-09-20 16:38:26 +02:00
Daniel Cios
94c2f522ff Fix spacing 2024-09-19 17:31:33 +02:00
Daniel Cios
e81e356d59 Add colour customisation to skin components 2024-09-19 17:27:25 +02:00
Dean Herbert
d5c2484109
Always transfer updated counts once 2024-09-19 19:23:14 +09:00
Dean Herbert
cd61aecad1
Merge pull request #29925 from nekupaw/skip-overlay-beat-synced-animation
Implement beat-synchronized animation in skip overlay
2024-09-19 18:53:45 +09:00
Dean Herbert
fd45644d0f
Fix skin layout editor PlayerAvatar applying corner radius weirdly after scale
Closes #29919.

I've also made this handle resizing better, so now you can have
non-square avatar displays.
2024-09-19 16:55:04 +09:00
Bartłomiej Dach
fdd94aa845
Remove pointless max
The clamp should already ensure this.
2024-09-19 09:43:50 +02:00
Neku
d0519238a3
Implement beat-synchronized animation in skip overlay 2024-09-19 09:43:45 +02:00
Dean Herbert
8f49876fe7
Re-sync judgement counter display after replay frame reset 2024-09-18 15:28:11 +09:00
Dean Herbert
c46e9cbce3
Tidy up JudgementCounter classes 2024-09-18 15:28:10 +09:00
Dean Herbert
58fe502af4
Merge branch 'master' into beatmap-info-purge 2024-09-15 04:53:35 +09:00
Bartłomiej Dach
4e9ad1388f
Fix stall when attempting to import replay after hitting nothing 2024-09-06 13:16:58 +02:00
Dean Herbert
37f61b26ea
Fix offset adjust control not correctly applying changes after song select quit
This is an interesting scenario where we arrive at a fresh
`BeatmapOffsetControl` but with a reference score (from the last play).

Our best assumption here is that the beatmap's offset hasn't changed
since the last play, so we want to use it for the `lastPlayBeatmapOffset`.
But due to unfortunate order of execution, `Current.Value` was not yet
initialised.
2024-09-05 19:04:52 +09:00
Bartłomiej Dach
3a3a912ebc
Merge pull request #29701 from peppy/fix-gc-fuck-fuck-fuck
Fix high performance session potentially getting stuck after multiplayer spectator
2024-09-05 11:24:54 +02:00
Dean Herbert
446c8109b7
Merge pull request #27334 from Sheppsu/replay-analysis-settings
Add a replay analysis overlay
2024-09-05 17:43:00 +09:00
Dean Herbert
86a06c7e10
Fix high performance session potentially getting stuck after multiplayer spectator 2024-09-05 17:19:53 +09:00
Dean Herbert
cc3d220f6f
Allow settings to be added to replay HUD from ruleset 2024-09-04 19:00:23 +09:00
Dean Herbert
a417fec234
Move analysis container implementation completely local to osu! ruleset 2024-09-04 19:00:22 +09:00
Dean Herbert
7cd24ba58e
Disallow mistimed firing of beat sync for break overlay for now
It doesn't work well with pause/resume.
2024-09-04 18:00:32 +09:00
Sheppsu
c89597b060 fix config mistake 2024-09-04 03:37:52 -04:00
Dean Herbert
6c89c4eed6
Fix rewind causing weirdness with progress bar animation 2024-09-03 18:50:57 +09:00
Sheppsu
a2b15fcdee rework code logic to make more sense
analysis container creates settings and the settings items are created more nicely
also removed use of localized strings because that can be done separately
2024-09-03 00:59:42 -04:00
Sheppsu
1ed94e598a Merge branch 'master' into replay-analysis-settings 2024-09-01 19:32:25 -04:00
Dean Herbert
eb70a1b72d
Change middle text to only animate initially 2024-08-28 15:57:42 +09:00
Dean Herbert
47a52d10eb
Revert "Add slight parallax to centre content"
This reverts commit 90d06d4496.
2024-08-28 15:32:59 +09:00
Dean Herbert
90d06d4496
Add slight parallax to centre content 2024-08-27 16:37:27 +09:00
Dean Herbert
6f1664f0a6
Add beat-synced animation to break overlay
I've been meaning to make the progress bar synchronise with the beat
rather than a continuous countdown, just to give the overlay a bit more
of a rhythmic feel.

Not completely happy with how this feels but I think it's a start?

I had to refactor how the break overlay works in the process. It no
longer creates transforms for all breaks ahead-of-time, which could be
argued as a better way of doing things. It's more dynamically able to
handle breaks now (maybe useful for the future, who knows).
2024-08-27 16:34:37 +09:00
Dean Herbert
98faa07590
Apply NRT to BreakOverlay 2024-08-27 15:01:51 +09:00
Dean Herbert
797b020747
Add shadow around break overlay middle content to make sure it remains visible 2024-08-27 15:01:50 +09:00
Dean Herbert
abdbe510b8
Move break overlay (and cursor) further forward in depth
I didn't really want to move the cursor in front of the HUD, but we face
a bit of an impossible scenario otherwise (it should definitely be in
front of the break overlay for visibility).

So I'll deal with it for now.
2024-08-27 14:52:11 +09:00
Dean Herbert
9a21174582
Move GlobalSkinnableContainers to global scope 2024-08-22 18:46:07 +09:00
Dean Herbert
f37cab0c6e
Rename SkinComponentsContainerLookup to GlobalSkinnableContainerLookup 2024-08-22 18:39:36 +09:00
Dean Herbert
41756520b1
Rename SkinComponentsContainer to SkinnableContainer 2024-08-22 17:42:50 +09:00
Dean Herbert
54e5f1c9f0
Merge pull request #29556 from frenzibyte/kiai-star-bursts
Add star fountains/bursts when entering kiai mode in gameplay
2024-08-22 14:14:25 +09:00
Salman Ahmed
c92af71029 Add in-gameplay version of kiai star fountains/burst 2024-08-21 17:34:38 +09:00
Salman Ahmed
0d358a1dae Fix resume overlay appearing behind HUD/skip overlays 2024-08-21 02:53:11 +09:00
Dean Herbert
6985e2e657
Increase default visibility on touch platforms 2024-08-19 20:32:05 +09:00
Dean Herbert
005b1038a3
Change "hold for menu" button to only show for touch by default 2024-08-19 20:23:25 +09:00
Salman Ahmed
3a4546d62d Remove x symbol from argon mania combo counter 2024-08-15 15:08:35 +09:00
Dean Herbert
e465049050
Merge branch 'master' into mania-combo-counter 2024-08-14 15:12:00 +09:00
ArijanJ
fed5b9d747
Fix one more inspectcode warning 2024-08-10 09:45:30 +02:00
ArijanJ
d01e76d9db
Fix double blank line 2024-08-09 23:08:22 +02:00