Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
18,141 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

108 Commits

Author SHA1 Message Date
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
lm edd14e6765 [Jenkins] Make build as failed when generating bindings fails 2014-03-27 14:28:40 +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
lm 640a82c2ab [Jenkins] Make build as failed when git fetch is failed 2014-03-26 14:29:53 +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
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
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
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 761456d480 test android part of autotest.py. 2014-03-18 14:06:33 +08:00
linchaogithub 88232d86bd [jenkins-watchdog] ['JENKINS_ADMIN']replace['username'],['JENKINS_ADMIN_PW']replace['password'] 2014-03-17 16:10:26 +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
CocosRobot 7fd3017b5f modify autotest.py for use mac app. 2014-03-17 11:49:18 +08:00
James Chen b37bd73861 Merge pull request #5751 from linchaogithub/develop 
[Jenkins-watchdog] check & kill dead buid
 2014-03-13 17:50:53 +08:00
qiaofeng00oo 3013bf2d6d modify cocos-console-test.py. 2014-03-13 17:05:10 +08:00
qiaofeng00oo 17ba28de2a add cocos-console-test.py to tools/jenkins-scripts/ 2014-03-13 16:29:47 +08:00
linchaogithub 347dd55f3d [jenkins-job-watchdog-threshold]replace[duration] 2014-03-13 14:12:29 +08:00
linchaogithub 9dcca7641c [Jenkins] watchdog 2014-03-13 11:16:21 +08:00
linchaogithub d1a84cd7e8 [Jenkins] watchdog 2014-03-12 17:18:16 +08:00
linchaogithub db68e1feed [jenkins] watchdog 2014-03-12 16:28:23 +08:00
linchaogithub d7aa1312ba [Jenkins] watchdog 2014-03-12 15:36:09 +08:00
James Chen fbcf1e7193 Updates pull-request-builder.py, do 'git clean -fdx -f' after checkout a new branch. 2014-03-11 22:05:50 +08:00
James Chen e825324a94 [jenkins ci] Updates pull-request-builder.py. Uses 'git clean -fdx -f' to remove all files that are not in current repo. 2014-03-11 21:39:31 +08:00
James Chen 3adc62679f Updates Jenkins ci. 2014-03-11 20:47:02 +08:00
James Chen 4444e3872e [jenkins ci] Build only cpp-empty-test, cpp-tests. 2014-03-11 19:39:20 +08:00
Dhilan007 41c8b6064e re-open generate binding glue codes. 2014-03-11 15:30:48 +08:00
lm bdd66ee0fd [Jenkins] fix the crash in comment trigger 2014-03-10 16:35:55 +08:00
James Chen 7841bceb2b [jenkins ci] Updates jenkins script 2014-03-10 13:50:14 +08:00
James Chen 286ebb349f [jenkins] Don't gen jsb bindings. 2014-03-10 12:02:29 +08:00
lm e01319a701 [Jenkins] add linux build 2014-03-07 11:25:35 +08:00
minggo 3d2bf5cc1a Merge pull request #5608 from lmskater/fix-android-build 
[Jenkins] fix android build
 2014-03-07 11:02:47 +08:00
lm c49dc0a044 [Jenkins] fix android build 2014-03-07 10:51:17 +08:00