Commit graph

15815 commits

Author SHA1 Message Date
Ignacio Etcheverry f3c7527225 Fix case where exported properties value is lost
Fixes exported property modified values lost when creating a placeholder script instance with a failed script compilation

- Object set/get will call PlaceHolderScriptInstance's new fallback set/get methods as a last resort. This way, placeholder script instances can keep the values for storage or until the script is compiled successfuly.
- Script::can_instance() will only return true if a real script instance can be created. Otherwise, in the case of placeholder script instances, it will return false.
- Object::set_script(script) is now in charge of requesting the creation of placeholder script instances. It's no longer Script::instance_create(owner)'s duty.
- PlaceHolderScriptInstance has a new method set_build_failed(bool) to determine whether it should call into its script methods or not.
- Fixed a few problems during reloading of C# scripts.
2018-07-29 22:40:12 +02:00
Juan Linietsky 200c6cf630 Perform a name check when loading scenes and running on editor, fixes #6152 2018-07-29 17:39:45 -03:00
Ignacio Etcheverry b3919dcb44
Merge pull request #20582 from hpvb/fix-mono-mingw
Fix Mono compilation on Windows/Ming
2018-07-29 22:36:44 +02:00
Hein-Pieter van Braam 0deb8dda51 Fix Mono compilation on Windows/Ming
(cherry picked from commit 83140541dc)
2018-07-29 22:31:38 +02:00
Juan Linietsky 317dee95de It is now possible to import images as a separate resource, closes #5738 and likely many others 2018-07-29 16:45:23 -03:00
Jari Ronkainen 687b95b41f Do not use deprecated stuff that only glibc now implements 2018-07-29 22:27:47 +03:00
Juan Linietsky 7b63c6323d Clear color was not correctly being set, fixes #4939 2018-07-29 15:09:42 -03:00
Andrea Catania 7949ba771b SoftBody add MeshInstance Material correctly 2018-07-29 19:36:32 +02:00
Juan Linietsky c752c26427 Expose _clips_input as a virtual function, closes #15358 2018-07-29 12:48:17 -03:00
Juan Linietsky 0fcc28b6f3
Merge pull request #15269 from ianb96/context_menu_improvements
Context Menu Improvements
2018-07-29 12:31:20 -03:00
Juan Linietsky d2aaf460fb Manually fix, merge and close #15168 2018-07-29 12:18:37 -03:00
Hein-Pieter van Braam 2d98b40d47 Fix nested Vectors
When a Vector of Vectors gets resized the 'this' pointer of the Vectors
change. This means that the VectorWriteProxy _parent references get
invalidated. Thanks a lot to @ibrahn for finding the root cause of this.

To fix this we now create a pointer to CowData in Vector (which won't
change when the vectors move) and pass that to the write proxy also.

This fixes #20475
2018-07-29 17:03:35 +02:00
Hein-Pieter van Braam b62586c9f9
Merge pull request #20546 from ibrahn/fix-menu-branch-on-uninit
fixed uninitialised variable that was causing menu crash.
2018-07-29 04:20:45 +02:00
Hein-Pieter van Braam 5c88bc66e3 Undo an accidental revert.
Sorry for the history pollution. I was testing something on this branch
and forgot to reset befor pushing the security update.

This reverts commit 2ef66def46.
2018-07-29 04:14:57 +02:00
Fabio Alessandrelli feaf03421d Fix marshalls size checks.
Yesterday, when playing around with my network code, I realized there is
a security issue in decode_variant, at least when decoding PoolArrays.
Basically, the size of the PoolArray is encoded in a uint32_t, when
decoding it, that value is cast to int when comparing if the packet is
actually that size causing numbers with MSB=1 to be interpreted as
negative thus always passing the check. That same value though, is used
as uint32_t again to resize the output vector.  For this reason, sending
a malformed packet with declared type PoolByteArray and size of 2^31(+x)
causes the engine to try to allocate 2+GB of pool memory, causing the
engine to crash.

(cherry picked from commit 5262d1bbcc)
2018-07-29 03:00:34 +02:00
Hein-Pieter van Braam 2ef66def46 Revert "Open visual editor when "open editor" button in the inspector is pressed."
This reverts commit 0ae400f523.
2018-07-28 21:16:20 +02:00
Andrea Catania 45160f0c0d Fixed Softbody pin point 2018-07-28 20:38:20 +02:00
Rémi Verschelde 07129deaeb
Merge pull request #20544 from dragmz/fix-py37-windows-build
fix windows build using python 3.7
2018-07-28 20:24:34 +02:00
oliperraul dc2df7a146 Fixed a number of issues related to the Dictionary export property for the editor
* Fixed a problem when buttons were deleted on the same frame they were pressed (inside update_property)
* Prevent usage of nul key for a dictionary.
* Provide symetry in the interface for both the array property and dictionary property by first clicking on the field to instantiating the dictionary.
	Array (Nil), Array (size 0), Array (size 1)
	Dictionary (Nil), Array (size 0), Array (size 1)
* Allow to press enter to confirm a string in line edi.
2018-07-28 14:17:56 -04:00
Ibrahn Sahir 1626ae6421 fixed uninitialised variable that was causing menu crash. 2018-07-28 18:09:47 +01:00
dragmz 8fd337e2df fix windows build using python 3.7
fixes NameError (missing "subprocess_main" and "basestring")
2018-07-28 18:13:48 +02:00
Rémi Verschelde 90298ddf01
Merge pull request #20532 from BastiaanOlij/arraymesh_surface_find_by_name
Added a method to find the index for a surface with a given name
2018-07-28 15:42:08 +02:00
Rémi Verschelde 04ec0bf5e1
Merge pull request #20539 from akien-mga/mbedtls-2.12.0
mbedtls: Update to upstream version 2.12.0
2018-07-28 15:40:40 +02:00
Rémi Verschelde bdbc63c4ee
Merge pull request #20537 from akien-mga/glad-0.1.25
glad: Sync with upstream 0.1.25
2018-07-28 15:40:33 +02:00
Rémi Verschelde d7490bbee9
Merge pull request #20536 from akien-mga/libpng-1.6.35
libpng: Update to upstream version 1.6.35
2018-07-28 15:40:27 +02:00
Rémi Verschelde 31c67a0fa0
Merge pull request #20535 from akien-mga/layers-tooltips
Fix layer 2-line tooltips used as name in inspector
2018-07-28 15:40:18 +02:00
Rémi Verschelde d8e1cd7a10 mbedtls: Update to upstream version 2.12.0
_WIN32_WINNT redefinition fix is no longer needed as it was merged
upstream. PR 1453 is still not merged, diff updated to current state.
2018-07-28 11:16:58 +02:00
Bastiaan Olij d41a4089c6 Added a method to find the index for a surface with a given name 2018-07-28 19:14:41 +10:00
Rémi Verschelde a431492b62 glad: Sync with upstream 0.1.25 2018-07-28 11:01:43 +02:00
Rémi Verschelde f4e682d717 libpng: Update to upstream version 1.6.35 2018-07-28 10:57:14 +02:00
Rémi Verschelde 4e4702e386
Merge pull request #20464 from Calinou/add-editor-standalone-feature-tags
Add "editor" and "standalone" feature tags
2018-07-28 10:49:27 +02:00
Rémi Verschelde 578c8fc1e5 Fix layer 2-line tooltips used as name in inspector
Fixes #20288.
2018-07-28 10:27:19 +02:00
Rémi Verschelde 4488bb9956
Merge pull request #20463 from fire/vs_expand_hints_to_virtual_func
Visualscript: Carry property hint and hint string through to Visualscript virtual funcs
2018-07-28 09:49:23 +02:00
Rémi Verschelde e6aec27428
Merge pull request #20511 from maksloboda/InputEventActionFix
Fixed shortcuts not working with InputEventActions
2018-07-28 09:48:44 +02:00
Rémi Verschelde 66429a1576
Merge pull request #17595 from viktor-ferenczi/issue-5042-subproc
Running builder (content generator) functions in subprocesses on Windows
2018-07-28 09:20:50 +02:00
Max Hilbrunner 6601502acd
Merge pull request #20528 from Calinou/improve-appstream-add-mime-type
Tweak AppStream metadata and add MIME type integration
2018-07-28 01:29:33 +02:00
SaracenOne f045534f86
Merge pull request #7 from marcelofg55/audio_mic_mf2
Added support for single channel inputs for PulseAudio
2018-07-27 23:40:35 +01:00
Hugo Locurcio 01914ee00b
Tweak AppStream metadata and add MIME type integration
This allows Godot to be registered as an application to open
Godot project files.
2018-07-28 00:40:05 +02:00
Marcelo Fernandez 913eec5b04 Added support for single channel inputs for PulseAudio 2018-07-27 17:28:41 -03:00
K. S. Ernest (iFire) Lee 2650b87102 Carry property hint and hint string through to Visualscript virtual functions. 2018-07-27 13:12:34 -07:00
Rémi Verschelde aecc3a444b
Merge pull request #20457 from fire/vs_generic_search_crash_and_connecting
Visualscript: misc generic search changes
2018-07-27 21:38:11 +02:00
Viktor Ferenczi c5bd0c37ce Running builder (content generator) functions in subprocesses on Windows
- Refactored all builder (make_*) functions into separate Python modules along to the build tree
- Introduced utility function to wrap all invocations on Windows, but does not change it elsewhere
- Introduced stub to use the builders module as a stand alone script and invoke a selected function

There is a problem with file handles related to writing generated content (*.gen.h and *.gen.cpp)
on Windows, which randomly causes a SHARING VIOLATION error to the compiler resulting in flaky
builds. Running all such content generators in a new subprocess instead of directly inside the
build script works around the issue.

Yes, I tried the multiprocessing module. It did not work due to conflict with SCons on cPickle.
Suggested workaround did not fully work either.

Using the run_in_subprocess wrapper on osx and x11 platforms as well for consistency. In case of
running a cross-compilation on Windows they would still be used, but likely it will not happen
in practice. What counts is that the build itself is running on which platform, not the target
platform.

Some generated files are written directly in an SConstruct or SCsub file, before the parallel build starts. They don't need to be written in a subprocess, apparently, so I left them as is.
2018-07-27 21:37:55 +02:00
Rémi Verschelde 33f1ca89a5
Merge pull request #20462 from fire/vs_don't_typeguess_nil
Visualscript: Don't type guess on nil and set default type to ""
2018-07-27 21:37:46 +02:00
Saracen d91183be52 Added pointer to WASAPI input_buffer_write method. 2018-07-27 19:34:07 +01:00
SaracenOne e8f13432f8
Merge pull request #6 from marcelofg55/audio_mic_mf2
Renamed AudioDriver audio_input_* vars to input_*
2018-07-27 19:27:14 +01:00
Marcelo Fernandez 597301db34 Renamed AudioDriver audio_input_* vars to input_* 2018-07-27 15:09:03 -03:00
SaracenOne dd8a0b92e0
Merge pull request #5 from marcelofg55/audio_mic_mf2
Added support for single channel inputs for CoreAudio
2018-07-27 18:16:48 +01:00
Marcelo Fernandez e5e4dbb6c9 Added support for single channel inputs for CoreAudio 2018-07-27 14:05:38 -03:00
Ignacio Etcheverry 92c59384ec
Merge pull request #17720 from paulloz/custom-csharp-glue
[mono] Generic Typed GetNode, GetChild, etc.
2018-07-27 18:47:19 +02:00
Saracen 09eafaba62 Implemented capture device selection for PulseAudio (marcelofg55) 2018-07-27 16:50:13 +01:00