zhangbin
|
1a37040e8d
|
Update the reference of submodule cocos2d-console.
|
2014-07-17 17:21:31 +08:00 |
minggo
|
5c0ac02f70
|
Merge pull request #7479 from samuele3hu/v3_hot_fix
Update bindings-generator submodule and update the related Lua bindings for experimental and test cases
|
2014-07-17 15:40:07 +08:00 |
minggo
|
9329c77f2a
|
Merge pull request #7485 from heliclei/save-build-result
[ci skip][jenkins]record size of libcpp_empty_test.so to database
|
2014-07-17 15:12:30 +08:00 |
samuele3hu
|
e975b0d5f9
|
Update experimental lua bindings、related test cases and project setting
|
2014-07-17 14:54:34 +08:00 |
heliclei
|
bed47c90fe
|
[ci skip][jenkins]record size of libcpp_empty_test.so to database
|
2014-07-17 14:52:26 +08:00 |
samuele3hu
|
6516039604
|
Update bindings-generator submodule
|
2014-07-17 12:56:00 +08:00 |
samuele3hu
|
eb8d1d70f7
|
Update the FastTileMapTest and VideoPlayerTest
|
2014-07-17 12:55:28 +08:00 |
samuele3hu
|
6f109f330f
|
Update the related Lua bindings for experimental
|
2014-07-17 12:54:50 +08:00 |
samuele3hu
|
2baf860669
|
Update bindings-generator submodule
|
2014-07-17 09:56:35 +08:00 |
minggo
|
bf27428a28
|
Merge pull request #7454 from samuele3hu/v3_hot_fix
Update bindings-generator config files and manual bindings files to fix the compile warning
|
2014-07-15 17:43:24 +08:00 |
zhangbin
|
94ea6c40d6
|
Update the reference of submodule cocos2d-console.
|
2014-07-15 17:39:56 +08:00 |
samuele3hu
|
a6c30bc495
|
Update bindings-generator config files and manual bindings files to fix the compile warning
|
2014-07-15 17:38:56 +08:00 |
zhangbin
|
28dd766159
|
Update the reference of submodule cocos2d-console.
|
2014-07-15 14:36:57 +08:00 |
minggo
|
e3b149deda
|
Merge pull request #7433 from heliclei/check-build-size
check libcpp-empty-test.so size after successful build
|
2014-07-14 16:25:52 +08:00 |
heliclei
|
9812532103
|
[ci skip]add .so to file name
|
2014-07-14 15:51:04 +08:00 |
heliclei
|
06ae2ba2a6
|
check libcpp-empty-test.so size after successful build
|
2014-07-14 15:30:11 +08:00 |
zhangbin
|
30ebba8d51
|
Update the reference of submodule cocos2d-console.
|
2014-07-14 13:51:44 +08:00 |
samuele3hu
|
3c8dc7a596
|
Update the cocos2d.ini config
|
2014-07-11 17:21:55 +08:00 |
samuele3hu
|
175ff37302
|
Remove glView setting form cpp to lua script and remove lua bindings for Bone3D
|
2014-07-11 16:00:02 +08:00 |
samuele3hu
|
dd76ae93f6
|
Update controller lua binding and related test cases
|
2014-07-11 11:52:05 +08:00 |
samuele3hu
|
caae8392d4
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_controller
Conflicts:
build/cocos2d_tests.xcodeproj/project.pbxproj
cocos/scripting/lua-bindings/Android.mk
cocos/scripting/lua-bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj/project.pbxproj
tools/tolua/genbindings.py
|
2014-07-10 22:42:09 +08: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 |
zhangbin
|
68bd1c3c76
|
Update the reference of submodule cocos2d-console.
|
2014-07-10 09:29:57 +08:00 |
samuele3hu
|
2bc1cd0486
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_controller
Conflicts:
cocos/scripting/lua-bindings/script/Cocos2dConstants.lua
|
2014-07-09 22:31:05 +08:00 |
samuele3hu
|
fca4b1dbd8
|
Update bindings-generaotr submoudle
|
2014-07-09 18:31:35 +08:00 |
samuele3hu
|
243fa49c09
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_VideoPlayer
|
2014-07-09 18:08:09 +08:00 |
samuele3hu
|
3546c131dd
|
Add Lua bindings for controller and related test case project
|
2014-07-09 18:05:02 +08:00 |
boyu0
|
8f6e05bbf5
|
Skip class Sprite3DMaterialCache in lua binding.
|
2014-07-09 12:59:01 +08:00 |
samuele3hu
|
bf3e0cb132
|
Update ini configure and bindings-generator submodule
|
2014-07-08 15:17:46 +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 |
zhangbin
|
af5cf0a33f
|
Add configuration in templates to set the bundle identity of Mac & iOS project.
|
2014-07-08 10:22:08 +08:00 |
zhangbin
|
ac4a8b1960
|
Update the reference of submodule cocos2d-console.
|
2014-07-07 10:11:46 +08:00 |
minggo
|
6e711c0e63
|
Merge pull request #7301 from samuele3hu/v3_animation3D
Update ini files for Lua bindings to support ndk-r9d
|
2014-07-03 14:09:28 +08:00 |
minggo
|
0b8f15dc2e
|
Merge pull request #7298 from heliclei/update-ndk-r9d
[ci skip]update travis ci to use ndk-r9d
|
2014-07-03 13:56:29 +08:00 |
samuele3hu
|
7b0126cdb7
|
Update ini files for Lua bindings
|
2014-07-03 12:02:48 +08:00 |
heliclei
|
ec92f81446
|
[ci skip]update travis ci to use ndk-r9d
|
2014-07-03 11:02:04 +08:00 |
samuele3hu
|
68aa0831eb
|
Update the bindings-generaotr submodule
|
2014-07-01 13:49:14 +08:00 |
samuele3hu
|
1bc0397644
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_VideoPlayer
|
2014-07-01 09:47:41 +08:00 |
zhangbin
|
b8e7fd425d
|
Update the reference of submodule cocos2d-console.
|
2014-06-30 17:28:46 +08:00 |
samuele3hu
|
148039fbfb
|
Update bindings-generator submodule
|
2014-06-29 18:53:35 +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 |
samuele3hu
|
c892939968
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_SceneReader
|
2014-06-26 09:52:41 +08:00 |
samuele3hu
|
c767f8a276
|
Update bindings-generator submodule
|
2014-06-26 09:51:56 +08:00 |
samuele3hu
|
3bd195d4ef
|
Add Lua binding for ActionTimeline related and related test cases
|
2014-06-26 09:51:32 +08:00 |
minggo
|
d97f531d1c
|
Merge pull request #7205 from samuele3hu/v3_ui_binary
Update bindings-generator submodule
|
2014-06-25 17:19:15 +08:00 |
samuele3hu
|
ca56aaa0d8
|
Update bindings-generator submodule
|
2014-06-25 16:23:26 +08: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
|
5c765f6883
|
Add coco studio ui focus test cases for Lua
|
2014-06-25 15:08:59 +08:00 |
samuele3hu
|
6319a3d646
|
Update bindings-generator submodule
|
2014-06-24 11:09:36 +08:00 |
samuele3hu
|
03a4e014e6
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_keypad_fix
|
2014-06-24 11:04:38 +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 |
minggo
|
886b66f759
|
Merge pull request #7167 from heliclei/post-build-mail
[ci skip] Send email notification if pull request build fail
|
2014-06-23 17:30:29 +08:00 |
heliclei
|
41c8a5e33b
|
send email notification if build failed
|
2014-06-23 11:01:41 +08:00 |
samuele3hu
|
7de04210c2
|
Update bindings-generator submodule
|
2014-06-23 10:27:06 +08:00 |
heliclei
|
39ee23795e
|
send email notification if pull request build fail
|
2014-06-23 10:26:36 +08:00 |
minggo
|
bfed48f0ff
|
revert binding-generators to correct commit
|
2014-06-19 17:42:50 +08:00 |
minggo
|
6d80de181a
|
revert binding-generators to correct commit
|
2014-06-19 17:39:14 +08:00 |
minggo
|
a549fdccdc
|
Merge pull request #7134 from samuele3hu/v3_keypad_fix
Update bindings-generator
|
2014-06-19 15:28:43 +08:00 |
zhangbin
|
bd6aed8a7b
|
Update the reference of submodule cocos2d-console.
|
2014-06-19 14:47:16 +08:00 |
samuele3hu
|
477816e883
|
update bindings-generator submodule
|
2014-06-19 14:42:09 +08:00 |
samuele3hu
|
46ce1c917d
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_keypad_fix
|
2014-06-19 14:37:00 +08:00 |
samuele3hu
|
3a350e11ae
|
Add Lua binding for Animation3D and Animate3D ,and add related test case
|
2014-06-19 14:05:38 +08:00 |
samuele3hu
|
98fde94647
|
Skip some functions for Lua bindings
|
2014-06-18 13:43:22 +08:00 |
samuele3hu
|
15d070f7fc
|
Update submodule
|
2014-06-18 11:50:24 +08:00 |
samuele3hu
|
00611f7ec1
|
Update cocos2dx_spine.ini
|
2014-06-18 11:47:43 +08:00 |
samuele3hu
|
9b3b6c0e53
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_keypad_fix
|
2014-06-13 14:39:11 +08:00 |
zhangbin
|
60c08dcb47
|
Update the reference of submodule cocos2d-console.
|
2014-06-13 14:15:17 +08:00 |
heliclei
|
87ac4c660d
|
[ci skip] Set github commit status context & description
|
2014-06-12 11:30:37 +08:00 |
samuele3hu
|
108c0d0da9
|
Modify ini files for bindings-generator to fix the compile warning
|
2014-06-12 10:08:58 +08:00 |
zhangbin
|
07aaa6fabe
|
Update the reference of submodule cocos2d-console.
|
2014-06-09 11:27:01 +08:00 |
samuele3hu
|
52323b27fa
|
Update cocos2d-console submodule
|
2014-06-06 12:09:10 +08:00 |
samuele3hu
|
919524cf89
|
Update controller.lua for lua-tests and bindings-generator submoudle
|
2014-06-05 14:39:09 +08:00 |
samuele3hu
|
404db49538
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix
|
2014-06-03 17:17:11 +08:00 |
lm
|
be3f88c4ce
|
[Jenkins][ci skip] Fix proxy address in post-build.py
|
2014-06-03 11:48:52 +08:00 |
samuele3hu
|
5b3f3da428
|
update console submodule
|
2014-06-03 10:13:23 +08:00 |
samuele3hu
|
691e606b34
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix
Conflicts:
tools/cocos2d-console
|
2014-06-03 09:58:57 +08:00 |
samuele3hu
|
b91d8255bd
|
Add xxtea encrypt support for lua and update the console submodule
|
2014-06-03 09:55:57 +08:00 |
zhangbin
|
1d95d9a04b
|
Update the reference of submodule cocos2d-console.
|
2014-05-30 15:35:25 +08:00 |
lm
|
3520e7da0b
|
[Jenkins][ci skip] Fix proxy address to jenkins config
|
2014-05-30 12:51:54 +08:00 |
minggo
|
50fcb9a52b
|
Merge pull request #6935 from heliclei/config-proxies
[ci skip][jenkins]move http proxy address to jenkins configuration
|
2014-05-29 17:19:19 +08:00 |
heliclei
|
7d547cf9d2
|
[ci skip][jenkins]move http proxy address to jenkins configuration
|
2014-05-29 16:55:22 +08:00 |
lm
|
f93a40ebde
|
[Jenkins][ci skip] Add rebuild jobs to watchdog.py
|
2014-05-29 15:50:24 +08:00 |
zhangbin
|
db66cd866a
|
Update the reference of submodule cocos2d-console.
|
2014-05-29 13:37:26 +08:00 |
James Chen
|
984d33c055
|
Update README.md in tools/tolua
|
2014-05-28 09:43:48 +08:00 |
samuele3hu
|
b6cc477832
|
Update submodule
|
2014-05-27 14:25:18 +08:00 |
minggo
|
63680946ee
|
Merge pull request #6841 from shujunqiao/reboot
[ci skip], add reboot.py in jenkins-scripts.
|
2014-05-27 14:08:25 +08:00 |
minggo
|
c476e784fa
|
Merge pull request #6816 from shujunqiao/request-build-modify
[ci skip], modify request proxies in post-build.py and so on.
|
2014-05-27 14:04:37 +08:00 |
samuele3hu
|
270ddf0354
|
Update submodule
|
2014-05-26 18:25:23 +08:00 |
lm
|
4328072f7b
|
[Jenkins][ci skip] Remove unavailable parameter in android building
|
2014-05-23 16:06:46 +08:00 |
lm
|
209c1d884a
|
[Jenkins][ci skip] Remove upload apks to another slave, just save it in local
|
2014-05-23 14:02:31 +08:00 |
samuele3hu
|
f76e2a5476
|
Readd the lua binding for `visit` and modify a requirement for IDE
|
2014-05-23 10:00:59 +08:00 |
minggo
|
6e76ca7945
|
Merge pull request #6864 from natural-law/v3
Update the reference of submodule cocos2d-console.
|
2014-05-22 20:32:13 -05:00 |
samuele3hu
|
a6efd4f650
|
Move `setSearchPat` operation from cpp to script
|
2014-05-22 14:00:39 +08:00 |
zhangbin
|
d3d8c94c32
|
Update the reference of submodule cocos2d-console.
|
2014-05-21 17:48:46 +08:00 |
samuele3hu
|
a2ebe428da
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix
|
2014-05-20 18:11:28 +08:00 |
samuele3hu
|
2d65f9bc6f
|
issue #5255:Add Sprite3D test cases for Lua
|
2014-05-20 18:09:04 +08:00 |
shujunqiao
|
7232ba9414
|
[ci skip], add reboot.py in jenkins-scripts.
|
2014-05-20 16:34:36 +08:00 |