Skip to content
This repository has been archived by the owner on Feb 3, 2025. It is now read-only.

7 ➡️ 9 #2801

Merged
merged 8 commits into from
Aug 4, 2020
Merged

7 ➡️ 9 #2801

merged 8 commits into from
Aug 4, 2020

Conversation

chapulina
Copy link
Contributor

Merge gazebo7 forward to gazebo9. Nothing major, mainly just one PR.

Includes #2800

chapulina and others added 7 commits February 20, 2020 19:34
Remove X11 call from Gazebo 7

Approved-by: Steve Peters <[email protected]>
Approved-by: Ian Chen <[email protected]>
* 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 (#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]>
@chapulina chapulina added the 9 Gazebo 9 label Jul 28, 2020
@ahcorde
Copy link
Contributor

ahcorde commented Jul 29, 2020

@osrf-jenkins run tests please

1 similar comment
@chapulina
Copy link
Contributor Author

@osrf-jenkins run tests please

@j-rivero j-rivero self-assigned this Aug 3, 2020
@scpeters
Copy link
Member

scpeters commented Aug 3, 2020

this seems to revert 98a5eb7 from a few years ago

@scpeters
Copy link
Member

scpeters commented Aug 3, 2020

this seems to revert 98a5eb7 from a few years ago

which was part of osrf/gazebo PR 2572:

@scpeters
Copy link
Member

scpeters commented Aug 3, 2020

this seems to revert 98a5eb7 from a few years ago

which was part of osrf/gazebo PR 2572:

cc @iche033

Signed-off-by: Louise Poubel <[email protected]>
@chapulina
Copy link
Contributor Author

this seems to revert 98a5eb7 from a few years ago

This is a forward-port of PR 3195 fixing #2692 on Gazebo 7. That essentially added the static_cast<uint64_t> for Linux and macOS. Since this PR is basically just changing Windows, which was untested on Gazebo 7, I reverted it: bf171c4

@chapulina
Copy link
Contributor Author

This PR is now just fixing a typo and some changelog entries, no code changes.

@chapulina chapulina merged commit 11ebf3d into gazebo9 Aug 4, 2020
@chapulina chapulina deleted the chapulina/7_to_9 branch August 4, 2020 00:20
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
9 Gazebo 9
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants