5722 Commits

Author SHA1 Message Date
badlogic
ebe44b0e13 Merge branch '3.8' into 3.9-beta 2019-12-12 14:41:18 +01:00
badlogic
08e5cd3cc9 [cocos2dx] Fixed runtimes.sh to copy resources to example-v4 folder as well for cocos2dx v4. 2019-12-12 14:40:53 +01:00
badlogic
209425c05a Merge branch '3.8' of https://github.com/esotericsoftware/spine-runtimes into 3.8 2019-12-12 14:36:04 +01:00
badlogic
9974fec421 [cocos2dx] Need to duplicate assets in the example-v4 folder as the Android build doesn't like relative directories outside the root folder. Fixed linking for Android. 2019-12-12 14:35:55 +01:00
NathanSweet
6568c5d64e Fixed JsonRollback when a skin has no attachments. 2019-12-12 10:56:26 +01:00
Harald Csaszar
814d3a0408 [unity] Fixed Prefab Inspector constantly reloading in Unity 2019.3. Closes #1387. 2019-12-11 21:04:51 +01:00
Harald Csaszar
9550e9e6bc [unity] Fixed Prefab Inspector constantly reloading in Unity 2019.3. Closes #1387. 2019-12-11 21:04:02 +01:00
Harald Csaszar
cdcdb64a4f [unity] BoneFollower can now optionally follow (uniform) world scale of the reference bone. Renamed BoneFollower.followLocalScale to followScale. Scenes and prefabs are automatically upgraded, code needs manual correction. 2019-12-10 16:28:32 +01:00
badlogic
8391097947 [cocos2dx] Don't cull if no visiting camera is set. Closes #1566. 2019-12-10 16:12:32 +01:00
badlogic
75da2e3d94 [cocos2dx] Fix for iOS. Updated README.md partially. 2019-12-10 15:48:24 +01:00
badlogic
cd77aa908a [cocos2dx] spine-cocos2dx sources are build as a separate static library as part of the example for v4. 2019-12-10 15:16:27 +01:00
badlogic
9ab8c3817b [cocos2dx] Merged SkeletonRenderer code for v3 and v4. Only the batchers remain in separate source files. 2019-12-10 15:00:32 +01:00
badlogic
d8f94bc18a [cocos2dx] Unified SkeletonRenderer.h 2019-12-10 13:38:20 +01:00
badlogic
d950c32ba2 [cocos2dx] Unify SkeletonRenderer interface. 2019-12-10 13:38:01 +01:00
badlogic
bf14723dcc [cocos2dx] Initial cocos2dx v4 support. Need to fix formatting, ensure v3 and v4 work on all supported platforms, unify headers where possible and minimize code duplication. 2019-12-10 13:30:06 +01:00
Harald Csaszar
a8062da998 [unity] Fixed error when querying outline properties at LWRP shaders. Closes #1565. 2019-12-09 15:55:35 +01:00
Harald Csaszar
68bf9d60df [unity] Fixed error when querying outline properties at LWRP shaders. Closes #1565. 2019-12-09 15:54:56 +01:00
NathanSweet
068a554cc9 Avoid iterators for hot paths. 2019-12-06 22:22:18 +01:00
NathanSweet
65752c6d39 A little more minor skin clean up. 2019-12-06 22:22:18 +01:00
badlogic
154849484c [ts] Updated threejs backend to version r111. Closes #1560. 2019-12-05 14:07:58 +01:00
Harald Csaszar
2b4bbcb4ee [unity] Import: Fixed Skeleton not being updated when atlas page texture count changed. Closes #1562. 2019-12-05 12:58:13 +01:00
Harald Csaszar
a239aee367 [unity] Import: Fixed Skeleton not being updated when atlas page texture count changed. Closes #1562. 2019-12-05 12:57:29 +01:00
Harald Csaszar
60bfdd16f0 [unity] Fixed Timeline SpineAnimationStateTrack not showing Track Index parameter in Inspector at older Unity versions. Closes #1558. 2019-12-02 19:11:26 +01:00
Harald Csaszar
dbdaafc6a0 [unity] Fixed Timeline SpineAnimationStateTrack not showing Track Index parameter in Inspector at older Unity versions. Closes #1558. 2019-12-02 19:10:22 +01:00
Harald Csaszar
feba925a79 Merge branch '3.8' into 3.9-beta 2019-12-02 18:24:03 +01:00
Harald Csaszar
1802f7319a [csharp] Fixed an error in Skin where Skin.setAttachment() did not work as expected on 3.8 branch (See #1485). 2019-12-02 18:01:33 +01:00
Harald Csaszar
80f42c65a4 [unity] Minor cleanup, removed some useless comments. 2019-12-02 17:43:48 +01:00
Harald Csaszar
1d5189db81 [unity] Cleanup: merged common code of GetRepackedAttachments and GetRepackedSkin. See commit e3245ed. 2019-12-02 16:30:32 +01:00
Harald Csaszar
e3245ed590 [unity] Added support for additional texture channels (e.g. normal maps) at GetRepackedAttachments(). Commit before merging common code of GetRepackedAttachments and GetRepackedSkin. See #1519. 2019-12-02 16:21:45 +01:00
NathanSweet
26aaed331f Minor skin clean up. 2019-11-29 21:07:30 +01:00
Harald Csaszar
d99fd64e2d [unity] Re-added removed extension method GetRepackedAttachments(). Cleanup: Removed extension methods Attachment.GetRegion(). See commit f2a8c9a. See #1557. 2019-11-29 16:45:20 +01:00
Harald Csaszar
f3b6cc5933 [unity] Removal of usage statement. Addition to last cleanup commit, see commit c6bd125. 2019-11-29 16:10:26 +01:00
Harald Csaszar
c6bd125dea [unity] Cleanup removing OrderedDictionary usage in Skin. See commits ab7bd0f and f2a8c9a. 2019-11-29 16:00:23 +01:00
NathanSweet
ab7bd0f75f Minor clean up. 2019-11-29 14:41:19 +01:00
Harald Csaszar
f2a8c9a3c1 [unity][csharp] API Cleanup: removed many redundant extension methods that are now obsolete with Skin and Attachment API of 3.8. Closes #1557. Fixed an error in Skin where Skin.setAttachment() did not work as expected (See #1485). C# implementation is different to ref-impl here as struct keys do not allow for changing key.Attachment later without removing and readding the entry to the dictionary. 2019-11-29 12:31:39 +01:00
Harald Csaszar
de84c1000e [unity] Fixed Skin extension methods not copying skin bones and constraints. Closes #1556. 2019-11-28 14:40:13 +01:00
Harald Csaszar
237b33d82f [unity] Fixed Skin extension methods not copying skin bones and constraints. Closes #1556. 2019-11-28 14:39:39 +01:00
badlogic
a2bae9dea4 [ts] Generator background image UI and application. 2019-11-28 10:35:16 +01:00
badlogic
c37916a731 [ts][player] Only accept background image bounds if fully specified. 2019-11-27 15:15:56 +01:00
Harald Csaszar
b3e29c4338 [unity] Added Outline Shaders example scene to demonstrate switching to outline materials. See #1531. 2019-11-27 13:49:00 +01:00
Harald Csaszar
847ec12e3d [unity] Added Outline Shaders example scene to demonstrate switching to outline materials. See #1531. 2019-11-27 13:47:51 +01:00
Harald Csaszar
6730852e86 [xna] Fixed another (not so apparent) bug in multi pass rending (item texture reference was cleared to null and added to free pool too early). See #1554. 2019-11-27 12:20:56 +01:00
Harald Csaszar
c771fabf5d [xna] Fixed another (not so apparent) bug in multi pass rending (item texture reference was cleared to null and added to free pool too early). See #1554. 2019-11-27 12:20:05 +01:00
Harald Csaszar
701ef901dc [csharp] Fixed RegionAttachment copy method, did not copy color. Closes #1555. 2019-11-27 10:37:02 +01:00
Harald Csaszar
cb59d8d78b [csharp] Fixed RegionAttachment copy method, did not copy color. Closes #1555. 2019-11-27 10:36:35 +01:00
badlogic
bdad0c7170 Merge branch '3.8' of https://github.com/esotericsoftware/spine-runtimes into 3.8 2019-11-26 18:12:19 +01:00
badlogic
fca2f0c7af [ts] web player generator. 2019-11-26 18:12:13 +01:00
Harald Csaszar
56e950e3a7 [xna] Fixed multi pass rending (was not working, did nothing after first pass). Closes #1554. 2019-11-26 13:39:32 +01:00
Harald Csaszar
0b3db3142a [xna] Fixed multi pass rending (was not working, did nothing after first pass). Closes #1554. 2019-11-26 13:36:03 +01:00
Harald Csaszar
873ed56e4b [Examples] Removed previously merged and now redundant spine-unity/hero example asset. 2019-11-26 13:36:03 +01:00