pandamicro 85d4ce0d5a Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into v3 ... Conflicts: cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.hpp docs/RELEASE_NOTES.md tools/cocos2d-console tools/tojs/cocos2dx.ini		2015-07-21 11:39:24 +08:00
..
3d	add physics3d js manual binding and tests	2015-05-21 18:05:49 +08:00
chipmunk	…
cocosbuilder	…
cocostudio	upgrade rapidjson to 1.0.2	2015-05-25 11:43:03 +08:00
experimental	add the return value	2015-06-23 20:27:30 +08:00
extension	Reorganize code	2015-07-03 12:55:55 +08:00
localstorage	Add localStorage.clear test case	2015-05-12 19:02:22 +08:00
navmesh	Fix compilation issue in navmesh conversion	2015-06-19 08:11:45 +08:00
network	Reorganize code	2015-07-03 12:55:55 +08:00
physics3d	Change physics3d api to jsb namespace	2015-06-18 20:39:40 +08:00
platform	Fixed iOS/JS-Bind callStaticMethod() with bool arg	2015-06-30 14:00:28 +09:00
spine	Fix spine crash issue	2015-05-14 10:40:37 +08:00
ui	…
ScriptingCore.cpp	Fixed #12834 Invoke cleanup function when override in JS	2015-07-14 15:35:29 +08:00
ScriptingCore.h	Update versions and docs for v3.7	2015-07-16 16:53:43 +08:00
cocos2d_specifics.cpp	Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into v3	2015-07-21 11:39:24 +08:00
cocos2d_specifics.hpp	Remove cleanup from auto bindings add made it support override in JS	2015-07-16 14:09:26 +08:00
js_bindings_config.h	…
js_bindings_core.cpp	…
js_bindings_core.h	…
js_bindings_opengl.cpp	…
js_bindings_opengl.h	…
js_manual_conversions.cpp	Merge pull request #8 from pandamicro/physics3d	2015-06-18 14:54:32 +08:00
js_manual_conversions.h	Merge branch 'v3_navigation' of https://github.com/samuele3hu/cocos2d-x into physics3d	2015-06-18 09:20:37 +08:00
jsb_event_dispatcher_manual.cpp	…
jsb_event_dispatcher_manual.h	…
jsb_helper.h	…
jsb_opengl_functions.cpp	…
jsb_opengl_functions.h	…
jsb_opengl_manual.cpp	…
jsb_opengl_manual.h	…
jsb_opengl_registration.cpp	…
jsb_opengl_registration.h	…
spidermonkey_specifics.h	…