Merge develop into feature web proto #5710
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
* Port changes to master branch * Check if field triggers regeneration before using it after changing the value * Fix brackets * Update changelog
…#5663) * Update WbExtendedStringEditor.hpp * Disable select button for restricted fields * Update changelog-r2023.md
Merge master into develop
* Add null if nothing was read * Update src/controller/c/robot.c Co-authored-by: Olivier Michel <[email protected]> Co-authored-by: Olivier Michel <[email protected]>
* Add vehicles documentation * Improve PROTO descriptions and fix default translations * update icon_creator * Update images * Update generated sources * Update model image * Add image thumbnails * Reuse script for generating vehicles doc * Reuse script for generating vehicles doc * Fix image path * Update car.md * Fix anchors * Update vehicle-citroen.md * Update vehicle-lincoln.md * Update vehicle-range-rover.md * Update vehicle-tesla.md * Update vehicle-toyota.md * Update ToyotaPrius.proto * Update vehicle-toyota.md * Update car.md * Update vehicle-generic.md * Update BusWheel.proto * Update vehicle-bmw.md * Update vehicle-citroen.md * Update vehicle-toyota.md * Update BmwX5Wheel.proto * Update CitroenCZeroFrontWheel.proto * Update CitroenCZeroRearWheel.proto * Update ToyotaPrius.proto * Fix documentation generated from PROTO files * Fix pep8 error * Update car.md * Add car PROTO field descriptions * Add description to generic vehicle fields * Regenerate documentation * Remove duplicated util file * Add entry in Changelog
* Ignore NaN values when adjusting the plot range * Add ChangeLog entry
Merge master into develop
…Rosetta (#5691) * Update installation-procedure.md * Update installation-procedure.md * Add files via upload
* Skip updates if geometry is going to be deleted * Fix dangling ODE geometries * Update changelog
Co-authored-by: Olivier Michel <[email protected]>
* Add necessary first line in proto file examples * Update docs/guide/tutorial-7-your-first-proto.md Co-authored-by: Olivier Michel <[email protected]> * Update docs/guide/tutorial-7-your-first-proto.md Co-authored-by: Olivier Michel <[email protected]> * Update docs/guide/tutorial-7-your-first-proto.md Co-authored-by: Olivier Michel <[email protected]> Co-authored-by: Olivier Michel <[email protected]>
* Add a troubleshooting section for macOS installation with respect to Rosetta (#5691) * Update installation-procedure.md * Update installation-procedure.md * Add files via upload * Add necessary first line in proto file examples (#5692) * Add necessary first line in proto file examples * Update docs/guide/tutorial-7-your-first-proto.md Co-authored-by: Olivier Michel <[email protected]> * Update docs/guide/tutorial-7-your-first-proto.md Co-authored-by: Olivier Michel <[email protected]> * Update docs/guide/tutorial-7-your-first-proto.md Co-authored-by: Olivier Michel <[email protected]> Co-authored-by: Olivier Michel <[email protected]> Co-authored-by: Olivier Michel <[email protected]> Co-authored-by: Stephan Kunz <[email protected]>
* Fix infinite loop updating ODE geometries (#5686) * Skip updates if geometry is going to be deleted * Fix dangling ODE geometries * Update changelog * remove libcontroller sync in test suite (#5689) Co-authored-by: Olivier Michel <[email protected]> * Merge released into master (#5696) * Add a troubleshooting section for macOS installation with respect to Rosetta (#5691) * Update installation-procedure.md * Update installation-procedure.md * Add files via upload * Add necessary first line in proto file examples (#5692) * Add necessary first line in proto file examples * Update docs/guide/tutorial-7-your-first-proto.md Co-authored-by: Olivier Michel <[email protected]> * Update docs/guide/tutorial-7-your-first-proto.md Co-authored-by: Olivier Michel <[email protected]> * Update docs/guide/tutorial-7-your-first-proto.md Co-authored-by: Olivier Michel <[email protected]> Co-authored-by: Olivier Michel <[email protected]> Co-authored-by: Olivier Michel <[email protected]> Co-authored-by: Stephan Kunz <[email protected]> Co-authored-by: Stefania Pedrazzi <[email protected]> Co-authored-by: Yannick Goumaz <[email protected]> Co-authored-by: Olivier Michel <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Stephan Kunz <[email protected]>
* Update jointparameters.md * Update docs/reference/jointparameters.md Co-authored-by: ad-daniel <[email protected]> * Update docs/reference/jointparameters.md Co-authored-by: ad-daniel <[email protected]> Co-authored-by: ad-daniel <[email protected]>
…esolutions (#5705) * Fixed crash in Python API when using several cameras with different resolutions * Update changelog-r2023.md
Merge released into master
Merge master into develop
ad-daniel
approved these changes
Jan 4, 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.
Conflicts: