Merge branch 'master' into collision-tags

code-iai · Nov 2, 2021 · 094d308 · 094d308
2 parents 4d3d160 + 3c9f98e
commit 094d308
Show file tree

Hide file tree

Showing 25 changed files with 1,400 additions and 529 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 *.fasl
 *.*~
 *.*.swp
+*.vscode
diff --git a/iai_adapters_description/meshes/fwk_fwa_050_simple.dae b/iai_adapters_description/meshes/fwk_fwa_050_simple.dae
diff --git a/iai_boxy_base_2/meshes/base_without_wheels.stl b/iai_boxy_base_2/meshes/base_without_wheels.stl
diff --git a/iai_boxy_base_2/meshes/wheel_back_left.stl b/iai_boxy_base_2/meshes/wheel_back_left.stl
diff --git a/iai_boxy_base_2/meshes/wheel_back_right.stl b/iai_boxy_base_2/meshes/wheel_back_right.stl
diff --git a/iai_boxy_base_2/meshes/wheel_front_left.stl b/iai_boxy_base_2/meshes/wheel_front_left.stl
diff --git a/iai_boxy_base_2/meshes/wheel_front_right.stl b/iai_boxy_base_2/meshes/wheel_front_right.stl
diff --git a/iai_boxy_base_2/robots/base.URDF b/iai_boxy_base_2/robots/base.URDF
diff --git a/iai_boxy_base_2/robots/base.URDF.xacro b/iai_boxy_base_2/robots/base.URDF.xacro