Commit Graph

164 Commits

Author SHA1 Message Date
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
coulsonwang 95bb7d6b5a fix drawnode line width issue (#20442) 2020-01-18 20:40:34 +08:00
RH f1c58b23e2 V4 bmfont improved api (#20406)
* Merged improved BM font API from Cocos2d-x V3.  Code based on #20309 and #20300

* Added missing test resources.
2020-01-18 20:40:17 +08:00
Arnold 1cd85b88d0 set attribute (#20417) 2020-01-18 20:40:09 +08:00
minggo 2b521922fa fix flicker of fast tilemap (#20387) 2019-11-30 16:58:55 +08:00
halx99 d5af773970 Merge: f8e6c06286 cea283c489
Merge pull request #11 from simdsoft/sync-v4

Sync v4
2019-11-26 08:49:56 -08:00
halx99 217962e748 Merge: 3cab821c25 8ff2ea18c2
Merge pull request #10 from simdsoft/v5-deps-5

update deps to v5-deps-5
2019-11-26 08:28:03 -08:00
codetypes 7969eabbed missing implementation for TiledGrid3DAction::create (#20370) 2019-11-26 23:40:44 +08:00
halx99 0536b38509 Use toString instead asString 2019-11-25 18:02:13 +08:00
halx99 5faf15e10f Use toString instead. 2019-11-25 17:06:01 +08:00
halx99 8333e4c06e Remove tinyxml2 dep, done. 2019-11-25 01:35:26 +08:00
halx99 3bb4edfbf9 Merge: 179ec6ed67 e9305431da
Merge pull request #13 from cocos2d/v4

sync V4
2019-11-23 20:20:02 -08:00
halx99 8df3d5e274 Init Commit 2019-11-23 20:27:39 +08:00