1111 Commits

Author	SHA1	Message	Date
Dean Herbert	a4f30daf13	Merge pull request #5462 from peppy/skin-metric-parity ... Bring playfield ratio in line with stable	2019-07-29 18:49:21 +09:00
Dean Herbert	d99408e979	Fix SkinChanged events triggering after disposal (#5461) ... Fix SkinChanged events triggering after disposal Co-authored-by: Dan Balasescu <1329837+smoogipoo@users.noreply.github.com>	2019-07-29 18:48:53 +09:00
Dan Balasescu	98813222af	Adjust comment	2019-07-29 18:35:22 +09:00
Dean Herbert	c514cbe2b7	Add basic skinning test	2019-07-29 17:27:00 +09:00
jorolf	f4effd12c3	make legacy skins animatable	2019-07-28 21:04:55 +02:00
Dean Herbert	df5abd9651	Merge branch 'master' into shuffle-skin	2019-07-29 01:55:57 +09:00
Dean Herbert	bfaf9d5f41	Remove unnecessary special cases	2019-07-25 16:24:10 +09:00
Dean Herbert	c1b0130857	Add legacy cursormiddle support	2019-07-25 16:23:04 +09:00
Dean Herbert	38e21caa5a	Add legacy hitcircle	2019-07-25 16:10:01 +09:00
Dean Herbert	900d17a4db	Merge branch 'fix-skin-changed-disposal' into add-legacy-hit-animations	2019-07-25 16:09:15 +09:00
Dean Herbert	58feba72a3	Fix scheduled events not running on previous drawables	2019-07-25 15:59:44 +09:00
Dean Herbert	46e17646ac	Align slider path size with legacy skins	2019-07-25 14:22:26 +09:00
Dean Herbert	9473f6d3e3	Fix incorrect ratios being applied to playfield / skin elements ... This now matches osu-stable 1:1.	2019-07-25 14:22:22 +09:00
Dean Herbert	a290437286	Fix skin changed events triggering after disposal	2019-07-25 13:55:01 +09:00
Dean Herbert	7275beaf1a	Remove unnecessary type specification from SkinnableDrawable	2019-07-25 11:20:39 +09:00
Dean Herbert	36c557c752	Add null check and simplify scaling conditional logic via switch	2019-07-22 14:43:25 +09:00
Dean Herbert	9d091c96b8	Use cache to ensure correct DrawSize when deciding scaling	2019-07-22 14:43:04 +09:00
Dean Herbert	74c961bcff	Add more flexible skin element confine modes	2019-07-22 14:42:56 +09:00
smoogipoo	9f6ff63634	Fix judgement disposals causing huge LOH pressure	2019-07-17 19:25:41 +09:00
Dean Herbert	ba8df3ba92	Clean up stable lookup and mutate logic	2019-07-05 13:59:31 +09:00
Dean Herbert	8346c50ce1	Rename delete method and improve xmldoc	2019-07-05 13:55:25 +09:00
Dean Herbert	7575047db8	Merge branch 'master' into import-stable-scores	2019-07-04 01:00:42 +09:00
smoogipoo	fc8dee6123	Fix typo	2019-07-01 23:26:53 +09:30
Dean Herbert	0636df5660	Add support for legacy skins which use animation frames to hide elements	2019-07-01 18:13:14 +09:00
HoLLy	79fc143422	Only remove .osk files when importing skin archives	2019-06-30 16:52:39 +02:00
Dean Herbert	60ea3d4e1a	Fix skinning support for combobreak	2019-06-30 21:58:30 +09:00
welsar55	d6561531a3	Merge branch 'master' into combobreak	2019-06-29 11:55:10 -05:00
Welsar55	a22c166575	Make ComboEffects its own class	2019-06-29 11:28:40 -05:00
Welsar55	a57218e50e	Move to LocalSkinOverride	2019-06-28 20:45:11 -05:00
HoLLy	12350d18b5	Don't remove imported archives by default	2019-06-27 14:41:11 +02:00
HoLLy	55216dffb7	Merge remote-tracking branch 'origin/master' into import-stable-scores	2019-06-27 14:07:17 +02:00
Dean Herbert	06eaba766b	Move method below ctor	2019-06-24 15:27:46 +09:00
Dean Herbert	9593e66a96	Add some more xmldoc	2019-06-24 15:25:01 +09:00
Dean Herbert	3f22c0a311	Add SkinnableSprite implementation	2019-06-24 15:17:35 +09:00
HoLLy	802da225d4	Move responsibility for selecting paths to model managers	2019-06-21 17:32:47 +02:00
HoLLy	15c75b4442	Add basic score import from stable	2019-06-19 18:33:51 +02:00
smoogipoo	f090e292c9	Move ArchiveModelManager import process to async flow	2019-06-10 13:42:22 +09:00
Dean Herbert	8607f3b765	Merge remote-tracking branch 'upstream/master' into databased-sin-setting	2019-06-05 19:03:57 +09:00
Dean Herbert	80d65f9a3b	Update resource stores with GetAvailableResources	2019-05-31 14:33:18 +09:00
Dean Herbert	1629534a0c	More disposal?	2019-05-31 14:28:53 +09:00
Dean Herbert	a20eda7b5f	Fix remaining cases to work without things	2019-05-28 23:54:42 +09:00
Dean Herbert	4ca34bd5e8	Update osu! in line with audio subsystem refactor	2019-05-28 17:06:01 +09:00
Dean Herbert	31e6a4fa59	Add optional skin foreign key to databased settings	2019-05-27 01:56:19 +09:00
Dean Herbert	487a56549e	Fix CI issues	2019-05-12 22:53:12 +09:00
Dean Herbert	41e13aef23	Use more standard parsing method	2019-05-12 22:53:03 +09:00
Dean Herbert	ce0e4c506e	Merge branch 'master' into dev	2019-05-12 21:45:52 +09:00
smoogipoo	d7c09e7dbd	Merge remote-tracking branch 'origin/master' into fix-new-inspections ... # Conflicts: # osu.Game.Rulesets.Catch/Judgements/CatchDropletJudgement.cs # osu.Game.Rulesets.Catch/Judgements/CatchJudgement.cs # osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs # osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs # osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs # osu.Game.Tests/Visual/SongSelect/TestCaseBeatmapScoresContainer.cs # osu.Game/Graphics/OsuFont.cs # osu.Game/Online/API/Requests/Responses/APILegacyScoreInfo.cs # osu.Game/Overlays/Profile/Header/BadgeContainer.cs # osu.Game/Overlays/Profile/ProfileHeader.cs # osu.Game/Screens/Select/PlaySongSelect.cs # osu.Game/Skinning/LegacySkinDecoder.cs	2019-05-07 13:20:17 +09:00
smoogipoo	0bd35ab7bb	Turn on warnings, resolve issues	2019-04-25 17:36:17 +09:00
Dean Herbert	2060bad3bc	Try applying minimal inspection fixes for latest Rider EAP	2019-04-01 13:28:14 +09:00
Dean Herbert	c39c37a18d	Apply more missed cases	2019-04-01 12:44:46 +09:00
Dean Herbert	612db31c38	Apply newline additions	2019-04-01 12:16:32 +09:00
Dean Herbert	7d6a08d6da	Fix a few new inspections in latest Rider EAP	2019-04-01 11:39:02 +09:00
Santeri Nogelainen	cbb7498a42	Border size to float, add min and max size, other small changes	2019-03-16 12:41:03 +02:00
Santeri Nogelainen	92595e43f6	slider border thickness	2019-03-14 21:57:39 +02:00
Dean Herbert	d4041d5d42	Automate includes of files in ArchiveModelManager use cases	2019-03-01 10:25:21 +09:00
Dean Herbert	26d53d06a9	Fix remaining issues	2019-02-28 13:31:40 +09:00
Dean Herbert	3e1f283281	Merge remote-tracking branch 'upstream/master' into more-inspections	2019-02-28 13:09:18 +09:00
Dean Herbert	ccb00b932b	Merge branch 'master' into fix-nasty-unbind	2019-02-27 21:44:54 +09:00
Dean Herbert	c8793911a8	Enable more stringent inspectcode style inspections	2019-02-27 21:25:40 +09:00
smoogipoo	7fa4262207	Clear delegate list rather than relying on unbinds	2019-02-27 21:04:47 +09:00
Dean Herbert	9473b53226	Avoid redundant (synchronous) skin change	2019-02-27 18:53:01 +09:00
Dean Herbert	3fe4b8fd1c	Update variable names ... Also cleans up some weird code	2019-02-22 17:51:39 +09:00
smoogipoo	d8c55bc729	Adjust namespaces	2019-02-21 19:05:52 +09:00
smoogipoo	bca347427f	Update with framework bindable changes	2019-02-21 18:56:34 +09:00
Dean Herbert	90e462309f	Add newline	2019-02-15 21:16:54 +09:00
Jamie Taylor	38cf5a1ea4	Add support for the HitCircleOverlap property in legacy skins	2019-02-15 21:03:06 +09:00
Dean Herbert	2f8f4fac64	Fix combo colour fallbacks when skin is not providing any	2019-02-05 17:54:14 +09:00
Dean Herbert	8617aaa2a7	Update licence header (and remove year)	2019-01-24 17:43:03 +09:00
ekrctb	0573c1c923	Fix taiko namespace ignored	2019-01-21 14:20:37 +09:00
Dean Herbert	0a24d188b4	Remove TryGetValue as it won't work	2019-01-10 19:01:41 +09:00
Dean Herbert	881b10a18f	Merge remote-tracking branch 'Dragicafit/moreOptionsFromSkin.ini' into moreOptionsFromSkin.ini	2019-01-08 11:01:04 +09:00
Dean Herbert	7eed3ffe75	Merge branch 'master' into moreOptionsFromSkin.ini	2019-01-08 10:02:06 +09:00
Dean Herbert	4cee21f356	Make skinning better	2019-01-07 20:12:39 +09:00
Roman Kapustin	4b5fc85875	Use Find instead of FirstOrDefault	2019-01-05 19:35:33 +03:00
Dean Herbert	13f461099f	Merge branch 'master' into moreOptionsFromSkin.ini	2018-12-14 19:51:41 +09:00
Dean Herbert	ac0fc6236c	Fix crash when changing beatmap toggles at loading screen	2018-12-13 14:51:18 +09:00
Dragicafit	9afbebf560	Equals to == for string	2018-12-09 13:29:14 +01:00
Dragicafit	506f27a92e	cursorExpand is now a bool	2018-12-07 23:52:57 +01:00
Dragicafit	0816eaacb8	Make CursorExpand skinnable	2018-12-07 22:22:40 +01:00
Dragicafit	667eaf95d8	Make comboColours skinnable	2018-12-07 22:16:09 +01:00
Jan Jurzitza	3f6656e2cd	Merge branch 'master' into shuffle-skin	2018-12-04 12:59:31 +01:00
Dean Herbert	aa7a665317	Merge remote-tracking branch 'upstream/master' into scoredatabase	2018-11-30 17:20:23 +09:00
WebFreak001	c4c2191500	Apply requested changes	2018-11-28 12:36:21 +01:00
Dean Herbert	ab2b2493a1	Move hashing functionality to ArchiveModelManager	2018-11-28 19:21:36 +09:00
Dean Herbert	ce660b6d67	Add skin de-duplication	2018-11-28 19:01:22 +09:00
smoogipoo	14ff4bc26a	Move primary key attribute to IHasPrimaryKey	2018-11-28 13:19:23 +09:00
smoogipoo	f27bd3ef3e	OpenTK -> osuTK	2018-11-20 17:14:59 +09:00
smoogipoo	e207dd728b	Fix taiko proxies not receiving the correct lifetimes	2018-11-15 20:26:12 +09:00
smoogipoo	3539874262	Add missing scale ... Makes about a 1px difference.	2018-09-28 11:40:13 +09:00
smoogipoo	1c242556ca	Add comments + cleanup	2018-09-27 17:40:28 +09:00
smoogipoo	8191f03503	Implement HitCircleFont skin configuration	2018-09-27 17:40:28 +09:00
smoogipoo	0d8276c5f8	Implement skinnable sprite text	2018-09-27 17:40:28 +09:00
smoogipoo	b84994e643	Make GetTexture return the post-scaled texture	2018-09-27 17:40:28 +09:00
Dean Herbert	cc533a05c5	Update framework	2018-09-07 19:00:43 +09:00
Dean Herbert	75d2cb199c	Fix formatting	2018-09-07 18:14:27 +09:00
Dean Herbert	43824c2a94	Switch back to default skin when the user selected skin is deleted	2018-09-03 11:50:50 +09:00
Dean Herbert	fb1e8fbdcf	Remove migration code	2018-09-03 10:23:56 +09:00
Dean Herbert	144e80dff6	Add "import all skins from stable" option (and mass delete)	2018-09-03 10:10:04 +09:00
Dean Herbert	b1a3dfedd1	Reduce async-await pairs	2018-08-30 14:41:16 +09:00
smoogipoo	21d5322899	Update with async changes	2018-08-27 17:05:58 +09:00
smoogipoo	90ebabd2db	Fix nullref	2018-08-23 15:21:36 +09:00
smoogipoo	c7db407832	Fix operation cancelled exception when changing visual settings	2018-08-23 14:53:16 +09:00
morguldir	6c861a1638	Strip comments from everything except metadata	2018-07-16 01:04:41 +02:00
Dean Herbert	fbc5250bf1	Update framework	2018-07-11 17:12:01 +09:00
smoogipoo	310c4a7d6c	Make SampleInfo choose its own lookup name	2018-07-02 14:18:41 +09:00
Dean Herbert	6e6586909b	User pattern matching	2018-04-25 16:32:06 +09:00
Dean Herbert	4f53185d43	Invert logic to match existing toggles	2018-04-25 16:18:55 +09:00
Dean Herbert	45810e6220	Merge branch 'master' into ignore_beatmap_skin	2018-04-24 17:15:39 +09:00
UselessToucan	254e9929be	Merge branch 'master' into ignore_beatmap_skin	2018-04-23 13:06:24 +03:00
Dean Herbert	ff3d3379f0	Merge remote-tracking branch 'upstream/master' into async-screens	2018-04-23 18:29:37 +09:00
Dean Herbert	44a9aa529a	Test CI run with new changes	2018-04-22 03:51:17 +09:00
TocoToucan	1ce38c7fc6	Visual settings: Ignore beatmap hitsounds	2018-04-20 18:30:41 +03:00
TocoToucan	606e088713	Visual settings: Ignore beatmap skin	2018-04-20 18:17:57 +03:00
Dean Herbert	b16e25c3e9	Add error handling on a per-line level in LegacyDecoder ... Resolves #2306.	2018-04-20 18:32:24 +09:00
Dean Herbert	32a74f95a5	Normalize all the line endings	2018-04-13 18:26:38 +09:00
Dean Herbert	c39f056b3b	Fix skin path being ignored in extension agnostic lookups ... Closes #2295.	2018-03-30 18:06:18 +09:00
Dean Herbert	0e669c9a3f	Fix many warnings	2018-03-24 18:23:22 +09:00
Dean Herbert	1996698817	Fix @1x skin elements not being used	2018-03-24 11:40:45 +09:00
Dean Herbert	256baf6d60	Move binding to LoadComplete ... Previously there was a chance that it would still never get disposed, as the event was bound in async load, before it was in a state it can be recursively disposed via the PlayerLoader call.	2018-03-24 05:40:51 +09:00
Dean Herbert	eb751fa607	Fix event unbind not being unbound correctly	2018-03-23 15:05:28 +09:00
Dean Herbert	ee12d75b30	Merge branch 'master' into skin-scaling	2018-03-22 19:30:17 +09:00
Dean Herbert	366b7fca65	Remove GetColour method	2018-03-22 18:50:19 +09:00
Dean Herbert	425d4aa766	Add ability to lookup arbitrary SkinConfiguration values	2018-03-22 18:10:28 +09:00
Dean Herbert	c4fe6a04c5	Use string lookups for combo colours	2018-03-22 17:32:05 +09:00
Dan Balasescu	ab9505652b	Merge branch 'master' into skin--completion	2018-03-22 16:44:00 +09:00
Dean Herbert	504c3ff0ba	BeatmapSkin -> LegacyBeatmapSkin	2018-03-22 12:50:48 +09:00
Dean Herbert	c5eecae32f	Improve shared code paths in legacy skins	2018-03-22 12:50:23 +09:00
Dan Balasescu	77ebd94804	Merge branch 'master' into beatmap-as-a-skin	2018-03-22 11:33:27 +09:00
Dean Herbert	4a93abcc36	Add scale adjusts to bring legacy skins in-line with lazer sizing	2018-03-21 20:07:58 +09:00
Dean Herbert	5a10270a2a	return -> break ... no real reason but whatever works	2018-03-20 20:32:32 +09:00
Dean Herbert	fb3d319d0e	Make fallback bool into a function ... Allows correct handling now that beatmap skins are also a thing.	2018-03-20 16:40:11 +09:00
Dean Herbert	f03abb3145	Add GetTexture method to ISkinSource ... Used to shortcut lookup checks without potentially expensive drawable creation overhead.	2018-03-20 16:40:11 +09:00
Dean Herbert	9ad4e9284a	Add skin source fallback chain	2018-03-20 16:40:11 +09:00
Dean Herbert	d1c2aa71d0	Add beatmap sample override support	2018-03-20 16:24:06 +09:00
Dean Herbert	dbcf755618	Make Beatmaps parsable as skins	2018-03-20 16:05:29 +09:00
Dean Herbert	553fd3b789	Give DefaultSkin an empty Configuration	2018-03-19 21:00:27 +09:00
Dean Herbert	b71c123214	Allow import of skins which don't have ini files	2018-03-19 20:26:16 +09:00
Dean Herbert	7272ba2f1b	Add migration for skins which didn't get a proper name assigned ... Also correctly imports new skins	2018-03-19 20:06:44 +09:00
Dean Herbert	ec851648da	Add better ToString output from SkinInfo	2018-03-19 20:06:44 +09:00
Dean Herbert	397b06283a	Add basic skin configuration decoding support	2018-03-19 20:06:44 +09:00
Dean Herbert	8e52d91180	Handle missing files without hard failure ... Also adds support for lookups with file extensions	2018-03-19 20:06:44 +09:00
Dean Herbert	c4f5b46d72	Add basic structure for skin configurations	2018-03-19 20:06:44 +09:00
Dean Herbert	3354849cc9	Fix code formatting regression	2018-03-12 22:01:18 +09:00
Dean Herbert	c70be29eda	Move legacy conversion to LegacySkin	2018-03-12 11:30:13 +09:00
Dean Herbert	1447ca55a3	Add xmldoc, make restrictSize private	2018-03-12 11:02:02 +09:00
Dean Herbert	bd952ce370	Allow skinnable drawables to be of non-restricted size	2018-03-07 18:21:05 +09:00
Dean Herbert	02690e5f25	Move to private implementation	2018-03-05 21:27:37 +09:00
Dean Herbert	30b1447318	Fix skin file path lookup performance ... Move path mapping to the resource store, so caching can happen against the component's name rather than the skin path. Fixes regression of beatmap load time when a custom skin is selected.	2018-03-04 03:19:01 +09:00
Dean Herbert	ab9aed351f	Remove null channels from SkinnableSound playable channels	2018-02-25 17:14:35 +09:00
Dean Herbert	4a52df2dd4	Apply review	2018-02-24 23:07:02 +09:00
Dean Herbert	768e0a4e2a	Add SkinnableSound class ... Tidy things up, move logic out of SampleInfo.	2018-02-24 22:47:14 +09:00
Dean Herbert	a36986ef5a	Make ComponentName readonly	2018-02-23 14:28:57 +09:00
Dean Herbert	0e20c4e6bb	Fix typo	2018-02-23 14:27:53 +09:00
Dean Herbert	ff75cf6b75	Remove unnecessary braces	2018-02-23 14:27:39 +09:00
Dean Herbert	f81eb2de65	Remove unnecessary local store	2018-02-23 14:24:32 +09:00
Dean Herbert	92d20eea8c	Add missing licence header	2018-02-23 13:38:12 +09:00
Dean Herbert	84b707f4f8	Add basic hitcircle skinning	2018-02-23 13:38:12 +09:00
Dean Herbert	3726db53b5	Allow instantiation of skins	2018-02-23 13:38:12 +09:00
Dean Herbert	e9c5834387	Add query method for now	2018-02-23 13:26:01 +09:00
Dean Herbert	402d71a8d9	Add user skin setting storage	2018-02-22 16:29:05 +09:00
Dean Herbert	4c14b32783	Add basic skin database model layout and importing	2018-02-22 15:46:11 +09:00