andyque 82f597ce98 Merge branch 'v3.7.1' into v3 ... # Conflicts: # cocos/scripting/lua-bindings/auto/api/CheckBox.lua # cocos/ui/UICheckBox.cpp # cocos/ui/UICheckBox.h		2015-08-12 17:59:50 +08:00
..
GUI	Fixed inertial scrolling for `CCScrollView`	2015-07-08 10:03:03 +02:00
Particle3D	Merge branch 'v3.7.1' into v3	2015-08-12 17:59:50 +08:00
assets-manager	Fix AssetsManager crash by protect Downloader with shared_ptr	2015-08-04 12:45:49 +08:00
physics-nodes	Improve sync transform logic using custom listener	2015-08-01 16:50:16 +08:00
Android.mk	Fix the compile error of js-template by using android-studio compile param.	2015-06-25 17:44:51 +08:00
CMakeLists.txt	modify project using short path	2015-03-05 13:40:52 +08: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