Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/lua/cocos2dx_support
History
Phenix Yu e623cd6357 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 
Conflicts:
	cocos2dx/include/CCTexture2D.h
	cocos2dx/include/ccMacros.h
	cocos2dx/textures/CCTexture2D.cpp
	lua/cocos2dx_support/LuaCocos2d.cpp
 		2012-04-15 15:46:01 +08:00
..
CCLuaEngine.cpp issue #1056:gles20 runs ok on android 2012-03-20 16:10:12 +08:00
CCLuaEngine.h Improve Lua engine 2012-03-07 20:27:26 +08:00
Cocos2dxLuaLoader.cpp move SelectorProtocol to CCObject 2012-02-03 15:05:29 +08:00
Cocos2dxLuaLoader.h move SelectorProtocol to CCObject 2012-02-03 15:05:29 +08:00
LuaCocos2d.cpp.REMOVED.git-id Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 2012-04-15 15:46:01 +08:00
LuaCocos2d.h move SelectorProtocol to CCObject 2012-02-03 15:05:29 +08:00
tolua_fix.c Improve Lua engine 2012-03-07 20:27:26 +08:00
tolua_fix.h Improve Lua engine 2012-03-07 20:27:26 +08:00