Commit graph

27276 commits

Author SHA1 Message Date
Rémi Verschelde
9d8a9ea826 assimp: Clean and document buildsystem, prepare for unbundling
- 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-06 14:37:52 +01:00
Rémi Verschelde
1e255532e9
Merge pull request #36845 from bruvzg/macos10_15_gamepad_fix
Fix gamepad disconnection callback on macOS Catalina.
2020-03-06 11:16:51 +01:00
bruvzg
6b23e36dbc
Replace IOHIDDeviceRegisterRemovalCallback with IOHIDManagerRegisterDeviceRemovalCallback to fix gamepad disconnection callback on macOS Catalina. 2020-03-06 11:57:58 +02:00
Rémi Verschelde
b61fedbb1d
Merge pull request #36844 from Chaosus/tween_remove_bool
Removed boolean return type from majority of method in Tween
2020-03-06 10:47:27 +01:00
Yuri Roubinsky
d5bff588c7 Removed boolean return type from majority of method in Tween 2020-03-06 10:59:07 +03:00
Rémi Verschelde
da05ca6720
Merge pull request #36823 from akien-mga/mbedtls-2.16.5
mbedtls: Update to upstream version 2.16.5
2020-03-05 22:41:37 +01:00
Rémi Verschelde
93f7c63ba5
Merge pull request #33682 from m4gr3d/rearch_godot_android_plugin
Re-architecture of the Godot Android plugin.
2020-03-05 22:14:38 +01:00
fhuya
f097defba1 Re-architecture of the Godot Android plugin. 2020-03-05 10:00:19 -08:00
Rémi Verschelde
60ea8aea98
Merge pull request #36603 from m4gr3d/implement_vk_surface_view
Provide a Vulkan surface view base implementation
2020-03-05 18:44:18 +01:00
fhuya
c090caa58b Provides a base implementation of the Vulkan surface view (VkSurfaceView.kt) 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-05 08:01:42 -08:00
Rémi Verschelde
42595085a5
Merge pull request #36752 from RandomShaper/rework_semaphore
Drop old semaphore implementation
2020-03-05 16:33:45 +01:00
Thakee Nathees
07c99340d1 typo in gdscript_workspace.cpp/remove_cache_parser() fixed 2020-03-05 20:51:02 +05:30
Rémi Verschelde
e435bed847 mbedtls: Update to upstream version 2.16.5
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-05 16:12:50 +01:00
Rémi Verschelde
bd553d072b
Merge pull request #36821 from akien-mga/signals-property_changed-no-binds
Signals: Don't pass default binds to EditorProperty property_changed
2020-03-05 15:58:26 +01:00
Rémi Verschelde
fdda39a506 Signals: Don't pass default binds to EditorProperty property_changed
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-05 15:35:44 +01:00
Rémi Verschelde
5ea8b1692a
Merge pull request #36795 from hungrymonkey/issue_36720
Change LINKFLAGS to FRAMEWORKS which is supported since Scons release 0.96.91
2020-03-05 15:21:26 +01:00
Rémi Verschelde
54a8bad8fe
Merge pull request #36700 from ThakeeNathees/scene-tab-bug-fix
Fix possible EditorFolding crash when switching scenes
2020-03-05 14:23:43 +01:00
Thakee Nathees
3275e8488b Fix EditorFolding crash when switching scenes 2020-03-05 18:19:58 +05:30
Rémi Verschelde
da502f744e
Merge pull request #36813 from Faless/debugger/fix_crashes
Fix some bugs spotted by asan in editor debugger.
2020-03-05 12:51:23 +01:00
Fabio Alessandrelli
e5ec499a92 Fix some bugs spotted by asan in editor debugger.
EditorDebuggerInspector is in tree, so it gets automatically deleted,
when clearing errors the debugger should not fake a process
notification.
2020-03-05 12:28:22 +01:00
Rémi Verschelde
ee0f670807
Merge pull request #36772 from pyacier/warning-concavepolygonshape
Add a new configuration warning to CollisionShape
2020-03-05 12:01:59 +01:00
Thakee Nathees
63ce1fc438 pass keyword inside a class implemented 2020-03-05 16:19:06 +05:30
Rémi Verschelde
e8b68c48ea
Merge pull request #36810 from akien-mga/configfile-better-errors
ConfigFile: Improve error messages
2020-03-05 11:47:12 +01:00
Pierre Caye
ad227d9a85 Add a new configuration warning to CollisionShape
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-05 11:18:45 +01:00
Rémi Verschelde
f7c87ed3dd ConfigFile: Improve error messages and complete docs 2020-03-05 11:01:25 +01:00
Rémi Verschelde
d16d554d6b
Merge pull request #36807 from akien-mga/dont-give-apples-to-the-monkeys
Mono: Fix detection of Apple platforms in build script
2020-03-05 10:25:15 +01:00
Rémi Verschelde
85ffc5ec97
Merge pull request #36746 from aaronfranke/plugin-icon-docs
Document EditorPlugin get_plugin_icon and get_plugin_name
2020-03-05 09:46:41 +01:00
Rémi Verschelde
6d269dbf56
Merge pull request #36800 from qarmin/added_some_gitignore_records
Added to .gitignore - Cppcheck folder and Gcov, Lcov code coverage
2020-03-05 09:15:05 +01:00
Rémi Verschelde
5b040ef2e8 Mono: Fix detection of Apple platforms in build script 2020-03-05 09:00:41 +01:00
Rémi Verschelde
fbaa55a8db
Merge pull request #36798 from m4gr3d/android_codebase_misc_cleanup
Miscellaneous cleanup for the Android codebase
2020-03-05 08:55:56 +01:00
Rémi Verschelde
cac3e2faad
Merge pull request #36788 from nekomatata/windows-permissive-flag
Remove '/permissive-' flag from Windows MSVC build
2020-03-05 08:12:00 +01:00
Rémi Verschelde
0c53f1f7db
Merge pull request #36743 from Calinou/tweak-giprobe-gizmo
Tweak the GIProbe gizmo to be more subtle
2020-03-04 22:44:44 +01:00
Rémi Verschelde
7c9e15238e
Merge pull request #36739 from Calinou/improve-giprobe-editor-label
Improve the GIProbe editor contextual label
2020-03-04 22:41:25 +01:00
Aaron Franke
68d73ecf60
Document EditorPlugin get_plugin_icon and get_plugin_name
The return value's type hint is now accurate.
2020-03-04 15:49:20 -05:00
fhuya
b38283a6b7 Miscellaneous cleanup for the Android codebase:
- 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-04 12:16:17 -08:00
Rémi Verschelde
e89754fa1f
Merge pull request #36021 from YeldhamDev/intersects_touch_expose
Turn Rect2's 'intersects_touch()' into an extra argument of 'intersects()'
2020-03-04 20:32:20 +01:00
Rémi Verschelde
398f714dfc
Merge pull request #36792 from akien-mga/vulkan-better-debug-prints
Vulkan: Use Godot print macros matching MessageSeverity flag
2020-03-04 20:31:02 +01:00
Rémi Verschelde
fadcb75e48
Merge pull request #36791 from akien-mga/scons-expand-cxx
SCons: Expand env variables to check compiler version
2020-03-04 20:30:17 +01:00
Rafał Mikrut
5b4d74edd4 Added to .gitignore - Cppcheck and code coverage 2020-03-04 20:24:38 +01:00
hungrymonkey
c924e83a64 Change LINKFLAGS to FRAMEWORKS which is supported since
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-04 08:36:28 -08:00
Rémi Verschelde
080b5df625
Merge pull request #36682 from nekomatata/android-compilation-fix
Compilation fixes on Android
2020-03-04 16:22:16 +01:00
Rémi Verschelde
3625b057af Vulkan: Use Godot print macros matching MessageSeverity flag
Otherwise any verbose/info/warning debug message from Vulkan would
raise an error, confusing users about the severity of the message.

Cf. #36185, #36790.
2020-03-04 15:02:49 +01:00
Rémi Verschelde
df7ecfc4a7 SCons: Expand env variables to check compiler version
Scons' `Environment.subst()` does that, and was already used in the
other place where we query an env variable (`env["LINK"]` in x11 code).

Fixes `3.2` iOS build after cherry-pick of #36559 (previously it only
ran for GCC code, not iOS's Clang), and the same issue would likely
affect `master` if iOS builds were enabled right now.
2020-03-04 14:36:58 +01:00
Rémi Verschelde
a0e33e17fb
Merge pull request #36733 from qarmin/static_analyzer_fixes
Fixes bugs found by Sonarcloud and Coverity
2020-03-04 13:41:38 +01:00
Michael Alexsander
8c8c48a7ad Turn Rect2's 'intersects_touch()' into an extra argument of 'intersects()' 2020-03-04 09:32:34 -03:00
PouleyKetchoupp
e888dbbb8d Remove '/permissive-' flag from Windows MSVC build
This flag is causing compilation issues with headers from older versions
of Windows SDK (before 10.0.16299.0).
2020-03-04 13:20:53 +01:00
Rémi Verschelde
f83f1d7c9b
Merge pull request #36069 from RandomShaper/imvu/improve_drives_ux
Improve UX of drive letters
2020-03-04 13:19:55 +01:00
Rémi Verschelde
2856740e6b
Merge pull request #36385 from kuruk-mm/some_static_asserts
Change when we can ERR_FAIL_COND and ERR_FAIL_CONV_V to static_assert
2020-03-04 13:18:48 +01:00
PouleyKetchoupp
ed0655cdfb Compilation fixes on Android 2020-03-04 13:15:37 +01:00
Rémi Verschelde
98f88a4102
Merge pull request #36585 from disks86/master
Enhanced physical device selection
2020-03-04 13:00:52 +01:00