Merge master into develop #6397
Merged
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}
* Fix values returned by getEmitterDirection * fixes #6392 * Update changelog (fix getEmitterDirection) * Update changelog-r2023.md * Update changelog-r2023.md --------- Co-authored-by: Olivier Michel <[email protected]>
* FIX:Matlab path search on macOS - fixes creation of the path were matlab is installed on macOS - fixes search for latest matlab version * Code review - Fix clang-formatting - Simpler "ifndef"-case for error msg * Update webots_controller.c * Apply suggestions from code review Co-authored-by: Olivier Michel <[email protected]> * Make cppcheck happy with realloc usage. --------- Co-authored-by: nilsjor <[email protected]> Co-authored-by: Olivier Michel <[email protected]>
* fixed mIsOmnidirectional in WbObjectDetection * updated chhangelog * Update changelog-r2023.md * adapted fov check to be simpler
BenjaminDeleze
approved these changes
Oct 2, 2023
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.