11 ➡️ main #594
Merged
11 ➡️ main #594
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
* Allow to convert URDF color to SDF material tag Signed-off-by: ahcorde <[email protected]> * Added tests Signed-off-by: ahcorde <[email protected]> * make linters happy Signed-off-by: ahcorde <[email protected]> * fixed test Signed-off-by: ahcorde <[email protected]> * Set ambient and diffuse Signed-off-by: ahcorde <[email protected]> * Fixed test integration material tests Signed-off-by: ahcorde <[email protected]> * Ambient and specular value based on the discussion Signed-off-by: ahcorde <[email protected]> * make linters happy Signed-off-by: ahcorde <[email protected]> * make linters happy Signed-off-by: ahcorde <[email protected]>
…th sanitization (gazebosim#578) * Adding comment and modifications to element_tracing test regarding path sanitization Signed-off-by: Aaron Chong <[email protected]> * Referencing github issue 572 Signed-off-by: Aaron Chong <[email protected]> Co-authored-by: Jenn Nguyen <[email protected]>
…osim#582) gazebosim#548 introduced a behavior change on `sdf::Element::FilePath()` for elements loaded from strings. Before that PR, `FilePath()` returned `""` for such elements, but presently, it returns either `data-string` or `<data-string>`. This behavior change could cause failures in downstream applications once released (I know the test `INTEGRATION_save_world` in ign-gazebo will have test failures). Signed-off-by: Addisu Z. Taddese <[email protected]>
Signed-off-by: Addisu Z. Taddese <[email protected]>
chapulina
approved these changes
Jun 16, 2021
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.
➡️ Forward port
Port sdf11 to main
Branch comparison: main...sdf11
Note to maintainers: Remember to Merge with commit (not squash-merge or rebase)