maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
15483 commits 10 branches 35 tags 1.1 GiB
Commit graph

15483 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
Rémi Verschelde
6afabc0335
Merge pull request #20516 from BastiaanOlij/fix_nativescript_getset 
Fixed nativescript getter and setter logic
 2018-07-27 16:54:06 +02:00
Rémi Verschelde
eb17a65dec
Merge pull request #20515 from akien-mga/physicsbody-deprecated 
Fix PhysicsBody build with deprecated=no
 2018-07-27 16:53:43 +02:00
Thomas Herzog
c7dc066dc1
Merge pull request #20512 from karroffel/gles2-pr 
add initial GLES2 3D renderer
 2018-07-27 16:31:10 +02:00
Bastiaan Olij
8a914f17b0 Fixed nativescript getter and setter logic 2018-07-27 23:45:29 +10:00
Rémi Verschelde
12254594ac Fix PhysicsBody build with deprecated=no 
Fixes #20483.
 2018-07-27 15:34:58 +02:00
karroffel
b64171e79c add initial GLES2 3D renderer 2018-07-27 14:15:46 +02:00
Max
c2be1a75a0 Fixed shortcuts not working with InputEventActions 2018-07-27 15:09:41 +03:00
Juan Linietsky
936b5a395a Do conversion of scene preview icon at the end, improves save performance a bit. Closes #14387 2018-07-27 08:59:43 -03:00
Juan Linietsky
6a5aec3644 Rename flag to better name 2018-07-27 08:59:18 -03:00
Rémi Verschelde
bfb21be871
Merge pull request #20509 from BastiaanOlij/fixup_mobile_vr_interface 
Reenabled module and fixed missing const
 2018-07-27 11:09:19 +02:00
Bastiaan Olij
03d02e88fc Reenabled module and fixed missing const 2018-07-27 18:43:50 +10:00
Rémi Verschelde
4487c27f7b
Merge pull request #20508 from Gamblify/FixAudioRecordingCrash 
Fix of AudioRecordingEffect property
 2018-07-27 10:07:54 +02:00
Gustav Lund
0672fc377e Fix of AudioRecordingEffect property 
For debug purposes the boolean whether the recording is active or not were an editor property.
It has been removed to avoid users leaving it on true on close, causing it to be saved in the default_bus_layout
It was also renamed to better describe its functionality

related to issue: 20487
 2018-07-27 09:52:54 +02:00
Rémi Verschelde
ea0abedaf7
Merge pull request #20506 from akien-mga/check-only-paired 
Main: Fix --check-only option implemented as paired
 2018-07-27 09:06:08 +02:00
Rémi Verschelde
7056dc6011
Merge pull request #20498 from Calinou/caret-width-hidpi 
Make the caret thicker in TextEdit and scale it with the editor scale
 2018-07-27 09:01:58 +02:00
Rémi Verschelde
4c0ded6dcc
Merge pull request #20497 from Calinou/textedit-hidpi-line-spacing 
Multiply TextEdit line spacing by the editor scale
 2018-07-27 09:01:41 +02:00
Paul Joannon
877ea882ce
Add missing methods to Node class in the mono glue 
* GetNodeOrNull<T>
* GetChild<T>
* GetChildOrNull<T>
* GetOwner<T>
* GetOwnerOrNull<T>
* GetParent<T>
* GetParentOrNull<T>
 2018-07-27 08:50:35 +02:00
Rémi Verschelde
2d4a4a245d Main: Fix --check-only option implemented as paired 
Fixes #20503.

Also added the option to the Linux manpage.
 2018-07-27 08:39:48 +02:00
Rémi Verschelde
b5b8f52d4f
Merge pull request #15310 from remorse107/Cinema-Mode 
Added "Cinema Mode" so that the spatial editor can actively track the...
 2018-07-27 08:12:22 +02:00