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 6 -> 7 #2447

Merged
merged 4 commits into from
Jun 26, 2024
Merged

Merge 6 -> 7 #2447

merged 4 commits into from
Jun 26, 2024

Conversation

iche033
Copy link
Contributor

@iche033 iche033 commented Jun 17, 2024

➡️ Forward port

Port ign-gazebo6 to gz-sim7

Branch comparison: gz-sim7...ign-gazebo6

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

AzulRadio and others added 2 commits June 13, 2024 09:32
Signed-off-by: youhy <[email protected]>
Signed-off-by: Ian Chen <[email protected]>
Co-authored-by: Ian Chen <[email protected]>
Signed-off-by: Ian Chen <[email protected]>
@github-actions github-actions bot added the 🌱 garden Ignition Garden label Jun 17, 2024
@azeey
Copy link
Contributor

azeey commented Jun 17, 2024

Can we wait until #2398 (comment) is resolved to merge this?

@iche033
Copy link
Contributor Author

iche033 commented Jun 17, 2024

yes this can wait

@azeey azeey mentioned this pull request Jun 18, 2024
9 tasks
This adds a boolean GravityEnabled component to the existing gz/sim/components/Gravity.hh header file, which should be used with Link entities instead of the Vector3 gravity component.

---------

Signed-off-by: Steve Peters <[email protected]>
Signed-off-by: youhy <[email protected]>
Co-authored-by: youhy <[email protected]>
@gazebosim gazebosim deleted a comment from mergify bot Jun 26, 2024
@azeey
Copy link
Contributor

azeey commented Jun 26, 2024

Can we wait until #2398 (comment) is resolved to merge this?
#2451 is merged, so we can move forward with this. Can you update the PR?

Signed-off-by: Ian Chen <[email protected]>
@iche033
Copy link
Contributor Author

iche033 commented Jun 26, 2024

updated

@iche033 iche033 merged commit e71c719 into gz-sim7 Jun 26, 2024
8 of 9 checks passed
@iche033 iche033 deleted the merge_6_7_20240617 branch June 26, 2024 20:34
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🌱 garden Ignition Garden
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

4 participants