Merge master into develop #46
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
…rsion-in-ros-test Pin empy Version in Ros CI Test
* fix WbField::isParameter * fix dependencies on old behavior * remove WbTemplateManager::regenerateNodeFromField/ParameterChange * move WbField::isParameter to cpp file * fix WbField::isParameter definition * update changelog and fix PR reference comment * formatting
* Fix Heron warnings (cyberbotics#6717) Fix Heron warnings * print more info * use absolute path for heron protos * Revert "print more info" This reverts commit f9d5e51. * directly use water bounding boxes --------- Co-authored-by: MNikoliCC <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Synchronizes changes of master branch into develop branch.