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/script
History
samuelhu 7c45ddafe2 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAssetsManager 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
 		2013-10-31 17:22:14 +08:00
..
AudioEngine.lua issue #2905:adjust folder structure 2013-10-12 11:22:05 +08:00
CCBReaderLoad.lua issue #2905:adjust folder structure 2013-10-12 11:22:05 +08:00
Cocos2d.lua issue #2905:adjust folder structure 2013-10-12 11:22:05 +08:00
Cocos2dConstants.lua issue #3037:Add assetsmananger lua binding and a releated test sample 2013-10-22 16:14:49 +08:00
Deprecated.lua issue #2905:adjust folder structure 2013-10-12 11:22:05 +08:00
DeprecatedClass.lua issue #2905:adjust folder structure 2013-10-12 11:22:05 +08:00
DeprecatedEnum.lua issue #2905:adjust folder structure 2013-10-12 11:22:05 +08:00
DeprecatedOpenglEnum.lua issue #2905:adjust folder structure 2013-10-12 11:22:05 +08:00
DrawPrimitives.lua issue #2905:adjust folder structure 2013-10-12 11:22:05 +08:00
Opengl.lua issue #2905:adjust folder structure 2013-10-12 11:22:05 +08:00
OpenglConstants.lua issue #2905:adjust folder structure 2013-10-12 11:22:05 +08:00
luaj.lua issue #2905:adjust folder structure 2013-10-12 11:22:05 +08:00
luaoc.lua issue #3069:Add LuaObjectCBridge and related test sample 2013-10-31 15:20:53 +08:00