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

3 ➡️ 4 #84

Closed
wants to merge 92 commits into from
Closed

3 ➡️ 4 #84

wants to merge 92 commits into from

Conversation

chapulina
Copy link
Contributor

No description provided.

chapulina and others added 30 commits December 2, 2019 12:57
@chapulina
Custom paths with file URIs
f9faf2a
@chapulina
[WIP] Handle unexpected COLLADA more gracefully
a777676
@chapulina
Merged ign-common3 into collada_catch_errors
5f9a390
@luca-della-vedova
Add API for texture based alpha rendering
9f91d31
@luca-della-vedova
Fix codecheck
6ed0baa
@scpeters
changelog
5d989a9
@luca-della-vedova
Change API for texture alpha, add unit test
7370f61
@luca-della-vedova
Add changelog
8f34ab3
@iche033
Close branch transparent_texture_common3
ece1b77
@iche033
Merged in transparent_texture_common3 (pull request #221)
e6d42bf 
Support for alpha based texture rendering

Approved-by: Louise Poubel <lupoubel@hotmail.com>
Approved-by: Ian Chen <ichen@osrfoundation.org>
@iche033
prepare for 3.4.0 pre1 release
9cb290e
@iche033
Close branch bump_3.4_pre1
4c95ab4
@iche033
Merged in bump_3.4_pre1 (pull request #222)
582a575 
Prepare for 3.4.0-pre1 prerelease

Approved-by: Louise Poubel <lupoubel@hotmail.com>
@iche033
Added tag ignition-common3_3.4.0~pre1 for changeset f9ec9eb153a2
07938bb
@iche033
add function to return node anim by name
e613cbb
@iche033
changelog
6eca6e6
@scpeters
add lines to test confirming NodeAnimation name
35c909a
@chapulina
Close branch node_anim
472665f
@chapulina
Merged in node_anim (pull request #223)
0a95d3e 
Add function to get NodeAnimation

Approved-by: Louise Poubel <lupoubel@hotmail.com>
Approved-by: Steve Peters <scpeters@osrfoundation.org>
@chapulina
add tests for env + URI
25e0880
@chapulina
Merged ign-common3 into custom_paths_uri
f702898
@chapulina
Support custom callbacks to find files on global interface
becd409
@chapulina
changelog, PR feedback and windows
05ce4cc
@chapulina
merged from custom_paths_uri
ba1fa76
@chapulina
don't normalize path because that doesn't work on Windows
4b45544
@chapulina
Close branch findFileCb
b32ce42
@chapulina
Merged in findFileCb (pull request #226)
28ac3f9 
Support custom callbacks to find files on global interface

Approved-by: Ian Chen <ichen@osrfoundation.org>
Approved-by: Nate Koenig <natekoenig@gmail.com>
@chapulina
trying more things to satisfy windows
14439f3
@chapulina
fix test expectations for windows
ef469e2
@chapulina
fixing cases which were broken on windows before
7010bb6
scpeters and others added 14 commits May 22, 2020 22:37
@scpeters
Update to gtest 1.10.0
458fb84 
Signed-off-by: Steve Peters <scpeters@openrobotics.org>
@scpeters
patch gtest.cc to suppress gcc warnings
381e65c 
Signed-off-by: Steve Peters <scpeters@openrobotics.org>
@iche033
Fix ColladaLoader loading <transparent> tag when <transparency> does …
a3ac618 
…not exist (#68)

* fix loading <transparent> when <transparency> does not exist

Signed-off-by: Ian Chen <ichen@osrfoundation.org>
@traversaro
Remove unused included headers (#71)
15b2974 
Signed-off-by: Silvio Traversaro <silvio.traversaro@iit.it>
Signed-off-by: Silvio <silvio.traversaro@iit.it>
@scpeters
Add heightmap_flat_NxN.png files
ae2209c 
Useful for testing heightmap loading time.

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
@scpeters
Image performance test for computing MaxColor
cc77cb0 
Signed-off-by: Steve Peters <scpeters@openrobotics.org>
@scpeters
Refactor Image::MaxColor to increase speed
f685e43 
Copy implementation of Image::Pixel(...) into Image::MaxColor()
to improve performance.

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
@scpeters
Changelog for #66, #67, #71
3d54f5d 
Signed-off-by: Steve Peters <scpeters@openrobotics.org>
@chapulina
More file path APIs (#70)
7957176 
Signed-off-by: Louise Poubel <louise@openrobotics.org>
@chapulina
Bump to 3.6.0 (#72)
3627f7d 
Signed-off-by: Louise Poubel <louise@openrobotics.org>
@nkoenig
Fix hierarchical submesh processing in the ColladaLoader. (#78)
d6f7d2d 
Fix hierarchical submesh processing in the ColladaLoader. #78

Signed-off-by: Nate Koenig <nate@openrobotics.org>
@adlarkin
Fixed the AudioDecoder class (#81)
851aae0 
* fixed existing AudioDecoder unit tests

Signed-off-by: Ashton Larkin <ashton@openrobotics.org>

* handled possible seg fault by using AudioDecoder without calling SetFile

Signed-off-by: Ashton Larkin <ashton@openrobotics.org>
@chapulina
Fix actions CI ✨ (#83)
3ac1020 
Signed-off-by: Louise Poubel <louise@openrobotics.org>
@chapulina
3 to 4
cfa4314 
Signed-off-by: Louise Poubel <louise@openrobotics.org>
@chapulina chapulina requested a review from mjcarroll as a code owner August 1, 2020 02:00
@chapulina
?!
813c465 
Signed-off-by: Louise Poubel <louise@openrobotics.org>
@mjcarroll
Copy link
Contributor

CI is very unhappy. :(

@chapulina chapulina self-assigned this Aug 3, 2020
@chapulina
Copy link
Contributor Author

CI is very unhappy. :(

Ok, there are some conflicts with PR 213 which will need some love.

@chapulina chapulina changed the base branch from master to main October 3, 2020 01:10
@chapulina
Copy link
Contributor Author

Closing in favor of #104

@chapulina chapulina closed this Oct 14, 2020
@chapulina chapulina deleted the chapulina/3_to_4 branch October 14, 2020 21:48
@mjcarroll mjcarroll mentioned this pull request Oct 14, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mjcarroll mjcarroll Awaiting requested review from mjcarroll

Assignees

@chapulina chapulina

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@chapulina @mjcarroll @luca-della-vedova @scpeters @iche033 @traversaro @nkoenig @adlarkin