Commit Graph

13506 Commits

Author SHA1 Message Date
bruvzg 042a74a696 [macOS] Allow using user provided `.icns` files for exported app icons.
(cherry picked from commit 22ee26849e)
2019-07-03 12:33:25 +02:00
bruvzg 56a82b473e Fix macOS icon export (add 1024px PNG icon and 32px/16px RLE icons).
(cherry picked from commit 56b26c4369)
2019-07-03 12:33:25 +02:00
Marcelo Fernandez deef878f6f Add missing NULL checks for add_child_below_node
(cherry picked from commit 8c1c7ff131)
2019-07-03 12:33:25 +02:00
Marcelo Fernandez fab378abf5 Fix profiler not updating on realtime
(cherry picked from commit 34045051d2)
2019-07-03 12:33:25 +02:00
Rémi Verschelde a41f7579c8 Fix property hint for ReflectionProbe extents
(cherry picked from commit 2fabb81318)
2019-07-03 12:33:25 +02:00
Emmanuel Leblond 3808544891 [Pluginscript] Fix not working exports in editor
(cherry picked from commit 380b85a32f)
2019-07-03 12:33:25 +02:00
Rémi Verschelde 69f08cd2cc Fix shortcuts using KEY_MASK_CTRL instead of KEY_MASK_CMD
KEY_MASK_CMD is automatically replaced by KEY_MASK_CTRL on non-OSX
and KEY_MASK_META (Command key) on OSX, so it should be used for all
Ctrl/Cmd + key shortcuts.

Also de-hacked the macOS shortcut replacements with proper conditional
definition. Not tested on macOS, cannot judge if they are good shortcuts.

Fixes #10761.

(cherry picked from commit 3f09cac267)
2019-07-03 12:33:25 +02:00
Oliver Rausch 2107517f2f Fix return type of isnan and isinf in the shader language
(cherry picked from commit 2368b31e1e)
2019-07-03 12:33:25 +02:00
Fabian 82e54db588 Fix for not picking up locale of some .po translation files
(cherry picked from commit 1065f06eef)
2019-07-03 12:33:25 +02:00
Webster Sheets 793a205ae1 Revert #14753, as it is buggy and no longer necessary.
(cherry picked from commit 1198662b2b)
2019-07-03 12:33:25 +02:00
George Marques a5a9d887da Fix positive operator in GDScript compiler
(cherry picked from commit 3cec24baa8)
2019-07-03 12:33:25 +02:00
volzhs 12458ebe8c Fix updating mesh when reimporting
(cherry picked from commit 9d5e1228ea)
2019-07-03 12:33:25 +02:00
Chaosus 367bec2010 Fix bug in CubeMesh
(cherry picked from commit b3fccc5778)
2019-07-03 12:33:24 +02:00
Marcelo Fernandez f85b2a62f7 Fix missing return on Navigation2D::get_closest_point_owner
(cherry picked from commit b9023715e2)
2019-07-03 12:33:24 +02:00
nemerle 13a90fdd89 Fix PoolAllocator::resize for too large p_new_size
The code had a subtle signed/unsigned bug -
```cpp
if( signed - unsigned < 0)
// signed - unsigned is unsigned in c++, so
if( unsigned < 0)
// and thus the if block will never be executed
```

Thus all the following code would be ran, including unnecessary retries
of compacting the pool.

(cherry picked from commit 2bbe6144ff)
2019-07-03 12:33:24 +02:00
Bojidar Marinov 761bfb156d Fix a corner-case bug in _copy_texscreen in the gles3 renderer
Fixes #17698

(cherry picked from commit ee52d12921)
2019-07-03 12:33:24 +02:00
Webster Sheets 46f091bfcb AtlasTexture fixes, part 2.
(cherry picked from commit c522fe05e0)
2019-07-03 12:33:24 +02:00
Webster Sheets d1c93a0af3 Fix AtlasTexture usage in Sprite3D.
Changes as requested in b484d5c.

(cherry picked from commit 4b545e3105)
2019-07-03 12:33:24 +02:00
Peter Folkins 9d006730ad Fix script editor CTRL+CLICK on singleton functions
(cherry picked from commit 0c1a71b047)
2019-07-03 12:33:24 +02:00
Robin Hübner e867befd46 Fix delay in rename_error windows save loop, should be 100msec, not 1sec
(cherry picked from commit caa887f317)
2019-07-03 12:27:24 +02:00
Brian Richardson fdbef334bb Camera::project_local_ray_normal needs to be virtual so that ARVRCamera::project_local_ray_normal gets called.
(cherry picked from commit 680a5cbb0b)
2019-07-03 12:27:24 +02:00
Rémi Verschelde dfb839ebce Fix Node2D::global_scale's PropertyInfo type
Was missed in #18391.

(cherry picked from commit 8852ca1455)
2019-07-03 12:27:24 +02:00
Ruslan Mustakov 6c9bddef53 Fix Node2D::global_position to have Vector2 type
(cherry picked from commit 8619b0d280)
2019-07-03 12:27:24 +02:00
Michael cc8e1e93c3 Fixed 2D intersect_shape limiting broadphase results
Physics2DDirectSpaceStateSW was applying the result limit to broadphase
collision detection instead of narrow. This is inconsistent with its 3D
variant, as well as the rest of the 2D direct space state functions.

Broadphase is now limited by INTERSECTION_QUERY_MAX like everything else,
and narrow phase is exited early when the result limit has been reached.

(cherry picked from commit 1ba106a71e)
2019-07-03 12:27:24 +02:00
sheepandshepherd 3fcdb3198b Fix NativeScript property list
(cherry picked from commit bc110b3771)
2019-07-03 12:27:24 +02:00
Markus Ewald 3d5c5c28d5 Implement VisualServerScene::instance_set_extra_visibility_margin() method to actually apply extra culling margin and mark instance AABB dirty
(cherry picked from commit fc166f3ee1)
2019-07-03 12:27:24 +02:00
Bernhard Liebl ac1520325c Catch NSException in macOS run loop to prevent crashs
(cherry picked from commit 3ff18ee61e)
2019-07-03 12:27:23 +02:00
Marcelo Fernandez 5a89810238 Fix missing const in CapsuleShapeSW::get_area
(cherry picked from commit 9042ef3836)
2019-07-03 12:27:23 +02:00
Thomas Karcher b977e8ab0c Update of RigidBody2D class description
Added a hint in the RigidBody2D class description regarding the transformation issue mentioned in https://github.com/godotengine/godot/issues/5734

(cherry picked from commit 1170b78e28)
2019-07-03 11:07:05 +02:00
lopho 2ccca78929 Document CollisionObject2D pickable requires collision_layer
Documents CollisionObject2D mouse_entered, mouse_exited and input_event requiring at least one collision_layer to be set.

(cherry picked from commit da73bcca6f)
2019-07-03 11:06:30 +02:00
Jiří Procházka 768f5fd1ac Small documentation improvements
(cherry picked from commit 04b49264f2)
2019-07-03 11:05:23 +02:00
clayjohn 3066616e1a changed references to array types in arraymesh doc
(cherry picked from commit e8858a9a44)
2019-07-03 11:04:55 +02:00
Soham Kar 197ea38552 Fixed copy&paste error #28117
Changed "left to right" in VSplitContainer to "top to bottom".

(cherry picked from commit aa8b2f4448)
2019-07-03 11:03:44 +02:00
Rémi Verschelde 67a72a2759 doc: Add note about VisibilityNotifier.is_on_screen after instantiation
Fixes #9430.

(cherry picked from commit 3fc1f7dfbe)
2019-07-03 11:03:17 +02:00
Ignacio Etcheverry 64a7a6b2f4 Mono: Buildsystem support for finding MSBuild from VS2019
(cherry picked from commit e82b2def8e)
2019-07-03 11:02:10 +02:00
Sebastian Hartte adb9815199 Add support for new MSBuild directory naming introduced in VS 2019.
(cherry picked from commit 7440295ad1)
2019-07-03 11:01:35 +02:00
Poommetee Ketson 3daca13f72 Fix error explanation in core_bind Thread::_start_func
(cherry picked from commit 2caaa7c97d)
2019-07-03 10:59:11 +02:00
Jared 68148b16d3 Documented set_point_cloud() for ConvexPolygonShape2D
(cherry picked from commit 1d238c1835)
2019-07-03 10:56:30 +02:00
Rémi Verschelde 1fae776445 Fix GeometryInstance extra_cull_margin step
Fixes #22369.

(cherry picked from commit d4c75e608e)
2019-07-03 10:53:46 +02:00
Bernhard M. Wiedemann 413f4db585 BuildSystem: Fix font list
We want to add the individual strings to the list
and not add a list object to the list.

Without this patch, sorting failed because "str < list"
is not a valid operation in python.

(cherry picked from commit f312582326)
2019-07-03 10:48:19 +02:00
Rémi Verschelde c85d2d7420 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:46:13 +02:00
Rémi Verschelde e284ea344d 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 3.0, also building by default against bundled openssl.
2019-07-02 15:00:59 +02:00
Rémi Verschelde 315abb0513 Update sponsors
Image Campus is no longer a Gold sponsor at this time.

(cherry picked from commit 328805ae31)
2019-06-04 12:58:34 +02:00
Rémi Verschelde cae8e9fa8e openssl: Update to pristine 1.0.2s (security update) 2019-06-04 12:21:32 +02:00
Rémi Verschelde 069c4908c8 tinyexr: Sync with upstream 65f9859
(cherry picked from commit 9ce6588466)
2019-06-04 11:28:36 +02:00
Rémi Verschelde 2e18a4acdf TinyEXR: Sync with upstream master branch
Fixes #24247.

(cherry picked from commit 9105538b45)
2019-06-04 11:27:11 +02:00
elasota 0921e68913 Fix tiled EXR crash, update tinyexr to head to fix corrupted uncompressed EXR loading
(cherry picked from commit 4b7885fb1e)
2019-06-04 11:26:10 +02:00
Rémi Verschelde c9fdaa412a nanosvg: Sync with upstream c1f6e20
(cherry picked from commit 43d6774dcc)
2019-06-04 11:25:29 +02:00
Jari Ronkainen bed09c2af6 Do not use deprecated stuff that only glibc now implements
(cherry picked from commit 687b95b41f)
2019-06-04 11:23:26 +02:00
volzhs b9e0da98bb Update minizip to 1.2.11
(cherry picked from commit 7e563f75b5)
2019-06-04 11:17:01 +02:00