Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
axmol/lua
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
..
CocosDenshion_support Added CocsDenshion lua support and tested with HelloLua on iOS 2011-08-16 23:56:41 +08:00
cocos2dx_support Merge remote-tracking branch 'remotes/upstream/master' 2011-11-15 14:43:55 +08:00
lua [android] issue #528, rename the folders in cocos2d-x/lua, for xcode4 template generator. 2011-06-23 12:01:02 +08:00
proj.android/jni [android] HelloLua use shared link with other libraries 2011-06-25 11:57:34 +08:00
proj.win32 [win32] fixed #620: change the output of lua to a lib 2011-07-20 15:21:51 +08:00
tolua support lua 2011-05-31 14:04:14 +08:00