Commit Graph

290 Commits

Author SHA1 Message Date
Nate Koenig
e95b34dc36 Updates and merged from scpeters branch 2013-09-05 07:15:29 -07:00
Steve Peters
1286680101 Revert small changes 2013-09-04 18:17:05 -07:00
Steve Peters
7417076a29 Restore some of Nate's changes, reduce scope of link reference to allow for multiple model instances in the world 2013-09-04 18:15:16 -07:00
Steve Peters
b3add8d775 merge with drc_practice_valves 2013-09-04 17:05:56 -07:00
Nate Koenig
28eeef0782 remove useless visuals 2013-09-04 15:32:31 -07:00
Nate Koenig
b3578757ed Fixed walls 2013-09-04 15:24:11 -07:00
Nate Koenig
40598c2dab Fix cmake 2013-09-04 13:59:49 -07:00
Nate Koenig
a62c638b32 Merged from default 2013-09-04 13:54:20 -07:00
Nate Koenig
13d8e887da Updated cmakelists 2013-09-04 13:51:39 -07:00
Nathan Koenig
30a9baa2d2 Merged in drcpractice_road (pull request #52)
Models used for DRC Practice driving task
2013-09-04 13:23:18 -07:00
Steve Peters
5721b7016f Update ball valve inertial properties, joint damping, reinstate attachment collision, and connect joint to attachment link instead of world 2013-09-04 12:01:23 -07:00
Nate Koenig
6472a72e43 Removed road course 2013-09-04 10:58:24 -07:00
Nathan Koenig
f19fff6f03 CMakeLists.txt edited online with Bitbucket 2013-09-04 17:41:06 +00:00
Nate Koenig
dca77a35a3 Added valve walls 2013-08-28 09:50:21 -07:00
Nate Koenig
c596b236c9 New valves 2013-08-27 15:58:01 -07:00
Nate Koenig
4334410542 Added ball valve 2013-08-27 13:46:57 -07:00
Nate Koenig
79c6b84ebf Merged from default 2013-08-14 14:51:56 -07:00
Nate Koenig
4dec565d7f Added angled barrier model 2013-08-14 14:45:16 -07:00
Nate Koenig
5b8e719e46 Adding drc practice models 2013-08-14 09:19:18 -07:00
Nathan Koenig
dbab1048e1 Merged in drc_practice (pull request #50)
Added first set of DRC practice models
2013-08-12 15:13:28 -07:00
Nate Koenig
ee83b5e715 Added road course to CMakeLists.txt 2013-08-12 09:19:57 -07:00
Nate Koenig
5980241dd1 Added DRC road course model 2013-08-12 09:19:15 -07:00
Nate Koenig
ec7d26e6c5 Fixed angled block 2013-08-12 08:39:11 -07:00
Nate Koenig
1144b81e2f Updated truss inertia 2013-08-12 08:33:06 -07:00
Nate Koenig
c3e1c235e8 Rotated textures 2013-08-09 08:36:44 -07:00
Steve Peters
422bd9361a Added inertia values to truss model 2013-08-08 13:42:10 -07:00
Nate Koenig
7a68af172f Update to drc practice ladder 2013-08-07 15:53:22 -07:00
Nate Koenig
6a60263b6b Added DRC practice ladder 2013-08-07 15:36:38 -07:00
Nate Koenig
1bb2482e48 Name fixes 2013-08-07 15:31:05 -07:00
Nate Koenig
e05a8d17cc Added first set of DRC practice models 2013-08-07 14:46:13 -07:00
Dave Coleman
96c659d5ce Merged in move_the_sun (pull request #48)
Put the sun in front of objects
2013-06-07 11:44:23 -07:00
Dave Coleman
50212077f4 Put the sun in front of objects 2013-06-06 11:16:31 -07:00
Nathan Koenig
57180511c9 Merged in pioneer3at (pull request #46)
Added skid steer to pioneer3at
2013-05-24 16:58:27 -07:00
Nathan Koenig
e27b65ebe8 Merged in starting_pen_simple (pull request #47)
Change starting pen to use simple shapes
2013-05-23 10:28:43 -07:00
Ian Chen
5b0a3ff4b9 Resized floor collision 2013-05-22 18:34:43 -07:00
Ian Chen
5c728c93f0 Change starting pen to use simple shapes 2013-05-22 17:51:20 -07:00
Nate Koenig
6b2ca9991a Added skid steer to pioneer3at 2013-05-22 14:25:44 -07:00
gerkey
222260cfb0 Merged in add_hack_mud_box_dependency (pull request #45)
add dependency from starting_pen to mud_box
2013-05-18 12:10:45 -07:00
gerkey
918159689e add dependency from starting_pen to mud_box 2013-05-18 19:07:20 +00:00
gerkey
6eb0590995 Merged in fix_house_deps (pull request #44)
add dependency from house_2 and house_3 to house_1, because they share some resources
2013-05-18 11:42:49 -07:00
Brian Gerkey
e8927e1e83 add dependency from house_2 and house_3 to house_1, because they share some resources 2013-05-18 11:41:50 -07:00
Nathan Koenig
daeb2f2796 Merged in polaris_min_depth (pull request #42)
Polaris: give min_depth to polaris wheels to improve wheel contact
2013-05-17 13:08:19 -07:00
Nathan Koenig
6098d10bb2 Merged in hacked_models (pull request #43)
Brighter materials
2013-05-17 13:08:08 -07:00
Nate Koenig
5e38143f40 Reduced mud box texture size 2013-05-17 10:46:39 -07:00
Nate Koenig
a3bdd852e1 Brighter materials 2013-05-17 08:56:37 -07:00
Steve Peters
8c88227de6 Set max_contacts on wheels to 1 to prevent cylinders from having multiple contact points when driving on boxes 2013-05-16 16:50:04 -07:00
Steve Peters
642fd07302 give min_depth to polaris wheels to improve wheel contact 2013-05-16 15:53:56 -07:00
Nathan Koenig
66f45e8d83 Merged in more_rusty (pull request #41)
More rusty rust
2013-05-15 13:29:11 -07:00
Nate Koenig
3593c2bb58 Updates 2013-05-15 13:28:34 -07:00
Nate Koenig
7fbb002bda Updates 2013-05-15 13:12:41 -07:00