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.

Sign up for GitHub

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

Jump to bottom

Cherry-picks for the 4.2 branch (future 4.2.2) - 3rd batch #89339

Merged
merged 194 commits into from
Mar 12, 2024
Merged

Cherry-picks for the 4.2 branch (future 4.2.2) - 3rd batch #89339

merged 194 commits into from
Mar 12, 2024

Conversation

akien-mga
Copy link
Member

@akien-mga akien-mga commented Mar 9, 2024 •
edited
Loading

Long time no see 4.2...

WIP, I'll add more commits.

For now this batch includes:

  • Buildsystem changes
  • Thirdparty changes
  • Some high priority bug fixes and regression fixes
  • Safe-looking rendering fixes
  • Documentation improvements
  • Editor fixes
  • Physics fixes
  • Platform fixes
  • Core fixes and more, the rest of the "safe" looking stuff

@akien-mga akien-mga added this to the 4.2 milestone Mar 9, 2024
@akien-mga akien-mga mentioned this pull request Mar 9, 2024
Merged
@akien-mga
Copy link
Member Author

Added a few topic:rendering cherrypicks. The rest need to be discussed with Clay: https://github.com/godotengine/godot/pulls?q=is%3Apr+label%3Acherrypick%3A4.2+is%3Aclosed+label%3Atopic%3Arendering

Calinou and others added 8 commits March 11, 2024 00:11
@Calinou @akien-mga
makerst: Suggest using [code skip-lint] to skip warnings if intended
0f394c0 
(cherry picked from commit cd3078e)
@bruvzg @akien-mga
[iOS] Update linker flags for Xcode 15.2.
6d7ff2e 
(cherry picked from commit ac57f10)
@akien-mga
CI: Update mymindstorm/setup-emsdk to v14, should fix cache folder co…
d14aeb3 
…nflicts

https://github.com/mymindstorm/setup-emsdk/releases/tag/v14

Co-authored-by: Yuri Sizov <yuris@humnom.net>
(cherry picked from commit 35ef0b3)
@RandomShaper @akien-mga
Undefine yet another macro from Windows headers
06988f8 
(cherry picked from commit bcc9644)
@AThousandShips @akien-mga
Fix printf for format checks
7ba594e 
Prevents errors with input being invalid format strings

(cherry picked from commit 6da378a)
@adamscott @akien-mga
Add basic Emacs .gitignore entries
1bf5756 
(cherry picked from commit 2696fee)
@bruvzg @akien-mga
[macOS] Check Vulkan SDK version when looking for MoltenVK libs.
adcc505 
(cherry picked from commit 70e3283)
@akien-mga
Web: Bump closure compiler spec to ECMASCRIPT_2021
2b704dc 
Fixes godotengine#88008.

(cherry picked from commit d29b0d9)
adamscott and others added 12 commits March 11, 2024 15:00
@adamscott @akien-mga
Add WASM_BIGINT linker flag to the web build
52efe85 
(cherry picked from commit 3ae524f)
@shana @akien-mga
Use an absolute path for SConsignFile so all Sconscript invocations s…
18c543d 
…hare the same database

SConscript("some SCsub path") calls create a new context where a relative path
to the .sconsign file is interpreted as being next to the currently executing
SCsub, and not the one at the root. This breaks incremental build detection
because scons can't find the build information of dependent files outside of the
SCsub directory and just rebuilds everything every time.

(cherry picked from commit 0b43b01)
@m4gr3d @akien-mga
Fix gradle build errors when the build path contains non-ASCII charac…
2dd55ce 
…ters

(cherry picked from commit f1887a3)
@LinuxUserGD @akien-mga
os_linuxbsd.cpp: include servers/rendering_server.h
4bbca24 
(cherry picked from commit 6307ceb)
@akien-mga
CI: Update actions to latest versions
5985f2b 
(cherry picked from commit ad8d3cf)
@mxaddict @akien-mga
Added proper timeout for blender rpc connection
e45579f 
(cherry picked from commit 857586b)
@capnm @akien-mga
ThorVG: update from v0.12.0 to v0.12.1
ff42ab7 
https://github.com/thorvg/thorvg/releases/tag/v0.12.1

Godot-related SVG bug fixes:

+ [SVG] XML parser workaround for quote checks within quotes.
      thorvg/thorvg#1892

Fixes »dancing errors« with such SVG images inside the project folder.

(cherry picked from commit 0650e72)
@capnm @akien-mga
ThorVG: update from v0.12.1 to v0.12.3
8f4e66d 
https://github.com/thorvg/thorvg/releases/tag/v0.12.3

+ Full Changelog:
  thorvg/thorvg@v0.12.1...v0.12.3

Godot-related SVG bug fixes:

+ svg_loader: Add missing transform functions skewX and skewY.
  thorvg/thorvg#1928
+ sw_engine: Rectified dash line drawing issue.
  thorvg/thorvg#1932

(cherry picked from commit 73589f6)
@akien-mga
thorvg: Re-enable thread support, made opt-in upstream
6c8faad 
Fixes godotengine#87788.
Fixes godotengine#87962.

(cherry picked from commit 2e32b93)
@capnm @akien-mga
ThorVG: update from v0.12.3 to v0.12.4
5970616 
https://github.com/thorvg/thorvg/releases/tag/v0.12.4

+ Full Changelog:
  thorvg/thorvg@v0.12.3...v0.12.4

Godot-related SVG bug fixes:

+ loader/svg: Apply specification of out-of-range elliptical arc parameters,
  fix zero check of arc's rx and ry.
    thorvg/thorvg#1938

(cherry picked from commit da42124)
@capnm @akien-mga
ThorVG: update from v0.12.4 to v0.12.5
3ad0469 
https://github.com/thorvg/thorvg/releases/tag/v0.12.5

    + Full Changelog:
      thorvg/thorvg@v0.12.4...v0.12.5

Godot-related SVG bug fixes:

    + sw_engine: Improve image up-scaler quality.
      thorvg/thorvg#1960

    + renderer: Ensure canvas rendering continues
      despite invalid scene parts.
      thorvg/thorvg#1957

    + Portability: Fix compiler shadowing warning (patch)
      thorvg/thorvg#1975

(cherry picked from commit b5ec799)
@akien-mga
thorvg: Update to 0.12.7
ab3f14d 
(cherry picked from commit 6fa77e0)
@akien-mga akien-mga removed request for a team March 11, 2024 22:31
@akien-mga
Copy link
Member Author

This is now ready for review.

I'd welcome some help to check the list of commits I cherry-picked, and flag any that seems potentially risky / best to drop for now and not cherry-pick to 4.2.x or consider for a later build.

@Mickeon
Copy link
Contributor

Mickeon commented Mar 11, 2024

Nitpick but if Transform3D class reference overhaul is in, so should #87175 and #87181 as they heavily borrow from one another.

@clayjohn
Copy link
Member

Added a few topic:rendering cherrypicks. The rest need to be discussed with Clay: https://github.com/godotengine/godot/pulls?q=is%3Apr+label%3Acherrypick%3A4.2+is%3Aclosed+label%3Atopic%3Arendering

I removed the label from the PRs I don't think should be cherrypicked. The remaining ones are safe to include if you want

@clayjohn
Copy link
Member

I don't see anything on the list that needs to be removed! Great work

Mickeon and others added 5 commits March 12, 2024 00:38
@Mickeon @akien-mga
Overhaul Quaternion documentation
bbe1b0c 
(cherry picked from commit 38cd13c)
@Mickeon @akien-mga
Overhaul Basis' documentation
194efad 
Co-Authored-By: Aaron Franke <arnfranke@yahoo.com>
(cherry picked from commit 58ddd84)
@bitsawer @akien-mga
Fix Volumetric Fog VoxelGI updates
4495fbd 
(cherry picked from commit 89d772a)
@daustria @akien-mga
implement overdraw, lighting, and unshaded debug draw modes for opengl
51d7ffd 
(cherry picked from commit c8bdd1d)
@Calinou @akien-mga
Make Overdraw, Lighting and Shadow Splits debug draw modes ignore decals
562613a 
This also makes the Overdraw and Shadow Splits debug draw modes ignore fog.
The Lighting debug draw mode still displays fog as that debug draw mode
is intended to preview scene lighting, and fog has an impact on how
lighting is perceived.

(cherry picked from commit 26a220b)
@Sauermann
Copy link
Contributor

I had a look at PRs, that I was involved in and are looking good.

@tokengamedev
Copy link

I could not find #87346 in the list. It is critical to have this change.

@akien-mga
Copy link
Member Author

I could not find #87346 in the list. It is critical to have this change.

I need to assess the pros and cons with @m4gr3d. I was earmarking it for 4.2.3 and trying not to increase the scope too much for 4.2.2, but this batch makes it somewhat big already so we might want to go all the way.

@tokengamedev
Copy link

I appreciate, reviewing again. I have been trying to build plugins on top of 4.2.2 RC and if merged let me know I will do some testing for android export as well as plugin creations. If anything, else needs to be tested also let me know.

zaevi and others added 3 commits March 12, 2024 17:02
@zaevi @akien-mga
C#: Fix issues for StringName reference in CSharpInstanceBridge.Get.
1b90b9a 
(cherry picked from commit 1e14503)
@m4gr3d @akien-mga
Update Android dependencies for the project
6980cb0 
- Update Android gradle plugin version from 7.2.1 to 8.2.0
- Update gradle version from 7.4.2 to 8.2
- Update target SDK from 33 to 34
- Update build tools version from 33.0.2 to 34.0.0
- Update kotlin version from 1.7.0 to 1.9.20
- Update Android fragment version from 1.3.6 to 1.6.2
- Update AndroidX window version from 1.0.0 to 1.2.0

(cherry picked from commit e04a387)
@clayjohn @akien-mga
Improve warning when XR shaders are not enabled
fa1b680 
(cherry picked from commit d8f2768)
@akien-mga
Copy link
Member Author

I could not find #87346 in the list. It is critical to have this change.

I need to assess the pros and cons with @m4gr3d. I was earmarking it for 4.2.3 and trying not to increase the scope too much for 4.2.2, but this batch makes it somewhat big already so we might want to go all the way.

Let's give it a go, and see how it fares under testing :)

@akien-mga akien-mga merged commit c61a686 into godotengine:4.2 Mar 12, 2024
15 checks passed
@akien-mga akien-mga deleted the 4.2-cherrypicks branch March 12, 2024 21:44
@tokengamedev
Copy link

Awesome!! thanks

@tokengamedev
Copy link

I didn't know where to mention this, but initial tests on #87346 shows it is working fine.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@AThousandShips AThousandShips AThousandShips left review comments

@clayjohn clayjohn clayjohn left review comments

Assignees
No one assigned
Labels
bug enhancement topic:core topic:editor
Projects
None yet
Milestone
4.2
Development

Successfully merging this pull request may close these issues.