Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/extensions
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
..
GUI Merge branch 'v3.10' of github.com:cocos2d/cocos2d-x into v3 2015-12-20 22:56:33 +08:00
Particle3D Merge branch 'v3.10' of github.com:cocos2d/cocos2d-x into v3 2015-12-20 22:56:33 +08:00
assets-manager Adds `std::nothrow` to the `new` statements 2015-12-16 14:02:55 +08:00
physics-nodes Fix PhysicsSprite not working with moveTo action issue 2015-11-19 17:17:59 +08:00
Android.mk Squashed commit of the following: 2015-08-13 00:14:10 -07:00
CMakeLists.txt Squashed commit of the following: 2015-08-13 00:14:10 -07:00
ExtensionDeprecated.cpp remove ccscale9sprite , cceditBox 2014-09-01 17:06:22 +08:00
ExtensionDeprecated.h remove ccscale9sprite , cceditBox 2014-09-01 17:06:22 +08:00
ExtensionExport.h Combine Studio change for particle 3d 2015-11-18 14:34:14 +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 update for 3D object render, revert old changes 2015-12-18 11:23:33 +08:00