summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-03-11Merge pull request #36905 from Faless/js/restore_and_ciRémi Verschelde
Resurrect HTML5 platform, add it to CI (no rendering yet)
2020-03-10Merge pull request #36704 from ThakeeNathees/gdscript-duplicate-args-fixRémi Verschelde
GDScript duplicate arguments bug fixed
2020-03-10Merge pull request #36767 from ThakeeNathees/class-pass-fixRémi Verschelde
fix: Classes can't have pass
2020-03-10Merge pull request #36859 from ThakeeNathees/logic-error-for-loop-range-parsingRémi Verschelde
Fix: logic error in gdscript_parser.cpp for-loop-range
2020-03-10Merge pull request #36959 from akien-mga/enginedebugger-Wshadow=localFabio Alessandrelli
Fix -Wshadow=local warning in EngineDebugger
2020-03-10Fix -Wshadow=local warning in EngineDebuggerRémi Verschelde
2020-03-10Merge pull request #36887 from MCrafterzz/relativeSnapRémi Verschelde
Made snap relative work on rotation as well
2020-03-10Revert "Change LINKFLAGS to FRAMEWORKS which is supported since"Rémi Verschelde
This reverts commit c924e83a646f8a6d972ccd4d009acc323a6be158. 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-10Merge pull request #36957 from akien-mga/mbedtls-padlock-unsupportedRémi Verschelde
mbedtls: Re-add patch to disable VIA padlock
2020-03-10mbedtls: Re-add patch to disable VIA padlockRémi Verschelde
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-10Revert "Enhanced physical device selection to use device type and available ↵Rémi Verschelde
memory in relation to issue #35397" This reverts commit 4f3006e5ac30d00b90eb531f3bdfd4bfa0d4025b.
2020-03-10Merge pull request #36956 from timothyqiu/initRémi Verschelde
Initializes VulkanContext::queue_props to NULL
2020-03-10Initializes VulkanContext::queue_props to NULLHaoyu Qiu
2020-03-10Merge pull request #36954 from Faless/debugger/remote_debug_option_fixRémi Verschelde
Fix "deploy with remote debug" editor option.
2020-03-10Fix "deploy with remote debug" editor option.Fabio Alessandrelli
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-09Merge pull request #36751 from Faless/debugger/threads_and_profilersRémi Verschelde
ScriptDebugger refactor, threading, profilers.
2020-03-09Merge pull request #36943 from akien-mga/mbedtls-reapply-pr1453Rémi Verschelde
mbedtls: Re-apply upstream PR 1453 after #36823
2020-03-09Made snap relative work on rotation as wellMarcus Elg
2020-03-09mbedtls: Re-apply upstream PR 1453 after #36823Rémi Verschelde
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-09Merge pull request #36941 from akien-mga/vulkan-windows-staticRémi Verschelde
vulkan: Re-add option to build Vulkan-Loader statically
2020-03-09Merge pull request #36938 from pyacier/exclamation-mark-to-dotRémi Verschelde
change an exclamation mark to a dot
2020-03-09vulkan: Re-add option to build Vulkan-Loader staticallyRémi Verschelde
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-09Merge pull request #36901 from nekomatata/vulkan-error-messagesRémi Verschelde
More explicit error messages when vulkan calls return errors
2020-03-09change an exclamation mark to a dotPierre Caye
2020-03-09More explicit error messages when vulkan calls return errorsPouleyKetchoupp
2020-03-09Merge pull request #36917 from volzhs/cancel-snap-settingRémi Verschelde
Update snap setting only with OK
2020-03-09Merge pull request #36914 from guilhermefelipecgs/fix_check_view_informationRémi Verschelde
Fix the VIEW_INFORMATION checkbox not being selected (visually)
2020-03-09Merge pull request #36912 from Xrayez/resurrect-module-iconsRémi Verschelde
Fix missing module editor icons
2020-03-09Merge pull request #36911 from lupoDharkael/nav-renameRémi Verschelde
Complete NavigationMeshInstance rename
2020-03-09Merge pull request #36920 from Faless/debugger/more_instancesRémi Verschelde
Move Debug menu logic to DebuggerEditorPlugin, allow 4 debug instances
2020-03-09Merge pull request #36929 from timothyqiu/keep-filenameRémi Verschelde
Keeps the filename when marking scene as unsaved
2020-03-09Merge pull request #36286 from Calinou/doc-sprite3d-performance-caveatsRémi Verschelde
Document known performance issues with Sprite3D
2020-03-09Merge pull request #36934 from akien-mga/variant-defargsRémi Verschelde
DocData: Fix serialization of Variant default values
2020-03-09Merge pull request #36933 from m4gr3d/fix_godot_payment_initRémi Verschelde
Fix initialization of the GodotPayment plugin
2020-03-09DocData: Fix serialization of Variant default valuesRémi Verschelde
Co-authored-by: Bojidar Marinov <bojidar.marinov.bg@gmail.com>
2020-03-09Revert "assimp: Sync with upstream 0201fc5"Rémi Verschelde
This reverts commit 78b22393a8dd182ee56d0448ed77ba4430de5e75. It caused a regression in FBX import leading to crashes. Fixes #36908.
2020-03-09Fix initialization of the GodotPayment pluginfhuya
The `onGLRegisterPluginWithGodotNative()` method is supposed to be invoked only by `Godot`.
2020-03-09doc: Sync classref with current sourceRémi Verschelde
2020-03-09i18n: Sync translations with WeblateRémi Verschelde
(cherry picked from commit 18e021b7cd81afbccf915bd825aaa264a9f608a1)
2020-03-09Merge pull request #36932 from akien-mga/vulkan-sdk-1.2.131.2Rémi Verschelde
Update Vulkan SDK to 1.2.131.2 and matching glslang version
2020-03-09Document known performance issues with Sprite3DHugo Locurcio
See https://github.com/godotengine/godot/issues/20855.
2020-03-09Merge pull request #36924 from JFonS/viewport_rotation_masterRémi Verschelde
Add rotation widget to 3D viewport (updated)
2020-03-09Allow running/debugging up to 4 instances.Fabio Alessandrelli
2020-03-09glslang: Sync with upstream 4fc7a33 for Vulkan SDK 1.2.131Rémi Verschelde
Fixes #36888.
2020-03-09Update Vulkan loader and headers to sdk-1.2.131.2Rémi Verschelde
(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-09Keeps the filename when marking scene as unsavedHaoyu Qiu
2020-03-08Add rotation widget to 3D viewportjfons
2020-03-08Move Debug menu logic to DebuggerEditorPluginFabio Alessandrelli
2020-03-09Update snap setting only with OKvolzhs
restore previous values with cancel
2020-03-08Fix the VIEW_INFORMATION checkbox not being selectedGuilherme Felipe
Generated id of "Display Advanced..." was in conflict with "View Information"