Commit graph

27358 commits

Author SHA1 Message Date
Rémi Verschelde
95c9345b63
Merge pull request #36859 from ThakeeNathees/logic-error-for-loop-range-parsing
Fix: logic error in gdscript_parser.cpp for-loop-range
2020-03-10 13:08:01 +01:00
Fabio Alessandrelli
002d821e6e
Merge pull request #36959 from akien-mga/enginedebugger-Wshadow=local
Fix -Wshadow=local warning in EngineDebugger
2020-03-10 12:09:02 +01:00
Rémi Verschelde
e1c3c6ba45 Fix -Wshadow=local warning in EngineDebugger 2020-03-10 10:24:23 +01:00
Rémi Verschelde
1500e40ccf
Merge pull request #36887 from MCrafterzz/relativeSnap
Made snap relative work on rotation as well
2020-03-10 10:17:42 +01:00
Rémi Verschelde
1f6c9328dd Revert "Change LINKFLAGS to FRAMEWORKS which is supported since"
This reverts commit c924e83a64.

SCons `FRAMEWORKS` is, according to their latest docs, only supported
"On Mac OS X with gcc". While the "with gcc" part seems bogus, #36795
did introduce a link failure for our osxcross toolchain for compiling
macOS binaries from Linux. SCons probably fails to detect this as a
macOS target and does not use its `FRAMEWORKS` logic properly.

So using `LINKFLAGS` as we used to is the more portable solution.
2020-03-10 09:55:28 +01:00
Rémi Verschelde
f67ebdc4a8
Merge pull request #36957 from akien-mga/mbedtls-padlock-unsupported
mbedtls: Re-add patch to disable VIA padlock
2020-03-10 09:31:00 +01:00
Rémi Verschelde
8189abd64a mbedtls: Re-add patch to disable VIA padlock
The comment mentioned a conflict with libwebsockets, but we actually
still get this conflict even now that we don't use libwebsockets.
Not sure what component is clashing but we should basically just keep
this patch.

Follow-up to #36823.
2020-03-10 09:15:00 +01:00
Rémi Verschelde
f70b5fa30c Revert "Enhanced physical device selection to use device type and available memory in relation to issue #35397"
This reverts commit 4f3006e5ac.
2020-03-10 08:58:34 +01:00
Rémi Verschelde
17c3c223dc
Merge pull request #36956 from timothyqiu/init
Initializes VulkanContext::queue_props to NULL
2020-03-10 08:58:06 +01:00
Haoyu Qiu
46230d253b Initializes VulkanContext::queue_props to NULL 2020-03-10 14:36:39 +08:00
Rémi Verschelde
5a6f96e01d
Merge pull request #36954 from Faless/debugger/remote_debug_option_fix
Fix "deploy with remote debug" editor option.
2020-03-10 07:05:55 +01:00
Fabio Alessandrelli
95c4ba80c5 Fix "deploy with remote debug" editor option.
The line to update the option was missing (rendering it useless).
Of course the only one I didn't know how to test was broken.
2020-03-10 04:06:19 +01:00
Rémi Verschelde
478337c412
Merge pull request #36751 from Faless/debugger/threads_and_profilers
ScriptDebugger refactor, threading, profilers.
2020-03-09 19:08:07 +01:00
Rémi Verschelde
640169da5b
Merge pull request #36943 from akien-mga/mbedtls-reapply-pr1453
mbedtls: Re-apply upstream PR 1453 after #36823
2020-03-09 19:06:57 +01:00
Mateo Miccino
64cd5d197d Doctool and core: Fix return type in docs for some Variant methods assigning PROPERTY_USAGE_NIL_IS_VARIANT to MethodInfo usage when we have something to return 2020-03-09 13:36:03 -03:00
Marcus Elg
97a07bada7 Made snap relative work on rotation as well 2020-03-09 17:00:47 +01:00
Rémi Verschelde
9a727714ee mbedtls: Re-apply upstream PR 1453 after #36823
For some weird reason 'git apply' does not error out when it does nothing,
so I missed that I did not apply the patch properly in #36823...

This broke the UWP 32-bit x86 build.
2020-03-09 16:03:27 +01:00
Rémi Verschelde
65e0a2fb52
Merge pull request #36941 from akien-mga/vulkan-windows-static
vulkan: Re-add option to build Vulkan-Loader statically
2020-03-09 15:51:18 +01:00
Rémi Verschelde
2fb511a4f7
Merge pull request #36938 from pyacier/exclamation-mark-to-dot
change an exclamation mark to a dot
2020-03-09 15:27:33 +01:00
Rémi Verschelde
d744d3046e vulkan: Re-add option to build Vulkan-Loader statically
Upstream removed the option in KhronosGroup/Vulkan-Loader#260, which
breaks our current use case.
This commit reverts KhronosGroup/Vulkan-Loader#260 is our vendored
loader.

We may need to re-evaluate how we link the loader, but until then,
reverting this PR fixes Windows support after the upgrade to a recent
SDK version in #36932.
2020-03-09 15:25:54 +01:00
Rémi Verschelde
709b176db0
Merge pull request #36901 from nekomatata/vulkan-error-messages
More explicit error messages when vulkan calls return errors
2020-03-09 14:50:04 +01:00
Pierre Caye
f30f3f3deb change an exclamation mark to a dot 2020-03-09 14:44:12 +01:00
PouleyKetchoupp
d99bea20dc More explicit error messages when vulkan calls return errors 2020-03-09 13:25:54 +01:00
Rémi Verschelde
af015f79d3
Merge pull request #36917 from volzhs/cancel-snap-setting
Update snap setting only with OK
2020-03-09 12:19:56 +01:00
Rémi Verschelde
1f37c8e048
Merge pull request #36914 from guilhermefelipecgs/fix_check_view_information
Fix the VIEW_INFORMATION checkbox not being selected (visually)
2020-03-09 12:17:07 +01:00
Rémi Verschelde
d9524d8890
Merge pull request #36912 from Xrayez/resurrect-module-icons
Fix missing module editor icons
2020-03-09 12:15:44 +01:00
Rémi Verschelde
bc9e9f1dfc
Merge pull request #36911 from lupoDharkael/nav-rename
Complete NavigationMeshInstance rename
2020-03-09 12:15:02 +01:00
Rémi Verschelde
e162c07af9
Merge pull request #36920 from Faless/debugger/more_instances
Move Debug menu logic to DebuggerEditorPlugin, allow 4 debug instances
2020-03-09 12:01:14 +01:00
Rémi Verschelde
a4318281d3
Merge pull request #36929 from timothyqiu/keep-filename
Keeps the filename when marking scene as unsaved
2020-03-09 11:43:11 +01:00
Rémi Verschelde
159ed359f0
Merge pull request #36286 from Calinou/doc-sprite3d-performance-caveats
Document known performance issues with Sprite3D
2020-03-09 11:42:27 +01:00
Rémi Verschelde
4787da0997
Merge pull request #36934 from akien-mga/variant-defargs
DocData: Fix serialization of Variant default values
2020-03-09 11:35:28 +01:00
Rémi Verschelde
ee543253ec
Merge pull request #36933 from m4gr3d/fix_godot_payment_init
Fix initialization of the GodotPayment plugin
2020-03-09 11:31:56 +01:00
Rémi Verschelde
788765709d DocData: Fix serialization of Variant default values
Co-authored-by: Bojidar Marinov <bojidar.marinov.bg@gmail.com>
2020-03-09 10:52:44 +01:00
Rémi Verschelde
da1f80c1f2 Revert "assimp: Sync with upstream 0201fc5"
This reverts commit 78b22393a8.

It caused a regression in FBX import leading to crashes.
Fixes #36908.
2020-03-09 10:42:18 +01:00
fhuya
7aa1c3e490 Fix initialization of the GodotPayment plugin
The `onGLRegisterPluginWithGodotNative()` method is supposed to be invoked only by `Godot`.
2020-03-09 10:32:23 +01:00
Rémi Verschelde
471271b727 doc: Sync classref with current source 2020-03-09 10:13:45 +01:00
Rémi Verschelde
e629b4bc8a i18n: Sync translations with Weblate
(cherry picked from commit 18e021b7cd)
2020-03-09 10:13:45 +01:00
Rémi Verschelde
18dae8409c
Merge pull request #36932 from akien-mga/vulkan-sdk-1.2.131.2
Update Vulkan SDK to 1.2.131.2 and matching glslang version
2020-03-09 10:13:27 +01:00
Hugo Locurcio
92fa3e076f Document known performance issues with Sprite3D
See https://github.com/godotengine/godot/issues/20855.
2020-03-09 10:13:09 +01:00
Rémi Verschelde
6b3798ecb3
Merge pull request #36924 from JFonS/viewport_rotation_master
Add rotation widget to 3D viewport (updated)
2020-03-09 10:09:14 +01:00
Fabio Alessandrelli
bfc1b76803 Allow running/debugging up to 4 instances. 2020-03-09 09:43:54 +01:00
Rémi Verschelde
1231c2ecfc glslang: Sync with upstream 4fc7a33 for Vulkan SDK 1.2.131
Fixes #36888.
2020-03-09 09:36:38 +01:00
Rémi Verschelde
214bc9e5a1 Update Vulkan loader and headers to sdk-1.2.131.2
(Headers are actually sdk-1.2.131.1, they did not get a re-release.)

Also synced VMA 2.3.0 again, fixing unwanted clang-formatting of
thirdparty code.
2020-03-09 09:36:37 +01:00
Haoyu Qiu
9ed61a70cc Keeps the filename when marking scene as unsaved 2020-03-09 10:26:57 +08:00
jfons
7055a926ff Add rotation widget to 3D viewport 2020-03-08 23:38:29 +01:00
Fabio Alessandrelli
4d623b70d7 Move Debug menu logic to DebuggerEditorPlugin 2020-03-08 22:57:48 +01:00
volzhs
667a981d4d Update snap setting only with OK
restore previous values with cancel
2020-03-09 04:31:11 +09:00
Guilherme Felipe
126cec41e6 Fix the VIEW_INFORMATION checkbox not being selected
Generated id of "Display Advanced..." was in conflict with "View Information"
2020-03-08 15:34:41 -03:00
Andrii Doroshenko (Xrayez)
3acebdeecd Fix missing module editor icons
Module icons need to be renamed to PascalCase as well
for them to be registered in 4.0.

See godotengine/godot#36513.
2020-03-08 19:32:25 +02:00
lupoDharkael
d63bf6dea5 Complete NavigationMeshInstance rename 2020-03-08 17:33:34 +01:00