Commit Graph

6874 Commits

Author SHA1 Message Date
Rémi Verschelde e1af0d01c6 Travis: Use Xcode 11.6 instead of 9.3 2020-08-14 14:59:39 +02:00
Rémi Verschelde 87abfad7e2 OSX: Remove support for 32-bit and fat binaries
Mac OS X is 64-bit only since 10.7 (Lion), which has reached End-Of-Life in October 2014.
Therefore it no longer makes sense to support exporting 32-bit binaries for Mac OS X,
and we can now default to 64-bit instead of bigger "fat" binaries.

(cherry picked from commits f04958cd5d,
42c5af5e48, 3e6f2b7d98,
and 1602e0cdb9)
2020-08-14 14:58:49 +02:00
Rémi Verschelde a7cdffc39b
Merge pull request #41250 from akien-mga/2.1-cherrypicks
[2.1] Third-party library updates and Travis fix
2020-08-14 14:58:17 +02:00
Rémi Verschelde 07f21b1080 Travis: Fix server build env in matrix
Another stray quote that broke Travis, not sure how it got there.
2020-08-14 14:37:12 +02:00
Rémi Verschelde 1394bbd443 openssl: Update to pristine 1.0.2u (security update) 2020-08-14 12:40:55 +02:00
Rémi Verschelde 0f436f10d0 FastLZ: Update to upstream version 0.5.0
Upstream development restarted after 13 years. Changes:

2020-02-02: Version 0.5.0

    Minor speed improvement on the decompressor.
    Prevent memory violation when decompressing corrupted input.

2020-01-10: Version 0.4.0

    Only code & infrastructure clean-up, no new functionality.

(cherry picked from commit 5167c9186a)
2020-08-14 12:32:06 +02:00
volzhs 8bd68b4b49 Update libwebp to 1.1.0
(cherry picked from commit 65f2ab1b61)
2020-08-14 12:31:03 +02:00
volzhs 4cb84f0416 Update libwebp to 1.0.3
(cherry picked from commit 074d421dca)
2020-08-14 12:30:57 +02:00
Rémi Verschelde 4a8350bbe3
Merge pull request #41222 from bruvzg/2.1
Cherry-picks for the 2.1 branch (macOS)
2020-08-14 11:36:36 +02:00
bruvzg 834f427cf5
[macOS] Return exit code specified by `OS.exit_code` parameter. 2020-08-14 09:15:00 +03:00
bruvzg f2b51815c7
Hack to force macOS window activation for non-bundled app. 2020-08-14 09:14:59 +03:00
bruvzg 45f4300edd
[macOS] Fix locale detection. 2020-08-14 09:14:59 +03:00
bruvzg 457dc5056d
Ignore process serial number (`-psn_...`) command line argument passed by macOS Gatekeeper. 2020-08-14 09:14:59 +03:00
Daniel Ting 91f7af48eb
Fix opening URLS with special characters in macOS
The Online Tutorials section of InputMap in the editor's built-in
documentation viewer contains this link:

docs.godotengine.org/en/latest/tutorials/inputs/inputevent.html#inputmap

The macOS implementation for opening a link percent-encodes it before
sending it to the browser, resulting in a 404. This is to fix #13422
where filenames with special characters could not be opened in Finder.
However, this breaks URLS so I added a check to see if the resource
scheme is file:// and if so, only then is it escaped. This allows other
schemes like `http`, `ftp`, and `mailto` to be used.
2020-08-14 09:14:58 +03:00
bruvzg 31d84838ac
[macOS] Make `move_window_to_foreground` to take focus in addition to moving window to front. 2020-08-14 09:14:58 +03:00
bruvzg 0b118594f9
[macOS] Send resize event without actually resizing window on backing change.
Co-authored-by: Haoyu Qiu <timothyqiu32@gmail.com>
2020-08-14 09:14:57 +03:00
Rémi Verschelde d284e366a4 Update DONORS list 2020-08-14 00:15:19 +02:00
Rémi Verschelde 03e90d565b
Merge pull request #41234 from akien-mga/2.1-clang-format-10
[2.1] Travis: Use clang-format 8 instead of 6
2020-08-13 23:37:17 +02:00
Rémi Verschelde 897c53173d Travis: Use clang-format 8 instead of 6
Fix bogus build matrix due to stray quotes.
2020-08-13 23:17:30 +02:00
Rémi Verschelde 5dac688644 Bump version to 2.1.7-rc 2020-08-13 22:58:45 +02:00
Rémi Verschelde b97401f304 Update copyright statements to 2020
And apply clang-format 10 to the codebase.
2020-08-13 22:58:13 +02:00
Max 18484dd45e Fix crash on exit or resume on iOS 13
Fixes #7966.

(cherry picked from commit 29bde8cd74)
2020-05-28 14:09:23 +02:00
Rémi Verschelde 1d2aa22438 Windows: Appease capricious MSVC versions with moody headers
Fixes #37799.
Fixes #37986.

(cherry picked from commit 4d3a18d9ff)
2020-05-28 14:09:23 +02:00
Rémi Verschelde 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
bruvzg 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
Rémi Verschelde 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
Ibrahn Sahir 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
Rémi Verschelde 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
Xavier Sellier 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
Rémi Verschelde 38568f82c3
Merge pull request #34283 from xsellier/patch-2
Vertical scroll container margin is incorrect
2019-12-12 07:34:59 +01:00
Xavier Sellier 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
Rémi Verschelde 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
Rémi Verschelde 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
Rémi Verschelde 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
Rémi Verschelde 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
Rémi Verschelde 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
Rémi Verschelde 4dabc8faca openssl: Update to pristine 1.0.2t (security update)
(cherry picked from commit 21596fb992)
2019-11-12 09:48:32 +01:00
bruvzg 36eb43fff7 Fix non-HiDPI mode on HiDPI displays on macOS Catalina.
(cherry picked from commit 509afcea92)
2019-10-25 16:31:02 +02:00
Rémi Verschelde 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
Rémi Verschelde 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
Bojidar Marinov 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
Rémi Verschelde 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
Rémi Verschelde 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
Rémi Verschelde 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
Rémi Verschelde 01e65c4555 Android: Fix support for android_stl=no with NDK r20
Fixes #30688.
2019-07-30 15:11:36 +02:00
Rémi Verschelde 0a502efc3a
Merge pull request #30758 from jandrewlong/fix-android-detect
fix detecting ndk platform
2019-07-22 20:55:28 +02:00
J Andrew Long 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
Wojciech Milkowski 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
Rémi Verschelde e10ddbc80e
Merge pull request #30682 from jandrewlong/fix-andoird-detect
fix string split() call
2019-07-19 08:42:15 +02:00
J Andrew Long 5ac248264a fix string split() call 2019-07-18 11:37:07 -04:00