456 Commits

Author SHA1 Message Date
Mario Zechner
c80fd56ce3 Merge branch '4.0' into 4.1-beta 2022-01-19 16:01:27 +01:00
Mario Zechner
c312c373c0 [cocos2dx] Fix culling of clip attachments. See https://github.com/EsotericSoftware/spine-runtimes/pull/2011 2022-01-19 16:01:10 +01:00
Mario Zechner
899a9a80b9 [cocos2dx] Fix renderer compilation errors. 2021-12-22 16:23:08 +01:00
Mario Zechner
e87757ef57 Update version strings to 4.1(.xx) 2021-10-14 00:47:13 +02:00
badlogic
a0f1ed1b9b [runtimes] Fixed and updated example exports with 4.1.04-beta
- Fixed SkeletonBinary.ts
- Updated dragon example to use sequences
2021-10-13 17:52:34 +02:00
Nathan Sweet
96a998b82d Spine Runtimes License Agreement update (September 24, 2021). 2021-09-24 18:18:19 -10:00
Mario Zechner
67c0d39eab [runtimes] Fixed owl example project, export and runtime scripts
The owl example project was not keying the control bone, leading to incorrect additive blending. The export.sh and runtimes.sh script in example/export did not account for the folder structure change in spine-ts.
2021-09-14 00:02:04 +02:00
aismann
3560eb81a1
Fix 'Debug 64bit' build error on windows (VS2019) (#1946)
Error (active)	E0075	operand of '*' must be a pointer but has type "bool"
2021-09-01 14:21:41 +02:00
Mario Zechner
98ec2ab278 [cocos2dx] Fix Xcode project to be compatible with Xcode 12
Does not fix compilation errors in cocos2dx itself, which we can not fix on our end.
2021-08-24 16:01:34 +02:00
Nathan Sweet
7d6cdcd9d8 Applied oxipng. 2021-08-04 18:44:16 -04:00
badlogic
7cbb924d9d [cocos2dx] Minor fix-ups. 2021-07-01 11:27:56 +02:00
badlogic
87658c7d31 [c][cpp] Spotless formatter 2021-07-01 10:40:18 +02:00
Mario Zechner
de697385fc [runtimes] Fix up README.md files using correct editor version. 2021-06-14 15:31:17 +02:00
badlogic
653c06a6b8 [cpp] 4.0 port, half done. 2021-03-02 16:54:14 +01:00
badlogic
688d855006 [runtimes] Updated examples with Editor version 4.0.58-beta. 2021-03-01 10:05:26 +01:00
badlogic
81aee82c91 Merge branch '3.8' into 4.0-beta 2020-10-29 15:43:48 +01:00
RH
f06fd410e8
Fix to address issue introduced in PR #1787 where the same ProgramState was being used for each attachment, but would cause problems if the attachments did not use the same texture. (#1801) 2020-10-27 09:34:31 +01:00
badlogic
ee3f088e6c Merge branch '3.8' into 4.0-beta 2020-10-23 11:26:34 +02:00
halx99
21185a1fc3 fix 2020-10-16 18:46:13 +08:00
halx99
5bacfcd733 SkeletonTwoColorBatch also support custom program 2020-10-16 18:42:45 +08:00
halx99
84b0af8ac5 Fix custom program state not applied at cocos2d-x-4.0 2020-10-16 17:48:30 +08:00
Nathan Sweet
98a6c8f696 Exported examples with export.sh 4.0.05-beta and ran runtimes.sh. 2020-10-10 16:22:40 -07:00
badlogic
706a68761c Merge branch '3.8' into 4.0-beta 2020-08-26 16:20:59 +02:00
badlogic
4927c2be63 [cocos2dx] Closes #1710, MALLOC is not available in cocos2dx 3.x. 2020-08-26 16:20:46 +02:00
badlogic
9f1ce2853b Merge branch '3.8' into 4.0-beta 2020-08-26 16:16:49 +02:00
badlogic
1cc50fd09e [cocos2dx] Closes #1734, simplify file I/O. 2020-08-26 16:16:36 +02:00
badlogic
585a6f0e39 Merge branch '3.8' into 4.0-beta 2020-08-26 16:14:59 +02:00
badlogic
0a42f4fe28 [cocos2dx] Closes #1733, missing JS bindings. 2020-08-26 16:14:48 +02:00
Nathan Sweet
896e6a419c Merge branch '3.8' into 4.0-beta 2020-08-10 23:56:47 +02:00
Nathan Sweet
33e2aea7ff Merge branch '3.8' into 4.0-beta 2020-08-10 23:53:10 +02:00
Nathan Sweet
13b3b2e011
Formatting. 2020-08-10 23:47:50 +02:00
Harald Csaszar
46a0ffce50 [cocos2d-x] Added early out check for MeshAttachment alpha == 0. Related to commit 254baf4. See #1708. 2020-06-22 16:48:14 +02:00
Harald Csaszar
254baf4d75 [cocos2d-x] Fixed broken mesh indices when RegionAttachment alpha == 0. Closes #1708. 2020-06-22 14:44:40 +02:00
badlogic
dd77657755 Merge branch '3.8' into 3.9-beta 2020-04-20 15:52:17 +02:00
badlogic
049adf7e2b [cocos2dx] Apply node Z to debug node. Closes #1655. 2020-04-20 15:51:57 +02:00
Mario Zechner
29146937fd Merge branch '3.8' into 3.9-beta 2020-02-03 15:53:07 +01:00
Mario Zechner
90c2a19364 [cocos2dx] Updated windows build for cocos2d-x v4. 2020-02-03 15:52:50 +01:00
badlogic
0dd2db2627 [cocos2dx] Improve CMake build for cocos2d-x v3 and v4 example projects, based on PR #1572. 2020-02-03 14:57:29 +01:00
badlogic
a0f33bb0c0 Merge branch '3.8' into 3.9-beta 2020-02-03 14:43:36 +01:00
badlogic
acee8d0bd4 [cocos2dx] Disable BUILD_EDITOR_SPINE in example project, so our sources in tree get used. 2020-02-03 14:43:19 +01:00
badlogic
934bec56b7 Merge branch '3.8' into 3.9-beta 2019-12-20 12:27:35 +01:00
badlogic
b67bf992a0 Single bone IK fix and license header update. Closes #1580, closes #1581. 2019-12-20 12:20:46 +01:00
Arnold
8c8b08f80b [bugfix] spine-cocos2dx renderer issues (#1577)
* fix some bugs

* auto release program
2019-12-18 09:19:58 +01:00
badlogic
ae62a01d4d Merge branch '3.8' into 3.9-beta 2019-12-12 16:27:34 +01:00
badlogic
1daedd3f1c [cocos2dx] Disable cocos2d spine editor support for our example project. 2019-12-12 16:27:20 +01:00
badlogic
944b656517 Merge branch '3.8' of https://github.com/esotericsoftware/spine-runtimes into 3.8 2019-12-12 16:08:54 +01:00
badlogic
47db7878fc [cocos2dx] Fix macOS target configuration. 2019-12-12 16:08:48 +01:00
badlogic
79fae539bf Merge branch '3.8' into 3.9-beta 2019-12-12 15:56:51 +01:00
badlogic
9f0a361df0 [cocos2dx] Updated Windows build instructions. 2019-12-12 15:56:05 +01:00
badlogic
7f58a2f5da [cocos2dx] Fix VS solution and instructions. 2019-12-12 15:12:11 +01:00