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: 7 -> 8 #933

Merged
merged 8 commits into from
Oct 10, 2023
Merged

Merge: 7 -> 8 #933

merged 8 commits into from
Oct 10, 2023

Conversation

iche033
Copy link
Contributor

@iche033 iche033 commented Oct 10, 2023

➡️ Forward port

Port gz-rendering7 to gz-rendering8

Branch comparison: gz-rendering8...gz-rendering7

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

iche033 and others added 8 commits October 3, 2023 14:39
Updated actions/checkout to v4

Signed-off-by: mosfet80 <[email protected]>
* Extend ogre 1.x shaders to support constants and textures
* add waves integration test

---------

Signed-off-by: Ian Chen <[email protected]>
@github-actions github-actions bot added the 🎵 harmonic Gazebo Harmonic label Oct 10, 2023
@codecov
Copy link

codecov bot commented Oct 10, 2023

Codecov Report

Merging #933 (795cd72) into gz-rendering8 (22b2bbf) will increase coverage by 0.37%.
The diff coverage is 100.00%.

❗ Current head 795cd72 differs from pull request most recent head c27ebce. Consider uploading reports for the commit c27ebce to get more accurate results

@@                Coverage Diff                @@
##           gz-rendering8     #933      +/-   ##
=================================================
+ Coverage          75.18%   75.55%   +0.37%     
=================================================
  Files                177      177              
  Lines              16879    16882       +3     
=================================================
+ Hits               12690    12755      +65     
+ Misses              4189     4127      -62     
Files Coverage Δ
ogre2/src/Ogre2Material.cc 84.76% <100.00%> (+8.68%) ⬆️

@azeey azeey merged commit c42123e into gz-rendering8 Oct 10, 2023
7 checks passed
@azeey azeey deleted the merge_7_8_20231010 branch October 10, 2023 20:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🎵 harmonic Gazebo Harmonic
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

3 participants