Commit Graph

14 Commits

Author SHA1 Message Date
minggo
f08555248f fix conflict 2022-01-24 17:23:03 +08:00
Yun Hsiao Wu
14a17c9d22 license upgrade (#4210) 2022-01-24 17:18:47 +08:00
Santy-Wang
69eca07b53 fix physX crash (#3843) 2021-08-21 13:43:43 +08:00
minggo
43c288196e Merge v3.1.2 (#3691)
* add jsb binding for v3.1.2 (#3611)

* update (#3615)

* optimize cleanTracks method (#3620)

* Fix setMaterial memory leak (#3622)

* fix RenderAdditiveLightQueue memory leaks for v3.1.2 (#3616)

* fix shadows GFXBuffer memory leaks for v3.1.2 (#3630)

* [ci skip][AUTO]: updating jsbinding automatically: dea52c7b (#3633)

Co-authored-by: cocos-robot <engine-deploy@cocos.com>

* fix erase shared body (#3635)

* Native PCF change sync to native-engine for v3.1.2 (#3652)

* support getAABB and getBoundingShpere (#3563) (#3671)

* fix compiling error

Co-authored-by: troublemaker52025 <troublemaker52025@outlook.com>
Co-authored-by: mmyduckx <308303735@qq.com>
Co-authored-by: wangyuzhi233 <78699242+wangyuzhi233@users.noreply.github.com>
Co-authored-by: Cocos Robot <48829427+cocos-robot@users.noreply.github.com>
Co-authored-by: cocos-robot <engine-deploy@cocos.com>
Co-authored-by: jiaxin.lai <goodlaijiaxin@qq.com>
2021-07-13 09:43:25 +08:00
GengineJS
b8f54069c0 [Add] Native scene object update function (#3638) 2021-06-22 16:41:13 +08:00
minggo
c98a1251a0 Revert "[add] Native scene object update function (#3602)" (#3634)
This reverts commit 8cc944277f.
2021-06-18 18:12:50 +08:00
GengineJS
8cc944277f [add] Native scene object update function (#3602) 2021-06-18 17:34:06 +08:00
minggo
13d3274136 fix conflict 2021-06-11 16:01:34 +08:00
minggo
30db2bcbda merge v3.12 into v 3.3 2021-06-10 17:33:22 +08:00
cary
965037568c Modify the memory pool and remove the deprecated code. (#3599) 2021-06-10 09:06:27 +08:00
Yun Hsiao Wu
ed60fc8e85 sync new hasChanged structure (#3568) 2021-05-27 10:19:33 +08:00
jiaxin.lai
1f5e6c86d6 fix rigid body type conversion (#3521)
(cherry picked from commit 52a2198dae99d5384bb9785f6e6c9ebd282a0178)
2021-05-13 12:02:55 +08:00
jiaxin.lai
cc74d49393 clear velocity when remove body (#3475) 2021-04-26 15:28:22 +08:00
jiaxin.lai
d23e039d2c native physx (#3409) 2021-04-20 12:51:52 +08:00