Merge master into released #6766
Merged
Conversation
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
Merge master into develop
* Update MotionWidget.cpp * Update PoseWidget.cpp
Merge master into develop
* Fix missing points in lidar scan - Enable the UP and DOWN camera - Fix the face identification in merge_spherical.frag - Use texture instead of texelFetch for smoother result * Experiment with custom texture interpolation function * Improve the texture picking function in merge_spherical.frag * Fix UP and DOWN camera activation - Fix lateral camera aspect ratio to only require UP and DOWN camera when necessary - Fix bad lidar data for fov < pi/2 - Increased mSphericalFovYCorrectionCoefficient to 1.4 to avoid rounding errors * Fix bad interpolation with infinite data * Cleanup and minor imporvements --------- Co-authored-by: Olivier Michel <[email protected]>
Merge master into develop
* Prepend blank line in bashrc script * Update bash_profile.windows * Update bash_profile.mac
Merge master into develop
Merge master into develop
Merge released into master
Merge master into develop
…6456) Bumps [tj-actions/branch-names](https://github.com/tj-actions/branch-names) from 5.1 to 7.0.7. - [Release notes](https://github.com/tj-actions/branch-names/releases) - [Changelog](https://github.com/tj-actions/branch-names/blob/main/HISTORY.md) - [Commits](tj-actions/branch-names@v5.1...v7.0.7) --- updated-dependencies: - dependency-name: tj-actions/branch-names dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Merge master into develop
Merge master into develop
Merge released into master
Merge master into develop
* Avoid crashes and better warn when getting PROTO Avoid crashes and better warn when getting the PROTO in `WbSupervisorUtilities::getProtoParameterNodeInstance()`. Signed-off-by: Gaël Écorchard <[email protected]> * Update src/webots/nodes/utils/WbSupervisorUtilities.cpp * clang-format * clang-format * Update changelog-r2023.md * Update changelog-r2023.md --------- Signed-off-by: Gaël Écorchard <[email protected]> Co-authored-by: Gaël Écorchard <[email protected]> Co-authored-by: Olivier Michel <[email protected]>
…s-test Pin empy Version in Ros CI Test
Merge master into develop
Merge master into develop
* 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
Merge master into develop
* Fix Heron warnings (#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]>
* Launch Webots on x11 server * Set the x11 server just for Ubuntu 24 version * Fix
…sync-master-65094da8c
* First Improvement * Update "Webots-2025-a-release.md" * Update * Test * Add New Robot * Fix * Fix "menu.md" * Fix * Update Heron Picture * ros (wip) * add images * fix * fix * fix * fix * fix * more --------- Co-authored-by: Darko Lukić <[email protected]>
Merge master into develop
* Regenerate translations * merge changelogs * version * 2025a * 2025a * fix
* Fix reference s in the URL sample * revert * fix * date
Merge develop in master
omichel
approved these changes
Jan 31, 2025
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.
No description provided.