minggo 437257e7e6 Merge pull request #7683 from andyque/fixWidgetDefaultCascadColorAndOpacity ... Let Widget class don't support cascaded opacity and cascaded color on default.		2014-08-11 09:37:51 +08:00
..
2d	Merge pull request #7683 from andyque/fixWidgetDefaultCascadColorAndOpacity	2014-08-11 09:37:51 +08:00
3d	remove DrawNode3D	2014-08-08 15:06:45 +08:00
audio	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_wp8fix	2014-08-07 11:58:01 +08:00
base	Merge pull request #7702 from super626/v3_merge	2014-08-08 15:56:38 +08:00
deprecated	Merge branch 'v3' into v3_dll	2014-07-17 14:12:10 +08:00
editor-support	Make CMake More Robust	2014-08-06 15:43:19 +01:00
math	add Quaternion::ZERO	2014-07-31 18:36:30 +08:00
network	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module	2014-08-07 14:02:50 +08:00
physics	Mac dylib version works now	2014-07-17 20:58:50 +08:00
platform	winrt compile fix -addtional	2014-08-08 10:47:14 +08:00
renderer	Make CMake More Robust	2014-08-06 15:43:19 +01:00
scripting/lua-bindings	[AUTO]: updating luabinding automatically	2014-08-11 01:31:04 +00:00
storage	Update CMakeLists.txt for storage	2014-08-07 15:07:29 +08:00
ui	Merge pull request #7683 from andyque/fixWidgetDefaultCascadColorAndOpacity	2014-08-11 09:37:51 +08:00
Android.mk	remove DrawNode3D	2014-08-08 15:06:45 +08:00
CMakeLists.txt	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module	2014-08-07 14:02:50 +08:00
cocos2d-prefix.pch	Squashed commit of the following:	2014-05-16 14:36:00 -07:00
cocos2d.cpp	[ci skip]	2014-07-15 15:11:17 +08:00
cocos2d.h	remove DrawNode3D	2014-08-08 15:06:45 +08:00