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

Merged
merged 18 commits into from
May 14, 2024
Merged

Merge gz-common5 ➡️ main #610

merged 18 commits into from
May 14, 2024

Conversation

scpeters
Copy link
Member

➡️ Forward port

Port gz-common5 ➡️ main

Branch comparison: main...gz-common5

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

bchoineubility and others added 18 commits March 11, 2024 09:59
Signed-off-by: Addisu Z. Taddese <[email protected]>
Signed-off-by: Shameek Ganguly <[email protected]>
Signed-off-by: Shameek Ganguly <[email protected]>
Signed-off-by: Michael Carroll <[email protected]>
Co-authored-by: Shameek Ganguly <[email protected]>
* Avoid users asking whether the height and elevation functions are the
  same
* Match common conventions like in GDAL to refer to things in "raster"
  coordinates with "pixels" indicating each point on a DEM
* https://gdal.org/tutorials/raster_api_tut.html

Signed-off-by: Ryan Friedman <[email protected]>
Signed-off-by: Addisu Z. Taddese <[email protected]>
Signed-off-by: Addisu Z. Taddese <[email protected]>
Merge ign-common3 ➡️  ign-common4
Signed-off-by: Addisu Z. Taddese <[email protected]>
Merge ign-common4 ➡️  gz-common5
Signed-off-by: Addisu Z. Taddese <[email protected]>
Co-authored-by: Michael Carroll <[email protected]>
Copy link

codecov bot commented May 14, 2024

Codecov Report

Attention: Patch coverage is 84.00000% with 4 lines in your changes are missing coverage. Please review.

Project coverage is 80.54%. Comparing base (149339c) to head (316ea33).
Report is 1 commits behind head on main.

Files Patch % Lines
graphics/src/AssimpLoader.cc 83.33% 4 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main     #610      +/-   ##
==========================================
- Coverage   80.54%   80.54%   -0.01%     
==========================================
  Files          80       80              
  Lines       13579    13588       +9     
==========================================
+ Hits        10937    10944       +7     
- Misses       2642     2644       +2     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@scpeters scpeters merged commit 3930407 into main May 14, 2024
11 checks passed
@scpeters scpeters deleted the scpeters/merge_5_main branch May 14, 2024 11:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

8 participants