This repository has been archived by the owner on Feb 3, 2025. It is now read-only.
Merge 9.14.0 -> 10 #2925
Closed
Merge 9.14.0 -> 10 #2925
Conversation
This file contains 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
Remove X11 call from Gazebo 7 Approved-by: Steve Peters <[email protected]> Approved-by: Ian Chen <[email protected]>
Signed-off-by: Louise Poubel <[email protected]>
Signed-off-by: Ian Chen <[email protected]>
Signed-off-by: Ian Chen <[email protected]>
Signed-off-by: Ian Chen <[email protected]>
Signed-off-by: Ian Chen <[email protected]>
Signed-off-by: Ian Chen <[email protected]>
Signed-off-by: Ian Chen <[email protected]>
Signed-off-by: Ian Chen <[email protected]>
…#2769) * Fixed crash when collision size is zero Signed-off-by: ahcorde <[email protected]> * Using ignition::math::isnan Signed-off-by: ahcorde <[email protected]> * Improved error message Signed-off-by: ahcorde <[email protected]> * fixed method to get the name of the visual Signed-off-by: ahcorde <[email protected]> * Fixed else brackets Signed-off-by: ahcorde <[email protected]> * [Gazebo 9] Added test to check collisions equal to zero (gazebosim#2788) * Added test to check collisions equal to zero Signed-off-by: ahcorde <[email protected]> * Included feedback Signed-off-by: ahcorde <[email protected]> * make linters happy Signed-off-by: ahcorde <[email protected]> * Update Visual_TEST.cc
Signed-off-by: Louise Poubel <[email protected]>
Signed-off-by: Louise Poubel <[email protected]>
Signed-off-by: Ian Chen <[email protected]>
Backport lockstep changes to gazebo9
Signed-off-by: Louise Poubel <[email protected]>
Signed-off-by: Louise Poubel <[email protected]>
* add publisher private class to hold OnPublishComplete callback Signed-off-by: Ian Chen <[email protected]> * std bind and rearrage pub node fini Signed-off-by: Ian Chen <[email protected]> * add comment on PublisherPrivate Signed-off-by: Ian Chen <[email protected]>
Signed-off-by: Louise Poubel <[email protected]>
Disable some code in SimpleTrackedVehiclePlugin for boost 1.74 or greater due to changes in boost shared_ptr.hpp Signed-off-by: Steve Peters <[email protected]>
|
I cherry-picked #2865 to fix the macOS build |
|
looks like I also removed the logic from bitbucket PR 2657 (5ca6ba3), which should be restored I noticed a local failure of |
|
Gazebo 10 is already EOL, so I think this PR may not be worth the risk of introducing a regression on a final minor release. |
ok, I'll try merging directly to 11 instead |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
We haven't merged forward from gazebo9 to 10 or 11 in quite some time. I'll start by merging forward from 9.14.0 to gazebo10, since a significant change to gazebo transport (#2812) was merged just before that tag. The changes to transport conflict with changes made in gazebo 10.0.0 (bitbucket pull request 2922). Given that there were noted issues with exceptions during the review of the pull request to gazebo10; I've reverted most of the changes from bitbucket pull request 2922 in favor of #2812 while resolving merge conflicts. We should look closely at CI and see if there is anything worth keeping from the reverted code.
cc @parrotepicuser @iche033 @chapulina