Commit Graph

35517 Commits

Author SHA1 Message Date
Rémi Verschelde a81d96c637
mbedtls: Update to upstream version 2.28.7
(cherry picked from commit dec635119e)
2024-01-30 19:39:19 +01:00
Rémi Verschelde 8fe6d9db44
Sync controller mappings DB with SDL2 community repo
Synced with gabomdq/SDL_GameControllerDB@232c738ce0

(cherry picked from commit 10445d80d8)
2024-01-30 15:16:22 +01:00
Rémi Verschelde 72ab4af489
Merge pull request #87739 from akien-mga/3.x-scons-web-workaround-emscripten-version-check
[3.x] SCons: Fix Web build when compiler version isn't properly detected
2024-01-30 15:10:06 +01:00
Rémi Verschelde 4206975e3a
SCons: Fix Web build when compiler version isn't properly detected
Quick fix for #82585.

A better fix requires refactoring the way we detect the compiler version
to make it more reliable, and get a consistent output. But I prefer to
keep changes minimal for 3.x branches at this point.

Also set CI version to 3.1.39, which is what we use for official 3.6 builds
since 3.6-beta4.
2024-01-30 14:54:49 +01:00
Rémi Verschelde 561a6cd503
Style: Mark clang-format 16 as supported for pre-commit hook
It only introduced a difference in a .glsl file, which I've worked
around by removing an empty line. This keeps formatting consistent
between clang-format 15 and 16.

Also added a change in the 3-to-4 project converter to fix bogus
formatting in clang-format < 17.

(cherry picked from commit 49f4860ce3)
2024-01-30 14:42:46 +01:00
Rémi Verschelde ebd65eeb23
certs: Sync with Mozilla bundle as of Dec 13, 2023
bef37a977c
(cherry picked from commit c6e829b4c6)
2024-01-30 14:27:08 +01:00
Rémi Verschelde f255fb89db
CI: Update mymindstorm/setup-emsdk to v14, should fix cache folder conflicts
https://github.com/mymindstorm/setup-emsdk/releases/tag/v14

Co-authored-by: Yuri Sizov <yuris@humnom.net>
(cherry picked from commit 35ef0b32b3)
2024-01-30 14:25:16 +01:00
Rémi Verschelde 7885b5814c
zlib/minizip: Update to version 1.3.1
Minizip includes previously backported fix for CVE-2023-45853,
and a Debian patch for CVE-2014-9485 was also upstreamed.

(cherry picked from commit 8ead8d2ddb)
2024-01-30 14:21:37 +01:00
Rémi Verschelde 885926850d
Merge pull request #87737 from 20kdc/bone2d-fix-apply_rest
[3.x] Fix the documentation of `Bone2D::apply_rest`
2024-01-30 13:36:16 +01:00
20kdc 2f03ba77e9 Fix the documentation of Bone2D::apply_rest (squashed, backport)
Co-authored-by: Micky <66727710+Mickeon@users.noreply.github.com>
2024-01-30 12:13:02 +00:00
Rémi Verschelde e9949a6db7
Merge pull request #87702 from lawnjelly/portal_export_logging
[3.x] Portals - Improve conversion logging
2024-01-29 23:30:11 +01:00
Rémi Verschelde 8b3eb38791
Merge pull request #87677 from Mickeon/3.x-oooh-Reduz-of-the-past-You're-so-quirky
[3.x] Mention InputEventJoypadButton's pressure not working
2024-01-29 23:29:49 +01:00
Rémi Verschelde d1b6b6f725
Merge pull request #87588 from m4gr3d/update_android_dependencies_3x
[3.x] Update Android dependencies for the project
2024-01-29 23:29:27 +01:00
Rémi Verschelde 721eba5d5d
Merge pull request #87539 from SysError99/3.x-get_first_node_in_group
[3.x] Add `SceneTree::get_first_node_in_group` following 4.x
2024-01-29 23:29:04 +01:00
Rémi Verschelde 1aa4c2fed1
Merge pull request #86642 from Mickeon/3.x-doc-peeves-resourceful-uh-oh-stinky
[3.x] Rewrite most of Resource's documentation
2024-01-29 23:28:42 +01:00
Rémi Verschelde 30b81a4bd9
Merge pull request #84529 from lawnjelly/gles2_gl_fragcolor
[3.x] GLES2 & GLES3 - Use `gl_FragColor` temporary
2024-01-29 23:28:19 +01:00
Rémi Verschelde 6f3c5e63f3
Merge pull request #82584 from lawnjelly/lightcull_23
[3.x] Shadow volume culling and tighter shadow caster culling
2024-01-29 23:27:56 +01:00
Rémi Verschelde 24d1391af9
Merge pull request #64931 from Mickeon/3.x-tileset-collision-group
[3.x] Add Selected Collision Group in TileSet Editor
2024-01-29 23:27:33 +01:00
Rémi Verschelde 4e741ec2ba
Merge pull request #64493 from Mickeon/3.x-editor-group
[3.x] Add Node editor description group
2024-01-29 23:27:07 +01:00
lawnjelly 5e0b298d50 Portals - Improve conversion logging
Logging is now allowed in any TOOLS build (rather than just in the editor), but still prevented in final exports.
Logging can be switched off via project settings.
Autoplacement is now logged.
2024-01-29 14:21:22 +00:00
Micky 9b1f1d5b6e [3.x] Mention InputEventJoypadButton's pressure not working 2024-01-28 15:00:38 +01:00
Micky 211c707e67 [3.x] Add Selected Collision Group in TileSet Editor
Also moves the TileSet Script property down to its own category.
2024-01-26 16:26:55 +01:00
SysError99 99284482bc [3.x] Add `SceneTree::get_first_node_in_group` following 4.x 2024-01-26 21:26:40 +07:00
Rémi Verschelde e184e626f7
Merge pull request #87579 from akien-mga/3.x-year-2024
[3.x] Update `year` property in `version.py` to 2024
2024-01-26 01:33:41 +01:00
Fredia Huya-Kouadio eba77be573 Update Android dependencies for the project
- Update Java version from 11 to 17
- 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
- Update Nexus plugin version from 1.1.0 to 1.3.0
2024-01-25 13:58:08 -08:00
Rémi Verschelde f61e2491e1
Update `year` property in `version.py` to 2024
Seems like we missed this one when changing the copyright statements
to use `present` instead of the hardcoded `year`.

And backport other minor improvements from #87543.
2024-01-25 13:38:03 +01:00
Rémi Verschelde 584dc09ff8
Merge pull request #87359 from bruvzg/ios_xc1520_3
[iOS, 3.x] Update linker flags for Xcode 15.0 - 15.2. Bump min. iOS version to 12.
2024-01-19 09:12:50 +01:00
bruvzg e6fb19275e
[iOS, 3.x] Update linker flags for Xcode 15.0 - 15.2. Bump min. iOS version to 12. 2024-01-19 08:19:46 +02:00
Rémi Verschelde 93ac21cf8b
Merge pull request #87256 from akien-mga/3.x-cherrypicks
Cherry-picks for the 3.x branch (future 3.6) - 16th batch
2024-01-18 21:52:12 +01:00
Rémi Verschelde c6fb284441
Merge pull request #87341 from KoBeWi/must_prot3.x_selection
[3.x] Preserve selection when focusing SpinBox
2024-01-18 21:23:23 +01:00
kobewi c377bffaa1 Preserve selection when focusing SpinBox 2024-01-18 16:38:05 +01:00
Rémi Verschelde f706a3bd54
Web: Clarify that `OS.get_unique_id` is not supported
Remove the base error message in `OS`, we no longer really error out this
way for not implemented methods. Instead, each platform should override them
to provide the context they want.

Fixes #82439.

(cherry picked from commit 0a10f09ce4)
2024-01-18 16:19:43 +01:00
Rémi Verschelde 574a5e59f3
brotli: Sync with upstream 1.1.0
https://github.com/google/brotli/releases/tag/v1.1.0
(cherry picked from commit 0402205ce6)
2024-01-18 16:19:43 +01:00
Rémi Verschelde 49c20ecd19
minizip: Backport patch to fix CVE-2023-45853
(cherry picked from commit c8dee05bf0)
2024-01-18 16:19:43 +01:00
Rémi Verschelde 8bec4b6456
zlib/minizip: Update to version 1.3
Remove `infback.c` which we don't need.

The `OF` macro was also removed so I can drop the patch where I yell
at Gentoo developers.

(cherry picked from commits e0e1f2e4a2
and 071499ac0d)
2024-01-18 16:19:32 +01:00
floatingpointer ece9dccbd1
Add XInput device ID for wireless Series 2 Elite controller
(cherry picked from commit 81f9c0345c)
2024-01-18 16:10:46 +01:00
nikitalita 267063268b
SCons: Add `stack_size` and `default_pthread_stack_size` options to Web target
(cherry picked from commit 6788bc6bc2)
2024-01-18 16:10:45 +01:00
Adam Scott 4a02e6159d
Set what were default values for some emscripten linkflags
- Set `-sSTACK_SIZE` to what it was before emscripten 3.1.27.
  It was renamed in 3.1.25 so also set `-sTOTAL_SIZE` for older
  versions for consistency.
- Set `-sDEFAULT_PTHREAD_STACK_SIZE` to what it was before 3.1.30.

Co-authored-by: Rémi Verschelde <rverschelde@gmail.com>
(cherry picked from commit 8e5fbd4348)
2024-01-18 16:10:45 +01:00
Max Hilbrunner 346c9a6671
Fix generating vsproj with SCons 4.6.0+
(cherry picked from commit 72110134d6)
2024-01-18 16:10:45 +01:00
Rémi Verschelde 9d69e7aba3
Donors: Change tiers to match Dev Fund, sync latest data
The new list includes all donors listed on fund.godotengine.org,
together with the ones still on Patreon on matching tiers.

We haven't yet updated Patreon tiers to match the Dev Fund, so donors
who used to be listed under "Silver donors" are now grandfathered under
the "Gold members" category from the Dev Fund.

(cherry picked from commit ff5ac866e8)
2024-01-18 16:10:45 +01:00
Rémi Verschelde cb19b81374
Merge pull request #87338 from akien-mga/3.x-linux-export-arm
[3.x] Linux: Add support for arm64 and arm32 export templates
2024-01-18 16:10:35 +01:00
Rémi Verschelde 58898a5484
Linux: Add support for arm64 and arm32 export templates
This is done in a hacky way, mostly to keep it simple and avoid having
to do a refactoring of the `EditorExportPlatform` interface.

Only Windows and Linux use `EditorExportPlatformPC`, and thus to
handle the new architectures for Linux, we simply do a few checks here
and there with a couple new methods to register the export template
names for Linux arm64 and arm32.

For Godot 4.0, we did refactor everything to allow exporting binaries
for different architectures cleanly. For 3.6, which is likely the last
feature release for the 3.x branch, I tend to cut corners as these
improvements will be shorter lived and thus new tech debt isn't as big
a concern.
2024-01-18 15:38:32 +01:00
Rémi Verschelde 3e7572304d
Merge pull request #87292 from akien-mga/3.x-libvpx-crimes
[3.x] Linux: Disable webm module on arm32, we can't build libvpx properly
2024-01-17 15:21:40 +01:00
Rémi Verschelde c6e4ee72df
Linux: Disable webm module on arm32, we can't build libvpx properly
libvpx arm32 build with NEON can be supported in theory (and it works
on Android armv7), but our SCons logic for it is super convoluted and
broken. It needs significant rework to be made less error prone, and
ensure we can compile `.s` files properly with cross-compilation
toolchains.

The demand to play WebM videos on older Pi3-style SoCs is likely low,
so for now this is a simple compromise.

Could be improved with some effort if someone is motivated.
2024-01-17 15:06:52 +01:00
Rémi Verschelde b0eb2b4e59
Merge pull request #87288 from akien-mga/3.x-uwp-fix-get_unique_id-build
[3.x] UWP: Fix VS 2017 build with new `get_unique_id` method
2024-01-17 13:47:32 +01:00
Rémi Verschelde dfb03a3956
Merge pull request #87272 from halotroop2288/patch-3
[3.x] Fix `#if *_ENABLED` inconsistencies, should check if defined
2024-01-17 13:47:09 +01:00
Rémi Verschelde 1eac1a2794
Merge pull request #87265 from AThousandShips/aabb_fix_cs_3_x
[3.x] [C#] Fix `Encloses` failing on shared upper bound for `AABB` and `Rect2`
2024-01-17 13:46:47 +01:00
Rémi Verschelde 2c5a420701
Merge pull request #87261 from alessandrofama/3.x-wasapi-failed-init
[3.x] Fix Dummy audio driver initialization issue on WASAPI output device initialization failure
2024-01-17 13:46:20 +01:00
Rémi Verschelde dd03a68b89
Merge pull request #87258 from akien-mga/3.x-fix-arm32-oidn-embree-build
[3.x] Linux: Fix arm32 build for OIDN and Embree
2024-01-17 13:45:53 +01:00
Rémi Verschelde d01e8aafb4
UWP: Fix VS 2017 build with new `get_unique_id` method
Fixes this error:
```
platform\uwp\os_uwp.cpp(715): error C3149: 'Windows::Storage::Streams::IBuffer': cannot use this type here without a top-level '^'
```
2024-01-17 11:24:19 +01:00