Commit Graph

162 Commits

Author SHA1 Message Date
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
2youyouo2 96201232b8 Merge branch 'master' of github.com:cocos-creator/cocos2d-x-lite into develop 2016-05-11 11:19:22 +08:00
CocosRobot f9a3dadd92 [AUTO][ci skip]: updating cocos2dx_files.json 2016-05-11 03:09:07 +00:00
zilongshanren 7c283ccd63 fix gen bindings and cocos files script 2016-05-11 11:02:08 +08:00
zilongshanren 6e2f691342 change travis secure data owner 2016-05-11 10:50:06 +08:00
Wenhai Lin dd5b3674c6 stability improvements 2016-05-11 10:29:54 +08:00
zilongshanren bbf8958779 fix indentation of secure in travis.yml 2016-05-11 10:16:03 +08:00
Wenhai Lin 194fa85b7e stability improvements 2016-05-10 22:48:00 +08:00
zilongshanren 82547394f1 generate new secure key 2016-05-10 19:13:14 +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 100741d47e add env keywords? 2016-05-10 17:48:30 +08:00
zilongshanren 66f12204fd remove unused comments 2016-05-10 17:43:08 +08:00
zilongshanren 5b608c2198 fix travis linux install deps 2016-05-10 17:34:58 +08:00
zilongshanren 052e25f2d6 add bindings code 2016-05-10 17:20:42 +08:00
zilongshanren fb56f45e0a only setup two build slaves for push event 2016-05-10 17:00:22 +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
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
Wenhai Lin 52332dce9e Fixed possible crash on exit. 2016-05-09 16:37:55 +08:00
2youyouo2 ecab936f2a fixed clog 2016-05-09 13:35:24 +08:00
Wang Nan 8d57618e6f Merge pull request #57 from 2youyouo2/link
Link
2016-05-06 18:09:29 +08:00
zilongshanren d7b795944a Merge pull request #63 from zilongshanren/add-travis-support
fix travis build status badget
2016-05-06 16:32:04 +08:00
zilongshanren 0df1095d26 fix travis build status badget 2016-05-06 16:28:55 +08:00
zilongshanren ed65eda755 Merge pull request #62 from zilongshanren/add-travis-support
make travis working
2016-05-06 16:24:11 +08:00
zilongshanren a45d0f5772 add travis build status to develop branch 2016-05-06 16:22:28 +08:00
zilongshanren d366a8d1bb make travis working 2016-05-06 16:10:43 +08:00
zilongshanren 86eefc2c87 Merge pull request #61 from zilongshanren/add-travis-support
use https instead of git protobol
2016-05-06 16:07:47 +08:00
zilongshanren 85530c17ff use https instead of git protobol 2016-05-06 16:07:06 +08:00
zilongshanren 63ef7ce364 Merge pull request #60 from zilongshanren/add-travis-support
update bindings-generator from creator org
2016-05-06 15:52:50 +08:00
zilongshanren f55fbc20f3 update bindings-generator from creator org 2016-05-06 15:52:04 +08:00
zilongshanren b8a0847385 Merge pull request #59 from zilongshanren/add-travis-support
add travis scripts back.
2016-05-06 15:15:20 +08:00
zilongshanren 4f42d3a5ca add travis scripts back.
1. it also fix generate cocos files and bindings code
2016-05-06 14:54:19 +08:00
zilongshanren 6c1bf3b722 Merge remote-tracking branch 'upstream/master' 2016-05-06 13:32:16 +08:00
2youyouo2 9982849850 fixed binary template 2016-05-06 13:16:51 +08:00
Wenhai Lin e3431f9259 Avoid creating short-term temporary Vec2 objects 2016-05-06 11:21:11 +08:00
2youyou2 768f8a34a3 update win32 link template 2016-05-05 18:41:50 +08:00
2youyouo2 ad944a4919 add project.properties 2016-05-05 16:43:33 +08:00
2youyouo2 a819423530 add link template 2016-05-05 15:23:17 +08:00
Wenhai Lin 4d87be5c76 Refine EditBox(sync from cocos2d-x) 2016-05-04 16:08:46 +08:00