chuanweizhang2013
|
2a9c99ff66
|
Merge pull request #25 from cocos2d/develop
update cocos2d-x
|
2014-04-18 11:45:53 +08:00 |
cw
|
a9e697523e
|
amend comment
|
2014-04-18 11:40:51 +08:00 |
James Chen
|
8a80bac266
|
Merge pull request #6320 from CocosRobot/update_lua_bindings_1397789417
[AUTO]: updating luabinding automatically
|
2014-04-18 11:05:29 +08:00 |
CocosRobot
|
a78a1090c3
|
[AUTO]: updating luabinding automatically
|
2014-04-18 02:51:14 +00:00 |
minggo
|
7399ef2527
|
Merge pull request #6308 from nutty898/develop_nutty_widgetsupportscontentsize
Develop nutty widgetsupportscontentsize
|
2014-04-18 10:47:10 +08:00 |
minggo
|
74e9355119
|
Merge pull request #6317 from lmskater/fix-comment-body
[Jenkins][ci skip] Fix result comment body of Emptytest
|
2014-04-17 18:14:22 +08:00 |
lm
|
dfeac8c7d2
|
[Jenkins][ci skip] Fix result comment body of Emptytest
|
2014-04-17 18:08:15 +08:00 |
minggo
|
bb0c62b724
|
Merge pull request #6314 from lmskater/add-internet-permission
[Jenkins][ci skip] Add android.permission.INTERNET to cpp-empty-test
|
2014-04-17 17:19:07 +08:00 |
lm
|
c34b3d5324
|
[Jenkins][ci skip] Add android.permission.INTERNET to cpp-empty-test
|
2014-04-17 17:04:28 +08:00 |
cw
|
2914f60fcf
|
fixed xiaomi show ip error
|
2014-04-17 16:50:11 +08:00 |
James Chen
|
0d7747e3b1
|
Merge pull request #6312 from heliclei/fix-jenkins-tool
[jenkins]Add execute permission
|
2014-04-17 15:12:24 +08:00 |
heliclei
|
70c20ddfb2
|
add execute permission
|
2014-04-17 15:08:49 +08:00 |
minggo
|
b85a2c08e5
|
Merge pull request #6311 from minggo/comment-event-listener
add comment for EventListenerTouchOneByOne::checkAvailable()
|
2014-04-17 14:48:37 +08:00 |
minggo
|
a8a8ef85e6
|
add comment for EventListenerTouchOneByOne::checkAvailable()
|
2014-04-17 14:46:52 +08:00 |
CaiWenzhi
|
a8bfa094c0
|
Remove useless codes
|
2014-04-17 14:27:21 +08:00 |
CaiWenzhi
|
ed4fcd5d1a
|
Merge branch 'develop' into develop_nutty_modifylayout_add_Boxes
|
2014-04-17 14:23:08 +08:00 |
CaiWenzhi
|
19f6526ef8
|
Widget supports contentsize
|
2014-04-17 14:08:25 +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 |
James Chen
|
57d1f00788
|
Merge pull request #6297 from lmskater/comment-emptytest-result
[Jenkins][ci skip] Comment result of emptytest
|
2014-04-17 10:41:46 +08:00 |
James Chen
|
68d5cec430
|
Merge pull request #6303 from andyque/issue4883
closed #4883. fixed slider hittest problem
|
2014-04-17 10:38:17 +08:00 |
andyque
|
a9ed075d50
|
closed #4883. fixed slider hittest problem
|
2014-04-17 10:15:58 +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 |
James Chen
|
3322a3540c
|
Merge pull request #6296 from lmskater/fix-ftp-home
[Jenkins][ci skip] Fix 'localfile' parameter
|
2014-04-16 16:58:52 +08:00 |
minggo
|
83c41af1e0
|
Merge pull request #6293 from natural-law/issue4847
Find ant path from system first when ANT_ROOT is not set.
|
2014-04-16 16:34:23 +08:00 |
lm
|
3b16a267fb
|
[Jenkins][ci skip] Fix 'localfile' parameter
|
2014-04-16 16:26:50 +08:00 |
James Chen
|
1d64d4038a
|
Merge pull request #6294 from lmskater/fix-ftp-home
[Jenkins][ci skip] Fix ftp home in upload_apk.sh
|
2014-04-16 14:26:37 +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 |
zhangbin
|
4605fb6d56
|
closed #4847, Find ant path from system first when ANT_ROOT is not set.
|
2014-04-16 11:08:01 +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 |
zhangbin
|
72bc254141
|
Merge branch 'develop' into issue4727
|
2014-04-16 10:30:43 +08:00 |
Ricardo Quesada
|
9c19974448
|
Merge pull request #6290 from ricardoquesada/fix_changelog
argh... changelog is outdated
|
2014-04-15 16:43:36 -07:00 |
Ricardo Quesada
|
170d1fd626
|
argh... changelog is outdated
|
2014-04-15 16:40:41 -07: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 |
cw
|
312cd49b1a
|
Merge branch 'luaruntime' of https://github.com/chuanweizhang2013/cocos2d-x into luaruntime
|
2014-04-15 17:10:24 +08:00 |
cw
|
d361efacae
|
add update
|
2014-04-15 17:10:11 +08:00 |
zhangbin
|
dd5c2aacd6
|
Merge branch 'develop' into issue4727
Conflicts:
tools/cocos2d-console
|
2014-04-15 15:18:00 +08:00 |
minggo
|
b68ff69ad0
|
Merge pull request #6287 from minggo/update-version
update version information
|
2014-04-15 14:00:08 +08:00 |
minggo
|
46e7058587
|
update version information
|
2014-04-15 13:58:51 +08:00 |
shujunqiao
|
3b8934f205
|
[ci skip], modify print infomation in emptytest.py
|
2014-04-15 13:43:38 +08:00 |
minggo
|
38b982f938
|
Merge pull request #6286 from dumganhar/rename-listener-method
Renames the protected method: 'EventListener::(s|g)etSceneGraphPriority'-> 'EventListener::(s|g)etAssociatedNode'
|
2014-04-15 13:43:25 +08:00 |
minggo
|
eea099866c
|
Merge pull request #6285 from dumganhar/template-ios5.1-crash-fix
closed #4607: Fixed project created by template crashes on iOS5.1 device...
|
2014-04-15 13:42:47 +08:00 |