YuLei Liao
|
aa0251bcef
|
* remove stackDump()
|
2011-12-08 00:30:58 +08:00 |
YuLei Liao
|
1184559ce1
|
* add tolua_stack_dump()
|
2011-12-08 00:30:46 +08:00 |
YuLei Liao
|
6be1e0a8d6
|
* change CCLuaEngine::executeFunctionByRefID() to public
|
2011-12-08 00:29:22 +08:00 |
YuLei Liao
|
df8231362c
|
* add callback support for lua-llthreads
|
2011-12-05 22:10:29 +08:00 |
YuLei Liao
|
a99b2f0675
|
* add Lua llthreads
|
2011-12-05 19:09:24 +08:00 |
YuLei Liao
|
010a386338
|
* add CCApplication, CCFileUtils to Lua support
|
2011-12-05 13:57:43 +08:00 |
YuLei Liao
|
e22dff0469
|
* add Lua CJSON module
|
2011-12-05 13:56:51 +08:00 |
YuLei Liao
|
fb4582b9fd
|
* add TOLUA_RELEASE macro
|
2011-12-05 11:38:38 +08:00 |
YuLei Liao
|
442e06e62e
|
* add CCNode:getPositionLua(), return CCPoint
|
2011-12-04 11:35:55 +08:00 |
YuLei Liao
|
ffe54c4ce5
|
* add more Lua property for CCNode, CCSprite
|
2011-12-04 10:57:20 +08:00 |
YuLei Liao
|
f0e5cd9896
|
* add Lua property support for CCNode
|
2011-12-04 10:28:20 +08:00 |
YuLei Liao
|
cf12806558
|
merge luafix-0.9.2
|
2011-12-01 22:02:16 +08:00 |
YuLei Liao
|
fe7f810096
|
* make CCEase* working for CCNode:runAction()
|
2011-12-01 16:55:21 +08:00 |
YuLei Liao
|
2d9e8f065b
|
* add CCNode:getPositionX(), CCNode:getPositionY(), CCNode:setPositionX(), CCNode:setPositionY()
|
2011-12-01 14:58:39 +08:00 |
YuLei Liao
|
45fe3b3090
|
* merge luafix-0.9.2
|
2011-11-30 21:42:18 +08:00 |
YuLei Liao
|
216ad9b9cb
|
* merge upstream/master to master
|
2011-11-30 21:38:20 +08:00 |
YuLei Liao
|
31285fea17
|
* add Touch & MultiTouches lua support
|
2011-11-30 21:27:50 +08:00 |
Tsz Ming WONG
|
a7fddfc641
|
Fix for the rename of getHornorParentTransform/setHornorParentTransform: ab7db20809
|
2011-11-30 18:19:34 +08:00 |
YuLei Liao
|
4bf68e79fd
|
* merge upstream/master to master
|
2011-11-29 19:56:20 +08:00 |
YuLei Liao
|
ebd381af26
|
* merge luafix-0.9.2 to master
|
2011-11-29 19:20:49 +08:00 |
YuLei Liao
|
07a468cec9
|
* merge LuaSimpleAudioEngine to LuaCocos2d
|
2011-11-29 17:39:47 +08:00 |
YuLei Liao
|
9aa72c23b2
|
* remove LuaEngineImpl.cpp
|
2011-11-29 17:13:44 +08:00 |
YuLei Liao
|
83aaa504d2
|
* change error message
|
2011-11-29 17:11:47 +08:00 |
YuLei Liao
|
3e47f7a546
|
* add CCLuaEngine::executeFunctionWith...Data()
|
2011-11-29 17:11:20 +08:00 |
YuLei Liao
|
149e33ef69
|
* fix tolua_ref_function() and tolua_remove_function_by_refid()
|
2011-11-29 15:51:18 +08:00 |
YuLei Liao
|
ab184c7ead
|
* CCLuaEngine::executeFunctionByRefID() support additional parameters
|
2011-11-29 15:44:54 +08:00 |
YuLei Liao
|
e9fa8116e9
|
* rename tolua_fix.cpp to tolua_fix.c
|
2011-11-29 15:40:15 +08:00 |
YuLei Liao
|
4ba170d82f
|
* rename LuaEngine.cpp/.h to CCLuaEngine.cpp/.h
|
2011-11-29 12:35:34 +08:00 |
YuLei Liao
|
153774b46d
|
* merge CCTransitionPageTurn.pkg, CCTransitionRadial.pkg to CCTransition.pkg
|
2011-11-28 11:27:24 +08:00 |
minggo
|
6aedc258b4
|
fixed #838: tests and HelloLua support x86
|
2011-11-23 15:51:30 +08:00 |
YuLei Liao
|
0ec47ddf38
|
* rename luax_initpreload() to luax_exts()
|
2011-11-23 13:55:07 +08:00 |
YuLei Liao
|
4ff2bf96d1
|
* ccConfig: add LUA_ENGINE macro, turn on Lua support when LUA_ENGINE defined
|
2011-11-23 13:41:48 +08:00 |
YuLei Liao
|
fc9cabc447
|
* add lua_socket module
|
2011-11-23 13:37:32 +08:00 |
YuLei Liao
|
44b5e55876
|
* add lua_socket module
|
2011-11-23 12:24:14 +08:00 |
YuLei Liao
|
151b373239
|
* ccConfig: add LUA_ENGINE macro, turn on Lua support when LUA_ENGINE defined
|
2011-11-23 00:58:31 +08:00 |
YuLei Liao
|
7a6253d9aa
|
* merge cocos2d-1.0.1-x-0.9.2-luafix to master
|
2011-11-21 16:38:00 +08:00 |
YuLei Liao
|
396568a22e
|
* merge upstream master -> master
|
2011-11-21 12:12:13 +08:00 |
YuLei Liao
|
5b696828dc
|
* update tolua++ .pkg files
|
2011-11-21 00:30:55 +08:00 |
YuLei Liao
|
f928bc949f
|
* tolua_pushusertype() push nil when ptr is NULL
|
2011-11-20 21:12:35 +08:00 |
YuLei Liao
|
01bf6b57f4
|
* import lua/exts (luasocket)
|
2011-11-18 21:31:01 +08:00 |
YuLei Liao
|
8afe909819
|
* merge LuaEngineImpl to LuaEngine
|
2011-11-18 20:36:39 +08:00 |
YuLei Liao
|
ba3fa3fec0
|
* format tolua++ source files
|
2011-11-18 20:34:13 +08:00 |
YuLei Liao
|
cfed3afa4c
|
* format lua source files
|
2011-11-18 20:33:52 +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 |
YuLei Liao
|
0873f049cb
|
* update LuaCocos2d.cpp/.h
|
2011-11-09 23:24:57 +08:00 |
YuLei Liao
|
fc7d8b5c3b
|
* update LuaCocos2d.cpp
|
2011-10-01 23:15:54 +08:00 |
minggo
|
4166d87869
|
Merge pull request #529 from ciaranj/lua_gc_additions
Adding some lua_gc calls post script load-ins
|
2011-09-27 23:36:32 -07:00 |
ciaranj
|
1aae893ad2
|
Adding some lua_gc calls post script load-ins
|
2011-09-27 23:23:43 +01:00 |