From a3cc68d0775d5414369263927b04b165a15cbd83 Mon Sep 17 00:00:00 2001 From: Harald Csaszar Date: Fri, 18 Aug 2023 12:25:40 +0200 Subject: [PATCH 1/3] [unity] Updated more license files to the latest license. --- .../LICENSE.md | 28 +++++++++---------- .../LICENSE.md | 28 +++++++++---------- .../LICENSE.md | 28 +++++++++---------- 3 files changed, 42 insertions(+), 42 deletions(-) diff --git a/spine-unity/Modules/com.esotericsoftware.spine.lwrp-shaders/LICENSE.md b/spine-unity/Modules/com.esotericsoftware.spine.lwrp-shaders/LICENSE.md index 61b10330d..4425c6122 100644 --- a/spine-unity/Modules/com.esotericsoftware.spine.lwrp-shaders/LICENSE.md +++ b/spine-unity/Modules/com.esotericsoftware.spine.lwrp-shaders/LICENSE.md @@ -1,26 +1,26 @@ # Spine Runtimes License Agreement -Last updated May 1, 2019. Replaces all prior versions. +Last updated July 28, 2023. Replaces all prior versions. -Copyright (c) 2013-2019, Esoteric Software LLC +Copyright (c) 2013-2023, Esoteric Software LLC Integration of the Spine Runtimes into software or otherwise creating derivative works of the Spine Runtimes is permitted under the terms and conditions of Section 2 of the Spine Editor License Agreement: http://esotericsoftware.com/spine-editor-license -Otherwise, it is permitted to integrate the Spine Runtimes into software -or otherwise create derivative works of the Spine Runtimes (collectively, +Otherwise, it is permitted to integrate the Spine Runtimes into software or +otherwise create derivative works of the Spine Runtimes (collectively, "Products"), provided that each user of the Products must obtain their own Spine Editor license and redistribution of the Products in any form must include this license and copyright notice. -THIS SOFTWARE IS PROVIDED BY ESOTERIC SOFTWARE LLC "AS IS" AND ANY EXPRESS -OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN -NO EVENT SHALL ESOTERIC SOFTWARE LLC BE LIABLE FOR ANY DIRECT, INDIRECT, -INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES, BUSINESS -INTERRUPTION, OR LOSS OF USE, DATA, OR PROFITS) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, -EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file +THE SPINE RUNTIMES ARE PROVIDED BY ESOTERIC SOFTWARE LLC "AS IS" AND ANY +EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL ESOTERIC SOFTWARE LLC BE LIABLE FOR ANY +DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES, +BUSINESS INTERRUPTION, OR LOSS OF USE, DATA, OR PROFITS) HOWEVER CAUSED AND +ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THE +SPINE RUNTIMES, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file diff --git a/spine-unity/Modules/com.esotericsoftware.spine.timeline/LICENSE.md b/spine-unity/Modules/com.esotericsoftware.spine.timeline/LICENSE.md index 61b10330d..4425c6122 100644 --- a/spine-unity/Modules/com.esotericsoftware.spine.timeline/LICENSE.md +++ b/spine-unity/Modules/com.esotericsoftware.spine.timeline/LICENSE.md @@ -1,26 +1,26 @@ # Spine Runtimes License Agreement -Last updated May 1, 2019. Replaces all prior versions. +Last updated July 28, 2023. Replaces all prior versions. -Copyright (c) 2013-2019, Esoteric Software LLC +Copyright (c) 2013-2023, Esoteric Software LLC Integration of the Spine Runtimes into software or otherwise creating derivative works of the Spine Runtimes is permitted under the terms and conditions of Section 2 of the Spine Editor License Agreement: http://esotericsoftware.com/spine-editor-license -Otherwise, it is permitted to integrate the Spine Runtimes into software -or otherwise create derivative works of the Spine Runtimes (collectively, +Otherwise, it is permitted to integrate the Spine Runtimes into software or +otherwise create derivative works of the Spine Runtimes (collectively, "Products"), provided that each user of the Products must obtain their own Spine Editor license and redistribution of the Products in any form must include this license and copyright notice. -THIS SOFTWARE IS PROVIDED BY ESOTERIC SOFTWARE LLC "AS IS" AND ANY EXPRESS -OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN -NO EVENT SHALL ESOTERIC SOFTWARE LLC BE LIABLE FOR ANY DIRECT, INDIRECT, -INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES, BUSINESS -INTERRUPTION, OR LOSS OF USE, DATA, OR PROFITS) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, -EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file +THE SPINE RUNTIMES ARE PROVIDED BY ESOTERIC SOFTWARE LLC "AS IS" AND ANY +EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL ESOTERIC SOFTWARE LLC BE LIABLE FOR ANY +DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES, +BUSINESS INTERRUPTION, OR LOSS OF USE, DATA, OR PROFITS) HOWEVER CAUSED AND +ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THE +SPINE RUNTIMES, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file diff --git a/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/LICENSE.md b/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/LICENSE.md index 61b10330d..4425c6122 100644 --- a/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/LICENSE.md +++ b/spine-unity/Modules/com.esotericsoftware.spine.urp-shaders/LICENSE.md @@ -1,26 +1,26 @@ # Spine Runtimes License Agreement -Last updated May 1, 2019. Replaces all prior versions. +Last updated July 28, 2023. Replaces all prior versions. -Copyright (c) 2013-2019, Esoteric Software LLC +Copyright (c) 2013-2023, Esoteric Software LLC Integration of the Spine Runtimes into software or otherwise creating derivative works of the Spine Runtimes is permitted under the terms and conditions of Section 2 of the Spine Editor License Agreement: http://esotericsoftware.com/spine-editor-license -Otherwise, it is permitted to integrate the Spine Runtimes into software -or otherwise create derivative works of the Spine Runtimes (collectively, +Otherwise, it is permitted to integrate the Spine Runtimes into software or +otherwise create derivative works of the Spine Runtimes (collectively, "Products"), provided that each user of the Products must obtain their own Spine Editor license and redistribution of the Products in any form must include this license and copyright notice. -THIS SOFTWARE IS PROVIDED BY ESOTERIC SOFTWARE LLC "AS IS" AND ANY EXPRESS -OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN -NO EVENT SHALL ESOTERIC SOFTWARE LLC BE LIABLE FOR ANY DIRECT, INDIRECT, -INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, -BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES, BUSINESS -INTERRUPTION, OR LOSS OF USE, DATA, OR PROFITS) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, -EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file +THE SPINE RUNTIMES ARE PROVIDED BY ESOTERIC SOFTWARE LLC "AS IS" AND ANY +EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL ESOTERIC SOFTWARE LLC BE LIABLE FOR ANY +DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES, +BUSINESS INTERRUPTION, OR LOSS OF USE, DATA, OR PROFITS) HOWEVER CAUSED AND +ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THE +SPINE RUNTIMES, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file From 597af11179783848532b45ced11cfabe85300ec3 Mon Sep 17 00:00:00 2001 From: Harald Csaszar Date: Mon, 21 Aug 2023 16:59:23 +0200 Subject: [PATCH 2/3] [unity] Minor: Increased officially compatible Unity version to 2023.1. --- spine-unity/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spine-unity/README.md b/spine-unity/README.md index dba132794..6d869e149 100644 --- a/spine-unity/README.md +++ b/spine-unity/README.md @@ -22,7 +22,7 @@ Unity's physics components do not support dynamically assigned vertices so they ## Unity version -spine-unity is compatible with Unity 2017.1-2022.1. +spine-unity is compatible with Unity 2017.1-2023.1. ## Usage From 4239912146575594846cf991dcbedc4b8a57a639 Mon Sep 17 00:00:00 2001 From: Harald Csaszar Date: Mon, 21 Aug 2023 17:49:31 +0200 Subject: [PATCH 3/3] [unity] Added warning when 'CanvasGroup compatible' is enabled at Material and SkeletonGraphic 'PMA Vertex Colors' is incorrectly enabled as well. --- .../Spine/Runtime/spine-unity/Utility/MaterialChecks.cs | 8 ++++++++ spine-unity/Assets/Spine/package.json | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/spine-unity/Assets/Spine/Runtime/spine-unity/Utility/MaterialChecks.cs b/spine-unity/Assets/Spine/Runtime/spine-unity/Utility/MaterialChecks.cs index 69fad8f9f..59a03cbc9 100644 --- a/spine-unity/Assets/Spine/Runtime/spine-unity/Utility/MaterialChecks.cs +++ b/spine-unity/Assets/Spine/Runtime/spine-unity/Utility/MaterialChecks.cs @@ -102,6 +102,10 @@ namespace Spine.Unity { + "a) disable 'CanvasGroup Compatible' at the Material or\n" + "b) enable 'Canvas Group Tint Black' at the SkeletonGraphic component under 'Advanced'.\n" + "You may want to duplicate the 'SkeletonGraphicTintBlack' material and change settings at the duplicate to not affect all instances."; + public static readonly string kCanvasGroupCompatiblePMAVertexMessage = + "\nWarning: 'CanvasGroup Compatible' is enabled at the Material and 'PMA Vertex Colors' is enabled at SkeletonGraphic!\n\nPlease\n" + + "a) disable 'CanvasGroup Compatible' at the Material or\n" + + "b) disable 'PMA Vertex Colors' at the SkeletonGraphic component under 'Advanced'."; public static bool IsMaterialSetupProblematic (SkeletonRenderer renderer, ref string errorMessage) { Material[] materials = renderer.GetComponent().sharedMaterials; @@ -162,6 +166,10 @@ namespace Spine.Unity { isProblematic = true; errorMessage += kCanvasGroupCompatibleDisabledMessage; } + if (settings.pmaVertexColors == true && IsCanvasGroupCompatible(material)) { + isProblematic = true; + errorMessage += kCanvasGroupCompatiblePMAVertexMessage; + } } return isProblematic; } diff --git a/spine-unity/Assets/Spine/package.json b/spine-unity/Assets/Spine/package.json index be89e2659..b596ebe63 100644 --- a/spine-unity/Assets/Spine/package.json +++ b/spine-unity/Assets/Spine/package.json @@ -2,7 +2,7 @@ "name": "com.esotericsoftware.spine.spine-unity", "displayName": "spine-unity Runtime", "description": "This plugin provides the spine-unity runtime core.", - "version": "4.1.16", + "version": "4.1.17", "unity": "2018.3", "author": { "name": "Esoteric Software",