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
boyu0 ef54ed3c15 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into HEAD 
Conflicts:
	cocos/2d/CCLabel.cpp
	cocos/2d/CCLabel.h
	cocos/2d/CCLabelBMFont.cpp
	cocos/2d/CCLabelBMFont.h
	cocos/2d/CCLayer.cpp
	cocos/2d/CCLayer.h
	cocos/2d/CCNode.cpp
	extensions/GUI/CCControlExtension/CCControl.cpp
	extensions/GUI/CCControlExtension/CCControlButton.cpp
	extensions/GUI/CCControlExtension/CCScale9Sprite.cpp
	tools/tojs/cocos2dx.ini
 		2013-12-19 17:05:59 +08:00
..
AudioEngine.lua issue #2905:adjust folder structure 2013-10-12 11:22:05 +08:00
CCBReaderLoad.lua issue #3309:Modify some deprecated cpp files and lua files 2013-12-04 15:15:55 +08:00
Cocos2d.lua Issue #2790:Add more conversion functions to support templates containers 2013-12-10 11:21:30 +08:00
Cocos2dConstants.lua issue #3402:Add the new label lua binding and the releated test cases 2013-12-18 11:39:43 +08:00
Deprecated.lua issue #3309:Modify some deprecated cpp files and lua files 2013-12-04 15:15:55 +08:00
DeprecatedClass.lua issue #3162: deprecated RGBAProtocol, NodeRGBA and LayerRGBA 2013-12-13 10:10:49 +08:00
DeprecatedEnum.lua issue #3309:Modify some deprecated cpp files and lua files 2013-12-04 15:15:55 +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
StudioConstants.lua issue #3309:Add some deprecated functions and classes to support master cocostudio lua bindings 2013-12-03 15:40:59 +08:00
json.lua removes exe bit from text files 2013-11-08 11:30:50 -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