479 Commits

Author SHA1 Message Date
badlogic
c95af40579 Updated all exports, using PMA now where possible in all examples. Did not update UE4 and Unity assets, these need to be updated manually. 2018-11-15 10:58:30 +01:00
badlogic
bb1bdd7046 Merge branch '3.7-beta' into 3.7-beta-cpp 2018-10-26 17:12:08 +02:00
sp-stefano-lanza
7183e3b0bd Feature/new skeleton culling (#1196)
* Fix culling of skeleton and clean up code

* Optionally draw the bounding rectangle of skeletons

* Add Visual Studio compiler support

* Fix indentation

* Fix indentation

* Fix indentation

* Revert some indentation changes
2018-10-16 15:46:49 +02:00
badlogic
b2479bf7bf [ue4] Updated example project to 4.20. Fixed re-import of skeletons, see #1177. 2018-09-25 15:46:09 +02:00
badlogic
7c398be3b6 Merge branch '3.7-beta' into 3.7-beta-cpp 2018-09-06 16:01:12 +02:00
badlogic
a4584a1a1c [ts] Added event volume and balance, see #1171. 2018-09-06 14:45:55 +02:00
badlogic
3a64a3d389 Merge branch '3.7-beta' into 3.7-beta-cpp 2018-09-03 15:16:37 +02:00
badlogic
74734bc542 [runtimes] Re-exported samples with 3.7. 2018-09-03 15:16:20 +02:00
Mario Zechner
1d703ce052 Merge branch '3.7-beta' into 3.7-beta-cpp 2018-08-24 16:41:27 +02:00
Mario Zechner
c1e62e9690 [cocos2dx] Fixed VS2015 example project. 2018-08-24 16:27:23 +02:00
Mario Zechner
af32155930 Merge branch '3.6' into 3.7-beta 2018-08-24 16:16:55 +02:00
Mario Zechner
68f329c4fc [cocos2d] Fixed VS 2015 solution. 2018-08-24 15:02:37 +02:00
badlogic
e724231c5f Merge branch '3.7-beta' into 3.7-beta-cpp 2018-08-14 15:09:15 +02:00
badlogic
4b66fffcd7 [cpp] Updated samples to include stretch IK flag, implemented stretchy IK for C++. 2018-08-14 14:30:11 +02:00
badlogic
7fba618e88 [cpp] Fixed bug in handling of dark colors on load. 2018-08-13 17:21:24 +02:00
badlogic
f033239b54 [cocos2dx] Fixes tint black. 2018-08-13 16:56:05 +02:00
badlogic
a6dcbc61e3 [cocos2dx] Fix for tint black in 3.7 branch. 2018-08-13 16:47:36 +02:00
badlogic
bd778ba417 Merge branch '3.6' into 3.7-beta 2018-08-13 16:36:38 +02:00
badlogic
ce536558e5 [cocos2dx] Tint black did not work, didn't multiple dark color with skeleton/attachment color. Closes #1158. 2018-08-13 16:34:06 +02:00
badlogic
5a78663bfa [cocos2dx] Resolved merge conflict that got accidentially commited. 2018-08-10 11:57:11 +02:00
badlogic
253bda4ee4 Merge branch '3.7-beta' into 3.7-beta-cpp 2018-08-10 11:54:49 +02:00
badlogic
d3e37284fc Merge branch '3.6' into 3.7-beta 2018-08-10 11:14:01 +02:00
badlogic
a578be88e0 [cocos2dx][c] Fixed call to spVertexAttachment_computeWorldVertices, as well as count calcalculation. 2018-08-10 11:11:15 +02:00
badlogic
c405dcd165 [cocos2dx][cpp] More changes to computeWorldVertices. 2018-08-09 15:27:26 +02:00
badlogic
f12728f0d2 Merge branch '3.7-beta' into 3.7-beta-cpp 2018-08-09 15:18:15 +02:00
badlogic
4005ff2ad4 Merge branch '3.6' into 3.7-beta 2018-08-09 15:02:55 +02:00
badlogic
9a428a02b8 [c] Fixes #1148, revert changes to spVertexAttachment_computeWorldVertices. Vertex size must be a multiple of 4, which explains why #1148 failed. 2018-08-09 14:59:09 +02:00
Mario Zechner
ac7fe7ca80 Updated examples to 3.7, including stretchy ik. 2018-08-03 14:57:10 +02:00
badlogic
cb22d5dab9 Merge branch '3.7-beta' into 3.7-beta-cpp 2018-07-18 15:20:05 +02:00
badlogic
218d3b4737 [cpp][sfml][cocos2dx] skip rendering of skeletons/slots/attachment with alpha equal 0. 2018-07-18 14:27:57 +02:00
badlogic
22c1e32164 Merge branch '3.7-beta' into 3.7-beta-cpp 2018-07-18 14:14:39 +02:00
badlogic
6e83e6aed1 [c][cpp][sfml][cocos2d-x] Skip rendering of skeleton/slot/attachment early if alpha is 0. See #1145 2018-07-18 12:04:11 +02:00
badlogic
ca6a6fc930 Updated all READMEs. 2018-06-08 14:18:51 +02:00
badlogic
f315f36956 [cocos2dx] Fixed batchers, MSVC projects. 2018-06-05 14:36:20 +02:00
badlogic
7e68a48189 [cocos2dx] More fixes to two color batching. 2018-06-05 13:30:00 +02:00
badlogic
ec718b73ee [cocos2dx] Fixed Android example project. 2018-06-05 11:48:54 +02:00
badlogic
162ce9f5aa Fixed meshes. 2018-05-30 18:31:36 +02:00
badlogic
878a6e6435 Refactored C++ runtime, added cocos2d-x cpp runtime. 2018-05-30 17:31:11 +02:00
badlogic
7867f09a6d Merge branch '3.6' into 3.7-beta 2018-04-12 10:42:46 +02:00
badlogic
7647c345e3 [cocos2dx] Initializing skeleton setup poses and world transform on construction to avoid flicked in first frame. Closes #1098 2018-04-12 10:42:34 +02:00
badlogic
34bac82ee2 [c] Fixed parsing of dark slot colors for binary files. See #1097 2018-04-12 10:30:43 +02:00
badlogic
c97553474e Added new assets for libGDX tests. 2018-04-12 10:24:42 +02:00
badlogic
28df2f8944 Merge branch '3.6' into 3.7-beta 2018-02-06 15:16:55 +01:00
badlogic
eecde9e871 [cocos2d-x] Closes #1075, added SkeletonRenderer:setSlotsRange and SkeletonRenderer::createWithSkeleton. Allows rendering parts of a single skeleton, mixed with other nodes. See SkeletonRendererSeparator.cpp for an example. 2018-02-06 15:16:23 +01:00
badlogic
b547280eb9 Updated samples, added owl. 2018-01-18 15:18:31 +01:00
badlogic
999e836ba0 [cocos2dx] Closes #1062, proper handling of batch boundaries. 2018-01-12 13:44:58 +01:00
Greg Rynkowski
97dd5ab8df Fix typo in the SkeletonAnimation::createWithFile (#1045) 2017-12-07 15:47:32 +01:00
badlogic
f40efe6066 Revert "fix warnings (#1034)"
This reverts commit 5948e5a62f0d9fb5a526c200dc70a81d286b1e38.
2017-12-06 15:35:02 +01:00
minggo
5948e5a62f fix warnings (#1034) 2017-11-21 11:17:39 +01:00
badlogic
843159b6c3 [cocos2dx] Updated Android.mk. Closes #1036 2017-11-10 11:27:23 +01:00