liuliang a27a420a91 Merge branch 'v3' of github.com:super626/cocos2d-x into Meshv3 ... Conflicts: cocos/3d/CCSprite3D.cpp		2014-08-20 11:45:48 +08:00
..
2d	* Fixed WP8 cocos library project	2014-08-19 19:24:56 +03:00
3d	Merge branch 'v3' of github.com:super626/cocos2d-x into Meshv3	2014-08-20 11:45:48 +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 #7271 from newnon/v3_getPreviousLocation_fix	2014-08-19 09:49:01 +08:00
deprecated	Merge branch 'v3' into v3_dll	2014-07-17 14:12:10 +08:00
editor-support	fixed ArmatureAnimation::setSpeedScale	2014-08-18 16:19:54 +08:00
math	- added export to dll for: ZipFile, CGAffineToGL, GLToCGAffine, XXH32 (in .def file)	2014-08-15 13:20:37 +03: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	delete empty line	2014-08-18 20:28:59 +08:00
scripting/lua-bindings	[AUTO]: updating luabinding automatically	2014-08-18 15:26:32 +00:00
storage	Update CMakeLists.txt for storage	2014-08-07 15:07:29 +08:00
ui	add swallow touch and propagation customization to UIWidgets	2014-08-15 15:28:28 +08:00
Android.mk	Split cocos3d from cocos2d on the android、win32 and linux platform and adjust the related test project	2014-08-17 23:45:56 +08:00
CMakeLists.txt	Split cocos3d from cocos2d on the android、win32 and linux platform and adjust the related test project	2014-08-17 23:45:56 +08:00
cocos2d-prefix.pch	…
cocos2d.cpp	add missed CC_DLL for cocos2dVersion function	2014-08-11 15:50:48 +08:00
cocos2d.h	Split cocos3d from cocos2d on the android、win32 and linux platform and adjust the related test project	2014-08-17 23:45:56 +08:00