457 Commits

Author SHA1 Message Date
badlogic
7f58a2f5da [cocos2dx] Fix VS solution and instructions. 2019-12-12 15:12:11 +01:00
badlogic
63be983014 [cocos2dx] Updated instructions for running the example for cocos2dx v3 on Windows. 2019-12-12 14:51:05 +01:00
badlogic
ebe44b0e13 Merge branch '3.8' into 3.9-beta 2019-12-12 14:41:18 +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
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
badlogic
c90ca1b08c Merge branch '3.8' into 3.9-beta 2019-11-19 16:36:36 +01:00
badlogic
41cfd38049 [cpp][cocos2dx] Skin and attachment setters now handle empty strings correctly. Closes #1543. 2019-11-19 16:36:25 +01:00
badlogic
151cf5143b Merge branch '3.8' into 3.9-beta 2019-10-28 15:35:07 +01:00
badlogic
015de8ed4c [cocos2d-objc] Added IK example. Also added SkeletonAnimation preUpdateWorldTransformListener and postUpdateWorldTransformsListener which allow modifying a skeleton pre- and post-calculation of the world transformations. See #1532. 2019-10-28 15:34:53 +01:00
badlogic
2e5560ca0f Merge branch '3.8' into 3.9-beta 2019-10-28 14:09:38 +01:00
badlogic
656b08a32e [cocos2dx] Added IK example, see #1532. Also added SkeletonAnimation::setPreUpdateWorldTransformsListener() and SkeletonAnimation::setPostUpdateWorldTransformsListener(). 2019-10-28 14:07:25 +01:00
badlogic
2bc4181fe0 Merge branch '3.8' into 3.9-beta 2019-09-23 16:43:30 +02:00
badlogic
5cb9afd2fa [cocos2dx] Reimplemented culling. Works with both 2D and 3D projections, and possibly custom projections as well. Closes #1445. 2019-09-23 16:43:19 +02:00
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