1
0
mirror of https://github.com/ppy/osu.git synced 2025-03-11 00:17:19 +08:00

45809 Commits

Author SHA1 Message Date
Dean Herbert
c31a5dcdae
Merge branch 'master' into remove-selectedroom 2025-03-04 19:21:05 +09:00
Dean Herbert
918315aa65
Split out methods so retrieving the room is not a callback function 2025-03-04 19:19:53 +09:00
Dean Herbert
d9162daac2
Merge pull request #32098 from bdach/dont-drop-green-line-sample-bank
Attempt to preserve sample control point bank when encoding beatmap
2025-03-04 18:32:16 +09:00
Bartłomiej Dach
28be0e31c2
Merge pull request #32214 from smoogipoo/fix-multi-user-kick-threading
Fix thread safety when kicking multiplayer users
2025-03-04 09:24:08 +01:00
Dan Balasescu
e0e7d92e79
Merge pull request #32219 from peppy/lounge-minor-redesign
Adjust scale and display of rooms in multiplayer lounge
2025-03-04 17:19:58 +09:00
Dan Balasescu
cf3664349d
Merge branch 'master' into remove-selectedroom 2025-03-04 17:00:43 +09:00
Dean Herbert
4a16b4bd98
Fix typo in xmldoc 2025-03-04 16:15:40 +09:00
Dean Herbert
667bd6e8f1
Merge pull request #32217 from smoogipoo/fix-mp-channel
Fix multiplayer not joining correct chat channel
2025-03-04 16:15:20 +09:00
Dean Herbert
c9a492a6eb
Merge pull request #32075 from Gennadiyev/patch-result-screen-volume-adjust
Add Alt + mousewheel volume adjustment on result screens
2025-03-04 16:06:46 +09:00
Dean Herbert
4085ee805a
Adjust scale and display of rooms in multiplayer lounge
Just a quick pass because the rooms were definitely larger than they
should be.
2025-03-04 15:55:44 +09:00
Dean Herbert
9e8a611728
Rename RoomsContainer and scope down bindables 2025-03-04 15:05:12 +09:00
Dan Balasescu
77d5b1d5dd
Fix multiplayer not joining correct chat channel 2025-03-04 14:45:23 +09:00
Dean Herbert
0696cfa4f2
LoungePollingComponent -> LoungeListingPoller 2025-03-04 14:40:55 +09:00
Dean Herbert
f3e9d1931c
Merge branch 'master' into remove-roommanager 2025-03-04 14:23:51 +09:00
Dan Balasescu
4a00662092
Fix thread safety when kicking multiplayer users 2025-03-04 14:02:45 +09:00
Dean Herbert
3fe92fb83c
Merge pull request #32158 from bdach/scaling-crash
Fix possible crash when scaling objects in editor
2025-03-04 13:40:41 +09:00
Dean Herbert
57ec2f7228
Merge pull request #32196 from bdach/disallow-negative-drain-length
Fix drain length calculation helper method being able to return negative durations
2025-03-04 13:35:52 +09:00
Dan Balasescu
446718f929
Merge branch 'master' into remove-roommanager 2025-03-04 13:17:04 +09:00
Dan Balasescu
8c13a86ad1
Merge pull request #32200 from andy840119/remove-handle-scale-base-method
Remove unused virtual method after refactor the scale handling.
2025-03-04 13:14:14 +09:00
Dean Herbert
58a671decb
Merge pull request #31637 from smoogipoo/room-management-lio
Create, join, and part multiplayer rooms only via the multiplayer server
2025-03-04 13:13:55 +09:00
Dean Herbert
118f9a3a72
Merge pull request #32210 from smoogipoo/fix-multi-join-many-users
Fix being unable to join multiplayer rooms with many users
2025-03-04 13:13:15 +09:00
Dean Herbert
63cd93a9a8
Merge pull request #32208 from smoogipoo/diffcalc-timed-cancellation
Cancel difficulty calculation after 10 seconds by default
2025-03-04 12:52:18 +09:00
Dan Balasescu
3024a98658
Fix unable to join multiplayer rooms with many users 2025-03-04 12:34:11 +09:00
Dan Balasescu
550ff85550
Cancel difficulty calculation after 10 seconds by default 2025-03-04 11:22:47 +09:00
Joseph Madamba
cab849b5d9
Use web localisable string for team channel label 2025-03-03 14:23:39 -08:00
Bartłomiej Dach
c30f334cf9
Merge pull request #32197 from peppy/zoom-to-centre-always
Always zoom timeline to centre rather than focus point
2025-03-03 20:12:28 +01:00
andy840119
23a5d6dc40 This method is not being used anymore.
see:
https://github.com/ppy/osu/pull/26643
2025-03-03 22:10:41 +08:00
Bartłomiej Dach
a33e76717c
Merge pull request #32135 from zihadmahiuddin/fix/settings-show-at-visibility
Fix settings control not visible because of previous search
2025-03-03 13:29:26 +01:00
Dean Herbert
6aaec144c8
Merge pull request #32162 from nekodex/kiai-sfx
Add SFX for kiai/star fountain activation
2025-03-03 19:05:05 +09:00
Dean Herbert
f32a8e8741
Update resources 2025-03-03 18:54:46 +09:00
Dean Herbert
52860def6c
Always zoom timeline to centre rather than focus point
Closes https://github.com/ppy/osu/issues/32183.
2025-03-03 18:53:41 +09:00
Bartłomiej Dach
87fb8da351
Fix drain length calculation helper method being able to return negative durations
This is the principal failure behind
https://github.com/ppy/osu-server-beatmap-submission/issues/40.
2025-03-03 09:35:46 +01:00
Bartłomiej Dach
47747aed3e
Add guards to prevent clamp calls with invalid bounds 2025-03-03 08:40:51 +01:00
Bartłomiej Dach
8539745667
Merge pull request #32153 from peppy/carousel-design-fixes
Apply first wave blanket fixes to new beatmap carousel design
2025-03-03 08:13:43 +01:00
Dan Balasescu
033952029e
Cancel ApplyDefaults() when requested
Also didn't notice a particular case here, but if all code passes up
until we get to the `foreach (var h in nestedHitObjects)` below, then we
could end up stuck here for quite a while.
2025-03-03 14:46:13 +09:00
Dan Balasescu
52dad09b20
Cancel slider generation when requested
Didn't notice a particular case with this one, just came up as I was
looking through code.
2025-03-03 14:19:43 +09:00
Dan Balasescu
ad9a963bd0
Exit loop when cancellation requested
The following manages to create all hitobjects but proceeds to get stuck
in this method:

`dotnet run -- difficulty 1607040 -r:2`
2025-03-03 14:19:19 +09:00
Jamie Taylor
881534eb7f
Add SFX for kiai/star fountain activation 2025-03-01 01:51:37 +09:00
Dean Herbert
38de3566b1
Adjust set panel display and animations slightly 2025-02-28 22:54:00 +09:00
Dean Herbert
4beac64bdb
Remove unused container level 2025-02-28 22:54:00 +09:00
Dean Herbert
29c35529d2
Fix activation flash being applied twice (and adjust duration) 2025-02-28 22:54:00 +09:00
Dean Herbert
8032b68932
Stop using padding for panel x offsets 2025-02-28 22:54:00 +09:00
Zihad
0d7c00ae09
use Bindable.SetDefault for clearing search text 2025-02-28 19:04:47 +06:00
Zihad
88089fb014
make SettingsPanel.SearchTextBox's setter private 2025-02-28 19:03:39 +06:00
Bartłomiej Dach
35b0ff80bb
Mark MathHelper.Clamp() as banned API
See previous commit for partial rationale.

There's an argument to be made about the `NaN`-spreading semantics being
desirable because at least something will loudly fail in that case, but
I'm not so sure about that these days. It feels like either way if
`NaN`s are produced, then things are outside of any control, and chances
are the game can probably continue without crashing. And, this move
reduces our dependence on osuTK, which has already been living on
borrowed time for years now and is only awaiting someone brave to go
excise it.
2025-02-28 13:48:22 +01:00
Bartłomiej Dach
c4e37a1566
Merge pull request #32109 from smoogipoo/results-beatmap-lookup
Fix multiplayer results screen displaying same beatmap for all users
2025-02-28 12:36:28 +01:00
Dan Balasescu
993473c081
Pass through artist/title in beatmap transform 2025-02-28 18:40:54 +09:00
Dean Herbert
0e257038e8
Fix status pills displaying wrong 2025-02-28 16:47:57 +09:00
Dean Herbert
51cb0bea1c
Fix carousel taking up too much space on new song select implementation 2025-02-28 16:45:49 +09:00
Dean Herbert
1e46dc6b0a
Adjust animation duration to roughly match scroll operations
Previous value felt wrong when using keyboard selection for iteration.
2025-02-28 16:27:42 +09:00