Commit Graph

8 Commits

Author SHA1 Message Date
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