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

15558 Commits

Author SHA1 Message Date
Bartłomiej Dach
3dc2408965
Merge branch 'master' into bat-max-performance 2024-11-01 13:13:20 +01:00
cdwcgt
69b5bd3b50
Fix existing friend logic 2024-11-01 12:53:13 +08:00
Dan Balasescu
904b76b9d7
Merge pull request #30424 from bdach/wtf-wtf-wtf-wtf
Do not fall back to beatmap's original ruleset if conversion fails
2024-10-28 17:14:19 +09:00
Salman Alshamrani
0e65655fef Remove redundant condition in else branch
Yep.
2024-10-25 23:15:17 -04:00
Bartłomiej Dach
b78e7d5d9a
Fix multiplayer song select not correctly applying filter sometimes
Fixes the root client-side failure causing
https://github.com/ppy/osu/issues/30415.

Thread of breakage is as follows:

1. `SongSelect` loads the carousel.
   At this point, the ruleset is what the ambient ruleset would have
   been at the time of pushing song select, so most likely it will
   match the current ruleset.
   Notably, the carousel is loaded with `AllowSelection == false`.
2. `OnlinePlaySongSelect` sets the ruleset to the one taken from
   the relevant playlist item in `LoadComplete()`.
3. At any point between the previous and the next step, the user
   changes the ruleset manually.
4. `SongSelect.carouselBeatmapsLoaded()` is ran, which calls
   `transferRulesetValue()`, which calls `FilterControl.FilterChanged`.
   But at this stage `Carousel.AllowSelection` is still false, so
   the filter is not executed, but `pendingFilterApplication` is set
   instead.
   Unfortunately, the pending filter never gets applied after that.
   The only place that checks that flag is `OnEntering()`, which at
   this point has already ran.

To fix, move the `pendingFilterApplication` check to `Update()`, which
seems like the most obvious and safe solution.
2024-10-25 21:29:53 +02:00
Bartłomiej Dach
b72a50bbaa
Merge pull request #30387 from peppy/editor-sidebars-always-expanded
Keep editor sidebars expanded by default
2024-10-25 19:46:35 +02: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
OliBomby
eb61da4232 only consider hit objects which are visible in timeline for contracted state 2024-10-24 21:22:09 +02:00
OliBomby
88e88bdc4f Fix addition banks disabled on reset 2024-10-24 13:17:49 +02:00
OliBomby
5b92a9ff59 Fix enabled state not updating drawable 2024-10-24 13:15:09 +02:00
Dean Herbert
940220b649
Fix big oops 2024-10-24 19:57:39 +09:00
Dean Herbert
787d3dceea
Merge branch 'master' into auto-addition2 2024-10-24 18:40:27 +09:00
Dean Herbert
77bd0e8d70
Add visual disabled state to ternary buttons 2024-10-24 18:36:34 +09:00
Salman Alshamrani
6e9ff49e59
Merge branch 'master' into editor-slider-touch-support-2 2024-10-23 17:02:38 -04:00
Salman Alshamrani
3a4d5af83e Fix placement blueprints sometimes not behaving correctly with touch input
More specifically, this fixes placement blueprints not beginning placement when using touch input while the cursor was previously outside compose area, due to the placement blueprint not existing (removed from the scene by `ComposeBlueprintContainer`).
2024-10-23 16:51:21 -04:00
OliBomby
ddbeb56f0f Show tooltip on auto normal bank when not usable 2024-10-23 21:25:37 +02:00
Dean Herbert
77d2f35765
Merge pull request #30375 from bdach/fix-broken-playfield-skin-layer-rotation
Fix playfield skinning layer no longer correctly rotating with the playfield
2024-10-23 19:50:39 +09:00
Dean Herbert
cb880f7e9b
Merge branch 'master' into move-already-placed-objects-when-adjusting-offset-bpm 2024-10-23 18:20:43 +09:00
Dean Herbert
5939c78760
Merge branch 'master' into auto-addition2 2024-10-23 15:53:07 +09:00
Dean Herbert
2103b3e186
Merge pull request #28863 from OliBomby/additions
Add toggles and hotkeys for configuring sample addition bank
2024-10-23 15:52:55 +09:00
Dean Herbert
53a340938a
Merge pull request #30377 from bdach/very-bad-completely-no-good-comparer
Fix timeline blueprints sometimes causing crashes due to current placement blueprint becoming unsorted
2024-10-22 20:20:03 +09:00
Bartłomiej Dach
24dfc1b66e
Merge pull request #30328 from TaterToes/seekingControlPointFix
Add breathing room to seek back between control points in editor
2024-10-22 13:14:24 +02:00
Dean Herbert
e37d415c6f
Keep editor sidebars expanded by default
They will not only contract if the user chooses to have them contract
(new setting in the `View` menu) or if the game isn't wide enough to
allow full interaction with the playfield while they are expanded.

Addressess https://github.com/ppy/osu/discussions/28970.
2024-10-22 20:08:50 +09:00
Dean Herbert
16bc188ba7
Refactor code to read better (and adjust lenience to match stable) 2024-10-22 18:08:25 +09:00
Dean Herbert
e1a950e2d3
Fix beatmap selection being lost during update process
Broke due to something changing in the way we handle realm things in the
carousel. The deselection happens in `updateBeatmapSet` so we need to
store / check the original selection before this occurs.

Doesn't seem this had test coverage? Probably implies that the overhead
of adding a test was very large, so maybe best to leave it that way.
2024-10-22 17:53:34 +09:00
Bartłomiej Dach
03683e28be
Merge branch 'master' into editor-slider-touch-support-1 2024-10-22 09:31:03 +02:00
Bartłomiej Dach
dbc2e78dd9
Fix timeline blueprints sometimes causing crashes due to current placement blueprint becoming unsorted
Closes https://github.com/ppy/osu/issues/30324.
2024-10-21 14:48:57 +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
OliBomby
22aef90cb7 dont contract samples for stacked objects 2024-10-20 00:07:40 +02:00
OliBomby
f137fed04e Update sample point contracted state each frame 2024-10-19 23:57:41 +02:00
OliBomby
c03017438e Use FinishTransforms to init visual state 2024-10-19 23:57:05 +02:00
TaterToes
5fe074a0f9
Merge branch 'master' into seekingControlPointFix 2024-10-18 10:59:57 -04:00
TaterToes
1cc6309656
attempt to fix formatting 2024-10-18 07:21:05 -04: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
TaterToes
0a8ba4bfb5
cleanup 2024-10-17 18:41:00 -04:00
TaterToes
c8b0220934
fix comment 2024-10-17 18:12:05 -04:00
TaterToes
e10293531b
adjust margin time and apply rate adjust 2024-10-17 18:10:48 -04:00
TaterToes
45dd9b1167
Forgot subtraction 2024-10-17 17:01:42 -04:00
TaterToes
3fe0791298
fix seeking back on control points 2024-10-17 16:26:13 -04:00
Dan Balasescu
d195a69447
Compute maximum performance along with difficulty 2024-10-17 19:26:19 +09:00
Dean Herbert
dafe8d6448
Merge pull request #30145 from WitherFlower/ranked-date-filtering
Add ranked date and submitted date filtering to song select
2024-10-17 02:38:36 +09:00
Dean Herbert
b29a17364d
Remove hold-to-confirm delay when pausing using keyboard shortcuts 2024-10-16 20:41:24 +09:00
Salman Alshamrani
e151c0fab1 Fix coding mistake 2024-10-14 15:11:44 -04:00
Salman Alshamrani
40b98d4863 Move conditional 2024-10-14 09:55:24 -04:00
Shin Morisawa
8ff86d560f
Merge branch 'master' into master 2024-10-14 17:48:04 +09:00
Bartłomiej Dach
cd59b93cc9
Merge branch 'master' into feat/optimize-polygon-tool 2024-10-14 08:28:30 +02:00
Shin Morisawa
90a08b8a68 Fix Beatmap Delete Dialog 2024-10-14 09:55:28 +09:00
Salman Alshamrani
f8c8184c5c Fix placement blueprints not receiving latest mouse position with touch input 2024-10-13 11:01:18 -04: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
Marvin Schürz
f76a2d02f6 Make sure to properly update hitobjects 2024-10-11 23:22:15 +02:00
Bartłomiej Dach
968835bb44
Do not show daily challenge conclusion notification on disconnection
Closes https://github.com/ppy/osu/issues/30194.
2024-10-11 14:18:19 +02:00
WitherFlower
da376c534b Filter out unranked/unsubmitted beatmaps when using the ranked/submitted search filters 2024-10-11 09:49:47 +02:00
Dan Balasescu
616c2aeefc
Merge pull request #30206 from minetoblend/fix/selection-box-buttons-stuck
Fix SelectionBox buttons freezing when button is triggered via key event
2024-10-11 12:02:58 +09:00
Marvin Schürz
af55585dc8 Make TriggerAction public 2024-10-10 20:50:47 +02:00
Marvin Schürz
fc7ad96fcd Move circle flash to TriggerAction 2024-10-10 20:20:02 +02:00
Marvin Schürz
9cc6ee2ebc Fix SelectionBox buttons freezing when button is triggered via key event 2024-10-10 20:14:11 +02:00
Dean Herbert
14ecd56913
Merge pull request #30195 from bdach/advanced-stats-stupid-shenanigans
Fix crashes when attempting to change from a custom ruleset with mods selected to another
2024-10-11 00:57:28 +09:00
WitherFlower
eb2f1d09f8 Improve regex readability by using character set 2024-10-10 17:42:43 +02:00
WitherFlower
6b532824b1 Fix code quality and formatting issues 2024-10-10 17:41:29 +02: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
Bartłomiej Dach
f1842d781e
Decouple AdvancedStats from global mods
Closes https://github.com/ppy/osu/issues/30163.

If I'm to be blunt, the decoupled stuff in song select makes my head
spin. I spent a solid 20 minutes thinking how I was going to fix this
one but then finally realised that generally most of the cause there
was the fact that `AdvancedStats` was seeing the new rulesets *before*
the "ensure global selected mods are valid for current ruleset" logic,
and so decided to just _delay_ that until the decoupled transfer
thingamajig happens.

I was honestly considering combining `BeatmapInfo`, `Ruleset`, and
`Mods` into one property on `AdvancedStats`. I figured I'd rather not
push my luck and try the baseline version first, but I honestly think
that direction is going to be required at some point to properly corral
all of the decoupled madness taking place in song select.
2024-10-10 14:22:16 +02:00
WitherFlower
b58576f31b Add slash and dot as valid separators in dates. 2024-10-08 14:13:27 +02:00
WitherFlower
2369e98cfc Implement ranked and submitted date filtering 2024-10-08 13:56:55 +02:00
Dean Herbert
682023e130
Merge branch 'master' into grids-4 2024-10-08 16:26:42 +09:00
Dean Herbert
b658d9a681
Merge pull request #30073 from peppy/updates-outside-of-gameplay-only-2
Avoid updates (and update notifications) from appearing in more gameplay cases
2024-10-08 15:17:09 +09:00
OliBomby
d7526be243 Merge remote-tracking branch 'upstream/master' into grids-4 2024-10-07 11:56:35 +02:00
Dan Balasescu
8dece70097
Merge branch 'master' into updates-outside-of-gameplay-only-2 2024-10-07 17:41:42 +09:00
Dean Herbert
11fc811e2f
Fix delete dialogs having generic "Caution" header text
Regressed in https://github.com/ppy/osu/pull/28363.
2024-10-07 16:46:53 +09:00
Dean Herbert
75f15ccaba
Maybe fix compilation? Fuck knows if this is correct. 2024-10-07 16:04:24 +09:00
Dean Herbert
1ab02b93b3
Merge branch 'master' into grids-4 2024-10-07 15:42:23 +09:00
Dean Herbert
5c826be652
Merge pull request #29860 from bdach/fix-nudging
Only allow seek to next/previous object via keybinding if there is no selection
2024-10-07 15:36:19 +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
OliBomby
ae8abc7f35 fix readybutton and favouritebutton 2024-10-05 21:46:00 +02:00
OliBomby
48da758c39 contract sample point pieces based on smallest gap on the timeline
It finds the smallest distance between two sample point pieces on the alive timeline blueprints
2024-10-05 20:52:45 +02:00
OliBomby
ad734b1a13 Revert "Use new keyword instead of overriding TooltipText to remove setter"
This reverts commit 80dffa905a.
2024-10-05 15:10:36 +02:00
CloneWith
d7ba4ce7f2
Refactor progress tooltip updating method
* Rewrite calculating logic
* Remove useless variables
2024-10-04 23:30:50 +08:00
Bartłomiej Dach
7816c41b94
Only transfer difficulty slider values on commit
Closes https://github.com/ppy/osu/issues/30112.
2024-10-04 14:08:46 +02:00
Dean Herbert
4fc0aae486
Merge pull request #30108 from bdach/default-combo-colours-in-editor
Initialise colours section with default combo colours if none present
2024-10-04 18:57:25 +09:00
Bartłomiej Dach
61103cc712
Remove redundant initialiser 2024-10-04 11:18:09 +02:00
Bartłomiej Dach
7cd724f342
Move setup screen background preview to appropriate form control
See
https://discord.com/channels/188630481301012481/188630652340404224/1291361342971707463.
2024-10-04 11:09:14 +02: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
Bartłomiej Dach
6e5a38c6c8
Initialise colours section with default combo colours if none present
Closes https://github.com/ppy/osu/issues/30100.
2024-10-04 10:01:24 +02:00
Bartłomiej Dach
1bab2236fe
Ensure columns collapse into one correctly if no space 2024-10-03 15:01:23 +02:00
Bartłomiej Dach
99eb26b7d5
Redo the layout of sections based on discord feedback
See
https://discord.com/channels/188630481301012481/188630652340404224/1291358770064130140
and everything after.
2024-10-03 13:53:21 +02:00
Bartłomiej Dach
b15608343b
Replace setup screen controls with new "form" controls 2024-10-03 11:49:03 +02:00
OliBomby
80dffa905a Use new keyword instead of overriding TooltipText to remove setter 2024-10-03 11:13:49 +02:00
Dean Herbert
24d6ea5444
Change failed states to be considered as NotPlaying 2024-10-03 17:11:41 +09:00
OliBomby
f8397cccc7 Merge remote-tracking branch 'upstream/master' into grids-4 2024-10-01 15:43:54 +02:00
OliBomby
9fa2849b14 Fixed tooltip inheritors of RoundedButton 2024-10-01 15:34:12 +02: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
OliBomby
154a3eebc6 Reset the sample bank states to auto when selection is cleared
this matches behaviour in stable
2024-10-01 13:22:20 +02:00
OliBomby
1960a0d44d Add tooltip to explain why addition banks dont work when no additions exist 2024-10-01 13:07:25 +02:00
Dean Herbert
8773c34fdd
Rename enum to non-plural now that it won't conflict 2024-10-01 19:55:46 +09:00