Commit Graph

9 Commits

Author SHA1 Message Date
John Hsu
401ba1db64 add comment on wood elastic modulus per pull request comment 2015-11-02 13:13:25 -08:00
John Hsu
d8197329cb switch to scientific notation, and add sources. 2015-10-23 15:29:57 -07:00
John Hsu
ab34af1752 add Young's modulus and Poisson's ratio for all the haptix objects 2015-09-09 16:55:51 -07:00
Jackie Kay jacquelinekay1
b4c7d20c75 merged with default 2014-09-30 14:17:28 -07:00
Jackie Kay jacquelinekay1
207e2f9765 Fixed branch ancestry issues, manually applied patch from 9db591d 2014-09-30 14:15:16 -07:00
Steve Peters
dd54a2631b Fix contact parameters for wood blocks 2014-09-22 17:33:07 -07:00
Steve Peters
f6da4739f8 Add erb model templates for wood blocks with wood density of 500 kg/m^3 2014-08-12 13:59:22 -07:00
Nate Koenig
176ffaa41e updates 2014-08-12 13:39:29 -07:00
Nate Koenig
fbf4a970e3 Added models for the ARAT grasp tasks 2014-08-08 11:29:24 -07:00