Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge 13 -> 14 #1316

Merged
merged 24 commits into from
Aug 30, 2023
Merged

Merge 13 -> 14 #1316

merged 24 commits into from
Aug 30, 2023

Commits on May 29, 2023

  1. adding sdf::Error to public functions 

    Signed-off-by: Marco A. Gutierrez <[email protected]>
    Marco A. Gutierrez committed May 29, 2023
    Configuration menu
    Copy the full SHA
    f9e5aab View commit details
    Browse the repository at this point in the history

  2. fix line size errors 

    Signed-off-by: Marco A. Gutierrez <[email protected]>
    Marco A. Gutierrez committed May 29, 2023
    Configuration menu
    Copy the full SHA
    d4b3a1e View commit details
    Browse the repository at this point in the history

  3. more function updates to return sdf::Errors 

    Signed-off-by: Marco A. Gutierrez <[email protected]>
    Marco A. Gutierrez committed May 29, 2023
    Configuration menu
    Copy the full SHA
    d8642f0 View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2023

  1. Merge branch 'sdf13' into sdf_error_parser 

    Signed-off-by: Marco A. Gutierrez <[email protected]>
    Marco A. Gutierrez committed Jun 21, 2023
    Configuration menu
    Copy the full SHA
    8b39a4c View commit details
    Browse the repository at this point in the history

Commits on Jun 22, 2023

  1. Testing parser errors are not printed 

    Signed-off-by: Marco A. Gutierrez <[email protected]>
    Marco A. Gutierrez committed Jun 22, 2023
    Configuration menu
    Copy the full SHA
    a708ab1 View commit details
    Browse the repository at this point in the history

  2. Fix typo 

    Signed-off-by: Marco A. Gutierrez <[email protected]>
    Marco A. Gutierrez committed Jun 22, 2023
    Configuration menu
    Copy the full SHA
    49952ca View commit details
    Browse the repository at this point in the history

  3. Fixing linting errors 

    Signed-off-by: Marco A. Gutierrez <[email protected]>
    Marco A. Gutierrez committed Jun 22, 2023
    Configuration menu
    Copy the full SHA
    85bd244 View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2023

  1. Removing somee overloads and extra enums 

    Signed-off-by: Marco A. Gutierrez <[email protected]>
    Marco A. Gutierrez committed Jun 27, 2023
    Configuration menu
    Copy the full SHA
    1d7ff47 View commit details
    Browse the repository at this point in the history

  2. Fix missing spaces 

    Co-authored-by: Addisu Z. Taddese <[email protected]>
Signed-off-by: Marco A. Gutierrez <[email protected]>
    @azeey
    Marco A. Gutierrez and azeey committed Jun 27, 2023
    Configuration menu
    Copy the full SHA
    b3e55a8 View commit details
    Browse the repository at this point in the history

  3. Update test/integration/includes.cc 

    Co-authored-by: Addisu Z. Taddese <[email protected]>
Signed-off-by: Marco A. Gutierrez <[email protected]>
    @azeey
    Marco A. Gutierrez and azeey authored Jun 27, 2023
    Configuration menu
    Copy the full SHA
    eb56ca8 View commit details
    Browse the repository at this point in the history

  4. Update src/parser.cc 

    Co-authored-by: Addisu Z. Taddese <[email protected]>
Signed-off-by: Marco A. Gutierrez <[email protected]>
    @azeey
    Marco A. Gutierrez and azeey authored Jun 27, 2023
    Configuration menu
    Copy the full SHA
    7c7f630 View commit details
    Browse the repository at this point in the history

  5. add emplace_back and fix test 

    Signed-off-by: Marco A. Gutierrez <[email protected]>
    Marco A. Gutierrez committed Jun 27, 2023
    Configuration menu
    Copy the full SHA
    03b9864 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'sdf_error_parser' of github.com:gazebosim/sdformat into… 

    … sdf_error_parser
    Marco A. Gutierrez committed Jun 27, 2023
    Configuration menu
    Copy the full SHA
    ce20514 View commit details
    Browse the repository at this point in the history

Commits on Jul 15, 2023

  1. Merge branch 'sdf13' into sdf_error_parser

    @mjcarroll
    mjcarroll authored Jul 15, 2023
    Configuration menu
    Copy the full SHA
    ff1e93e View commit details
    Browse the repository at this point in the history

Commits on Aug 16, 2023

  1. moving output params first, removing POINTER_ERROR 

    Signed-off-by: Marco A. Gutierrez <[email protected]>
    Marco A. Gutierrez committed Aug 16, 2023
    Configuration menu
    Copy the full SHA
    30671a5 View commit details
    Browse the repository at this point in the history

  2. moving output params first 

    Signed-off-by: Marco A. Gutierrez <[email protected]>
    Marco A. Gutierrez committed Aug 16, 2023
    Configuration menu
    Copy the full SHA
    973e91c View commit details
    Browse the repository at this point in the history

  3. Merge branch 'sdf13' into sdf_error_parser

    Marco A. Gutierrez authored Aug 16, 2023
    Configuration menu
    Copy the full SHA
    d1e1fe3 View commit details
    Browse the repository at this point in the history

Commits on Aug 23, 2023

  1. Suggestions for #1294 

    Signed-off-by: Addisu Z. Taddese <[email protected]>
    @azeey
    azeey committed Aug 23, 2023
    Configuration menu
    Copy the full SHA
    f22c655 View commit details
    Browse the repository at this point in the history

Commits on Aug 24, 2023

  1. Merge pull request #1314 from gazebosim/azeey/sdf_error_parser_sugges… 

    …tions

Suggestions for #1294
    @marcoag
    marcoag authored Aug 24, 2023
    Configuration menu
    Copy the full SHA
    a6324e4 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'sdf13' into sdf_error_parser

    @azeey
    azeey authored Aug 24, 2023
    Configuration menu
    Copy the full SHA
    fe2c105 View commit details
    Browse the repository at this point in the history

Commits on Aug 25, 2023

  1. Merge pull request #1294 from gazebosim/sdf_error_parser 

    Update functions in parser.cc to use sdf::Errors output.
    @marcoag
    marcoag authored Aug 25, 2023
    Configuration menu
    Copy the full SHA
    b999425 View commit details
    Browse the repository at this point in the history

Commits on Aug 30, 2023

  1. Use relative path in an urdf include to avoid confusion between inter… 

    …nal and system headers (#1259)

Signed-off-by: Jose Luis Rivero <[email protected]>
    @j-rivero
    j-rivero authored Aug 30, 2023
    Configuration menu
    Copy the full SHA
    9f7a377 View commit details
    Browse the repository at this point in the history

  2. Prepare for 13.6.0 Release (#1315) 

    Signed-off-by: Addisu Z. Taddese <[email protected]>
Signed-off-by: Steve Peters <[email protected]>
Co-authored-by: Steve Peters <[email protected]>
    @azeey @scpeters
    azeey and scpeters authored Aug 30, 2023
    Configuration menu
    Copy the full SHA
    f425694 View commit details
    Browse the repository at this point in the history

  3. merge from sdf13 

    Signed-off-by: Ian Chen <[email protected]>
    @iche033
    iche033 committed Aug 30, 2023
    Configuration menu
    Copy the full SHA
    f7b355f View commit details
    Browse the repository at this point in the history