20 Commits

Author	SHA1	Message	Date
halx99	52d3c91fa6	fix travis no output [skip appveyor]	2020-09-11 19:34:01 +08:00
halx99	71362f65f6	fix travis timeout	2020-09-11 19:00:21 +08:00
halx99	d3dfee9614	fix travis.yml[skip appveyor]	2020-09-08 09:52:17 +08:00
halx99	2e9af13dd7	Simplify travis.yml [skip appveyor]	2020-09-08 08:08:39 +08:00
halx99	ebfe29a9e6	fix travis.yml [skip appveyor]	2020-09-08 07:54:39 +08:00
halx99	9d4271ccf5	Merge: 556e0d05d3 3629cd7120 ... Merge branch 'master' of https://gitee.com/c4games/engine-x into master	2020-09-06 17:01:21 +08:00
halx99	cabc917bff	Move getFileDataFromZip from FileUtils to ZipFile and mark it as deprecated	2020-09-06 17:00:20 +08:00
halx99	b442e5a158	fix link error ... see: https://github.com/curl/curl/issues/5210	2020-09-06 11:18:04 +08:00
halx99	d8f6edd211	fix .travis.yml	2020-09-04 17:19:51 +08:00
halx99	170d8eb0f5	test	2020-09-04 17:03:25 +08:00
halx99	801c827802	fix .travis.yml ident, update readme [skip appveyor]	2020-09-04 16:55:13 +08:00
halx99	715858a0e0	Enable mac build for ci	2020-09-04 16:47:32 +08:00
weiwest	a998fe8c14	Merge: 2a02db76d8 2d3e162e21 ... Merge remote-tracking branch 'upstream/master'	2020-02-12 16:58:47 +08:00
weiwest	33b9e8330b	add astc soft decode support	2020-02-11 23:54:17 +08:00
halx99	dc09756a94	disable other jobs exclude android & ios	2020-02-07 16:41:34 +08:00
Arnold	ecd81c77dc	[CI ]add cocos new for iOS (#20380)	2019-11-30 16:58:49 +08:00
halx99	ba2b8b3b6d	Merge: 6078a4c922 aad1a18a8f ... Merge branch 'master' of https://github.com/simdsoft/engine-v5	2019-11-25 20:26:43 +08:00
halx99	c77560fb80	Make writeValueMapToFile works well with pugixml.	2019-11-25 20:26:29 +08:00
halx99	a72ed0c814	Update .travis.yml	2019-11-25 19:26:08 +08:00
halx99	8df3d5e274	Init Commit	2019-11-23 20:27:39 +08:00