Merge remote-tracking branch 'upstream/master'

This commit is contained in:
yunfeibai
2017-03-29 15:06:15 -07:00
77 changed files with 2213 additions and 1218 deletions

View File

@@ -71,9 +71,9 @@
</visual>
<collision>
<geometry>
<box size=".03 .03 .02"/>
<box size=".03 .01 .02"/>
</geometry>
<origin rpy="0.0 0 0" xyz="0.105 0.00495 0"/>
<origin rpy="0.0 0.0 0" xyz="0.105 -0.005 0"/>
</collision>
<inertial>
<mass value="0.1"/>
@@ -130,10 +130,17 @@
</visual>
<collision>
<geometry>
<box size=".03 .03 .02"/>
<box size=".03 .01 .02"/>
</geometry>
<origin rpy="-3.1415 0 0" xyz="0.105 0.00495 0"/>
<origin rpy="-3.1415 0 0" xyz="0.105 0.015 0"/>
</collision>
<collision>
<geometry>
<box size=".01 .02 .02"/>
</geometry>
<origin rpy="-3.1415 0 -0.5" xyz="0.095 0.005 0"/>
</collision>
<inertial>
<mass value="0.1"/>
<inertia ixx="1.0" ixy="0.0" ixz="0.0" iyy="1.0" iyz="0.0" izz="1.0"/>