Commit graph

29353 commits

Author SHA1 Message Date
Rémi Verschelde
ea9c1c0a94
Merge pull request #45577 from Birdulon/DocDrawString
[3.3] Documentation: Correct CanvasItem.draw_string position description
2021-03-17 15:16:10 +01:00
Rémi Verschelde
e6b291b152
Mono: Bump Godot.NET.Sdk to 3.3.0
Using only 3.3 results in a build warning.

Follow-up to #47055.
2021-03-17 14:46:26 +01:00
Rémi Verschelde
2ffbe3c877
Merge pull request #47092 from lawnjelly/ewok_large_fvf_polys
Batching - prevent CPU transform for non-rects using large FVF
2021-03-17 14:16:02 +01:00
lawnjelly
0d80385687 Batching - prevent CPU transform for non-rects using large FVF
Large FVF which encodes the transform in a vertex attribute is triggered by reading from VERTEX in a custom shader. This means that the local vertex position must be available in the shader, so the only way to batch is to also pass the transform as an attribute.

The large FVF path already disabled CPU transform in the case of rects, but not in other primitives, which this PR fixes.

Note that large FVF is incompatible with 2d software skinning. So reading from VERTEX in a custom shader when using skinning will not work.
2021-03-17 12:04:59 +00:00
Rémi Verschelde
dae319355f
Merge pull request #47068 from nekomatata/cylinder-fix-margins-3.2
[3.3] Fix Cylinder shape collision with margins when using GJK-EPA
2021-03-17 11:05:46 +01:00
Rémi Verschelde
be64551922
Merge pull request #47085 from nekomatata/cylinder-capsule-collision-fix-3.2
[3.3] Fix capsule-cylinder collision in godot physics
2021-03-17 11:04:07 +01:00
Rémi Verschelde
0d0841e08e
Merge pull request #47082 from nekomatata/collision-debug-shape-game-only-3.3
[3.3] Disable debug collision shapes in the editor
2021-03-17 10:38:12 +01:00
PouleyKetchoupp
27a01d054d Fix capsule-cylinder collision in godot physics
Test specific axes before falling back to GJK-EPA algorithm to get more
accurate separation axes for common cases, the same way it's done for
cylinder-cylinder collision.
2021-03-16 19:14:51 -07:00
PouleyKetchoupp
baf24b4503 Disable debug collision shapes in the editor
If the editor was started with --debug-collisions, 3d shapes were
displayed twice, both with the gizmo and debug shapes. Some shapes could
also persist after being removed due to the usage of queue_free() to
destroy the debug shapes.
2021-03-16 17:58:51 -07:00
PouleyKetchoupp
abb5660925 Fix Cylinder shape collision with margins when using GJK-EPA
In the case of falling back to GJK-EPA algorithm to generate cylinder
contact points, margins were never taken into account.

This fixes the depenetration phase for kinematic bodies and allows
consistent floor detection for cylinder shapes.
2021-03-16 10:20:19 -07:00
Rémi Verschelde
2e90db407a
Merge pull request #47055 from akien-mga/3.2.4-is-dead-long-live-3.3
Bump version to 3.3-rc
2021-03-16 18:13:16 +01:00
Rémi Verschelde
0341251d0f
Bump version to 3.3-rc
We decided to rename the upcoming 3.2.4 release to 3.3 to better reflect that
it is a significant feature release, and not a maintenance update.

The `3.2` branch was also renamed to `3.x` and will now be the development
branch for future 3.x releases (3.3, 3.4, etc.).
2021-03-16 12:16:36 +01:00
Rémi Verschelde
94a0fc47f7
i18n: Sync translations with Weblate 2021-03-16 11:41:29 +01:00
Haoyu Qiu
966c89657b
Fix AnimationTree editor crash when renaming node
(cherry picked from commit eac806547f)
2021-03-16 11:38:29 +01:00
Hugo Locurcio
ee8661158c
Document the valid input range for acos() and atan()
(cherry picked from commit d359e159da)
2021-03-16 11:37:26 +01:00
Aaron Franke
d82c01c1a0
Improve documentation for AtlasTexture
(cherry picked from commit 682286fec8)
2021-03-16 11:35:23 +01:00
Rémi Verschelde
76b375e6a3
Thread: Re-add pthread_np.h include for FreeBSD/OpenBSD
Was a regression from #45315.

Fixes #46998.

(cherry picked from commit 7a64819c2f)
2021-03-16 11:33:55 +01:00
Kongfa Waroros
7646cbbca6
Check if _edit_set_position and _edit_set_rect was used outside an editor
(cherry picked from commit b80406770f)
2021-03-16 11:11:31 +01:00
Dominik 'dreamsComeTrue' Jasiński
ac4cedc596
Reset ruler tool when switching tools with shortcuts
Fixes: #37056
(cherry picked from commit a99a671034)
2021-03-16 11:11:27 +01:00
Rémi Verschelde
8ec3a33115
Merge pull request #47047 from m4gr3d/simplify_godot_plugin_methods_registration
[3.2] Improve Godot Android plugin methods registration
2021-03-16 10:35:06 +01:00
Fredia Huya-Kouadio
94df08aae1 Leverage java annotations to simplify the logic used to register the Godot plugin methods. 2021-03-16 01:20:43 -07:00
Rémi Verschelde
bbc87d54dd
Merge pull request #47045 from timothyqiu/image-lock-crash
[3.2] Fix invalid memory usage when modifying locked image
2021-03-16 08:08:45 +01:00
Rémi Verschelde
95a9e2987a
Merge pull request #47044 from timothyqiu/grid-map-ub
[3.2] Fix uninitialized GridMapEditor::node
2021-03-16 08:06:46 +01:00
Haoyu Qiu
0a17e96ab2 Fix invalid memory usage when modifying locked image 2021-03-16 13:45:45 +08:00
Haoyu Qiu
871843bbdc Fix uninitialized GridMapEditor::node 2021-03-16 10:20:56 +08:00
Rémi Verschelde
3ddab1c9d1
Merge pull request #47028 from Faless/net/3.x_upnp_null_fixes
[3.2] [Net] Fix miniupnpc when no interface is specified
2021-03-15 18:32:36 +01:00
Fabio Alessandrelli
50f0f51604 [Net] Fix miniupnpc when no interface is specified
This is a tricky one, it used to work, but it was wrong, because in such
a scenario instead of passing NULL as required by the API, it would pass
a buffer containing the `\0` terminator.
This stopped working on a specific miniupnpc version, when they fixed
some network endianess issue on Windows, to which we made a workaround,
which in turn would probably result in failures when the interface is
specified.

This commit address the issue properly, by checking the specified
interface string size, and correctly passing NULL instead of the empty
string when necessary.

Also reverts the commit that introduced the bogus workaround:
388adac947

One of those PR when the explanation is much longer then code changes
:).
2021-03-15 18:12:05 +01:00
Rémi Verschelde
48708b8e3d
Merge pull request #46999 from bruvzg/mac_new_wnd
[macOS] Fix "New Window" opening copy of current project instead of Project Manager.
2021-03-14 18:21:27 +01:00
bruvzg
7273e0b51b
[macOS] Fix "New Window" opening copy of current project instead of Project Manager. 2021-03-14 17:56:02 +02:00
Rémi Verschelde
6a9e7c5a53
Merge pull request #46992 from akien-mga/3.2-cherrypicks
Cherry-picks for the 3.2 branch (future 3.2.4) - 29th batch
2021-03-14 15:44:58 +01:00
Kongfa Waroros
5f4ac65251
Check if an input image wasn't Image on several functions in CameraFeed
(cherry picked from commit 916e576021)
2021-03-14 12:03:22 +01:00
jmb462
592c0632a1
fix-EditorSpinSlider-grabber-zoomed-position
(cherry picked from commit 919b097b9e)
2021-03-14 12:03:22 +01:00
ray90514
045cf246d4
Fix Node can not be reselected
(cherry picked from commit b0c881392a)
2021-03-14 12:03:22 +01:00
Andrii Doroshenko (Xrayez)
a33b0c5319
Provide additional include paths for custom modules
Allows to use a module as a library, where an include path may start
with module's name itself.

(cherry picked from commit f712d68ceb)
2021-03-14 12:03:22 +01:00
Alex Hirsch
5a882a659a
Add parameter checkes to FileAccess get_buffer functions
fix #46540

(cherry picked from commit cdf3099c68)
2021-03-14 12:03:22 +01:00
Rémi Verschelde
c7c7a0b822
clang-format: Fix version number in hook warning
(cherry picked from commit f4d46f6290)
2021-03-14 12:03:21 +01:00
jmb462
4b2b45f72b
Fix crash on closing empty modified scene
(cherry picked from commit 49d5ec073f)
2021-03-14 12:03:17 +01:00
jmb462
b674d934c4
Fix Asset Library URL not updating after been changed in editor settings
The changes made in this commit refresh the URL OptionButton when editor settings are modified.

No need to restart any more for the changes to appear in the Asset Library.

Fix #46977

(cherry picked from commit 6525d74623)
2021-03-14 00:20:54 +01:00
Pop0p
d2a577f7f1
trims_whitespaces_when_creating_folder_windows
When creating a Windows folder via a Godot's dialog, the extra spaces are not removed which causes problems with Windows. We now remove leading and trailing whitespace when creating a dir.

(cherry picked from commit c8538153b0)
2021-03-13 22:25:34 +01:00
Andrii Doroshenko (Xrayez)
7c7f4602e7
Add use_asan option for MSVC to enable AddressSanitizer
Exposes AddressSanitizer support in MSVC compiler. Can be installed via individual
components in the Visual Studio 2019 Installer.

Disabled by default. Compile the engine with `scons use_asan=yes`.

(cherry picked from commit 53901d870b)
2021-03-13 22:10:15 +01:00
jmb462
b73a97b110
Fix hardcoded Maya style navigation pan key modifier
ALT key modifier was hardcoded is node_3d_editor_plugin.cpp and didn't take editor settings into account.

Fix #46973

(cherry picked from commit 31077d875e)
2021-03-13 22:04:55 +01:00
Ev1lbl0w
a586f9daae
Replace malloc's with Godot's memalloc macro
(cherry picked from commit 838e7d0a8d)
2021-03-13 22:01:27 +01:00
jmb462
7ca7acce7b
Fix always capitalized properties in sub-inspector
Fix #46961:

This commit correctly initialize capitalization in sub-inspectors (like shaders's sub-inspector in the inspector panel) with the editor settings.

(cherry picked from commit 281f5a4999)
2021-03-13 21:56:31 +01:00
Fabio Alessandrelli
2f1a8ae751
Bump mbedtls to version 2.16.10.
(cherry picked from commit 18bc1f2a8f)
2021-03-13 21:56:31 +01:00
mujpao
f2739b3f52
Update viewport after Polygon2D deselected
(cherry picked from commit 030703dd30)
2021-03-13 21:56:31 +01:00
Ignacio Etcheverry
10c8438178
C#: Fix StringName leak warnings after generating bindings
`Main::cleanup()` prints warnings if it finds `StringName`s still alive.
We need the `BindingsGenerator` to be destructed before calling cleanup.

(cherry picked from commit d9603b2d73)
2021-03-13 21:56:31 +01:00
Rémi Verschelde
1d0929a992
Merge pull request #46920 from nekomatata/soft-body-gizmo-fix-3.2
[3.2] Fix pinned vertices in SoftBody editor gizmo
2021-03-13 21:52:51 +01:00
Rémi Verschelde
707a3a69c0
Merge pull request #46980 from akien-mga/3.2-fix-46979
Fix Control::_edit_set_state bogus error check
2021-03-13 21:34:48 +01:00
Rémi Verschelde
eb1698dd2a
Fix Control::_edit_set_state bogus error check
My mistake when cherry-picking #46699 with f8ee8b1b73,
I forgot to amend the cherry-pick to change 'offsets' back to 'margins' for the 3.2
branch.

Fixes #46979.
2021-03-13 21:10:12 +01:00
Rémi Verschelde
ba174332af
Merge pull request #46939 from abaire/relaxes_gltf_name_sanitization_3.2
Relaxes Node naming constraints in glTF documents to match the Editor.
2021-03-13 14:57:09 +01:00