yinkaile 74bd8b09d6 update armature		2013-09-13 18:07:37 +08:00
..
AssetsManager	merged	2013-09-09 18:20:16 +09:00
CCBReader	Merge branch 'develop' into dictionary_array_fixes	2013-08-21 21:27:44 -07:00
CocoStudio	update armature	2013-09-13 18:07:37 +08:00
GUI	[develop] Warning fixes.	2013-09-08 11:26:38 +08:00
LocalStorage	[Tizen] Enable LocalStorage	2013-08-07 19:01:41 +09:00
network	Merge branch 'develop' into dictionary_array_fixes	2013-08-21 21:27:44 -07:00
physics_nodes	`getNodeToParent()` returns a `const &`	2013-08-28 18:31:32 -07:00
proj.emscripten	[emscripten] Fixing compilation errors.	2013-07-29 16:33:34 +08:00
proj.ios	1. remove any unused functions.	2013-09-10 11:02:50 +08:00
proj.linux	1. update mkfile.	2013-09-10 13:08:05 +08:00
proj.mac	cocos2d-x in Mac:	2013-06-28 19:02:10 -07:00
proj.nacl	1. add shadernode.cpp to linux, nacl mk files.	2013-09-10 11:47:02 +08:00
proj.qt5	Qt 5 port: Fixes to build against "develop" branch	2013-07-26 08:55:46 +00:00
proj.tizen	[Tizen] CC_ENABLE_CHIPMUNK_INTEGRATION=1	2013-08-06 14:42:53 +09:00
proj.win32	update armature	2013-09-13 18:07:37 +08:00
spine	ccGLXXX -> GL::xxx	2013-07-25 18:42:53 -07:00
Android.mk	1. fixes error of 34 line in android.mk.	2013-09-10 11:50:08 +08:00
CCDeprecated-ext.cpp	issue #2430: Moved constant to header file to avoid errors in 'switch case', the error is 'case value is not a constant expression'.	2013-07-27 00:55:41 +08:00
CCDeprecated-ext.h	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into DrawNode	2013-07-28 14:35:38 +08:00
ExtensionMacros.h	issue #1483: Added LICENSE_CCControlExtension.txt, and added license information for headers of CCControlExtension.	2012-09-25 17:26:09 +08:00
cocos-ext.h	update armature	2013-09-13 18:07:37 +08:00