XiaoYang 593a619dc8 Merge pull request #14715 from liamcindy/v3_textureCache ... update for 3D object render, revert old changes		2015-12-18 21:22:31 +08:00
..
GUI	Merge pull request #14641 from liamcindy/v3_ui_controlButton	2015-12-14 19:47:41 +08:00
Particle3D	update for 3D object render, revert old changes	2015-12-18 11:23:33 +08:00
assets-manager	Fix typos in documentation and comments	2015-12-12 21:04:22 +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