forked from cyberbotics/webots
-
Notifications
You must be signed in to change notification settings - Fork 0
Merge master into develop #48
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
github-actions
wants to merge
28
commits into
develop
Choose a base branch
from
sync-master-4bcca6b05
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
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
* 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]>
…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]>
…4da8c 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
Merge master into released
Merge master into released
My contribution for Heron USV, my name is not added Co-authored-by: Darko Lukić <[email protected]>
My contribution for Heron USV, my name is not added Co-authored-by: Darko Lukić <[email protected]> Co-authored-by: harunkurtdev <[email protected]>
…fe88fcc Merge released into master
…6806) * build webots-controller for both x86 and arm on macos * update the changelog * use gcc instead of cxx * create a build directory
…e0b9333 Merge released into master
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.