yangxiao 1942a27a5c Merge branch 'newcode' into v3_merge		2014-08-14 13:55:57 +08:00
..
2d	Merge branch 'newcode' into v3_merge	2014-08-14 13:55:57 +08:00
3d	Merge branch 'newcode' into v3_merge	2014-08-14 13:55:57 +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	reset default camera rotation	2014-08-14 09:06:06 +08:00
deprecated	Merge branch 'v3' into v3_dll	2014-07-17 14:12:10 +08:00
editor-support	rename isVisibleByVisitingCamera to isVisitableByVisitingCamera	2014-08-14 10:26:37 +08: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	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into feature5537_physics_step	2014-08-12 10:20:34 +08:00
platform	add UITextField color & place hold color, fix double delete bug	2014-08-13 11:28:37 +08:00
renderer	add mirror test	2014-08-13 17:38:16 +08:00
scripting/lua-bindings	[AUTO]: updating luabinding automatically	2014-08-14 02:17:25 +00:00
storage	Update CMakeLists.txt for storage	2014-08-07 15:07:29 +08:00
ui	Merge branch 'newcode' into v3_merge	2014-08-14 13:55:57 +08:00
Android.mk	Merge branch 'v3_renderPrimitive' of github.com:dabingnn/cocos2d-x into v3	2014-08-11 14:37:43 +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	add missed CC_DLL for cocos2dVersion function	2014-08-11 15:50:48 +08:00
cocos2d.h	remove DrawNode3D	2014-08-08 15:06:45 +08:00