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
..
LuaOpengl.cpp	modify float convert to unsigned int	2015-01-07 16:03:46 +08:00
LuaOpengl.h	Update comments of some header files	2015-03-26 22:07:44 +08:00
LuaScriptHandlerMgr.cpp	Decrease the package size of lua_empty_test	2014-11-26 21:54:18 +08:00
LuaScriptHandlerMgr.h	fixed 'seperate' typo	2015-04-25 00:02:39 +03:00
lua_cocos2dx_deprecated.cpp	issue #9820:Inconsistent :setBlendFunc(...) function binding for Sprite and LabelBMFont classes	2015-01-14 13:51:09 +08:00
lua_cocos2dx_deprecated.h	Split luabindings module to some independent modules	2014-07-31 15:20:23 +08:00
lua_cocos2dx_experimental_manual.cpp	Add Lua-bindings for SpritePolygon and related test case	2015-04-28 18:19:57 +08:00
lua_cocos2dx_experimental_manual.hpp	Split luabindings module to some independent modules	2014-07-31 15:20:23 +08:00
lua_cocos2dx_manual.cpp	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_physics3d	2015-05-24 22:46:05 +08:00
lua_cocos2dx_manual.hpp	Add CameraTest、OBBTest and related lua bindings	2014-10-10 09:49:25 +08:00
lua_cocos2dx_physics_manual.cpp	issue 10411:Bug in Physics manual Lua binding	2015-05-07 16:15:24 +08:00
lua_cocos2dx_physics_manual.hpp	Split luabindings module to some independent modules	2014-07-31 15:20:23 +08:00