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

Merge commit godotengine/godot-docs@9f221dc #44

Merged
merged 27 commits into from
Oct 26, 2024

Conversation

Spartan322
Copy link
Member

No description provided.

Flarkk and others added 27 commits August 27, 2024 16:44
Fix shader language matrix row/col convention
Removes notes about features being introduced in 3.x minor versions. In 4.x, these
details are no longer relevant.
Since Godot 4.2, rendering 2D in HDR is once again possible.
Fix HDR 2D mention in Upgrading to Godot 4 page
Remove reference to 3.1 as a minimum version
Add `#error` shader preprocessor directive description
Remove references to Phong and Blinn specular modes
The original description was backwards. This is a small edit that fixes it.
…ws-codesigning-update-url

Update URL to Microsoft codesigning guide in Exporting for Windows
Typo fix for Interpolation gif description
…d_in_custom_funcs

Note about stage func/discard may be used in custom shader function
Copy link
Collaborator

@adikhoff adikhoff left a comment

Choose a reason for hiding this comment

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

Squash first

@adikhoff
Copy link
Collaborator

I would like to know what the traditional policy is when squashing comments that come from a fork sync

@Spartan322
Copy link
Member Author

Spartan322 commented Oct 26, 2024

This is a merge, it is necessary for this not to be squashed in order to perfectly retain the history of upstream as if we had forked from it.

@adikhoff adikhoff merged commit a6730b7 into Redot-Engine:master Oct 26, 2024
1 check passed
@Spartan322 Spartan322 deleted the merge/9f221dc branch October 26, 2024 13:41
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.