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

1383 Commits

Author SHA1 Message Date
James Chen 81e1e0c23d Merge pull request #6750 from shujunqiao/pull-build-merge 
modify /merge to /head in pull-request-build.[ci skip]
 2014-05-16 10:00:23 +08:00
James Chen 14639d812e Update config.gitingore 2014-05-15 18:29:54 +08:00
shujunqiao 2a93fdaaa6 modify build terminal time in watchdog.py.[ci skip] 2014-05-15 17:27:23 +08:00
shujunqiao 96a9326026 [ci skip], modify build-job termination time. 2014-05-15 16:50:53 +08:00
samuele3hu 5a14b1d67b fix compile error and synchronizate the UI change for Lua 2014-05-15 15:39:15 +08:00
James Chen 140560057b Merge pull request #6751 from natural-law/v3 
Update the reference of submodule cocos2d-console.
 2014-05-15 10:40:42 +08:00
zhangbin 2eafb3c39f Update the reference of submodule cocos2d-console. 2014-05-15 10:37:06 +08:00
shujunqiao 39e5619f3f modify /merge to /head in pull-request-build. 2014-05-15 10:36:01 +08:00
shujunqiao a1f1b2f3a1 [ci skip],for stupid error in equal (backup_files = current_files = range(1)) 2014-05-14 18:47:58 +08:00
minggo 9c6e612c1f Merge pull request #6729 from lmskater/add-external-lib-to-ci-release 
[Jenkins][ci skip] Add external lib to ci release build
 2014-05-14 17:41:19 +08:00
shujunqiao c58f303a31 [ci skip], set v2-branch different variable in pull-request-builder.py. 2014-05-14 15:13:43 +08:00
lm cf24e327ee [Jenkins][ci skip] Add external lib to ci release build 2014-05-14 11:53:27 +08:00
shujunqiao 1341970b40 [ci skip], modify v3!=v2 about config.json. 2014-05-14 11:19:30 +08:00
James Chen bd82c119b6 Updates travis.yml, adds email notification to @Minggo and @James 2014-05-13 21:26:25 +08:00
lm 5cd5a2339b [Jenkins][ci skip] Add error commit status for cancel build in queue 2014-05-13 18:16:51 +08:00
James Chen 45d845f559 Adds a comment before making archive file 2014-05-13 14:33:53 +08:00
James Chen 4f886e8ebf [ci skip] The tool of making package supports to insert the content of 
another zip file
 2014-05-13 14:28:29 +08:00
James Chen e3ccf41ed9 Only build 'merge build' 2014-05-12 21:59:32 +08:00
James Chen 91d684d077 Updates travis script to add mac host support 2014-05-12 21:55:11 +08:00
James Chen 36c4a407ee Adds travis_mac.yml 2014-05-12 21:54:24 +08:00
lm f5a134a86e [Jenkins][ci skip] Add lua-runtime-bin to support pull request build 2014-05-12 18:49:52 +08:00
Huabing.Xu b80a1e7c3c roll back submodule changes 2014-05-09 21:31:15 -07:00
Huabing.Xu c3a255e2d0 do not generate backupFile if it is not needed for convert particle file yCoordFlipped 2014-05-09 20:07:46 -07:00
Huabing.Xu c16d072491 added conversion script for convert yCoordFlipped 2014-05-09 17:28:12 -07:00
yangxiao 879958855b UniformValue use union array 2014-05-09 14:38:36 -07:00
zhangbin 7d270cd1a1 Update the reference of submodule cocos2d-console. 2014-05-09 11:48:43 +08:00
samuele3hu ec45dbb0c9 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix 2014-05-08 10:22:52 +08:00
lm 15c3a0eb8c [Jenkins][ci skip] Fix copy logic of current_3rd_libs 2014-05-07 20:34:06 +08:00
lm 05af9e5bed [Jenkins][ci skip] Check external file to support build 2014-05-07 19:01:46 +08:00
James Chen 3fee1c3f23 Merge pull request #6597 from dumganhar/v3 
Re-adds download-deps.py, unzip works ok and output more detail informations
 2014-05-07 17:31:29 +08:00
samuele3hu 8615e13c91 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix 2014-05-07 17:16:40 +08:00
James Chen a617680cae Updates travis script 2014-05-07 15:06:20 +08:00
James Chen b76a6a5dda updates travis-script. 2014-05-07 13:48:39 +08:00
samuele3hu 3fb53e39ea Update bindings-generator submodule 2014-05-07 11:06:58 +08:00
samuele3hu f122f3894c Update the bindings-generator 2014-05-07 10:52:49 +08:00
samuele3hu a0b60acf24 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix 2014-05-07 10:33:57 +08:00
samuele3hu fb60b9f65a issue #5032:A potential crash bug of Lua binding 2014-05-07 10:09:54 +08:00
James Chen ac7fd0069b Merge pull request #6559 from shujunqiao/cocos-console-hang 
fixed one-hang-bug in cocos-console-test.py. [ci skip]
 2014-05-06 15:11:07 +08:00
samuele3hu 0ce2a38f17 Update bindings-generator and `MAX_SUB_TEST_NUMS` for SpritePerformance Test 2014-05-06 13:59:16 +08:00
James Chen 6c1791eae6 Updates travis-script, removed using download-deps.py now, 'external' is 
a submodule module now. please use `git submodule update --init` to
fetch it.
 2014-05-05 13:14:28 +08:00
James Chen 53488092a4 Updates before-install.sh 2014-05-04 19:09:51 +08:00
shujunqiao 6d2542efb5 fixed one-hang-bug in cocos-console-test.py 2014-05-04 17:33:00 +08:00
James Chen 7fca2c05e2 Update travis script 2014-05-04 15:42:50 +08:00
James Chen 188d843767 Update travis script 2014-05-04 15:38:42 +08:00
Ricardo Quesada b67f3008a5 Lua compiles again 2014-05-01 18:07:25 -07:00
zhangbin 64f30980b4 closed #4990, Fix the error in cocos2d-console when rename files on windows. 2014-04-30 11:25:47 +08:00
zhangbin 9ad5acec7c Update the reference of submodule cocos2d-console. 2014-04-29 11:56:50 +08:00
shujunqiao 8ac1545686 [ci skip], modify android apk name in cocos-console-test.py. 2014-04-28 16:55:21 +08:00
James Chen 698b52093e Merge pull request #6396 from natural-law/FuzzyMatch 
Support fuzzy matching in the create project configuration.
 2014-04-28 15:47:56 +08:00
James Chen 55b355009a Merge pull request #6400 from lmskater/check-pr-title 
[Jenkins][ci skip] Check pull request title to skip build
 2014-04-28 15:00:37 +08:00