Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/cocos/scripting/lua-bindings
History
samuele3hu 074216bef9 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_physics3d 
Conflicts:
	templates/lua-template-default/frameworks/runtime-src/Classes/lua_module_register.h
	tests/lua-tests/src/mainMenu.lua
 		2015-05-24 22:46:05 +08:00
..
auto [AUTO]: updating luabinding & jsbinding automatically 2015-05-22 02:04:38 +00:00
manual Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_physics3d 2015-05-24 22:46:05 +08:00
proj.android Add Lua bindings for Physics3D and related test cases 2015-05-15 09:28:03 +08:00
proj.ios_mac/cocos2d_lua_bindings.xcodeproj Add Lua bindings for Physics3D and related test cases 2015-05-15 09:28:03 +08:00
proj.win32 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_physics3d 2015-05-15 09:31:53 +08:00
script Add Lua bindings for Physics3D and related test cases 2015-05-15 09:28:03 +08:00
CMakeLists.txt Add Lua bindings for Physics3D and related test cases 2015-05-15 09:28:03 +08:00