minggo
|
3bf11dba7e
|
issue #892: modify pkg for lua
|
2011-12-07 15:24:03 +08:00 |
|
Phenix Yu
|
255293119d
|
add tolua_usertype(tolua_S,"void*") to fix CCCallFuncND
|
2011-11-15 17:01:07 +08:00 |
|
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 |
|
Phenix Yu
|
441f8e6da9
|
Merge branch 'master' of https://github.com/jbyu/cocos2d-x
Conflicts:
cocos2dx/CCScheduler.cpp
lua/cocos2dx_support/LuaEngine.cpp
lua/cocos2dx_support/LuaEngine.h
|
2011-11-15 14:00:52 +08:00 |
|
ciaranj
|
209214008e
|
Adding in Particle Systems to Lua Bindings (inc. the example systems.)
|
2011-09-20 07:58:04 +01:00 |
|
minggo
|
914706735f
|
update LuaCocos2d.cpp and pkg files
|
2011-07-18 17:04:15 +08:00 |
|
minggo
|
9c49e27bf1
|
add extensions & tools directory
|
2011-06-14 14:31:25 +08:00 |