James Chen
|
53488092a4
|
Updates before-install.sh
|
2014-05-04 19:09:51 +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 |
James Chen
|
e96883ec43
|
Merge pull request #6394 from samuele3hu/dev_compile_error
Fix compile error for Lua
|
2014-04-28 14:57:48 +08:00 |
lm
|
b2a414a660
|
[Jenkins][ci skip] Check pull request title to skip build
|
2014-04-28 14:54:29 +08:00 |
lm
|
d2c091edda
|
[Jenkins][ci skip] Catch exception in check_queue_build
|
2014-04-28 14:34:34 +08:00 |
zhangbin
|
0eaf8cc38d
|
Support fuzzy matching in the create project configuration.
|
2014-04-28 14:16:19 +08:00 |
samuele3hu
|
c3f40bdc24
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into dev_compile_error
|
2014-04-28 14:05:08 +08:00 |
samuele3hu
|
d3670644bf
|
Fix compile error for Lua
|
2014-04-28 14:04:37 +08:00 |
James Chen
|
1634ae30c5
|
'develop' -> 'v3' branch for travis ci.
|
2014-04-28 11:28:03 +08:00 |
lm
|
575a7c988b
|
[Jenkins][ci skip] Fix branch to v3 v2
|
2014-04-28 10:45:55 +08:00 |
James Chen
|
cd6fe294b8
|
Merge pull request #6288 from boyu0/bug4771_move_physicsworld_2_layer
closed #4771: Move PhysicsWorld to Layer
|
2014-04-25 11:52:32 +08:00 |
James Chen
|
8d706060a7
|
Merge pull request #6358 from shujunqiao/emptytest-upload
[ci skip], add ssh upload file in emptytest.py.
|
2014-04-25 10:59:58 +08:00 |
lm
|
41615fe56a
|
[Jenkins][ci skip] Change 'payload' to 'tag'
|
2014-04-23 18:10:39 +08:00 |
shujunqiao
|
c1d52f9af1
|
[ci skip], modify address_of_result_html display in emptytest.py.
|
2014-04-23 18:06:30 +08:00 |
shujunqiao
|
8b2d84a9e6
|
[ci skip],modify ssh directory in emptytest.py
|
2014-04-23 17:55:53 +08:00 |
shujunqiao
|
e749ab8ddb
|
[ci skip], add ssh upload file in emptytest.py.
|
2014-04-23 16:32:37 +08:00 |
lm
|
2c55c740ba
|
[Jenkins][ci skip] Git fetch tag
|
2014-04-22 14:31:56 +08:00 |
lm
|
7005d6664d
|
[Jenkins][ci skip] Clean workspace before debug build or release build
|
2014-04-22 12:36:40 +08:00 |
lm
|
9f7021fd6c
|
[Jenkins][ci skip] Add [ci release xxx] command
|
2014-04-22 11:41:14 +08:00 |
zhangbin
|
b7ff312c7c
|
Update the reference of submodule cocos2d-console.
|
2014-04-22 11:21:13 +08:00 |
shujunqiao
|
48d3714bf2
|
[ci skip], delete wake function in emptytest.py.
|
2014-04-22 11:04:17 +08:00 |
shujunqiao
|
79e9c315d8
|
[ci skip], add get android device infomation in emptytest.py.
|
2014-04-21 18:18:48 +08:00 |
minggo
|
0a5b92c56f
|
Merge pull request #6305 from samuele3hu/developAudio
fix the bug that exit layer can’t end the SimpleAudioEngine
|
2014-04-21 14:40:40 +08:00 |
zhangbin
|
00910216b1
|
Update the reference of submodule cocos2d-console.
|
2014-04-21 11:01:39 +08:00 |
minggo
|
541f0b0a19
|
Merge pull request #6315 from natural-law/issue4863
Update the reference of submodule "cocos2d-console".
|
2014-04-18 13:57:52 +08:00 |
lm
|
dfeac8c7d2
|
[Jenkins][ci skip] Fix result comment body of Emptytest
|
2014-04-17 18:08:15 +08:00 |
zhangbin
|
0e14c2ad3f
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into issue4863
|
2014-04-17 17:19:57 +08:00 |
zhangbin
|
33472c7805
|
closed #4863, Zipalign the apk generated with release mode.
|
2014-04-17 17:18:39 +08:00 |
lm
|
c34b3d5324
|
[Jenkins][ci skip] Add android.permission.INTERNET to cpp-empty-test
|
2014-04-17 17:04:28 +08:00 |
heliclei
|
70c20ddfb2
|
add execute permission
|
2014-04-17 15:08:49 +08:00 |
minggo
|
5d90fd73d3
|
Merge pull request #6235 from natural-law/issue4727
Support run sample projects with console.
|
2014-04-17 12:05:50 +08:00 |
samuele3hu
|
11515f6ab3
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developAudio
|
2014-04-17 11:06:20 +08:00 |
samuele3hu
|
1331fff62c
|
fix the bug that exit layer can’t end SimpleAudioEngine
|
2014-04-17 10:36:08 +08:00 |
lm
|
008bdba373
|
[Jenkins][ci skip] Change 'GITHUB_ACCESS_TOKEN' to 'GITHUB_COMMENT_ACCESS_TOKEN'
|
2014-04-17 09:57:55 +08:00 |
lm
|
fb462b90b6
|
[Jenkins][ci skip] Fix 'comments_url' parameter
|
2014-04-16 18:56:17 +08:00 |
lm
|
84b6981e2b
|
[Jenkins][ci skip] Comment result of emptytest
|
2014-04-16 18:36:05 +08:00 |
James Chen
|
ba38268167
|
Merge pull request #6292 from lmskater/add-emptytest-command
[Jenkins][ci skip] Add [ci emptytest] command
|
2014-04-16 17:28:20 +08:00 |
lm
|
3b16a267fb
|
[Jenkins][ci skip] Fix 'localfile' parameter
|
2014-04-16 16:26:50 +08:00 |
lm
|
b78c89d39b
|
[Jenkins][ci skip] Fix ftp home in upload_apk.sh
|
2014-04-16 14:19:13 +08:00 |
lm
|
3cbe02771d
|
[Jenkins][ci skip] Fix ftp home in upload_apk.sh
|
2014-04-16 13:47:40 +08:00 |
James Chen
|
4dadd3537e
|
Merge pull request #6289 from lmskater/create-save-apk
[Jenkins][ci skip] Create and save cpp-empty-test apk for autotest
|
2014-04-16 11:14:50 +08:00 |
James Chen
|
99ff168512
|
Merge pull request #6282 from shujunqiao/empty-test
[ci skip], add emptytest.py
|
2014-04-16 11:13:35 +08:00 |
lm
|
e5cd2adaad
|
[Jenkins][ci skip] Add [ci emptytest] command
|
2014-04-16 11:05:27 +08:00 |