499 Commits

Author	SHA1	Message	Date
mcendu	ec689ce824	add support for custom mania skin paths for stage decorations	2020-07-05 12:31:16 +08:00
Dean Herbert	5f577797a7	Expose transform helpers in SkinnableSound	2020-07-01 18:41:00 +09:00
Bartłomiej Dach	8233f5fbc4	Check skin option in skin transformers	2020-06-22 20:08:32 +02:00
Bartłomiej Dach	e827b14abf	Add LayeredHitSamples skin config lookup	2020-06-22 19:42:42 +02:00
Bartłomiej Dach	ad85c5f538	Add base legacy skin transformer	2020-06-21 23:06:55 +02:00
Dean Herbert	b9e247da8f	Simplify lookup code	2020-06-13 21:19:06 +09:00
mcendu	c6e087b994	remove incorrectly added key	2020-06-12 23:11:50 +08:00
mcendu	586e3d405c	add proper decoding support?	2020-06-12 22:48:18 +08:00
mcendu	7c3e7b65a8	add custom file path support for osu\!mania judgement sprite	2020-06-12 21:22:22 +08:00
Dean Herbert	f277b0c99f	Use better formatting for skin display (matching BeatmapMetadata)	2020-05-24 22:30:56 +09:00
Dean Herbert	c2697d3907	Use DrawableSample in SkinnableSound class	2020-05-20 20:49:01 +09:00
Dean Herbert	052ad79fc6	Convert dangerous events to IBindables	2020-05-19 16:44:22 +09:00
Dean Herbert	bf719f98d5	Fix beatmap skins providing fallback version lookup, preceding user skins	2020-05-12 11:08:30 +09:00
smoogipoo	a41ac50e2f	Line widths should not receive scale factor	2020-04-21 17:15:06 +09:00
smoogipoo	b8a1831d98	Read line widths from skin	2020-04-21 17:14:04 +09:00
Dean Herbert	48cf7becd1	Merge branch 'master' into catch-hyperdash-fruit-colouring	2020-04-19 21:48:41 +09:00
smoogipoo	44981431c5	Remove suffix hackery	2020-04-14 21:33:32 +09:00
Dean Herbert	081a02f748	Merge branch 'master' into catch-hyperdash-fruit-colouring	2020-04-14 10:01:15 +09:00
smoogipoo	cee4b005e6	Fix custom sample set 0 not falling back to default samples	2020-04-13 20:00:06 +09:00
Dean Herbert	cb6372acac	Merge branch 'master' into mania-stage-background-skinning	2020-04-09 15:37:48 +09:00
Dean Herbert	9bdc881b3c	Merge pull request #8677 from smoogipoo/fix-minwidth-override ... Fix hidden notes due to 0 minimum width	2020-04-08 23:32:25 +09:00
Dean Herbert	4b16b2e720	Bump legacy skin version	2020-04-08 19:42:31 +09:00
smoogipoo	7d787dde89	Move comparison to decoder	2020-04-08 18:17:45 +09:00
smoogipoo	2ddea018cf	Fix hidden notes due to 0 minimum width	2020-04-08 17:15:59 +09:00
smoogipoo	83db6cebb6	Implement bottom stage image	2020-04-08 16:20:54 +09:00
smoogipoo	cd15b672eb	Implement left and right stage images	2020-04-08 16:20:47 +09:00
Bartłomiej Dach	f5f0b94944	Fix incorrect fallback logic ... The recently-modified skin texture fallback logic was very subtly incorrect. If at the end of the first loop no texture was found, it would be checked for null to avoid setting scale adjust on a null texture, but then returned anyway, bypassing the fallback logic for subsequent possible paths entirely. Invert the check and explicitly continue to the next fallback path if neither a 2x, nor 1x texture with the given name is found in the store.	2020-04-07 22:50:25 +02:00
Dan Balasescu	35d66c3c1d	Fix missing comma	2020-04-07 23:37:30 +09:00
Dean Herbert	2062087155	Merge branch 'master' into more-mania-colours	2020-04-07 23:36:42 +09:00
Dean Herbert	9ff4458fd6	Merge branch 'master' into mania-skin-note-images	2020-04-07 22:41:22 +09:00
Dean Herbert	780784217d	Merge pull request #8652 from smoogipoo/mania-multiple-columnwidth ... Make note height scale by minimum column width	2020-04-07 22:38:12 +09:00
Dean Herbert	f0443bca3c	Merge pull request #8643 from smoogipoo/fix-legacy-version ... Make version-less skins fallback to version 1.0	2020-04-07 21:28:06 +09:00
smoogipoo	2568f3f588	Fix off-by-one indexing	2020-04-07 17:11:32 +09:00
smoogipoo	11d58fb7f6	Implement column background and light colours	2020-04-07 16:53:55 +09:00
smoogipoo	9fd73492ca	Implement judgement line colour	2020-04-07 16:53:55 +09:00
smoogipoo	3ecb99462f	Make note height scale by minimum column width	2020-04-07 16:07:18 +09:00
Dan Balasescu	6dbe8cd575	Merge branch 'master' into animate-judgements	2020-04-07 11:29:07 +09:00
smoogipoo	a4208f35c4	Make versionless skins fallback to version 1.0	2020-04-06 19:36:17 +09:00
smoogipoo	db6db861c0	Implement mania note + key image configs	2020-04-06 19:04:02 +09:00
smoogipoo	eff17c2da5	Allow legacy skin textures from subpaths	2020-04-06 19:03:15 +09:00
smoogipoo	0182448262	Fix performance when parsing mania skins	2020-04-06 18:35:39 +09:00
Dean Herbert	33c64428a8	Fix playback position being set incorrectly for IAnimationTimeReference	2020-04-06 13:04:32 +09:00
Salman Ahmed	1b76a53d32	Move CatchTheBeat section handling to LegacySkinDecoder ... Best place to reside at	2020-04-05 22:10:35 +03:00
Endrik Tombak	6700ef910f	use startAtCurrentTime	2020-04-04 11:35:15 +03:00
Dean Herbert	51db361c32	Update usages of Animation and Video in line with framework changes	2020-04-03 16:00:06 +09:00
smoogipoo	24a7b5f0d6	Fix missing comma	2020-04-02 23:59:53 +09:00
Dean Herbert	f919a2f267	Merge branch 'master' into mania-hitexplosion-skinning	2020-04-02 23:57:03 +09:00
smoogipoo	2a6c0de225	Add frameLength parameter to GetAnimation	2020-04-02 22:56:30 +09:00
smoogipoo	62f1bc276d	Add skinning support for column line colour	2020-04-02 18:10:17 +09:00
smoogipoo	a77933f5e0	Add support for parsing mania skin colours	2020-04-02 17:56:12 +09:00
smoogipoo	fa3a449c3b	Implement legacy normal hit explosions	2020-04-02 14:37:29 +09:00
smoogipoo	b375a02cff	Cleanup positioning factor definition	2020-04-02 14:37:29 +09:00
smoogipoo	beb1f037e9	Add startAtCurrentTime parameter to GetAnimation()	2020-04-02 14:33:15 +09:00
Dean Herbert	a76428f965	Move lookup to own function	2020-04-01 23:46:50 +09:00
Dean Herbert	c2c7ff7334	Add temporary logic to LegacySkin	2020-04-01 23:32:48 +09:00
smoogipoo	ff2c5b446e	Fix column lights positioned incorrectly	2020-04-01 16:06:09 +09:00
smoogipoo	2d6d1a8cc6	Implement column width and column spacing	2020-04-01 13:38:03 +09:00
杜Nate	9d9780707d	Merge branch 'master' into mania-skinning-refactor	2020-04-01 10:27:40 +08:00
Dean Herbert	3454983d7a	Merge branch 'master' into mania-hold-note-skinning	2020-04-01 00:04:49 +09:00
Dean Herbert	1e88d3c17a	Merge conflict "resolution"	2020-03-31 23:36:06 +09:00
mcendu	c0f8c1dc28	rename variable used for mania lookup key storage	2020-03-31 17:22:46 +08:00
smoogipoo	1952fcc0ce	Implement mania hold note skinning	2020-03-31 16:42:35 +09:00
smoogipoo	c4f76ffdaf	Implement mania note skinning	2020-03-31 15:29:25 +09:00
smoogipoo	b926d570ee	Allow skinnabledrawable to be auto-sized	2020-03-31 15:28:50 +09:00
smoogipoo	211a8db4c5	Merge branch 'mania-key-area-skinning' into mania-note-skinning	2020-03-31 15:23:59 +09:00
smoogipoo	538dc0c558	Merge branch 'mania-hitobject-area-skinning' into mania-note-skinning	2020-03-31 15:20:56 +09:00
smoogipoo	71387016b2	Add missing judgement line	2020-03-31 12:26:31 +09:00
smoogipoo	02237133cb	Implement mania hit target skinning	2020-03-31 12:17:44 +09:00
smoogipoo	cb1513b374	Add mania key area skinning	2020-03-31 11:23:33 +09:00
smoogipoo	44727eb2b8	Implement column background skinning	2020-03-31 10:57:56 +09:00
smoogipoo	2b5e9885f6	Implement mania skin reading functionality	2020-03-31 10:55:58 +09:00
smoogipoo	a8f7d7ea42	Add structure for mania configuration lookups	2020-03-30 23:21:40 +09:00
smoogipoo	881ec146af	Ignore duplicate configs	2020-03-30 17:36:57 +09:00
smoogipoo	4719aac235	Add basic mania skin parsing	2020-03-30 17:18:09 +09:00
Dean Herbert	d8041a0dcb	Increase sample concurrency to better match stable	2020-03-22 02:16:28 +09:00
Kelvin	c8ea922577	Update osu.Game/Skinning/LegacySkinExtensions.cs ... Co-Authored-By: Dean Herbert <pe@ppy.sh>	2020-03-12 04:18:57 -07:00
Kelvin	317bb5d0a4	Fallback on invalid AnimationFramerate for legacy skins	2020-03-12 03:55:45 -07:00
smoogipoo	ee13632375	Fix ogg beatmap/skin samples not loading	2020-02-18 13:21:55 +09:00
recapitalverb	c753cb46c5	Use [Resolved] wherever possible	2020-02-14 20:14:00 +07:00
Dean Herbert	9181bb41c6	Remove unused using	2020-02-07 15:11:09 +09:00
Dean Herbert	544685be48	Add support for reading skin frame rate from configuration file	2020-02-07 14:58:29 +09:00
Dean Herbert	7460018cd3	Move combo colours to GlobalSkinColours	2020-02-07 14:58:07 +09:00
smoogipoo	09cd66adb0	Fix storyboard samples not loading from subfolders	2020-01-02 14:07:22 +09:00
Dean Herbert	783159f7a0	Remove redundant logic	2019-12-25 14:55:22 +09:00
Dean Herbert	145ac8e0b5	Remove redundant setter	2019-12-25 14:55:05 +09:00
Salman Ahmed	ff5e6c0dcf	Make DefaultComboColours a property	2019-12-21 12:36:34 +03:00
Salman Ahmed	55be4478aa	Merge remote-tracking branch 'upstream/master' into fallback-to-skin-combo-colours	2019-12-21 12:36:09 +03:00
Dean Herbert	4443d2196b	Merge branch 'master' into legacy-slider-body	2019-12-17 23:42:31 +09:00
smoogipoo	527ab1a72f	Fix traceable mod not working on skin change	2019-12-17 19:49:13 +09:00
Huo Yaoyuan	caf3f774ba	CA1309: compare strings correctly.	2019-12-17 13:00:15 +08:00
Dean Herbert	272d7d0ca9	Merge branch 'master' into fallback-to-skin-combo-colours	2019-12-17 12:36:20 +09:00
Dean Herbert	befb78f83b	Simplify LegacySkinResourceStore by deriving from ResourceStore	2019-12-16 14:01:08 +09:00
Dean Herbert	9062fe1935	Fix crashes on custom skins due to extension-less file lookups	2019-12-16 13:32:53 +09:00
Salman Ahmed	bf8caee53f	Inherit SkinConfiguration directly	2019-12-12 14:05:24 +03:00
Salman Ahmed	a9125f6544	Merge remote-tracking branch 'upstream/master' into fallback-to-skin-combo-colours	2019-12-12 12:37:51 +03:00
Huo Yaoyuan	04b3297a05	Constrain configuration lookup as enum.	2019-12-09 17:45:26 +08:00
Dean Herbert	21ceb7f85d	Always display skins at native sizes for now	2019-12-06 14:40:45 +09:00
Huo Yaoyuan	c0fe91a84c	Merge branch 'master' into sharpen	2019-11-26 18:21:50 +08:00
iiSaLMaN	b58afa3eb6	Remove unnecessary mentioning in xmldoc	2019-11-24 04:36:34 +03:00
iiSaLMaN	20a8a653c2	Change LegacySkin.Configuration accessibility	2019-11-24 04:10:04 +03:00
iiSaLMaN	5bf6e57eb0	Remove unnecessary usage	2019-11-24 02:16:43 +03:00
iiSaLMaN	0f9978b34a	Use AddRange instead	2019-11-24 02:08:36 +03:00
iiSaLMaN	1e24ee7956	Remove ClearComboColours()	2019-11-24 02:07:56 +03:00
Dean Herbert	bcb1504110	Fix naming	2019-11-20 15:40:35 +09:00
iiSaLMaN	08b8cedfdf	Add setter to legacy skin configuration access	2019-11-20 01:15:40 +03:00
iiSaLMaN	0407d2248c	Merge remote-tracking branch 'refs/remotes/upstream/master' into add-access-to-skin-legacy-version	2019-11-20 01:10:32 +03:00
Huo Yaoyuan	dcfa98414f	Use ??=.	2019-11-12 19:56:51 +08:00
Huo Yaoyuan	0d81b96c5f	Use deconstruction declaration.	2019-11-12 19:55:22 +08:00
Huo Yaoyuan	bbeab6fa76	Use auto property.	2019-11-12 19:53:25 +08:00
Dean Herbert	758c304d92	Merge branch 'master' into fallback-to-skin-combo-colours	2019-11-12 19:00:05 +09:00
Huo Yaoyuan	e9b8cbb516	Apply other styles.	2019-11-11 20:27:04 +08:00
Huo Yaoyuan	ccc8aa6fa4	Apply brace style.	2019-11-11 20:13:13 +08:00
iiSaLMaN	9874ce49ce	Move fallback allowance to the skin configuration only.	2019-11-07 15:55:34 +03:00
iiSaLMaN	808543885f	Change ComboColours type to IReadOnlyList<Color4> ... Also exposes functions to modify the internal list (AddComboColours, ClearComboColours)	2019-11-07 15:54:30 +03:00
iiSaLMaN	61778232d8	Rewrite inline comment	2019-11-06 23:24:54 +03:00
iiSaLMaN	cef6e2a26b	Move colours fallback logic to SkinConfiguration.ComboColours getter	2019-11-06 23:20:36 +03:00
iiSaLMaN	198a1750c3	Use is pattern matching	2019-11-06 20:46:02 +03:00
iiSaLMaN	69d9a0ae1a	Use null check and pattern matching	2019-11-06 20:30:26 +03:00
iiSaLMaN	ba14345107	Specify culture and number style	2019-11-06 20:27:55 +03:00
iiSaLMaN	947602f70a	Specify why legacy version is nullable	2019-11-06 20:24:19 +03:00
iiSaLMaN	502dcc5669	Fix incorrect skin version case	2019-11-06 20:23:22 +03:00
iiSaLMaN	55230a36dd	Set correct legacy version	2019-11-06 19:58:07 +03:00
iiSaLMaN	2cf17e0bf3	Use decimal data type instead	2019-10-09 23:33:25 +03:00
iiSaLMaN	01ac19fdbb	Set legacy version of osu!classic skin to 2.0	2019-10-09 23:06:32 +03:00
iiSaLMaN	7f6541672c	Parse legacy version of decoded skin to numerical	2019-10-09 23:05:50 +03:00
iiSaLMaN	003af19e3f	Introduce legacy skin configuration	2019-10-09 23:04:34 +03:00
iiSaLMaN	5e3f0f6c95	Return default combo colours if none provided	2019-10-09 21:08:07 +03:00
iiSaLMaN	281671a213	Remove default combo colours usage from skins	2019-10-09 21:04:26 +03:00
Dean Herbert	24269c0384	Fix skins not being displayed correctly in the editor	2019-10-08 12:52:34 +09:00
Dan Balasescu	dc984d0d81	Merge branch 'master' into beatmap-parsing-fallback-v2	2019-10-04 13:51:56 +09:00
Dean Herbert	925615320e	Update lazer default combo colours to match stable	2019-10-04 10:46:48 +08:00
Dean Herbert	6268bbcfc8	Merge branch 'master' into beatmap-parsing-fallback-v2	2019-10-03 15:12:21 +08:00
smoogipoo	706e884cc0	Update accent colour on combo index change	2019-09-26 17:13:13 +09:00
Dean Herbert	a06cb54732	Merge branch 'master' into beatmap-parsing-fallback-v2	2019-09-20 15:28:08 +09:00
Dean Herbert	3fa1b53b2a	Add back combo colours for osu!classic	2019-09-19 12:39:15 +09:00
Bartłomiej Dach	11eda44d34	Migrate decoding to line-buffered reader ... Migrate all usages of StreamReader in the context of decoding beatmaps, storyboards or skins to the new LineBufferedReader.	2019-09-15 01:28:07 +02:00
Dean Herbert	6760e239a1	Fix osu! hitcircle font textures being incorrectly sized	2019-09-11 13:39:21 +09:00
Dean Herbert	f4f9519761	Add todo comment	2019-09-06 12:16:20 +09:00
Dean Herbert	a0aeccf232	Fix fallback to default combo colours not working	2019-09-05 23:24:13 +09:00
smoogipoo	90985b6af6	Add missing license header	2019-09-05 17:01:14 +09:00
smoogipoo	bda21998c4	Add helper method to make direct casts be used	2019-09-05 16:48:56 +09:00
Dean Herbert	c0bcbfd892	Merge branch 'master' ... Conflicts: osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableDrawable.cs	2019-09-05 14:40:30 +09:00
Dean Herbert	6197c7fd31	Add automatic resource mapping for rulesets to their own dll	2019-09-04 20:29:28 +09:00
Dean Herbert	8ea82123e4	Fix nullref on test disposal	2019-09-04 15:59:09 +09:00
Dean Herbert	2983918f71	Merge remote-tracking branch 'upstream/master' into skin-configuration-refactor	2019-09-04 13:40:41 +09:00
Dean Herbert	f655cd4516	Fix parsing of null configuration elements	2019-09-04 13:30:46 +09:00
Dean Herbert	04c2c33c64	Allow LegacySkin to be constructed with all nulls	2019-09-04 13:29:55 +09:00
Dean Herbert	f58ca82398	Don't include section for now	2019-09-03 18:56:01 +09:00
Dean Herbert	002de80c30	Add xmldoc to ISkin	2019-09-03 18:30:22 +09:00
Dean Herbert	097012dc95	Move slider ball colouring to DefaultLegacySkin for now	2019-09-03 18:05:16 +09:00