Commit Graph

3949 Commits

Author SHA1 Message Date
halx99 e9ba5420ef Refine code 2020-08-19 12:10:29 +08:00
halx99 82ceee2fdb fix label crashing, add private use BatchCommand move constructor to adapte std::vector resize properly 2020-08-19 11:46:13 +08:00
halx99 927f05f670 Sync mssing code from official-v3 2020-08-18 14:43:09 +08:00
halx99 a567820461 Improve code quality 2020-08-18 14:29:09 +08:00
halx99 9d9067dec4 Backport CCValue APIs 2020-08-18 11:33:18 +08:00
halx99 f88dfdc167 FreeType: Output missing char in .ttf at _DEBUG compiling mode 2020-08-12 14:24:06 +08:00
halx99 4eb4660c9d Reorder members of Node, sizeof(Node) decrease from 640 to 616 on 32bit application 2020-08-06 13:30:35 +08:00
halx99 2b24a1cb6f Add ENGINEX_VERSION and improve ABI compatiable 2020-08-04 12:11:36 +08:00
halx99 a735abaf65 Take care _programState use 2020-07-21 23:11:03 +08:00
halx99 cd656f8b8b fix label not rendering 2020-06-12 11:34:02 +08:00
halx99 9da96e3e1a Sync from: https://github.com/cocos2d/cocos2d-x/pull/20531 2020-06-12 11:24:10 +08:00
halx99 e379fc513d Refactor CCValue. 2020-03-03 19:24:07 +08:00
halx99 ddb30e881c Clean JSB sources, optmize script event dispatch. 2020-02-28 02:15:33 +08:00
halx99 f36d21c9bf fix #51 2020-02-12 20:15:09 +08:00
coulsonwang 2b4b7c4aae fix drawnode line width issue (#20442) 2020-01-18 20:40:34 +08:00
RH 93352ff06f 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 2fdb65e2c6 set attribute (#20417) 2020-01-18 20:40:09 +08:00
minggo 3ffb04f84a fix flicker of fast tilemap (#20387) 2019-11-30 16:58:55 +08:00
codetypes 4310342862 missing implementation for TiledGrid3DAction::create (#20370) 2019-11-26 23:40:44 +08:00
halx99 d193246f09 Use toString instead asString 2019-11-25 18:02:13 +08:00
halx99 5f1dc7c748 Use toString instead. 2019-11-25 17:06:01 +08:00
halx99 3fcb8883c2 Remove tinyxml2 dep, done. 2019-11-25 01:35:26 +08:00
HALX99 7723fabb78
Merge pull request #13 from cocos2d/v4
sync V4
2019-11-23 20:20:02 -08:00
coulsonwang c048d6b6bd no need to update color (#20363) 2019-11-23 10:04:23 +08:00
codetypes b9df4bd63b format spelling (#20360) 2019-11-22 16:07:43 +08:00
HALX99 c08e2cda4d
Merge branch 'v4' into v4 2019-11-22 10:29:11 +08:00
halx99 78ed4e230b TextureFormatEXT 2019-11-22 03:36:01 +08:00
halx99 5d5e6fcfec Remove comment. 2019-11-20 18:44:45 +08:00
halx99 0caf671edd Fix merge error. 2019-11-20 18:35:48 +08:00
halx99 e647820c9c Merge from official-v4. 2019-11-20 18:27:56 +08:00
halx99 e7906acfa4 v4-meta-multi-textures support Single Texture2D with multi GPU texture handlers. 2019-11-20 18:19:24 +08:00
coulsonwang 912ba30e49 remove duplicated PrgramState instance in the derived class of Node (#20350) 2019-11-20 11:04:42 +08:00
coulsonwang b2940949dd implement setProgramState for SpriteBatchNode (#20344) 2019-11-18 15:04:47 +08:00
Arnold 587bcabf44 fix asan reported errors (#20332) 2019-11-15 13:39:23 +08:00
coulsonwang 292e4c3b4d fix effect test (#20286) 2019-11-06 16:25:30 +08:00
minggo 01ff6ddd66
delete useless files and clean codes (#20279) 2019-11-06 14:24:06 +08:00
coulsonwang a0d7751510 rename to make function name more clear 2019-10-28 16:47:27 +08:00
coulsonwang eb23e1ffde needs update texture info 2019-10-28 16:05:05 +08:00
coulsonwang 2d42aa1d21 fix memory leak (#20258) 2019-10-28 15:04:03 +08:00
minggo 7f796936ee
Revert "fix RotateTo animation when angle is bigger than 360 (#20009) (#20211)" (#20257)
This reverts commit 8a64e6f983.
2019-10-28 09:53:07 +08:00
coulsonwang 2501f53b9b add CameraTest (#20253)
* nodeTest

* fix
2019-10-25 18:22:35 +08:00
minggo c9af873e2e
fix some warnings (#20247) 2019-10-25 16:40:30 +08:00
minggo be038d9ffc
fix some warnings (#20236) 2019-10-25 09:27:54 +08:00
minggo 6b1e55f419
Remove experimental namespace (#20229) 2019-10-23 14:58:31 +08:00
minggo d29adb3180
sync #19914 (#20215) 2019-10-17 11:14:04 +08:00
minggo 99e984dde5
fix crash when plist filename hasn't suffix (#19999) (#20212) 2019-10-17 11:12:37 +08:00
minggo 24b04e561b
sync #20007 to v4 (#20210)
* sync #20007 to v4

* Fixing a bug in Node::enumerateChildren (#20045)

This patch fixes an issue that if both // (recursive enumeration)
and .. (starting from parent node) are specified,
Node::enumerateChildren does not honor the latter and starts searching
from current node rather than parent node.
2019-10-17 11:12:25 +08:00
minggo 8a64e6f983
fix RotateTo animation when angle is bigger than 360 (#20009) (#20211) 2019-10-16 16:31:35 +08:00
coulsonwang 67ae2e756e fix ProgramState and Program performance (#20189)
* fix ProgramState and Program performance

* fix review

* fix

* add autorelease
2019-10-15 09:40:59 +08:00
coulsonwang c7020fbb5f fix C4244 warning (#20173) 2019-10-09 17:50:32 +08:00