songmiao 08a4ebba06 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into billboard ... Conflicts: cocos/2d/libcocos2d.vcxproj.filters tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.h		2014-08-15 17:43:04 +08:00
..
2d	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into billboard	2014-08-15 17:43:04 +08:00
3d	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into billboard	2014-08-15 17:43:04 +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	add CCModuleManager into CMakeLists.txt	2014-08-15 14:46:21 +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	Merge pull request #7794 from minggo/seperate-jpg-tiff-webp	2014-08-15 15:24:09 +08:00
renderer	fix android background and foreground crash for primitive	2014-08-15 14:05:17 +08:00
scripting/lua-bindings	[AUTO]: updating luabinding automatically	2014-08-15 07:23:17 +00:00
storage	Update CMakeLists.txt for storage	2014-08-07 15:07:29 +08:00
ui	Merge pull request #7780 from andyque/addOptionsForHardCodedValue	2014-08-15 15:16:12 +08:00
Android.mk	Merge pull request #7708 from super626/obb	2014-08-15 15:32:14 +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	…
cocos2d.cpp	add missed CC_DLL for cocos2dVersion function	2014-08-11 15:50:48 +08:00
cocos2d.h	merge cocos2d	2014-08-08 16:25:52 +08:00