1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 02:03:51 +08:00
Commit Graph

1635 Commits

Author SHA1 Message Date
Terochi
e6f1ec57a9 Bring back and make use of clearPreviousSamples() 2023-03-23 18:46:48 +01:00
Terochi
1478a26cc0 Addressed changes 2023-03-21 23:15:49 +01:00
Dean Herbert
8e6a4559e3 Add xmldoc for new method and reorder methods in SkinReloadableDrawable 2023-03-16 15:58:42 +09:00
Dean Herbert
297e7d6542 Fix Flush call being run too late in PoolableSkinnableSample 2023-03-16 15:33:30 +09:00
Terochi
edc6314634 Drank some coffee and figured out the fix 2023-03-15 10:49:59 +01:00
Terochi
b0f1a69523 Update the pauseLoop sample instantly on skin change 2023-03-15 09:05:34 +01:00
Terochi
a9c349fa6d Cache any skin changes in SkinReloadableDrawable to ScheduledDelegate 2023-03-15 09:03:29 +01:00
Terochi
390ad335d0 Reloading samples before playing then when skin change occurs 2023-03-14 21:35:52 +01:00
rozukke
1f7721786b Perform check to account for non-ASCII characters 2023-03-13 22:01:26 +11:00
Dean Herbert
16c8a392a1 Add ability to send selected skin components to front or back 2023-02-22 18:17:20 +09:00
Bartłomiej Dach
6799492596
Merge branch 'master' into skin-editor-layer-select 2023-02-20 21:33:48 +01:00
Bartłomiej Dach
86a7f4dfd0
Do not serialise SkinLayoutInfo.AllDrawables
- It is entirely derived from `SkinLayoutInfo.DrawableInfo`, which is
  the actual primary thing we want to serialise.
- It will never get read out from any serialised files anyway (corollary
  of the previous point - it is a get-only property derived from another).
- It is only used in tests.

All of the three reasons above make serialising the property out to skin
files nothing more than a waste of space.
2023-02-20 20:37:48 +01:00
Bartłomiej Dach
43724472c4
Clarify comment to avoid playing pronoun game 2023-02-20 20:09:24 +01:00
Dean Herbert
ec12186d63 Remove unnecesasry null check on content 2023-02-20 19:53:04 +09:00
Dean Herbert
18700b4daa Add note about skin migrations being on read and remove an older deprecation notice 2023-02-20 19:51:54 +09:00
Dean Herbert
1629c86b5d
Mark constant identifier as non-localisable
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2023-02-20 19:48:39 +09:00
Dean Herbert
0ddda018fd
Add xmldoc for SkinComponentsContainerLookup.Ruleset
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2023-02-20 19:48:18 +09:00
Dean Herbert
5f7a6d13c3 Remove unused GetSerialisableIdentifier for now 2023-02-20 19:47:17 +09:00
Bartłomiej Dach
6b9472c367
Merge branch 'master' into skin-per-ruleset-layouts 2023-02-17 22:58:38 +01:00
Salman Ahmed
449e5fa6f8 Rename one more left-over skinnable naming 2023-02-17 22:09:55 +03:00
cdwcgt
e84e011d5d Merge branch 'master' into export 2023-02-17 22:15:19 +09:00
Dean Herbert
c03b6cec23 Add IEquatable and ToString support to SkinComponentsContainerLookup 2023-02-17 19:27:16 +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
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
cb7df7282b Apply NRT to SerialisedDrawableInfo 2023-02-16 20:01:59 +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
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
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
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
e5f62b0d2e Remove public access modifier from interface methods 2023-02-06 14:19:25 +09:00
Dean Herbert
10ab4d572a Merge branch 'master' into skin-editor-undo-support 2023-02-06 13:46:50 +09:00
Bartłomiej Dach
59656a7286
Merge branch 'master' into skin-editor-dont-show-save-on-no-change 2023-02-03 19:08:33 +01:00
Dean Herbert
2f30306ea2 Expose a method to reload a SkinnableTargetContainer from provided info 2023-02-03 18:53:09 +09:00
Dean Herbert
92306b9123 Combine localisations for abstract skinnable components into a single file
Generally we don't want localisation files with only one to two
translations. It makes it harder for translators to handle in crowdin (a
lot of file changes for small results).

So for cases like this I believe we should be grouping translations
where it makes sense.

I've left individual components in their own files as I can see
potential for more settings to be added in the future. Plus it gives a
bit of extra context.
2023-02-03 16:02:18 +09:00
Dean Herbert
cf8cfe0d2c Move skin component localisations to namespaces 2023-02-03 15:34:57 +09:00
Dean Herbert
32207dc9dd Merge branch 'master' into locale/skin-editor-components 2023-02-03 15:24:00 +09:00
Dean Herbert
9c954a93e3 Update Save method xmldoc to make more sense 2023-02-03 15:18:01 +09:00
Bartłomiej Dach
4d46a8f32d
Merge branch 'master' into skin-editor-dont-show-save-on-no-change 2023-02-02 19:36:23 +01:00
Bartłomiej Dach
6c0aada86a
Merge pull request #22490 from peppy/skin-overlay-namespace
Move skin editor to overlays namespace
2023-02-02 18:14:16 +01:00
Dean Herbert
015f4f2b38 Avoid showing skin save message when changing scenes after making no changes 2023-02-02 18:42:37 +09:00
Dean Herbert
229fb518dc Apply NRT to LegacyJudgementPieceOld 2023-02-02 14:19:00 +09:00
Dean Herbert
183d1c5bd6 Change version comparison to match other existing code as proposed in review 2023-02-02 14:18:49 +09:00
Dean Herbert
263a7e2766 Merge branch 'master' into misses-animation 2023-02-02 14:08:15 +09:00
Dean Herbert
8dc2e6872e Move skin editor to overlays namespace 2023-02-02 14:00:31 +09:00
Dean Herbert
10df64467a
Merge pull request #22430 from peppy/skin-editor-nrt
Apply NRT to all skin editor classes
2023-02-02 13:57:57 +09:00
tsrk
0fb6a63709
refactor: change namespacing to allow osu-localisation-analyzer to process all strings 2023-02-02 00:46:14 +00:00
tsrk
8645e705fd
feat: add localisation for Skin editor components 2023-02-01 23:48:05 +00:00
Bartłomiej Dach
c5e1f54185
Fix sample store creation mutating shared resource store 2023-01-30 20:48:52 +01:00
Dean Herbert
74ab036f3e Refactor SkinnableSound.Samples to be non-nullable 2023-01-27 19:32:30 +09:00
Dean Herbert
8a9a6c733c
Apply missed cleanup to BackgroundDependencyLoader call
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2023-01-27 13:55:34 +09:00
EXtremeExploit
758b4c8cfc
Do the thing aka fix the if 2023-01-26 10:01:33 -03:00
Dean Herbert
4352c56c3e Apply NRT to all simple auxiliary skin classes 2023-01-26 17:53:04 +09:00
Dean Herbert
2017ac1135 Apply NRT to all skin editor classes 2023-01-26 17:52:53 +09:00
Dean Herbert
64e7f6f138 Add more documentation around the implementation of FontAdjustableSkinComponent 2023-01-26 16:05:07 +09:00
Dean Herbert
d63719a602 Move and rename the base component class 2023-01-26 16:04:56 +09:00
Dean Herbert
48885d40cc
Merge branch 'master' into skin-fonts 2023-01-26 15:52:54 +09:00
Dean Herbert
f3c92749bf Fix code quality issues 2023-01-26 15:43:03 +09:00
EXtremeExploit
bcecc49092
Only do misses animations on modern skins 2023-01-25 23:05:11 -03:00
EXtremeExploit
a6fc3ce477
bring comment back 2023-01-25 20:38:55 -03:00
Bartłomiej Dach
fd495e87f7
Fix GetAsync() not limiting texture dimensions 2023-01-25 19:02:35 +01:00
EXtremeExploit
fc968d1d89
del extra newline 2023-01-25 14:38:02 -03:00
EXtremeExploit
a4a94cb96e
Add movement to misses in osu ruleset 2023-01-25 14:34:00 -03:00
Dean Herbert
7bb6337d2e Fix nullability (thanks bdach for patch) 2023-01-25 14:43:46 +09:00
Dean Herbert
8caf960f9a Revert weird nullable changes to Skin.cs 2023-01-25 14:43:46 +09:00
Dean Herbert
0a9b20d5d5 Split lookup store into own file / class 2023-01-25 14:43:46 +09:00
Dean Herbert
c1a5c16973 Reduce maximum texture size to a more commonly-supported 8192 2023-01-25 14:43:46 +09:00
Dean Herbert
d000a4ed28 Make sure to dispose of the original texture upload as we are replacing it 2023-01-25 14:43:46 +09:00
Dean Herbert
598c6fcbad Add basic support for stupidly long hold note skin textures 2023-01-25 14:43:46 +09:00
Bartłomiej Dach
b62ff8d644
Merge branch 'master' into skin/argon-song-progress-cleaner 2023-01-18 23:52:12 +01:00
Dean Herbert
4ef940653b Fix legacy judgement animation not matching perfectly
This will be the final attempt to get it right. I was seemingly drunk
last time I wrote the logic.

Closes #21892.
2023-01-18 19:03:04 +09:00
Dean Herbert
5429979049 Combine common code into SongProgress base class 2023-01-18 15:23:55 +09:00
Dean Herbert
65bd2e74fd Merge branch 'master' into skin/argon-song-progress-cleaner 2023-01-17 18:00:42 +09:00
ansel
133b9b79d7 Do not touch "currently editing" line 2023-01-16 22:52:17 +03:00
ansel
17aeb0ec19 Localise editor's UI 2023-01-16 19:55:28 +03:00
ansel
6eb5508404 Localise menu bar 2023-01-16 19:39:50 +03:00
Dean Herbert
d2309feec2
Merge branch 'master' into skin/argon-song-progress-cleaner 2023-01-12 19:49:27 +09:00
Dean Herbert
e9571be4ab Fix incorrect application layer causing completely discoloured circles 2023-01-11 19:29:17 +09:00
Dean Herbert
a87debab0f Fix kiai flash opacity on legacy skins being too intense 2023-01-11 19:29:17 +09:00
tsrk
91cde5ffbf
feat(hud/gameplay): implement Argon variant of SongProgress 2023-01-09 21:59:48 +01:00
Dean Herbert
811a562608 Don't use bindables to avoid potential cross-usage contamination 2023-01-10 01:10:20 +09:00
Dean Herbert
62ffb4fe78 Pause imports during active gameplay 2023-01-09 18:54:11 +09:00
Berkan Diler
c7ca4bbba5 Use generic Enum methods 2022-12-26 20:36:39 +01:00
Jamie Taylor
f7c854f1b0
Change asset folder 2022-12-20 21:18:51 +09:00
Dean Herbert
2f0c772dcb
Add argon pro skin 2022-12-20 21:18:51 +09:00
Dean Herbert
192536643c Fix some more inspections 2022-12-16 20:21:19 +09:00
Dean Herbert
ba54551313 Merge branch 'master' into guard-url-protocols 2022-12-16 18:23:16 +09:00
Dean Herbert
27c497145f Fix the MOTHERLOAD of undetected issues that are now visible thanks to net6.0 2022-12-16 18:16:26 +09:00
cdwcgt
6ef5b2733f
Export instead of ExportCurrentSkin 2022-12-15 21:41:15 +09:00
Dean Herbert
b8904fe747 Move ImportParameters to better home 2022-12-13 21:41:26 +09:00
Dean Herbert
cb16d62700 Hook up ImportParameter flow with IModelImporter caller methods 2022-12-13 21:29:32 +09:00
Dean Herbert
cf2719d4c0 Convert batchImport parameter to parameters class to allow further import configuration 2022-12-13 19:55:18 +09:00
cdwcgt
e02b8cb199
Group export methods into their respective managers 2022-12-11 18:30:24 +09:00
ansel
b240d15731 Fix numeric font 2022-12-03 23:38:50 +03:00
ansel
8174f6be64 Get rid of dublicated enum 2022-12-03 23:32:17 +03:00
ansel
b41f30c868 Allow changing font of text elements 2022-12-03 22:44:54 +03:00
ansel
0db6c2ada1 Add enum with font types 2022-12-03 22:38:11 +03:00
Bartłomiej Dach
212d78865a
Add a few more missing partial specs 2022-11-26 16:30:52 +01:00
Dan Balasescu
7bc8908ca9 Partial everything 2022-11-27 00:00:27 +09:00
C0D3 M4513R
4b44f31b5e
Use LocaliseableStings in BeatmapAttributeText 2022-11-23 21:02:43 +01:00
Dean Herbert
774f70e380 Simplify class structure 2022-11-23 16:56:40 +09:00
Dean Herbert
0749a7bb07 Simplify attribute assignment 2022-11-23 16:53:36 +09:00
Dean Herbert
0f034606fd Use LocalisableDescription from BeatmapOnlineStatus enum instead of locally defined 2022-11-23 16:49:51 +09:00
Dean Herbert
a8af83e62a Move label initialisation out of ctor 2022-11-23 16:49:39 +09:00
Dean Herbert
27473262af Rename attributes in enum to match better with user expectations 2022-11-23 16:45:46 +09:00
Dean Herbert
b89689a34a Rename class and reword settings text/tooltips to avoid clashing with other naming 2022-11-23 16:31:50 +09:00
C0D3 M4513R
93ab1c9432
Merge branch 'master' into beatmap-info 2022-11-21 09:01:24 +00:00
Dean Herbert
eae8530722 Fix SkinnableSprite lookups broken in lazer-first skins
Regressed with removal of local `GetTexture` calls in e19ba65f91
2022-11-13 12:46:21 +09:00
Dean Herbert
e19ba65f91 Remove LookupName from base ISkinComponentLookup 2022-11-09 17:46:43 +09:00
Dean Herbert
1aa0e40f2f Add "Component" prefix to lookup naming 2022-11-09 17:46:43 +09:00
Dean Herbert
e75c3b3f94 Rename SkinnableTarget to GlobalSkinLookup 2022-11-09 17:46:43 +09:00
Dean Herbert
c908969d9b Rename ISkinComponent to ISkinLookup 2022-11-09 17:46:43 +09:00
Dean Herbert
ab458320c4 Fix some lingering inspections 2022-11-09 17:46:24 +09:00
Dean Herbert
d4251271d8 Apply nullability to SkinnableDrawable 2022-11-09 13:59:13 +09:00
Dean Herbert
bf26dbffc2 Apply nullability to skinning support classes 2022-11-09 13:59:13 +09:00
C0D3 M4513R
ab650d8a1b
Use AutoSizeAxes 2022-11-07 15:22:20 +01:00
C0D3 M4513R
28ab092b6f
Simplify the whole Templating process 2022-11-07 07:55:42 +01:00
C0D3 M4513R
a435e365ea
Allow for the Value of BeatmapInfoDrawable to be formatted 2022-11-03 18:54:55 +01:00
C0D3 M4513R
502bfa950e
Fix potential resource leak 2022-11-03 08:05:26 +01:00
C0D3 M4513R
95e2521ca4
Use more Localisations 2022-11-02 13:56:55 +01:00
C0D3 M4513R
2e5db5e259
Remove nullable disable from TextElement 2022-11-02 13:24:05 +01:00
C0D3 M4513R
ed7e3a29e2
Add Localisation
Also add Labels for what is displayed, and prefix/suffix for Labels
Add a Prefix and Suffix for Values
2022-11-02 13:00:45 +01:00
C0D3 M4513R
975eed964e
Don't make Beatmap in OsuGameBase public
Signed-off-by: C0D3 M4513R <28912031+C0D3-M4513R@users.noreply.github.com>
2022-11-01 21:19:01 +01:00
C0D3 M4513R
c231a20cbb
Add a generic text Element
Signed-off-by: C0D3 M4513R <28912031+C0D3-M4513R@users.noreply.github.com>
2022-11-01 20:54:52 +01:00
C0D3 M4513R
905ebc3c1f
Initial implementation of a Beatmap Information Skinning Element
Signed-off-by: C0D3 M4513R <28912031+C0D3-M4513R@users.noreply.github.com>
2022-11-01 20:46:32 +01:00
Dean Herbert
42eafe318c Remove various simple obsoletions 2022-10-28 13:20:58 +09:00
Dean Herbert
7dbd6e2469
Merge branch 'master' into taiko-kiai-flashing 2022-10-21 12:48:35 +09:00
Joseph Madamba
bf4a91f1f0 Fix skin toolbox component button not playing hover/click sounds 2022-10-20 13:16:03 -07:00
Salman Ahmed
eb386d4bd5 Enable slider ball tint in default legacy skin 2022-10-20 03:29:25 +03:00