1
0
Fork 0
Commit Graph

59730 Commits

Author SHA1 Message Date
Daniel Opitz 6933fd9e38 CI: Hotfix for build error with newer clang++
It will be included in the next release at some point.
- https://github.com/RenderKit/embree/issues 486
  "fix output operator"

[ 30%] Compiling thirdparty/embree/kernels/common/accelset.cpp ...
In file included from thirdparty/embree/kernels/common/device.cpp:12:
In file included from thirdparty/embree/kernels/common/scene_curves.h:10:
thirdparty/embree/kernels/common/../subdiv/bezier_curve.h:138:56:
error: no member named 'u' in 'QuadraticBezierCurve<V>'
  138 |         return cout << "QuadraticBezierCurve ( (" << a.u.lower << ", "
  << a.u.upper << "), " << a.v0 << ", " << a.v1 << ", " << a.v2 << ")";
 ...

(cherry picked from commit c24ea0ecca)
2025-01-30 10:34:10 +01:00
Rémi Verschelde 0f170e6ff4 Add missing `cstdint` includes for GCC 15
(cherry picked from commit 1823460787)
2025-01-30 10:00:25 +01:00
Max Hilbrunner 7dd4c69708 Fix VS project generation with SCons 4.8.0+
(cherry picked from commit f682406cf2)
2025-01-13 16:11:05 +01:00
Gergely Kis be302e7957
Move Vulkan includes to a central godot_vulkan.h header
Also fixes Vulkan build problem with recent Clang.

(cherry picked from commit 146ba4106f)
2024-12-16 11:50:17 +01:00
Rémi Verschelde 369b981a75
Merge pull request #98878 from aaronfranke/4.2-gltf-preserve-visibility
[4.2] GLTF: Preserve node visibility on import
2024-12-05 01:11:08 +01:00
Micky ca31f563e0
Add documentation note on Object's boolean context
(cherry picked from commit 2ad161a4c7)
2024-12-05 01:10:59 +01:00
demolke 31017f89ce
Update vertex color import to handle Blender 4.2 upwards
Blender commit 0f0a8df8a9 which is landing in 4.2 deprecated `vertex_colors` GLTF property, use `export_vertex_color` instead.

(cherry picked from commit 7864abbeec)
2024-12-05 01:03:19 +01:00
Rémi Verschelde f8218ce3b6
Merge pull request #100013 from akien-mga/4.2-mbedtls-2.28.9
[4.2] mbedtls: Update to upstream version 2.28.9
2024-12-04 17:56:19 +01:00
Rémi Verschelde 881645fff9
mbedtls: Update to upstream version 2.28.9 2024-12-04 15:45:49 +01:00
Aaron Franke 8bf8028d3b
[4.2] GLTF: Preserve node visibility on import 2024-11-08 14:21:44 -08:00
Rémi Verschelde 73d4fc7082
certs: Sync with Mozilla bundle as of Oct 19, 2024
4d3fe6683f

Document matching mozilla-release changeset.

(cherry picked from commit eb41ff0fee)
2024-11-05 21:09:50 +01:00
bruvzg 83cb5bb9ab
[macOS] Update Vulkan SDK install script.
(cherry picked from commit 74df6f192a)
2024-11-05 17:02:03 +01:00
Rémi Verschelde 3504c98c12
Revert "[MP] Handle cleanup of "scene cache" nodes"
This reverts commit 8544106b7e.

This caused regression #90908.
2024-07-31 22:47:02 +02:00
Rémi Verschelde 12ae52fd7d
Merge pull request #94469 from AThousandShips/cache_improve_4_2
[4.2][CI] Upload build cache before running tests
2024-07-17 15:23:11 +02:00
A Thousand Ships 9f615edb84
[CI] Upload build cache before running tests 2024-07-13 17:47:36 +02:00
Rémi Verschelde e55db90099
Merge pull request #93911 from MarianoGnu/4.2-vulkan-out-of-memory-error-fix
[4.2] Make an early return when rendering buffer failed to allocate instead…
2024-07-07 12:12:37 +02:00
MarianoGnu 63be8ecbb2 Make an early return when rendering buffer failed to allocate instead of crashing 2024-07-05 15:33:57 -03:00
Rémi Verschelde 7132627666
CI: Fix support for latest codespell 2024-07-05 13:25:07 +02:00
Rémi Verschelde 32a7ddca38
Merge pull request #93938 from TokageItLab/cp-anim-4-2
Cherry-pick animation fixes for 4.2
2024-07-05 12:18:59 +02:00
Silc Lizard (Tokage) Renew faf17a3ae1 Cherry-pick animation fix for 4.2 2024-07-05 00:24:42 +09:00
Rémi Verschelde 07cf36d21c
i18n: Sync translations with Weblate
Weblate now tracks 4.3 strings, so only the strings which are the
same in both branches are being backported.
2024-06-14 11:36:15 +02:00
Rémi Verschelde 8d9c31ec7b
Merge pull request #91661 from akien-mga/4.2-remove-binary-forward-compat-PackedVector4Array
[4.2] Remove forward compat parsing of PackedVector4Array in binary format
2024-05-30 15:59:54 +02:00
Rémi Verschelde 0c957c0d5f
Merge pull request #92073 from AThousandShips/shader_hint_fix_4_2
[4.2] [Rendering] Improve `(u)int` shader uniform hint
2024-05-18 16:53:26 +02:00
A Thousand Ships 5495edd11c
[Rendering] Improve `(u)int` shader uniform hint 2024-05-18 11:32:26 +02:00
A Thousand Ships 7a3a36ab87
[Doc] Fix incorrect reference to `input_pickable`
(cherry picked from commit d8cd7b2f9f)
2024-05-07 14:48:53 +02:00
Rémi Verschelde def12f7cc4
Remove forward compat parsing of PackedVector4Array in binary format
The logic I implemented was lacking, and actually it's not useful as binary files saved by Godot 4.3
are not recognized due to the `ver_major > VERSION_MAJOR` check.

So even if the format version was unchanged, such files would still not be readable in 4.2.
2024-05-07 14:22:51 +02:00
Rémi Verschelde f9d101d740
Merge pull request #91486 from akien-mga/4.2-forward-compat-PackedVector4Array
[4.2] Add forward compat parsing of PackedVector4Array
2024-05-06 12:22:19 +02:00
Rémi Verschelde 7aacb098f0
Add forward compat parsing of PackedVector4Array
This new Variant type is being added in 4.3, and breaks compatibility with
earlier releases. By adding minimal parsing support (converting to plain Array)
we can at least open the scenes, and minimize the data loss when going back and
forth between minor versions.
2024-05-03 00:20:12 +02:00
Rémi Verschelde 604ad4eaa5
Merge pull request #91436 from clayjohn/4.2-particles-crash
Avoid switch statement in particles shader to workaround shader compiler crash on Apple silicon devices
2024-05-02 09:55:32 +02:00
clayjohn b5660604e4 Avoid switch statement in glsl files to workaround shader compiler crash on macOS devices 2024-05-01 20:56:53 -07:00
Rémi Verschelde b9f01dcf87
Merge pull request #91350 from bruvzg/42_ios_privacy
[4.2, iOS export] Add support for privacy manifest configuration.
2024-04-30 16:40:12 +02:00
bruvzg e9b86b4910
[4.2, iOS export] Add support for privacy manifest configuration. 2024-04-30 10:27:11 +03:00
Rémi Verschelde d9bcd1bfa1
Merge pull request #91250 from timothyqiu/4.2-format-compat
[4.2] Add support for reading text resource format 4
2024-04-30 08:27:44 +02:00
Haoyu Qiu 4ade4ab92a Add support for reading text resource format 4
Co-Authored-By: Gilles Roudiere <gilles.roudiere@gmail.com>
2024-04-30 09:02:19 +08:00
Rémi Verschelde 190cbcfd7f
Merge pull request #91156 from akien-mga/4.2-cherrypicks
Cherry-picks for the 4.2 branch (future 4.2.3) - 1st batch
2024-04-29 11:25:05 +02:00
Markus Sauermann 79727d4833
Prohibit execution of delayed input events by different means
In some cases it can happen, that the order of input events and
window events is not followed, when input buffering or input accumulation
is active.

The display server order `InputEvent` => window-event gets changed to
window-event => `InputEvent` which becomes problematic in certain
situations.

This PR makes sure, that the order is adhered to by flushing input events
before a window event is sent.
Previously this problem was mitigated by discarding these delayed events.
But this solution was problematic in the setting of android input events.

(cherry picked from commit 945babc619)
2024-04-29 10:23:25 +02:00
Rémi Verschelde de06aece82
Fix GCC 14 -Wtemplate-id-cdtor warnings
Fixes #91206.

(cherry picked from commit a8ff47b6d6)
2024-04-26 11:44:18 +02:00
A Thousand Ships e343a110fb
[CI] [macOS] Build for both `arm64` and `x86_64`
Creates a universal build, to catch discrepancies on different
architectures

(cherry picked from commit 24ad73b13f)
2024-04-25 14:42:28 +02:00
Ricardo Buring 32262931ca
Fix move_and_slide wall slide acceleration (3D)
When travel is high enough, keep the global position resulting from the
move_and_collide call, and set the motion to the remainder from the
move_and_collide call. This ensures travel is taken into account once,
rather than twice.

(cherry picked from commit 80c600d86b)
2024-04-25 13:18:10 +02:00
Rémi Verschelde 8638b5ff32
Sync controller mappings DB with SDL 2 community repo
Synced with mdqinc/SDL_GameControllerDB@5b4efa3a20

(cherry picked from commit 1da02fa7be)
2024-04-25 13:04:50 +02:00
Rémi Verschelde a4fcc9cbbb
miniupnpc: Update to 2.2.7
No change for the files we include.

(cherry picked from commit afe64bb517)
2024-04-25 12:54:40 +02:00
Rémi Verschelde 2d93cb544c
Merge pull request #90449 from dsnopek/gdextension-hot-reload-not-classdb-instantiate-4.2
[4.2] Fix GDExtension hot reload for classes not created via `ClassDB::instantiate()`
2024-04-19 16:18:15 +02:00
Rémi Verschelde c8356fb9d4
Bump version to 4.2.3-rc 2024-04-17 16:05:28 +02:00
Rémi Verschelde 15073afe38
Bump version to 4.2.2-stable 2024-04-16 13:48:19 +02:00
Rémi Verschelde 7fbfe1dbe7
Update AUTHORS and DONORS list
(cherry picked from commit 020bd219ed)
2024-04-16 13:47:57 +02:00
Rémi Verschelde f23a48e663
Update AUTHORS and DONORS list
(cherry picked from commit 9272f7b53d)
2024-04-16 13:47:55 +02:00
Yorick de Wid e5ea748dcf
FIX: Return if TCP is in STATUS_CONNECTED
If the `StreamPeerTCP` is polled and the TCP connection is `STATUS_CONNECTED` it should return after polling netsocket. Without `return` poll keeps calling `_sock->connect_to_host` and `connect()`.

(cherry picked from commit 61a2f5c534)
2024-04-16 13:47:32 +02:00
Rémi Verschelde 895f1877fb
Merge pull request #90738 from akien-mga/4.2-cherrypicks
Cherry-picks for the 4.2 branch (future 4.2.2) - 5th batch
2024-04-16 10:17:51 +02:00
Rémi Verschelde e57244edc6
Update changelog for 4.2.2 2024-04-16 09:29:17 +02:00
Mikael Hermansson 219517f6b8
Add `--import` command-line flag
(cherry picked from commit 9d01793dff)
2024-04-16 09:29:16 +02:00