[gazebo] 01/02: Merge tag 'upstream/6.1.0'
Jose Luis Rivero
jrivero-guest at moszumanska.debian.org
Mon Aug 31 12:24:39 UTC 2015
This is an automated email from the git hooks/post-receive script.
jrivero-guest pushed a commit to branch master
in repository gazebo.
commit 4a6dd37c62872b32135c53c94bf6ae4651f8e4a6
Merge: f1b941f 18733e3
Author: Jose Luis Rivero <jrivero at osrfoundation.org>
Date: Mon Aug 24 18:19:58 2015 +0200
Merge tag 'upstream/6.1.0'
Upstream version 6.1.0
.hg_archival.txt | 4 +-
CMakeLists.txt | 2 +-
Changelog.md | 15 ++
cmake/SearchForStuff.cmake | 2 +-
.../plugins/animate_joints/animate_joints.world | 1 -
examples/plugins/animate_pose/animate_pose.cc | 4 +-
gazebo/Server.cc | 3 +
gazebo/gazebo_main.cc | 3 +
gazebo/gui/GuiIface.cc | 3 +
gazebo/msgs/CMakeLists.txt | 2 +
gazebo/msgs/logical_camera_image.proto | 28 +++
gazebo/msgs/logical_camera_sensor.proto | 20 +++
gazebo/msgs/sensor.proto | 31 ++--
gazebo/physics/CMakeLists.txt | 1 +
gazebo/physics/bullet/BulletBoxShape.hh | 3 +
gazebo/physics/bullet/BulletCylinderShape.hh | 1 +
gazebo/physics/bullet/BulletPlaneShape.hh | 1 +
gazebo/physics/bullet/BulletRaySensor.cc | 149 ----------------
gazebo/physics/bullet/BulletRaySensor.hh | 81 ---------
gazebo/physics/bullet/BulletSphereShape.hh | 2 +
gazebo/physics/bullet/CMakeLists.txt | 1 -
gazebo/rendering/CMakeLists.txt | 2 +
gazebo/rendering/Heightmap.cc | 1 +
gazebo/rendering/LogicalCameraVisual.cc | 126 ++++++++++++++
gazebo/rendering/LogicalCameraVisual.hh | 62 +++++++
gazebo/rendering/RTShaderSystem.cc | 1 +
gazebo/rendering/RenderTypes.hh | 5 +
gazebo/rendering/Scene.cc | 23 +++
.../rendering/selection_buffer/MaterialSwitcher.cc | 1 +
.../rendering/selection_buffer/SelectionBuffer.cc | 1 +
gazebo/sensors/CMakeLists.txt | 2 +
gazebo/sensors/LogicalCameraSensor.cc | 192 +++++++++++++++++++++
gazebo/sensors/LogicalCameraSensor.hh | 104 +++++++++++
gazebo/sensors/LogicalCameraSensorPrivate.hh | 54 ++++++
gazebo/sensors/Sensor.cc | 12 +-
gazebo/sensors/SensorFactory.cc | 16 +-
gazebo/sensors/SensorTypes.hh | 5 +
plugins/CMakeLists.txt | 1 +
plugins/RandomVelocityPlugin.cc | 181 +++++++++++++++++++
plugins/RandomVelocityPlugin.hh | 88 ++++++++++
plugins/RandomVelocityPluginPrivate.hh | 69 ++++++++
test/integration/CMakeLists.txt | 1 +
test/integration/logical_camera_sensor.cc | 108 ++++++++++++
test/integration/physics_friction.cc | 144 +++++-----------
tools/gz_TEST.cc | 2 +-
worlds/CMakeLists.txt | 1 +
worlds/logical_camera.world | 47 +++++
worlds/random_velocity.world | 65 +++++++
48 files changed, 1309 insertions(+), 362 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/gazebo.git
More information about the debian-science-commits
mailing list