-
-
Notifications
You must be signed in to change notification settings - Fork 21.4k
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
Make CSGShape follow curve's tilt in Path mode #79355
Conversation
Could you please squash your commits into one? Make sure that the final commit has a short but descriptive message (the title of this PR is a good option). See this documentation, if you need help with squashing. |
PRs can't be deleted, only closed |
You haven't. You only merged master into your branch. So now it contains 3 commits that you've made and one that is a merge commit. First of all, you shouldn't merge master into your branches, you should rebase your branches on top of master. That means that your changes would always look like You need to take your current branch and do the following:
The file also contains brief instructions about how it can be edited.
If you're using a GUI app it may have dedicated UI for the rebase where you may pick what to keep and what to drop with some on-screen controls. Refer to your app's documentation for more details. PS. I also recommend you avoid using your master branch when authoring commits. Create a feature branch from your master to make things easier for yourself. You don't have to do it now with this PR, but please consider it in future. |
I rebased and squashed the commits myself, and improved the commit message. |
Thanks! And congrats for your first merged Godot contribution 🎉 |
Thank you for squashing the commits. I did not want to mess up the pull quests even more than I already did, I still have a lot to learn about git. |
We have a handy guide for this: https://docs.godotengine.org/en/latest/contributing/workflow/pr_workflow.html But in general, you should keep your fork's
|
Cherry-picked for 4.1.3. |
This is the simple fix for #65634.
The fix adds the tilt flag for sample_baked_up_vector in the csg_shape.cpp
Production edit: Fixes #65634