Skip to content

Conversation

scpeters
Copy link
Member

@scpeters scpeters commented Jun 5, 2025

➡️ Forward port

Port gz-sim9 ➡️ main

Branch comparison: main...gz-sim9

Note to maintainers: Remember to Merge with commit (not squash-merge or rebase)

iche033 and others added 12 commits April 1, 2025 16:25
Signed-off-by: Ian Chen <ichen@openrobotics.org>
(cherry picked from commit 2aaa0ed)
Follow-up to #2777.

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
…tor (#2835)

Signed-off-by: Ian Chen <ichen@openrobotics.org>
Co-authored-by: Alejandro Hernández Cordero <ahcorde@gmail.com>
(cherry picked from commit 6135ae8)
Signed-off-by: GauravKumar9920 <gaurav.og.9920@gmail.com>
Signed-off-by: Gaurav Kumar <84905312+GauravKumar9920@users.noreply.github.com>
Co-authored-by: Arjo Chakravarty <arjo129@gmail.com>
…2863)

Signed-off-by: Arjo Chakravarty <arjoc@intrinsic.ai>
Signed-off-by: Steve Peters <scpeters@openrobotics.org>
Signed-off-by: Ian Chen <ichen@openrobotics.org>
(cherry picked from commit 6444e71)
Signed-off-by: Leander Stephen D'Souza <leanderdsouza1234@gmail.com>
Co-authored-by: Alejandro Hernández Cordero <ahcorde@gmail.com>
Co-authored-by: Jose Luis Rivero <jrivero@osrfoundation.org>
This PR fixes issue #2903 and prevents the server from segfaulting if
the plugin fails to load correctly. It prints an error that the plugin
was misconfigured and continues executing ahead.


(cherry picked from commit 049c19e)

Signed-off-by: Arjo Chakravarty <arjoc@intrinsic.ai>
Co-authored-by: Arjo Chakravarty <arjoc@intrinsic.ai>
Signed-off-by: Arjo Chakravarty <arjoc@intrinsic.ai>
(cherry picked from commit 4fa756b)
Signed-off-by: Ian Chen <ichen@openrobotics.org>
Signed-off-by: Steve Peters <scpeters@openrobotics.org>
@scpeters
Copy link
Member Author

scpeters commented Jun 5, 2025

needs gazebosim/gz-common#680 to be merged forward

@scpeters
Copy link
Member Author

scpeters commented Jun 5, 2025

needs gazebosim/gz-common#680 to be merged forward

@scpeters scpeters force-pushed the scpeters/merge_9_main branch from 712ce9d to 92506fa Compare June 5, 2025 19:00
scpeters added a commit that referenced this pull request Jun 5, 2025
* Fix whitespace, line length
* Include what you use
* Fix cast syntax
* Use size_t instead of unsigned long in function

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
@scpeters
Copy link
Member Author

scpeters commented Jun 5, 2025

fixing some cpplint complaints on main in a67c302, please review these changes

@scpeters
Copy link
Member Author

scpeters commented Jun 5, 2025

still some codespell complaints

scpeters added a commit that referenced this pull request Jun 5, 2025
* Fix whitespace, line length
* Include what you use
* Fix cast syntax
* Use size_t instead of unsigned long in function
* Fix spelling, ignore renderD, change ' character

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
@scpeters scpeters force-pushed the scpeters/merge_9_main branch from a67c302 to 6ea4845 Compare June 5, 2025 23:22
@scpeters
Copy link
Member Author

scpeters commented Jun 5, 2025

still some codespell complaints

amended a bunch of fixes into 6ea4845, all except the complaints about gz3d.js

@github-project-automation github-project-automation bot moved this from Inbox to In review in Core development Jun 6, 2025
scpeters added a commit that referenced this pull request Jun 6, 2025
* Fix whitespace, line length
* Include what you use
* Fix cast syntax
* Use size_t instead of unsigned long in function
* Fix spelling, ignore renderD, change ' character
* codespell: skip gz3d.js

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
@scpeters scpeters force-pushed the scpeters/merge_9_main branch from 6ea4845 to 11cc271 Compare June 6, 2025 18:21
* Fix whitespace, line length
* Include what you use
* Fix cast syntax
* Use size_t instead of unsigned long in function
* Fix spelling, ignore renderD, change ' character
* codespell: skip gz3d.js

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
@scpeters scpeters force-pushed the scpeters/merge_9_main branch from 11cc271 to ab0ac7a Compare June 6, 2025 18:26
@scpeters scpeters merged commit aa493be into main Jun 6, 2025
9 checks passed
@scpeters scpeters deleted the scpeters/merge_9_main branch June 6, 2025 20:42
@github-project-automation github-project-automation bot moved this from In review to Done in Core development Jun 6, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

🪵 jetty Gazebo Jetty

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

5 participants