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-sim8 ➡️ main #2525

Merged
merged 17 commits into from
Aug 14, 2024
Merged

Merge gz-sim8 ➡️ main #2525

merged 17 commits into from
Aug 14, 2024

Conversation

scpeters
Copy link
Member

➡️ Forward port

Port gz-sim8 ➡️ main

Branch comparison: main...gz-sim8

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

shameekganguly and others added 16 commits July 12, 2024 11:16
This test was generating a warning about unused vairables. Unless built
in debug mode, `aserts`are often optimized out we should be using the
`ASSERT` macros from `gtest` instead.

Signed-off-by: Arjo Chakravarty <[email protected]>
n particular if a user despawns an entity, the associated plugin gets removed. This should prevent issues like #2165. TBH I'm not sure if this is the right way forward as a system should technically be able to access any entity in a traditional ECS.

The PR has now been reworked and greatly simplified. All we do is stop all worker threads if an entity is removed and then recreate remaining threads.
* Fix #2458 - checking linkEnity is empty

Signed-off-by: Abhiroop Bhavsar <[email protected]>

* Update src/systems/user_commands/UserCommands.cc

Co-authored-by: Arjo Chakravarty <[email protected]>
Signed-off-by: Abhiroop Bhavsar <[email protected]>

---------

Signed-off-by: Abhiroop Bhavsar <[email protected]>
Signed-off-by: Abhiroop Bhavsar <[email protected]>
Co-authored-by: Arjo Chakravarty <[email protected]>
* Check entity exists before attempting to add system

Signed-off-by: Ian Chen <[email protected]>

* warn to err, add todo

Signed-off-by: Ian Chen <[email protected]>

---------

Signed-off-by: Ian Chen <[email protected]>
* Clarfied description that was not clear due to rename Ignition to Gazebo.

Signed-off-by: Johan Rutgeerts <[email protected]>

* Slight rephrasing for extra clarity.

Signed-off-by: Johan Rutgeerts <[email protected]>

---------

Signed-off-by: Johan Rutgeerts <[email protected]>
Co-authored-by: Addisu Z. Taddese <[email protected]>
Co-authored-by: Ian Chen <[email protected]>
* Use new ModelIdentifier::Url method

---------

Signed-off-by: Michael Carroll <[email protected]>
Co-authored-by: Addisu Z. Taddese <[email protected]>
Co-authored-by: Ian Chen <[email protected]>
@github-actions github-actions bot added the 🏛️ ionic Gazebo Ionic label Aug 14, 2024
@scpeters
Copy link
Member Author

scpeters commented Aug 14, 2024

DCO is unhappy because of d0c0322, but I guess 2994087 doesn't have a sign-off either

@scpeters
Copy link
Member Author

needs gazebosim/gz-fuel-tools#429 to be merged forward

@scpeters
Copy link
Member Author

scpeters commented Aug 14, 2024

@scpeters
Copy link
Member Author

needs gazebosim/gz-fuel-tools#429 to be merged forward

this is merged; manually restarting some CI jobs...

@scpeters
Copy link
Member Author

I'm going to manually ignore the DCO failiure in order to merge this

@scpeters scpeters merged commit 6595a52 into main Aug 14, 2024
8 of 9 checks passed
@scpeters scpeters deleted the scpeters/merge_8_main branch August 14, 2024 20:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🏛️ ionic Gazebo Ionic
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

8 participants