Commit Graph

17 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 9a5d6b4f5e Sync lua bindings for UserDefault Refactor 2020-02-07 16:45:25 +08:00
CocosRobot 71da768d3c [ci skip][AUTO]: updating luabinding & cocos_file.json automatically (#20438) 2020-01-18 20:40:25 +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
halx99 8cc7800ea8 [v4] spine v3.8 2020-01-05 03:09:32 +08:00
halx99 ed1e0744c4 fix luabindings 52/53 compat 2019-12-29 21:31:19 +08:00
halx99 9553236c72 Initial adapter spine runtime. 2019-12-12 23:26:12 +08:00
CocosRobot 5c2f06ff55 [ci skip][AUTO]: updating luabinding & cocos_file.json automatically (#20378) 2019-11-30 16:55:06 +08:00
halx99 a56cddfefe Remove getSuitableFopen, we never reduce performance for win32 only 2019-11-25 02:54:00 +08:00
halx99 2b5ce77ac7 lua53 compat, both lua51, lua52, luat3, luajit are supported. 2019-11-25 01:59:08 +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 f2159823ed Remove xxtea. 2019-11-24 19:17:23 +08:00
halx99 08b05240ab Remove websockets, sync lua bindings. 2019-11-24 19:16:13 +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