1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-22 03:27:24 +08:00
Commit Graph

59946 Commits

Author SHA1 Message Date
Dean Herbert
4f55afb60d Merge branch 'master' into chat-report 2023-05-03 18:50:38 +09:00
Bartłomiej Dach
88135a3be8
Merge pull request #23384 from peppy/fix-incorrect-transform-thread
Fix potentially incorrect thread access in `OsuTabControlCheckbox`
2023-05-03 10:37:27 +02:00
Dean Herbert
ff28d941b3
Merge pull request #23385 from Joehuu/scroll-back-button-block-hover
Fix overlay scroll back button not absorbing hover from behind
2023-05-03 16:28:05 +09:00
Bartłomiej Dach
de1b28bcb2
Fix incorrect initial state of checkbox
This only ever barely used to work without the `(..., true)`
in `master` because of haphazard operation ordering.
2023-05-03 09:27:23 +02:00
Bartłomiej Dach
5f781bd6de
Move callback to LoadComplete()
Is the more correct place for `BindValueChanged()` callbacks.
2023-05-03 09:26:54 +02:00
Bartłomiej Dach
29a943d514
Merge pull request #23383 from peppy/fix-multi-freemod-overlays-test-failure
Fix test failure in `MultiplayerMatchSongSelect` due to multiple overlays present
2023-05-03 09:09:41 +02:00
Bartłomiej Dach
2add8e119f
Merge pull request #23379 from peppy/legacy-skin-reverse-arrow-colour-flip
Add support for flipping colour of reverse arrow on legacy default skin when combo colour is too bright
2023-05-03 08:48:32 +02:00
Joseph Madamba
1c74f6e8ea
Fix regressed button hover fade in 2023-05-02 22:54:42 -07:00
Joseph Madamba
bede1292de
Fix overlay scroll back button not absorbing hover from behind 2023-05-02 22:40:37 -07:00
Dean Herbert
a3efae3690 Fix potentially incorrect thread access in OsuTabControlCheckbox
https://github.com/ppy/osu/actions/runs/4868337922/jobs/8681736829.
2023-05-03 14:33:32 +09:00
Dean Herbert
384693a431 Fix test failure in MultiplayerMatchSongSelect due to multiple overlays present
https://github.com/ppy/osu/actions/runs/4868337922/jobs/8681736995?pr=23308.
2023-05-03 14:30:58 +09:00
Dean Herbert
6b017ac05f
Merge pull request #23308 from OliBomby/sample-control-points
Remove SampleControlPoint and DifficultyControlPoint from HitObject
2023-05-03 14:21:51 +09:00
Dean Herbert
f930c4bd0a Move struct to bottom of file 2023-05-03 13:33:31 +09:00
Dean Herbert
48fd99818e Split out default and sample application 2023-05-03 13:30:45 +09:00
Dean Herbert
cca15f930c Refactor applyLegacyInfoAndDefaults for legibility 2023-05-03 13:26:50 +09:00
Dean Herbert
588a4e6196 Move pragma disable to top of LegacyBeatmapDecoder
Makes more sense as it's used multiple times in the class.
2023-05-03 13:19:14 +09:00
Dean Herbert
16c624fb61 Ensure static banana samples are not mutated 2023-05-03 13:02:37 +09:00
Dean Herbert
9c4312b407 Add support for flipping colour of reverse arrow on legacy default skin when combo colour is too bright 2023-05-03 12:37:07 +09:00
Dean Herbert
e42b0cc5b1
Merge pull request #23370 from peppy/fix-editor-playfield-padding
Add more padding around playfield in editor to avoid overlap with tool areas
2023-05-03 11:44:55 +09:00
Bartłomiej Dach
03459a4f19
Merge pull request #23371 from peppy/argon-slider-ball-fade-faster
Increase the rate of slider ball fade on argon skins to match other implementations
2023-05-02 19:03:47 +02:00
Bartłomiej Dach
95badb9455
Adjust composer tests to new screen layout
`TestSceneHitObjectComposer.TestPlacementFailsWhenClickingButton()` was
attempting to cover the case of the user clicking a toolbox button which
was in front of the playfield, and ensure that the click did not result
in a placement. However, since the paddings in
67f83f246b were added, it is impossible
for a toolbox button to be in front of the playfield in the collapsed
state, which the test was relying on.

The test scenario is still however relevant in the case of the toolbox
being expanded, as in that state the toolbux buttons may very well end
up being in front of the playfield, and they still should not result in
a hitobject being placed. To ensure that this is the case, add a few
extra test steps ensuring that the toolbox is expanded first before
trying to retrieve an overlapping button.
2023-05-02 18:45:45 +02:00
Bartłomiej Dach
ec8362c6fc
Merge pull request #23367 from peppy/fix-uo-tooltip
Fix slider bar tooltips potentially showing negative zero
2023-05-02 18:03:09 +02:00
Bartłomiej Dach
48dd42407b
Merge pull request #23369 from peppy/beatmap-attribute-text-unicode-preference
Fix `BeatmapAttributeText` not supporting unicode artist/title
2023-05-02 17:32:55 +02:00
Dean Herbert
94ae9d7664
Merge pull request #23357 from OliBomby/fix-reverse-crash
Prevent infinite repeat count when adjusting repeats of 0 length slider
2023-05-02 19:53:26 +09:00
Dean Herbert
1b565ab9e8
Merge pull request #21789 from mk56-spn/bubble_mod_implementation_clean
Add "bubble" mod to osu! ruleset
2023-05-02 19:52:32 +09:00
Dean Herbert
2aaa52e904
Merge pull request #23374 from EVAST9919/ruleset-shaders-test
Add missing ruleset shader tests
2023-05-02 19:52:09 +09:00
OliBomby
90d98cd329 remove constructor argument from Banana 2023-05-02 12:41:39 +02:00
OliBomby
d2d81bb82c remove redundant zero check in sv calculation 2023-05-02 12:29:11 +02:00
Andrei Zavatski
ba5088f71a Add missing ruleset shader tests 2023-05-02 11:55:05 +03:00
Andrei Zavatski
8160d56264 Update test shaders 2023-05-02 11:51:05 +03:00
Dean Herbert
e44672bdd5 Avoid using Schedule in transforms (doesn't handle rewind well) 2023-05-02 17:08:49 +09:00
Dean Herbert
7830711c8e Tidy up various code quality issues in OsuModBubbles 2023-05-02 17:08:37 +09:00
Dean Herbert
fb0e90913d Ensure lifetime start is also updated when reverting judgements 2023-05-02 17:07:12 +09:00
Dean Herbert
414b80d44e Change flashlight depth in a more standard way 2023-05-02 17:00:54 +09:00
Dean Herbert
b2b9f2a036 Merge branch 'master' into bubble_mod_implementation_clean 2023-05-02 16:59:55 +09:00
Dean Herbert
bd72c67d68 Increase the rate of slider ball fade on argon skins to match other implementations 2023-05-02 15:47:35 +09:00
OliBomby
2e018c8b06
Fix comment 2 osu.Game/Rulesets/Objects/Types/IHasGenerateTicks.cs
Co-authored-by: Dean Herbert <pe@ppy.sh>
2023-05-02 08:41:47 +02:00
OliBomby
c2ad8c2320
Fix comment 1 osu.Game/Rulesets/Objects/Types/IHasGenerateTicks.cs
Co-authored-by: Dean Herbert <pe@ppy.sh>
2023-05-02 08:41:30 +02:00
Dean Herbert
67f83f246b Add more padding around playfield in editor to avoid overlap with tool areas
Closes #23130.
2023-05-02 15:37:02 +09:00
Dean Herbert
4a97c2c105
Merge pull request #23038 from cdwcgt/scale-background-dim
Add feature to adjust `ScalingContainer` background dim
2023-05-02 15:36:52 +09:00
Dean Herbert
ce4a6c38a0
Merge pull request #22950 from Joehuu/fix-initial-playlist-highlight
Fix now playing playlist not highlighting selected item on initial open
2023-05-02 15:36:34 +09:00
Dean Herbert
8a536c1cdb Fix non-block namespace usage 2023-05-02 15:09:24 +09:00
Dean Herbert
1e4a628cb1
Merge pull request #23284 from Hy0tic/multiplier-doesnt-update-with-preset-mod
Fix issue where multiplier show wrong value when adjusting speed on preset
2023-05-02 14:59:41 +09:00
Dean Herbert
e3c384c6b5 Merge branch 'master' into sample-control-points 2023-05-02 14:38:39 +09:00
Dean Herbert
57f48e0703 Start colour black to ensure initial appear transition doesn't look silly 2023-05-02 14:33:57 +09:00
Dean Herbert
ab4f66fad3 Minor readability refactors 2023-05-02 14:31:39 +09:00
Dean Herbert
7a840e1d82 Remove unnecessary TransferValue spec 2023-05-02 14:29:26 +09:00
Dean Herbert
7efaa299bd Merge branch 'master' into scale-background-dim 2023-05-02 14:24:54 +09:00
Dean Herbert
736be6a73b Refactor slightly for readability 2023-05-02 14:11:16 +09:00
Dean Herbert
ad40099e32 Ensure negative sign is only applied when the post-rounded result is negative 2023-05-02 14:00:52 +09:00