Commit Graph

6873 Commits

Author SHA1 Message Date
Rémi Verschelde 332d74bcaf AppVeyor: Skip saving cache on non-master branches
Otherwise we run into situations where commits to stable branches
induce very long build times, as they have to basically build from
scratch but also invalidate the cache for future commits on the
master branch.

This commit also makes the cache folder branch-specific, but since
it's still limited to 1 GB of total cache size, we don't enable it
for non-master, as we would still run into issues with non-master
build invalidating the master cache.

(cherry picked from commit b021bdbf1f)
2019-07-03 07:48:19 +02:00
Rémi Verschelde bf54138453 Release 2.1.6-stable 2019-07-02 15:08:16 +02:00
Rémi Verschelde 717d79e540 SCons: Default to builtin libpng/freetype on Linux (+ openssl)
The rationale for keeping those shared by default is that they're typical
dependencies found on any Linux system, and it saves compilation time and
binary size to link their dynamically.

But since official builds default to all-builtin, and Debian/Ubuntu still
don't have libpng16 (which we now require) readily available on all their
supported releases, it's simpler to bundle all the things.

This does not change the fact that those dependencies *can* be unbundled
on Linux, it's only the default option changing.

(cherry picked from commit 1769cbc0e2)

For 2.1, also building by default against bundled openssl.
2019-07-02 15:03:16 +02:00
Rémi Verschelde 43a5f5b366
Merge pull request #29728 from xsellier/bugfix/wasapi-driver-not-initialized
[2.1] If WASAPI driver not initialized, fail the init
2019-06-12 23:14:53 +02:00
Xavier Sellier ea595c2290 If WASAPI driver not initialized, fail the init 2019-06-12 15:16:49 -04:00
Rémi Verschelde a0bce23a5b
Merge pull request #29550 from xsellier/feature/HiDPI-support-for-windows
[2.1] Backporting HiDPI support on Windows.. yes this is all it took (cherry-pick)
2019-06-11 12:12:31 +02:00
Juan Linietsky 9e8dc70240 HiDPI support on Windows.. yes this is all it took. 2019-06-06 11:58:56 -04:00
Rémi Verschelde 9ef833ec6d HTML5: Do not error on undefined symbols
Emscripten used not to error out on those warnings, but this behaviour changed
recently, so we revert it to be able to compile as we used to for previous 2.1.x
releases. It would be good to fix those undefined symbols though.
2019-06-04 13:35:24 +02:00
Rémi Verschelde 9c585b20b0 Update sponsors
Image Campus is no longer a Gold sponsor at this time.

(cherry picked from commit 328805ae31)
2019-06-04 12:58:51 +02:00
Rémi Verschelde a3866276a2 openssl: Update to pristine 1.0.2s (security update)
(cherry picked from commit cae8e9fa8e)
2019-06-04 12:24:24 +02:00
Rémi Verschelde 246b2c2d06 Update more version strings to 2.1.6 2019-06-04 11:43:02 +02:00
Rémi Verschelde 7562ce053a Update copyright statements to 2019 2019-06-04 11:41:49 +02:00
Rémi Verschelde c38f3ee027 Sync AUTHORS and DONORS with master branch 2019-06-04 11:02:13 +02:00
Rémi Verschelde b407fe66d1 libwebp: Sync with upstream 1.0.2
(cherry picked from commit 93f6a065f8)
2019-06-04 10:27:21 +02:00
volzhs 5e4bcb9f1b Update libwebp to 1.0.1
(cherry picked from commit d4133ac844)
2019-06-04 10:27:16 +02:00
Guilherme Felipe 8009fe22df Update libvorbis to 1.3.6
(cherry picked from commit 4932c7ddcf)
2019-06-04 10:26:48 +02:00
Rémi Verschelde 5df893613e libpng: Update to upstream 1.6.37
Fixes CVE-2019-7317.

(cherry picked from commit 225b61ab2a)
2019-06-04 10:25:31 +02:00
Chaosus 3112f50ecf Update libpng (1.6.35 --> 1.6.36)
(cherry picked from commit 5a89d08e3f)
2019-06-04 10:25:03 +02:00
Rémi Verschelde 67f1c9f1c8 libpng: Update to upstream version 1.6.35
(cherry picked from commit f4e682d717)
2019-06-04 10:24:58 +02:00
Rémi Verschelde b8168a839a thirdparty: Improve documentation on b2d_convexdecomp and DroidSans 2019-06-04 10:24:47 +02:00
Rémi Verschelde 84d46ae0b9 certs: Sync with latest ca-certificates-2018.2.26-2.fc29
(cherry picked from commit e50407d2d2)
2019-06-04 10:21:10 +02:00
Rémi Verschelde 24d516c50f iOS: Link against SDK 12.1 as required by Apple Store
Fixes #26593.
2019-06-04 09:42:08 +02:00
Rémi Verschelde 04ea848116 SCons: Fix Python 3 support in GCC version check 2019-06-03 16:26:13 +02:00
Rémi Verschelde ee08831a32 Bump version to 2.1.6-rc 2019-05-28 13:01:07 +02:00
Rémi Verschelde ba709aadb0
Merge pull request #27248 from RandomShaper/upgrade-android-2.1
Upgrade & fix Android build scripts
2019-03-27 17:14:30 +01:00
Pedro J. Estébanez 5f795e6261 Upgrade & fix Android build scripts 2019-03-19 21:53:54 +01:00
Rémi Verschelde e898b0a3a8 Android: Enable arm64-v8a export by default
From August 1, 2019, Google Play requires that all new apps and app updates
include 64-bit versions, so we enable ARM64 by default.

IINM support for x86 and x86_64 is still be optional, so not enabling them
out of the box.

Part of #25030.

(cherry picked from commit 9e820cdf20)
2019-01-16 14:02:54 +01:00
Rémi Verschelde b768381998 Android: Add support for x86_64 architecture
Like arm64v8, this is only supported by API 21 and later,
so we enforce 21 as min API for x86_64.

Part of #25030.

(cherry picked from commit 7f4ee36469)
2019-01-16 13:28:04 +01:00
Rémi Verschelde f2a42e1ae5 openssl: Update to pristine 1.0.2q (security update)
(cherry picked from commit cff0913be8)
2018-11-22 19:58:40 +01:00
Rémi Verschelde 0429b21f10 openssl: Reorder sources alphabetically
(cherry picked from commit 8bde816efd)
2018-11-22 19:57:39 +01:00
Rémi Verschelde 7e5ffc7f77
Merge pull request #23727 from allkhor/fix_android_stl
[2.1] Fixed built templates for android
2018-11-16 15:16:20 +01:00
allkhor 7bdd22312f Fixed built templates for android 2018-11-15 21:09:34 +06:00
Rémi Verschelde 8d75ea755c
Merge pull request #23309 from allkhor/fix_android_stl
Godot [2.1] Don't copying libc++_shared.so when module android_stl is disabled
2018-10-27 00:07:58 +02:00
allkhor 52c63f7cfd Don't copying libc++_shared.so when module android_stl is disabled 2018-10-26 23:53:44 +06:00
Rémi Verschelde 9b7009bbc1
Merge pull request #22215 from DrMoriarty/fix_atlas
Optimize AtlasTexture packing by minimal perimeter (fixes #19307)
2018-09-18 15:59:27 +02:00
Vasiliy Makarov 9b992dddfc Optimize AtlasTexture packing by minimal perimeter.
Fixes #19307
2018-09-18 16:41:20 +03:00
Juan Linietsky 2c47116a3c I have no idea why this commit fixes #15392
(cherry picked from commit 8daf5491ab)
2018-09-18 13:37:38 +02:00
Bernhard Liebl bc0af4a73e Fix stale dynamic font reference fetch from cache
Seems to fix issue 15392

(cherry picked from commit 526e637a97)
2018-09-18 13:37:06 +02:00
Juan Linietsky 531fb3b8e6 Remove node from list before calling queries, fixes #10886
(cherry picked from commit 4deac219b0)

Fixes #17793.
2018-09-18 13:04:50 +02:00
Leon Krause 723c14cdfc Enable Theora module for HTML5 platform
(cherry picked from commit b4b816c122)
2018-09-18 11:48:52 +02:00
Rémi Verschelde d25c33889b
Merge pull request #22187 from guilhermefelipecgs/fix_20177
[2.1] Fix Input::set_custom_mouse_cursor showing cursor when it's invisible
2018-09-17 17:55:14 +02:00
Guilherme Felipe 72d4fd8f0d Fix Input::set_custom_mouse_cursor showing cursor when it's invisible 2018-09-17 12:24:44 -03:00
Ridwan Abdul Hafidh 6e62a1e4de add support libc++_shared on android 2018-09-17 15:13:40 +02:00
Rémi Verschelde 702022c947 Update AUTHORS and DONORS list
New contributors added to AUTHORS:
@dragmz, @fire

Thanks to all contributors and donors for making Godot possible!

[ci skip]

(cherry picked from commit 284b56f2fb)
2018-08-13 08:12:05 +02:00
Rémi Verschelde 38ed4b9a8c Release 2.1.5-stable 2018-07-28 17:17:52 +02:00
Fabio Alessandrelli c26094fd84 Fix InputEvent marshalling 2018-07-28 17:17:39 +02:00
Fabio Alessandrelli 497bc7d5fd Fix marshalls size checks.
Yesterday, when playing around with my network code, I realized there is
a security issue in decode_variant, at least when decoding PoolArrays.
Basically, the size of the PoolArray is encoded in a uint32_t, when
decoding it, that value is cast to int when comparing if the packet is
actually that size causing numbers with MSB=1 to be interpreted as
negative thus always passing the check. That same value though, is used
as uint32_t again to resize the output vector.  For this reason, sending
a malformed packet with declared type PoolByteArray and size of 2^31(+x)
causes the engine to try to allocate 2+GB of pool memory, causing the
engine to crash.

This patch is a backport of the one initially written for the master
branch.
2018-07-28 17:17:36 +02:00
Rémi Verschelde 9f0e38cca8 openssl: Update to pristine 1.0.2o (security update) 2018-07-27 16:39:39 +02:00
Rémi Verschelde 96e5d9430b libogg: Update to pristine version 1.3.3
(cherry picked from commit de0b31edd5)
2018-07-27 16:04:34 +02:00
Rémi Verschelde 849ff42496 Add check to clang 6.0 compiler bug workaround
Extending on b68222e4e7 to ensure that it still
has the exact same behaviour as the previous code, as discussed with @hpvb.

(cherry picked from commit 03e11c13bf)
2018-07-26 17:25:55 +02:00