axmol/cocos/scripting/lua/bindings
samuele3 80f3a7d57a Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAssetsManager
Conflicts:
	build/cocos2d_samples.xcodeproj/project.pbxproj
	cocos/scripting/lua/bindings/LuaScriptHandlerMgr.h
	cocos/scripting/lua/script/Cocos2dConstants.lua
2013-11-01 17:17:21 +08:00
..
platform issue #3069:Add LuaObjectCBridge and related test sample 2013-10-31 15:20:53 +08:00
.cproject issue #2905: Renaming lua/cocos2dx_support to lua/bindings. 2013-10-16 16:40:07 +08:00
.project issue #2905: Renaming lua/cocos2dx_support to lua/bindings. 2013-10-16 16:40:07 +08:00
Android.mk issue #3409:Add XMLHttpRequest lua binding and corresponding test sample 2013-10-29 17:54:35 +08:00
CCBProxy.cpp issue #2905: Renaming lua/cocos2dx_support to lua/bindings. 2013-10-16 16:40:07 +08:00
CCBProxy.h issue #2905: jsbinding samples and lua binding samples build ok on android 2013-10-17 15:04:30 +08:00
CCLuaBridge.cpp issue #2905: Renaming lua/cocos2dx_support to lua/bindings. 2013-10-16 16:40:07 +08:00
CCLuaBridge.h issue #2905: Renaming lua/cocos2dx_support to lua/bindings. 2013-10-16 16:40:07 +08:00
CCLuaEngine.cpp issue #3037:Add assetsmananger lua binding and a releated test sample 2013-10-22 16:14:49 +08:00
CCLuaEngine.h issue #3037:Add assetsmananger lua binding and a releated test sample 2013-10-22 16:14:49 +08:00
CCLuaStack.cpp issue #3409:Add XMLHttpRequest lua binding and corresponding test sample 2013-10-29 11:40:41 +08:00
CCLuaStack.h issue #2905: [iOS Mac] HelloLua and TestLua work now. 2013-10-16 17:19:02 +08:00
CCLuaValue.cpp issue #2905: Renaming lua/cocos2dx_support to lua/bindings. 2013-10-16 16:40:07 +08:00
CCLuaValue.h issue #2905: [iOS Mac] HelloLua and TestLua work now. 2013-10-16 17:19:02 +08:00
Cocos2dxLuaLoader.cpp issue #2905: Renaming lua/cocos2dx_support to lua/bindings. 2013-10-16 16:40:07 +08:00
Cocos2dxLuaLoader.h issue #2905: Renaming lua/cocos2dx_support to lua/bindings. 2013-10-16 16:40:07 +08:00
LuaBasicConversions.cpp issue #2905: Renaming lua/cocos2dx_support to lua/bindings. 2013-10-16 16:40:07 +08:00
LuaBasicConversions.h issue #2905: Renaming lua/cocos2dx_support to lua/bindings. 2013-10-16 16:40:07 +08:00
LuaOpengl.cpp.REMOVED.git-id issue #2905: jsbinding samples and lua binding samples build ok on android 2013-10-17 15:04:30 +08:00
LuaOpengl.h issue #2905: [iOS Mac] HelloLua and TestLua work now. 2013-10-16 17:19:02 +08:00
LuaScriptHandlerMgr.cpp issue #2905: jsbinding samples and lua binding samples build ok on android 2013-10-17 15:04:30 +08:00
LuaScriptHandlerMgr.h Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAssetsManager 2013-11-01 17:17:21 +08:00
Lua_web_socket.cpp issue #2905: [iOS Mac] HelloLua and TestLua work now. 2013-10-16 17:19:02 +08:00
Lua_web_socket.h issue #2905: [iOS Mac] HelloLua and TestLua work now. 2013-10-16 17:19:02 +08:00
Makefile issue #3409:Add XMLHttpRequest lua binding and corresponding test sample 2013-10-29 17:54:35 +08:00
liblua.vcxproj issue #3409:Add XMLHttpRequest lua binding and corresponding test sample 2013-10-29 17:54:35 +08:00
liblua.vcxproj.filters issue #3409:Add XMLHttpRequest lua binding and corresponding test sample 2013-10-29 17:54:35 +08:00
liblua.vcxproj.user issue #2905: Renaming lua/cocos2dx_support to lua/bindings. 2013-10-16 16:40:07 +08:00
lua_cocos2dx_deprecated.cpp.REMOVED.git-id issue #2905: Renaming lua/cocos2dx_support to lua/bindings. 2013-10-16 16:40:07 +08:00
lua_cocos2dx_deprecated.h issue #2905: Renaming lua/cocos2dx_support to lua/bindings. 2013-10-16 16:40:07 +08:00
lua_cocos2dx_extension_manual.cpp issue #3037:Add assetsmananger lua binding and a releated test sample 2013-10-22 16:14:49 +08:00
lua_cocos2dx_extension_manual.h issue #3037:Add assetsmananger lua binding and a releated test sample 2013-10-22 16:14:49 +08:00
lua_cocos2dx_manual.cpp issue #3069:Modify layer lua register and add some compatible lua binding functions 2013-10-31 09:49:04 +08:00
lua_cocos2dx_manual.hpp issue #2905: Renaming lua/cocos2dx_support to lua/bindings. 2013-10-16 16:40:07 +08:00
lua_xml_http_request.cpp issue #3049:Add XMLHttpRequest lua binding and corresponding test sample 2013-10-29 18:21:15 +08:00
lua_xml_http_request.h issue #3409:Add XMLHttpRequest lua binding and corresponding test sample 2013-10-29 11:40:41 +08:00
tolua_fix.c issue #2905: Renaming lua/cocos2dx_support to lua/bindings. 2013-10-16 16:40:07 +08:00
tolua_fix.h issue #2905: Renaming lua/cocos2dx_support to lua/bindings. 2013-10-16 16:40:07 +08:00