Commit Graph

10 Commits

Author SHA1 Message Date
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
coulsonwang 832ae29932 adjust ralative position of tested item in TouchTest (#20369) 2019-11-26 23:40:54 +08:00
halx99 0536b38509 Use toString instead asString 2019-11-25 18:02:13 +08:00
halx99 305e7c6549 Update etc1 alpha test case 2019-11-25 02:46:52 +08:00
halx99 442012b525 Improve CCImage, BMP support. 2019-11-25 02:28:38 +08:00
halx99 0ab49ddf22 Merge: 98a3bd35f0 f332ae77c1
Merge branch 'master' of https://github.com/simdsoft/engine-v5
2019-11-24 23:16:11 +08:00
halx99 441e1f1283 Remove tinyxml, integrate dragonbones. 2019-11-24 23:15:56 +08:00
halx99 d00fea9340 Remove websockets, sync tests. 2019-11-24 21:02:16 +08:00
halx99 8df3d5e274 Init Commit 2019-11-23 20:27:39 +08:00