Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/extensions/Particle3D
History
pandamicro 022bcc24f1 Merge branch 'v3.10' of github.com:cocos2d/cocos2d-x into v3 
Conflicts:
	cocos/scripting/js-bindings/manual/chipmunk/js_bindings_chipmunk_manual.cpp
	cocos/scripting/js-bindings/manual/component/CCComponentJS.cpp
	cocos/scripting/js-bindings/manual/js_bindings_opengl.cpp
 		2015-12-20 22:56:33 +08:00
..
PU Merge branch 'v3.10' of github.com:cocos2d/cocos2d-x into v3 2015-12-20 22:56:33 +08:00
CCParticle3DAffector.cpp add std::nothrow 2015-03-02 16:05:26 +08:00
CCParticle3DAffector.h add std::nothrow 2015-03-02 16:05:26 +08:00
CCParticle3DEmitter.cpp add std::nothrow 2015-03-02 16:05:26 +08:00
CCParticle3DEmitter.h add std::nothrow 2015-03-02 16:05:26 +08:00
CCParticle3DRender.cpp update for 3D object render, revert old changes 2015-12-18 11:23:33 +08:00
CCParticle3DRender.h update for 3D object render, revert old changes 2015-12-18 11:23:33 +08:00
CCParticleSystem3D.cpp And more warnings. 2015-07-07 23:10:04 +08:00
CCParticleSystem3D.h update for 3D object render, revert old changes 2015-12-18 11:23:33 +08:00