4 Commits

Author	SHA1	Message	Date
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	8df3d5e274	Init Commit	2019-11-23 20:27:39 +08:00