axmol/cocos2dx/particle_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
..
CCParticleBatchNode.cpp Merge branch 'suppressed-C4996' of https://github.com/savdalion/cocos2d-x into savdalion-suppressed-C4996 2013-09-16 20:58:26 +08:00
CCParticleBatchNode.h issue #2784:Add class constructor js-binding document 2013-09-13 16:46:31 +08:00
CCParticleExamples.cpp Key should start with '/' to gain performance 2013-09-06 22:51:47 -07:00
CCParticleExamples.h issue #2784:Add class constructor js-binding document 2013-09-13 16:46:31 +08:00
CCParticleSystem.cpp Merge pull request #3554 from ricardoquesada/fileutils_perf_improvements 2013-09-08 19:50:12 -07:00
CCParticleSystem.h issue #2784:Add class constructor js-binding document 2013-09-13 16:46:31 +08:00
CCParticleSystemQuad.cpp Deprecated methods are replaced (warning MSVC C4996 is suppressed). 2013-09-16 15:38:03 +03:00
CCParticleSystemQuad.h issue #2784:Add class constructor js-binding document 2013-09-13 16:46:31 +08:00
firePngData.h fixed #1556: Added a newline at the end of firePngData.h file. 2012-11-08 12:06:02 +08:00