Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/cocos/scripting/js-bindings/manual
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
..
3d Merge branch 'v3.10' of https://github.com/cocos2d/cocos2d-x into v3 2016-01-09 18:01:56 +08:00
chipmunk Merge branch 'v3' of github.com:pandamicro/cocos2d-x into hbmemory 2016-01-18 16:40:00 +08:00
cocosbuilder Update manual bindings to use the new memory model 2015-12-21 00:16:16 +08:00
cocostudio Update manual bindings to use the new memory model 2015-12-21 00:16:16 +08:00
component Update manual bindings to use the new memory model 2015-12-21 00:16:16 +08:00
experimental Update manual bindings to use the new memory model 2015-12-21 00:16:16 +08:00
extension Update manual bindings to use the new memory model 2015-12-21 00:16:16 +08:00
localstorage Fix issues causing by temporary RootedObject passed as function parameters 2015-11-27 01:35:06 +08:00
navmesh Update manual bindings to use the new memory model 2015-12-21 00:16:16 +08:00
network Merge branch 'v3' of github.com:pandamicro/cocos2d-x into hbmemory 2016-01-18 16:40:00 +08:00
physics3d Update manual bindings to use the new memory model 2015-12-21 00:16:16 +08:00
platform Update manual bindings to use the new memory model 2015-12-21 00:16:16 +08:00
spine Update manual bindings to use the new memory model 2015-12-21 00:16:16 +08:00
ui Adds `std::nothrow` to the `new` statements 2015-12-16 17:06:56 +08:00
ScriptingCore.cpp Merge branch 'v3' of github.com:pandamicro/cocos2d-x into hbmemory 2016-01-18 16:40:00 +08:00
ScriptingCore.h Merge branch 'v3' of github.com:pandamicro/cocos2d-x into hbmemory 2016-01-18 16:40:00 +08:00
cocos2d_specifics.cpp Merge branch 'v3' of github.com:pandamicro/cocos2d-x into hbmemory 2016-01-18 16:40:00 +08:00
cocos2d_specifics.hpp Implement full GC relied memory model 2015-12-21 00:14:51 +08:00
js-BindingsExport.h update code as comment 2015-11-26 17:39:57 +08:00
js_bindings_config.h Fix minor grammar and typo in documentation 2015-11-04 17:14:00 +09:00
js_bindings_core.cpp Update js bindings & js tests. 2015-05-05 10:50:19 +08:00
js_bindings_core.h Update js bindings & js tests. 2015-05-05 10:50:19 +08:00
js_bindings_opengl.cpp Update manual bindings to use the new memory model 2015-12-21 00:16:16 +08:00
js_bindings_opengl.h Update js bindings & js tests. 2015-05-05 10:50:19 +08:00
js_manual_conversions.cpp Adds `std::nothrow` to the `new` statements 2015-12-16 17:06:56 +08:00
js_manual_conversions.h removes logs 2015-12-15 18:21:44 -08:00
js_module_register.cpp Merge branch 'v3.10' of https://github.com/cocos2d/cocos2d-x into v3 2016-01-09 18:01:56 +08:00
js_module_register.h Correct return type to adopt GC Rooting API 2015-12-21 11:07:40 +08:00
jsb_event_dispatcher_manual.cpp js_get_or_create_jsobject() and other stuff 2015-12-07 19:05:23 -08:00
jsb_event_dispatcher_manual.h Update js bindings & js tests. 2015-05-05 10:50:19 +08:00
jsb_helper.h Clean up manual bindings code, remove JS_THIS_OBJECT and JS_SET_RVAL 2015-11-25 14:33:43 +08:00
jsb_opengl_functions.cpp Update js bindings & js tests. 2015-05-05 10:50:19 +08:00
jsb_opengl_functions.h Update js bindings & js tests. 2015-05-05 10:50:19 +08:00
jsb_opengl_manual.cpp Adds `std::nothrow` to the `new` statements 2015-12-16 17:06:56 +08:00
jsb_opengl_manual.h Update js bindings & js tests. 2015-05-05 10:50:19 +08:00
jsb_opengl_registration.cpp Update js bindings & js tests. 2015-05-05 10:50:19 +08:00
jsb_opengl_registration.h Update js bindings & js tests. 2015-05-05 10:50:19 +08:00
spidermonkey_specifics.h Update spidermonkey_specifics.h 2015-12-16 20:03:09 -08:00