314 Commits

Author SHA1 Message Date
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
badlogic
095fe71ff8 [cocos2dx] Updated to cocos2d-x 3.16. 2017-11-02 10:51:26 +01:00
Jare Guo
041b6ddb00 [cocos2dx] allow load custom atlas texture in _spAtlasPage_createTexture for CocosCreator (#1018) 2017-10-13 09:50:03 +02:00
badlogic
8650c668e9 [cocos2dx] Removed hard coded scratch buffer size, replaced with dynamic allocation. Also made it a global scratch buffer, instead of a per instance buffer. Saves 4kb per SkeletonRenderer instance. Closes #1015. 2017-10-10 15:37:27 +02:00
badlogic
d0cc44bfdb Fixed URLs in READMEs, replaced most with relative links, so URLs point to correct branch. 2017-10-04 15:08:22 +02:00
badlogic
f9245031a6 [cocos2d-x] Ported new tint black shader. See #1003. 2017-09-30 09:43:19 +02:00
badlogic
cdc335d41b [cocos2dx] Didn't invoke GL program state setup in initialize and setTwoColorTint. See #989 2017-09-28 17:00:05 +02:00
badlogic
c1538b113b [cocos2d-x] Added ETC1 support, thanks @halx99. Closes #989 2017-09-25 11:44:28 +02:00
badlogic
083e696220 [cocos2d-x] Closes #984. 2017-09-11 15:24:56 +02:00
zzya
5947520c9b fix clipping issue (#966)
* modify for clip

* fix clipping issue
2017-08-15 20:27:26 +02:00
badlogic
f7bb981852 [cocos2d-x] Call Node::update in SkeletonRenderer. Closes #960 2017-08-03 11:22:47 +02:00
zzya
687d774082 modify for clip (#955) 2017-07-28 11:58:10 +02:00
badlogic
6e7c6ebc07 [cocos2d-x] Not submitting geometry when final opacity of attachment is 0 2017-07-17 14:26:06 +02:00
badlogic
3be988e12f Updated READMEs to point to correct zips 2017-07-12 11:20:55 +02:00
badlogic
7488383b15 [cocos2dx] Added support for vertex effects. See #898 2017-06-26 15:00:59 +02:00
badlogic
b443e6e609 [Lua] Fixed path constraint sorting and type check in case attachment of target is null. [cocos2dx] Fixed samples. 2017-06-19 17:49:01 +02:00