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 sdf9 ➡️ sdf12 #1016

Merged
merged 5 commits into from
May 13, 2022
Merged

Merge sdf9 ➡️ sdf12 #1016

merged 5 commits into from
May 13, 2022

Conversation

chapulina
Copy link
Contributor

➡️ Forward port

Port sdf9 ➡️ sdf12

Branch comparision: sdf12...sdf9

Note to maintainers: Remember to Merge with commit (not squash-merge or rebase)

WilliamLewww and others added 4 commits April 22, 2022 10:16
@WilliamLewww
Added <shininess> to <material> (#985)
0f9b771 
Signed-off-by: William Lew <WilliamMilesLew@gmail.com>
@chapulina @ahcorde @scpeters
Polyline geometry DOM (#1000)
52ce8fb 
Signed-off-by: Louise Poubel <louise@openrobotics.org>
Signed-off-by: Steve Peters <scpeters@openrobotics.org>

Co-authored-by: Alejandro Hernández Cordero <ahcorde@gmail.com>
Co-authored-by: Steve Peters <scpeters@openrobotics.org>
@WilliamLewww
Prepare for 9.8.0 release (#1005)
a978ade 
* Updated CMakeLists and Changelog for release

Signed-off-by: William Lew <WilliamMilesLew@gmail.com>

* Added code suggestions

Signed-off-by: William Lew <WilliamMilesLew@gmail.com>

* Added code suggestion

Signed-off-by: William Lew <WilliamMilesLew@gmail.com>
@chapulina
9 ➡️ 12
b16ac51 
Signed-off-by: Louise Poubel <louise@openrobotics.org>
@chapulina chapulina changed the title Merge sdf9 -> sdf12 Merge sdf9 ➡️ sdf12 May 12, 2022
@chapulina chapulina mentioned this pull request May 12, 2022
Merged
7 tasks
ahcorde
ahcorde approved these changes May 12, 2022
View reviewed changes
Copy link
Collaborator

@ahcorde ahcorde left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, just a minor comment about the CHANGELOG, code is only adding Shininess but I can see many entries, is this right ?

@scpeters
Copy link
Member

LGTM, just a minor comment about the CHANGELOG, code is only adding Shininess but I can see many entries, is this right ?

the changelog entries are from a978ade

scpeters
scpeters previously requested changes May 12, 2022
View reviewed changes
sdf/1.7/material.sdf Show resolved Hide resolved
@osrf-triage osrf-triage added this to Inbox in Core development May 12, 2022
@github-actions github-actions bot added the 🏯 fortress Ignition Fortress label May 12, 2022
@codecov
Copy link

codecov bot commented May 12, 2022 •
edited

Codecov Report

Merging #1016 (04377ad) into sdf12 (5b984ed) will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##            sdf12    #1016   +/-   ##
=======================================
  Coverage   65.38%   65.38%           
=======================================
  Files           2        2           
  Lines          26       26           
=======================================
  Hits           17       17           
  Misses          9        9
Impacted Files Coverage Δ
src/EmbeddedSdf.cc 100.00% <0.00%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 5b984ed...04377ad. Read the comment docs.

@chapulina
Add <shininess> to SDF 1.8 and 1.9 (#1016)
04377ad 
Signed-off-by: Louise Poubel <louise@openrobotics.org>
@chapulina chapulina requested a review from scpeters May 12, 2022 23:15
@chapulina chapulina moved this from Inbox to In review in Core development May 12, 2022
@chapulina chapulina dismissed scpeters’s stale review May 13, 2022 15:32

Ported shininess to 1.8 and 1.9

@chapulina chapulina merged commit aeb9fc0 into sdf12 May 13, 2022
Core development automation moved this from In review to Done May 13, 2022
@chapulina chapulina deleted the chapulina/9_to_12 branch May 13, 2022 15:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ahcorde ahcorde ahcorde approved these changes

@azeey azeey Awaiting requested review from azeey azeey is a code owner

@scpeters scpeters Awaiting requested review from scpeters scpeters is a code owner

Assignees
No one assigned
Labels
🏯 fortress Ignition Fortress
Projects
Core development
Archived in project
Core development
Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@chapulina @scpeters @ahcorde @WilliamLewww