Skip to content

Commit

Permalink
Merge branch 'ign-gazebo3' into chapulina/3/enable_metrics
Browse files Browse the repository at this point in the history
  • Loading branch information
chapulina authored Aug 27, 2021
2 parents 9b3c319 + c625586 commit 1f5a207
Show file tree
Hide file tree
Showing 36 changed files with 281 additions and 331 deletions.
3 changes: 2 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ find_package(ignition-cmake2 2.8.0 REQUIRED)
#============================================================================
# Configure the project
#============================================================================
ign_configure_project(VERSION_SUFFIX pre2)
ign_configure_project(VERSION_SUFFIX)

#============================================================================
# Set project-specific options
Expand Down Expand Up @@ -178,6 +178,7 @@ if (NOT APPLE)
API_MAINPAGE_MD "${CMAKE_BINARY_DIR}/api.md"
TUTORIALS_MAINPAGE_MD "${CMAKE_BINARY_DIR}/tutorials.md"
ADDITIONAL_INPUT_DIRS "${CMAKE_SOURCE_DIR}/src/systems ${CMAKE_SOURCE_DIR}/src/gui/plugins"
IMAGE_PATH_DIRS "${CMAKE_SOURCE_DIR}/tutorials/files"
TAGFILES
"${IGNITION-MATH_DOXYGEN_TAGFILE} = ${IGNITION-MATH_API_URL}"
"${IGNITION-MSGS_DOXYGEN_TAGFILE} = ${IGNITION-MSGS_API_URL}"
Expand Down
8 changes: 7 additions & 1 deletion Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,13 @@
### Ignition Gazebo 3.X.X (202X-XX-XX)


### Ignition Gazebo 3.9.0 (2021-08-XX)
### Ignition Gazebo 3.9.0 (2021-08-16)

1. Entity tree: prevent creation of repeated entity items
* [Pull request #974](https://github.com/ignitionrobotics/ign-gazebo/pull/974)

1. Don't use $HOME on most tests (InternalFixture)
* [Pull request #971](https://github.com/ignitionrobotics/ign-gazebo/pull/971)

1. Be more specific when looking for physics plugins
* [Pull request #965](https://github.com/ignitionrobotics/ign-gazebo/pull/965)
Expand Down
100 changes: 0 additions & 100 deletions bitbucket-pipelines.yml

This file was deleted.

Loading

0 comments on commit 1f5a207

Please sign in to comment.