Commit Graph

8 Commits

Author SHA1 Message Date
halx99 8822faae98 Remove unnecessary std::move semantics 2020-02-28 12:10:27 +08:00
halx99 48007c67c9 Merge: b350a7abf8 d9e6cb8e33
Merge pull request #72 from c4games/sync-v3-pr20107

Sync v3 pr20107 & fix builtin shaders
2020-02-24 20:59:11 +08:00
halx99 810397ebfe Merge: f0d60d4a85 a7e118ec0b
Merge pull request #70 from c4games/remove-unused-shader

Remove unused shader
2020-02-24 17:51:58 +08:00
halx99 825ec25a6b Sync v3 pr20107 & fix builtin shaders, see: https://github.com/cocos2d/cocos2d-x/pull/20107 2020-02-24 17:09:25 +08:00
halx99 bb441097e7 Merge: f6853a5852 f36d21c9bf
Merge pull request #52 from c4games/fix-issue51

fix #51
2020-02-12 20:58:25 +08:00
halx99 41f0869926 Merge: 2d3e162e21 5d7f58c3ad
Merge pull request #50 from weiwest/master

add astc support (Great Job)
2020-02-12 20:24:29 +08:00
halx99 53d784af8d fix #51 2020-02-12 20:15:09 +08:00
halx99 8df3d5e274 Init Commit 2019-11-23 20:27:39 +08:00