Merge branch 'master' into 3.1, excluding 3.2+ specific changes

I went through the diff to try to ensure that no 3.2+ specific changes
are being backported to the stable branch. I might have missed some
things though.
This commit is contained in:
Rémi Verschelde
2019-05-31 11:04:47 +02:00
222 changed files with 3910 additions and 1151 deletions

View File

@@ -303,7 +303,7 @@ during runtime with the ``LD_LIBRARY_PATH`` environ variable:
user@host:~/godot$ ./bin/godot*
**note**: Pay attention you have to ``export`` the environ variable otherwise
you won't be able to play you project from within the editor.
you won't be able to play your project from within the editor.
On top of that, it would be nice to be able to select whether to compile our
module as shared library (for development) or as a part of the Godot binary