summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-03-06Trim the whitespace around the plugins names.fhuya
2020-03-06Merge pull request #36870 from CodeforEvolution/syncMiniupnpcRémi Verschelde
miniupnpc: Sync with upstream master (4436632)
2020-03-06miniupnpc: Sync with upstream master (4436632)CodeforEvolution
2020-03-06Merge pull request #36842 from Phischermen/mono-resource-loader-extension-updateRémi Verschelde
Mono/C#: Add missing parameters to 'ResourceLoader.Load<T>()'
2020-03-06Added parameters to Load()Phischermen
2020-03-06Merge pull request #36849 from theoway/Documentation_editRémi Verschelde
Edited the KinematicBody and KinematicBody2D docs
2020-03-06Edited the KinematicBody and KinematicBody2D docsUmang Kalra
Changes made as requested. Explained the reason why move_and_slide should be sued in _physics_process Final Changes Edited the docs as per the changes requested. Edits in docs Made some changes
2020-03-06Merge pull request #36852 from akien-mga/assimp-unbundleRémi Verschelde
assimp: Clean and document buildsystem, update to upstream 0201fc5
2020-03-06Merge pull request #36854 from AndreaCatania/AndreaCatania-patch-3Rémi Verschelde
Added navigation mesh merging error.
2020-03-06Added error to notify that the Navigation triangle merging failed due to ↵Andrea Catania
incorrect parameter.
2020-03-06assimp: Sync with upstream 0201fc5Rémi Verschelde
2020-03-06assimp: Clean and document buildsystem, prepare for unbundlingRémi Verschelde
- Improve the SCsub to allow unbundling and remove unnecessary code. - Move files around to match upstream source. - Re-sync with upstream commit 308db73d0b3c2d1870cd3e465eaa283692a4cf23 to ensure we don't have local modifications. - Doesn't actually build against current version 5.0.1 due to the lack of the new ArmaturePopulate API that Gordon authored. We'll have to wait for a public release with that API (5.1?) to enable unbundling.
2020-03-06Merge pull request #36845 from bruvzg/macos10_15_gamepad_fixRémi Verschelde
Fix gamepad disconnection callback on macOS Catalina.
2020-03-06Replace IOHIDDeviceRegisterRemovalCallback with ↵bruvzg
IOHIDManagerRegisterDeviceRemovalCallback to fix gamepad disconnection callback on macOS Catalina.
2020-03-06Merge pull request #36844 from Chaosus/tween_remove_boolRémi Verschelde
Removed boolean return type from majority of method in Tween
2020-03-06Removed boolean return type from majority of method in TweenYuri Roubinsky
2020-03-05Merge pull request #36823 from akien-mga/mbedtls-2.16.5Rémi Verschelde
mbedtls: Update to upstream version 2.16.5
2020-03-05Merge pull request #33682 from m4gr3d/rearch_godot_android_pluginRémi Verschelde
Re-architecture of the Godot Android plugin.
2020-03-05Re-architecture of the Godot Android plugin.fhuya
2020-03-05Merge pull request #36603 from m4gr3d/implement_vk_surface_viewRémi Verschelde
Provide a Vulkan surface view base implementation
2020-03-05Provides a base implementation of the Vulkan surface view (VkSurfaceView.kt) ↵fhuya
and its accompanying components. The implementation is meant to be extended and updated in order to integrate it with the existing Godot java and native codebase.
2020-03-05Merge pull request #36752 from RandomShaper/rework_semaphoreRémi Verschelde
Drop old semaphore implementation
2020-03-05mbedtls: Update to upstream version 2.16.5Rémi Verschelde
Fixes https://tls.mbed.org/tech-updates/security-advisories/mbedtls-security-advisory-2020-02 Drop patch to disable VIA padlock since we no longer use libwebsockets, so there's no conflict anymore.
2020-03-05Merge pull request #36821 from akien-mga/signals-property_changed-no-bindsRémi Verschelde
Signals: Don't pass default binds to EditorProperty property_changed
2020-03-05Signals: Don't pass default binds to EditorProperty property_changedRémi Verschelde
This was done by mistake in #36758, but it's not necessary and actual causes a bug. `property_changed` is only emitted via `emit_changed()`, which already has default values for `p_field` and `p_changing`. Also reverted to using `String` for now to be on the safe side, even if it's inconsistent with `emit_changed()`. I had only changed it partially in #36758 so it was inconsistent. It probably does make sense to port `EditorInspector` and related property editors to use `StringName` where relevant, but that's for a dedicated PR. Fixes #36799.
2020-03-05Merge pull request #36795 from hungrymonkey/issue_36720Rémi Verschelde
Change LINKFLAGS to FRAMEWORKS which is supported since Scons release 0.96.91
2020-03-05Merge pull request #36700 from ThakeeNathees/scene-tab-bug-fixRémi Verschelde
Fix possible EditorFolding crash when switching scenes
2020-03-05Fix EditorFolding crash when switching scenesThakee Nathees
2020-03-05Merge pull request #36813 from Faless/debugger/fix_crashesRémi Verschelde
Fix some bugs spotted by asan in editor debugger.
2020-03-05Fix some bugs spotted by asan in editor debugger.Fabio Alessandrelli
EditorDebuggerInspector is in tree, so it gets automatically deleted, when clearing errors the debugger should not fake a process notification.
2020-03-05Merge pull request #36772 from pyacier/warning-concavepolygonshapeRémi Verschelde
Add a new configuration warning to CollisionShape
2020-03-05Merge pull request #36810 from akien-mga/configfile-better-errorsRémi Verschelde
ConfigFile: Improve error messages
2020-03-05Add a new configuration warning to CollisionShapePierre Caye
In the case where a ConcavePolygonShape is used as a shape for a RigidBody in another mode than static, a configuration warning will appear in the editor.
2020-03-05ConfigFile: Improve error messages and complete docsRémi Verschelde
2020-03-05Merge pull request #36807 from akien-mga/dont-give-apples-to-the-monkeysRémi Verschelde
Mono: Fix detection of Apple platforms in build script
2020-03-05Merge pull request #36746 from aaronfranke/plugin-icon-docsRémi Verschelde
Document EditorPlugin get_plugin_icon and get_plugin_name
2020-03-05Merge pull request #36800 from qarmin/added_some_gitignore_recordsRémi Verschelde
Added to .gitignore - Cppcheck folder and Gcov, Lcov code coverage
2020-03-05Mono: Fix detection of Apple platforms in build scriptRémi Verschelde
2020-03-05Merge pull request #36798 from m4gr3d/android_codebase_misc_cleanupRémi Verschelde
Miscellaneous cleanup for the Android codebase
2020-03-05Merge pull request #36788 from nekomatata/windows-permissive-flagRémi Verschelde
Remove '/permissive-' flag from Windows MSVC build
2020-03-04Merge pull request #36743 from Calinou/tweak-giprobe-gizmoRémi Verschelde
Tweak the GIProbe gizmo to be more subtle
2020-03-04Merge pull request #36739 from Calinou/improve-giprobe-editor-labelRémi Verschelde
Improve the GIProbe editor contextual label
2020-03-04Document EditorPlugin get_plugin_icon and get_plugin_nameAaron Franke
The return value's type hint is now accurate.
2020-03-04Miscellaneous cleanup for the Android codebase:fhuya
- update gradle plugins versions - add formatting rules for AndroidManifest and gradle build files - cleanup java_godot_lib_jni Note: logic was mostly moved around and no new logic/functionality was added.
2020-03-04Merge pull request #36021 from YeldhamDev/intersects_touch_exposeRémi Verschelde
Turn Rect2's 'intersects_touch()' into an extra argument of 'intersects()'
2020-03-04Merge pull request #36792 from akien-mga/vulkan-better-debug-printsRémi Verschelde
Vulkan: Use Godot print macros matching MessageSeverity flag
2020-03-04Merge pull request #36791 from akien-mga/scons-expand-cxxRémi Verschelde
SCons: Expand env variables to check compiler version
2020-03-04Added to .gitignore - Cppcheck and code coverageRafał Mikrut
2020-03-04Change LINKFLAGS to FRAMEWORKS which is supported sincehungrymonkey
Scons release 0.96.91 Fixes the link errors below clang: error: no such file or directory: 'Carbon' clang: error: no such file or directory: 'AudioUnit' clang: error: no such file or directory: 'CoreAudio' clang: error: no such file or directory: 'CoreMIDI' clang: error: no such file or directory: 'IOKit' clang: error: no such file or directory: 'ForceFeedback' clang: error: no such file or directory: 'CoreVideo' clang: error: no such file or directory: 'AVFoundation' clang: error: no such file or directory: 'CoreMedia' clang: error: no such file or directory: 'Metal' clang: error: no such file or directory: 'QuartzCore' Tested on System Version: macOS 10.15.3 (19D76) SCons by Steven Knight et al.: script: v3.1.2.bee7caf9defd6e108fc2998a2520ddb36a967691, 2019-12-17 02:07:09, by bdeegan on octodog engine: v3.1.2.bee7caf9defd6e108fc2998a2520ddb36a967691, 2019-12-17 02:07:09, by bdeegan on octodog engine path: ['/usr/local/Cellar/scons/3.1.2_1/libexec/scons-local/SCons'] Xcode 11.3.1 Build version 11C504 Apple clang version 11.0.0 (clang-1100.0.33.17) Target: x86_64-apple-darwin19.3.0 Closes #36720
2020-03-04Merge pull request #36682 from nekomatata/android-compilation-fixRémi Verschelde
Compilation fixes on Android