6901 Commits

Author SHA1 Message Date
c071c754d0 Travis: Fix clang-format on non-master branches
`git diff-tree` used to fail on the `3.2` branch (and other non-master
branches) as Travis doesn't actually check that branch from the remote:
```
fatal: ambiguous argument '3.2': unknown revision or path not in the
working tree.
```

The exit code would still be 0 so we'd miss badly formatted commits
targeting stable branches.

We do it manually to ensure that it's going to work as we want it.

(cherry picked from commit e479231b21)
2020-05-28 14:09:22 +02:00
7894c6176c Replace IOHIDDeviceRegisterRemovalCallback with IOHIDManagerRegisterDeviceRemovalCallback to fix gamepad disconnection callback on macOS Catalina.
(cherry picked from commit 6b23e36dbc)
2020-05-28 14:09:22 +02:00
ce57492e8e Merge pull request #36449 from xsellier/fix-late-segfault-hang
[2.1] Fixed hang when segfaulting after OS object destroyed (OSX and X11)
2020-02-22 16:58:01 +01:00
9344851b05 Fixed hang when segfaulting after OS object destroyed (OSX and X11)
The two POSIX style crash handlers (OSX and X11) now remove their signal
handlers when they are destroyed.
Additonally if they are called while no OS singleton is set, they will
simply abort(). This should not happen now that they remove themselves,
but if a future change seperates OS object and crash handler lifetimes,
this may be easier to report/debug than hanging on SIGSEGV.
2020-02-22 08:44:16 -05:00
9c9aee12f3 Merge pull request #34453 from xsellier/patch-3
[2.1] Fallback to the dummy audio driver if no other audio driver works
2019-12-20 12:22:42 +01:00
400e273eee Fallback to the dummy audio driver if no other driver works
Fix this issue https://github.com/godotengine/godot/issues/1684
2019-12-19 10:16:01 -05:00
38568f82c3 Merge pull request #34283 from xsellier/patch-2
Vertical scroll container margin is incorrect
2019-12-12 07:34:59 +01:00
fab1ef325c Vertical scroll container margin is incorrect
This bug has already been fixed in the master branch
2019-12-11 16:06:02 -05:00
32f64e5f99 HTML5: Explicitly link idbfs.js for IDBFS support
Upstream Emscripten changed this in 1.39.1+, so IDBFS is no longer
included by default and has to be linked manually.

The explicit linking doesn't seem to be problematic on earlier
versions (tested `1.38.47-upstream`).

Fixes #33724.

(cherry picked from commit e5dfcb5edd)
2019-11-29 16:04:14 +01:00
995eddf714 HTML5: Fix support for Emscripten 1.39.1+
A change in upstream Emscripten 1.39.1+ made our buildsystem error
out where it was previously only issuing a warning:
```
[  5%] Linking Static Library ==> main/libmain.javascript.opt.bc
shared:WARNING: Assuming object file output in the absence of `-c`, based on output filename. Please add with `-c` or `-r` to avoid this warning
Ranlib Library         ==> main/libmain.javascript.opt.bc
/opt/emsdk/upstream/bin/llvm-ranlib: error: unable to load 'main/libmain.javascript.opt.bc': file too small to be an archive
```

As advised on emscripten-core/emscripten#9806, we should be using
`emar` here to create the static library and not `emcc`.
This was apparently done to workaround Emscripten issues in the past,
but evidently this is no longer necessary.

The rest of the `env` redefinitions should probably be re-assessed
against the current state of Emscripten.

Fixes #33374.

(cherry picked from commit e9e2a4b044)
2019-11-29 16:01:19 +01:00
6a51c28400 Update AUTHORS list
New contributors added to AUTHORS:
@kawa-yoiko, @m4gr3d, @QbieShay, @RevoluPowered, @rxlecky

(cherry picked from commit 62a09a2ee3)
2019-11-12 15:47:13 +01:00
134c463d3f New contributors added to AUTHORS:
@DavidSichma, @ptrojahn

New Platinum sponsor, added to splash screen:
Interblock

New Gold sponsor:
Image Campus

(cherry picked from commit c663d65ffc)
(cherry picked from commit 2fa9cae76c)
2019-11-12 10:00:51 +01:00
e9a5fe6c0b Update AUTHORS and DONORS list
New contributors added to AUTHORS:
@creikey, @IronicallySerious, @LikeLakers2, @minraws, @NilsIrl,
@profan, @raphael10241024

New Platinum sponsor, added to splash screen:
Heroic Labs

Merged some duplicates via .mailmap to allow better tracking of
commit counts with `git shortlog -s -n -e --no-merges`.

Thanks to all contributors and donors for making Godot possible!

(cherry picked from commit 664d7e7336)
(cherry picked from commit 0ce197f238)
2019-11-12 10:00:40 +01:00
4dabc8faca openssl: Update to pristine 1.0.2t (security update)
(cherry picked from commit 21596fb992)
2019-11-12 09:48:32 +01:00
36eb43fff7 Fix non-HiDPI mode on HiDPI displays on macOS Catalina.
(cherry picked from commit 509afcea92)
2019-10-25 16:31:02 +02:00
cb33ac3842 Update AUTHORS and DONORS list
New contributors added to AUTHORS:
@merumelu, @sparkart

Thanks to all contributors and donors for making Godot possible!

(cherry picked from commit 41beecaa08)
2019-09-24 13:23:19 +02:00
e6b20e1626 Merge pull request #32088 from abmyii/2.1
Fix crash when guessing type of variable declared to itself - Godot 2.1
2019-09-24 13:23:03 +02:00
f4a6e3dded Fix crash when guessing type of variable declared to itself
Fixes #10972

(cherry picked from commit b7fd065f5c)
2019-09-24 10:52:38 +02:00
b5c444a671 Update AUTHORS and DONORS list
New contributors added to AUTHORS:
@Anutrix, @hbina, @santouits

Thanks to all contributors and donors for making Godot possible!

(cherry picked from commit 6d6b9ccc9a)
2019-08-02 09:46:09 +02:00
ea06e04594 Update AUTHORS and DONORS list
New contributor added to AUTHORS:
@aqnuep

Thanks to all contributors and donors for making Godot possible!

(cherry picked from commit ab1cb10317)
2019-08-02 09:46:05 +02:00
59dea32b68 Merge pull request #30963 from akien-mga/2.1-fix-android_stl-no
Android: Fix support for android_stl=no with NDK r20
2019-07-30 17:16:28 +02:00
01e65c4555 Android: Fix support for android_stl=no with NDK r20
Fixes #30688.
2019-07-30 15:11:36 +02:00
0a502efc3a Merge pull request #30758 from jandrewlong/fix-android-detect
fix detecting ndk platform
2019-07-22 20:55:28 +02:00
860365bef1 fix detecting ndk platform
python maps are not subscriptable, so we need to use a list
2019-07-22 13:38:53 -04:00
8a95782e5a No need to link with libandroid_support in NDK 17
According to https://github.com/bytedeco/javacpp/pull/244 in NDK 17
libandroid_support library is not needed any more, and on armv8 is
already gone which breaks compilation.

(cherry picked from commit 3a3ea6d514)
2019-07-21 16:18:53 +02:00
e10ddbc80e Merge pull request #30682 from jandrewlong/fix-andoird-detect
fix string split() call
2019-07-19 08:42:15 +02:00
5ac248264a fix string split() call 2019-07-18 11:37:07 -04:00
7249992b62 Android: Target SDK 28, required by Google from Aug 2019 2.1.6-stable 2019-07-08 14:01:42 +02:00
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
bf54138453 Release 2.1.6-stable 2019-07-02 15:08:16 +02:00
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
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
ea595c2290 If WASAPI driver not initialized, fail the init 2019-06-12 15:16:49 -04:00
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
9e8dc70240 HiDPI support on Windows.. yes this is all it took. 2019-06-06 11:58:56 -04:00
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
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
a3866276a2 openssl: Update to pristine 1.0.2s (security update)
(cherry picked from commit cae8e9fa8e)
2019-06-04 12:24:24 +02:00
246b2c2d06 Update more version strings to 2.1.6 2019-06-04 11:43:02 +02:00
7562ce053a Update copyright statements to 2019 2019-06-04 11:41:49 +02:00
c38f3ee027 Sync AUTHORS and DONORS with master branch 2019-06-04 11:02:13 +02:00
b407fe66d1 libwebp: Sync with upstream 1.0.2
(cherry picked from commit 93f6a065f8)
2019-06-04 10:27:21 +02:00
5e4bcb9f1b Update libwebp to 1.0.1
(cherry picked from commit d4133ac844)
2019-06-04 10:27:16 +02:00
8009fe22df Update libvorbis to 1.3.6
(cherry picked from commit 4932c7ddcf)
2019-06-04 10:26:48 +02:00
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
3112f50ecf Update libpng (1.6.35 --> 1.6.36)
(cherry picked from commit 5a89d08e3f)
2019-06-04 10:25:03 +02:00
67f1c9f1c8 libpng: Update to upstream version 1.6.35
(cherry picked from commit f4e682d717)
2019-06-04 10:24:58 +02:00
b8168a839a thirdparty: Improve documentation on b2d_convexdecomp and DroidSans 2019-06-04 10:24:47 +02:00
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
24d516c50f iOS: Link against SDK 12.1 as required by Apple Store
Fixes #26593.
2019-06-04 09:42:08 +02:00