diff options
| -rw-r--r-- | AUTHORS.md | 2 | ||||
| -rw-r--r-- | DONORS.md | 92 | ||||
| -rw-r--r-- | core/bind/core_bind.cpp | 14 | ||||
| -rw-r--r-- | core/bind/core_bind.h | 15 | ||||
| -rw-r--r-- | editor/plugins/visual_shader_editor_plugin.cpp | 4 | ||||
| -rw-r--r-- | modules/assimp/editor_scene_importer_assimp.cpp | 2 |
6 files changed, 88 insertions, 41 deletions
diff --git a/AUTHORS.md b/AUTHORS.md index b7eca2d9b1..99482fb4df 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -45,6 +45,7 @@ name is available. Błażej Szczygieł (zaps166) Bojidar Marinov (bojidar-bg) bruvzg + Camille Mohr-Daurat (pouleyKetchoupp) Carl Olsson (not-surt) Carter Anderson (cart) Chris Bradfield (cbscribe) @@ -115,6 +116,7 @@ name is available. Pieter-Jan Briers (PJB3005) Poommetee Ketson (Noshyaar) Przemysław Gołąb (n-pigeon) + Rafał Mikrut (qarmin) Ralf Hölzemer (rollenrolm) Ramesh Ravone (RameshRavone) Ray Koopa (RayKoopa) @@ -18,22 +18,21 @@ generous deed immortalized in the next stable release of Godot Engine. Gamblify <https://www.gamblify.com> Image Campus <https://www.imagecampus.edu.ar> - Yakaz.com <https://yakaz.com> ## Mini sponsors Alan Beauchamp Anandarup Mallik Andrew Dunai - Arda Erol Brandon Lamb Christian Uldall Pedersen Christoph Woinke + Connor Hill Edward Flick GameDev.net GameDev.tv Hein-Pieter van Braam - Jamal Alyafei + Jacob McKenney Javary Games Jay Sistar Justin Arnold @@ -43,22 +42,18 @@ generous deed immortalized in the next stable release of Godot Engine. Matthieu Huvé Maxim Karsten Mike King - Nathan Warden Neal Gompa (Conan Kudo) Patrick Aarstad "Rainway " - Ruslan Mustakov Slobodan Milnovic StarFlare Software Stephan Lanfermann - Stoney Meyerhoeffer - thechris + TigerJ VilliHaukka Zashi ## Gold donors - Asdf Brandon Waite cheese65536 David Gehrig @@ -69,8 +64,10 @@ generous deed immortalized in the next stable release of Godot Engine. Nathanael Beisiegel Officine Pixel S.n.c. Retro Village + Sofox Zaven Muradyan + Alexander Trey Saunders Allen Schade Andreas Schüle Asher Glick @@ -80,7 +77,6 @@ generous deed immortalized in the next stable release of Godot Engine. David Giardi Edward E Florian Breisch - Gary Oberbrunner Gero Jay Horton Jon Smith @@ -88,6 +84,8 @@ generous deed immortalized in the next stable release of Godot Engine. Jorge Bernal Joshua Lesperance Justo Delgado Baudí + Karl Werf + Kommentgames Krzysztof Dluzniewski Moonwards Mored1984 @@ -95,6 +93,7 @@ generous deed immortalized in the next stable release of Godot Engine. paul gruenbacher Paul LaMotte Rob Messick + Ross Esmond Scott Wadden Sergey Svenne Krap @@ -103,19 +102,20 @@ generous deed immortalized in the next stable release of Godot Engine. Wyatt Goodin Xananax - BanjoNode2D - Beliar + Abel Oroz Vicente Chris Serino Christian Padilla Conrad Curry Craig Smith Daniel Egger Dean Harmon + Ian Richard Kunert Ivan Trombley Joan Fons Krzysztof Jankowski Lord Bloodhound Lucas Ferreira Franca + Michele Zilli Nathan Lundquist Pascal Grüter Petr Malac @@ -125,27 +125,34 @@ generous deed immortalized in the next stable release of Godot Engine. Ronnie Ashlock ScottMakesGames Thomas Bjarnelöf + Vincent Henderson Wojciech Chojnacki Xavier PATRICELLI Alessandra Pereyra Alexey Dyadchenko Andrew Bowen + Asdf Benjamin W Flint Chau Siu Hung Chris Goddard Chris Petrich Christian Leth Jeppesen + Christoph Schröder Cody Parker ComicSads D + Daniel + Daniel Eichler Deadly Lampshade + Eagle 3d E.G. Eric Eric Monson Ethan Bennis Eugenio Hugo Salgüero Jáñez flesk + Francisco Javier Moreno Carracedo gavlig GGGames.org Giles Montgomery @@ -153,21 +160,24 @@ generous deed immortalized in the next stable release of Godot Engine. Guilherme Felipe de C. G. da Silva Heath Hayes Hysteria - Jalal Chaabane - Jeppe Zapp Jose Malheiro + Joshua Flores Juan T Chen Juraj Móza Kasper Jeppesen Klavdij Voncina Leandro Voltolino - Lukáš Rendvanský + Maarten Elings + Malcolm Peralty Marius Kamm + Markus Fehr Markus Wiesner Martin Eigel Marvin Matt Eunson + Matthew Hillier Max R.R. Collada + MegaC Nick Nikitin Oliver Dick oziatek @@ -175,39 +185,45 @@ generous deed immortalized in the next stable release of Godot Engine. Paul Von Zimmerman Pete Goodwin Ranoller - ray-tracer - Ruben Soares Luis Samuel Judd - Sofox + Scott Pilet spilldata Stoned Xander + Thomas Krampl Tobias Bocanegra + Urho WytRabbit Xavier Fumado Beltran + yuanzhe zhou ## Silver donors 1D_Inc + Abraham Haskins Adam Brunnmeier Adam Carr Adam Nakonieczny Adam Smeltzer Adisibio + Aidan O'Flannagain Alder Stefano Alessandro Senese Alexander Gillberg Alexander Koppe + Alex Davies-Moore Alice Robinson + Andreas Evers Andreas Krampitz Anthony Bongiovanni - Arbor Interactive + Arda Erol Arthur S. Muszynski Aubrey Falconer Avencherus - Bailey Balázs Batári Bastian Böhm + Beliar Benedikt + Ben Phelan Ben Vercammen Bernd Jänichen Blair Allen @@ -221,14 +237,17 @@ generous deed immortalized in the next stable release of Godot Engine. Christian Baune Christian Winter Christoffer Sundbom + Christopher Fisher Chris Wilson + Clay Heaton Collin Shooltz - Connor Hill Daniel Johnson DanielMaximiano Daniel Reed + David Bullock David Cravens David May + Diliup Gabadamudalige Dominik Wetzel Duobix Edward Herbert @@ -238,20 +257,24 @@ generous deed immortalized in the next stable release of Godot Engine. Eric Martini Eric McCarthy Eric Williams - Fabian Becker + Fabian Lökes fengjiongmax Foomf G3Dev sàrl + Gary Hulst Gerrit Großkopf Grant Clarke Greg Olson + Greg Pennefather Guldoman - Haley Aycock Heribert Hirth Hiroshi Naruo + HMan Hunter Jones ialex32x Igor Buzatovic + Iiari + Isaac Morton Jaime Ruiz-Borau Vizárraga Jako Danar James A F Manley @@ -259,6 +282,7 @@ generous deed immortalized in the next stable release of Godot Engine. Jeremy Kahn Jesse Dubay Joel Fivat + Joel Setterberg Johannes Wuensch Jonas Rudlang Jonas Yamazaki @@ -267,14 +291,16 @@ generous deed immortalized in the next stable release of Godot Engine. Jonathon Jon Bonazza Jon Sully + Jose Aleman Josh 'Cheeseness' Bush Juanfran Juan Negrier Judd Julian Murgia + Julius Hackel Kajornthep Piyanun KC Chan - Kevin Boyer + kickmaniac Kiyohiro Kawamura (kyorohiro) Klagsam KR McGinley @@ -289,10 +315,13 @@ generous deed immortalized in the next stable release of Godot Engine. Major Haul Malcolm Markus Michael Egger + Martin Holas + Matthew Little Matthias Grandis Matt Welke Maxwell medecau + Menno Finlay-Smits Mertcan Mermerkaya mhilbrunner Michael Dürwald @@ -300,17 +329,19 @@ generous deed immortalized in the next stable release of Godot Engine. Michael Labbe Mikael Olsson Mikayla Hutchinson + Mike Cunningham MoM Moritz Laass Moritz Weissenberger + MuffinManKen Natrim nee Neil Blakey-Milner Nerdforge - Nick Pavlica Niclas Eriksen Nicolás Montaña Nicolas SAN AGUSTIN + Nithin Jino Oscar Norlander Pan Ip Patrick Nafarrete @@ -321,20 +352,29 @@ generous deed immortalized in the next stable release of Godot Engine. Pierre-Igor Berthet Pietro Vertechi Piotr Kaczmarski + Pitsanu Tongprasin + Poryg Prokhorenko Leonid Psyagnostic Rafael + Raphael Leroux Rémi Verschelde + Reneator Ricardo Alcantara Richman Stewart + Rob Crowle Robert Farr (Larington) + Robert Hernandez + Rodrigo Loli Roger Burgess Roger Smith Roland Rząsa Roman Tinkov Ryan Cheung + Ryan Groom Ryan Hentz Sasori Olkof + Scott D. Yelich Sebastian Michailidis Shane Spoor Simon Wenner @@ -348,6 +388,7 @@ generous deed immortalized in the next stable release of Godot Engine. tiansheng li Tim Tim Drumheller + Tim Gudex Tom Larrow Torsten Crass Tryggve Sollid @@ -355,10 +396,13 @@ generous deed immortalized in the next stable release of Godot Engine. UltyX Vaiktorg Victor + Vigilant Watch Viktor Ferenczi waka nya Wayne Haak werner mendizabal + Wiley Thompson + Will William Gervasio William Hogben Wout Standaert diff --git a/core/bind/core_bind.cpp b/core/bind/core_bind.cpp index 67de156fc3..98d3e77f66 100644 --- a/core/bind/core_bind.cpp +++ b/core/bind/core_bind.cpp @@ -148,7 +148,7 @@ _ResourceLoader::_ResourceLoader() { singleton = this; } -Error _ResourceSaver::save(const String &p_path, const RES &p_resource, uint32_t p_flags) { +Error _ResourceSaver::save(const String &p_path, const RES &p_resource, SaverFlags p_flags) { ERR_FAIL_COND_V(p_resource.is_null(), ERR_INVALID_PARAMETER); return ResourceSaver::save(p_path, p_resource, p_flags); @@ -1579,7 +1579,7 @@ _Geometry::_Geometry() { ///////////////////////// FILE -Error _File::open_encrypted(const String &p_path, int p_mode_flags, const Vector<uint8_t> &p_key) { +Error _File::open_encrypted(const String &p_path, ModeFlags p_mode_flags, const Vector<uint8_t> &p_key) { Error err = open(p_path, p_mode_flags); if (err) @@ -1596,7 +1596,7 @@ Error _File::open_encrypted(const String &p_path, int p_mode_flags, const Vector return OK; } -Error _File::open_encrypted_pass(const String &p_path, int p_mode_flags, const String &p_pass) { +Error _File::open_encrypted_pass(const String &p_path, ModeFlags p_mode_flags, const String &p_pass) { Error err = open(p_path, p_mode_flags); if (err) @@ -1614,7 +1614,7 @@ Error _File::open_encrypted_pass(const String &p_path, int p_mode_flags, const S return OK; } -Error _File::open_compressed(const String &p_path, int p_mode_flags, int p_compress_mode) { +Error _File::open_compressed(const String &p_path, ModeFlags p_mode_flags, CompressionMode p_compress_mode) { FileAccessCompressed *fac = memnew(FileAccessCompressed); @@ -1631,7 +1631,7 @@ Error _File::open_compressed(const String &p_path, int p_mode_flags, int p_compr return OK; } -Error _File::open(const String &p_path, int p_mode_flags) { +Error _File::open(const String &p_path, ModeFlags p_mode_flags) { close(); Error err; @@ -2453,12 +2453,12 @@ void _Thread::_start_func(void *ud) { } } -Error _Thread::start(Object *p_instance, const StringName &p_method, const Variant &p_userdata, int p_priority) { +Error _Thread::start(Object *p_instance, const StringName &p_method, const Variant &p_userdata, Priority p_priority) { ERR_FAIL_COND_V(active, ERR_ALREADY_IN_USE); ERR_FAIL_COND_V(!p_instance, ERR_INVALID_PARAMETER); ERR_FAIL_COND_V(p_method == StringName(), ERR_INVALID_PARAMETER); - ERR_FAIL_INDEX_V(p_priority, 3, ERR_INVALID_PARAMETER); + ERR_FAIL_INDEX_V(p_priority, PRIORITY_MAX, ERR_INVALID_PARAMETER); ret = Variant(); target_method = p_method; diff --git a/core/bind/core_bind.h b/core/bind/core_bind.h index 1c26d9b144..2906de4a4a 100644 --- a/core/bind/core_bind.h +++ b/core/bind/core_bind.h @@ -85,7 +85,7 @@ public: static _ResourceSaver *get_singleton() { return singleton; } - Error save(const String &p_path, const RES &p_resource, uint32_t p_flags); + Error save(const String &p_path, const RES &p_resource, SaverFlags p_flags); PoolVector<String> get_recognized_extensions(const RES &p_resource); _ResourceSaver(); @@ -436,11 +436,11 @@ public: COMPRESSION_GZIP = Compression::MODE_GZIP }; - Error open_encrypted(const String &p_path, int p_mode_flags, const Vector<uint8_t> &p_key); - Error open_encrypted_pass(const String &p_path, int p_mode_flags, const String &p_pass); - Error open_compressed(const String &p_path, int p_mode_flags, int p_compress_mode = 0); + Error open_encrypted(const String &p_path, ModeFlags p_mode_flags, const Vector<uint8_t> &p_key); + Error open_encrypted_pass(const String &p_path, ModeFlags p_mode_flags, const String &p_pass); + Error open_compressed(const String &p_path, ModeFlags p_mode_flags, CompressionMode p_compress_mode = COMPRESSION_FASTLZ); - Error open(const String &p_path, int p_mode_flags); ///< open a file + Error open(const String &p_path, ModeFlags p_mode_flags); ///< open a file void close(); ///< close a file bool is_open() const; ///< true when file is open @@ -632,10 +632,11 @@ public: PRIORITY_LOW, PRIORITY_NORMAL, - PRIORITY_HIGH + PRIORITY_HIGH, + PRIORITY_MAX }; - Error start(Object *p_instance, const StringName &p_method, const Variant &p_userdata = Variant(), int p_priority = PRIORITY_NORMAL); + Error start(Object *p_instance, const StringName &p_method, const Variant &p_userdata = Variant(), Priority p_priority = PRIORITY_NORMAL); String get_id() const; bool is_active() const; Variant wait_to_finish(); diff --git a/editor/plugins/visual_shader_editor_plugin.cpp b/editor/plugins/visual_shader_editor_plugin.cpp index d1c647b24d..f71ff84bbe 100644 --- a/editor/plugins/visual_shader_editor_plugin.cpp +++ b/editor/plugins/visual_shader_editor_plugin.cpp @@ -1496,12 +1496,12 @@ VisualShaderEditor::VisualShaderEditor() { add_options.push_back(AddOption("Clamp", "Vector", "Functions", "VisualShaderNodeVectorClamp", TTR("Constrains a value to lie between two further values."), -1, VisualShaderNode::PORT_TYPE_VECTOR)); add_options.push_back(AddOption("Cos", "Vector", "Functions", "VisualShaderNodeVectorFunc", TTR("Returns the cosine of the parameter."), VisualShaderNodeVectorFunc::FUNC_COS, VisualShaderNode::PORT_TYPE_VECTOR)); add_options.push_back(AddOption("CosH", "Vector", "Functions", "VisualShaderNodeVectorFunc", TTR("(GLES3 only) Returns the hyperbolic cosine of the parameter."), VisualShaderNodeVectorFunc::FUNC_COSH, VisualShaderNode::PORT_TYPE_VECTOR)); + add_options.push_back(AddOption("Cross", "Vector", "Functions", "VisualShaderNodeVectorOp", TTR("Calculates the cross product of two vectors."), VisualShaderNodeVectorOp::OP_CROSS, VisualShaderNode::PORT_TYPE_VECTOR)); add_options.push_back(AddOption("Degrees", "Vector", "Functions", "VisualShaderNodeVectorFunc", TTR("Converts a quantity in radians to degrees."), VisualShaderNodeVectorFunc::FUNC_DEGREES, VisualShaderNode::PORT_TYPE_VECTOR)); add_options.push_back(AddOption("Distance", "Vector", "Functions", "VisualShaderNodeVectorDistance", TTR("Returns the distance between two points."), -1, VisualShaderNode::PORT_TYPE_SCALAR)); + add_options.push_back(AddOption("Dot", "Vector", "Functions", "VisualShaderNodeDotProduct", TTR("Calculates the dot product of two vectors."), -1, VisualShaderNode::PORT_TYPE_SCALAR)); add_options.push_back(AddOption("Exp", "Vector", "Functions", "VisualShaderNodeVectorFunc", TTR("Base-e Exponential."), VisualShaderNodeVectorFunc::FUNC_EXP, VisualShaderNode::PORT_TYPE_VECTOR)); add_options.push_back(AddOption("Exp2", "Vector", "Functions", "VisualShaderNodeVectorFunc", TTR("Base-2 Exponential."), VisualShaderNodeVectorFunc::FUNC_EXP2, VisualShaderNode::PORT_TYPE_VECTOR)); - add_options.push_back(AddOption("Cross", "Vector", "Functions", "VisualShaderNodeVectorOp", TTR("Calculates the cross product of two vectors."), VisualShaderNodeVectorOp::OP_CROSS, VisualShaderNode::PORT_TYPE_VECTOR)); - add_options.push_back(AddOption("Dot", "Vector", "Functions", "VisualShaderNodeDotProduct", TTR("Calculates the dot product of two vectors."), -1, VisualShaderNode::PORT_TYPE_SCALAR)); add_options.push_back(AddOption("FaceForward", "Vector", "Functions", "VisualShaderNodeFaceForward", TTR("Returns a vector that points in the same direction as a reference vector. The function has three vector parameters : N, the vector to orient, I, the incident vector, and Nref, the reference vector. If the dot product of I and Nref is smaller than zero the return value is N. Otherwise -N is returned."), -1, VisualShaderNode::PORT_TYPE_VECTOR)); add_options.push_back(AddOption("Floor", "Vector", "Functions", "VisualShaderNodeVectorFunc", TTR("Finds the nearest integer less than or equal to the parameter."), VisualShaderNodeVectorFunc::FUNC_FLOOR, VisualShaderNode::PORT_TYPE_VECTOR)); add_options.push_back(AddOption("Fract", "Vector", "Functions", "VisualShaderNodeVectorFunc", TTR("Computes the fractional part of the argument."), VisualShaderNodeVectorFunc::FUNC_FRAC, VisualShaderNode::PORT_TYPE_VECTOR)); diff --git a/modules/assimp/editor_scene_importer_assimp.cpp b/modules/assimp/editor_scene_importer_assimp.cpp index 4662cf9d0a..ee66097ffd 100644 --- a/modules/assimp/editor_scene_importer_assimp.cpp +++ b/modules/assimp/editor_scene_importer_assimp.cpp @@ -1945,7 +1945,7 @@ void EditorSceneImporterAssimp::_add_mesh_to_mesh_instance(const aiNode *p_node, morphs[j] = array_copy; } - r_name_morph_mesh_names.insert(_ai_raw_string_to_string(p_node->mName), morph_mesh_idx_names); + r_name_morph_mesh_names.insert(_ai_string_to_string(p_node->mName), morph_mesh_idx_names); mesh->add_surface_from_arrays(primitive, array_mesh, morphs); mesh->surface_set_material(i, mat); mesh->surface_set_name(i, _ai_string_to_string(ai_mesh->mName)); |