Merge master in released#6265
Merged
BenjaminDeleze merged 527 commits intoreleasedfrom Jun 28, 2023
Merged
Conversation
Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com> Co-authored-by: ad-daniel <44834743+ad-daniel@users.noreply.github.com> Co-authored-by: Yannick Goumaz <61198661+ygoumaz@users.noreply.github.com>
Merge master into develop
* Remove use of WEBOTS_SAFE_MODE * Fix line too long * Readd --minimize option
* Fixed Python getContactPoints API function * changelog
Merge master into develop
* cleanup * test merge_group trigger tests * remove merge queue test
* update to docker compose V2 * fixes * lint corrections * Text touch up * Replaced old install command with URL to current doc
* Fix warning * Update tests/api/controllers/supervisor_get_position_orientation_pose/supervisor_get_position_orientation_pose.c Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com> * Update supervisor_get_position_orientation_pose.c --------- Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com>
* fix infinite message * remove test * fix cpp
Merge master in develop
* fix mf restrictions * remove test for null * end of documentation url * Revert "end of documentation url" This reverts commit 06046c4.
* Enforce limit * Cleanup * Fix compilation * Use local sha1 algo * Fix license * Use tmp on macos * Change permissions * Fix permissions * Fix permission * Fix * Fixes * Fix sources * Fix sources * Fix sources * Finalize * Cleanup * Fix * Change tmpdir * Fix suppression * Test * Fix compilation * Fix compilation * cleanup slightly * Fix * Fix * Fix test suite * Fix * Fix sources * Update src/webots/control/WbController.cpp Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com> * Update src/webots/control/WbController.cpp Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com> * Update src/webots/control/WbController.cpp Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com> * Review fixes * Add fixme note * Fixed behavior on Windows * Changelog entry --------- Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com>
* new comparison * reset the equals function * urls equals
* Remove unwanted altitude change * Update changelog-r2023.md
* Fix scaled bounding sphere radius * Fix assertion failure computing WbMathsUtilities::clampedAcos * Adjust tests * Fix inconsistencies with WbBoundingSphere radius scale * Remove unused method * Fix line too long * Fixed shadows variables * Fix computation of bounding sphere not updated to ENU
Merge released into master
Merge master in develop
* Fix smile of MyBot robot * Fix MyBot smile IFS
* regenerate mf on add/delete * special flag * cleanup
* Fix bounding sphere radius for Sphere * Fix scaled bounding sphere of CadShape
* Port bounding sphere fix to webotsjs * Fix boundingSphere * Fix CadShape bounding sphere * Remove unused radius * Update resources/web/wwi/nodes/WbDevice.js Co-authored-by: Benjamin Délèze <benjamin.deleze@cyberbotics.com> * Fix type in parser (#5995) --------- Co-authored-by: Benjamin Délèze <benjamin.deleze@cyberbotics.com>
Merge master into develop
* yaml * update advertising board * doc url * doc url * documation url * wallplug * wall * translatioN * pingpongball * robocupsoccerball * soccerball * BathroomSink * documentation url * documentation url * doc url * doc url * documentation url * proto * doc url * laptop anchor * doc url * doc url * doc url * electrical plug * emergency button and eye screw * doc url * missing doc url * doc url * doc url hospital * doc url * doc url * doc url * doc url * caution panel * missing IS * documentation url * fix panel * doc url * end of doc url * change urls --------- Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com>
* splash screen * rename tiago
* stop export when URDF * Update changelog-r2023.md
* Fix size of translate rotation manipulator for scaled Transform nodes * Generalize fix to scaled Transform children * Fix translation along axis for scaled nodes * Fix handles scale when node selected from scene tree --------- Co-authored-by: Benjamin Délèze <benjamin.deleze@cyberbotics.com>
* Allow the compilation in non-ASCII paths * Update changelog-r2023.md * The name of the controller should be in local 8 bit, not UTF-8 * Removed debug statement
* Synch with webots_ros * Synch with webots_ros * Synchronize webots_ros submodule
* Fix bounding sphere updates * Restore performance optimization * Improve performance * Optimize parent notification * Update WbCamera.cpp
* blog post * fix typos * fix style * upper case * Update menu.md * typo * include new devices * Update changelog-r2023.md * Update index.md * added controller launcher + ros2 * Update docs/blog/Webots-2023-b-release.md Co-authored-by: Stefania Pedrazzi <stefaniapedrazzi@users.noreply.github.com> * Update docs/blog/Webots-2023-b-release.md Co-authored-by: Stefania Pedrazzi <stefaniapedrazzi@users.noreply.github.com> * Update docs/blog/Webots-2023-b-release.md Co-authored-by: Stefania Pedrazzi <stefaniapedrazzi@users.noreply.github.com> * Update docs/blog/Webots-2023-b-release.md Co-authored-by: Stefania Pedrazzi <stefaniapedrazzi@users.noreply.github.com> * Update docs/blog/Webots-2023-b-release.md Co-authored-by: Stefania Pedrazzi <stefaniapedrazzi@users.noreply.github.com> * Update docs/blog/Webots-2023-b-release.md Co-authored-by: Stefania Pedrazzi <stefaniapedrazzi@users.noreply.github.com> * update date * Update Webots-2023-b-release.md * Update docs/blog/Webots-2023-b-release.md Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com> * Update docs/blog/Webots-2023-b-release.md Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com> * Update docs/blog/Webots-2023-b-release.md Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com> * Update docs/blog/Webots-2023-b-release.md Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com> * Update docs/blog/Webots-2023-b-release.md Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com> * Update docs/blog/Webots-2023-b-release.md Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com> --------- Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com> Co-authored-by: Yannick Goumaz <yannick.goumaz@epfl.ch> Co-authored-by: Yannick Goumaz <61198661+ygoumaz@users.noreply.github.com> Co-authored-by: Stefania Pedrazzi <stefaniapedrazzi@users.noreply.github.com>
* Remove sumo from Webots package * Update documentation * Update the instructions * Update instructions for macOS and Windows * Remove code related to bundled sumo * update sumo installation directory path * Update the documentation * Remove last occurrences of Webots sumo folder * Remove references to deleted Makefile * Update sumo-interface.md * Update sumo_supervisor.py * Update sumo-interface.md --------- Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com> Co-authored-by: Yannick Goumaz <61198661+ygoumaz@users.noreply.github.com>
* get qmenu * create with parent * working solution * cleanup * clang format * Update src/webots/gui/WbView3D.cpp Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com> * Update WbSimulationView.cpp * style * clang * style * clang format --------- Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com>
* Fixed scaled rotation matrix * Cleanup: horizontal drag only used for top nodes * Cleanup unused method
* add guide to convert worlds/protos * fix errors * fix errors * doc * typo * upper case * upper case * update welcome message * update translation * fix references to wiki * update translatioN * clang format * Update docs/guide/upgrading-webots.md Co-authored-by: Stefania Pedrazzi <stefaniapedrazzi@users.noreply.github.com> * Update docs/guide/upgrading-webots.md Co-authored-by: Stefania Pedrazzi <stefaniapedrazzi@users.noreply.github.com> * Update docs/guide/from-2023a-to-2023b.md Co-authored-by: Stefania Pedrazzi <stefaniapedrazzi@users.noreply.github.com> * Update src/webots/gui/WbUpdatedDialog.cpp Co-authored-by: Stefania Pedrazzi <stefaniapedrazzi@users.noreply.github.com> * Update docs/guide/upgrading-webots.md Co-authored-by: Stefania Pedrazzi <stefaniapedrazzi@users.noreply.github.com> * Update docs/guide/from-2023a-to-2023b.md Co-authored-by: Stefania Pedrazzi <stefaniapedrazzi@users.noreply.github.com> * Update docs/guide/from-2023a-to-2023b.md Co-authored-by: Stefania Pedrazzi <stefaniapedrazzi@users.noreply.github.com> * Update docs/guide/from-2023a-to-2023b.md Co-authored-by: Stefania Pedrazzi <stefaniapedrazzi@users.noreply.github.com> * Update docs/guide/from-2023a-to-2023b.md Co-authored-by: Stefania Pedrazzi <stefaniapedrazzi@users.noreply.github.com> * Update docs/guide/from-2023a-to-2023b.md Co-authored-by: Stefania Pedrazzi <stefaniapedrazzi@users.noreply.github.com> * Update docs/guide/from-2023a-to-2023b.md Co-authored-by: Stefania Pedrazzi <stefaniapedrazzi@users.noreply.github.com> * Update docs/guide/from-2023a-to-2023b.md Co-authored-by: Stefania Pedrazzi <stefaniapedrazzi@users.noreply.github.com> * Update docs/guide/from-2023a-to-2023b.md Co-authored-by: Stefania Pedrazzi <stefaniapedrazzi@users.noreply.github.com> * Update docs/guide/from-2023a-to-2023b.md Co-authored-by: Stefania Pedrazzi <stefaniapedrazzi@users.noreply.github.com> * Update docs/guide/from-2023a-to-2023b.md Co-authored-by: Stefania Pedrazzi <stefaniapedrazzi@users.noreply.github.com> * Update docs/guide/from-2023a-to-2023b.md Co-authored-by: Stefania Pedrazzi <stefaniapedrazzi@users.noreply.github.com> * remove notes * Link with general upgrade page * center images * local images * reverse order * mention version in scripts * Update docs/guide/upgrading-webots.md Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com> * Update docs/guide/from-2023a-to-2023b.md Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com> * Update docs/guide/from-2023a-to-2023b.md Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com> * Update docs/guide/from-2023a-to-2023b.md Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com> * Update docs/guide/from-2023a-to-2023b.md Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com> * Update docs/guide/from-2023a-to-2023b.md Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com> * Update docs/guide/from-2023a-to-2023b.md Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com> * Update docs/guide/from-2023a-to-2023b.md Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com> * Update docs/guide/from-2023a-to-2023b.md Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com> * Update docs/guide/from-2023a-to-2023b.md Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com> * Update docs/guide/from-2023a-to-2023b.md Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com> * Update docs/guide/from-2023a-to-2023b.md Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com> * upper * Update docs/guide/upgrading-webots.md Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com> * Update docs/guide/upgrading-webots.md Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com> * upper * Allow small verbs to be lowercase in titles * add mention of changelog * lower * Improved the title capitalization rules * More title capitalization improvements * More title capitalization rules * Minor * Update docs/guide/from-2021b-to-2022a.md Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com> * explain bold * Update docs/guide/from-2021b-to-2022a.md Co-authored-by: Stefania Pedrazzi <stefaniapedrazzi@users.noreply.github.com> * Update docs/guide/from-2022a-to-2022b.md Co-authored-by: Stefania Pedrazzi <stefaniapedrazzi@users.noreply.github.com> * Update docs/guide/from-2022a-to-2022b.md Co-authored-by: Stefania Pedrazzi <stefaniapedrazzi@users.noreply.github.com> --------- Co-authored-by: Stefania Pedrazzi <stefaniapedrazzi@users.noreply.github.com> Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com>
* Adjust SumoInterface to run externController * Update sumo-interface.md * Update sumo-interface.md * Update projects/default/controllers/sumo_supervisor/sumo_supervisor.py Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com> --------- Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com>
* Removed conflicting QT5 environment variable on Windows * Update changelog-r2023.md
* SUMO extern controller * Update docs/automobile/sumo-interface.md Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com> * Update projects/default/controllers/sumo_supervisor/sumo_supervisor.py Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com> --------- Co-authored-by: Olivier Michel <Olivier.Michel@cyberbotics.com>
* Update webots-linux.sh * Update changelog-r2023.md
BenjaminDeleze
added
documentation
omichel
previously approved these changes
Jun 28, 2023
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
13 participants
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.
No conflicts.
To be merged once R2023b is released.