summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-07-29Undo an accidental revert.Hein-Pieter van Braam
Sorry for the history pollution. I was testing something on this branch and forgot to reset befor pushing the security update. This reverts commit 2ef66def4615594b87340aed2b02adf2204c74c2.
2018-07-29Fix marshalls size checks.Fabio Alessandrelli
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 5262d1bbcc81a06db66ac45c3f75535f231268bc)
2018-07-28Revert "Open visual editor when "open editor" button in the inspector is ↵Hein-Pieter van Braam
pressed." This reverts commit 0ae400f523b0e4aefc9cdbea5195a54e6e8268df.
2018-07-28Merge pull request #20544 from dragmz/fix-py37-windows-buildRémi Verschelde
fix windows build using python 3.7
2018-07-28fix windows build using python 3.7dragmz
fixes NameError (missing "subprocess_main" and "basestring")
2018-07-28Merge pull request #20532 from BastiaanOlij/arraymesh_surface_find_by_nameRémi Verschelde
Added a method to find the index for a surface with a given name
2018-07-28Merge pull request #20539 from akien-mga/mbedtls-2.12.0Rémi Verschelde
mbedtls: Update to upstream version 2.12.0
2018-07-28Merge pull request #20537 from akien-mga/glad-0.1.25Rémi Verschelde
glad: Sync with upstream 0.1.25
2018-07-28Merge pull request #20536 from akien-mga/libpng-1.6.35Rémi Verschelde
libpng: Update to upstream version 1.6.35
2018-07-28Merge pull request #20535 from akien-mga/layers-tooltipsRémi Verschelde
Fix layer 2-line tooltips used as name in inspector
2018-07-28mbedtls: Update to upstream version 2.12.0Rémi Verschelde
_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-28Added a method to find the index for a surface with a given nameBastiaan Olij
2018-07-28glad: Sync with upstream 0.1.25Rémi Verschelde
2018-07-28libpng: Update to upstream version 1.6.35Rémi Verschelde
2018-07-28Merge pull request #20464 from Calinou/add-editor-standalone-feature-tagsRémi Verschelde
Add "editor" and "standalone" feature tags
2018-07-28Fix layer 2-line tooltips used as name in inspectorRémi Verschelde
Fixes #20288.
2018-07-28Merge pull request #20463 from fire/vs_expand_hints_to_virtual_funcRémi Verschelde
Visualscript: Carry property hint and hint string through to Visualscript virtual funcs
2018-07-28Merge pull request #20511 from maksloboda/InputEventActionFixRémi Verschelde
Fixed shortcuts not working with InputEventActions
2018-07-28Merge pull request #17595 from viktor-ferenczi/issue-5042-subprocRémi Verschelde
Running builder (content generator) functions in subprocesses on Windows
2018-07-28Merge pull request #20528 from Calinou/improve-appstream-add-mime-typeMax Hilbrunner
Tweak AppStream metadata and add MIME type integration
2018-07-28Tweak AppStream metadata and add MIME type integrationHugo Locurcio
This allows Godot to be registered as an application to open Godot project files.
2018-07-27Carry property hint and hint string through to Visualscript virtual functions.K. S. Ernest (iFire) Lee
2018-07-27Merge pull request #20457 from fire/vs_generic_search_crash_and_connectingRémi Verschelde
Visualscript: misc generic search changes
2018-07-27Running builder (content generator) functions in subprocesses on WindowsViktor Ferenczi
- 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-27Merge pull request #20462 from fire/vs_don't_typeguess_nilRémi Verschelde
Visualscript: Don't type guess on nil and set default type to ""
2018-07-27Merge pull request #17720 from paulloz/custom-csharp-glueIgnacio Etcheverry
[mono] Generic Typed GetNode, GetChild, etc.
2018-07-27Merge pull request #20516 from BastiaanOlij/fix_nativescript_getsetRémi Verschelde
Fixed nativescript getter and setter logic
2018-07-27Merge pull request #20515 from akien-mga/physicsbody-deprecatedRémi Verschelde
Fix PhysicsBody build with deprecated=no
2018-07-27Merge pull request #20512 from karroffel/gles2-prThomas Herzog
add initial GLES2 3D renderer
2018-07-27Fixed nativescript getter and setter logicBastiaan Olij
2018-07-27Fix PhysicsBody build with deprecated=noRémi Verschelde
Fixes #20483.
2018-07-27add initial GLES2 3D rendererkarroffel
2018-07-27Fixed shortcuts not working with InputEventActionsMax
2018-07-27Do conversion of scene preview icon at the end, improves save performance a ↵Juan Linietsky
bit. Closes #14387
2018-07-27Rename flag to better nameJuan Linietsky
2018-07-27Merge pull request #20509 from BastiaanOlij/fixup_mobile_vr_interfaceRémi Verschelde
Reenabled module and fixed missing const
2018-07-27Reenabled module and fixed missing constBastiaan Olij
2018-07-27Merge pull request #20508 from Gamblify/FixAudioRecordingCrashRémi Verschelde
Fix of AudioRecordingEffect property
2018-07-27Fix of AudioRecordingEffect propertyGustav Lund
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-27Merge pull request #20506 from akien-mga/check-only-pairedRémi Verschelde
Main: Fix --check-only option implemented as paired
2018-07-27Merge pull request #20498 from Calinou/caret-width-hidpiRémi Verschelde
Make the caret thicker in TextEdit and scale it with the editor scale
2018-07-27Merge pull request #20497 from Calinou/textedit-hidpi-line-spacingRémi Verschelde
Multiply TextEdit line spacing by the editor scale
2018-07-27Add missing methods to Node class in the mono gluePaul Joannon
* GetNodeOrNull<T> * GetChild<T> * GetChildOrNull<T> * GetOwner<T> * GetOwnerOrNull<T> * GetParent<T> * GetParentOrNull<T>
2018-07-27Main: Fix --check-only option implemented as pairedRémi Verschelde
Fixes #20503. Also added the option to the Linux manpage.
2018-07-27Merge pull request #15310 from remorse107/Cinema-ModeRémi Verschelde
Added "Cinema Mode" so that the spatial editor can actively track the...
2018-07-26Add "Cinematic Preview" to the Spatial Plugin Editor.Robert Morse
2018-07-26Multiply TextEdit line spacing by the editor scaleHugo Locurcio
This makes sure the default line spacing in the script editor is consistent with the editor scale in use.
2018-07-26Make the caret thicker in TextEdit and scale it with the editor scaleHugo Locurcio
The caret in LineEdit is still 1 pixel thick, but it will become 2 pixels thick at editor scales higher than or equal to 150%.
2018-07-26Merge pull request #20233 from willnationsdev/gsc-editorJuan Linietsky
Add script class hierarchies & add-script button permanence/auto-derivation
2018-07-26Merge pull request #20022 from EIREXE/snap_to_floorMax Hilbrunner
Add snap to floor functionality to the editor