zilongshanren e1d0d7f722 Merge pull request #14854 from zilongshanren/fixScale9GrayShader ... fix scale9sprite gray state opacity issue.		2016-01-12 11:50:41 +08:00
..
Classes	Merge pull request #14854 from zilongshanren/fixScale9GrayShader	2016-01-12 11:50:41 +08:00
Resources	Merge branch 'v3.10' of https://github.com/cocos2d/cocos2d-x into v3	2016-01-09 18:01:56 +08:00
proj.android	constexpr for signature, garbage collection and compile-time error for unsupported argument types	2015-11-10 23:39:16 +03:00
proj.android-studio	constexpr for signature, garbage collection and compile-time error for unsupported argument types	2015-11-10 23:39:16 +03:00
proj.ios	adds tvOS support	2015-12-28 15:59:36 -08:00
proj.linux	…
proj.mac	Squashed commit of the following:	2015-08-13 00:14:10 -07:00
proj.win8.1-universal	updated winrt temporary app certificates expiration dates	2015-10-20 07:39:42 -07:00
proj.win10	moved file to correct folder in vcxproj	2015-10-20 10:07:30 -07:00
proj.win32	add a test case for pr 14327	2015-11-18 22:52:47 +08:00
.cocos-project.json	Solve the error when run tests projects with `cocos run`.	2015-06-24 15:33:13 +08:00
CMakeLists.txt	Remove performance tests from cpp-tests project.	2015-09-10 16:01:56 +08:00