Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge devel in master and release v3.2.0 #432

Merged
merged 42 commits into from
Jul 1, 2019
Merged
Changes from 2 commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
2839964
[virtAnalogWrapper] Adding virtualAnalogWrapper impl to controlboard
prashanthr05 Sep 7, 2018
0b247db
Refactoring of linkattacher
lrapetti Oct 25, 2018
a908af9
Merge pull request #393 from lrapetti/linkattacher_refactoring
traversaro Nov 8, 2018
bea7588
Add use of loadConfigModelPlugin()
lrapetti Nov 9, 2018
5934115
Merge pull request #394 from lrapetti/use_loadConfigModelPlugin
traversaro Nov 12, 2018
32e7252
Add <yarpConfigurationString> parameter
lrapetti Nov 12, 2018
50aeb93
Update embed_plugins.md
lrapetti Nov 12, 2018
9a26c78
Merge pull request #396 from lrapetti/add_yarpConfigurationString
traversaro Nov 13, 2018
a66de0c
Fix loadConfigModelPlugin inputs in VideoTexture #397
lrapetti Nov 17, 2018
7a07b3f
Merge pull request #398 from lrapetti/patch-1
pattacini Nov 17, 2018
b70b1b4
Revert #394 in VideoTexture plugin
lrapetti Nov 17, 2018
5ed5bf8
Merge pull request #399 from lrapetti/patch-2
pattacini Nov 17, 2018
1023891
Add configurationOverride Plugin
lrapetti Nov 5, 2018
4689d4f
Merge pull request #401 from lrapetti/configuration_override
traversaro Nov 21, 2018
865f140
Merge branch 'devel' of https://github.com/robotology/gazebo-yarp-plu…
prashanthr05 Nov 21, 2018
ac4ed33
[virtAnalogWrapper] cleanup
prashanthr05 Nov 21, 2018
5cdb1d8
Merge pull request #403 from prashanthr05/feature/virtualAnalogWrapper
traversaro Nov 26, 2018
d18ff8d
worldinterface plugin: now the makeBox function doesn't append number…
valegagge Nov 21, 2018
b95969d
worldinterface plugin: now the makeCylinder and makeFrame functions d…
valegagge Nov 21, 2018
5ccd19d
WorldInterface: in make* functions, add check to verify if an object …
valegagge Jan 3, 2019
fcfcac8
Merge branch 'master' into devel
traversaro Jan 3, 2019
89ef235
Merge pull request #404 from valegagge/worldInterface_MakeBox
randaz81 Jan 4, 2019
73be755
Fix bug in deleteObject of WorldInterface plugin
valegagge Feb 8, 2019
ee04609
Merge pull request #412 from valegagge/fixWorldInterf_DelObj
randaz81 Feb 26, 2019
de7f414
Merge branch 'master' into devel
traversaro Mar 12, 2019
ba78bfa
Developed Double laser plugin
valegagge Sep 6, 2018
02f7f47
LaserSensor: added deviceId setting
valegagge Apr 1, 2019
acc2345
DoubleLaser: fix copyright and typos
valegagge Apr 1, 2019
de4c0ee
Merge pull request #419 from valegagge/doubleLaserPlugin
randaz81 Apr 1, 2019
caa999a
Added Reset Simulation (#345)
triccyx Apr 9, 2019
37eff49
Update external wrench plugin with mutiple wrenches and improve rpc r…
yeshasvitirupachuri Apr 16, 2019
2a5dc3c
Update CMakeLists with gazebo_yarp_lib_common
yeshasvitirupachuri Apr 18, 2019
3c68999
Merge pull request #422 from Yeshasvitvs/patch/externalwrenchplugin
traversaro Apr 18, 2019
3ffd3a6
Removing unused CMake checks for version less than 3.5 (#421) (#423)
MiladShafiee Apr 24, 2019
3b61320
Merge branch 'master' into devel
Nicogene Apr 26, 2019
f52c36e
Add resetSimulationState and regenerate thrift-generated files (#424)
triccyx May 6, 2019
cb9952a
Fix invalid camera parameters in gazebo_depthCamera plugin.
Jan 16, 2019
f51713b
Add missing `physFocalLength` parameter
Jun 4, 2019
6ea5b58
Merge pull request #408 from jchevrie/fix_depth_camera
Jun 5, 2019
023fee1
Merge remote-tracking branch 'origin/master' into devel
traversaro Jul 1, 2019
f0bae32
Add autogenerated thrift files
traversaro Jul 1, 2019
147419e
Bump version and update ChangeLog document.
traversaro Jul 1, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion plugins/externalwrench/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@ include(AddGazeboYarpPluginTarget)
add_gazebo_yarp_plugin_target(LIBRARY_NAME externalwrench
INCLUDE_DIRS include/gazebo
SYSTEM_INCLUDE_DIRS ${Boost_INCLUDE_DIRS} ${GAZEBO_INCLUDE_DIRS} ${SDFORMAT_INCLUDE_DIRS} ${PROTOBUF_INCLUDE_DIRS}
LINKED_LIBRARIES ${YARP_LIBRARIES} ${GAZEBO_LIBRARIES} ${Boost_LIBRARIES}
LINKED_LIBRARIES gazebo_yarp_lib_common ${YARP_LIBRARIES} ${GAZEBO_LIBRARIES} ${Boost_LIBRARIES}
HEADERS include/gazebo/ApplyExternalWrench.hh include/gazebo/ExternalWrench.hh
SOURCES src/ApplyExternalWrench.cc src/ExternalWrench.cc
)