1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-17 09:39:04 +08:00
Commit Graph

59184 Commits

Author SHA1 Message Date
Bartłomiej Dach
15d209d17e
Merge branch 'master' into CompletionText-LocalisableString 2023-02-18 13:50:58 +01:00
Bartłomiej Dach
6b1c8195bc
Merge pull request #22672 from peppy/skin-editor-improve-toolbox-hover
Improve the feel of hovering components in the skin editor toolbox
2023-02-18 10:34:28 +01:00
Bartłomiej Dach
fbea3e312f
Merge branch 'master' into skin-editor-improve-toolbox-hover 2023-02-18 10:02:02 +01:00
Bartłomiej Dach
704dddf14b
Merge branch 'master' into skin-editor-clipboard 2023-02-17 22:59:18 +01:00
Bartłomiej Dach
6b9472c367
Merge branch 'master' into skin-per-ruleset-layouts 2023-02-17 22:58:38 +01:00
Bartłomiej Dach
2aa4481f68
Fix toolbox items spontaneously contracting after briefly losing hover
Reproduction scenario:

1. Hover a toolbox item
2. Unhover the item, but do not hover any other item (can be done by
   exiting the toolbox completely to the right)
3. Come back to the item hovered in step (1)
4. The item would spontaneously contract after a second
2023-02-17 22:54:11 +01:00
Bartłomiej Dach
b390fdb8cc
Remove unused field 2023-02-17 21:51:19 +01:00
Bartłomiej Dach
8894a73b07
Merge branch 'master' into blueprint-improve-visuals 2023-02-17 21:40:16 +01:00
Bartłomiej Dach
23a636b74b
Merge pull request #22648 from peppy/skinnable-clean-up-documentation
Refactor structure and naming of skin-related classes
2023-02-17 21:37:54 +01:00
Andrei Zavatski
ffcca9fd89 Remove awkward width specification 2023-02-17 23:23:58 +03:00
Bartłomiej Dach
6afa65bd3d
Merge branch 'master' into skinnable-clean-up-documentation 2023-02-17 20:59:18 +01:00
Salman Ahmed
449e5fa6f8 Rename one more left-over skinnable naming 2023-02-17 22:09:55 +03:00
cdwcgt
dbb366e279 CompletionText can be a LocalisableString
I can't find a reason for not doing this, probably this was forgotten in https://github.com/ppy/osu/pull/15440
2023-02-17 22:32:03 +09:00
Andrei Zavatski
51940133df Adjust width and add comment 2023-02-17 15:18:45 +03:00
Andrei Zavatski
0838fa636f Make triangles slower 2023-02-17 15:16:00 +03:00
Andrei Zavatski
fa300b5ba0 Merge branch 'master' into mod-overlay-triangles 2023-02-17 15:13:51 +03:00
Dean Herbert
0a018514e1 Make skin editor focus only one layer at a time 2023-02-17 19:27:16 +09:00
Dean Herbert
00fcee0c5a Add per-ruleset component toolbox and placement support 2023-02-17 19:27:16 +09:00
Dean Herbert
ba5a87ca04 Add basic target layer selection in skin editor 2023-02-17 19:27:16 +09:00
Dean Herbert
c03b6cec23 Add IEquatable and ToString support to SkinComponentsContainerLookup 2023-02-17 19:27:16 +09:00
Dean Herbert
a01c3090e4 Fix tests which rely on HUDOverlay's DrawableRuleset being nullable 2023-02-17 19:27:09 +09:00
Dean Herbert
5ed038fbb3 Improve the feel of hovering toolbox component items 2023-02-17 19:26:03 +09:00
Dean Herbert
814080d982 Only show blueprint labels when hovering or selected 2023-02-17 19:23:52 +09:00
Dean Herbert
209d41ee9d Use RulesetInfo instead of Ruleset in skin components lookup 2023-02-17 18:24:05 +09:00
Dean Herbert
675e5b81f3 Fix SkinnableLighting showing up as a user placeable component 2023-02-17 18:24:05 +09:00
Dean Herbert
2267aa1ac2 Add ability to retrieve serialisable drawables for specific rulesets 2023-02-17 18:24:05 +09:00
Dean Herbert
ffb99364b9 Ensure skin default component layouts only apply to global layout for now 2023-02-17 18:24:05 +09:00
Dean Herbert
6c61c5f4a8 Fix selection on the edge of blueprints (in the new inflation area) failing 2023-02-17 18:19:46 +09:00
Dean Herbert
16d94b4ea2 Improve visuals of skin blueprint 2023-02-17 18:19:46 +09:00
Dean Herbert
9793774377 Update SkinDeserialisationTest to work with new serialisation structure 2023-02-17 16:22:48 +09:00
Dean Herbert
6b3652f567 Change serialisation format of skin layouts to allow more flexibility
Also adds per-ruleset storage for each container type.
2023-02-17 14:19:19 +09:00
Dean Herbert
9685fb2114 Always return a non-null container for SkinComponentsContainerLookups 2023-02-17 14:19:19 +09:00
Dean Herbert
4cc6664dc7 Add optional ruleset identifier to SkinComponentsContainerLookup 2023-02-17 14:19:19 +09:00
Dean Herbert
1a63ca9ece Add xmldoc around SkinComponentsContainerLookup 2023-02-17 14:18:05 +09:00
Andrei Zavatski
a84f20bf32 Add triangles to ModSelectColumn 2023-02-17 03:09:32 +03:00
Adam
e06502085e Enable fading when hidden only hides appreach circles 2023-02-16 16:31:42 -06:00
Bartłomiej Dach
9f9893d93a
Merge pull request #22338 from Pasi4K5/hide-resume-overlay
Hide `ResumeOverlay` when `OsuModAutopilot` is enabled
2023-02-16 22:22:19 +01:00
Bartłomiej Dach
3ee046000e
Merge branch 'master' into revert-result-in-playfield 2023-02-16 21:54:29 +01:00
Bartłomiej Dach
66e9bb2581
Merge branch 'master' into hide-resume-overlay 2023-02-16 21:33:23 +01:00
Bartłomiej Dach
bba1722725
Merge pull request #22645 from peppy/adjust-song-select-background-dim
Adjust song select background dimming to be more evenly applied
2023-02-16 21:27:27 +01:00
Bartłomiej Dach
b8084a15eb
Revert ResumeOverlay setter accessibility change 2023-02-16 21:26:01 +01:00
Bartłomiej Dach
0186062246
Merge branch 'master' into adjust-song-select-background-dim 2023-02-16 20:52:36 +01:00
Bartłomiej Dach
ad5132ed41
Remove redundant conditional access qualifier
It is impossible for the callback passed to `ApplyToBackground()` to
receive a null reference. See `OsuScreen.ApplyToBackground()` - if the
background to call the callback on were `null`, then an
`InvalidOperationException` would be thrown instead.
2023-02-16 20:47:51 +01:00
Bartłomiej Dach
7d86f49fce
Merge pull request #22658 from peppy/gameplay-sample-trigger-source-test-fix
Refactor `GameplaySampleTriggerSource` test to not be realtime dependent
2023-02-16 19:39:18 +01:00
Bartłomiej Dach
5bdc5dfadd
Add one more assert to keep coverage from previous implementation 2023-02-16 19:02:51 +01:00
Dean Herbert
cb7df7282b Apply NRT to SerialisedDrawableInfo 2023-02-16 20:01:59 +09:00
Dean Herbert
394d368f16 Fix song select potentially updating background parameters when not the current screen 2023-02-16 18:45:22 +09:00
Dean Herbert
979c079f8b Refactor GameplaySampleTriggerSource test to not be realtime dependent 2023-02-16 17:58:44 +09:00
Dean Herbert
9d02a2ef0e Apply NRT to GamepleSampleTriggerSource tests 2023-02-16 17:58:44 +09:00
Dean Herbert
ce9ef3bc3c Always create ResumeOverlay, with UseResumeOverlay flag only affecting whether it is displayed or not 2023-02-16 15:47:20 +09:00