axmol/cocos/scripting/js-bindings/manual
WuHao 27d0f51e9b Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fix_spritepolygon
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	build/cocos2d_tests.xcodeproj/project.pbxproj
	cocos/2d/libcocos2d.vcxproj.filters
	tools/cocos2d-console
	web
2015-06-15 16:13:36 +08:00
..
3d add physics3d js manual binding and tests 2015-05-21 18:05:49 +08:00
chipmunk Update js bindings & js tests. 2015-05-05 10:50:19 +08:00
cocosbuilder Update js bindings & js tests. 2015-05-05 10:50:19 +08:00
cocostudio upgrade rapidjson to 1.0.2 2015-05-25 11:43:03 +08:00
experimental Merge pull request #15 from pandamicro/spritepolygon 2015-06-15 15:47:02 +08:00
extension Fix issue that __JSDownloaderDelegator::onError get called twice 2015-06-04 15:03:20 +08:00
localstorage Add localStorage.clear test case 2015-05-12 19:02:22 +08:00
network Update js bindings & js tests. 2015-05-05 10:50:19 +08:00
physics3d Fix physics 3d macro include issue 2015-06-12 15:41:46 +08:00
platform Update js bindings & js tests. 2015-05-05 10:50:19 +08:00
spine Fix spine crash issue 2015-05-14 10:40:37 +08:00
ui Update js bindings & js tests. 2015-05-05 10:50:19 +08:00
ScriptingCore.cpp Fix component function execution issue in JSB 2015-06-05 00:03:21 +08:00
ScriptingCore.h Update js bindings & js tests. 2015-05-05 10:50:19 +08:00
cocos2d_specifics.cpp Remove jsb_cocos2dx_experimental_manual 2015-06-15 10:46:57 +08:00
cocos2d_specifics.hpp Update js bindings & js tests. 2015-05-05 10:50:19 +08:00
js_bindings_config.h Update js bindings & js tests. 2015-05-05 10:50:19 +08: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 js bindings & js tests. 2015-05-05 10:50:19 +08:00
js_bindings_opengl.h Update js bindings & js tests. 2015-05-05 10:50:19 +08:00
js_manual_conversions.cpp Update manual conversion for sprite polygon 2015-06-12 12:56:37 +08:00
js_manual_conversions.h Update manual conversion for sprite polygon 2015-06-12 12:56:37 +08:00
jsb_event_dispatcher_manual.cpp Update js bindings & js tests. 2015-05-05 10:50:19 +08:00
jsb_event_dispatcher_manual.h Update js bindings & js tests. 2015-05-05 10:50:19 +08:00
jsb_helper.h Update js bindings & js tests. 2015-05-05 10:50:19 +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 Update js bindings & js tests. 2015-05-05 10:50:19 +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 js bindings & js tests. 2015-05-05 10:50:19 +08:00