Commit graph

35337 commits

Author SHA1 Message Date
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
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
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
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
Caroline Joy Bell
9c0bd332a5
Fix #if *_ENABLED inconsistencies, should check if defined
Co-authored-by: Rémi Verschelde <rverschelde@gmail.com>
2024-01-17 10:21:40 +01:00
A Thousand Ships
ee4396809c
[C#] Fix Encloses failing on shared upper bound for AABB and Rect2 2024-01-16 20:19:43 +01:00
Alessandro Famà
61b1e2e83f [3.x] Fix Dummy audio driver initialization issue on WASAPI output device initialization failure 2024-01-16 18:40:56 +01:00
Rémi Verschelde
ae34c85a87
Linux: Fix arm32 build for OIDN and Embree
Still paying the cost of not having refactored all architecture handling
in the 3.x branch so we have this broken hybrid of arch/bits which is
unreliable.
2024-01-16 18:17:05 +01:00
Mikael Klasson
62858097aa
Fix invalid Python escape sequences
(cherry picked from commit 4986d6d317)
2024-01-16 17:15:35 +01:00
Rémi Verschelde
304f453b01
SCons: Fix Python 3.12 SyntaxError with regex escape sequences
(cherry picked from commit b362976504)
2024-01-16 17:04:40 +01:00
Rémi Verschelde
b0329fe8cb
Linux: Remove hardcoded lib path for x86 cross-compilation
This breaks the build with our updated i686 Linux SDK which doesn't contain
this path, and may not be needed at all.

(cherry picked from commit 63153c9d36)
2024-01-16 16:17:54 +01:00
Rémi Verschelde
59eb1b604e
Merge pull request #87214 from AThousandShips/aabb_fix_3_x
[3.x] [Core] Fix AABB.encloses failing on shared upper bound
2024-01-15 14:36:33 +01:00
A Thousand Ships
9aa001fe14
[Core] Fix AABB.encloses failing on shared upper bound
This differs from `Rect2` and was fixed for those classes in the past
2024-01-14 13:36:05 +01:00
Rémi Verschelde
4126326197
Merge pull request #83409 from jfriv/add-audiosession-options
[3.x] Add project settings for AVAudioSessionCategory on iOS
2024-01-10 13:37:22 +01:00
Rémi Verschelde
911f8d03c1
Merge pull request #75136 from DylanCheetah/3.x
[3.x] Implement UWP version of `OS.get_unique_id` function.
2024-01-10 13:37:09 +01:00
Rémi Verschelde
3fa0c97158
Merge pull request #62940 from gotnospirit/prevent-leading-dot
[3.x] Prevent creating folders or files starting with a dot
2024-01-10 13:36:31 +01:00
Cody Roberts
739d27ae40
Add project settings for AVAudioSessionCategory on iOS
Co-authored-by: Georg Wacker <contact@georgwacker.com>
2024-01-10 13:33:11 +01:00
DylanCheetah
bc93cad7f9
Implement UWP version of OS.get_unique_id function. 2024-01-10 13:25:28 +01:00
James
6782738a85 Prevent using name with leading dot when create/rename/duplicate scene/folder/script/resource
Fixes #62497
2024-01-06 19:36:14 +01:00
Rémi Verschelde
e22335ec72
Merge pull request #53639 from bjauny/fix_uninitMemberVar_core
[3.x] Fix unitialized variables in `core`
2024-01-05 12:28:14 +01:00
Bastien JAUNY
d214867a7e
Fix unitialized variables in core 2024-01-05 11:47:46 +01:00
Rémi Verschelde
e653473646
Merge pull request #86725 from Mickeon/3-x-remove-unused
[3.x] Remove unused struct in GradientTexture1D
2024-01-05 11:07:44 +01:00
Rémi Verschelde
fd93036834
Merge pull request #86466 from andy-noisyduck/csharp-transform2d-operator-fix
[3.x] C#: Fix incorrect `Rect2` sizing when using the `Transform2D` `*` operator.
2024-01-05 11:07:19 +01:00
Rémi Verschelde
2b7e00f601
Merge pull request #86380 from m4gr3d/update_render_thread_paused_timing_3x
[3.x] Android: Update the logic used to start / stop the GL thread
2024-01-05 11:06:57 +01:00
Rémi Verschelde
f37ff9e254
Merge pull request #79123 from dalexeev/3.x-gds-prevent-native-class-shadowing
[3.x] GDScript: Prevent native class shadowing
2024-01-05 11:06:31 +01:00