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

Merged
merged 9 commits into from
Sep 28, 2021
Merged

5 ➡️ main #1062

merged 9 commits into from
Sep 28, 2021

Conversation

azeey
Copy link
Contributor

@azeey azeey commented Sep 28, 2021

➡️ 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)

mjcarroll and others added 8 commits September 14, 2021 14:30
…862)

* Support locked entities, and headless video recording using sim time

Signed-off-by: Nate Koenig <[email protected]>

* Spelling

Signed-off-by: Nate Koenig <[email protected]>

* Add bitrate (#864)

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

* Changing Locked name and adding fps

Signed-off-by: Nate Koenig <[email protected]>

* Rename to unpin

Signed-off-by: Nate Koenig <[email protected]>

* Fix codecheck

Signed-off-by: Nate Koenig <[email protected]>

Co-authored-by: Nate Koenig <[email protected]>
Co-authored-by: Ian Chen <[email protected]>
* 4.11.0 release prep

Signed-off-by: Nate Koenig <[email protected]>

* Update Changelog.md

Co-authored-by: Nate Koenig <[email protected]>
`ComponentState::OneTimeChange` was used when updating the
`AxisAlignedBox` and `ContactSensorData` components which causes all
components to be serialized and sent over to state subscribers.

Signed-off-by: Addisu Z. Taddese <[email protected]>
Signed-off-by: Addisu Z. Taddese <[email protected]>
@azeey azeey requested a review from chapulina as a code owner September 28, 2021 04:10
@github-actions github-actions bot added the 🏯 fortress Ignition Fortress label Sep 28, 2021
@codecov
Copy link

codecov bot commented Sep 28, 2021

Codecov Report

Merging #1062 (aff31b5) into main (f8781ab) will increase coverage by 0.06%.
The diff coverage is 90.47%.

❗ Current head aff31b5 differs from pull request most recent head b445b42. Consider uploading reports for the commit b445b42 to get more accurate results
Impacted file tree graph

@@            Coverage Diff             @@
##             main    #1062      +/-   ##
==========================================
+ Coverage   64.01%   64.07%   +0.06%     
==========================================
  Files         255      255              
  Lines       19919    19958      +39     
==========================================
+ Hits        12752    12789      +37     
- Misses       7167     7169       +2     
Impacted Files Coverage Δ
include/ignition/gazebo/EntityComponentManager.hh 100.00% <ø> (ø)
src/ServerPrivate.cc 88.06% <ø> (ø)
src/systems/physics/Physics.cc 70.95% <ø> (ø)
src/EntityComponentManager.cc 85.48% <90.47%> (+0.52%) ⬆️

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 f8781ab...b445b42. Read the comment docs.

src/EntityComponentManager.cc Outdated Show resolved Hide resolved
src/EntityComponentManager.cc Outdated Show resolved Hide resolved
src/EntityComponentManager.cc Show resolved Hide resolved
@chapulina chapulina added beta Targeting beta release of upcoming collection bug Something isn't working labels Sep 28, 2021
Signed-off-by: Addisu Z. Taddese <[email protected]>
@adlarkin
Copy link
Contributor

As a side note, I just read through #997, and it looks like we can close that issue once this PR is merged.

@azeey azeey merged commit 064dacc into main Sep 28, 2021
@azeey azeey deleted the azeey/5_to_main branch September 28, 2021 21:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
beta Targeting beta release of upcoming collection bug Something isn't working 🏯 fortress Ignition Fortress
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants