-
-
Notifications
You must be signed in to change notification settings - Fork 21.3k
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
Fixes Camera.project_position to not return get_global_transform().origin if projection mode is orthogonal #34233
Conversation
Update from Master
Could you squash commits together, and give the resulting commit a more explicit commit message? See https://github.com/godotengine/godot/blob/master/CONTRIBUTING.md#format-your-commit-logs-with-readability-in-mind and PR workflow. |
is wired that I squash commits together,but it make mistake |
You still have 2 commits, with And the commit message for the second commit is:
which is not explicit at all. |
…rigin if projection mode is orthogonal
Sorry I am totally new to the GitHub, I force change the commit message, but I am confused why after I did the squash commits, it still shows Merge pull request #1 from godotengine/master … |
I don't know why I am in that commit, is not done by me, and it seams that is the master of my commit, did any one have a good idea to solve that? |
Sorry for the delay. The first commit is there because one of your team member used a Pull Request to update your fork (Team-Bad#1) instead of doing a manual pull. GitHub sadly lacks an option in its interface to update a branch without custom modifications to the latest upstream master branch. I fixed it myself by rebasing on the upstream master branch, and fixed the style issues that were remaining (missing space before Thanks for the contribution! |
Fix #33837