Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Cherry-picks for the 3.2 branch (future 3.2.4) - 6th batch #43162

Merged
merged 27 commits into from
Oct 28, 2020
Merged

Cherry-picks for the 3.2 branch (future 3.2.4) - 6th batch #43162

merged 27 commits into from
Oct 28, 2020

Conversation

akien-mga
Copy link
Member

No description provided.

YeldhamDev and others added 23 commits October 28, 2020 14:05
@YeldhamDev @akien-mga
Minor improvements to the Polygon 2D UV editor
5c129c7 
(cherry picked from commit c26b49f)
@Calinou @akien-mga
Document how to display the vertex color in SurfaceTool.add_color()
a5f98e9 
This closes godotengine/godot-docs#4083.

(cherry picked from commit 2f1d403)
@Tadaboody @akien-mga
Setting visibility on GridMap now works. Closes godotengine#41374.
3e4816e 
Continuing the work from f43a0ef,
It seems the maps visibility was not actually set and a flase value was propogated to the meshes
Trying to set the maps visibility directly (Using `set_visibility` causes the map to no longer to recieve visibility notifications, instead this approach was chosen

(cherry picked from commit fe52c6b)
@dreamsComeTrue @akien-mga
TextEdit - fix valid bounds in 'set_line'. Fixes godotengine#41967
ba00ced 
(cherry picked from commit 99c8a07)
@gvaneyck @akien-mga
Fix emit_signal timing for GraphEdit's begin/end node move
7735cda 
(cherry picked from commit fbc095d)
@rsubtil @akien-mga
Disable code to add patches menu
a2dcbfe 
(cherry picked from commit 395cb57)
@volzhs @akien-mga
Update freetype to 2.10.4
4e720c0 
(cherry picked from commit 42959d5)
@Xrayez @akien-mga
Cross-reference ColorRect and ReferenceRect in the class reference
bdfa43e 
They use the same underlying `CanvasItem.draw_rect()` API.

(cherry picked from commit 803b046)
@Xrayez @akien-mga
Add border_width to ReferenceRect
921046c 
Exposes a hidden parameter behind `CanvasItem.draw_rect()`.

(cherry picked from commit aef0002)
@KoBeWi @akien-mga
Favor project.binary over project.godot
c2a7df7 
(cherry picked from commit 37d515e)
@Klowner @akien-mga
Fix android apk contents having mtime 1 month in future
5740bd8 
minizip documentation describes tm_mon as expecting the number of months
since January - [0, 11], but the month returned by OS.get_date() is in
the range of [1, 12].

(cherry picked from commit 5fe9022)
@Pleto @akien-mga
Enhancement for tileset sorting
203d637 
(cherry picked from commit 0e392bd)
@rsubtil @akien-mga
Fix wrong exit code being returned
126d08e 
(cherry picked from commit 0d3a168)
@Xrayez @akien-mga
GDNative XR: remove redundant config.py
9aecf04 
It's not an engine module. This is handled by GDNative's
`SCsub` instead, as done for other subdirectories already.

(cherry picked from commit 650ae41)
@DavidSichma @akien-mga
fix toggle mask bit 0
b69f1f1 
(cherry picked from commit 6acd450)
@Calinou @akien-mga
Improve undo log messages in the 2D editor for additional context
94cf0dc 
Undo/redo log messages will now specify the modified node's
name (or number of modified nodes if several were modified).
On top of that, the new position/rotation/scale/pivot offset
will also be mentioned in the message.

(cherry picked from commit 996740d)
@rsubtil @akien-mga
Changed shell_open behaviour
f41cc7d 
(cherry picked from commit 9e57a39)
@timothyqiu @akien-mga
Fixes property revert after saving instanced scene
a973bc9 
(cherry picked from commit a2c1593)
@Xrayez @akien-mga
Make randbase member protected in RandomNumberGenerator
943db2c 
Allows to extend `RandomNumberGenerator` via C++ modules.

(cherry picked from commit 1923f0d)
@DustOneHub @akien-mga
Improved documentation for TileMap.cell_y_sort
a7609d9 
(cherry picked from commit 669f21d)
@timothyqiu @akien-mga
Fixes property revert for inherited child nodes
3f81cd5 
(cherry picked from commit 0dfe28d)
@groud @akien-mga
Fixes setting top_level not updating the global position
638e246 
(cherry picked from commit 131a7b5)
@Calinou @akien-mga
Document hiding a Control when its reference point is behind the camera
7746afe 
See godotengine#1725.

(cherry picked from commit b3a6937)
@akien-mga akien-mga added this to the 3.2 milestone Oct 28, 2020
@akien-mga akien-mga requested review from hpvb and a team as code owners October 28, 2020 13:36
@akien-mga
Copy link
Member Author

The regression test project found a crash from 325b41248efe6890e4495436315825e159789ffb, nice CI!

ERROR: _get_tab_width: Index p_index = 0 is out of bounds (get_tab_count() = 0).
   At: scene/gui/tab_container.cpp:491.
ERROR: get: FATAL: Index p_index = 0 is out of bounds (size() = 0).
   At: ./core/cowdata.h:152.
handle_crash: Program crashed with signal 4
Dumping the backtrace. Please include this when reporting the bug on https://github.com/godotengine/godot/issues
[1] bin/godot.x11.tools.64s() [0x1456f46] (/home/runner/work/godot/godot/platform/x11/crash_handler_x11.cpp:54)
[2] /lib/x86_64-linux-gnu/libc.so.6(+0x46210) [0x7f80b32a0210] (??:0)
[3] CowData<Control*>::get(int) const (/home/runner/work/godot/godot/./core/cowdata.h:152 (discriminator 7))
[4] Vector<Control*>::operator[](int) const (/home/runner/work/godot/godot/./core/vector.h:85)
[5] TabContainer::_draw_tab(Ref<StyleBox>&, Color&, int, float) (/home/runner/work/godot/godot/scene/gui/tab_container.cpp:428)
[6] TabContainer::_notification(int) (/home/runner/work/godot/godot/scene/gui/tab_container.cpp:380)
[7] TabContainer::_notificationv(int, bool) (/home/runner/work/godot/godot/scene/gui/tab_container.h:38 (discriminator 14))
[8] Object::notification(int, bool) (/home/runner/work/godot/godot/core/object.cpp:934)
[9] CanvasItem::_update_callback() (/home/runner/work/godot/godot/scene/2d/canvas_item.cpp:460)
[10] MethodBind0::call(Object*, Variant const**, int, Variant::CallError&) (/home/runner/work/godot/godot/./core/method_bind.gen.inc:61 (discriminator 4))
[11] Object::call(StringName const&, Variant const**, int, Variant::CallError&) (/home/runner/work/godot/godot/core/object.cpp:922 (discriminator 1))
[12] MessageQueue::_call_function(Object*, StringName const&, Variant const*, int, bool) (/home/runner/work/godot/godot/core/message_queue.cpp:250)
[13] MessageQueue::flush() (/home/runner/work/godot/godot/core/message_queue.cpp:299)
[14] SceneTree::iteration(float) (/home/runner/work/godot/godot/scene/main/scene_tree.cpp:484 (discriminator 2))
[15] Main::iteration() (/home/runner/work/godot/godot/main/main.cpp:2086)
[16] OS_X11::run() (/home/runner/work/godot/godot/platform/x11/os_x11.cpp:3396)
[17] bin/godot.x11.tools.64s(main+0x334) [0x144dd3a] (/home/runner/work/godot/godot/platform/x11/godot_x11.cpp:57)
[18] /lib/x86_64-linux-gnu/libc.so.6(__libc_start_main+0xf3) [0x7f80b32810b3] (??:0)
[19] bin/godot.x11.tools.64s(_start+0x2e) [0x144d94e] (??:?)

Poke @volzhs (might simply be that I messed up in my cherry-pick, I'll investigate too).

pouleyKetchoupp and others added 4 commits October 28, 2020 15:09
@pouleyKetchoupp @akien-mga
Release .build_version file handle in Android custom build export
4ccde80 
(cherry picked from commit b271315)
@erictuvesson @akien-mga
fix(sprite2d): Rect is not handling pixel snap
9320266 
related godotengine#42985

(cherry picked from commit e892a92)
@akien-mga
i18n: Sync translations with Weblate
284dae0
@akien-mga
Update AUTHORS and DONORS list
914b0f7 
New corporate sponsors:
  Spiffcode (Platinum)
  ASIFA-Hollywood (Silver)
  Zenva Academy (Silver)

Thanks to all contributors and donors for making Godot possible!

(cherry picked from commit 4960894)
@qarmin qarmin mentioned this pull request Oct 28, 2020
Closed
@akien-mga
Copy link
Member Author

The regression test project found a crash from 325b412, nice CI!

Reverted in that PR.

@akien-mga akien-mga merged commit 0b6d75c into godotengine:3.2 Oct 28, 2020
@qarmin qarmin mentioned this pull request Apr 18, 2021
Merged
@akien-mga akien-mga modified the milestones: 3.2, 3.3 Apr 21, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@BastiaanOlij BastiaanOlij Awaiting requested review from BastiaanOlij

@hpvb hpvb Awaiting requested review from hpvb

Assignees
No one assigned
Labels
bug documentation enhancement topic:core topic:editor
Projects
None yet
Milestone
3.3
Development

Successfully merging this pull request may close these issues.

None yet