summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-11-15Make the replaced results appear in the matches counterMichael Alexsander
2019-11-15Merge pull request #33632 from lupoDharkael/ternary-checkRémi Verschelde
Parser: Check all the arguments of the ternary operator
2019-11-15Merge pull request #33635 from akien-mga/emscripten-fix-1.39.1-supportRémi Verschelde
HTML5: Fix support for Emscripten 1.39.1+
2019-11-15HTML5: Fix support for Emscripten 1.39.1+Rémi Verschelde
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.
2019-11-15Parser: Check all the arguments of the ternary operatorlupoDharkael
2019-11-14Merge pull request #33607 from Calinou/orbit-modifier-always-altRémi Verschelde
Always allow Alt as an orbit modifier in the 3D editor
2019-11-14Always allow Alt as an orbit modifier in the 3D editorHugo Locurcio
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.
2019-11-14Merge pull request #33621 from Calinou/export-runnable-tooltipRémi Verschelde
Add a tooltip to explain what marking a preset as "runnable" does
2019-11-14Add a tooltip to explain what marking a preset as "runnable" doesHugo Locurcio
2019-11-14Merge pull request #33617 from Chaosus/fix_theme_element2Rémi Verschelde
Fix incorrect error/matches label color when switching from light to dark theme
2019-11-14EditorNode: Improve tooltip for pause buttonRémi Verschelde
Closes #14742.
2019-11-14Fix incorrect error label color when switching from light to dark themeYuri Roubinsky
2019-11-14Merge pull request #33614 from Chaosus/fix_theme_elementRémi Verschelde
Fix "matches" label color in light theme
2019-11-14Merge pull request #33608 from groud/disable_ok_button_input_settingsRémi Verschelde
Disable ok button if no key is selected when adding event to an action
2019-11-14Merge pull request #33601 from willnationsdev/nodepath-docsRémi Verschelde
Added more in-depth examples of NodePaths in API docs.
2019-11-14Fix "matches" label color in light themeYuri Roubinsky
2019-11-13Disable ok button if no key is selected when adding event to an actionGilles Roudière
2019-11-13Added more in-depth examples of NodePaths in API docs.willnationsdev
2019-11-13Merge pull request #33595 from Faless/fix/explain_msg_stripRémi Verschelde
Fix explain message not being stripped in release.
2019-11-13Merge pull request #33596 from KoBeWi/sell_tileRémi Verschelde
Make sure tile is selected when selecting TileMap
2019-11-13Make sure tile is selected when selecting TileMapTomasz Chabora
2019-11-13Fix explain message not being stripped in release.Fabio Alessandrelli
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).
2019-11-13Merge pull request #33591 from zaksnet/fix-string-docs-splitRémi Verschelde
Fix split/rsplit docs
2019-11-13Fix split/rsplit docsZak
2019-11-13Merge pull request #33589 from JFonS/fix_scaled_gizmosRémi Verschelde
Fix broken gizmo interaction when Node is scaled
2019-11-13Fix broken gizmo interaction when Node is scaledJFonS
2019-11-13Merge pull request #33536 from akien-mga/revert-25474-android-gesturesRémi Verschelde
Revert "Android : implement InputEventMagnifyGesture and InputEventPanGesture"
2019-11-12Merge pull request #33576 from merumelu/doc-reload-current-sceneRémi Verschelde
Doc: Add return values for SceneTree::reload_current_scene
2019-11-12Merge pull request #33575 from KoBeWi/zoomsetRémi Verschelde
Properly handle zoom when opening tileset editor
2019-11-12doc: PCKPacker class example codeIlyaStuurFedorov
2019-11-12Merge pull request #32966 from ffaristocrat/fix-hex-parsingRémi Verschelde
Fix base 16 hex literal parsing
2019-11-12Fixes #32963 by correctly parsing bin/hex literalsMicheál Keane
2019-11-12Doc: Add return values for SceneTree::reload_current_scenemerumelu
2019-11-12Properly handle zoom when opening tileset editorTomasz Chabora
2019-11-12Update AUTHORS listRémi Verschelde
New contributors added to AUTHORS: @kawa-yoiko, @m4gr3d, @QbieShay, @RevoluPowered, @rxlecky
2019-11-12Merge pull request #33249 from JoshLee0915/MonoHeadlessServerIgnacio Roldán Etcheverry
Added missing server platform checks to template dir and shared lib copy in mono_configure.py
2019-11-12Merge pull request #33571 from KoBeWi/new_crashRémi Verschelde
Prevent crash when scene has path, but no file
2019-11-12Prevent crash when scene has path, but no fileTomasz Chabora
2019-11-12Merge pull request #33568 from akien-mga/opus-fixup-33311Rémi Verschelde
opus: Packaging fixups after #33311
2019-11-12opus: Packaging fixups after #33311Rémi Verschelde
Removes the custom code for VS2012 support in config.h, and reduces diff with upstream config.h. We still have many custom defines for ARM optimizations which we probably don't use properly, since we don't compile the included asm code, so a thorough review and cleanup would be welcome.
2019-11-12Merge pull request #33565 from akien-mga/vhacd-b07958eRémi Verschelde
vhacd: Sync with upstream b07958e
2019-11-12Merge pull request #33563 from akien-mga/tinyexr-656bb61Rémi Verschelde
tinyexr: Sync with upstream 656bb61
2019-11-12Merge pull request #33562 from akien-mga/nanosvg-25241c5Rémi Verschelde
nanosvg: Sync with upstream c1f6e20
2019-11-12Merge pull request #33561 from akien-mga/miniupnpc-0ab1d67Rémi Verschelde
miniupnpc: Sync with upstream master (0ab1d67)
2019-11-12Merge pull request #33560 from akien-mga/mbedtls-2.16.3Rémi Verschelde
mbedtls: Update to upstream version 2.16.3
2019-11-12Merge pull request #33559 from akien-mga/glad-0.1.33Rémi Verschelde
glad: Sync with upstream 0.1.33
2019-11-12vhacd: Sync with upstream b07958eRémi Verschelde
Nothing to see here, it is just a cosmetic sync to confirm that we have the latest upstream changes.
2019-11-12tinyexr: Sync with upstream 656bb61Rémi Verschelde
2019-11-12nanosvg: Sync with upstream c1f6e20Rémi Verschelde
Now formally unmaintained, so probably no further sync to expect from this repository.
2019-11-12miniupnpc: Sync with upstream master (0ab1d67)Rémi Verschelde