Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

adjust the getActualGroupIndex function #3652

Merged
merged 1 commit into from
Dec 20, 2018

Conversation

ColinCollins
Copy link
Contributor

Re: #3642

@ColinCollins ColinCollins force-pushed the findCamera branch 3 times, most recently from c285e31 to 03baf84 Compare December 19, 2018 10:15
Squashed commits:
[03baf84]  (+1 squashed commit)
Squashed commits:
[c285e31]  (+1 squashed commit)
Squashed commits:
[c112a22] adjust the getActualGroupIndex function
@pandamicro pandamicro merged commit 21e1c84 into cocos:v2.0-release Dec 20, 2018
sunnylanwanjun pushed a commit to sunnylanwanjun/engine that referenced this pull request Feb 18, 2019
pandamicro pushed a commit to pandamicro/fire-engine that referenced this pull request Feb 18, 2019
* cherry pick cocos#3652

* fixed the children cullingMask don't change when parent cullingMask changed (cocos#3677)

* Fix when culling mask is zero, no use parent group index bug

* Fix camera sort bug
minggo added a commit that referenced this pull request Feb 10, 2022
* 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>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants