4 to 5 #918
Merged
4 to 5 #918
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
* fix mouse view control race condition Signed-off-by: Ian Chen <[email protected]> * add dragging Signed-off-by: Ian Chen <[email protected]>
Signed-off-by: Nate Koenig <[email protected]> Co-authored-by: Nate Koenig <[email protected]>
…rflow (#889) Signed-off-by: Ashton Larkin <[email protected]>
Signed-off-by: Louise Poubel <[email protected]>
Signed-off-by: addy1997 <[email protected]> Signed-off-by: Louise Poubel <[email protected]> Co-authored-by: Jose Luis Rivero <[email protected]> Co-authored-by: Louise Poubel <[email protected]>
… updated (#876) Signed-off-by: Ashton Larkin <[email protected]>
Signed-off-by: Ashton Larkin <[email protected]>
azeey
approved these changes
Jul 16, 2021
Signed-off-by: Ashton Larkin <[email protected]>
adlarkin
force-pushed
the
adlarkin/4_to_5
branch
from
4dda5ce
to
f2706be
Compare
|
|
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.
➡️ Forward port
Port
ign-gazebo4toign-gazebo5Branch comparison: ign-gazebo5...ign-gazebo4
Part of this forward-port involved fixing merge conflicts for #876. I also updated the physics system to handle the scenario where a parent model and nested model each have their own canonical links, but only the canonical link of the parent model moves. In this scenario, although the nested model did not move, the nested model and all of its links needs to be updated since the nested model pose in the physics system is saved w.r.t. the parent model. This scenario did not need to be addressed in #876 since
ign-gazebo4does not have full nested model support. I believe that with this forward port and additional fix, we can close #871 - cc @azeeyNote to maintainers: Remember to Merge with commit (not squash-merge or rebase)