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/script
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 Physics3DHingeConstraint support constructor 2015-08-01 16:18:00 +08:00
ccui Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into audioengine 2015-07-30 20:25:57 +08:00
chipmunk Update js bindings & js tests. 2015-05-05 10:50:19 +08:00
debugger fix jsb debugger bug 2015-05-07 18:24:30 +08:00
extension Update js bindings & js tests. 2015-05-05 10:50:19 +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 Update js bindings & js tests. 2015-05-05 10:50:19 +08:00
studio Merge branch 'v3.7.1' of https://github.com/cocos2d/cocos2d-x into v3 2015-08-02 22:28:27 +08:00
jsb.js Add js wrapper for audio engine 2015-07-29 20:47:28 +08:00
jsb_audioengine.js Add js wrapper for audio engine 2015-07-29 20:47:28 +08:00
jsb_boot.js Add js wrapper for audio engine 2015-07-29 20:47:28 +08:00
jsb_cocos2d.js Merge branch 'v3.7.1' of https://github.com/cocos2d/cocos2d-x into v3 2015-08-02 22:28:27 +08:00
jsb_cocos2d_constants.js Update js bindings & js tests. 2015-05-05 10:50:19 +08:00
jsb_cocosbuilder.js Update js bindings & js tests. 2015-05-05 10:50:19 +08:00
jsb_common.js Update js bindings & js tests. 2015-05-05 10:50:19 +08:00
jsb_create_apis.js Fix create Sprite with PolygonInfo issue 2015-06-18 21:48:57 +08:00
jsb_debugger.js Update js bindings & js tests. 2015-05-05 10:50:19 +08:00
jsb_deprecated.js Update js bindings & js tests. 2015-05-05 10:50:19 +08:00
jsb_loaders.js Ensure backward compatibility 2015-07-14 14:14:36 +08:00
jsb_opengl.js Update js bindings & js tests. 2015-05-05 10:50:19 +08:00
jsb_opengl_constants.js Update js bindings & js tests. 2015-05-05 10:50:19 +08:00
jsb_pool.js Update js bindings & js tests. 2015-05-05 10:50:19 +08:00
jsb_prepare.js Auto add extend to jsb need to extend classes 2015-07-10 09:49:39 +08:00
jsb_property_apis.js Fix incorrect property of cc.Texture2D 2015-05-14 10:41:10 +08:00
jsb_property_impls.js Update js bindings & js tests. 2015-05-05 10:50:19 +08:00
jsb_spine.js Update js bindings & js tests. 2015-05-05 10:50:19 +08:00