Skip to content

Merge master into develop #47

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
wants to merge 22 commits into
base: develop
Choose a base branch
from
Open

Conversation

github-actions[bot]
Copy link

@github-actions github-actions bot commented Apr 5, 2025

Synchronizes changes of master branch into develop branch.

CoolSpy3 and others added 22 commits December 24, 2024 11:16
* 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]>
* 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]>
* Regenerate translations

* merge changelogs

* version

* 2025a

* 2025a

* fix
* Fix reference s in the URL sample

* revert

* fix

* date
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]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants