summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #26705 from volzhs/fix-exportRémi Verschelde2019-03-066-6/+6
|\ | | | | Fix directory check when exporting project
| * Fix directory check when exporting projectvolzhs2019-03-066-6/+6
| | | | | | | | Fix #26702
* | Merge pull request #26688 from Faless/net/lws_3.1Rémi Verschelde2019-03-06141-12432/+16984
|\ \ | | | | | | Update libwebsockets to 3.1, fix IPv6 issues
| * | Disable WebSocket IPv6 support on OpenBSD.Fabio Alessandrelli2019-03-061-1/+3
| | | | | | | | | | | | | | | | | | OpenBSD does not support dual stacking, disabling IPv6 for now. Will possibly come back if/when we get websocket running using our own NetSocket class.
| * | Add fix to libwebsocket to disable V6ONLY.Fabio Alessandrelli2019-03-064-0/+44
| | | | | | | | | | | | This was enabled by default on some systems (e.g. Windows).
| * | Update libwebsockets to 3.1 (plus UWP patch)Fabio Alessandrelli2019-03-06140-12431/+16937
| | |
* | | Safer way to update animation if changed, fixes #26670Juan Linietsky2019-03-063-8/+48
| | |
* | | Fix how settings change, closes #26692Juan Linietsky2019-03-061-1/+4
| | |
* | | Merge pull request #22716 from Chaosus/update_themeRémi Verschelde2019-03-061-7/+7
|\ \ \ | |_|/ |/| | Make theme changing no longer requires restart to be fully applied
| * | Make theme changing no longer requires restart to be fully appliedChaosus2018-10-251-7/+7
| | |
* | | Merge pull request #26673 from willnationsdev/fix-inspector-pluginRémi Verschelde2019-03-061-0/+4
|\ \ \ | | | | | | | | Fix inspector plugin
| * | | Fix crash on exit when removing EditorInspectorPluginsWill Nations2019-03-061-0/+4
| | | |
* | | | Merge pull request #26668 from marxin/use-gcc-builtins-for-bswapRémi Verschelde2019-03-061-1/+14
|\ \ \ \ | | | | | | | | | | Use GCC builtins for bswap as compiler can then emit these via insn
| * | | | Use GCC builtins for bswap as compiler can then emit these via instructions.marxin2019-03-051-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using current macros, one get for: static inline int BSWAP32(int x) { return ((x << 24) | ((x << 8) & 0x00FF0000) | ((x >> 8) & 0x0000FF00) | (x >> 24)); } int main(int argc, char **argv) { return BSWAP32(argc); } main: .LFB1: .cfi_startproc movl %edi, %eax movl %edi, %edx sarl $24, %edx sall $24, %eax orl %edx, %eax movl %edi, %edx sarl $8, %edi sall $8, %edx andl $65280, %edi andl $16711680, %edx orl %edx, %eax orl %edi, %eax ret while using: int main(int argc, char **argv) { return __builtin_bswap32(argc); } one gets: main: .LFB0: .cfi_startproc movl %edi, %eax bswap %eax ret
* | | | | Merge pull request #26633 from akien-mga/driver-fallback-etcRémi Verschelde2019-03-0612-18/+43
|\ \ \ \ \ | | | | | | | | | | | | Disable driver fallback to GLES2 by default
| * | | | | Disable driver fallback to GLES2 by defaultRémi Verschelde2019-03-0512-18/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GLES2 is not designed to be a drop-in replacement for the GLES3 backend, so the fallback mode has to be used knowingly. It *can* make sense for simple projects which make sure to handle the differences between both rendering backends, but most users should stick to one supported backend. By making it opt-in, we can now use this parameter to define whether to export ETC textures to Android and iOS when using GLES3 + Fallback. When using GLES3 without Fallback on Android, set the proper min GLES version in the AndroidManifest. Also made the option boolean and renamed it for clarity and to avoid conflict with the previous String option (which would always evaluate as "true" otherwise). Fixes #26569.
* | | | | | Merge pull request #26666 from Calinou/update-server-buildsystemRémi Verschelde2019-03-061-4/+70
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Update the server platform's `detect.py` to match x11's
| * | | | | Update the server platform's `detect.py` to match x11'sHugo Locurcio2019-03-051-4/+70
| | |/ / / | |/| | | | | | | | | | | | | | | | | | This adds support for LTO, UBSAN/ASAN/LSAN, debugging symbols options and `optimize=size` in the `server` platform.
* | | | | Merge pull request #26664 from marxin/fix-25714-__bswap_16Rémi Verschelde2019-03-051-4/+4
|\ \ \ \ \ | | | | | | | | | | | | Replace usage of __bswap_16 with BSWAP16 (#25714).
| * | | | | Replace usage of __bswap_16 with BSWAP16 (#25714).marxin2019-03-051-4/+4
| |/ / / /
* | | | | Merge pull request #26660 from marxin/fix-25639-audio-negative-shiftRémi Verschelde2019-03-051-2/+4
|\ \ \ \ \ | | | | | | | | | | | | Fix #25639 by not shifting a negative value.
| * | | | | Fix #25639 by not shifting a negative value.marxin2019-03-051-2/+4
| |/ / / /
* | | | | Move YEAR definition to version.pyRémi Verschelde2019-03-052-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If it needs to be hardcoded (for the sake of reproducible builds), it should be together with the other hardcoded version info. And yeah, two months in, let's move to 2019.
* | | | | Merge pull request #26661 from neikeq/issue-17601Ignacio Etcheverry2019-03-051-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Mono: Fix array field being assigned MonoArray** instead of MonoArray*
| * | | | | Mono: Fix array field being assigned MonoArray** instead of MonoArray*Ignacio Etcheverry2019-03-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Fixes #17601
* | | | | | Merge pull request #26657 from marxin/fix-25641-ubsan-negative-valueRémi Verschelde2019-03-051-1/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix #25641 by not shifting a negative value.
| * | | | | | Fix #25641 by not shifting a negative value.marxin2019-03-051-1/+2
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #26642 from DrMoriarty/check_cursor_lineRémi Verschelde2019-03-051-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Check cursor line and column
| * | | | | | Check cursor line and columnVasiliy Makarov2019-03-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a trivial check if cursor.line and cursor.column are valid. Fix #26245
* | | | | | | Merge pull request #26626 from rluders/misleading-error-message-exportRémi Verschelde2019-03-057-1/+29
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fixing misleading error message when trying to export
| * | | | | | | Fixes misleading error message when trying to exportRicardo Lüders2019-03-057-1/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch fixes the misleading error message when users try to "export all" into an invalid destination path. Closes #26539
* | | | | | | | Merge pull request #26655 from merumelu/assetlib-video-overlayRémi Verschelde2019-03-051-0/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | AssetLib: convert video thumbnails to RGBA8
| * | | | | | | | AssetLib: convert video thumbnails to RGBAmerumelu2019-03-051-0/+2
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | Image::blend_rect only works with images that have the same format.
* | | | | | | | Merge pull request #26654 from merumelu/doc-makerst-varargRémi Verschelde2019-03-051-0/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | makerst: make vararg methods look the same as in editor help
| * | | | | | | | makerst: make vararg methods look the same as in editor helpmerumelu2019-03-051-0/+6
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge pull request #26643 from KoBeWi/readd_script_with_no_reselectRémi Verschelde2019-03-051-1/+5
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | Fix attaching script after removing one
| * | | | | | | Allow to attach script when there's no 'selected node', but selection existsTomasz Chabora2019-03-051-1/+5
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge pull request #26652 from YeldhamDev/filesys_dock_icon_fixRémi Verschelde2019-03-051-1/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Fix FileSystem dock's item view button starting with the wrong icon
| * | | | | | Fix FileSystem dock's item view button starting with the wrong iconMichael Alexsander Silva Dias2019-03-051-1/+1
|/ / / / / /
* | | | | | Merge pull request #26639 from YeldhamDev/tileeditor_coordnav_disableRémi Verschelde2019-03-051-2/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | Disable coord navigation buttons in TileSet editor when no texture is selected
| * | | | | | Disable coord navigation buttons in TileSet editor when no texture is selectedMichael Alexsander Silva Dias2019-03-051-2/+6
| |/ / / / /
* | | | | | Merge pull request #26638 from KoBeWi/fix_audio_stream_playerRémi Verschelde2019-03-051-1/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | Pause AudioStreamPlayer on SceneTree pause
| * | | | | | Pause AudioStreamPlayer on SceneTree pauseTomasz Chabora2019-03-051-1/+3
| |/ / / / /
* | | | | | Merge pull request #26636 from YeldhamDev/doc_todo_changesRémi Verschelde2019-03-054-4/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove "TODO" instances in the docs
| * | | | | | Remove "TODO" instances in the docsMichael Alexsander Silva Dias2019-03-054-4/+4
| |/ / / / /
* | | | | | Merge pull request #26635 from bruvzg/js_preview_url_fixRémi Verschelde2019-03-051-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix HTML5 quick preview URL
| * | | | | | Fix HTML5 quick preview URLbruvzg2019-03-051-1/+1
| |/ / / / /
* | | | | | Merge pull request #26622 from pyrophone/TilesetPreviewFixRémi Verschelde2019-03-051-1/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fixed Tileset preview stretching textures
| * | | | | | Fixed Tileset preview stretching texturesGio Aleman2019-03-051-1/+2
| | | | | | |
* | | | | | | Merge pull request #26631 from YeldhamDev/filesys_fixesRémi Verschelde2019-03-054-38/+21
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Fix general issues with filesystem-related UI components in the editor