CocosRobot
|
c205bd0806
|
[AUTO]: updating luabinding automatically
|
2014-07-10 14:10:03 +00:00 |
minggo
|
e876065d3e
|
Merge pull request #7229 from samuele3hu/v3_VideoPlayer
Add VideoPlayer Lua bindings and update bindings-generator submodule
|
2014-07-10 22:04:46 +08:00 |
CocosRobot
|
af460a1530
|
[AUTO]: updating luabinding automatically
|
2014-07-10 02:03:40 +00:00 |
samuele3hu
|
243fa49c09
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_VideoPlayer
|
2014-07-09 18:08:09 +08:00 |
CocosRobot
|
ae12030745
|
[AUTO]: updating luabinding automatically
|
2014-07-09 05:42:06 +00:00 |
minggo
|
0f7968de89
|
Merge pull request #7339 from super626/v3
fix android, add 3d files to cocos2d.h and remove unused resources
|
2014-07-08 22:09:50 +08:00 |
CocosRobot
|
5838370b31
|
[AUTO]: updating luabinding automatically
|
2014-07-08 10:05:47 +00:00 |
yangxiao
|
ae97d6ebc6
|
Bone conflict
|
2014-07-08 15:48:55 +08:00 |
samuele3hu
|
521f805219
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_VideoPlayer
Conflicts:
tests/lua-tests/src/mainMenu.lua
tools/bindings-generator
tools/tolua/cocos2dx_physics.ini
|
2014-07-08 14:57:19 +08:00 |
samuele3hu
|
7095298735
|
Add manual lua binding for Node::enumerateChildren
|
2014-07-08 14:22:05 +08:00 |
samuele3hu
|
a1615123a3
|
Fix some type conversion error
|
2014-07-08 12:01:35 +08:00 |
CocosRobot
|
4c1da7d89a
|
[AUTO]: updating luabinding automatically
|
2014-07-06 13:05:59 +00:00 |
minggo
|
a942aae84f
|
Merge pull request #7316 from cocoscodeide/v3
lua runtime template 1.2
|
2014-07-04 18:33:36 +08:00 |
samuele3hu
|
4725388646
|
Remove useless codes
|
2014-07-04 16:43:33 +08:00 |
samuele3hu
|
3b23b0c1ff
|
Remove useless codes
|
2014-07-04 16:30:22 +08:00 |
samuele3hu
|
85dd2e55bf
|
Add Lua bindings for utils and CaptureScreen test case
|
2014-07-04 16:24:00 +08:00 |
chuanweizhang2013
|
b88b5e4c3d
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime
|
2014-07-03 11:13:59 +08:00 |
boyu0
|
35ff23fa6d
|
support for Xcode6 iphone 5s simulator
|
2014-07-02 15:16:06 +08:00 |
CocosRobot
|
2821a23640
|
[AUTO]: updating luabinding automatically
|
2014-07-02 02:15:26 +00:00 |
samuele3hu
|
1bc0397644
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_VideoPlayer
|
2014-07-01 09:47:41 +08:00 |
chuanweizhang2013
|
4481149a30
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime
|
2014-06-30 17:53:46 +08:00 |
CocosRobot
|
774c851dcb
|
[AUTO]: updating luabinding automatically
|
2014-06-30 09:45:03 +00:00 |
CocosRobot
|
bb9df773a9
|
[AUTO]: updating luabinding automatically
|
2014-06-29 09:28:33 +00:00 |
CocosRobot
|
afe11ca435
|
[AUTO]: updating luabinding automatically
|
2014-06-29 08:45:14 +00:00 |
chuanweizhang2013
|
a8f4dcb59f
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime
|
2014-06-28 18:10:17 +08:00 |
samuele3hu
|
67423e0dd2
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_bu_fix
|
2014-06-27 18:00:34 +08:00 |
samuele3hu
|
318e39a6d2
|
Fix the bug that lua-tests can’t be loaded in iOS64bit device and Linux
|
2014-06-27 17:58:59 +08:00 |
CocosRobot
|
9393777c22
|
[AUTO]: updating luabinding automatically
|
2014-06-27 08:31:17 +00:00 |
samuele3hu
|
6ec93b3575
|
Remove some auto lua binding files by mistake
|
2014-06-27 14:58:18 +08:00 |
samuele3hu
|
b1d07f2711
|
Add VideoPlayer Test for Lua
|
2014-06-27 13:56:39 +08:00 |
samuele3hu
|
b3da322920
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_VideoPlayer
Conflicts:
build/cocos2d_tests.xcodeproj/project.pbxproj
|
2014-06-26 16:21:09 +08:00 |
samuele3hu
|
32c355dca4
|
Add VideoPlayer Lua bindings and update bindings-generator submodule
|
2014-06-26 16:19:22 +08:00 |
CocosRobot
|
57513d4c2e
|
[AUTO]: updating luabinding automatically
|
2014-06-26 03:10:44 +00:00 |
samuele3hu
|
c892939968
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_SceneReader
|
2014-06-26 09:52:41 +08:00 |
samuele3hu
|
3bd195d4ef
|
Add Lua binding for ActionTimeline related and related test cases
|
2014-06-26 09:51:32 +08:00 |
CocosRobot
|
755b907e69
|
[AUTO]: updating luabinding automatically
|
2014-06-25 09:36:50 +00:00 |
CocosRobot
|
68649695b2
|
[AUTO]: updating luabinding automatically
|
2014-06-25 09:17:16 +00:00 |
samuele3hu
|
5f63514d6b
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_ui_focus
|
2014-06-25 15:15:05 +08:00 |
samuele3hu
|
3a0e750926
|
Add deprecated support for lua binding of `getSize` and `setSize` of Widget
|
2014-06-25 15:13:08 +08:00 |
samuele3hu
|
5c765f6883
|
Add coco studio ui focus test cases for Lua
|
2014-06-25 15:08:59 +08:00 |
CocosRobot
|
515f967f96
|
[AUTO]: updating luabinding automatically
|
2014-06-25 06:17:41 +00:00 |
chuanweizhang2013
|
ac539131e2
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime
|
2014-06-25 11:39:17 +08:00 |
CocosRobot
|
2cd212b1b0
|
[AUTO]: updating luabinding automatically
|
2014-06-24 10:48:02 +00:00 |
CocosRobot
|
879862b993
|
[AUTO]: updating luabinding automatically
|
2014-06-24 02:35:55 +00:00 |
samuele3hu
|
50f82ce1d0
|
Fix compile error for lua bindings in the different platforms
|
2014-06-24 10:12:32 +08:00 |
samuele3hu
|
a339afb2c0
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_lua_fix
|
2014-06-23 17:53:41 +08:00 |
samuele3hu
|
b23e1384f6
|
Update the implementation of Lua bindings for `lua_cocos2dx_ListView_addScrollViewEventListener`
|
2014-06-23 17:42:04 +08:00 |
chuanweizhang2013
|
7f75b58acf
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime
Conflicts:
templates/lua-template-runtime/cocos-project-template.json
|
2014-06-23 17:30:33 +08:00 |
samuele3hu
|
9126608138
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_bug_fix
|
2014-06-23 17:30:24 +08:00 |
samuele3hu
|
dce4c8a0a8
|
Add Lua bindings for `addScrollViewEventListener` of `ui.ListView` and related test cases
|
2014-06-23 17:29:56 +08:00 |