XiaoFeng ab0efd933a Merge branch 'v3.10' of https://github.com/cocos2d/cocos2d-x into v3 ... Conflicts: CHANGELOG cocos/scripting/js-bindings/manual/cocos2d_specifics.cpp tests/js-tests/src/RenderTextureTest/RenderTextureTest.js		2016-01-09 18:01:56 +08:00
..
3d	Add JS and Lua bindings for CCCameraBackgroundBrush	2015-08-21 12:42:36 +08:00
ccui	Fix UI addEventListener issue	2015-12-19 22:44:25 +08:00
chipmunk	…
debugger	…
extension	fix script samples error with controlButton	2015-12-19 22:22:41 +08:00
navmesh	Move NavMesh to jsb namespace	2015-06-18 22:57:41 +08:00
physics3d	Change physics3d api to jsb namespace	2015-06-18 20:39:40 +08:00
physicsSprite	…
studio	Fix more js parser font setting error	2016-01-06 20:42:27 +08:00
jsb.js	fix loading pluginx when compile Android with --compile-script flag	2015-09-24 11:41:18 +07:00
jsb_audioengine.js	Add js wrapper for audio engine	2015-07-29 20:47:28 +08:00
jsb_boot.js	fix cc.game.config['showFPS'] bug	2015-10-27 20:36:05 +08:00
jsb_cocos2d.js	add overFlow enum to jsb and lua.	2016-01-04 21:43:37 +08:00
jsb_cocos2d_constants.js	…
jsb_cocosbuilder.js	…
jsb_common.js	…
jsb_create_apis.js	Fix issue in MenuItem init usage	2015-12-19 22:45:22 +08:00
jsb_debugger.js	…
jsb_deprecated.js	…
jsb_loaders.js	Permit webp image loading	2015-08-17 18:55:53 +08:00
jsb_opengl.js	…
jsb_opengl_constants.js	update for jsb_opengl_constants	2015-08-28 08:42:55 +08:00
jsb_pool.js	…
jsb_prepare.js	Adds iOS tests, calls GC after replacing scene	2015-12-29 17:36:02 -08:00
jsb_property_apis.js	fix the node color property can not use	2015-08-07 17:26:35 +08:00
jsb_property_impls.js	…
jsb_spine.js	add custom spine skeletonAnimation test	2015-09-25 13:36:48 +08:00