YuLei
|
748d64ecc0
|
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20
|
2012-08-31 09:47:03 +08:00 |
minggo
|
af79357549
|
Merge pull request #1258 from John-cdy/gles20
issue #1404:Update android script files,and make more notes
|
2012-08-29 07:49:22 -07:00 |
James Chen
|
0eac64c259
|
Merge pull request #1260 from dumganhar/gles20
Commented some codes.
|
2012-08-29 06:56:11 -07:00 |
James Chen
|
d6e1d6b4fa
|
Commented some codes.
|
2012-08-29 21:50:09 +08:00 |
James Chen
|
9b9770ea80
|
Merge pull request #1259 from dumganhar/gles20
Updated templates for android,blackberry,win32 and ios.
[1] LAYER_CREATE_FUNC ~> CREATE_FUNC
[2] Updated hello.lua in Template folder.
|
2012-08-29 06:09:53 -07:00 |
James Chen
|
6a99431338
|
Updated hello.lua in Template folder.
|
2012-08-29 21:04:21 +08:00 |
James Chen
|
95419d2dea
|
Updated templates for android,blackberry,win32 and ios.
LAYER_CREATE_FUNC ~> CREATE_FUNC
|
2012-08-29 21:03:47 +08:00 |
YuLei
|
f14eccb6e5
|
[Mac] add miss CCLuaLog
|
2012-08-29 18:40:42 +08:00 |
Caidongyang
|
56e784701c
|
issue #1404:Update android script files,and make more notes
|
2012-08-29 18:23:46 +08:00 |
James Chen
|
1cb0a37034
|
Merge pull request #1257 from mustime/testlua
issue #1425: fix a problem that missing "MainMenu"
|
2012-08-29 03:19:43 -07:00 |
mustime
|
289eb65dde
|
issue #1425: fix a problem that missing "MainMenu"
|
2012-08-29 18:16:59 +08:00 |
James Chen
|
5ba6a4c0b7
|
Merge pull request #1256 from dumganhar/gles20
Updated cocos2d_generated.cpp.
|
2012-08-29 03:08:16 -07:00 |
James Chen
|
bff1615dbb
|
Merge pull request #1255 from mustime/testlua
issue #1425: add ParticleTest to TestLua.
|
2012-08-29 03:06:42 -07:00 |
James Chen
|
0fe9d12eaa
|
Updated cocos2d_generated.cpp.
|
2012-08-29 18:03:34 +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
|
cc4573c3e4
|
issue #1425: add ParticleTest to TestLua
|
2012-08-29 17:17:36 +08:00 |
mustime
|
7172e71e1a
|
issue #1425: recreate LuaCocos2d.cpp for tolua++ binding
|
2012-08-29 17:14:16 +08:00 |
mustime
|
df25d56cc3
|
issue #1425: update pkg for tolua++ binding
|
2012-08-29 17:10:06 +08:00 |
James Chen
|
3647537db2
|
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
|
2012-08-29 17:03:37 +08:00 |
YuLei
|
8a680c4c06
|
[Lua] add CCFileUtils:setResourceDirectory()
|
2012-08-28 18:14:00 +08:00 |
YuLei
|
2ce08cdcda
|
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20
|
2012-08-28 18:04:53 +08:00 |
minggo
|
f0068209f3
|
Merge pull request #1252 from mustime/testlua
issue #1425: add EffectTest to TestLua
|
2012-08-28 01:05:50 -07:00 |
YuLei
|
d7881b7c3a
|
[Lua] update luabinding
|
2012-08-28 15:54:19 +08:00 |
mustime
|
22cf904038
|
issue #1425: add EffectTest to TestLua
|
2012-08-28 15:44:09 +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 |
minggo
|
1e11ac5d27
|
Merge pull request #1251 from minggo/gles20
issue #1425: add icons for testlua
|
2012-08-27 23:35:09 -07:00 |
minggo
|
ff34cb7b39
|
issue #1425: add icons for testlua
|
2012-08-28 14:34:22 +08: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
|
f63a719981
|
issue #1425: fix the problem that missing Resources path
|
2012-08-28 14:14:09 +08:00 |
minggo
|
061e0a3893
|
Merge pull request #1249 from minggo/gles20
update AUTHORS and CHANGELOG
|
2012-08-27 23:04:04 -07:00 |
minggo
|
d5565eeceb
|
update AUTHORS and CHANGELOG
|
2012-08-28 14:03:00 +08: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
|
8ec843785c
|
issue #1425: change the title from "HelloLua" to "TestLua"
|
2012-08-28 11:56:23 +08:00 |
mustime
|
9b384dace2
|
issue #1425: update for pkg files' change
|
2012-08-28 11:53:07 +08:00 |
mustime
|
91b9949e4b
|
issue #1425: update pkg file
|
2012-08-28 11:52:22 +08:00 |
mustime
|
fbf90e2c2c
|
issue #1425: fix a error when using ccp in lua
|
2012-08-28 11:51:45 +08:00 |
mustime
|
4237ec42be
|
issue #1425: add ios project for TestLua
|
2012-08-28 11:49:22 +08:00 |
mustime
|
9afede2474
|
issue #1425: update lua files
|
2012-08-28 11:48:34 +08:00 |
mustime
|
567f4b15aa
|
issue #1425: fix a problem when searching lua files on ios project
|
2012-08-28 11:47:06 +08:00 |
minggo
|
d1f92b8da4
|
Merge pull request #1239 from mustime/testlua
Testlua
|
2012-08-27 02:45:29 -07:00 |
James Chen
|
ef906cd2ba
|
Merge pull request #1247 from dumganhar/gles20
Updated Makefiles for linux port.
|
2012-08-27 01:45:26 -07:00 |
James Chen
|
dd26a2fcd8
|
Updated Makefiles for linux port.
|
2012-08-27 16:43:02 +08:00 |
minggo
|
5905ea15c6
|
Merge pull request #1246 from minggo/iss1442_CREATE_FUNC
fixed #1442: use CREATE_FUNC instead of SCENE_CREATE_FUNC and NODE_CREATE_FUNC
|
2012-08-27 01:12:14 -07:00 |