Merge pull request #1030 from erwincoumans/master

friction anchors, arm64 premake
2017-03-20 11:48:44 -07:00
parent 3532762cdc 0b017b0f53
commit cb08d077f0
19 changed files with 300 additions and 92 deletions
--- a/data/cube_soft.urdf
+++ b/data/cube_soft.urdf
@@ -2,7 +2,8 @@
 <robot name="cube.urdf">
  <link name="baseLink">
    <contact>
-      <lateral_friction value="1.0"/>
+      <friction_anchor/>
+      <lateral_friction value="1.3"/>
      <rolling_friction value="0.0"/>
      <stiffness value="300"/>
      <damping value="10"/>