summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #33663 from Calinou/add-node-get-process-priorityRémi Verschelde2019-11-174-10/+11
|\ | | | | Implement `Node::get_process_priority()` and its associated property
| * Implement `Node::get_process_priority()` and its associated propertyHugo Locurcio2019-11-174-10/+11
| | | | | | | | This closes #33660.
* | Merge pull request #33678 from nekomatata/stylebox-flat-width-zeroRémi Verschelde2019-11-171-1/+5
|\ \ | | | | | | StyleBoxFlat doesn't draw content when width or height is zero
| * | StyleBoxFlat doesn't draw content when width or height is zeroPouleyKetchoupp2019-11-171-1/+5
|/ / | | | | | | | | | | | | | | Causes unnecessary computations and drawing, and a division by zero when calculating uv coordinates. This case happened with ScriptEditor's member overview (ItemList), initialized with a minimum width of 0. Fixes #33634
* | Merge pull request #33662 from touilleMan/issue-30577Rémi Verschelde2019-11-161-0/+6
|\ \ | | | | | | Add singleton_name field to autogenerated json api
| * | Add singleton_name field to autogenerated json apiEmmanuel Leblond2019-11-161-0/+6
| |/
* | Merge pull request #33637 from madmiraal/fix-c4334-warningRémi Verschelde2019-11-161-1/+1
|\ \ | | | | | | Fix Visual Studio throwing C4334 warning.
| * | Fix Visual Studio throwing C4334 warning.Marcel Admiraal2019-11-151-1/+1
| | |
* | | Merge pull request #33643 from Calinou/visual-script-multiply-signRémi Verschelde2019-11-161-1/+1
|\ \ \ | | | | | | | | Use the Unicode "multiply" sign for the "A x B" visual script node
| * | | Use the Unicode "multiply" sign for the "A x B" visual script nodeHugo Locurcio2019-11-151-1/+1
| | |/ | |/|
* | | Merge pull request #33645 from Calinou/graphedit-ctrl-toggle-snappingRémi Verschelde2019-11-161-2/+5
|\ \ \ | | | | | | | | Make holding Ctrl toggle snapping in GraphEdit
| * | | Make holding Ctrl toggle snapping in GraphEditHugo Locurcio2019-11-151-2/+5
| |/ / | | | | | | | | | This affects the visual script and visual shader editors as well.
* | | Merge pull request #33658 from NeoSpark314/rename_ext_msaaRémi Verschelde2019-11-162-3/+3
|\ \ \ | | | | | | | | Rename External MSAA to AndroidVR MSAA
| * | | Rename External MSAA to AndroidVR MSAAHolger Dammertz2019-11-162-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | A new external MSAA setting was introduced in https://github.com/godotengine/godot/pull/33518 that fixed issues on GLES2 and Oculus Mobile VR. To avoid misunderstanding it was suggested by @BastiaanOlij and discussed on discord to rename it to AndroidVR.
* | | | Merge pull request #33603 from neikeq/ばかRémi Verschelde2019-11-1648-1182/+2054
|\ \ \ \ | |_|/ / |/| | | Mono/C#: WebAssembly and initial AOT support
| * | | Make C# internal calls return structs as ref parametersIgnacio Etcheverry2019-11-152-49/+148
| | | | | | | | | | | | | | | | | | | | | | | | The Mono IL interpreter's WebAssembly to native trampolines don't support passing structs by value, so we need to do it this way. Also now we pass and return long, ulong, float and double as ref parameters as well. This is due to missing trampolines for float and long types. This is likely a temporary workaround that will be reverted in the future. The correct solution would be to patch 'mono/mini/m2n-gen.cs' when building the Mono runtime for WASM in order to generate the trampolines we need.
| * | | Mono/C#: Initial exporter support for AOT compilationIgnacio Etcheverry2019-11-1516-173/+616
| | | |
| * | | Mono/C#: WebAssembly supportIgnacio Etcheverry2019-11-1337-988/+1318
| | | |
* | | | Merge pull request #33632 from lupoDharkael/ternary-checkRémi Verschelde2019-11-151-0/+2
|\ \ \ \ | | | | | | | | | | Parser: Check all the arguments of the ternary operator
| * | | | Parser: Check all the arguments of the ternary operatorlupoDharkael2019-11-151-0/+2
| | | | |
* | | | | Merge pull request #33635 from akien-mga/emscripten-fix-1.39.1-supportRémi Verschelde2019-11-151-4/+1
|\ \ \ \ \ | |/ / / / |/| | | | HTML5: Fix support for Emscripten 1.39.1+
| * | | | HTML5: Fix support for Emscripten 1.39.1+Rémi Verschelde2019-11-151-4/+1
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A change in upstream Emscripten 1.39.1+ made our buildsystem error out where it was previously only issuing a warning: ``` [ 5%] Linking Static Library ==> main/libmain.javascript.opt.bc shared:WARNING: Assuming object file output in the absence of `-c`, based on output filename. Please add with `-c` or `-r` to avoid this warning Ranlib Library ==> main/libmain.javascript.opt.bc /opt/emsdk/upstream/bin/llvm-ranlib: error: unable to load 'main/libmain.javascript.opt.bc': file too small to be an archive ``` As advised on emscripten-core/emscripten#9806, we should be using `emar` here to create the static library and not `emcc`. This was apparently done to workaround Emscripten issues in the past, but evidently this is no longer necessary. The rest of the `env` redefinitions should probably be re-assessed against the current state of Emscripten. Fixes #33374.
* | | | Merge pull request #33607 from Calinou/orbit-modifier-always-altRémi Verschelde2019-11-141-13/+19
|\ \ \ \ | |_|_|/ |/| | | Always allow Alt as an orbit modifier in the 3D editor
| * | | Always allow Alt as an orbit modifier in the 3D editorHugo Locurcio2019-11-141-13/+19
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | This makes it easier to navigate in 3D when using a graphics tablet. This fallback modifier will only be available if no other modifier is using Alt. This partially addresses https://github.com/godotengine/godot-proposals/issues/196.
* | | Merge pull request #33621 from Calinou/export-runnable-tooltipRémi Verschelde2019-11-141-0/+1
|\ \ \ | | | | | | | | Add a tooltip to explain what marking a preset as "runnable" does
| * | | Add a tooltip to explain what marking a preset as "runnable" doesHugo Locurcio2019-11-141-0/+1
|/ / /
* | | Merge pull request #33617 from Chaosus/fix_theme_element2Rémi Verschelde2019-11-142-2/+6
|\ \ \ | | | | | | | | Fix incorrect error/matches label color when switching from light to dark theme
| * | | Fix incorrect error label color when switching from light to dark themeYuri Roubinsky2019-11-142-2/+6
| | | |
* | | | EditorNode: Improve tooltip for pause buttonRémi Verschelde2019-11-141-1/+1
|/ / / | | | | | | | | | Closes #14742.
* | | Merge pull request #33614 from Chaosus/fix_theme_elementRémi Verschelde2019-11-142-2/+2
|\ \ \ | | | | | | | | Fix "matches" label color in light theme
| * | | Fix "matches" label color in light themeYuri Roubinsky2019-11-142-2/+2
| |/ /
* | | Merge pull request #33608 from groud/disable_ok_button_input_settingsRémi Verschelde2019-11-141-0/+3
|\ \ \ | | | | | | | | Disable ok button if no key is selected when adding event to an action
| * | | Disable ok button if no key is selected when adding event to an actionGilles Roudière2019-11-131-0/+3
| |/ /
* | | Merge pull request #33601 from willnationsdev/nodepath-docsRémi Verschelde2019-11-141-0/+13
|\ \ \ | |/ / |/| | Added more in-depth examples of NodePaths in API docs.
| * | Added more in-depth examples of NodePaths in API docs.willnationsdev2019-11-131-0/+13
| | |
* | | Merge pull request #33595 from Faless/fix/explain_msg_stripRémi Verschelde2019-11-131-72/+79
|\ \ \ | |/ / |/| | Fix explain message not being stripped in release.
| * | Fix explain message not being stripped in release.Fabio Alessandrelli2019-11-131-72/+79
| | | | | | | | | | | | | | | | | | | | | | | | Messages coming from ERR_EXPLAIN / ERR_*_MSG macros used to strip the error explanation in release builds and was changed in a recent refactoring. This commit restores the old behaviour (fixing release builds).
* | | Merge pull request #33596 from KoBeWi/sell_tileRémi Verschelde2019-11-131-0/+1
|\ \ \ | | | | | | | | Make sure tile is selected when selecting TileMap
| * | | Make sure tile is selected when selecting TileMapTomasz Chabora2019-11-131-0/+1
| | | |
* | | | Merge pull request #33591 from zaksnet/fix-string-docs-splitRémi Verschelde2019-11-131-2/+17
|\ \ \ \ | | | | | | | | | | Fix split/rsplit docs
| * | | | Fix split/rsplit docsZak2019-11-131-2/+17
| | | | |
* | | | | Merge pull request #33589 from JFonS/fix_scaled_gizmosRémi Verschelde2019-11-131-6/+0
|\ \ \ \ \ | |_|_|/ / |/| | | | Fix broken gizmo interaction when Node is scaled
| * | | | Fix broken gizmo interaction when Node is scaledJFonS2019-11-131-6/+0
| | | | |
* | | | | Merge pull request #33536 from akien-mga/revert-25474-android-gesturesRémi Verschelde2019-11-131-33/+1
|\ \ \ \ \ | |_|_|/ / |/| | | | Revert "Android : implement InputEventMagnifyGesture and InputEventPanGesture"
| * | | | Revert "Android : implement InputEventMagnifyGesture and InputEventPanGesture"Rémi Verschelde2019-11-111-33/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 9cc66495cfb6393102ce5ad4e82f2ccb716b9b33. This caused regressions with the handling of screen drag events. Fixes #33428. Fixes #33459. Fixes #33470.
* | | | | Merge pull request #33576 from merumelu/doc-reload-current-sceneRémi Verschelde2019-11-121-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Doc: Add return values for SceneTree::reload_current_scene
| * | | | | Doc: Add return values for SceneTree::reload_current_scenemerumelu2019-11-121-1/+1
| | |/ / / | |/| | |
* | | | | Merge pull request #33575 from KoBeWi/zoomsetRémi Verschelde2019-11-121-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Properly handle zoom when opening tileset editor
| * | | | | Properly handle zoom when opening tileset editorTomasz Chabora2019-11-121-2/+2
| |/ / / /
* | | | | doc: PCKPacker class example codeIlyaStuurFedorov2019-11-121-0/+9
| | | | |