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.

Sign up for GitHub

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

Jump to bottom

Update master #123

Merged
merged 22 commits into from
Jul 2, 2019
Merged

Update master #123

merged 22 commits into from
Jul 2, 2019

Conversation

anasarrak
Copy link

Cherry picked from uppstream, moveit#60, moveit#65, moveit#42

Víctor Mayoral Vilches and others added 22 commits June 26, 2019 10:48
@anasarrak
Distance_field fixes
23710f6
@anasarrak
Collision detection fixes
c109599
@anasarrak
Remove not necessary stamp
88f2964
@ahcorde @anasarrak
moveit_core kinematics_constraints - addressing some issues
25604a5
@ahcorde @anasarrak
kinematic_constraints cmakelist
e1c34ca
@ahcorde @anasarrak
moveit_core kinematics_constraints - fix whitespaces in CMakeLists.txt
249bad9
@ahcorde @anasarrak
moveit_core kinematic_constraints - Fix getMarkers header
e84131e
@ahcorde @anasarrak
collision_detection update
4e2cefe
@anasarrak
Update logger test_constraint_samplers
9cdc3fb
@anasarrak
Constraint_sampler cmakelist formating
db8930b
@anasarrak
Move constraint_sampler_tools logger to .hpp
7ae3047
@anasarrak
Using ros_time instead of rcl_system_time
ee48f31
@anasarrak
Moving pr2_arm_ik logger to .h
99321cf
@anasarrak
adding RCL_ROS_TIME on pr2_arm_kinematics_plugin
c691e44
@anasarrak
removing dead code
d62528c
@anasarrak
clang format
33c67dc
@ahcorde @anasarrak
Make loggers static
2850e91
@ahcorde @anasarrak
Fix collision_distance_field cmakelist
79bccc8
@anasarrak
collision_distance_field_types, Using RCL_ROS_TIME instead of RCL_SYS…
47a26c5 
…TEM_TIME
@anasarrak
collision_robot_distance_field, removing dead code
03f59de
@anasarrak
collision_world_distance_Field, using RCL_SYSTEM_TIME
b5ddf9c
@anasarrak
Clang Format
533da5a
@anasarrak anasarrak requested a review from ahcorde June 26, 2019 11:05
@anasarrak
Copy link
Author

@ahcorde can we merge this?

@ahcorde ahcorde merged commit c9afe78 into master Jul 2, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ahcorde ahcorde ahcorde approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@anasarrak @ahcorde