samuele3hu 6bb21c0f4d Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module ... Conflicts: build/cocos2d_libs.xcodeproj/project.pbxproj tools/tolua/cocos2dx.ini		2014-07-31 17:52:22 +08:00
..
2d	Remove CCProtectedNode.h/.cpp from ui/base to 2d and modify the related project setting	2014-07-31 16:38:55 +08:00
3d	Merge pull request #7526 from chenguangqi/v3	2014-07-21 13:54:31 +08:00
audio	change CocosDenshion to libcocosdenshion	2014-07-28 21:35:16 +08:00
base	Split luabindings module to some independent modules	2014-07-31 15:20:23 +08:00
deprecated	Merge branch 'v3' into v3_dll	2014-07-17 14:12:10 +08:00
editor-support	remove CC_CONSTUCTOR_ACCESS fow win32 release	2014-07-30 16:39:21 +08:00
math	add CC_DLL for functions	2014-07-15 11:18:05 +08:00
network	change libnetwork and libSpine	2014-07-29 09:31:52 +08:00
physics	Mac dylib version works now	2014-07-17 20:58:50 +08:00
platform	Merge pull request #7078 from reckhou/v3	2014-07-28 14:00:55 +08:00
renderer	Change Image::PVRImagesHavePremultipliedAlpha() to Image::setPVRImagesHavePremultipliedAlpha()	2014-07-28 10:38:22 +08:00
scripting/lua-bindings	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_module	2014-07-31 15:22:46 +08:00
storage	remove unused windows localstorage project file	2014-07-29 15:23:07 +08:00
ui	Merge pull request #7635 from samuele3hu/v3_new_module	2014-07-31 17:39:01 +08:00
Android.mk	Remove CCProtectedNode.h/.cpp from ui/base to 2d and modify the related project setting	2014-07-31 16:38:55 +08:00
CMakeLists.txt	Squashed commit of the following:	2014-05-18 14:49:16 -07: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	decouple libcocos2d and cocosdenshion	2014-07-29 18:08:40 +08:00