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.

Sign up for GitHub

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

Jump to bottom

Merge 9 -> main #1077

Merged
merged 20 commits into from
Oct 9, 2024
Merged

Merge 9 -> main #1077

merged 20 commits into from
Oct 9, 2024

Conversation

iche033
Copy link
Contributor

@iche033 iche033 commented Oct 4, 2024

➡️ Forward port

Port gz-rendering9 to main

Branch comparison: main...gz-rendering9

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

iche033 and others added 19 commits August 25, 2024 18:06
@iche033
Update badges to point to gz-rendering9 branch (#1044)
f8f631a 
Signed-off-by: Ian Chen <[email protected]>
@iche033
Prepare for gz-rendering9.0.0~pre1 release (#1045)
77ef27d 
Signed-off-by: Ian Chen <[email protected]>
@iche033
Prepare for gz-rendering9.0.0~pre2 release (#1046)
22e05d5 
Signed-off-by: Ian Chen <[email protected]>
@avanmalleghem
Fix readme issues (#1051)
6136735 
Signed-off-by: Van Malleghem Antoine <[email protected]>
@azeey
Add Github Action for Windows and fix build (#1049)
3ba2f1e 
Signed-off-by: Addisu Z. Taddese <[email protected]>
@iche033
Fix using lightmap and emissive map together (#1047)
6ec0c52 
Signed-off-by: Ian Chen <[email protected]>
@caguero
Use gz-rendering9 in links and lux_core_engine example (#1053)
12b6a15 
Signed-off-by: Carlos Agüero <[email protected]>
@avanmalleghem @ahcorde
fix prerequisites (#1054)
3ee62e1 
Signed-off-by: Van Malleghem Antoine <[email protected]>
Signed-off-by: Antoine Van Malleghem <[email protected]>
Co-authored-by: Alejandro Hernández Cordero <[email protected]>
@avanmalleghem
Fix install tutorial (#1055)
03060ba 
Signed-off-by: Van Malleghem Antoine <[email protected]>
@peci1
examples/heightmap: Fixed Windows build (#1062)
9c9934f 
Signed-off-by: Martin Pecka <[email protected]>
@peci1
18_simple_demo_tutorial: Add Windows instructions (#1061)
ca37cf0 
Signed-off-by: Martin Pecka <[email protected]>
@iche033
Update homebrew install instruction (#1064)
6cf203d 
Signed-off-by: Ian Chen <[email protected]>
@peci1
examples/depth_camera: Fixed windows usage (#1060)
21993f0 
Signed-off-by: Martin Pecka <[email protected]>
@iche033
Revert "Fix using lightmap and emissive map together (#1047)"
8e42985 
This reverts commit 6ec0c52.
@athenaz2
Add macOS instructions for render_order tutorial (#1069)
8835b39 
Signed-off-by: Athena Z <[email protected]>
@iche033
Merge pull request #1067 from gazebosim/revert_lightmap
c0e7c30 
Revert "Fix using lightmap and emissive map together (#1047)"
@iche033
Update code for loading normal and albedo maps from image data (#1068)
7ef4528 
Signed-off-by: Ian Chen <[email protected]>
@iche033
Prepare for 9.0.0 (#1070)
cd1d3f8 
Signed-off-by: Ian Chen <[email protected]>
@traversaro
Fix installation with GZ_ENABLE_RELOCATABLE_INSTALL=ON (#1071)
a9af984 
By adding the missing DL dependency

Signed-off-by: Silvio Traversaro <[email protected]>
ahcorde
ahcorde reviewed Oct 4, 2024
View reviewed changes
Copy link
Contributor

@ahcorde ahcorde left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Windows CI is broken but we can fix this in a follow up PR

usage: colcon [-h] [--log-base LOG_BASE] [--log-level LOG_LEVEL]
              {build,extension-points,extensions,graph,info,list,metadata,test,test-result,version-check}
              ...
colcon: error: unrecognized arguments: -A x64 -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=OFF

@iche033
Copy link
Contributor Author

iche033 commented Oct 4, 2024

Windows CI is broken but we can fix this in a follow up PR

usage: colcon [-h] [--log-base LOG_BASE] [--log-level LOG_LEVEL]
              {build,extension-points,extensions,graph,info,list,metadata,test,test-result,version-check}
              ...
colcon: error: unrecognized arguments: -A x64 -DCMAKE_BUILD_TYPE=Release -DBUILD_TESTING=OFF

Not sure why it's working on gz-rendering9 branch and not main. Took a quick look, colcon and pixi versions are the same. I also tried merging with #1052 but didn't help. Will continue looking into it

@iche033
update readme
efb4bf5 
Signed-off-by: Ian Chen <[email protected]>
@iche033
Copy link
Contributor Author

iche033 commented Oct 9, 2024

merging this first. Will address windows CI github actions separately

@iche033 iche033 merged commit 115a179 into main Oct 9, 2024
8 of 10 checks passed
@iche033 iche033 deleted the merge_9_main_20241004 branch October 9, 2024 16:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ahcorde ahcorde ahcorde approved these changes

Assignees
No one assigned
Labels
None yet
Projects
Core development
Archived in project
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@iche033 @ahcorde @avanmalleghem @azeey @caguero @peci1 @athenaz2 @traversaro