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

Merged
merged 25 commits into from
Aug 5, 2024
Merged

Merge gz-gui8 ➡️ main #632

merged 25 commits into from
Aug 5, 2024

Conversation

azeey
Copy link
Contributor

@azeey azeey commented Jul 31, 2024

➡️ Forward port

Port gz-gui8 ➡️ main

Branch comparison: main...gz-gui8

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

traversaro and others added 24 commits June 13, 2023 08:34
Signed-off-by: Martin Pecka <[email protected]>
Signed-off-by: Jenn Nguyen <[email protected]>
Co-authored-by: Silvio Traversaro <[email protected]>
Co-authored-by: Ian Chen <[email protected]>
Co-authored-by: Jenn Nguyen <[email protected]>
Co-authored-by: Jenn Nguyen <[email protected]>
* Use on `push` only on stable branches to avoid duplicate runs
* Update project automation

Signed-off-by: Addisu Z. Taddese <[email protected]>
Signed-off-by: Jenn Nguyen <[email protected]>
Signed-off-by: Addisu Z. Taddese <[email protected]>
GCC-13 is complaining about "pointers returned from a mismatched
allocation function" in the UNIT_ImageDisplay_TEST. There are
3 occurences where a shared pointer is created from a simple
type while the object handled is really a C array.

The commit changes the type to indicate that it is in fact
an array.

Signed-off-by: Jose Luis Rivero <[email protected]>
Signed-off-by: Addisu Z. Taddese <[email protected]>
…#619)

Signed-off-by: Benjamin Perseghetti <[email protected]>
Co-authored-by: Alejandro Hernández Cordero <[email protected]>
Signed-off-by: Benjamin Perseghetti <[email protected]>
Replaces the gamma correction QML element and instead tells Qt to copy the texture as is without decoding from srgb->rgb. 
---------

Signed-off-by: Addisu Z. Taddese <[email protected]>
@azeey azeey requested a review from jennuine as a code owner July 31, 2024 22:39
@github-actions github-actions bot added the 🏛️ ionic Gazebo Ionic label Jul 31, 2024
Signed-off-by: Addisu Z. Taddese <[email protected]>
@azeey azeey added the beta Targeting beta release of upcoming collection label Jul 31, 2024
@azeey azeey merged commit c4f3ddc into gazebosim:main Aug 5, 2024
8 checks passed
@azeey azeey deleted the 8_to_9 branch August 5, 2024 21:41
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 🏛️ ionic Gazebo Ionic
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

9 participants