mirror/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-12-09 10:09:20 +08:00
Code Issues Packages Projects Releases Wiki Activity
15,504 Commits 15 Branches 59 Tags 8.1 GiB
6c569c90b6
Commit Graph

15504 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
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
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