2 ➡️ 3 (#362)

Signed-off-by: Louise Poubel <louise@openrobotics.org>
gazebosim · Oct 8, 2020 · fc72bfc · fc72bfc
2 parents 9e7f6ae + 0be1bbf
commit fc72bfc
Show file tree

Hide file tree

Showing 34 changed files with 5,497 additions and 74 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -87,7 +87,7 @@ ign_find_package (Qt5
 
 #--------------------------------------
 # Find ignition-physics
-ign_find_package(ignition-physics2 VERSION 2.1
+ign_find_package(ignition-physics2 VERSION 2.3
   COMPONENTS
     mesh
     sdf
@@ -119,7 +119,7 @@ set(IGN_RENDERING_VER ${ignition-rendering3_VERSION_MAJOR})
 
 #--------------------------------------
 # Find ignition-math
-ign_find_package(ignition-math6 REQUIRED COMPONENTS eigen3 VERSION 6.2)
+ign_find_package(ignition-math6 REQUIRED COMPONENTS eigen3 VERSION 6.6)
 set(IGN_MATH_VER ${ignition-math6_VERSION_MAJOR})
 
 #--------------------------------------

diff --git a/Changelog.md b/Changelog.md
@@ -1,5 +1,40 @@
 ## Ignition Gazebo 3.x
 
+### Ignition Gazebo 3.X.X (2020-XX-XX)
+
+1. Added playback scrubber GUI
+    * [Pull Request 299](https://github.com/ignitionrobotics/ign-gazebo/pull/299)
+    * [Pull Request 362](https://github.com/ignitionrobotics/ign-gazebo/pull/362)
+
+1. Added wheel slip system plugin.
+    * [Pull Request 134](https://github.com/ignitionrobotics/ign-gazebo/pull/134)
+    * [Pull Request 357](https://github.com/ignitionrobotics/ign-gazebo/pull/357)
+    * [Pull Request 362](https://github.com/ignitionrobotics/ign-gazebo/pull/362)
+
+1. Enhanced log playback performance.
+    * [Pull Request 351](https://github.com/ignitionrobotics/ign-gazebo/pull/351)
+    * [Pull Request 362](https://github.com/ignitionrobotics/ign-gazebo/pull/362)
+
+1. Tests & Warnings: Qt 5.14, breadcrumbs, Gui, ign_TEST
+    * [Pull Request 327](https://github.com/ignitionrobotics/ign-gazebo/pull/327)
+
+1. Added support for specifying topics to record.
+    * [Pull Request 315](https://github.com/ignitionrobotics/ign-gazebo/pull/315)
+
+1. Make sure OpenGL core profile context is used by GzScene3D.
+    * [Pull Request 339](https://github.com/ignitionrobotics/ign-gazebo/pull/339)
+
+1. Support relative paths for PBR materials
+    * [Pull Request 328](https://github.com/ignitionrobotics/ign-gazebo/pull/328)
+    * [Pull Request 362](https://github.com/ignitionrobotics/ign-gazebo/pull/362)
+
+1. Add file extension automatically for record plugin.
+    * [Pull Request 303](https://github.com/ignitionrobotics/ign-gazebo/pull/303)
+    * [Pull Request 362](https://github.com/ignitionrobotics/ign-gazebo/pull/362)
+
+1. Support spawning during log playback.
+    * [Pull Request 346](https://github.com/ignitionrobotics/ign-gazebo/pull/346)
+
 ### Ignition Gazebo 3.3.0 (2020-08-31)
 
 1. Added marker array service.
@@ -109,6 +144,33 @@
 
 ## Ignition Gazebo 2.x
 
+### Ignition Gazebo 2.25.0 (2020-09-17)
+
+1. Added wheel slip system plugin.
+    * [Pull Request 134](https://github.com/ignitionrobotics/ign-gazebo/pull/134)
+    * [Pull Request 357](https://github.com/ignitionrobotics/ign-gazebo/pull/357)
+
+1. Enhanced log playback performance.
+    * [Pull Request 351](https://github.com/ignitionrobotics/ign-gazebo/pull/351)
+
+1. Tests & Warnings: Qt 5.14, breadcrumbs, Gui, ign_TEST
+    * [Pull Request 327](https://github.com/ignitionrobotics/ign-gazebo/pull/327)
+
+1. Added support for specifying topics to record.
+    * [Pull Request 315](https://github.com/ignitionrobotics/ign-gazebo/pull/315)
+
+1. Make sure OpenGL core profile context is used by GzScene3D.
+    * [Pull Request 339](https://github.com/ignitionrobotics/ign-gazebo/pull/339)
+
+1. Support relative paths for PBR materials
+    * [Pull Request 328](https://github.com/ignitionrobotics/ign-gazebo/pull/328)
+
+1. Add file extension automatically for record plugin.
+    * [Pull Request 303](https://github.com/ignitionrobotics/ign-gazebo/pull/303)
+
+1. Support spawning during log playback.
+    * [Pull Request 346](https://github.com/ignitionrobotics/ign-gazebo/pull/346)
+
 ### Ignition Gazebo 2.24.0 (2020-09-03)
 
 1. Resource env var, with transport interface.

diff --git a/examples/worlds/diff_drive_skid.sdf b/examples/worlds/diff_drive_skid.sdf
@@ -149,7 +149,9 @@
           <surface>
             <friction>
               <ode>
-                <mu>0.01</mu>
+                <mu>0.5</mu>
+                <mu2>1.0</mu2>
+                <fdir1>0 0 1</fdir1>
               </ode>
             </friction>
           </surface>
@@ -190,7 +192,9 @@
           <surface>
             <friction>
               <ode>
-                <mu>5</mu>
+                <mu>0.5</mu>
+                <mu2>1.0</mu2>
+                <fdir1>0 0 1</fdir1>
               </ode>
             </friction>
           </surface>
@@ -231,7 +235,9 @@
           <surface>
             <friction>
               <ode>
-                <mu>0.01</mu>
+                <mu>0.5</mu>
+                <mu2>1.0</mu2>
+                <fdir1>0 0 1</fdir1>
               </ode>
             </friction>
           </surface>
@@ -272,7 +278,9 @@
           <surface>
             <friction>
               <ode>
-                <mu>5</mu>
+                <mu>0.5</mu>
+                <mu2>1.0</mu2>
+                <fdir1>0 0 1</fdir1>
               </ode>
             </friction>
           </surface>