cocos2d-x/extensions
James Chen 5ee6e7d79a Merge branch 'develop' into carlomorgantinizynga-new_develop_merge
Conflicts:
	cocos2dx/Android.mk
2013-08-05 10:09:15 +08:00
..
AssetsManager Change some doc due to the change of source code. 2013-08-01 17:47:37 +08:00
CCArmature Yet another documentation fix. 2013-08-01 21:40:13 +08:00
CCBReader Merge branch 'develop' into carlomorgantinizynga-new_develop_merge 2013-08-05 10:09:15 +08:00
Components Removes more Hungarian notation and more 2013-07-25 16:27:24 -07:00
GUI Yet another documentation fix. 2013-08-01 21:40:13 +08:00
LocalStorage Various linux eclipse projects compilation fixes 2013-07-09 15:23:19 +02:00
network Merge pull request #3346 from nakosung/develop 2013-08-01 19:41:11 -07:00
physics_nodes CCAssert -> CCASSERT 2013-07-19 22:01:27 -07:00
proj.emscripten [emscripten] Fixing compilation errors. 2013-07-29 16:33:34 +08:00
proj.ios issue #2325: Updating project configuration, tested on iPad 3. 2013-06-24 18:32:06 +08:00
proj.linux issue #2430:fix some compiling error 2013-07-26 16:43:40 +08:00
proj.mac cocos2d-x in Mac: 2013-06-28 19:02:10 -07:00
proj.nacl fix warnings 2013-07-26 15:22:45 +08:00
proj.qt5 Qt 5 port: Fixes to build against "develop" branch 2013-07-26 08:55:46 +00:00
proj.tizen [Tizen] Fix compile error. 2013-07-30 15:43:05 +09:00
proj.win32 issue 2430:fix a compiling error and add missing cpp 2013-07-26 15:55:12 +08:00
spine ccGLXXX -> GL::xxx 2013-07-25 18:42:53 -07:00
Android.mk closed #2434: simply Android.mk 2013-08-02 17:33:27 +08:00
CCDeprecated-ext.cpp issue #2430: Moved constant to header file to avoid errors in 'switch case', the error is 'case value is not a constant expression'. 2013-07-27 00:55:41 +08:00
CCDeprecated-ext.h Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into DrawNode 2013-07-28 14:35:38 +08:00
ExtensionMacros.h
cocos-ext.h issue #2404: cocos-ext include WebSocket.h and SocketIO.h now. WebSocket.h doesn't depend on <libwebsockets.h> now. 2013-07-25 10:33:19 +08:00