Merge branch 'ign-gazebo3' into viz_collisions

gazebosim · Jan 21, 2021 · e49f875 · e49f875
2 parents dbf7a0c + 8998740
commit e49f875
Show file tree

Hide file tree

Showing 85 changed files with 1,086 additions and 1,031 deletions.
diff --git a/examples/scripts/distributed/secondary.sdf b/examples/scripts/distributed/secondary.sdf
@@ -28,6 +28,7 @@
           <geometry>
             <plane>
               <normal>0 0 1</normal>
+              <size>100 100</size>
             </plane>
           </geometry>
         </collision>

diff --git a/examples/scripts/distributed/standalone.sdf b/examples/scripts/distributed/standalone.sdf
@@ -108,6 +108,7 @@
           <geometry>
             <plane>
               <normal>0 0 1</normal>
+              <size>100 100</size>
             </plane>
           </geometry>
         </collision>