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

Sync with master #18

Merged
merged 124 commits into from
Dec 10, 2019
Merged

Sync with master #18

merged 124 commits into from
Dec 10, 2019

Conversation

rh101
Copy link
Owner

@rh101 rh101 commented Dec 10, 2019

No description provided.

Mee-gu and others added 30 commits October 8, 2019 15:06
needs an integer position
modify the item relative position to avoid inappropriate operation.
* fix triangle batch
since it would be too expensive to check the uniforms, simplify enable batching for built-in program.

* enable user update the materialID
need resize depth and stencil attachment texture as well.
* fix ProgramState and Program performance

* fix review

* fix

* add autorelease
* 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.
* remove redundant copy constructor and destructor
- Build using C++17 by default.
- Simplified customization of Xcode project via cmake.
- Add documentation to demonstrate how to use the customization.

- NOTE: I believe we could compile with bitcode enabled if the box2d
        library was compiled using bitcode.
* update changelog

* update release note

* update version
* fix issue: TextField can not receive characters(non number or english… (#20209)
Mee-gu and others added 29 commits November 18, 2019 15:04
When part of scissorRect is out of render target viewport, it crash on mac.
Error message like this: -[MTLDebugRenderCommandEncoder setScissorRect:]:2703: failed assertion `(rect.y(568) + rect.height(447))(1015) must be <= render pass height(1000)'
* support load asset in internal storage or sdcard

* fix crash when fullPath.size() == 0
* fix AudioEngine maybe crash on android

I receive many crash about std::base_string in bugly(tencent) crash report, i can't prove those crash is relate with this, but when after  fix, i never receive again. so i think there maybe some situation will cause crash.

* type of 'filePath' change to std::string
'sysEdit' y position is relate with frame height, not the viewport height. When in FIXED_WIDTH mode, if frame height is bigger than viewport height, it will got error y position.
* fix incorrect hash structure for RenderPipeline
removed old URLs I could not fine, replaced 404 with new URLS
@rh101 rh101 merged commit 310d717 into rh101:v4 Dec 10, 2019
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.