Commit Graph

20429 Commits

Author SHA1 Message Date
Rémi Verschelde 40a0abea8d mbedtls: Re-add patch to disable VIA padlock
The comment mentioned a conflict with libwebsockets, but we actually
still get this conflict even now that we don't use libwebsockets.
Not sure what component is clashing but we should basically just keep
this patch.

Follow-up to #36823.

(cherry picked from commit 8189abd64a)

Note: For the 3.1 branch, only modifies the README.md a bit as I had
kept the patch removed in master/3.2.
2020-03-10 09:32:08 +01:00
Rémi Verschelde 1e9c726231 mbedtls: Re-apply upstream PR 1453 after #36823
For some weird reason 'git apply' does not error out when it does nothing,
so I missed that I did not apply the patch properly in #36823...

This broke the UWP 32-bit x86 build.

(cherry picked from commit 9a727714ee)
2020-03-09 19:50:05 +01:00
Rémi Verschelde 9b8f66a825 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-03-06 11:50:09 +01:00
bruvzg 279ada89ab Replace IOHIDDeviceRegisterRemovalCallback with IOHIDManagerRegisterDeviceRemovalCallback to fix gamepad disconnection callback on macOS Catalina.
(cherry picked from commit 6b23e36dbc)
2020-03-06 11:39:37 +01:00
Rémi Verschelde 8e7315d2fe mbedtls: Update to upstream version 2.16.5
Fixes https://tls.mbed.org/tech-updates/security-advisories/mbedtls-security-advisory-2020-02

Drop patch to disable VIA padlock since we no longer use libwebsockets,
so there's no conflict anymore.

(cherry picked from commit e435bed847)
2020-03-06 11:38:39 +01:00
Rémi Verschelde 879fc0b581 mbedtls: Update to upstream version 2.16.4
Fixes CVE-2019-18222.

`include/mbedtls/version.h` was modified to include the forgotten
version bump to 2.16.4, fixed upstream by ARMmbed/mbedtls#2992.

(cherry picked from commit 724487b3c1)
2020-03-06 11:37:04 +01:00
Relintai 58c58ec212 Fix startGame's logic in engine.js.
(cherry picked from commit cb29ce8a3b)
2020-02-14 16:10:49 +01:00
Fabio Alessandrelli 72395ca846 Fix UPNP on windows after #30205.
The problem could be related to different byte ordering when copying
the interface address over the binding address.

(cherry picked from commit e85330231c)
2020-02-14 16:01:54 +01:00
D00T24 273927273d fixed godot not recognising 150x150 icon for uwp export
(cherry picked from commit 88bd3227ac)
2020-02-06 12:47:04 +01:00
Rémi Verschelde 5361dbf4f9
Merge pull request #35396 from akien-mga/3.1
Range: Properly bind value emitted by 'changed' signal
2020-01-21 10:16:25 +01:00
Rémi Verschelde 227a81c119 Range: Properly bind value emitted by 'changed' signal
This was fixed in the `master` branch by removing the value in #29831,
but for `3.1` we preserve compatibility, even if redundant with
'value_changed'.

Fixes #35395.
2020-01-21 09:25:08 +01:00
Rémi Verschelde 513bfe496c SCons: Add 'split_libmodules' option to workaround linker issue
The new 'split_libmodules=yes' option is useful to work around linker
command line size limitations when linking a huge number of objects.
We're currently over 64k chars when linking libmodules.a on Windows
with MinGW, which triggers issues as seen in #30892.

Even on Linux, we can also reach linker command line size limitations
by adding more custom modules.

We force this option to True for MinGW on Windows, which fixes #30892.

Additional changes to lib splitting:

- Fix linking of the split module libs with interdependent symbols,
  hacking our way into LINKCOM and SHLINKCOM to set the `--start-group`
  and `--end-group` flags.
- Fix Python 3 compatibility in `methods.split_lib()`.
- Drop seemingly obsolete condition for 'msys' on 'posix'.
- Drop the unnecessary 'split_drivers' as the drivers lib is no longer
  too big since we moved all thirdparty builds to modules.

Co-authored-by: Hein-Pieter van Braam-Stewart <hp@tmm.cx>
(cherry picked from commit c320a82213)
2020-01-06 12:52:07 +01:00
qarmin 6de4c53d26 Fix crash when frames are empty
(cherry picked from commit 37c2595526)
2019-12-09 09:03:47 +01:00
Relintai 0587df4aa5 Fixed running the export templates with newer emscripten versions.
(cherry picked from commit 6f1d6cfc78)
2019-12-03 15:02:03 +01:00
Rémi Verschelde 89f26c9479 Emscripten: Re-add BINARYEN_TRAP_MODE='clamp' for fastcomp
The option is needed when using the 'fastcomp' backend (default before
1.39.0), and must not be defined when using 'upstream' (new default).
So we define it conditionally to support both backends.

Follow-up to #30751.

(cherry picked from commit 6d6280dfa3)
2019-12-03 15:01:43 +01:00
Rémi Verschelde ec02a81f47 Bump version to 3.1.2-stable
Tons of bugfixes have been cherry-picked since 3.1.1 in April,
this should make the 3.1 branch a lot more reliable to ship games.

Thanks to all contributors! <3
2019-11-29 16:23:51 +01:00
Rémi Verschelde eabf4bbd67 Emscripten: Do not define BINARYEN_TRAP_MODE='clamp'
It is not supported in Emscripten's `latest-upstream` LLVM backend,
and doesn't seem necessary in the `latest` backend either.
It was initially added in #22857 to solve a compilation error with the latter.

Part of #30270.

(cherry picked from commit 63544e6b02)
2019-11-29 16:10:18 +01:00
Rémi Verschelde 6184ccca46 Sync controller mappings DB with SDL2 community repo
Synced with gabomdq/SDL_GameControllerDB@d329cb6a71.

(cherry picked from commit 502a667070)
2019-11-29 16:05:32 +01:00
bruvzg 56f5502402 [macOS] Fix locale detection.
(cherry picked from commit c8bf0ee062)
2019-11-29 16:05:07 +01:00
stoofin 577b6d1196 Fixed bug caused by a copy/paste error in Face3::get_closest_point_to
s * edge0 = -d / a * edge0 = -edge0⋅v0 / (edge0⋅edge0) * edge0 = vector projection of -v0 onto edge0

By incorrectly using -e/c instead of -d/a, Face3::get_closest_point_to was returning the wrong point in certain cases.  Specifically, I noticed it returning vertex[0] when it should have been returning vertex[1].

(cherry picked from commit 8abd64dcbb)
2019-11-29 16:04:41 +01:00
Rémi Verschelde 8a13eac43d 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:02:17 +01:00
Ignacio Etcheverry 1d952f8d69 C#: Throw NullReferenceException for null NodePath/RID params
(cherry picked from commit 008769aee9)
2019-11-29 16:02:02 +01:00
Rémi Verschelde bf204bdc7c 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 15:58:41 +01:00
Hugo Locurcio 3b82f52f7d Add a tooltip to explain what marking a preset as "runnable" does
(cherry picked from commit bc8236bd39)
2019-11-29 15:58:28 +01:00
willnationsdev 4aeb7b41cb Added more in-depth examples of NodePaths in API docs.
(cherry picked from commit db0082534c)
2019-11-29 15:58:27 +01:00
Tomasz Chabora f161f7aa0b Make sure tile is selected when selecting TileMap
(cherry picked from commit f7476359e0)
2019-11-29 15:58:27 +01:00
Zak 7c67b1c9a2 Fix split/rsplit docs
(cherry picked from commit 79aca6b0c0)
2019-11-29 15:58:27 +01:00
JFonS 3436955c2e Fix broken gizmo interaction when Node is scaled
(cherry picked from commit 1f623c5a2b)
2019-11-29 15:58:27 +01:00
Rémi Verschelde 4b855aa88e
Merge pull request #33692 from JoshLee0915/3.1MonoHeadlesBuildFix
Added server platform to mono config script
2019-11-19 09:49:13 +01:00
Rémi Verschelde bfd993b0ca doc: Sync classref with current source 2019-11-12 21:49:04 +01:00
Rémi Verschelde 261b9d12b9 Update AUTHORS list
New contributors added to AUTHORS:
@kawa-yoiko, @m4gr3d, @QbieShay, @RevoluPowered, @rxlecky

(cherry picked from commit 62a09a2ee3)
2019-11-12 15:46:03 +01:00
Rémi Verschelde 7f6e2c5037
Merge pull request #33569 from akien-mga/3.1
Assorted cherry-picks from the master branch for Godot 3.1.2 [4th batch]
2019-11-12 15:45:30 +01:00
Rémi Verschelde 473e3665ff Bump version to 3.1.2-rc 2019-11-12 14:29:41 +01:00
Marcel Admiraal 7e56ef1484 Fix mismatch between RigidBody(2D) and Body(2D)SW can_sleep defaults.
- Set Body2DSW can_sleep default to true.

- Set Body2D can_sleep default to true.

(cherry picked from commit 42a9ae7a82)
2019-11-12 14:28:14 +01:00
Yuri Roubinsky c1cabb0bf5 Prevent shader crash if name of variable overrides function name
(cherry picked from commit 76324bec8d)
2019-11-12 14:28:14 +01:00
Ignacio Etcheverry 8b4eea3d6d Mono: Don't use project settings for debugger agent on exported games
(cherry picked from commit 5ff4e0516b)
2019-11-12 14:28:13 +01:00
Rémi Verschelde c3aefbd1d2 Android: Bump gradle version to 5.1.1
Matching changes made in #31521 and #31547 but only in the Jetbrains
IDE config.

(cherry picked from commit 1afd77e375)
2019-11-12 13:09:36 +01:00
fogine 6a4653f41c iOS>=11 platform - when handling gestures on screen edges, godot apps should have priority over OS
Solves an issue where iOS would steal InputEventTouch events when near
screen edges in order to handle system wide gestures.
Fixes #31503

(cherry picked from commit e0df9de0cb)
2019-11-12 13:09:36 +01:00
Hugo Locurcio 41d0e46f2d Always use lists for `LIBS` in SCons
This closes #31288.

(cherry picked from commit 05daf5c78b)
2019-11-12 13:09:36 +01:00
Cameron Reikes dd83296155 Add particles icon to CPUParticles
(cherry picked from commit 345fcb96a2)
2019-11-12 13:09:36 +01:00
iwek7 9bf2e54ca5 Fixes color picker in code editor - now it only changes one color
(cherry picked from commit e7b07e1e58)
2019-11-12 13:09:36 +01:00
Yuri Roubinski b5d8154d17 Added link to docs for shader editor
(cherry picked from commit 770ce20ea3)
2019-11-12 13:09:35 +01:00
santouits 7ebfb73a4a Hopefully fix the random crashes with threads
(cherry picked from commit 13efc1bb06)
2019-11-12 13:09:35 +01:00
clayjohn 0e76f2cc95 fix contact shadows appearing when shading casting is off
(cherry picked from commit b1839e5e85)
2019-11-12 13:09:35 +01:00
Bojidar Marinov 794bfe8aaa Fix invalid write in AudioStreamSample::save_to_wav
Fixes #29955

(cherry picked from commit ea949ab873)
2019-11-12 13:09:35 +01:00
SonerSound 20822ee87d Fix inconsistent lighting in GLES2
Issue was possibily being caused by duplicating a light even when that
light was not in the render_light_instances array.

(cherry picked from commit 545bf86d39)
2019-11-12 13:09:35 +01:00
Shiqing c9422b9c23 Fix #29478 multiple modals possibly freeze
(cherry picked from commit c16e764bb2)
2019-11-12 13:09:35 +01:00
Bojidar Marinov e17a57d88a Fix some issue with TileMap's and other nodes' boundaries
Fixes #30348
Addresses a small part of #30012

(cherry picked from commit ebf2a4d553)
2019-11-12 13:09:35 +01:00
zwostein 0f0016bb75 Explicitly set a channel map when initialising the Pulseaudio stream.
(cherry picked from commit 9fa2e07588)
2019-11-12 13:09:35 +01:00
santouits 1c8984c433 Free server id pools directly.
When closing the game, we flush the command queue but after we are pushing the freeing calls of the id pool to the
command queue and they are never being run. Now we free them directly.

(cherry picked from commit 7aa4622222)
2019-11-12 13:09:35 +01:00