561 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Jackie Kay jacquelinekay1	0477ba4fa1	Modified cup thickness	2014-10-01 15:59:44 -07:00
Jackie Kay jacquelinekay1	6953e5064f	Added .wings files for each new mesh	2014-10-01 15:50:17 -07:00
Jackie Kay jacquelinekay1	9fda027dc7	Fixed washer inertia	2014-10-01 15:26:16 -07:00
Jackie Kay jacquelinekay1	12f05e1530	fixed washer material	2014-10-01 15:24:28 -07:00
Jackie Kay jacquelinekay1	fafbf36ae7	Added materials for new models	2014-10-01 15:14:44 -07:00
Jackie Kay jacquelinekay1	37a72e942d	merged with arat_meshes	2014-10-01 15:00:23 -07:00
Jackie Kay jacquelinekay1	d02b51f2f5	Merged with case_meshes	2014-10-01 14:59:42 -07:00
Jackie Kay jacquelinekay1	6be2a5bcac	Final merge resolution commit	2014-10-01 14:01:28 -07:00
Jackie Kay jacquelinekay1	8dd5555aa4	Fixed the cup	2014-10-01 13:58:51 -07:00
Jackie K	7dd4d3a298	resolved conflict in tube_2_25cm	2014-10-01 20:57:42 +00:00
Jackie K	900ceead6a	more conflict resolution	2014-10-01 20:57:08 +00:00
Jackie K	c2e02a6bd1	resolved conflict in marble sdf	2014-10-01 20:56:38 +00:00
Jackie K	664b612f1b	model.rsdf edited online with Bitbucket	2014-10-01 20:55:43 +00:00
Jackie Kay jacquelinekay1	c4260e5bc5	Cleaned up leftover comments	2014-10-01 13:54:17 -07:00
Jackie Kay jacquelinekay1	bc6c38d694	actually removed the stuff. sorry, i am still getting used to mercurial.	2014-10-01 13:47:55 -07:00
Jackie Kay jacquelinekay1	e2f68bda85	Cleaned up redundant .sdf file, materials and meshes	2014-10-01 13:44:25 -07:00
Jackie Kay jacquelinekay1	dfc782e9b2	added mesh for 9.5mm tube	2014-10-01 13:36:31 -07:00
Jackie Kay jacquelinekay1	98518de5b6	Added meshes for metal case base and top	2014-10-01 13:35:26 -07:00
Jackie Kay jacquelinekay1	4d34dafc63	stl files	2014-10-01 13:29:40 -07:00
Jackie Kay jacquelinekay1	3391dd4c26	Added meshes for tubes, washer and cup	2014-10-01 13:28:45 -07:00
Jackie K	9636af2895	Merged in mass_update_2 (pull request #94) ... Mass update	2014-09-30 16:16:09 -07:00
Jackie K	798724262c	Close branch mass_update_2	2014-09-30 16:16:09 -07:00
Jackie Kay jacquelinekay1	dd98e9557b	Fixed inertial calculations in pegs and erb'd files for tube and cup	2014-09-30 15:34:34 -07:00
Jackie Kay jacquelinekay1	94b0bdf878	Added peg board	2014-09-30 15:18:35 -07:00
Jackie Kay jacquelinekay1	aa54581221	Cleaned up comments	2014-09-30 14:24:46 -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
Jackie Kay jacquelinekay1	d068431160	merging with mass_update	2014-09-30 14:00:11 -07:00
Jackie Kay jacquelinekay1	d09a4b0241	fixed some cylindrical models	2014-09-30 13:30:43 -07:00
Jackie Kay jacquelinekay1	0c7fedf849	added peg board	2014-09-30 13:28:56 -07:00
Jackie Kay jacquelinekay1	296b338190	made wooden box non-static and fixed joints	2014-09-30 10:54:43 -07:00
Jackie Kay jacquelinekay1	2eced92ca7	Added ARAT wooden carrying box and small metal case	2014-09-30 09:30:49 -07:00
James Taylor	191c56b7e8	moved ur_description to ur10_description	2014-09-29 18:15:53 -04:00
jacquelinekay	84eb85b642	Fixed flying wheel valves for now	2014-09-26 12:20:03 -07:00
jacquelinekay	b17b404d94	Moved DRC ladders from drcsim to this database	2014-09-26 10:33:41 -07:00
jacquelinekay	1a3668badb	fixed some stuff	2014-09-25 17:24:04 -07:00
jacquelinekay	4caf75c15b	Added weighted door	2014-09-25 17:19:51 -07:00
jacquelinekay	8198866b1a	Added door without threshold for DRC Task 5	2014-09-25 15:23:35 -07:00
jacquelinekay	631259ebd5	Modified cinder_block_wide	2014-09-25 13:52:46 -07:00
jacquelinekay	62bae9cf9a	disabled collisions on cinder_block_wide	2014-09-24 18:10:22 -07:00
Steven Peters	de13593f7e	Merged in wood_blocks_contact (pull request #87) ... Fix contact parameters for wood blocks	2014-09-24 09:05:09 -07:00
Steven Peters	bc4646baaa	Close branch wood_blocks_contact	2014-09-24 09:05:09 -07:00
jacquelinekay	93d99276ca	Changed wheel valve walls to reflect specifications in DRC Trials Task Description	2014-09-23 17:59:37 -07:00
Steve Peters	dd54a2631b	Fix contact parameters for wood blocks	2014-09-22 17:33:07 -07:00
Steven Peters	f34fd1ee17	Merged in cricket_ball_inertia (pull request #85) ... Add erb model of cricket ball with updated inertia computation	2014-09-22 17:26:27 -07:00
Steven Peters	4fba08cd1f	Close branch cricket_ball_inertia	2014-09-22 17:26:27 -07:00
Jackie K	369ba0f314	Merged spherical_inertia_fix into default	2014-09-22 09:52:13 -07:00
jacquelinekay	85ec34ecbe	Updating ball bearing and marble	2014-09-22 09:50:01 -07:00
jacquelinekay	a4c064dd1f	Added spherical ARAT objects inertia fix	2014-09-19 11:59:31 -07:00
Steve Peters	2a8c8659d2	Add erb model of cricket ball with updated inertia computation	2014-09-18 15:30:29 -07:00