gazebo-classic:gazebo10_traversaro_heightmap

Last commit made on 2019-11-23
Get this branch:
git clone -b gazebo10_traversaro_heightmap https://git.launchpad.net/gazebo-classic

Branch merges

Branch information

Name:
gazebo10_traversaro_heightmap
Repository:
lp:gazebo-classic

Recent commits

4b210e5... by Jose Luis Rivero

Import of Silvio Traversaro patch in PR 3130

041fdf1... by Jose Luis Rivero

Import of Silvio Traversaro patch in PR 3130

cbbe263... by Jose Luis Rivero

Merged in traversaro/gazebo-25/Silvio-Traversaro/avoid-to-pass-gcc-style-linker-options-t-1572376156484 (pull request #3141)

Avoid to pass GCC style linker options to Visual Studio Linker

Approved-by: Jose Luis Rivero <email address hidden>
Approved-by: Steve Peters <email address hidden>

16ea612... by Jose Luis Rivero

Merged in traversaro/gazebo-27/Silvio-Traversaro/avoid-conflict-between-winnths-delete-an-1572422376845 (pull request #3143)

Avoid conflict between winnt.h's DELETE and ignition::fuel_tools::REST::DELETE

Approved-by: Louise Poubel <email address hidden>
Approved-by: Nate Koenig <email address hidden>
Approved-by: Jose Luis Rivero <email address hidden>

8ea7ee6... by Jose Luis Rivero

Merged in traversaro/gazebo-19/Silvio-Traversaro/fix-cmake-314-regression-in-msvcpkg_conf-1568579829239 (pull request #3125)

Fix CMake 3.14 regression in MSVC/PKG_CONFIG_FOUND workaround

Approved-by: Steve Peters <email address hidden>
Approved-by: Jose Luis Rivero <email address hidden>

626d1dd... by Jose Luis Rivero

Merged in traversaro/gazebo-20/Silvio-Traversaro/fixes-for-finding-ogre-with-cmake-config-1568580368146 (pull request #3126)

Fixes for finding OGRE with CMake config files

Approved-by: Ian Chen <email address hidden>
Approved-by: Jose Luis Rivero <email address hidden>

2014c1d... by Silvio Traversaro <email address hidden>

Add more detailed comment

fac0694... by SJ

Fix texture loading on OGRE 1.11, 1.12
As per https://github.com/OGRECave/ogre/blob/master/Docs/1.11-Notes.md,
the FreeImage codec got moved to a separate plugin in OGRE 1.11

4e548d7... by Steven Peters

Merged in traversaro/gazebo-26/Silvio-Traversaro/fix-compilation-against-ogre-compiled-in-1572383152352 (pull request #3142)

The Return of Fix compilation against Ogre compiled in debug mode

Approved-by: Ian Chen <email address hidden>
Approved-by: Steve Peters <email address hidden>

b415d2d... by Silvio Traversaro <email address hidden>

Avoid conflict between winnt.h's DELETE and ignition::fuel_tools::REST::DELETE

See https://bitbucket.org/ignitionrobotics/ign-fuel-tools/issues/37/rest-delete-collides-with-delete-defined for the upstream issue.