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
|
ab184c7ead
|
* CCLuaEngine::executeFunctionByRefID() support additional parameters
|
2011-11-29 15:44:54 +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
|
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
|
8afe909819
|
* merge LuaEngineImpl to LuaEngine
|
2011-11-18 20:36:39 +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 |
ciaranj
|
d1f031d2de
|
Add support for particleWithFile for both Quad & Point Particle Systems
|
2011-09-27 23:15:54 +01:00 |
ciaranj
|
209214008e
|
Adding in Particle Systems to Lua Bindings (inc. the example systems.)
|
2011-09-20 07:58:04 +01:00 |
ciaranj
|
11f03e9c8c
|
Adding a build file that correctly generates LuaCocos2d.cpp
|
2011-09-18 18:29:17 +01:00 |
minggo
|
d6cc12ffe4
|
issue #707: require works ok on android
|
2011-09-05 17:13:52 +08:00 |
Walzer
|
b326b85808
|
HelloLua compile succeed in xcode4
|
2011-08-12 22:42:58 +08:00 |
minggo
|
914706735f
|
update LuaCocos2d.cpp and pkg files
|
2011-07-18 17:04:15 +08:00 |
RongHong
|
9328991cbd
|
to update lua support
|
2011-07-12 15:18:14 +08:00 |
RongHong
|
c8f5f703a5
|
to commit LuaCocos2d.cpp
|
2011-07-11 15:33:27 +08:00 |
minggo
|
6482f5662b
|
fixed #557: upgrade label_nodes to 1.0.1-rc3
|
2011-07-04 10:59:35 +08:00 |
natural-law
|
4d5dab4a40
|
fixed #558, Upgrade folder layers_scenes_transitions_nodes to rc3.
|
2011-07-01 11:26:26 +08:00 |
Walzer
|
e606027b59
|
fixed #528, Lua can get the CCTouch array in callback function; Add CCNode parent for CCLayer in LuaCocos2d.cpp, HelloLua can move the farm layer now.
|
2011-06-24 21:03:33 +08:00 |
minggo
|
2f97a43439
|
issue #528: refactor lua ok on Android
|
2011-06-21 10:18:43 +08:00 |
minggo
|
022e2b9998
|
issue #528: refactor ok on win32
|
2011-06-20 17:31:38 +08:00 |