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 |
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 |
zhangbin
|
4af7e14dc8
|
Update the reference of submodule cocos2d-console.
|
2014-04-16 10:32:43 +08:00 |
shujunqiao
|
17811f00a1
|
[ci skip], modify apk path.
|
2014-04-15 18:28:56 +08:00 |
lm
|
7e495c9619
|
[Jenkins][ci skip] Create and save cpp-empty-test apk for autotest
|
2014-04-15 18:15:31 +08:00 |
shujunqiao
|
fcd72adf9f
|
[ci skip], modify information of print.
|
2014-04-15 17:41:40 +08:00 |
zhangbin
|
dd5c2aacd6
|
Merge branch 'develop' into issue4727
Conflicts:
tools/cocos2d-console
|
2014-04-15 15:18:00 +08:00 |
shujunqiao
|
3b8934f205
|
[ci skip], modify print infomation in emptytest.py
|
2014-04-15 13:43:38 +08:00 |
boyu0
|
b53961b78d
|
issue $4771: fix lua test and fix some bugs
|
2014-04-15 13:40:44 +08:00 |
minggo
|
0ecd8e271e
|
update console submodule
|
2014-04-14 21:02:01 +08:00 |
shujunqiao
|
58f2de8598
|
[ci skip], add emptytest.py
|
2014-04-14 18:43:26 +08:00 |
zhangbin
|
7874cd8045
|
closed #4786, Show tip message when python is not compatible.
|
2014-04-14 17:29:37 +08:00 |
shujunqiao
|
884974f5e4
|
[ci skip], add close app in autotest.py
|
2014-04-14 11:55:11 +08:00 |
lm
|
3088ac88f5
|
[Jenkins][ci skip] Add rebuild when git fail in pull request builder
|
2014-04-11 15:06:14 +08:00 |
zhangbin
|
76972e6304
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into issue4727
|
2014-04-11 11:37:50 +08:00 |
zhangbin
|
29615f7e26
|
closed #4727, Support run sample projects with console.
|
2014-04-11 11:36:23 +08:00 |
shujunqiao
|
c937cad4c9
|
[ci skip], fix android part in cocos-console-test.py.
|
2014-04-10 18:20:53 +08:00 |
samuele3hu
|
249163c32d
|
Update config files for lua bindings-generator and `lua_cocos2dx_manual.cpp` file
|
2014-04-10 15:52:51 +08:00 |
James Chen
|
efb443dea0
|
Merge pull request #6200 from dumganhar/iss4729-deprecated-folder
issue #4729: Move deprecated stuff to deprecated folder
|
2014-04-10 11:17:21 +08:00 |
zhangbin
|
cd6ff8f391
|
Update the reference of submodule cocos2d-console.
|
2014-04-10 09:51:46 +08:00 |
James Chen
|
7cdd041b79
|
issue #4729: Adds missing include path in cocos2dx_physics.ini
|
2014-04-10 00:37:42 +08:00 |
James Chen
|
a2a712bc17
|
issue #4729: Updates tools/tolua/cocos2dx.ini
|
2014-04-10 00:36:42 +08:00 |
shujunqiao
|
71bc948369
|
not excute android autotest now.
|
2014-04-09 16:30:08 +08:00 |
James Chen
|
82333e357e
|
Updates bindings-generator to the latest version.
|
2014-04-09 15:44:07 +08:00 |
shujunqiao
|
11af83dbf6
|
[ci skip], add get package size in cocos-console-test.py.
|
2014-04-08 18:02:12 +08:00 |
James Chen
|
02507ce25f
|
Merge pull request #6173 from lmskater/fix-git-fail-return-value
[Jenkins][ci skip]: Modified the return value when git fails, it's used for `ci rebuild`
|
2014-04-08 17:32:31 +08:00 |
lm
|
ca9b4a3196
|
[Jenkins][ci skip]: Fix return value of git fail
|
2014-04-08 16:35:01 +08:00 |
zhangbin
|
99f7ca5c40
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into issue4666
|
2014-04-08 16:27:18 +08:00 |
zhangbin
|
12fb27b01e
|
closed #4666, Update the build configuration files in template & update the reference of submodule cocos2d-console.
|
2014-04-08 16:23:12 +08:00 |