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 3c2e66e425 Merge branch 'v3.7.1' of https://github.com/cocos2d/cocos2d-x into v3 
# Conflicts:
#	.travis.yml
#	build/cocos2d_js_tests.xcodeproj/project.pbxproj
#	build/cocos2d_tests.xcodeproj/project.pbxproj
#	cocos/2d/CCFont.h
#	cocos/2d/CCFontAtlas.cpp
#	cocos/2d/CCFontAtlas.h
#	cocos/2d/CCFontFreeType.cpp
#	cocos/2d/CCFontFreeType.h
#	cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Windows/libcocos2d_8_1.Windows.vcxproj
#	cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.WindowsPhone/libcocos2d_8_1.WindowsPhone.vcxproj
#	cocos/2d/libcocos2d_win10/libcocos2d.vcxproj
#	cocos/cocos2d.cpp
#	cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.cpp
#	cocos/scripting/js-bindings/auto/jsb_cocos2dx_studio_auto.cpp
#	templates/cpp-template-default/proj.ios_mac/HelloCpp.xcodeproj/project.pbxproj
#	templates/js-template-default/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj
#	templates/js-template-runtime/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj
#	templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj
#	tests/cpp-tests/Classes/LabelTest/LabelTestNew.cpp
#	tests/cpp-tests/Classes/LabelTest/LabelTestNew.h
#	tools/bindings-generator
#	tools/simulator/frameworks/runtime-src/proj.ios_mac/simulator.xcodeproj/project.pbxproj
#	tools/travis-scripts/generate-bindings.sh
#	tools/travis-scripts/generate-cocosfiles.sh
#	tools/travis-scripts/travis_mac.yml
 		2015-08-02 22:28:27 +08:00
..
3d add Camera support constructor 2015-07-30 18:00:51 +08:00
chipmunk Auto add extend to jsb need to extend classes 2015-07-10 09:49:39 +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 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 recover the physics3DShape initHeightfield api 2015-08-01 18:29:48 +08:00
platform Fixed iOS/JS-Bind callStaticMethod() with bool arg 2015-06-30 14:00:28 +09:00
spine Fix manual bindings for changed API in spine 2015-07-28 15:11:20 +08:00
ui Update js bindings & js tests. 2015-05-05 10:50:19 +08:00
ScriptingCore.cpp Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into autoExtend 2015-07-23 15:25:33 +08:00
ScriptingCore.h Release docs for v3.7.1 2015-07-25 15:16:39 +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 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 Auto add extend to jsb need to extend classes 2015-07-10 09:49:39 +08:00
js_bindings_opengl.h Update js bindings & js tests. 2015-05-05 10:50:19 +08:00
js_manual_conversions.cpp Add BoneNode/SkeletonNode/SkinNode JS bindings 2015-07-24 15:48:34 +08:00
js_manual_conversions.h Add BoneNode/SkeletonNode/SkinNode JS bindings 2015-07-24 15:48:34 +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