Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/tests/js-tests/project/Classes
History
pandamicro fc19435123 Merge branch 'v3' of github.com:pandamicro/cocos2d-x into hbmemory 
Conflicts:
	cocos/base/ccConfig.h
	cocos/scripting/js-bindings/manual/ScriptingCore.cpp
	cocos/scripting/js-bindings/manual/ScriptingCore.h
	cocos/scripting/js-bindings/script/jsb_prepare.js
 		2016-01-18 16:40:00 +08:00
..
AppDelegate.cpp adds tvOS support 2015-12-28 15:59:36 -08:00
AppDelegate.h Add override keywords 2015-10-16 15:01:10 +09:00
js_DrawNode3D_bindings.cpp Update manual bindings to use the new memory model 2015-12-21 00:16:16 +08:00
js_DrawNode3D_bindings.h Add js-tests 2015-04-16 18:07:35 +08:00
js_Effect3D_bindings.cpp Update manual bindings to use the new memory model 2015-12-21 00:16:16 +08:00
js_Effect3D_bindings.h Add js-tests 2015-04-16 18:07:35 +08:00