axmol/cocos2dx/tilemap_parallax_nodes
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
..
CCParallaxNode.cpp [develop] Warning fixes. 2013-09-08 11:26:38 +08:00
CCParallaxNode.h issue #2784:Add class constructor js-binding document 2013-09-13 16:46:31 +08:00
CCTMXLayer.cpp Deprecated methods are replaced (warning MSVC C4996 is suppressed). 2013-09-16 15:38:03 +03:00
CCTMXLayer.h issue #2784:Add class constructor js-binding document 2013-09-13 16:46:31 +08:00
CCTMXObjectGroup.cpp Array & Dictionary fixes 2013-08-21 20:12:09 -07:00
CCTMXObjectGroup.h issue #2784:Add class constructor js-binding document 2013-09-13 16:46:31 +08:00
CCTMXTiledMap.cpp More best practices fixes and other bug fixes 2013-07-23 15:20:22 -07:00
CCTMXTiledMap.h issue #2784:Add class constructor js-binding document 2013-09-13 16:46:31 +08:00
CCTMXXMLParser.cpp TMX map polyline parse 2013-09-11 20:36:53 -03:00
CCTMXXMLParser.h issue #2784:Add class constructor js-binding document 2013-09-13 16:46:31 +08:00
CCTileMapAtlas.cpp Array & Dictionary fixes 2013-08-21 20:12:09 -07:00
CCTileMapAtlas.h issue #2784:Add class constructor js-binding document 2013-09-13 16:46:31 +08:00