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
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
..
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 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAssetsManager 2013-11-01 17:17:21 +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
json.lua issue #3409:Add XMLHttpRequest lua binding and corresponding test sample 2013-10-29 11:40:41 +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