10 Commits

Author	SHA1	Message	Date
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
Wenhai Lin	66b0a0e9b1	Adds `std::nothrow` to the `new` statements	2015-12-16 17:06:56 +08:00
Ricardo Quesada	c5058aa2f9	more conversions	2015-12-11 17:18:20 -08:00
pandamicro	43c68aa16b	Fix Chipmunk bindings issue	2015-11-27 22:38:16 +08:00
pandamicro	8320c2f702	Use rooted object for js_proxy new and get	2015-11-27 10:19:13 +08:00
pandamicro	ae2b75c8be	Fix issues causing by temporary RootedObject passed as function parameters	2015-11-27 01:35:06 +08:00
pandamicro	c202834312	Clean up manual bindings code, remove JS_THIS_OBJECT and JS_SET_RVAL	2015-11-25 14:33:43 +08:00
pandamicro	5a918608c1	Fix Chipmunk setCollisionType issue by initializing variables	2015-09-11 15:23:29 +08:00
pandamicro	69cdaca306	Auto add extend to jsb need to extend classes	2015-07-10 09:49:39 +08:00
zhangbin	b4f2d94109	Update js bindings & js tests.	2015-05-05 10:50:19 +08:00