Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/extensions
History
James Chen b128018f76 Merge branch 'suppressed-C4996' of https://github.com/savdalion/cocos2d-x into savdalion-suppressed-C4996 
Conflicts:
	extensions/CocoStudio/Armature/external_tool/GLES-Render.cpp
	samples/Cpp/TestCpp/Classes/ExtensionsTest/CocoStudioArmatureTest/ArmatureScene.cpp
 		2013-09-16 20:58:26 +08:00
..
AssetsManager issue #2784:Add class constructor js-binding document 2013-09-13 16:46:31 +08:00
CCBReader Deprecated methods are replaced (warning MSVC C4996 is suppressed). 2013-09-16 15:38:03 +03:00
CocoStudio Deprecated methods are replaced (warning MSVC C4996 is suppressed). 2013-09-16 15:38:03 +03:00
GUI Merge branch 'suppressed-C4996' of https://github.com/savdalion/cocos2d-x into savdalion-suppressed-C4996 2013-09-16 20:58:26 +08:00
LocalStorage [Tizen] Enable LocalStorage 2013-08-07 19:01:41 +09:00
network issue #2784:Add class constructor js-binding document 2013-09-13 16:46:31 +08:00
physics_nodes issue #2784:Add class constructor js-binding document 2013-09-13 16:46:31 +08:00
proj.emscripten [emscripten] Fixing compilation errors. 2013-07-29 16:33:34 +08:00
proj.ios 1. remove any unused functions. 2013-09-10 11:02:50 +08:00
proj.linux Merge branch 'develop' of https://github.com/2youyouo2/cocos2d-x into 2youyouo2-develop 2013-09-16 18:18:23 +08:00
proj.mac cocos2d-x in Mac: 2013-06-28 19:02:10 -07:00
proj.nacl 1. add shadernode.cpp to linux, nacl mk files. 2013-09-10 11:47:02 +08:00
proj.qt5 Qt 5 port: Fixes to build against "develop" branch 2013-07-26 08:55:46 +00:00
proj.tizen [Tizen] CC_ENABLE_CHIPMUNK_INTEGRATION=1 2013-08-06 14:42:53 +09:00
proj.win32 Merge branch 'develop' into 2youyouo2-develop 2013-09-16 20:12:03 +08:00
spine Deprecated methods are replaced (warning MSVC C4996 is suppressed). 2013-09-16 15:38:03 +03:00
Android.mk Merge branch 'develop' of https://github.com/2youyouo2/cocos2d-x into 2youyouo2-develop 2013-09-16 18:18:23 +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 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 Merge branch 'develop' of https://github.com/2youyouo2/cocos2d-x into 2youyouo2-develop 2013-09-16 18:18:23 +08:00