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
History
pandamicro fc19435123 Merge branch 'v3' of github.com:pandamicro/cocos2d-x into hbmemory 
Conflicts:
	cocos/base/ccConfig.h
	cocos/scripting/js-bindings/manual/ScriptingCore.cpp
	cocos/scripting/js-bindings/manual/ScriptingCore.h
	cocos/scripting/js-bindings/script/jsb_prepare.js
 		2016-01-18 16:40:00 +08:00
..
auto Merge pull request #14692 from CodeAndWeb/spriteframe-anchor-from-plist 2016-01-13 15:58:02 -08:00
manual Merge branch 'v3' of github.com:pandamicro/cocos2d-x into hbmemory 2016-01-18 16:40:00 +08:00
proj.android fix the link error and compile error in windows and android platform 2015-12-09 20:18:37 +08:00
proj.ios_mac/cocos2d_js_bindings.xcodeproj adds missing scheme files 2015-12-28 16:42:44 -08:00
proj.win8.1-universal/libjscocos2d added missing _USRJSSTATIC preprocessor define for ARM builds 2015-12-14 14:55:33 -08:00
proj.win32 Combine studio change for LuaBinding, jsb and simulator 2015-11-25 21:52:44 +08:00
script Merge branch 'v3' of github.com:pandamicro/cocos2d-x into hbmemory 2016-01-18 16:40:00 +08:00
.gitignore Update js bindings & js tests. 2015-05-05 10:50:19 +08:00
CMakeLists.txt Add ScriptComponent and ComponentJS 2015-09-26 19:43:36 +08:00
README.md Update js bindings & js tests. 2015-05-05 10:50:19 +08:00

README.md

js-bindings

This repo is used for js bindings.