Ricardo Quesada efaec7b7ec Merge branch 'develop' into glview_improvements ... Conflicts: samples/Lua/HelloLua/Classes/AppDelegate.cpp template/multi-platform-lua/Classes/AppDelegate.cpp		2014-01-27 10:52:35 -08:00
..
GUI	GLView improvements	2014-01-23 15:36:55 -08:00
assets-manager	Linux fix missing file -> rename dir loadSceneEditorFileTest to LoadScene...; add string::npos; const correctness	2014-01-04 19:26:16 -03:00
physics-nodes	Makes an assert if CC_ENABLE_CHIPMUNK_INTEGRATION was not enabled in PhysicsDebugNode::create.	2014-01-26 20:05:51 +08:00
proj.win32	Added x64 support for Windows - CCExtensions	2014-01-11 12:31:04 +00:00
Android.mk	[Android] Don’t define CC_ENABLE_CHIPMUNK_INTEGRATION in extension project. Define it in `Application.mk` instead.	2014-01-26 17:55:38 +08:00
CMakeLists.txt	Merge branch 'develop' of https://github.com/akof1314/cocos2d-x into develop	2014-01-08 17:03:44 +08:00
ExtensionMacros.h	issue #1483: Added LICENSE_CCControlExtension.txt, and added license information for headers of CCControlExtension.	2012-09-25 17:26:09 +08:00
cocos-ext.h	Updates CCPhysicsDebugNode.h/.cpp, don’t define CC_ENABLE_CHIPMUNK_INTEGRATION in header file.	2014-01-26 19:35:21 +08:00