samuele3hu caae8392d4 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_controller ... Conflicts: build/cocos2d_tests.xcodeproj/project.pbxproj cocos/scripting/lua-bindings/Android.mk cocos/scripting/lua-bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj/project.pbxproj tools/tolua/genbindings.py		2014-07-10 22:42:09 +08:00
..
AudioEngine.lua	fix the bug that exit layer can’t end SimpleAudioEngine	2014-04-17 10:36:08 +08:00
CCBReaderLoad.lua	Re-add lua bindings codes.	2014-03-10 14:04:58 +08:00
CocoStudio.lua	Re-add lua bindings codes.	2014-03-10 14:04:58 +08:00
Cocos2d.lua	fixed cc.pGetAngle not using absolute value	2014-04-01 17:13:59 +09:00
Cocos2dConstants.lua	Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_controller	2014-07-09 22:31:05 +08:00
Deprecated.lua	Add deprecated support for lua binding of `getSize` and `setSize` of Widget	2014-06-25 15:13:08 +08:00
DeprecatedClass.lua	Update the openGL lua binding and related test case	2014-05-23 19:12:30 +08:00
DeprecatedEnum.lua	fix layout constant syntax error	2014-06-03 20:26:59 -07:00
DeprecatedOpenglEnum.lua	Re-add lua bindings codes.	2014-03-10 14:04:58 +08:00
DrawPrimitives.lua	Re-add lua bindings codes.	2014-03-10 14:04:58 +08:00
GuiConstants.lua	Update some GuiConstants and resubmission pr#6361.	2014-05-15 16:54:55 +08:00
Opengl.lua	Re-add lua bindings codes.	2014-03-10 14:04:58 +08:00
OpenglConstants.lua	Re-add lua bindings codes.	2014-03-10 14:04:58 +08:00
StudioConstants.lua	Re-add lua bindings codes.	2014-03-10 14:04:58 +08:00
experimentalConstants.lua	Add VideoPlayer Test for Lua	2014-06-27 13:56:39 +08:00
extern.lua	Re-add lua bindings codes.	2014-03-10 14:04:58 +08:00
json.lua	Re-add lua bindings codes.	2014-03-10 14:04:58 +08:00
luaj.lua	Re-add lua bindings codes.	2014-03-10 14:04:58 +08:00
luaoc.lua	Re-add lua bindings codes.	2014-03-10 14:04:58 +08:00