Merge branch 'ign-physics4' into link_features_validate_graphs_4

CMakeLists.txt

@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.5.1 FATAL_ERROR)
 #============================================================================
 # Initialize the project
 #============================================================================
-project(ignition-physics4 VERSION 4.1.0)
+project(ignition-physics4 VERSION 4.2.0)
 
 #============================================================================
 # Find ignition-cmake
@@ -13,7 +13,7 @@ find_package(ignition-cmake2 2.8.0 REQUIRED)
 #============================================================================
 # Configure the project
 #============================================================================
-ign_configure_project(VERSION_SUFFIX)
+ign_configure_project(VERSION_SUFFIX pre1)
 
 
 #============================================================================

Changelog.md

@@ -2,6 +2,33 @@
 
 ### Ignition Physics 4.x.x (20XX-XX-XX)
 
+### Ignition Physics 4.2.0 (2021-07-XX)
+
+1. Heightmaps 🏔️
+    * [Pull request #218](https://github.com/ignitionrobotics/ign-physics/pull/218)
+
+1. Added Ellipsoid and Capsule shapes to TPE
+    * [Pull request #203](https://github.com/ignitionrobotics/ign-physics/pull/203)
+
+1. Fix collision detection issue when using joints across nested models
+    * [Pull request #268](https://github.com/ignitionrobotics/ign-physics/pull/268)
+
+1. Use slip compliance APIs available in upstream dartsim release
+    * [Pull request #265](https://github.com/ignitionrobotics/ign-physics/pull/265)
+
+1. Fix DART deprecation warning
+    * [Pull request #263](https://github.com/ignitionrobotics/ign-physics/pull/263)
+
+1. Integrate Bullet engine
+    * [Pull request #208](https://github.com/ignitionrobotics/ign-physics/pull/208)
+
+1. Remove `tools/code_check` and update codecov
+    * [Pull request #257](https://github.com/ignitionrobotics/ign-physics/pull/257)
+
+1. [Citadel] Update tutorials
+    * [Pull request #204](https://github.com/ignitionrobotics/ign-physics/pull/204)
+    * [Pull request #259](https://github.com/ignitionrobotics/ign-physics/pull/259)
+
 ### Ignition Physics 4.1.0 (2021-05-01)
 
 1. [TPE] Update link pose and velocity

Migration.md

@@ -5,6 +5,16 @@ Deprecated code produces compile-time warnings. These warning serve as
 notification to users that their code should be upgraded. The next major
 release will remove the deprecated code.
 
+## Ignition Physics 4.1 to 4.2
+
+### Additions
+
+1. Bullet: new plugin implementation.
+
+1. Heightmap: Feature defined and implemented in dartsim.
+
+1. TPE: Capsule and Ellipsoid shapes added.
+
 ## Ignition Physics 3.X to 4.X
 
 ### Modifications