11099 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
FreezyLemon	ec8b5c2465	Permitted nulls in ChatOverlay.load() so that in testing, no "OsuGame" instance is required. Also added null checks to the links' on click actions	2017-12-07 10:31:02 +01:00
FreezyLemon	006ac44e11	Fixed up style in the ChatDisplay test	2017-12-07 10:29:54 +01:00
FreezyLemon	65afbd5c1b	Added new test case for URL parsing / link display in chat	2017-12-07 10:29:33 +01:00
FreezyLemon	541c25e995	Renamed ChatLinkSpriteText to ChatLink for convenience	2017-12-07 10:28:12 +01:00
FreezyLemon	7bf25bdd4d	Changed it so the ":" character does not appear after usernames when the displayed message is an action (e.g. /np). Just makes more sense imo	2017-12-07 10:23:57 +01:00
Dean Herbert	c35c8263b9	Merge remote-tracking branch 'upstream/master' into input-revamp	2017-12-07 18:07:26 +09:00
Dean Herbert	2a0b37e192	Merge pull request #1638 from Aergwyn/fix-beatmap-carousel-lag ... Fix lagging beatmap carousel because of storyboard-loading	2017-12-07 18:04:38 +09:00
Dean Herbert	2a1a9b9f1f	Fix post-merge issue	2017-12-07 17:26:39 +09:00
smoogipoo	bdf283a4e1	A bit more cleanup	2017-12-07 15:55:38 +09:00
smoogipoo	09f54b06ac	Just don't serialize Author altogether for now	2017-12-07 15:55:22 +09:00
smoogipoo	0ba8988580	Don't serialize Author + add SerializableAttributes	2017-12-07 15:32:39 +09:00
Dean Herbert	44ee11e75f	Merge branch 'master' into fix-beatmap-carousel-lag	2017-12-07 15:30:50 +09:00
smoogipoo	e573db04d4	Don't serialize HitObject.Kiai	2017-12-07 14:42:36 +09:00
smoogipoo	f5f7658e90	Don't serialize TotalBreakTime	2017-12-07 14:40:28 +09:00
smoogipoo	245b5f759f	Underscore + lowercase all keys	2017-12-07 14:37:12 +09:00
Dean Herbert	a78441bc5a	Apply changes in line with framework input adjustments	2017-12-07 13:16:59 +09:00
smoogipoo	dfc10d42e8	Merge remote-tracking branch 'origin/master' into beatmap-serialization	2017-12-07 12:49:27 +09:00
smoogipoo	d026587a91	Add flag to explicitly serialize the type version	2017-12-07 12:49:16 +09:00
smoogipoo	9e51480aa3	Cleanup TypedListConverter a bit	2017-12-07 12:27:30 +09:00
smoogipoo	f1dbcc4f1a	Remove misleading comments	2017-12-07 12:23:53 +09:00
smoogipoo	feef4b1890	Add license header	2017-12-07 12:18:00 +09:00
smoogipoo	fcfdbc8e07	Don't show the migrate button on deployed builds for now	2017-12-07 12:02:48 +09:00
smoogipoo	b0684cb194	Add storyboard test case but disable for now	2017-12-07 12:02:34 +09:00
smoogipoo	851c20aff0	Add a few comments	2017-12-07 11:17:32 +09:00
smoogipoo	499ecb4edd	Add parity checking OsuJsonDecoder test cases	2017-12-07 11:11:38 +09:00
smoogipoo	ea2c67ca5f	Fix incorrect serialization condition	2017-12-07 11:10:46 +09:00
smoogipoo	9597f9d46b	Resharper cleanup	2017-12-07 11:10:20 +09:00
smoogipoo	0e3b001b13	Make maps with storyboards decode correctly with OsuJsonDecoder	2017-12-07 10:37:51 +09:00
Dan Balasescu	de6d1cc647	Merge pull request #1660 from peppy/shader-precompile ... Add shader precompile step	2017-12-07 04:25:15 +09:00
Dan Balasescu	9c4ca46786	Merge branch 'master' into shader-precompile	2017-12-07 04:15:24 +09:00
smoogipoo	a8db3a9484	Add progress notification to migration	2017-12-07 04:09:03 +09:00
smoogipoo	41b607c165	Dont serialize hitobject sample properties copied from the control point	2017-12-07 03:40:43 +09:00
smoogipoo	9787788081	Revert unintended change	2017-12-07 03:39:43 +09:00
smoogipoo	4232a54b32	Make TypedListConverter not reconstruct serializers	2017-12-07 03:04:56 +09:00
smoogipoo	b6b26cfe25	Add basic method to migrate beatmaps to the new JSON format	2017-12-07 03:04:36 +09:00
Dan Balasescu	eaffd496f2	Merge pull request #1661 from peppy/fix-async-is-loaded ... Fix IsValueCreated method not checking whether the async task was completed	2017-12-07 01:28:28 +09:00
FreezyLemon	94eb853d3d	Added centralised handling for some chat links	2017-12-06 16:41:57 +01:00
Dan Balasescu	8e3cce798d	Merge branch 'master' into fix-async-is-loaded	2017-12-06 23:01:38 +09:00
Dean Herbert	34596b3368	Rename and comment for clarification	2017-12-06 21:47:48 +09:00
FreezyLemon	b04ddba2a0	Added basic "on click" actions to the in-chat links	2017-12-06 10:27:30 +01:00
smoogipoo	ed5f7e5353	Make OsuJsonDecoder apply defaults similar to OsuLegacyDecoder	2017-12-06 16:28:34 +09:00
smoogipoo	f9e34dfa3d	Assume that control points are already sequentially-ordered ... Fixes up deserializing.	2017-12-06 16:24:09 +09:00
Dean Herbert	04ae64e9fd	Add missing IsCompleted check to ensureValid	2017-12-06 16:20:49 +09:00
smoogipoo	887b81148d	Don't ignore RulesetId for now	2017-12-06 14:14:07 +09:00
smoogipoo	44edb8724f	Add JsonIgnores to CommandTimelineGroup	2017-12-06 13:48:44 +09:00
Dean Herbert	988cc27f0e	Update framework	2017-12-06 11:59:53 +09:00
Dean Herbert	15ed3b4aac	Fix IsValueCreated method not cecking whether the async task was completed ... Caused potential stutters for components that relied on this check.	2017-12-06 09:49:12 +09:00
smoogipoo	e199ee5225	Add a few xmldocs	2017-12-06 00:42:17 +09:00
smoogipoo	d2dc7c8937	Add OsuJsonDecoder	2017-12-06 00:38:12 +09:00
smoogipoo	b584178e85	Make Beatmap ISerializable and add more JsonIgnores	2017-12-06 00:37:37 +09:00