518 Commits

Author	SHA1	Message	Date
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
Dean Herbert	bebc3309ce	Refactor skin configuration to be infinitely extensible	2019-09-03 17:57:34 +09:00
Dean Herbert	d1cdf49dd5	Revert SkinnableSprite lookups to old behaviour	2019-09-03 14:21:54 +09:00
Dean Herbert	0261456d5a	Merge branch 'master' into play-to-gameplay	2019-09-03 11:42:15 +09:00
Dean Herbert	09097f7680	Merge branch 'master' into iskincomponent	2019-09-02 22:38:57 +09:00
Dean Herbert	b460f76fa6	Adjust file spacing slightly	2019-09-02 19:01:43 +09:00
Dean Herbert	0bfe4650c3	Early return if no change occurred in looping value	2019-09-02 19:01:17 +09:00
Dean Herbert	f08b523abf	Name tuple items	2019-09-02 18:20:30 +09:00
Dean Herbert	9c53430a0f	Only initialise when required	2019-09-02 18:18:59 +09:00
Dean Herbert	eaeecfb300	Merge remote-tracking branch 'upstream/master' into add-adjustment-function-for-skinnable-sound	2019-09-02 18:15:17 +09:00
Dean Herbert	f9fcf1562f	Merge remote-tracking branch 'upstream/master' into iskincomponent	2019-09-02 14:21:02 +09:00
Dean Herbert	d2a3e0581b	Fix legacy decoder using wrong configuration	2019-08-31 13:27:03 +09:00
Dean Herbert	12eeec36fc	Fix ruleset skins incorrectly providing configuration defaults	2019-08-31 12:33:29 +09:00
Dean Herbert	3aa2ece49b	Merge branch 'iskincomponent' into play-to-gameplay	2019-08-30 15:29:55 +09:00
Dean Herbert	fe90e194e3	Remove redundant qualifier	2019-08-30 15:29:44 +09:00
Dean Herbert	70e417533f	Update naming	2019-08-30 15:13:29 +09:00
Dean Herbert	a7c94c3883	Simplify hit result lookups	2019-08-30 15:12:03 +09:00
Dean Herbert	a15828ab25	Introduce the concept of SkinComponents ... Removes reliance on string lookups and better defines elements for introduction into database	2019-08-30 14:55:52 +09:00
Dean Herbert	8f9fe99237	Move SliderFollowCircle implementation	2019-08-30 14:40:36 +09:00
Dean Herbert	71192791d5	Merge remote-tracking branch 'upstream/master' into add-ruleset-legacy-skin	2019-08-30 14:12:56 +09:00
Dean Herbert	c389a5c798	Move remaining osu-specific implementations to OsuLegacySkin	2019-08-30 13:42:29 +09:00
Dean Herbert	7bba8ca14b	Split out nested classes	2019-08-30 13:04:11 +09:00
Dean Herbert	84e4748268	Remove duplicate getAnimation function and improve namespacing	2019-08-30 12:59:58 +09:00
Dean Herbert	bfbec067b1	Remove remnants of user skin PR	2019-08-30 11:54:36 +09:00
iiSaLMaN	06224a7d4e	Fix build issue	2019-08-29 15:38:33 +03:00
iiSaLMaN	ec6a40af33	Add adjustments on channel creation if there is	2019-08-29 15:32:21 +03:00
Dean Herbert	40c1c6072e	Add "osu!classic" as a bundled skin choice	2019-08-29 16:39:42 +09:00
iiSaLMaN	3d62003382	Add null check	2019-08-28 15:39:45 +03:00
Dean Herbert	01aede3e29	Add comprehensive skin fallback integration testing	2019-08-28 19:57:17 +09:00
iiSaLMaN	2f3fb8cf88	Add Stop + RemoveAdjustment functions	2019-08-28 13:10:11 +03:00
iiSaLMaN	cb8fe89b8b	Allow setting looping to existing channels	2019-08-28 13:09:53 +03:00
iiSaLMaN	d1cbd11d28	Merge remote-tracking branch 'upstream/master' into add-adjustment-function-for-skinnable-sound	2019-08-28 13:09:07 +03:00
Dean Herbert	7ea55a5cdd	Merge remote-tracking branch 'upstream/master' into add-ruleset-legacy-skin	2019-08-28 16:36:20 +09:00
Dean Herbert	1aa09ff05c	Merge pull request #5795 from iiSaLMaN/allow-fallback-to-samples-without-bank ... Try retrieving samples without bank names	2019-08-28 13:12:51 +09:00
Dean Herbert	4add1727b7	Fix hitsounds not updating immediately after switching skins	2019-08-28 03:25:57 +09:00
iiSaLMaN	18431a42e6	Resolve merge conflicts	2019-08-27 20:06:17 +03:00
iiSaLMaN	4ef991b973	Loop over lookup names on default-samples retrieval	2019-08-27 19:42:17 +03:00
Dean Herbert	7ccc409df7	Merge remote-tracking branch 'upstream/master' into add-ruleset-legacy-skin	2019-08-27 18:27:26 +09:00
Dean Herbert	7aeeb65ae7	Tidy up Player's container loading logic ... Fixes drawable ruleset being loaded before skin sources are finished, by loading them as a separate operation (to avoid children being loaded first).	2019-08-27 18:27:21 +09:00
Dean Herbert	0ea10a4922	Fix skin sample reading failing	2019-08-27 17:18:32 +09:00
Dean Herbert	66223b9954	Merge branch 'master' into allow-fallback-to-samples-without-bank	2019-08-27 14:44:16 +09:00
Dean Herbert	62641c149d	Fx component lookups being incorrect for non-databased legacy skins	2019-08-26 18:20:45 +09:00
Dean Herbert	5e362d10b1	Add ruleset-specific legacy skin providers ... This moves implementation of osu! skinnables to OsuLegacySkin.	2019-08-26 12:21:49 +09:00
Dean Herbert	de2c6aa23d	Rename and expand usability of SkinProvidingContainer	2019-08-26 12:21:11 +09:00
iiSaLMaN	0bcd323d17	Remove unnecessary string literal	2019-08-24 09:30:43 +03:00
iiSaLMaN	da72806693	Remove lookup logic from SkinnableSound	2019-08-23 14:55:38 +03:00
iiSaLMaN	d8535574d1	Pass sample info to Skin.GetSample	2019-08-23 14:32:43 +03:00
iiSaLMaN	66d8440167	Move non-bank samples logic to LegacySkin	2019-08-22 12:50:47 +03:00
iiSaLMaN	87f3184fcc	Try retrieving samples without bank names ... Fallback for spinner bonus samples	2019-08-21 15:14:33 +03:00
Dean Herbert	28dfe072a5	Update one more blending mode change post-master merge	2019-08-21 15:11:46 +09:00
Dean Herbert	4186d2566a	Remove unnecessary null checks	2019-08-21 15:11:33 +09:00
Dean Herbert	745bd58f37	Merge remote-tracking branch 'upstream/master' into update-framework-blending	2019-08-21 15:10:08 +09:00
Dean Herbert	444f2b9387	Specify font size in a saner way	2019-08-21 15:01:50 +09:00
Dean Herbert	6a48819055	Merge branch 'master' into update-framework-blending	2019-08-21 14:27:57 +09:00
Dean Herbert	cca64771dd	Add comment about placement of default loading	2019-08-21 13:56:49 +09:00
Dean Herbert	aa8b7b60de	Merge remote-tracking branch 'upstream/master' into update-framework-blending	2019-08-21 13:30:24 +09:00
Dan Balasescu	82fe506f97	Merge branch 'master' into animated-legacy-skins	2019-08-21 13:03:11 +09:00
smoogipoo	0de219dda4	Update with spritetext text builder changes	2019-08-20 19:03:57 +09:00
Dean Herbert	4bffb0df84	Merge branch 'animated-legacy-skins' into animated-slider-ball	2019-08-20 18:14:17 +09:00
Dean Herbert	6dd638b327	Further improve legibility of texture lookup	2019-08-20 17:39:24 +09:00
Dean Herbert	84530b7839	Colour the correct layer	2019-08-20 15:02:07 +09:00
Dean Herbert	f7ce7c7d99	Merge branch 'fix-skin-test-regression' into animated-slider-ball	2019-08-20 14:09:53 +09:00
Dean Herbert	3b7cee2d45	Fix LegacySkin not checking for @2x hitcircle when deciding sizing	2019-08-20 13:50:16 +09:00
Dean Herbert	b5cb59faf2	Add default skin sprites and specular/diffuse layer support	2019-08-20 13:19:32 +09:00
Dean Herbert	d0766fa1cd	Add slider ball animation support	2019-08-19 19:55:47 +09:00
Dean Herbert	539a27a557	Refactor texture lookup code	2019-08-19 19:23:54 +09:00
Dean Herbert	d02b8d14f7	Avoid unnecessary texture retrieval for non-animated sprites	2019-08-19 17:47:59 +09:00
Dean Herbert	d224405bc6	Rename const and make more available	2019-08-19 17:46:05 +09:00
Dean Herbert	4356f2ef9f	Add sample usage of looping skinnable	2019-08-19 17:45:54 +09:00
iiSaLMaN	cfa569b226	Add looping field and fix build	2019-08-15 05:35:47 +03:00
iiSaLMaN	07e7e1187c	Add adjustment function in SkinnableSound	2019-08-15 05:30:35 +03:00
Dean Herbert	bc49164cc1	Merge branch 'master' into animated-legacy-skins	2019-08-13 00:40:20 +09:00
smoogipoo	5486c77362	Remove explicit autosize	2019-08-09 15:25:42 +09:00
Dean Herbert	ec13143ab3	Add further xmldoc	2019-08-07 18:45:56 +09:00
jorolf	7b95741dab	fix crash and add some tests ... - still missing special skin textures	2019-07-31 21:55:56 +02:00
jorolf	e01d3d85a3	Merge branch 'master' of git://github.com/ppy/osu into animated-legacy-skins	2019-07-30 20:29:04 +02:00
Dean Herbert	9335ebeb55	Fix missing anchor/origin specification	2019-07-30 23:45:55 +09:00
Dean Herbert	f6b6fa9633	Add disappeared null check	2019-07-30 23:44:47 +09:00
Dean Herbert	f9c95e21be	Merge remote-tracking branch 'upstream/master' into legacy-cursor-middle	2019-07-30 23:44:13 +09:00
Dean Herbert	21a8f566c3	Trim whitespace	2019-07-30 23:24:28 +09:00
Dean Herbert	d12de7dbfa	Add temporary scale hack to make cursors correct size	2019-07-30 23:20:35 +09:00
Dean Herbert	8e9f8bb565	Merge branch 'master' into slider-ball-scaling	2019-07-30 23:19:28 +09:00