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.

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

Merge gz-sim7 ➡️ gz-sim8 #2242

Merged
merged 3 commits into from
Nov 13, 2023
Merged

Merge gz-sim7 ➡️ gz-sim8 #2242

merged 3 commits into from
Nov 13, 2023

Conversation

scpeters
Copy link
Member

➡️ Forward port

Port gz-sim7 ➡️ gz-sim8

Branch comparison: gz-sim8...gz-sim7

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

frede791 and others added 3 commits November 9, 2023 18:14
* wind addition to advanced_lift_drag plugin

Signed-off-by: frederik <[email protected]>

* added note on wind

Signed-off-by: frederik <[email protected]>

---------

Signed-off-by: frederik <[email protected]>
Co-authored-by: frederik <[email protected]>
Several systems use const_cast in order to call
sdf::Element::GetElement with const ElementPtrs,
but the FindElement API can be used instead.

Signed-off-by: Steve Peters <[email protected]>
@scpeters scpeters requested a review from mjcarroll as a code owner November 13, 2023 17:25
@github-actions github-actions bot added the 🎵 harmonic Gazebo Harmonic label Nov 13, 2023
@mjcarroll mjcarroll merged commit a30dfff into gz-sim8 Nov 13, 2023
4 checks passed
@mjcarroll mjcarroll deleted the scpeters/merge_7_8 branch November 13, 2023 19:09
@mjcarroll
Copy link
Contributor

@scpeters can you go ahead and do an 8->main as well while we are doing this?

@scpeters
Copy link
Member Author

@scpeters can you go ahead and do an 8->main as well while we are doing this?

#2244

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🎵 harmonic Gazebo Harmonic
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

5 participants