jianglong0156 d5a6522a37 Merge branch 'v3' into constructedWith3D#12404		2015-07-28 09:59:35 +08:00
..
bindings-generator@c3b5130e3b	Update bindings-generator	2015-07-15 14:21:47 +08:00
cocos2d-console@f3768083be	Update the reference of submodule cocos2d-console.	2015-07-17 10:08:35 +08:00
framework-compile	add cocos framework build on linux platform.	2015-07-14 16:25:54 +08:00
jenkins-scripts	add xcpretty to framework mac build	2015-07-17 10:48:05 +08:00
make-package	Solve the error in git-archive-all tools.	2015-06-25 11:23:27 +08:00
particle	fixed 'seperate' typo	2015-04-25 00:02:39 +03:00
release	fix doxygen document generate tool restore doxygen.config file unexpectly	2015-03-23 14:35:38 +08:00
simulator	Fixed #12906 : Can't add custom member to cocos2d::Scene subclass.	2015-07-22 12:01:34 +08:00
tojs	add Physics3DRigidBodyDes support new , add new file jsb_cocos2dx_3d_conversions.h and jsb_cocos2dx_3d_conversions.cpp	2015-07-27 18:19:10 +08:00
tolua	Merge branch 'v3.7-release' into v3	2015-07-13 22:44:54 +08:00
travis-scripts	Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into v3	2015-07-15 14:39:40 +08:00
missing-tools.txt	rename file name	2014-08-06 15:01:18 +08:00