mirror/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-12-03 09:52:18 +08:00
Code Issues Packages Projects Releases Wiki Activity
21,976 Commits 15 Branches 59 Tags 7.8 GiB
4dec1bde77
Commit Graph

21976 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rémi Verschelde
4dec1bde77
Merge pull request #30231 from Ranoller/master 
Tilemap fix displaced textures and shapes and added center texture and compatibility mode
 2019-07-02 21:43:16 +02:00
Rémi Verschelde
9e134407d4
Merge pull request #30252 from Faless/tls/disable_no_crash 
Fix editor crash when StreamPeerSSL is unavilable.
 2019-07-02 21:42:13 +02:00
Rémi Verschelde
e0d610203c
Merge pull request #30254 from bojidar-bg/30224-docdata-generate 
Fix various memory leaks and errors
 2019-07-02 21:41:42 +02:00
Rémi Verschelde
9e1e4defef
Merge pull request #30228 from YeldhamDev/go_to_menu 
Add "Go To" menu to the script editor and move the bookmark and breakpoint menus there
 2019-07-02 21:41:29 +02:00
Ranoller
14e2a99129 Tilemap fix displaced textures and shapes and added center texture and compatibility mode 
This commit fix #22989 #15249 #28206. Main problem is that tilemap displace textures in different tile origins in a strange way and doesn´t respect coincidence between texture and shapes in not uniform tiles. This issue is present in godot 3.0 and godot 3.1. To maintain compatibility are added a compatibility mode and a center texture option. Other related issues and pull request: #28896 #29487 #29519 #29961. Idications of #30204 are added
 2019-07-02 17:12:58 +02:00
Bojidar Marinov
f7dad789e9
Fix various memory leaks and errors 2019-07-02 17:23:54 +03:00
Rémi Verschelde
ae65c610e7
Merge pull request #30250 from marxin/travis-gcc-9 
Use GCC 9 in travis.
 2019-07-02 15:56:57 +02:00
Fabio Alessandrelli
c798173332 Fix editor crash when StreamPeerSSL is unavilable. 
The fix for EditorNode is a bit hacky, but the handling of the buttons
and features there is hacky too (based on enums that might not reflect
the actual state).
 2019-07-02 15:34:34 +02:00
Rémi Verschelde
e9d624d7ce
Merge pull request #30239 from Faless/crypto/crypto_core 
CryptoCore class to access to base crypto utils.
 2019-07-02 14:52:43 +02:00
Rémi Verschelde
4cb0887660
Merge pull request #30249 from marxin/fix-gcc9-warnings 
Fix few GCC9 warnings:
 2019-07-02 14:16:28 +02:00
Martin Liska
f48bb8fac8 Fix few GCC9 warnings: 
thirdparty/assimp/include/assimp/material.inl: In member function 'aiReturn aiMaterial::Get(const char*, unsigned int, unsigned int, aiColor3D&) const':
thirdparty/assimp/include/assimp/material.inl:176:33: error: implicitly-declared 'aiColor3D& aiColor3D::operator=(const aiColor3D&)' is deprecated [-Werror=deprecated-copy]
  176 |     pOut = aiColor3D(c.r,c.g,c.b);

modules/dds/texture_loader_dds.cpp:167:50: error: comparison of integer expressions of different signedness: 'uint32_t' {aka 'unsigned int'} and 'int' [-Werror=sign-compare]
  167 |  if (format_flags & DDPF_FOURCC && format_fourcc == PF_FOURCC("DXT1")) {
      |                                                  ^
[ 28%] modules/dds/texture_loader_dds.cpp:170:57: error: comparison of integer expressions of different signedness: 'uint32_t' {aka 'unsigned int'} and 'int' [-Werror=sign-compare]
  170 |  } else if (format_flags & DDPF_FOURCC && format_fourcc == PF_FOURCC("DXT3")) {
      |                                                         ^
modules/dds/texture_loader_dds.cpp:174:57: error: comparison of integer expressions of different signedness: 'uint32_t' {aka 'unsigned int'} and 'int' [-Werror=sign-compare]
  174 |  } else if (format_flags & DDPF_FOURCC && format_fourcc == PF_FOURCC("DXT5")) {
      |                                                         ^
modules/dds/texture_loader_dds.cpp:177:57: error: comparison of integer expressions of different signedness: 'uint32_t' {aka 'unsigned int'} and 'int' [-Werror=sign-compare]
  177 |  } else if (format_flags & DDPF_FOURCC && format_fourcc == PF_FOURCC("ATI1")) {
      |                                                         ^
modules/dds/texture_loader_dds.cpp:180:57: error: comparison of integer expressions of different signedness: 'uint32_t' {aka 'unsigned int'} and 'int' [-Werror=sign-compare]
  180 |  } else if (format_flags & DDPF_FOURCC && format_fourcc == PF_FOURCC("ATI2")) {
      |                                                         ^
modules/dds/texture_loader_dds.cpp:183:57: error: comparison of integer expressions of different signedness: 'uint32_t' {aka 'unsigned int'} and 'int' [-Werror=sign-compare]
  183 |  } else if (format_flags & DDPF_FOURCC && format_fourcc == PF_FOURCC("A2XY")) {
      |                                                         ^

thirdparty/assimp/include/assimp/material.inl: In member function 'aiReturn aiMaterial::Get(const char*, unsigned int, unsigned int, aiColor3D&) const':
thirdparty/assimp/include/assimp/material.inl:176:33: error: implicitly-declared 'aiColor3D& aiColor3D::operator=(const aiColor3D&)' is deprecated [-Werror=deprecated-copy]
  176 |     pOut = aiColor3D(c.r,c.g,c.b);
 2019-07-02 13:35:30 +02:00
Rémi Verschelde
78af5625d0 i18n: Sync translation template with current source 2019-07-02 13:30:19 +02:00
Rémi Verschelde
bc00332286 Fix TTR strings for VisualShaderNodes 
It had been done wrongly in #30185, but I missed it.
 2019-07-02 13:29:26 +02:00
Martin Liska
c8de5760bd Use GCC 9 in travis. 2019-07-02 13:28:48 +02:00
Rémi Verschelde
ce3e3b609c i18n: Sync translations with Weblate 2019-07-02 13:22:58 +02:00
Fabio Alessandrelli
564d93ff10 CryptoCore class to access to base crypto utils. 
Godot core needs MD5/SHA256/AES/Base64 which used to be provided by
separate libraries.
Since we bundle mbedtls in most cases, and we can easily only include
the needed sources if we so desire, let's use it.

To simplify library changes in the future, and better isolate header
dependencies all functions have been wrapped around inside a class in
`core/math/crypto_base.h`.

If the mbedtls module is disabled, we only bundle the needed source
files independently of the `builtin_mbedtls` option.
If the module is enabled, the `builtin_mbedtls` option works as usual.

Also remove some unused headers from StreamPeerMbedTLS which were
causing build issues.
 2019-07-02 12:36:27 +02:00
Rémi Verschelde
266dc732ba doc: Sync classref with current source 2019-07-02 12:04:26 +02:00
Rémi Verschelde
c08877777d
Merge pull request #26613 from KoBeWi/direction_of_particles 
Add a Direction property to ParticlesMaterial
 2019-07-02 11:33:34 +02:00
Rémi Verschelde
98879be276
Merge pull request #27510 from fire/screenshot_editor 
Add editor screenshot on control - f12.
 2019-07-02 11:30:16 +02:00
Rémi Verschelde
c486b8dac0
Merge pull request #30223 from qarmin/properly_delete_thread 
Remove thread to prevent memory leak
 2019-07-02 11:26:29 +02:00
Rémi Verschelde
d2c416ec62
Merge pull request #29824 from m4gr3d/add_ovr_export 
Add XR mode selection to the Android export process.
 2019-07-02 10:36:30 +02:00
Rémi Verschelde
e8b483ce21
Merge pull request #19936 from Xrayez/collapse-button 
Expand/collapse nodes recursively in scene tree dock
 2019-07-02 10:02:24 +02:00
fhuya
12e0dc1b65 Add XR mode selection to the Android export process. 2019-07-02 00:12:38 -07:00
Rémi Verschelde
ab1cb10317 Update AUTHORS and DONORS list 
New contributor added to AUTHORS:
@aqnuep

Thanks to all contributors and donors for making Godot possible!
 2019-07-02 08:37:32 +02:00
Rémi Verschelde
0ab11e436d
Merge pull request #29656 from nhold/add-remove-option-array-inspector 
Add buttons to remove keys\items from dictionaries\arrays.
 2019-07-02 07:29:22 +02:00
Nathan Hold
bd9cc84fdc Add option to remove array item and button to remove typed array item 2019-07-02 12:42:37 +10:00
K. S. Ernest (iFire) Lee
05de0eafab Add editor screenshot on control - f12. 2019-07-01 13:39:21 -07:00
Rémi Verschelde
0268a4869d
Merge pull request #30196 from LikeLakers2/scenetreedock-script-creation-bugfix 
SceneTreeDock will now only attach scripts to the selected node if the ScriptCreateDialog was opened from the SceneTreeDock
 2019-07-01 21:13:46 +02:00
Michael Alexsander Silva Dias
91d357f177 Add "Go To" menu to the script editor and move the bookmark and breakpoint menus there 2019-07-01 16:00:05 -03:00
Rémi Verschelde
d40dbd6d11
Merge pull request #29951 from raphael10241024/add_physics_2d_optimize 
add 2d physic optimization similar to 3d physics
 2019-07-01 17:08:05 +02:00
Rémi Verschelde
4d99408d12
Merge pull request #28884 from vnen/yield-resume-stack 
Keep GDScript functions in stack while yielding
 2019-07-01 16:35:26 +02:00
Rémi Verschelde
f5d9454a4b
Merge pull request #29071 from YeldhamDev/improve_bookmarks 
Improve bookmarks
 2019-07-01 16:34:17 +02:00
Rémi Verschelde
08200cb9f5
Merge pull request #29333 from hbina/fix_double_click_when_no_edited_func 
fixed an issue with double clicking available node in VisualScriptEditor
 2019-07-01 16:33:04 +02:00
Rémi Verschelde
b0eeb12335
Merge pull request #29909 from clayjohn/gles2-light-scale 
Scale vertex lit lights by environment scale
 2019-07-01 16:28:17 +02:00
qarmin
6edd06e566 Remove thread to prevent memory leak 2019-07-01 15:07:06 +02:00
Rémi Verschelde
6b30f284a0
Merge pull request #29980 from Dentrax/directed-by-qarmin 
Fix some editor crashes
 2019-07-01 14:59:29 +02:00
Rémi Verschelde
b0ce9401ff
Merge pull request #30126 from qarmin/remove_unnecessary_code 
Remove unnecessary code and add some error explanations
 2019-07-01 14:32:04 +02:00
Rémi Verschelde
531c92a53e
Merge pull request #30221 from godotengine/revert-28572-trace-info 
Revert "Add godot version in backtrace message"
 2019-07-01 14:00:04 +02:00
Rémi Verschelde
98e7ec1e26
Revert "Add godot version in backtrace message" 2019-07-01 13:58:57 +02:00
Rémi Verschelde
380bf04566
Merge pull request #29413 from YeldhamDev/global_rate_scale 
Add 'global_rate_scale' to the AudioServer
 2019-07-01 13:53:04 +02:00
Rémi Verschelde
771aa9a779
Merge pull request #29482 from Calinou/html5-fix-emscripten-root 
Fix Emscripten root directory detection when building for HTML5
 2019-07-01 13:52:22 +02:00
Rémi Verschelde
867f38a626
Merge pull request #29572 from qarmin/fix_text_edit_select 
Fix TextEdit Select crash
 2019-07-01 13:49:06 +02:00
Furkan Türkal
7d8d337b2c fix some crashes 2019-07-01 14:28:29 +03:00
qarmin
3c154eb93b Remove unnecessary code and add some error explanations 2019-07-01 12:59:42 +02:00
Rémi Verschelde
ab9c14cca6
Merge pull request #30220 from Calinou/doc-fix-nintendo-buttons 
Fix Nintendo buttons in the @GlobalScope documentation
 2019-07-01 12:55:14 +02:00
Rémi Verschelde
931b6dfd33
Merge pull request #30219 from Calinou/tweak-gamepad-button-names 
Tweak gamepad button names to be consistent with the documentation
 2019-07-01 12:55:01 +02:00
Hugo Locurcio
398219a80e
Fix Nintendo buttons in the @GlobalScope documentation 
These were mistakenly referred to as DualShock buttons.
 2019-07-01 12:24:47 +02:00
Hugo Locurcio
310b03d97e
Tweak gamepad button names to be consistent with the documentation 2019-07-01 12:18:59 +02:00
Rémi Verschelde
d17eac735c
Merge pull request #29815 from NilsIrl/plus_file_1 
Replace ` + "/" + ` with `String::file_add()`
 2019-07-01 12:06:35 +02:00
Rémi Verschelde
b62041d1f3
Merge pull request #30089 from fire/cicd-crash 
Headless CI/CD crash fixes
 2019-07-01 12:03:46 +02:00