Vincent Yang 848fa2c0d0 Merge cocos2d.		2015-09-15 18:30:45 +08:00
..
GUI	Fixed inertial scrolling for `CCScrollView`	2015-07-08 10:03:03 +02:00
Particle3D	Merge pull request #13398 from perminovVS/v3-dev-use-more-get-file-extension	2015-08-18 17:27:11 +08:00
assets-manager	Merge cocos2d.	2015-09-15 18:30:45 +08:00
physics-nodes	Improve sync transform logic using custom listener	2015-08-01 16:50:16 +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	added check for WinRT and WP8	2014-10-14 16:46:23 -07: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	disable CURL and AssetsManager for Windows 10 UWP	2015-05-28 13:32:08 -07:00