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

5 ➡️ 6 #970

Merged
merged 23 commits into from
Aug 13, 2021
Merged

5 ➡️ 6 #970

merged 23 commits into from
Aug 13, 2021

Conversation

chapulina
Copy link
Contributor

➡️ Forward port

Port ign-gazebo5 to main

Branch comparison: main...ign-gazebo5

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

🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸🔸

diegoferigo and others added 23 commits August 2, 2021 10:39
Signed-off-by: Louise Poubel <[email protected]>
Signed-off-by: Arjo Chakravarty <[email protected]>
Signed-off-by: Juan Oxoby <[email protected]>

Co-authored-by: Juan Oxoby <[email protected]>
Co-authored-by: Louise Poubel <[email protected]>
Signed-off-by: Louise Poubel <[email protected]>

Edifice to Citadel (#945)

Signed-off-by: Louise Poubel <[email protected]>
Signed-off-by: Louise Poubel <[email protected]>

Co-authored-by: Alejandro Hernández Cordero <[email protected]>
* add enable/disable diffdrive

Signed-off-by: Guillaume Doisy <[email protected]>

* remove debug

Signed-off-by: Guillaume Doisy <[email protected]>

* do not subscribe to enable if topic is empty

Signed-off-by: Guillaume Doisy <[email protected]>

* add test

Signed-off-by: Guillaume Doisy <[email protected]>

* lint and style

Signed-off-by: Guillaume Doisy <[email protected]>

* change enable type to bool and renamed to enabled

Signed-off-by: Guillaume Doisy <[email protected]>
Signed-off-by: cjds <[email protected]>
Signed-off-by: root <[email protected]>
Signed-off-by: Louise Poubel <[email protected]>

Co-authored-by: Alejandro Hernández Cordero <[email protected]>
Co-authored-by: Louise Poubel <[email protected]>
This updates the LiftDrag system so that links in nested models can be referenced in the link_name parameter. This is an example of using the entitiesFromScopedName function in Util.hh

Signed-off-by: Addisu Z. Taddese <[email protected]>
Signed-off-by: Jenn Nguyen <[email protected]>

Co-authored-by: Michael Carroll <[email protected]>
Signed-off-by: Louise Poubel <[email protected]>
Signed-off-by: Louise Poubel <[email protected]>
Signed-off-by: Louise Poubel <[email protected]>
Signed-off-by: Luca Della Vedova <[email protected]>
Signed-off-by: Ian Chen <[email protected]>

Co-authored-by: Ian Chen <[email protected]>
Signed-off-by: Louise Poubel <[email protected]>
Signed-off-by: Louise Poubel <[email protected]>
Signed-off-by: Louise Poubel <[email protected]>
@github-actions github-actions bot added the 🏯 fortress Ignition Fortress label Aug 12, 2021
@chapulina
Copy link
Contributor Author

The CMake warning and failing sensor tests will be fixed by #617 . Merging!

@chapulina chapulina merged commit b40ca3b into main Aug 13, 2021
@chapulina chapulina deleted the chapulina/5_to_6 branch August 13, 2021 17:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🏯 fortress Ignition Fortress
Projects
None yet
Development

Successfully merging this pull request may close these issues.