11 ➡️ main #576
Merged
11 ➡️ main #576
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
Signed-off-by: Jenn Nguyen <[email protected]>
…parsers (#562) #475 introduced a regression where included URDFs were being silently ignored when there are no custom parsers available. This returns the behavior back to URDFs being parsed natively by SDFormat if there are no custom parsers. Signed-off-by: Addisu Z. Taddese <[email protected]>
* sdf 1.8: Add <double_sided> to material from #410 * sdf 1.8: Add lightmap to 1.8 spec from #429 * sdf 1.8: document Add L16 camera pixel format from #487 Signed-off-by: Ian Chen <[email protected]> * sdf 1.8: Decrease far clip lower bound from #435 Signed-off-by: Nate Koenig <[email protected]> * sdf 1.8: Added render_order to material from #446 Signed-off-by: ahcorde <[email protected]> * sdf 1.8: Add camera type aliases to docs. from #514 * sdf 1.8: Improve docs of collision_bitmask from #521 Signed-off-by: Martin Pecka <[email protected]> * sdf 1.8: support nested models in @attached_to from #316 Signed-off-by: Steve Peters <[email protected]>
…ror. (#548) * Changing Error API to work with generic path instead of file path Signed-off-by: Aaron Chong <[email protected]> * Added Xml path into API of Error Signed-off-by: Aaron Chong <[email protected]> * Adding XmlPath to errors up till before includes are handled Signed-off-by: Aaron Chong <[email protected]> * Added tests for new API and error messages Signed-off-by: Aaron Chong <[email protected]> * Fixed FilePath argument name in Error Signed-off-by: Aaron Chong <[email protected]> * Added XML path information related API to Element Signed-off-by: Aaron Chong <[email protected]> * Reverting API changes to readXml, XML paths are now embedded in Element Signed-off-by: Aaron Chong <[email protected]> * Cleaned up useless changes Signed-off-by: Aaron Chong <[email protected]> * Lint Signed-off-by: Aaron Chong <[email protected]> * Revert pimpl-izing Element Signed-off-by: Aaron Chong <[email protected]> * Clean up missed out reversions Signed-off-by: Aaron Chong <[email protected]> * Refactored error output stream implementation Signed-off-by: Aaron Chong <[email protected]> * Added example in brief for an XML path in Element API Signed-off-by: Aaron Chong <[email protected]> * Added braces for if else cases Signed-off-by: Aaron Chong <[email protected]> * Revert construction, used setters Signed-off-by: Aaron Chong <[email protected]> * Added line number support to Element Signed-off-by: Aaron Chong <[email protected]> * Fixed code_check error Signed-off-by: Aaron Chong <[email protected]> * Fixed broken XML path in tests Signed-off-by: Aaron Chong <[email protected]> * Added integration test for file path, line number and xml path, fixed missing assignments Signed-off-by: Aaron Chong <[email protected]> * Linting element_tracing Signed-off-by: Aaron Chong <[email protected]> * Elaborating on XML path examples with sample SDF document, linking from Error too Signed-off-by: Aaron Chong <[email protected]> * Changed post-increment to pre-increment Signed-off-by: Aaron Chong <[email protected]> * Changed lincense year of element_tracing tests, removed unused includes Signed-off-by: Aaron Chong <[email protected]> * Reducing number of lines in readXml function Signed-off-by: Aaron Chong <[email protected]> * Removing prefixed / for windows CI Signed-off-by: Aaron Chong <[email protected]> * Removed helper function for clearer failure debugging Signed-off-by: Aaron Chong <[email protected]> * Checking against different file path, as it gets loaded as test_model/model.sdf regardless Signed-off-by: Aaron Chong <[email protected]> * Removed lines unrelated to test case Signed-off-by: Aaron Chong <[email protected]> * Adding minimal path sanitization into findFileCb, reverting to use separated arguments in sdf::testing::TestFile Signed-off-by: Aaron Chong <[email protected]> * Fix linting errors Signed-off-by: Aaron Chong <[email protected]> * Removed unused vector include Signed-off-by: Aaron Chong <[email protected]>
aaronchongth
added
🏯 fortress
azeey
requested changes
May 20, 2021
Signed-off-by: Aaron Chong <[email protected]>
aaronchongth
force-pushed
the
aaron/11-to-main
branch
from
690d143 to
a052027
Compare
azeey
approved these changes
May 24, 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
sdf11tomainBranch comparison: main...sdf11
Note to maintainers: Remember to Merge with commit (not squash-merge or rebase)