diff options
| -rw-r--r-- | AUTHORS.md | 4 | ||||
| -rw-r--r-- | DONORS.md | 46 | ||||
| -rw-r--r-- | editor/editor_autoload_settings.cpp | 4 | ||||
| -rw-r--r-- | scene/gui/text_edit.cpp | 6 | ||||
| -rw-r--r-- | scene/resources/primitive_meshes.cpp | 42 |
5 files changed, 55 insertions, 47 deletions
diff --git a/AUTHORS.md b/AUTHORS.md index 67563298f2..12494a487d 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -38,6 +38,7 @@ name is available. Ariel Manzur (punto-) Bastiaan Olij (BastiaanOlij) Ben Brookshire (sheepandshepherd) + Benjamin (Nallebeorn) Bernard Liebl (poke1024) Bojidar Marinov (bojidar-bg) Błażej Szczygieł (zaps166) @@ -61,6 +62,7 @@ name is available. Hubert Jarosz (Marqin) Hugo Locurcio (Calinou) Ian Bishop (ianb96) + Ibrahn Sahir (ibrahn) Ignacio Etcheverry (neikeq) Indah Sylvia (ISylvox) J08nY @@ -71,6 +73,7 @@ name is available. Juan Linietsky (reduz) Julian Murgia (StraToN) Justo Delgado (mrcdk) + Kelly Thomas (KellyThomas) Kostadin Damyanov (Max-Might) Leon Krause (eska014) Marc Gilleron (Zylann) @@ -85,6 +88,7 @@ name is available. Nathan Warden (NathanWarden) Nuno Donato (nunodonato) Ovnuniarchos + Pascal Richter (ShyRed) Patrick (firefly2442) Paul Batty (Paulb23) Paul Joannon (paulloz) @@ -22,7 +22,6 @@ generous deed immortalized in the next stable release of Godot Engine. ## Mini sponsors - Andreas Brandon Lamb Christian Uldall Pedersen Christopher Igoe @@ -44,6 +43,7 @@ generous deed immortalized in the next stable release of Godot Engine. Stephan Lanfermann Stoney Meyerhoeffer Thomas Mathews + VilliHaukka ## Gold donors @@ -51,11 +51,11 @@ generous deed immortalized in the next stable release of Godot Engine. Alexander Otto Asdf cheese65536 - Jake Bo + K9Kraken Kris Michael Manuele Finocchiaro + Nathanael Beisiegel Officine Pixel S.n.c. - Rémi Verschelde Zaven Muradyan Allen Schade @@ -64,7 +64,7 @@ generous deed immortalized in the next stable release of Godot Engine. Bernhard Liebl Catalin Moldovan DeepSquid - Duane Johnson + Fidget Sinner Florian Breisch Gary Oberbrunner Johannes Wuensch @@ -72,6 +72,7 @@ generous deed immortalized in the next stable release of Godot Engine. Joshua Lesperance Libre-Dépanne Matthew Bennett + Olafur Gislason Paul LaMotte Ranoller Svenne Krap @@ -82,20 +83,21 @@ generous deed immortalized in the next stable release of Godot Engine. Chris Serino Conrad Curry Craig Smith + Daniel Egger David Churchill Dean Harmon Dexter Miguel - Garrett Dockins Guilherme Felipe de C. G. da Silva John Justo Delgado Baudí + KTL Laurence Bannister Rami Robert Willes Robin Arys + Ronnie Ashlock Rufus Xavier Sarsaparilla ScottMakesGames - Testus Maximus Thomas Bjarnelöf William Connell Wojciech Chojnacki @@ -109,21 +111,20 @@ generous deed immortalized in the next stable release of Godot Engine. Chris Petrich Chris Wilson Cody Parker + Corey Auger D Daniel Eliasinski E.G. Eric Monson flesk - François Cantin G Barnes GGGames.org Giovanni Solimeno Hasen Judy Heath Hayes + Jay Horton Jeppe Zapp - Jeremi Biernacki joe513 - John O'Mahoney Jordan M Lucas Juraj Móza Justin Arnold @@ -137,10 +138,11 @@ generous deed immortalized in the next stable release of Godot Engine. Patrick Schnorbus Pete Goodwin Phyronnaz - SeokHui Lee - Simon De Greve + Ruben Soares Luis Sofox + Stoned Xander Ted + Tim Dalporto Trent McPheron Vladimir @@ -158,6 +160,7 @@ generous deed immortalized in the next stable release of Godot Engine. Arthur S. Muszynski Aubrey Falconer Avencherus + Bailey Bastian Böhm Benedikt Benjamin Beshara @@ -172,7 +175,8 @@ generous deed immortalized in the next stable release of Godot Engine. Christian Winter Christopher Schmitt Collin Shooltz - Daniel Egger + Daniel Delgado Corona + Daniel Johnson Daniel Kaplan DanielMaximiano Daniel Mircea @@ -180,18 +184,18 @@ generous deed immortalized in the next stable release of Godot Engine. David Cravens David May Dominik Wetzel + Duy Kevin Nguyen Edward Herbert Eric Martini Fabian Becker fengjiongmax Francesco Lisi - Frédéric Alix G3Dev sàrl - Geequlim Gerrit Großkopf Gerrit Procee Gilberto K. Otubo Guldoman + Gumichan01 Heribert Hirth hubert jenkins Hunter Jones @@ -211,7 +215,6 @@ generous deed immortalized in the next stable release of Godot Engine. Josh 'Cheeseness' Bush Juan Negrier Judd - JuDelCo Julian Murgia Justin Luk KC Chan @@ -221,26 +224,26 @@ generous deed immortalized in the next stable release of Godot Engine. Krzysztof Jankowski Lars pfeffer Linus Lind Lundgren + Luis Moraes Macil magodev Martin Eigel + Martins Odabi Matthew Fitzpatrick - Matthias Hölzl Max R.R. Collada - memoryruins + Maxwell mhilbrunner Michael Dürwald Michael Gringauz Michael Labbe Mikael Olsson MoM - monokrome Moritz Laass + Natrim nee Neil Blakey-Milner Nick Pavlica Niclas Eriksen - Nicolás Montaña Nicolas SAN AGUSTIN Niko Leopold nivardus @@ -257,6 +260,8 @@ generous deed immortalized in the next stable release of Godot Engine. Pierre-Igor Berthet Pietro Vertechi Piotr Kaczmarski + Rea + Rémi Verschelde Richman Stewart Roger Burgess Roger Smith @@ -264,12 +269,11 @@ generous deed immortalized in the next stable release of Godot Engine. Ryan Whited Samuel El-Borai Sasori Olkof - Scott D. Yelich Sootstone + Stefan Butucea Theo Cranmore Thibault Barbaroux Thomas Bell - Thomas Herzog & Xananax Thomas Kurz Tomasz Wacławek Tom Larrow diff --git a/editor/editor_autoload_settings.cpp b/editor/editor_autoload_settings.cpp index de9203232c..5b6594d233 100644 --- a/editor/editor_autoload_settings.cpp +++ b/editor/editor_autoload_settings.cpp @@ -610,8 +610,8 @@ void EditorAutoloadSettings::drop_data_fw(const Point2 &p_point, const Variant & i = 0; for (List<AutoLoadInfo>::Element *E = autoload_cache.front(); E; E = E->next()) { - undo_redo->add_do_method(ProjectSettings::get_singleton(), "set_order", E->get().name, orders[i++]); - undo_redo->add_undo_method(ProjectSettings::get_singleton(), "set_order", E->get().name, E->get().order); + undo_redo->add_do_method(ProjectSettings::get_singleton(), "set_order", "autoload/" + E->get().name, orders[i++]); + undo_redo->add_undo_method(ProjectSettings::get_singleton(), "set_order", "autoload/" + E->get().name, E->get().order); } orders.clear(); diff --git a/scene/gui/text_edit.cpp b/scene/gui/text_edit.cpp index 55a650ff12..1c6ac50b1c 100644 --- a/scene/gui/text_edit.cpp +++ b/scene/gui/text_edit.cpp @@ -447,7 +447,7 @@ void TextEdit::_click_selection_held() { } void TextEdit::_update_selection_mode_pointer() { - Point2 mp = Input::get_singleton()->get_mouse_position() - get_global_position(); + Point2 mp = get_local_mouse_position(); int row, col; _get_mouse_pos(Point2i(mp.x, mp.y), row, col); @@ -462,7 +462,7 @@ void TextEdit::_update_selection_mode_pointer() { } void TextEdit::_update_selection_mode_word() { - Point2 mp = Input::get_singleton()->get_mouse_position() - get_global_position(); + Point2 mp = get_local_mouse_position(); int row, col; _get_mouse_pos(Point2i(mp.x, mp.y), row, col); @@ -515,7 +515,7 @@ void TextEdit::_update_selection_mode_word() { } void TextEdit::_update_selection_mode_line() { - Point2 mp = Input::get_singleton()->get_mouse_position() - get_global_position(); + Point2 mp = get_local_mouse_position(); int row, col; _get_mouse_pos(Point2i(mp.x, mp.y), row, col); diff --git a/scene/resources/primitive_meshes.cpp b/scene/resources/primitive_meshes.cpp index 5b600623b9..50673d0818 100644 --- a/scene/resources/primitive_meshes.cpp +++ b/scene/resources/primitive_meshes.cpp @@ -419,10 +419,10 @@ void CapsuleMesh::_bind_methods() { ClassDB::bind_method(D_METHOD("set_rings", "rings"), &CapsuleMesh::set_rings); ClassDB::bind_method(D_METHOD("get_rings"), &CapsuleMesh::get_rings); - ADD_PROPERTY(PropertyInfo(Variant::REAL, "radius", PROPERTY_HINT_RANGE, "0.001,100.0,0.001"), "set_radius", "get_radius"); - ADD_PROPERTY(PropertyInfo(Variant::REAL, "mid_height", PROPERTY_HINT_RANGE, "0.001,100.0,0.001"), "set_mid_height", "get_mid_height"); - ADD_PROPERTY(PropertyInfo(Variant::INT, "radial_segments", PROPERTY_HINT_RANGE, "1,100,1"), "set_radial_segments", "get_radial_segments"); - ADD_PROPERTY(PropertyInfo(Variant::INT, "rings", PROPERTY_HINT_RANGE, "1,100,1"), "set_rings", "get_rings"); + ADD_PROPERTY(PropertyInfo(Variant::REAL, "radius", PROPERTY_HINT_RANGE, "0.001,100.0,0.001,or_greater"), "set_radius", "get_radius"); + ADD_PROPERTY(PropertyInfo(Variant::REAL, "mid_height", PROPERTY_HINT_RANGE, "0.001,100.0,0.001,or_greater"), "set_mid_height", "get_mid_height"); + ADD_PROPERTY(PropertyInfo(Variant::INT, "radial_segments", PROPERTY_HINT_RANGE, "1,100,1,or_greater"), "set_radial_segments", "get_radial_segments"); + ADD_PROPERTY(PropertyInfo(Variant::INT, "rings", PROPERTY_HINT_RANGE, "1,100,1,or_greater"), "set_rings", "get_rings"); } void CapsuleMesh::set_radius(const float p_radius) { @@ -677,9 +677,9 @@ void CubeMesh::_bind_methods() { ClassDB::bind_method(D_METHOD("get_subdivide_depth"), &CubeMesh::get_subdivide_depth); ADD_PROPERTY(PropertyInfo(Variant::VECTOR3, "size"), "set_size", "get_size"); - ADD_PROPERTY(PropertyInfo(Variant::INT, "subdivide_width", PROPERTY_HINT_RANGE, "0,100,1"), "set_subdivide_width", "get_subdivide_width"); - ADD_PROPERTY(PropertyInfo(Variant::INT, "subdivide_height", PROPERTY_HINT_RANGE, "0,100,1"), "set_subdivide_height", "get_subdivide_height"); - ADD_PROPERTY(PropertyInfo(Variant::INT, "subdivide_depth", PROPERTY_HINT_RANGE, "0,100,1"), "set_subdivide_depth", "get_subdivide_depth"); + ADD_PROPERTY(PropertyInfo(Variant::INT, "subdivide_width", PROPERTY_HINT_RANGE, "0,100,1,or_greater"), "set_subdivide_width", "get_subdivide_width"); + ADD_PROPERTY(PropertyInfo(Variant::INT, "subdivide_height", PROPERTY_HINT_RANGE, "0,100,1,or_greater"), "set_subdivide_height", "get_subdivide_height"); + ADD_PROPERTY(PropertyInfo(Variant::INT, "subdivide_depth", PROPERTY_HINT_RANGE, "0,100,1,or_greater"), "set_subdivide_depth", "get_subdivide_depth"); } void CubeMesh::set_size(const Vector3 &p_size) { @@ -881,11 +881,11 @@ void CylinderMesh::_bind_methods() { ClassDB::bind_method(D_METHOD("set_rings", "rings"), &CylinderMesh::set_rings); ClassDB::bind_method(D_METHOD("get_rings"), &CylinderMesh::get_rings); - ADD_PROPERTY(PropertyInfo(Variant::REAL, "top_radius", PROPERTY_HINT_RANGE, "0.001,100.0,0.001"), "set_top_radius", "get_top_radius"); - ADD_PROPERTY(PropertyInfo(Variant::REAL, "bottom_radius", PROPERTY_HINT_RANGE, "0.001,100.0,0.001"), "set_bottom_radius", "get_bottom_radius"); - ADD_PROPERTY(PropertyInfo(Variant::REAL, "height", PROPERTY_HINT_RANGE, "0.001,100.0,0.001"), "set_height", "get_height"); - ADD_PROPERTY(PropertyInfo(Variant::INT, "radial_segments", PROPERTY_HINT_RANGE, "1,100,1"), "set_radial_segments", "get_radial_segments"); - ADD_PROPERTY(PropertyInfo(Variant::INT, "rings", PROPERTY_HINT_RANGE, "1,100,1"), "set_rings", "get_rings"); + ADD_PROPERTY(PropertyInfo(Variant::REAL, "top_radius", PROPERTY_HINT_RANGE, "0.001,100.0,0.001,or_greater"), "set_top_radius", "get_top_radius"); + ADD_PROPERTY(PropertyInfo(Variant::REAL, "bottom_radius", PROPERTY_HINT_RANGE, "0.001,100.0,0.001,or_greater"), "set_bottom_radius", "get_bottom_radius"); + ADD_PROPERTY(PropertyInfo(Variant::REAL, "height", PROPERTY_HINT_RANGE, "0.001,100.0,0.001,or_greater"), "set_height", "get_height"); + ADD_PROPERTY(PropertyInfo(Variant::INT, "radial_segments", PROPERTY_HINT_RANGE, "1,100,1,or_greater"), "set_radial_segments", "get_radial_segments"); + ADD_PROPERTY(PropertyInfo(Variant::INT, "rings", PROPERTY_HINT_RANGE, "1,100,1,or_greater"), "set_rings", "get_rings"); } void CylinderMesh::set_top_radius(const float p_radius) { @@ -1017,8 +1017,8 @@ void PlaneMesh::_bind_methods() { ClassDB::bind_method(D_METHOD("get_subdivide_depth"), &PlaneMesh::get_subdivide_depth); ADD_PROPERTY(PropertyInfo(Variant::VECTOR2, "size"), "set_size", "get_size"); - ADD_PROPERTY(PropertyInfo(Variant::INT, "subdivide_width", PROPERTY_HINT_RANGE, "0,100,1"), "set_subdivide_width", "get_subdivide_width"); - ADD_PROPERTY(PropertyInfo(Variant::INT, "subdivide_depth", PROPERTY_HINT_RANGE, "0,100,1"), "set_subdivide_depth", "get_subdivide_depth"); + ADD_PROPERTY(PropertyInfo(Variant::INT, "subdivide_width", PROPERTY_HINT_RANGE, "0,100,1,or_greater"), "set_subdivide_width", "get_subdivide_width"); + ADD_PROPERTY(PropertyInfo(Variant::INT, "subdivide_depth", PROPERTY_HINT_RANGE, "0,100,1,or_greater"), "set_subdivide_depth", "get_subdivide_depth"); } void PlaneMesh::set_size(const Size2 &p_size) { @@ -1283,9 +1283,9 @@ void PrismMesh::_bind_methods() { ADD_PROPERTY(PropertyInfo(Variant::REAL, "left_to_right", PROPERTY_HINT_RANGE, "-2.0,2.0,0.1"), "set_left_to_right", "get_left_to_right"); ADD_PROPERTY(PropertyInfo(Variant::VECTOR2, "size"), "set_size", "get_size"); - ADD_PROPERTY(PropertyInfo(Variant::INT, "subdivide_width", PROPERTY_HINT_RANGE, "0,100,1"), "set_subdivide_width", "get_subdivide_width"); - ADD_PROPERTY(PropertyInfo(Variant::INT, "subdivide_height", PROPERTY_HINT_RANGE, "0,100,1"), "set_subdivide_height", "get_subdivide_height"); - ADD_PROPERTY(PropertyInfo(Variant::INT, "subdivide_depth", PROPERTY_HINT_RANGE, "0,100,1"), "set_subdivide_depth", "get_subdivide_depth"); + ADD_PROPERTY(PropertyInfo(Variant::INT, "subdivide_width", PROPERTY_HINT_RANGE, "0,100,1,or_greater"), "set_subdivide_width", "get_subdivide_width"); + ADD_PROPERTY(PropertyInfo(Variant::INT, "subdivide_height", PROPERTY_HINT_RANGE, "0,100,1,or_greater"), "set_subdivide_height", "get_subdivide_height"); + ADD_PROPERTY(PropertyInfo(Variant::INT, "subdivide_depth", PROPERTY_HINT_RANGE, "0,100,1,or_greater"), "set_subdivide_depth", "get_subdivide_depth"); } void PrismMesh::set_left_to_right(const float p_left_to_right) { @@ -1499,10 +1499,10 @@ void SphereMesh::_bind_methods() { ClassDB::bind_method(D_METHOD("set_is_hemisphere", "is_hemisphere"), &SphereMesh::set_is_hemisphere); ClassDB::bind_method(D_METHOD("get_is_hemisphere"), &SphereMesh::get_is_hemisphere); - ADD_PROPERTY(PropertyInfo(Variant::REAL, "radius", PROPERTY_HINT_RANGE, "0.001,100.0,0.001"), "set_radius", "get_radius"); - ADD_PROPERTY(PropertyInfo(Variant::REAL, "height", PROPERTY_HINT_RANGE, "0.001,100.0,0.001"), "set_height", "get_height"); - ADD_PROPERTY(PropertyInfo(Variant::INT, "radial_segments", PROPERTY_HINT_RANGE, "1,100,1"), "set_radial_segments", "get_radial_segments"); - ADD_PROPERTY(PropertyInfo(Variant::INT, "rings", PROPERTY_HINT_RANGE, "1,100,1"), "set_rings", "get_rings"); + ADD_PROPERTY(PropertyInfo(Variant::REAL, "radius", PROPERTY_HINT_RANGE, "0.001,100.0,0.001,or_greater"), "set_radius", "get_radius"); + ADD_PROPERTY(PropertyInfo(Variant::REAL, "height", PROPERTY_HINT_RANGE, "0.001,100.0,0.001,or_greater"), "set_height", "get_height"); + ADD_PROPERTY(PropertyInfo(Variant::INT, "radial_segments", PROPERTY_HINT_RANGE, "1,100,1,or_greater"), "set_radial_segments", "get_radial_segments"); + ADD_PROPERTY(PropertyInfo(Variant::INT, "rings", PROPERTY_HINT_RANGE, "1,100,1,or_greater"), "set_rings", "get_rings"); ADD_PROPERTY(PropertyInfo(Variant::BOOL, "is_hemisphere"), "set_is_hemisphere", "get_is_hemisphere"); } |