1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-30 20:17:34 +08:00
Commit Graph

37778 Commits

Author SHA1 Message Date
Dean Herbert
d7381b762c Also tween origin position 2023-02-19 23:52:21 +09:00
Bartłomiej Dach
d9ca7102f0
Use more generic wording for future-proofing 2023-02-19 15:06:40 +01:00
Bartłomiej Dach
aac32a2c9f
Combine config and time checks into one
Functionally equivalent right now, but the combined variant is more
localised to what it actually needs to do, and less error-prone if
any new code gets appended to the method.
2023-02-19 13:14:51 +01:00
Maximilian Kruse
723a043c43 naming change from Hitobject to HitObject 2023-02-19 10:18:22 +01:00
Maximilian Kruse
f3522c4162 change bindable seekToHitObject to private 2023-02-19 10:18:02 +01:00
Maximilian Kruse
ddd37bb319 Add setting to disable automatic seeking after object placement 2023-02-18 19:43:45 +01:00
Bartłomiej Dach
ea04c487f2
Merge branch 'master' into blueprint-labels-while-hovering 2023-02-18 15:57:30 +01:00
Cootz
5fa75805cc
Merge branch 'master' into fix-exporting-a-skin-with-too-long-file-name 2023-02-18 15:52:17 +03:00
Bartłomiej Dach
15d209d17e
Merge branch 'master' into CompletionText-LocalisableString 2023-02-18 13:50:58 +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
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
Cootz
e3bdb3d852 Align links in one line 2023-02-17 15:32:36 +03:00
Cootz
fd1beaef87 Fix typo 2023-02-17 15:24:27 +03:00
Cootz
a3b440493a Update xml doc 2023-02-17 15:23:43 +03: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
Cootz
ceed3606cd
Remove redundant comment
Co-authored-by: Dean Herbert <pe@ppy.sh>
2023-02-17 13:46:06 +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
19d5293ad1 Change early return to also find the earliest nested object 2023-02-17 18:59:31 +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
Dean Herbert
8c772a723f Expose constant publicly rather than reexposing business 2023-02-17 13:34:19 +09:00
Dean Herbert
96b1498932 Rename max length variable to make sense (it's a filename limit, not path) 2023-02-17 13:33:22 +09:00
Andrei Zavatski
a84f20bf32 Add triangles to ModSelectColumn 2023-02-17 03:09:32 +03:00
Cootz
810712386d
Merge branch 'master' into fix-exporting-a-skin-with-too-long-file-name 2023-02-17 01:51:24 +03: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
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
Cootz
f1da213bea Add tests 2023-02-16 16:26:57 +03:00
Dean Herbert
cb7df7282b Apply NRT to SerialisedDrawableInfo 2023-02-16 20:01:59 +09:00
Cootz
3057ccb635
Merge branch 'master' into fix-exporting-a-skin-with-too-long-file-name 2023-02-16 13:22:11 +03: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
affa9507a1 Fix GameplaySampleTriggerSource not considering nested objects when determining the best sample to play 2023-02-16 18:21:33 +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
Dean Herbert
7afdcb9383 Merge branch 'master' into hide-resume-overlay 2023-02-16 15:42:14 +09:00
Dean Herbert
81dcc105a9 Rename left-over skinnable naming in SerialisedDrawableExtensions 2023-02-16 15:34:41 +09:00
Dean Herbert
76f7accd13 Standardise all local SkinComponentsContainerLookup variables to containerLookup 2023-02-16 15:33:56 +09:00
Dean Herbert
eea0cd3cf8 Reword xmldoc on ISerialisableDrawable to make less skin-centric 2023-02-16 15:31:35 +09:00
Dean Herbert
0b25f7baeb
Reword and fix typos in some new xmldoc
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2023-02-16 15:27:30 +09:00
Bartłomiej Dach
c315113fde
Merge branch 'master' into maximum-judgement-offset-in-hit-object 2023-02-16 00:15:51 +01:00
Bartłomiej Dach
768eea1ea8
Merge branch 'master' into skinnable-clean-up-documentation 2023-02-15 21:26:11 +01:00
Bartłomiej Dach
1d5d34ba0e
Merge pull request #22647 from peppy/remove-target-component-container
Simplify and rename `SkinnableTargetComponentsContainer`
2023-02-15 21:25:49 +01:00
Cootz
387a6f1330 Move logic to Export method 2023-02-15 22:43:43 +03:00
Cootz
fb06a77e2b
Merge branch 'master' into fix-exporting-a-skin-with-too-long-file-name 2023-02-15 22:29:38 +03:00
Cootz
1f586c129c fix applied 2023-02-15 22:15:44 +03:00
Dean Herbert
925deb7ca5 Make skin editor clipboard shared between screens and skins to allow moving elements over 2023-02-15 19:35:37 +09:00
Dean Herbert
bc83b0c264 Fix clipboard changes not batching as undo steps 2023-02-15 19:35:22 +09:00
Dean Herbert
bcf2555545 Fix components having incorrect default positions 2023-02-15 19:34:42 +09:00
Dean Herbert
d653335b6f Add basic skin editor clipboard implementation 2023-02-15 19:28:42 +09:00
Dean Herbert
08ed174f61 Change GameplaySkinComponentLookup's generic to always be an enum
And document the class better.
2023-02-15 18:48:14 +09:00
Dean Herbert
a92e42bb84 Rename SkinnableTargetContainer to SkinComponentsContainer
Also use full `SkinComponentsContainerLookup` instead of the sub-type.
This will potentially be useful once we bring in per-ruleset targets.
2023-02-15 18:37:41 +09:00
Dean Herbert
b1cf6d83d8 Move extension methods closer to serialisation classes 2023-02-15 18:37:41 +09:00
Dean Herbert
e61d2d571c Move the lookup type out of ISserialisableDrawableContainer 2023-02-15 18:37:41 +09:00
Dean Herbert
a7b47f6503 Rename ISkinnableTarget to ISerialisableDrawableContainer 2023-02-15 18:37:41 +09:00
Dean Herbert
d159d6b970 Rename ISkinnableDrawable to ISerialisableDrawable 2023-02-15 18:37:41 +09:00
Dean Herbert
8cb5a51aa7 Add further documentation to skin classes 2023-02-15 18:23:19 +09:00
Dean Herbert
856efd9fd9 Rename SkinnableDrawableInfo to SerialisedDrawableInfo 2023-02-15 18:23:19 +09:00
Dean Herbert
9e651a7ca2 Rename SkinnableInfo to SkinnableDrawableInfo 2023-02-15 18:23:17 +09:00
Dean Herbert
6010dde86e Move SkinnableInfo to better namespace 2023-02-15 18:23:10 +09:00
Dean Herbert
8bbd00822c Simplify and rename SkinnableTargetComponentsContainer 2023-02-15 17:30:21 +09:00
Dean Herbert
e71dfd7555 Fix skin export failing if a directory exists with the proposed filename 2023-02-15 16:11:16 +09:00
Dean Herbert
da8ab7143b
Merge branch 'master' into maximum-judgement-offset-in-hit-object 2023-02-15 14:48:15 +09:00
Dean Herbert
9ed068c1e6 Only apply dim changes when background blur is disabled 2023-02-15 14:16:34 +09:00
Dean Herbert
19e3c5d33c Adjust song select background dimming to be more evenly applied 2023-02-15 13:59:24 +09:00
Bartłomiej Dach
99b78c63a0
Merge branch 'master' into fix-mania-long-note-regression 2023-02-14 21:25:31 +01:00
Dean Herbert
5ec5222d8a Expose and consume OsuInputManager explicitly 2023-02-14 17:36:07 +09:00
Dean Herbert
b42b5f97cf Use Overlays container rather than KeyBindingInputManager for flashlight 2023-02-14 17:36:07 +09:00
Dean Herbert
970388d4e2 Move Overlays container to accept input and be frame-stable 2023-02-14 17:35:12 +09:00
Dean Herbert
e6f0a1dec9
Merge pull request #22632 from Joehuu/fix-beatmap-preview-progress
Fix beatmap card song preview progress sometimes showing past progress for one frame
2023-02-14 17:06:50 +09:00
Dean Herbert
0217875f3f
Merge branch 'master' into SkinSetOnNotificationClick 2023-02-14 16:04:03 +09:00
Dean Herbert
0ad245e9e0 Rewrite implementation to match other implementations 2023-02-14 16:00:23 +09:00
Dean Herbert
21429e164f Fix comment grammar 2023-02-14 15:55:32 +09:00
PC
ca2603324c Change present from skin selection tab to SkinCollection.First() 2023-02-14 09:43:40 +03:00
Joseph Madamba
ea624b8ad0 Reset preview track when stopping instead 2023-02-13 22:39:34 -08:00
Dean Herbert
63f3498762 Restructure UseResumeOverlay to correctly handle a value change before BDL load 2023-02-14 15:11:33 +09:00
Dean Herbert
9e04a36d86 Move test to a mod test and add more resilient test logic 2023-02-14 15:07:45 +09:00
PC
9064391226 Use ChildrenOfType instead of linq 2023-02-14 08:24:03 +03:00
Dean Herbert
51d4ae5241
Merge branch 'master' into footer_V2_implementation 2023-02-14 14:00:53 +09:00
Dean Herbert
f0ebb920b9 Make Actions nullable 2023-02-14 13:54:00 +09:00
Joseph Madamba
24a5a1061f Fix OsuClickableContainer sounds not being blocked by nested drawables 2023-02-13 15:36:17 -08:00
PC
f8f485e4c8 Move PresentSkinsImport to OsuGame. Replace switch with if statement 2023-02-14 02:29:50 +03:00
MK56
5006dbe3db
Update osu.Game/Screens/Select/FooterV2/FooterButtonV2.cs
Co-authored-by: Joseph Madamba <madamba.joehu@outlook.com>
2023-02-14 00:07:02 +01:00
Bartłomiej Dach
939144fb6c
Merge pull request #22628 from EVAST9919/letterbox-no-containers
Remove unnecessary containers in `LetterboxOverlay`
2023-02-13 23:54:48 +01:00
Pasi4K5
e4b84ebd0b Add UseResumeOverlay and use it for hiding the ResumeOverlay 2023-02-13 23:51:39 +01:00
Joseph Madamba
7f7e72705f Fix beatmap card song preview progress sometimes showing past progress for one frame 2023-02-13 14:15:37 -08:00
mk56-spn
ae9a17d76b Add offset to FooterButtonV2.cs shadow 2023-02-13 22:20:41 +01:00
mk56-spn
be52d0a60c Add note explaining shadow opacity
pass ColourProvider in from test, instead of hard coding it in `FooterButtonV2.cs`
2023-02-13 22:18:34 +01:00
mk56-spn
61584ba63c Fix corner_radius missing in some parts of FooterButtonV2.cs.
Adjust shadow radius value to 5 to match figma.
2023-02-13 22:15:29 +01:00
mk56-spn
6e6421caea Change FooterV2.cs colour to use ColourProvider instead of OsuColour.
Remove unnecessary `FillFlowContainer`
2023-02-13 22:12:25 +01:00
PC
10ab228d76 Improve xml doc 2023-02-13 22:47:29 +03:00
PC
46b13f2565 Improve code quality 2023-02-13 22:44:11 +03:00
PC
637b07efe6 Remove Resolved attribute 2023-02-13 22:36:51 +03:00
PC
a22a36bfe0 Add navigation to skin settings on multiple import 2023-02-13 20:31:09 +03:00
Andrei Zavatski
2dee783401 Remove not needed containers 2023-02-13 15:14:25 +03:00
PC
35bc0a29d8 Add setting skin on notification click 2023-02-13 15:11:55 +03:00
Dean Herbert
679df9bf8b
Merge pull request #22604 from Joehuu/abort-dangerous-dialog-button-on-hover-lost
Add ability to abort dangerous dialog button on hover lost
2023-02-13 20:40:14 +09:00
Dean Herbert
55358d36c8 Change MinimumColumnWidth to remove setter 2023-02-13 17:50:32 +09:00
Dean Herbert
ca768ca446 Add comment regarding unused enum members in LegacyNoteBodyStyle 2023-02-13 17:43:52 +09:00
Joseph Madamba
cb51b9e350 Use existing ModdingBeatmap activity 2023-02-12 15:01:50 -08:00
Joseph Madamba
bbeef53569 Add TestingBeatmap activity 2023-02-12 13:11:42 -08:00
Joseph Madamba
afb66d8af4 Make user activity class names more specific 2023-02-12 12:32:17 -08:00
Dean Herbert
9d09141ab7 Move taiko-specific property out of DrawableHitObject 2023-02-12 16:09:28 +09:00
Joseph Madamba
8d9245c1d4 Make AbortConfirm() virtual and override with filter logic 2023-02-11 12:54:16 -08:00
Bartłomiej Dach
774eae98cc
Merge branch 'master' into editor-select-timing-on-enter 2023-02-11 16:27:22 +01:00
Bartłomiej Dach
a3cc0d23b3
Fix typo in xmldoc 2023-02-11 16:26:32 +01:00
Bartłomiej Dach
7b2c5ab7eb
Merge pull request #22608 from peppy/update-dependencies
Update realm and other dependencies
2023-02-11 12:37:02 +01:00
Bartłomiej Dach
ebf469272f
Merge pull request #22544 from peppy/fix-change-join-leave-loop
Attempt to fix channel join / leave loop
2023-02-11 12:26:26 +01:00
Dean Herbert
20f3ab167e Re-centralise BannedApiAnalysers nuget package 2023-02-11 19:36:40 +09:00
Bartłomiej Dach
8292052dc2
Merge pull request #22598 from peppy/fix-skip-intro-replay
Fix "skip" key binding no longer working in replay playback
2023-02-11 11:27:10 +01:00
Dean Herbert
0c5dae5f26
Merge pull request #22529 from ItsShamed/dsc/presence
Add support for `Watching` and `Spectating` activities in `ReplayPlayer` and `SoloSpectatingPlayer`
2023-02-11 17:29:47 +09:00
Dean Herbert
86c8675910 Update realm and other dependencies 2023-02-11 13:52:24 +09:00
Dean Herbert
463e8221e0
Merge pull request #22600 from Terochi/song-progress-time-left-fix
Song progress incorrectly displaying `timeLeft` counter after rotation
2023-02-11 13:19:06 +09:00
Joseph Madamba
94d6ab1ec7 Continue confirming when rehovering if mouse is still down 2023-02-10 19:09:30 -08:00
Joseph Madamba
bfd83768c1 Fix skin component previews on toolbox buttons having incorrect size for one frame 2023-02-10 17:58:34 -08:00
Joseph Madamba
d30d054b4c Add ability to abort dangerous dialog button on hover lost 2023-02-10 14:41:44 -08:00
Bartłomiej Dach
75e19bb89f
Merge branch 'master' into fix-clickable-avatar-bloat 2023-02-10 21:30:40 +01:00
Bartłomiej Dach
11296c4ffe
Use better exception type 2023-02-10 21:25:19 +01:00
Terochi
81c3e0da31 Fixed timeLeft counter in SongProgressInfo being out of bounds after rotation 2023-02-10 17:58:48 +01:00
Dean Herbert
bfbffc4a68 Add parsing support for mania NoteBodyStyle 2023-02-10 19:46:59 +09:00
Dean Herbert
635e225d19 Add correct lookup for WidthForNoteHeightScale 2023-02-10 19:18:41 +09:00
Dean Herbert
5c795f492f Reorder game key bindings to allow skip overlay to have precedence over replay controls 2023-02-10 18:57:21 +09:00
Dean Herbert
96fbd04698 Add failing test coverage of skip no longer working in replay playback 2023-02-10 18:57:04 +09:00
Dean Herbert
4f7d26b776 Actually apply new parameter 2023-02-10 18:29:39 +09:00
Dean Herbert
6d876fdb9a Automatically select the closest timing point on entering the timing screen 2023-02-10 17:48:56 +09:00