Merge remote-tracking branch 'upstream/master' into rdrr_master

DONORS.md

@@ -24,10 +24,12 @@ generous deed immortalized in the next stable release of Godot Engine.
     Andreas
     Brandon Lamb
     Christian Uldall Pedersen
+    Christopher Igoe
     Christoph Woinke
     E Hewert
     Hein-Pieter van Braam
     Jamal Alyafei
+    Jay Sistar
     Jordan M Lucas
     Matthieu Huvé
     Nathan Warden
@@ -36,6 +38,7 @@ generous deed immortalized in the next stable release of Godot Engine.
     Ruslan Mustakov
     Slobodan Milnovic
     Stephan Lanfermann
+    Stoney Meyerhoeffer
     Thomas Mathews
 
 ## Gold donors
@@ -50,33 +53,35 @@ generous deed immortalized in the next stable release of Godot Engine.
     Rémi Verschelde
     Zaven Muradyan
 
+    Allen Schade
     Andreas Schüle
     Austen McRae
     Benjamin Botwin
     Bernhard Liebl
-    Cody Brocious
-    Gerald E Butler
-    Jahn Johansen
     Johannes Wuensch
+    Josep G. Camarasa
     Kris Michael
     Libre-Dépanne
     Ranoller
     Svenne Krap
+    Timothy Hagberg
 
     BanjoNode2D
+    Brandon
     Chris Serino
     Conrad Curry
     Craig Smith
     David Churchill
     Dean Harmon
+    Dexter Miguel
+    Garrett Dockins
     Guilherme Felipe de C. G. da Silva
-    Henrique Alves
+    Harman Bains
+    Karsten Bock
     Laurence Bannister
-    Przemysław Gołąb (n-pigeon)
     Robert Willes
     Robin Arys
     ScottMakesGames
-    summerblind
     Testus Maximus
     Thomas Bjarnelöf
     Xavier Tan
@@ -86,25 +91,31 @@ generous deed immortalized in the next stable release of Godot Engine.
     Andreas Haas
     Arnaud Verstuyf
     Chris Brown
+    Chris Wilson
     Cody Parker
     D
     Daniel Eliasinski
-    Daniel Langegger
     Eric Monson
     Ezra Theunissen
     flesk
     François Cantin
-    Giovanni Solimeno
+    GGGames.org
+    Heath Hayes
     Jeppe Zapp
+    Jeremi Biernacki
     joe513
+    Juraj Móza
     Justin Arnold
     Justo Delgado Baudí
     Leandro Voltolino
-    Lucien Boudy
+    Lisandro Lorea
     Markus Wiesner
+    Nick Nikitin
     Pablo Cholaky
+    Paolo Munoz
     Patrick Schnorbus
     Pete Goodwin
+    Rami
     Ryan Estes
     Ted
     Travis Womack
@@ -113,24 +124,31 @@ generous deed immortalized in the next stable release of Godot Engine.
 ## Silver donors
 
     1D_Inc
+    Adam  Carr
     Alder Stefano
     Alessandro Senese
-    Alex Barsukov
     Álvaro Domínguez López
-    Andres Cuevas
+    Andrea Badii
+    Andrew Thomas
     Anthony Bongiovanni
+    Arda Erol
+    Arthur S. Muszynski
     Avencherus
     Bastian Böhm
+    Benedikt
+    Benjamin Beshara
     Ben Vercammen
     Blair Allen
     Bryanna M
     Bryan Stevenson
+    Carwyn Edwards
     Casey Foote
     Christian Baune
     Christian Winter
     Collin Shooltz
     Daniel Egger
     Daniel Kaplan
+    Daniel Langegger
     Daniel Mircea
     David Cravens
     David May
@@ -146,52 +164,57 @@ generous deed immortalized in the next stable release of Godot Engine.
     Gerrit Großkopf
     Gilberto K. Otubo
     Guldoman
-    HardRound
     HeartBeast
     Heribert Hirth
     Hunter Jones
     Jaime Ruiz-Borau Vizárraga
+    Jed Rose
     Jeff Hungerford
-    Jerry Chen
-    Jesse Liles
+    Jonas Yamazaki
+    Jonathan Nieto
     Jonathon
     Josh 'Cheeseness' Bush
     Juan Negrier
+    Judd
     JuDelCo
     Julian Murgia
-    Juraj Móza
-    Karonis
     KC Chan
     Kevin Boyer
     Kevin Kamper Meejach Petersen
     Klavdij Voncina
+    Lars pfeffer
     Linus Lind Lundgren
-    Lisandro Lorea
     magodev
+    Martin Eigel
     Martin Novák
     Matthew Fitzpatrick
     Matthias Hölzl
+    Maurice Meysel
     Max R.R. Collada
     memoryruins
     mhilbrunner
+    Michael Dürwald
     Michael Gringauz
-    Mikael Olsson
     MoM
     monokrome
     Moritz Laass
     nee
     Neil Blakey-Milner
+    Niclas Eriksen
     Nik Lee
     Niko Leopold
+    Noi Sek
     Oleg Tyshchenko
     Pablo Seibelt
     Pan Ip
     Pat LaBine
     Patrick Nafarrete
+    Patric Vormstein
     Paul Mason
     Paweł Kowal
     Pierre-Igor Berthet
     Pietro Vertechi
+    Piotr Kaczmarski
     Richman Stewart
     Rodolfo Baeza
     Roger Burgess
@@ -202,11 +225,12 @@ generous deed immortalized in the next stable release of Godot Engine.
     Sootstone
     Stephen Traskal
     Theo Cranmore
-    Thomas Norman
+    Thomas Bell
+    Thomas Herzog & Xananax
     Tom Larrow
     UltyX
     Wout Standaert
-    Xananax & karroffel
+    Yu He
 
 ## Bronze donors
 

core/os/file_access.cpp

@@ -479,6 +479,9 @@ void FileAccess::store_double(double p_dest) {
 
 uint64_t FileAccess::get_modified_time(const String &p_file) {
 
+	if (PackedData::get_singleton() && !PackedData::get_singleton()->is_disabled() && PackedData::get_singleton()->has_path(p_file))
+		return 0;
+
 	FileAccess *fa = create_for_path(p_file);
 	ERR_FAIL_COND_V(!fa, 0);
 

core/safe_refcount.cpp

@@ -119,8 +119,8 @@ _ALWAYS_INLINE_ uint64_t _atomic_exchange_if_greater_impl(register uint64_t *pw,
 
 // The actual advertised functions; they'll call the right implementation
 
-uint32_t atomic_conditional_increment(register uint32_t *counter) {
-	return _atomic_conditional_increment_impl(counter);
+uint32_t atomic_conditional_increment(register uint32_t *pw) {
+	return _atomic_conditional_increment_impl(pw);
 }
 
 uint32_t atomic_decrement(register uint32_t *pw) {
@@ -143,8 +143,8 @@ uint32_t atomic_exchange_if_greater(register uint32_t *pw, register uint32_t val
 	return _atomic_exchange_if_greater_impl(pw, val);
 }
 
-uint64_t atomic_conditional_increment(register uint64_t *counter) {
-	return _atomic_conditional_increment_impl(counter);
+uint64_t atomic_conditional_increment(register uint64_t *pw) {
+	return _atomic_conditional_increment_impl(pw);
 }
 
 uint64_t atomic_decrement(register uint64_t *pw) {

core/variant_call.cpp

@@ -1539,7 +1539,7 @@ void register_variant_methods() {
 	ADDFUNC0R(VECTOR3, BOOL, Vector3, is_normalized, varray());
 	ADDFUNC0R(VECTOR3, VECTOR3, Vector3, normalized, varray());
 	ADDFUNC0R(VECTOR3, VECTOR3, Vector3, inverse, varray());
-	ADDFUNC1R(VECTOR3, VECTOR3, Vector3, snapped, REAL, "by", varray());
+	ADDFUNC1R(VECTOR3, VECTOR3, Vector3, snapped, VECTOR3, "by", varray());
 	ADDFUNC2R(VECTOR3, VECTOR3, Vector3, rotated, VECTOR3, "axis", REAL, "phi", varray());
 	ADDFUNC2R(VECTOR3, VECTOR3, Vector3, linear_interpolate, VECTOR3, "b", REAL, "t", varray());
 	ADDFUNC4R(VECTOR3, VECTOR3, Vector3, cubic_interpolate, VECTOR3, "b", VECTOR3, "pre_a", VECTOR3, "post_b", REAL, "t", varray());

doc/classes/Control.xml

@@ -8,13 +8,13 @@
 		For more information on Godot's UI system, anchors, margins, and containers, see the related tutorials in the manual. To build flexible UIs, you'll need a mix of UI elements that inherit from [code]Control[/code] and [Container] nodes.
 		[b]User Interface nodes and input[/b]
 		Godot sends input events to the scene's root node first, by calling [method Node._input]. [method Node._input] forwards the event down the node tree to the nodes under the mouse cursor, or on keyboard focus. To do so, it calls [method MainLoop._input_event]. Call [method accept_event] so no other node receives the event. Once you accepted an input, it becomes handled so [method Node._unhandled_input] will not process it.
-		Only one [code]Control[/code] node can be in keyboard focus. Only the node in focus will receive keyboard events. To get the focus, call [method set_focus_mode]. [code]Control[/code] nodes lose focus when another node grabs it, or if you hide the node in focus.
-		Call [method set_ignore_mouse] to tell a [code]Control[/code] node to ignore mouse or touch events. You'll need it if you place an icon on top of a button.
+		Only one [code]Control[/code] node can be in keyboard focus. Only the node in focus will receive keyboard events. To get the focus, call [method grab_focus]. [code]Control[/code] nodes lose focus when another node grabs it, or if you hide the node in focus.
+		Set [member mouse_filter] to MOUSE_FILTER_IGNORE to tell a [code]Control[/code] node to ignore mouse or touch events. You'll need it if you place an icon on top of a button.
 		[Theme] resources change the Control's appearance. If you change the [Theme] on a [code]Control[/code] node, it affects all of its children. To override some of the theme's parameters, call one of the [code]add_*_override[/code] methods, like [method add_font_override]. You can override the theme with the inspector.
 	</description>
 	<tutorials>
 		http://docs.godotengine.org/en/3.0/tutorials/gui/index.html
-	http://docs.godotengine.org/en/3.0/tutorials/2d/custom_drawing_in_2d.html
+		http://docs.godotengine.org/en/3.0/tutorials/2d/custom_drawing_in_2d.html
 	</tutorials>
 	<demos>
 	</demos>

doc/classes/Image.xml

@@ -217,7 +217,7 @@
 			<return type="int" enum="Image.Format">
 			</return>
 			<description>
-				Returns the image's raw data.
+				Returns the image’s format. See [code]FORMAT_*[/code] constants.
 			</description>
 		</method>
 		<method name="get_height" qualifiers="const">

doc/classes/Vector3.xml

@@ -216,7 +216,7 @@
 		<method name="snapped">
 			<return type="Vector3">
 			</return>
-			<argument index="0" name="by" type="float">
+			<argument index="0" name="by" type="Vector3">
 			</argument>
 			<description>
 				Returns a copy of the vector, snapped to the lowest neared multiple.

drivers/windows/file_access_windows.cpp

@@ -148,6 +148,9 @@ void FileAccessWindows::close() {
 		}
 
 		save_path = "";
+		if (rename_error) {
+			ERR_EXPLAIN("Safe save failed. This may be a permissions problem, but also may happen because you are running a paranoid antivirus. If this is the case, please switch to Windows Defender or disable the 'safe save' option in editor settings. This makes it work, but increases the risk of file corruption in a crash.");
+		}
 		ERR_FAIL_COND(rename_error);
 	}
 }

editor/editor_file_dialog.cpp

@@ -458,6 +458,23 @@ void EditorFileDialog::_item_selected(int p_item) {
 	get_ok()->set_disabled(_is_open_should_be_disabled());
 }
 
+void EditorFileDialog::_multi_selected(int p_item, bool p_selected) {
+
+	int current = p_item;
+	if (current < 0 || current >= item_list->get_item_count())
+		return;
+
+	Dictionary d = item_list->get_item_metadata(current);
+
+	if (!d["dir"] && p_selected) {
+
+		file->set_text(d["name"]);
+		_request_single_thumbnail(get_current_dir().plus_file(get_current_file()));
+	}
+
+	get_ok()->set_disabled(_is_open_should_be_disabled());
+}
+
 void EditorFileDialog::_items_clear_selection() {
 
 	item_list->unselect_all();
@@ -1290,6 +1307,7 @@ void EditorFileDialog::_bind_methods() {
 	ClassDB::bind_method(D_METHOD("_unhandled_input"), &EditorFileDialog::_unhandled_input);
 
 	ClassDB::bind_method(D_METHOD("_item_selected"), &EditorFileDialog::_item_selected);
+	ClassDB::bind_method(D_METHOD("_multi_selected"), &EditorFileDialog::_multi_selected);
 	ClassDB::bind_method(D_METHOD("_items_clear_selection"), &EditorFileDialog::_items_clear_selection);
 	ClassDB::bind_method(D_METHOD("_item_list_item_rmb_selected"), &EditorFileDialog::_item_list_item_rmb_selected);
 	ClassDB::bind_method(D_METHOD("_item_list_rmb_clicked"), &EditorFileDialog::_item_list_rmb_clicked);
@@ -1598,6 +1616,7 @@ EditorFileDialog::EditorFileDialog() {
 
 	connect("confirmed", this, "_action_pressed");
 	item_list->connect("item_selected", this, "_item_selected", varray(), CONNECT_DEFERRED);
+	item_list->connect("multi_selected", this, "_multi_selected", varray(), CONNECT_DEFERRED);
 	item_list->connect("item_activated", this, "_item_db_selected", varray());
 	item_list->connect("nothing_selected", this, "_items_clear_selection");
 	dir->connect("text_entered", this, "_dir_entered");

editor/editor_file_dialog.h

@@ -159,6 +159,7 @@ class EditorFileDialog : public ConfirmationDialog {
 	void _recent_selected(int p_idx);
 
 	void _item_selected(int p_item);
+	void _multi_selected(int p_item, bool p_selected);
 	void _items_clear_selection();
 	void _item_dc_selected(int p_item);
 

editor/editor_settings.h

@@ -145,7 +145,7 @@ class EditorSettings : public Resource {
 	bool has_setting(const String &p_setting) const;
 	void erase(const String &p_setting);
 	void raise_order(const String &p_setting);
-	void set_initial_value(const StringName &p_setting, const Variant &p_value, bool update_current = false);
+	void set_initial_value(const StringName &p_setting, const Variant &p_value, bool p_update_current = false);
 	void set_manually(const StringName &p_setting, const Variant &p_value, bool p_emit_signal = false) {
 		if (p_emit_signal)
 			_set(p_setting, p_value);

editor/editor_sub_scene.cpp

@@ -121,10 +121,10 @@ void EditorSubScene::_item_multi_selected(Object *p_object, int p_cell, bool p_s
 	}
 }
 
-void EditorSubScene::_remove_selection_child(Node *n) {
-	if (n->get_child_count() > 0) {
-		for (int i = 0; i < n->get_child_count(); i++) {
-			Node *c = n->get_child(i);
+void EditorSubScene::_remove_selection_child(Node *p_node) {
+	if (p_node->get_child_count() > 0) {
+		for (int i = 0; i < p_node->get_child_count(); i++) {
+			Node *c = p_node->get_child(i);
 			List<Node *>::Element *E = selection.find(c);
 			if (E) {
 				selection.move_to_back(E);

editor/editor_sub_scene.h

@@ -50,7 +50,7 @@ class EditorSubScene : public ConfirmationDialog {
 	void _fill_tree(Node *p_node, TreeItem *p_parent);
 	void _selected_changed();
 	void _item_multi_selected(Object *p_object, int p_cell, bool p_selected);
-	void _remove_selection_child(Node *c);
+	void _remove_selection_child(Node *p_node);
 	void _reown(Node *p_node, List<Node *> *p_to_reown);
 
 	void ok_pressed();