187 Commits

Author SHA1 Message Date
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
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
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
4406cdfba0 Updated examples in example projects. 2019-02-19 15:59:30 +01:00
badlogic
691cb23218 Merge branch '3.7-beta' into 3.7-beta-cpp 2018-12-03 17:18:04 +01:00
badlogic
7a803f8b1b Updated example project exports. 2018-12-03 17:12:03 +01:00
badlogic
4fb76c8c0e Merge branch '3.7-beta' into 3.7-beta-cpp 2018-11-19 14:45:11 +01:00
badlogic
238523d0fc Updated assets in all runtime example projects except Unity and UE4. 2018-11-19 13:28:58 +01:00
badlogic
990ccc4606 Merge branch '3.7-beta' into 3.7-beta-cpp 2018-11-15 15:58:42 +01:00
badlogic
939685f66c Added new PMA samples. 2018-11-15 10:59:50 +01:00
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
f033239b54 [cocos2dx] Fixes tint black. 2018-08-13 16:56:05 +02:00
badlogic
f12728f0d2 Merge branch '3.7-beta' into 3.7-beta-cpp 2018-08-09 15:18:15 +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
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
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
843159b6c3 [cocos2dx] Updated Android.mk. Closes #1036 2017-11-10 11:27:23 +01:00
badlogic
7488383b15 [cocos2dx] Added support for vertex effects. See #898 2017-06-26 15:00:59 +02:00