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 786feb6a8d Merge remote-tracking branch 'remotes/upstream/master' 
Conflicts:
	HelloLua/Classes/AppDelegate.cpp
	HelloLua/Resource/hello.lua
	HelloLua/ios/HelloLua.xcodeproj/project.pbxproj
	HelloLua/win32/HelloLua.win32.vcproj
	HelloLua/win32/HelloLua.win32.vcxproj.filters
	cocos2dx/include/ccMacros.h
	cocos2dx/platform/ios/AccelerometerDelegateWrapper.mm
	lua/cocos2dx_support/LuaCocos2d.cpp
	lua/cocos2dx_support/LuaEngineImpl.cpp
	template/xcode3/cocos2d-x_lua_app/___PROJECTNAME___.xcodeproj/project.pbxproj
	template/xcode4/cocos2dx_lua.xctemplate/Resources/hello.lua
	template/xcode4/cocos2dx_lua.xctemplate/TemplateInfo.plist
	tests/test.win32/test.win32.vcxproj.filters
 		2011-11-15 14:43:55 +08:00
..
Cocos2dxLuaLoader.cpp issue #707: require works ok on android 2011-09-05 17:13:52 +08:00
Cocos2dxLuaLoader.h issue #707: add lua loader on android 2011-09-05 16:14:51 +08:00
LuaCocos2d.cpp.REMOVED.git-id Merge remote-tracking branch 'remotes/upstream/master' 2011-11-15 14:43:55 +08:00
LuaCocos2d.h use release version of tolua 2011-07-21 14:01:55 +08:00
LuaEngine.cpp fixed lua memory leak 2011-08-18 12:26:33 +08:00
LuaEngine.h Merge branch 'master' of https://github.com/jbyu/cocos2d-x 2011-11-15 14:00:52 +08:00
LuaEngineImpl.cpp Merge branch 'master' of https://github.com/jbyu/cocos2d-x 2011-11-15 14:00:52 +08:00
LuaEngineImpl.h issue #707: add lua loader on android 2011-09-05 16:11:48 +08:00