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

3.5 #1

Closed
wants to merge 2,582 commits into from
Closed

3.5 #1

wants to merge 2,582 commits into from

Conversation

darngeek
Copy link

@darngeek darngeek commented Aug 7, 2022

update our fork to version 3.5
mainly because of shader caching

akien-mga and others added 26 commits August 5, 2022 03:29
What a ride!

Developing 3.5 in parallel with the rapidly growing 4.0 alpha has
proved challenging, but here we are with a great feature update for the
3.x branch.

4.0 is getting close to beta, and now most contributors have switched
their focus towards that major update, and rightly so. Still, the work
that went into 3.5 is amazing and makes it a very strong and stable
solution for your games *today* -- while 4.0 takes the time it needs to
stabilize and mature.

A big thankyou to all contributors who worked on this release!
Fixes TileMap error msg spam when bake_navigation=true but the optional and depr navigation node is not set.

(cherry picked from commit 30d4555)
References in reStructuredText cannot be located within bold/italic
text. This caused the online class reference to have the `:ref:`
text written as-is.

(cherry picked from commit 9709205)
It used to return the write index instead of the written bytes (i.e.
index + 1) when reading until last block.

(cherry picked from commit e8f7b79)
If the user does not set the albedo color to pure white, then the
multiplication with a value different from 1 will produce modulated colors.

Co-authored-by: Hugo Locurcio <hugo.locurcio@hugo.pro>
(cherry picked from commit 1f6709d)
This shortcut got in the way when using the Maya navigation scheme,
and also when using the slow freelook modifier (regardless of
navigation scheme).

(cherry picked from commit 53f4ff2)
Adds special logic for handling skeleton bounding rect updates. Previously these were never being updated because the canvas item is never set to "rect_dirty".

(cherry picked from commit 18bb668)
This mostly reverts the approach in #62628, which now the problem is better scoped, looks overengineered and instead focuses on the few cases where there's something to take care of.

(cherry picked from commit a2ed82d)
Fixes #64662.
Regression from #61145.

(cherry picked from commit 13d1ee6)
Updates various actions to latest versions:

actions/cache@v3
actions/checkout@v3
actions/upload-artifact@v3
actions/setup-dotnet@v2
actions/setup-java@v3
actions/setup-python@v4
mymindstorm/setup-emsdk@v11

(cherry picked from commit abaa76f)
jordo and others added 23 commits December 12, 2022 14:42
This also harmonizes the server code to be consistent with Linux desktop
(with warnings printed for relative XDG paths).

Co-authored-by: Rémi Verschelde <rverschelde@gmail.com>
(cherry picked from commit 06c266f)
And cleanup disable_warnings too to avoid setting `/w` / `-w` multiple times.

(cherry picked from commit 9505f5f)
Library code and public headers are now properly separated, we can fix include paths
to remove the redundant subfolder.

(cherry picked from commit 432ac52)
(cherry picked from commit f592f6b)
(cherry picked from commit d80a2a8)
Co-authored-by: sriramun <sriramun2@gmail.com>
(cherry picked from commit 08e804b)
Cherry-picks for the 3.5 branch (future 3.5.2) - 3rd batch
(cherry picked from commit 55deecb)
Fixes #63205.

(cherry picked from commits 3fa943f,
42a16ef and
2ff69d6)

(cherry picked from commit a412922)
Fixes #69759
Fixes #54343
Fixes #25526

(cherry picked from commit aca8999)
@akien-mga
Copy link

Note: This kind of PR is not the right way to update a fork, you should like do a rebase instead, unless you're ready to solve thousands of merge conflicts between two branches that diverged by 2500 commits.
I came to this PR because GitHub unhelpfully adds a backreference to it to all Godot 3.5 commits: image
So if you don't intend to merge this PR, closing it would remove this backreference from all upstream Godot commits in the 3.5 branch :)

@darngeek @PumpUpTheJams Bump :)

Pretty ping. This is still generating back references in all commits cherry-picked to our 3.5 branch.

New contributors added to AUTHORS:
adamscott, alfredbaudisch, DarkKilauea, DeeJayLSP, dzil123,
jasonwinterpixel, jtnicholl, nikitalita, Riteo, rune-scape, TechnoPorg

Thanks to all contributors and donors for making Godot possible!

(cherry picked from commit 85ca32b)
@darngeek darngeek closed this Dec 22, 2022
@darngeek
Copy link
Author

Note: This kind of PR is not the right way to update a fork, you should like do a rebase instead, unless you're ready to solve thousands of merge conflicts between two branches that diverged by 2500 commits.
I came to this PR because GitHub unhelpfully adds a backreference to it to all Godot 3.5 commits: image
So if you don't intend to merge this PR, closing it would remove this backreference from all upstream Godot commits in the 3.5 branch :)

@darngeek @PumpUpTheJams Bump :)

Pretty ping. This is still generating back references in all commits cherry-picked to our 3.5 branch.

Sorry was not aware of this back referencing. hopefully closing the PR fixes the issue.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.