488 Commits

Author SHA1 Message Date
badlogic
16306c3cec Merge branch '3.8' into 3.9-beta 2019-09-23 16:04:23 +02:00
badlogic
fba357ed74 [cocos2dx] SkeletonRenderer:getBoundingBox() recalculates the bounds on each call instead of relying on draw() having calculated it. Closes #1483. 2019-09-23 16:03:37 +02:00
badlogic
81938c65c0 Merge branch '3.8' into 3.9-beta 2019-09-23 14:38:43 +02:00
badlogic
9cfe697cfd [cocos2dx] Fix VS project to copy resources to new required location on Windows. 2019-09-19 15:44:52 +02:00
badlogic
6e4a6925a2 [cocos2d] Updated CHANGELOG and README.md for VS2019 upgrade. 2019-09-19 14:36:09 +02:00
badlogic
0e9978b5d2 [cocos2d] Updated README.md with better instructions for Windows. 2019-09-19 14:26:00 +02:00
badlogic
e6103a8a88 Merge branch '3.8' into 3.9-beta 2019-09-18 17:36:04 +02:00
badlogic
e89043b1f6 [cpp] Fixes #1444. SpineObject was using the wrong calloc. 2019-09-18 17:29:21 +02:00
badlogic
db166b1b7b Merge branch '3.8' into 3.9-beta 2019-09-11 16:20:00 +02:00
Stefano Lanza
df748dbe4b Fix cocos2dx project and use of premultiplied alpha (#1484)
* Fix project

* Take into account premultiplied alpha of cocos2dx texture
2019-09-10 14:11:58 +02:00
NathanSweet
45362e60bf [all] Source clean up, formatting, and tabs for indentation. 2019-08-28 17:36:51 +02:00
NathanSweet
842dffbd83 [all] Source clean up, formatting, and tabs for indentation. 2019-08-27 15:57:14 +02:00
badlogic
56c45856de Merge branch '3.8' into 3.9-beta 2019-08-12 14:02:49 +02:00
badlogic
40d4cad434 [cocos2dx] Properly retain/release textures in attachemnt vertices. Closes #1442. 2019-08-12 14:02:05 +02:00
badlogic
9040824e2b Merge branch '3.8' into 3.9-beta 2019-08-05 17:41:29 +02:00
badlogic
bb51ec7f23 Updated examples, removed stretch-ik stretchyman. 2019-08-05 17:31:15 +02:00
badlogic
f2be7423da Updated README.mds to specify correct Spine Editor version compatibility. 2019-08-05 14:54:07 +02:00
badlogic
aab88a7a6f [cocos2dx] Fixed up reference to isAutoCullEnable(). 2019-07-12 13:03:39 +02:00
Stefano Lanza
b648d3af99 Remove Socialpoint custom code related to cocos2dx (#1407) 2019-07-12 13:01:15 +02:00
badlogic
e5b88aa4c0 [cocos2dx] Temporarily enable culling by default. 2019-07-11 15:05:29 +02:00
badlogic
727b3866d3 Merge branch 'feature/socialpoint_custom_changes' of https://github.com/socialpoint/spine-runtimes into socialpoint 2019-07-11 14:56:56 +02:00
badlogic
b22420b03b [cocos2dx] Fixed mix-and-match example. 2019-07-11 14:32:14 +02:00
badlogic
8172d8c98b [cocos2dx] Closes #1406, set renderer object on track entry to NULL after track entry disposal. 2019-07-11 14:26:35 +02:00
badlogic
f8f495524e Updated example exports, fixed up example projects with mix-and-match skin api demo. 2019-07-09 13:47:05 +02:00
unknown
16c2437d70 Fix breaking changes 2019-07-04 14:24:08 +02:00
unknown
c71736792b Formatting 2019-07-03 12:56:51 +02:00
unknown
90f2968865 Clean ups 2019-07-03 12:49:10 +02:00
unknown
99c08fced6 Port more features 2019-07-02 17:51:47 +02:00
unknown
9745e3779c Revert some changes and fix formatting 2019-07-02 12:36:52 +02:00
unknown
7f4343d65c Fix solution 2019-07-02 11:50:11 +02:00
unknown
9df2c28768 ported more changes 2019-07-02 11:47:45 +02:00
unknown
c8a34cdbd5 Ported my fixes and optimization to spine stable 2019-07-01 17:15:03 +02:00
badlogic
bbce5b915d Updated README.mds. 2019-06-26 13:53:12 +02:00
badlogic
6850a019ec Updated examples again, final binary format change. 2019-06-19 18:02:20 +02:00
badlogic
5f13f1b8e6 Exported all examples with 3.8.25-beta to include file format changes in .json and .skel files. 2019-06-19 16:56:47 +02:00
badlogic
e9929461f4 [cocos2dx] Added mix-and-match example. See #1375. 2019-06-13 17:30:03 +02:00
badlogic
5d974e4480 Added mix-and-match assets, modified export scripts, added libGDX sample. See #1375. 2019-06-13 15:58:16 +02:00
badlogic
d9793e5df9 [cocos2dx][cocos2dobjc] Renderers must not render slots with inactive bones. 2019-06-06 16:33:30 +02:00
badlogic
1ec6e26b71 Updated example exports and copies in runtime example projects to the latest .json and .skel formats. 2019-06-05 11:20:43 +02:00
badlogic
55d2a644bd Merge branch '3.7' into 3.8-beta 2019-05-31 11:33:43 +02:00
badlogic
61d2b52868 [cocos2dx] Closes #1366, setupGLProgramState incorrectly checked for RegionAttachment. 2019-05-31 11:33:21 +02:00
badlogic
4f3d2d8057 Merge branch '3.7' into 3.8-beta 2019-05-03 10:53:34 +02:00
badlogic
849e9acc7e Updated READMEs. 2019-05-03 10:51:33 +02:00
badlogic
09130b15df Merge branch '3.7' into 3.8-beta 2019-05-02 11:43:36 +02:00
badlogic
7f7e5f0fec Updated license headers and LICENSE files. 2019-05-02 11:38:19 +02:00
badlogic
c68d85a1fc [c][cpp] Ported addition of x/y bounding coordinates to SkeletonData. See #1325. 2019-04-16 14:06:41 +02:00
badlogic
5c62f78ed4 [cocos2dx] Segfault when copying old scratch buffer contents to resized buffer. Closes #1295. 2019-03-07 19:00:47 +01:00
badlogic
2eb85acff9 [cocos2dx] Segfault when copying old scratch buffer contents to resized buffer. Closes #1295. 2019-03-07 19:00:17 +01:00
badlogic
4406cdfba0 Updated examples in example projects. 2019-02-19 15:59:30 +01:00
badlogic
5c6ac74eab [cocos2dx] Updated samples to cocos2d-x 3.17.1. 2019-01-23 14:29:31 +01:00