heliclei
|
f04ca0069c
|
fix autotest infinite loop
|
2014-04-01 16:05:28 +08:00 |
shujunqiao
|
27f1ded3cd
|
add android part in cocos-console-test.
|
2014-03-28 17:50:07 +08:00 |
shujunqiao
|
fb780f82da
|
add [director end] command in CCConsole.cpp.
|
2014-03-28 13:40:24 +08:00 |
shujunqiao
|
ba97b6cf8a
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into cocos-console-test
|
2014-03-28 09:25:16 +08:00 |
zhangbin
|
0c82a4a3e0
|
Add tools/bindings-generator & tools/tolua into the lua project template.
|
2014-03-27 15:38:01 +08:00 |
James Chen
|
c80fdaa54f
|
Merge pull request #6020 from samuele3hu/develop_test
Update the cocos2dx.ini for lua binding
|
2014-03-27 14:40:56 +08:00 |
lm
|
edd14e6765
|
[Jenkins] Make build as failed when generating bindings fails
|
2014-03-27 14:28:40 +08:00 |
samuele3hu
|
a64f44d6b2
|
Add lua binding for `getOpenGLView` of `Director`
|
2014-03-27 14:16:20 +08:00 |
samuele3hu
|
8b754c6257
|
Update coco2dx.ini for binding `ProtectedNode` class
|
2014-03-27 14:08:19 +08:00 |
shujunqiao
|
d38f873ecc
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into cocos-console-test
|
2014-03-27 10:56:29 +08:00 |
zhangbin
|
269c63ec69
|
Update the reference of submodule "cocos2d-console".
|
2014-03-27 09:50:16 +08:00 |
lm
|
640a82c2ab
|
[Jenkins] Make build as failed when git fetch is failed
|
2014-03-26 14:29:53 +08:00 |
samuele3hu
|
ac0ad54433
|
Modify the config files for bindings-generator to fix the error about “is_ref_class”
|
2014-03-26 12:58:33 +08:00 |
samuele3hu
|
674bce677d
|
update `bindings-generator` submoudle
|
2014-03-26 12:56:29 +08:00 |
James Chen
|
b8eee8e1a4
|
[ci] Updates travis scripts. only commit relevant folder.
|
2014-03-25 17:07:15 +08:00 |
James Chen
|
bb190fe78a
|
[ci] Updates travis scripts.
|
2014-03-25 16:24:08 +08:00 |
zhangbin
|
beb6f7359c
|
Update the reference of submodule "cocos2d-console".
|
2014-03-25 14:19:46 +08:00 |
shujunqiao
|
e521632b55
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into cocos-console-test
|
2014-03-21 17:51:06 +08:00 |
shujunqiao
|
c55910c2c0
|
add-close app in console-test.py.
|
2014-03-21 17:50:38 +08:00 |
James Chen
|
87cfbc9773
|
Merge pull request #5849 from shujunqiao/autotest
[jenkins] updates autotest.py
|
2014-03-21 16:52:58 +08:00 |
shujunqiao
|
a66a2a9bba
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into cocos-console-test
|
2014-03-21 14:36:28 +08:00 |
shujunqiao
|
d18ee12678
|
for test close project in cocos-console-test.py.
|
2014-03-21 14:15:59 +08:00 |
lm
|
9598c151ed
|
[Jenkins] Clean workspace after build finish
|
2014-03-21 13:57:38 +08:00 |
shujunqiao
|
686ed5dfa1
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into cocos-console-test
|
2014-03-21 10:42:23 +08:00 |
shujunqiao
|
fdb87cc69d
|
ignore [] in command [console run].
|
2014-03-20 17:40:41 +08:00 |
lm
|
3db3a12318
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into add-master-build
|
2014-03-20 16:20:02 +08:00 |
lm
|
3f09fbdade
|
[Jenkins] Add master build in pull-request-builder.py
|
2014-03-20 16:19:35 +08:00 |
James Chen
|
3e83dc9b1d
|
Merge pull request #5872 from shujunqiao/cocos-console-test
[jenkins] modify job-comment-trigger to support [console].
|
2014-03-20 15:14:42 +08:00 |
zhangbin
|
64f90e5f04
|
Update the reference of submodule "cocos2d-console".
|
2014-03-20 14:12:58 +08:00 |
andyque
|
6b042d26da
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into cocos-console-test
|
2014-03-20 10:43:31 +08:00 |
andyque
|
abc88ecc6a
|
delete not need variable in cocos-console-test.py.
|
2014-03-20 10:41:19 +08:00 |
andyque
|
7ea6185bbb
|
"modify console_cmd to console_param in cocos-console-test.py."
|
2014-03-20 10:32:04 +08:00 |
andyque
|
4bd7a60ca9
|
modify args of [console].
|
2014-03-20 10:24:10 +08:00 |
samuele3hu
|
3b2a5274ea
|
Update `bindings-generator` submodule
|
2014-03-20 10:12:04 +08:00 |
andyque
|
2f5e9ed654
|
modify job-comment-trigger to support [console].
|
2014-03-19 17:57:19 +08:00 |
James Chen
|
863272b1c8
|
Merge pull request #5855 from lmskater/fix-android-build
[Jenkins] build all samples on android
|
2014-03-19 12:01:37 +08:00 |
James Chen
|
05db740d2f
|
Merge pull request #5837 from linchaogithub/develop
[jenkins-watchdog] update
|
2014-03-19 12:01:13 +08:00 |
lm
|
426b006bfb
|
[Jenkins] build all samples on android
|
2014-03-18 17:27:57 +08:00 |
CocosRobot
|
ee0e43fcc2
|
modify android-job in autotest.py.
|
2014-03-18 16:21:41 +08:00 |
James Chen
|
7a16ffff84
|
Merge pull request #5848 from samuele3hu/develop_3_fix
Update `bindings-generator` submodule and resolve a error about the return value of FileUtilsWin32::getWritablePath()
|
2014-03-18 15:52:07 +08:00 |
lm
|
716f480eb4
|
[Jenkins] make build fail when submodule update fail
|
2014-03-18 14:37:23 +08:00 |
andyque
|
8c25fd5e8f
|
modify android-build-autotest in autotest.py.
|
2014-03-18 14:30:01 +08:00 |
andyque
|
a4bba6d03a
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into autotest
|
2014-03-18 14:07:24 +08:00 |
andyque
|
761456d480
|
test android part of autotest.py.
|
2014-03-18 14:06:33 +08:00 |
samuele3hu
|
402b6f0f28
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_3_fix
|
2014-03-18 10:40:12 +08:00 |
samuele3hu
|
309422f791
|
update `bindings-generator` submodule
|
2014-03-18 10:36:37 +08:00 |
minggo
|
36cfd17e7b
|
Merge pull request #5834 from shujunqiao/autotest
modify autotest.py for use mac app.
|
2014-03-17 17:59:36 +08:00 |
linchaogithub
|
88232d86bd
|
[jenkins-watchdog] ['JENKINS_ADMIN']replace['username'],['JENKINS_ADMIN_PW']replace['password']
|
2014-03-17 16:10:26 +08:00 |
zhangbin
|
bf68f180b4
|
Update the reference of submodule "cocos2d-console".
|
2014-03-17 15:25:07 +08:00 |
linchaogithub
|
bcdf74f4ee
|
[jenkins-watchdog] int(os.environ['jenkins-job-watchdog-threshold'])replace os.environ['jenkins-job-watchdog-threshold']
|
2014-03-17 14:53:03 +08:00 |