Commit Graph

15566 Commits

Author SHA1 Message Date
Thomas Herzog b34d2efedb
Merge pull request #20704 from dragmz/patch-2
Fix uniform set for mat3 and mat4
2018-08-04 08:10:44 +02:00
Marcin Zawiejski 477f496162
Fix uniform set for mat3 and mat4 2018-08-04 07:30:25 +02:00
Ignacio Etcheverry b911165679
Merge pull request #20600 from exts/new_generic_methods
Mono: Added generic methods for PackedScene & ResourceLoader
2018-08-04 05:22:38 +02:00
exts cdb4ae471b Added generic method for ResourceLoader: Load<T>() 2018-08-03 13:40:42 -05:00
PJB3005 338217c30b Improve TileMap.get_used_cells docs. 2018-08-03 20:38:31 +02:00
Andrea Catania b469267d94 Fixed SoftBody pinned point offset calculation 2018-08-03 17:44:09 +02:00
David Sichma c101dd5fa6 Keeping track of discard
Shader compilation now keeps track of the discard key word.

Previously only variables were monitored. But discard, which needs
special treatment in some cases, went unnoticed by the compiler as
discard is not a variable but a flow control.

This commit adds monitoring for discard.
2018-08-02 21:55:02 +02:00
Max Hilbrunner 6c569c90b6
Merge pull request #20617 from viktor-ferenczi/issue-20613
Fix Mac build
2018-08-01 19:00:22 +02:00
Ignacio Etcheverry 3fa2404a79
Merge pull request #20644 from NickToony/master
Fixed Windows mono compile
2018-08-01 03:52:46 +02:00
Nick Hope 24b4694313 fixed: windows mono compile (#20598)
tidy: formatting.
2018-07-31 21:16:47 +01:00
Jason Anderson 512ae49f7d Added description and measurement 2018-07-31 14:20:27 -05:00
Ignacio Etcheverry ccce161d0e
Merge pull request #20639 from neikeq/issue-20531-and-cleanup
Mono: Fix property set_value and cleanup
2018-07-31 20:10:04 +02:00
Ignacio Etcheverry 4172fa03b5 Mono: Fix property set_value and cleanup 2018-07-31 19:49:16 +02:00
Unknown 7fbb826422 Fix #20564 HDR import fail
Token has extra "0" at the end so it fail condition checking.
2018-07-31 21:34:44 +07:00
Viktor Ferenczi 5590ec67db Fixed short circuiting on non-Windows platforms 2018-07-30 23:55:15 +02:00
Viktor Ferenczi 32a2c46d02 Fixed Mac build by running builders in subprocess only on Windows
Also passing serializable SCons environment variables (env) for compatibility with debug builds (search for uses of env in make functions)
2018-07-30 23:35:35 +02:00
Jason Anderson 17eb26a83a Added description 2018-07-30 13:56:09 -05:00
Max Hilbrunner 3f01f40e91
Merge pull request #20550 from AndreaCatania/soft_fix
Soft Body - Pin Point fix, Material fix
2018-07-30 17:01:25 +02:00
Thomas Herzog b4d3f541e7 add 3D textures 2018-07-30 12:20:27 +02:00
Juan Linietsky 5a5614e8ad Add support for line continuations (wtf) in obj format, fixes #7974 2018-07-29 21:37:55 -03:00
Juan Linietsky 15db793ef2 Ensure process notification is received only if really enabled, fixes #7894 2018-07-29 21:20:41 -03:00
Juan Linietsky e896261b87 Added missing support for traditional chinese on Windows, fixes #7674 2018-07-29 21:10:30 -03:00
Juan Linietsky ac52eb444f Ensure one shot signals are not disconnected while edited, closes #7776 2018-07-29 21:05:31 -03:00
Juan Linietsky 95a9e51975 Remove pointless check for no texture, fixes #7298 2018-07-29 20:47:20 -03:00
Juan Linietsky aff57a613b Add extra functions to toggle bits in visualinstance and camera, same as physics. Helps with #6685 2018-07-29 20:05:16 -03: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
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
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