[gazebo] 01/01: Merge branch 'upstream' into dfsg_clean
Jose Luis Rivero
jrivero-guest at moszumanska.debian.org
Wed Oct 28 20:52:48 UTC 2015
This is an automated email from the git hooks/post-receive script.
jrivero-guest pushed a commit to branch dfsg_clean
in repository gazebo.
commit a6235b88639214e453bceb8b21640d5f72916a13
Merge: ebbf0e8 c2e3c8c
Author: Jose Luis Rivero <jrivero at osrfoundation.org>
Date: Mon Oct 26 14:03:42 2015 +0100
Merge branch 'upstream' into dfsg_clean
.hg_archival.txt | 6 +-
CMakeLists.txt | 6 +-
Changelog.md | 46 +++
cmake/GazeboTestUtils.cmake | 12 +-
cmake/SearchForStuff.cmake | 2 +-
cmake/gazebo-config.cmake.in | 63 +++-
cmake/gazebo_config.h.in | 1 +
cmake/upload_doc.sh.in | 36 ++
deps/opende/CMakeLists.txt | 7 +
deps/opende/include/ode/objects.h | 3 +-
deps/opende/src/joints/gearbox.cpp | 3 +
deps/opende/src/step.cpp | 38 +-
.../opende/src/step_bullet_inc.h | 33 +-
deps/opende/src/step_bullet_lemke_wrapper.cpp | 74 ++++
.../opende/src/step_bullet_lemke_wrapper.h | 27 +-
deps/opende/src/step_bullet_pgs_wrapper.cpp | 69 ++++
.../opende/src/step_bullet_pgs_wrapper.h | 24 +-
examples/plugins/CMakeLists.txt | 14 -
examples/plugins/animate_joints/CMakeLists.txt | 11 +-
.../GUIExampleSpawnWidget.cc | 32 +-
examples/plugins/hello_world/CMakeLists.txt | 2 +-
examples/plugins/mainwindow_example/CMakeLists.txt | 5 +-
.../mainwindow_example/MainWindowExampleWidget.hh | 6 +-
examples/plugins/model_move/CMakeLists.txt | 13 +-
examples/plugins/model_push/CMakeLists.txt | 2 +-
examples/plugins/model_push/model_push.world | 2 +-
examples/plugins/parameters/CMakeLists.txt | 8 +-
examples/plugins/projector/CMakeLists.txt | 8 +-
examples/plugins/system_gui_plugin/CMakeLists.txt | 2 +-
examples/stand_alone/actuator/CMakeLists.txt | 12 +-
examples/stand_alone/animated_box/CMakeLists.txt | 13 +-
.../stand_alone/clone_simulation/CMakeLists.txt | 8 +-
examples/stand_alone/custom_main/CMakeLists.txt | 10 +-
.../custom_main_pkgconfig/CMakeLists.txt | 9 +-
examples/stand_alone/listener/CMakeLists.txt | 8 +-
examples/stand_alone/publisher/CMakeLists.txt | 10 +-
examples/stand_alone/publisher/publisher.cc | 2 +-
examples/stand_alone/test_fixture/CMakeLists.txt | 6 +-
examples/stand_alone/transporter/CMakeLists.txt | 7 +-
examples/stand_alone/transporter/transporter.cc | 6 +-
gazebo/Master.cc | 1 +
gazebo/common/CMakeLists.txt | 1 +
gazebo/common/Event_TEST.cc | 1 +
gazebo/common/ModelDatabase.cc | 2 +
gazebo/common/ModelDatabase.hh | 1 +
gazebo/common/ModelDatabasePrivate.hh | 1 +
gazebo/common/MouseEvent.cc | 18 +
gazebo/common/MouseEvent.hh | 9 +
gazebo/common/MouseEvent_TEST.cc | 278 +++++++++++++++
gazebo/common/SphericalCoordinates.cc | 384 +++++++++++++++++----
gazebo/common/SphericalCoordinates.hh | 55 ++-
gazebo/common/SphericalCoordinatesPrivate.hh | 33 +-
gazebo/common/SphericalCoordinates_TEST.cc | 73 +++-
gazebo/gazebo.cc | 1 +
gazebo/gui/ApplyWrenchDialog.cc | 1 +
gazebo/gui/EntityMaker.hh | 1 +
gazebo/gui/GLWidget.cc | 2 +
gazebo/gui/InsertModelWidget.cc | 1 +
gazebo/gui/MainWindow.cc | 2 +
gazebo/gui/ModelBuilderWidget.cc | 1 +
gazebo/gui/ModelListWidget.cc | 2 +
gazebo/gui/ModelRightMenu.cc | 3 +-
gazebo/gui/ModelSnap.cc | 3 +-
gazebo/gui/OculusWindow.cc | 1 +
gazebo/gui/QTestFixture.cc | 1 +
gazebo/gui/RenderWidget.cc | 2 +
gazebo/gui/SpaceNav.cc | 1 +
gazebo/gui/TimePanel.cc | 1 +
gazebo/gui/TimeWidget_TEST.cc | 151 ++++++++
gazebo/gui/TimeWidget_TEST.hh | 4 +
gazebo/gui/ToolsWidget.cc | 3 +-
gazebo/gui/building/BuildingEditor.cc | 1 +
gazebo/gui/building/BuildingEditorPalette.cc | 1 +
gazebo/gui/building/BuildingMaker.cc | 2 +
gazebo/gui/building/BuildingModelManip.cc | 1 +
gazebo/gui/building/EditorView.cc | 1 +
gazebo/gui/building/LevelWidget.cc | 1 +
gazebo/gui/building/ScaleWidget.cc | 1 +
gazebo/gui/model/JointMaker.cc | 1 +
gazebo/gui/model/ModelCreator.cc | 1 +
gazebo/gui/model/ModelEditor.cc | 1 +
gazebo/gui/model/ModelEditorPalette.cc | 1 +
gazebo/gui/terrain/TerrainEditorPalette.cc | 1 +
gazebo/gui/viewers/CMakeLists.txt | 1 +
gazebo/gui/viewers/LaserView.cc | 27 +-
gazebo/gui/viewers/LaserView.hh | 3 +
gazebo/gui/viewers/LaserView_TEST.cc | 107 ++++++
.../LaserView_TEST.hh} | 20 +-
gazebo/physics/ContactManager.cc | 3 +-
gazebo/physics/Entity.cc | 2 +
gazebo/physics/Entity.hh | 1 +
gazebo/physics/Gripper.cc | 3 +-
gazebo/physics/Inertial.cc | 1 +
gazebo/physics/Link.cc | 2 +
gazebo/physics/Model.cc | 2 +
gazebo/physics/Model.hh | 1 +
gazebo/physics/World.cc | 8 +-
gazebo/physics/bullet/BulletJoint.cc | 1 +
gazebo/physics/bullet/BulletLink.cc | 10 +
gazebo/physics/bullet/BulletLink.hh | 3 +
gazebo/physics/dart/DARTJoint.cc | 1 +
gazebo/physics/dart/DARTLink.cc | 16 +
gazebo/physics/dart/DARTLink.hh | 3 +
gazebo/physics/dart/DARTScrewJoint.cc | 16 +-
gazebo/physics/dart/DARTTypes.hh | 15 +
gazebo/physics/ode/ODEJoint.cc | 17 +-
gazebo/physics/ode/ODELink.cc | 111 +++---
gazebo/physics/ode/ODELink.hh | 6 +
gazebo/physics/ode/ODEPhysics.cc | 7 +
gazebo/physics/ode/ODEPhysics.hh | 4 +-
gazebo/physics/simbody/SimbodyLink.cc | 6 +
gazebo/physics/simbody/SimbodyLink.hh | 3 +
gazebo/rendering/COMVisual.cc | 52 ++-
gazebo/rendering/COMVisual.hh | 10 +-
gazebo/rendering/Camera.cc | 12 +-
gazebo/rendering/Camera.hh | 1 +
gazebo/rendering/CameraVisual.cc | 2 +
gazebo/rendering/ContactVisual.cc | 3 +-
gazebo/rendering/InertiaVisual.cc | 53 ++-
gazebo/rendering/InertiaVisual.hh | 10 +-
gazebo/rendering/LaserVisual.cc | 2 +
gazebo/rendering/Projector.cc | 2 +
gazebo/rendering/RenderEngine.cc | 9 +-
gazebo/rendering/Road2d.cc | 1 +
gazebo/rendering/Scene.cc | 8 +-
gazebo/rendering/SonarVisual.cc | 3 +-
gazebo/rendering/TransmitterVisual.cc | 3 +-
gazebo/rendering/UserCamera.cc | 1 +
gazebo/rendering/VideoVisual.cc | 1 +
gazebo/rendering/Visual.cc | 19 +-
gazebo/rendering/Visual.hh | 1 +
gazebo/rendering/VisualPrivate.hh | 1 +
gazebo/rendering/WrenchVisual.cc | 3 +-
gazebo/sensors/AltimeterSensor.cc | 1 +
gazebo/sensors/CameraSensor.cc | 3 +
gazebo/sensors/ContactSensor.cc | 1 +
gazebo/sensors/DepthCameraSensor.cc | 1 +
gazebo/sensors/ForceTorqueSensor.cc | 2 +
gazebo/sensors/GpsSensor.cc | 3 +-
gazebo/sensors/GpuRaySensor.cc | 3 +
gazebo/sensors/GpuRaySensor.hh | 1 +
gazebo/sensors/GpuRaySensor_TEST.cc | 1 +
gazebo/sensors/ImuSensor.cc | 1 +
gazebo/sensors/LogicalCameraSensor.cc | 1 +
gazebo/sensors/MagnetometerSensor.cc | 1 +
gazebo/sensors/MultiCameraSensor.cc | 2 +
gazebo/sensors/Noise.cc | 1 +
gazebo/sensors/Noise.hh | 1 +
gazebo/sensors/Noise_TEST.cc | 1 +
gazebo/sensors/RaySensor.cc | 2 +
gazebo/sensors/Sensor.cc | 32 +-
gazebo/sensors/Sensor.hh | 9 +
gazebo/sensors/SensorManager.cc | 1 +
gazebo/sensors/Sensor_TEST.cc | 9 +
gazebo/sensors/SonarSensor.cc | 3 +-
gazebo/sensors/WirelessReceiver_TEST.cc | 2 +-
gazebo/sensors/WirelessTransceiver.cc | 1 +
gazebo/test/helper_physics_generator.hh | 10 +
gazebo/transport/Connection.cc | 2 +
gazebo/transport/ConnectionManager.cc | 3 +-
gazebo/transport/IOManager.cc | 1 +
gazebo/transport/Node.cc | 1 +
gazebo/transport/Node.hh | 1 +
gazebo/transport/Publication.cc | 2 +
gazebo/transport/Publication.hh | 1 +
gazebo/transport/PublicationTransport.cc | 2 +
gazebo/transport/PublicationTransport.hh | 1 +
gazebo/transport/Publisher.cc | 3 +-
gazebo/transport/SubscriptionTransport.cc | 2 +
gazebo/transport/SubscriptionTransport.hh | 1 +
gazebo/transport/TopicManager.cc | 1 +
gazebo/transport/TopicManager.hh | 1 +
gazebo/util/Diagnostics.cc | 2 +
gazebo/util/LogRecord.cc | 2 +
gazebo/util/LogRecord.hh | 1 +
interfaces/player/CameraInterface.cc | 1 +
interfaces/player/LaserInterface.cc | 1 +
plugins/ModelPropShop.hh | 2 +-
plugins/MudPlugin.cc | 1 +
plugins/PressurePlugin.cc | 1 +
plugins/events/CMakeLists.txt | 2 +
plugins/events/JointEventSource.cc | 279 +++++++++++++++
plugins/events/JointEventSource.hh | 135 ++++++++
plugins/events/SimEventsPlugin.cc | 37 +-
plugins/rest_web/RestApi.cc | 4 +-
plugins/rest_web/RestWebPlugin.cc | 8 +-
test/cmake/plugin/CMakeLists.txt | 8 +-
test/examples/CMakeLists.txt | 5 +
test/examples/examples_build.cc | 10 +-
test/integration/CMakeLists.txt | 2 +
test/integration/camera_sensor.cc | 66 ++++
test/integration/dem.cc | 10 +-
test/integration/joint_gearbox.cc | 102 +++---
test/integration/joint_screw.cc | 6 -
test/integration/physics_friction.cc | 12 +-
test/integration/physics_link.cc | 1 +
test/integration/physics_msgs_inertia.cc | 275 +++++++++++++++
test/integration/physics_solver.cc | 120 +++++++
test/integration/sim_events.cc | 56 ++-
test/integration/world_reset.cc | 105 +++++-
test/pkgconfig/plugin/CMakeLists.txt | 13 +-
test/regression/1694_world_accel.cc | 78 +++++
test/regression/1702_remove_model_scene_nodes.cc | 152 ++++++++
test/regression/CMakeLists.txt | 2 +
test/worlds/gearbox.world | 10 +-
test/worlds/issue_1694.world | 73 ++++
tools/gz.cc | 8 +-
tools/gz.hh | 2 +-
tools/gz_TEST.cc | 10 +-
tools/gz_log.cc | 2 +-
worlds/CMakeLists.txt | 1 +
worlds/seesaw.world | 211 +++++++++++
worlds/seesaw.world.erb | 112 ++++++
worlds/sim_events.world | 236 +++++++++++++
214 files changed, 4063 insertions(+), 510 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