-
Notifications
You must be signed in to change notification settings - Fork 938
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
Adding documentation to collision detection #1645
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
BryceStevenWilley
approved these changes
Aug 26, 2019
felixvd
suggested changes
Aug 27, 2019
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not approving right away to avoid an accidental merge, but this is fine with me overall. Only typos and nits in this review really.
moveit_core/collision_detection/include/moveit/collision_detection/collision_common.h
Outdated
Show resolved
Hide resolved
moveit_core/collision_detection/include/moveit/collision_detection/collision_common.h
Show resolved
Hide resolved
moveit_core/collision_detection_fcl/include/moveit/collision_detection_fcl/collision_common.h
Outdated
Show resolved
Hide resolved
moveit_core/collision_detection_fcl/include/moveit/collision_detection_fcl/collision_common.h
Outdated
Show resolved
Hide resolved
moveit_core/collision_detection_fcl/include/moveit/collision_detection_fcl/collision_common.h
Outdated
Show resolved
Hide resolved
moveit_core/collision_detection_fcl/include/moveit/collision_detection_fcl/collision_common.h
Outdated
Show resolved
Hide resolved
moveit_core/collision_detection_fcl/include/moveit/collision_detection_fcl/collision_common.h
Outdated
Show resolved
Hide resolved
moveit_core/collision_detection_fcl/include/moveit/collision_detection_fcl/collision_env_fcl.h
Outdated
Show resolved
Hide resolved
moveit_core/collision_detection_fcl/include/moveit/collision_detection_fcl/collision_env_fcl.h
Outdated
Show resolved
Hide resolved
felixvd
approved these changes
Aug 28, 2019
ac46577
to
20d42e3
Compare
v4hn
pushed a commit
to v4hn/moveit
that referenced
this pull request
Sep 17, 2019
Backport relevant documentation to melodic-devel
Thanks @v4hn! |
BryceStevenWilley
pushed a commit
that referenced
this pull request
Sep 17, 2019
henningkayser
pushed a commit
to PickNikRobotics/moveit
that referenced
this pull request
Nov 21, 2019
* Collision detection documentation from moveit#1488 * Collision detection documentation from moveit#1505
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
As during the rebase on master of the feature branch
feature-bullet-trajopt
I ran into merge conflicts because of deleted files in master, I dropped the two documentation PRs #1488 and #1505 from the feature branch.Instead I went through them again and created this new PR targeting master. This does not include changes which have not been reviewed in #1488 or #1505. Therefore, could be merged fast.