1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-17 00:33:21 +08:00
Commit Graph

15455 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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