j-jorge 651a593713 Prevent removal of unknown touch in CCScrollView::onTouchCancelled. (#17208)		2017-02-04 10:39:08 +08:00
..
GUI	Prevent removal of unknown touch in CCScrollView::onTouchCancelled. (#17208)	2017-02-04 10:39:08 +08:00
Particle3D	Fixed variable order in initializer lists (#17274)	2017-02-04 10:33:58 +08:00
assets-manager	Adding async version of common CCFileUtil functions. This will allow engine users to interact with the file system, without blocking the main thread and disrupting rendering. (#17140)	2017-01-13 10:05:46 +08:00
physics-nodes	No CC_UNUSED_PARAM (#16812)	2016-11-16 09:48:37 +08:00
Android.mk	remove curl link for Android	2016-07-21 11:56:56 +08:00
CMakeLists.txt	Squashed commit of the following:	2015-08-13 00:14:10 -07:00
ExtensionDeprecated.cpp	Update copyright to 2016. (#16311)	2016-08-05 09:42:15 +08:00
ExtensionDeprecated.h	Update copyright to 2016. (#16311)	2016-08-05 09:42:15 +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