mustime
|
f5506d58e1
|
issue #1425: update pkg files and recreate binding
|
2012-08-31 18:29:44 +08:00 |
minggo
|
860d3eff4b
|
issue #1454: make js binding work together with lua binding and native codes
|
2012-08-31 17:55:45 +08:00 |
YuLei
|
748d64ecc0
|
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20
|
2012-08-31 09:47:03 +08:00 |
James Chen
|
e2629ef175
|
Fixed some compile errors on win32.
|
2012-08-30 23:10:09 +08:00 |
mustime
|
5ed3ec14e9
|
issue #1425: update pkg and recreate LuaCococs2d.cpp
|
2012-08-30 15:33:54 +08:00 |
YuLei
|
64c8ed3398
|
[Lua] update CCNode:isVisible() and CCNode:setVisible()
|
2012-08-29 17:51:42 +08:00 |
YuLei
|
66b221dc79
|
[Lua] update luabinding
|
2012-08-29 17:32:47 +08:00 |
mustime
|
c15c96ac28
|
Merge https://github.com/cocos2d/cocos2d-x into testlua
|
2012-08-29 17:29:33 +08:00 |
mustime
|
7172e71e1a
|
issue #1425: recreate LuaCocos2d.cpp for tolua++ binding
|
2012-08-29 17:14:16 +08:00 |
YuLei
|
8a680c4c06
|
[Lua] add CCFileUtils:setResourceDirectory()
|
2012-08-28 18:14:00 +08:00 |
YuLei
|
d7881b7c3a
|
[Lua] update luabinding
|
2012-08-28 15:54:19 +08:00 |
YuLei
|
f6a17f69f7
|
update tolua++ pkg files
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20
|
2012-08-28 14:53:52 +08:00 |
minggo
|
f7993b9954
|
Merge pull request #1250 from mustime/testlua
issue #1425: remove endToLua interface in CCDirector.h, use renaming feature in tolua++ instead.
|
2012-08-27 23:35:55 -07:00 |
mustime
|
69679ff545
|
issue #1425: remove endToLua interface in CCDirector.h, use renaming
feature in tolua++ instead.
|
2012-08-28 14:28:33 +08:00 |
YuLei
|
b411c00f38
|
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20
|
2012-08-28 14:23:31 +08:00 |
minggo
|
76410f4b5b
|
Merge pull request #1248 from mustime/testlua
Testlua
|
2012-08-27 23:18:22 -07:00 |
mustime
|
60a64d0eca
|
issue #1425: remove the scheduleScriptHandler interface from CCNode
|
2012-08-28 12:49:43 +08:00 |
YuLei
|
02e77faf51
|
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20
|
2012-08-28 12:22:57 +08:00 |
YuLei
|
2c518e43b2
|
[Lua] fix CCLayer:registerScriptTouchHandler()
[Lua] make CCNotificationCenter script support
|
2012-08-28 12:08:15 +08:00 |
mustime
|
9b384dace2
|
issue #1425: update for pkg files' change
|
2012-08-28 11:53:07 +08:00 |
minggo
|
d1f92b8da4
|
Merge pull request #1239 from mustime/testlua
Testlua
|
2012-08-27 02:45:29 -07:00 |
mustime
|
be116f5352
|
issue #1425: update TestLua project
|
2012-08-27 11:43:47 +08:00 |
mustime
|
1b70d8193f
|
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into testlua
Conflicts:
samples/TestLua/proj.win32/TestLua.win32.vcxproj
|
2012-08-27 10:00:00 +08:00 |
YuLei
|
a38b8d4a00
|
[Lua] CCNode:onEnter() and CCNode:onExit() pass {name = "enter"/"exit"} to Lua function
[Lua] fix CCMenuItem:registerScriptTapHandler() and CCMenuItem:unregisterScriptTapHandler()
[Lua] update luabinding
|
2012-08-25 17:08:33 +08:00 |
YuLei
|
8b54355aa1
|
[Lua] update luabinding
[Lua] add LuaValue, LuaDict, LuaArray
|
2012-08-25 15:05:59 +08:00 |
Donald Alan Morrison
|
5075a83271
|
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
Conflicts:
cocos2dx/kazmath/src/ray2.c
|
2012-08-25 00:00:27 -07:00 |
YuLei
|
bf3ce7cf76
|
[Lua] update Lua to 5.1.5
|
2012-08-25 14:32:06 +08:00 |
Donald Alan Morrison
|
9ef8b3b699
|
Fixed Warning C4114: same type qualifier used more than once. (Definition
signature does not match Implementation signature.)
|
2012-08-24 08:52:29 -07:00 |
James Chen
|
85304b9441
|
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into dale_lua
|
2012-08-24 10:27:20 +08:00 |
mustime
|
4c7ad0d0d1
|
issue #1425: testlua project
|
2012-08-24 10:23:23 +08:00 |
mustime
|
96e621bae8
|
issue #1425: recreate LuaCocos2d.cpp for .pkg files' changes
|
2012-08-23 16:13:08 +08:00 |
mustime
|
be3a02c7f3
|
issue #1425: fixed the problem when using ccBezierConfig to create
CCBezierAction
|
2012-08-23 13:54:23 +08:00 |
James Chen
|
dbd02b2726
|
Merge branch 'gles20' of https://github.com/dducharme/cocos2d-x into dale_lua
|
2012-08-22 18:28:11 +08:00 |
mustime
|
354f7a51b2
|
issue #1425: recreate luacocos2d.cpp to meet pkg files
|
2012-08-22 12:02:56 +08:00 |
mustime
|
d01842a37b
|
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into testlua
Conflicts:
scripting/lua/cocos2dx_support/LuaCocos2d.cpp
|
2012-08-22 09:39:21 +08:00 |
Dale Ducharme
|
d76d9a6451
|
Adding lua scripting to BlackBerry port.
|
2012-08-21 13:32:28 -04:00 |
mustime
|
57659d1584
|
issue #1425: modifing pkg files for Lua
|
2012-08-21 18:42:35 +08:00 |
minggo
|
07ddd43695
|
issue #1437:make CCApplication::sharedApplication() return pointer
|
2012-08-21 15:28:43 +08:00 |
minggo
|
cfdc50fb60
|
issue #1437:make CCEGLView::sharedOpenGLView() return pointer
|
2012-08-21 14:58:31 +08:00 |
mustime
|
d5b99cc79e
|
issue #1425: corresponding changes for .pkg files
|
2012-08-11 16:05:38 +08:00 |
Walzer
|
685b70e6fb
|
fixed #1402, résolve conflicting "create" functions
1. Following https://docs.google.com/document/d/1eqvYjVah0R9nkjzJ_ga1-_cyjHnizVQ5dyESYNpYM0s/edit?pli=1
2. use CCSequence/CCSpawn::initWithTwoActions, createWithTwoActions instead of initOneTwo, create(one, two).
3. haven't re-generate lua-binding to resolve the conflicts yet.
|
2012-07-23 22:49:11 +08:00 |
minggo
|
59db9f0c6f
|
issue #1399:lua building works ok after adjusting directory structure
|
2012-07-23 17:14:18 +08:00 |
James Chen
|
2ab5e4ab9c
|
issue #1399: Added vs2010 support.
|
2012-07-23 11:57:34 +08:00 |
James Chen
|
77f1fba566
|
issue #1399: Adjust folder structure, made it built successfully on win32.
|
2012-07-20 14:05:52 +08:00 |