Commit Graph

188 Commits

Author SHA1 Message Date
Nathan Koenig
94d4457f82 Merged in objects (pull request #33)
Added cinder block and jersey barrier
2013-05-02 15:27:17 -07:00
Nate Koenig
597d194ebd Merged from objects_scpeters 2013-05-02 14:18:14 -07:00
Steve Peters
93ad5fb366 Fixed inertia for cinder block, jersey barrier, tweaked collisions in cinder block to reduce number of contact points 2013-05-02 13:46:03 -07:00
Nathan Koenig
c52eed7302 Merged in beer (pull request #31)
Maurice's beer can
2013-05-01 18:24:42 -07:00
Nate Koenig
cd23b3442e Updated cmake 2013-04-29 12:56:40 -07:00
Nate Koenig
b7c55d266a Added cinder block and jersey barrier 2013-04-29 12:55:53 -07:00
Nate Koenig
b333eeff42 Added author 2013-04-26 12:32:08 -07:00
Nate Koenig
c8d5b7a17a Updates 2013-04-26 12:30:02 -07:00
Nate Koenig
460d96f5a0 Added a beer. This is copied from pull request #19 2013-04-26 11:43:32 -07:00
Nathan Koenig
a9adaeb4d7 Merged in cordless_drill_jitter (pull request #30)
attempt to eliminate cordless_drill jitter by adding margin to contact LCP (min_depth = 1mm).
2013-04-23 08:52:59 -07:00
Nathan Koenig
8249b01baa Merged in models_1.4_fix (pull request #29)
Fix a few model.config files and a pose error in ClearPath Husky
2013-04-19 13:46:33 -07:00
John Hsu
5f9f9f8981 revert accidental coke can changes 2013-04-19 12:05:42 -07:00
John Hsu
527f2ca599 attempt to eliminate cordless_drill jitter by adding margin to contact LCP (min_depth = 1mm). 2013-04-19 12:00:05 -07:00
Steve Peters
549f760d3e Fix a few model.config files and a pose error in ClearPath Husky 2013-04-19 11:43:38 -07:00
Nathan Koenig
02233e5130 Merged in cordless_drill_dance (pull request #28)
Stop the cordless drill from dancing around
2013-04-18 18:24:57 -07:00
Nate Koenig
2e6d040d9c Fix dancing cordless drill 2013-04-18 17:28:29 -07:00
Nathan Koenig
12e83edd4b Merged in sdf1.4 (pull request #27)
Updated sdf files to 1.4
2013-04-18 13:58:21 -07:00
Nathan Koenig
836f83a10d Close branch sdf1.4 2013-04-18 13:58:21 -07:00
Nate Koenig
9ba4e4f361 Added missing files 2013-04-12 08:40:23 -07:00
Nate Koenig
ace09bd328 Updated sdf files to 1.4 2013-04-12 08:06:42 -07:00
Nate Koenig
0ed8d18640 Merged from default 2013-03-22 08:21:54 -07:00
Nate Koenig
ef2c244796 Reduced complexity of hokuyo model 2013-03-22 08:21:34 -07:00
Nathan Koenig
ca3c5e38a2 Merged in dawonn/gazebo_models (pull request #24)
NEW: Pioneer 3 AT
2013-03-21 21:31:13 -07:00
Steven Peters
f621b4f877 Merged in polaris_pedal_tweaks (pull request #22)
Increase joint limits for pedals and hand brake, and reduce pedal masses
2013-03-20 10:19:51 -07:00
Nathan Koenig
ef66f2e0b7 Merged in rgariepy/gazebo_models (pull request #23)
Adding Clearpath Husky model
2013-03-20 07:41:26 -07:00
Dereck Wonnacott
a37ce6c3a0 changed name to lower case. 2013-03-14 09:27:43 -04:00
Ryan Gariepy
a6aadb2365 manifest.xml to be deprecated 2013-03-12 18:05:15 -04:00
Dereck Wonnacott
2bd9174340 Removed Plugin from SDF until it has landed upstream.
Users can compile it themselves and re-enable it here if they want.
2013-03-06 11:32:05 -05:00
dawonn
5cfd57f2e9 Merged osrf/gazebo_models into default 2013-03-06 11:27:13 -05:00
nkoenig
647505ac7a Updated cmake 2013-03-06 16:16:45 +00:00
Dereck Wonnacott
79566d7b20 Mereged upstream changes 2013-03-05 11:36:56 -05:00
Dereck Wonnacott
2bdc94e168 removed .hgignore file since its not needed anymore. 2013-03-05 11:34:37 -05:00
dawonn
6057ec2734 Merged osrf/gazebo_models into default 2013-03-05 11:30:55 -05:00
Dereck Wonnacott
dcd61bb4d2 Updated files from my working directory. 2013-03-05 11:21:42 -05:00
Ryan Gariepy
ad703d2940 Adding Clearpath Husky model 2013-03-04 20:52:07 -05:00
Nate Koenig
0c58b402e9 Merged 2013-03-04 17:30:02 -08:00
Steve Peters
c39b6decdc merge with default 2013-03-04 17:07:39 -08:00
Steve Peters
f4606360e0 Change pedal position since we increased pedal travel 2013-03-04 17:06:57 -08:00
Dereck Wonnacott
481b2df8d1 Removed plugin from Pioneer3AT model directory and submitted it to Gazebo Proper. 2013-03-04 19:31:06 -05:00
Nathan Koenig
7fe47bada4 Merged in nate (pull request #20)
More models from Cole
2013-03-04 14:35:06 -08:00
Nathan Koenig
60c344786b Merged in nate (pull request #20)
More models from Cole
2013-03-04 14:35:05 -08:00
Steve Peters
e22ded0468 Increase joint limits for pedals and hand brake, and reduce pedal masses 2013-03-01 16:56:07 -08:00
Nate Koenig
113edd845f Scale up speed limit sign 2013-02-26 11:22:34 -08:00
Nate Koenig
e111af8b7b Made starting pen static 2013-02-26 11:07:29 -08:00
Nate Koenig
8725292852 Added new models 2013-02-26 10:58:14 -08:00
Dereck Wonnacott
0ce065dc0f added hgignore for build/ 2013-02-24 16:02:35 -05:00
Dereck Wonnacott
e6e32edaee Initial commit of pioneer3AT model 2013-02-24 16:00:53 -05:00
Nathan Koenig
76c6e570b1 Merged in cordless_drill_collision (pull request #10)
per issue #4 and a couple of model updates
2013-02-21 13:42:46 -08:00
John Hsu
ab90c50917 removing dae files from long fire hose model 2013-02-20 19:42:47 -08:00
John Hsu
617b2574fb merging from default 2013-02-20 19:38:38 -08:00