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
Huabing.Xu feec24e3ef Merge branch 'v3' into develop_migrate_math_lib_merge 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	cocos/2d/CCNode.cpp
	cocos/2d/CCRenderTexture.cpp
	cocos/2d/platform/wp8/CCGLView.h
	cocos/physics/CCPhysicsBody.cpp
	extensions/physics-nodes/CCPhysicsSprite.cpp
	extensions/physics-nodes/CCPhysicsSprite.h
	tests/cpp-tests/Classes/PhysicsTest/PhysicsTest.cpp
 		2014-04-25 16:20:24 +08:00
..
auto [AUTO]: updating luabinding automatically 2014-04-25 04:00:21 +00:00
manual Merge branch 'v3' into develop_migrate_math_lib_merge 2014-04-25 16:20:24 +08:00
proj.ios_mac/cocos2d_lua_bindings.xcodeproj issue #4729: iOS/Mac works fine 2014-04-10 00:36:41 +08:00
proj.win32 close #4400: Use the newest version of LuaSocket for lua 2014-03-20 17:04:54 +08:00
script Merge pull request #6093 from dplusic/develop 2014-04-25 13:41:41 +08:00
Android.mk close #4400: Update the anrroid.mk for lua-bindings 2014-03-20 18:09:52 +08:00
CMakeLists.txt fix lua bindings 2014-03-11 21:36:00 +08:00