karroffel
f302888a47
fix nameclash with MSVC
...
(cherry picked from commit 43ae1c712f
)
2019-07-03 13:23:41 +02:00
Rémi Verschelde
392d988228
Export: Properly reload preset when opening dialog
...
Fixes #20119 where newly installed templates were not detected.
Also fix a bug with preset deletion where it would attempt to
edit an already removed preset. For this I made it so that
ItemList::deselect_all() also resets `current` to -1, as a manual
ItemList::deselect(idx) already does.
(cherry picked from commit 13239cd4cc
)
2019-07-03 13:23:10 +02:00
matthew1006
c68a465f47
Fixed OS.has_feature not using custom feature tags.
...
(cherry picked from commit 25e64ffa20
)
2019-07-03 13:21:56 +02:00
volzhs
fd5dca2689
Fix copying ttf, otf by DND to editor
...
regression from d65ac7378c
(cherry picked from commit 4bb85b70e1
)
2019-07-03 13:09:18 +02:00
Yar-Mukhamedov
47c7bfd678
Fix export templates installation error...
...
(cherry picked from commit bf37bd94b6
)
2019-07-03 13:08:44 +02:00
Overblob
854fc3cb97
Fixed error due to bad cursor handling when parsing shader code
...
Fixed completion error log thrown on "no auto-completion found" for typings with no completion.
(cherry picked from commit 7a74d310aa
)
2019-07-03 13:07:45 +02:00
Ibrahn Sahir
33a93311ec
fix scrollbar icons with atlas texture.
...
Draw scrollbar icons through their textures, rather than calling
directly to the server. Allows atlas textures to manipulate the source
rect as required.
(cherry picked from commit e51a94905d
)
2019-07-03 13:07:12 +02:00
Ibrahn Sahir
b890ed527b
fixed branch on uninit and data race in editor android device polling
...
Initialised relevant variables before stating thread,
to prevent a branch on uninitialised data.
Fixed race condition in polling that could miss a device change.
(cherry picked from commit fe4265ad46
)
2019-07-03 13:06:46 +02:00
karroffel
4b69ed4124
fix wrong loop condition in MultiMesh allocation
...
(cherry picked from commit 3d33da19bd
)
2019-07-03 13:04:56 +02:00
Saracen
493e220ab9
Fix bits_per_pixel validation in BMP and TGA loader modules.
...
(cherry picked from commit 115f6d14a0
)
2019-07-03 13:02:45 +02:00
Juan Linietsky
16e6d6fede
Don't post process on tiny render targets, fixes #19628
...
(cherry picked from commit a78b42c058
)
2019-07-03 13:01:53 +02:00
Josh Taylor
b1bb7e48ca
Changed minimum visible viewport size
...
When the viewport's size.y becomes lower than 2, the storage->frame.current_rt->effects.mip_maps[0].sizes Vector during rendering becomes empty, resulting in crashes in at least GLES3. This is a temporary fix to stop rendering a viewport when its size is below 2 rather than below 1.
(cherry picked from commit 892a4b175a
)
2019-07-03 13:01:02 +02:00
Will Nations
f4db382c50
Fix underline_meta not working in RichTextLabel
...
(cherry picked from commit a9ea06e73a
)
2019-07-03 12:43:24 +02:00
Yasha Borevich
f17983e9cf
Fix memory leak in GDScript during infinnity loops with yields
...
(cherry picked from commit 30317296af
)
2019-07-03 12:42:41 +02:00
matthew1006
dae30964a2
Fixed project settings overrides not using custom feature tags.
...
(cherry picked from commit 1844704c20
)
2019-07-03 12:41:27 +02:00
Duy-Nguyen Ta
f27c989829
bugfix: correct #ifdef for TOUCH_ENABLED and OPENGL_ENABLED
...
(cherry picked from commit 25ad5f8a35
)
2019-07-03 12:40:34 +02:00
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