takaken1994 d4b556ee1e Update : Used a reference instead of the copy		2016-01-10 21:57:36 +09:00
..
GUI	Merge branch 'v3.10' of github.com:cocos2d/cocos2d-x into v3	2015-12-20 22:56:33 +08:00
Particle3D	Merge branch 'v3.10' of github.com:cocos2d/cocos2d-x into v3	2015-12-20 22:56:33 +08:00
assets-manager	Update : Used a reference instead of the copy	2016-01-10 21:57:36 +09:00
physics-nodes	Fix PhysicsSprite not working with moveTo action issue	2015-11-19 17:17:59 +08:00
Android.mk	Squashed commit of the following:	2015-08-13 00:14:10 -07:00
CMakeLists.txt	Squashed commit of the following:	2015-08-13 00:14:10 -07:00
ExtensionDeprecated.cpp	remove ccscale9sprite , cceditBox	2014-09-01 17:06:22 +08:00
ExtensionDeprecated.h	remove ccscale9sprite , cceditBox	2014-09-01 17:06:22 +08:00
ExtensionExport.h	Combine Studio change for particle 3d	2015-11-18 14:34:14 +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 for 3D object render, revert old changes	2015-12-18 11:23:33 +08:00