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

Reapply -Avoid adding margin twice along capsule Y axis #42649

Merged
merged 1 commit into from
Oct 15, 2020

Conversation

madmiraal
Copy link
Contributor

#41806 was accidentally reverted with #42639. This PR simply reapplies the original commit (53e4293). I've made the original author the co-author of this commit.

Co-authored-by: Andrea Catania <info@andreacatania.com>
Copy link
Contributor

@AndreaCatania AndreaCatania left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks

@akien-mga akien-mga merged commit 5971a97 into godotengine:master Oct 15, 2020
@akien-mga
Copy link
Member

Thanks!

@madmiraal madmiraal deleted the reapply-41806 branch October 15, 2020 15:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants