Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-12-04 01:52:56 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
22,119 Commits 15 Branches 59 Tags 3.3 GiB
e57d0c8e60
Commit Graph

305 Commits

Author SHA1 Message Date
Fabio Alessandrelli
9233edd344 Godot addition to wslay, fixes MSVC build 2019-07-04 15:03:04 +02:00
Fabio Alessandrelli
aae6c075aa Remove libwebsocket. No longer used, yay! 2019-07-04 15:03:04 +02:00
Fabio Alessandrelli
9e303ef71c WebSocket module now uses wslay library. 
Both client and server are supported on native builds (as usual).

SSL server is still not supported, but will soon be possible with this
new library.

The API stays the same, we just need to work out potential issues due to
this big library switch.
 2019-07-04 15:03:04 +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
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
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
Fabio Alessandrelli
78907d91f1 Update miniupnpc library to latest master 2019-06-30 17:49:40 +02:00
Rémi Verschelde
99acec63f1 bullet: Sync with current upstream master branch 
This updates our local copy to commit 5ec8339b6fc491e3f09a34a4516e82787f053fcc.
We need a recent master commit for some new features that we use in Godot
(see #25543 and #28909).

To avoid warnings generated by Bullet headers included in our own module,
we include those headers with -isystem on GCC and Clang.

Fixes #29503.
 2019-06-11 13:19:42 +02:00
Rémi Verschelde
900d90bb61 Git: Explicitly list binary files as such to avoid EOL change 
text=auto works well in Git 2.10+ but it's broken in previous versions,
which are still used in production on e.g. Ubuntu 16.04 LTS.

Also fix a couple missed text files with CRLF terminators.
.bat files likely require it to be processed properly on Windows,
but core.autocrlf should take care of converting them on the fly
when checking out on Windows.
 2019-05-25 10:43:48 +02:00
Andrii Doroshenko (Xrayez)
9bf48db891 Build Clipper with tools=no and patch it to auto-disable exceptions 
Reverts "Build polygon clipper only in tools builds" (see #17319)
which allows to build Clipper with tools disabled (release) and because
of that, Clipper has to be patched to optionally disable exceptions in
order to be built on some platforms.

Patched Clipper 6.4.2 to be compiled with exceptions enabled/disabled.
and ensure that Clipper-specific exception macros are defined: don't use
exceptions by default unless exception handling is detected.

Compilation with exceptions will be determined by various
C++ exceptions defines:

* ` __cpp_exceptions` is part of C++ feature testing macros (since C++98);
* `__EXCEPTIONS` is used by some GNU compilers;
* `_CPPUNWIND` is used by MSVC.

The user can override specific exceptions behavior via corresponding
`*_USER` macros (i.e. compiling for embedded systems).
 2019-05-22 13:12:21 +03:00
Rémi Verschelde
b7e737639f Fix non UTF8-encoded thirdparty files 2019-05-22 10:34:57 +02:00
Rémi Verschelde
c38d9180df
Revert "Revert "Implemented terrain raycast acceleration"" 2019-05-16 10:18:48 +02:00
Rémi Verschelde
e0517a12c5
Merge pull request #28518 from clayjohn/GLES2-MSAA 
Added MSAA to GLES2 backend
 2019-05-13 17:46:11 +02:00
Fabio Alessandrelli
0239d8bd9f
Merge pull request #28453 from Tarik02/enet_socket_set_option 
Partially implement enet_socket_set_option
 2019-05-07 10:14:52 +02:00
clayjohn
a3d5aec68d added MSAA to GLES backend 2019-05-02 14:24:20 -07:00
Fabio Alessandrelli
be414e4476 Revert "Update libwebsockets to 3.1 (plus UWP patch)" 
This reverts commit 90210c4862.
 2019-05-01 14:41:47 +02:00
Rémi Verschelde
12cc760538
Merge pull request #26051 from 20kdc/videofix 
webm/theora/yuv2rgb/libsimplewebm: Fix colour issues I could find.
 2019-04-30 13:38:44 +02:00
Tarik02
63d1a80656 Removed a call to set_blocking_enabled from function enet_socket_create since it is already called from https://github.com/godotengine/godot/blob/master/thirdparty/enet/host.c#L63 2019-04-26 22:27:50 +03:00
Tarik02
bb3089895c Implement function enet_socket_set_option using ENetSocket class's methods. 
Implemented options:
 - ENET_SOCKOPT_NONBLOCK
 - ENET_SOCKOPT_BROADCAST
 - ENET_SOCKOPT_REUSEADDR
 - ENET_SOCKOPT_NODELAY
Not implemented options:
 - ENET_SOCKOPT_RCVBUF
 - ENET_SOCKOPT_SNDBUF
 - ENET_SOCKOPT_RCVTIMEO
 - ENET_SOCKOPT_SNDTIMEO
 2019-04-26 22:23:52 +03:00
Rémi Verschelde
225b61ab2a libpng: Update to upstream 1.6.37 
Fixes CVE-2019-7317.
 2019-04-26 10:37:22 +02:00
Rémi Verschelde
458827efc2
Revert "Implemented terrain raycast acceleration" 2019-04-23 13:56:23 +02:00
Hein-Pieter van Braam
4575769115
Merge pull request #25543 from Zylann/optimize_bullet_heightfield_raycast2 
Implemented terrain raycast acceleration
 2019-04-23 06:25:15 +03:00
Rémi Verschelde
1e67f214c5
Merge pull request #27817 from fire/assimp_d3d98a 
Update Assimp to master at d3d98a7ec0c8d38e1952b46dfe53f7e9233dc92d
 2019-04-22 12:00:06 +02:00
Rémi Verschelde
5899972049
Merge pull request #27554 from volzhs/freetype-2.10.0 
Update freetype to 2.10.0
 2019-04-20 20:00:56 +02:00
Rémi Verschelde
8269ed9cdf
Merge pull request #28196 from akien-mga/xatlas-cleanup 
xatlas: Document provenance, copyright and custom changes
 2019-04-19 12:59:41 +02:00
Rémi Verschelde
44f9a966e0 xatlas: Redo our custom changes, but properly documented 2019-04-19 12:40:01 +02:00
Rémi Verschelde
1e39fee140 xatlas: Revert to unmodified upstream code, add to COPYRIGHT 
Imported by @reduz from b8ec29b6b6
Custom changes will be remade properly in the next commit.
 2019-04-19 12:39:26 +02:00
Rémi Verschelde
6640f397f1 Drop unused thekla_atlas dependency 
Since f12cb82 @reduz dropped the use of the thirdparty thekla_atlas
library, which is replaced by xatlas.

Fixes #28180.
Fixes #28182.
 2019-04-19 11:42:58 +02:00
Rémi Verschelde
88cb9bd27f zstd: Update to upstream 1.4.0 
One step towards fixing #17374 as most experimental APIs we use are now
part of the stable 1.4.0.
 2019-04-18 12:39:11 +02:00
Rémi Verschelde
74ab31b7f7 vhacd: Fix -fpermissive build issue with MinGW 
Fixes #27926.
 2019-04-11 18:20:33 +02:00
Rémi Verschelde
668439d16a vhacd: Reapply downstream changes to namespace conflicting bullet code 
Also adding a patch to easily identify and reapply them.
 2019-04-11 18:20:32 +02:00
Rémi Verschelde
531b158897 vhacd: Recommit unmodified upstream code without style changes 
Godot-specific changes will then be redone without touching upstream formatting.
Also documented current state in thirdparty/README.md and added LICENSE.

Add vhacd to COPYRIGHT.txt.
 2019-04-11 18:11:59 +02:00
Windy Darian
f05af9d492 fix vhacd namespace placing in thirdparty/vhacd/src/btConvexHullComputer.cpp 2019-04-10 23:45:26 -04:00
Juan Linietsky
5823b5d77d Bundled VHACD library for convex decomposition. 
Modified both MeshInstance tools as well as importer to use it instead of QuickHull.
 2019-04-10 17:47:28 -03:00
K. S. Ernest (iFire) Lee
cc72bc6713 Update Assimp to master at d3d98a7ec0c8d38e1952b46dfe53f7e9233dc92d 
* ASCII FBX embedded content
* Improved uv scaling metadata
 2019-04-09 07:42:31 -07:00
K. S. Ernest (iFire) Lee
793b0de197 Add Assimp library in thirdparty 
From https://github.com/assimp/assimp repo at d2b45377e4b09a1f43be95e45553afcc06b03f4b
 2019-04-05 07:17:52 -07:00
volzhs
a6300b454d Update freetype to 2.10.0 2019-03-31 23:20:36 +09:00
Chaosus
6280be46a6 Properly setup seed in RNG 2019-03-27 19:37:25 +03:00
Fabio Alessandrelli
6d64a54d75 Disable WebSocket IPv6 support on OpenBSD. 
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.
 2019-03-06 06:34:31 +01:00
Fabio Alessandrelli
e3ddf12693 Add fix to libwebsocket to disable V6ONLY. 
This was enabled by default on some systems (e.g. Windows).
 2019-03-06 06:29:46 +01:00
Fabio Alessandrelli
90210c4862 Update libwebsockets to 3.1 (plus UWP patch) 2019-03-06 02:02:52 +01:00
Rémi Verschelde
ab11496a92
Merge pull request #26586 from akien-mga/tinyexr-65f9859 
tinyexr: Sync with upstream 65f9859
 2019-03-04 16:41:04 +01:00
Rémi Verschelde
fcabdf9e83
Merge pull request #26585 from akien-mga/pcre2-10.32 
pcre2: Sync with upstream 10.32
 2019-03-04 16:14:25 +01:00
Rémi Verschelde
f173f8625d
Merge pull request #26584 from akien-mga/nanosvg-c1f6e20 
nanosvg: Sync with upstream c1f6e20
 2019-03-04 15:20:44 +01:00
Rémi Verschelde
a1d707f9de
Merge pull request #26583 from akien-mga/stb-truetype-1.21-vorbis-1.15 
stb: Update to upstream stb_truetype 1.21 and stb_vorbis 1.15
 2019-03-04 15:12:10 +01:00
Rémi Verschelde
a9e48b981d Updates to thirdparty README and COPYRIGHT 
Notably, we now track stable Bullet 2.88, so distros can
unbundle it again.
 2019-03-04 14:51:16 +01:00
Rémi Verschelde
9ce6588466 tinyexr: Sync with upstream 65f9859 2019-03-04 14:33:42 +01:00
Rémi Verschelde
0455bc64b6 pcre2: Sync with upstream 10.32 2019-03-04 14:25:49 +01:00
Rémi Verschelde
43d6774dcc nanosvg: Sync with upstream c1f6e20 2019-03-04 14:11:26 +01:00
Rémi Verschelde
f102546f34 stb: Update to upstream stb_truetype 1.21 and stb_vorbis 1.15 2019-03-04 14:06:31 +01:00