zilongshanren
|
6ffebc4f03
|
[Dont' Merge!] It's just a dummy PR.
|
2016-05-11 11:54:20 +08:00 |
|
zilongshanren
|
6423852e1d
|
Merge pull request #84 from zilongshanren/change-travis-secure-owner
add -q option to unzip
|
2016-05-11 11:48:25 +08:00 |
|
zilongshanren
|
0cc145d991
|
add -q option to unzip
|
2016-05-11 11:47:57 +08:00 |
|
zilongshanren
|
a4fdc8217c
|
Merge pull request #83 from zilongshanren/change-travis-secure-owner
change ndk version from r9d to r11c
|
2016-05-11 11:40:07 +08:00 |
|
zilongshanren
|
d0b79965ac
|
change ndk version from r9d to r11c
|
2016-05-11 11:39:35 +08:00 |
|
zilongshanren
|
bb20c854cd
|
Merge pull request #82 from 2youyouo2/develop
sync master
|
2016-05-11 11:28:59 +08:00 |
|
2youyouo2
|
96201232b8
|
Merge branch 'master' of github.com:cocos-creator/cocos2d-x-lite into develop
|
2016-05-11 11:19:22 +08:00 |
|
2youyouo2
|
ed103756f2
|
Merge branch 'develop' of github.com:cocos-creator/cocos2d-x-lite into develop
|
2016-05-11 11:13:16 +08:00 |
|
zilongshanren
|
880013ee7a
|
Merge pull request #81 from CocosRobot/update_cocosfiles_1462936146
[AUTO][ci skip]: updating cocos2dx_files.json
|
2016-05-11 11:10:30 +08:00 |
|
CocosRobot
|
f9a3dadd92
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2016-05-11 03:09:07 +00:00 |
|
zilongshanren
|
ed4cd11a37
|
Merge pull request #80 from zilongshanren/change-travis-secure-owner
fix gen bindings and cocos files script
|
2016-05-11 11:08:24 +08:00 |
|
zilongshanren
|
7c283ccd63
|
fix gen bindings and cocos files script
|
2016-05-11 11:02:08 +08:00 |
|
zilongshanren
|
9ce59f40dc
|
Merge pull request #79 from zilongshanren/change-travis-secure-owner
change travis secure data owner
|
2016-05-11 10:52:06 +08:00 |
|
zilongshanren
|
6e2f691342
|
change travis secure data owner
|
2016-05-11 10:50:06 +08:00 |
|
Wenhai Lin
|
05aba932fb
|
Merge pull request #78 from WenhaiLin/master
stability improvements
|
2016-05-11 10:31:27 +08:00 |
|
Wenhai Lin
|
dd5b3674c6
|
stability improvements
|
2016-05-11 10:29:54 +08:00 |
|
zilongshanren
|
1d9ee03ae9
|
Merge pull request #77 from zilongshanren/test-travis-build
fix indentation of secure in travis.yml
|
2016-05-11 10:16:37 +08:00 |
|
zilongshanren
|
bbf8958779
|
fix indentation of secure in travis.yml
|
2016-05-11 10:16:03 +08:00 |
|
zilongshanren
|
443a7172de
|
Merge pull request #76 from WenhaiLin/master
stability improvements
|
2016-05-11 10:05:48 +08:00 |
|
Wenhai Lin
|
194fa85b7e
|
stability improvements
|
2016-05-10 22:48:00 +08:00 |
|
zilongshanren
|
9543821b0a
|
Merge pull request #74 from zilongshanren/test-travis-build
fix travis not start build...
|
2016-05-10 19:13:42 +08:00 |
|
zilongshanren
|
82547394f1
|
generate new secure key
|
2016-05-10 19:13:14 +08:00 |
|
Wenhai Lin
|
714c504b8f
|
Merge pull request #75 from WenhaiLin/master
Fixed crash on desktop
|
2016-05-10 18:39:48 +08:00 |
|
Wenhai Lin
|
cab4a05112
|
Fixed crash
|
2016-05-10 18:37:24 +08:00 |
|
Wenhai Lin
|
cf40056acd
|
Fixed crash on desktop
|
2016-05-10 18:32:27 +08:00 |
|
zilongshanren
|
027e5cff12
|
remove global
|
2016-05-10 17:57:25 +08:00 |
|
zilongshanren
|
a2cc736108
|
fix travis not start build...
|
2016-05-10 17:53:56 +08:00 |
|
zilongshanren
|
825c74cdf2
|
Merge pull request #73 from zilongshanren/test-travis-build
add env keywords?
|
2016-05-10 17:50:19 +08:00 |
|
zilongshanren
|
100741d47e
|
add env keywords?
|
2016-05-10 17:48:30 +08:00 |
|
zilongshanren
|
30a136db78
|
Merge pull request #72 from zilongshanren/test-travis-build
remove unused comments
|
2016-05-10 17:44:09 +08:00 |
|
zilongshanren
|
66f12204fd
|
remove unused comments
|
2016-05-10 17:43:08 +08:00 |
|
zilongshanren
|
1636948322
|
Merge pull request #71 from zilongshanren/add-travis-cocos-robot-support
fix travis linux install deps
|
2016-05-10 17:36:14 +08:00 |
|
zilongshanren
|
5b608c2198
|
fix travis linux install deps
|
2016-05-10 17:34:58 +08:00 |
|
zilongshanren
|
e7af086cdb
|
Merge pull request #70 from zilongshanren/add-travis-cocos-robot-support
add bindings code
|
2016-05-10 17:21:37 +08:00 |
|
zilongshanren
|
052e25f2d6
|
add bindings code
|
2016-05-10 17:20:42 +08:00 |
|
zilongshanren
|
74b1a91cfc
|
Merge pull request #69 from zilongshanren/add-travis-cocos-robot-support
only setup two build slaves for push event
|
2016-05-10 17:01:24 +08:00 |
|
zilongshanren
|
fb56f45e0a
|
only setup two build slaves for push event
|
2016-05-10 17:00:22 +08:00 |
|
zilongshanren
|
fb773eb9b0
|
Merge pull request #68 from zilongshanren/add-travis-cocos-robot-support
Add travis cocos robot support
|
2016-05-10 16:41:34 +08:00 |
|
zilongshanren
|
350cddd916
|
fix mac travis build
|
2016-05-10 16:40:12 +08:00 |
|
zilongshanren
|
cdb8af157c
|
add multiple build to travis
|
2016-05-10 16:35:23 +08:00 |
|
zilongshanren
|
f7f5d9a899
|
cleanup ci scripts
|
2016-05-10 16:19:46 +08:00 |
|
2youyouo2
|
281b4061f8
|
Merge branch 'develop' of github.com:cocos-creator/cocos2d-x-lite into develop
|
2016-05-10 16:09:11 +08:00 |
|
zilongshanren
|
3dceb4cf4d
|
Merge pull request #67 from zilongshanren/syncMasterBranch
Sync master branch
|
2016-05-10 15:07:34 +08:00 |
|
zilongshanren
|
cfb0b36343
|
fix generate templates json file scripts
|
2016-05-10 14:57:43 +08:00 |
|
zilongshanren
|
adc2a7c8b7
|
update js bindings
|
2016-05-10 14:17:32 +08:00 |
|
zilongshanren
|
c647536c0c
|
Merge branch 'develop' into syncMasterBranch
# Conflicts:
# gulpfile.js
# package.json
|
2016-05-10 14:12:59 +08:00 |
|
zilongshanren
|
bf18b226b2
|
Merge remote-tracking branch 'upstream/master'
|
2016-05-10 14:01:59 +08:00 |
|
pandamicro
|
3d32f8e2b2
|
Merge pull request #64 from 2youyouo2/cclog
fixed clog
|
2016-05-10 11:47:40 +08:00 |
|
Wenhai Lin
|
77fb1ed35a
|
Merge pull request #65 from WenhaiLin/master
Fixed possible crash on exit.
|
2016-05-09 16:44:29 +08:00 |
|
Wenhai Lin
|
52332dce9e
|
Fixed possible crash on exit.
|
2016-05-09 16:37:55 +08:00 |
|