Commit Graph

558 Commits

Author SHA1 Message Date
Ian Chen
cbe7cc7234 Merged in jersey_barriers (pull request #113)
New drc jersery barrier meshes
2014-12-11 16:08:55 -08:00
Ian Chen
259d3875dc Close branch jersey_barriers 2014-12-11 16:08:55 -08:00
Ian Chen
bd2899da81 remove jersery barrier duplicate vertices 2014-12-11 14:39:00 -08:00
Nathan Koenig
9e7b0fc5ea Merged in cafe (pull request #112)
Added a cafe and cafe tables
2014-12-11 11:23:38 -08:00
Nathan Koenig
76ce53a9c6 Close branch cafe 2014-12-11 11:23:38 -08:00
Nate Koenig
9b4b0cdd2c Raised the floor 2014-12-11 10:20:23 -08:00
Nate Koenig
797afb4d9e Change name 2014-12-11 09:55:47 -08:00
Nate Koenig
d313845620 Minor rename 2014-12-11 08:30:57 -08:00
Nate Koenig
9be0c2cf69 Minor rename 2014-12-11 08:23:56 -08:00
Nate Koenig
3e134cab68 Added a cafe and cafe tables 2014-12-11 08:07:52 -08:00
Nate Koenig
1e7cd686e3 Minor pose change for camera 2014-12-03 16:09:00 -08:00
Nate Koenig
6d7b0fd9bd Fix ur10 model 2014-11-25 10:58:26 -08:00
Nathan Koenig
0c05b31798 Merged in jrtaylor/gazebo_models/ur10 (pull request #92)
Moved ur_description to ur10_description per request
2014-11-25 09:28:04 -08:00
Nathan Koenig
6bb1998385 Close branch ur10 2014-11-25 09:28:04 -08:00
Nathan Koenig
ec5996356e Merged in remove_manifest (pull request #107)
Fixed cinder_block_wide
2014-11-21 09:52:57 -08:00
Nathan Koenig
81af303a6a Close branch remove_manifest 2014-11-21 09:52:57 -08:00
Nate Koenig
60430d513a Renamed cinderblock wide 2014-11-21 09:51:25 -08:00
Nathan Koenig
c795b0d76c Merged in issue_24 (pull request #106)
fix issue #24 and minor updates to physics params
2014-11-21 09:47:10 -08:00
Nathan Koenig
68bcd540e3 Close branch issue_24 2014-11-21 09:47:10 -08:00
Jackie Kay jacquelinekay1
e6f751d674 Fixed cinder block 2014-11-17 13:46:48 -08:00
John Hsu
8c25269100 fix issue #24 and minor updates to physics params 2014-11-11 12:24:54 -08:00
Nathan Koenig
778d166d96 Merged in sphere_rolling_decay (pull request #105)
add half percent angular velocity decay to ball bearing, marble and cricket ball (ARAT spheres).
2014-11-06 10:28:25 -08:00
Nathan Koenig
1d6e6ec145 Close branch sphere_rolling_decay 2014-11-06 10:28:25 -08:00
John Hsu
6ebb49ebae add half percent angular velocity decay to ball bearing, marble and cricket ball (ARAT spheres). 2014-11-04 16:45:01 -08:00
John Hsu
b87725c3e5 merge 2014-11-04 00:10:03 -08:00
John Hsu
98ae99658f merge default 2014-11-04 00:09:54 -08:00
Brian Gerkey
d8fba7b66e Change undefined materials to be grey 2014-11-03 14:34:01 -08:00
Nathan Koenig
b5a2c473fd Merged in round_tin_meshes (pull request #102)
Use denser meshes for round_tin_* models (#20)
2014-11-03 13:27:57 -08:00
Nathan Koenig
2131ebab25 Close branch round_tin_meshes 2014-11-03 13:27:57 -08:00
Steve Peters
d91240fccf Fix material name for round_tin_* bases 2014-10-30 14:14:41 -07:00
Nate Koenig
c83c72fc98 Merged from default 2014-10-29 15:35:44 -07:00
Nate Koenig
e873b67e62 Added missing models 2014-10-29 15:35:09 -07:00
Nathan Koenig
027771438c Merged in issue_21 (pull request #103)
Add wooden_case models with different types of pegs (#21)
2014-10-29 15:33:06 -07:00
Nathan Koenig
73167b4ae7 Close branch issue_21 2014-10-29 15:33:06 -07:00
Steve Peters
433f76a8c2 merge with default 2014-10-29 14:53:40 -07:00
Steve Peters
b12a6a73b6 Remove un-needed pose tags 2014-10-29 14:53:28 -07:00
Nate Koenig
03b142173d Removed tmp install 2014-10-29 10:56:33 -07:00
Nathan Koenig
296f565b02 Merged in fix_cmake (pull request #104)
Fix cmake to include all models
2014-10-29 10:50:37 -07:00
Nathan Koenig
aaf8e3505c Close branch fix_cmake 2014-10-29 10:50:37 -07:00
Nate Koenig
d5ab39ec54 Added Steve's check install shell script 2014-10-29 10:37:39 -07:00
Nate Koenig
552dbf118d Fix cmake to include all models 2014-10-29 10:22:52 -07:00
Steve Peters
87bc295c65 Remove rsdf files that don't actually use erb 2014-10-23 01:46:48 -07:00
Steve Peters
0424e2edb2 Add wooden_case models with different types of pegs 2014-10-23 01:44:52 -07:00
Steve Peters
c28d18d80a Fix round_tin meshes, add contact properties to ball_bearing 2014-10-23 00:46:12 -07:00
Steve Peters
ea2b7cc852 Updated mesh for round_tin_base 2014-10-21 15:52:14 -07:00
Jackie K
31803162a7 Merged in new_door (pull request #89)
New door for Task 5
2014-10-16 15:10:29 -07:00
Jackie K
601b501bfb Close branch new_door 2014-10-16 15:10:29 -07:00
Jackie K
4857ffbc9f Merged in ladders (pull request #101)
DRC Ladders
2014-10-16 10:42:18 -07:00
Jackie K
643fb1e51d Close branch ladders 2014-10-16 10:42:18 -07:00
Jackie Kay jacquelinekay1
cc4d609231 Merged cinder block wide conflict 2014-10-16 09:58:22 -07:00