Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/cocos2dx/misc_nodes
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
..
CCClippingNode.cpp Deprecated methods are replaced (warning MSVC C4996 is suppressed). 2013-09-16 15:38:03 +03:00
CCClippingNode.h Merge GUI to develop step 1; 2013-09-16 17:12:15 +08:00
CCMotionStreak.cpp Deprecated methods are replaced (warning MSVC C4996 is suppressed). 2013-09-16 15:38:03 +03:00
CCMotionStreak.h issue #2784:Add class constructor js-binding document 2013-09-13 16:46:31 +08:00
CCProgressTimer.cpp Deprecated methods are replaced (warning MSVC C4996 is suppressed). 2013-09-16 15:38:03 +03:00
CCProgressTimer.h issue #2784:Add class constructor js-binding document 2013-09-13 16:46:31 +08:00
CCRenderTexture.cpp [dispatcher] Adding 'Node::updateEventPriorityIndex' and making 'Node::addEventId(removeEventId)' method to be private. 2013-09-12 20:47:15 +08:00
CCRenderTexture.h issue #2784:Add class constructor js-binding document 2013-09-13 16:46:31 +08:00