diff options
196 files changed, 11772 insertions, 3329 deletions
diff --git a/.gitignore b/.gitignore index 2ede830bcf..537ed7d32a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,30 +1,31 @@ # Godot auto generated files -platform/server/logo.h -platform/android/logo.h -platform/bb10/logo.h -platform/iphone/logo.h -platform/javascript/logo.h -platform/osx/logo.h -platform/windows/logo.h -platform/x11/logo.h -drivers/gles2/shaders/*.h -drivers/gles3/shaders/*.h -modules/register_module_types.cpp -core/version.h -core/method_bind.inc +core/global_defaults.cpp core/method_bind_ext.inc +core/method_bind.inc core/script_encryption_key.cpp -core/global_defaults.cpp +core/version_generated.h +drivers/gles2/shaders/*.h +drivers/gles3/shaders/*.h drivers/unix/os_unix_global_settings_path.cpp -editor/register_exporters.cpp -editor/doc_data_compressed.h +editor/builtin_fonts.h editor/certs_compressed.h +editor/doc_data_compressed.h editor/editor_icons.cpp +editor/register_exporters.cpp editor/translations.h -editor/builtin_fonts.h -.fscache -make.bat log.txt +main/app_icon.h +main/splash.h +make.bat +modules/register_module_types.cpp +platform/android/logo.h +platform/bb10/logo.h +platform/iphone/logo.h +platform/javascript/logo.h +platform/osx/logo.h +platform/server/logo.h +platform/windows/logo.h +platform/x11/logo.h # Documentation generated by doxygen or from classes.xml doc/_build/ diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 21ce52d6e3..23ab874a2e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -90,7 +90,7 @@ The Godot Engine community has [many communication channels](https://godotengine To communicate with developers (e.g. to discuss a feature you want to implement or a bug you want to fix), the following channels can be used: - [GitHub issues](https://github.com/godotengine/godot/issues): If there is an existing issue about a topic you want to discuss, just add a comment to it - all developers watch the repository and will get an email notification. You can also create a new issue - please keep in mind to create issues only to discuss quite specific points about the development, and not general user feedback or support requests. -- [#godotengine-devel IRC channel on Freenode](http://webchat.freenode.net/?channels=godotengine-devel): You will find most core developers there, so it's the go-to channel for direct chat about Godot Engine development. Feel free to start discussing something there to get some early feedback before writing up a detailed proposal in a GitHub issue. +- [#godotengine-devel IRC channel on Freenode](https://webchat.freenode.net/?channels=godotengine-devel): You will find most core developers there, so it's the go-to channel for direct chat about Godot Engine development. Feel free to start discussing something there to get some early feedback before writing up a detailed proposal in a GitHub issue. - [devel@godotengine.org mailing list](https://listengine.tuxfamily.org/godotengine.org/devel/): Mailing list for Godot developers, used primarily to announce developer meetings on IRC and other important discussions that need to reach people directly in their mailbox. See the [index page](https://listengine.tuxfamily.org/godotengine.org/devel/) for subscription instructions. Thanks! diff --git a/core/bind/core_bind.cpp b/core/bind/core_bind.cpp index 7523d30e18..bd41e48a30 100644 --- a/core/bind/core_bind.cpp +++ b/core/bind/core_bind.cpp @@ -163,9 +163,9 @@ _ResourceSaver::_ResourceSaver() { /////////////////OS -Point2 _OS::get_mouse_pos() const { +Point2 _OS::get_mouse_position() const { - return OS::get_singleton()->get_mouse_pos(); + return OS::get_singleton()->get_mouse_position(); } void _OS::set_window_title(const String &p_title) { @@ -954,7 +954,7 @@ _OS *_OS::singleton = NULL; void _OS::_bind_methods() { - //ClassDB::bind_method(D_METHOD("get_mouse_pos"),&_OS::get_mouse_pos); + //ClassDB::bind_method(D_METHOD("get_mouse_position"),&_OS::get_mouse_position); //ClassDB::bind_method(D_METHOD("is_mouse_grab_enabled"),&_OS::is_mouse_grab_enabled); ClassDB::bind_method(D_METHOD("set_clipboard", "clipboard"), &_OS::set_clipboard); diff --git a/core/bind/core_bind.h b/core/bind/core_bind.h index ab27296b27..222339bce1 100644 --- a/core/bind/core_bind.h +++ b/core/bind/core_bind.h @@ -120,7 +120,7 @@ public: MONTH_DECEMBER }; - Point2 get_mouse_pos() const; + Point2 get_mouse_position() const; void set_window_title(const String &p_title); int get_mouse_button_state() const; diff --git a/core/class_db.cpp b/core/class_db.cpp index 94a907a1f0..0ca982303d 100644 --- a/core/class_db.cpp +++ b/core/class_db.cpp @@ -30,6 +30,7 @@ #include "class_db.h" #include "os/mutex.h" +#include "version.h" #ifdef NO_THREADS diff --git a/core/global_config.cpp b/core/global_config.cpp index d37c67c84a..f9a0877c23 100644 --- a/core/global_config.cpp +++ b/core/global_config.cpp @@ -53,6 +53,11 @@ String GlobalConfig::get_resource_path() const { return resource_path; }; +String GlobalConfig::get_project_file_name() const { + + return project_file_name; +} + String GlobalConfig::localize_path(const String &p_path) const { if (resource_path == "") @@ -236,13 +241,43 @@ bool GlobalConfig::_load_resource_pack(const String &p_pack) { return true; } +static String _find_project_file(DirAccess *p_diraccess, bool p_res = false) { + p_diraccess->list_dir_begin(); + String ret = ""; + while (true) { + bool isdir; + String file = p_diraccess->get_next(&isdir); + if (file == "") + break; + + if (!isdir) { + if (file.get_extension() == "godot") { + + if (p_res) { + ret = "res://" + file; + } else { + ret = p_diraccess->get_current_dir() + "/" + file; + } + } + } + } + p_diraccess->list_dir_end(); + return ret; +} + +static String _find_project_file() { + DirAccess *dir = DirAccess::create(DirAccess::ACCESS_RESOURCES); + String ret = _find_project_file(dir, true); + memdelete(dir); + return ret; +} + Error GlobalConfig::setup(const String &p_path, const String &p_main_pack) { //If looking for files in network, just use network! - if (FileAccessNetworkClient::get_singleton()) { - - if (_load_settings("res://godot.cfg") == OK || _load_settings_binary("res://godot.cfb") == OK) { + String gdproj = _find_project_file(); + if (_load_settings(gdproj) == OK || _load_settings_binary("res://godot.cfb") == OK) { _load_settings("res://override.cfg"); } @@ -258,8 +293,8 @@ Error GlobalConfig::setup(const String &p_path, const String &p_main_pack) { bool ok = _load_resource_pack(p_main_pack); ERR_FAIL_COND_V(!ok, ERR_CANT_OPEN); - - if (_load_settings("res://godot.cfg") == OK || _load_settings_binary("res://godot.cfb") == OK) { + String gdproj = _find_project_file(); + if (_load_settings(gdproj) == OK || _load_settings_binary("res://godot.cfb") == OK) { //load override from location of the main pack _load_settings(p_main_pack.get_base_dir().plus_file("override.cfg")); } @@ -272,7 +307,8 @@ Error GlobalConfig::setup(const String &p_path, const String &p_main_pack) { if (_load_resource_pack(exec_path.get_basename() + ".pck")) { - if (_load_settings("res://godot.cfg") == OK || _load_settings_binary("res://godot.cfb") == OK) { + String gdproj = _find_project_file(); + if (_load_settings(gdproj) == OK || _load_settings_binary("res://godot.cfb") == OK) { //load override from location of executable _load_settings(exec_path.get_base_dir().plus_file("override.cfg")); } @@ -292,15 +328,15 @@ Error GlobalConfig::setup(const String &p_path, const String &p_main_pack) { // data.pck and data.zip are deprecated and no longer supported, apologies. // make sure this is loaded from the resource path - - if (_load_settings("res://godot.cfg") == OK || _load_settings_binary("res://godot.cfb") == OK) { + String gdproj = _find_project_file(); + if (_load_settings(gdproj) == OK || _load_settings_binary("res://godot.cfb") == OK) { _load_settings("res://override.cfg"); } return OK; } - //Nothing was found, try to find a godot.cfg somewhere! + //Nothing was found, try to find a *.godot somewhere! DirAccess *d = DirAccess::create(DirAccess::ACCESS_FILESYSTEM); ERR_FAIL_COND_V(!d, ERR_CANT_CREATE); @@ -313,8 +349,8 @@ Error GlobalConfig::setup(const String &p_path, const String &p_main_pack) { while (true) { //try to load settings in ascending through dirs shape! - - if (_load_settings(current_dir + "/godot.cfg") == OK || _load_settings_binary(current_dir + "/godot.cfb") == OK) { + String gdproj = _find_project_file(d); + if (_load_settings(gdproj) == OK || _load_settings_binary(current_dir + "/godot.cfb") == OK) { _load_settings(current_dir + "/override.cfg"); candidate = current_dir; @@ -428,6 +464,7 @@ Error GlobalConfig::_load_settings(const String p_path) { err = VariantParser::parse_tag_assign_eof(&stream, lines, error_text, next_tag, assign, value, NULL, true); if (err == ERR_FILE_EOF) { memdelete(f); + project_file_name = p_path.get_file(); return OK; } else if (err != OK) { ERR_PRINTS("GlobalConfig::load - " + p_path + ":" + itos(lines) + " error: " + error_text); @@ -449,6 +486,7 @@ Error GlobalConfig::_load_settings(const String p_path) { } } + project_file_name = p_path.get_file(); memdelete(f); return OK; @@ -474,7 +512,12 @@ void GlobalConfig::clear(const String &p_name) { Error GlobalConfig::save() { - return save_custom(get_resource_path() + "/godot.cfg"); + if (project_file_name.empty()) { + String name = ((String)get("application/name")).replace(" ", "_"); + return save_custom(get_resource_path() + "/" + name + ".godot"); + } else { + return save_custom(get_resource_path() + "/" + project_file_name); + } } Error GlobalConfig::_save_settings_binary(const String &p_file, const Map<String, List<String> > &props, const CustomMap &p_custom) { @@ -483,7 +526,7 @@ Error GlobalConfig::_save_settings_binary(const String &p_file, const Map<String FileAccess *file = FileAccess::open(p_file, FileAccess::WRITE, &err); if (err != OK) { - ERR_EXPLAIN("Coudln't save godot.cfb at " + p_file); + ERR_EXPLAIN("Couldn't save godot.cfb at " + p_file); ERR_FAIL_COND_V(err, err) } @@ -548,7 +591,7 @@ Error GlobalConfig::_save_settings_text(const String &p_file, const Map<String, FileAccess *file = FileAccess::open(p_file, FileAccess::WRITE, &err); if (err) { - ERR_EXPLAIN("Coudln't save godot.cfg - " + p_file); + ERR_EXPLAIN("Couldn't save project file - " + p_file); ERR_FAIL_COND_V(err, err) } @@ -658,7 +701,7 @@ Error GlobalConfig::save_custom(const String &p_path, const CustomMap &p_custom, props[category].push_back(name); } - if (p_path.ends_with(".cfg")) + if (p_path.ends_with(".godot")) return _save_settings_text(p_path, props, p_custom); else if (p_path.ends_with(".cfb")) return _save_settings_binary(p_path, props, p_custom); @@ -828,6 +871,7 @@ void GlobalConfig::_bind_methods() { ClassDB::bind_method(D_METHOD("clear", "name"), &GlobalConfig::clear); ClassDB::bind_method(D_METHOD("localize_path", "path"), &GlobalConfig::localize_path); ClassDB::bind_method(D_METHOD("globalize_path", "path"), &GlobalConfig::globalize_path); + ClassDB::bind_method(D_METHOD("get_project_file_name"), &GlobalConfig::get_project_file_name); ClassDB::bind_method(D_METHOD("save"), &GlobalConfig::save); ClassDB::bind_method(D_METHOD("has_singleton", "name"), &GlobalConfig::has_singleton); ClassDB::bind_method(D_METHOD("get_singleton", "name"), &GlobalConfig::get_singleton_object); diff --git a/core/global_config.h b/core/global_config.h index d0f64dc23c..5148c4377e 100644 --- a/core/global_config.h +++ b/core/global_config.h @@ -111,6 +111,8 @@ protected: void _add_property_info_bind(const Dictionary &p_info); + String project_file_name; + protected: static void _bind_methods(); @@ -124,6 +126,7 @@ public: Variant property_get_revert(const String &p_name); String get_resource_path() const; + String get_project_file_name() const; static GlobalConfig *get_singleton(); diff --git a/core/hashfuncs.h b/core/hashfuncs.h index fbd2e161b3..8392984565 100644 --- a/core/hashfuncs.h +++ b/core/hashfuncs.h @@ -81,24 +81,6 @@ static inline uint32_t hash_one_uint64(const uint64_t p_int) { return (int)v; } -static inline uint32_t hash_djb2_one_float(float p_in, uint32_t p_prev = 5381) { - union { - float f; - uint32_t i; - } u; - - // Normalize +/- 0.0 and NaN values so they hash the same. - if (p_in == 0.0f) - u.f = 0.0; - else if (Math::is_nan(p_in)) - u.f = Math_NAN; - else - u.f = p_in; - - return ((p_prev << 5) + p_prev) + u.i; -} - -// Overload for real_t size changes static inline uint32_t hash_djb2_one_float(double p_in, uint32_t p_prev = 5381) { union { double d; diff --git a/core/io/marshalls.cpp b/core/io/marshalls.cpp index 3889c8f3ae..5e66b7f7f5 100644 --- a/core/io/marshalls.cpp +++ b/core/io/marshalls.cpp @@ -862,7 +862,7 @@ Error encode_variant(const Variant &p_variant, uint8_t *r_buffer, int &r_len) { } else { if (buf) { - encode_double(p_variant.operator float(), buf); + encode_float(p_variant.operator float(), buf); } r_len += 4; diff --git a/core/io/resource_loader.cpp b/core/io/resource_loader.cpp index 3b43492bc5..234d71cb68 100644 --- a/core/io/resource_loader.cpp +++ b/core/io/resource_loader.cpp @@ -179,10 +179,10 @@ RES ResourceLoader::load(const String &p_path, const String &p_type_hint, bool p print_line("load resource: " + local_path); bool found = false; + // Try all loaders and pick the first match for the type hint for (int i = 0; i < loader_count; i++) { if (!loader[i]->recognize_path(local_path, p_type_hint)) { - print_line("path not recognized"); continue; } found = true; diff --git a/core/math/math_2d.cpp b/core/math/math_2d.cpp index 20b916ee3b..962a42acb9 100644 --- a/core/math/math_2d.cpp +++ b/core/math/math_2d.cpp @@ -63,7 +63,8 @@ Vector2 Vector2::normalized() const { } bool Vector2::is_normalized() const { - return Math::isequal_approx(length(), (real_t)1.0); + // use length_squared() instead of length() to avoid sqrt(), makes it more stringent. + return Math::is_equal_approx(length_squared(), 1.0); } real_t Vector2::distance_to(const Vector2 &p_vector2) const { @@ -281,7 +282,7 @@ Vector2 Vector2::cubic_interpolate(const Vector2 &p_b, const Vector2 &p_pre_a, c // slide returns the component of the vector along the given plane, specified by its normal vector. Vector2 Vector2::slide(const Vector2 &p_n) const { -#ifdef DEBUG_ENABLED +#ifdef MATH_CHECKS ERR_FAIL_COND_V(p_n.is_normalized() == false, Vector2()); #endif return *this - p_n * this->dot(p_n); @@ -292,7 +293,7 @@ Vector2 Vector2::bounce(const Vector2 &p_n) const { } Vector2 Vector2::reflect(const Vector2 &p_n) const { -#ifdef DEBUG_ENABLED +#ifdef MATH_CHECKS ERR_FAIL_COND_V(p_n.is_normalized() == false, Vector2()); #endif return 2.0 * p_n * this->dot(p_n) - *this; @@ -439,7 +440,9 @@ Transform2D Transform2D::inverse() const { void Transform2D::affine_invert() { real_t det = basis_determinant(); +#ifdef MATH_CHECKS ERR_FAIL_COND(det == 0); +#endif real_t idet = 1.0 / det; SWAP(elements[0][0], elements[1][1]); diff --git a/core/math/math_defs.h b/core/math/math_defs.h index 1a5768e515..3d9eb63e11 100644 --- a/core/math/math_defs.h +++ b/core/math/math_defs.h @@ -35,6 +35,10 @@ #define CMP_NORMALIZE_TOLERANCE 0.000001 #define CMP_POINT_IN_PLANE_EPSILON 0.00001 +#ifdef DEBUG_ENABLED +#define MATH_CHECKS +#endif + #define USEC_TO_SEC(m_usec) ((m_usec) / 1000000.0) /** * "Real" is a type that will be translated to either floats or fixed depending diff --git a/core/math/math_funcs.cpp b/core/math/math_funcs.cpp index 6a46b9fbe3..9f5a9c193a 100644 --- a/core/math/math_funcs.cpp +++ b/core/math/math_funcs.cpp @@ -30,7 +30,7 @@ #include "math_funcs.h" #include "core/os/os.h" -pcg32_random_t Math::default_pcg = { 1, PCG_DEFAULT_INC_64 }; +pcg32_random_t Math::default_pcg = { 12047754176567800795ULL, PCG_DEFAULT_INC_64 }; #define PHI 0x9e3779b9 @@ -51,9 +51,7 @@ void Math::seed(uint64_t x) { } void Math::randomize() { - - OS::Time time = OS::get_singleton()->get_time(); - seed(OS::get_singleton()->get_ticks_usec() * (time.hour + 1) * (time.min + 1) * (time.sec + 1) * rand()); // TODO: can be simplified. + seed(OS::get_singleton()->get_ticks_usec() * default_pcg.state + PCG_DEFAULT_INC_64); } uint32_t Math::rand() { diff --git a/core/math/math_funcs.h b/core/math/math_funcs.h index 10426c9243..5bfbc1005f 100644 --- a/core/math/math_funcs.h +++ b/core/math/math_funcs.h @@ -157,7 +157,7 @@ public: static uint32_t larger_prime(uint32_t p_val); - static void seed(uint64_t x = 0); + static void seed(uint64_t x); static void randomize(); static uint32_t rand_from_seed(uint64_t *seed); static uint32_t rand(); @@ -168,7 +168,7 @@ public: static float random(float from, float to); static real_t random(int from, int to) { return (real_t)random((real_t)from, (real_t)to); } - static _ALWAYS_INLINE_ bool isequal_approx(real_t a, real_t b) { + static _ALWAYS_INLINE_ bool is_equal_approx(real_t a, real_t b) { // TODO: Comparing floats for approximate-equality is non-trivial. // Using epsilon should cover the typical cases in Godot (where a == b is used to compare two reals), such as matrix and vector comparison operators. // A proper implementation in terms of ULPs should eventually replace the contents of this function. diff --git a/core/math/matrix3.cpp b/core/math/matrix3.cpp index ef368009d1..c733251c3c 100644 --- a/core/math/matrix3.cpp +++ b/core/math/matrix3.cpp @@ -62,8 +62,9 @@ void Basis::invert() { real_t det = elements[0][0] * co[0] + elements[0][1] * co[1] + elements[0][2] * co[2]; - +#ifdef MATH_CHECKS ERR_FAIL_COND(det == 0); +#endif real_t s = 1.0 / det; set(co[0] * s, cofac(0, 2, 2, 1) * s, cofac(0, 1, 1, 2) * s, @@ -72,8 +73,9 @@ void Basis::invert() { } void Basis::orthonormalize() { +#ifdef MATH_CHECKS ERR_FAIL_COND(determinant() == 0); - +#endif // Gram-Schmidt Process Vector3 x = get_axis(0); @@ -102,20 +104,20 @@ bool Basis::is_orthogonal() const { Basis id; Basis m = (*this) * transposed(); - return isequal_approx(id, m); + return is_equal_approx(id, m); } bool Basis::is_rotation() const { - return Math::isequal_approx(determinant(), 1) && is_orthogonal(); + return Math::is_equal_approx(determinant(), 1) && is_orthogonal(); } bool Basis::is_symmetric() const { - if (Math::abs(elements[0][1] - elements[1][0]) > CMP_EPSILON) + if (!Math::is_equal_approx(elements[0][1], elements[1][0])) return false; - if (Math::abs(elements[0][2] - elements[2][0]) > CMP_EPSILON) + if (!Math::is_equal_approx(elements[0][2], elements[2][0])) return false; - if (Math::abs(elements[1][2] - elements[2][1]) > CMP_EPSILON) + if (!Math::is_equal_approx(elements[1][2], elements[2][1])) return false; return true; @@ -123,11 +125,11 @@ bool Basis::is_symmetric() const { Basis Basis::diagonalize() { - //NOTE: only implemented for symmetric matrices - //with the Jacobi iterative method method - +//NOTE: only implemented for symmetric matrices +//with the Jacobi iterative method method +#ifdef MATH_CHECKS ERR_FAIL_COND_V(!is_symmetric(), Basis()); - +#endif const int ite_max = 1024; real_t off_matrix_norm_2 = elements[0][1] * elements[0][1] + elements[0][2] * elements[0][2] + elements[1][2] * elements[1][2]; @@ -160,7 +162,7 @@ Basis Basis::diagonalize() { // Compute the rotation angle real_t angle; - if (Math::abs(elements[j][j] - elements[i][i]) < CMP_EPSILON) { + if (Math::is_equal_approx(elements[j][j], elements[i][i])) { angle = Math_PI / 4; } else { angle = 0.5 * Math::atan(2 * elements[i][j] / (elements[j][j] - elements[i][i])); @@ -226,11 +228,25 @@ Basis Basis::scaled(const Vector3 &p_scale) const { } Vector3 Basis::get_scale() const { - // We are assuming M = R.S, and performing a polar decomposition to extract R and S. - // FIXME: We eventually need a proper polar decomposition. - // As a cheap workaround until then, to ensure that R is a proper rotation matrix with determinant +1 - // (such that it can be represented by a Quat or Euler angles), we absorb the sign flip into the scaling matrix. - // As such, it works in conjunction with get_rotation(). + // FIXME: We are assuming M = R.S (R is rotation and S is scaling), and use polar decomposition to extract R and S. + // A polar decomposition is M = O.P, where O is an orthogonal matrix (meaning rotation and reflection) and + // P is a positive semi-definite matrix (meaning it contains absolute values of scaling along its diagonal). + // + // Despite being different from what we want to achieve, we can nevertheless make use of polar decomposition + // here as follows. We can split O into a rotation and a reflection as O = R.Q, and obtain M = R.S where + // we defined S = Q.P. Now, R is a proper rotation matrix and S is a (signed) scaling matrix, + // which can involve negative scalings. However, there is a catch: unlike the polar decomposition of M = O.P, + // the decomposition of O into a rotation and reflection matrix as O = R.Q is not unique. + // Therefore, we are going to do this decomposition by sticking to a particular convention. + // This may lead to confusion for some users though. + // + // The convention we use here is to absorb the sign flip into the scaling matrix. + // The same convention is also used in other similar functions such as set_scale, + // get_rotation_axis_angle, get_rotation, set_rotation_axis_angle, set_rotation_euler, ... + // + // A proper way to get rid of this issue would be to store the scaling values (or at least their signs) + // as a part of Basis. However, if we go that path, we need to disable direct (write) access to the + // matrix elements. real_t det_sign = determinant() > 0 ? 1 : -1; return det_sign * Vector3( Vector3(elements[0][0], elements[1][0], elements[2][0]).length(), @@ -238,6 +254,17 @@ Vector3 Basis::get_scale() const { Vector3(elements[0][2], elements[1][2], elements[2][2]).length()); } +// Sets scaling while preserving rotation. +// This requires some care when working with matrices with negative determinant, +// since we're using a particular convention for "polar" decomposition in get_scale and get_rotation. +// For details, see the explanation in get_scale. +void Basis::set_scale(const Vector3 &p_scale) { + Vector3 e = get_euler(); + Basis(); // reset to identity + scale(p_scale); + rotate(e); +} + // Multiplies the matrix from left by the rotation matrix: M -> R.M // Note that this does *not* rotate the matrix itself. // @@ -260,6 +287,7 @@ void Basis::rotate(const Vector3 &p_euler) { *this = rotated(p_euler); } +// TODO: rename this to get_rotation_euler Vector3 Basis::get_rotation() const { // Assumes that the matrix can be decomposed into a proper rotation and scaling matrix as M = R.S, // and returns the Euler angles corresponding to the rotation part, complementing get_scale(). @@ -274,6 +302,42 @@ Vector3 Basis::get_rotation() const { return m.get_euler(); } +void Basis::get_rotation_axis_angle(Vector3 &p_axis, real_t &p_angle) const { + // Assumes that the matrix can be decomposed into a proper rotation and scaling matrix as M = R.S, + // and returns the Euler angles corresponding to the rotation part, complementing get_scale(). + // See the comment in get_scale() for further information. + Basis m = orthonormalized(); + real_t det = m.determinant(); + if (det < 0) { + // Ensure that the determinant is 1, such that result is a proper rotation matrix which can be represented by Euler angles. + m.scale(Vector3(-1, -1, -1)); + } + + m.get_axis_angle(p_axis, p_angle); +} + +// Sets rotation while preserving scaling. +// This requires some care when working with matrices with negative determinant, +// since we're using a particular convention for "polar" decomposition in get_scale and get_rotation. +// For details, see the explanation in get_scale. +void Basis::set_rotation_euler(const Vector3 &p_euler) { + Vector3 s = get_scale(); + Basis(); // reset to identity + scale(s); + rotate(p_euler); +} + +// Sets rotation while preserving scaling. +// This requires some care when working with matrices with negative determinant, +// since we're using a particular convention for "polar" decomposition in get_scale and get_rotation. +// For details, see the explanation in get_scale. +void Basis::set_rotation_axis_angle(const Vector3 &p_axis, real_t p_angle) { + Vector3 s = get_scale(); + Basis(); // reset to identity + scale(s); + rotate(p_axis, p_angle); +} + // get_euler returns a vector containing the Euler angles in the format // (a1,a2,a3), where a3 is the angle of the first rotation, and a1 is the last // (following the convention they are commonly defined in the literature). @@ -294,9 +358,9 @@ Vector3 Basis::get_euler() const { // -cx*cz*sy+sx*sz cz*sx+cx*sy*sz cx*cy Vector3 euler; - +#ifdef MATH_CHECKS ERR_FAIL_COND_V(is_rotation() == false, euler); - +#endif euler.y = Math::asin(elements[0][2]); if (euler.y < Math_PI * 0.5) { if (euler.y > -Math_PI * 0.5) { @@ -340,11 +404,11 @@ void Basis::set_euler(const Vector3 &p_euler) { *this = xmat * (ymat * zmat); } -bool Basis::isequal_approx(const Basis &a, const Basis &b) const { +bool Basis::is_equal_approx(const Basis &a, const Basis &b) const { for (int i = 0; i < 3; i++) { for (int j = 0; j < 3; j++) { - if (Math::isequal_approx(a.elements[i][j], b.elements[i][j]) == false) + if (Math::is_equal_approx(a.elements[i][j], b.elements[i][j]) == false) return false; } } @@ -387,8 +451,9 @@ Basis::operator String() const { } Basis::operator Quat() const { +#ifdef MATH_CHECKS ERR_FAIL_COND_V(is_rotation() == false, Quat()); - +#endif real_t trace = elements[0][0] + elements[1][1] + elements[2][2]; real_t temp[4]; @@ -482,9 +547,10 @@ void Basis::set_orthogonal_index(int p_index) { *this = _ortho_bases[p_index]; } -void Basis::get_axis_and_angle(Vector3 &r_axis, real_t &r_angle) const { +void Basis::get_axis_angle(Vector3 &r_axis, real_t &r_angle) const { +#ifdef MATH_CHECKS ERR_FAIL_COND(is_rotation() == false); - +#endif real_t angle, x, y, z; // variables for result real_t epsilon = 0.01; // margin to allow for rounding errors real_t epsilon2 = 0.1; // margin to distinguish between 0 and 180 degrees @@ -573,11 +639,11 @@ Basis::Basis(const Quat &p_quat) { xz - wy, yz + wx, 1.0 - (xx + yy)); } -Basis::Basis(const Vector3 &p_axis, real_t p_phi) { - // Rotation matrix from axis and angle, see https://en.wikipedia.org/wiki/Rotation_matrix#Rotation_matrix_from_axis_and_angle - +void Basis::set_axis_angle(const Vector3 &p_axis, real_t p_phi) { +// Rotation matrix from axis and angle, see https://en.wikipedia.org/wiki/Rotation_matrix#Rotation_matrix_from_axis_angle +#ifdef MATH_CHECKS ERR_FAIL_COND(p_axis.is_normalized() == false); - +#endif Vector3 axis_sq(p_axis.x * p_axis.x, p_axis.y * p_axis.y, p_axis.z * p_axis.z); real_t cosine = Math::cos(p_phi); @@ -595,3 +661,7 @@ Basis::Basis(const Vector3 &p_axis, real_t p_phi) { elements[2][1] = p_axis.y * p_axis.z * (1.0 - cosine) + p_axis.x * sine; elements[2][2] = axis_sq.z + cosine * (1.0 - axis_sq.z); } + +Basis::Basis(const Vector3 &p_axis, real_t p_phi) { + set_axis_angle(p_axis, p_phi); +} diff --git a/core/math/matrix3.h b/core/math/matrix3.h index 08e963f56e..c3eeb1f705 100644 --- a/core/math/matrix3.h +++ b/core/math/matrix3.h @@ -77,15 +77,25 @@ public: void rotate(const Vector3 &p_euler); Basis rotated(const Vector3 &p_euler) const; + Vector3 get_rotation() const; + void get_rotation_axis_angle(Vector3 &p_axis, real_t &p_angle) const; - void scale(const Vector3 &p_scale); - Basis scaled(const Vector3 &p_scale) const; - Vector3 get_scale() const; + void set_rotation_euler(const Vector3 &p_euler); + void set_rotation_axis_angle(const Vector3 &p_axis, real_t p_angle); Vector3 get_euler() const; void set_euler(const Vector3 &p_euler); + void get_axis_angle(Vector3 &r_axis, real_t &r_angle) const; + void set_axis_angle(const Vector3 &p_axis, real_t p_phi); + + void scale(const Vector3 &p_scale); + Basis scaled(const Vector3 &p_scale) const; + + Vector3 get_scale() const; + void set_scale(const Vector3 &p_scale); + // transposed dot products _FORCE_INLINE_ real_t tdotx(const Vector3 &v) const { return elements[0][0] * v[0] + elements[1][0] * v[1] + elements[2][0] * v[2]; @@ -97,7 +107,7 @@ public: return elements[0][2] * v[0] + elements[1][2] * v[1] + elements[2][2] * v[2]; } - bool isequal_approx(const Basis &a, const Basis &b) const; + bool is_equal_approx(const Basis &a, const Basis &b) const; bool operator==(const Basis &p_matrix) const; bool operator!=(const Basis &p_matrix) const; @@ -121,8 +131,6 @@ public: operator String() const; - void get_axis_and_angle(Vector3 &r_axis, real_t &r_angle) const; - /* create / set */ _FORCE_INLINE_ void set(real_t xx, real_t xy, real_t xz, real_t yx, real_t yy, real_t yz, real_t zx, real_t zy, real_t zz) { diff --git a/core/math/quat.cpp b/core/math/quat.cpp index 9662542224..0bea97c2e8 100644 --- a/core/math/quat.cpp +++ b/core/math/quat.cpp @@ -92,6 +92,10 @@ Quat Quat::normalized() const { return *this / length(); } +bool Quat::is_normalized() const { + return Math::is_equal_approx(length(), 1.0); +} + Quat Quat::inverse() const { return Quat(-x, -y, -z, w); } diff --git a/core/math/quat.h b/core/math/quat.h index 76b3cde2a3..f22275b457 100644 --- a/core/math/quat.h +++ b/core/math/quat.h @@ -48,6 +48,7 @@ public: real_t length() const; void normalize(); Quat normalized() const; + bool is_normalized() const; Quat inverse() const; _FORCE_INLINE_ real_t dot(const Quat &q) const; void set_euler(const Vector3 &p_euler); @@ -56,7 +57,7 @@ public: Quat slerpni(const Quat &q, const real_t &t) const; Quat cubic_slerp(const Quat &q, const Quat &prep, const Quat &postq, const real_t &t) const; - _FORCE_INLINE_ void get_axis_and_angle(Vector3 &r_axis, real_t &r_angle) const { + _FORCE_INLINE_ void get_axis_angle(Vector3 &r_axis, real_t &r_angle) const { r_angle = 2 * Math::acos(w); r_axis.x = x / Math::sqrt(1 - w * w); r_axis.y = y / Math::sqrt(1 - w * w); diff --git a/core/math/vector3.h b/core/math/vector3.h index a6bc20ccb2..5f4390fbd1 100644 --- a/core/math/vector3.h +++ b/core/math/vector3.h @@ -389,7 +389,8 @@ Vector3 Vector3::normalized() const { } bool Vector3::is_normalized() const { - return Math::isequal_approx(length(), (real_t)1.0); + // use length_squared() instead of length() to avoid sqrt(), makes it more stringent. + return Math::is_equal_approx(length_squared(), 1.0); } Vector3 Vector3::inverse() const { @@ -404,7 +405,7 @@ void Vector3::zero() { // slide returns the component of the vector along the given plane, specified by its normal vector. Vector3 Vector3::slide(const Vector3 &p_n) const { -#ifdef DEBUG_ENABLED +#ifdef MATH_CHECKS ERR_FAIL_COND_V(p_n.is_normalized() == false, Vector3()); #endif return *this - p_n * this->dot(p_n); @@ -415,7 +416,7 @@ Vector3 Vector3::bounce(const Vector3 &p_n) const { } Vector3 Vector3::reflect(const Vector3 &p_n) const { -#ifdef DEBUG_ENABLED +#ifdef MATH_CHECKS ERR_FAIL_COND_V(p_n.is_normalized() == false, Vector3()); #endif return 2.0 * p_n * this->dot(p_n) - *this; diff --git a/core/os/input.cpp b/core/os/input.cpp index 6215ad3732..bc388d0bca 100644 --- a/core/os/input.cpp +++ b/core/os/input.cpp @@ -75,7 +75,7 @@ void Input::_bind_methods() { ClassDB::bind_method(D_METHOD("get_accelerometer"), &Input::get_accelerometer); ClassDB::bind_method(D_METHOD("get_magnetometer"), &Input::get_magnetometer); ClassDB::bind_method(D_METHOD("get_gyroscope"), &Input::get_gyroscope); - //ClassDB::bind_method(D_METHOD("get_mouse_pos"),&Input::get_mouse_pos); - this is not the function you want + //ClassDB::bind_method(D_METHOD("get_mouse_position"),&Input::get_mouse_position); - this is not the function you want ClassDB::bind_method(D_METHOD("get_last_mouse_speed"), &Input::get_last_mouse_speed); ClassDB::bind_method(D_METHOD("get_mouse_button_mask"), &Input::get_mouse_button_mask); ClassDB::bind_method(D_METHOD("set_mouse_mode", "mode"), &Input::set_mouse_mode); diff --git a/core/os/input.h b/core/os/input.h index 4b297a7eef..4f26f097c2 100644 --- a/core/os/input.h +++ b/core/os/input.h @@ -77,7 +77,7 @@ public: virtual void start_joy_vibration(int p_device, float p_weak_magnitude, float p_strong_magnitude, float p_duration = 0) = 0; virtual void stop_joy_vibration(int p_device) = 0; - virtual Point2 get_mouse_pos() const = 0; + virtual Point2 get_mouse_position() const = 0; virtual Point2 get_last_mouse_speed() const = 0; virtual int get_mouse_button_mask() const = 0; diff --git a/core/os/os.cpp b/core/os/os.cpp index ab03bb8016..e323e03829 100644 --- a/core/os/os.cpp +++ b/core/os/os.cpp @@ -507,7 +507,6 @@ OS::OS() { _render_thread_mode = RENDER_THREAD_SAFE; _allow_hidpi = true; - Math::seed(1234567); } OS::~OS() { diff --git a/core/os/os.h b/core/os/os.h index 0abc91e35e..ff2a24f40d 100644 --- a/core/os/os.h +++ b/core/os/os.h @@ -144,7 +144,7 @@ public: virtual MouseMode get_mouse_mode() const; virtual void warp_mouse_pos(const Point2 &p_to) {} - virtual Point2 get_mouse_pos() const = 0; + virtual Point2 get_mouse_position() const = 0; virtual int get_mouse_button_state() const = 0; virtual void set_window_title(const String &p_title) = 0; diff --git a/core/script_language.h b/core/script_language.h index 905ac4eeda..1ec02f5845 100644 --- a/core/script_language.h +++ b/core/script_language.h @@ -119,7 +119,7 @@ public: virtual void get_script_method_list(List<MethodInfo> *p_list) const = 0; virtual void get_script_property_list(List<PropertyInfo> *p_list) const = 0; - virtual int get_member_line(const StringName &p_member) const { return 0; } + virtual int get_member_line(const StringName &p_member) const { return -1; } Script() {} }; @@ -201,6 +201,7 @@ public: virtual bool has_named_classes() const = 0; virtual int find_function(const String &p_function, const String &p_code) const = 0; virtual String make_function(const String &p_class, const String &p_name, const PoolStringArray &p_args) const = 0; + virtual Error open_in_external_editor(const Ref<Script> &p_script, int p_line, int p_col) { return ERR_UNAVAILABLE; } virtual Error complete_code(const String &p_code, const String &p_base_path, Object *p_owner, List<String> *r_options, String &r_call_hint) { return ERR_UNAVAILABLE; } diff --git a/core/typedefs.h b/core/typedefs.h index 335f576bce..40d9ea37b5 100644 --- a/core/typedefs.h +++ b/core/typedefs.h @@ -42,17 +42,6 @@ #define _MKSTR(m_x) _STR(m_x) #endif -/** - * Version macros - it is necessary to include "version.h" for those to work. - * Include it in the .cpp file, not the header. - */ -#ifdef VERSION_PATCH -#define VERSION_MKSTRING "" _MKSTR(VERSION_MAJOR) "." _MKSTR(VERSION_MINOR) "." _MKSTR(VERSION_PATCH) "." _MKSTR(VERSION_STATUS) "." _MKSTR(VERSION_REVISION) -#else -#define VERSION_MKSTRING "" _MKSTR(VERSION_MAJOR) "." _MKSTR(VERSION_MINOR) "." _MKSTR(VERSION_STATUS) "." _MKSTR(VERSION_REVISION) -#endif // VERSION_PATCH -#define VERSION_FULL_NAME "" _MKSTR(VERSION_NAME) " v" VERSION_MKSTRING - #ifndef _ALWAYS_INLINE_ #if defined(__GNUC__) && (__GNUC__ >= 4) diff --git a/core/variant.cpp b/core/variant.cpp index 6e675d07de..67ce8af483 100644 --- a/core/variant.cpp +++ b/core/variant.cpp @@ -2839,7 +2839,7 @@ uint32_t Variant::hash() const { } #define hash_compare_scalar(p_lhs, p_rhs) \ - ((p_lhs) == (p_rhs)) || (Math::is_nan(p_lhs) == Math::is_nan(p_rhs)) + ((p_lhs) == (p_rhs)) || (Math::is_nan(p_lhs) && Math::is_nan(p_rhs)) #define hash_compare_vector2(p_lhs, p_rhs) \ (hash_compare_scalar((p_lhs).x, (p_rhs).x)) && \ diff --git a/core/variant_call.cpp b/core/variant_call.cpp index e87dfd2768..beaee188eb 100644 --- a/core/variant_call.cpp +++ b/core/variant_call.cpp @@ -328,6 +328,7 @@ struct _VariantCall { VCALL_LOCALMEM0R(Vector2, normalized); VCALL_LOCALMEM0R(Vector2, length); VCALL_LOCALMEM0R(Vector2, length_squared); + VCALL_LOCALMEM0R(Vector2, is_normalized); VCALL_LOCALMEM1R(Vector2, distance_to); VCALL_LOCALMEM1R(Vector2, distance_squared_to); VCALL_LOCALMEM1R(Vector2, angle_to); @@ -362,6 +363,7 @@ struct _VariantCall { VCALL_LOCALMEM0R(Vector3, max_axis); VCALL_LOCALMEM0R(Vector3, length); VCALL_LOCALMEM0R(Vector3, length_squared); + VCALL_LOCALMEM0R(Vector3, is_normalized); VCALL_LOCALMEM0R(Vector3, normalized); VCALL_LOCALMEM0R(Vector3, inverse); VCALL_LOCALMEM1R(Vector3, snapped); @@ -418,6 +420,7 @@ struct _VariantCall { VCALL_LOCALMEM0R(Quat, length); VCALL_LOCALMEM0R(Quat, length_squared); VCALL_LOCALMEM0R(Quat, normalized); + VCALL_LOCALMEM0R(Quat, is_normalized); VCALL_LOCALMEM0R(Quat, inverse); VCALL_LOCALMEM1R(Quat, dot); VCALL_LOCALMEM1R(Quat, xform); @@ -704,6 +707,9 @@ struct _VariantCall { VCALL_PTR1R(Basis, scaled); VCALL_PTR0R(Basis, get_scale); VCALL_PTR0R(Basis, get_euler); + VCALL_PTR1(Basis, set_scale); + VCALL_PTR1(Basis, set_rotation_euler); + VCALL_PTR2(Basis, set_rotation_axis_angle); VCALL_PTR1R(Basis, tdotx); VCALL_PTR1R(Basis, tdoty); VCALL_PTR1R(Basis, tdotz); @@ -875,6 +881,11 @@ struct _VariantCall { r_ret = Basis(p_args[0]->operator Vector3(), p_args[1]->operator real_t()); } + static void Basis_init3(Variant &r_ret, const Variant **p_args) { + + r_ret = Basis(p_args[0]->operator Vector3()); + } + static void Transform_init1(Variant &r_ret, const Variant **p_args) { Transform t; @@ -1429,6 +1440,7 @@ void register_variant_methods() { ADDFUNC0(VECTOR2, REAL, Vector2, length, varray()); ADDFUNC0(VECTOR2, REAL, Vector2, angle, varray()); ADDFUNC0(VECTOR2, REAL, Vector2, length_squared, varray()); + ADDFUNC0(VECTOR2, BOOL, Vector2, is_normalized, varray()); ADDFUNC1(VECTOR2, REAL, Vector2, distance_to, VECTOR2, "to", varray()); ADDFUNC1(VECTOR2, REAL, Vector2, distance_squared_to, VECTOR2, "to", varray()); ADDFUNC1(VECTOR2, REAL, Vector2, angle_to, VECTOR2, "to", varray()); @@ -1462,6 +1474,7 @@ void register_variant_methods() { ADDFUNC0(VECTOR3, INT, Vector3, max_axis, varray()); ADDFUNC0(VECTOR3, REAL, Vector3, length, varray()); ADDFUNC0(VECTOR3, REAL, Vector3, length_squared, varray()); + ADDFUNC0(VECTOR3, BOOL, Vector3, is_normalized, varray()); ADDFUNC0(VECTOR3, VECTOR3, Vector3, normalized, varray()); ADDFUNC0(VECTOR3, VECTOR3, Vector3, inverse, varray()); ADDFUNC1(VECTOR3, VECTOR3, Vector3, snapped, REAL, "by", varray()); @@ -1497,6 +1510,7 @@ void register_variant_methods() { ADDFUNC0(QUAT, REAL, Quat, length, varray()); ADDFUNC0(QUAT, REAL, Quat, length_squared, varray()); ADDFUNC0(QUAT, QUAT, Quat, normalized, varray()); + ADDFUNC0(QUAT, BOOL, Quat, is_normalized, varray()); ADDFUNC0(QUAT, QUAT, Quat, inverse, varray()); ADDFUNC1(QUAT, REAL, Quat, dot, QUAT, "b", varray()); ADDFUNC1(QUAT, VECTOR3, Quat, xform, VECTOR3, "v", varray()); @@ -1692,6 +1706,9 @@ void register_variant_methods() { ADDFUNC0(BASIS, REAL, Basis, determinant, varray()); ADDFUNC2(BASIS, BASIS, Basis, rotated, VECTOR3, "axis", REAL, "phi", varray()); ADDFUNC1(BASIS, BASIS, Basis, scaled, VECTOR3, "scale", varray()); + ADDFUNC1(BASIS, NIL, Basis, set_scale, VECTOR3, "scale", varray()); + ADDFUNC1(BASIS, NIL, Basis, set_rotation_euler, VECTOR3, "euler", varray()); + ADDFUNC2(BASIS, NIL, Basis, set_rotation_axis_angle, VECTOR3, "axis", REAL, "angle", varray()); ADDFUNC0(BASIS, VECTOR3, Basis, get_scale, varray()); ADDFUNC0(BASIS, VECTOR3, Basis, get_euler, varray()); ADDFUNC1(BASIS, REAL, Basis, tdotx, VECTOR3, "with", varray()); @@ -1749,6 +1766,7 @@ void register_variant_methods() { _VariantCall::add_constructor(_VariantCall::Basis_init1, Variant::BASIS, "x_axis", Variant::VECTOR3, "y_axis", Variant::VECTOR3, "z_axis", Variant::VECTOR3); _VariantCall::add_constructor(_VariantCall::Basis_init2, Variant::BASIS, "axis", Variant::VECTOR3, "phi", Variant::REAL); + _VariantCall::add_constructor(_VariantCall::Basis_init3, Variant::BASIS, "euler", Variant::VECTOR3); _VariantCall::add_constructor(_VariantCall::Transform_init1, Variant::TRANSFORM, "x_axis", Variant::VECTOR3, "y_axis", Variant::VECTOR3, "z_axis", Variant::VECTOR3, "origin", Variant::VECTOR3); _VariantCall::add_constructor(_VariantCall::Transform_init2, Variant::TRANSFORM, "basis", Variant::BASIS, "origin", Variant::VECTOR3); diff --git a/core/version.h b/core/version.h new file mode 100644 index 0000000000..80e50e51b9 --- /dev/null +++ b/core/version.h @@ -0,0 +1,37 @@ +/*************************************************************************/ +/* version.h */ +/*************************************************************************/ +/* This file is part of: */ +/* GODOT ENGINE */ +/* http://www.godotengine.org */ +/*************************************************************************/ +/* Copyright (c) 2007-2017 Juan Linietsky, Ariel Manzur. */ +/* Copyright (c) 2014-2017 Godot Engine contributors (cf. AUTHORS.md) */ +/* */ +/* Permission is hereby granted, free of charge, to any person obtaining */ +/* a copy of this software and associated documentation files (the */ +/* "Software"), to deal in the Software without restriction, including */ +/* without limitation the rights to use, copy, modify, merge, publish, */ +/* distribute, sublicense, and/or sell copies of the Software, and to */ +/* permit persons to whom the Software is furnished to do so, subject to */ +/* the following conditions: */ +/* */ +/* The above copyright notice and this permission notice shall be */ +/* included in all copies or substantial portions of the Software. */ +/* */ +/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */ +/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */ +/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/ +/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */ +/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */ +/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ +/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +/*************************************************************************/ +#include "version_generated.h" + +#ifdef VERSION_PATCH +#define VERSION_MKSTRING "" _MKSTR(VERSION_MAJOR) "." _MKSTR(VERSION_MINOR) "." _MKSTR(VERSION_PATCH) "." _MKSTR(VERSION_STATUS) "." _MKSTR(VERSION_REVISION) +#else +#define VERSION_MKSTRING "" _MKSTR(VERSION_MAJOR) "." _MKSTR(VERSION_MINOR) "." _MKSTR(VERSION_STATUS) "." _MKSTR(VERSION_REVISION) +#endif // VERSION_PATCH +#define VERSION_FULL_NAME "" _MKSTR(VERSION_NAME) " v" VERSION_MKSTRING diff --git a/doc/base/classes.xml b/doc/base/classes.xml index f108a48310..e0e88ef348 100644 --- a/doc/base/classes.xml +++ b/doc/base/classes.xml @@ -2985,7 +2985,7 @@ Return the default blend time between animations. </description> </method> - <method name="get_pos" qualifiers="const"> + <method name="get_position" qualifiers="const"> <return type="float"> </return> <description> @@ -6005,7 +6005,7 @@ <description> </description> </method> - <method name="get_pos"> + <method name="get_position"> <return type="float"> </return> <description> @@ -6868,6 +6868,15 @@ <method name="Basis"> <return type="Basis"> </return> + <argument index="0" name="euler" type="Vector3"> + </argument> + <description> + Create a rotation matrix (in the XYZ convention: first Z, then Y, and X last) from the specified Euler angles, given in the vector format as (third,second,first). + </description> + </method> + <method name="Basis"> + <return type="Basis"> + </return> <argument index="0" name="x_axis" type="Vector3"> </argument> <argument index="1" name="y_axis" type="Vector3"> @@ -6889,8 +6898,7 @@ <return type="Vector3"> </return> <description> - Return Euler angles (in the XYZ convention: first Z, then Y, and X last) from the matrix. Returned vector contains the rotation angles in the format (third,second,first). - This function only works if the matrix represents a proper rotation. + Assuming that the matrix is a proper rotation matrix (orthonormal matrix with determinant +1), return Euler angles (in the XYZ convention: first Z, then Y, and X last). Returned vector contains the rotation angles in the format (third,second,first). </description> </method> <method name="get_orthogonal_index"> @@ -6929,7 +6937,27 @@ <argument index="1" name="phi" type="float"> </argument> <description> - Introduce an additional rotation around the given axis by phi. Only relevant when the matrix is being used as a part of [Transform]. The axis must be a normalized vector. + Introduce an additional rotation around the given axis by phi (radians). Only relevant when the matrix is being used as a part of [Transform]. The axis must be a normalized vector. + </description> + </method> + <method name="set_rotation_euler"> + <return type="Basis"> + </return> + <argument index="0" name="euler" type="Vector3"> + </argument> + <description> + Changes only the rotation part of the [Basis] to a rotation corresponding to given Euler angles, while preserving the scaling part (as determined by get_scale). + </description> + </method> + <method name="set_rotation_axis_angle"> + <return type="Basis"> + </return> + <argument index="0" name="axis" type="Vector3"> + </argument> + <argument index="1" name="phi" type="float"> + </argument> + <description> + Changes only the rotation part of the [Basis] to a rotation around given axis by phi, while preserving the scaling part (as determined by get_scale). </description> </method> <method name="scaled"> @@ -6941,6 +6969,15 @@ Introduce an additional scaling specified by the given 3D scaling factor. Only relevant when the matrix is being used as a part of [Transform]. </description> </method> + <method name="set_scale"> + <return type="Basis"> + </return> + <argument index="0" name="scale" type="Vector3"> + </argument> + <description> + Changes only the scaling part of the Basis to the specified scaling, while preserving the rotation part (as determined by get_rotation). + </description> + </method> <method name="tdotx"> <return type="float"> </return> @@ -8333,7 +8370,7 @@ <argument index="0" name="state" type="Variant"> </argument> <description> - Set the transform state of this CanvasItem. For [Node2D], this is an [Array] with (in order) a [Vector2] for position, a float for rotation and another [Vector2] for scale. For [Control] this is a [Rect2] with the position and size. + Set the transform state of this CanvasItem. For [Node2D], this is an [Array] with (in order) a [Vector2] for position, a float for rotation (radians) and another [Vector2] for scale. For [Control] this is a [Rect2] with the position and size. </description> </method> <method name="get_canvas" qualifiers="const"> @@ -8357,7 +8394,7 @@ Get the transform matrix of this item's canvas. </description> </method> - <method name="get_global_mouse_pos" qualifiers="const"> + <method name="get_global_mouse_position" qualifiers="const"> <return type="Vector2"> </return> <description> @@ -8708,14 +8745,14 @@ <return type="float"> </return> <description> - Return the base rotation for this layer (helper). + Return the base rotation for this layer in radians (helper). </description> </method> <method name="get_rotationd" qualifiers="const"> <return type="float"> </return> <description> - Get rotation of the layer in degree. + Return the base rotation for this layer in degrees. </description> </method> <method name="get_scale" qualifiers="const"> @@ -8763,14 +8800,14 @@ <argument index="0" name="radians" type="float"> </argument> <description> - Set the base rotation for this layer (helper). + Set the base rotation for this layer in radians (helper). </description> </method> <method name="set_rotationd"> <argument index="0" name="degrees" type="float"> </argument> <description> - Set rotation of the layer in degree. + Set the base rotation for this layer in degrees (helper). </description> </method> <method name="set_scale"> @@ -10847,7 +10884,7 @@ <description> </description> </method> - <method name="get_pos" qualifiers="const"> + <method name="get_position" qualifiers="const"> <return type="Vector2"> </return> <description> @@ -10865,12 +10902,14 @@ <return type="float"> </return> <description> + Return the rotation (in radians) </description> </method> <method name="get_rotation_deg" qualifiers="const"> <return type="float"> </return> <description> + Return the rotation (in degrees) </description> </method> <method name="get_scale" qualifiers="const"> @@ -11174,7 +11213,7 @@ Set when the control is ignoring mouse events (even touchpad events send mouse events). (see the MOUSE_FILTER_* constants) </description> </method> - <method name="set_pos"> + <method name="set_position"> <argument index="0" name="pos" type="Vector2"> </argument> <description> @@ -11185,12 +11224,14 @@ <argument index="0" name="radians" type="float"> </argument> <description> + Set the rotation (in radians). </description> </method> <method name="set_rotation_deg"> <argument index="0" name="degrees" type="float"> </argument> <description> + Set the rotation (in degrees). </description> </method> <method name="set_scale"> @@ -14872,7 +14913,7 @@ Get a [String] saved in Pascal format from the file. </description> </method> - <method name="get_pos" qualifiers="const"> + <method name="get_position" qualifiers="const"> <return type="int"> </return> <description> @@ -16414,7 +16455,7 @@ Contains global variables accessible from everywhere. </brief_description> <description> - Contains global variables accessible from everywhere. Use the normal [Object] API, such as "Globals.get(variable)", "Globals.set(variable,value)" or "Globals.has(variable)" to access them. Variables stored in godot.cfg are also loaded into globals, making this object very useful for reading custom game configuration options. + Contains global variables accessible from everywhere. Use the normal [Object] API, such as "Globals.get(variable)", "Globals.set(variable,value)" or "Globals.has(variable)" to access them. Variables stored in the project file (*.godot) are also loaded into globals, making this object very useful for reading custom game configuration options. </description> <methods> <method name="add_property_info"> @@ -25812,7 +25853,7 @@ <argument index="0" name="radians" type="float"> </argument> <description> - Apply a 'radians' rotation to the 2D node, starting from its current rotation. + Apply a rotation (in radians) to the 2D node, starting from its current rotation. </description> </method> <method name="scale"> @@ -35144,6 +35185,13 @@ Returns a copy of the quaternion, normalized to unit length. </description> </method> + <method name="is_normalized"> + <return type="bool"> + </return> + <description> + Returns whether the quaternion is normalized or not. + </description> + </method> <method name="slerp"> <return type="Quat"> </return> @@ -39597,12 +39645,14 @@ <return type="Vector3"> </return> <description> + Return the rotation (in radians). </description> </method> <method name="get_rotation_deg" qualifiers="const"> <return type="Vector3"> </return> <description> + Return the rotation (in degrees). </description> </method> <method name="get_scale" qualifiers="const"> @@ -39771,12 +39821,14 @@ <argument index="0" name="rotation_rad" type="Vector3"> </argument> <description> + Set the rotation (in radians). </description> </method> <method name="set_rotation_deg"> <argument index="0" name="rotation_deg" type="Vector3"> </argument> <description> + Set the rotation (in degrees). </description> </method> <method name="set_scale"> @@ -41788,7 +41840,7 @@ <description> </description> </method> - <method name="get_pos" qualifiers="const"> + <method name="get_position" qualifiers="const"> <return type="int"> </return> <description> @@ -46106,6 +46158,7 @@ <return type="float"> </return> <description> + Return the rotation (in radians). </description> </method> <method name="get_scale"> @@ -48039,6 +48092,13 @@ do_property]. Returns a normalized vector to unit length. </description> </method> + <method name="is_normalized"> + <return type="bool"> + </return> + <description> + Returns whether the vector is normalized or not. + </description> + </method> <method name="reflect"> <return type="Vector2"> </return> @@ -48263,6 +48323,13 @@ do_property]. Return a copy of the normalized vector to unit length. This is the same as v / v.length(). </description> </method> + <method name="is_normalized"> + <return type="bool"> + </return> + <description> + Returns whether the vector is normalized or not. + </description> + </method> <method name="outer"> <return type="Basis"> </return> @@ -48386,6 +48453,7 @@ do_property]. <return type="float"> </return> <description> + Return the steering angle (in radians). </description> </method> <method name="set_brake"> @@ -48416,6 +48484,7 @@ do_property]. <argument index="0" name="steering" type="float"> </argument> <description> + Set the steering angle (in radians). </description> </method> </methods> @@ -48846,7 +48915,7 @@ do_property]. Get whether the rendered texture has filters enabled. </description> </method> - <method name="get_mouse_pos" qualifiers="const"> + <method name="get_mouse_position" qualifiers="const"> <return type="Vector2"> </return> <description> diff --git a/drivers/gles3/rasterizer_scene_gles3.cpp b/drivers/gles3/rasterizer_scene_gles3.cpp index 9cb44349bf..a7996b09d3 100644 --- a/drivers/gles3/rasterizer_scene_gles3.cpp +++ b/drivers/gles3/rasterizer_scene_gles3.cpp @@ -125,14 +125,13 @@ void RasterizerSceneGLES3::shadow_atlas_set_size(RID p_atlas, int p_size) { if (p_size == shadow_atlas->size) return; + // erasing atlas if (shadow_atlas->fbo) { glDeleteTextures(1, &shadow_atlas->depth); glDeleteFramebuffers(1, &shadow_atlas->fbo); shadow_atlas->depth = 0; shadow_atlas->fbo = 0; - - print_line("erasing atlas"); } for (int i = 0; i < 4; i++) { //clear subdivisions @@ -4678,7 +4677,7 @@ void RasterizerSceneGLES3::initialize() { const int ubo_light_size = 160; state.ubo_light_size = ubo_light_size; state.max_ubo_lights = MIN(RenderList::MAX_LIGHTS, max_ubo_size / ubo_light_size); - print_line("max ubo light: " + itos(state.max_ubo_lights)); + print_line("GLES3: max ubo light: " + itos(state.max_ubo_lights)); state.spot_array_tmp = (uint8_t *)memalloc(ubo_light_size * state.max_ubo_lights); state.omni_array_tmp = (uint8_t *)memalloc(ubo_light_size * state.max_ubo_lights); @@ -4704,7 +4703,7 @@ void RasterizerSceneGLES3::initialize() { state.scene_shader.add_custom_define("#define MAX_FORWARD_LIGHTS " + itos(state.max_forward_lights_per_object) + "\n"); state.max_ubo_reflections = MIN(RenderList::MAX_REFLECTIONS, max_ubo_size / sizeof(ReflectionProbeDataUBO)); - print_line("max ubo reflections: " + itos(state.max_ubo_reflections) + " ubo size: " + itos(sizeof(ReflectionProbeDataUBO))); + print_line("GLES3: max ubo reflections: " + itos(state.max_ubo_reflections) + ", ubo size: " + itos(sizeof(ReflectionProbeDataUBO))); state.reflection_array_tmp = (uint8_t *)memalloc(sizeof(ReflectionProbeDataUBO) * state.max_ubo_reflections); diff --git a/drivers/gles3/rasterizer_storage_gles3.cpp b/drivers/gles3/rasterizer_storage_gles3.cpp index beed923a58..73547b5a16 100644 --- a/drivers/gles3/rasterizer_storage_gles3.cpp +++ b/drivers/gles3/rasterizer_storage_gles3.cpp @@ -825,7 +825,6 @@ Image RasterizerStorageGLES3::texture_get_data(RID p_texture, VS::CubeMapSide p_ if (!texture->images[p_cube_side].empty()) { return texture->images[p_cube_side]; } - print_line("GETTING FROM GL "); #ifdef GLES_OVER_GL @@ -842,7 +841,7 @@ Image RasterizerStorageGLES3::texture_get_data(RID p_texture, VS::CubeMapSide p_ glBindBuffer(GL_PIXEL_PACK_BUFFER, 0); - print_line("GET FORMAT: " + Image::get_format_name(texture->format) + " mipmaps: " + itos(texture->mipmaps)); + //print_line("GET FORMAT: " + Image::get_format_name(texture->format) + " mipmaps: " + itos(texture->mipmaps)); for (int i = 0; i < texture->mipmaps; i++) { @@ -4777,7 +4776,6 @@ RID RasterizerStorageGLES3::gi_probe_dynamic_data_create(int p_width, int p_heig min_size = 4; } - print_line("dyndata create"); while (true) { if (gipd->compression == GI_PROBE_S3TC) { @@ -5534,7 +5532,7 @@ void RasterizerStorageGLES3::_render_target_allocate(RenderTarget *rt) { glGenTextures(1, &rt->depth); glBindTexture(GL_TEXTURE_2D, rt->depth); glTexImage2D(GL_TEXTURE_2D, 0, GL_DEPTH24_STENCIL8, rt->width, rt->height, 0, - GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, NULL); + GL_DEPTH_STENCIL, GL_UNSIGNED_INT_24_8, NULL); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); @@ -6270,7 +6268,6 @@ bool RasterizerStorageGLES3::free(RID p_rid) { // delete the texture GIProbeData *gi_probe_data = gi_probe_data_owner.get(p_rid); - print_line("dyndata delete"); glDeleteTextures(1, &gi_probe_data->tex_id); gi_probe_owner.free(p_rid); memdelete(gi_probe_data); @@ -6333,9 +6330,8 @@ void RasterizerStorageGLES3::initialize() { { int max_extensions = 0; - print_line("getting extensions"); glGetIntegerv(GL_NUM_EXTENSIONS, &max_extensions); - print_line("total " + itos(max_extensions)); + print_line("GLES3: max extensions: " + itos(max_extensions)); for (int i = 0; i < max_extensions; i++) { const GLubyte *s = glGetStringi(GL_EXTENSIONS, i); if (!s) @@ -6500,7 +6496,7 @@ void RasterizerStorageGLES3::initialize() { frame.count = 0; frame.prev_tick = 0; frame.delta = 0; - frame.current_rt=NULL; + frame.current_rt = NULL; config.keep_original_textures = false; } diff --git a/drivers/gles3/shader_compiler_gles3.cpp b/drivers/gles3/shader_compiler_gles3.cpp index 6aeb3af2cd..89b056df84 100644 --- a/drivers/gles3/shader_compiler_gles3.cpp +++ b/drivers/gles3/shader_compiler_gles3.cpp @@ -410,7 +410,6 @@ String ShaderCompilerGLES3::_dump_node_code(SL::Node *p_node, int p_level, Gener if (fnode->name == "vertex") { - print_line("vertex uses functions: " + itos(pnode->functions[i].uses_function.size())); _dump_function_deps(pnode, fnode->name, function_code, r_gen_code.vertex_global, added_vtx); r_gen_code.vertex = function_code["vertex"]; } diff --git a/drivers/gles3/shaders/particles.glsl b/drivers/gles3/shaders/particles.glsl index f789be24cf..fa12dd7408 100644 --- a/drivers/gles3/shaders/particles.glsl +++ b/drivers/gles3/shaders/particles.glsl @@ -101,7 +101,7 @@ void main() { restart_phase*= (1.0-explosiveness); bool restart=false; - bool active = velocity_active.a > 0.5; + bool shader_active = velocity_active.a > 0.5; if (system_phase > prev_system_phase) { if (prev_system_phase < restart_phase && system_phase >= restart_phase) { @@ -134,7 +134,7 @@ void main() { uint particle_number = current_cycle * uint(total_particles) + uint(gl_VertexID); if (restart) { - active=emitting; + shader_active=emitting; } mat4 xform; @@ -148,7 +148,7 @@ void main() { out_velocity_active=vec4(0.0); out_custom=vec4(0.0); if (!restart) - active=false; + shader_active=false; xform = mat4( vec4(1.0,0.0,0.0,0.0), @@ -163,7 +163,7 @@ void main() { xform = transpose(mat4(xform_1,xform_2,xform_3,vec4(vec3(0.0),1.0))); } - if (active) { + if (shader_active) { //execute shader { @@ -178,7 +178,7 @@ VERTEX_SHADER_CODE for(int i=0;i<attractor_count;i++) { vec3 rel_vec = xform[3].xyz - attractors[i].pos; - float dist = rel_vec.length(); + float dist = length(rel_vec); if (attractors[i].radius < dist) continue; if (attractors[i].eat_radius>0 && attractors[i].eat_radius > dist) { @@ -215,7 +215,7 @@ VERTEX_SHADER_CODE xform = transpose(xform); - out_velocity_active.a = mix(0.0,1.0,active); + out_velocity_active.a = mix(0.0,1.0,shader_active); out_xform_1 = xform[0]; out_xform_2 = xform[1]; diff --git a/drivers/pulseaudio/audio_driver_pulseaudio.cpp b/drivers/pulseaudio/audio_driver_pulseaudio.cpp index 9aaf5c129b..45827ee4f7 100644 --- a/drivers/pulseaudio/audio_driver_pulseaudio.cpp +++ b/drivers/pulseaudio/audio_driver_pulseaudio.cpp @@ -102,7 +102,6 @@ float AudioDriverPulseAudio::get_latency() { void AudioDriverPulseAudio::thread_func(void *p_udata) { - print_line("thread"); AudioDriverPulseAudio *ad = (AudioDriverPulseAudio *)p_udata; while (!ad->exit_thread) { diff --git a/drivers/unix/os_unix.h b/drivers/unix/os_unix.h index 206559ab3d..67eb5cefdf 100644 --- a/drivers/unix/os_unix.h +++ b/drivers/unix/os_unix.h @@ -76,7 +76,7 @@ public: //virtual void set_mouse_show(bool p_show); //virtual void set_mouse_grab(bool p_grab); //virtual bool is_mouse_grab_enabled() const = 0; - //virtual void get_mouse_pos(int &x, int &y) const; + //virtual void get_mouse_position(int &x, int &y) const; //virtual void set_window_title(const String& p_title); //virtual void set_video_mode(const VideoMode& p_video_mode); diff --git a/editor/animation_editor.cpp b/editor/animation_editor.cpp index 16606b5d12..447f57a73f 100644 --- a/editor/animation_editor.cpp +++ b/editor/animation_editor.cpp @@ -1724,7 +1724,7 @@ bool AnimationKeyEditor::_edit_if_single_selection() { curve_edit->set_transition(animation->track_get_key_transition(idx, key)); /*key_edit_dialog->set_size( Size2( 200,200) ); - key_edit_dialog->set_pos( track_editor->get_global_pos() + ofs + mpos +Point2(-100,20)); + key_edit_dialog->set_position( track_editor->get_global_position() + ofs + mpos +Point2(-100,20)); key_edit_dialog->popup();*/ } @@ -1983,7 +1983,7 @@ void AnimationKeyEditor::_track_editor_gui_input(const InputEvent &p_input) { track_menu->add_item(TTR("Duplicate Transposed"), RIGHT_MENU_DUPLICATE_TRANSPOSE); track_menu->add_item(TTR("Remove Selection"), RIGHT_MENU_REMOVE); - track_menu->set_pos(te->get_global_pos() + mpos); + track_menu->set_position(te->get_global_position() + mpos); interp_editing = -1; cont_editing = -1; @@ -2064,7 +2064,7 @@ void AnimationKeyEditor::_track_editor_gui_input(const InputEvent &p_input) { Rect2 area(ofs.x, ofs.y + ((int(mpos.y) / h) + 1) * h, name_limit, h); track_name->set_text(animation->track_get_path(idx)); - track_name->set_pos(te->get_global_pos() + area.pos); + track_name->set_position(te->get_global_position() + area.pos); track_name->set_size(area.size); track_name->show_modal(); track_name->grab_focus(); @@ -2214,7 +2214,7 @@ void AnimationKeyEditor::_track_editor_gui_input(const InputEvent &p_input) { int popup_y = ofs.y + ((int(mpos.y) / h) + 2) * h; int popup_x = size.width - track_ofs[1]; - track_menu->set_pos(te->get_global_pos() + Point2(popup_x, popup_y)); + track_menu->set_position(te->get_global_position() + Point2(popup_x, popup_y)); wrap_editing = idx; interp_editing = -1; @@ -2237,7 +2237,7 @@ void AnimationKeyEditor::_track_editor_gui_input(const InputEvent &p_input) { int popup_y = ofs.y + ((int(mpos.y) / h) + 2) * h; int popup_x = size.width - track_ofs[2]; - track_menu->set_pos(te->get_global_pos() + Point2(popup_x, popup_y)); + track_menu->set_position(te->get_global_position() + Point2(popup_x, popup_y)); interp_editing = idx; cont_editing = -1; @@ -2260,7 +2260,7 @@ void AnimationKeyEditor::_track_editor_gui_input(const InputEvent &p_input) { int popup_y = ofs.y + ((int(mpos.y) / h) + 2) * h; int popup_x = size.width - track_ofs[3]; - track_menu->set_pos(te->get_global_pos() + Point2(popup_x, popup_y)); + track_menu->set_position(te->get_global_position() + Point2(popup_x, popup_y)); interp_editing = -1; wrap_editing = -1; @@ -2309,7 +2309,7 @@ void AnimationKeyEditor::_track_editor_gui_input(const InputEvent &p_input) { cvi_track = idx; cvi_pos = pos; - type_menu->set_pos(get_global_pos() + mpos + ofs); + type_menu->set_position(get_global_position() + mpos + ofs); type_menu->popup(); return; } @@ -3749,7 +3749,7 @@ AnimationKeyEditor::AnimationKeyEditor() { root = NULL; //menu = memnew( MenuButton ); //menu->set_flat(true); - //menu->set_pos(Point2()); + //menu->set_position(Point2()); //add_child(menu); zoomicon = memnew(TextureRect); @@ -3891,7 +3891,7 @@ AnimationKeyEditor::AnimationKeyEditor() { /* l = memnew( Label ); l->set_text("Base: "); - l->set_pos(Point2(0,3)); + l->set_position(Point2(0,3)); //dr_panel->add_child(l);*/ //menu->get_popup()->connect("id_pressed",this,"_menu_callback"); diff --git a/editor/asset_library_editor_plugin.cpp b/editor/asset_library_editor_plugin.cpp index ca99541bbd..971adb14cf 100644 --- a/editor/asset_library_editor_plugin.cpp +++ b/editor/asset_library_editor_plugin.cpp @@ -144,7 +144,7 @@ EditorAssetLibraryItem::EditorAssetLibraryItem() { rating_hb->add_child(stars[i]); } price = memnew(Label); - price->set_text("Free"); + price->set_text(TTR("Free")); vb->add_child(price); set_custom_minimum_size(Size2(250, 100)); @@ -226,12 +226,12 @@ void EditorAssetLibraryItemDescription::configure(const String &p_title, int p_a sha256 = p_sha256_hash; item->configure(p_title, p_asset_id, p_category, p_category_id, p_author, p_author_id, p_rating, p_cost); description->clear(); - description->add_text("Version: " + p_version_string + "\n"); - description->add_text("Contents: "); + description->add_text(TTR("Version:") + " " + p_version_string + "\n"); + description->add_text(TTR("Contents:") + " "); description->push_meta(p_browse_url); - description->add_text("View Files"); + description->add_text(TTR("View Files")); description->pop(); - description->add_text("\nDescription:\n\n"); + description->add_text("\n" + TTR("Description:") + "\n\n"); description->append_bbcode(p_description); set_title(p_title); } @@ -280,7 +280,6 @@ EditorAssetLibraryItemDescription::EditorAssetLibraryItemDescription() { description = memnew(RichTextLabel); description->connect("meta_clicked", this, "_link_click"); - //desc_vbox->add_child(description); desc_bg->add_child(description); desc_bg->add_style_override("panel", get_stylebox("normal", "TextEdit")); @@ -301,8 +300,8 @@ EditorAssetLibraryItemDescription::EditorAssetLibraryItemDescription() { preview_hb->set_v_size_flags(SIZE_EXPAND_FILL); previews->add_child(preview_hb); - get_ok()->set_text("Install"); - get_cancel()->set_text("Close"); + get_ok()->set_text(TTR("Install")); + get_cancel()->set_text(TTR("Close")); } /////////////////////////////////////////////////////////////////////////////////// @@ -314,48 +313,49 @@ void EditorAssetLibraryItemDownload::_http_download_completed(int p_status, int switch (p_status) { case HTTPRequest::RESULT_CANT_RESOLVE: { - error_text = ("Can't resolve hostname: " + host); - status->set_text("Can't resolve."); + error_text = TTR("Can't resolve hostname:") + " " + host; + status->set_text(TTR("Can't resolve.")); } break; case HTTPRequest::RESULT_BODY_SIZE_LIMIT_EXCEEDED: case HTTPRequest::RESULT_CONNECTION_ERROR: case HTTPRequest::RESULT_CHUNKED_BODY_SIZE_MISMATCH: { - error_text = ("Connection error, please try again."); - status->set_text("Can't connect."); + error_text = TTR("Connection error, please try again."); + status->set_text(TTR("Can't connect.")); } break; case HTTPRequest::RESULT_SSL_HANDSHAKE_ERROR: case HTTPRequest::RESULT_CANT_CONNECT: { - error_text = ("Can't connect to host: " + host); - status->set_text("Can't connect."); + error_text = TTR("Can't connect to host:") + " " + host; + status->set_text(TTR("Can't connect.")); } break; case HTTPRequest::RESULT_NO_RESPONSE: { - error_text = ("No response from host: " + host); - status->set_text("No response."); + error_text = TTR("No response from host:") + " " + host; + status->set_text(TTR("No response.")); } break; case HTTPRequest::RESULT_REQUEST_FAILED: { - error_text = ("Request failed, return code: " + itos(p_code)); - status->set_text("Req. Failed."); + error_text = TTR("Request failed, return code:") + " " + itos(p_code); + status->set_text(TTR("Req. Failed.")); } break; case HTTPRequest::RESULT_REDIRECT_LIMIT_REACHED: { - error_text = ("Request failed, too many redirects"); - status->set_text("Redirect Loop."); + error_text = TTR("Request failed, too many redirects"); + status->set_text(TTR("Redirect Loop.")); } break; default: { if (p_code != 200) { - error_text = ("Request failed, return code: " + itos(p_code)); - status->set_text("Failed: " + itos(p_code)); + error_text = TTR("Request failed, return code:") + " " + itos(p_code); + status->set_text(TTR("Failed:") + " " + itos(p_code)); } else if (sha256 != "") { String download_sha256 = FileAccess::get_sha256(download->get_download_file()); if (sha256 != download_sha256) { - error_text = "Bad download hash, assuming file has been tampered with.\nExpected: " + sha256 + "\nGot: " + download_sha256; - status->set_text("Failed sha256 hash check"); + error_text = TTR("Bad download hash, assuming file has been tampered with.") + "\n"; + error_text += TTR("Expected:") + " " + sha256 + "\n" + TTR("Got:") + " " + download_sha256; + status->set_text(TTR("Failed sha256 hash check")); } } } break; } if (error_text != String()) { - download_error->set_text("Asset Download Error:\n" + error_text); + download_error->set_text(TTR("Asset Download Error:") + "\n" + error_text); download_error->popup_centered_minsize(); return; } @@ -368,7 +368,7 @@ void EditorAssetLibraryItemDownload::_http_download_completed(int p_status, int progress->set_value(download->get_downloaded_bytes()); - status->set_text("Success! (" + String::humanize_size(download->get_downloaded_bytes()) + ")"); + status->set_text(TTR("Success!") + " (" + String::humanize_size(download->get_downloaded_bytes()) + ")"); set_process(false); } @@ -396,19 +396,19 @@ void EditorAssetLibraryItemDownload::_notification(int p_what) { int cstatus = download->get_http_client_status(); if (cstatus == HTTPClient::STATUS_BODY) - status->set_text("Fetching: " + String::humanize_size(download->get_downloaded_bytes())); + status->set_text(TTR("Fetching:") + " " + String::humanize_size(download->get_downloaded_bytes())); if (cstatus != prev_status) { switch (cstatus) { case HTTPClient::STATUS_RESOLVING: { - status->set_text("Resolving.."); + status->set_text(TTR("Resolving..")); } break; case HTTPClient::STATUS_CONNECTING: { - status->set_text("Connecting.."); + status->set_text(TTR("Connecting..")); } break; case HTTPClient::STATUS_REQUESTING: { - status->set_text("Requesting.."); + status->set_text(TTR("Requesting..")); } break; default: {} } @@ -442,7 +442,7 @@ void EditorAssetLibraryItemDownload::_make_request() { Error err = download->request(host); if (err != OK) { - status->set_text("Error making request"); + status->set_text(TTR("Error making request")); } else { set_process(true); } @@ -483,7 +483,7 @@ EditorAssetLibraryItemDownload::EditorAssetLibraryItemDownload() { vb->add_spacer(); - status = memnew(Label("Idle")); + status = memnew(Label(TTR("Idle"))); vb->add_child(status); status->add_color_override("font_color", Color(0.5, 0.5, 0.5)); progress = memnew(ProgressBar); @@ -494,12 +494,12 @@ EditorAssetLibraryItemDownload::EditorAssetLibraryItemDownload() { hb2->add_spacer(); install = memnew(Button); - install->set_text("Install"); + install->set_text(TTR("Install")); install->set_disabled(true); install->connect("pressed", this, "_install"); retry = memnew(Button); - retry->set_text("Retry"); + retry->set_text(TTR("Retry")); retry->connect("pressed", this, "_make_request"); hb2->add_child(retry); @@ -512,7 +512,7 @@ EditorAssetLibraryItemDownload::EditorAssetLibraryItemDownload() { download_error = memnew(AcceptDialog); add_child(download_error); - download_error->set_title("Download Error"); + download_error->set_title(TTR("Download Error")); asset_installer = memnew(EditorAssetInstaller); add_child(asset_installer); @@ -585,7 +585,7 @@ void EditorAssetLibrary::_install_asset() { if (d && d->get_asset_id() == description->get_asset_id()) { if (EditorNode::get_singleton() != NULL) - EditorNode::get_singleton()->show_warning("Download for this asset is already in progress!"); + EditorNode::get_singleton()->show_warning(TTR("Download for this asset is already in progress!")); return; } } @@ -902,7 +902,7 @@ HBoxContainer *EditorAssetLibrary::_make_pages(int p_page, int p_page_count, int if (p_page != 0) { LinkButton *first = memnew(LinkButton); - first->set_text("first"); + first->set_text(TTR("first")); first->add_color_override("font_color", gray); first->set_underline_mode(LinkButton::UNDERLINE_MODE_ON_HOVER); first->connect("pressed", this, "_search", varray(0)); @@ -911,7 +911,7 @@ HBoxContainer *EditorAssetLibrary::_make_pages(int p_page, int p_page_count, int if (p_page > 0) { LinkButton *prev = memnew(LinkButton); - prev->set_text("prev"); + prev->set_text(TTR("prev")); prev->add_color_override("font_color", gray); prev->set_underline_mode(LinkButton::UNDERLINE_MODE_ON_HOVER); prev->connect("pressed", this, "_search", varray(p_page - 1)); @@ -939,7 +939,7 @@ HBoxContainer *EditorAssetLibrary::_make_pages(int p_page, int p_page_count, int if (p_page < p_page_count - 1) { LinkButton *next = memnew(LinkButton); - next->set_text("next"); + next->set_text(TTR("next")); next->add_color_override("font_color", gray); next->set_underline_mode(LinkButton::UNDERLINE_MODE_ON_HOVER); next->connect("pressed", this, "_search", varray(p_page + 1)); @@ -949,7 +949,7 @@ HBoxContainer *EditorAssetLibrary::_make_pages(int p_page, int p_page_count, int if (p_page != p_page_count - 1) { LinkButton *last = memnew(LinkButton); - last->set_text("last"); + last->set_text(TTR("last")); last->add_color_override("font_color", gray); last->set_underline_mode(LinkButton::UNDERLINE_MODE_ON_HOVER); hbc->add_child(last); @@ -992,30 +992,30 @@ void EditorAssetLibrary::_http_request_completed(int p_status, int p_code, const switch (p_status) { case HTTPRequest::RESULT_CANT_RESOLVE: { - error_label->set_text("Can't resolve hostname: " + host); + error_label->set_text(TTR("Can't resolve hostname:") + " " + host); } break; case HTTPRequest::RESULT_BODY_SIZE_LIMIT_EXCEEDED: case HTTPRequest::RESULT_CONNECTION_ERROR: case HTTPRequest::RESULT_CHUNKED_BODY_SIZE_MISMATCH: { - error_label->set_text("Connection error, please try again."); + error_label->set_text(TTR("Connection error, please try again.")); } break; case HTTPRequest::RESULT_SSL_HANDSHAKE_ERROR: case HTTPRequest::RESULT_CANT_CONNECT: { - error_label->set_text("Can't connect to host: " + host); + error_label->set_text(TTR("Can't connect to host:") + " " + host); } break; case HTTPRequest::RESULT_NO_RESPONSE: { - error_label->set_text("No response from host: " + host); + error_label->set_text(TTR("No response from host:") + " " + host); } break; case HTTPRequest::RESULT_REQUEST_FAILED: { - error_label->set_text("Request failed, return code: " + itos(p_code)); + error_label->set_text(TTR("Request failed, return code:") + " " + itos(p_code)); } break; case HTTPRequest::RESULT_REDIRECT_LIMIT_REACHED: { - error_label->set_text("Request failed, too many redirects"); + error_label->set_text(TTR("Request failed, too many redirects")); } break; default: { if (p_code != 200) { - error_label->set_text("Request failed, return code: " + itos(p_code)); + error_label->set_text(TTR("Request failed, return code:") + " " + itos(p_code)); } else { error_abort = false; @@ -1048,7 +1048,7 @@ void EditorAssetLibrary::_http_request_completed(int p_status, int p_code, const case REQUESTING_CONFIG: { categories->clear(); - categories->add_item("All"); + categories->add_item(TTR("All")); categories->set_item_metadata(0, 0); if (d.has("categories")) { Array clist = d["categories"]; @@ -1283,7 +1283,7 @@ EditorAssetLibrary::EditorAssetLibrary(bool p_templates_only) { search_hb->add_child(filter); filter->set_h_size_flags(SIZE_EXPAND_FILL); filter->connect("text_entered", this, "_search"); - search = memnew(Button("Search")); + search = memnew(Button(TTR("Search"))); search->connect("pressed", this, "_search"); search_hb->add_child(search); @@ -1291,12 +1291,12 @@ EditorAssetLibrary::EditorAssetLibrary(bool p_templates_only) { search_hb->add_child(memnew(VSeparator)); Button *open_asset = memnew(Button); - open_asset->set_text("Import"); + open_asset->set_text(TTR("Import")); search_hb->add_child(open_asset); open_asset->connect("pressed", this, "_asset_open"); Button *plugins = memnew(Button); - plugins->set_text("Plugins"); + plugins->set_text(TTR("Plugins")); search_hb->add_child(plugins); plugins->connect("pressed", this, "_manage_plugins"); @@ -1342,9 +1342,9 @@ EditorAssetLibrary::EditorAssetLibrary(bool p_templates_only) { search_hb2->add_child(memnew(Label(TTR("Site:") + " "))); repository = memnew(OptionButton); - repository->add_item("Godot"); + repository->add_item("godotengine.org"); repository->set_item_metadata(0, "https://godotengine.org/asset-library/api"); - repository->add_item("Localhost"); // TODO: Maybe remove? + repository->add_item("localhost"); // TODO: Maybe remove? repository->set_item_metadata(1, "http://127.0.0.1/asset-library/api"); repository->connect("item_selected", this, "_repository_changed"); diff --git a/editor/call_dialog.cpp b/editor/call_dialog.cpp index d2b46863b0..8cf9ed6ef4 100644 --- a/editor/call_dialog.cpp +++ b/editor/call_dialog.cpp @@ -290,8 +290,8 @@ CallDialog::CallDialog() { property_editor->hide_top_label(); add_child(property_editor); - method_label = memnew( Label ); - method_label->set_pos( Point2( 15,25) ); + method_label = memnew(Label); + method_label->set_position(Point2( 15,25)); method_label->set_text(TTR("Method List:")); add_child(method_label); diff --git a/editor/code_editor.cpp b/editor/code_editor.cpp index cc20912612..4ec2a3c391 100644 --- a/editor/code_editor.cpp +++ b/editor/code_editor.cpp @@ -64,7 +64,7 @@ GotoLineDialog::GotoLineDialog() { set_title(TTR("Go to Line")); Label *l = memnew(Label); l->set_text(TTR("Line Number:")); - l->set_pos(Point2(5, 5)); + l->set_position(Point2(5, 5)); add_child(l); line = memnew(LineEdit); @@ -1071,7 +1071,8 @@ void CodeTextEditor::update_editor_settings() { text_editor->set_auto_brace_completion(EditorSettings::get_singleton()->get("text_editor/completion/auto_brace_complete")); text_editor->set_scroll_pass_end_of_file(EditorSettings::get_singleton()->get("text_editor/cursor/scroll_past_end_of_file")); - text_editor->set_tab_size(EditorSettings::get_singleton()->get("text_editor/indent/tab_size")); + text_editor->set_indent_using_spaces(EditorSettings::get_singleton()->get("text_editor/indent/type") == "Tabs" ? 0 : 1); + text_editor->set_indent_size(EditorSettings::get_singleton()->get("text_editor/indent/size")); text_editor->set_draw_tabs(EditorSettings::get_singleton()->get("text_editor/indent/draw_tabs")); text_editor->set_show_line_numbers(EditorSettings::get_singleton()->get("text_editor/line_numbers/show_line_numbers")); text_editor->set_line_numbers_zero_padded(EditorSettings::get_singleton()->get("text_editor/line_numbers/line_numbers_zero_padded")); diff --git a/editor/connections_dialog.cpp b/editor/connections_dialog.cpp index 9c6624d9e5..93c2b7493c 100644 --- a/editor/connections_dialog.cpp +++ b/editor/connections_dialog.cpp @@ -767,7 +767,7 @@ void ConnectionsDock::_something_activated() { Ref<Script> script = c.target->get_script(); - if (script.is_valid() && ScriptEditor::get_singleton()->script_go_to_method(script, c.method)) { + if (script.is_valid() && ScriptEditor::get_singleton()->script_goto_method(script, c.method)) { editor->call("_editor_select", EditorNode::EDITOR_SCRIPT); } } diff --git a/editor/editor_audio_buses.cpp b/editor/editor_audio_buses.cpp index 67d9977149..6ef32a6afd 100644 --- a/editor/editor_audio_buses.cpp +++ b/editor/editor_audio_buses.cpp @@ -342,7 +342,7 @@ void EditorAudioBus::_effect_edited() { if (effect->get_metadata(0) == Variant()) { Rect2 area = effects->get_item_rect(effect); - effect_options->set_pos(effects->get_global_pos() + area.pos + Vector2(0, area.size.y)); + effect_options->set_position(effects->get_global_position() + area.pos + Vector2(0, area.size.y)); effect_options->popup(); //add effect } else { @@ -394,7 +394,7 @@ void EditorAudioBus::_gui_input(const InputEvent &p_event) { if (p_event.type == InputEvent::MOUSE_BUTTON && p_event.mouse_button.button_index == 2 && p_event.mouse_button.pressed) { Vector2 pos = Vector2(p_event.mouse_button.x, p_event.mouse_button.y); - delete_popup->set_pos(get_global_pos() + pos); + delete_popup->set_position(get_global_position() + pos); delete_popup->popup(); } } @@ -420,7 +420,7 @@ Variant EditorAudioBus::get_drag_data(const Point2 &p_point) { c->add_child(p); p->add_style_override("panel", get_stylebox("focus", "Button")); p->set_size(get_size()); - p->set_pos(-p_point); + p->set_position(-p_point); set_drag_preview(c); Dictionary d; d["type"] = "move_audio_bus"; @@ -576,7 +576,7 @@ void EditorAudioBus::_effect_rmb(const Vector2 &p_pos) { if (item->get_metadata(0).get_type() != Variant::INT) return; - delete_effect_popup->set_pos(get_global_mouse_pos()); + delete_effect_popup->set_position(get_global_mouse_position()); delete_effect_popup->popup(); } diff --git a/editor/editor_file_system.cpp b/editor/editor_file_system.cpp index 2612a2af16..3fb2923696 100644 --- a/editor/editor_file_system.cpp +++ b/editor/editor_file_system.cpp @@ -487,6 +487,22 @@ bool EditorFileSystem::_check_missing_imported_files(const String &p_path) { return true; } +static bool _find_project(const String &p_path) { + DirAccess *dir_access = DirAccess::create_for_path(p_path); + bool ret = false; + while (true) { + bool is_dir; + String file = dir_access->get_next(&is_dir); + if (file == "") + break; + if (file.ends_with(".godot")) { + ret = true; + } + } + memdelete(dir_access); + return ret; +} + void EditorFileSystem::_scan_new_dir(EditorFileSystemDirectory *p_dir, DirAccess *da, const ScanProgress &p_progress) { List<String> dirs; @@ -509,8 +525,9 @@ void EditorFileSystem::_scan_new_dir(EditorFileSystemDirectory *p_dir, DirAccess if (f.begins_with(".")) //ignore hidden and . / .. continue; - if (FileAccess::exists(cd.plus_file(f).plus_file("godot.cfg"))) // skip if another project inside this + if (_find_project(cd.plus_file(f))) { continue; + } dirs.push_back(f); @@ -676,34 +693,35 @@ void EditorFileSystem::_scan_fs_changes(EditorFileSystemDirectory *p_dir, const while (true) { bool isdir; - String f = da->get_next(&isdir); - if (f == "") + String file = da->get_next(&isdir); + if (file == "") break; if (isdir) { - if (f.begins_with(".")) //ignore hidden and . / .. + if (file.begins_with(".")) //ignore hidden and . / .. continue; - int idx = p_dir->find_dir_index(f); + int idx = p_dir->find_dir_index(file); if (idx == -1) { - if (FileAccess::exists(cd.plus_file(f).plus_file("godot.cfg"))) // skip if another project inside this + if (_find_project(cd.plus_file(file))) { continue; + } EditorFileSystemDirectory *efd = memnew(EditorFileSystemDirectory); efd->parent = p_dir; - efd->name = f; + efd->name = file; DirAccess *d = DirAccess::create(DirAccess::ACCESS_RESOURCES); - d->change_dir(cd.plus_file(f)); + d->change_dir(cd.plus_file(file)); _scan_new_dir(efd, d, p_progress.get_sub(1, 1)); memdelete(d); ItemAction ia; ia.action = ItemAction::ACTION_DIR_ADD; ia.dir = p_dir; - ia.file = f; + ia.file = file; ia.new_dir = efd; scan_actions.push_back(ia); } else { @@ -711,16 +729,16 @@ void EditorFileSystem::_scan_fs_changes(EditorFileSystemDirectory *p_dir, const } } else { - String ext = f.get_extension().to_lower(); + String ext = file.get_extension().to_lower(); if (!valid_extensions.has(ext)) continue; //invalid - int idx = p_dir->find_file_index(f); + int idx = p_dir->find_file_index(file); if (idx == -1) { //never seen this file, add actition to add it EditorFileSystemDirectory::FileInfo *fi = memnew(EditorFileSystemDirectory::FileInfo); - fi->file = f; + fi->file = file; String path = cd.plus_file(fi->file); fi->modified_time = FileAccess::get_modified_time(path); @@ -731,7 +749,7 @@ void EditorFileSystem::_scan_fs_changes(EditorFileSystemDirectory *p_dir, const ItemAction ia; ia.action = ItemAction::ACTION_FILE_ADD; ia.dir = p_dir; - ia.file = f; + ia.file = file; ia.new_file = fi; scan_actions.push_back(ia); } @@ -739,14 +757,14 @@ void EditorFileSystem::_scan_fs_changes(EditorFileSystemDirectory *p_dir, const if (import_extensions.has(ext)) { //if it can be imported, and it was added, it needs to be reimported print_line("REIMPORT: file was not found before, reimport"); - print_line("at dir: " + p_dir->get_path() + " file: " + f); + print_line("at dir: " + p_dir->get_path() + " file: " + file); for (int i = 0; i < p_dir->files.size(); i++) { print_line(itos(i) + ": " + p_dir->files[i]->file); } ItemAction ia; ia.action = ItemAction::ACTION_FILE_REIMPORT; ia.dir = p_dir; - ia.file = f; + ia.file = file; scan_actions.push_back(ia); } diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index 06f1b9a673..04d369fed4 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -236,7 +236,7 @@ void EditorNode::_notification(int p_what) { Rect2 grect = scene_root_base->get_global_rect(); Rect2 grectsrp = scene_root_parent->get_global_rect(); if (grect!=grectsrp) { - scene_root_parent->set_pos(grect.pos); + scene_root_parent->set_position(grect.pos); scene_root_parent->set_size(grect.size); } } @@ -435,7 +435,7 @@ void EditorNode::_sources_changed(bool p_exist) { if (defer_load_scene != "") { - print_line("loading scene DEFERED"); + print_line("loading scene DEFERRED"); load_scene(defer_load_scene); defer_load_scene = ""; } @@ -447,18 +447,6 @@ void EditorNode::_sources_changed(bool p_exist) { void EditorNode::_vp_resized() { } -void EditorNode::_rebuild_import_menu() { - PopupMenu *p = import_menu->get_popup(); - p->clear(); -//p->add_item(TTR("Node From Scene"), FILE_IMPORT_SUBSCENE); -//p->add_separator(); -#if 0 - for (int i = 0; i < editor_import_export->get_import_plugin_count(); i++) { - p->add_item(editor_import_export->get_import_plugin(i)->get_visible_name(), IMPORT_PLUGIN_BASE + i); - } -#endif -} - void EditorNode::_node_renamed() { if (property_editor) @@ -4469,7 +4457,7 @@ Variant EditorNode::drag_resource(const Ref<Resource> &p_res, Control *p_from) { p_from->set_drag_preview(drag_control); //wait until it enters scene - label->set_pos(Point2((preview->get_width() - label->get_minimum_size().width) / 2, preview->get_height())); + label->set_position(Point2((preview->get_width() - label->get_minimum_size().width) / 2, preview->get_height())); Dictionary drag_data; drag_data["type"] = "resource"; @@ -4862,9 +4850,9 @@ EditorNode::EditorNode() { import_wav.instance(); ResourceFormatImporter::get_singleton()->add_importer(import_wav); - //Ref<ResourceImporterOBJ> import_obj; - //import_obj.instance(); - //ResourceFormatImporter::get_singleton()->add_importer(import_obj); + Ref<ResourceImporterOBJ> import_obj; + import_obj.instance(); + ResourceFormatImporter::get_singleton()->add_importer(import_obj); Ref<ResourceImporterScene> import_scene; import_scene.instance(); @@ -5152,7 +5140,7 @@ EditorNode::EditorNode() { //left_menu_hb->add_child( prev_scene ); prev_scene->connect("pressed", this, "_menu_option", make_binds(FILE_OPEN_PREV)); gui_base->add_child(prev_scene); - prev_scene->set_pos(Point2(3, 24)); + prev_scene->set_position(Point2(3, 24)); prev_scene->hide(); ED_SHORTCUT("editor/next_tab", TTR("Next tab"), KEY_MASK_CMD + KEY_TAB); @@ -5232,7 +5220,7 @@ EditorNode::EditorNode() { #if 0 node_menu = memnew( MenuButton ); node_menu->set_text("Node"); - node_menu->set_pos( Point2( 50,0) ); + node_menu->set_position( Point2( 50,0) ); menu_panel->add_child( node_menu ); p=node_menu->get_popup(); @@ -5253,19 +5241,10 @@ EditorNode::EditorNode() { resource_menu = memnew( MenuButton ); resource_menu->set_text("Resource"); - resource_menu->set_pos( Point2( 90,0) ); + resource_menu->set_position( Point2( 90,0) ); menu_panel->add_child( resource_menu ); #endif - import_menu = memnew(MenuButton); - import_menu->set_tooltip(TTR("Import assets to the project.")); - import_menu->set_text(TTR("Import")); - //import_menu->set_icon(gui_base->get_icon("Save","EditorIcons")); - left_menu_hb->add_child(import_menu); - - p = import_menu->get_popup(); - p->connect("id_pressed", this, "_menu_option"); - tool_menu = memnew(MenuButton); tool_menu->set_tooltip(TTR("Miscellaneous project or scene-wide tools.")); tool_menu->set_text(TTR("Tools")); @@ -5288,7 +5267,7 @@ EditorNode::EditorNode() { //Separator *s1 = memnew( VSeparator ); //menu_panel->add_child(s1); - //s1->set_pos(Point2(210,4)); + //s1->set_position(Point2(210,4)); //s1->set_size(Point2(10,15)); play_cc = memnew(CenterContainer); @@ -5403,7 +5382,7 @@ EditorNode::EditorNode() { /* run_settings_button = memnew( ToolButton ); menu_panel->add_child(run_settings_button); - run_settings_button->set_pos(Point2(305,0)); + run_settings_button->set_position(Point2(305,0)); run_settings_button->set_focus_mode(Control::FOCUS_NONE); run_settings_button->set_icon(gui_base->get_icon("Run","EditorIcons")); run_settings_button->connect("pressed", this,"_menu_option",make_binds(RUN_SETTINGS)); @@ -5496,7 +5475,7 @@ EditorNode::EditorNode() { /* Separator *s2 = memnew( VSeparator ); menu_panel->add_child(s2); - s2->set_pos(Point2(338,4)); + s2->set_position(Point2(338,4)); s2->set_size(Point2(10,15)); */ @@ -5728,7 +5707,7 @@ EditorNode::EditorNode() { /* animation_menu = memnew( ToolButton ); - animation_menu->set_pos(Point2(500,0)); + animation_menu->set_position(Point2(500,0)); animation_menu->set_size(Size2(20,20)); animation_menu->set_toggle_mode(true); animation_menu->set_focus_mode(Control::FOCUS_NONE); @@ -5960,8 +5939,6 @@ EditorNode::EditorNode() { circle_step_frame = Engine::get_singleton()->get_frames_drawn(); circle_step = 0; - _rebuild_import_menu(); - editor_plugin_screen = NULL; editor_plugins_over = memnew(EditorPluginList); @@ -6074,7 +6051,10 @@ EditorNode::EditorNode() { { _initializing_addons = true; - Vector<String> addons = GlobalConfig::get_singleton()->get("editor_plugins/enabled"); + Vector<String> addons; + if (GlobalConfig::get_singleton()->has("editor_plugins/enabled")) { + addons = GlobalConfig::get_singleton()->get("editor_plugins/enabled"); + } for (int i = 0; i < addons.size(); i++) { set_addon_plugin_enabled(addons[i], true); diff --git a/editor/editor_node.h b/editor/editor_node.h index e7f4085fc5..7de713eae9 100644 --- a/editor/editor_node.h +++ b/editor/editor_node.h @@ -242,7 +242,6 @@ private: HBoxContainer *menu_hb; Control *viewport; MenuButton *file_menu; - MenuButton *import_menu; MenuButton *tool_menu; ToolButton *export_button; ToolButton *prev_scene; @@ -447,8 +446,6 @@ private: void _show_messages(); void _vp_resized(); - void _rebuild_import_menu(); - void _save_scene(String p_file, int idx = -1); void _instance_request(const Vector<String> &p_files); diff --git a/editor/editor_path.cpp b/editor/editor_path.cpp index 33dc30fb73..98e0808ba5 100644 --- a/editor/editor_path.cpp +++ b/editor/editor_path.cpp @@ -80,7 +80,7 @@ void EditorPath::_gui_input(const InputEvent &p_event) { objects.clear(); popup->clear(); _add_children_to_popup(obj); - popup->set_pos(get_global_pos() + Vector2(0, get_size().height)); + popup->set_position(get_global_position() + Vector2(0, get_size().height)); popup->set_size(Size2(get_size().width, 1)); popup->popup(); } diff --git a/editor/editor_settings.cpp b/editor/editor_settings.cpp index 8ea5d16bbf..bec4fdadc7 100644 --- a/editor/editor_settings.cpp +++ b/editor/editor_settings.cpp @@ -407,7 +407,7 @@ void EditorSettings::setup_network() { IP::get_singleton()->get_local_addresses(&local_ip); String lip; String hint; - String current = get("network/debug_host"); + String current = has("network/debug_host") ? get("network/debug_host") : ""; for (List<IP_Address>::Element *E = local_ip.front(); E; E = E->next()) { @@ -506,7 +506,7 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) { set("interface/dim_editor_on_dialog_popup", true); set("interface/dim_amount", 0.6f); hints["interface/dim_amount"] = PropertyInfo(Variant::REAL, "interface/dim_amount", PROPERTY_HINT_RANGE, "0,1,0.01", PROPERTY_USAGE_DEFAULT); - set("interface/dim_transition_time", 0.11f); + set("interface/dim_transition_time", 0.08f); hints["interface/dim_transition_time"] = PropertyInfo(Variant::REAL, "interface/dim_transition_time", PROPERTY_HINT_RANGE, "0,1,0.001", PROPERTY_USAGE_DEFAULT); set("filesystem/directories/autoscan_project_path", ""); @@ -529,8 +529,11 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) { set("text_editor/highlighting/highlight_all_occurrences", true); set("text_editor/cursor/scroll_past_end_of_file", false); - set("text_editor/indent/tab_size", 4); - hints["text_editor/indent/tab_size"] = PropertyInfo(Variant::INT, "text_editor/indent/tab_size", PROPERTY_HINT_RANGE, "1, 64, 1"); // size of 0 crashes. + set("text_editor/indent/type", 0); + hints["text_editor/indent/type"] = PropertyInfo(Variant::STRING, "text_editor/indent/type", PROPERTY_HINT_ENUM, "Tabs,Spaces"); + set("text_editor/indent/size", 4); + hints["text_editor/indent/size"] = PropertyInfo(Variant::INT, "text_editor/indent/size", PROPERTY_HINT_RANGE, "1, 64, 1"); // size of 0 crashes. + set("text_editor/indent/convert_indent_on_save", false); set("text_editor/indent/draw_tabs", true); set("text_editor/line_numbers/show_line_numbers", true); @@ -588,9 +591,7 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) { set("editors/2d/bone_color2", Color(0.75, 0.75, 0.75, 0.9)); set("editors/2d/bone_selected_color", Color(0.9, 0.45, 0.45, 0.9)); set("editors/2d/bone_ik_color", Color(0.9, 0.9, 0.45, 0.9)); - set("editors/2d/keep_margins_when_changing_anchors", false); - set("editors/2d/warped_mouse_panning", true); set("run/window_placement/rect", 0); diff --git a/editor/filesystem_dock.cpp b/editor/filesystem_dock.cpp index 79bce2c150..9d10117418 100644 --- a/editor/filesystem_dock.cpp +++ b/editor/filesystem_dock.cpp @@ -1102,7 +1102,7 @@ void FileSystemDock::_dir_rmb_pressed(const Vector2 &p_pos) { folder_options->add_item(TTR("Expand all"), FOLDER_EXPAND_ALL); folder_options->add_item(TTR("Collapse all"), FOLDER_COLLAPSE_ALL); - folder_options->set_pos(tree->get_global_pos() + p_pos); + folder_options->set_position(tree->get_global_position() + p_pos); folder_options->popup(); } @@ -1526,7 +1526,7 @@ void FileSystemDock::_files_list_rmb_select(int p_item, const Vector2 &p_pos) { */ } - file_options->set_pos(files->get_global_pos() + p_pos); + file_options->set_position(files->get_global_position() + p_pos); file_options->popup(); } diff --git a/editor/plugins/animation_player_editor_plugin.cpp b/editor/plugins/animation_player_editor_plugin.cpp index c79bdef71d..0be7b202a8 100644 --- a/editor/plugins/animation_player_editor_plugin.cpp +++ b/editor/plugins/animation_player_editor_plugin.cpp @@ -87,7 +87,7 @@ void AnimationPlayerEditor::_notification(int p_what) { } last_active = player->is_playing(); - //seek->set_val(player->get_pos()); + //seek->set_val(player->get_position()); updating = false; } @@ -1386,13 +1386,13 @@ AnimationPlayerEditor::AnimationPlayerEditor(EditorNode *p_editor) { add_child(name_dialog); name = memnew(LineEdit); name_dialog->add_child(name); - name->set_pos(Point2(18, 30)); + name->set_position(Point2(18, 30)); name->set_anchor_and_margin(MARGIN_RIGHT, ANCHOR_END, 10); name_dialog->register_text_enter(name); l = memnew(Label); l->set_text(TTR("Animation Name:")); - l->set_pos(Point2(10, 10)); + l->set_position(Point2(10, 10)); name_dialog->add_child(l); name_title = l; diff --git a/editor/plugins/animation_tree_editor_plugin.cpp b/editor/plugins/animation_tree_editor_plugin.cpp index eb669f95b5..e126cdf40f 100644 --- a/editor/plugins/animation_tree_editor_plugin.cpp +++ b/editor/plugins/animation_tree_editor_plugin.cpp @@ -261,12 +261,12 @@ void AnimationTreeEditor::_popup_edit_dialog() { Ref<StyleBox> style = get_stylebox("panel", "PopupMenu"); Size2 size = get_node_size(edited_node); Point2 popup_pos(pos.x + style->get_margin(MARGIN_LEFT), pos.y + size.y - style->get_margin(MARGIN_BOTTOM)); - popup_pos += get_global_pos(); + popup_pos += get_global_position(); if (renaming_edit) { edit_label[0]->set_text(TTR("New name:")); - edit_label[0]->set_pos(Point2(5, 5)); + edit_label[0]->set_position(Point2(5, 5)); edit_label[0]->show(); edit_line[0]->set_begin(Point2(15, 25)); edit_line[0]->set_text(edited_node); @@ -294,18 +294,18 @@ void AnimationTreeEditor::_popup_edit_dialog() { master_anim_popup->add_item(E->get()); } - master_anim_popup->set_pos(popup_pos); + master_anim_popup->set_position(popup_pos); master_anim_popup->popup(); } else { property_editor->edit(this, "", Variant::OBJECT, anim_tree->animation_node_get_animation(edited_node), PROPERTY_HINT_RESOURCE_TYPE, "Animation"); - property_editor->set_pos(popup_pos); + property_editor->set_position(popup_pos); property_editor->popup(); updating_edit = false; } return; case AnimationTreePlayer::NODE_TIMESCALE: edit_label[0]->set_text(TTR("Scale:")); - edit_label[0]->set_pos(Point2(5, 5)); + edit_label[0]->set_position(Point2(5, 5)); edit_label[0]->show(); edit_line[0]->set_begin(Point2(15, 25)); edit_line[0]->set_text(rtos(anim_tree->timescale_node_get_scale(edited_node))); @@ -314,13 +314,13 @@ void AnimationTreeEditor::_popup_edit_dialog() { break; case AnimationTreePlayer::NODE_ONESHOT: edit_label[0]->set_text(TTR("Fade In (s):")); - edit_label[0]->set_pos(Point2(5, 5)); + edit_label[0]->set_position(Point2(5, 5)); edit_label[0]->show(); edit_line[0]->set_begin(Point2(15, 25)); edit_line[0]->set_text(rtos(anim_tree->oneshot_node_get_fadein_time(edited_node))); edit_line[0]->show(); edit_label[1]->set_text(TTR("Fade Out (s):")); - edit_label[1]->set_pos(Point2(5, 55)); + edit_label[1]->set_position(Point2(5, 55)); edit_label[1]->show(); edit_line[1]->set_begin(Point2(15, 75)); edit_line[1]->set_text(rtos(anim_tree->oneshot_node_get_fadeout_time(edited_node))); @@ -340,13 +340,13 @@ void AnimationTreeEditor::_popup_edit_dialog() { edit_check->show(); edit_label[2]->set_text(TTR("Restart (s):")); - edit_label[2]->set_pos(Point2(5, 145)); + edit_label[2]->set_position(Point2(5, 145)); edit_label[2]->show(); edit_line[2]->set_begin(Point2(15, 165)); edit_line[2]->set_text(rtos(anim_tree->oneshot_node_get_autorestart_delay(edited_node))); edit_line[2]->show(); edit_label[3]->set_text(TTR("Random Restart (s):")); - edit_label[3]->set_pos(Point2(5, 195)); + edit_label[3]->set_position(Point2(5, 195)); edit_label[3]->show(); edit_line[3]->set_begin(Point2(15, 215)); edit_line[3]->set_text(rtos(anim_tree->oneshot_node_get_autorestart_random_delay(edited_node))); @@ -367,7 +367,7 @@ void AnimationTreeEditor::_popup_edit_dialog() { case AnimationTreePlayer::NODE_MIX: edit_label[0]->set_text(TTR("Amount:")); - edit_label[0]->set_pos(Point2(5, 5)); + edit_label[0]->set_position(Point2(5, 5)); edit_label[0]->show(); edit_scroll[0]->set_min(0); edit_scroll[0]->set_max(1); @@ -379,7 +379,7 @@ void AnimationTreeEditor::_popup_edit_dialog() { break; case AnimationTreePlayer::NODE_BLEND2: edit_label[0]->set_text(TTR("Blend:")); - edit_label[0]->set_pos(Point2(5, 5)); + edit_label[0]->set_position(Point2(5, 5)); edit_label[0]->show(); edit_scroll[0]->set_min(0); edit_scroll[0]->set_max(1); @@ -394,7 +394,7 @@ void AnimationTreeEditor::_popup_edit_dialog() { case AnimationTreePlayer::NODE_BLEND3: edit_label[0]->set_text(TTR("Blend:")); - edit_label[0]->set_pos(Point2(5, 5)); + edit_label[0]->set_position(Point2(5, 5)); edit_label[0]->show(); edit_scroll[0]->set_min(-1); edit_scroll[0]->set_max(1); @@ -407,7 +407,7 @@ void AnimationTreeEditor::_popup_edit_dialog() { case AnimationTreePlayer::NODE_BLEND4: edit_label[0]->set_text(TTR("Blend 0:")); - edit_label[0]->set_pos(Point2(5, 5)); + edit_label[0]->set_position(Point2(5, 5)); edit_label[0]->show(); edit_scroll[0]->set_min(0); edit_scroll[0]->set_max(1); @@ -415,7 +415,7 @@ void AnimationTreeEditor::_popup_edit_dialog() { edit_scroll[0]->set_begin(Point2(15, 25)); edit_scroll[0]->show(); edit_label[1]->set_text(TTR("Blend 1:")); - edit_label[1]->set_pos(Point2(5, 55)); + edit_label[1]->set_position(Point2(5, 55)); edit_label[1]->show(); edit_scroll[1]->set_min(0); edit_scroll[1]->set_max(1); @@ -429,14 +429,14 @@ void AnimationTreeEditor::_popup_edit_dialog() { case AnimationTreePlayer::NODE_TRANSITION: { edit_label[0]->set_text(TTR("X-Fade Time (s):")); - edit_label[0]->set_pos(Point2(5, 5)); + edit_label[0]->set_position(Point2(5, 5)); edit_label[0]->show(); edit_line[0]->set_begin(Point2(15, 25)); edit_line[0]->set_text(rtos(anim_tree->transition_node_get_xfade_time(edited_node))); edit_line[0]->show(); edit_label[1]->set_text(TTR("Current:")); - edit_label[1]->set_pos(Point2(5, 55)); + edit_label[1]->set_position(Point2(5, 55)); edit_label[1]->show(); edit_option->set_begin(Point2(15, 75)); @@ -455,7 +455,7 @@ void AnimationTreeEditor::_popup_edit_dialog() { } } - edit_dialog->set_pos(popup_pos); + edit_dialog->set_position(popup_pos); edit_dialog->popup(); updating_edit = false; @@ -727,8 +727,8 @@ void AnimationTreeEditor::_node_edit_property(const StringName& p_node) { property_editor->edit(NULL,ph.name,ph.type,anim_tree->node_get_param(p_node),ph.hint,ph.hint_string); Point2 popup_pos=Point2( pos.x+(size.width-property_editor->get_size().width)/2.0,pos.y+(size.y-style->get_margin(MARGIN_BOTTOM))).floor(); - popup_pos+=get_global_pos(); - property_editor->set_pos(popup_pos); + popup_pos+=get_global_position(); + property_editor->set_position(popup_pos); property_editor->popup(); @@ -797,7 +797,7 @@ void AnimationTreeEditor::_gui_input(InputEvent p_event) { } } - node_popup->set_pos(rclick_pos + get_global_pos()); + node_popup->set_position(rclick_pos + get_global_position()); node_popup->popup(); } @@ -807,7 +807,7 @@ void AnimationTreeEditor::_gui_input(InputEvent p_event) { node_popup->add_item(TTR("Remove"), NODE_ERASE); if (anim_tree->node_get_type(rclick_node) == AnimationTreePlayer::NODE_TRANSITION) node_popup->add_item(TTR("Add Input"), NODE_ADD_INPUT); - node_popup->set_pos(rclick_pos + get_global_pos()); + node_popup->set_position(rclick_pos + get_global_position()); node_popup->popup(); } } @@ -1302,7 +1302,7 @@ AnimationTreeEditor::AnimationTreeEditor() { add_menu = memnew(MenuButton); //add_menu->set_ - add_menu->set_pos(Point2(0, 0)); + add_menu->set_position(Point2(0, 0)); add_menu->set_size(Point2(25, 15)); add_child(add_menu); @@ -1324,7 +1324,7 @@ AnimationTreeEditor::AnimationTreeEditor() { p->connect("id_pressed", this, "_add_menu_item"); play_button = memnew(Button); - play_button->set_pos(Point2(25, 0)); + play_button->set_position(Point2(25, 0)); play_button->set_size(Point2(25, 15)); add_child(play_button); play_button->set_toggle_mode(true); diff --git a/editor/plugins/canvas_item_editor_plugin.cpp b/editor/plugins/canvas_item_editor_plugin.cpp index 0c32671acc..1a533dce32 100644 --- a/editor/plugins/canvas_item_editor_plugin.cpp +++ b/editor/plugins/canvas_item_editor_plugin.cpp @@ -186,17 +186,17 @@ void CanvasItemEditor::_edit_set_pivot(const Vector2 &mouse_pos) { Vector2 motion_ofs = gpos - local_mouse_pos; - undo_redo->add_do_method(n2d, "set_global_pos", local_mouse_pos); + undo_redo->add_do_method(n2d, "set_global_position", local_mouse_pos); undo_redo->add_do_method(n2d, "edit_set_pivot", offset + n2d->get_global_transform().affine_inverse().basis_xform(motion_ofs)); - undo_redo->add_undo_method(n2d, "set_global_pos", gpos); + undo_redo->add_undo_method(n2d, "set_global_position", gpos); undo_redo->add_undo_method(n2d, "edit_set_pivot", offset); for (int i = 0; i < n2d->get_child_count(); i++) { Node2D *n2dc = n2d->get_child(i)->cast_to<Node2D>(); if (!n2dc) continue; - undo_redo->add_do_method(n2dc, "set_global_pos", n2dc->get_global_position()); - undo_redo->add_undo_method(n2dc, "set_global_pos", n2dc->get_global_position()); + undo_redo->add_do_method(n2dc, "set_global_position", n2dc->get_global_position()); + undo_redo->add_undo_method(n2dc, "set_global_position", n2dc->get_global_position()); } } } @@ -666,7 +666,7 @@ void CanvasItemEditor::_key_move(const Vector2 &p_dir, bool p_snap, KeyMoveMODE } else if (Control *control = canvas_item->cast_to<Control>()) { - control->set_pos(control->get_pos() + drag); + control->set_position(control->get_position() + drag); } } } @@ -1014,7 +1014,7 @@ void CanvasItemEditor::_list_select(const InputEventMouseButton &b) { additive_selection = b.mod.shift; - selection_menu->set_global_pos(Vector2(b.global_x, b.global_y)); + selection_menu->set_global_position(Vector2(b.global_x, b.global_y)); selection_menu->popup(); selection_menu->call_deferred("grab_click_focus"); selection_menu->set_invalidate_click_until_motion(); @@ -1135,7 +1135,7 @@ void CanvasItemEditor::_viewport_gui_input(const InputEvent &p_event) { Node* scene = get_scene()->get_root_node()->cast_to<EditorNode>()->get_edited_scene(); if ( scene ) ref_item =_select_canvas_item_at_pos( Point2( b.x, b.y ), scene, transform ); #endif - //popup->set_pos(Point2(b.x,b.y)); + //popup->set_position(Point2(b.x,b.y)); //popup->popup(); } return; @@ -2703,7 +2703,7 @@ void CanvasItemEditor::_popup_callback(int p_op) { Control *ctrl = canvas_item->cast_to<Control>(); if (key_pos) - AnimationPlayerEditor::singleton->get_key_editor()->insert_node_value_key(ctrl, "rect/pos", ctrl->get_pos(), existing); + AnimationPlayerEditor::singleton->get_key_editor()->insert_node_value_key(ctrl, "rect/pos", ctrl->get_position(), existing); if (key_scale) AnimationPlayerEditor::singleton->get_key_editor()->insert_node_value_key(ctrl, "rect/size", ctrl->get_size(), existing); } @@ -2789,10 +2789,10 @@ void CanvasItemEditor::_popup_callback(int p_op) { Node2D *n2d = o->cast_to<Node2D>(); if (!n2d) continue; - undo_redo->add_do_method(n2d, "set_pos", E->get().pos); + undo_redo->add_do_method(n2d, "set_position", E->get().pos); undo_redo->add_do_method(n2d, "set_rot", E->get().rot); undo_redo->add_do_method(n2d, "set_scale", E->get().scale); - undo_redo->add_undo_method(n2d, "set_pos", n2d->get_position()); + undo_redo->add_undo_method(n2d, "set_position", n2d->get_position()); undo_redo->add_undo_method(n2d, "set_rot", n2d->get_rotation()); undo_redo->add_undo_method(n2d, "set_scale", n2d->get_scale()); } @@ -2826,7 +2826,7 @@ void CanvasItemEditor::_popup_callback(int p_op) { Control *ctrl = canvas_item->cast_to<Control>(); if (key_pos) - ctrl->set_pos(Point2()); + ctrl->set_position(Point2()); /* if (key_scale) AnimationPlayerEditor::singleton->get_key_editor()->insert_node_value_key(ctrl,"rect/size",ctrl->get_size()); @@ -3354,7 +3354,7 @@ CanvasItemEditor::CanvasItemEditor(EditorNode *p_editor) { Label *l = memnew(Label); l->set_text(TTR("Snap (Pixels):")); - l->set_pos(Point2(5, 5)); + l->set_position(Point2(5, 5)); value_dialog->add_child(l); dialog_label = l; @@ -3474,8 +3474,8 @@ void CanvasItemEditorViewport::_on_change_type() { } void CanvasItemEditorViewport::_create_preview(const Vector<String> &files) const { - label->set_pos(get_global_pos() + Point2(14, 14)); - label_desc->set_pos(label->get_pos() + Point2(0, label->get_size().height)); + label->set_position(get_global_position() + Point2(14, 14)); + label_desc->set_position(label->get_position() + Point2(0, label->get_size().height)); for (int i = 0; i < files.size(); i++) { String path = files[i]; RES res = ResourceLoader::load(path); @@ -3576,8 +3576,8 @@ void CanvasItemEditorViewport::_create_nodes(Node *parent, Node *child, String & // locate at preview position Point2 pos; - if (parent->has_method("get_global_pos")) { - pos = parent->call("get_global_pos"); + if (parent->has_method("get_global_position")) { + pos = parent->call("get_global_position"); } Transform2D trans = canvas->get_canvas_transform(); Point2 target_pos = (p_point - trans.get_origin()) / trans.get_scale().x - pos; @@ -3626,7 +3626,7 @@ bool CanvasItemEditorViewport::_create_instance(Node *parent, String &path, cons } else { Control *parent_control = parent->cast_to<Control>(); if (parent_control) { - pos = parent_control->get_global_pos(); + pos = parent_control->get_global_position(); } } Transform2D trans = canvas->get_canvas_transform(); @@ -3834,7 +3834,7 @@ CanvasItemEditorViewport::CanvasItemEditorViewport(EditorNode *p_node, CanvasIte for (int i = 0; i < types.size(); i++) { CheckBox *check = memnew(CheckBox); check->set_text(types[i]); - check->connect("button_selected", this, "_on_select_type", varray(check)); + check->connect("button_down", this, "_on_select_type", varray(check)); btn_group->add_child(check); check->set_button_group(button_group); } diff --git a/editor/plugins/cube_grid_theme_editor_plugin.cpp b/editor/plugins/cube_grid_theme_editor_plugin.cpp index 4633d5fe33..17149ef868 100644 --- a/editor/plugins/cube_grid_theme_editor_plugin.cpp +++ b/editor/plugins/cube_grid_theme_editor_plugin.cpp @@ -303,7 +303,7 @@ MeshLibraryEditor::MeshLibraryEditor(EditorNode *p_editor) { add_child(panel); MenuButton * options = memnew( MenuButton ); panel->add_child(options); - options->set_pos(Point2(1,1)); + options->set_position(Point2(1,1)); options->set_text("Theme"); options->get_popup()->add_item(TTR("Add Item"),MENU_OPTION_ADD_ITEM); options->get_popup()->add_item(TTR("Remove Selected Item"),MENU_OPTION_REMOVE_ITEM); diff --git a/editor/plugins/gradient_texture_editor_plugin.cpp b/editor/plugins/gradient_texture_editor_plugin.cpp index 1e82a1105a..9551fe19fa 100644 --- a/editor/plugins/gradient_texture_editor_plugin.cpp +++ b/editor/plugins/gradient_texture_editor_plugin.cpp @@ -39,7 +39,7 @@ void GradientTextureEdit::_show_color_picker() { return; Size2 ms = Size2(350, picker->get_combined_minimum_size().height + 10); picker->set_pick_color(points[grabbed].color); - popup->set_pos(get_global_pos() - Vector2(ms.width - get_size().width, ms.height)); + popup->set_position(get_global_position() - Vector2(ms.width - get_size().width, ms.height)); popup->set_size(ms); popup->popup(); } diff --git a/editor/plugins/sample_editor_plugin.cpp b/editor/plugins/sample_editor_plugin.cpp index 0c4a85230c..a9af5823e3 100644 --- a/editor/plugins/sample_editor_plugin.cpp +++ b/editor/plugins/sample_editor_plugin.cpp @@ -381,14 +381,14 @@ SampleEditor::SampleEditor() { play = memnew( Button ); - play->set_pos(Point2( 5, 5 )); + play->set_position(Point2( 5, 5 )); play->set_size( Size2(1,1 ) ); play->set_toggle_mode(true); add_child(play); stop = memnew( Button ); - stop->set_pos(Point2( 35, 5 )); + stop->set_position(Point2( 35, 5 )); stop->set_size( Size2(1,1 ) ); stop->set_toggle_mode(true); add_child(stop); diff --git a/editor/plugins/sample_library_editor_plugin.cpp b/editor/plugins/sample_library_editor_plugin.cpp index 17f24d1a6b..9eb1af70d1 100644 --- a/editor/plugins/sample_library_editor_plugin.cpp +++ b/editor/plugins/sample_library_editor_plugin.cpp @@ -436,7 +436,7 @@ SampleLibraryEditor::SampleLibraryEditor() { load = memnew( Button ); - load->set_pos(Point2( 5, 5 )); + load->set_position(Point2( 5, 5 )); load->set_size( Size2(1,1 ) ); add_child(load); diff --git a/editor/plugins/sample_player_editor_plugin.cpp b/editor/plugins/sample_player_editor_plugin.cpp index 944f41637f..25f1fe9e17 100644 --- a/editor/plugins/sample_player_editor_plugin.cpp +++ b/editor/plugins/sample_player_editor_plugin.cpp @@ -118,7 +118,7 @@ SamplePlayerEditor::SamplePlayerEditor() { play = memnew( Button ); - play->set_pos(Point2( 5, 5 )); + play->set_position(Point2( 5, 5 )); play->set_toggle_mode(true); play->set_anchor_and_margin(MARGIN_LEFT,Control::ANCHOR_END,250); play->set_anchor_and_margin(MARGIN_RIGHT,Control::ANCHOR_END,230); @@ -129,7 +129,7 @@ SamplePlayerEditor::SamplePlayerEditor() { stop = memnew( Button ); - stop->set_pos(Point2( 35, 5 )); + stop->set_position(Point2( 35, 5 )); stop->set_toggle_mode(true); stop->set_anchor_and_margin(MARGIN_LEFT,Control::ANCHOR_END,220); stop->set_anchor_and_margin(MARGIN_RIGHT,Control::ANCHOR_END,200); diff --git a/editor/plugins/script_editor_plugin.cpp b/editor/plugins/script_editor_plugin.cpp index 8ce0f51211..a99cd7a2d6 100644 --- a/editor/plugins/script_editor_plugin.cpp +++ b/editor/plugins/script_editor_plugin.cpp @@ -530,6 +530,15 @@ void ScriptEditor::_resave_scripts(const String &p_str) { if (trim_trailing_whitespace_on_save) { se->trim_trailing_whitespace(); } + + if (convert_indent_on_save) { + if (use_space_indentation) { + se->convert_indent_to_spaces(); + } else { + se->convert_indent_to_tabs(); + } + } + editor->save_resource(script); se->tag_saved_version(); } @@ -795,12 +804,28 @@ void ScriptEditor::_menu_option(int p_option) { if (trim_trailing_whitespace_on_save) current->trim_trailing_whitespace(); + + if (convert_indent_on_save) { + if (use_space_indentation) { + current->convert_indent_to_spaces(); + } else { + current->convert_indent_to_tabs(); + } + } editor->save_resource(current->get_edited_script()); } break; case FILE_SAVE_AS: { current->trim_trailing_whitespace(); + + if (convert_indent_on_save) { + if (use_space_indentation) { + current->convert_indent_to_spaces(); + } else { + current->convert_indent_to_tabs(); + } + } editor->push_item(current->get_edited_script()->cast_to<Object>()); editor->save_resource_as(current->get_edited_script()); @@ -878,28 +903,29 @@ void ScriptEditor::_menu_option(int p_option) { } } } - } + } else { - EditorHelp *help = tab_container->get_current_tab_control()->cast_to<EditorHelp>(); - if (help) { + EditorHelp *help = tab_container->get_current_tab_control()->cast_to<EditorHelp>(); + if (help) { - switch (p_option) { + switch (p_option) { - case HELP_SEARCH_FIND: { - help->popup_search(); - } break; - case HELP_SEARCH_FIND_NEXT: { - help->search_again(); - } break; - case FILE_CLOSE: { - _close_current_tab(); - } break; - case CLOSE_DOCS: { - _close_docs_tab(); - } break; - case CLOSE_ALL: { - _close_all_tabs(); - } break; + case HELP_SEARCH_FIND: { + help->popup_search(); + } break; + case HELP_SEARCH_FIND_NEXT: { + help->search_again(); + } break; + case FILE_CLOSE: { + _close_current_tab(); + } break; + case CLOSE_DOCS: { + _close_docs_tab(); + } break; + case CLOSE_ALL: { + _close_all_tabs(); + } break; + } } } } @@ -1380,10 +1406,10 @@ void ScriptEditor::_update_script_names() { _update_script_colors(); } -void ScriptEditor::edit(const Ref<Script> &p_script, bool p_grab_focus) { +bool ScriptEditor::edit(const Ref<Script> &p_script, int p_line, int p_col, bool p_grab_focus) { if (p_script.is_null()) - return; + return false; // refuse to open built-in if scene is not loaded @@ -1391,22 +1417,46 @@ void ScriptEditor::edit(const Ref<Script> &p_script, bool p_grab_focus) { bool open_dominant = EditorSettings::get_singleton()->get("text_editor/files/open_dominant_script_on_scene_change"); + Error err = p_script->get_language()->open_in_external_editor(p_script, p_line >= 0 ? p_line : 0, p_col); + if (err == OK) + return false; + if (err != ERR_UNAVAILABLE) + WARN_PRINT("Couldn't open in custom external text editor"); + if (p_script->get_path().is_resource_file() && bool(EditorSettings::get_singleton()->get("text_editor/external/use_external_editor"))) { String path = EditorSettings::get_singleton()->get("text_editor/external/exec_path"); String flags = EditorSettings::get_singleton()->get("text_editor/external/exec_flags"); + + Dictionary keys; + keys["project"] = GlobalConfig::get_singleton()->get_resource_path(); + keys["file"] = GlobalConfig::get_singleton()->globalize_path(p_script->get_path()); + keys["line"] = p_line >= 0 ? p_line : 0; + keys["col"] = p_col; + + flags = flags.format(keys).strip_edges().replace("\\\\", "\\"); + List<String> args; - flags = flags.strip_edges(); - if (flags != String()) { - Vector<String> flagss = flags.split(" ", false); - for (int i = 0; i < flagss.size(); i++) - args.push_back(flagss[i]); + + if (flags.size()) { + int from = 0, to = 0; + bool inside_quotes = false; + for (int i = 0; i < flags.size(); i++) { + if (flags[i] == '"' && (!i || flags[i - 1] != '\\')) { + inside_quotes = !inside_quotes; + } else if (flags[i] == '\0' || (!inside_quotes && flags[i] == ' ')) { + args.push_back(flags.substr(from, to)); + from = i + 1; + to = 0; + } else { + to++; + } + } } - args.push_back(GlobalConfig::get_singleton()->globalize_path(p_script->get_path())); Error err = OS::get_singleton()->execute(path, args, false); if (err == OK) - return; + return false; WARN_PRINT("Couldn't open external text editor, using internal"); } @@ -1425,8 +1475,11 @@ void ScriptEditor::edit(const Ref<Script> &p_script, bool p_grab_focus) { } if (is_visible_in_tree()) se->ensure_focus(); + + if (p_line >= 0) + se->goto_line(p_line - 1); } - return; + return true; } } @@ -1439,7 +1492,7 @@ void ScriptEditor::edit(const Ref<Script> &p_script, bool p_grab_focus) { if (se) break; } - ERR_FAIL_COND(!se); + ERR_FAIL_COND_V(!se, false); tab_container->add_child(se); se->set_edited_script(p_script); @@ -1466,6 +1519,11 @@ void ScriptEditor::edit(const Ref<Script> &p_script, bool p_grab_focus) { _test_script_times_on_disk(p_script); _update_modified_scripts_for_external_editor(p_script); + + if (p_line >= 0) + se->goto_line(p_line - 1); + + return true; } void ScriptEditor::save_all_scripts() { @@ -1483,6 +1541,14 @@ void ScriptEditor::save_all_scripts() { se->trim_trailing_whitespace(); } + if (convert_indent_on_save) { + if (use_space_indentation) { + se->convert_indent_to_spaces(); + } else { + se->convert_indent_to_tabs(); + } + } + Ref<Script> script = se->get_edited_script(); if (script.is_valid()) se->apply_code(); @@ -1582,6 +1648,9 @@ void ScriptEditor::_save_layout() { void ScriptEditor::_editor_settings_changed() { trim_trailing_whitespace_on_save = EditorSettings::get_singleton()->get("text_editor/files/trim_trailing_whitespace_on_save"); + convert_indent_on_save = EditorSettings::get_singleton()->get("text_editor/indent/convert_indent_on_save"); + use_space_indentation = EditorSettings::get_singleton()->get("text_editor/indent/type") == "Tabs" ? 0 : 1; + float autosave_time = EditorSettings::get_singleton()->get("text_editor/files/autosave_interval_secs"); if (autosave_time > 0) { autosave_timer->set_wait_time(autosave_time); @@ -1863,20 +1932,14 @@ void ScriptEditor::set_scene_root_script(Ref<Script> p_script) { } } -bool ScriptEditor::script_go_to_method(Ref<Script> p_script, const String &p_method) { +bool ScriptEditor::script_goto_method(Ref<Script> p_script, const String &p_method) { - for (int i = 0; i < tab_container->get_child_count(); i++) { - ScriptEditorBase *current = tab_container->get_child(i)->cast_to<ScriptEditorBase>(); + int line = p_script->get_member_line(p_method); - if (current && current->get_edited_script() == p_script) { - if (current->goto_method(p_method)) { - edit(p_script); - return true; - } - break; - } - } - return false; + if (line == -1) + return false; + + return edit(p_script, line, 0); } void ScriptEditor::set_live_auto_reload_running_scripts(bool p_enabled) { @@ -2160,6 +2223,8 @@ ScriptEditor::ScriptEditor(EditorNode *p_editor) { edit_pass = 0; trim_trailing_whitespace_on_save = false; + convert_indent_on_save = false; + use_space_indentation = false; ScriptServer::edit_request_func = _open_script_request; } diff --git a/editor/plugins/script_editor_plugin.h b/editor/plugins/script_editor_plugin.h index 51d9bd3fc8..6a54609167 100644 --- a/editor/plugins/script_editor_plugin.h +++ b/editor/plugins/script_editor_plugin.h @@ -91,11 +91,12 @@ public: virtual void set_edit_state(const Variant &p_state) = 0; virtual void goto_line(int p_line, bool p_with_error = false) = 0; virtual void trim_trailing_whitespace() = 0; + virtual void convert_indent_to_spaces() = 0; + virtual void convert_indent_to_tabs() = 0; virtual void ensure_focus() = 0; virtual void tag_saved_version() = 0; virtual void reload(bool p_soft) = 0; virtual void get_breakpoints(List<int> *p_breakpoints) = 0; - virtual bool goto_method(const String &p_method) = 0; virtual void add_callback(const String &p_function, PoolStringArray p_args) = 0; virtual void update_settings() = 0; virtual void set_debugger_active(bool p_active) = 0; @@ -252,6 +253,8 @@ class ScriptEditor : public VBoxContainer { void _res_saved_callback(const Ref<Resource> &p_res); bool trim_trailing_whitespace_on_save; + bool use_space_indentation; + bool convert_indent_on_save; void _trim_trailing_whitespace(TextEdit *tx); @@ -312,7 +315,9 @@ public: void apply_scripts() const; void ensure_select_current(); - void edit(const Ref<Script> &p_script, bool p_grab_focus = true); + + _FORCE_INLINE_ bool edit(const Ref<Script> &p_script, bool p_grab_focus = true) { return edit(p_script, -1, 0, p_grab_focus); } + bool edit(const Ref<Script> &p_script, int p_line, int p_col, bool p_grab_focus = true); Dictionary get_state() const; void set_state(const Dictionary &p_state); @@ -329,7 +334,7 @@ public: void set_scene_root_script(Ref<Script> p_script); - bool script_go_to_method(Ref<Script> p_script, const String &p_method); + bool script_goto_method(Ref<Script> p_script, const String &p_method); virtual void edited_scene_changed(); diff --git a/editor/plugins/script_text_editor.cpp b/editor/plugins/script_text_editor.cpp index 159fc0d51f..052c19f34e 100644 --- a/editor/plugins/script_text_editor.cpp +++ b/editor/plugins/script_text_editor.cpp @@ -69,26 +69,6 @@ Ref<Script> ScriptTextEditor::get_edited_script() const { return script; } -bool ScriptTextEditor::goto_method(const String &p_method) { - - Vector<String> functions = get_functions(); - - String method_search = p_method + ":"; - - for (int i = 0; i < functions.size(); i++) { - String function = functions[i]; - - if (function.begins_with(method_search)) { - - int line = function.get_slice(":", 1).to_int(); - goto_line(line - 1); - return true; - } - } - - return false; -} - void ScriptTextEditor::_load_theme_settings() { TextEdit *text_edit = code_editor->get_text_edit(); @@ -290,13 +270,103 @@ void ScriptTextEditor::trim_trailing_whitespace() { } } +void ScriptTextEditor::convert_indent_to_spaces() { + TextEdit *tx = code_editor->get_text_edit(); + Ref<Script> scr = get_edited_script(); + + if (scr.is_null()) { + return; + } + + int indent_size = EditorSettings::get_singleton()->get("text_editor/indent/size"); + String indent = ""; + + for (int i = 0; i < indent_size; i++) { + indent += " "; + } + + bool changed_indentation = false; + for (int i = 0; i < tx->get_line_count(); i++) { + String line = tx->get_line(i); + + if (line.length() <= 0) { + continue; + } + + int j = 0; + while (j < line.length() && (line[j] == ' ' || line[j] == '\t')) { + if (line[j] == '\t') { + if (!changed_indentation) { + tx->begin_complex_operation(); + changed_indentation = true; + } + line = line.left(j) + indent + line.right(j + 1); + } + j++; + } + tx->set_line(i, line); + } + if (changed_indentation) { + tx->end_complex_operation(); + tx->update(); + } +} + +void ScriptTextEditor::convert_indent_to_tabs() { + TextEdit *tx = code_editor->get_text_edit(); + Ref<Script> scr = get_edited_script(); + + if (scr.is_null()) { + return; + } + + int indent_size = EditorSettings::get_singleton()->get("text_editor/indent/size"); + indent_size -= 1; + + bool changed_indentation = false; + for (int i = 0; i < tx->get_line_count(); i++) { + String line = tx->get_line(i); + + if (line.length() <= 0) { + continue; + } + + int j = 0; + int space_count = -1; + while (j < line.length() && (line[j] == ' ' || line[j] == '\t')) { + if (line[j] != '\t') { + space_count++; + + if (space_count == indent_size) { + if (!changed_indentation) { + tx->begin_complex_operation(); + changed_indentation = true; + } + + line = line.left(j - indent_size) + "\t" + line.right(j + 1); + j = 0; + space_count = -1; + } + } else { + space_count = -1; + } + j++; + } + tx->set_line(i, line); + } + if (changed_indentation) { + tx->end_complex_operation(); + tx->update(); + } +} + void ScriptTextEditor::tag_saved_version() { code_editor->get_text_edit()->tag_saved_version(); } void ScriptTextEditor::goto_line(int p_line, bool p_with_error) { - code_editor->get_text_edit()->cursor_set_line(p_line); + code_editor->get_text_edit()->call_deferred("cursor_set_line", p_line); } void ScriptTextEditor::ensure_focus() { @@ -827,6 +897,12 @@ void ScriptTextEditor::_edit_option(int p_op) { case EDIT_TRIM_TRAILING_WHITESAPCE: { trim_trailing_whitespace(); } break; + case EDIT_CONVERT_INDENT_TO_SPACES: { + convert_indent_to_spaces(); + } break; + case EDIT_CONVERT_INDENT_TO_TABS: { + convert_indent_to_tabs(); + } break; case EDIT_PICK_COLOR: { color_panel->popup(); } break; @@ -1095,8 +1171,8 @@ void ScriptTextEditor::_text_edit_gui_input(const InputEvent &ev) { int col, row; TextEdit *tx = code_editor->get_text_edit(); - tx->_get_mouse_pos(Point2i(mb.global_x, mb.global_y) - tx->get_global_pos(), row, col); - Vector2 mpos = Vector2(mb.global_x, mb.global_y) - tx->get_global_pos(); + tx->_get_mouse_pos(Point2i(mb.global_x, mb.global_y) - tx->get_global_position(), row, col); + Vector2 mpos = Vector2(mb.global_x, mb.global_y) - tx->get_global_position(); bool have_selection = (tx->get_selection_text().length() > 0); bool have_color = (tx->get_word_at_pos(mpos) == "Color"); if (have_color) { @@ -1124,7 +1200,7 @@ void ScriptTextEditor::_text_edit_gui_input(const InputEvent &ev) { float alpha = color.size() > 3 ? color[3] : 1.0f; color_picker->set_pick_color(Color(color[0], color[1], color[2], alpha)); } - color_panel->set_pos(get_global_transform().xform(get_local_mouse_pos())); + color_panel->set_position(get_global_transform().xform(get_local_mouse_pos())); Size2 ms = Size2(300, color_picker->get_combined_minimum_size().height + 10); color_panel->set_size(ms); } else { @@ -1174,7 +1250,7 @@ void ScriptTextEditor::_make_context_menu(bool p_selection, bool p_color) { context_menu->add_separator(); context_menu->add_item(TTR("Pick Color"), EDIT_PICK_COLOR); } - context_menu->set_pos(get_global_transform().xform(get_local_mouse_pos())); + context_menu->set_position(get_global_transform().xform(get_local_mouse_pos())); context_menu->set_size(Vector2(1, 1)); context_menu->popup(); } @@ -1237,6 +1313,8 @@ ScriptTextEditor::ScriptTextEditor() { edit_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("script_text_editor/complete_symbol"), EDIT_COMPLETE); #endif edit_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("script_text_editor/trim_trailing_whitespace"), EDIT_TRIM_TRAILING_WHITESAPCE); + edit_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("script_text_editor/convert_indent_to_spaces"), EDIT_CONVERT_INDENT_TO_SPACES); + edit_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("script_text_editor/convert_indent_to_tabs"), EDIT_CONVERT_INDENT_TO_TABS); edit_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("script_text_editor/auto_indent"), EDIT_AUTO_INDENT); edit_menu->get_popup()->connect("id_pressed", this, "_edit_option"); edit_menu->get_popup()->add_separator(); @@ -1305,6 +1383,8 @@ void ScriptTextEditor::register_editor() { ED_SHORTCUT("script_text_editor/complete_symbol", TTR("Complete Symbol"), KEY_MASK_CMD | KEY_SPACE); #endif ED_SHORTCUT("script_text_editor/trim_trailing_whitespace", TTR("Trim Trailing Whitespace"), KEY_MASK_CTRL | KEY_MASK_ALT | KEY_T); + ED_SHORTCUT("script_text_editor/convert_indent_to_spaces", TTR("Convert Indent To Spaces"), KEY_MASK_CTRL | KEY_MASK_SHIFT | KEY_Y); + ED_SHORTCUT("script_text_editor/convert_indent_to_tabs", TTR("Convert Indent To Tabs"), KEY_MASK_CTRL | KEY_MASK_SHIFT | KEY_X); ED_SHORTCUT("script_text_editor/auto_indent", TTR("Auto Indent"), KEY_MASK_CMD | KEY_I); ED_SHORTCUT("script_text_editor/toggle_breakpoint", TTR("Toggle Breakpoint"), KEY_F9); diff --git a/editor/plugins/script_text_editor.h b/editor/plugins/script_text_editor.h index 0649e39ab7..8e089e1ebf 100644 --- a/editor/plugins/script_text_editor.h +++ b/editor/plugins/script_text_editor.h @@ -67,6 +67,8 @@ class ScriptTextEditor : public ScriptEditorBase { EDIT_COMPLETE, EDIT_AUTO_INDENT, EDIT_TRIM_TRAILING_WHITESAPCE, + EDIT_CONVERT_INDENT_TO_SPACES, + EDIT_CONVERT_INDENT_TO_TABS, EDIT_TOGGLE_COMMENT, EDIT_MOVE_LINE_UP, EDIT_MOVE_LINE_DOWN, @@ -125,6 +127,8 @@ public: virtual void set_edit_state(const Variant &p_state); virtual void ensure_focus(); virtual void trim_trailing_whitespace(); + virtual void convert_indent_to_spaces(); + virtual void convert_indent_to_tabs(); virtual void tag_saved_version(); virtual void goto_line(int p_line, bool p_with_error = false); @@ -134,7 +138,6 @@ public: virtual void add_callback(const String &p_function, PoolStringArray p_args); virtual void update_settings(); - virtual bool goto_method(const String &p_method); virtual void set_tooltip_request_func(String p_method, Object *p_obj); diff --git a/editor/plugins/shader_editor_plugin.cpp b/editor/plugins/shader_editor_plugin.cpp index dcb126a754..b5edd12b9c 100644 --- a/editor/plugins/shader_editor_plugin.cpp +++ b/editor/plugins/shader_editor_plugin.cpp @@ -370,7 +370,8 @@ void ShaderEditor::_editor_settings_changed() { shader_editor->get_text_edit()->set_auto_brace_completion(EditorSettings::get_singleton()->get("text_editor/completion/auto_brace_complete")); shader_editor->get_text_edit()->set_scroll_pass_end_of_file(EditorSettings::get_singleton()->get("text_editor/cursor/scroll_past_end_of_file")); - shader_editor->get_text_edit()->set_tab_size(EditorSettings::get_singleton()->get("text_editor/indent/tab_size")); + shader_editor->get_text_edit()->set_indent_size(EditorSettings::get_singleton()->get("text_editor/indent/size")); + shader_editor->get_text_edit()->set_indent_using_spaces(EditorSettings::get_singleton()->get("text_editor/indent/type") == "Tabs" ? 0 : 1); shader_editor->get_text_edit()->set_draw_tabs(EditorSettings::get_singleton()->get("text_editor/indent/draw_tabs")); shader_editor->get_text_edit()->set_show_line_numbers(EditorSettings::get_singleton()->get("text_editor/line_numbers/show_line_numbers")); shader_editor->get_text_edit()->set_syntax_coloring(EditorSettings::get_singleton()->get("text_editor/highlighting/syntax_highlighting")); @@ -445,7 +446,7 @@ ShaderEditor::ShaderEditor() { edit_menu = memnew(MenuButton); hbc->add_child(edit_menu); - edit_menu->set_pos(Point2(5, -1)); + edit_menu->set_position(Point2(5, -1)); edit_menu->set_text(TTR("Edit")); edit_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/undo", TTR("Undo"), KEY_MASK_CMD | KEY_Z), EDIT_UNDO); edit_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/redo", TTR("Redo"), KEY_MASK_CMD | KEY_Y), EDIT_REDO); @@ -459,7 +460,7 @@ ShaderEditor::ShaderEditor() { search_menu = memnew(MenuButton); hbc->add_child(search_menu); - search_menu->set_pos(Point2(38, -1)); + search_menu->set_position(Point2(38, -1)); search_menu->set_text(TTR("Search")); search_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/find", TTR("Find.."), KEY_MASK_CMD | KEY_F), SEARCH_FIND); search_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/find_next", TTR("Find Next"), KEY_F3), SEARCH_FIND_NEXT); diff --git a/editor/plugins/shader_graph_editor_plugin.cpp b/editor/plugins/shader_graph_editor_plugin.cpp index 04dae641bc..0fd28a0b59 100644 --- a/editor/plugins/shader_graph_editor_plugin.cpp +++ b/editor/plugins/shader_graph_editor_plugin.cpp @@ -60,7 +60,7 @@ void GraphColorRampEdit::_gui_input(const InputEvent& p_event) { return; Size2 ms = Size2(350, picker->get_combined_minimum_size().height+10); picker->set_color(points[grabbed].color); - popup->set_pos(get_global_pos()-Size2(0,ms.height)); + popup->set_position(get_global_position()-Size2(0,ms.height)); popup->set_size(ms); popup->popup(); return; @@ -840,7 +840,7 @@ void ShaderGraphView::_xform_input_changed(int p_id, Node *p_button){ ToolButton *tb = p_button->cast_to<ToolButton>(); - ped_popup->set_pos(tb->get_global_pos()+Vector2(0,tb->get_size().height)); + ped_popup->set_position(tb->get_global_position()+Vector2(0,tb->get_size().height)); ped_popup->set_size(tb->get_size()); edited_id=p_id; edited_def=-1; @@ -851,7 +851,7 @@ void ShaderGraphView::_xform_input_changed(int p_id, Node *p_button){ void ShaderGraphView::_xform_const_changed(int p_id, Node *p_button){ ToolButton *tb = p_button->cast_to<ToolButton>(); - ped_popup->set_pos(tb->get_global_pos()+Vector2(0,tb->get_size().height)); + ped_popup->set_position(tb->get_global_position()+Vector2(0,tb->get_size().height)); ped_popup->set_size(tb->get_size()); edited_id=p_id; edited_def=-1; @@ -1075,7 +1075,7 @@ void ShaderGraphView::_input_name_changed(const String& p_name, int p_id, Node * void ShaderGraphView::_tex_edited(int p_id,Node* p_button) { ToolButton *tb = p_button->cast_to<ToolButton>(); - ped_popup->set_pos(tb->get_global_pos()+Vector2(0,tb->get_size().height)); + ped_popup->set_position(tb->get_global_position()+Vector2(0,tb->get_size().height)); ped_popup->set_size(tb->get_size()); edited_id=p_id; edited_def=-1; @@ -1085,7 +1085,7 @@ void ShaderGraphView::_tex_edited(int p_id,Node* p_button) { void ShaderGraphView::_cube_edited(int p_id,Node* p_button) { ToolButton *tb = p_button->cast_to<ToolButton>(); - ped_popup->set_pos(tb->get_global_pos()+Vector2(0,tb->get_size().height)); + ped_popup->set_position(tb->get_global_position()+Vector2(0,tb->get_size().height)); ped_popup->set_size(tb->get_size()); edited_id=p_id; edited_def=-1; @@ -1300,7 +1300,7 @@ void ShaderGraphView::_delete_nodes_request() void ShaderGraphView::_default_changed(int p_id, Node *p_button, int p_param, int v_type, String p_hint) { ToolButton *tb = p_button->cast_to<ToolButton>(); - ped_popup->set_pos(tb->get_global_pos()+Vector2(0,tb->get_size().height)); + ped_popup->set_position(tb->get_global_position()+Vector2(0,tb->get_size().height)); ped_popup->set_size(tb->get_size()); edited_id=p_id; edited_def=p_param; @@ -2751,7 +2751,7 @@ ShaderGraphView::ShaderGraphView(ShaderGraph::ShaderType p_type) { graph_edit->get_top_layer()->add_child(status); graph_edit->connect("_begin_node_move", this, "_begin_node_move"); graph_edit->connect("_end_node_move", this, "_end_node_move"); - status->set_pos(Vector2(5,5)); + status->set_position(Vector2(5,5)); status->add_color_override("font_color_shadow",Color(0,0,0)); status->add_color_override("font_color",Color(1,0.4,0.3)); status->add_constant_override("shadow_as_outline",1); @@ -2779,7 +2779,7 @@ void ShaderGraphEditor::_popup_requested(const Vector2 &p_position) { Vector2 scroll_ofs=graph_edits[tabs->get_current_tab()]->get_graph_edit()->get_scroll_ofs(); next_location = get_local_mouse_pos() + scroll_ofs; - popup->set_global_pos(p_position); + popup->set_global_position(p_position); popup->set_size( Size2( 200, 0) ); popup->popup(); popup->call_deferred("grab_click_focus"); diff --git a/editor/plugins/spatial_editor_plugin.cpp b/editor/plugins/spatial_editor_plugin.cpp index 4961de56d3..d73349f773 100644 --- a/editor/plugins/spatial_editor_plugin.cpp +++ b/editor/plugins/spatial_editor_plugin.cpp @@ -673,7 +673,7 @@ void SpatialEditorViewport::_list_select(InputEventMouseButton b) { "\nType: " + spat->get_class() + "\nPath: " + node_path); } - selection_menu->set_global_pos(Vector2(b.global_x, b.global_y)); + selection_menu->set_global_position(Vector2(b.global_x, b.global_y)); selection_menu->popup(); selection_menu->call_deferred("grab_click_focus"); selection_menu->set_invalidate_click_until_motion(); @@ -2166,7 +2166,7 @@ SpatialEditorViewport::SpatialEditorViewport(SpatialEditor *p_spatial_editor, Ed view_menu = memnew(MenuButton); surface->add_child(view_menu); - view_menu->set_pos(Point2(4, 4)); + view_menu->set_position(Point2(4, 4)); view_menu->set_self_modulate(Color(1, 1, 1, 0.5)); view_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("spatial_editor/top_view"), VIEW_TOP); view_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("spatial_editor/bottom_view"), VIEW_BOTTOM); @@ -3572,7 +3572,7 @@ SpatialEditor::SpatialEditor(EditorNode *p_editor) { view_menu = memnew(MenuButton); view_menu->set_text(TTR("View")); - view_menu->set_pos(Point2(212, 0)); + view_menu->set_position(Point2(212, 0)); hbc_menu->add_child(view_menu); p = view_menu->get_popup(); @@ -3717,44 +3717,44 @@ SpatialEditor::SpatialEditor(EditorNode *p_editor) { add_child(xform_dialog); Label *l = memnew(Label); l->set_text(TTR("Translate:")); - l->set_pos(Point2(5, 5)); + l->set_position(Point2(5, 5)); xform_dialog->add_child(l); for (int i = 0; i < 3; i++) { xform_translate[i] = memnew(LineEdit); - xform_translate[i]->set_pos(Point2(15 + i * 60, 22)); + xform_translate[i]->set_position(Point2(15 + i * 60, 22)); xform_translate[i]->set_size(Size2(50, 12)); xform_dialog->add_child(xform_translate[i]); } l = memnew(Label); l->set_text(TTR("Rotate (deg.):")); - l->set_pos(Point2(5, 45)); + l->set_position(Point2(5, 45)); xform_dialog->add_child(l); for (int i = 0; i < 3; i++) { xform_rotate[i] = memnew(LineEdit); - xform_rotate[i]->set_pos(Point2(15 + i * 60, 62)); + xform_rotate[i]->set_position(Point2(15 + i * 60, 62)); xform_rotate[i]->set_size(Size2(50, 22)); xform_dialog->add_child(xform_rotate[i]); } l = memnew(Label); l->set_text(TTR("Scale (ratio):")); - l->set_pos(Point2(5, 85)); + l->set_position(Point2(5, 85)); xform_dialog->add_child(l); for (int i = 0; i < 3; i++) { xform_scale[i] = memnew(LineEdit); - xform_scale[i]->set_pos(Point2(15 + i * 60, 102)); + xform_scale[i]->set_position(Point2(15 + i * 60, 102)); xform_scale[i]->set_size(Size2(50, 22)); xform_dialog->add_child(xform_scale[i]); } l = memnew(Label); l->set_text(TTR("Transform Type")); - l->set_pos(Point2(5, 125)); + l->set_position(Point2(5, 125)); xform_dialog->add_child(l); xform_type = memnew(OptionButton); diff --git a/editor/plugins/stream_editor_plugin.cpp b/editor/plugins/stream_editor_plugin.cpp index 43f770ab10..dd97ce936d 100644 --- a/editor/plugins/stream_editor_plugin.cpp +++ b/editor/plugins/stream_editor_plugin.cpp @@ -84,7 +84,7 @@ StreamEditor::StreamEditor() { stop = memnew( Button ); - stop->set_pos(Point2( 35, 5 )); + stop->set_position(Point2( 35, 5 )); stop->set_anchor_and_margin(MARGIN_LEFT,Control::ANCHOR_END,30); stop->set_anchor_and_margin(MARGIN_RIGHT,Control::ANCHOR_END,10); stop->set_anchor_and_margin(MARGIN_TOP,Control::ANCHOR_BEGIN,0); diff --git a/editor/plugins/style_box_editor_plugin.cpp b/editor/plugins/style_box_editor_plugin.cpp index 1d067ff975..d421b203e9 100644 --- a/editor/plugins/style_box_editor_plugin.cpp +++ b/editor/plugins/style_box_editor_plugin.cpp @@ -61,12 +61,12 @@ StyleBoxEditor::StyleBoxEditor() { Label *l = memnew(Label); l->set_text(TTR("StyleBox Preview:")); - l->set_pos(Point2(5, 5)); + l->set_position(Point2(5, 5)); panel->add_child(l); preview = memnew(Panel); panel->add_child(preview); - preview->set_pos(Point2(50, 50)); + preview->set_position(Point2(50, 50)); preview->set_size(Size2(200, 100)); } diff --git a/editor/plugins/theme_editor_plugin.cpp b/editor/plugins/theme_editor_plugin.cpp index 4ff5951049..a83ea70508 100644 --- a/editor/plugins/theme_editor_plugin.cpp +++ b/editor/plugins/theme_editor_plugin.cpp @@ -640,7 +640,7 @@ ThemeEditor::ThemeEditor() { theme_menu->get_popup()->add_item(TTR("Create Empty Editor Template"), POPUP_CREATE_EDITOR_EMPTY); add_child(theme_menu); - theme_menu->set_pos(Vector2(3, 3) * EDSCALE); + theme_menu->set_position(Vector2(3, 3) * EDSCALE); theme_menu->get_popup()->connect("id_pressed", this, "_theme_menu_cbk"); HBoxContainer *main_hb = memnew(HBoxContainer); @@ -778,23 +778,23 @@ ThemeEditor::ThemeEditor() { /* test_h_scroll = memnew( HScrollBar ); - test_h_scroll->set_pos( Point2( 25, 225 ) ); + test_h_scroll->set_position( Point2( 25, 225 ) ); test_h_scroll->set_size( Point2( 150, 5 ) ); panel->add_child(test_h_scroll); line_edit = memnew( LineEdit ); - line_edit->set_pos( Point2( 25, 275 ) ); + line_edit->set_position( Point2( 25, 275 ) ); line_edit->set_size( Point2( 150, 5 ) ); line_edit->set_text("Line Edit"); panel->add_child(line_edit); test_v_scroll = memnew( VScrollBar ); - test_v_scroll->set_pos( Point2( 200, 25 ) ); + test_v_scroll->set_position( Point2( 200, 25 ) ); test_v_scroll->set_size( Point2( 5, 150 ) ); panel->add_child(test_v_scroll); test_tree = memnew(Tree); - test_tree->set_pos( Point2( 300, 25 ) ); + test_tree->set_position( Point2( 300, 25 ) ); test_tree->set_size( Point2( 200, 200 ) ); panel->add_child(test_tree); @@ -818,7 +818,7 @@ ThemeEditor::ThemeEditor() { item->set_range(0,2); Button *fd_button= memnew( Button ); - fd_button->set_pos(Point2(300,275)); + fd_button->set_position(Point2(300,275)); fd_button->set_text("Open File Dialog"); panel->add_child(fd_button); @@ -833,17 +833,17 @@ ThemeEditor::ThemeEditor() { add_child(add_del_dialog); Label *l = memnew(Label); - l->set_pos(Point2(5, 5) * EDSCALE); + l->set_position(Point2(5, 5) * EDSCALE); l->set_text(TTR("Type:")); add_del_dialog->add_child(l); dtype_select_label = l; type_edit = memnew(LineEdit); - type_edit->set_pos(Point2(5, 25) * EDSCALE); + type_edit->set_position(Point2(5, 25) * EDSCALE); type_edit->set_size(Point2(150, 5) * EDSCALE); add_del_dialog->add_child(type_edit); type_menu = memnew(MenuButton); - type_menu->set_pos(Point2(160, 25) * EDSCALE); + type_menu->set_position(Point2(160, 25) * EDSCALE); type_menu->set_size(Point2(30, 5) * EDSCALE); type_menu->set_text(".."); add_del_dialog->add_child(type_menu); @@ -851,17 +851,17 @@ ThemeEditor::ThemeEditor() { type_menu->get_popup()->connect("id_pressed", this, "_type_menu_cbk"); l = memnew(Label); - l->set_pos(Point2(200, 5) * EDSCALE); + l->set_position(Point2(200, 5) * EDSCALE); l->set_text(TTR("Name:")); add_del_dialog->add_child(l); name_select_label = l; name_edit = memnew(LineEdit); - name_edit->set_pos(Point2(200, 25) * EDSCALE); + name_edit->set_position(Point2(200, 25) * EDSCALE); name_edit->set_size(Point2(150, 5) * EDSCALE); add_del_dialog->add_child(name_edit); name_menu = memnew(MenuButton); - name_menu->set_pos(Point2(360, 25) * EDSCALE); + name_menu->set_position(Point2(360, 25) * EDSCALE); name_menu->set_size(Point2(30, 5) * EDSCALE); name_menu->set_text(".."); @@ -871,7 +871,7 @@ ThemeEditor::ThemeEditor() { name_menu->get_popup()->connect("id_pressed", this, "_name_menu_cbk"); type_select_label = memnew(Label); - type_select_label->set_pos(Point2(400, 5) * EDSCALE); + type_select_label->set_position(Point2(400, 5) * EDSCALE); type_select_label->set_text(TTR("Data Type:")); add_del_dialog->add_child(type_select_label); @@ -881,7 +881,7 @@ ThemeEditor::ThemeEditor() { type_select->add_item(TTR("Font")); type_select->add_item(TTR("Color")); type_select->add_item(TTR("Constant")); - type_select->set_pos(Point2(400, 25) * EDSCALE); + type_select->set_position(Point2(400, 25) * EDSCALE); type_select->set_size(Point2(80, 5) * EDSCALE); add_del_dialog->add_child(type_select); diff --git a/editor/plugins/tile_set_editor_plugin.cpp b/editor/plugins/tile_set_editor_plugin.cpp index cbd300a53c..e79cbd0d35 100644 --- a/editor/plugins/tile_set_editor_plugin.cpp +++ b/editor/plugins/tile_set_editor_plugin.cpp @@ -225,7 +225,7 @@ TileSetEditor::TileSetEditor(EditorNode *p_editor) { add_child(panel); MenuButton *options = memnew(MenuButton); panel->add_child(options); - options->set_pos(Point2(1, 1)); + options->set_position(Point2(1, 1)); options->set_text("Theme"); options->get_popup()->add_item(TTR("Add Item"), MENU_OPTION_ADD_ITEM); options->get_popup()->add_item(TTR("Remove Item"), MENU_OPTION_REMOVE_ITEM); diff --git a/editor/project_manager.cpp b/editor/project_manager.cpp index cb67d706c3..1a4a36fa18 100644 --- a/editor/project_manager.cpp +++ b/editor/project_manager.cpp @@ -50,6 +50,19 @@ #include "scene/gui/tool_button.h" #include "version.h" +static String _find_project_file(DirAccess *p_da) { + p_da->list_dir_begin(); + while (true) { + String f = p_da->get_next(); + if (f == "") + break; + if (f.get_extension() == "godot") + return p_da->get_current_dir() + "/" + f; + } + p_da->list_dir_end(); + return ""; +} + class NewProjectDialog : public ConfirmationDialog { GDCLASS(NewProjectDialog, ConfirmationDialog); @@ -92,18 +105,18 @@ private: if (mode != MODE_IMPORT) { - if (d->file_exists("godot.cfg")) { + if (_find_project_file(d) != "") { - error->set_text(TTR("Invalid project path, godot.cfg must not exist.")); + error->set_text(TTR("Invalid project path, *.godot must not exist.")); memdelete(d); return ""; } } else { - if (valid_path != "" && !d->file_exists("godot.cfg")) { + if (valid_path != "" && _find_project_file(d) == "") { - error->set_text(TTR("Invalid project path, godot.cfg must exist.")); + error->set_text(TTR("Invalid project path, *.godot must exist.")); memdelete(d); return ""; } @@ -136,7 +149,7 @@ private: String p = p_path; if (mode == MODE_IMPORT) { - if (p.ends_with("godot.cfg")) { + if (p.get_extension() == "godot") { p = p.get_base_dir(); } @@ -162,7 +175,7 @@ private: fdialog->set_mode(FileDialog::MODE_OPEN_FILE); fdialog->clear_filters(); - fdialog->add_filter("godot.cfg ; " _MKSTR(VERSION_NAME) " Project"); + fdialog->add_filter("*.godot ; " _MKSTR(VERSION_NAME) " Project"); } else { fdialog->set_mode(FileDialog::MODE_OPEN_DIR); } @@ -186,9 +199,9 @@ private: } else { if (mode == MODE_NEW) { - FileAccess *f = FileAccess::open(dir.plus_file("/godot.cfg"), FileAccess::WRITE); + FileAccess *f = FileAccess::open(dir.plus_file("/" + project_name->get_text().replace(" ", "_") + ".godot"), FileAccess::WRITE); if (!f) { - error->set_text(TTR("Couldn't create godot.cfg in project path.")); + error->set_text(TTR("Couldn't create *.godot project file in project path.")); } else { f->store_line("; Engine configuration file."); @@ -405,7 +418,7 @@ public: l = memnew(Label); l->set_text(TTR("Project Name:")); - l->set_pos(Point2(5, 50)); + l->set_position(Point2(5, 50)); vb->add_child(l); pn = l; @@ -624,7 +637,7 @@ void ProjectManager::_unhandled_input(const InputEvent &p_ev) { selected_list.clear(); selected_list.insert(current, hb->get_meta("main_scene")); - int offset_diff = scroll->get_v_scroll() - hb->get_pos().y; + int offset_diff = scroll->get_v_scroll() - hb->get_position().y; if (offset_diff > 0) scroll->set_v_scroll(scroll->get_v_scroll() - offset_diff); @@ -662,7 +675,7 @@ void ProjectManager::_unhandled_input(const InputEvent &p_ev) { selected_list.insert(current, hb->get_meta("main_scene")); int last_y_visible = scroll->get_v_scroll() + scroll->get_size().y; - int offset_diff = (hb->get_pos().y + hb->get_size().y) - last_y_visible; + int offset_diff = (hb->get_position().y + hb->get_size().y) - last_y_visible; if (offset_diff > 0) scroll->set_v_scroll(scroll->get_v_scroll() + offset_diff); @@ -741,10 +754,17 @@ void ProjectManager::_load_recent_projects() { continue; String project = _name.get_slice("/", 1); - String conf = path.plus_file("godot.cfg"); + DirAccess *dir_access = DirAccess::create(DirAccess::ACCESS_FILESYSTEM); + if (dir_access->change_dir(path) != OK) { + EditorSettings::get_singleton()->erase(_name); + continue; + } + String conf = _find_project_file(dir_access); + memdelete(dir_access); bool favorite = (_name.begins_with("favorite_projects/")) ? true : false; uint64_t last_modified = 0; + if (FileAccess::exists(conf)) { last_modified = FileAccess::get_modified_time(conf); @@ -912,7 +932,7 @@ void ProjectManager::_update_scroll_pos(const String &dir) { selected_list.insert(hb->get_meta("name"), hb->get_meta("main_scene")); _update_project_buttons(); int last_y_visible = scroll->get_v_scroll() + scroll->get_size().y; - int offset_diff = (hb->get_pos().y + hb->get_size().y) - last_y_visible; + int offset_diff = (hb->get_position().y + hb->get_size().y) - last_y_visible; if (offset_diff > 0) scroll->set_v_scroll(scroll->get_v_scroll() + offset_diff); @@ -1006,7 +1026,7 @@ void ProjectManager::_scan_dir(DirAccess *da, float pos, float total, List<Strin while (n != String()) { if (da->current_is_dir() && !n.begins_with(".")) { subdirs.push_front(n); - } else if (n == "godot.cfg") { + } else if (n.get_extension() == "godot") { r_projects->push_back(da->get_current_dir()); } n = da->get_next(); @@ -1117,7 +1137,7 @@ void ProjectManager::_files_dropped(PoolStringArray p_files, int p_screen) { dir->list_dir_begin(); String file = dir->get_next(); while (confirm && file != String()) { - if (!dir->current_is_dir() && file.ends_with("godot.cfg")) { + if (!dir->current_is_dir() && file.get_extension() == "godot") { confirm = false; } file = dir->get_next(); @@ -1191,7 +1211,7 @@ ProjectManager::ProjectManager() { } } - FileDialog::set_default_show_hidden_files(EditorSettings::get_singleton()->get("filesytem/file_dialog/show_hidden_files")); + FileDialog::set_default_show_hidden_files(EditorSettings::get_singleton()->get("filesystem/file_dialog/show_hidden_files")); set_area_as_parent_rect(); set_theme(create_editor_theme()); @@ -1324,7 +1344,7 @@ ProjectManager::ProjectManager() { if (StreamPeerSSL::is_available()) { asset_library = memnew(EditorAssetLibrary(true)); - asset_library->set_name("Templates"); + asset_library->set_name(TTR("Templates")); tabs->add_child(asset_library); asset_library->connect("install_asset", this, "_install_project"); } else { diff --git a/editor/project_settings.cpp b/editor/project_settings.cpp index 77af64d9e3..bc1bdcf8af 100644 --- a/editor/project_settings.cpp +++ b/editor/project_settings.cpp @@ -397,12 +397,12 @@ void ProjectSettings::_action_button_pressed(Object *p_obj, int p_column, int p_ ERR_FAIL_COND(!ti); if (p_id == 1) { - Point2 ofs = input_editor->get_global_pos(); + Point2 ofs = input_editor->get_global_position(); Rect2 ir = input_editor->get_item_rect(ti); ir.pos.y -= input_editor->get_scroll().y; ofs += ir.pos + ir.size; ofs.x -= 100; - popup_add->set_pos(ofs); + popup_add->set_position(ofs); popup_add->popup(); add_at = "input/" + ti->get_text(0); @@ -1168,7 +1168,8 @@ void ProjectSettings::_bind_methods() { ProjectSettings::ProjectSettings(EditorData *p_data) { singleton = this; - set_title(TTR("Project Settings (godot.cfg)")); + String project_file = "(" + GlobalConfig::get_singleton()->get_project_file_name() + ")"; + set_title(TTR("Project Settings " + project_file)); set_resizable(true); undo_redo = &p_data->get_undo_redo(); data = p_data; @@ -1326,7 +1327,7 @@ ProjectSettings::ProjectSettings(EditorData *p_data) { l = memnew(Label); vbc->add_child(l); - l->set_pos(Point2(6, 5)); + l->set_position(Point2(6, 5)); l->set_text(TTR("Action:")); hbc = memnew(HBoxContainer); diff --git a/editor/property_editor.cpp b/editor/property_editor.cpp index 406dbac5d9..666bfa20b5 100644 --- a/editor/property_editor.cpp +++ b/editor/property_editor.cpp @@ -319,12 +319,12 @@ bool CustomPropertyEditor::edit(Object *p_owner, const String &p_name, Variant:: CheckBox *c = checks20[0]; c->set_text("True"); - checks20gc->set_pos(Vector2(4, 4)); + checks20gc->set_position(Vector2(4, 4)); c->set_pressed(v); c->show(); checks20gc->set_size(checks20gc->get_minimum_size()); - set_size(checks20gc->get_pos() + checks20gc->get_size() + Vector2(4, 4) * EDSCALE); + set_size(checks20gc->get_position() + checks20gc->get_size() + Vector2(4, 4) * EDSCALE); } break; case Variant::INT: @@ -374,7 +374,7 @@ bool CustomPropertyEditor::edit(Object *p_owner, const String &p_name, Variant:: for (int i = 0; i < options.size(); i++) { menu->add_item(options[i], i); } - menu->set_pos(get_pos()); + menu->set_position(get_position()); menu->popup(); hide(); updating = false; @@ -423,12 +423,12 @@ bool CustomPropertyEditor::edit(Object *p_owner, const String &p_name, Variant:: value_label[0]->set_text(title); value_label[0]->show(); - value_label[0]->set_pos(Vector2(4, 4) * EDSCALE); + value_label[0]->set_position(Vector2(4, 4) * EDSCALE); - checks20gc->set_pos(Vector2(4, 4) * EDSCALE + Vector2(0, value_label[0]->get_size().height + 4 * EDSCALE)); + checks20gc->set_position(Vector2(4, 4) * EDSCALE + Vector2(0, value_label[0]->get_size().height + 4 * EDSCALE)); checks20gc->set_size(checks20gc->get_minimum_size()); - set_size(Vector2(4, 4) * EDSCALE + checks20gc->get_pos() + checks20gc->get_size()); + set_size(Vector2(4, 4) * EDSCALE + checks20gc->get_position() + checks20gc->get_size()); } else if (hint == PROPERTY_HINT_EXP_EASING) { @@ -466,7 +466,7 @@ bool CustomPropertyEditor::edit(Object *p_owner, const String &p_name, Variant:: if (f & (1 << i)) menu->set_item_checked(menu->get_item_index(i), true); } - menu->set_pos(get_pos()); + menu->set_position(get_position()); menu->popup(); hide(); updating = false; @@ -502,7 +502,7 @@ bool CustomPropertyEditor::edit(Object *p_owner, const String &p_name, Variant:: for (int i = 0; i < options.size(); i++) { menu->add_item(options[i], i); } - menu->set_pos(get_pos()); + menu->set_position(get_position()); menu->popup(); hide(); updating = false; @@ -838,15 +838,15 @@ bool CustomPropertyEditor::edit(Object *p_owner, const String &p_name, Variant:: value_editor[i]->show(); value_label[i]->show(); - value_label[i]->set_pos(Point2(ofs,y)); + value_label[i]->set_position(Point2(ofs,y)); scroll[i]->set_min(0); scroll[i]->set_max(1.0); scroll[i]->set_page(0); - scroll[i]->set_pos(Point2(ofs+15,y+Math::floor((h-scroll[i]->get_minimum_size().height)/2.0))); + scroll[i]->set_position(Point2(ofs+15,y+Math::floor((h-scroll[i]->get_minimum_size().height)/2.0))); scroll[i]->set_val(values[i]); scroll[i]->set_size(Size2(120,1)); scroll[i]->show(); - value_editor[i]->set_pos(Point2(ofs+140,y)); + value_editor[i]->set_position(Point2(ofs+140,y)); value_editor[i]->set_size(Size2(40,h)); value_editor[i]->set_text( String::num(values[i],2 )); @@ -857,7 +857,7 @@ bool CustomPropertyEditor::edit(Object *p_owner, const String &p_name, Variant:: value_label[2]->set_text("B"); value_label[3]->set_text("A"); - Size2 new_size = value_editor[3]->get_pos() + value_editor[3]->get_size() + Point2(10,10); + Size2 new_size = value_editor[3]->get_position() + value_editor[3]->get_size() + Point2(10,10); set_size( new_size ); */ @@ -981,7 +981,7 @@ bool CustomPropertyEditor::edit(Object *p_owner, const String &p_name, Variant:: } } - menu->set_pos(get_pos()); + menu->set_position(get_position()); menu->popup(); hide(); updating = false; @@ -1868,7 +1868,7 @@ void CustomPropertyEditor::config_action_buttons(const List<String> &p_strings) if (i < p_strings.size()) { action_buttons[i]->show(); action_buttons[i]->set_text(p_strings[i]); - action_buttons[i]->set_pos(Point2(m, m + i * (h + m))); + action_buttons[i]->set_position(Point2(m, m + i * (h + m))); action_buttons[i]->set_size(Size2(w - m * 2, h)); action_buttons[i]->set_flat(true); } else { @@ -1896,9 +1896,9 @@ void CustomPropertyEditor::config_value_editors(int p_amount, int p_columns, int value_editor[i]->show(); value_label[i]->show(); value_label[i]->set_text(i < p_strings.size() ? p_strings[i] : String("")); - value_editor[i]->set_pos(Point2(m + p_label_w + c * (w + m + p_label_w), m + r * (h + m))); + value_editor[i]->set_position(Point2(m + p_label_w + c * (w + m + p_label_w), m + r * (h + m))); value_editor[i]->set_size(Size2(w, h)); - value_label[i]->set_pos(Point2(m + c * (w + m + p_label_w), m + r * (h + m))); + value_label[i]->set_position(Point2(m + c * (w + m + p_label_w), m + r * (h + m))); value_editor[i]->set_editable(!read_only); } else { value_editor[i]->hide(); @@ -2388,6 +2388,10 @@ void PropertyEditor::set_item_text(TreeItem *p_item, int p_type, const String &p RES res = obj->get(p_name).operator RefPtr(); if (res->is_class("Texture")) { int tw = EditorSettings::get_singleton()->get("docks/property_editor/texture_preview_width"); + Vector2 size(res->call("get_width"), res->call("get_height")); + if (size.width < size.height) { + tw = MAX((size.width / size.height) * tw, 1); + } p_item->set_icon_max_width(1, tw); p_item->set_icon(1, res); p_item->set_text(1, ""); @@ -2427,7 +2431,9 @@ void PropertyEditor::set_item_text(TreeItem *p_item, int p_type, const String &p } } - if (!res->is_class("Texture")) { + if (res->is_class("Script")) { + p_item->set_text(1, res->get_path().get_file()); + } else if (!res->is_class("Texture")) { //texture already previews via itself EditorResourcePreview::get_singleton()->queue_edited_resource_preview(res, this, "_resource_preview_done", p_item->get_instance_ID()); } @@ -3618,6 +3624,10 @@ void PropertyEditor::update_tree() { if (res->is_class("Texture")) { int tw = EditorSettings::get_singleton()->get("docks/property_editor/texture_preview_width"); + Vector2 size(res->call("get_width"), res->call("get_height")); + if (size.width < size.height) { + tw = MAX((size.width / size.height) * tw, 1); + } item->set_icon_max_width(1, tw); item->set_icon(1, res); item->set_text(1, ""); @@ -3641,7 +3651,9 @@ void PropertyEditor::update_tree() { } else if (res.is_valid()) { item->set_tooltip(1, res->get_name() + " (" + res->get_class() + ")"); } - if (!res->is_class("Texture")) { + if (res->is_class("Script")) { + item->set_text(1, res->get_path().get_file()); + } else if (!res->is_class("Texture")) { //texture already previews via itself EditorResourcePreview::get_singleton()->queue_edited_resource_preview(res, this, "_resource_preview_done", item->get_instance_ID()); } @@ -3989,7 +4001,7 @@ void PropertyEditor::_custom_editor_request(bool p_arrow) { int hint = d.has("hint") ? d["hint"].operator int() : -1; String hint_text = d.has("hint_text") ? d["hint_text"] : ""; Rect2 where = tree->get_custom_popup_rect(); - custom_editor->set_pos(where.pos); + custom_editor->set_position(where.pos); if (custom_editor->edit(obj, name, type, v, hint, hint_text)) { custom_editor->popup(); @@ -4097,8 +4109,8 @@ void PropertyEditor::_edit_button(Object *p_item, int p_column, int p_button) { custom_editor->edit(obj, n, (Variant::Type)t, v, h, ht); Rect2 where = tree->get_item_rect(ti, 1); where.pos -= tree->get_scroll(); - where.pos += tree->get_global_pos(); - custom_editor->set_pos(where.pos); + where.pos += tree->get_global_position(); + custom_editor->set_position(where.pos); custom_editor->popup(); } else if (t == Variant::STRING) { @@ -4110,8 +4122,8 @@ void PropertyEditor::_edit_button(Object *p_item, int p_column, int p_button) { Rect2 where = tree->get_item_rect(ti, 1); where.pos -= tree->get_scroll(); - where.pos += tree->get_global_pos(); - custom_editor->set_pos(where.pos); + where.pos += tree->get_global_position(); + custom_editor->set_position(where.pos); custom_editor->popup(); } else { custom_editor->popup_centered_ratio(); @@ -4389,6 +4401,7 @@ PropertyEditor::PropertyEditor() { capitalize_paths = true; autoclear = false; tree->set_column_titles_visible(false); + tree->add_constant_override("button_margin", 0); keying = false; read_only = false; diff --git a/editor/reparent_dialog.cpp b/editor/reparent_dialog.cpp index ffd4d704d5..acc511e004 100644 --- a/editor/reparent_dialog.cpp +++ b/editor/reparent_dialog.cpp @@ -95,7 +95,7 @@ ReparentDialog::ReparentDialog() { tree->get_scene_tree()->connect("item_activated", this, "_reparent"); //Label *label = memnew( Label ); - //label->set_pos( Point2( 15,8) ); + //label->set_position( Point2( 15,8) ); //label->set_text("Reparent Location (Select new Parent):"); keep_transform = memnew(CheckBox); diff --git a/editor/scene_tree_dock.cpp b/editor/scene_tree_dock.cpp index 1a0e67e71a..69b8723431 100644 --- a/editor/scene_tree_dock.cpp +++ b/editor/scene_tree_dock.cpp @@ -1112,7 +1112,7 @@ void SceneTreeDock::_do_reparent(Node *p_new_parent, int p_position_in_parent, V if (node->cast_to<Spatial>()) editor_data->get_undo_redo().add_do_method(node, "set_global_transform", node->cast_to<Spatial>()->get_global_transform()); if (node->cast_to<Control>()) - editor_data->get_undo_redo().add_do_method(node, "set_global_pos", node->cast_to<Control>()->get_global_pos()); + editor_data->get_undo_redo().add_do_method(node, "set_global_position", node->cast_to<Control>()->get_global_position()); } editor_data->get_undo_redo().add_do_method(this, "_set_owners", edited_scene, owners); @@ -1154,7 +1154,7 @@ void SceneTreeDock::_do_reparent(Node *p_new_parent, int p_position_in_parent, V if (node->cast_to<Spatial>()) editor_data->get_undo_redo().add_undo_method(node, "set_transform", node->cast_to<Spatial>()->get_transform()); if (node->cast_to<Control>()) - editor_data->get_undo_redo().add_undo_method(node, "set_pos", node->cast_to<Control>()->get_pos()); + editor_data->get_undo_redo().add_undo_method(node, "set_position", node->cast_to<Control>()->get_position()); } } @@ -1669,7 +1669,7 @@ void SceneTreeDock::_tree_rmb(const Vector2 &p_menu_pos) { menu->add_icon_shortcut(get_icon("Instance", "EditorIcons"), ED_GET_SHORTCUT("scene_tree/instance_scene"), TOOL_INSTANCE); menu->set_size(Size2(1, 1)); - menu->set_pos(p_menu_pos); + menu->set_position(p_menu_pos); menu->popup(); return; } @@ -1710,7 +1710,7 @@ void SceneTreeDock::_tree_rmb(const Vector2 &p_menu_pos) { menu->add_separator(); menu->add_icon_shortcut(get_icon("Remove", "EditorIcons"), ED_SHORTCUT("scene_tree/delete", TTR("Delete Node(s)"), KEY_DELETE), TOOL_ERASE); menu->set_size(Size2(1, 1)); - menu->set_pos(p_menu_pos); + menu->set_position(p_menu_pos); menu->popup(); } diff --git a/editor/scene_tree_editor.cpp b/editor/scene_tree_editor.cpp index b8bbe2c832..8fd0d13b32 100644 --- a/editor/scene_tree_editor.cpp +++ b/editor/scene_tree_editor.cpp @@ -162,16 +162,16 @@ void SceneTreeEditor::_cell_button_pressed(Object *p_item, int p_column, int p_i //open scene request Rect2 item_rect = tree->get_item_rect(item, 0); item_rect.pos.y -= tree->get_scroll().y; - item_rect.pos += tree->get_global_pos(); + item_rect.pos += tree->get_global_position(); if (n == get_scene_node()) { - inheritance_menu->set_pos(item_rect.pos + Vector2(0, item_rect.size.y)); + inheritance_menu->set_position(item_rect.pos + Vector2(0, item_rect.size.y)); inheritance_menu->set_size(Vector2(item_rect.size.x, 0)); inheritance_menu->popup(); instance_node = n->get_instance_ID(); } else { - instance_menu->set_pos(item_rect.pos + Vector2(0, item_rect.size.y)); + instance_menu->set_position(item_rect.pos + Vector2(0, item_rect.size.y)); instance_menu->set_size(Vector2(item_rect.size.x, 0)); if (EditorNode::get_singleton()->get_edited_scene()->is_editable_instance(n)) instance_menu->set_item_checked(0, true); @@ -1103,7 +1103,7 @@ SceneTreeEditor::SceneTreeEditor(bool p_label, bool p_can_rename, bool p_can_ope if (p_label) { Label *label = memnew(Label); - label->set_pos(Point2(10, 0)); + label->set_position(Point2(10, 0)); label->set_text(TTR("Scene Tree (Nodes):")); add_child(label); diff --git a/editor/translations/ar.po b/editor/translations/ar.po index 48d015ec07..766d8f9676 100644 --- a/editor/translations/ar.po +++ b/editor/translations/ar.po @@ -358,6 +358,174 @@ msgstr "" msgid "Change Array Value" msgstr "" +#: editor/asset_library_editor_plugin.cpp +msgid "Free" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp editor/editor_plugin_settings.cpp +msgid "Version:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Contents:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "View Files" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp editor/create_dialog.cpp +#: editor/editor_help.cpp editor/property_selector.cpp +#: editor/script_editor_debugger.cpp +msgid "Description:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp editor/project_manager.cpp +msgid "Install" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp editor/call_dialog.cpp +#: editor/connections_dialog.cpp editor/export_template_manager.cpp +#: editor/plugins/animation_player_editor_plugin.cpp +#: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/resource_preloader_editor_plugin.cpp +#: editor/plugins/sample_library_editor_plugin.cpp +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/sprite_frames_editor_plugin.cpp editor/project_settings.cpp +#: editor/property_editor.cpp editor/run_settings_dialog.cpp +#: editor/settings_config_dialog.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Close" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Can't resolve hostname:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Can't resolve." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Connection error, please try again." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Can't connect." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Can't connect to host:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "No response from host:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "No response." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Request failed, return code:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Req. Failed." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Request failed, too many redirects" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Redirect Loop." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Failed:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Bad download hash, assuming file has been tampered with." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Expected:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Got:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Failed sha256 hash check" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Asset Download Error:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Success!" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Fetching:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Resolving.." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Connecting.." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Requesting.." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Error making request" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Idle" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Retry" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Download Error" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Download for this asset is already in progress!" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "first" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "prev" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "next" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "last" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "All" +msgstr "" + #: editor/asset_library_editor_plugin.cpp editor/create_dialog.cpp #: editor/editor_help.cpp editor/editor_node.cpp #: editor/plugins/script_editor_plugin.cpp editor/property_selector.cpp @@ -365,6 +533,29 @@ msgstr "" msgid "Search:" msgstr "" +#: editor/asset_library_editor_plugin.cpp editor/code_editor.cpp +#: editor/editor_help.cpp editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp +#: editor/plugins/shader_editor_plugin.cpp editor/project_settings.cpp +msgid "Search" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp editor/editor_node.cpp +#: editor/io_plugins/editor_bitmask_import_plugin.cpp +#: editor/io_plugins/editor_font_import_plugin.cpp +#: editor/io_plugins/editor_mesh_import_plugin.cpp +#: editor/io_plugins/editor_sample_import_plugin.cpp +#: editor/io_plugins/editor_scene_import_plugin.cpp +#: editor/io_plugins/editor_texture_import_plugin.cpp +#: editor/io_plugins/editor_translation_import_plugin.cpp +#: editor/project_manager.cpp +msgid "Import" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp editor/project_settings.cpp +msgid "Plugins" +msgstr "" + #: editor/asset_library_editor_plugin.cpp msgid "Sort:" msgstr "" @@ -378,10 +569,6 @@ msgid "Category:" msgstr "" #: editor/asset_library_editor_plugin.cpp -msgid "All" -msgstr "" - -#: editor/asset_library_editor_plugin.cpp msgid "Site:" msgstr "الموقع:" @@ -413,20 +600,6 @@ msgstr "" msgid "Call" msgstr "نداء" -#: editor/call_dialog.cpp editor/connections_dialog.cpp -#: editor/export_template_manager.cpp -#: editor/plugins/animation_player_editor_plugin.cpp -#: editor/plugins/canvas_item_editor_plugin.cpp -#: editor/plugins/resource_preloader_editor_plugin.cpp -#: editor/plugins/sample_library_editor_plugin.cpp -#: editor/plugins/script_editor_plugin.cpp -#: editor/plugins/sprite_frames_editor_plugin.cpp editor/project_settings.cpp -#: editor/property_editor.cpp editor/run_settings_dialog.cpp -#: editor/settings_config_dialog.cpp -#: modules/visual_script/visual_script_editor.cpp -msgid "Close" -msgstr "" - #: editor/call_dialog.cpp msgid "Method List:" msgstr "" @@ -476,13 +649,6 @@ msgid "Selection Only" msgstr "" #: editor/code_editor.cpp editor/editor_help.cpp -#: editor/plugins/script_editor_plugin.cpp -#: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp editor/project_settings.cpp -msgid "Search" -msgstr "" - -#: editor/code_editor.cpp editor/editor_help.cpp msgid "Find" msgstr "" @@ -632,11 +798,6 @@ msgstr "" msgid "Matches:" msgstr "" -#: editor/create_dialog.cpp editor/editor_help.cpp editor/property_selector.cpp -#: editor/script_editor_debugger.cpp -msgid "Description:" -msgstr "" - #: editor/dependency_editor.cpp msgid "Search Replacement For:" msgstr "" @@ -1111,10 +1272,6 @@ msgstr "" msgid "Clear" msgstr "" -#: editor/editor_node.cpp -msgid "Node From Scene" -msgstr "" - #: editor/editor_node.cpp editor/plugins/animation_player_editor_plugin.cpp #: editor/resources_dock.cpp msgid "Error saving resource!" @@ -1479,21 +1636,6 @@ msgid "Distraction Free Mode" msgstr "" #: editor/editor_node.cpp -msgid "Import assets to the project." -msgstr "" - -#: editor/editor_node.cpp editor/io_plugins/editor_bitmask_import_plugin.cpp -#: editor/io_plugins/editor_font_import_plugin.cpp -#: editor/io_plugins/editor_mesh_import_plugin.cpp -#: editor/io_plugins/editor_sample_import_plugin.cpp -#: editor/io_plugins/editor_scene_import_plugin.cpp -#: editor/io_plugins/editor_texture_import_plugin.cpp -#: editor/io_plugins/editor_translation_import_plugin.cpp -#: editor/project_manager.cpp -msgid "Import" -msgstr "" - -#: editor/editor_node.cpp msgid "Miscellaneous project or scene-wide tools." msgstr "" @@ -1762,10 +1904,6 @@ msgid "Installed Plugins:" msgstr "" #: editor/editor_plugin_settings.cpp -msgid "Version:" -msgstr "" - -#: editor/editor_plugin_settings.cpp msgid "Author:" msgstr "" @@ -3736,6 +3874,10 @@ msgid "A processor material of type 'ParticlesMaterial' is required." msgstr "" #: editor/plugins/particles_editor_plugin.cpp +msgid "Generating AABB" +msgstr "" + +#: editor/plugins/particles_editor_plugin.cpp msgid "Faces contain no area!" msgstr "" @@ -3783,6 +3925,14 @@ msgstr "" msgid "Emission Source: " msgstr "" +#: editor/plugins/particles_editor_plugin.cpp +msgid "Generate Visibility AABB" +msgstr "" + +#: editor/plugins/particles_editor_plugin.cpp +msgid "Generation Time (sec):" +msgstr "" + #: editor/plugins/path_2d_editor_plugin.cpp msgid "Remove Point from Curve" msgstr "" @@ -4232,6 +4382,14 @@ msgid "Trim Trailing Whitespace" msgstr "" #: editor/plugins/script_text_editor.cpp +msgid "Convert Indent To Spaces" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Convert Indent To Tabs" +msgstr "" + +#: editor/plugins/script_text_editor.cpp msgid "Auto Indent" msgstr "" @@ -5088,11 +5246,11 @@ msgid "Invalid project path, the path must exist!" msgstr "" #: editor/project_manager.cpp -msgid "Invalid project path, godot.cfg must not exist." +msgid "Invalid project path, *.godot must not exist." msgstr "" #: editor/project_manager.cpp -msgid "Invalid project path, godot.cfg must exist." +msgid "Invalid project path, *.godot must exist." msgstr "" #: editor/project_manager.cpp @@ -5104,7 +5262,7 @@ msgid "Invalid project path (changed anything?)." msgstr "" #: editor/project_manager.cpp -msgid "Couldn't create godot.cfg in project path." +msgid "Couldn't create *.godot project file in project path." msgstr "" #: editor/project_manager.cpp @@ -5140,10 +5298,6 @@ msgid "Install Project:" msgstr "" #: editor/project_manager.cpp -msgid "Install" -msgstr "" - -#: editor/project_manager.cpp msgid "Browse" msgstr "" @@ -5202,6 +5356,10 @@ msgid "New Project" msgstr "" #: editor/project_manager.cpp +msgid "Templates" +msgstr "" + +#: editor/project_manager.cpp msgid "Exit" msgstr "" @@ -5385,7 +5543,7 @@ msgid "Remove Resource Remap Option" msgstr "" #: editor/project_settings.cpp -msgid "Project Settings (godot.cfg)" +msgid "Project Settings " msgstr "" #: editor/project_settings.cpp editor/settings_config_dialog.cpp @@ -5452,10 +5610,6 @@ msgstr "" msgid "AutoLoad" msgstr "" -#: editor/project_settings.cpp -msgid "Plugins" -msgstr "" - #: editor/property_editor.cpp msgid "Pick a Viewport" msgstr "" @@ -6057,6 +6211,10 @@ msgid "Change Notifier Extents" msgstr "" #: editor/spatial_editor_gizmos.cpp +msgid "Change Particles AABB" +msgstr "" + +#: editor/spatial_editor_gizmos.cpp msgid "Change Probe Extents" msgstr "" @@ -6616,6 +6774,17 @@ msgid "" "It only provides navigation data." msgstr "" +#: scene/3d/particles.cpp +msgid "" +"Nothing is visible because meshes have not been assigned to draw passes." +msgstr "" + +#: scene/3d/particles.cpp +msgid "" +"A material to process the particles is not assigned, so no behavior is " +"imprinted." +msgstr "" + #: scene/3d/remote_transform.cpp msgid "Path property must point to a valid Spatial node to work." msgstr "" diff --git a/editor/translations/bg.po b/editor/translations/bg.po index fe15509a62..b23fa3a8fb 100644 --- a/editor/translations/bg.po +++ b/editor/translations/bg.po @@ -356,6 +356,176 @@ msgstr "" msgid "Change Array Value" msgstr "" +#: editor/asset_library_editor_plugin.cpp +msgid "Free" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp editor/editor_plugin_settings.cpp +msgid "Version:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Contents:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "View Files" +msgstr "Файл:" + +#: editor/asset_library_editor_plugin.cpp editor/create_dialog.cpp +#: editor/editor_help.cpp editor/property_selector.cpp +#: editor/script_editor_debugger.cpp +msgid "Description:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp editor/project_manager.cpp +msgid "Install" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp editor/call_dialog.cpp +#: editor/connections_dialog.cpp editor/export_template_manager.cpp +#: editor/plugins/animation_player_editor_plugin.cpp +#: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/resource_preloader_editor_plugin.cpp +#: editor/plugins/sample_library_editor_plugin.cpp +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/sprite_frames_editor_plugin.cpp editor/project_settings.cpp +#: editor/property_editor.cpp editor/run_settings_dialog.cpp +#: editor/settings_config_dialog.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Close" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Can't resolve hostname:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Can't resolve." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Connection error, please try again." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Can't connect." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Can't connect to host:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "No response from host:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "No response." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Request failed, return code:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Req. Failed." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Request failed, too many redirects" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Redirect Loop." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Failed:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Bad download hash, assuming file has been tampered with." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Expected:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Got:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Failed sha256 hash check" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Asset Download Error:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Success!" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Fetching:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Resolving.." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Connecting.." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Requesting.." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Error making request" +msgstr "Имаше грешка при зареждане на Ñцената." + +#: editor/asset_library_editor_plugin.cpp +msgid "Idle" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Retry" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Download Error" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Download for this asset is already in progress!" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "first" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "prev" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "next" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "last" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "All" +msgstr "" + #: editor/asset_library_editor_plugin.cpp editor/create_dialog.cpp #: editor/editor_help.cpp editor/editor_node.cpp #: editor/plugins/script_editor_plugin.cpp editor/property_selector.cpp @@ -363,6 +533,29 @@ msgstr "" msgid "Search:" msgstr "" +#: editor/asset_library_editor_plugin.cpp editor/code_editor.cpp +#: editor/editor_help.cpp editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp +#: editor/plugins/shader_editor_plugin.cpp editor/project_settings.cpp +msgid "Search" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp editor/editor_node.cpp +#: editor/io_plugins/editor_bitmask_import_plugin.cpp +#: editor/io_plugins/editor_font_import_plugin.cpp +#: editor/io_plugins/editor_mesh_import_plugin.cpp +#: editor/io_plugins/editor_sample_import_plugin.cpp +#: editor/io_plugins/editor_scene_import_plugin.cpp +#: editor/io_plugins/editor_texture_import_plugin.cpp +#: editor/io_plugins/editor_translation_import_plugin.cpp +#: editor/project_manager.cpp +msgid "Import" +msgstr "ВнаÑÑне" + +#: editor/asset_library_editor_plugin.cpp editor/project_settings.cpp +msgid "Plugins" +msgstr "ПриÑтавки" + #: editor/asset_library_editor_plugin.cpp msgid "Sort:" msgstr "" @@ -376,10 +569,6 @@ msgid "Category:" msgstr "" #: editor/asset_library_editor_plugin.cpp -msgid "All" -msgstr "" - -#: editor/asset_library_editor_plugin.cpp msgid "Site:" msgstr "" @@ -411,20 +600,6 @@ msgstr "" msgid "Call" msgstr "" -#: editor/call_dialog.cpp editor/connections_dialog.cpp -#: editor/export_template_manager.cpp -#: editor/plugins/animation_player_editor_plugin.cpp -#: editor/plugins/canvas_item_editor_plugin.cpp -#: editor/plugins/resource_preloader_editor_plugin.cpp -#: editor/plugins/sample_library_editor_plugin.cpp -#: editor/plugins/script_editor_plugin.cpp -#: editor/plugins/sprite_frames_editor_plugin.cpp editor/project_settings.cpp -#: editor/property_editor.cpp editor/run_settings_dialog.cpp -#: editor/settings_config_dialog.cpp -#: modules/visual_script/visual_script_editor.cpp -msgid "Close" -msgstr "" - #: editor/call_dialog.cpp msgid "Method List:" msgstr "" @@ -474,13 +649,6 @@ msgid "Selection Only" msgstr "" #: editor/code_editor.cpp editor/editor_help.cpp -#: editor/plugins/script_editor_plugin.cpp -#: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp editor/project_settings.cpp -msgid "Search" -msgstr "" - -#: editor/code_editor.cpp editor/editor_help.cpp msgid "Find" msgstr "" @@ -630,11 +798,6 @@ msgstr "" msgid "Matches:" msgstr "" -#: editor/create_dialog.cpp editor/editor_help.cpp editor/property_selector.cpp -#: editor/script_editor_debugger.cpp -msgid "Description:" -msgstr "" - #: editor/dependency_editor.cpp msgid "Search Replacement For:" msgstr "" @@ -1110,10 +1273,6 @@ msgstr "" msgid "Clear" msgstr "ИзчиÑтване" -#: editor/editor_node.cpp -msgid "Node From Scene" -msgstr "" - #: editor/editor_node.cpp editor/plugins/animation_player_editor_plugin.cpp #: editor/resources_dock.cpp msgid "Error saving resource!" @@ -1478,21 +1637,6 @@ msgid "Distraction Free Mode" msgstr "" #: editor/editor_node.cpp -msgid "Import assets to the project." -msgstr "ВнаÑÑне на обекти в проекта." - -#: editor/editor_node.cpp editor/io_plugins/editor_bitmask_import_plugin.cpp -#: editor/io_plugins/editor_font_import_plugin.cpp -#: editor/io_plugins/editor_mesh_import_plugin.cpp -#: editor/io_plugins/editor_sample_import_plugin.cpp -#: editor/io_plugins/editor_scene_import_plugin.cpp -#: editor/io_plugins/editor_texture_import_plugin.cpp -#: editor/io_plugins/editor_translation_import_plugin.cpp -#: editor/project_manager.cpp -msgid "Import" -msgstr "ВнаÑÑне" - -#: editor/editor_node.cpp msgid "Miscellaneous project or scene-wide tools." msgstr "" @@ -1761,10 +1905,6 @@ msgid "Installed Plugins:" msgstr "ИнÑталирани приÑтавки:" #: editor/editor_plugin_settings.cpp -msgid "Version:" -msgstr "" - -#: editor/editor_plugin_settings.cpp msgid "Author:" msgstr "" @@ -3744,6 +3884,10 @@ msgid "A processor material of type 'ParticlesMaterial' is required." msgstr "" #: editor/plugins/particles_editor_plugin.cpp +msgid "Generating AABB" +msgstr "" + +#: editor/plugins/particles_editor_plugin.cpp msgid "Faces contain no area!" msgstr "" @@ -3791,6 +3935,14 @@ msgstr "" msgid "Emission Source: " msgstr "" +#: editor/plugins/particles_editor_plugin.cpp +msgid "Generate Visibility AABB" +msgstr "" + +#: editor/plugins/particles_editor_plugin.cpp +msgid "Generation Time (sec):" +msgstr "" + #: editor/plugins/path_2d_editor_plugin.cpp msgid "Remove Point from Curve" msgstr "" @@ -4241,6 +4393,14 @@ msgid "Trim Trailing Whitespace" msgstr "" #: editor/plugins/script_text_editor.cpp +msgid "Convert Indent To Spaces" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Convert Indent To Tabs" +msgstr "" + +#: editor/plugins/script_text_editor.cpp msgid "Auto Indent" msgstr "" @@ -5101,11 +5261,11 @@ msgid "Invalid project path, the path must exist!" msgstr "" #: editor/project_manager.cpp -msgid "Invalid project path, godot.cfg must not exist." +msgid "Invalid project path, *.godot must not exist." msgstr "" #: editor/project_manager.cpp -msgid "Invalid project path, godot.cfg must exist." +msgid "Invalid project path, *.godot must exist." msgstr "" #: editor/project_manager.cpp @@ -5117,7 +5277,7 @@ msgid "Invalid project path (changed anything?)." msgstr "" #: editor/project_manager.cpp -msgid "Couldn't create godot.cfg in project path." +msgid "Couldn't create *.godot project file in project path." msgstr "" #: editor/project_manager.cpp @@ -5153,10 +5313,6 @@ msgid "Install Project:" msgstr "" #: editor/project_manager.cpp -msgid "Install" -msgstr "" - -#: editor/project_manager.cpp msgid "Browse" msgstr "" @@ -5215,6 +5371,10 @@ msgid "New Project" msgstr "" #: editor/project_manager.cpp +msgid "Templates" +msgstr "" + +#: editor/project_manager.cpp msgid "Exit" msgstr "" @@ -5399,7 +5559,7 @@ msgstr "" #: editor/project_settings.cpp #, fuzzy -msgid "Project Settings (godot.cfg)" +msgid "Project Settings " msgstr "ÐаÑтройки на проекта" #: editor/project_settings.cpp editor/settings_config_dialog.cpp @@ -5466,10 +5626,6 @@ msgstr "" msgid "AutoLoad" msgstr "" -#: editor/project_settings.cpp -msgid "Plugins" -msgstr "ПриÑтавки" - #: editor/property_editor.cpp msgid "Pick a Viewport" msgstr "" @@ -6079,6 +6235,10 @@ msgid "Change Notifier Extents" msgstr "" #: editor/spatial_editor_gizmos.cpp +msgid "Change Particles AABB" +msgstr "" + +#: editor/spatial_editor_gizmos.cpp msgid "Change Probe Extents" msgstr "" @@ -6664,6 +6824,17 @@ msgid "" "It only provides navigation data." msgstr "" +#: scene/3d/particles.cpp +msgid "" +"Nothing is visible because meshes have not been assigned to draw passes." +msgstr "" + +#: scene/3d/particles.cpp +msgid "" +"A material to process the particles is not assigned, so no behavior is " +"imprinted." +msgstr "" + #: scene/3d/remote_transform.cpp #, fuzzy msgid "Path property must point to a valid Spatial node to work." @@ -6732,6 +6903,13 @@ msgid "" "texture to some node for display." msgstr "" +#~ msgid "Import assets to the project." +#~ msgstr "ВнаÑÑне на обекти в проекта." + +#, fuzzy +#~ msgid "Project Settings (godot.cfg)" +#~ msgstr "ÐаÑтройки на проекта" + #~ msgid "" #~ "A SampleLibrary resource must be created or set in the 'samples' property " #~ "in order for SamplePlayer to play sound." diff --git a/editor/translations/bn.po b/editor/translations/bn.po index d4184dfe2b..224c00cf5d 100644 --- a/editor/translations/bn.po +++ b/editor/translations/bn.po @@ -358,6 +358,184 @@ msgstr "শà§à¦°à§‡à¦£à§€à¦¬à¦¿à¦¨à§à¦¯à¦¾à¦¸/সারির মানের msgid "Change Array Value" msgstr "শà§à¦°à§‡à¦£à§€à¦¬à¦¿à¦¨à§à¦¯à¦¾à¦¸/সারির মান পরিবরà§à¦¤à¦¨ করà§à¦¨" +#: editor/asset_library_editor_plugin.cpp +msgid "Free" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp editor/editor_plugin_settings.cpp +msgid "Version:" +msgstr "সংসà§à¦•à¦°à¦£:" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Contents:" +msgstr "ধà§à¦°à§à¦¬à¦•à¦¸à¦®à§‚হ:" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "View Files" +msgstr "ফাইল" + +#: editor/asset_library_editor_plugin.cpp editor/create_dialog.cpp +#: editor/editor_help.cpp editor/property_selector.cpp +#: editor/script_editor_debugger.cpp +msgid "Description:" +msgstr "বরà§à¦£à¦¨à¦¾:" + +#: editor/asset_library_editor_plugin.cpp editor/project_manager.cpp +msgid "Install" +msgstr "ইনà§à¦¸à¦Ÿà¦²" + +#: editor/asset_library_editor_plugin.cpp editor/call_dialog.cpp +#: editor/connections_dialog.cpp editor/export_template_manager.cpp +#: editor/plugins/animation_player_editor_plugin.cpp +#: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/resource_preloader_editor_plugin.cpp +#: editor/plugins/sample_library_editor_plugin.cpp +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/sprite_frames_editor_plugin.cpp editor/project_settings.cpp +#: editor/property_editor.cpp editor/run_settings_dialog.cpp +#: editor/settings_config_dialog.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Close" +msgstr "বনà§à¦§ করà§à¦¨" + +#: editor/asset_library_editor_plugin.cpp +msgid "Can't resolve hostname:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Can't resolve." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Connection error, please try again." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Can't connect." +msgstr "সংযোগ.." + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Can't connect to host:" +msgstr "নোডের সাথে সংযà§à¦•à§à¦¤ করà§à¦¨:" + +#: editor/asset_library_editor_plugin.cpp +msgid "No response from host:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "No response." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Request failed, return code:" +msgstr "আবেদনকৃত ফাইল ফরমà§à¦¯à¦¾à¦Ÿ/ধরণ অজানা:" + +#: editor/asset_library_editor_plugin.cpp +msgid "Req. Failed." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Request failed, too many redirects" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Redirect Loop." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Failed:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Bad download hash, assuming file has been tampered with." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Expected:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Got:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Failed sha256 hash check" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Asset Download Error:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Success!" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Fetching:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Resolving.." +msgstr "সংরকà§à¦·à¦¿à¦¤ হচà§à¦›à§‡.." + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Connecting.." +msgstr "সংযোগ.." + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Requesting.." +msgstr "পরীকà§à¦·à¦¾à¦®à§‚লক উৎস" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Error making request" +msgstr "রিসোরà§à¦¸ সংরকà§à¦·à¦£à§‡ সমসà§à¦¯à¦¾ হয়েছে!" + +#: editor/asset_library_editor_plugin.cpp +msgid "Idle" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Retry" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Download Error" +msgstr "নীচে" + +#: editor/asset_library_editor_plugin.cpp +msgid "Download for this asset is already in progress!" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "first" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "prev" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "next" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "last" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "All" +msgstr "সকল" + #: editor/asset_library_editor_plugin.cpp editor/create_dialog.cpp #: editor/editor_help.cpp editor/editor_node.cpp #: editor/plugins/script_editor_plugin.cpp editor/property_selector.cpp @@ -365,6 +543,29 @@ msgstr "শà§à¦°à§‡à¦£à§€à¦¬à¦¿à¦¨à§à¦¯à¦¾à¦¸/সারির মান পর msgid "Search:" msgstr "অনà§à¦¸à¦¨à§à¦§à¦¾à¦¨ করà§à¦¨:" +#: editor/asset_library_editor_plugin.cpp editor/code_editor.cpp +#: editor/editor_help.cpp editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp +#: editor/plugins/shader_editor_plugin.cpp editor/project_settings.cpp +msgid "Search" +msgstr "অনà§à¦¸à¦¨à§à¦§à¦¾à¦¨ করà§à¦¨" + +#: editor/asset_library_editor_plugin.cpp editor/editor_node.cpp +#: editor/io_plugins/editor_bitmask_import_plugin.cpp +#: editor/io_plugins/editor_font_import_plugin.cpp +#: editor/io_plugins/editor_mesh_import_plugin.cpp +#: editor/io_plugins/editor_sample_import_plugin.cpp +#: editor/io_plugins/editor_scene_import_plugin.cpp +#: editor/io_plugins/editor_texture_import_plugin.cpp +#: editor/io_plugins/editor_translation_import_plugin.cpp +#: editor/project_manager.cpp +msgid "Import" +msgstr "ইমà§à¦ªà§‹à¦°à§à¦Ÿ" + +#: editor/asset_library_editor_plugin.cpp editor/project_settings.cpp +msgid "Plugins" +msgstr "পà§à¦²à¦¾à¦—ইন-সমূহ" + #: editor/asset_library_editor_plugin.cpp msgid "Sort:" msgstr "সাজান:" @@ -378,10 +579,6 @@ msgid "Category:" msgstr "বিà¦à¦¾à¦—:" #: editor/asset_library_editor_plugin.cpp -msgid "All" -msgstr "সকল" - -#: editor/asset_library_editor_plugin.cpp msgid "Site:" msgstr "ওয়েবসাইট:" @@ -413,20 +610,6 @@ msgstr "'%s' à¦à¦° জনà§à¦¯ মেথডের তালিকা:" msgid "Call" msgstr "ডাকà§à¦¨ (Call)" -#: editor/call_dialog.cpp editor/connections_dialog.cpp -#: editor/export_template_manager.cpp -#: editor/plugins/animation_player_editor_plugin.cpp -#: editor/plugins/canvas_item_editor_plugin.cpp -#: editor/plugins/resource_preloader_editor_plugin.cpp -#: editor/plugins/sample_library_editor_plugin.cpp -#: editor/plugins/script_editor_plugin.cpp -#: editor/plugins/sprite_frames_editor_plugin.cpp editor/project_settings.cpp -#: editor/property_editor.cpp editor/run_settings_dialog.cpp -#: editor/settings_config_dialog.cpp -#: modules/visual_script/visual_script_editor.cpp -msgid "Close" -msgstr "বনà§à¦§ করà§à¦¨" - #: editor/call_dialog.cpp msgid "Method List:" msgstr "মেথডের তালিকা:" @@ -477,13 +660,6 @@ msgid "Selection Only" msgstr "শà§à¦§à§à¦®à¦¾à¦¤à§à¦° নিরà§à¦¬à¦¾à¦šà¦¿à¦¤à¦¸à¦®à§‚হ" #: editor/code_editor.cpp editor/editor_help.cpp -#: editor/plugins/script_editor_plugin.cpp -#: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp editor/project_settings.cpp -msgid "Search" -msgstr "অনà§à¦¸à¦¨à§à¦§à¦¾à¦¨ করà§à¦¨" - -#: editor/code_editor.cpp editor/editor_help.cpp msgid "Find" msgstr "সনà§à¦§à¦¾à¦¨ করà§à¦¨" @@ -635,11 +811,6 @@ msgstr "সামà§à¦ªà§à¦°à¦¤à¦¿à¦•:" msgid "Matches:" msgstr "মিলসমূহ:" -#: editor/create_dialog.cpp editor/editor_help.cpp editor/property_selector.cpp -#: editor/script_editor_debugger.cpp -msgid "Description:" -msgstr "বরà§à¦£à¦¨à¦¾:" - #: editor/dependency_editor.cpp msgid "Search Replacement For:" msgstr "à¦à¦° জনà§à¦¯ পà§à¦°à¦¤à¦¿à¦¸à§à¦¥à¦¾à¦ªà¦•à§‡à¦° অনà§à¦¸à¦¨à§à¦§à¦¾à¦¨ করà§à¦¨:" @@ -1128,10 +1299,6 @@ msgstr " আউটপà§à¦Ÿ/ফলাফল:" msgid "Clear" msgstr "পরিসà§à¦•à¦¾à¦° করà§à¦¨/কà§à¦²à§€à§Ÿà¦¾à¦°" -#: editor/editor_node.cpp -msgid "Node From Scene" -msgstr "দৃশà§à¦¯ হতে নোড" - #: editor/editor_node.cpp editor/plugins/animation_player_editor_plugin.cpp #: editor/resources_dock.cpp msgid "Error saving resource!" @@ -1514,21 +1681,6 @@ msgid "Distraction Free Mode" msgstr "বিকà§à¦·à§‡à¦ª-হীন মোড" #: editor/editor_node.cpp -msgid "Import assets to the project." -msgstr "উপাদানসমূহ পà§à¦°à¦•à¦²à§à¦ªà§‡ ইমà§à¦ªà§‹à¦°à§à¦Ÿ করà§à¦¨à¥¤" - -#: editor/editor_node.cpp editor/io_plugins/editor_bitmask_import_plugin.cpp -#: editor/io_plugins/editor_font_import_plugin.cpp -#: editor/io_plugins/editor_mesh_import_plugin.cpp -#: editor/io_plugins/editor_sample_import_plugin.cpp -#: editor/io_plugins/editor_scene_import_plugin.cpp -#: editor/io_plugins/editor_texture_import_plugin.cpp -#: editor/io_plugins/editor_translation_import_plugin.cpp -#: editor/project_manager.cpp -msgid "Import" -msgstr "ইমà§à¦ªà§‹à¦°à§à¦Ÿ" - -#: editor/editor_node.cpp msgid "Miscellaneous project or scene-wide tools." msgstr "পà§à¦°à¦•à¦²à§à¦ª অথবা দৃশà§à¦¯à§‡-বà§à¦¯à¦¾à¦ªà§€ বিবিধ সরঞà§à¦œà¦¾à¦®-সমূহ।" @@ -1818,10 +1970,6 @@ msgid "Installed Plugins:" msgstr "ইনà§à¦¸à¦Ÿà¦²-কৃত পà§à¦²à¦¾à¦—ইন-সমূহ:" #: editor/editor_plugin_settings.cpp -msgid "Version:" -msgstr "সংসà§à¦•à¦°à¦£:" - -#: editor/editor_plugin_settings.cpp msgid "Author:" msgstr "লেখক:" @@ -3830,6 +3978,11 @@ msgid "A processor material of type 'ParticlesMaterial' is required." msgstr "" #: editor/plugins/particles_editor_plugin.cpp +#, fuzzy +msgid "Generating AABB" +msgstr "AABB উৎপনà§à¦¨ করà§à¦¨" + +#: editor/plugins/particles_editor_plugin.cpp msgid "Faces contain no area!" msgstr "পৃষà§à¦ সমূহ কোনো আকার নেই!" @@ -3882,6 +4035,16 @@ msgstr "আয়তন" msgid "Emission Source: " msgstr "Emission পূরণ:" +#: editor/plugins/particles_editor_plugin.cpp +#, fuzzy +msgid "Generate Visibility AABB" +msgstr "AABB উৎপনà§à¦¨ করà§à¦¨" + +#: editor/plugins/particles_editor_plugin.cpp +#, fuzzy +msgid "Generation Time (sec):" +msgstr "গড় সময় (সেঃ)" + #: editor/plugins/path_2d_editor_plugin.cpp msgid "Remove Point from Curve" msgstr "বকà§à¦°à¦°à§‡à¦–া হতে বিনà§à¦¦à§ অপসারণ করà§à¦¨" @@ -4334,6 +4497,14 @@ msgid "Trim Trailing Whitespace" msgstr "শেষের হোয়াইটসà§à¦ªà§‡à¦¸ ছেà¦à¦Ÿà§‡ ফেলà§à¦¨" #: editor/plugins/script_text_editor.cpp +msgid "Convert Indent To Spaces" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Convert Indent To Tabs" +msgstr "" + +#: editor/plugins/script_text_editor.cpp msgid "Auto Indent" msgstr "সà§à¦¬à§Ÿà¦‚কà§à¦°à¦¿à§Ÿà¦à¦¾à¦¬à§‡ মাতà§à¦°à¦¾ দিন" @@ -5207,12 +5378,12 @@ msgstr "অকারà§à¦¯à¦•à¦° পà§à¦°à¦•à¦²à§à¦ªà§‡à¦° পথ, পথটঠ#: editor/project_manager.cpp #, fuzzy -msgid "Invalid project path, godot.cfg must not exist." +msgid "Invalid project path, *.godot must not exist." msgstr "অকারà§à¦¯à¦•à¦° পà§à¦°à¦•à¦²à§à¦ªà§‡à¦° পথ, engine.cfg অবশà§à¦¯à¦‡ অনà§à¦ªà¦¸à§à¦¥à¦¿à¦¤ হতে হবে।" #: editor/project_manager.cpp #, fuzzy -msgid "Invalid project path, godot.cfg must exist." +msgid "Invalid project path, *.godot must exist." msgstr "অকারà§à¦¯à¦•à¦° পà§à¦°à¦•à¦²à§à¦ªà§‡à¦° পথ, engine.cfg অবশà§à¦¯à¦‡ উপসà§à¦¥à¦¿à¦¤ হতে হবে।" #: editor/project_manager.cpp @@ -5225,7 +5396,7 @@ msgstr "অকারà§à¦¯à¦•à¦° পà§à¦°à¦•à¦²à§à¦ªà§‡à¦° পথ (কোনৠ#: editor/project_manager.cpp #, fuzzy -msgid "Couldn't create godot.cfg in project path." +msgid "Couldn't create *.godot project file in project path." msgstr "পà§à¦°à¦•à¦²à§à¦ªà§‡à¦° পথে engine.cfg তৈরি করা সমà§à¦à¦¬ হয়নি।" #: editor/project_manager.cpp @@ -5261,10 +5432,6 @@ msgid "Install Project:" msgstr "পà§à¦°à¦•à¦²à§à¦ª ইনà§à¦¸à¦Ÿà¦² করà§à¦¨:" #: editor/project_manager.cpp -msgid "Install" -msgstr "ইনà§à¦¸à¦Ÿà¦²" - -#: editor/project_manager.cpp msgid "Browse" msgstr "বà§à¦°à¦¾à¦‰à¦¸" @@ -5325,6 +5492,11 @@ msgid "New Project" msgstr "নতà§à¦¨ পà§à¦°à¦•à¦²à§à¦ª" #: editor/project_manager.cpp +#, fuzzy +msgid "Templates" +msgstr "বসà§à¦¤à§ অপসারণ করà§à¦¨" + +#: editor/project_manager.cpp msgid "Exit" msgstr "পà§à¦°à¦¸à§à¦¥à¦¾à¦¨ করà§à¦¨" @@ -5511,8 +5683,8 @@ msgstr "রিসোরà§à¦¸à§‡à¦° পà§à¦¨à¦ƒ-নকশার সিদà§à¦§ #: editor/project_settings.cpp #, fuzzy -msgid "Project Settings (godot.cfg)" -msgstr "পà§à¦°à¦•à¦²à§à¦ªà§‡à¦° সেটিংস (engine.cfg)" +msgid "Project Settings " +msgstr "পà§à¦°à¦•à¦²à§à¦ªà§‡à¦° সেটিংস" #: editor/project_settings.cpp editor/settings_config_dialog.cpp msgid "General" @@ -5578,10 +5750,6 @@ msgstr "ঘটনাসà§à¦¥à¦²" msgid "AutoLoad" msgstr "সà§à¦¬à§Ÿà¦‚কà§à¦°à¦¿à§Ÿ-লোড" -#: editor/project_settings.cpp -msgid "Plugins" -msgstr "পà§à¦²à¦¾à¦—ইন-সমূহ" - #: editor/property_editor.cpp #, fuzzy msgid "Pick a Viewport" @@ -6191,6 +6359,10 @@ msgid "Change Notifier Extents" msgstr "Notifier à¦à¦° সীমা পরিবরà§à¦¤à¦¨ করà§à¦¨" #: editor/spatial_editor_gizmos.cpp +msgid "Change Particles AABB" +msgstr "" + +#: editor/spatial_editor_gizmos.cpp msgid "Change Probe Extents" msgstr "পà§à¦°à§‹à¦¬à§‡à¦° (Probe) পরিবà§à¦¯à¦¾à¦ªà§à¦¤à¦¿ পরিবরà§à¦¤à¦¨ করà§à¦¨" @@ -6792,6 +6964,17 @@ msgstr "" "NavigationMeshInstance-কে অবশà§à¦¯à¦‡ Navigation-à¦à¦° অংশ অথবা অংশের অংশ হতে হবে। " "à¦à¦Ÿà¦¾ শà§à¦§à§à¦®à¦¾à¦¤à§à¦° নà§à¦¯à¦¾à¦à¦¿à¦—েশনের তথà§à¦¯ পà§à¦°à¦¦à¦¾à¦¨ করে।" +#: scene/3d/particles.cpp +msgid "" +"Nothing is visible because meshes have not been assigned to draw passes." +msgstr "" + +#: scene/3d/particles.cpp +msgid "" +"A material to process the particles is not assigned, so no behavior is " +"imprinted." +msgstr "" + #: scene/3d/remote_transform.cpp msgid "Path property must point to a valid Spatial node to work." msgstr "Path à¦à¦° দিক অবশà§à¦¯à¦‡ à¦à¦•à¦Ÿà¦¿ কারà§à¦¯à¦•à¦° Spatial নোডের à¦à¦° দিকে নিরà§à¦¦à§‡à¦¶ করাতে হবে।" @@ -6868,6 +7051,16 @@ msgstr "" "আকার ধারণ করতে পারে। অনà§à¦¯à¦¥à¦¾à§Ÿ, à¦à¦Ÿà¦¿à¦•à§‡ à¦à¦•à¦Ÿà¦¿ RenderTarget করà§à¦¨ à¦à¦¬à¦‚ à¦à¦° অà¦à§à¦¯à¦¨à§à¦¤à¦°à§€à¦£ " "দৃশà§à¦¯à¦¾à¦¬à¦²à¦¿à¦•à§‡ (texture) দৃশà§à¦¯à¦®à¦¾à¦¨ করতে কোনো নোডে হসà§à¦¤à¦¾à¦¨à§à¦¤à¦° করà§à¦¨à¥¤" +#~ msgid "Node From Scene" +#~ msgstr "দৃশà§à¦¯ হতে নোড" + +#~ msgid "Import assets to the project." +#~ msgstr "উপাদানসমূহ পà§à¦°à¦•à¦²à§à¦ªà§‡ ইমà§à¦ªà§‹à¦°à§à¦Ÿ করà§à¦¨à¥¤" + +#, fuzzy +#~ msgid "Project Settings (godot.cfg)" +#~ msgstr "পà§à¦°à¦•à¦²à§à¦ªà§‡à¦° সেটিংস (engine.cfg)" + #~ msgid "Surface" #~ msgstr "পৃষà§à¦ তল" diff --git a/editor/translations/ca.po b/editor/translations/ca.po index b125b6582f..581e862716 100644 --- a/editor/translations/ca.po +++ b/editor/translations/ca.po @@ -358,6 +358,184 @@ msgstr "Canvia Tipus de la Matriu" msgid "Change Array Value" msgstr "Canvia Valor de la Matriu" +#: editor/asset_library_editor_plugin.cpp +msgid "Free" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp editor/editor_plugin_settings.cpp +msgid "Version:" +msgstr "Versió:" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Contents:" +msgstr "Constants:" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "View Files" +msgstr "Fitxer:" + +#: editor/asset_library_editor_plugin.cpp editor/create_dialog.cpp +#: editor/editor_help.cpp editor/property_selector.cpp +#: editor/script_editor_debugger.cpp +msgid "Description:" +msgstr "Descripció:" + +#: editor/asset_library_editor_plugin.cpp editor/project_manager.cpp +msgid "Install" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp editor/call_dialog.cpp +#: editor/connections_dialog.cpp editor/export_template_manager.cpp +#: editor/plugins/animation_player_editor_plugin.cpp +#: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/resource_preloader_editor_plugin.cpp +#: editor/plugins/sample_library_editor_plugin.cpp +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/sprite_frames_editor_plugin.cpp editor/project_settings.cpp +#: editor/property_editor.cpp editor/run_settings_dialog.cpp +#: editor/settings_config_dialog.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Close" +msgstr "Tanca" + +#: editor/asset_library_editor_plugin.cpp +msgid "Can't resolve hostname:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Can't resolve." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Connection error, please try again." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Can't connect." +msgstr "Connecta.." + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Can't connect to host:" +msgstr "Connecta al Node:" + +#: editor/asset_library_editor_plugin.cpp +msgid "No response from host:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "No response." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Request failed, return code:" +msgstr "Format de fitxer desconegut:" + +#: editor/asset_library_editor_plugin.cpp +msgid "Req. Failed." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Request failed, too many redirects" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Redirect Loop." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Failed:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Bad download hash, assuming file has been tampered with." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Expected:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Got:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Failed sha256 hash check" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Asset Download Error:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Success!" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Fetching:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Resolving.." +msgstr "Desant..." + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Connecting.." +msgstr "Connecta.." + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Requesting.." +msgstr "Provant" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Error making request" +msgstr "Error en desar recurs!" + +#: editor/asset_library_editor_plugin.cpp +msgid "Idle" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Retry" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Download Error" +msgstr "Errors de Cà rrega" + +#: editor/asset_library_editor_plugin.cpp +msgid "Download for this asset is already in progress!" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "first" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "prev" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "next" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "last" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "All" +msgstr "Tot" + #: editor/asset_library_editor_plugin.cpp editor/create_dialog.cpp #: editor/editor_help.cpp editor/editor_node.cpp #: editor/plugins/script_editor_plugin.cpp editor/property_selector.cpp @@ -365,6 +543,29 @@ msgstr "Canvia Valor de la Matriu" msgid "Search:" msgstr "Cerca:" +#: editor/asset_library_editor_plugin.cpp editor/code_editor.cpp +#: editor/editor_help.cpp editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp +#: editor/plugins/shader_editor_plugin.cpp editor/project_settings.cpp +msgid "Search" +msgstr "Cerca" + +#: editor/asset_library_editor_plugin.cpp editor/editor_node.cpp +#: editor/io_plugins/editor_bitmask_import_plugin.cpp +#: editor/io_plugins/editor_font_import_plugin.cpp +#: editor/io_plugins/editor_mesh_import_plugin.cpp +#: editor/io_plugins/editor_sample_import_plugin.cpp +#: editor/io_plugins/editor_scene_import_plugin.cpp +#: editor/io_plugins/editor_texture_import_plugin.cpp +#: editor/io_plugins/editor_translation_import_plugin.cpp +#: editor/project_manager.cpp +msgid "Import" +msgstr "Importa" + +#: editor/asset_library_editor_plugin.cpp editor/project_settings.cpp +msgid "Plugins" +msgstr "" + #: editor/asset_library_editor_plugin.cpp msgid "Sort:" msgstr "Ordena:" @@ -378,10 +579,6 @@ msgid "Category:" msgstr "Categoria:" #: editor/asset_library_editor_plugin.cpp -msgid "All" -msgstr "Tot" - -#: editor/asset_library_editor_plugin.cpp msgid "Site:" msgstr "Lloc:" @@ -413,20 +610,6 @@ msgstr "Llista de mètodes de '%s':" msgid "Call" msgstr "Crida" -#: editor/call_dialog.cpp editor/connections_dialog.cpp -#: editor/export_template_manager.cpp -#: editor/plugins/animation_player_editor_plugin.cpp -#: editor/plugins/canvas_item_editor_plugin.cpp -#: editor/plugins/resource_preloader_editor_plugin.cpp -#: editor/plugins/sample_library_editor_plugin.cpp -#: editor/plugins/script_editor_plugin.cpp -#: editor/plugins/sprite_frames_editor_plugin.cpp editor/project_settings.cpp -#: editor/property_editor.cpp editor/run_settings_dialog.cpp -#: editor/settings_config_dialog.cpp -#: modules/visual_script/visual_script_editor.cpp -msgid "Close" -msgstr "Tanca" - #: editor/call_dialog.cpp msgid "Method List:" msgstr "Llista de mètodes:" @@ -477,13 +660,6 @@ msgid "Selection Only" msgstr "Selecció Només" #: editor/code_editor.cpp editor/editor_help.cpp -#: editor/plugins/script_editor_plugin.cpp -#: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp editor/project_settings.cpp -msgid "Search" -msgstr "Cerca" - -#: editor/code_editor.cpp editor/editor_help.cpp msgid "Find" msgstr "Troba" @@ -634,11 +810,6 @@ msgstr "Recents:" msgid "Matches:" msgstr "Coincidències:" -#: editor/create_dialog.cpp editor/editor_help.cpp editor/property_selector.cpp -#: editor/script_editor_debugger.cpp -msgid "Description:" -msgstr "Descripció:" - #: editor/dependency_editor.cpp msgid "Search Replacement For:" msgstr "Cerca Reemplaçant per a:" @@ -1123,10 +1294,6 @@ msgstr " Sortida:" msgid "Clear" msgstr "Neteja" -#: editor/editor_node.cpp -msgid "Node From Scene" -msgstr "Node de l'Escena" - #: editor/editor_node.cpp editor/plugins/animation_player_editor_plugin.cpp #: editor/resources_dock.cpp msgid "Error saving resource!" @@ -1510,21 +1677,6 @@ msgid "Distraction Free Mode" msgstr "Mode Lliure de Distraccions" #: editor/editor_node.cpp -msgid "Import assets to the project." -msgstr "Importa actius al projecte." - -#: editor/editor_node.cpp editor/io_plugins/editor_bitmask_import_plugin.cpp -#: editor/io_plugins/editor_font_import_plugin.cpp -#: editor/io_plugins/editor_mesh_import_plugin.cpp -#: editor/io_plugins/editor_sample_import_plugin.cpp -#: editor/io_plugins/editor_scene_import_plugin.cpp -#: editor/io_plugins/editor_texture_import_plugin.cpp -#: editor/io_plugins/editor_translation_import_plugin.cpp -#: editor/project_manager.cpp -msgid "Import" -msgstr "Importa" - -#: editor/editor_node.cpp msgid "Miscellaneous project or scene-wide tools." msgstr "Eines và ries o d'escena." @@ -1815,10 +1967,6 @@ msgid "Installed Plugins:" msgstr "Connectors Instal·lats:" #: editor/editor_plugin_settings.cpp -msgid "Version:" -msgstr "Versió:" - -#: editor/editor_plugin_settings.cpp msgid "Author:" msgstr "Autor:" @@ -3815,6 +3963,10 @@ msgid "A processor material of type 'ParticlesMaterial' is required." msgstr "" #: editor/plugins/particles_editor_plugin.cpp +msgid "Generating AABB" +msgstr "" + +#: editor/plugins/particles_editor_plugin.cpp msgid "Faces contain no area!" msgstr "" @@ -3863,6 +4015,15 @@ msgstr "" msgid "Emission Source: " msgstr "" +#: editor/plugins/particles_editor_plugin.cpp +msgid "Generate Visibility AABB" +msgstr "" + +#: editor/plugins/particles_editor_plugin.cpp +#, fuzzy +msgid "Generation Time (sec):" +msgstr "Temps Mitjà (s)" + #: editor/plugins/path_2d_editor_plugin.cpp msgid "Remove Point from Curve" msgstr "" @@ -4314,6 +4475,14 @@ msgid "Trim Trailing Whitespace" msgstr "" #: editor/plugins/script_text_editor.cpp +msgid "Convert Indent To Spaces" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Convert Indent To Tabs" +msgstr "" + +#: editor/plugins/script_text_editor.cpp msgid "Auto Indent" msgstr "" @@ -5179,12 +5348,12 @@ msgstr "" #: editor/project_manager.cpp #, fuzzy -msgid "Invalid project path, godot.cfg must not exist." +msgid "Invalid project path, *.godot must not exist." msgstr "El camà de Destinació ha d'existir." #: editor/project_manager.cpp #, fuzzy -msgid "Invalid project path, godot.cfg must exist." +msgid "Invalid project path, *.godot must exist." msgstr "El camà de Destinació ha d'existir." #: editor/project_manager.cpp @@ -5196,7 +5365,7 @@ msgid "Invalid project path (changed anything?)." msgstr "" #: editor/project_manager.cpp -msgid "Couldn't create godot.cfg in project path." +msgid "Couldn't create *.godot project file in project path." msgstr "" #: editor/project_manager.cpp @@ -5232,10 +5401,6 @@ msgid "Install Project:" msgstr "" #: editor/project_manager.cpp -msgid "Install" -msgstr "" - -#: editor/project_manager.cpp msgid "Browse" msgstr "" @@ -5294,6 +5459,11 @@ msgid "New Project" msgstr "" #: editor/project_manager.cpp +#, fuzzy +msgid "Templates" +msgstr "Treu la Selecció" + +#: editor/project_manager.cpp msgid "Exit" msgstr "" @@ -5478,8 +5648,8 @@ msgstr "" #: editor/project_settings.cpp #, fuzzy -msgid "Project Settings (godot.cfg)" -msgstr "Configuració del Projecte (engine.cfg)" +msgid "Project Settings " +msgstr "Configuració del Projecte" #: editor/project_settings.cpp editor/settings_config_dialog.cpp msgid "General" @@ -5545,10 +5715,6 @@ msgstr "" msgid "AutoLoad" msgstr "" -#: editor/project_settings.cpp -msgid "Plugins" -msgstr "" - #: editor/property_editor.cpp #, fuzzy msgid "Pick a Viewport" @@ -6161,6 +6327,10 @@ msgid "Change Notifier Extents" msgstr "" #: editor/spatial_editor_gizmos.cpp +msgid "Change Particles AABB" +msgstr "" + +#: editor/spatial_editor_gizmos.cpp msgid "Change Probe Extents" msgstr "" @@ -6784,6 +6954,17 @@ msgstr "" "NavigationMeshInstance ha de ser fill o nét d'un node Navigation. Només " "proporciona dades de navegació." +#: scene/3d/particles.cpp +msgid "" +"Nothing is visible because meshes have not been assigned to draw passes." +msgstr "" + +#: scene/3d/particles.cpp +msgid "" +"A material to process the particles is not assigned, so no behavior is " +"imprinted." +msgstr "" + #: scene/3d/remote_transform.cpp #, fuzzy msgid "Path property must point to a valid Spatial node to work." @@ -6862,6 +7043,16 @@ msgstr "" "forma per tal d'obtenir-ne la mida. Altrament, establiu-la com a Destinació " "de Renderització i assigneu-ne la textura interna a algun node." +#~ msgid "Node From Scene" +#~ msgstr "Node de l'Escena" + +#~ msgid "Import assets to the project." +#~ msgstr "Importa actius al projecte." + +#, fuzzy +#~ msgid "Project Settings (godot.cfg)" +#~ msgstr "Configuració del Projecte (engine.cfg)" + #~ msgid "" #~ "A SampleLibrary resource must be created or set in the 'samples' property " #~ "in order for SamplePlayer to play sound." diff --git a/editor/translations/cs.po b/editor/translations/cs.po index 08982fd7e4..89d88a234f 100644 --- a/editor/translations/cs.po +++ b/editor/translations/cs.po @@ -358,6 +358,181 @@ msgstr "ZmÄ›nit typ hodnot pole" msgid "Change Array Value" msgstr "ZmÄ›nit hodnotu pole" +#: editor/asset_library_editor_plugin.cpp +msgid "Free" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp editor/editor_plugin_settings.cpp +msgid "Version:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Contents:" +msgstr "Spojité" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "View Files" +msgstr "Soubor:" + +#: editor/asset_library_editor_plugin.cpp editor/create_dialog.cpp +#: editor/editor_help.cpp editor/property_selector.cpp +#: editor/script_editor_debugger.cpp +msgid "Description:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp editor/project_manager.cpp +msgid "Install" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp editor/call_dialog.cpp +#: editor/connections_dialog.cpp editor/export_template_manager.cpp +#: editor/plugins/animation_player_editor_plugin.cpp +#: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/resource_preloader_editor_plugin.cpp +#: editor/plugins/sample_library_editor_plugin.cpp +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/sprite_frames_editor_plugin.cpp editor/project_settings.cpp +#: editor/property_editor.cpp editor/run_settings_dialog.cpp +#: editor/settings_config_dialog.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Close" +msgstr "ZavÅ™Ãt" + +#: editor/asset_library_editor_plugin.cpp +msgid "Can't resolve hostname:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Can't resolve." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Connection error, please try again." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Can't connect." +msgstr "PÅ™ipojit.." + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Can't connect to host:" +msgstr "PÅ™ipojit k uzlu:" + +#: editor/asset_library_editor_plugin.cpp +msgid "No response from host:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "No response." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Request failed, return code:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Req. Failed." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Request failed, too many redirects" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Redirect Loop." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Failed:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Bad download hash, assuming file has been tampered with." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Expected:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Got:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Failed sha256 hash check" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Asset Download Error:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Success!" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Fetching:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Resolving.." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Connecting.." +msgstr "PÅ™ipojit.." + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Requesting.." +msgstr "Testované" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Error making request" +msgstr "Chyba nahrávánà fontu." + +#: editor/asset_library_editor_plugin.cpp +msgid "Idle" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Retry" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Download Error" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Download for this asset is already in progress!" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "first" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "prev" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "next" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "last" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "All" +msgstr "VÅ¡echny" + #: editor/asset_library_editor_plugin.cpp editor/create_dialog.cpp #: editor/editor_help.cpp editor/editor_node.cpp #: editor/plugins/script_editor_plugin.cpp editor/property_selector.cpp @@ -365,6 +540,29 @@ msgstr "ZmÄ›nit hodnotu pole" msgid "Search:" msgstr "Hledat:" +#: editor/asset_library_editor_plugin.cpp editor/code_editor.cpp +#: editor/editor_help.cpp editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp +#: editor/plugins/shader_editor_plugin.cpp editor/project_settings.cpp +msgid "Search" +msgstr "Hledat" + +#: editor/asset_library_editor_plugin.cpp editor/editor_node.cpp +#: editor/io_plugins/editor_bitmask_import_plugin.cpp +#: editor/io_plugins/editor_font_import_plugin.cpp +#: editor/io_plugins/editor_mesh_import_plugin.cpp +#: editor/io_plugins/editor_sample_import_plugin.cpp +#: editor/io_plugins/editor_scene_import_plugin.cpp +#: editor/io_plugins/editor_texture_import_plugin.cpp +#: editor/io_plugins/editor_translation_import_plugin.cpp +#: editor/project_manager.cpp +msgid "Import" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp editor/project_settings.cpp +msgid "Plugins" +msgstr "" + #: editor/asset_library_editor_plugin.cpp msgid "Sort:" msgstr "Řadit:" @@ -378,10 +576,6 @@ msgid "Category:" msgstr "Kategorie:" #: editor/asset_library_editor_plugin.cpp -msgid "All" -msgstr "VÅ¡echny" - -#: editor/asset_library_editor_plugin.cpp msgid "Site:" msgstr "Web:" @@ -413,20 +607,6 @@ msgstr "Seznam metod '%s':" msgid "Call" msgstr "Zavolat" -#: editor/call_dialog.cpp editor/connections_dialog.cpp -#: editor/export_template_manager.cpp -#: editor/plugins/animation_player_editor_plugin.cpp -#: editor/plugins/canvas_item_editor_plugin.cpp -#: editor/plugins/resource_preloader_editor_plugin.cpp -#: editor/plugins/sample_library_editor_plugin.cpp -#: editor/plugins/script_editor_plugin.cpp -#: editor/plugins/sprite_frames_editor_plugin.cpp editor/project_settings.cpp -#: editor/property_editor.cpp editor/run_settings_dialog.cpp -#: editor/settings_config_dialog.cpp -#: modules/visual_script/visual_script_editor.cpp -msgid "Close" -msgstr "ZavÅ™Ãt" - #: editor/call_dialog.cpp msgid "Method List:" msgstr "Seznam metod:" @@ -477,13 +657,6 @@ msgid "Selection Only" msgstr "Pouze výbÄ›r" #: editor/code_editor.cpp editor/editor_help.cpp -#: editor/plugins/script_editor_plugin.cpp -#: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp editor/project_settings.cpp -msgid "Search" -msgstr "Hledat" - -#: editor/code_editor.cpp editor/editor_help.cpp msgid "Find" msgstr "NajÃt" @@ -633,11 +806,6 @@ msgstr "" msgid "Matches:" msgstr "Shody:" -#: editor/create_dialog.cpp editor/editor_help.cpp editor/property_selector.cpp -#: editor/script_editor_debugger.cpp -msgid "Description:" -msgstr "" - #: editor/dependency_editor.cpp msgid "Search Replacement For:" msgstr "Hledat náhradu za:" @@ -1120,10 +1288,6 @@ msgstr "" msgid "Clear" msgstr "VyÄistit" -#: editor/editor_node.cpp -msgid "Node From Scene" -msgstr "" - #: editor/editor_node.cpp editor/plugins/animation_player_editor_plugin.cpp #: editor/resources_dock.cpp msgid "Error saving resource!" @@ -1488,21 +1652,6 @@ msgid "Distraction Free Mode" msgstr "" #: editor/editor_node.cpp -msgid "Import assets to the project." -msgstr "" - -#: editor/editor_node.cpp editor/io_plugins/editor_bitmask_import_plugin.cpp -#: editor/io_plugins/editor_font_import_plugin.cpp -#: editor/io_plugins/editor_mesh_import_plugin.cpp -#: editor/io_plugins/editor_sample_import_plugin.cpp -#: editor/io_plugins/editor_scene_import_plugin.cpp -#: editor/io_plugins/editor_texture_import_plugin.cpp -#: editor/io_plugins/editor_translation_import_plugin.cpp -#: editor/project_manager.cpp -msgid "Import" -msgstr "" - -#: editor/editor_node.cpp msgid "Miscellaneous project or scene-wide tools." msgstr "" @@ -1772,10 +1921,6 @@ msgid "Installed Plugins:" msgstr "" #: editor/editor_plugin_settings.cpp -msgid "Version:" -msgstr "" - -#: editor/editor_plugin_settings.cpp msgid "Author:" msgstr "" @@ -3753,6 +3898,10 @@ msgid "A processor material of type 'ParticlesMaterial' is required." msgstr "" #: editor/plugins/particles_editor_plugin.cpp +msgid "Generating AABB" +msgstr "" + +#: editor/plugins/particles_editor_plugin.cpp msgid "Faces contain no area!" msgstr "" @@ -3800,6 +3949,14 @@ msgstr "" msgid "Emission Source: " msgstr "" +#: editor/plugins/particles_editor_plugin.cpp +msgid "Generate Visibility AABB" +msgstr "" + +#: editor/plugins/particles_editor_plugin.cpp +msgid "Generation Time (sec):" +msgstr "" + #: editor/plugins/path_2d_editor_plugin.cpp msgid "Remove Point from Curve" msgstr "" @@ -4251,6 +4408,14 @@ msgid "Trim Trailing Whitespace" msgstr "" #: editor/plugins/script_text_editor.cpp +msgid "Convert Indent To Spaces" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Convert Indent To Tabs" +msgstr "" + +#: editor/plugins/script_text_editor.cpp msgid "Auto Indent" msgstr "" @@ -5111,11 +5276,11 @@ msgid "Invalid project path, the path must exist!" msgstr "" #: editor/project_manager.cpp -msgid "Invalid project path, godot.cfg must not exist." +msgid "Invalid project path, *.godot must not exist." msgstr "" #: editor/project_manager.cpp -msgid "Invalid project path, godot.cfg must exist." +msgid "Invalid project path, *.godot must exist." msgstr "" #: editor/project_manager.cpp @@ -5127,7 +5292,7 @@ msgid "Invalid project path (changed anything?)." msgstr "" #: editor/project_manager.cpp -msgid "Couldn't create godot.cfg in project path." +msgid "Couldn't create *.godot project file in project path." msgstr "" #: editor/project_manager.cpp @@ -5163,10 +5328,6 @@ msgid "Install Project:" msgstr "" #: editor/project_manager.cpp -msgid "Install" -msgstr "" - -#: editor/project_manager.cpp msgid "Browse" msgstr "" @@ -5225,6 +5386,11 @@ msgid "New Project" msgstr "" #: editor/project_manager.cpp +#, fuzzy +msgid "Templates" +msgstr "Odstranit výbÄ›r" + +#: editor/project_manager.cpp msgid "Exit" msgstr "" @@ -5409,7 +5575,7 @@ msgstr "" #: editor/project_settings.cpp #, fuzzy -msgid "Project Settings (godot.cfg)" +msgid "Project Settings " msgstr "Nastavenà projektu" #: editor/project_settings.cpp editor/settings_config_dialog.cpp @@ -5476,10 +5642,6 @@ msgstr "" msgid "AutoLoad" msgstr "" -#: editor/project_settings.cpp -msgid "Plugins" -msgstr "" - #: editor/property_editor.cpp msgid "Pick a Viewport" msgstr "" @@ -6087,6 +6249,10 @@ msgid "Change Notifier Extents" msgstr "" #: editor/spatial_editor_gizmos.cpp +msgid "Change Particles AABB" +msgstr "" + +#: editor/spatial_editor_gizmos.cpp msgid "Change Probe Extents" msgstr "" @@ -6695,6 +6861,17 @@ msgstr "" "NavigationMeshInstance musà být dÃtÄ›tem nebo vnouÄetem uzlu Navigation. " "Poskytuje pouze data pro navigaci." +#: scene/3d/particles.cpp +msgid "" +"Nothing is visible because meshes have not been assigned to draw passes." +msgstr "" + +#: scene/3d/particles.cpp +msgid "" +"A material to process the particles is not assigned, so no behavior is " +"imprinted." +msgstr "" + #: scene/3d/remote_transform.cpp #, fuzzy msgid "Path property must point to a valid Spatial node to work." @@ -6774,6 +6951,10 @@ msgstr "" "mohl zÃskat velikost. Jinak ho nastavte jako render target a pÅ™iÅ™aÄte jeho " "vnitÅ™nà texturu nÄ›jakému uzlu k zobrazenÃ." +#, fuzzy +#~ msgid "Project Settings (godot.cfg)" +#~ msgstr "Nastavenà projektu" + #~ msgid "" #~ "A SampleLibrary resource must be created or set in the 'samples' property " #~ "in order for SamplePlayer to play sound." diff --git a/editor/translations/da.po b/editor/translations/da.po index 49b26f6ed2..b84be76247 100644 --- a/editor/translations/da.po +++ b/editor/translations/da.po @@ -356,6 +356,181 @@ msgstr "Skift Array værditype" msgid "Change Array Value" msgstr "Ændre Array-værdi" +#: editor/asset_library_editor_plugin.cpp +msgid "Free" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp editor/editor_plugin_settings.cpp +msgid "Version:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Contents:" +msgstr "Kontinuerlig" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "View Files" +msgstr "Fil:" + +#: editor/asset_library_editor_plugin.cpp editor/create_dialog.cpp +#: editor/editor_help.cpp editor/property_selector.cpp +#: editor/script_editor_debugger.cpp +msgid "Description:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp editor/project_manager.cpp +msgid "Install" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp editor/call_dialog.cpp +#: editor/connections_dialog.cpp editor/export_template_manager.cpp +#: editor/plugins/animation_player_editor_plugin.cpp +#: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/resource_preloader_editor_plugin.cpp +#: editor/plugins/sample_library_editor_plugin.cpp +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/sprite_frames_editor_plugin.cpp editor/project_settings.cpp +#: editor/property_editor.cpp editor/run_settings_dialog.cpp +#: editor/settings_config_dialog.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Close" +msgstr "Luk" + +#: editor/asset_library_editor_plugin.cpp +msgid "Can't resolve hostname:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Can't resolve." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Connection error, please try again." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Can't connect." +msgstr "Forbind..." + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Can't connect to host:" +msgstr "Opret forbindelse til Node:" + +#: editor/asset_library_editor_plugin.cpp +msgid "No response from host:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "No response." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Request failed, return code:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Req. Failed." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Request failed, too many redirects" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Redirect Loop." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Failed:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Bad download hash, assuming file has been tampered with." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Expected:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Got:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Failed sha256 hash check" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Asset Download Error:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Success!" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Fetching:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Resolving.." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Connecting.." +msgstr "Forbind..." + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Requesting.." +msgstr "Tester" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Error making request" +msgstr "Error loading skrifttype." + +#: editor/asset_library_editor_plugin.cpp +msgid "Idle" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Retry" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Download Error" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Download for this asset is already in progress!" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "first" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "prev" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "next" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "last" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "All" +msgstr "Alle" + #: editor/asset_library_editor_plugin.cpp editor/create_dialog.cpp #: editor/editor_help.cpp editor/editor_node.cpp #: editor/plugins/script_editor_plugin.cpp editor/property_selector.cpp @@ -363,6 +538,29 @@ msgstr "Ændre Array-værdi" msgid "Search:" msgstr "Søgning:" +#: editor/asset_library_editor_plugin.cpp editor/code_editor.cpp +#: editor/editor_help.cpp editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp +#: editor/plugins/shader_editor_plugin.cpp editor/project_settings.cpp +msgid "Search" +msgstr "Søg" + +#: editor/asset_library_editor_plugin.cpp editor/editor_node.cpp +#: editor/io_plugins/editor_bitmask_import_plugin.cpp +#: editor/io_plugins/editor_font_import_plugin.cpp +#: editor/io_plugins/editor_mesh_import_plugin.cpp +#: editor/io_plugins/editor_sample_import_plugin.cpp +#: editor/io_plugins/editor_scene_import_plugin.cpp +#: editor/io_plugins/editor_texture_import_plugin.cpp +#: editor/io_plugins/editor_translation_import_plugin.cpp +#: editor/project_manager.cpp +msgid "Import" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp editor/project_settings.cpp +msgid "Plugins" +msgstr "" + #: editor/asset_library_editor_plugin.cpp msgid "Sort:" msgstr "Sorter:" @@ -376,10 +574,6 @@ msgid "Category:" msgstr "Kategori:" #: editor/asset_library_editor_plugin.cpp -msgid "All" -msgstr "Alle" - -#: editor/asset_library_editor_plugin.cpp msgid "Site:" msgstr "Websted:" @@ -411,20 +605,6 @@ msgstr "Metode liste For '%s':" msgid "Call" msgstr "Kald" -#: editor/call_dialog.cpp editor/connections_dialog.cpp -#: editor/export_template_manager.cpp -#: editor/plugins/animation_player_editor_plugin.cpp -#: editor/plugins/canvas_item_editor_plugin.cpp -#: editor/plugins/resource_preloader_editor_plugin.cpp -#: editor/plugins/sample_library_editor_plugin.cpp -#: editor/plugins/script_editor_plugin.cpp -#: editor/plugins/sprite_frames_editor_plugin.cpp editor/project_settings.cpp -#: editor/property_editor.cpp editor/run_settings_dialog.cpp -#: editor/settings_config_dialog.cpp -#: modules/visual_script/visual_script_editor.cpp -msgid "Close" -msgstr "Luk" - #: editor/call_dialog.cpp msgid "Method List:" msgstr "Metode liste:" @@ -475,13 +655,6 @@ msgid "Selection Only" msgstr "Kun Valgte" #: editor/code_editor.cpp editor/editor_help.cpp -#: editor/plugins/script_editor_plugin.cpp -#: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp editor/project_settings.cpp -msgid "Search" -msgstr "Søg" - -#: editor/code_editor.cpp editor/editor_help.cpp msgid "Find" msgstr "Find" @@ -631,11 +804,6 @@ msgstr "" msgid "Matches:" msgstr "Matches:" -#: editor/create_dialog.cpp editor/editor_help.cpp editor/property_selector.cpp -#: editor/script_editor_debugger.cpp -msgid "Description:" -msgstr "" - #: editor/dependency_editor.cpp msgid "Search Replacement For:" msgstr "Søg erstatning For:" @@ -1114,10 +1282,6 @@ msgstr "" msgid "Clear" msgstr "Clear" -#: editor/editor_node.cpp -msgid "Node From Scene" -msgstr "" - #: editor/editor_node.cpp editor/plugins/animation_player_editor_plugin.cpp #: editor/resources_dock.cpp msgid "Error saving resource!" @@ -1482,21 +1646,6 @@ msgid "Distraction Free Mode" msgstr "" #: editor/editor_node.cpp -msgid "Import assets to the project." -msgstr "" - -#: editor/editor_node.cpp editor/io_plugins/editor_bitmask_import_plugin.cpp -#: editor/io_plugins/editor_font_import_plugin.cpp -#: editor/io_plugins/editor_mesh_import_plugin.cpp -#: editor/io_plugins/editor_sample_import_plugin.cpp -#: editor/io_plugins/editor_scene_import_plugin.cpp -#: editor/io_plugins/editor_texture_import_plugin.cpp -#: editor/io_plugins/editor_translation_import_plugin.cpp -#: editor/project_manager.cpp -msgid "Import" -msgstr "" - -#: editor/editor_node.cpp msgid "Miscellaneous project or scene-wide tools." msgstr "" @@ -1765,10 +1914,6 @@ msgid "Installed Plugins:" msgstr "" #: editor/editor_plugin_settings.cpp -msgid "Version:" -msgstr "" - -#: editor/editor_plugin_settings.cpp msgid "Author:" msgstr "" @@ -3744,6 +3889,10 @@ msgid "A processor material of type 'ParticlesMaterial' is required." msgstr "" #: editor/plugins/particles_editor_plugin.cpp +msgid "Generating AABB" +msgstr "" + +#: editor/plugins/particles_editor_plugin.cpp msgid "Faces contain no area!" msgstr "" @@ -3791,6 +3940,14 @@ msgstr "" msgid "Emission Source: " msgstr "" +#: editor/plugins/particles_editor_plugin.cpp +msgid "Generate Visibility AABB" +msgstr "" + +#: editor/plugins/particles_editor_plugin.cpp +msgid "Generation Time (sec):" +msgstr "" + #: editor/plugins/path_2d_editor_plugin.cpp msgid "Remove Point from Curve" msgstr "" @@ -4242,6 +4399,14 @@ msgid "Trim Trailing Whitespace" msgstr "" #: editor/plugins/script_text_editor.cpp +msgid "Convert Indent To Spaces" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Convert Indent To Tabs" +msgstr "" + +#: editor/plugins/script_text_editor.cpp msgid "Auto Indent" msgstr "" @@ -5099,11 +5264,11 @@ msgid "Invalid project path, the path must exist!" msgstr "" #: editor/project_manager.cpp -msgid "Invalid project path, godot.cfg must not exist." +msgid "Invalid project path, *.godot must not exist." msgstr "" #: editor/project_manager.cpp -msgid "Invalid project path, godot.cfg must exist." +msgid "Invalid project path, *.godot must exist." msgstr "" #: editor/project_manager.cpp @@ -5115,7 +5280,7 @@ msgid "Invalid project path (changed anything?)." msgstr "" #: editor/project_manager.cpp -msgid "Couldn't create godot.cfg in project path." +msgid "Couldn't create *.godot project file in project path." msgstr "" #: editor/project_manager.cpp @@ -5151,10 +5316,6 @@ msgid "Install Project:" msgstr "" #: editor/project_manager.cpp -msgid "Install" -msgstr "" - -#: editor/project_manager.cpp msgid "Browse" msgstr "" @@ -5213,6 +5374,11 @@ msgid "New Project" msgstr "" #: editor/project_manager.cpp +#, fuzzy +msgid "Templates" +msgstr "Fjern markering" + +#: editor/project_manager.cpp msgid "Exit" msgstr "" @@ -5396,7 +5562,7 @@ msgid "Remove Resource Remap Option" msgstr "" #: editor/project_settings.cpp -msgid "Project Settings (godot.cfg)" +msgid "Project Settings " msgstr "" #: editor/project_settings.cpp editor/settings_config_dialog.cpp @@ -5463,10 +5629,6 @@ msgstr "" msgid "AutoLoad" msgstr "" -#: editor/project_settings.cpp -msgid "Plugins" -msgstr "" - #: editor/property_editor.cpp msgid "Pick a Viewport" msgstr "" @@ -6072,6 +6234,10 @@ msgid "Change Notifier Extents" msgstr "" #: editor/spatial_editor_gizmos.cpp +msgid "Change Particles AABB" +msgstr "" + +#: editor/spatial_editor_gizmos.cpp msgid "Change Probe Extents" msgstr "" @@ -6672,6 +6838,17 @@ msgstr "" "NavigationMeshInstance skal være et barn eller barnebarn til en Navigation " "node. Det giver kun navigationsdata." +#: scene/3d/particles.cpp +msgid "" +"Nothing is visible because meshes have not been assigned to draw passes." +msgstr "" + +#: scene/3d/particles.cpp +msgid "" +"A material to process the particles is not assigned, so no behavior is " +"imprinted." +msgstr "" + #: scene/3d/remote_transform.cpp #, fuzzy msgid "Path property must point to a valid Spatial node to work." diff --git a/editor/translations/de.po b/editor/translations/de.po index ac615e885b..ba6805d1f1 100644 --- a/editor/translations/de.po +++ b/editor/translations/de.po @@ -375,6 +375,184 @@ msgstr "Wertetyp des Arrays ändern" msgid "Change Array Value" msgstr "Array-Wert ändern" +#: editor/asset_library_editor_plugin.cpp +msgid "Free" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp editor/editor_plugin_settings.cpp +msgid "Version:" +msgstr "Version:" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Contents:" +msgstr "Konstanten:" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "View Files" +msgstr "Datei" + +#: editor/asset_library_editor_plugin.cpp editor/create_dialog.cpp +#: editor/editor_help.cpp editor/property_selector.cpp +#: editor/script_editor_debugger.cpp +msgid "Description:" +msgstr "Beschreibung:" + +#: editor/asset_library_editor_plugin.cpp editor/project_manager.cpp +msgid "Install" +msgstr "Installieren" + +#: editor/asset_library_editor_plugin.cpp editor/call_dialog.cpp +#: editor/connections_dialog.cpp editor/export_template_manager.cpp +#: editor/plugins/animation_player_editor_plugin.cpp +#: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/resource_preloader_editor_plugin.cpp +#: editor/plugins/sample_library_editor_plugin.cpp +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/sprite_frames_editor_plugin.cpp editor/project_settings.cpp +#: editor/property_editor.cpp editor/run_settings_dialog.cpp +#: editor/settings_config_dialog.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Close" +msgstr "Schließen" + +#: editor/asset_library_editor_plugin.cpp +msgid "Can't resolve hostname:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Can't resolve." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Connection error, please try again." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Can't connect." +msgstr "Verbinde.." + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Can't connect to host:" +msgstr "Verbinde mit Node:" + +#: editor/asset_library_editor_plugin.cpp +msgid "No response from host:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "No response." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Request failed, return code:" +msgstr "Angefordertes Dateiformat unbekannt:" + +#: editor/asset_library_editor_plugin.cpp +msgid "Req. Failed." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Request failed, too many redirects" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Redirect Loop." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Failed:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Bad download hash, assuming file has been tampered with." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Expected:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Got:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Failed sha256 hash check" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Asset Download Error:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Success!" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Fetching:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Resolving.." +msgstr "Speichere.." + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Connecting.." +msgstr "Verbinde.." + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Requesting.." +msgstr "Testphase" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Error making request" +msgstr "Fehler beim speichern der Ressource!" + +#: editor/asset_library_editor_plugin.cpp +msgid "Idle" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Retry" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Download Error" +msgstr "Herunter" + +#: editor/asset_library_editor_plugin.cpp +msgid "Download for this asset is already in progress!" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "first" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "prev" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "next" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "last" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "All" +msgstr "Alle" + #: editor/asset_library_editor_plugin.cpp editor/create_dialog.cpp #: editor/editor_help.cpp editor/editor_node.cpp #: editor/plugins/script_editor_plugin.cpp editor/property_selector.cpp @@ -382,6 +560,29 @@ msgstr "Array-Wert ändern" msgid "Search:" msgstr "Suche:" +#: editor/asset_library_editor_plugin.cpp editor/code_editor.cpp +#: editor/editor_help.cpp editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp +#: editor/plugins/shader_editor_plugin.cpp editor/project_settings.cpp +msgid "Search" +msgstr "Suche" + +#: editor/asset_library_editor_plugin.cpp editor/editor_node.cpp +#: editor/io_plugins/editor_bitmask_import_plugin.cpp +#: editor/io_plugins/editor_font_import_plugin.cpp +#: editor/io_plugins/editor_mesh_import_plugin.cpp +#: editor/io_plugins/editor_sample_import_plugin.cpp +#: editor/io_plugins/editor_scene_import_plugin.cpp +#: editor/io_plugins/editor_texture_import_plugin.cpp +#: editor/io_plugins/editor_translation_import_plugin.cpp +#: editor/project_manager.cpp +msgid "Import" +msgstr "Import" + +#: editor/asset_library_editor_plugin.cpp editor/project_settings.cpp +msgid "Plugins" +msgstr "Erweiterungen" + #: editor/asset_library_editor_plugin.cpp msgid "Sort:" msgstr "Sortiere:" @@ -395,10 +596,6 @@ msgid "Category:" msgstr "Kategorie:" #: editor/asset_library_editor_plugin.cpp -msgid "All" -msgstr "Alle" - -#: editor/asset_library_editor_plugin.cpp msgid "Site:" msgstr "Seite:" @@ -430,20 +627,6 @@ msgstr "Methodenliste für '%s':" msgid "Call" msgstr "Aufruf" -#: editor/call_dialog.cpp editor/connections_dialog.cpp -#: editor/export_template_manager.cpp -#: editor/plugins/animation_player_editor_plugin.cpp -#: editor/plugins/canvas_item_editor_plugin.cpp -#: editor/plugins/resource_preloader_editor_plugin.cpp -#: editor/plugins/sample_library_editor_plugin.cpp -#: editor/plugins/script_editor_plugin.cpp -#: editor/plugins/sprite_frames_editor_plugin.cpp editor/project_settings.cpp -#: editor/property_editor.cpp editor/run_settings_dialog.cpp -#: editor/settings_config_dialog.cpp -#: modules/visual_script/visual_script_editor.cpp -msgid "Close" -msgstr "Schließen" - #: editor/call_dialog.cpp msgid "Method List:" msgstr "Methodenliste:" @@ -494,13 +677,6 @@ msgid "Selection Only" msgstr "Nur Auswahl" #: editor/code_editor.cpp editor/editor_help.cpp -#: editor/plugins/script_editor_plugin.cpp -#: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp editor/project_settings.cpp -msgid "Search" -msgstr "Suche" - -#: editor/code_editor.cpp editor/editor_help.cpp msgid "Find" msgstr "Finde" @@ -652,11 +828,6 @@ msgstr "Kürzlich:" msgid "Matches:" msgstr "Treffer:" -#: editor/create_dialog.cpp editor/editor_help.cpp editor/property_selector.cpp -#: editor/script_editor_debugger.cpp -msgid "Description:" -msgstr "Beschreibung:" - #: editor/dependency_editor.cpp msgid "Search Replacement For:" msgstr "Suche Ersatz für:" @@ -1145,10 +1316,6 @@ msgstr " Ausgabe:" msgid "Clear" msgstr "Löschen" -#: editor/editor_node.cpp -msgid "Node From Scene" -msgstr "Node aus Szene" - #: editor/editor_node.cpp editor/plugins/animation_player_editor_plugin.cpp #: editor/resources_dock.cpp msgid "Error saving resource!" @@ -1533,21 +1700,6 @@ msgid "Distraction Free Mode" msgstr "Ablenkungsfreier Modus" #: editor/editor_node.cpp -msgid "Import assets to the project." -msgstr "Importiere Medieninhalte ins Projekt." - -#: editor/editor_node.cpp editor/io_plugins/editor_bitmask_import_plugin.cpp -#: editor/io_plugins/editor_font_import_plugin.cpp -#: editor/io_plugins/editor_mesh_import_plugin.cpp -#: editor/io_plugins/editor_sample_import_plugin.cpp -#: editor/io_plugins/editor_scene_import_plugin.cpp -#: editor/io_plugins/editor_texture_import_plugin.cpp -#: editor/io_plugins/editor_translation_import_plugin.cpp -#: editor/project_manager.cpp -msgid "Import" -msgstr "Import" - -#: editor/editor_node.cpp msgid "Miscellaneous project or scene-wide tools." msgstr "Sonstiges Projekt oder szenenübergreifende Werkzeuge." @@ -1837,10 +1989,6 @@ msgid "Installed Plugins:" msgstr "Installierte Erweiterungen:" #: editor/editor_plugin_settings.cpp -msgid "Version:" -msgstr "Version:" - -#: editor/editor_plugin_settings.cpp msgid "Author:" msgstr "Autor:" @@ -3852,6 +4000,11 @@ msgid "A processor material of type 'ParticlesMaterial' is required." msgstr "" #: editor/plugins/particles_editor_plugin.cpp +#, fuzzy +msgid "Generating AABB" +msgstr "Erzeuge AABB" + +#: editor/plugins/particles_editor_plugin.cpp msgid "Faces contain no area!" msgstr "Flächen enthalten keinen Bereich!" @@ -3904,6 +4057,16 @@ msgstr "Volumen" msgid "Emission Source: " msgstr "Emissionsfüllung:" +#: editor/plugins/particles_editor_plugin.cpp +#, fuzzy +msgid "Generate Visibility AABB" +msgstr "Erzeuge AABB" + +#: editor/plugins/particles_editor_plugin.cpp +#, fuzzy +msgid "Generation Time (sec):" +msgstr "Durchschnittszeit (Sek)" + #: editor/plugins/path_2d_editor_plugin.cpp msgid "Remove Point from Curve" msgstr "Punkt von Kurve entfernen" @@ -4358,6 +4521,14 @@ msgid "Trim Trailing Whitespace" msgstr "kürze Leerraum am Zeilenende" #: editor/plugins/script_text_editor.cpp +msgid "Convert Indent To Spaces" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Convert Indent To Tabs" +msgstr "" + +#: editor/plugins/script_text_editor.cpp msgid "Auto Indent" msgstr "Automatische Einrückung" @@ -5232,12 +5403,12 @@ msgstr "Ungültiger Projektpfad, der Pfad muss existieren!" #: editor/project_manager.cpp #, fuzzy -msgid "Invalid project path, godot.cfg must not exist." +msgid "Invalid project path, *.godot must not exist." msgstr "Ungültiger Projektpfad, engine.cfg darf nicht existieren." #: editor/project_manager.cpp #, fuzzy -msgid "Invalid project path, godot.cfg must exist." +msgid "Invalid project path, *.godot must exist." msgstr "Ungültiger Projektpfad, engine.cfg muss existieren." #: editor/project_manager.cpp @@ -5250,7 +5421,7 @@ msgstr "Ungültiger Projektpfad (etwas geändert?)." #: editor/project_manager.cpp #, fuzzy -msgid "Couldn't create godot.cfg in project path." +msgid "Couldn't create *.godot project file in project path." msgstr "Konnte engine.cfg in Projektpfad nicht erzeugen." #: editor/project_manager.cpp @@ -5286,10 +5457,6 @@ msgid "Install Project:" msgstr "Installiere Projekt:" #: editor/project_manager.cpp -msgid "Install" -msgstr "Installieren" - -#: editor/project_manager.cpp msgid "Browse" msgstr "Durchstöbern" @@ -5350,6 +5517,11 @@ msgid "New Project" msgstr "Neues Projekt" #: editor/project_manager.cpp +#, fuzzy +msgid "Templates" +msgstr "Entferne Element" + +#: editor/project_manager.cpp msgid "Exit" msgstr "Verlassen" @@ -5536,8 +5708,8 @@ msgstr "Ressourcen-Remap-Option entfernen" #: editor/project_settings.cpp #, fuzzy -msgid "Project Settings (godot.cfg)" -msgstr "Projekteinstellungen (engine.cfg)" +msgid "Project Settings " +msgstr "Projekteinstellungen" #: editor/project_settings.cpp editor/settings_config_dialog.cpp msgid "General" @@ -5603,10 +5775,6 @@ msgstr "Lokalisierung" msgid "AutoLoad" msgstr "Autoload" -#: editor/project_settings.cpp -msgid "Plugins" -msgstr "Erweiterungen" - #: editor/property_editor.cpp #, fuzzy msgid "Pick a Viewport" @@ -6220,6 +6388,10 @@ msgid "Change Notifier Extents" msgstr "Ändere Ausmaße des Benachrichtigers" #: editor/spatial_editor_gizmos.cpp +msgid "Change Particles AABB" +msgstr "" + +#: editor/spatial_editor_gizmos.cpp #, fuzzy msgid "Change Probe Extents" msgstr "Ändere Ausmaße des Benachrichtigers" @@ -6842,6 +7014,17 @@ msgstr "" "Eine NavigationMesh-Instanz muss ein Unterobjekt erster oder höherer Ordnung " "eines Navigation-Nodes sein. Es liefert nur Navigationsdaten." +#: scene/3d/particles.cpp +msgid "" +"Nothing is visible because meshes have not been assigned to draw passes." +msgstr "" + +#: scene/3d/particles.cpp +msgid "" +"A material to process the particles is not assigned, so no behavior is " +"imprinted." +msgstr "" + #: scene/3d/remote_transform.cpp msgid "Path property must point to a valid Spatial node to work." msgstr "Die Pfad-Eigenschaft muss auf ein gültiges Spatial-Node verweisen." @@ -6920,6 +7103,16 @@ msgstr "" "Eigenschaft ‚Render Target‘ des Viewports aktiviert und seine Textur " "irgendeinem Node zum Anzeigen zugewiesen werden." +#~ msgid "Node From Scene" +#~ msgstr "Node aus Szene" + +#~ msgid "Import assets to the project." +#~ msgstr "Importiere Medieninhalte ins Projekt." + +#, fuzzy +#~ msgid "Project Settings (godot.cfg)" +#~ msgstr "Projekteinstellungen (engine.cfg)" + #~ msgid "Surface" #~ msgstr "Oberfläche" diff --git a/editor/translations/de_CH.po b/editor/translations/de_CH.po index ae6d433e54..aeae6a5537 100644 --- a/editor/translations/de_CH.po +++ b/editor/translations/de_CH.po @@ -355,6 +355,178 @@ msgstr "" msgid "Change Array Value" msgstr "" +#: editor/asset_library_editor_plugin.cpp +msgid "Free" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp editor/editor_plugin_settings.cpp +msgid "Version:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Contents:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "View Files" +msgstr "Datei(en) öffnen" + +#: editor/asset_library_editor_plugin.cpp editor/create_dialog.cpp +#: editor/editor_help.cpp editor/property_selector.cpp +#: editor/script_editor_debugger.cpp +msgid "Description:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp editor/project_manager.cpp +msgid "Install" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp editor/call_dialog.cpp +#: editor/connections_dialog.cpp editor/export_template_manager.cpp +#: editor/plugins/animation_player_editor_plugin.cpp +#: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/resource_preloader_editor_plugin.cpp +#: editor/plugins/sample_library_editor_plugin.cpp +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/sprite_frames_editor_plugin.cpp editor/project_settings.cpp +#: editor/property_editor.cpp editor/run_settings_dialog.cpp +#: editor/settings_config_dialog.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Close" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Can't resolve hostname:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Can't resolve." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Connection error, please try again." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Can't connect." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Can't connect to host:" +msgstr "Verbindung zu Node:" + +#: editor/asset_library_editor_plugin.cpp +msgid "No response from host:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "No response." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Request failed, return code:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Req. Failed." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Request failed, too many redirects" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Redirect Loop." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Failed:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Bad download hash, assuming file has been tampered with." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Expected:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Got:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Failed sha256 hash check" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Asset Download Error:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Success!" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Fetching:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Resolving.." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Connecting.." +msgstr "Connections editieren" + +#: editor/asset_library_editor_plugin.cpp +msgid "Requesting.." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Error making request" +msgstr "Szene kann nicht gespeichert werden." + +#: editor/asset_library_editor_plugin.cpp +msgid "Idle" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Retry" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Download Error" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Download for this asset is already in progress!" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "first" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "prev" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "next" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "last" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "All" +msgstr "" + #: editor/asset_library_editor_plugin.cpp editor/create_dialog.cpp #: editor/editor_help.cpp editor/editor_node.cpp #: editor/plugins/script_editor_plugin.cpp editor/property_selector.cpp @@ -362,6 +534,29 @@ msgstr "" msgid "Search:" msgstr "" +#: editor/asset_library_editor_plugin.cpp editor/code_editor.cpp +#: editor/editor_help.cpp editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp +#: editor/plugins/shader_editor_plugin.cpp editor/project_settings.cpp +msgid "Search" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp editor/editor_node.cpp +#: editor/io_plugins/editor_bitmask_import_plugin.cpp +#: editor/io_plugins/editor_font_import_plugin.cpp +#: editor/io_plugins/editor_mesh_import_plugin.cpp +#: editor/io_plugins/editor_sample_import_plugin.cpp +#: editor/io_plugins/editor_scene_import_plugin.cpp +#: editor/io_plugins/editor_texture_import_plugin.cpp +#: editor/io_plugins/editor_translation_import_plugin.cpp +#: editor/project_manager.cpp +msgid "Import" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp editor/project_settings.cpp +msgid "Plugins" +msgstr "" + #: editor/asset_library_editor_plugin.cpp msgid "Sort:" msgstr "" @@ -375,10 +570,6 @@ msgid "Category:" msgstr "" #: editor/asset_library_editor_plugin.cpp -msgid "All" -msgstr "" - -#: editor/asset_library_editor_plugin.cpp msgid "Site:" msgstr "" @@ -410,20 +601,6 @@ msgstr "" msgid "Call" msgstr "" -#: editor/call_dialog.cpp editor/connections_dialog.cpp -#: editor/export_template_manager.cpp -#: editor/plugins/animation_player_editor_plugin.cpp -#: editor/plugins/canvas_item_editor_plugin.cpp -#: editor/plugins/resource_preloader_editor_plugin.cpp -#: editor/plugins/sample_library_editor_plugin.cpp -#: editor/plugins/script_editor_plugin.cpp -#: editor/plugins/sprite_frames_editor_plugin.cpp editor/project_settings.cpp -#: editor/property_editor.cpp editor/run_settings_dialog.cpp -#: editor/settings_config_dialog.cpp -#: modules/visual_script/visual_script_editor.cpp -msgid "Close" -msgstr "" - #: editor/call_dialog.cpp msgid "Method List:" msgstr "" @@ -473,13 +650,6 @@ msgid "Selection Only" msgstr "" #: editor/code_editor.cpp editor/editor_help.cpp -#: editor/plugins/script_editor_plugin.cpp -#: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp editor/project_settings.cpp -msgid "Search" -msgstr "" - -#: editor/code_editor.cpp editor/editor_help.cpp msgid "Find" msgstr "" @@ -630,11 +800,6 @@ msgstr "" msgid "Matches:" msgstr "" -#: editor/create_dialog.cpp editor/editor_help.cpp editor/property_selector.cpp -#: editor/script_editor_debugger.cpp -msgid "Description:" -msgstr "" - #: editor/dependency_editor.cpp msgid "Search Replacement For:" msgstr "" @@ -1108,10 +1273,6 @@ msgstr "" msgid "Clear" msgstr "" -#: editor/editor_node.cpp -msgid "Node From Scene" -msgstr "Node von Szene" - #: editor/editor_node.cpp editor/plugins/animation_player_editor_plugin.cpp #: editor/resources_dock.cpp msgid "Error saving resource!" @@ -1477,21 +1638,6 @@ msgid "Distraction Free Mode" msgstr "" #: editor/editor_node.cpp -msgid "Import assets to the project." -msgstr "Assets zum Projekt importieren." - -#: editor/editor_node.cpp editor/io_plugins/editor_bitmask_import_plugin.cpp -#: editor/io_plugins/editor_font_import_plugin.cpp -#: editor/io_plugins/editor_mesh_import_plugin.cpp -#: editor/io_plugins/editor_sample_import_plugin.cpp -#: editor/io_plugins/editor_scene_import_plugin.cpp -#: editor/io_plugins/editor_texture_import_plugin.cpp -#: editor/io_plugins/editor_translation_import_plugin.cpp -#: editor/project_manager.cpp -msgid "Import" -msgstr "" - -#: editor/editor_node.cpp msgid "Miscellaneous project or scene-wide tools." msgstr "Verschiedene Projekte oder Szenenweite Werkzeuge." @@ -1764,10 +1910,6 @@ msgid "Installed Plugins:" msgstr "" #: editor/editor_plugin_settings.cpp -msgid "Version:" -msgstr "" - -#: editor/editor_plugin_settings.cpp msgid "Author:" msgstr "" @@ -3758,6 +3900,10 @@ msgid "A processor material of type 'ParticlesMaterial' is required." msgstr "" #: editor/plugins/particles_editor_plugin.cpp +msgid "Generating AABB" +msgstr "" + +#: editor/plugins/particles_editor_plugin.cpp msgid "Faces contain no area!" msgstr "Flächen enthalten keinen Bereich!" @@ -3807,6 +3953,14 @@ msgstr "" msgid "Emission Source: " msgstr "" +#: editor/plugins/particles_editor_plugin.cpp +msgid "Generate Visibility AABB" +msgstr "" + +#: editor/plugins/particles_editor_plugin.cpp +msgid "Generation Time (sec):" +msgstr "" + #: editor/plugins/path_2d_editor_plugin.cpp msgid "Remove Point from Curve" msgstr "" @@ -4256,6 +4410,14 @@ msgid "Trim Trailing Whitespace" msgstr "" #: editor/plugins/script_text_editor.cpp +msgid "Convert Indent To Spaces" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Convert Indent To Tabs" +msgstr "" + +#: editor/plugins/script_text_editor.cpp msgid "Auto Indent" msgstr "" @@ -5116,12 +5278,12 @@ msgstr "Ungültiger Projektpfad, Pfad existiert nicht!" #: editor/project_manager.cpp #, fuzzy -msgid "Invalid project path, godot.cfg must not exist." +msgid "Invalid project path, *.godot must not exist." msgstr "Ungültiger Projektpfad, engine.cfg vorhanden!" #: editor/project_manager.cpp #, fuzzy -msgid "Invalid project path, godot.cfg must exist." +msgid "Invalid project path, *.godot must exist." msgstr "Ungültiger Projektpfad, engine.cfg nicht vorhanden!" #: editor/project_manager.cpp @@ -5134,7 +5296,7 @@ msgstr "Ungültiger Projektpfad, (wurde was geändert?)!" #: editor/project_manager.cpp #, fuzzy -msgid "Couldn't create godot.cfg in project path." +msgid "Couldn't create *.godot project file in project path." msgstr "Die engine.cfg kann im Projektverzeichnis nicht erstellt werden." #: editor/project_manager.cpp @@ -5170,10 +5332,6 @@ msgid "Install Project:" msgstr "" #: editor/project_manager.cpp -msgid "Install" -msgstr "" - -#: editor/project_manager.cpp msgid "Browse" msgstr "" @@ -5232,6 +5390,11 @@ msgid "New Project" msgstr "" #: editor/project_manager.cpp +#, fuzzy +msgid "Templates" +msgstr "Ungültige Bilder löschen" + +#: editor/project_manager.cpp msgid "Exit" msgstr "" @@ -5416,7 +5579,7 @@ msgstr "" #: editor/project_settings.cpp #, fuzzy -msgid "Project Settings (godot.cfg)" +msgid "Project Settings " msgstr "Projekteinstellungen" #: editor/project_settings.cpp editor/settings_config_dialog.cpp @@ -5483,10 +5646,6 @@ msgstr "" msgid "AutoLoad" msgstr "" -#: editor/project_settings.cpp -msgid "Plugins" -msgstr "" - #: editor/property_editor.cpp msgid "Pick a Viewport" msgstr "" @@ -6095,6 +6254,10 @@ msgid "Change Notifier Extents" msgstr "" #: editor/spatial_editor_gizmos.cpp +msgid "Change Particles AABB" +msgstr "" + +#: editor/spatial_editor_gizmos.cpp msgid "Change Probe Extents" msgstr "" @@ -6669,6 +6832,17 @@ msgid "" "It only provides navigation data." msgstr "" +#: scene/3d/particles.cpp +msgid "" +"Nothing is visible because meshes have not been assigned to draw passes." +msgstr "" + +#: scene/3d/particles.cpp +msgid "" +"A material to process the particles is not assigned, so no behavior is " +"imprinted." +msgstr "" + #: scene/3d/remote_transform.cpp #, fuzzy msgid "Path property must point to a valid Spatial node to work." @@ -6735,6 +6909,16 @@ msgid "" "texture to some node for display." msgstr "" +#~ msgid "Node From Scene" +#~ msgstr "Node von Szene" + +#~ msgid "Import assets to the project." +#~ msgstr "Assets zum Projekt importieren." + +#, fuzzy +#~ msgid "Project Settings (godot.cfg)" +#~ msgstr "Projekteinstellungen" + #~ msgid "Surface" #~ msgstr "Oberfläche" diff --git a/editor/translations/editor.pot b/editor/translations/editor.pot index 276662dbed..5b62f132fa 100644 --- a/editor/translations/editor.pot +++ b/editor/translations/editor.pot @@ -349,6 +349,174 @@ msgstr "" msgid "Change Array Value" msgstr "" +#: editor/asset_library_editor_plugin.cpp +msgid "Free" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp editor/editor_plugin_settings.cpp +msgid "Version:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Contents:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "View Files" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp editor/create_dialog.cpp +#: editor/editor_help.cpp editor/property_selector.cpp +#: editor/script_editor_debugger.cpp +msgid "Description:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp editor/project_manager.cpp +msgid "Install" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp editor/call_dialog.cpp +#: editor/connections_dialog.cpp editor/export_template_manager.cpp +#: editor/plugins/animation_player_editor_plugin.cpp +#: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/resource_preloader_editor_plugin.cpp +#: editor/plugins/sample_library_editor_plugin.cpp +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/sprite_frames_editor_plugin.cpp editor/project_settings.cpp +#: editor/property_editor.cpp editor/run_settings_dialog.cpp +#: editor/settings_config_dialog.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Close" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Can't resolve hostname:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Can't resolve." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Connection error, please try again." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Can't connect." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Can't connect to host:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "No response from host:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "No response." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Request failed, return code:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Req. Failed." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Request failed, too many redirects" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Redirect Loop." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Failed:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Bad download hash, assuming file has been tampered with." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Expected:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Got:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Failed sha256 hash check" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Asset Download Error:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Success!" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Fetching:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Resolving.." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Connecting.." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Requesting.." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Error making request" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Idle" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Retry" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Download Error" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Download for this asset is already in progress!" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "first" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "prev" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "next" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "last" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "All" +msgstr "" + #: editor/asset_library_editor_plugin.cpp editor/create_dialog.cpp #: editor/editor_help.cpp editor/editor_node.cpp #: editor/plugins/script_editor_plugin.cpp editor/property_selector.cpp @@ -356,6 +524,29 @@ msgstr "" msgid "Search:" msgstr "" +#: editor/asset_library_editor_plugin.cpp editor/code_editor.cpp +#: editor/editor_help.cpp editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp +#: editor/plugins/shader_editor_plugin.cpp editor/project_settings.cpp +msgid "Search" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp editor/editor_node.cpp +#: editor/io_plugins/editor_bitmask_import_plugin.cpp +#: editor/io_plugins/editor_font_import_plugin.cpp +#: editor/io_plugins/editor_mesh_import_plugin.cpp +#: editor/io_plugins/editor_sample_import_plugin.cpp +#: editor/io_plugins/editor_scene_import_plugin.cpp +#: editor/io_plugins/editor_texture_import_plugin.cpp +#: editor/io_plugins/editor_translation_import_plugin.cpp +#: editor/project_manager.cpp +msgid "Import" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp editor/project_settings.cpp +msgid "Plugins" +msgstr "" + #: editor/asset_library_editor_plugin.cpp msgid "Sort:" msgstr "" @@ -369,10 +560,6 @@ msgid "Category:" msgstr "" #: editor/asset_library_editor_plugin.cpp -msgid "All" -msgstr "" - -#: editor/asset_library_editor_plugin.cpp msgid "Site:" msgstr "" @@ -404,20 +591,6 @@ msgstr "" msgid "Call" msgstr "" -#: editor/call_dialog.cpp editor/connections_dialog.cpp -#: editor/export_template_manager.cpp -#: editor/plugins/animation_player_editor_plugin.cpp -#: editor/plugins/canvas_item_editor_plugin.cpp -#: editor/plugins/resource_preloader_editor_plugin.cpp -#: editor/plugins/sample_library_editor_plugin.cpp -#: editor/plugins/script_editor_plugin.cpp -#: editor/plugins/sprite_frames_editor_plugin.cpp editor/project_settings.cpp -#: editor/property_editor.cpp editor/run_settings_dialog.cpp -#: editor/settings_config_dialog.cpp -#: modules/visual_script/visual_script_editor.cpp -msgid "Close" -msgstr "" - #: editor/call_dialog.cpp msgid "Method List:" msgstr "" @@ -467,13 +640,6 @@ msgid "Selection Only" msgstr "" #: editor/code_editor.cpp editor/editor_help.cpp -#: editor/plugins/script_editor_plugin.cpp -#: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp editor/project_settings.cpp -msgid "Search" -msgstr "" - -#: editor/code_editor.cpp editor/editor_help.cpp msgid "Find" msgstr "" @@ -623,11 +789,6 @@ msgstr "" msgid "Matches:" msgstr "" -#: editor/create_dialog.cpp editor/editor_help.cpp editor/property_selector.cpp -#: editor/script_editor_debugger.cpp -msgid "Description:" -msgstr "" - #: editor/dependency_editor.cpp msgid "Search Replacement For:" msgstr "" @@ -1101,10 +1262,6 @@ msgstr "" msgid "Clear" msgstr "" -#: editor/editor_node.cpp -msgid "Node From Scene" -msgstr "" - #: editor/editor_node.cpp editor/plugins/animation_player_editor_plugin.cpp #: editor/resources_dock.cpp msgid "Error saving resource!" @@ -1469,21 +1626,6 @@ msgid "Distraction Free Mode" msgstr "" #: editor/editor_node.cpp -msgid "Import assets to the project." -msgstr "" - -#: editor/editor_node.cpp editor/io_plugins/editor_bitmask_import_plugin.cpp -#: editor/io_plugins/editor_font_import_plugin.cpp -#: editor/io_plugins/editor_mesh_import_plugin.cpp -#: editor/io_plugins/editor_sample_import_plugin.cpp -#: editor/io_plugins/editor_scene_import_plugin.cpp -#: editor/io_plugins/editor_texture_import_plugin.cpp -#: editor/io_plugins/editor_translation_import_plugin.cpp -#: editor/project_manager.cpp -msgid "Import" -msgstr "" - -#: editor/editor_node.cpp msgid "Miscellaneous project or scene-wide tools." msgstr "" @@ -1752,10 +1894,6 @@ msgid "Installed Plugins:" msgstr "" #: editor/editor_plugin_settings.cpp -msgid "Version:" -msgstr "" - -#: editor/editor_plugin_settings.cpp msgid "Author:" msgstr "" @@ -3725,6 +3863,10 @@ msgid "A processor material of type 'ParticlesMaterial' is required." msgstr "" #: editor/plugins/particles_editor_plugin.cpp +msgid "Generating AABB" +msgstr "" + +#: editor/plugins/particles_editor_plugin.cpp msgid "Faces contain no area!" msgstr "" @@ -3772,6 +3914,14 @@ msgstr "" msgid "Emission Source: " msgstr "" +#: editor/plugins/particles_editor_plugin.cpp +msgid "Generate Visibility AABB" +msgstr "" + +#: editor/plugins/particles_editor_plugin.cpp +msgid "Generation Time (sec):" +msgstr "" + #: editor/plugins/path_2d_editor_plugin.cpp msgid "Remove Point from Curve" msgstr "" @@ -4221,6 +4371,14 @@ msgid "Trim Trailing Whitespace" msgstr "" #: editor/plugins/script_text_editor.cpp +msgid "Convert Indent To Spaces" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Convert Indent To Tabs" +msgstr "" + +#: editor/plugins/script_text_editor.cpp msgid "Auto Indent" msgstr "" @@ -5077,11 +5235,11 @@ msgid "Invalid project path, the path must exist!" msgstr "" #: editor/project_manager.cpp -msgid "Invalid project path, godot.cfg must not exist." +msgid "Invalid project path, *.godot must not exist." msgstr "" #: editor/project_manager.cpp -msgid "Invalid project path, godot.cfg must exist." +msgid "Invalid project path, *.godot must exist." msgstr "" #: editor/project_manager.cpp @@ -5093,7 +5251,7 @@ msgid "Invalid project path (changed anything?)." msgstr "" #: editor/project_manager.cpp -msgid "Couldn't create godot.cfg in project path." +msgid "Couldn't create *.godot project file in project path." msgstr "" #: editor/project_manager.cpp @@ -5129,10 +5287,6 @@ msgid "Install Project:" msgstr "" #: editor/project_manager.cpp -msgid "Install" -msgstr "" - -#: editor/project_manager.cpp msgid "Browse" msgstr "" @@ -5191,6 +5345,10 @@ msgid "New Project" msgstr "" #: editor/project_manager.cpp +msgid "Templates" +msgstr "" + +#: editor/project_manager.cpp msgid "Exit" msgstr "" @@ -5374,7 +5532,7 @@ msgid "Remove Resource Remap Option" msgstr "" #: editor/project_settings.cpp -msgid "Project Settings (godot.cfg)" +msgid "Project Settings " msgstr "" #: editor/project_settings.cpp editor/settings_config_dialog.cpp @@ -5441,10 +5599,6 @@ msgstr "" msgid "AutoLoad" msgstr "" -#: editor/project_settings.cpp -msgid "Plugins" -msgstr "" - #: editor/property_editor.cpp msgid "Pick a Viewport" msgstr "" @@ -6044,6 +6198,10 @@ msgid "Change Notifier Extents" msgstr "" #: editor/spatial_editor_gizmos.cpp +msgid "Change Particles AABB" +msgstr "" + +#: editor/spatial_editor_gizmos.cpp msgid "Change Probe Extents" msgstr "" @@ -6584,6 +6742,17 @@ msgid "" "It only provides navigation data." msgstr "" +#: scene/3d/particles.cpp +msgid "" +"Nothing is visible because meshes have not been assigned to draw passes." +msgstr "" + +#: scene/3d/particles.cpp +msgid "" +"A material to process the particles is not assigned, so no behavior is " +"imprinted." +msgstr "" + #: scene/3d/remote_transform.cpp msgid "Path property must point to a valid Spatial node to work." msgstr "" diff --git a/editor/translations/el.po b/editor/translations/el.po index 357112ce0c..292c5a6fd3 100644 --- a/editor/translations/el.po +++ b/editor/translations/el.po @@ -358,6 +358,182 @@ msgstr "Αλλαγή Ï„Ïπου τιμής πίνακα" msgid "Change Array Value" msgstr "Αλλαγή τιμής πίνακα" +#: editor/asset_library_editor_plugin.cpp +msgid "Free" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp editor/editor_plugin_settings.cpp +msgid "Version:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Contents:" +msgstr "ΣταθεÏÎÏ‚:" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "View Files" +msgstr "ΑÏχείο:" + +#: editor/asset_library_editor_plugin.cpp editor/create_dialog.cpp +#: editor/editor_help.cpp editor/property_selector.cpp +#: editor/script_editor_debugger.cpp +msgid "Description:" +msgstr "ΠεÏιγÏαφή:" + +#: editor/asset_library_editor_plugin.cpp editor/project_manager.cpp +msgid "Install" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp editor/call_dialog.cpp +#: editor/connections_dialog.cpp editor/export_template_manager.cpp +#: editor/plugins/animation_player_editor_plugin.cpp +#: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/resource_preloader_editor_plugin.cpp +#: editor/plugins/sample_library_editor_plugin.cpp +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/sprite_frames_editor_plugin.cpp editor/project_settings.cpp +#: editor/property_editor.cpp editor/run_settings_dialog.cpp +#: editor/settings_config_dialog.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Close" +msgstr "Κλείσιμο" + +#: editor/asset_library_editor_plugin.cpp +msgid "Can't resolve hostname:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Can't resolve." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Connection error, please try again." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Can't connect." +msgstr "ΣÏνδεση.." + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Can't connect to host:" +msgstr "ΣÏνδεση στον κόμβο:" + +#: editor/asset_library_editor_plugin.cpp +msgid "No response from host:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "No response." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Request failed, return code:" +msgstr "Ζητήθηκε άγνωστη μοÏφή αÏχείου:" + +#: editor/asset_library_editor_plugin.cpp +msgid "Req. Failed." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Request failed, too many redirects" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Redirect Loop." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Failed:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Bad download hash, assuming file has been tampered with." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Expected:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Got:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Failed sha256 hash check" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Asset Download Error:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Success!" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Fetching:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Resolving.." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Connecting.." +msgstr "ΣÏνδεση.." + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Requesting.." +msgstr "Δοκιμιμαστικά" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Error making request" +msgstr "Σφάλμα κατά την αποθήκευση πόÏου!" + +#: editor/asset_library_editor_plugin.cpp +msgid "Idle" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Retry" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Download Error" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Download for this asset is already in progress!" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "first" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "prev" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "next" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "last" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "All" +msgstr "Όλα" + #: editor/asset_library_editor_plugin.cpp editor/create_dialog.cpp #: editor/editor_help.cpp editor/editor_node.cpp #: editor/plugins/script_editor_plugin.cpp editor/property_selector.cpp @@ -365,6 +541,29 @@ msgstr "Αλλαγή τιμής πίνακα" msgid "Search:" msgstr "Αναζήτηση:" +#: editor/asset_library_editor_plugin.cpp editor/code_editor.cpp +#: editor/editor_help.cpp editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp +#: editor/plugins/shader_editor_plugin.cpp editor/project_settings.cpp +msgid "Search" +msgstr "Αναζήτηση" + +#: editor/asset_library_editor_plugin.cpp editor/editor_node.cpp +#: editor/io_plugins/editor_bitmask_import_plugin.cpp +#: editor/io_plugins/editor_font_import_plugin.cpp +#: editor/io_plugins/editor_mesh_import_plugin.cpp +#: editor/io_plugins/editor_sample_import_plugin.cpp +#: editor/io_plugins/editor_scene_import_plugin.cpp +#: editor/io_plugins/editor_texture_import_plugin.cpp +#: editor/io_plugins/editor_translation_import_plugin.cpp +#: editor/project_manager.cpp +msgid "Import" +msgstr "Εισαγωγή" + +#: editor/asset_library_editor_plugin.cpp editor/project_settings.cpp +msgid "Plugins" +msgstr "" + #: editor/asset_library_editor_plugin.cpp msgid "Sort:" msgstr "Ταξινόμηση:" @@ -378,10 +577,6 @@ msgid "Category:" msgstr "ΚατηγοÏία:" #: editor/asset_library_editor_plugin.cpp -msgid "All" -msgstr "Όλα" - -#: editor/asset_library_editor_plugin.cpp msgid "Site:" msgstr "ΔιεÏθυνση:" @@ -413,20 +608,6 @@ msgstr "Λίστα συναÏτήσεων για '%s':" msgid "Call" msgstr "Κλήση" -#: editor/call_dialog.cpp editor/connections_dialog.cpp -#: editor/export_template_manager.cpp -#: editor/plugins/animation_player_editor_plugin.cpp -#: editor/plugins/canvas_item_editor_plugin.cpp -#: editor/plugins/resource_preloader_editor_plugin.cpp -#: editor/plugins/sample_library_editor_plugin.cpp -#: editor/plugins/script_editor_plugin.cpp -#: editor/plugins/sprite_frames_editor_plugin.cpp editor/project_settings.cpp -#: editor/property_editor.cpp editor/run_settings_dialog.cpp -#: editor/settings_config_dialog.cpp -#: modules/visual_script/visual_script_editor.cpp -msgid "Close" -msgstr "Κλείσιμο" - #: editor/call_dialog.cpp msgid "Method List:" msgstr "Λίστα συναÏτήσεων:" @@ -477,13 +658,6 @@ msgid "Selection Only" msgstr "Μόνο στην επιλογή" #: editor/code_editor.cpp editor/editor_help.cpp -#: editor/plugins/script_editor_plugin.cpp -#: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp editor/project_settings.cpp -msgid "Search" -msgstr "Αναζήτηση" - -#: editor/code_editor.cpp editor/editor_help.cpp msgid "Find" msgstr "ΕÏÏεση" @@ -635,11 +809,6 @@ msgstr "Î Ïόσφατα:" msgid "Matches:" msgstr "Αντιστοιχίες:" -#: editor/create_dialog.cpp editor/editor_help.cpp editor/property_selector.cpp -#: editor/script_editor_debugger.cpp -msgid "Description:" -msgstr "ΠεÏιγÏαφή:" - #: editor/dependency_editor.cpp msgid "Search Replacement For:" msgstr "Αναζήτηση αντικατάστασης για:" @@ -1125,10 +1294,6 @@ msgstr " Έξοδος:" msgid "Clear" msgstr "ΕκκαθάÏιση" -#: editor/editor_node.cpp -msgid "Node From Scene" -msgstr "Κόμβος από σκηνή" - #: editor/editor_node.cpp editor/plugins/animation_player_editor_plugin.cpp #: editor/resources_dock.cpp msgid "Error saving resource!" @@ -1517,21 +1682,6 @@ msgid "Distraction Free Mode" msgstr "ΛειτουÏγία χωÏίς διάσπαση Ï€Ïοσοχής" #: editor/editor_node.cpp -msgid "Import assets to the project." -msgstr "Εισαγωγή πόÏων στο ÎÏγο." - -#: editor/editor_node.cpp editor/io_plugins/editor_bitmask_import_plugin.cpp -#: editor/io_plugins/editor_font_import_plugin.cpp -#: editor/io_plugins/editor_mesh_import_plugin.cpp -#: editor/io_plugins/editor_sample_import_plugin.cpp -#: editor/io_plugins/editor_scene_import_plugin.cpp -#: editor/io_plugins/editor_texture_import_plugin.cpp -#: editor/io_plugins/editor_translation_import_plugin.cpp -#: editor/project_manager.cpp -msgid "Import" -msgstr "Εισαγωγή" - -#: editor/editor_node.cpp msgid "Miscellaneous project or scene-wide tools." msgstr "Λοιπά ÎÏγα ή εÏγαλεία για όλη τη σκηνή." @@ -1821,10 +1971,6 @@ msgid "Installed Plugins:" msgstr "" #: editor/editor_plugin_settings.cpp -msgid "Version:" -msgstr "" - -#: editor/editor_plugin_settings.cpp msgid "Author:" msgstr "" @@ -3804,6 +3950,10 @@ msgid "A processor material of type 'ParticlesMaterial' is required." msgstr "" #: editor/plugins/particles_editor_plugin.cpp +msgid "Generating AABB" +msgstr "" + +#: editor/plugins/particles_editor_plugin.cpp msgid "Faces contain no area!" msgstr "" @@ -3851,6 +4001,14 @@ msgstr "" msgid "Emission Source: " msgstr "" +#: editor/plugins/particles_editor_plugin.cpp +msgid "Generate Visibility AABB" +msgstr "" + +#: editor/plugins/particles_editor_plugin.cpp +msgid "Generation Time (sec):" +msgstr "" + #: editor/plugins/path_2d_editor_plugin.cpp msgid "Remove Point from Curve" msgstr "" @@ -4301,6 +4459,14 @@ msgid "Trim Trailing Whitespace" msgstr "" #: editor/plugins/script_text_editor.cpp +msgid "Convert Indent To Spaces" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Convert Indent To Tabs" +msgstr "" + +#: editor/plugins/script_text_editor.cpp msgid "Auto Indent" msgstr "" @@ -5163,11 +5329,11 @@ msgid "Invalid project path, the path must exist!" msgstr "" #: editor/project_manager.cpp -msgid "Invalid project path, godot.cfg must not exist." +msgid "Invalid project path, *.godot must not exist." msgstr "" #: editor/project_manager.cpp -msgid "Invalid project path, godot.cfg must exist." +msgid "Invalid project path, *.godot must exist." msgstr "" #: editor/project_manager.cpp @@ -5179,7 +5345,7 @@ msgid "Invalid project path (changed anything?)." msgstr "" #: editor/project_manager.cpp -msgid "Couldn't create godot.cfg in project path." +msgid "Couldn't create *.godot project file in project path." msgstr "" #: editor/project_manager.cpp @@ -5215,10 +5381,6 @@ msgid "Install Project:" msgstr "" #: editor/project_manager.cpp -msgid "Install" -msgstr "" - -#: editor/project_manager.cpp msgid "Browse" msgstr "" @@ -5277,6 +5439,11 @@ msgid "New Project" msgstr "" #: editor/project_manager.cpp +#, fuzzy +msgid "Templates" +msgstr "ΑφαίÏεση επιλογής" + +#: editor/project_manager.cpp msgid "Exit" msgstr "" @@ -5461,7 +5628,7 @@ msgstr "" #: editor/project_settings.cpp #, fuzzy -msgid "Project Settings (godot.cfg)" +msgid "Project Settings " msgstr "Ρυθμίσεις ÎÏγου" #: editor/project_settings.cpp editor/settings_config_dialog.cpp @@ -5528,10 +5695,6 @@ msgstr "" msgid "AutoLoad" msgstr "" -#: editor/project_settings.cpp -msgid "Plugins" -msgstr "" - #: editor/property_editor.cpp msgid "Pick a Viewport" msgstr "" @@ -6134,6 +6297,10 @@ msgid "Change Notifier Extents" msgstr "" #: editor/spatial_editor_gizmos.cpp +msgid "Change Particles AABB" +msgstr "" + +#: editor/spatial_editor_gizmos.cpp msgid "Change Probe Extents" msgstr "" @@ -6758,6 +6925,17 @@ msgstr "" "Ένας κόμβος NavigationMeshInstance Ï€ÏÎπει να κληÏονομεί Îναν κόμβο Ï„Ïπου " "Navigation, διότι διαθÎτει μόνο δεδομÎνα πλοήγησης." +#: scene/3d/particles.cpp +msgid "" +"Nothing is visible because meshes have not been assigned to draw passes." +msgstr "" + +#: scene/3d/particles.cpp +msgid "" +"A material to process the particles is not assigned, so no behavior is " +"imprinted." +msgstr "" + #: scene/3d/remote_transform.cpp msgid "Path property must point to a valid Spatial node to work." msgstr "" @@ -6836,6 +7014,16 @@ msgstr "" "μÎγεθος. Αλλιώς, κάντε το Îνα RenderTarget και οÏίστε το internal texture σε " "Îναν κόμβο για απεικόνιση." +#~ msgid "Node From Scene" +#~ msgstr "Κόμβος από σκηνή" + +#~ msgid "Import assets to the project." +#~ msgstr "Εισαγωγή πόÏων στο ÎÏγο." + +#, fuzzy +#~ msgid "Project Settings (godot.cfg)" +#~ msgstr "Ρυθμίσεις ÎÏγου" + #~ msgid "" #~ "A SampleLibrary resource must be created or set in the 'samples' property " #~ "in order for SamplePlayer to play sound." diff --git a/editor/translations/es.po b/editor/translations/es.po index 6c9c54d88e..a7b9553892 100644 --- a/editor/translations/es.po +++ b/editor/translations/es.po @@ -366,6 +366,184 @@ msgstr "Cambiar tipo de valor del «array»" msgid "Change Array Value" msgstr "Cambiar valor del «array»" +#: editor/asset_library_editor_plugin.cpp +msgid "Free" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp editor/editor_plugin_settings.cpp +msgid "Version:" +msgstr "Versión:" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Contents:" +msgstr "Constantes:" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "View Files" +msgstr "Archivo" + +#: editor/asset_library_editor_plugin.cpp editor/create_dialog.cpp +#: editor/editor_help.cpp editor/property_selector.cpp +#: editor/script_editor_debugger.cpp +msgid "Description:" +msgstr "Descripción:" + +#: editor/asset_library_editor_plugin.cpp editor/project_manager.cpp +msgid "Install" +msgstr "Instalar" + +#: editor/asset_library_editor_plugin.cpp editor/call_dialog.cpp +#: editor/connections_dialog.cpp editor/export_template_manager.cpp +#: editor/plugins/animation_player_editor_plugin.cpp +#: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/resource_preloader_editor_plugin.cpp +#: editor/plugins/sample_library_editor_plugin.cpp +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/sprite_frames_editor_plugin.cpp editor/project_settings.cpp +#: editor/property_editor.cpp editor/run_settings_dialog.cpp +#: editor/settings_config_dialog.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Close" +msgstr "Cerrar" + +#: editor/asset_library_editor_plugin.cpp +msgid "Can't resolve hostname:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Can't resolve." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Connection error, please try again." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Can't connect." +msgstr "Conectar.." + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Can't connect to host:" +msgstr "Conectar a nodo:" + +#: editor/asset_library_editor_plugin.cpp +msgid "No response from host:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "No response." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Request failed, return code:" +msgstr "Formato de archivo desconocido:" + +#: editor/asset_library_editor_plugin.cpp +msgid "Req. Failed." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Request failed, too many redirects" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Redirect Loop." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Failed:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Bad download hash, assuming file has been tampered with." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Expected:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Got:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Failed sha256 hash check" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Asset Download Error:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Success!" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Fetching:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Resolving.." +msgstr "Guardando…" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Connecting.." +msgstr "Conectar.." + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Requesting.." +msgstr "Prueba" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Error making request" +msgstr "¡Hubo un error al guardar el recurso!" + +#: editor/asset_library_editor_plugin.cpp +msgid "Idle" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Retry" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Download Error" +msgstr "Abajo" + +#: editor/asset_library_editor_plugin.cpp +msgid "Download for this asset is already in progress!" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "first" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "prev" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "next" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "last" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "All" +msgstr "Todos" + #: editor/asset_library_editor_plugin.cpp editor/create_dialog.cpp #: editor/editor_help.cpp editor/editor_node.cpp #: editor/plugins/script_editor_plugin.cpp editor/property_selector.cpp @@ -373,6 +551,29 @@ msgstr "Cambiar valor del «array»" msgid "Search:" msgstr "Buscar:" +#: editor/asset_library_editor_plugin.cpp editor/code_editor.cpp +#: editor/editor_help.cpp editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp +#: editor/plugins/shader_editor_plugin.cpp editor/project_settings.cpp +msgid "Search" +msgstr "Buscar" + +#: editor/asset_library_editor_plugin.cpp editor/editor_node.cpp +#: editor/io_plugins/editor_bitmask_import_plugin.cpp +#: editor/io_plugins/editor_font_import_plugin.cpp +#: editor/io_plugins/editor_mesh_import_plugin.cpp +#: editor/io_plugins/editor_sample_import_plugin.cpp +#: editor/io_plugins/editor_scene_import_plugin.cpp +#: editor/io_plugins/editor_texture_import_plugin.cpp +#: editor/io_plugins/editor_translation_import_plugin.cpp +#: editor/project_manager.cpp +msgid "Import" +msgstr "Importar" + +#: editor/asset_library_editor_plugin.cpp editor/project_settings.cpp +msgid "Plugins" +msgstr "Plugins" + #: editor/asset_library_editor_plugin.cpp msgid "Sort:" msgstr "Ordenar:" @@ -386,10 +587,6 @@ msgid "Category:" msgstr "CategorÃa:" #: editor/asset_library_editor_plugin.cpp -msgid "All" -msgstr "Todos" - -#: editor/asset_library_editor_plugin.cpp msgid "Site:" msgstr "Sitio:" @@ -421,20 +618,6 @@ msgstr "Lista de métodos Para '%s':" msgid "Call" msgstr "Llamada" -#: editor/call_dialog.cpp editor/connections_dialog.cpp -#: editor/export_template_manager.cpp -#: editor/plugins/animation_player_editor_plugin.cpp -#: editor/plugins/canvas_item_editor_plugin.cpp -#: editor/plugins/resource_preloader_editor_plugin.cpp -#: editor/plugins/sample_library_editor_plugin.cpp -#: editor/plugins/script_editor_plugin.cpp -#: editor/plugins/sprite_frames_editor_plugin.cpp editor/project_settings.cpp -#: editor/property_editor.cpp editor/run_settings_dialog.cpp -#: editor/settings_config_dialog.cpp -#: modules/visual_script/visual_script_editor.cpp -msgid "Close" -msgstr "Cerrar" - #: editor/call_dialog.cpp msgid "Method List:" msgstr "Lista de métodos:" @@ -485,13 +668,6 @@ msgid "Selection Only" msgstr "Sólo selección" #: editor/code_editor.cpp editor/editor_help.cpp -#: editor/plugins/script_editor_plugin.cpp -#: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp editor/project_settings.cpp -msgid "Search" -msgstr "Buscar" - -#: editor/code_editor.cpp editor/editor_help.cpp msgid "Find" msgstr "Búsqueda" @@ -645,11 +821,6 @@ msgstr "Recientes:" msgid "Matches:" msgstr "Coincidencias:" -#: editor/create_dialog.cpp editor/editor_help.cpp editor/property_selector.cpp -#: editor/script_editor_debugger.cpp -msgid "Description:" -msgstr "Descripción:" - #: editor/dependency_editor.cpp msgid "Search Replacement For:" msgstr "Buscar reemplazo para:" @@ -1141,10 +1312,6 @@ msgstr " Salida:" msgid "Clear" msgstr "Borrar todo" -#: editor/editor_node.cpp -msgid "Node From Scene" -msgstr "Nodo desde escena" - #: editor/editor_node.cpp editor/plugins/animation_player_editor_plugin.cpp #: editor/resources_dock.cpp msgid "Error saving resource!" @@ -1529,21 +1696,6 @@ msgid "Distraction Free Mode" msgstr "Modo sin distracciones" #: editor/editor_node.cpp -msgid "Import assets to the project." -msgstr "Importar elementos al proyecto." - -#: editor/editor_node.cpp editor/io_plugins/editor_bitmask_import_plugin.cpp -#: editor/io_plugins/editor_font_import_plugin.cpp -#: editor/io_plugins/editor_mesh_import_plugin.cpp -#: editor/io_plugins/editor_sample_import_plugin.cpp -#: editor/io_plugins/editor_scene_import_plugin.cpp -#: editor/io_plugins/editor_texture_import_plugin.cpp -#: editor/io_plugins/editor_translation_import_plugin.cpp -#: editor/project_manager.cpp -msgid "Import" -msgstr "Importar" - -#: editor/editor_node.cpp msgid "Miscellaneous project or scene-wide tools." msgstr "Herramientas varias o de escenas." @@ -1834,10 +1986,6 @@ msgid "Installed Plugins:" msgstr "Plugins instalados:" #: editor/editor_plugin_settings.cpp -msgid "Version:" -msgstr "Versión:" - -#: editor/editor_plugin_settings.cpp msgid "Author:" msgstr "Autor:" @@ -3868,6 +4016,11 @@ msgid "A processor material of type 'ParticlesMaterial' is required." msgstr "" #: editor/plugins/particles_editor_plugin.cpp +#, fuzzy +msgid "Generating AABB" +msgstr "Generar AABB" + +#: editor/plugins/particles_editor_plugin.cpp msgid "Faces contain no area!" msgstr "¡Las caras no contienen área!" @@ -3920,6 +4073,16 @@ msgstr "Volumen" msgid "Emission Source: " msgstr "Relleno de emisión:" +#: editor/plugins/particles_editor_plugin.cpp +#, fuzzy +msgid "Generate Visibility AABB" +msgstr "Generar AABB" + +#: editor/plugins/particles_editor_plugin.cpp +#, fuzzy +msgid "Generation Time (sec):" +msgstr "Tiempo promedio (seg)" + #: editor/plugins/path_2d_editor_plugin.cpp msgid "Remove Point from Curve" msgstr "Borrar punto de curva" @@ -4377,6 +4540,14 @@ msgid "Trim Trailing Whitespace" msgstr "Borrar espacios sobrantes al final" #: editor/plugins/script_text_editor.cpp +msgid "Convert Indent To Spaces" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Convert Indent To Tabs" +msgstr "" + +#: editor/plugins/script_text_editor.cpp msgid "Auto Indent" msgstr "Autoindentar" @@ -5255,12 +5426,12 @@ msgstr "¡La ruta del proyecto no es correcta, tiene que existir!" #: editor/project_manager.cpp #, fuzzy -msgid "Invalid project path, godot.cfg must not exist." +msgid "Invalid project path, *.godot must not exist." msgstr "La ruta del proyecto no es correcta, engine.cfg no debe existir." #: editor/project_manager.cpp #, fuzzy -msgid "Invalid project path, godot.cfg must exist." +msgid "Invalid project path, *.godot must exist." msgstr "¡La ruta del proyecto no es correcta, engine.cfg debe existir." #: editor/project_manager.cpp @@ -5273,7 +5444,7 @@ msgstr "La ruta del proyecto no es correcta (¿has cambiado algo?)." #: editor/project_manager.cpp #, fuzzy -msgid "Couldn't create godot.cfg in project path." +msgid "Couldn't create *.godot project file in project path." msgstr "No se pudo crear engine.cfg en la ruta de proyecto." #: editor/project_manager.cpp @@ -5309,10 +5480,6 @@ msgid "Install Project:" msgstr "Instalar proyecto:" #: editor/project_manager.cpp -msgid "Install" -msgstr "Instalar" - -#: editor/project_manager.cpp msgid "Browse" msgstr "Examinar" @@ -5375,6 +5542,11 @@ msgid "New Project" msgstr "Proyecto nuevo" #: editor/project_manager.cpp +#, fuzzy +msgid "Templates" +msgstr "Remover Item" + +#: editor/project_manager.cpp msgid "Exit" msgstr "Salir" @@ -5561,8 +5733,8 @@ msgstr "Quitar opción de remapeo de recursos" #: editor/project_settings.cpp #, fuzzy -msgid "Project Settings (godot.cfg)" -msgstr "Ajustes de proyecto (engine.cfg)" +msgid "Project Settings " +msgstr "Ajustes del proyecto" #: editor/project_settings.cpp editor/settings_config_dialog.cpp msgid "General" @@ -5628,10 +5800,6 @@ msgstr "Idioma" msgid "AutoLoad" msgstr "AutoLoad" -#: editor/project_settings.cpp -msgid "Plugins" -msgstr "Plugins" - #: editor/property_editor.cpp #, fuzzy msgid "Pick a Viewport" @@ -6254,6 +6422,10 @@ msgid "Change Notifier Extents" msgstr "Cambiar Alcances de Notificadores" #: editor/spatial_editor_gizmos.cpp +msgid "Change Particles AABB" +msgstr "" + +#: editor/spatial_editor_gizmos.cpp #, fuzzy msgid "Change Probe Extents" msgstr "Cambiar Alcances de Notificadores" @@ -6899,6 +7071,17 @@ msgstr "" "NavigationMeshInstance debe ser un hijo o nieto de un nodo Navigation. Ya " "que sólo proporciona los datos de navegación." +#: scene/3d/particles.cpp +msgid "" +"Nothing is visible because meshes have not been assigned to draw passes." +msgstr "" + +#: scene/3d/particles.cpp +msgid "" +"A material to process the particles is not assigned, so no behavior is " +"imprinted." +msgstr "" + #: scene/3d/remote_transform.cpp #, fuzzy msgid "Path property must point to a valid Spatial node to work." @@ -6977,6 +7160,16 @@ msgstr "" "que pueda obtener un tamaño. Alternativamente, hacelo un RenderTarget y " "asigná su textura interna a algún otro nodo para mostrar." +#~ msgid "Node From Scene" +#~ msgstr "Nodo desde escena" + +#~ msgid "Import assets to the project." +#~ msgstr "Importar elementos al proyecto." + +#, fuzzy +#~ msgid "Project Settings (godot.cfg)" +#~ msgstr "Ajustes de proyecto (engine.cfg)" + #~ msgid "Surface" #~ msgstr "Superficie" diff --git a/editor/translations/es_AR.po b/editor/translations/es_AR.po index 502b043378..6c9579916f 100644 --- a/editor/translations/es_AR.po +++ b/editor/translations/es_AR.po @@ -361,6 +361,184 @@ msgstr "Cambiar Tipo de Valor del Array" msgid "Change Array Value" msgstr "Cambiar Valor del Array" +#: editor/asset_library_editor_plugin.cpp +msgid "Free" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp editor/editor_plugin_settings.cpp +msgid "Version:" +msgstr "Version:" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Contents:" +msgstr "Constantes:" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "View Files" +msgstr "Archivo" + +#: editor/asset_library_editor_plugin.cpp editor/create_dialog.cpp +#: editor/editor_help.cpp editor/property_selector.cpp +#: editor/script_editor_debugger.cpp +msgid "Description:" +msgstr "Descripción:" + +#: editor/asset_library_editor_plugin.cpp editor/project_manager.cpp +msgid "Install" +msgstr "Instalar" + +#: editor/asset_library_editor_plugin.cpp editor/call_dialog.cpp +#: editor/connections_dialog.cpp editor/export_template_manager.cpp +#: editor/plugins/animation_player_editor_plugin.cpp +#: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/resource_preloader_editor_plugin.cpp +#: editor/plugins/sample_library_editor_plugin.cpp +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/sprite_frames_editor_plugin.cpp editor/project_settings.cpp +#: editor/property_editor.cpp editor/run_settings_dialog.cpp +#: editor/settings_config_dialog.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Close" +msgstr "Cerrar" + +#: editor/asset_library_editor_plugin.cpp +msgid "Can't resolve hostname:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Can't resolve." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Connection error, please try again." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Can't connect." +msgstr "Conectar.." + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Can't connect to host:" +msgstr "Conectar a Nodo:" + +#: editor/asset_library_editor_plugin.cpp +msgid "No response from host:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "No response." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Request failed, return code:" +msgstr "Formato requerido de archivo desconocido:" + +#: editor/asset_library_editor_plugin.cpp +msgid "Req. Failed." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Request failed, too many redirects" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Redirect Loop." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Failed:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Bad download hash, assuming file has been tampered with." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Expected:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Got:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Failed sha256 hash check" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Asset Download Error:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Success!" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Fetching:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Resolving.." +msgstr "Guardando.." + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Connecting.." +msgstr "Conectar.." + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Requesting.." +msgstr "Testeo" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Error making request" +msgstr "Error al guardar el recurso!" + +#: editor/asset_library_editor_plugin.cpp +msgid "Idle" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Retry" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Download Error" +msgstr "Abajo" + +#: editor/asset_library_editor_plugin.cpp +msgid "Download for this asset is already in progress!" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "first" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "prev" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "next" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "last" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "All" +msgstr "Todos" + #: editor/asset_library_editor_plugin.cpp editor/create_dialog.cpp #: editor/editor_help.cpp editor/editor_node.cpp #: editor/plugins/script_editor_plugin.cpp editor/property_selector.cpp @@ -368,6 +546,29 @@ msgstr "Cambiar Valor del Array" msgid "Search:" msgstr "Buscar:" +#: editor/asset_library_editor_plugin.cpp editor/code_editor.cpp +#: editor/editor_help.cpp editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp +#: editor/plugins/shader_editor_plugin.cpp editor/project_settings.cpp +msgid "Search" +msgstr "Buscar" + +#: editor/asset_library_editor_plugin.cpp editor/editor_node.cpp +#: editor/io_plugins/editor_bitmask_import_plugin.cpp +#: editor/io_plugins/editor_font_import_plugin.cpp +#: editor/io_plugins/editor_mesh_import_plugin.cpp +#: editor/io_plugins/editor_sample_import_plugin.cpp +#: editor/io_plugins/editor_scene_import_plugin.cpp +#: editor/io_plugins/editor_texture_import_plugin.cpp +#: editor/io_plugins/editor_translation_import_plugin.cpp +#: editor/project_manager.cpp +msgid "Import" +msgstr "Importar" + +#: editor/asset_library_editor_plugin.cpp editor/project_settings.cpp +msgid "Plugins" +msgstr "Plugins" + #: editor/asset_library_editor_plugin.cpp msgid "Sort:" msgstr "Ordenar:" @@ -381,10 +582,6 @@ msgid "Category:" msgstr "CategorÃa:" #: editor/asset_library_editor_plugin.cpp -msgid "All" -msgstr "Todos" - -#: editor/asset_library_editor_plugin.cpp msgid "Site:" msgstr "Sitio:" @@ -416,20 +613,6 @@ msgstr "Lista de Métodos Para '%s':" msgid "Call" msgstr "Llamar" -#: editor/call_dialog.cpp editor/connections_dialog.cpp -#: editor/export_template_manager.cpp -#: editor/plugins/animation_player_editor_plugin.cpp -#: editor/plugins/canvas_item_editor_plugin.cpp -#: editor/plugins/resource_preloader_editor_plugin.cpp -#: editor/plugins/sample_library_editor_plugin.cpp -#: editor/plugins/script_editor_plugin.cpp -#: editor/plugins/sprite_frames_editor_plugin.cpp editor/project_settings.cpp -#: editor/property_editor.cpp editor/run_settings_dialog.cpp -#: editor/settings_config_dialog.cpp -#: modules/visual_script/visual_script_editor.cpp -msgid "Close" -msgstr "Cerrar" - #: editor/call_dialog.cpp msgid "Method List:" msgstr "Lista de Métodos:" @@ -480,13 +663,6 @@ msgid "Selection Only" msgstr "Solo Selección" #: editor/code_editor.cpp editor/editor_help.cpp -#: editor/plugins/script_editor_plugin.cpp -#: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp editor/project_settings.cpp -msgid "Search" -msgstr "Buscar" - -#: editor/code_editor.cpp editor/editor_help.cpp msgid "Find" msgstr "Encontrar" @@ -638,11 +814,6 @@ msgstr "Recientes:" msgid "Matches:" msgstr "Coincidencias:" -#: editor/create_dialog.cpp editor/editor_help.cpp editor/property_selector.cpp -#: editor/script_editor_debugger.cpp -msgid "Description:" -msgstr "Descripción:" - #: editor/dependency_editor.cpp msgid "Search Replacement For:" msgstr "Buscar Reemplazo Para:" @@ -1130,10 +1301,6 @@ msgstr " Salida:" msgid "Clear" msgstr "Limpiar" -#: editor/editor_node.cpp -msgid "Node From Scene" -msgstr "Nodo desde Escena" - #: editor/editor_node.cpp editor/plugins/animation_player_editor_plugin.cpp #: editor/resources_dock.cpp msgid "Error saving resource!" @@ -1515,21 +1682,6 @@ msgid "Distraction Free Mode" msgstr "Modo Sin Distracciones" #: editor/editor_node.cpp -msgid "Import assets to the project." -msgstr "Importar assets al proyecto." - -#: editor/editor_node.cpp editor/io_plugins/editor_bitmask_import_plugin.cpp -#: editor/io_plugins/editor_font_import_plugin.cpp -#: editor/io_plugins/editor_mesh_import_plugin.cpp -#: editor/io_plugins/editor_sample_import_plugin.cpp -#: editor/io_plugins/editor_scene_import_plugin.cpp -#: editor/io_plugins/editor_texture_import_plugin.cpp -#: editor/io_plugins/editor_translation_import_plugin.cpp -#: editor/project_manager.cpp -msgid "Import" -msgstr "Importar" - -#: editor/editor_node.cpp msgid "Miscellaneous project or scene-wide tools." msgstr "Herramientas misceláneas a nivel proyecto o escena." @@ -1819,10 +1971,6 @@ msgid "Installed Plugins:" msgstr "Plugins Instalados:" #: editor/editor_plugin_settings.cpp -msgid "Version:" -msgstr "Version:" - -#: editor/editor_plugin_settings.cpp msgid "Author:" msgstr "Autor:" @@ -3837,6 +3985,11 @@ msgid "A processor material of type 'ParticlesMaterial' is required." msgstr "" #: editor/plugins/particles_editor_plugin.cpp +#, fuzzy +msgid "Generating AABB" +msgstr "Generar AABB" + +#: editor/plugins/particles_editor_plugin.cpp msgid "Faces contain no area!" msgstr "Las caras no contienen area!" @@ -3889,6 +4042,16 @@ msgstr "Volumen" msgid "Emission Source: " msgstr "Relleno de Emisión:" +#: editor/plugins/particles_editor_plugin.cpp +#, fuzzy +msgid "Generate Visibility AABB" +msgstr "Generar AABB" + +#: editor/plugins/particles_editor_plugin.cpp +#, fuzzy +msgid "Generation Time (sec):" +msgstr "Tiempo Promedio (seg)" + #: editor/plugins/path_2d_editor_plugin.cpp msgid "Remove Point from Curve" msgstr "Remover Punto de Curva" @@ -4343,6 +4506,14 @@ msgid "Trim Trailing Whitespace" msgstr "Eliminar Espacios Sobrantes al Final" #: editor/plugins/script_text_editor.cpp +msgid "Convert Indent To Spaces" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Convert Indent To Tabs" +msgstr "" + +#: editor/plugins/script_text_editor.cpp msgid "Auto Indent" msgstr "Auto Indentar" @@ -5217,12 +5388,12 @@ msgstr "Ruta de proyecto inválida, la ruta debe existir!" #: editor/project_manager.cpp #, fuzzy -msgid "Invalid project path, godot.cfg must not exist." +msgid "Invalid project path, *.godot must not exist." msgstr "Ruta de proyecto inválida, engine.cfg no debe existir." #: editor/project_manager.cpp #, fuzzy -msgid "Invalid project path, godot.cfg must exist." +msgid "Invalid project path, *.godot must exist." msgstr "Ruta de proyecto inválida, engine.cfg debe existir." #: editor/project_manager.cpp @@ -5235,7 +5406,7 @@ msgstr "Ruta de proyecto inválida (cambiaste algo?)." #: editor/project_manager.cpp #, fuzzy -msgid "Couldn't create godot.cfg in project path." +msgid "Couldn't create *.godot project file in project path." msgstr "No se pudo crear engine.cfg en la ruta de proyecto." #: editor/project_manager.cpp @@ -5271,10 +5442,6 @@ msgid "Install Project:" msgstr "Instalar Proyecto:" #: editor/project_manager.cpp -msgid "Install" -msgstr "Instalar" - -#: editor/project_manager.cpp msgid "Browse" msgstr "Examinar" @@ -5337,6 +5504,11 @@ msgid "New Project" msgstr "Proyecto Nuevo" #: editor/project_manager.cpp +#, fuzzy +msgid "Templates" +msgstr "Remover Item" + +#: editor/project_manager.cpp msgid "Exit" msgstr "Salir" @@ -5523,8 +5695,8 @@ msgstr "Remover Opción de Remapeo de Recursos" #: editor/project_settings.cpp #, fuzzy -msgid "Project Settings (godot.cfg)" -msgstr "Ajustes de Proyecto (engine.cfg)" +msgid "Project Settings " +msgstr "Configuración de Proyecto" #: editor/project_settings.cpp editor/settings_config_dialog.cpp msgid "General" @@ -5590,10 +5762,6 @@ msgstr "Locale" msgid "AutoLoad" msgstr "AutoLoad" -#: editor/project_settings.cpp -msgid "Plugins" -msgstr "Plugins" - #: editor/property_editor.cpp #, fuzzy msgid "Pick a Viewport" @@ -6205,6 +6373,10 @@ msgid "Change Notifier Extents" msgstr "Cambiar Alcances de Notificadores" #: editor/spatial_editor_gizmos.cpp +msgid "Change Particles AABB" +msgstr "" + +#: editor/spatial_editor_gizmos.cpp msgid "Change Probe Extents" msgstr "Cambiar Extensión de Sonda" @@ -6825,6 +6997,17 @@ msgstr "" "NavigationMeshInstance debe ser un hijo o nieto de un nodo Navigation. Solo " "provee datos de navegación." +#: scene/3d/particles.cpp +msgid "" +"Nothing is visible because meshes have not been assigned to draw passes." +msgstr "" + +#: scene/3d/particles.cpp +msgid "" +"A material to process the particles is not assigned, so no behavior is " +"imprinted." +msgstr "" + #: scene/3d/remote_transform.cpp msgid "Path property must point to a valid Spatial node to work." msgstr "" @@ -6902,6 +7085,16 @@ msgstr "" "que pueda obtener un tamaño. Alternativamente, hacelo un RenderTarget y " "asigná su textura interna a algún otro nodo para mostrar." +#~ msgid "Node From Scene" +#~ msgstr "Nodo desde Escena" + +#~ msgid "Import assets to the project." +#~ msgstr "Importar assets al proyecto." + +#, fuzzy +#~ msgid "Project Settings (godot.cfg)" +#~ msgstr "Ajustes de Proyecto (engine.cfg)" + #~ msgid "Surface" #~ msgstr "Superficie" diff --git a/editor/translations/fa.po b/editor/translations/fa.po index 2cfd69f3bd..2ec9b18d78 100644 --- a/editor/translations/fa.po +++ b/editor/translations/fa.po @@ -360,6 +360,182 @@ msgstr "نوع مقدار آرایه را تغییر بده" msgid "Change Array Value" msgstr "مقدار آرایه را تغییر بده" +#: editor/asset_library_editor_plugin.cpp +msgid "Free" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp editor/editor_plugin_settings.cpp +msgid "Version:" +msgstr "نسخه:" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Contents:" +msgstr "مستمر" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "View Files" +msgstr "پرونده:" + +#: editor/asset_library_editor_plugin.cpp editor/create_dialog.cpp +#: editor/editor_help.cpp editor/property_selector.cpp +#: editor/script_editor_debugger.cpp +msgid "Description:" +msgstr "توضیØ:" + +#: editor/asset_library_editor_plugin.cpp editor/project_manager.cpp +msgid "Install" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp editor/call_dialog.cpp +#: editor/connections_dialog.cpp editor/export_template_manager.cpp +#: editor/plugins/animation_player_editor_plugin.cpp +#: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/resource_preloader_editor_plugin.cpp +#: editor/plugins/sample_library_editor_plugin.cpp +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/sprite_frames_editor_plugin.cpp editor/project_settings.cpp +#: editor/property_editor.cpp editor/run_settings_dialog.cpp +#: editor/settings_config_dialog.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Close" +msgstr "بستن" + +#: editor/asset_library_editor_plugin.cpp +msgid "Can't resolve hostname:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Can't resolve." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Connection error, please try again." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Can't connect." +msgstr "در Øال اتصال..." + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Can't connect to host:" +msgstr "اتصال به گره:" + +#: editor/asset_library_editor_plugin.cpp +msgid "No response from host:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "No response." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Request failed, return code:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Req. Failed." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Request failed, too many redirects" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Redirect Loop." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Failed:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Bad download hash, assuming file has been tampered with." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Expected:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Got:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Failed sha256 hash check" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Asset Download Error:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Success!" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Fetching:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Resolving.." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Connecting.." +msgstr "در Øال اتصال..." + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Requesting.." +msgstr "آزمودن" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Error making request" +msgstr "خطای بارگذاری قلم." + +#: editor/asset_library_editor_plugin.cpp +msgid "Idle" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Retry" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Download Error" +msgstr "خطاهای بارگذاری" + +#: editor/asset_library_editor_plugin.cpp +msgid "Download for this asset is already in progress!" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "first" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "prev" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "next" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "last" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "All" +msgstr "همه" + #: editor/asset_library_editor_plugin.cpp editor/create_dialog.cpp #: editor/editor_help.cpp editor/editor_node.cpp #: editor/plugins/script_editor_plugin.cpp editor/property_selector.cpp @@ -367,6 +543,29 @@ msgstr "مقدار آرایه را تغییر بده" msgid "Search:" msgstr "جستجو:" +#: editor/asset_library_editor_plugin.cpp editor/code_editor.cpp +#: editor/editor_help.cpp editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp +#: editor/plugins/shader_editor_plugin.cpp editor/project_settings.cpp +msgid "Search" +msgstr "جستجو" + +#: editor/asset_library_editor_plugin.cpp editor/editor_node.cpp +#: editor/io_plugins/editor_bitmask_import_plugin.cpp +#: editor/io_plugins/editor_font_import_plugin.cpp +#: editor/io_plugins/editor_mesh_import_plugin.cpp +#: editor/io_plugins/editor_sample_import_plugin.cpp +#: editor/io_plugins/editor_scene_import_plugin.cpp +#: editor/io_plugins/editor_texture_import_plugin.cpp +#: editor/io_plugins/editor_translation_import_plugin.cpp +#: editor/project_manager.cpp +msgid "Import" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp editor/project_settings.cpp +msgid "Plugins" +msgstr "" + #: editor/asset_library_editor_plugin.cpp msgid "Sort:" msgstr "مرتب‌سازی:" @@ -380,10 +579,6 @@ msgid "Category:" msgstr "طبقه‌بندی:" #: editor/asset_library_editor_plugin.cpp -msgid "All" -msgstr "همه" - -#: editor/asset_library_editor_plugin.cpp msgid "Site:" msgstr "تارنما:" @@ -415,20 +610,6 @@ msgstr "لیست متد برای 's%' :" msgid "Call" msgstr "Ùراخوانی" -#: editor/call_dialog.cpp editor/connections_dialog.cpp -#: editor/export_template_manager.cpp -#: editor/plugins/animation_player_editor_plugin.cpp -#: editor/plugins/canvas_item_editor_plugin.cpp -#: editor/plugins/resource_preloader_editor_plugin.cpp -#: editor/plugins/sample_library_editor_plugin.cpp -#: editor/plugins/script_editor_plugin.cpp -#: editor/plugins/sprite_frames_editor_plugin.cpp editor/project_settings.cpp -#: editor/property_editor.cpp editor/run_settings_dialog.cpp -#: editor/settings_config_dialog.cpp -#: modules/visual_script/visual_script_editor.cpp -msgid "Close" -msgstr "بستن" - #: editor/call_dialog.cpp msgid "Method List:" msgstr "Ùهرست متدها:" @@ -479,13 +660,6 @@ msgid "Selection Only" msgstr "تنها در قسمت انتخاب شده" #: editor/code_editor.cpp editor/editor_help.cpp -#: editor/plugins/script_editor_plugin.cpp -#: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp editor/project_settings.cpp -msgid "Search" -msgstr "جستجو" - -#: editor/code_editor.cpp editor/editor_help.cpp msgid "Find" msgstr "یاÙتن" @@ -636,11 +810,6 @@ msgstr "" msgid "Matches:" msgstr "تطبیق‌ها:" -#: editor/create_dialog.cpp editor/editor_help.cpp editor/property_selector.cpp -#: editor/script_editor_debugger.cpp -msgid "Description:" -msgstr "توضیØ:" - #: editor/dependency_editor.cpp #, fuzzy msgid "Search Replacement For:" @@ -1125,10 +1294,6 @@ msgstr " خروجی:" msgid "Clear" msgstr "پاک کردن" -#: editor/editor_node.cpp -msgid "Node From Scene" -msgstr "" - #: editor/editor_node.cpp editor/plugins/animation_player_editor_plugin.cpp #: editor/resources_dock.cpp msgid "Error saving resource!" @@ -1493,21 +1658,6 @@ msgid "Distraction Free Mode" msgstr "" #: editor/editor_node.cpp -msgid "Import assets to the project." -msgstr "" - -#: editor/editor_node.cpp editor/io_plugins/editor_bitmask_import_plugin.cpp -#: editor/io_plugins/editor_font_import_plugin.cpp -#: editor/io_plugins/editor_mesh_import_plugin.cpp -#: editor/io_plugins/editor_sample_import_plugin.cpp -#: editor/io_plugins/editor_scene_import_plugin.cpp -#: editor/io_plugins/editor_texture_import_plugin.cpp -#: editor/io_plugins/editor_translation_import_plugin.cpp -#: editor/project_manager.cpp -msgid "Import" -msgstr "" - -#: editor/editor_node.cpp msgid "Miscellaneous project or scene-wide tools." msgstr "" @@ -1777,10 +1927,6 @@ msgid "Installed Plugins:" msgstr "اÙزونه های نصب شده:" #: editor/editor_plugin_settings.cpp -msgid "Version:" -msgstr "نسخه:" - -#: editor/editor_plugin_settings.cpp msgid "Author:" msgstr "خالق:" @@ -3762,6 +3908,10 @@ msgid "A processor material of type 'ParticlesMaterial' is required." msgstr "" #: editor/plugins/particles_editor_plugin.cpp +msgid "Generating AABB" +msgstr "" + +#: editor/plugins/particles_editor_plugin.cpp msgid "Faces contain no area!" msgstr "" @@ -3809,6 +3959,14 @@ msgstr "" msgid "Emission Source: " msgstr "" +#: editor/plugins/particles_editor_plugin.cpp +msgid "Generate Visibility AABB" +msgstr "" + +#: editor/plugins/particles_editor_plugin.cpp +msgid "Generation Time (sec):" +msgstr "" + #: editor/plugins/path_2d_editor_plugin.cpp msgid "Remove Point from Curve" msgstr "" @@ -4260,6 +4418,14 @@ msgid "Trim Trailing Whitespace" msgstr "" #: editor/plugins/script_text_editor.cpp +msgid "Convert Indent To Spaces" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Convert Indent To Tabs" +msgstr "" + +#: editor/plugins/script_text_editor.cpp msgid "Auto Indent" msgstr "" @@ -5119,11 +5285,11 @@ msgid "Invalid project path, the path must exist!" msgstr "" #: editor/project_manager.cpp -msgid "Invalid project path, godot.cfg must not exist." +msgid "Invalid project path, *.godot must not exist." msgstr "" #: editor/project_manager.cpp -msgid "Invalid project path, godot.cfg must exist." +msgid "Invalid project path, *.godot must exist." msgstr "" #: editor/project_manager.cpp @@ -5135,7 +5301,7 @@ msgid "Invalid project path (changed anything?)." msgstr "" #: editor/project_manager.cpp -msgid "Couldn't create godot.cfg in project path." +msgid "Couldn't create *.godot project file in project path." msgstr "" #: editor/project_manager.cpp @@ -5171,10 +5337,6 @@ msgid "Install Project:" msgstr "" #: editor/project_manager.cpp -msgid "Install" -msgstr "" - -#: editor/project_manager.cpp msgid "Browse" msgstr "" @@ -5235,6 +5397,11 @@ msgid "New Project" msgstr "" #: editor/project_manager.cpp +#, fuzzy +msgid "Templates" +msgstr "برداشتن انتخاب شده" + +#: editor/project_manager.cpp msgid "Exit" msgstr "" @@ -5418,8 +5585,9 @@ msgid "Remove Resource Remap Option" msgstr "" #: editor/project_settings.cpp -msgid "Project Settings (godot.cfg)" -msgstr "" +#, fuzzy +msgid "Project Settings " +msgstr "ترجیØات" #: editor/project_settings.cpp editor/settings_config_dialog.cpp msgid "General" @@ -5485,10 +5653,6 @@ msgstr "" msgid "AutoLoad" msgstr "" -#: editor/project_settings.cpp -msgid "Plugins" -msgstr "" - #: editor/property_editor.cpp msgid "Pick a Viewport" msgstr "" @@ -6097,6 +6261,10 @@ msgid "Change Notifier Extents" msgstr "" #: editor/spatial_editor_gizmos.cpp +msgid "Change Particles AABB" +msgstr "" + +#: editor/spatial_editor_gizmos.cpp msgid "Change Probe Extents" msgstr "" @@ -6711,6 +6879,17 @@ msgstr "" "NavigationMeshInstance باید یک Ùرزند یا نوه‌ی یک گره Navigation باشد. این " "تنها داده‌ی پیمایش را Ùراهم می‌کند." +#: scene/3d/particles.cpp +msgid "" +"Nothing is visible because meshes have not been assigned to draw passes." +msgstr "" + +#: scene/3d/particles.cpp +msgid "" +"A material to process the particles is not assigned, so no behavior is " +"imprinted." +msgstr "" + #: scene/3d/remote_transform.cpp #, fuzzy msgid "Path property must point to a valid Spatial node to work." diff --git a/editor/translations/fr.po b/editor/translations/fr.po index 5b0076400c..1418e6f493 100644 --- a/editor/translations/fr.po +++ b/editor/translations/fr.po @@ -372,6 +372,184 @@ msgstr "Modifier type de valeur du tableau" msgid "Change Array Value" msgstr "Modifier valeur du tableau" +#: editor/asset_library_editor_plugin.cpp +msgid "Free" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp editor/editor_plugin_settings.cpp +msgid "Version:" +msgstr "Version :" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Contents:" +msgstr "Constantes :" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "View Files" +msgstr "Fichier" + +#: editor/asset_library_editor_plugin.cpp editor/create_dialog.cpp +#: editor/editor_help.cpp editor/property_selector.cpp +#: editor/script_editor_debugger.cpp +msgid "Description:" +msgstr "Description :" + +#: editor/asset_library_editor_plugin.cpp editor/project_manager.cpp +msgid "Install" +msgstr "Installer" + +#: editor/asset_library_editor_plugin.cpp editor/call_dialog.cpp +#: editor/connections_dialog.cpp editor/export_template_manager.cpp +#: editor/plugins/animation_player_editor_plugin.cpp +#: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/resource_preloader_editor_plugin.cpp +#: editor/plugins/sample_library_editor_plugin.cpp +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/sprite_frames_editor_plugin.cpp editor/project_settings.cpp +#: editor/property_editor.cpp editor/run_settings_dialog.cpp +#: editor/settings_config_dialog.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Close" +msgstr "Fermer" + +#: editor/asset_library_editor_plugin.cpp +msgid "Can't resolve hostname:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Can't resolve." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Connection error, please try again." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Can't connect." +msgstr "Connecter…" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Can't connect to host:" +msgstr "Connecter au nÅ“ud :" + +#: editor/asset_library_editor_plugin.cpp +msgid "No response from host:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "No response." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Request failed, return code:" +msgstr "Format de fichier demandé inconnu :" + +#: editor/asset_library_editor_plugin.cpp +msgid "Req. Failed." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Request failed, too many redirects" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Redirect Loop." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Failed:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Bad download hash, assuming file has been tampered with." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Expected:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Got:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Failed sha256 hash check" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Asset Download Error:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Success!" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Fetching:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Resolving.." +msgstr "Enregistrement…" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Connecting.." +msgstr "Connecter…" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Requesting.." +msgstr "En test" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Error making request" +msgstr "Erreur d'enregistrement de la ressource !" + +#: editor/asset_library_editor_plugin.cpp +msgid "Idle" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Retry" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Download Error" +msgstr "Bas" + +#: editor/asset_library_editor_plugin.cpp +msgid "Download for this asset is already in progress!" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "first" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "prev" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "next" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "last" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "All" +msgstr "Tout" + #: editor/asset_library_editor_plugin.cpp editor/create_dialog.cpp #: editor/editor_help.cpp editor/editor_node.cpp #: editor/plugins/script_editor_plugin.cpp editor/property_selector.cpp @@ -379,6 +557,29 @@ msgstr "Modifier valeur du tableau" msgid "Search:" msgstr "Rechercher :" +#: editor/asset_library_editor_plugin.cpp editor/code_editor.cpp +#: editor/editor_help.cpp editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp +#: editor/plugins/shader_editor_plugin.cpp editor/project_settings.cpp +msgid "Search" +msgstr "Rechercher" + +#: editor/asset_library_editor_plugin.cpp editor/editor_node.cpp +#: editor/io_plugins/editor_bitmask_import_plugin.cpp +#: editor/io_plugins/editor_font_import_plugin.cpp +#: editor/io_plugins/editor_mesh_import_plugin.cpp +#: editor/io_plugins/editor_sample_import_plugin.cpp +#: editor/io_plugins/editor_scene_import_plugin.cpp +#: editor/io_plugins/editor_texture_import_plugin.cpp +#: editor/io_plugins/editor_translation_import_plugin.cpp +#: editor/project_manager.cpp +msgid "Import" +msgstr "Importer" + +#: editor/asset_library_editor_plugin.cpp editor/project_settings.cpp +msgid "Plugins" +msgstr "Extensions" + #: editor/asset_library_editor_plugin.cpp msgid "Sort:" msgstr "Trier :" @@ -392,10 +593,6 @@ msgid "Category:" msgstr "Catégorie :" #: editor/asset_library_editor_plugin.cpp -msgid "All" -msgstr "Tout" - -#: editor/asset_library_editor_plugin.cpp msgid "Site:" msgstr "Site :" @@ -427,20 +624,6 @@ msgstr "Liste des méthodes pour « %s » :" msgid "Call" msgstr "Appel" -#: editor/call_dialog.cpp editor/connections_dialog.cpp -#: editor/export_template_manager.cpp -#: editor/plugins/animation_player_editor_plugin.cpp -#: editor/plugins/canvas_item_editor_plugin.cpp -#: editor/plugins/resource_preloader_editor_plugin.cpp -#: editor/plugins/sample_library_editor_plugin.cpp -#: editor/plugins/script_editor_plugin.cpp -#: editor/plugins/sprite_frames_editor_plugin.cpp editor/project_settings.cpp -#: editor/property_editor.cpp editor/run_settings_dialog.cpp -#: editor/settings_config_dialog.cpp -#: modules/visual_script/visual_script_editor.cpp -msgid "Close" -msgstr "Fermer" - #: editor/call_dialog.cpp msgid "Method List:" msgstr "Liste des méthodes :" @@ -491,13 +674,6 @@ msgid "Selection Only" msgstr "Sélection uniquement" #: editor/code_editor.cpp editor/editor_help.cpp -#: editor/plugins/script_editor_plugin.cpp -#: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp editor/project_settings.cpp -msgid "Search" -msgstr "Rechercher" - -#: editor/code_editor.cpp editor/editor_help.cpp msgid "Find" msgstr "Trouver" @@ -649,11 +825,6 @@ msgstr "Récents :" msgid "Matches:" msgstr "Correspondances :" -#: editor/create_dialog.cpp editor/editor_help.cpp editor/property_selector.cpp -#: editor/script_editor_debugger.cpp -msgid "Description:" -msgstr "Description :" - #: editor/dependency_editor.cpp msgid "Search Replacement For:" msgstr "Rechercher un remplacement pour :" @@ -1146,10 +1317,6 @@ msgstr " Sortie :" msgid "Clear" msgstr "Effacer" -#: editor/editor_node.cpp -msgid "Node From Scene" -msgstr "NÅ“ud à partir d'une scène" - #: editor/editor_node.cpp editor/plugins/animation_player_editor_plugin.cpp #: editor/resources_dock.cpp msgid "Error saving resource!" @@ -1535,21 +1702,6 @@ msgid "Distraction Free Mode" msgstr "Mode sans distraction" #: editor/editor_node.cpp -msgid "Import assets to the project." -msgstr "Importer des ressources dans le projet." - -#: editor/editor_node.cpp editor/io_plugins/editor_bitmask_import_plugin.cpp -#: editor/io_plugins/editor_font_import_plugin.cpp -#: editor/io_plugins/editor_mesh_import_plugin.cpp -#: editor/io_plugins/editor_sample_import_plugin.cpp -#: editor/io_plugins/editor_scene_import_plugin.cpp -#: editor/io_plugins/editor_texture_import_plugin.cpp -#: editor/io_plugins/editor_translation_import_plugin.cpp -#: editor/project_manager.cpp -msgid "Import" -msgstr "Importer" - -#: editor/editor_node.cpp msgid "Miscellaneous project or scene-wide tools." msgstr "Outils divers liés au projet ou à la scène." @@ -1842,10 +1994,6 @@ msgid "Installed Plugins:" msgstr "Extensions installées :" #: editor/editor_plugin_settings.cpp -msgid "Version:" -msgstr "Version :" - -#: editor/editor_plugin_settings.cpp msgid "Author:" msgstr "Auteur :" @@ -3878,6 +4026,11 @@ msgid "A processor material of type 'ParticlesMaterial' is required." msgstr "" #: editor/plugins/particles_editor_plugin.cpp +#, fuzzy +msgid "Generating AABB" +msgstr "Générer un AABB" + +#: editor/plugins/particles_editor_plugin.cpp msgid "Faces contain no area!" msgstr "Les faces n'ont pas de surface !" @@ -3930,6 +4083,16 @@ msgstr "Volume" msgid "Emission Source: " msgstr "Remplissage d'émission :" +#: editor/plugins/particles_editor_plugin.cpp +#, fuzzy +msgid "Generate Visibility AABB" +msgstr "Générer un AABB" + +#: editor/plugins/particles_editor_plugin.cpp +#, fuzzy +msgid "Generation Time (sec):" +msgstr "Temps moyen (seconde)" + #: editor/plugins/path_2d_editor_plugin.cpp msgid "Remove Point from Curve" msgstr "Supprimer le point d'une courbe" @@ -4385,6 +4548,14 @@ msgid "Trim Trailing Whitespace" msgstr "Supprimer les espaces de fin de ligne" #: editor/plugins/script_text_editor.cpp +msgid "Convert Indent To Spaces" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Convert Indent To Tabs" +msgstr "" + +#: editor/plugins/script_text_editor.cpp msgid "Auto Indent" msgstr "Indentation automatique" @@ -5260,12 +5431,12 @@ msgstr "Chemin de projet invalide, le chemin doit exister !" #: editor/project_manager.cpp #, fuzzy -msgid "Invalid project path, godot.cfg must not exist." +msgid "Invalid project path, *.godot must not exist." msgstr "Chemin de projet invalide, engine.cfg ne doit pas exister." #: editor/project_manager.cpp #, fuzzy -msgid "Invalid project path, godot.cfg must exist." +msgid "Invalid project path, *.godot must exist." msgstr "Chemin de projet invalide, engine.cfg doit exister." #: editor/project_manager.cpp @@ -5278,7 +5449,7 @@ msgstr "Chemin de projet non valide (avez-vous changé quelque chose ?)." #: editor/project_manager.cpp #, fuzzy -msgid "Couldn't create godot.cfg in project path." +msgid "Couldn't create *.godot project file in project path." msgstr "" "Impossible de créer le fichier engine.cfg dans le répertoire du projet." @@ -5319,10 +5490,6 @@ msgid "Install Project:" msgstr "Projets récents :" #: editor/project_manager.cpp -msgid "Install" -msgstr "Installer" - -#: editor/project_manager.cpp msgid "Browse" msgstr "Parcourir" @@ -5386,6 +5553,11 @@ msgid "New Project" msgstr "Nouveau projet" #: editor/project_manager.cpp +#, fuzzy +msgid "Templates" +msgstr "Supprimer l'item" + +#: editor/project_manager.cpp msgid "Exit" msgstr "Quitter" @@ -5572,8 +5744,8 @@ msgstr "" #: editor/project_settings.cpp #, fuzzy -msgid "Project Settings (godot.cfg)" -msgstr "Paramètres du projet (engine.cfg)" +msgid "Project Settings " +msgstr "Paramètres du projet" #: editor/project_settings.cpp editor/settings_config_dialog.cpp msgid "General" @@ -5639,10 +5811,6 @@ msgstr "Langue" msgid "AutoLoad" msgstr "AutoLoad" -#: editor/project_settings.cpp -msgid "Plugins" -msgstr "Extensions" - #: editor/property_editor.cpp #, fuzzy msgid "Pick a Viewport" @@ -6261,6 +6429,10 @@ msgid "Change Notifier Extents" msgstr "Changer les extents d'un notificateur" #: editor/spatial_editor_gizmos.cpp +msgid "Change Particles AABB" +msgstr "" + +#: editor/spatial_editor_gizmos.cpp #, fuzzy msgid "Change Probe Extents" msgstr "Changer les extents d'un notificateur" @@ -6885,6 +7057,17 @@ msgstr "" "Un NavigationMeshInstance doit être enfant ou sous-enfant d'un nÅ“ud de type " "Navigation. Il fournit uniquement des données de navigation." +#: scene/3d/particles.cpp +msgid "" +"Nothing is visible because meshes have not been assigned to draw passes." +msgstr "" + +#: scene/3d/particles.cpp +msgid "" +"A material to process the particles is not assigned, so no behavior is " +"imprinted." +msgstr "" + #: scene/3d/remote_transform.cpp msgid "Path property must point to a valid Spatial node to work." msgstr "" @@ -6963,6 +7146,16 @@ msgstr "" "nÅ“ud de type Control afin qu'il en obtienne une taille. Sinon, faites-en une " "RenderTarget et assignez sa texture à un nÅ“ud pouvant l'afficher." +#~ msgid "Node From Scene" +#~ msgstr "NÅ“ud à partir d'une scène" + +#~ msgid "Import assets to the project." +#~ msgstr "Importer des ressources dans le projet." + +#, fuzzy +#~ msgid "Project Settings (godot.cfg)" +#~ msgstr "Paramètres du projet (engine.cfg)" + #~ msgid "Surface" #~ msgstr "Surface" diff --git a/editor/translations/hu.po b/editor/translations/hu.po index b26c92257f..8cb6c2caf1 100644 --- a/editor/translations/hu.po +++ b/editor/translations/hu.po @@ -355,6 +355,174 @@ msgstr "" msgid "Change Array Value" msgstr "" +#: editor/asset_library_editor_plugin.cpp +msgid "Free" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp editor/editor_plugin_settings.cpp +msgid "Version:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Contents:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "View Files" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp editor/create_dialog.cpp +#: editor/editor_help.cpp editor/property_selector.cpp +#: editor/script_editor_debugger.cpp +msgid "Description:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp editor/project_manager.cpp +msgid "Install" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp editor/call_dialog.cpp +#: editor/connections_dialog.cpp editor/export_template_manager.cpp +#: editor/plugins/animation_player_editor_plugin.cpp +#: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/resource_preloader_editor_plugin.cpp +#: editor/plugins/sample_library_editor_plugin.cpp +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/sprite_frames_editor_plugin.cpp editor/project_settings.cpp +#: editor/property_editor.cpp editor/run_settings_dialog.cpp +#: editor/settings_config_dialog.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Close" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Can't resolve hostname:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Can't resolve." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Connection error, please try again." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Can't connect." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Can't connect to host:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "No response from host:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "No response." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Request failed, return code:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Req. Failed." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Request failed, too many redirects" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Redirect Loop." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Failed:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Bad download hash, assuming file has been tampered with." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Expected:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Got:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Failed sha256 hash check" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Asset Download Error:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Success!" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Fetching:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Resolving.." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Connecting.." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Requesting.." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Error making request" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Idle" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Retry" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Download Error" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Download for this asset is already in progress!" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "first" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "prev" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "next" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "last" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "All" +msgstr "" + #: editor/asset_library_editor_plugin.cpp editor/create_dialog.cpp #: editor/editor_help.cpp editor/editor_node.cpp #: editor/plugins/script_editor_plugin.cpp editor/property_selector.cpp @@ -362,6 +530,29 @@ msgstr "" msgid "Search:" msgstr "" +#: editor/asset_library_editor_plugin.cpp editor/code_editor.cpp +#: editor/editor_help.cpp editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp +#: editor/plugins/shader_editor_plugin.cpp editor/project_settings.cpp +msgid "Search" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp editor/editor_node.cpp +#: editor/io_plugins/editor_bitmask_import_plugin.cpp +#: editor/io_plugins/editor_font_import_plugin.cpp +#: editor/io_plugins/editor_mesh_import_plugin.cpp +#: editor/io_plugins/editor_sample_import_plugin.cpp +#: editor/io_plugins/editor_scene_import_plugin.cpp +#: editor/io_plugins/editor_texture_import_plugin.cpp +#: editor/io_plugins/editor_translation_import_plugin.cpp +#: editor/project_manager.cpp +msgid "Import" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp editor/project_settings.cpp +msgid "Plugins" +msgstr "" + #: editor/asset_library_editor_plugin.cpp msgid "Sort:" msgstr "" @@ -375,10 +566,6 @@ msgid "Category:" msgstr "" #: editor/asset_library_editor_plugin.cpp -msgid "All" -msgstr "" - -#: editor/asset_library_editor_plugin.cpp msgid "Site:" msgstr "" @@ -410,20 +597,6 @@ msgstr "" msgid "Call" msgstr "" -#: editor/call_dialog.cpp editor/connections_dialog.cpp -#: editor/export_template_manager.cpp -#: editor/plugins/animation_player_editor_plugin.cpp -#: editor/plugins/canvas_item_editor_plugin.cpp -#: editor/plugins/resource_preloader_editor_plugin.cpp -#: editor/plugins/sample_library_editor_plugin.cpp -#: editor/plugins/script_editor_plugin.cpp -#: editor/plugins/sprite_frames_editor_plugin.cpp editor/project_settings.cpp -#: editor/property_editor.cpp editor/run_settings_dialog.cpp -#: editor/settings_config_dialog.cpp -#: modules/visual_script/visual_script_editor.cpp -msgid "Close" -msgstr "" - #: editor/call_dialog.cpp msgid "Method List:" msgstr "" @@ -473,13 +646,6 @@ msgid "Selection Only" msgstr "" #: editor/code_editor.cpp editor/editor_help.cpp -#: editor/plugins/script_editor_plugin.cpp -#: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp editor/project_settings.cpp -msgid "Search" -msgstr "" - -#: editor/code_editor.cpp editor/editor_help.cpp msgid "Find" msgstr "" @@ -629,11 +795,6 @@ msgstr "" msgid "Matches:" msgstr "" -#: editor/create_dialog.cpp editor/editor_help.cpp editor/property_selector.cpp -#: editor/script_editor_debugger.cpp -msgid "Description:" -msgstr "" - #: editor/dependency_editor.cpp msgid "Search Replacement For:" msgstr "" @@ -1107,10 +1268,6 @@ msgstr "" msgid "Clear" msgstr "" -#: editor/editor_node.cpp -msgid "Node From Scene" -msgstr "" - #: editor/editor_node.cpp editor/plugins/animation_player_editor_plugin.cpp #: editor/resources_dock.cpp msgid "Error saving resource!" @@ -1475,21 +1632,6 @@ msgid "Distraction Free Mode" msgstr "" #: editor/editor_node.cpp -msgid "Import assets to the project." -msgstr "" - -#: editor/editor_node.cpp editor/io_plugins/editor_bitmask_import_plugin.cpp -#: editor/io_plugins/editor_font_import_plugin.cpp -#: editor/io_plugins/editor_mesh_import_plugin.cpp -#: editor/io_plugins/editor_sample_import_plugin.cpp -#: editor/io_plugins/editor_scene_import_plugin.cpp -#: editor/io_plugins/editor_texture_import_plugin.cpp -#: editor/io_plugins/editor_translation_import_plugin.cpp -#: editor/project_manager.cpp -msgid "Import" -msgstr "" - -#: editor/editor_node.cpp msgid "Miscellaneous project or scene-wide tools." msgstr "" @@ -1758,10 +1900,6 @@ msgid "Installed Plugins:" msgstr "" #: editor/editor_plugin_settings.cpp -msgid "Version:" -msgstr "" - -#: editor/editor_plugin_settings.cpp msgid "Author:" msgstr "" @@ -3731,6 +3869,10 @@ msgid "A processor material of type 'ParticlesMaterial' is required." msgstr "" #: editor/plugins/particles_editor_plugin.cpp +msgid "Generating AABB" +msgstr "" + +#: editor/plugins/particles_editor_plugin.cpp msgid "Faces contain no area!" msgstr "" @@ -3778,6 +3920,14 @@ msgstr "" msgid "Emission Source: " msgstr "" +#: editor/plugins/particles_editor_plugin.cpp +msgid "Generate Visibility AABB" +msgstr "" + +#: editor/plugins/particles_editor_plugin.cpp +msgid "Generation Time (sec):" +msgstr "" + #: editor/plugins/path_2d_editor_plugin.cpp msgid "Remove Point from Curve" msgstr "" @@ -4227,6 +4377,14 @@ msgid "Trim Trailing Whitespace" msgstr "" #: editor/plugins/script_text_editor.cpp +msgid "Convert Indent To Spaces" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Convert Indent To Tabs" +msgstr "" + +#: editor/plugins/script_text_editor.cpp msgid "Auto Indent" msgstr "" @@ -5083,11 +5241,11 @@ msgid "Invalid project path, the path must exist!" msgstr "" #: editor/project_manager.cpp -msgid "Invalid project path, godot.cfg must not exist." +msgid "Invalid project path, *.godot must not exist." msgstr "" #: editor/project_manager.cpp -msgid "Invalid project path, godot.cfg must exist." +msgid "Invalid project path, *.godot must exist." msgstr "" #: editor/project_manager.cpp @@ -5099,7 +5257,7 @@ msgid "Invalid project path (changed anything?)." msgstr "" #: editor/project_manager.cpp -msgid "Couldn't create godot.cfg in project path." +msgid "Couldn't create *.godot project file in project path." msgstr "" #: editor/project_manager.cpp @@ -5135,10 +5293,6 @@ msgid "Install Project:" msgstr "" #: editor/project_manager.cpp -msgid "Install" -msgstr "" - -#: editor/project_manager.cpp msgid "Browse" msgstr "" @@ -5197,6 +5351,10 @@ msgid "New Project" msgstr "" #: editor/project_manager.cpp +msgid "Templates" +msgstr "" + +#: editor/project_manager.cpp msgid "Exit" msgstr "" @@ -5380,7 +5538,7 @@ msgid "Remove Resource Remap Option" msgstr "" #: editor/project_settings.cpp -msgid "Project Settings (godot.cfg)" +msgid "Project Settings " msgstr "" #: editor/project_settings.cpp editor/settings_config_dialog.cpp @@ -5447,10 +5605,6 @@ msgstr "" msgid "AutoLoad" msgstr "" -#: editor/project_settings.cpp -msgid "Plugins" -msgstr "" - #: editor/property_editor.cpp msgid "Pick a Viewport" msgstr "" @@ -6050,6 +6204,10 @@ msgid "Change Notifier Extents" msgstr "" #: editor/spatial_editor_gizmos.cpp +msgid "Change Particles AABB" +msgstr "" + +#: editor/spatial_editor_gizmos.cpp msgid "Change Probe Extents" msgstr "" @@ -6590,6 +6748,17 @@ msgid "" "It only provides navigation data." msgstr "" +#: scene/3d/particles.cpp +msgid "" +"Nothing is visible because meshes have not been assigned to draw passes." +msgstr "" + +#: scene/3d/particles.cpp +msgid "" +"A material to process the particles is not assigned, so no behavior is " +"imprinted." +msgstr "" + #: scene/3d/remote_transform.cpp msgid "Path property must point to a valid Spatial node to work." msgstr "" diff --git a/editor/translations/id.po b/editor/translations/id.po index 8151c3208c..2126d324dd 100644 --- a/editor/translations/id.po +++ b/editor/translations/id.po @@ -380,6 +380,182 @@ msgstr "Ubah Tipe Nilai Array" msgid "Change Array Value" msgstr "Ubah Nilai Array" +#: editor/asset_library_editor_plugin.cpp +msgid "Free" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp editor/editor_plugin_settings.cpp +msgid "Version:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Contents:" +msgstr "Konstanta:" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "View Files" +msgstr "File:" + +#: editor/asset_library_editor_plugin.cpp editor/create_dialog.cpp +#: editor/editor_help.cpp editor/property_selector.cpp +#: editor/script_editor_debugger.cpp +msgid "Description:" +msgstr "Deskripsi:" + +#: editor/asset_library_editor_plugin.cpp editor/project_manager.cpp +msgid "Install" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp editor/call_dialog.cpp +#: editor/connections_dialog.cpp editor/export_template_manager.cpp +#: editor/plugins/animation_player_editor_plugin.cpp +#: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/resource_preloader_editor_plugin.cpp +#: editor/plugins/sample_library_editor_plugin.cpp +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/sprite_frames_editor_plugin.cpp editor/project_settings.cpp +#: editor/property_editor.cpp editor/run_settings_dialog.cpp +#: editor/settings_config_dialog.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Close" +msgstr "Tutup" + +#: editor/asset_library_editor_plugin.cpp +msgid "Can't resolve hostname:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Can't resolve." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Connection error, please try again." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Can't connect." +msgstr "Menyambungkan.." + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Can't connect to host:" +msgstr "Sambungkan Ke Node:" + +#: editor/asset_library_editor_plugin.cpp +msgid "No response from host:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "No response." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Request failed, return code:" +msgstr "Format file yang diminta tidak diketahui:" + +#: editor/asset_library_editor_plugin.cpp +msgid "Req. Failed." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Request failed, too many redirects" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Redirect Loop." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Failed:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Bad download hash, assuming file has been tampered with." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Expected:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Got:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Failed sha256 hash check" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Asset Download Error:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Success!" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Fetching:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Resolving.." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Connecting.." +msgstr "Menyambungkan.." + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Requesting.." +msgstr "Menguji" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Error making request" +msgstr "Error menyimpan resource!" + +#: editor/asset_library_editor_plugin.cpp +msgid "Idle" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Retry" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Download Error" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Download for this asset is already in progress!" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "first" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "prev" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "next" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "last" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "All" +msgstr "Semua" + #: editor/asset_library_editor_plugin.cpp editor/create_dialog.cpp #: editor/editor_help.cpp editor/editor_node.cpp #: editor/plugins/script_editor_plugin.cpp editor/property_selector.cpp @@ -387,6 +563,29 @@ msgstr "Ubah Nilai Array" msgid "Search:" msgstr "Cari:" +#: editor/asset_library_editor_plugin.cpp editor/code_editor.cpp +#: editor/editor_help.cpp editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp +#: editor/plugins/shader_editor_plugin.cpp editor/project_settings.cpp +msgid "Search" +msgstr "Cari" + +#: editor/asset_library_editor_plugin.cpp editor/editor_node.cpp +#: editor/io_plugins/editor_bitmask_import_plugin.cpp +#: editor/io_plugins/editor_font_import_plugin.cpp +#: editor/io_plugins/editor_mesh_import_plugin.cpp +#: editor/io_plugins/editor_sample_import_plugin.cpp +#: editor/io_plugins/editor_scene_import_plugin.cpp +#: editor/io_plugins/editor_texture_import_plugin.cpp +#: editor/io_plugins/editor_translation_import_plugin.cpp +#: editor/project_manager.cpp +msgid "Import" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp editor/project_settings.cpp +msgid "Plugins" +msgstr "" + #: editor/asset_library_editor_plugin.cpp msgid "Sort:" msgstr "Sortir:" @@ -400,10 +599,6 @@ msgid "Category:" msgstr "Kategori:" #: editor/asset_library_editor_plugin.cpp -msgid "All" -msgstr "Semua" - -#: editor/asset_library_editor_plugin.cpp msgid "Site:" msgstr "Situs:" @@ -435,20 +630,6 @@ msgstr "Daftar Fungsi Untuk '%s':" msgid "Call" msgstr "Panggil" -#: editor/call_dialog.cpp editor/connections_dialog.cpp -#: editor/export_template_manager.cpp -#: editor/plugins/animation_player_editor_plugin.cpp -#: editor/plugins/canvas_item_editor_plugin.cpp -#: editor/plugins/resource_preloader_editor_plugin.cpp -#: editor/plugins/sample_library_editor_plugin.cpp -#: editor/plugins/script_editor_plugin.cpp -#: editor/plugins/sprite_frames_editor_plugin.cpp editor/project_settings.cpp -#: editor/property_editor.cpp editor/run_settings_dialog.cpp -#: editor/settings_config_dialog.cpp -#: modules/visual_script/visual_script_editor.cpp -msgid "Close" -msgstr "Tutup" - #: editor/call_dialog.cpp msgid "Method List:" msgstr "Daftar Fungsi:" @@ -500,13 +681,6 @@ msgid "Selection Only" msgstr "Hanya yang Dipilih" #: editor/code_editor.cpp editor/editor_help.cpp -#: editor/plugins/script_editor_plugin.cpp -#: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp editor/project_settings.cpp -msgid "Search" -msgstr "Cari" - -#: editor/code_editor.cpp editor/editor_help.cpp msgid "Find" msgstr "Cari" @@ -659,11 +833,6 @@ msgstr "Saat ini:" msgid "Matches:" msgstr "Kecocokan:" -#: editor/create_dialog.cpp editor/editor_help.cpp editor/property_selector.cpp -#: editor/script_editor_debugger.cpp -msgid "Description:" -msgstr "Deskripsi:" - #: editor/dependency_editor.cpp msgid "Search Replacement For:" msgstr "Cari Ganti Untuk:" @@ -1158,10 +1327,6 @@ msgstr " Keluaran:" msgid "Clear" msgstr "Bersihkan" -#: editor/editor_node.cpp -msgid "Node From Scene" -msgstr "Node Dari Scene" - #: editor/editor_node.cpp editor/plugins/animation_player_editor_plugin.cpp #: editor/resources_dock.cpp msgid "Error saving resource!" @@ -1545,21 +1710,6 @@ msgid "Distraction Free Mode" msgstr "Mode Tanpa Gangguan" #: editor/editor_node.cpp -msgid "Import assets to the project." -msgstr "" - -#: editor/editor_node.cpp editor/io_plugins/editor_bitmask_import_plugin.cpp -#: editor/io_plugins/editor_font_import_plugin.cpp -#: editor/io_plugins/editor_mesh_import_plugin.cpp -#: editor/io_plugins/editor_sample_import_plugin.cpp -#: editor/io_plugins/editor_scene_import_plugin.cpp -#: editor/io_plugins/editor_texture_import_plugin.cpp -#: editor/io_plugins/editor_translation_import_plugin.cpp -#: editor/project_manager.cpp -msgid "Import" -msgstr "" - -#: editor/editor_node.cpp msgid "Miscellaneous project or scene-wide tools." msgstr "" @@ -1830,10 +1980,6 @@ msgid "Installed Plugins:" msgstr "" #: editor/editor_plugin_settings.cpp -msgid "Version:" -msgstr "" - -#: editor/editor_plugin_settings.cpp msgid "Author:" msgstr "" @@ -3815,6 +3961,10 @@ msgid "A processor material of type 'ParticlesMaterial' is required." msgstr "" #: editor/plugins/particles_editor_plugin.cpp +msgid "Generating AABB" +msgstr "" + +#: editor/plugins/particles_editor_plugin.cpp msgid "Faces contain no area!" msgstr "" @@ -3862,6 +4012,14 @@ msgstr "" msgid "Emission Source: " msgstr "" +#: editor/plugins/particles_editor_plugin.cpp +msgid "Generate Visibility AABB" +msgstr "" + +#: editor/plugins/particles_editor_plugin.cpp +msgid "Generation Time (sec):" +msgstr "" + #: editor/plugins/path_2d_editor_plugin.cpp msgid "Remove Point from Curve" msgstr "" @@ -4313,6 +4471,14 @@ msgid "Trim Trailing Whitespace" msgstr "" #: editor/plugins/script_text_editor.cpp +msgid "Convert Indent To Spaces" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Convert Indent To Tabs" +msgstr "" + +#: editor/plugins/script_text_editor.cpp msgid "Auto Indent" msgstr "" @@ -5174,11 +5340,11 @@ msgid "Invalid project path, the path must exist!" msgstr "" #: editor/project_manager.cpp -msgid "Invalid project path, godot.cfg must not exist." +msgid "Invalid project path, *.godot must not exist." msgstr "" #: editor/project_manager.cpp -msgid "Invalid project path, godot.cfg must exist." +msgid "Invalid project path, *.godot must exist." msgstr "" #: editor/project_manager.cpp @@ -5190,7 +5356,7 @@ msgid "Invalid project path (changed anything?)." msgstr "" #: editor/project_manager.cpp -msgid "Couldn't create godot.cfg in project path." +msgid "Couldn't create *.godot project file in project path." msgstr "" #: editor/project_manager.cpp @@ -5226,10 +5392,6 @@ msgid "Install Project:" msgstr "" #: editor/project_manager.cpp -msgid "Install" -msgstr "" - -#: editor/project_manager.cpp msgid "Browse" msgstr "" @@ -5288,6 +5450,11 @@ msgid "New Project" msgstr "" #: editor/project_manager.cpp +#, fuzzy +msgid "Templates" +msgstr "Hapus Pilihan" + +#: editor/project_manager.cpp msgid "Exit" msgstr "" @@ -5473,7 +5640,7 @@ msgid "Remove Resource Remap Option" msgstr "" #: editor/project_settings.cpp -msgid "Project Settings (godot.cfg)" +msgid "Project Settings " msgstr "" #: editor/project_settings.cpp editor/settings_config_dialog.cpp @@ -5540,10 +5707,6 @@ msgstr "" msgid "AutoLoad" msgstr "" -#: editor/project_settings.cpp -msgid "Plugins" -msgstr "" - #: editor/property_editor.cpp msgid "Pick a Viewport" msgstr "" @@ -6156,6 +6319,10 @@ msgid "Change Notifier Extents" msgstr "" #: editor/spatial_editor_gizmos.cpp +msgid "Change Particles AABB" +msgstr "" + +#: editor/spatial_editor_gizmos.cpp msgid "Change Probe Extents" msgstr "" @@ -6772,6 +6939,17 @@ msgstr "" "NavigationMeshInstance harus menjadi child atau grandchild untuk sebuah node " "Navigation. Ini hanya menyediakan data navigasi." +#: scene/3d/particles.cpp +msgid "" +"Nothing is visible because meshes have not been assigned to draw passes." +msgstr "" + +#: scene/3d/particles.cpp +msgid "" +"A material to process the particles is not assigned, so no behavior is " +"imprinted." +msgstr "" + #: scene/3d/remote_transform.cpp #, fuzzy msgid "Path property must point to a valid Spatial node to work." @@ -6853,6 +7031,9 @@ msgstr "" "sebuah RenderTarget dan tetapkannya tekstur internal untuk beberapa node " "untuk ditampilkan." +#~ msgid "Node From Scene" +#~ msgstr "Node Dari Scene" + #~ msgid "" #~ "A SampleLibrary resource must be created or set in the 'samples' property " #~ "in order for SamplePlayer to play sound." diff --git a/editor/translations/it.po b/editor/translations/it.po index affd0dfdc1..e055c6996a 100644 --- a/editor/translations/it.po +++ b/editor/translations/it.po @@ -360,6 +360,184 @@ msgstr "Cambia Tipo del Valore Array" msgid "Change Array Value" msgstr "Cambia Valore Array" +#: editor/asset_library_editor_plugin.cpp +msgid "Free" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp editor/editor_plugin_settings.cpp +msgid "Version:" +msgstr "Versione:" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Contents:" +msgstr "Costanti:" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "View Files" +msgstr "File" + +#: editor/asset_library_editor_plugin.cpp editor/create_dialog.cpp +#: editor/editor_help.cpp editor/property_selector.cpp +#: editor/script_editor_debugger.cpp +msgid "Description:" +msgstr "Descrizione:" + +#: editor/asset_library_editor_plugin.cpp editor/project_manager.cpp +msgid "Install" +msgstr "Installa" + +#: editor/asset_library_editor_plugin.cpp editor/call_dialog.cpp +#: editor/connections_dialog.cpp editor/export_template_manager.cpp +#: editor/plugins/animation_player_editor_plugin.cpp +#: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/resource_preloader_editor_plugin.cpp +#: editor/plugins/sample_library_editor_plugin.cpp +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/sprite_frames_editor_plugin.cpp editor/project_settings.cpp +#: editor/property_editor.cpp editor/run_settings_dialog.cpp +#: editor/settings_config_dialog.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Close" +msgstr "Chiudi" + +#: editor/asset_library_editor_plugin.cpp +msgid "Can't resolve hostname:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Can't resolve." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Connection error, please try again." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Can't connect." +msgstr "Connetti.." + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Can't connect to host:" +msgstr "Connetti A Nodo:" + +#: editor/asset_library_editor_plugin.cpp +msgid "No response from host:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "No response." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Request failed, return code:" +msgstr "Formato file richiesto sconosciuto:" + +#: editor/asset_library_editor_plugin.cpp +msgid "Req. Failed." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Request failed, too many redirects" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Redirect Loop." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Failed:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Bad download hash, assuming file has been tampered with." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Expected:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Got:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Failed sha256 hash check" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Asset Download Error:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Success!" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Fetching:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Resolving.." +msgstr "Salvataggio.." + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Connecting.." +msgstr "Connetti.." + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Requesting.." +msgstr "Testing" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Error making request" +msgstr "Errore salvando la Risorsa!" + +#: editor/asset_library_editor_plugin.cpp +msgid "Idle" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Retry" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Download Error" +msgstr "Giù" + +#: editor/asset_library_editor_plugin.cpp +msgid "Download for this asset is already in progress!" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "first" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "prev" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "next" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "last" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "All" +msgstr "Tutti" + #: editor/asset_library_editor_plugin.cpp editor/create_dialog.cpp #: editor/editor_help.cpp editor/editor_node.cpp #: editor/plugins/script_editor_plugin.cpp editor/property_selector.cpp @@ -367,6 +545,29 @@ msgstr "Cambia Valore Array" msgid "Search:" msgstr "Cerca:" +#: editor/asset_library_editor_plugin.cpp editor/code_editor.cpp +#: editor/editor_help.cpp editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp +#: editor/plugins/shader_editor_plugin.cpp editor/project_settings.cpp +msgid "Search" +msgstr "Cerca" + +#: editor/asset_library_editor_plugin.cpp editor/editor_node.cpp +#: editor/io_plugins/editor_bitmask_import_plugin.cpp +#: editor/io_plugins/editor_font_import_plugin.cpp +#: editor/io_plugins/editor_mesh_import_plugin.cpp +#: editor/io_plugins/editor_sample_import_plugin.cpp +#: editor/io_plugins/editor_scene_import_plugin.cpp +#: editor/io_plugins/editor_texture_import_plugin.cpp +#: editor/io_plugins/editor_translation_import_plugin.cpp +#: editor/project_manager.cpp +msgid "Import" +msgstr "Importa" + +#: editor/asset_library_editor_plugin.cpp editor/project_settings.cpp +msgid "Plugins" +msgstr "Plugins" + #: editor/asset_library_editor_plugin.cpp msgid "Sort:" msgstr "Ordina:" @@ -380,10 +581,6 @@ msgid "Category:" msgstr "Categoria:" #: editor/asset_library_editor_plugin.cpp -msgid "All" -msgstr "Tutti" - -#: editor/asset_library_editor_plugin.cpp msgid "Site:" msgstr "Sito:" @@ -415,20 +612,6 @@ msgstr "Lista Metodi Per '%s':" msgid "Call" msgstr "Chiama" -#: editor/call_dialog.cpp editor/connections_dialog.cpp -#: editor/export_template_manager.cpp -#: editor/plugins/animation_player_editor_plugin.cpp -#: editor/plugins/canvas_item_editor_plugin.cpp -#: editor/plugins/resource_preloader_editor_plugin.cpp -#: editor/plugins/sample_library_editor_plugin.cpp -#: editor/plugins/script_editor_plugin.cpp -#: editor/plugins/sprite_frames_editor_plugin.cpp editor/project_settings.cpp -#: editor/property_editor.cpp editor/run_settings_dialog.cpp -#: editor/settings_config_dialog.cpp -#: modules/visual_script/visual_script_editor.cpp -msgid "Close" -msgstr "Chiudi" - #: editor/call_dialog.cpp msgid "Method List:" msgstr "Lista Metodi:" @@ -479,13 +662,6 @@ msgid "Selection Only" msgstr "Solo Selezione" #: editor/code_editor.cpp editor/editor_help.cpp -#: editor/plugins/script_editor_plugin.cpp -#: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp editor/project_settings.cpp -msgid "Search" -msgstr "Cerca" - -#: editor/code_editor.cpp editor/editor_help.cpp msgid "Find" msgstr "Trova" @@ -637,11 +813,6 @@ msgstr "Recenti:" msgid "Matches:" msgstr "Corrispondenze:" -#: editor/create_dialog.cpp editor/editor_help.cpp editor/property_selector.cpp -#: editor/script_editor_debugger.cpp -msgid "Description:" -msgstr "Descrizione:" - #: editor/dependency_editor.cpp msgid "Search Replacement For:" msgstr "Cerca Rimpiazzo Per:" @@ -1130,10 +1301,6 @@ msgstr " Output:" msgid "Clear" msgstr "Rimuovi" -#: editor/editor_node.cpp -msgid "Node From Scene" -msgstr "Nodo Da Scena" - #: editor/editor_node.cpp editor/plugins/animation_player_editor_plugin.cpp #: editor/resources_dock.cpp msgid "Error saving resource!" @@ -1517,21 +1684,6 @@ msgid "Distraction Free Mode" msgstr "Modalità Senza Distrazioni" #: editor/editor_node.cpp -msgid "Import assets to the project." -msgstr "Importa asset nel progetto." - -#: editor/editor_node.cpp editor/io_plugins/editor_bitmask_import_plugin.cpp -#: editor/io_plugins/editor_font_import_plugin.cpp -#: editor/io_plugins/editor_mesh_import_plugin.cpp -#: editor/io_plugins/editor_sample_import_plugin.cpp -#: editor/io_plugins/editor_scene_import_plugin.cpp -#: editor/io_plugins/editor_texture_import_plugin.cpp -#: editor/io_plugins/editor_translation_import_plugin.cpp -#: editor/project_manager.cpp -msgid "Import" -msgstr "Importa" - -#: editor/editor_node.cpp msgid "Miscellaneous project or scene-wide tools." msgstr "Strumenti di progetto o scena vari." @@ -1820,10 +1972,6 @@ msgid "Installed Plugins:" msgstr "Plugins Installati:" #: editor/editor_plugin_settings.cpp -msgid "Version:" -msgstr "Versione:" - -#: editor/editor_plugin_settings.cpp msgid "Author:" msgstr "Autore:" @@ -3838,6 +3986,11 @@ msgid "A processor material of type 'ParticlesMaterial' is required." msgstr "" #: editor/plugins/particles_editor_plugin.cpp +#, fuzzy +msgid "Generating AABB" +msgstr "Genera AABB" + +#: editor/plugins/particles_editor_plugin.cpp msgid "Faces contain no area!" msgstr "Le facce non contengono area!" @@ -3890,6 +4043,16 @@ msgstr "Volume" msgid "Emission Source: " msgstr "Riempimento Emissione:" +#: editor/plugins/particles_editor_plugin.cpp +#, fuzzy +msgid "Generate Visibility AABB" +msgstr "Genera AABB" + +#: editor/plugins/particles_editor_plugin.cpp +#, fuzzy +msgid "Generation Time (sec):" +msgstr "Tempo Medio (sec)" + #: editor/plugins/path_2d_editor_plugin.cpp msgid "Remove Point from Curve" msgstr "Rimuovi Punto da Curva" @@ -4344,6 +4507,14 @@ msgid "Trim Trailing Whitespace" msgstr "Taglia Spazi in Coda" #: editor/plugins/script_text_editor.cpp +msgid "Convert Indent To Spaces" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Convert Indent To Tabs" +msgstr "" + +#: editor/plugins/script_text_editor.cpp msgid "Auto Indent" msgstr "Auto Indenta" @@ -5218,12 +5389,12 @@ msgstr "Percorso di progetto invalido, il percorso deve esistere!" #: editor/project_manager.cpp #, fuzzy -msgid "Invalid project path, godot.cfg must not exist." +msgid "Invalid project path, *.godot must not exist." msgstr "Percorso di progetto invalido, engine.cfg non deve esistere." #: editor/project_manager.cpp #, fuzzy -msgid "Invalid project path, godot.cfg must exist." +msgid "Invalid project path, *.godot must exist." msgstr "Percorso di progetto invalido, engine.cfg deve esistere." #: editor/project_manager.cpp @@ -5236,7 +5407,7 @@ msgstr "Percorso di progetto invalido (cambiato qualcosa?)." #: editor/project_manager.cpp #, fuzzy -msgid "Couldn't create godot.cfg in project path." +msgid "Couldn't create *.godot project file in project path." msgstr "Impossibile creare engine.cfg nel percorso di progetto." #: editor/project_manager.cpp @@ -5272,10 +5443,6 @@ msgid "Install Project:" msgstr "Installa Progetto:" #: editor/project_manager.cpp -msgid "Install" -msgstr "Installa" - -#: editor/project_manager.cpp msgid "Browse" msgstr "Sfoglia" @@ -5336,6 +5503,11 @@ msgid "New Project" msgstr "Nuovo Progetto" #: editor/project_manager.cpp +#, fuzzy +msgid "Templates" +msgstr "Rimuovi Elemento" + +#: editor/project_manager.cpp msgid "Exit" msgstr "Esci" @@ -5522,8 +5694,8 @@ msgstr "Rimuovi Opzione di Remap Rimorse" #: editor/project_settings.cpp #, fuzzy -msgid "Project Settings (godot.cfg)" -msgstr "Impostazioni Progetto (engine.cfg)" +msgid "Project Settings " +msgstr "Impostazioni Progetto" #: editor/project_settings.cpp editor/settings_config_dialog.cpp msgid "General" @@ -5589,10 +5761,6 @@ msgstr "Locale" msgid "AutoLoad" msgstr "AutoLoad" -#: editor/project_settings.cpp -msgid "Plugins" -msgstr "Plugins" - #: editor/property_editor.cpp #, fuzzy msgid "Pick a Viewport" @@ -6202,6 +6370,10 @@ msgid "Change Notifier Extents" msgstr "Cambia Estensione di Notifier" #: editor/spatial_editor_gizmos.cpp +msgid "Change Particles AABB" +msgstr "" + +#: editor/spatial_editor_gizmos.cpp msgid "Change Probe Extents" msgstr "Cambia Estensione Probe" @@ -6833,6 +7005,17 @@ msgstr "" "NavigationMeshInstance deve essere un figlio o nipote di un nodo Navigation. " "Fornisce solamente dati per la navigazione." +#: scene/3d/particles.cpp +msgid "" +"Nothing is visible because meshes have not been assigned to draw passes." +msgstr "" + +#: scene/3d/particles.cpp +msgid "" +"A material to process the particles is not assigned, so no behavior is " +"imprinted." +msgstr "" + #: scene/3d/remote_transform.cpp msgid "Path property must point to a valid Spatial node to work." msgstr "" @@ -6911,6 +7094,16 @@ msgstr "" "Control, in modo che possa ottenere una dimensione. Altrimenti, renderlo un " "RenderTarget e assegnare alla sua texture interna qualche nodo da mostrare." +#~ msgid "Node From Scene" +#~ msgstr "Nodo Da Scena" + +#~ msgid "Import assets to the project." +#~ msgstr "Importa asset nel progetto." + +#, fuzzy +#~ msgid "Project Settings (godot.cfg)" +#~ msgstr "Impostazioni Progetto (engine.cfg)" + #~ msgid "Surface" #~ msgstr "Superficie" diff --git a/editor/translations/ja.po b/editor/translations/ja.po index 7f0f01ff07..f34e0d118b 100644 --- a/editor/translations/ja.po +++ b/editor/translations/ja.po @@ -358,6 +358,181 @@ msgstr "é…列ã®å€¤ã®ç¨®é¡žã®å¤‰æ›´" msgid "Change Array Value" msgstr "é…列ã®å€¤ã‚’変更" +#: editor/asset_library_editor_plugin.cpp +msgid "Free" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp editor/editor_plugin_settings.cpp +msgid "Version:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Contents:" +msgstr "継続的" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "View Files" +msgstr "ファイル:" + +#: editor/asset_library_editor_plugin.cpp editor/create_dialog.cpp +#: editor/editor_help.cpp editor/property_selector.cpp +#: editor/script_editor_debugger.cpp +msgid "Description:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp editor/project_manager.cpp +msgid "Install" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp editor/call_dialog.cpp +#: editor/connections_dialog.cpp editor/export_template_manager.cpp +#: editor/plugins/animation_player_editor_plugin.cpp +#: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/resource_preloader_editor_plugin.cpp +#: editor/plugins/sample_library_editor_plugin.cpp +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/sprite_frames_editor_plugin.cpp editor/project_settings.cpp +#: editor/property_editor.cpp editor/run_settings_dialog.cpp +#: editor/settings_config_dialog.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Close" +msgstr "é–‰ã˜ã‚‹" + +#: editor/asset_library_editor_plugin.cpp +msgid "Can't resolve hostname:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Can't resolve." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Connection error, please try again." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Can't connect." +msgstr "接続" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Can't connect to host:" +msgstr "ノードã«æŽ¥ç¶šã—ã¾ã™ã€‚" + +#: editor/asset_library_editor_plugin.cpp +msgid "No response from host:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "No response." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Request failed, return code:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Req. Failed." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Request failed, too many redirects" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Redirect Loop." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Failed:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Bad download hash, assuming file has been tampered with." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Expected:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Got:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Failed sha256 hash check" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Asset Download Error:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Success!" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Fetching:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Resolving.." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Connecting.." +msgstr "接続" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Requesting.." +msgstr "テストä¸" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Error making request" +msgstr "フォントèªã¿è¾¼ã¿ã‚¨ãƒ©ãƒ¼ã€‚" + +#: editor/asset_library_editor_plugin.cpp +msgid "Idle" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Retry" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Download Error" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Download for this asset is already in progress!" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "first" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "prev" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "next" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "last" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "All" +msgstr "ã™ã¹ã¦" + #: editor/asset_library_editor_plugin.cpp editor/create_dialog.cpp #: editor/editor_help.cpp editor/editor_node.cpp #: editor/plugins/script_editor_plugin.cpp editor/property_selector.cpp @@ -365,6 +540,29 @@ msgstr "é…列ã®å€¤ã‚’変更" msgid "Search:" msgstr "検索:" +#: editor/asset_library_editor_plugin.cpp editor/code_editor.cpp +#: editor/editor_help.cpp editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp +#: editor/plugins/shader_editor_plugin.cpp editor/project_settings.cpp +msgid "Search" +msgstr "検索" + +#: editor/asset_library_editor_plugin.cpp editor/editor_node.cpp +#: editor/io_plugins/editor_bitmask_import_plugin.cpp +#: editor/io_plugins/editor_font_import_plugin.cpp +#: editor/io_plugins/editor_mesh_import_plugin.cpp +#: editor/io_plugins/editor_sample_import_plugin.cpp +#: editor/io_plugins/editor_scene_import_plugin.cpp +#: editor/io_plugins/editor_texture_import_plugin.cpp +#: editor/io_plugins/editor_translation_import_plugin.cpp +#: editor/project_manager.cpp +msgid "Import" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp editor/project_settings.cpp +msgid "Plugins" +msgstr "" + #: editor/asset_library_editor_plugin.cpp msgid "Sort:" msgstr "並ã¹æ›¿ãˆ:" @@ -378,10 +576,6 @@ msgid "Category:" msgstr "カテゴリー:" #: editor/asset_library_editor_plugin.cpp -msgid "All" -msgstr "ã™ã¹ã¦" - -#: editor/asset_library_editor_plugin.cpp msgid "Site:" msgstr "サイト:" @@ -413,20 +607,6 @@ msgstr "'%s' ã®ãƒ¡ã‚½ãƒƒãƒ‰ä¸€è¦§ï¼š" msgid "Call" msgstr "呼ã³å‡ºã—" -#: editor/call_dialog.cpp editor/connections_dialog.cpp -#: editor/export_template_manager.cpp -#: editor/plugins/animation_player_editor_plugin.cpp -#: editor/plugins/canvas_item_editor_plugin.cpp -#: editor/plugins/resource_preloader_editor_plugin.cpp -#: editor/plugins/sample_library_editor_plugin.cpp -#: editor/plugins/script_editor_plugin.cpp -#: editor/plugins/sprite_frames_editor_plugin.cpp editor/project_settings.cpp -#: editor/property_editor.cpp editor/run_settings_dialog.cpp -#: editor/settings_config_dialog.cpp -#: modules/visual_script/visual_script_editor.cpp -msgid "Close" -msgstr "é–‰ã˜ã‚‹" - #: editor/call_dialog.cpp msgid "Method List:" msgstr "メソッド一覧:" @@ -477,13 +657,6 @@ msgid "Selection Only" msgstr "é¸æŠžç¯„囲ã®ã¿" #: editor/code_editor.cpp editor/editor_help.cpp -#: editor/plugins/script_editor_plugin.cpp -#: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp editor/project_settings.cpp -msgid "Search" -msgstr "検索" - -#: editor/code_editor.cpp editor/editor_help.cpp msgid "Find" msgstr "検索" @@ -634,11 +807,6 @@ msgstr "" msgid "Matches:" msgstr "" -#: editor/create_dialog.cpp editor/editor_help.cpp editor/property_selector.cpp -#: editor/script_editor_debugger.cpp -msgid "Description:" -msgstr "" - #: editor/dependency_editor.cpp msgid "Search Replacement For:" msgstr "" @@ -1114,11 +1282,6 @@ msgstr "" msgid "Clear" msgstr "削除" -#: editor/editor_node.cpp -#, fuzzy -msgid "Node From Scene" -msgstr "シーンã‹ã‚‰ã®ãƒŽãƒ¼ãƒ‰" - #: editor/editor_node.cpp editor/plugins/animation_player_editor_plugin.cpp #: editor/resources_dock.cpp msgid "Error saving resource!" @@ -1494,21 +1657,6 @@ msgid "Distraction Free Mode" msgstr "" #: editor/editor_node.cpp -msgid "Import assets to the project." -msgstr "" - -#: editor/editor_node.cpp editor/io_plugins/editor_bitmask_import_plugin.cpp -#: editor/io_plugins/editor_font_import_plugin.cpp -#: editor/io_plugins/editor_mesh_import_plugin.cpp -#: editor/io_plugins/editor_sample_import_plugin.cpp -#: editor/io_plugins/editor_scene_import_plugin.cpp -#: editor/io_plugins/editor_texture_import_plugin.cpp -#: editor/io_plugins/editor_translation_import_plugin.cpp -#: editor/project_manager.cpp -msgid "Import" -msgstr "" - -#: editor/editor_node.cpp msgid "Miscellaneous project or scene-wide tools." msgstr "" @@ -1777,10 +1925,6 @@ msgid "Installed Plugins:" msgstr "" #: editor/editor_plugin_settings.cpp -msgid "Version:" -msgstr "" - -#: editor/editor_plugin_settings.cpp msgid "Author:" msgstr "" @@ -3758,6 +3902,10 @@ msgid "A processor material of type 'ParticlesMaterial' is required." msgstr "" #: editor/plugins/particles_editor_plugin.cpp +msgid "Generating AABB" +msgstr "" + +#: editor/plugins/particles_editor_plugin.cpp msgid "Faces contain no area!" msgstr "" @@ -3805,6 +3953,14 @@ msgstr "" msgid "Emission Source: " msgstr "" +#: editor/plugins/particles_editor_plugin.cpp +msgid "Generate Visibility AABB" +msgstr "" + +#: editor/plugins/particles_editor_plugin.cpp +msgid "Generation Time (sec):" +msgstr "" + #: editor/plugins/path_2d_editor_plugin.cpp msgid "Remove Point from Curve" msgstr "" @@ -4257,6 +4413,14 @@ msgid "Trim Trailing Whitespace" msgstr "" #: editor/plugins/script_text_editor.cpp +msgid "Convert Indent To Spaces" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Convert Indent To Tabs" +msgstr "" + +#: editor/plugins/script_text_editor.cpp msgid "Auto Indent" msgstr "" @@ -5114,11 +5278,11 @@ msgid "Invalid project path, the path must exist!" msgstr "" #: editor/project_manager.cpp -msgid "Invalid project path, godot.cfg must not exist." +msgid "Invalid project path, *.godot must not exist." msgstr "" #: editor/project_manager.cpp -msgid "Invalid project path, godot.cfg must exist." +msgid "Invalid project path, *.godot must exist." msgstr "" #: editor/project_manager.cpp @@ -5130,7 +5294,7 @@ msgid "Invalid project path (changed anything?)." msgstr "" #: editor/project_manager.cpp -msgid "Couldn't create godot.cfg in project path." +msgid "Couldn't create *.godot project file in project path." msgstr "" #: editor/project_manager.cpp @@ -5166,10 +5330,6 @@ msgid "Install Project:" msgstr "" #: editor/project_manager.cpp -msgid "Install" -msgstr "" - -#: editor/project_manager.cpp msgid "Browse" msgstr "" @@ -5228,6 +5388,11 @@ msgid "New Project" msgstr "" #: editor/project_manager.cpp +#, fuzzy +msgid "Templates" +msgstr "é¸æŠžã—ã¦ã„ã‚‹ã‚‚ã®ã‚’削除" + +#: editor/project_manager.cpp msgid "Exit" msgstr "終了" @@ -5411,7 +5576,7 @@ msgid "Remove Resource Remap Option" msgstr "" #: editor/project_settings.cpp -msgid "Project Settings (godot.cfg)" +msgid "Project Settings " msgstr "" #: editor/project_settings.cpp editor/settings_config_dialog.cpp @@ -5478,10 +5643,6 @@ msgstr "" msgid "AutoLoad" msgstr "" -#: editor/project_settings.cpp -msgid "Plugins" -msgstr "" - #: editor/property_editor.cpp msgid "Pick a Viewport" msgstr "" @@ -6087,6 +6248,10 @@ msgid "Change Notifier Extents" msgstr "" #: editor/spatial_editor_gizmos.cpp +msgid "Change Particles AABB" +msgstr "" + +#: editor/spatial_editor_gizmos.cpp msgid "Change Probe Extents" msgstr "" @@ -6698,6 +6863,17 @@ msgstr "" "NavigationMeshInstance ã¯ã€ãƒŠãƒ“ゲーションノードã®åã‚„å«ã§ã‚ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚" "ã“ã‚Œã¯ãƒŠãƒ“ゲーションデータã®ã¿æä¾›ã—ã¾ã™ã€‚" +#: scene/3d/particles.cpp +msgid "" +"Nothing is visible because meshes have not been assigned to draw passes." +msgstr "" + +#: scene/3d/particles.cpp +msgid "" +"A material to process the particles is not assigned, so no behavior is " +"imprinted." +msgstr "" + #: scene/3d/remote_transform.cpp #, fuzzy msgid "Path property must point to a valid Spatial node to work." @@ -6778,6 +6954,10 @@ msgstr "" "ãã‚Šã¾ã™ã€‚ãれ以外ã®å ´åˆã€ãƒ¬ãƒ³ãƒ€ãƒ¼ ターゲットã—ã€ãã®å†…部ã®ãƒ†ã‚¯ã‚¹ãƒãƒ£è¡¨ç¤ºã®ã„" "ãã¤ã‹ã®ãƒŽãƒ¼ãƒ‰ã«å‰²ã‚Šå½“ã¦ã¾ã™ã€‚" +#, fuzzy +#~ msgid "Node From Scene" +#~ msgstr "シーンã‹ã‚‰ã®ãƒŽãƒ¼ãƒ‰" + #~ msgid "" #~ "A SampleLibrary resource must be created or set in the 'samples' property " #~ "in order for SamplePlayer to play sound." diff --git a/editor/translations/ko.po b/editor/translations/ko.po index 02d7385927..769089b860 100644 --- a/editor/translations/ko.po +++ b/editor/translations/ko.po @@ -358,6 +358,184 @@ msgstr "ë°°ì—´ ê°’ 타입 변경" msgid "Change Array Value" msgstr "ë°°ì—´ ê°’ 변경" +#: editor/asset_library_editor_plugin.cpp +msgid "Free" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp editor/editor_plugin_settings.cpp +msgid "Version:" +msgstr "ë²„ì „:" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Contents:" +msgstr "ìƒìˆ˜:" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "View Files" +msgstr "파ì¼" + +#: editor/asset_library_editor_plugin.cpp editor/create_dialog.cpp +#: editor/editor_help.cpp editor/property_selector.cpp +#: editor/script_editor_debugger.cpp +msgid "Description:" +msgstr "설명:" + +#: editor/asset_library_editor_plugin.cpp editor/project_manager.cpp +msgid "Install" +msgstr "설치" + +#: editor/asset_library_editor_plugin.cpp editor/call_dialog.cpp +#: editor/connections_dialog.cpp editor/export_template_manager.cpp +#: editor/plugins/animation_player_editor_plugin.cpp +#: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/resource_preloader_editor_plugin.cpp +#: editor/plugins/sample_library_editor_plugin.cpp +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/sprite_frames_editor_plugin.cpp editor/project_settings.cpp +#: editor/property_editor.cpp editor/run_settings_dialog.cpp +#: editor/settings_config_dialog.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Close" +msgstr "닫기" + +#: editor/asset_library_editor_plugin.cpp +msgid "Can't resolve hostname:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Can't resolve." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Connection error, please try again." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Can't connect." +msgstr "연결하기.." + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Can't connect to host:" +msgstr "ì—°ê²°í• ë…¸ë“œ:" + +#: editor/asset_library_editor_plugin.cpp +msgid "No response from host:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "No response." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Request failed, return code:" +msgstr "ìš”ì²í•œ íŒŒì¼ í˜•ì‹ì„ ì•Œ 수 ì—†ìŒ:" + +#: editor/asset_library_editor_plugin.cpp +msgid "Req. Failed." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Request failed, too many redirects" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Redirect Loop." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Failed:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Bad download hash, assuming file has been tampered with." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Expected:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Got:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Failed sha256 hash check" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Asset Download Error:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Success!" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Fetching:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Resolving.." +msgstr "ì €ìž¥ 중.." + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Connecting.." +msgstr "연결하기.." + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Requesting.." +msgstr "테스팅" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Error making request" +msgstr "리소스 ì €ìž¥ 중 ì—러!" + +#: editor/asset_library_editor_plugin.cpp +msgid "Idle" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Retry" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Download Error" +msgstr "아래" + +#: editor/asset_library_editor_plugin.cpp +msgid "Download for this asset is already in progress!" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "first" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "prev" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "next" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "last" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "All" +msgstr "모ë‘" + #: editor/asset_library_editor_plugin.cpp editor/create_dialog.cpp #: editor/editor_help.cpp editor/editor_node.cpp #: editor/plugins/script_editor_plugin.cpp editor/property_selector.cpp @@ -365,6 +543,29 @@ msgstr "ë°°ì—´ ê°’ 변경" msgid "Search:" msgstr "검색:" +#: editor/asset_library_editor_plugin.cpp editor/code_editor.cpp +#: editor/editor_help.cpp editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp +#: editor/plugins/shader_editor_plugin.cpp editor/project_settings.cpp +msgid "Search" +msgstr "검색" + +#: editor/asset_library_editor_plugin.cpp editor/editor_node.cpp +#: editor/io_plugins/editor_bitmask_import_plugin.cpp +#: editor/io_plugins/editor_font_import_plugin.cpp +#: editor/io_plugins/editor_mesh_import_plugin.cpp +#: editor/io_plugins/editor_sample_import_plugin.cpp +#: editor/io_plugins/editor_scene_import_plugin.cpp +#: editor/io_plugins/editor_texture_import_plugin.cpp +#: editor/io_plugins/editor_translation_import_plugin.cpp +#: editor/project_manager.cpp +msgid "Import" +msgstr "ê°€ì ¸ì˜¤ê¸°" + +#: editor/asset_library_editor_plugin.cpp editor/project_settings.cpp +msgid "Plugins" +msgstr "플러그ì¸" + #: editor/asset_library_editor_plugin.cpp msgid "Sort:" msgstr "ì •ë ¬:" @@ -378,10 +579,6 @@ msgid "Category:" msgstr "ì¹´í…Œê³ ë¦¬:" #: editor/asset_library_editor_plugin.cpp -msgid "All" -msgstr "모ë‘" - -#: editor/asset_library_editor_plugin.cpp msgid "Site:" msgstr "사ì´íŠ¸:" @@ -413,20 +610,6 @@ msgstr "'%s' 함수 목ë¡:" msgid "Call" msgstr "호출" -#: editor/call_dialog.cpp editor/connections_dialog.cpp -#: editor/export_template_manager.cpp -#: editor/plugins/animation_player_editor_plugin.cpp -#: editor/plugins/canvas_item_editor_plugin.cpp -#: editor/plugins/resource_preloader_editor_plugin.cpp -#: editor/plugins/sample_library_editor_plugin.cpp -#: editor/plugins/script_editor_plugin.cpp -#: editor/plugins/sprite_frames_editor_plugin.cpp editor/project_settings.cpp -#: editor/property_editor.cpp editor/run_settings_dialog.cpp -#: editor/settings_config_dialog.cpp -#: modules/visual_script/visual_script_editor.cpp -msgid "Close" -msgstr "닫기" - #: editor/call_dialog.cpp msgid "Method List:" msgstr "함수 목ë¡:" @@ -477,13 +660,6 @@ msgid "Selection Only" msgstr "ì„ íƒì˜ì—만" #: editor/code_editor.cpp editor/editor_help.cpp -#: editor/plugins/script_editor_plugin.cpp -#: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp editor/project_settings.cpp -msgid "Search" -msgstr "검색" - -#: editor/code_editor.cpp editor/editor_help.cpp msgid "Find" msgstr "찾기" @@ -635,11 +811,6 @@ msgstr "최근:" msgid "Matches:" msgstr "ì¼ì¹˜:" -#: editor/create_dialog.cpp editor/editor_help.cpp editor/property_selector.cpp -#: editor/script_editor_debugger.cpp -msgid "Description:" -msgstr "설명:" - #: editor/dependency_editor.cpp msgid "Search Replacement For:" msgstr "ëŒ€ì²´í• ëŒ€ìƒ ì°¾ê¸°:" @@ -1123,10 +1294,6 @@ msgstr " ì¶œë ¥:" msgid "Clear" msgstr "지우기" -#: editor/editor_node.cpp -msgid "Node From Scene" -msgstr "씬으로부터 노드 ê°€ì ¸ì˜¤ê¸°" - #: editor/editor_node.cpp editor/plugins/animation_player_editor_plugin.cpp #: editor/resources_dock.cpp msgid "Error saving resource!" @@ -1503,21 +1670,6 @@ msgid "Distraction Free Mode" msgstr "초집중 모드" #: editor/editor_node.cpp -msgid "Import assets to the project." -msgstr "프로ì 트로 ì—ì…‹ ê°€ì ¸ì˜¤ê¸°." - -#: editor/editor_node.cpp editor/io_plugins/editor_bitmask_import_plugin.cpp -#: editor/io_plugins/editor_font_import_plugin.cpp -#: editor/io_plugins/editor_mesh_import_plugin.cpp -#: editor/io_plugins/editor_sample_import_plugin.cpp -#: editor/io_plugins/editor_scene_import_plugin.cpp -#: editor/io_plugins/editor_texture_import_plugin.cpp -#: editor/io_plugins/editor_translation_import_plugin.cpp -#: editor/project_manager.cpp -msgid "Import" -msgstr "ê°€ì ¸ì˜¤ê¸°" - -#: editor/editor_node.cpp msgid "Miscellaneous project or scene-wide tools." msgstr "프로ì 트 ë˜ëŠ” 씬 ê´€ë ¨ 여러가지 ë„구들." @@ -1807,10 +1959,6 @@ msgid "Installed Plugins:" msgstr "ì„¤ì¹˜ëœ í”ŒëŸ¬ê·¸ì¸:" #: editor/editor_plugin_settings.cpp -msgid "Version:" -msgstr "ë²„ì „:" - -#: editor/editor_plugin_settings.cpp msgid "Author:" msgstr "ì €ìž:" @@ -3815,6 +3963,11 @@ msgid "A processor material of type 'ParticlesMaterial' is required." msgstr "" #: editor/plugins/particles_editor_plugin.cpp +#, fuzzy +msgid "Generating AABB" +msgstr "AABB ìƒì„±" + +#: editor/plugins/particles_editor_plugin.cpp msgid "Faces contain no area!" msgstr "페ì´ìŠ¤ê°€ ì˜ì—ì„ ê°€ì§€ê³ ìžˆì§€ 않습니다!" @@ -3867,6 +4020,16 @@ msgstr "배출량" msgid "Emission Source: " msgstr "ì—미션 채움:" +#: editor/plugins/particles_editor_plugin.cpp +#, fuzzy +msgid "Generate Visibility AABB" +msgstr "AABB ìƒì„±" + +#: editor/plugins/particles_editor_plugin.cpp +#, fuzzy +msgid "Generation Time (sec):" +msgstr "í‰ê· 시간 (ì´ˆ)" + #: editor/plugins/path_2d_editor_plugin.cpp msgid "Remove Point from Curve" msgstr "커브ì—ì„œ í¬ì¸íŠ¸ ì‚ì œ" @@ -4319,6 +4482,14 @@ msgid "Trim Trailing Whitespace" msgstr "후행 공백 ë¬¸ìž ì œê±°" #: editor/plugins/script_text_editor.cpp +msgid "Convert Indent To Spaces" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Convert Indent To Tabs" +msgstr "" + +#: editor/plugins/script_text_editor.cpp msgid "Auto Indent" msgstr "ìžë™ 들여쓰기" @@ -5189,12 +5360,12 @@ msgstr "프로ì 트 경로가 ìœ íš¨í•˜ì§€ 않습니다. 경로가 반드시 ì¡ #: editor/project_manager.cpp #, fuzzy -msgid "Invalid project path, godot.cfg must not exist." +msgid "Invalid project path, *.godot must not exist." msgstr "프로ì 트 경로가 ìœ íš¨í•˜ì§€ 않습니다. engine.cfgê°€ 있으면 안ë©ë‹ˆë‹¤." #: editor/project_manager.cpp #, fuzzy -msgid "Invalid project path, godot.cfg must exist." +msgid "Invalid project path, *.godot must exist." msgstr "프로ì 트 경로가 ìœ íš¨í•˜ì§€ 않습니다. engine.cfgê°€ 존재해야합니다." #: editor/project_manager.cpp @@ -5207,7 +5378,7 @@ msgstr "ìœ íš¨í•˜ì§€ ì•Šì€ í”„ë¡œì 트 경로 (ë”ê°€ ë³€ê²½í•˜ì‹ ê±°ë¼ë„?) #: editor/project_manager.cpp #, fuzzy -msgid "Couldn't create godot.cfg in project path." +msgid "Couldn't create *.godot project file in project path." msgstr "프로ì 트 ê²½ë¡œì— engine.cfg를 ìƒì„±í• 수 없습니다." #: editor/project_manager.cpp @@ -5243,10 +5414,6 @@ msgid "Install Project:" msgstr "프로ì 트 설치:" #: editor/project_manager.cpp -msgid "Install" -msgstr "설치" - -#: editor/project_manager.cpp msgid "Browse" msgstr "찾아보기" @@ -5306,6 +5473,11 @@ msgid "New Project" msgstr "새 프로ì 트" #: editor/project_manager.cpp +#, fuzzy +msgid "Templates" +msgstr "ì•„ì´í…œ ì‚ì œ" + +#: editor/project_manager.cpp msgid "Exit" msgstr "종료" @@ -5492,8 +5664,8 @@ msgstr "리소스 리맵핑 옵션 ì œê±°" #: editor/project_settings.cpp #, fuzzy -msgid "Project Settings (godot.cfg)" -msgstr "프로ì 트 ì„¤ì • (engine.cfg)" +msgid "Project Settings " +msgstr "프로ì 트 ì„¤ì •" #: editor/project_settings.cpp editor/settings_config_dialog.cpp msgid "General" @@ -5559,10 +5731,6 @@ msgstr "지ì—" msgid "AutoLoad" msgstr "ìžë™ 로드" -#: editor/project_settings.cpp -msgid "Plugins" -msgstr "플러그ì¸" - #: editor/property_editor.cpp #, fuzzy msgid "Pick a Viewport" @@ -6168,6 +6336,10 @@ msgid "Change Notifier Extents" msgstr "Notifier 범위 변경" #: editor/spatial_editor_gizmos.cpp +msgid "Change Particles AABB" +msgstr "" + +#: editor/spatial_editor_gizmos.cpp msgid "Change Probe Extents" msgstr "프로브 범위 변경" @@ -6755,6 +6927,17 @@ msgstr "" "NavigationMeshInstanceì€ Navigation ë…¸ë“œì˜ í•˜ìœ„ì— ìžˆì–´ì•¼ 합니다. ì´ê²ƒì€ 네비" "게ì´ì…˜ ë°ì´íƒ€ë§Œì„ ì œê³µí•©ë‹ˆë‹¤." +#: scene/3d/particles.cpp +msgid "" +"Nothing is visible because meshes have not been assigned to draw passes." +msgstr "" + +#: scene/3d/particles.cpp +msgid "" +"A material to process the particles is not assigned, so no behavior is " +"imprinted." +msgstr "" + #: scene/3d/remote_transform.cpp msgid "Path property must point to a valid Spatial node to work." msgstr "Path ì†ì„±ì€ ìœ íš¨í•œ Spatial 노드를 가리켜야 합니다." @@ -6828,6 +7011,16 @@ msgstr "" "합니다. ê·¸ë ‡ì§€ ì•Šì„ ê²½ìš°, í™”ë©´ì— í‘œì‹œí•˜ê¸° 위해서는 Render target으로 ì„¤ì •í•˜" "ê³ ë‚´ë¶€ì ì¸ í…스ì³ë¥¼ 다른 ë…¸ë“œì— í• ë‹¹í•´ì•¼ 합니다." +#~ msgid "Node From Scene" +#~ msgstr "씬으로부터 노드 ê°€ì ¸ì˜¤ê¸°" + +#~ msgid "Import assets to the project." +#~ msgstr "프로ì 트로 ì—ì…‹ ê°€ì ¸ì˜¤ê¸°." + +#, fuzzy +#~ msgid "Project Settings (godot.cfg)" +#~ msgstr "프로ì 트 ì„¤ì • (engine.cfg)" + #~ msgid "Surface" #~ msgstr "출사면" diff --git a/editor/translations/nb.po b/editor/translations/nb.po index e452e85cd9..e7a64f501a 100644 --- a/editor/translations/nb.po +++ b/editor/translations/nb.po @@ -356,6 +356,174 @@ msgstr "" msgid "Change Array Value" msgstr "" +#: editor/asset_library_editor_plugin.cpp +msgid "Free" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp editor/editor_plugin_settings.cpp +msgid "Version:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Contents:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "View Files" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp editor/create_dialog.cpp +#: editor/editor_help.cpp editor/property_selector.cpp +#: editor/script_editor_debugger.cpp +msgid "Description:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp editor/project_manager.cpp +msgid "Install" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp editor/call_dialog.cpp +#: editor/connections_dialog.cpp editor/export_template_manager.cpp +#: editor/plugins/animation_player_editor_plugin.cpp +#: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/resource_preloader_editor_plugin.cpp +#: editor/plugins/sample_library_editor_plugin.cpp +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/sprite_frames_editor_plugin.cpp editor/project_settings.cpp +#: editor/property_editor.cpp editor/run_settings_dialog.cpp +#: editor/settings_config_dialog.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Close" +msgstr "Lukk" + +#: editor/asset_library_editor_plugin.cpp +msgid "Can't resolve hostname:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Can't resolve." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Connection error, please try again." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Can't connect." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Can't connect to host:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "No response from host:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "No response." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Request failed, return code:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Req. Failed." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Request failed, too many redirects" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Redirect Loop." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Failed:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Bad download hash, assuming file has been tampered with." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Expected:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Got:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Failed sha256 hash check" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Asset Download Error:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Success!" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Fetching:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Resolving.." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Connecting.." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Requesting.." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Error making request" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Idle" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Retry" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Download Error" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Download for this asset is already in progress!" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "first" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "prev" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "next" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "last" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "All" +msgstr "" + #: editor/asset_library_editor_plugin.cpp editor/create_dialog.cpp #: editor/editor_help.cpp editor/editor_node.cpp #: editor/plugins/script_editor_plugin.cpp editor/property_selector.cpp @@ -363,6 +531,29 @@ msgstr "" msgid "Search:" msgstr "" +#: editor/asset_library_editor_plugin.cpp editor/code_editor.cpp +#: editor/editor_help.cpp editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp +#: editor/plugins/shader_editor_plugin.cpp editor/project_settings.cpp +msgid "Search" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp editor/editor_node.cpp +#: editor/io_plugins/editor_bitmask_import_plugin.cpp +#: editor/io_plugins/editor_font_import_plugin.cpp +#: editor/io_plugins/editor_mesh_import_plugin.cpp +#: editor/io_plugins/editor_sample_import_plugin.cpp +#: editor/io_plugins/editor_scene_import_plugin.cpp +#: editor/io_plugins/editor_texture_import_plugin.cpp +#: editor/io_plugins/editor_translation_import_plugin.cpp +#: editor/project_manager.cpp +msgid "Import" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp editor/project_settings.cpp +msgid "Plugins" +msgstr "" + #: editor/asset_library_editor_plugin.cpp msgid "Sort:" msgstr "" @@ -376,10 +567,6 @@ msgid "Category:" msgstr "" #: editor/asset_library_editor_plugin.cpp -msgid "All" -msgstr "" - -#: editor/asset_library_editor_plugin.cpp msgid "Site:" msgstr "" @@ -411,20 +598,6 @@ msgstr "" msgid "Call" msgstr "Ring" -#: editor/call_dialog.cpp editor/connections_dialog.cpp -#: editor/export_template_manager.cpp -#: editor/plugins/animation_player_editor_plugin.cpp -#: editor/plugins/canvas_item_editor_plugin.cpp -#: editor/plugins/resource_preloader_editor_plugin.cpp -#: editor/plugins/sample_library_editor_plugin.cpp -#: editor/plugins/script_editor_plugin.cpp -#: editor/plugins/sprite_frames_editor_plugin.cpp editor/project_settings.cpp -#: editor/property_editor.cpp editor/run_settings_dialog.cpp -#: editor/settings_config_dialog.cpp -#: modules/visual_script/visual_script_editor.cpp -msgid "Close" -msgstr "Lukk" - #: editor/call_dialog.cpp msgid "Method List:" msgstr "" @@ -474,13 +647,6 @@ msgid "Selection Only" msgstr "" #: editor/code_editor.cpp editor/editor_help.cpp -#: editor/plugins/script_editor_plugin.cpp -#: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp editor/project_settings.cpp -msgid "Search" -msgstr "" - -#: editor/code_editor.cpp editor/editor_help.cpp msgid "Find" msgstr "" @@ -630,11 +796,6 @@ msgstr "" msgid "Matches:" msgstr "" -#: editor/create_dialog.cpp editor/editor_help.cpp editor/property_selector.cpp -#: editor/script_editor_debugger.cpp -msgid "Description:" -msgstr "" - #: editor/dependency_editor.cpp msgid "Search Replacement For:" msgstr "" @@ -1108,10 +1269,6 @@ msgstr "" msgid "Clear" msgstr "" -#: editor/editor_node.cpp -msgid "Node From Scene" -msgstr "" - #: editor/editor_node.cpp editor/plugins/animation_player_editor_plugin.cpp #: editor/resources_dock.cpp msgid "Error saving resource!" @@ -1476,21 +1633,6 @@ msgid "Distraction Free Mode" msgstr "" #: editor/editor_node.cpp -msgid "Import assets to the project." -msgstr "" - -#: editor/editor_node.cpp editor/io_plugins/editor_bitmask_import_plugin.cpp -#: editor/io_plugins/editor_font_import_plugin.cpp -#: editor/io_plugins/editor_mesh_import_plugin.cpp -#: editor/io_plugins/editor_sample_import_plugin.cpp -#: editor/io_plugins/editor_scene_import_plugin.cpp -#: editor/io_plugins/editor_texture_import_plugin.cpp -#: editor/io_plugins/editor_translation_import_plugin.cpp -#: editor/project_manager.cpp -msgid "Import" -msgstr "" - -#: editor/editor_node.cpp msgid "Miscellaneous project or scene-wide tools." msgstr "" @@ -1759,10 +1901,6 @@ msgid "Installed Plugins:" msgstr "" #: editor/editor_plugin_settings.cpp -msgid "Version:" -msgstr "" - -#: editor/editor_plugin_settings.cpp msgid "Author:" msgstr "" @@ -3732,6 +3870,10 @@ msgid "A processor material of type 'ParticlesMaterial' is required." msgstr "" #: editor/plugins/particles_editor_plugin.cpp +msgid "Generating AABB" +msgstr "" + +#: editor/plugins/particles_editor_plugin.cpp msgid "Faces contain no area!" msgstr "" @@ -3779,6 +3921,14 @@ msgstr "" msgid "Emission Source: " msgstr "" +#: editor/plugins/particles_editor_plugin.cpp +msgid "Generate Visibility AABB" +msgstr "" + +#: editor/plugins/particles_editor_plugin.cpp +msgid "Generation Time (sec):" +msgstr "" + #: editor/plugins/path_2d_editor_plugin.cpp msgid "Remove Point from Curve" msgstr "" @@ -4228,6 +4378,14 @@ msgid "Trim Trailing Whitespace" msgstr "" #: editor/plugins/script_text_editor.cpp +msgid "Convert Indent To Spaces" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Convert Indent To Tabs" +msgstr "" + +#: editor/plugins/script_text_editor.cpp msgid "Auto Indent" msgstr "" @@ -5084,11 +5242,11 @@ msgid "Invalid project path, the path must exist!" msgstr "" #: editor/project_manager.cpp -msgid "Invalid project path, godot.cfg must not exist." +msgid "Invalid project path, *.godot must not exist." msgstr "" #: editor/project_manager.cpp -msgid "Invalid project path, godot.cfg must exist." +msgid "Invalid project path, *.godot must exist." msgstr "" #: editor/project_manager.cpp @@ -5100,7 +5258,7 @@ msgid "Invalid project path (changed anything?)." msgstr "" #: editor/project_manager.cpp -msgid "Couldn't create godot.cfg in project path." +msgid "Couldn't create *.godot project file in project path." msgstr "" #: editor/project_manager.cpp @@ -5136,10 +5294,6 @@ msgid "Install Project:" msgstr "" #: editor/project_manager.cpp -msgid "Install" -msgstr "" - -#: editor/project_manager.cpp msgid "Browse" msgstr "" @@ -5198,6 +5352,10 @@ msgid "New Project" msgstr "" #: editor/project_manager.cpp +msgid "Templates" +msgstr "" + +#: editor/project_manager.cpp msgid "Exit" msgstr "" @@ -5381,7 +5539,7 @@ msgid "Remove Resource Remap Option" msgstr "" #: editor/project_settings.cpp -msgid "Project Settings (godot.cfg)" +msgid "Project Settings " msgstr "" #: editor/project_settings.cpp editor/settings_config_dialog.cpp @@ -5448,10 +5606,6 @@ msgstr "" msgid "AutoLoad" msgstr "" -#: editor/project_settings.cpp -msgid "Plugins" -msgstr "" - #: editor/property_editor.cpp msgid "Pick a Viewport" msgstr "" @@ -6053,6 +6207,10 @@ msgid "Change Notifier Extents" msgstr "" #: editor/spatial_editor_gizmos.cpp +msgid "Change Particles AABB" +msgstr "" + +#: editor/spatial_editor_gizmos.cpp msgid "Change Probe Extents" msgstr "" @@ -6598,6 +6756,17 @@ msgid "" "It only provides navigation data." msgstr "" +#: scene/3d/particles.cpp +msgid "" +"Nothing is visible because meshes have not been assigned to draw passes." +msgstr "" + +#: scene/3d/particles.cpp +msgid "" +"A material to process the particles is not assigned, so no behavior is " +"imprinted." +msgstr "" + #: scene/3d/remote_transform.cpp msgid "Path property must point to a valid Spatial node to work." msgstr "" diff --git a/editor/translations/nl.po b/editor/translations/nl.po index 74d75c0a01..55407145d2 100644 --- a/editor/translations/nl.po +++ b/editor/translations/nl.po @@ -357,6 +357,182 @@ msgstr "Wijzig Array Waarde Type" msgid "Change Array Value" msgstr "Wijzig Array Waarde" +#: editor/asset_library_editor_plugin.cpp +msgid "Free" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp editor/editor_plugin_settings.cpp +msgid "Version:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Contents:" +msgstr "Constanten:" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "View Files" +msgstr "Bestand:" + +#: editor/asset_library_editor_plugin.cpp editor/create_dialog.cpp +#: editor/editor_help.cpp editor/property_selector.cpp +#: editor/script_editor_debugger.cpp +msgid "Description:" +msgstr "Omschrijving:" + +#: editor/asset_library_editor_plugin.cpp editor/project_manager.cpp +msgid "Install" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp editor/call_dialog.cpp +#: editor/connections_dialog.cpp editor/export_template_manager.cpp +#: editor/plugins/animation_player_editor_plugin.cpp +#: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/resource_preloader_editor_plugin.cpp +#: editor/plugins/sample_library_editor_plugin.cpp +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/sprite_frames_editor_plugin.cpp editor/project_settings.cpp +#: editor/property_editor.cpp editor/run_settings_dialog.cpp +#: editor/settings_config_dialog.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Close" +msgstr "Sluiten" + +#: editor/asset_library_editor_plugin.cpp +msgid "Can't resolve hostname:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Can't resolve." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Connection error, please try again." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Can't connect." +msgstr "Verbind.." + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Can't connect to host:" +msgstr "Verbind Aan Node:" + +#: editor/asset_library_editor_plugin.cpp +msgid "No response from host:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "No response." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Request failed, return code:" +msgstr "Opgevraagde bestandsformaat onbekend:" + +#: editor/asset_library_editor_plugin.cpp +msgid "Req. Failed." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Request failed, too many redirects" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Redirect Loop." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Failed:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Bad download hash, assuming file has been tampered with." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Expected:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Got:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Failed sha256 hash check" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Asset Download Error:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Success!" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Fetching:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Resolving.." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Connecting.." +msgstr "Verbind.." + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Requesting.." +msgstr "Testen" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Error making request" +msgstr "Error bij het opslaan van resource!" + +#: editor/asset_library_editor_plugin.cpp +msgid "Idle" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Retry" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Download Error" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Download for this asset is already in progress!" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "first" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "prev" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "next" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "last" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "All" +msgstr "Alle" + #: editor/asset_library_editor_plugin.cpp editor/create_dialog.cpp #: editor/editor_help.cpp editor/editor_node.cpp #: editor/plugins/script_editor_plugin.cpp editor/property_selector.cpp @@ -364,6 +540,29 @@ msgstr "Wijzig Array Waarde" msgid "Search:" msgstr "Zoeken:" +#: editor/asset_library_editor_plugin.cpp editor/code_editor.cpp +#: editor/editor_help.cpp editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp +#: editor/plugins/shader_editor_plugin.cpp editor/project_settings.cpp +msgid "Search" +msgstr "Zoeken" + +#: editor/asset_library_editor_plugin.cpp editor/editor_node.cpp +#: editor/io_plugins/editor_bitmask_import_plugin.cpp +#: editor/io_plugins/editor_font_import_plugin.cpp +#: editor/io_plugins/editor_mesh_import_plugin.cpp +#: editor/io_plugins/editor_sample_import_plugin.cpp +#: editor/io_plugins/editor_scene_import_plugin.cpp +#: editor/io_plugins/editor_texture_import_plugin.cpp +#: editor/io_plugins/editor_translation_import_plugin.cpp +#: editor/project_manager.cpp +msgid "Import" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp editor/project_settings.cpp +msgid "Plugins" +msgstr "" + #: editor/asset_library_editor_plugin.cpp msgid "Sort:" msgstr "Sorteren:" @@ -377,10 +576,6 @@ msgid "Category:" msgstr "Categorie:" #: editor/asset_library_editor_plugin.cpp -msgid "All" -msgstr "Alle" - -#: editor/asset_library_editor_plugin.cpp msgid "Site:" msgstr "Site:" @@ -413,20 +608,6 @@ msgstr "Methode Lijst Voor '%s':" msgid "Call" msgstr "Aanroep" -#: editor/call_dialog.cpp editor/connections_dialog.cpp -#: editor/export_template_manager.cpp -#: editor/plugins/animation_player_editor_plugin.cpp -#: editor/plugins/canvas_item_editor_plugin.cpp -#: editor/plugins/resource_preloader_editor_plugin.cpp -#: editor/plugins/sample_library_editor_plugin.cpp -#: editor/plugins/script_editor_plugin.cpp -#: editor/plugins/sprite_frames_editor_plugin.cpp editor/project_settings.cpp -#: editor/property_editor.cpp editor/run_settings_dialog.cpp -#: editor/settings_config_dialog.cpp -#: modules/visual_script/visual_script_editor.cpp -msgid "Close" -msgstr "Sluiten" - #: editor/call_dialog.cpp msgid "Method List:" msgstr "Methode Lijst:" @@ -477,13 +658,6 @@ msgid "Selection Only" msgstr "Alleen Selectie" #: editor/code_editor.cpp editor/editor_help.cpp -#: editor/plugins/script_editor_plugin.cpp -#: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp editor/project_settings.cpp -msgid "Search" -msgstr "Zoeken" - -#: editor/code_editor.cpp editor/editor_help.cpp msgid "Find" msgstr "Zoeken" @@ -636,11 +810,6 @@ msgstr "Recente:" msgid "Matches:" msgstr "Matches:" -#: editor/create_dialog.cpp editor/editor_help.cpp editor/property_selector.cpp -#: editor/script_editor_debugger.cpp -msgid "Description:" -msgstr "Omschrijving:" - #: editor/dependency_editor.cpp msgid "Search Replacement For:" msgstr "Zoek Vervanging Voor:" @@ -1130,10 +1299,6 @@ msgstr " Uitvoer:" msgid "Clear" msgstr "Leegmaken" -#: editor/editor_node.cpp -msgid "Node From Scene" -msgstr "Node Uit Scene" - #: editor/editor_node.cpp editor/plugins/animation_player_editor_plugin.cpp #: editor/resources_dock.cpp msgid "Error saving resource!" @@ -1501,21 +1666,6 @@ msgid "Distraction Free Mode" msgstr "" #: editor/editor_node.cpp -msgid "Import assets to the project." -msgstr "" - -#: editor/editor_node.cpp editor/io_plugins/editor_bitmask_import_plugin.cpp -#: editor/io_plugins/editor_font_import_plugin.cpp -#: editor/io_plugins/editor_mesh_import_plugin.cpp -#: editor/io_plugins/editor_sample_import_plugin.cpp -#: editor/io_plugins/editor_scene_import_plugin.cpp -#: editor/io_plugins/editor_texture_import_plugin.cpp -#: editor/io_plugins/editor_translation_import_plugin.cpp -#: editor/project_manager.cpp -msgid "Import" -msgstr "" - -#: editor/editor_node.cpp msgid "Miscellaneous project or scene-wide tools." msgstr "" @@ -1784,10 +1934,6 @@ msgid "Installed Plugins:" msgstr "" #: editor/editor_plugin_settings.cpp -msgid "Version:" -msgstr "" - -#: editor/editor_plugin_settings.cpp msgid "Author:" msgstr "" @@ -3765,6 +3911,10 @@ msgid "A processor material of type 'ParticlesMaterial' is required." msgstr "" #: editor/plugins/particles_editor_plugin.cpp +msgid "Generating AABB" +msgstr "" + +#: editor/plugins/particles_editor_plugin.cpp msgid "Faces contain no area!" msgstr "" @@ -3812,6 +3962,14 @@ msgstr "" msgid "Emission Source: " msgstr "" +#: editor/plugins/particles_editor_plugin.cpp +msgid "Generate Visibility AABB" +msgstr "" + +#: editor/plugins/particles_editor_plugin.cpp +msgid "Generation Time (sec):" +msgstr "" + #: editor/plugins/path_2d_editor_plugin.cpp msgid "Remove Point from Curve" msgstr "" @@ -4262,6 +4420,14 @@ msgid "Trim Trailing Whitespace" msgstr "" #: editor/plugins/script_text_editor.cpp +msgid "Convert Indent To Spaces" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Convert Indent To Tabs" +msgstr "" + +#: editor/plugins/script_text_editor.cpp msgid "Auto Indent" msgstr "" @@ -5122,11 +5288,11 @@ msgid "Invalid project path, the path must exist!" msgstr "" #: editor/project_manager.cpp -msgid "Invalid project path, godot.cfg must not exist." +msgid "Invalid project path, *.godot must not exist." msgstr "" #: editor/project_manager.cpp -msgid "Invalid project path, godot.cfg must exist." +msgid "Invalid project path, *.godot must exist." msgstr "" #: editor/project_manager.cpp @@ -5138,7 +5304,7 @@ msgid "Invalid project path (changed anything?)." msgstr "" #: editor/project_manager.cpp -msgid "Couldn't create godot.cfg in project path." +msgid "Couldn't create *.godot project file in project path." msgstr "" #: editor/project_manager.cpp @@ -5174,10 +5340,6 @@ msgid "Install Project:" msgstr "" #: editor/project_manager.cpp -msgid "Install" -msgstr "" - -#: editor/project_manager.cpp msgid "Browse" msgstr "" @@ -5236,6 +5398,11 @@ msgid "New Project" msgstr "" #: editor/project_manager.cpp +#, fuzzy +msgid "Templates" +msgstr "Verwijder Selectie" + +#: editor/project_manager.cpp msgid "Exit" msgstr "" @@ -5419,7 +5586,7 @@ msgid "Remove Resource Remap Option" msgstr "" #: editor/project_settings.cpp -msgid "Project Settings (godot.cfg)" +msgid "Project Settings " msgstr "" #: editor/project_settings.cpp editor/settings_config_dialog.cpp @@ -5486,10 +5653,6 @@ msgstr "" msgid "AutoLoad" msgstr "" -#: editor/project_settings.cpp -msgid "Plugins" -msgstr "" - #: editor/property_editor.cpp msgid "Pick a Viewport" msgstr "" @@ -6091,6 +6254,10 @@ msgid "Change Notifier Extents" msgstr "" #: editor/spatial_editor_gizmos.cpp +msgid "Change Particles AABB" +msgstr "" + +#: editor/spatial_editor_gizmos.cpp msgid "Change Probe Extents" msgstr "" @@ -6712,6 +6879,17 @@ msgstr "" "NavigationMeshInstance moet een kind of kleinkind zijn van een Navigation " "node. Het biedt alleen navigatie data." +#: scene/3d/particles.cpp +msgid "" +"Nothing is visible because meshes have not been assigned to draw passes." +msgstr "" + +#: scene/3d/particles.cpp +msgid "" +"A material to process the particles is not assigned, so no behavior is " +"imprinted." +msgstr "" + #: scene/3d/remote_transform.cpp msgid "Path property must point to a valid Spatial node to work." msgstr "" @@ -6789,6 +6967,9 @@ msgstr "" "inhoud direct op het scherm te weergeven. Anders, maak er een RenderTarget " "van en wijs zijn interne texture toe aan een node om te tonen." +#~ msgid "Node From Scene" +#~ msgstr "Node Uit Scene" + #~ msgid "" #~ "A SampleLibrary resource must be created or set in the 'samples' property " #~ "in order for SamplePlayer to play sound." diff --git a/editor/translations/pl.po b/editor/translations/pl.po index 2149564c42..8eb2e9c884 100644 --- a/editor/translations/pl.po +++ b/editor/translations/pl.po @@ -367,6 +367,184 @@ msgstr "ZmieÅ„ Typ Tablicy" msgid "Change Array Value" msgstr "ZmieÅ„ Wartość Tablicy" +#: editor/asset_library_editor_plugin.cpp +msgid "Free" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp editor/editor_plugin_settings.cpp +msgid "Version:" +msgstr "Wersja:" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Contents:" +msgstr "StaÅ‚e:" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "View Files" +msgstr "Plik" + +#: editor/asset_library_editor_plugin.cpp editor/create_dialog.cpp +#: editor/editor_help.cpp editor/property_selector.cpp +#: editor/script_editor_debugger.cpp +msgid "Description:" +msgstr "Opis:" + +#: editor/asset_library_editor_plugin.cpp editor/project_manager.cpp +msgid "Install" +msgstr "Instaluj" + +#: editor/asset_library_editor_plugin.cpp editor/call_dialog.cpp +#: editor/connections_dialog.cpp editor/export_template_manager.cpp +#: editor/plugins/animation_player_editor_plugin.cpp +#: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/resource_preloader_editor_plugin.cpp +#: editor/plugins/sample_library_editor_plugin.cpp +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/sprite_frames_editor_plugin.cpp editor/project_settings.cpp +#: editor/property_editor.cpp editor/run_settings_dialog.cpp +#: editor/settings_config_dialog.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Close" +msgstr "Zamknij" + +#: editor/asset_library_editor_plugin.cpp +msgid "Can't resolve hostname:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Can't resolve." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Connection error, please try again." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Can't connect." +msgstr "PoÅ‚Ä…cz.." + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Can't connect to host:" +msgstr "PodÅ‚Ä…czanie Do WÄ™zÅ‚a:" + +#: editor/asset_library_editor_plugin.cpp +msgid "No response from host:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "No response." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Request failed, return code:" +msgstr "Nieznany format pliku:" + +#: editor/asset_library_editor_plugin.cpp +msgid "Req. Failed." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Request failed, too many redirects" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Redirect Loop." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Failed:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Bad download hash, assuming file has been tampered with." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Expected:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Got:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Failed sha256 hash check" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Asset Download Error:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Success!" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Fetching:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Resolving.." +msgstr "Zapisywanie.." + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Connecting.." +msgstr "PoÅ‚Ä…cz.." + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Requesting.." +msgstr "Testowanie" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Error making request" +msgstr "BÅ‚Ä…d podczas zapisu zasobu!" + +#: editor/asset_library_editor_plugin.cpp +msgid "Idle" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Retry" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Download Error" +msgstr "Wczytaj bÅ‚Ä™dy" + +#: editor/asset_library_editor_plugin.cpp +msgid "Download for this asset is already in progress!" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "first" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "prev" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "next" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "last" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "All" +msgstr "Wszystko" + #: editor/asset_library_editor_plugin.cpp editor/create_dialog.cpp #: editor/editor_help.cpp editor/editor_node.cpp #: editor/plugins/script_editor_plugin.cpp editor/property_selector.cpp @@ -374,6 +552,29 @@ msgstr "ZmieÅ„ Wartość Tablicy" msgid "Search:" msgstr "Szukaj:" +#: editor/asset_library_editor_plugin.cpp editor/code_editor.cpp +#: editor/editor_help.cpp editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp +#: editor/plugins/shader_editor_plugin.cpp editor/project_settings.cpp +msgid "Search" +msgstr "Szukaj" + +#: editor/asset_library_editor_plugin.cpp editor/editor_node.cpp +#: editor/io_plugins/editor_bitmask_import_plugin.cpp +#: editor/io_plugins/editor_font_import_plugin.cpp +#: editor/io_plugins/editor_mesh_import_plugin.cpp +#: editor/io_plugins/editor_sample_import_plugin.cpp +#: editor/io_plugins/editor_scene_import_plugin.cpp +#: editor/io_plugins/editor_texture_import_plugin.cpp +#: editor/io_plugins/editor_translation_import_plugin.cpp +#: editor/project_manager.cpp +msgid "Import" +msgstr "Importuj" + +#: editor/asset_library_editor_plugin.cpp editor/project_settings.cpp +msgid "Plugins" +msgstr "Wtyczki" + #: editor/asset_library_editor_plugin.cpp msgid "Sort:" msgstr "Sortuj:" @@ -387,10 +588,6 @@ msgid "Category:" msgstr "Kategoria:" #: editor/asset_library_editor_plugin.cpp -msgid "All" -msgstr "Wszystko" - -#: editor/asset_library_editor_plugin.cpp msgid "Site:" msgstr "ŹródÅ‚o:" @@ -422,20 +619,6 @@ msgstr "Lista metod '%s':" msgid "Call" msgstr "WywoÅ‚anie" -#: editor/call_dialog.cpp editor/connections_dialog.cpp -#: editor/export_template_manager.cpp -#: editor/plugins/animation_player_editor_plugin.cpp -#: editor/plugins/canvas_item_editor_plugin.cpp -#: editor/plugins/resource_preloader_editor_plugin.cpp -#: editor/plugins/sample_library_editor_plugin.cpp -#: editor/plugins/script_editor_plugin.cpp -#: editor/plugins/sprite_frames_editor_plugin.cpp editor/project_settings.cpp -#: editor/property_editor.cpp editor/run_settings_dialog.cpp -#: editor/settings_config_dialog.cpp -#: modules/visual_script/visual_script_editor.cpp -msgid "Close" -msgstr "Zamknij" - #: editor/call_dialog.cpp msgid "Method List:" msgstr "Lista metod:" @@ -486,13 +669,6 @@ msgid "Selection Only" msgstr "Tylko zaznaczenie" #: editor/code_editor.cpp editor/editor_help.cpp -#: editor/plugins/script_editor_plugin.cpp -#: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp editor/project_settings.cpp -msgid "Search" -msgstr "Szukaj" - -#: editor/code_editor.cpp editor/editor_help.cpp msgid "Find" msgstr "Szukaj" @@ -643,11 +819,6 @@ msgstr "Ostatnie:" msgid "Matches:" msgstr "PasujÄ…ce:" -#: editor/create_dialog.cpp editor/editor_help.cpp editor/property_selector.cpp -#: editor/script_editor_debugger.cpp -msgid "Description:" -msgstr "Opis:" - #: editor/dependency_editor.cpp msgid "Search Replacement For:" msgstr "Znajdź i zamieÅ„:" @@ -1127,10 +1298,6 @@ msgstr " Konsola:" msgid "Clear" msgstr "Wyczyść" -#: editor/editor_node.cpp -msgid "Node From Scene" -msgstr "WÄ™zeÅ‚ ze Sceny" - #: editor/editor_node.cpp editor/plugins/animation_player_editor_plugin.cpp #: editor/resources_dock.cpp msgid "Error saving resource!" @@ -1513,21 +1680,6 @@ msgid "Distraction Free Mode" msgstr "Tryb bez rozproszeÅ„" #: editor/editor_node.cpp -msgid "Import assets to the project." -msgstr "Importuj zasoby do projektu." - -#: editor/editor_node.cpp editor/io_plugins/editor_bitmask_import_plugin.cpp -#: editor/io_plugins/editor_font_import_plugin.cpp -#: editor/io_plugins/editor_mesh_import_plugin.cpp -#: editor/io_plugins/editor_sample_import_plugin.cpp -#: editor/io_plugins/editor_scene_import_plugin.cpp -#: editor/io_plugins/editor_texture_import_plugin.cpp -#: editor/io_plugins/editor_translation_import_plugin.cpp -#: editor/project_manager.cpp -msgid "Import" -msgstr "Importuj" - -#: editor/editor_node.cpp msgid "Miscellaneous project or scene-wide tools." msgstr "" @@ -1814,10 +1966,6 @@ msgid "Installed Plugins:" msgstr "Zainstalowane wtyczki:" #: editor/editor_plugin_settings.cpp -msgid "Version:" -msgstr "Wersja:" - -#: editor/editor_plugin_settings.cpp msgid "Author:" msgstr "Autor:" @@ -3828,6 +3976,11 @@ msgid "A processor material of type 'ParticlesMaterial' is required." msgstr "" #: editor/plugins/particles_editor_plugin.cpp +#, fuzzy +msgid "Generating AABB" +msgstr "Generuj AABB" + +#: editor/plugins/particles_editor_plugin.cpp msgid "Faces contain no area!" msgstr "" @@ -3876,6 +4029,16 @@ msgstr "GÅ‚oÅ›ność" msgid "Emission Source: " msgstr "" +#: editor/plugins/particles_editor_plugin.cpp +#, fuzzy +msgid "Generate Visibility AABB" +msgstr "Generuj AABB" + +#: editor/plugins/particles_editor_plugin.cpp +#, fuzzy +msgid "Generation Time (sec):" +msgstr "Åšredni Czas (sek)" + #: editor/plugins/path_2d_editor_plugin.cpp msgid "Remove Point from Curve" msgstr "" @@ -4328,6 +4491,14 @@ msgid "Trim Trailing Whitespace" msgstr "" #: editor/plugins/script_text_editor.cpp +msgid "Convert Indent To Spaces" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Convert Indent To Tabs" +msgstr "" + +#: editor/plugins/script_text_editor.cpp msgid "Auto Indent" msgstr "" @@ -5195,12 +5366,12 @@ msgstr "Niepoprawna Å›cieżka projektu, Å›cieżka musi istnieć!" #: editor/project_manager.cpp #, fuzzy -msgid "Invalid project path, godot.cfg must not exist." +msgid "Invalid project path, *.godot must not exist." msgstr "Niepoprawna Å›cieżka projektu, engine.cfg nie może istnieć." #: editor/project_manager.cpp #, fuzzy -msgid "Invalid project path, godot.cfg must exist." +msgid "Invalid project path, *.godot must exist." msgstr "Niepoprawna Å›cieżka projektu, engine.cfg musi istnieć." #: editor/project_manager.cpp @@ -5213,7 +5384,7 @@ msgstr "Niepoprawna Å›cieżka projektu (zmienić cokolwiek?)." #: editor/project_manager.cpp #, fuzzy -msgid "Couldn't create godot.cfg in project path." +msgid "Couldn't create *.godot project file in project path." msgstr "Nie można byÅ‚o utworzyć engine.cfg w Å›cieżce projektu." #: editor/project_manager.cpp @@ -5249,10 +5420,6 @@ msgid "Install Project:" msgstr "Zainstaluj projekt:" #: editor/project_manager.cpp -msgid "Install" -msgstr "Instaluj" - -#: editor/project_manager.cpp msgid "Browse" msgstr "Szukaj" @@ -5311,6 +5478,11 @@ msgid "New Project" msgstr "Nowy projekt" #: editor/project_manager.cpp +#, fuzzy +msgid "Templates" +msgstr "UsuÅ„ element" + +#: editor/project_manager.cpp msgid "Exit" msgstr "Wyjdź" @@ -5497,8 +5669,8 @@ msgstr "" #: editor/project_settings.cpp #, fuzzy -msgid "Project Settings (godot.cfg)" -msgstr "Ustawienia projektu (engine.cfg)" +msgid "Project Settings " +msgstr "Ustawienia projektu" #: editor/project_settings.cpp editor/settings_config_dialog.cpp msgid "General" @@ -5564,10 +5736,6 @@ msgstr "" msgid "AutoLoad" msgstr "" -#: editor/project_settings.cpp -msgid "Plugins" -msgstr "Wtyczki" - #: editor/property_editor.cpp msgid "Pick a Viewport" msgstr "" @@ -6186,6 +6354,10 @@ msgid "Change Notifier Extents" msgstr "" #: editor/spatial_editor_gizmos.cpp +msgid "Change Particles AABB" +msgstr "" + +#: editor/spatial_editor_gizmos.cpp #, fuzzy msgid "Change Probe Extents" msgstr "ZmieÅ„ rozmiar Box Shape" @@ -6794,6 +6966,17 @@ msgstr "" "NavigationMeshInstance musi być dzieckiem lub wnukiem wÄ™zÅ‚a typu Navigation. " "UdostÄ™pnia on tylko dane nawigacyjne." +#: scene/3d/particles.cpp +msgid "" +"Nothing is visible because meshes have not been assigned to draw passes." +msgstr "" + +#: scene/3d/particles.cpp +msgid "" +"A material to process the particles is not assigned, so no behavior is " +"imprinted." +msgstr "" + #: scene/3d/remote_transform.cpp #, fuzzy msgid "Path property must point to a valid Spatial node to work." @@ -6872,6 +7055,16 @@ msgstr "" "otrzymaÅ‚ jakiÅ› rozmiar. W przeciwnym wypadku ustawi opcjÄ™ RenderTarget i " "przyporzÄ…dkuj jego teksturÄ™ dla któregoÅ› wÄ™zÅ‚a." +#~ msgid "Node From Scene" +#~ msgstr "WÄ™zeÅ‚ ze Sceny" + +#~ msgid "Import assets to the project." +#~ msgstr "Importuj zasoby do projektu." + +#, fuzzy +#~ msgid "Project Settings (godot.cfg)" +#~ msgstr "Ustawienia projektu (engine.cfg)" + #~ msgid "Surface" #~ msgstr "Powierzchnia" diff --git a/editor/translations/pr.po b/editor/translations/pr.po index 3a8f795eb9..4df9c04664 100644 --- a/editor/translations/pr.po +++ b/editor/translations/pr.po @@ -355,6 +355,174 @@ msgstr "" msgid "Change Array Value" msgstr "" +#: editor/asset_library_editor_plugin.cpp +msgid "Free" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp editor/editor_plugin_settings.cpp +msgid "Version:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Contents:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "View Files" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp editor/create_dialog.cpp +#: editor/editor_help.cpp editor/property_selector.cpp +#: editor/script_editor_debugger.cpp +msgid "Description:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp editor/project_manager.cpp +msgid "Install" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp editor/call_dialog.cpp +#: editor/connections_dialog.cpp editor/export_template_manager.cpp +#: editor/plugins/animation_player_editor_plugin.cpp +#: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/resource_preloader_editor_plugin.cpp +#: editor/plugins/sample_library_editor_plugin.cpp +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/sprite_frames_editor_plugin.cpp editor/project_settings.cpp +#: editor/property_editor.cpp editor/run_settings_dialog.cpp +#: editor/settings_config_dialog.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Close" +msgstr "Close" + +#: editor/asset_library_editor_plugin.cpp +msgid "Can't resolve hostname:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Can't resolve." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Connection error, please try again." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Can't connect." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Can't connect to host:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "No response from host:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "No response." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Request failed, return code:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Req. Failed." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Request failed, too many redirects" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Redirect Loop." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Failed:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Bad download hash, assuming file has been tampered with." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Expected:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Got:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Failed sha256 hash check" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Asset Download Error:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Success!" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Fetching:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Resolving.." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Connecting.." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Requesting.." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Error making request" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Idle" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Retry" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Download Error" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Download for this asset is already in progress!" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "first" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "prev" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "next" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "last" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "All" +msgstr "" + #: editor/asset_library_editor_plugin.cpp editor/create_dialog.cpp #: editor/editor_help.cpp editor/editor_node.cpp #: editor/plugins/script_editor_plugin.cpp editor/property_selector.cpp @@ -362,6 +530,29 @@ msgstr "" msgid "Search:" msgstr "" +#: editor/asset_library_editor_plugin.cpp editor/code_editor.cpp +#: editor/editor_help.cpp editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp +#: editor/plugins/shader_editor_plugin.cpp editor/project_settings.cpp +msgid "Search" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp editor/editor_node.cpp +#: editor/io_plugins/editor_bitmask_import_plugin.cpp +#: editor/io_plugins/editor_font_import_plugin.cpp +#: editor/io_plugins/editor_mesh_import_plugin.cpp +#: editor/io_plugins/editor_sample_import_plugin.cpp +#: editor/io_plugins/editor_scene_import_plugin.cpp +#: editor/io_plugins/editor_texture_import_plugin.cpp +#: editor/io_plugins/editor_translation_import_plugin.cpp +#: editor/project_manager.cpp +msgid "Import" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp editor/project_settings.cpp +msgid "Plugins" +msgstr "" + #: editor/asset_library_editor_plugin.cpp msgid "Sort:" msgstr "" @@ -375,10 +566,6 @@ msgid "Category:" msgstr "" #: editor/asset_library_editor_plugin.cpp -msgid "All" -msgstr "" - -#: editor/asset_library_editor_plugin.cpp msgid "Site:" msgstr "" @@ -410,20 +597,6 @@ msgstr "" msgid "Call" msgstr "Call" -#: editor/call_dialog.cpp editor/connections_dialog.cpp -#: editor/export_template_manager.cpp -#: editor/plugins/animation_player_editor_plugin.cpp -#: editor/plugins/canvas_item_editor_plugin.cpp -#: editor/plugins/resource_preloader_editor_plugin.cpp -#: editor/plugins/sample_library_editor_plugin.cpp -#: editor/plugins/script_editor_plugin.cpp -#: editor/plugins/sprite_frames_editor_plugin.cpp editor/project_settings.cpp -#: editor/property_editor.cpp editor/run_settings_dialog.cpp -#: editor/settings_config_dialog.cpp -#: modules/visual_script/visual_script_editor.cpp -msgid "Close" -msgstr "Close" - #: editor/call_dialog.cpp msgid "Method List:" msgstr "" @@ -473,13 +646,6 @@ msgid "Selection Only" msgstr "" #: editor/code_editor.cpp editor/editor_help.cpp -#: editor/plugins/script_editor_plugin.cpp -#: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp editor/project_settings.cpp -msgid "Search" -msgstr "" - -#: editor/code_editor.cpp editor/editor_help.cpp msgid "Find" msgstr "" @@ -629,11 +795,6 @@ msgstr "" msgid "Matches:" msgstr "" -#: editor/create_dialog.cpp editor/editor_help.cpp editor/property_selector.cpp -#: editor/script_editor_debugger.cpp -msgid "Description:" -msgstr "" - #: editor/dependency_editor.cpp msgid "Search Replacement For:" msgstr "" @@ -1107,10 +1268,6 @@ msgstr "" msgid "Clear" msgstr "" -#: editor/editor_node.cpp -msgid "Node From Scene" -msgstr "" - #: editor/editor_node.cpp editor/plugins/animation_player_editor_plugin.cpp #: editor/resources_dock.cpp msgid "Error saving resource!" @@ -1475,21 +1632,6 @@ msgid "Distraction Free Mode" msgstr "" #: editor/editor_node.cpp -msgid "Import assets to the project." -msgstr "" - -#: editor/editor_node.cpp editor/io_plugins/editor_bitmask_import_plugin.cpp -#: editor/io_plugins/editor_font_import_plugin.cpp -#: editor/io_plugins/editor_mesh_import_plugin.cpp -#: editor/io_plugins/editor_sample_import_plugin.cpp -#: editor/io_plugins/editor_scene_import_plugin.cpp -#: editor/io_plugins/editor_texture_import_plugin.cpp -#: editor/io_plugins/editor_translation_import_plugin.cpp -#: editor/project_manager.cpp -msgid "Import" -msgstr "" - -#: editor/editor_node.cpp msgid "Miscellaneous project or scene-wide tools." msgstr "" @@ -1758,10 +1900,6 @@ msgid "Installed Plugins:" msgstr "" #: editor/editor_plugin_settings.cpp -msgid "Version:" -msgstr "" - -#: editor/editor_plugin_settings.cpp msgid "Author:" msgstr "" @@ -3733,6 +3871,10 @@ msgid "A processor material of type 'ParticlesMaterial' is required." msgstr "" #: editor/plugins/particles_editor_plugin.cpp +msgid "Generating AABB" +msgstr "" + +#: editor/plugins/particles_editor_plugin.cpp msgid "Faces contain no area!" msgstr "" @@ -3780,6 +3922,14 @@ msgstr "" msgid "Emission Source: " msgstr "" +#: editor/plugins/particles_editor_plugin.cpp +msgid "Generate Visibility AABB" +msgstr "" + +#: editor/plugins/particles_editor_plugin.cpp +msgid "Generation Time (sec):" +msgstr "" + #: editor/plugins/path_2d_editor_plugin.cpp msgid "Remove Point from Curve" msgstr "" @@ -4229,6 +4379,14 @@ msgid "Trim Trailing Whitespace" msgstr "" #: editor/plugins/script_text_editor.cpp +msgid "Convert Indent To Spaces" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Convert Indent To Tabs" +msgstr "" + +#: editor/plugins/script_text_editor.cpp msgid "Auto Indent" msgstr "" @@ -5085,11 +5243,11 @@ msgid "Invalid project path, the path must exist!" msgstr "" #: editor/project_manager.cpp -msgid "Invalid project path, godot.cfg must not exist." +msgid "Invalid project path, *.godot must not exist." msgstr "" #: editor/project_manager.cpp -msgid "Invalid project path, godot.cfg must exist." +msgid "Invalid project path, *.godot must exist." msgstr "" #: editor/project_manager.cpp @@ -5101,7 +5259,7 @@ msgid "Invalid project path (changed anything?)." msgstr "" #: editor/project_manager.cpp -msgid "Couldn't create godot.cfg in project path." +msgid "Couldn't create *.godot project file in project path." msgstr "" #: editor/project_manager.cpp @@ -5137,10 +5295,6 @@ msgid "Install Project:" msgstr "" #: editor/project_manager.cpp -msgid "Install" -msgstr "" - -#: editor/project_manager.cpp msgid "Browse" msgstr "" @@ -5199,6 +5353,11 @@ msgid "New Project" msgstr "" #: editor/project_manager.cpp +#, fuzzy +msgid "Templates" +msgstr "Discharge ye' Variable" + +#: editor/project_manager.cpp msgid "Exit" msgstr "" @@ -5382,7 +5541,7 @@ msgid "Remove Resource Remap Option" msgstr "" #: editor/project_settings.cpp -msgid "Project Settings (godot.cfg)" +msgid "Project Settings " msgstr "" #: editor/project_settings.cpp editor/settings_config_dialog.cpp @@ -5449,10 +5608,6 @@ msgstr "" msgid "AutoLoad" msgstr "" -#: editor/project_settings.cpp -msgid "Plugins" -msgstr "" - #: editor/property_editor.cpp msgid "Pick a Viewport" msgstr "" @@ -6054,6 +6209,10 @@ msgid "Change Notifier Extents" msgstr "" #: editor/spatial_editor_gizmos.cpp +msgid "Change Particles AABB" +msgstr "" + +#: editor/spatial_editor_gizmos.cpp msgid "Change Probe Extents" msgstr "" @@ -6618,6 +6777,17 @@ msgid "" "It only provides navigation data." msgstr "" +#: scene/3d/particles.cpp +msgid "" +"Nothing is visible because meshes have not been assigned to draw passes." +msgstr "" + +#: scene/3d/particles.cpp +msgid "" +"A material to process the particles is not assigned, so no behavior is " +"imprinted." +msgstr "" + #: scene/3d/remote_transform.cpp msgid "Path property must point to a valid Spatial node to work." msgstr "" diff --git a/editor/translations/pt_BR.po b/editor/translations/pt_BR.po index 6962fb5db7..75be59068c 100644 --- a/editor/translations/pt_BR.po +++ b/editor/translations/pt_BR.po @@ -363,6 +363,184 @@ msgstr "Alterar Tipo de Valor do Vetor" msgid "Change Array Value" msgstr "Alterar Valor do Vetor" +#: editor/asset_library_editor_plugin.cpp +msgid "Free" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp editor/editor_plugin_settings.cpp +msgid "Version:" +msgstr "Versão:" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Contents:" +msgstr "Constantes:" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "View Files" +msgstr "Arquivo" + +#: editor/asset_library_editor_plugin.cpp editor/create_dialog.cpp +#: editor/editor_help.cpp editor/property_selector.cpp +#: editor/script_editor_debugger.cpp +msgid "Description:" +msgstr "Descrição:" + +#: editor/asset_library_editor_plugin.cpp editor/project_manager.cpp +msgid "Install" +msgstr "Instalar" + +#: editor/asset_library_editor_plugin.cpp editor/call_dialog.cpp +#: editor/connections_dialog.cpp editor/export_template_manager.cpp +#: editor/plugins/animation_player_editor_plugin.cpp +#: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/resource_preloader_editor_plugin.cpp +#: editor/plugins/sample_library_editor_plugin.cpp +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/sprite_frames_editor_plugin.cpp editor/project_settings.cpp +#: editor/property_editor.cpp editor/run_settings_dialog.cpp +#: editor/settings_config_dialog.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Close" +msgstr "Fechar" + +#: editor/asset_library_editor_plugin.cpp +msgid "Can't resolve hostname:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Can't resolve." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Connection error, please try again." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Can't connect." +msgstr "Conectar..." + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Can't connect to host:" +msgstr "Conectar ao Nó:" + +#: editor/asset_library_editor_plugin.cpp +msgid "No response from host:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "No response." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Request failed, return code:" +msgstr "Formato de arquivo requisitado desconhecido:" + +#: editor/asset_library_editor_plugin.cpp +msgid "Req. Failed." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Request failed, too many redirects" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Redirect Loop." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Failed:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Bad download hash, assuming file has been tampered with." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Expected:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Got:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Failed sha256 hash check" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Asset Download Error:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Success!" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Fetching:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Resolving.." +msgstr "Salvando..." + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Connecting.." +msgstr "Conectar..." + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Requesting.." +msgstr "Em teste" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Error making request" +msgstr "Erro ao salvar Recurso!" + +#: editor/asset_library_editor_plugin.cpp +msgid "Idle" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Retry" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Download Error" +msgstr "Abaixo" + +#: editor/asset_library_editor_plugin.cpp +msgid "Download for this asset is already in progress!" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "first" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "prev" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "next" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "last" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "All" +msgstr "Todos" + #: editor/asset_library_editor_plugin.cpp editor/create_dialog.cpp #: editor/editor_help.cpp editor/editor_node.cpp #: editor/plugins/script_editor_plugin.cpp editor/property_selector.cpp @@ -370,6 +548,29 @@ msgstr "Alterar Valor do Vetor" msgid "Search:" msgstr "Pesquisar:" +#: editor/asset_library_editor_plugin.cpp editor/code_editor.cpp +#: editor/editor_help.cpp editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp +#: editor/plugins/shader_editor_plugin.cpp editor/project_settings.cpp +msgid "Search" +msgstr "Pesquisar" + +#: editor/asset_library_editor_plugin.cpp editor/editor_node.cpp +#: editor/io_plugins/editor_bitmask_import_plugin.cpp +#: editor/io_plugins/editor_font_import_plugin.cpp +#: editor/io_plugins/editor_mesh_import_plugin.cpp +#: editor/io_plugins/editor_sample_import_plugin.cpp +#: editor/io_plugins/editor_scene_import_plugin.cpp +#: editor/io_plugins/editor_texture_import_plugin.cpp +#: editor/io_plugins/editor_translation_import_plugin.cpp +#: editor/project_manager.cpp +msgid "Import" +msgstr "Importar" + +#: editor/asset_library_editor_plugin.cpp editor/project_settings.cpp +msgid "Plugins" +msgstr "Plugins" + #: editor/asset_library_editor_plugin.cpp msgid "Sort:" msgstr "Ordenar:" @@ -383,10 +584,6 @@ msgid "Category:" msgstr "Categoria:" #: editor/asset_library_editor_plugin.cpp -msgid "All" -msgstr "Todos" - -#: editor/asset_library_editor_plugin.cpp msgid "Site:" msgstr "Site:" @@ -418,20 +615,6 @@ msgstr "Lista de Métodos para \"%s\":" msgid "Call" msgstr "Chamar" -#: editor/call_dialog.cpp editor/connections_dialog.cpp -#: editor/export_template_manager.cpp -#: editor/plugins/animation_player_editor_plugin.cpp -#: editor/plugins/canvas_item_editor_plugin.cpp -#: editor/plugins/resource_preloader_editor_plugin.cpp -#: editor/plugins/sample_library_editor_plugin.cpp -#: editor/plugins/script_editor_plugin.cpp -#: editor/plugins/sprite_frames_editor_plugin.cpp editor/project_settings.cpp -#: editor/property_editor.cpp editor/run_settings_dialog.cpp -#: editor/settings_config_dialog.cpp -#: modules/visual_script/visual_script_editor.cpp -msgid "Close" -msgstr "Fechar" - #: editor/call_dialog.cpp msgid "Method List:" msgstr "Lista de Métodos:" @@ -482,13 +665,6 @@ msgid "Selection Only" msgstr "Apenas na Seleção" #: editor/code_editor.cpp editor/editor_help.cpp -#: editor/plugins/script_editor_plugin.cpp -#: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp editor/project_settings.cpp -msgid "Search" -msgstr "Pesquisar" - -#: editor/code_editor.cpp editor/editor_help.cpp msgid "Find" msgstr "Localizar" @@ -638,11 +814,6 @@ msgstr "Recente:" msgid "Matches:" msgstr "Combinações:" -#: editor/create_dialog.cpp editor/editor_help.cpp editor/property_selector.cpp -#: editor/script_editor_debugger.cpp -msgid "Description:" -msgstr "Descrição:" - #: editor/dependency_editor.cpp msgid "Search Replacement For:" msgstr "Buscar Substituição Para:" @@ -1129,10 +1300,6 @@ msgstr " SaÃda:" msgid "Clear" msgstr "Limpar" -#: editor/editor_node.cpp -msgid "Node From Scene" -msgstr "Nó a Partir de Cena" - #: editor/editor_node.cpp editor/plugins/animation_player_editor_plugin.cpp #: editor/resources_dock.cpp msgid "Error saving resource!" @@ -1513,21 +1680,6 @@ msgid "Distraction Free Mode" msgstr "Modo Sem Distrações" #: editor/editor_node.cpp -msgid "Import assets to the project." -msgstr "Importar assets ao projeto." - -#: editor/editor_node.cpp editor/io_plugins/editor_bitmask_import_plugin.cpp -#: editor/io_plugins/editor_font_import_plugin.cpp -#: editor/io_plugins/editor_mesh_import_plugin.cpp -#: editor/io_plugins/editor_sample_import_plugin.cpp -#: editor/io_plugins/editor_scene_import_plugin.cpp -#: editor/io_plugins/editor_texture_import_plugin.cpp -#: editor/io_plugins/editor_translation_import_plugin.cpp -#: editor/project_manager.cpp -msgid "Import" -msgstr "Importar" - -#: editor/editor_node.cpp msgid "Miscellaneous project or scene-wide tools." msgstr "Ferramentas diversas atuantes no projeto ou cena." @@ -1817,10 +1969,6 @@ msgid "Installed Plugins:" msgstr "Plugins Instalados:" #: editor/editor_plugin_settings.cpp -msgid "Version:" -msgstr "Versão:" - -#: editor/editor_plugin_settings.cpp msgid "Author:" msgstr "Autor:" @@ -3839,6 +3987,11 @@ msgid "A processor material of type 'ParticlesMaterial' is required." msgstr "" #: editor/plugins/particles_editor_plugin.cpp +#, fuzzy +msgid "Generating AABB" +msgstr "Gerar AABB" + +#: editor/plugins/particles_editor_plugin.cpp msgid "Faces contain no area!" msgstr "As faces não têm área!" @@ -3891,6 +4044,16 @@ msgstr "Volume" msgid "Emission Source: " msgstr "Preenchimento de Emissão:" +#: editor/plugins/particles_editor_plugin.cpp +#, fuzzy +msgid "Generate Visibility AABB" +msgstr "Gerar AABB" + +#: editor/plugins/particles_editor_plugin.cpp +#, fuzzy +msgid "Generation Time (sec):" +msgstr "Tempo Médio (seg)" + #: editor/plugins/path_2d_editor_plugin.cpp msgid "Remove Point from Curve" msgstr "Remover Ponto da Curva" @@ -4347,6 +4510,14 @@ msgid "Trim Trailing Whitespace" msgstr "Apagar Espaços em Branco" #: editor/plugins/script_text_editor.cpp +msgid "Convert Indent To Spaces" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Convert Indent To Tabs" +msgstr "" + +#: editor/plugins/script_text_editor.cpp msgid "Auto Indent" msgstr "Auto Recuar" @@ -5223,12 +5394,12 @@ msgstr "Caminho de projeto inválido, o caminho deve existir!" #: editor/project_manager.cpp #, fuzzy -msgid "Invalid project path, godot.cfg must not exist." +msgid "Invalid project path, *.godot must not exist." msgstr "Caminho de projeto inválido, engine.cfg não deve existir." #: editor/project_manager.cpp #, fuzzy -msgid "Invalid project path, godot.cfg must exist." +msgid "Invalid project path, *.godot must exist." msgstr "Caminho de projeto inválido, engine.cfg deve existir." #: editor/project_manager.cpp @@ -5241,7 +5412,7 @@ msgstr "Caminho de projeto inválido (mudou alguma coisa?)." #: editor/project_manager.cpp #, fuzzy -msgid "Couldn't create godot.cfg in project path." +msgid "Couldn't create *.godot project file in project path." msgstr "Não se pôde criar engine.cfg no caminho do projeto." #: editor/project_manager.cpp @@ -5277,10 +5448,6 @@ msgid "Install Project:" msgstr "Instalar Projeto:" #: editor/project_manager.cpp -msgid "Install" -msgstr "Instalar" - -#: editor/project_manager.cpp msgid "Browse" msgstr "Navegar" @@ -5342,6 +5509,11 @@ msgid "New Project" msgstr "Novo Projeto" #: editor/project_manager.cpp +#, fuzzy +msgid "Templates" +msgstr "Remover Item" + +#: editor/project_manager.cpp msgid "Exit" msgstr "Sair" @@ -5528,8 +5700,8 @@ msgstr "Remover Opção de Remapeamento de Recurso" #: editor/project_settings.cpp #, fuzzy -msgid "Project Settings (godot.cfg)" -msgstr "Configurações do Projeto (engine.cfg)" +msgid "Project Settings " +msgstr "Configurações do Projeto" #: editor/project_settings.cpp editor/settings_config_dialog.cpp msgid "General" @@ -5595,10 +5767,6 @@ msgstr "Localidade" msgid "AutoLoad" msgstr "AutoLoad" -#: editor/project_settings.cpp -msgid "Plugins" -msgstr "Plugins" - #: editor/property_editor.cpp #, fuzzy msgid "Pick a Viewport" @@ -6220,6 +6388,10 @@ msgid "Change Notifier Extents" msgstr "Alterar a Extensão do Notificador" #: editor/spatial_editor_gizmos.cpp +msgid "Change Particles AABB" +msgstr "" + +#: editor/spatial_editor_gizmos.cpp #, fuzzy msgid "Change Probe Extents" msgstr "Alterar a Extensão do Notificador" @@ -6825,6 +6997,17 @@ msgstr "" "NavigationMeshInstance deve ser filho ou neto de um nó Navigation. Ele " "apenas fornece dados de navegação." +#: scene/3d/particles.cpp +msgid "" +"Nothing is visible because meshes have not been assigned to draw passes." +msgstr "" + +#: scene/3d/particles.cpp +msgid "" +"A material to process the particles is not assigned, so no behavior is " +"imprinted." +msgstr "" + #: scene/3d/remote_transform.cpp #, fuzzy msgid "Path property must point to a valid Spatial node to work." @@ -6902,6 +7085,16 @@ msgstr "" "para que ele possa ter um tamanho. Caso contrário, defina-o como destino de " "render e atribua sua textura interna a algum nó para exibir." +#~ msgid "Node From Scene" +#~ msgstr "Nó a Partir de Cena" + +#~ msgid "Import assets to the project." +#~ msgstr "Importar assets ao projeto." + +#, fuzzy +#~ msgid "Project Settings (godot.cfg)" +#~ msgstr "Configurações do Projeto (engine.cfg)" + #~ msgid "Surface" #~ msgstr "SuperfÃcie" diff --git a/editor/translations/pt_PT.po b/editor/translations/pt_PT.po index 329ec9c053..913455b999 100644 --- a/editor/translations/pt_PT.po +++ b/editor/translations/pt_PT.po @@ -355,6 +355,174 @@ msgstr "" msgid "Change Array Value" msgstr "" +#: editor/asset_library_editor_plugin.cpp +msgid "Free" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp editor/editor_plugin_settings.cpp +msgid "Version:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Contents:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "View Files" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp editor/create_dialog.cpp +#: editor/editor_help.cpp editor/property_selector.cpp +#: editor/script_editor_debugger.cpp +msgid "Description:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp editor/project_manager.cpp +msgid "Install" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp editor/call_dialog.cpp +#: editor/connections_dialog.cpp editor/export_template_manager.cpp +#: editor/plugins/animation_player_editor_plugin.cpp +#: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/resource_preloader_editor_plugin.cpp +#: editor/plugins/sample_library_editor_plugin.cpp +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/sprite_frames_editor_plugin.cpp editor/project_settings.cpp +#: editor/property_editor.cpp editor/run_settings_dialog.cpp +#: editor/settings_config_dialog.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Close" +msgstr "Fechar" + +#: editor/asset_library_editor_plugin.cpp +msgid "Can't resolve hostname:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Can't resolve." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Connection error, please try again." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Can't connect." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Can't connect to host:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "No response from host:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "No response." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Request failed, return code:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Req. Failed." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Request failed, too many redirects" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Redirect Loop." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Failed:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Bad download hash, assuming file has been tampered with." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Expected:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Got:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Failed sha256 hash check" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Asset Download Error:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Success!" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Fetching:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Resolving.." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Connecting.." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Requesting.." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Error making request" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Idle" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Retry" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Download Error" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Download for this asset is already in progress!" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "first" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "prev" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "next" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "last" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "All" +msgstr "" + #: editor/asset_library_editor_plugin.cpp editor/create_dialog.cpp #: editor/editor_help.cpp editor/editor_node.cpp #: editor/plugins/script_editor_plugin.cpp editor/property_selector.cpp @@ -362,6 +530,29 @@ msgstr "" msgid "Search:" msgstr "" +#: editor/asset_library_editor_plugin.cpp editor/code_editor.cpp +#: editor/editor_help.cpp editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp +#: editor/plugins/shader_editor_plugin.cpp editor/project_settings.cpp +msgid "Search" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp editor/editor_node.cpp +#: editor/io_plugins/editor_bitmask_import_plugin.cpp +#: editor/io_plugins/editor_font_import_plugin.cpp +#: editor/io_plugins/editor_mesh_import_plugin.cpp +#: editor/io_plugins/editor_sample_import_plugin.cpp +#: editor/io_plugins/editor_scene_import_plugin.cpp +#: editor/io_plugins/editor_texture_import_plugin.cpp +#: editor/io_plugins/editor_translation_import_plugin.cpp +#: editor/project_manager.cpp +msgid "Import" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp editor/project_settings.cpp +msgid "Plugins" +msgstr "" + #: editor/asset_library_editor_plugin.cpp msgid "Sort:" msgstr "" @@ -375,10 +566,6 @@ msgid "Category:" msgstr "" #: editor/asset_library_editor_plugin.cpp -msgid "All" -msgstr "" - -#: editor/asset_library_editor_plugin.cpp msgid "Site:" msgstr "" @@ -410,20 +597,6 @@ msgstr "" msgid "Call" msgstr "" -#: editor/call_dialog.cpp editor/connections_dialog.cpp -#: editor/export_template_manager.cpp -#: editor/plugins/animation_player_editor_plugin.cpp -#: editor/plugins/canvas_item_editor_plugin.cpp -#: editor/plugins/resource_preloader_editor_plugin.cpp -#: editor/plugins/sample_library_editor_plugin.cpp -#: editor/plugins/script_editor_plugin.cpp -#: editor/plugins/sprite_frames_editor_plugin.cpp editor/project_settings.cpp -#: editor/property_editor.cpp editor/run_settings_dialog.cpp -#: editor/settings_config_dialog.cpp -#: modules/visual_script/visual_script_editor.cpp -msgid "Close" -msgstr "Fechar" - #: editor/call_dialog.cpp msgid "Method List:" msgstr "" @@ -473,13 +646,6 @@ msgid "Selection Only" msgstr "" #: editor/code_editor.cpp editor/editor_help.cpp -#: editor/plugins/script_editor_plugin.cpp -#: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp editor/project_settings.cpp -msgid "Search" -msgstr "" - -#: editor/code_editor.cpp editor/editor_help.cpp msgid "Find" msgstr "" @@ -629,11 +795,6 @@ msgstr "" msgid "Matches:" msgstr "" -#: editor/create_dialog.cpp editor/editor_help.cpp editor/property_selector.cpp -#: editor/script_editor_debugger.cpp -msgid "Description:" -msgstr "" - #: editor/dependency_editor.cpp msgid "Search Replacement For:" msgstr "" @@ -1107,10 +1268,6 @@ msgstr "" msgid "Clear" msgstr "" -#: editor/editor_node.cpp -msgid "Node From Scene" -msgstr "" - #: editor/editor_node.cpp editor/plugins/animation_player_editor_plugin.cpp #: editor/resources_dock.cpp msgid "Error saving resource!" @@ -1475,21 +1632,6 @@ msgid "Distraction Free Mode" msgstr "" #: editor/editor_node.cpp -msgid "Import assets to the project." -msgstr "" - -#: editor/editor_node.cpp editor/io_plugins/editor_bitmask_import_plugin.cpp -#: editor/io_plugins/editor_font_import_plugin.cpp -#: editor/io_plugins/editor_mesh_import_plugin.cpp -#: editor/io_plugins/editor_sample_import_plugin.cpp -#: editor/io_plugins/editor_scene_import_plugin.cpp -#: editor/io_plugins/editor_texture_import_plugin.cpp -#: editor/io_plugins/editor_translation_import_plugin.cpp -#: editor/project_manager.cpp -msgid "Import" -msgstr "" - -#: editor/editor_node.cpp msgid "Miscellaneous project or scene-wide tools." msgstr "" @@ -1758,10 +1900,6 @@ msgid "Installed Plugins:" msgstr "" #: editor/editor_plugin_settings.cpp -msgid "Version:" -msgstr "" - -#: editor/editor_plugin_settings.cpp msgid "Author:" msgstr "" @@ -3732,6 +3870,10 @@ msgid "A processor material of type 'ParticlesMaterial' is required." msgstr "" #: editor/plugins/particles_editor_plugin.cpp +msgid "Generating AABB" +msgstr "" + +#: editor/plugins/particles_editor_plugin.cpp msgid "Faces contain no area!" msgstr "" @@ -3779,6 +3921,14 @@ msgstr "" msgid "Emission Source: " msgstr "" +#: editor/plugins/particles_editor_plugin.cpp +msgid "Generate Visibility AABB" +msgstr "" + +#: editor/plugins/particles_editor_plugin.cpp +msgid "Generation Time (sec):" +msgstr "" + #: editor/plugins/path_2d_editor_plugin.cpp msgid "Remove Point from Curve" msgstr "" @@ -4229,6 +4379,14 @@ msgid "Trim Trailing Whitespace" msgstr "" #: editor/plugins/script_text_editor.cpp +msgid "Convert Indent To Spaces" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Convert Indent To Tabs" +msgstr "" + +#: editor/plugins/script_text_editor.cpp msgid "Auto Indent" msgstr "" @@ -5085,11 +5243,11 @@ msgid "Invalid project path, the path must exist!" msgstr "" #: editor/project_manager.cpp -msgid "Invalid project path, godot.cfg must not exist." +msgid "Invalid project path, *.godot must not exist." msgstr "" #: editor/project_manager.cpp -msgid "Invalid project path, godot.cfg must exist." +msgid "Invalid project path, *.godot must exist." msgstr "" #: editor/project_manager.cpp @@ -5101,7 +5259,7 @@ msgid "Invalid project path (changed anything?)." msgstr "" #: editor/project_manager.cpp -msgid "Couldn't create godot.cfg in project path." +msgid "Couldn't create *.godot project file in project path." msgstr "" #: editor/project_manager.cpp @@ -5137,10 +5295,6 @@ msgid "Install Project:" msgstr "" #: editor/project_manager.cpp -msgid "Install" -msgstr "" - -#: editor/project_manager.cpp msgid "Browse" msgstr "" @@ -5199,6 +5353,11 @@ msgid "New Project" msgstr "" #: editor/project_manager.cpp +#, fuzzy +msgid "Templates" +msgstr "Remover Variável" + +#: editor/project_manager.cpp msgid "Exit" msgstr "" @@ -5382,7 +5541,7 @@ msgid "Remove Resource Remap Option" msgstr "" #: editor/project_settings.cpp -msgid "Project Settings (godot.cfg)" +msgid "Project Settings " msgstr "" #: editor/project_settings.cpp editor/settings_config_dialog.cpp @@ -5449,10 +5608,6 @@ msgstr "" msgid "AutoLoad" msgstr "" -#: editor/project_settings.cpp -msgid "Plugins" -msgstr "" - #: editor/property_editor.cpp msgid "Pick a Viewport" msgstr "" @@ -6053,6 +6208,10 @@ msgid "Change Notifier Extents" msgstr "" #: editor/spatial_editor_gizmos.cpp +msgid "Change Particles AABB" +msgstr "" + +#: editor/spatial_editor_gizmos.cpp msgid "Change Probe Extents" msgstr "" @@ -6606,6 +6765,17 @@ msgid "" "It only provides navigation data." msgstr "" +#: scene/3d/particles.cpp +msgid "" +"Nothing is visible because meshes have not been assigned to draw passes." +msgstr "" + +#: scene/3d/particles.cpp +msgid "" +"A material to process the particles is not assigned, so no behavior is " +"imprinted." +msgstr "" + #: scene/3d/remote_transform.cpp msgid "Path property must point to a valid Spatial node to work." msgstr "" diff --git a/editor/translations/ru.po b/editor/translations/ru.po index 576261f8df..9f7aa6e26a 100644 --- a/editor/translations/ru.po +++ b/editor/translations/ru.po @@ -361,6 +361,184 @@ msgstr "Изменение типа Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ð¼Ð°ÑÑива" msgid "Change Array Value" msgstr "Изменить значение маÑÑива" +#: editor/asset_library_editor_plugin.cpp +msgid "Free" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp editor/editor_plugin_settings.cpp +msgid "Version:" +msgstr "ВерÑиÑ:" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Contents:" +msgstr "КонÑтанты:" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "View Files" +msgstr "Файл" + +#: editor/asset_library_editor_plugin.cpp editor/create_dialog.cpp +#: editor/editor_help.cpp editor/property_selector.cpp +#: editor/script_editor_debugger.cpp +msgid "Description:" +msgstr "ОпиÑание:" + +#: editor/asset_library_editor_plugin.cpp editor/project_manager.cpp +msgid "Install" +msgstr "УÑтановить" + +#: editor/asset_library_editor_plugin.cpp editor/call_dialog.cpp +#: editor/connections_dialog.cpp editor/export_template_manager.cpp +#: editor/plugins/animation_player_editor_plugin.cpp +#: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/resource_preloader_editor_plugin.cpp +#: editor/plugins/sample_library_editor_plugin.cpp +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/sprite_frames_editor_plugin.cpp editor/project_settings.cpp +#: editor/property_editor.cpp editor/run_settings_dialog.cpp +#: editor/settings_config_dialog.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Close" +msgstr "Закрыть" + +#: editor/asset_library_editor_plugin.cpp +msgid "Can't resolve hostname:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Can't resolve." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Connection error, please try again." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Can't connect." +msgstr "ПриÑоединить.." + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Can't connect to host:" +msgstr "ПриÑоединить к узлу:" + +#: editor/asset_library_editor_plugin.cpp +msgid "No response from host:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "No response." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Request failed, return code:" +msgstr "ÐеизвеÑтный формат запрашиваемого файла:" + +#: editor/asset_library_editor_plugin.cpp +msgid "Req. Failed." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Request failed, too many redirects" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Redirect Loop." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Failed:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Bad download hash, assuming file has been tampered with." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Expected:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Got:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Failed sha256 hash check" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Asset Download Error:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Success!" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Fetching:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Resolving.." +msgstr "Сохранение.." + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Connecting.." +msgstr "ПриÑоединить.." + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Requesting.." +msgstr "ТеÑтируемые" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Error making request" +msgstr "Ошибка при Ñохранении реÑурÑа!" + +#: editor/asset_library_editor_plugin.cpp +msgid "Idle" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Retry" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Download Error" +msgstr "Вниз" + +#: editor/asset_library_editor_plugin.cpp +msgid "Download for this asset is already in progress!" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "first" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "prev" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "next" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "last" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "All" +msgstr "Ð’Ñе" + #: editor/asset_library_editor_plugin.cpp editor/create_dialog.cpp #: editor/editor_help.cpp editor/editor_node.cpp #: editor/plugins/script_editor_plugin.cpp editor/property_selector.cpp @@ -368,6 +546,29 @@ msgstr "Изменить значение маÑÑива" msgid "Search:" msgstr "ПоиÑк:" +#: editor/asset_library_editor_plugin.cpp editor/code_editor.cpp +#: editor/editor_help.cpp editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp +#: editor/plugins/shader_editor_plugin.cpp editor/project_settings.cpp +msgid "Search" +msgstr "ПоиÑк" + +#: editor/asset_library_editor_plugin.cpp editor/editor_node.cpp +#: editor/io_plugins/editor_bitmask_import_plugin.cpp +#: editor/io_plugins/editor_font_import_plugin.cpp +#: editor/io_plugins/editor_mesh_import_plugin.cpp +#: editor/io_plugins/editor_sample_import_plugin.cpp +#: editor/io_plugins/editor_scene_import_plugin.cpp +#: editor/io_plugins/editor_texture_import_plugin.cpp +#: editor/io_plugins/editor_translation_import_plugin.cpp +#: editor/project_manager.cpp +msgid "Import" +msgstr "Импорт" + +#: editor/asset_library_editor_plugin.cpp editor/project_settings.cpp +msgid "Plugins" +msgstr "Плагины" + #: editor/asset_library_editor_plugin.cpp msgid "Sort:" msgstr "Сортировать:" @@ -381,10 +582,6 @@ msgid "Category:" msgstr "КатегориÑ:" #: editor/asset_library_editor_plugin.cpp -msgid "All" -msgstr "Ð’Ñе" - -#: editor/asset_library_editor_plugin.cpp msgid "Site:" msgstr "Сайт:" @@ -416,20 +613,6 @@ msgstr "СпиÑок ÑпоÑоб Ð´Ð»Ñ '%s':" msgid "Call" msgstr "Вызов" -#: editor/call_dialog.cpp editor/connections_dialog.cpp -#: editor/export_template_manager.cpp -#: editor/plugins/animation_player_editor_plugin.cpp -#: editor/plugins/canvas_item_editor_plugin.cpp -#: editor/plugins/resource_preloader_editor_plugin.cpp -#: editor/plugins/sample_library_editor_plugin.cpp -#: editor/plugins/script_editor_plugin.cpp -#: editor/plugins/sprite_frames_editor_plugin.cpp editor/project_settings.cpp -#: editor/property_editor.cpp editor/run_settings_dialog.cpp -#: editor/settings_config_dialog.cpp -#: modules/visual_script/visual_script_editor.cpp -msgid "Close" -msgstr "Закрыть" - #: editor/call_dialog.cpp msgid "Method List:" msgstr "СпиÑок методов:" @@ -480,13 +663,6 @@ msgid "Selection Only" msgstr "Только выделÑÑ‚ÑŒ" #: editor/code_editor.cpp editor/editor_help.cpp -#: editor/plugins/script_editor_plugin.cpp -#: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp editor/project_settings.cpp -msgid "Search" -msgstr "ПоиÑк" - -#: editor/code_editor.cpp editor/editor_help.cpp msgid "Find" msgstr "Ðайти" @@ -638,11 +814,6 @@ msgstr "Ðедавнее:" msgid "Matches:" msgstr "СовпадениÑ:" -#: editor/create_dialog.cpp editor/editor_help.cpp editor/property_selector.cpp -#: editor/script_editor_debugger.cpp -msgid "Description:" -msgstr "ОпиÑание:" - #: editor/dependency_editor.cpp msgid "Search Replacement For:" msgstr "ПоиÑк замены длÑ:" @@ -1130,10 +1301,6 @@ msgstr " Вывод:" msgid "Clear" msgstr "ОчиÑтить" -#: editor/editor_node.cpp -msgid "Node From Scene" -msgstr "Узел Ñо Ñцены" - #: editor/editor_node.cpp editor/plugins/animation_player_editor_plugin.cpp #: editor/resources_dock.cpp msgid "Error saving resource!" @@ -1515,21 +1682,6 @@ msgid "Distraction Free Mode" msgstr "Свободный режим" #: editor/editor_node.cpp -msgid "Import assets to the project." -msgstr "Импортировать аÑÑеты в проект." - -#: editor/editor_node.cpp editor/io_plugins/editor_bitmask_import_plugin.cpp -#: editor/io_plugins/editor_font_import_plugin.cpp -#: editor/io_plugins/editor_mesh_import_plugin.cpp -#: editor/io_plugins/editor_sample_import_plugin.cpp -#: editor/io_plugins/editor_scene_import_plugin.cpp -#: editor/io_plugins/editor_texture_import_plugin.cpp -#: editor/io_plugins/editor_translation_import_plugin.cpp -#: editor/project_manager.cpp -msgid "Import" -msgstr "Импорт" - -#: editor/editor_node.cpp msgid "Miscellaneous project or scene-wide tools." msgstr "Прочие инÑтрументы." @@ -1818,10 +1970,6 @@ msgid "Installed Plugins:" msgstr "УÑтановленные плагины:" #: editor/editor_plugin_settings.cpp -msgid "Version:" -msgstr "ВерÑиÑ:" - -#: editor/editor_plugin_settings.cpp msgid "Author:" msgstr "Ðвтор:" @@ -3836,6 +3984,11 @@ msgid "A processor material of type 'ParticlesMaterial' is required." msgstr "" #: editor/plugins/particles_editor_plugin.cpp +#, fuzzy +msgid "Generating AABB" +msgstr "Сгенерировать AABB" + +#: editor/plugins/particles_editor_plugin.cpp msgid "Faces contain no area!" msgstr "Грани не Ñодержат зоны!" @@ -3888,6 +4041,16 @@ msgstr "Объём" msgid "Emission Source: " msgstr "Заполнение излучателÑ:" +#: editor/plugins/particles_editor_plugin.cpp +#, fuzzy +msgid "Generate Visibility AABB" +msgstr "Сгенерировать AABB" + +#: editor/plugins/particles_editor_plugin.cpp +#, fuzzy +msgid "Generation Time (sec):" +msgstr "Среднее Ð²Ñ€ÐµÐ¼Ñ (Ñек.)" + #: editor/plugins/path_2d_editor_plugin.cpp msgid "Remove Point from Curve" msgstr "Удалена точка Ñ ÐºÑ€Ð¸Ð²Ð¾Ð¹" @@ -4342,6 +4505,14 @@ msgid "Trim Trailing Whitespace" msgstr "Удаление пробелов в конце Ñтрок" #: editor/plugins/script_text_editor.cpp +msgid "Convert Indent To Spaces" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Convert Indent To Tabs" +msgstr "" + +#: editor/plugins/script_text_editor.cpp msgid "Auto Indent" msgstr "ÐвтоотÑтуп" @@ -5214,12 +5385,12 @@ msgstr "Ðеверный путь к проекту, путь должен ÑÑƒÑ #: editor/project_manager.cpp #, fuzzy -msgid "Invalid project path, godot.cfg must not exist." +msgid "Invalid project path, *.godot must not exist." msgstr "ÐедопуÑтимый путь к проекту, engine.cfg не должен ÑущеÑтвовать." #: editor/project_manager.cpp #, fuzzy -msgid "Invalid project path, godot.cfg must exist." +msgid "Invalid project path, *.godot must exist." msgstr "ÐедопуÑтимый путь к проекту, engine.cfg должен ÑущеÑтвовать." #: editor/project_manager.cpp @@ -5232,7 +5403,7 @@ msgstr "Ðеверный путь к проекту (Что-то изменилР#: editor/project_manager.cpp #, fuzzy -msgid "Couldn't create godot.cfg in project path." +msgid "Couldn't create *.godot project file in project path." msgstr "Ðе могу Ñоздать engine.cfg в папке проекта." #: editor/project_manager.cpp @@ -5268,10 +5439,6 @@ msgid "Install Project:" msgstr "УÑтановить проект:" #: editor/project_manager.cpp -msgid "Install" -msgstr "УÑтановить" - -#: editor/project_manager.cpp msgid "Browse" msgstr "Обзор" @@ -5332,6 +5499,11 @@ msgid "New Project" msgstr "Ðовый проект" #: editor/project_manager.cpp +#, fuzzy +msgid "Templates" +msgstr "Удалить Ñлемент" + +#: editor/project_manager.cpp msgid "Exit" msgstr "Выход" @@ -5518,8 +5690,8 @@ msgstr "Удалён параметр реÑурÑа перенаправленР#: editor/project_settings.cpp #, fuzzy -msgid "Project Settings (godot.cfg)" -msgstr "ÐаÑтройки проекта (engine.cfg)" +msgid "Project Settings " +msgstr "Параметры проекта" #: editor/project_settings.cpp editor/settings_config_dialog.cpp msgid "General" @@ -5585,10 +5757,6 @@ msgstr "Язык" msgid "AutoLoad" msgstr "Ðвтозагрузка" -#: editor/project_settings.cpp -msgid "Plugins" -msgstr "Плагины" - #: editor/property_editor.cpp #, fuzzy msgid "Pick a Viewport" @@ -6200,6 +6368,10 @@ msgid "Change Notifier Extents" msgstr "Изменены границы уведомителÑ" #: editor/spatial_editor_gizmos.cpp +msgid "Change Particles AABB" +msgstr "" + +#: editor/spatial_editor_gizmos.cpp msgid "Change Probe Extents" msgstr "Изменены Probe Extents" @@ -6808,6 +6980,17 @@ msgstr "" "NavigationMeshInstance должен быть дочерним или под-дочерним узлом " "Navigation. Он предоÑтавлÑет только навигационные данные." +#: scene/3d/particles.cpp +msgid "" +"Nothing is visible because meshes have not been assigned to draw passes." +msgstr "" + +#: scene/3d/particles.cpp +msgid "" +"A material to process the particles is not assigned, so no behavior is " +"imprinted." +msgstr "" + #: scene/3d/remote_transform.cpp msgid "Path property must point to a valid Spatial node to work." msgstr "СвойÑтво Path должно указывать на дейÑтвительный Spatial узел." @@ -6885,6 +7068,16 @@ msgstr "" "Ñделайте его целью рендеринга и передайте его внутренние текÑтуры какому-то " "другому узлу Ð´Ð»Ñ Ð¾Ñ‚Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ." +#~ msgid "Node From Scene" +#~ msgstr "Узел Ñо Ñцены" + +#~ msgid "Import assets to the project." +#~ msgstr "Импортировать аÑÑеты в проект." + +#, fuzzy +#~ msgid "Project Settings (godot.cfg)" +#~ msgstr "ÐаÑтройки проекта (engine.cfg)" + #~ msgid "Surface" #~ msgstr "ПоверхноÑÑ‚ÑŒ" diff --git a/editor/translations/sk.po b/editor/translations/sk.po index 9dc83e0cd3..697def1043 100644 --- a/editor/translations/sk.po +++ b/editor/translations/sk.po @@ -356,6 +356,176 @@ msgstr "" msgid "Change Array Value" msgstr "" +#: editor/asset_library_editor_plugin.cpp +msgid "Free" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp editor/editor_plugin_settings.cpp +msgid "Version:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Contents:" +msgstr "KonÅ¡tanty:" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "View Files" +msgstr "Súbor:" + +#: editor/asset_library_editor_plugin.cpp editor/create_dialog.cpp +#: editor/editor_help.cpp editor/property_selector.cpp +#: editor/script_editor_debugger.cpp +msgid "Description:" +msgstr "Popis:" + +#: editor/asset_library_editor_plugin.cpp editor/project_manager.cpp +msgid "Install" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp editor/call_dialog.cpp +#: editor/connections_dialog.cpp editor/export_template_manager.cpp +#: editor/plugins/animation_player_editor_plugin.cpp +#: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/resource_preloader_editor_plugin.cpp +#: editor/plugins/sample_library_editor_plugin.cpp +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/sprite_frames_editor_plugin.cpp editor/project_settings.cpp +#: editor/property_editor.cpp editor/run_settings_dialog.cpp +#: editor/settings_config_dialog.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Close" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Can't resolve hostname:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Can't resolve." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Connection error, please try again." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Can't connect." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Can't connect to host:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "No response from host:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "No response." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Request failed, return code:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Req. Failed." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Request failed, too many redirects" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Redirect Loop." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Failed:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Bad download hash, assuming file has been tampered with." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Expected:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Got:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Failed sha256 hash check" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Asset Download Error:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Success!" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Fetching:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Resolving.." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Connecting.." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Requesting.." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Error making request" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Idle" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Retry" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Download Error" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Download for this asset is already in progress!" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "first" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "prev" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "next" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "last" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "All" +msgstr "" + #: editor/asset_library_editor_plugin.cpp editor/create_dialog.cpp #: editor/editor_help.cpp editor/editor_node.cpp #: editor/plugins/script_editor_plugin.cpp editor/property_selector.cpp @@ -363,6 +533,29 @@ msgstr "" msgid "Search:" msgstr "" +#: editor/asset_library_editor_plugin.cpp editor/code_editor.cpp +#: editor/editor_help.cpp editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp +#: editor/plugins/shader_editor_plugin.cpp editor/project_settings.cpp +msgid "Search" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp editor/editor_node.cpp +#: editor/io_plugins/editor_bitmask_import_plugin.cpp +#: editor/io_plugins/editor_font_import_plugin.cpp +#: editor/io_plugins/editor_mesh_import_plugin.cpp +#: editor/io_plugins/editor_sample_import_plugin.cpp +#: editor/io_plugins/editor_scene_import_plugin.cpp +#: editor/io_plugins/editor_texture_import_plugin.cpp +#: editor/io_plugins/editor_translation_import_plugin.cpp +#: editor/project_manager.cpp +msgid "Import" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp editor/project_settings.cpp +msgid "Plugins" +msgstr "" + #: editor/asset_library_editor_plugin.cpp msgid "Sort:" msgstr "" @@ -376,10 +569,6 @@ msgid "Category:" msgstr "" #: editor/asset_library_editor_plugin.cpp -msgid "All" -msgstr "" - -#: editor/asset_library_editor_plugin.cpp msgid "Site:" msgstr "Stránka:" @@ -411,20 +600,6 @@ msgstr "" msgid "Call" msgstr "" -#: editor/call_dialog.cpp editor/connections_dialog.cpp -#: editor/export_template_manager.cpp -#: editor/plugins/animation_player_editor_plugin.cpp -#: editor/plugins/canvas_item_editor_plugin.cpp -#: editor/plugins/resource_preloader_editor_plugin.cpp -#: editor/plugins/sample_library_editor_plugin.cpp -#: editor/plugins/script_editor_plugin.cpp -#: editor/plugins/sprite_frames_editor_plugin.cpp editor/project_settings.cpp -#: editor/property_editor.cpp editor/run_settings_dialog.cpp -#: editor/settings_config_dialog.cpp -#: modules/visual_script/visual_script_editor.cpp -msgid "Close" -msgstr "" - #: editor/call_dialog.cpp msgid "Method List:" msgstr "" @@ -474,13 +649,6 @@ msgid "Selection Only" msgstr "" #: editor/code_editor.cpp editor/editor_help.cpp -#: editor/plugins/script_editor_plugin.cpp -#: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp editor/project_settings.cpp -msgid "Search" -msgstr "" - -#: editor/code_editor.cpp editor/editor_help.cpp msgid "Find" msgstr "" @@ -630,11 +798,6 @@ msgstr "" msgid "Matches:" msgstr "" -#: editor/create_dialog.cpp editor/editor_help.cpp editor/property_selector.cpp -#: editor/script_editor_debugger.cpp -msgid "Description:" -msgstr "Popis:" - #: editor/dependency_editor.cpp msgid "Search Replacement For:" msgstr "" @@ -1109,10 +1272,6 @@ msgstr "" msgid "Clear" msgstr "" -#: editor/editor_node.cpp -msgid "Node From Scene" -msgstr "" - #: editor/editor_node.cpp editor/plugins/animation_player_editor_plugin.cpp #: editor/resources_dock.cpp msgid "Error saving resource!" @@ -1478,21 +1637,6 @@ msgid "Distraction Free Mode" msgstr "" #: editor/editor_node.cpp -msgid "Import assets to the project." -msgstr "" - -#: editor/editor_node.cpp editor/io_plugins/editor_bitmask_import_plugin.cpp -#: editor/io_plugins/editor_font_import_plugin.cpp -#: editor/io_plugins/editor_mesh_import_plugin.cpp -#: editor/io_plugins/editor_sample_import_plugin.cpp -#: editor/io_plugins/editor_scene_import_plugin.cpp -#: editor/io_plugins/editor_texture_import_plugin.cpp -#: editor/io_plugins/editor_translation_import_plugin.cpp -#: editor/project_manager.cpp -msgid "Import" -msgstr "" - -#: editor/editor_node.cpp msgid "Miscellaneous project or scene-wide tools." msgstr "" @@ -1761,10 +1905,6 @@ msgid "Installed Plugins:" msgstr "" #: editor/editor_plugin_settings.cpp -msgid "Version:" -msgstr "" - -#: editor/editor_plugin_settings.cpp msgid "Author:" msgstr "" @@ -3736,6 +3876,10 @@ msgid "A processor material of type 'ParticlesMaterial' is required." msgstr "" #: editor/plugins/particles_editor_plugin.cpp +msgid "Generating AABB" +msgstr "" + +#: editor/plugins/particles_editor_plugin.cpp msgid "Faces contain no area!" msgstr "" @@ -3783,6 +3927,14 @@ msgstr "" msgid "Emission Source: " msgstr "" +#: editor/plugins/particles_editor_plugin.cpp +msgid "Generate Visibility AABB" +msgstr "" + +#: editor/plugins/particles_editor_plugin.cpp +msgid "Generation Time (sec):" +msgstr "" + #: editor/plugins/path_2d_editor_plugin.cpp msgid "Remove Point from Curve" msgstr "" @@ -4233,6 +4385,14 @@ msgid "Trim Trailing Whitespace" msgstr "" #: editor/plugins/script_text_editor.cpp +msgid "Convert Indent To Spaces" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Convert Indent To Tabs" +msgstr "" + +#: editor/plugins/script_text_editor.cpp msgid "Auto Indent" msgstr "" @@ -5092,11 +5252,11 @@ msgid "Invalid project path, the path must exist!" msgstr "" #: editor/project_manager.cpp -msgid "Invalid project path, godot.cfg must not exist." +msgid "Invalid project path, *.godot must not exist." msgstr "" #: editor/project_manager.cpp -msgid "Invalid project path, godot.cfg must exist." +msgid "Invalid project path, *.godot must exist." msgstr "" #: editor/project_manager.cpp @@ -5108,7 +5268,7 @@ msgid "Invalid project path (changed anything?)." msgstr "" #: editor/project_manager.cpp -msgid "Couldn't create godot.cfg in project path." +msgid "Couldn't create *.godot project file in project path." msgstr "" #: editor/project_manager.cpp @@ -5144,10 +5304,6 @@ msgid "Install Project:" msgstr "" #: editor/project_manager.cpp -msgid "Install" -msgstr "" - -#: editor/project_manager.cpp msgid "Browse" msgstr "" @@ -5206,6 +5362,11 @@ msgid "New Project" msgstr "" #: editor/project_manager.cpp +#, fuzzy +msgid "Templates" +msgstr "VÅ¡etky vybrané" + +#: editor/project_manager.cpp msgid "Exit" msgstr "" @@ -5389,7 +5550,7 @@ msgid "Remove Resource Remap Option" msgstr "" #: editor/project_settings.cpp -msgid "Project Settings (godot.cfg)" +msgid "Project Settings " msgstr "" #: editor/project_settings.cpp editor/settings_config_dialog.cpp @@ -5456,10 +5617,6 @@ msgstr "" msgid "AutoLoad" msgstr "" -#: editor/project_settings.cpp -msgid "Plugins" -msgstr "" - #: editor/property_editor.cpp msgid "Pick a Viewport" msgstr "" @@ -6066,6 +6223,10 @@ msgid "Change Notifier Extents" msgstr "" #: editor/spatial_editor_gizmos.cpp +msgid "Change Particles AABB" +msgstr "" + +#: editor/spatial_editor_gizmos.cpp msgid "Change Probe Extents" msgstr "" @@ -6619,6 +6780,17 @@ msgid "" "It only provides navigation data." msgstr "" +#: scene/3d/particles.cpp +msgid "" +"Nothing is visible because meshes have not been assigned to draw passes." +msgstr "" + +#: scene/3d/particles.cpp +msgid "" +"A material to process the particles is not assigned, so no behavior is " +"imprinted." +msgstr "" + #: scene/3d/remote_transform.cpp msgid "Path property must point to a valid Spatial node to work." msgstr "" diff --git a/editor/translations/sl.po b/editor/translations/sl.po index a90a691f44..fad12d7f13 100644 --- a/editor/translations/sl.po +++ b/editor/translations/sl.po @@ -356,6 +356,174 @@ msgstr "" msgid "Change Array Value" msgstr "" +#: editor/asset_library_editor_plugin.cpp +msgid "Free" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp editor/editor_plugin_settings.cpp +msgid "Version:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Contents:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "View Files" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp editor/create_dialog.cpp +#: editor/editor_help.cpp editor/property_selector.cpp +#: editor/script_editor_debugger.cpp +msgid "Description:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp editor/project_manager.cpp +msgid "Install" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp editor/call_dialog.cpp +#: editor/connections_dialog.cpp editor/export_template_manager.cpp +#: editor/plugins/animation_player_editor_plugin.cpp +#: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/resource_preloader_editor_plugin.cpp +#: editor/plugins/sample_library_editor_plugin.cpp +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/sprite_frames_editor_plugin.cpp editor/project_settings.cpp +#: editor/property_editor.cpp editor/run_settings_dialog.cpp +#: editor/settings_config_dialog.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Close" +msgstr "Zapri" + +#: editor/asset_library_editor_plugin.cpp +msgid "Can't resolve hostname:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Can't resolve." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Connection error, please try again." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Can't connect." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Can't connect to host:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "No response from host:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "No response." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Request failed, return code:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Req. Failed." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Request failed, too many redirects" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Redirect Loop." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Failed:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Bad download hash, assuming file has been tampered with." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Expected:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Got:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Failed sha256 hash check" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Asset Download Error:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Success!" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Fetching:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Resolving.." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Connecting.." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Requesting.." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Error making request" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Idle" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Retry" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Download Error" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Download for this asset is already in progress!" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "first" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "prev" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "next" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "last" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "All" +msgstr "" + #: editor/asset_library_editor_plugin.cpp editor/create_dialog.cpp #: editor/editor_help.cpp editor/editor_node.cpp #: editor/plugins/script_editor_plugin.cpp editor/property_selector.cpp @@ -363,6 +531,29 @@ msgstr "" msgid "Search:" msgstr "" +#: editor/asset_library_editor_plugin.cpp editor/code_editor.cpp +#: editor/editor_help.cpp editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp +#: editor/plugins/shader_editor_plugin.cpp editor/project_settings.cpp +msgid "Search" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp editor/editor_node.cpp +#: editor/io_plugins/editor_bitmask_import_plugin.cpp +#: editor/io_plugins/editor_font_import_plugin.cpp +#: editor/io_plugins/editor_mesh_import_plugin.cpp +#: editor/io_plugins/editor_sample_import_plugin.cpp +#: editor/io_plugins/editor_scene_import_plugin.cpp +#: editor/io_plugins/editor_texture_import_plugin.cpp +#: editor/io_plugins/editor_translation_import_plugin.cpp +#: editor/project_manager.cpp +msgid "Import" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp editor/project_settings.cpp +msgid "Plugins" +msgstr "" + #: editor/asset_library_editor_plugin.cpp msgid "Sort:" msgstr "" @@ -376,10 +567,6 @@ msgid "Category:" msgstr "" #: editor/asset_library_editor_plugin.cpp -msgid "All" -msgstr "" - -#: editor/asset_library_editor_plugin.cpp msgid "Site:" msgstr "" @@ -411,20 +598,6 @@ msgstr "" msgid "Call" msgstr "" -#: editor/call_dialog.cpp editor/connections_dialog.cpp -#: editor/export_template_manager.cpp -#: editor/plugins/animation_player_editor_plugin.cpp -#: editor/plugins/canvas_item_editor_plugin.cpp -#: editor/plugins/resource_preloader_editor_plugin.cpp -#: editor/plugins/sample_library_editor_plugin.cpp -#: editor/plugins/script_editor_plugin.cpp -#: editor/plugins/sprite_frames_editor_plugin.cpp editor/project_settings.cpp -#: editor/property_editor.cpp editor/run_settings_dialog.cpp -#: editor/settings_config_dialog.cpp -#: modules/visual_script/visual_script_editor.cpp -msgid "Close" -msgstr "Zapri" - #: editor/call_dialog.cpp msgid "Method List:" msgstr "" @@ -474,13 +647,6 @@ msgid "Selection Only" msgstr "" #: editor/code_editor.cpp editor/editor_help.cpp -#: editor/plugins/script_editor_plugin.cpp -#: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp editor/project_settings.cpp -msgid "Search" -msgstr "" - -#: editor/code_editor.cpp editor/editor_help.cpp msgid "Find" msgstr "" @@ -630,11 +796,6 @@ msgstr "" msgid "Matches:" msgstr "" -#: editor/create_dialog.cpp editor/editor_help.cpp editor/property_selector.cpp -#: editor/script_editor_debugger.cpp -msgid "Description:" -msgstr "" - #: editor/dependency_editor.cpp msgid "Search Replacement For:" msgstr "" @@ -1108,10 +1269,6 @@ msgstr "" msgid "Clear" msgstr "" -#: editor/editor_node.cpp -msgid "Node From Scene" -msgstr "" - #: editor/editor_node.cpp editor/plugins/animation_player_editor_plugin.cpp #: editor/resources_dock.cpp msgid "Error saving resource!" @@ -1476,21 +1633,6 @@ msgid "Distraction Free Mode" msgstr "" #: editor/editor_node.cpp -msgid "Import assets to the project." -msgstr "" - -#: editor/editor_node.cpp editor/io_plugins/editor_bitmask_import_plugin.cpp -#: editor/io_plugins/editor_font_import_plugin.cpp -#: editor/io_plugins/editor_mesh_import_plugin.cpp -#: editor/io_plugins/editor_sample_import_plugin.cpp -#: editor/io_plugins/editor_scene_import_plugin.cpp -#: editor/io_plugins/editor_texture_import_plugin.cpp -#: editor/io_plugins/editor_translation_import_plugin.cpp -#: editor/project_manager.cpp -msgid "Import" -msgstr "" - -#: editor/editor_node.cpp msgid "Miscellaneous project or scene-wide tools." msgstr "" @@ -1759,10 +1901,6 @@ msgid "Installed Plugins:" msgstr "" #: editor/editor_plugin_settings.cpp -msgid "Version:" -msgstr "" - -#: editor/editor_plugin_settings.cpp msgid "Author:" msgstr "" @@ -3733,6 +3871,10 @@ msgid "A processor material of type 'ParticlesMaterial' is required." msgstr "" #: editor/plugins/particles_editor_plugin.cpp +msgid "Generating AABB" +msgstr "" + +#: editor/plugins/particles_editor_plugin.cpp msgid "Faces contain no area!" msgstr "" @@ -3780,6 +3922,14 @@ msgstr "" msgid "Emission Source: " msgstr "" +#: editor/plugins/particles_editor_plugin.cpp +msgid "Generate Visibility AABB" +msgstr "" + +#: editor/plugins/particles_editor_plugin.cpp +msgid "Generation Time (sec):" +msgstr "" + #: editor/plugins/path_2d_editor_plugin.cpp msgid "Remove Point from Curve" msgstr "" @@ -4230,6 +4380,14 @@ msgid "Trim Trailing Whitespace" msgstr "" #: editor/plugins/script_text_editor.cpp +msgid "Convert Indent To Spaces" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Convert Indent To Tabs" +msgstr "" + +#: editor/plugins/script_text_editor.cpp msgid "Auto Indent" msgstr "" @@ -5086,11 +5244,11 @@ msgid "Invalid project path, the path must exist!" msgstr "" #: editor/project_manager.cpp -msgid "Invalid project path, godot.cfg must not exist." +msgid "Invalid project path, *.godot must not exist." msgstr "" #: editor/project_manager.cpp -msgid "Invalid project path, godot.cfg must exist." +msgid "Invalid project path, *.godot must exist." msgstr "" #: editor/project_manager.cpp @@ -5102,7 +5260,7 @@ msgid "Invalid project path (changed anything?)." msgstr "" #: editor/project_manager.cpp -msgid "Couldn't create godot.cfg in project path." +msgid "Couldn't create *.godot project file in project path." msgstr "" #: editor/project_manager.cpp @@ -5138,10 +5296,6 @@ msgid "Install Project:" msgstr "" #: editor/project_manager.cpp -msgid "Install" -msgstr "" - -#: editor/project_manager.cpp msgid "Browse" msgstr "" @@ -5200,6 +5354,11 @@ msgid "New Project" msgstr "" #: editor/project_manager.cpp +#, fuzzy +msgid "Templates" +msgstr "Odstrani Spremenljivko" + +#: editor/project_manager.cpp msgid "Exit" msgstr "" @@ -5383,7 +5542,7 @@ msgid "Remove Resource Remap Option" msgstr "" #: editor/project_settings.cpp -msgid "Project Settings (godot.cfg)" +msgid "Project Settings " msgstr "" #: editor/project_settings.cpp editor/settings_config_dialog.cpp @@ -5450,10 +5609,6 @@ msgstr "" msgid "AutoLoad" msgstr "" -#: editor/project_settings.cpp -msgid "Plugins" -msgstr "" - #: editor/property_editor.cpp msgid "Pick a Viewport" msgstr "" @@ -6054,6 +6209,10 @@ msgid "Change Notifier Extents" msgstr "" #: editor/spatial_editor_gizmos.cpp +msgid "Change Particles AABB" +msgstr "" + +#: editor/spatial_editor_gizmos.cpp msgid "Change Probe Extents" msgstr "" @@ -6618,6 +6777,17 @@ msgid "" "It only provides navigation data." msgstr "" +#: scene/3d/particles.cpp +msgid "" +"Nothing is visible because meshes have not been assigned to draw passes." +msgstr "" + +#: scene/3d/particles.cpp +msgid "" +"A material to process the particles is not assigned, so no behavior is " +"imprinted." +msgstr "" + #: scene/3d/remote_transform.cpp msgid "Path property must point to a valid Spatial node to work." msgstr "" diff --git a/editor/translations/th.po b/editor/translations/th.po index 883c024ff3..79cdaf6b10 100644 --- a/editor/translations/th.po +++ b/editor/translations/th.po @@ -366,6 +366,186 @@ msgstr "à¹à¸à¹‰à¹„ขชนิดตัวà¹à¸›à¸£à¹ƒà¸™à¸à¸²à¸£à¹Œà¹€à¸£à¸¢ msgid "Change Array Value" msgstr "à¹à¸à¹‰à¹„ขค่าในà¸à¸²à¸£à¹Œà¹€à¸£à¸¢à¹Œ" +#: editor/asset_library_editor_plugin.cpp +msgid "Free" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp editor/editor_plugin_settings.cpp +msgid "Version:" +msgstr "รุ่น:" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Contents:" +msgstr "ค่าคงที่:" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "View Files" +msgstr "ไฟล์" + +#: editor/asset_library_editor_plugin.cpp editor/create_dialog.cpp +#: editor/editor_help.cpp editor/property_selector.cpp +#: editor/script_editor_debugger.cpp +#, fuzzy +msgid "Description:" +msgstr "รายละเà¸à¸µà¸¢à¸”:" + +#: editor/asset_library_editor_plugin.cpp editor/project_manager.cpp +msgid "Install" +msgstr "ติดตั้ง" + +#: editor/asset_library_editor_plugin.cpp editor/call_dialog.cpp +#: editor/connections_dialog.cpp editor/export_template_manager.cpp +#: editor/plugins/animation_player_editor_plugin.cpp +#: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/resource_preloader_editor_plugin.cpp +#: editor/plugins/sample_library_editor_plugin.cpp +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/sprite_frames_editor_plugin.cpp editor/project_settings.cpp +#: editor/property_editor.cpp editor/run_settings_dialog.cpp +#: editor/settings_config_dialog.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Close" +msgstr "ปิด" + +#: editor/asset_library_editor_plugin.cpp +msgid "Can't resolve hostname:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Can't resolve." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Connection error, please try again." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Can't connect." +msgstr "เชื่à¸à¸¡à¹‚ยง.." + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Can't connect to host:" +msgstr "เชื่à¸à¸¡à¹‚ยงà¸à¸±à¸šà¹‚หนด:" + +#: editor/asset_library_editor_plugin.cpp +msgid "No response from host:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "No response." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Request failed, return code:" +msgstr "ไม่ทราบรูปà¹à¸šà¸šà¹„ฟล์ที่ร้à¸à¸‡à¸‚à¸:" + +#: editor/asset_library_editor_plugin.cpp +msgid "Req. Failed." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Request failed, too many redirects" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Redirect Loop." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Failed:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Bad download hash, assuming file has been tampered with." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Expected:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Got:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Failed sha256 hash check" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Asset Download Error:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Success!" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Fetching:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Resolving.." +msgstr "à¸à¸³à¸¥à¸±à¸‡à¸šà¸±à¸™à¸—ึà¸.." + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Connecting.." +msgstr "เชื่à¸à¸¡à¹‚ยง.." + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Requesting.." +msgstr "ทดสà¸à¸š" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Error making request" +msgstr "บันทึà¸à¸£à¸µà¸‹à¸à¸£à¹Œà¸ªà¸œà¸´à¸”พลาด!" + +#: editor/asset_library_editor_plugin.cpp +msgid "Idle" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Retry" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Download Error" +msgstr "ลง" + +#: editor/asset_library_editor_plugin.cpp +msgid "Download for this asset is already in progress!" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "first" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "prev" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "next" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "last" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "All" +msgstr "ทั้งหมด" + #: editor/asset_library_editor_plugin.cpp editor/create_dialog.cpp #: editor/editor_help.cpp editor/editor_node.cpp #: editor/plugins/script_editor_plugin.cpp editor/property_selector.cpp @@ -374,6 +554,30 @@ msgstr "à¹à¸à¹‰à¹„ขค่าในà¸à¸²à¸£à¹Œà¹€à¸£à¸¢à¹Œ" msgid "Search:" msgstr "ค้นหา:" +#: editor/asset_library_editor_plugin.cpp editor/code_editor.cpp +#: editor/editor_help.cpp editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp +#: editor/plugins/shader_editor_plugin.cpp editor/project_settings.cpp +msgid "Search" +msgstr "ค้นหา" + +#: editor/asset_library_editor_plugin.cpp editor/editor_node.cpp +#: editor/io_plugins/editor_bitmask_import_plugin.cpp +#: editor/io_plugins/editor_font_import_plugin.cpp +#: editor/io_plugins/editor_mesh_import_plugin.cpp +#: editor/io_plugins/editor_sample_import_plugin.cpp +#: editor/io_plugins/editor_scene_import_plugin.cpp +#: editor/io_plugins/editor_texture_import_plugin.cpp +#: editor/io_plugins/editor_translation_import_plugin.cpp +#: editor/project_manager.cpp +#, fuzzy +msgid "Import" +msgstr "นำเข้า" + +#: editor/asset_library_editor_plugin.cpp editor/project_settings.cpp +msgid "Plugins" +msgstr "ปลั๊à¸à¸à¸´à¸™" + #: editor/asset_library_editor_plugin.cpp #, fuzzy msgid "Sort:" @@ -390,11 +594,6 @@ msgstr "ประเภท:" #: editor/asset_library_editor_plugin.cpp #, fuzzy -msgid "All" -msgstr "ทั้งหมด" - -#: editor/asset_library_editor_plugin.cpp -#, fuzzy msgid "Site:" msgstr "ไซต์:" @@ -431,20 +630,6 @@ msgstr "รายชื่à¸à¹€à¸¡à¸—็à¸à¸”ขà¸à¸‡ '%s':" msgid "Call" msgstr "เรียà¸" -#: editor/call_dialog.cpp editor/connections_dialog.cpp -#: editor/export_template_manager.cpp -#: editor/plugins/animation_player_editor_plugin.cpp -#: editor/plugins/canvas_item_editor_plugin.cpp -#: editor/plugins/resource_preloader_editor_plugin.cpp -#: editor/plugins/sample_library_editor_plugin.cpp -#: editor/plugins/script_editor_plugin.cpp -#: editor/plugins/sprite_frames_editor_plugin.cpp editor/project_settings.cpp -#: editor/property_editor.cpp editor/run_settings_dialog.cpp -#: editor/settings_config_dialog.cpp -#: modules/visual_script/visual_script_editor.cpp -msgid "Close" -msgstr "ปิด" - #: editor/call_dialog.cpp #, fuzzy msgid "Method List:" @@ -506,13 +691,6 @@ msgid "Selection Only" msgstr "เฉพาะที่เลืà¸à¸à¹„ว้" #: editor/code_editor.cpp editor/editor_help.cpp -#: editor/plugins/script_editor_plugin.cpp -#: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp editor/project_settings.cpp -msgid "Search" -msgstr "ค้นหา" - -#: editor/code_editor.cpp editor/editor_help.cpp #, fuzzy msgid "Find" msgstr "ค้นหา" @@ -692,12 +870,6 @@ msgstr "ล่าสุด:" msgid "Matches:" msgstr "พบ:" -#: editor/create_dialog.cpp editor/editor_help.cpp editor/property_selector.cpp -#: editor/script_editor_debugger.cpp -#, fuzzy -msgid "Description:" -msgstr "รายละเà¸à¸µà¸¢à¸”:" - #: editor/dependency_editor.cpp #, fuzzy msgid "Search Replacement For:" @@ -1231,10 +1403,6 @@ msgstr " เà¸à¸²à¸—์พุต:" msgid "Clear" msgstr "ลบทั้งหมด" -#: editor/editor_node.cpp -msgid "Node From Scene" -msgstr "โหนดจาà¸à¸‰à¸²à¸" - #: editor/editor_node.cpp editor/plugins/animation_player_editor_plugin.cpp #: editor/resources_dock.cpp msgid "Error saving resource!" @@ -1634,22 +1802,6 @@ msgid "Distraction Free Mode" msgstr "โหมดไร้สิ่งรบà¸à¸§à¸™" #: editor/editor_node.cpp -msgid "Import assets to the project." -msgstr "นำเข้าไฟล์มายังโปรเจà¸à¸•à¹Œ" - -#: editor/editor_node.cpp editor/io_plugins/editor_bitmask_import_plugin.cpp -#: editor/io_plugins/editor_font_import_plugin.cpp -#: editor/io_plugins/editor_mesh_import_plugin.cpp -#: editor/io_plugins/editor_sample_import_plugin.cpp -#: editor/io_plugins/editor_scene_import_plugin.cpp -#: editor/io_plugins/editor_texture_import_plugin.cpp -#: editor/io_plugins/editor_translation_import_plugin.cpp -#: editor/project_manager.cpp -#, fuzzy -msgid "Import" -msgstr "นำเข้า" - -#: editor/editor_node.cpp msgid "Miscellaneous project or scene-wide tools." msgstr "" @@ -1932,10 +2084,6 @@ msgid "Installed Plugins:" msgstr "ปลั๊à¸à¸à¸´à¸™à¸—ี่ติดตั้งà¹à¸¥à¹‰à¸§:" #: editor/editor_plugin_settings.cpp -msgid "Version:" -msgstr "รุ่น:" - -#: editor/editor_plugin_settings.cpp msgid "Author:" msgstr "โดย:" @@ -3943,6 +4091,11 @@ msgid "A processor material of type 'ParticlesMaterial' is required." msgstr "" #: editor/plugins/particles_editor_plugin.cpp +#, fuzzy +msgid "Generating AABB" +msgstr "สร้าง AABB" + +#: editor/plugins/particles_editor_plugin.cpp msgid "Faces contain no area!" msgstr "หน้าไม่มีพื้นที่!" @@ -3992,6 +4145,16 @@ msgstr "ปริมาตร" msgid "Emission Source: " msgstr "" +#: editor/plugins/particles_editor_plugin.cpp +#, fuzzy +msgid "Generate Visibility AABB" +msgstr "สร้าง AABB" + +#: editor/plugins/particles_editor_plugin.cpp +#, fuzzy +msgid "Generation Time (sec):" +msgstr "เวลาเฉลี่ย (วินาที)" + #: editor/plugins/path_2d_editor_plugin.cpp msgid "Remove Point from Curve" msgstr "ลบจุดในเส้นโค้ง" @@ -4446,6 +4609,14 @@ msgid "Trim Trailing Whitespace" msgstr "ลบตัวà¸à¸±à¸à¸©à¸£à¸—ี่มà¸à¸‡à¹„ม่เห็น" #: editor/plugins/script_text_editor.cpp +msgid "Convert Indent To Spaces" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Convert Indent To Tabs" +msgstr "" + +#: editor/plugins/script_text_editor.cpp msgid "Auto Indent" msgstr "ย่à¸à¸«à¸™à¹‰à¸²à¸à¸±à¸•à¹‚นมัติ" @@ -5317,12 +5488,12 @@ msgstr "ที่à¸à¸¢à¸¹à¹ˆà¹‚ปรเจà¸à¸•à¹Œà¸œà¸´à¸”พลาด ต๠#: editor/project_manager.cpp #, fuzzy -msgid "Invalid project path, godot.cfg must not exist." +msgid "Invalid project path, *.godot must not exist." msgstr "ที่à¸à¸¢à¸¹à¹ˆà¹‚ปรเจà¸à¸•à¹Œà¸œà¸´à¸”พลาด ต้à¸à¸‡à¹„ม่มี engine.cfg" #: editor/project_manager.cpp #, fuzzy -msgid "Invalid project path, godot.cfg must exist." +msgid "Invalid project path, *.godot must exist." msgstr "ที่à¸à¸¢à¸¹à¹ˆà¹‚ปรเจà¸à¸•à¹Œà¸œà¸´à¸”พลาด ต้à¸à¸‡à¸¡à¸µ engine.cfg" #: editor/project_manager.cpp @@ -5335,7 +5506,7 @@ msgstr "" #: editor/project_manager.cpp #, fuzzy -msgid "Couldn't create godot.cfg in project path." +msgid "Couldn't create *.godot project file in project path." msgstr "สร้างไฟล์ engine.cfg ไม่ได้" #: editor/project_manager.cpp @@ -5371,10 +5542,6 @@ msgid "Install Project:" msgstr "ติดตั้งโปรเจà¸à¸•à¹Œ:" #: editor/project_manager.cpp -msgid "Install" -msgstr "ติดตั้ง" - -#: editor/project_manager.cpp msgid "Browse" msgstr "เลืà¸à¸" @@ -5433,6 +5600,11 @@ msgid "New Project" msgstr "โปรเจà¸à¸•à¹Œà¹ƒà¸«à¸¡à¹ˆ" #: editor/project_manager.cpp +#, fuzzy +msgid "Templates" +msgstr "ลบไà¸à¹€à¸—ม" + +#: editor/project_manager.cpp msgid "Exit" msgstr "à¸à¸à¸" @@ -5628,8 +5800,8 @@ msgstr "ลบà¸à¸²à¸£à¹à¸—นที่" #: editor/project_settings.cpp #, fuzzy -msgid "Project Settings (godot.cfg)" -msgstr "ตัวเลืà¸à¸à¹‚ปรเจà¸à¸•à¹Œ (engine.cfg)" +msgid "Project Settings " +msgstr "ตัวเลืà¸à¸à¹‚ปรเจà¸à¸•à¹Œ" #: editor/project_settings.cpp editor/settings_config_dialog.cpp msgid "General" @@ -5695,10 +5867,6 @@ msgstr "ท้à¸à¸‡à¸–ิ่น" msgid "AutoLoad" msgstr "à¸à¸à¹‚ต้โหลด" -#: editor/project_settings.cpp -msgid "Plugins" -msgstr "ปลั๊à¸à¸à¸´à¸™" - #: editor/property_editor.cpp #, fuzzy msgid "Pick a Viewport" @@ -6304,6 +6472,10 @@ msgid "Change Notifier Extents" msgstr "ปรับขนาด Notifier" #: editor/spatial_editor_gizmos.cpp +msgid "Change Particles AABB" +msgstr "" + +#: editor/spatial_editor_gizmos.cpp #, fuzzy msgid "Change Probe Extents" msgstr "ปรับขนาด Probe" @@ -6954,6 +7126,17 @@ msgstr "" "NavigationMeshInstance ต้à¸à¸‡à¹€à¸›à¹‡à¸™à¹‚หนดลูà¸/หลานขà¸à¸‡à¹‚หนด Navigation " "โหนดนี้ใช้เพื่à¸à¹€à¸›à¹‡à¸™à¸‚้à¸à¸¡à¸¹à¸¥à¹ƒà¸™à¸à¸²à¸£à¸™à¸³à¸—างเท่านั้น" +#: scene/3d/particles.cpp +msgid "" +"Nothing is visible because meshes have not been assigned to draw passes." +msgstr "" + +#: scene/3d/particles.cpp +msgid "" +"A material to process the particles is not assigned, so no behavior is " +"imprinted." +msgstr "" + #: scene/3d/remote_transform.cpp #, fuzzy msgid "Path property must point to a valid Spatial node to work." @@ -7034,6 +7217,16 @@ msgstr "" "ให้à¹à¸à¹‰à¹„ขโหนดนี้ให้เป็นโหนดลูà¸à¸‚à¸à¸‡ Control à¹à¸•à¹ˆà¸–้าไม่ ให้ปรับเป็น render target à¹à¸¥à¸°à¸™à¸³à¹„ปใช้เป็น " "texture ขà¸à¸‡à¹‚หนดà¸à¸·à¹ˆà¸™" +#~ msgid "Node From Scene" +#~ msgstr "โหนดจาà¸à¸‰à¸²à¸" + +#~ msgid "Import assets to the project." +#~ msgstr "นำเข้าไฟล์มายังโปรเจà¸à¸•à¹Œ" + +#, fuzzy +#~ msgid "Project Settings (godot.cfg)" +#~ msgstr "ตัวเลืà¸à¸à¹‚ปรเจà¸à¸•à¹Œ (engine.cfg)" + #~ msgid "Surface" #~ msgstr "พื้นผิว" diff --git a/editor/translations/tr.po b/editor/translations/tr.po index 9228cf5818..20a794b34a 100644 --- a/editor/translations/tr.po +++ b/editor/translations/tr.po @@ -362,6 +362,184 @@ msgstr "Dizinin türünü degistir" msgid "Change Array Value" msgstr "Dizi DeÄŸerini DeÄŸiÅŸtir" +#: editor/asset_library_editor_plugin.cpp +msgid "Free" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp editor/editor_plugin_settings.cpp +msgid "Version:" +msgstr "Sürüm:" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Contents:" +msgstr "Sabitler:" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "View Files" +msgstr "Dizeç" + +#: editor/asset_library_editor_plugin.cpp editor/create_dialog.cpp +#: editor/editor_help.cpp editor/property_selector.cpp +#: editor/script_editor_debugger.cpp +msgid "Description:" +msgstr "Açıklama:" + +#: editor/asset_library_editor_plugin.cpp editor/project_manager.cpp +msgid "Install" +msgstr "Kur" + +#: editor/asset_library_editor_plugin.cpp editor/call_dialog.cpp +#: editor/connections_dialog.cpp editor/export_template_manager.cpp +#: editor/plugins/animation_player_editor_plugin.cpp +#: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/resource_preloader_editor_plugin.cpp +#: editor/plugins/sample_library_editor_plugin.cpp +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/sprite_frames_editor_plugin.cpp editor/project_settings.cpp +#: editor/property_editor.cpp editor/run_settings_dialog.cpp +#: editor/settings_config_dialog.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Close" +msgstr "Kapat" + +#: editor/asset_library_editor_plugin.cpp +msgid "Can't resolve hostname:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Can't resolve." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Connection error, please try again." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Can't connect." +msgstr "BaÄŸlan..." + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Can't connect to host:" +msgstr "Düğüme BaÄŸlan:" + +#: editor/asset_library_editor_plugin.cpp +msgid "No response from host:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "No response." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Request failed, return code:" +msgstr "Ä°stenilen dizeç formatı bilinmiyor:" + +#: editor/asset_library_editor_plugin.cpp +msgid "Req. Failed." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Request failed, too many redirects" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Redirect Loop." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Failed:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Bad download hash, assuming file has been tampered with." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Expected:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Got:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Failed sha256 hash check" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Asset Download Error:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Success!" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Fetching:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Resolving.." +msgstr "Kaydediliyor..." + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Connecting.." +msgstr "BaÄŸlan..." + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Requesting.." +msgstr "Deneme" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Error making request" +msgstr "Kaynak kaydedilirken sorun!" + +#: editor/asset_library_editor_plugin.cpp +msgid "Idle" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Retry" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Download Error" +msgstr "AÅŸağı" + +#: editor/asset_library_editor_plugin.cpp +msgid "Download for this asset is already in progress!" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "first" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "prev" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "next" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "last" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "All" +msgstr "Hepsi" + #: editor/asset_library_editor_plugin.cpp editor/create_dialog.cpp #: editor/editor_help.cpp editor/editor_node.cpp #: editor/plugins/script_editor_plugin.cpp editor/property_selector.cpp @@ -369,6 +547,29 @@ msgstr "Dizi DeÄŸerini DeÄŸiÅŸtir" msgid "Search:" msgstr "Ara:" +#: editor/asset_library_editor_plugin.cpp editor/code_editor.cpp +#: editor/editor_help.cpp editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp +#: editor/plugins/shader_editor_plugin.cpp editor/project_settings.cpp +msgid "Search" +msgstr "Ara" + +#: editor/asset_library_editor_plugin.cpp editor/editor_node.cpp +#: editor/io_plugins/editor_bitmask_import_plugin.cpp +#: editor/io_plugins/editor_font_import_plugin.cpp +#: editor/io_plugins/editor_mesh_import_plugin.cpp +#: editor/io_plugins/editor_sample_import_plugin.cpp +#: editor/io_plugins/editor_scene_import_plugin.cpp +#: editor/io_plugins/editor_texture_import_plugin.cpp +#: editor/io_plugins/editor_translation_import_plugin.cpp +#: editor/project_manager.cpp +msgid "Import" +msgstr "İçe Aktar" + +#: editor/asset_library_editor_plugin.cpp editor/project_settings.cpp +msgid "Plugins" +msgstr "Eklentiler" + #: editor/asset_library_editor_plugin.cpp msgid "Sort:" msgstr "Sırala:" @@ -382,10 +583,6 @@ msgid "Category:" msgstr "Katman:" #: editor/asset_library_editor_plugin.cpp -msgid "All" -msgstr "Hepsi" - -#: editor/asset_library_editor_plugin.cpp msgid "Site:" msgstr "Yer:" @@ -417,20 +614,6 @@ msgstr "'%s' İçin Yöntem Dizelgesi:" msgid "Call" msgstr "Çağır" -#: editor/call_dialog.cpp editor/connections_dialog.cpp -#: editor/export_template_manager.cpp -#: editor/plugins/animation_player_editor_plugin.cpp -#: editor/plugins/canvas_item_editor_plugin.cpp -#: editor/plugins/resource_preloader_editor_plugin.cpp -#: editor/plugins/sample_library_editor_plugin.cpp -#: editor/plugins/script_editor_plugin.cpp -#: editor/plugins/sprite_frames_editor_plugin.cpp editor/project_settings.cpp -#: editor/property_editor.cpp editor/run_settings_dialog.cpp -#: editor/settings_config_dialog.cpp -#: modules/visual_script/visual_script_editor.cpp -msgid "Close" -msgstr "Kapat" - #: editor/call_dialog.cpp msgid "Method List:" msgstr "Yöntem Dizelgesi:" @@ -481,13 +664,6 @@ msgid "Selection Only" msgstr "Yalnızca Seçim" #: editor/code_editor.cpp editor/editor_help.cpp -#: editor/plugins/script_editor_plugin.cpp -#: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp editor/project_settings.cpp -msgid "Search" -msgstr "Ara" - -#: editor/code_editor.cpp editor/editor_help.cpp msgid "Find" msgstr "Bul" @@ -639,11 +815,6 @@ msgstr "Yakın zamanda:" msgid "Matches:" msgstr "EÅŸleÅŸmeler:" -#: editor/create_dialog.cpp editor/editor_help.cpp editor/property_selector.cpp -#: editor/script_editor_debugger.cpp -msgid "Description:" -msgstr "Açıklama:" - #: editor/dependency_editor.cpp msgid "Search Replacement For:" msgstr "Åžunun İçin DeÄŸiÅŸikliÄŸi Ara:" @@ -1125,10 +1296,6 @@ msgstr " Çıktı:" msgid "Clear" msgstr "Temizle" -#: editor/editor_node.cpp -msgid "Node From Scene" -msgstr "Sahneden Düğüm(node)" - #: editor/editor_node.cpp editor/plugins/animation_player_editor_plugin.cpp #: editor/resources_dock.cpp msgid "Error saving resource!" @@ -1508,21 +1675,6 @@ msgid "Distraction Free Mode" msgstr "Dikkat Dağıtmayan Biçim" #: editor/editor_node.cpp -msgid "Import assets to the project." -msgstr "Varlıkları tasarının içine aktar." - -#: editor/editor_node.cpp editor/io_plugins/editor_bitmask_import_plugin.cpp -#: editor/io_plugins/editor_font_import_plugin.cpp -#: editor/io_plugins/editor_mesh_import_plugin.cpp -#: editor/io_plugins/editor_sample_import_plugin.cpp -#: editor/io_plugins/editor_scene_import_plugin.cpp -#: editor/io_plugins/editor_texture_import_plugin.cpp -#: editor/io_plugins/editor_translation_import_plugin.cpp -#: editor/project_manager.cpp -msgid "Import" -msgstr "İçe Aktar" - -#: editor/editor_node.cpp msgid "Miscellaneous project or scene-wide tools." msgstr "Türlü tasarı ya da sahne geniÅŸliÄŸinde araçlar." @@ -1811,10 +1963,6 @@ msgid "Installed Plugins:" msgstr "Yüklü Eklentiler:" #: editor/editor_plugin_settings.cpp -msgid "Version:" -msgstr "Sürüm:" - -#: editor/editor_plugin_settings.cpp msgid "Author:" msgstr "Yazar:" @@ -3824,6 +3972,11 @@ msgid "A processor material of type 'ParticlesMaterial' is required." msgstr "" #: editor/plugins/particles_editor_plugin.cpp +#, fuzzy +msgid "Generating AABB" +msgstr "AABB Ãœret" + +#: editor/plugins/particles_editor_plugin.cpp msgid "Faces contain no area!" msgstr "Yüzler alan içermez!" @@ -3876,6 +4029,16 @@ msgstr "Oylum" msgid "Emission Source: " msgstr "Yayma Dolumu:" +#: editor/plugins/particles_editor_plugin.cpp +#, fuzzy +msgid "Generate Visibility AABB" +msgstr "AABB Ãœret" + +#: editor/plugins/particles_editor_plugin.cpp +#, fuzzy +msgid "Generation Time (sec):" +msgstr "Ortalama Zaman (sn)" + #: editor/plugins/path_2d_editor_plugin.cpp msgid "Remove Point from Curve" msgstr "Noktayı EÄŸriden Kaldır" @@ -4330,6 +4493,14 @@ msgid "Trim Trailing Whitespace" msgstr "Ä°zleyenin BoÅŸluklarını Kırp" #: editor/plugins/script_text_editor.cpp +msgid "Convert Indent To Spaces" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Convert Indent To Tabs" +msgstr "" + +#: editor/plugins/script_text_editor.cpp msgid "Auto Indent" msgstr "Kendinden Girintili" @@ -5204,12 +5375,12 @@ msgstr "Geçersiz tasarı yolu, yolun var olması gerekir!" #: editor/project_manager.cpp #, fuzzy -msgid "Invalid project path, godot.cfg must not exist." +msgid "Invalid project path, *.godot must not exist." msgstr "Geçersiz tasarı yolu, engine.cfg var olmaması gerekir." #: editor/project_manager.cpp #, fuzzy -msgid "Invalid project path, godot.cfg must exist." +msgid "Invalid project path, *.godot must exist." msgstr "Geçersiz tasarı yolu, engine.cfg var olması gerekir." #: editor/project_manager.cpp @@ -5222,7 +5393,7 @@ msgstr "Geçersiz tasarı yolu (bir ÅŸey deÄŸiÅŸti mi?)." #: editor/project_manager.cpp #, fuzzy -msgid "Couldn't create godot.cfg in project path." +msgid "Couldn't create *.godot project file in project path." msgstr "engine.cfg tasarı yolunda oluÅŸturulamadı." #: editor/project_manager.cpp @@ -5258,10 +5429,6 @@ msgid "Install Project:" msgstr "Tasarıyı Kur:" #: editor/project_manager.cpp -msgid "Install" -msgstr "Kur" - -#: editor/project_manager.cpp msgid "Browse" msgstr "Gözat" @@ -5323,6 +5490,11 @@ msgid "New Project" msgstr "Yeni Tasarı" #: editor/project_manager.cpp +#, fuzzy +msgid "Templates" +msgstr "Öğeyi Kaldır" + +#: editor/project_manager.cpp msgid "Exit" msgstr "Çık" @@ -5509,8 +5681,8 @@ msgstr "Kaynak Yeniden EÅŸle SeçeneÄŸini Kaldır" #: editor/project_settings.cpp #, fuzzy -msgid "Project Settings (godot.cfg)" -msgstr "Tasarı Ayarları (engine.cfg)" +msgid "Project Settings " +msgstr "Tasarı Ayarları" #: editor/project_settings.cpp editor/settings_config_dialog.cpp msgid "General" @@ -5576,10 +5748,6 @@ msgstr "Yerel" msgid "AutoLoad" msgstr "KendindenYükle" -#: editor/project_settings.cpp -msgid "Plugins" -msgstr "Eklentiler" - #: editor/property_editor.cpp #, fuzzy msgid "Pick a Viewport" @@ -6188,6 +6356,10 @@ msgid "Change Notifier Extents" msgstr "Bildirim Kapsamını DeÄŸiÅŸtir" #: editor/spatial_editor_gizmos.cpp +msgid "Change Particles AABB" +msgstr "" + +#: editor/spatial_editor_gizmos.cpp msgid "Change Probe Extents" msgstr "DeÅŸme GeniÅŸlemesini DeÄŸiÅŸtir" @@ -6796,6 +6968,17 @@ msgstr "" "NavigationMeshInstance, bir Navigation düğümünün çocuÄŸu ya da torunu " "olmalıdır. O yalnızca yönlendirme verisi saÄŸlar." +#: scene/3d/particles.cpp +msgid "" +"Nothing is visible because meshes have not been assigned to draw passes." +msgstr "" + +#: scene/3d/particles.cpp +msgid "" +"A material to process the particles is not assigned, so no behavior is " +"imprinted." +msgstr "" + #: scene/3d/remote_transform.cpp msgid "Path property must point to a valid Spatial node to work." msgstr "" @@ -6873,6 +7056,16 @@ msgstr "" "bir boyut elde edin. Ya da, onu bir RenderTarget yapın ve iç dokusunu " "görüntülemesi için bir düğüme atayın." +#~ msgid "Node From Scene" +#~ msgstr "Sahneden Düğüm(node)" + +#~ msgid "Import assets to the project." +#~ msgstr "Varlıkları tasarının içine aktar." + +#, fuzzy +#~ msgid "Project Settings (godot.cfg)" +#~ msgstr "Tasarı Ayarları (engine.cfg)" + #~ msgid "Surface" #~ msgstr "Yüzey" diff --git a/editor/translations/ur_PK.po b/editor/translations/ur_PK.po index c8fb79d1c0..651aa62001 100644 --- a/editor/translations/ur_PK.po +++ b/editor/translations/ur_PK.po @@ -356,6 +356,174 @@ msgstr "" msgid "Change Array Value" msgstr "" +#: editor/asset_library_editor_plugin.cpp +msgid "Free" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp editor/editor_plugin_settings.cpp +msgid "Version:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Contents:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "View Files" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp editor/create_dialog.cpp +#: editor/editor_help.cpp editor/property_selector.cpp +#: editor/script_editor_debugger.cpp +msgid "Description:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp editor/project_manager.cpp +msgid "Install" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp editor/call_dialog.cpp +#: editor/connections_dialog.cpp editor/export_template_manager.cpp +#: editor/plugins/animation_player_editor_plugin.cpp +#: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/resource_preloader_editor_plugin.cpp +#: editor/plugins/sample_library_editor_plugin.cpp +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/sprite_frames_editor_plugin.cpp editor/project_settings.cpp +#: editor/property_editor.cpp editor/run_settings_dialog.cpp +#: editor/settings_config_dialog.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Close" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Can't resolve hostname:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Can't resolve." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Connection error, please try again." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Can't connect." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Can't connect to host:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "No response from host:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "No response." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Request failed, return code:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Req. Failed." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Request failed, too many redirects" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Redirect Loop." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Failed:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Bad download hash, assuming file has been tampered with." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Expected:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Got:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Failed sha256 hash check" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Asset Download Error:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Success!" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Fetching:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Resolving.." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Connecting.." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Requesting.." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Error making request" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Idle" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Retry" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Download Error" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Download for this asset is already in progress!" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "first" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "prev" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "next" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "last" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "All" +msgstr "" + #: editor/asset_library_editor_plugin.cpp editor/create_dialog.cpp #: editor/editor_help.cpp editor/editor_node.cpp #: editor/plugins/script_editor_plugin.cpp editor/property_selector.cpp @@ -363,6 +531,29 @@ msgstr "" msgid "Search:" msgstr "" +#: editor/asset_library_editor_plugin.cpp editor/code_editor.cpp +#: editor/editor_help.cpp editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp +#: editor/plugins/shader_editor_plugin.cpp editor/project_settings.cpp +msgid "Search" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp editor/editor_node.cpp +#: editor/io_plugins/editor_bitmask_import_plugin.cpp +#: editor/io_plugins/editor_font_import_plugin.cpp +#: editor/io_plugins/editor_mesh_import_plugin.cpp +#: editor/io_plugins/editor_sample_import_plugin.cpp +#: editor/io_plugins/editor_scene_import_plugin.cpp +#: editor/io_plugins/editor_texture_import_plugin.cpp +#: editor/io_plugins/editor_translation_import_plugin.cpp +#: editor/project_manager.cpp +msgid "Import" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp editor/project_settings.cpp +msgid "Plugins" +msgstr "" + #: editor/asset_library_editor_plugin.cpp msgid "Sort:" msgstr "" @@ -376,10 +567,6 @@ msgid "Category:" msgstr "" #: editor/asset_library_editor_plugin.cpp -msgid "All" -msgstr "" - -#: editor/asset_library_editor_plugin.cpp msgid "Site:" msgstr "سائٹ:" @@ -411,20 +598,6 @@ msgstr "" msgid "Call" msgstr "" -#: editor/call_dialog.cpp editor/connections_dialog.cpp -#: editor/export_template_manager.cpp -#: editor/plugins/animation_player_editor_plugin.cpp -#: editor/plugins/canvas_item_editor_plugin.cpp -#: editor/plugins/resource_preloader_editor_plugin.cpp -#: editor/plugins/sample_library_editor_plugin.cpp -#: editor/plugins/script_editor_plugin.cpp -#: editor/plugins/sprite_frames_editor_plugin.cpp editor/project_settings.cpp -#: editor/property_editor.cpp editor/run_settings_dialog.cpp -#: editor/settings_config_dialog.cpp -#: modules/visual_script/visual_script_editor.cpp -msgid "Close" -msgstr "" - #: editor/call_dialog.cpp msgid "Method List:" msgstr "" @@ -474,13 +647,6 @@ msgid "Selection Only" msgstr "" #: editor/code_editor.cpp editor/editor_help.cpp -#: editor/plugins/script_editor_plugin.cpp -#: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp editor/project_settings.cpp -msgid "Search" -msgstr "" - -#: editor/code_editor.cpp editor/editor_help.cpp msgid "Find" msgstr "" @@ -630,11 +796,6 @@ msgstr "" msgid "Matches:" msgstr "" -#: editor/create_dialog.cpp editor/editor_help.cpp editor/property_selector.cpp -#: editor/script_editor_debugger.cpp -msgid "Description:" -msgstr "" - #: editor/dependency_editor.cpp msgid "Search Replacement For:" msgstr "" @@ -1112,10 +1273,6 @@ msgstr "" msgid "Clear" msgstr "" -#: editor/editor_node.cpp -msgid "Node From Scene" -msgstr "" - #: editor/editor_node.cpp editor/plugins/animation_player_editor_plugin.cpp #: editor/resources_dock.cpp msgid "Error saving resource!" @@ -1481,21 +1638,6 @@ msgid "Distraction Free Mode" msgstr "" #: editor/editor_node.cpp -msgid "Import assets to the project." -msgstr "" - -#: editor/editor_node.cpp editor/io_plugins/editor_bitmask_import_plugin.cpp -#: editor/io_plugins/editor_font_import_plugin.cpp -#: editor/io_plugins/editor_mesh_import_plugin.cpp -#: editor/io_plugins/editor_sample_import_plugin.cpp -#: editor/io_plugins/editor_scene_import_plugin.cpp -#: editor/io_plugins/editor_texture_import_plugin.cpp -#: editor/io_plugins/editor_translation_import_plugin.cpp -#: editor/project_manager.cpp -msgid "Import" -msgstr "" - -#: editor/editor_node.cpp msgid "Miscellaneous project or scene-wide tools." msgstr "" @@ -1764,10 +1906,6 @@ msgid "Installed Plugins:" msgstr "" #: editor/editor_plugin_settings.cpp -msgid "Version:" -msgstr "" - -#: editor/editor_plugin_settings.cpp msgid "Author:" msgstr "" @@ -3739,6 +3877,10 @@ msgid "A processor material of type 'ParticlesMaterial' is required." msgstr "" #: editor/plugins/particles_editor_plugin.cpp +msgid "Generating AABB" +msgstr "" + +#: editor/plugins/particles_editor_plugin.cpp msgid "Faces contain no area!" msgstr "" @@ -3786,6 +3928,14 @@ msgstr "" msgid "Emission Source: " msgstr "" +#: editor/plugins/particles_editor_plugin.cpp +msgid "Generate Visibility AABB" +msgstr "" + +#: editor/plugins/particles_editor_plugin.cpp +msgid "Generation Time (sec):" +msgstr "" + #: editor/plugins/path_2d_editor_plugin.cpp msgid "Remove Point from Curve" msgstr "" @@ -4236,6 +4386,14 @@ msgid "Trim Trailing Whitespace" msgstr "" #: editor/plugins/script_text_editor.cpp +msgid "Convert Indent To Spaces" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Convert Indent To Tabs" +msgstr "" + +#: editor/plugins/script_text_editor.cpp msgid "Auto Indent" msgstr "" @@ -5094,11 +5252,11 @@ msgid "Invalid project path, the path must exist!" msgstr "" #: editor/project_manager.cpp -msgid "Invalid project path, godot.cfg must not exist." +msgid "Invalid project path, *.godot must not exist." msgstr "" #: editor/project_manager.cpp -msgid "Invalid project path, godot.cfg must exist." +msgid "Invalid project path, *.godot must exist." msgstr "" #: editor/project_manager.cpp @@ -5110,7 +5268,7 @@ msgid "Invalid project path (changed anything?)." msgstr "" #: editor/project_manager.cpp -msgid "Couldn't create godot.cfg in project path." +msgid "Couldn't create *.godot project file in project path." msgstr "" #: editor/project_manager.cpp @@ -5146,10 +5304,6 @@ msgid "Install Project:" msgstr "" #: editor/project_manager.cpp -msgid "Install" -msgstr "" - -#: editor/project_manager.cpp msgid "Browse" msgstr "" @@ -5208,6 +5362,11 @@ msgid "New Project" msgstr "" #: editor/project_manager.cpp +#, fuzzy +msgid "Templates" +msgstr ".تمام کا انتخاب" + +#: editor/project_manager.cpp msgid "Exit" msgstr "" @@ -5391,7 +5550,7 @@ msgid "Remove Resource Remap Option" msgstr "" #: editor/project_settings.cpp -msgid "Project Settings (godot.cfg)" +msgid "Project Settings " msgstr "" #: editor/project_settings.cpp editor/settings_config_dialog.cpp @@ -5458,10 +5617,6 @@ msgstr "" msgid "AutoLoad" msgstr "" -#: editor/project_settings.cpp -msgid "Plugins" -msgstr "" - #: editor/property_editor.cpp msgid "Pick a Viewport" msgstr "" @@ -6067,6 +6222,10 @@ msgid "Change Notifier Extents" msgstr ".نوٹÙئر Ú©Û’ اکسٹنٹ Ú©Ùˆ تبدیل کیجیۓ" #: editor/spatial_editor_gizmos.cpp +msgid "Change Particles AABB" +msgstr "" + +#: editor/spatial_editor_gizmos.cpp #, fuzzy msgid "Change Probe Extents" msgstr ".نوٹÙئر Ú©Û’ اکسٹنٹ Ú©Ùˆ تبدیل کیجیۓ" @@ -6612,6 +6771,17 @@ msgid "" "It only provides navigation data." msgstr "" +#: scene/3d/particles.cpp +msgid "" +"Nothing is visible because meshes have not been assigned to draw passes." +msgstr "" + +#: scene/3d/particles.cpp +msgid "" +"A material to process the particles is not assigned, so no behavior is " +"imprinted." +msgstr "" + #: scene/3d/remote_transform.cpp msgid "Path property must point to a valid Spatial node to work." msgstr "" diff --git a/editor/translations/zh_CN.po b/editor/translations/zh_CN.po index d2380c0a48..87ca113ce2 100644 --- a/editor/translations/zh_CN.po +++ b/editor/translations/zh_CN.po @@ -366,6 +366,184 @@ msgstr "修改数组类型" msgid "Change Array Value" msgstr "修改数组值" +#: editor/asset_library_editor_plugin.cpp +msgid "Free" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp editor/editor_plugin_settings.cpp +msgid "Version:" +msgstr "版本:" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Contents:" +msgstr "常é‡:" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "View Files" +msgstr "文件" + +#: editor/asset_library_editor_plugin.cpp editor/create_dialog.cpp +#: editor/editor_help.cpp editor/property_selector.cpp +#: editor/script_editor_debugger.cpp +msgid "Description:" +msgstr "æè¿°:" + +#: editor/asset_library_editor_plugin.cpp editor/project_manager.cpp +msgid "Install" +msgstr "安装" + +#: editor/asset_library_editor_plugin.cpp editor/call_dialog.cpp +#: editor/connections_dialog.cpp editor/export_template_manager.cpp +#: editor/plugins/animation_player_editor_plugin.cpp +#: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/resource_preloader_editor_plugin.cpp +#: editor/plugins/sample_library_editor_plugin.cpp +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/sprite_frames_editor_plugin.cpp editor/project_settings.cpp +#: editor/property_editor.cpp editor/run_settings_dialog.cpp +#: editor/settings_config_dialog.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Close" +msgstr "å…³é—" + +#: editor/asset_library_editor_plugin.cpp +msgid "Can't resolve hostname:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Can't resolve." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Connection error, please try again." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Can't connect." +msgstr "连接事件。" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Can't connect to host:" +msgstr "连接到节点:" + +#: editor/asset_library_editor_plugin.cpp +msgid "No response from host:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "No response." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Request failed, return code:" +msgstr "未知的文件类型请求:" + +#: editor/asset_library_editor_plugin.cpp +msgid "Req. Failed." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Request failed, too many redirects" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Redirect Loop." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Failed:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Bad download hash, assuming file has been tampered with." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Expected:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Got:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Failed sha256 hash check" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Asset Download Error:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Success!" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Fetching:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Resolving.." +msgstr "ä¿å˜ä¸..." + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Connecting.." +msgstr "连接事件。" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Requesting.." +msgstr "测试" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Error making request" +msgstr "ä¿å˜èµ„æºå‡ºé”™ï¼" + +#: editor/asset_library_editor_plugin.cpp +msgid "Idle" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Retry" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Download Error" +msgstr "å‘下" + +#: editor/asset_library_editor_plugin.cpp +msgid "Download for this asset is already in progress!" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "first" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "prev" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "next" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "last" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "All" +msgstr "全部" + #: editor/asset_library_editor_plugin.cpp editor/create_dialog.cpp #: editor/editor_help.cpp editor/editor_node.cpp #: editor/plugins/script_editor_plugin.cpp editor/property_selector.cpp @@ -373,6 +551,29 @@ msgstr "修改数组值" msgid "Search:" msgstr "æœç´¢:" +#: editor/asset_library_editor_plugin.cpp editor/code_editor.cpp +#: editor/editor_help.cpp editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp +#: editor/plugins/shader_editor_plugin.cpp editor/project_settings.cpp +msgid "Search" +msgstr "æœç´¢" + +#: editor/asset_library_editor_plugin.cpp editor/editor_node.cpp +#: editor/io_plugins/editor_bitmask_import_plugin.cpp +#: editor/io_plugins/editor_font_import_plugin.cpp +#: editor/io_plugins/editor_mesh_import_plugin.cpp +#: editor/io_plugins/editor_sample_import_plugin.cpp +#: editor/io_plugins/editor_scene_import_plugin.cpp +#: editor/io_plugins/editor_texture_import_plugin.cpp +#: editor/io_plugins/editor_translation_import_plugin.cpp +#: editor/project_manager.cpp +msgid "Import" +msgstr "导入" + +#: editor/asset_library_editor_plugin.cpp editor/project_settings.cpp +msgid "Plugins" +msgstr "æ’件" + #: editor/asset_library_editor_plugin.cpp msgid "Sort:" msgstr "排åº:" @@ -386,10 +587,6 @@ msgid "Category:" msgstr "分类:" #: editor/asset_library_editor_plugin.cpp -msgid "All" -msgstr "全部" - -#: editor/asset_library_editor_plugin.cpp msgid "Site:" msgstr "站点:" @@ -421,20 +618,6 @@ msgstr "'%s'的方法列表：" msgid "Call" msgstr "调用到" -#: editor/call_dialog.cpp editor/connections_dialog.cpp -#: editor/export_template_manager.cpp -#: editor/plugins/animation_player_editor_plugin.cpp -#: editor/plugins/canvas_item_editor_plugin.cpp -#: editor/plugins/resource_preloader_editor_plugin.cpp -#: editor/plugins/sample_library_editor_plugin.cpp -#: editor/plugins/script_editor_plugin.cpp -#: editor/plugins/sprite_frames_editor_plugin.cpp editor/project_settings.cpp -#: editor/property_editor.cpp editor/run_settings_dialog.cpp -#: editor/settings_config_dialog.cpp -#: modules/visual_script/visual_script_editor.cpp -msgid "Close" -msgstr "å…³é—" - #: editor/call_dialog.cpp msgid "Method List:" msgstr "方法列表:" @@ -485,13 +668,6 @@ msgid "Selection Only" msgstr "仅选ä¸" #: editor/code_editor.cpp editor/editor_help.cpp -#: editor/plugins/script_editor_plugin.cpp -#: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp editor/project_settings.cpp -msgid "Search" -msgstr "æœç´¢" - -#: editor/code_editor.cpp editor/editor_help.cpp msgid "Find" msgstr "查找" @@ -641,11 +817,6 @@ msgstr "最近文件:" msgid "Matches:" msgstr "匹é…项:" -#: editor/create_dialog.cpp editor/editor_help.cpp editor/property_selector.cpp -#: editor/script_editor_debugger.cpp -msgid "Description:" -msgstr "æè¿°:" - #: editor/dependency_editor.cpp msgid "Search Replacement For:" msgstr "æœç´¢æ›¿æ¢:" @@ -1121,10 +1292,6 @@ msgstr " 输出：" msgid "Clear" msgstr "清除" -#: editor/editor_node.cpp -msgid "Node From Scene" -msgstr "从场景导入节点" - #: editor/editor_node.cpp editor/plugins/animation_player_editor_plugin.cpp #: editor/resources_dock.cpp msgid "Error saving resource!" @@ -1499,21 +1666,6 @@ msgid "Distraction Free Mode" msgstr "æ— å¹²æ‰°æ¨¡å¼" #: editor/editor_node.cpp -msgid "Import assets to the project." -msgstr "导入资æºã€‚" - -#: editor/editor_node.cpp editor/io_plugins/editor_bitmask_import_plugin.cpp -#: editor/io_plugins/editor_font_import_plugin.cpp -#: editor/io_plugins/editor_mesh_import_plugin.cpp -#: editor/io_plugins/editor_sample_import_plugin.cpp -#: editor/io_plugins/editor_scene_import_plugin.cpp -#: editor/io_plugins/editor_texture_import_plugin.cpp -#: editor/io_plugins/editor_translation_import_plugin.cpp -#: editor/project_manager.cpp -msgid "Import" -msgstr "导入" - -#: editor/editor_node.cpp msgid "Miscellaneous project or scene-wide tools." msgstr "其他工程或全场景工具。" @@ -1792,10 +1944,6 @@ msgid "Installed Plugins:" msgstr "已安装æ’件:" #: editor/editor_plugin_settings.cpp -msgid "Version:" -msgstr "版本:" - -#: editor/editor_plugin_settings.cpp msgid "Author:" msgstr "作者:" @@ -3796,6 +3944,11 @@ msgid "A processor material of type 'ParticlesMaterial' is required." msgstr "" #: editor/plugins/particles_editor_plugin.cpp +#, fuzzy +msgid "Generating AABB" +msgstr "生æˆAABB" + +#: editor/plugins/particles_editor_plugin.cpp msgid "Faces contain no area!" msgstr "é¢ä¸å«æœ‰åŒºåŸŸï¼" @@ -3848,6 +4001,16 @@ msgstr "体积" msgid "Emission Source: " msgstr "å‘射填充：" +#: editor/plugins/particles_editor_plugin.cpp +#, fuzzy +msgid "Generate Visibility AABB" +msgstr "生æˆAABB" + +#: editor/plugins/particles_editor_plugin.cpp +#, fuzzy +msgid "Generation Time (sec):" +msgstr "å¹³å‡å¸§æ—¶é—´ï¼ˆç§’）" + #: editor/plugins/path_2d_editor_plugin.cpp msgid "Remove Point from Curve" msgstr "从曲线ä¸ç§»é™¤é¡¶ç‚¹" @@ -4300,6 +4463,14 @@ msgid "Trim Trailing Whitespace" msgstr "修剪行åŽç©ºç™½" #: editor/plugins/script_text_editor.cpp +msgid "Convert Indent To Spaces" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Convert Indent To Tabs" +msgstr "" + +#: editor/plugins/script_text_editor.cpp msgid "Auto Indent" msgstr "自动缩进" @@ -5170,12 +5341,12 @@ msgstr "项目目录ä¸å˜åœ¨ï¼" #: editor/project_manager.cpp #, fuzzy -msgid "Invalid project path, godot.cfg must not exist." +msgid "Invalid project path, *.godot must not exist." msgstr "项目目录下必须包å«engin.cfg文件。" #: editor/project_manager.cpp #, fuzzy -msgid "Invalid project path, godot.cfg must exist." +msgid "Invalid project path, *.godot must exist." msgstr "项目目录下必须包å«engin.cfg文件。" #: editor/project_manager.cpp @@ -5188,7 +5359,7 @@ msgstr "项目路径éžæ³•ï¼ˆè¢«å¤–部修改？）。" #: editor/project_manager.cpp #, fuzzy -msgid "Couldn't create godot.cfg in project path." +msgid "Couldn't create *.godot project file in project path." msgstr "æ— æ³•åœ¨é¡¹ç›®ç›®å½•ä¸‹åˆ›å»ºengine.cfg文件。" #: editor/project_manager.cpp @@ -5224,10 +5395,6 @@ msgid "Install Project:" msgstr "安装项目:" #: editor/project_manager.cpp -msgid "Install" -msgstr "安装" - -#: editor/project_manager.cpp msgid "Browse" msgstr "æµè§ˆ" @@ -5286,6 +5453,11 @@ msgid "New Project" msgstr "新建" #: editor/project_manager.cpp +#, fuzzy +msgid "Templates" +msgstr "移除项目" + +#: editor/project_manager.cpp msgid "Exit" msgstr "退出" @@ -5472,8 +5644,8 @@ msgstr "移除资æºé‡å®šå‘选项" #: editor/project_settings.cpp #, fuzzy -msgid "Project Settings (godot.cfg)" -msgstr "项目设置（engine.cfg）" +msgid "Project Settings " +msgstr "项目设置" #: editor/project_settings.cpp editor/settings_config_dialog.cpp msgid "General" @@ -5539,10 +5711,6 @@ msgstr "地区" msgid "AutoLoad" msgstr "è‡ªåŠ¨åŠ è½½(AutoLoad)" -#: editor/project_settings.cpp -msgid "Plugins" -msgstr "æ’件" - #: editor/property_editor.cpp #, fuzzy msgid "Pick a Viewport" @@ -6146,6 +6314,10 @@ msgid "Change Notifier Extents" msgstr "更改通知器级别" #: editor/spatial_editor_gizmos.cpp +msgid "Change Particles AABB" +msgstr "" + +#: editor/spatial_editor_gizmos.cpp msgid "Change Probe Extents" msgstr "更改探针(Probe)范围" @@ -6716,6 +6888,17 @@ msgid "" msgstr "" "NavigationMeshInstance类型节点必须作为Navigation节点的åå™æ‰èƒ½æ供导航数æ®ã€‚" +#: scene/3d/particles.cpp +msgid "" +"Nothing is visible because meshes have not been assigned to draw passes." +msgstr "" + +#: scene/3d/particles.cpp +msgid "" +"A material to process the particles is not assigned, so no behavior is " +"imprinted." +msgstr "" + #: scene/3d/remote_transform.cpp msgid "Path property must point to a valid Spatial node to work." msgstr "path属性必须指å‘一个åˆæ³•çš„Spatial节点æ‰èƒ½æ£å¸¸å·¥ä½œã€‚" @@ -6788,6 +6971,16 @@ msgstr "" "使其æˆä¸ºå控件的所以它å¯ä»¥æœ‰ä¸€ä¸ªå°ºå¯¸å¤§å°å€¼ã€‚å¦åˆ™è¯·è®¾ç½®ä¸ºRender target，并将其" "内部纹ç†åˆ†é…给一些节点以显示。" +#~ msgid "Node From Scene" +#~ msgstr "从场景导入节点" + +#~ msgid "Import assets to the project." +#~ msgstr "导入资æºã€‚" + +#, fuzzy +#~ msgid "Project Settings (godot.cfg)" +#~ msgstr "项目设置（engine.cfg）" + #~ msgid "Surface" #~ msgstr "表é¢" diff --git a/editor/translations/zh_HK.po b/editor/translations/zh_HK.po index 7c06087fd2..dfac75ecab 100644 --- a/editor/translations/zh_HK.po +++ b/editor/translations/zh_HK.po @@ -359,6 +359,180 @@ msgstr "" msgid "Change Array Value" msgstr "" +#: editor/asset_library_editor_plugin.cpp +msgid "Free" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp editor/editor_plugin_settings.cpp +msgid "Version:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Contents:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "View Files" +msgstr "檔案" + +#: editor/asset_library_editor_plugin.cpp editor/create_dialog.cpp +#: editor/editor_help.cpp editor/property_selector.cpp +#: editor/script_editor_debugger.cpp +msgid "Description:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp editor/project_manager.cpp +msgid "Install" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp editor/call_dialog.cpp +#: editor/connections_dialog.cpp editor/export_template_manager.cpp +#: editor/plugins/animation_player_editor_plugin.cpp +#: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/resource_preloader_editor_plugin.cpp +#: editor/plugins/sample_library_editor_plugin.cpp +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/sprite_frames_editor_plugin.cpp editor/project_settings.cpp +#: editor/property_editor.cpp editor/run_settings_dialog.cpp +#: editor/settings_config_dialog.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Close" +msgstr "關閉" + +#: editor/asset_library_editor_plugin.cpp +msgid "Can't resolve hostname:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Can't resolve." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Connection error, please try again." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Can't connect." +msgstr "連到..." + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Can't connect to host:" +msgstr "連到" + +#: editor/asset_library_editor_plugin.cpp +msgid "No response from host:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "No response." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Request failed, return code:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Req. Failed." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Request failed, too many redirects" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Redirect Loop." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Failed:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Bad download hash, assuming file has been tampered with." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Expected:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Got:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Failed sha256 hash check" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Asset Download Error:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Success!" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Fetching:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Resolving.." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Connecting.." +msgstr "連到..." + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Requesting.." +msgstr "測試" + +#: editor/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Error making request" +msgstr "載入å—形出ç¾éŒ¯èª¤" + +#: editor/asset_library_editor_plugin.cpp +msgid "Idle" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Retry" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Download Error" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Download for this asset is already in progress!" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "first" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "prev" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "next" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "last" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "All" +msgstr "全部" + #: editor/asset_library_editor_plugin.cpp editor/create_dialog.cpp #: editor/editor_help.cpp editor/editor_node.cpp #: editor/plugins/script_editor_plugin.cpp editor/property_selector.cpp @@ -366,6 +540,29 @@ msgstr "" msgid "Search:" msgstr "" +#: editor/asset_library_editor_plugin.cpp editor/code_editor.cpp +#: editor/editor_help.cpp editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp +#: editor/plugins/shader_editor_plugin.cpp editor/project_settings.cpp +msgid "Search" +msgstr "æœå°‹" + +#: editor/asset_library_editor_plugin.cpp editor/editor_node.cpp +#: editor/io_plugins/editor_bitmask_import_plugin.cpp +#: editor/io_plugins/editor_font_import_plugin.cpp +#: editor/io_plugins/editor_mesh_import_plugin.cpp +#: editor/io_plugins/editor_sample_import_plugin.cpp +#: editor/io_plugins/editor_scene_import_plugin.cpp +#: editor/io_plugins/editor_texture_import_plugin.cpp +#: editor/io_plugins/editor_translation_import_plugin.cpp +#: editor/project_manager.cpp +msgid "Import" +msgstr "å°Žå…¥" + +#: editor/asset_library_editor_plugin.cpp editor/project_settings.cpp +msgid "Plugins" +msgstr "æ’件" + #: editor/asset_library_editor_plugin.cpp msgid "Sort:" msgstr "" @@ -379,10 +576,6 @@ msgid "Category:" msgstr "分類:" #: editor/asset_library_editor_plugin.cpp -msgid "All" -msgstr "全部" - -#: editor/asset_library_editor_plugin.cpp msgid "Site:" msgstr "地å€:" @@ -414,20 +607,6 @@ msgstr "" msgid "Call" msgstr "" -#: editor/call_dialog.cpp editor/connections_dialog.cpp -#: editor/export_template_manager.cpp -#: editor/plugins/animation_player_editor_plugin.cpp -#: editor/plugins/canvas_item_editor_plugin.cpp -#: editor/plugins/resource_preloader_editor_plugin.cpp -#: editor/plugins/sample_library_editor_plugin.cpp -#: editor/plugins/script_editor_plugin.cpp -#: editor/plugins/sprite_frames_editor_plugin.cpp editor/project_settings.cpp -#: editor/property_editor.cpp editor/run_settings_dialog.cpp -#: editor/settings_config_dialog.cpp -#: modules/visual_script/visual_script_editor.cpp -msgid "Close" -msgstr "關閉" - #: editor/call_dialog.cpp msgid "Method List:" msgstr "" @@ -477,13 +656,6 @@ msgid "Selection Only" msgstr "åªé™é¸ä¸" #: editor/code_editor.cpp editor/editor_help.cpp -#: editor/plugins/script_editor_plugin.cpp -#: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp editor/project_settings.cpp -msgid "Search" -msgstr "æœå°‹" - -#: editor/code_editor.cpp editor/editor_help.cpp msgid "Find" msgstr "查找" @@ -636,11 +808,6 @@ msgstr "最近:" msgid "Matches:" msgstr "å»åˆ" -#: editor/create_dialog.cpp editor/editor_help.cpp editor/property_selector.cpp -#: editor/script_editor_debugger.cpp -msgid "Description:" -msgstr "" - #: editor/dependency_editor.cpp msgid "Search Replacement For:" msgstr "" @@ -1119,10 +1286,6 @@ msgstr "" msgid "Clear" msgstr "清空" -#: editor/editor_node.cpp -msgid "Node From Scene" -msgstr "" - #: editor/editor_node.cpp editor/plugins/animation_player_editor_plugin.cpp #: editor/resources_dock.cpp msgid "Error saving resource!" @@ -1491,21 +1654,6 @@ msgid "Distraction Free Mode" msgstr "" #: editor/editor_node.cpp -msgid "Import assets to the project." -msgstr "" - -#: editor/editor_node.cpp editor/io_plugins/editor_bitmask_import_plugin.cpp -#: editor/io_plugins/editor_font_import_plugin.cpp -#: editor/io_plugins/editor_mesh_import_plugin.cpp -#: editor/io_plugins/editor_sample_import_plugin.cpp -#: editor/io_plugins/editor_scene_import_plugin.cpp -#: editor/io_plugins/editor_texture_import_plugin.cpp -#: editor/io_plugins/editor_translation_import_plugin.cpp -#: editor/project_manager.cpp -msgid "Import" -msgstr "å°Žå…¥" - -#: editor/editor_node.cpp msgid "Miscellaneous project or scene-wide tools." msgstr "" @@ -1774,10 +1922,6 @@ msgid "Installed Plugins:" msgstr "" #: editor/editor_plugin_settings.cpp -msgid "Version:" -msgstr "" - -#: editor/editor_plugin_settings.cpp msgid "Author:" msgstr "" @@ -3753,6 +3897,10 @@ msgid "A processor material of type 'ParticlesMaterial' is required." msgstr "" #: editor/plugins/particles_editor_plugin.cpp +msgid "Generating AABB" +msgstr "" + +#: editor/plugins/particles_editor_plugin.cpp msgid "Faces contain no area!" msgstr "" @@ -3800,6 +3948,14 @@ msgstr "" msgid "Emission Source: " msgstr "" +#: editor/plugins/particles_editor_plugin.cpp +msgid "Generate Visibility AABB" +msgstr "" + +#: editor/plugins/particles_editor_plugin.cpp +msgid "Generation Time (sec):" +msgstr "" + #: editor/plugins/path_2d_editor_plugin.cpp msgid "Remove Point from Curve" msgstr "" @@ -4252,6 +4408,14 @@ msgid "Trim Trailing Whitespace" msgstr "" #: editor/plugins/script_text_editor.cpp +msgid "Convert Indent To Spaces" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Convert Indent To Tabs" +msgstr "" + +#: editor/plugins/script_text_editor.cpp msgid "Auto Indent" msgstr "" @@ -5114,11 +5278,11 @@ msgid "Invalid project path, the path must exist!" msgstr "" #: editor/project_manager.cpp -msgid "Invalid project path, godot.cfg must not exist." +msgid "Invalid project path, *.godot must not exist." msgstr "" #: editor/project_manager.cpp -msgid "Invalid project path, godot.cfg must exist." +msgid "Invalid project path, *.godot must exist." msgstr "" #: editor/project_manager.cpp @@ -5130,7 +5294,7 @@ msgid "Invalid project path (changed anything?)." msgstr "" #: editor/project_manager.cpp -msgid "Couldn't create godot.cfg in project path." +msgid "Couldn't create *.godot project file in project path." msgstr "" #: editor/project_manager.cpp @@ -5166,10 +5330,6 @@ msgid "Install Project:" msgstr "" #: editor/project_manager.cpp -msgid "Install" -msgstr "" - -#: editor/project_manager.cpp msgid "Browse" msgstr "ç€è¦½" @@ -5228,6 +5388,11 @@ msgid "New Project" msgstr "" #: editor/project_manager.cpp +#, fuzzy +msgid "Templates" +msgstr "移除é¸é …" + +#: editor/project_manager.cpp msgid "Exit" msgstr "離開" @@ -5412,8 +5577,9 @@ msgid "Remove Resource Remap Option" msgstr "" #: editor/project_settings.cpp -msgid "Project Settings (godot.cfg)" -msgstr "" +#, fuzzy +msgid "Project Settings " +msgstr "è¨å®š" #: editor/project_settings.cpp editor/settings_config_dialog.cpp msgid "General" @@ -5479,10 +5645,6 @@ msgstr "" msgid "AutoLoad" msgstr "" -#: editor/project_settings.cpp -msgid "Plugins" -msgstr "æ’件" - #: editor/property_editor.cpp msgid "Pick a Viewport" msgstr "" @@ -6094,6 +6256,10 @@ msgid "Change Notifier Extents" msgstr "" #: editor/spatial_editor_gizmos.cpp +msgid "Change Particles AABB" +msgstr "" + +#: editor/spatial_editor_gizmos.cpp msgid "Change Probe Extents" msgstr "" @@ -6649,6 +6815,17 @@ msgid "" "It only provides navigation data." msgstr "" +#: scene/3d/particles.cpp +msgid "" +"Nothing is visible because meshes have not been assigned to draw passes." +msgstr "" + +#: scene/3d/particles.cpp +msgid "" +"A material to process the particles is not assigned, so no behavior is " +"imprinted." +msgstr "" + #: scene/3d/remote_transform.cpp msgid "Path property must point to a valid Spatial node to work." msgstr "" diff --git a/editor/translations/zh_TW.po b/editor/translations/zh_TW.po index 34943b9eb4..48b76484e0 100644 --- a/editor/translations/zh_TW.po +++ b/editor/translations/zh_TW.po @@ -356,6 +356,174 @@ msgstr "" msgid "Change Array Value" msgstr "" +#: editor/asset_library_editor_plugin.cpp +msgid "Free" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp editor/editor_plugin_settings.cpp +msgid "Version:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Contents:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "View Files" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp editor/create_dialog.cpp +#: editor/editor_help.cpp editor/property_selector.cpp +#: editor/script_editor_debugger.cpp +msgid "Description:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp editor/project_manager.cpp +msgid "Install" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp editor/call_dialog.cpp +#: editor/connections_dialog.cpp editor/export_template_manager.cpp +#: editor/plugins/animation_player_editor_plugin.cpp +#: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/resource_preloader_editor_plugin.cpp +#: editor/plugins/sample_library_editor_plugin.cpp +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/sprite_frames_editor_plugin.cpp editor/project_settings.cpp +#: editor/property_editor.cpp editor/run_settings_dialog.cpp +#: editor/settings_config_dialog.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Close" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Can't resolve hostname:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Can't resolve." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Connection error, please try again." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Can't connect." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Can't connect to host:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "No response from host:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "No response." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Request failed, return code:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Req. Failed." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Request failed, too many redirects" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Redirect Loop." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Failed:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Bad download hash, assuming file has been tampered with." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Expected:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Got:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Failed sha256 hash check" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Asset Download Error:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Success!" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Fetching:" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Resolving.." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Connecting.." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Requesting.." +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Error making request" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Idle" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Retry" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Download Error" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "Download for this asset is already in progress!" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "first" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "prev" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "next" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "last" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp +msgid "All" +msgstr "" + #: editor/asset_library_editor_plugin.cpp editor/create_dialog.cpp #: editor/editor_help.cpp editor/editor_node.cpp #: editor/plugins/script_editor_plugin.cpp editor/property_selector.cpp @@ -363,6 +531,29 @@ msgstr "" msgid "Search:" msgstr "" +#: editor/asset_library_editor_plugin.cpp editor/code_editor.cpp +#: editor/editor_help.cpp editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp +#: editor/plugins/shader_editor_plugin.cpp editor/project_settings.cpp +msgid "Search" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp editor/editor_node.cpp +#: editor/io_plugins/editor_bitmask_import_plugin.cpp +#: editor/io_plugins/editor_font_import_plugin.cpp +#: editor/io_plugins/editor_mesh_import_plugin.cpp +#: editor/io_plugins/editor_sample_import_plugin.cpp +#: editor/io_plugins/editor_scene_import_plugin.cpp +#: editor/io_plugins/editor_texture_import_plugin.cpp +#: editor/io_plugins/editor_translation_import_plugin.cpp +#: editor/project_manager.cpp +msgid "Import" +msgstr "" + +#: editor/asset_library_editor_plugin.cpp editor/project_settings.cpp +msgid "Plugins" +msgstr "" + #: editor/asset_library_editor_plugin.cpp msgid "Sort:" msgstr "" @@ -376,10 +567,6 @@ msgid "Category:" msgstr "" #: editor/asset_library_editor_plugin.cpp -msgid "All" -msgstr "" - -#: editor/asset_library_editor_plugin.cpp msgid "Site:" msgstr "" @@ -411,20 +598,6 @@ msgstr "" msgid "Call" msgstr "" -#: editor/call_dialog.cpp editor/connections_dialog.cpp -#: editor/export_template_manager.cpp -#: editor/plugins/animation_player_editor_plugin.cpp -#: editor/plugins/canvas_item_editor_plugin.cpp -#: editor/plugins/resource_preloader_editor_plugin.cpp -#: editor/plugins/sample_library_editor_plugin.cpp -#: editor/plugins/script_editor_plugin.cpp -#: editor/plugins/sprite_frames_editor_plugin.cpp editor/project_settings.cpp -#: editor/property_editor.cpp editor/run_settings_dialog.cpp -#: editor/settings_config_dialog.cpp -#: modules/visual_script/visual_script_editor.cpp -msgid "Close" -msgstr "" - #: editor/call_dialog.cpp msgid "Method List:" msgstr "" @@ -474,13 +647,6 @@ msgid "Selection Only" msgstr "" #: editor/code_editor.cpp editor/editor_help.cpp -#: editor/plugins/script_editor_plugin.cpp -#: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp editor/project_settings.cpp -msgid "Search" -msgstr "" - -#: editor/code_editor.cpp editor/editor_help.cpp msgid "Find" msgstr "" @@ -630,11 +796,6 @@ msgstr "" msgid "Matches:" msgstr "" -#: editor/create_dialog.cpp editor/editor_help.cpp editor/property_selector.cpp -#: editor/script_editor_debugger.cpp -msgid "Description:" -msgstr "" - #: editor/dependency_editor.cpp msgid "Search Replacement For:" msgstr "" @@ -1108,10 +1269,6 @@ msgstr "" msgid "Clear" msgstr "" -#: editor/editor_node.cpp -msgid "Node From Scene" -msgstr "" - #: editor/editor_node.cpp editor/plugins/animation_player_editor_plugin.cpp #: editor/resources_dock.cpp msgid "Error saving resource!" @@ -1476,21 +1633,6 @@ msgid "Distraction Free Mode" msgstr "" #: editor/editor_node.cpp -msgid "Import assets to the project." -msgstr "" - -#: editor/editor_node.cpp editor/io_plugins/editor_bitmask_import_plugin.cpp -#: editor/io_plugins/editor_font_import_plugin.cpp -#: editor/io_plugins/editor_mesh_import_plugin.cpp -#: editor/io_plugins/editor_sample_import_plugin.cpp -#: editor/io_plugins/editor_scene_import_plugin.cpp -#: editor/io_plugins/editor_texture_import_plugin.cpp -#: editor/io_plugins/editor_translation_import_plugin.cpp -#: editor/project_manager.cpp -msgid "Import" -msgstr "" - -#: editor/editor_node.cpp msgid "Miscellaneous project or scene-wide tools." msgstr "" @@ -1759,10 +1901,6 @@ msgid "Installed Plugins:" msgstr "" #: editor/editor_plugin_settings.cpp -msgid "Version:" -msgstr "" - -#: editor/editor_plugin_settings.cpp msgid "Author:" msgstr "" @@ -3732,6 +3870,10 @@ msgid "A processor material of type 'ParticlesMaterial' is required." msgstr "" #: editor/plugins/particles_editor_plugin.cpp +msgid "Generating AABB" +msgstr "" + +#: editor/plugins/particles_editor_plugin.cpp msgid "Faces contain no area!" msgstr "" @@ -3779,6 +3921,14 @@ msgstr "" msgid "Emission Source: " msgstr "" +#: editor/plugins/particles_editor_plugin.cpp +msgid "Generate Visibility AABB" +msgstr "" + +#: editor/plugins/particles_editor_plugin.cpp +msgid "Generation Time (sec):" +msgstr "" + #: editor/plugins/path_2d_editor_plugin.cpp msgid "Remove Point from Curve" msgstr "" @@ -4228,6 +4378,14 @@ msgid "Trim Trailing Whitespace" msgstr "" #: editor/plugins/script_text_editor.cpp +msgid "Convert Indent To Spaces" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Convert Indent To Tabs" +msgstr "" + +#: editor/plugins/script_text_editor.cpp msgid "Auto Indent" msgstr "" @@ -5085,11 +5243,11 @@ msgid "Invalid project path, the path must exist!" msgstr "" #: editor/project_manager.cpp -msgid "Invalid project path, godot.cfg must not exist." +msgid "Invalid project path, *.godot must not exist." msgstr "" #: editor/project_manager.cpp -msgid "Invalid project path, godot.cfg must exist." +msgid "Invalid project path, *.godot must exist." msgstr "" #: editor/project_manager.cpp @@ -5101,7 +5259,7 @@ msgid "Invalid project path (changed anything?)." msgstr "" #: editor/project_manager.cpp -msgid "Couldn't create godot.cfg in project path." +msgid "Couldn't create *.godot project file in project path." msgstr "" #: editor/project_manager.cpp @@ -5137,10 +5295,6 @@ msgid "Install Project:" msgstr "" #: editor/project_manager.cpp -msgid "Install" -msgstr "" - -#: editor/project_manager.cpp msgid "Browse" msgstr "" @@ -5199,6 +5353,10 @@ msgid "New Project" msgstr "" #: editor/project_manager.cpp +msgid "Templates" +msgstr "" + +#: editor/project_manager.cpp msgid "Exit" msgstr "" @@ -5382,7 +5540,7 @@ msgid "Remove Resource Remap Option" msgstr "" #: editor/project_settings.cpp -msgid "Project Settings (godot.cfg)" +msgid "Project Settings " msgstr "" #: editor/project_settings.cpp editor/settings_config_dialog.cpp @@ -5449,10 +5607,6 @@ msgstr "" msgid "AutoLoad" msgstr "" -#: editor/project_settings.cpp -msgid "Plugins" -msgstr "" - #: editor/property_editor.cpp msgid "Pick a Viewport" msgstr "" @@ -6056,6 +6210,10 @@ msgid "Change Notifier Extents" msgstr "" #: editor/spatial_editor_gizmos.cpp +msgid "Change Particles AABB" +msgstr "" + +#: editor/spatial_editor_gizmos.cpp #, fuzzy msgid "Change Probe Extents" msgstr "變更框型範åœ" @@ -6610,6 +6768,17 @@ msgid "" "It only provides navigation data." msgstr "" +#: scene/3d/particles.cpp +msgid "" +"Nothing is visible because meshes have not been assigned to draw passes." +msgstr "" + +#: scene/3d/particles.cpp +msgid "" +"A material to process the particles is not assigned, so no behavior is " +"imprinted." +msgstr "" + #: scene/3d/remote_transform.cpp msgid "Path property must point to a valid Spatial node to work." msgstr "" diff --git a/main/input_default.cpp b/main/input_default.cpp index 918f3c150c..8f0b8464eb 100644 --- a/main/input_default.cpp +++ b/main/input_default.cpp @@ -340,7 +340,7 @@ void InputDefault::parse_input_event(const InputEvent &p_event) { Point2 pos = Point2(p_event.mouse_button.global_x, p_event.mouse_button.global_y); if (mouse_pos != pos) { - set_mouse_pos(pos); + set_mouse_position(pos); } } break; case InputEvent::MOUSE_MOTION: { @@ -456,16 +456,16 @@ void InputDefault::set_main_loop(MainLoop *p_main_loop) { main_loop = p_main_loop; } -void InputDefault::set_mouse_pos(const Point2 &p_posf) { +void InputDefault::set_mouse_position(const Point2 &p_posf) { mouse_speed_track.update(p_posf - mouse_pos); mouse_pos = p_posf; if (custom_cursor.is_valid()) { - VisualServer::get_singleton()->cursor_set_pos(get_mouse_pos()); + VisualServer::get_singleton()->cursor_set_pos(get_mouse_position()); } } -Point2 InputDefault::get_mouse_pos() const { +Point2 InputDefault::get_mouse_position() const { return mouse_pos; } @@ -560,7 +560,7 @@ void InputDefault::set_custom_mouse_cursor(const RES &p_cursor, const Vector2 &p set_mouse_mode(MOUSE_MODE_HIDDEN); VisualServer::get_singleton()->cursor_set_visible(true); VisualServer::get_singleton()->cursor_set_texture(custom_cursor->get_rid(), p_hotspot, 0, region); - VisualServer::get_singleton()->cursor_set_pos(get_mouse_pos()); + VisualServer::get_singleton()->cursor_set_pos(get_mouse_position()); } } @@ -687,6 +687,7 @@ static const char *s_ControllerMappings[] = { "030000004c0500006802000011010000,PS3 Controller,a:b14,b:b13,back:b0,dpdown:b6,dpleft:b7,dpright:b5,dpup:b4,guide:b16,leftshoulder:b10,leftstick:b1,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b11,rightstick:b2,righttrigger:b9,rightx:a2,righty:a3,start:b3,x:b15,y:b12,", "030000004c050000a00b000011010000,Sony DualShock 4 Wireless Adaptor,a:b1,b:b2,y:b3,x:b0,start:b9,guide:b12,back:b13,leftstick:b10,rightstick:b11,leftshoulder:b4,rightshoulder:b5,dpup:h0.1,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,leftx:a0,lefty:a1,rightx:a2,righty:a5,lefttrigger:a3,righttrigger:a4,", "030000004c050000c405000011010000,Sony DualShock 4,a:b1,b:b2,y:b3,x:b0,start:b9,guide:b12,back:b8,leftstick:b10,rightstick:b11,leftshoulder:b4,rightshoulder:b5,dpup:h0.1,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,leftx:a0,lefty:a1,rightx:a2,righty:a5,lefttrigger:a3,righttrigger:a4,", + "030000004c050000c405000011810000,Sony Computer Entertainment Wireless Controller,leftx:a0,lefty:a1,dpdown:h0.4,rightstick:h0.1,rightshoulder:b5,rightx:a3,start:b9,righty:a4,dpleft:h0.8,lefttrigger:a2,x:b3,dpup:h0.1,back:b8,leftstick:b11,leftshoulder:b4,y:b2,a:b0,dpright:h0.2,righttrigger:a5,b:b1,", "030000004c050000cc09000011010000,Sony DualShock 4 V2,a:b1,b:b2,y:b3,x:b0,start:b9,guide:b12,back:b13,leftstick:b10,rightstick:b11,leftshoulder:b4,rightshoulder:b5,dpup:h0.1,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,leftx:a0,lefty:a1,rightx:a2,righty:a5,lefttrigger:a3,righttrigger:a4,", "030000004f04000000b3000010010000,Thrustmaster Firestorm Dual Power,a:b0,b:b2,y:b3,x:b1,start:b10,guide:b8,back:b9,leftstick:b11,rightstick:b12,leftshoulder:b4,rightshoulder:b6,dpup:h0.1,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,leftx:a0,lefty:a1,rightx:a2,righty:a3,lefttrigger:b5,righttrigger:b7,", "030000004f04000008d0000000010000,Thrustmaster Run N Drive Wireless,a:b1,b:b2,x:b0,y:b3,start:b9,back:b8,leftstick:b10,rightstick:b11,leftshoulder:b4,rightshoulder:b5,dpup:h0.1,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,leftx:a0,lefty:a1,rightx:a2,righty:a5,lefttrigger:b6,righttrigger:b7,", @@ -756,6 +757,7 @@ static const char *s_ControllerMappings[] = { "05000000102800000900000000010000,8Bitdo SFC30 GamePad,x:b4,a:b1,b:b0,y:b3,back:b10,start:b11,leftshoulder:b6,rightshoulder:b7,leftx:a0,lefty:a1,", "05000000362800000100000002010000,OUYA Game Controller,a:b0,b:b3,dpdown:b9,dpleft:b10,dpright:b11,dpup:b8,guide:b14,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,x:b1,y:b2,", "05000000362800000100000003010000,OUYA Game Controller,a:b0,b:b3,dpdown:b9,dpleft:b10,dpright:b11,dpup:b8,guide:b14,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,x:b1,y:b2,", + "05000000362800000100000004010000,OUYA Game Controller,leftx:a0,lefty:a1,dpdown:b9,rightstick:b7,rightshoulder:b5,rightx:a3,start:b16,righty:a4,dpleft:b10,lefttrigger:b12,x:b1,dpup:b8,back:b14,leftstick:b6,leftshoulder:b4,y:b2,a:b0,dpright:b11,righttrigger:b13,b:b3,", "05000000380700006652000025010000,Mad Catz C.T.R.L.R ,x:b0,a:b1,b:b2,y:b3,back:b8,guide:b12,start:b9,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,leftstick:b10,rightstick:b11,leftx:a0,lefty:a1,rightx:a2,righty:a3,", "0500000047532047616d657061640000,GameStop Gamepad,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,", "050000004c0500006802000000010000,PS3 Controller (Bluetooth),a:b14,b:b13,y:b12,x:b15,start:b3,guide:b16,back:b0,leftstick:b1,rightstick:b2,leftshoulder:b10,rightshoulder:b11,dpup:b4,dpleft:b7,dpdown:b6,dpright:b5,leftx:a0,lefty:a1,rightx:a2,righty:a3,lefttrigger:b8,righttrigger:b9,", @@ -910,6 +912,7 @@ void InputDefault::joy_axis(int p_device, int p_axis, const JoyAxis &p_value) { if (joy.mapping == -1) { _axis_event(p_device, p_axis, val); + return; }; Map<int, JoyEvent>::Element *el = map_db[joy.mapping].axis.find(p_axis); diff --git a/main/input_default.h b/main/input_default.h index a611047cb3..55b7555ef9 100644 --- a/main/input_default.h +++ b/main/input_default.h @@ -196,7 +196,7 @@ public: virtual Vector3 get_magnetometer() const; virtual Vector3 get_gyroscope() const; - virtual Point2 get_mouse_pos() const; + virtual Point2 get_mouse_position() const; virtual Point2 get_last_mouse_speed() const; virtual int get_mouse_button_mask() const; @@ -215,7 +215,7 @@ public: virtual void stop_joy_vibration(int p_device); void set_main_loop(MainLoop *main_loop); - void set_mouse_pos(const Point2 &p_posf); + void set_mouse_position(const Point2 &p_posf); void action_press(const StringName &p_action); void action_release(const StringName &p_action); diff --git a/main/main.cpp b/main/main.cpp index 0fa795b214..377d15f5f4 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -129,7 +129,7 @@ void Main::print_help(const char *p_binary) { OS::get_singleton()->print(VERSION_FULL_NAME " (c) 2008-2017 Juan Linietsky, Ariel Manzur.\n"); OS::get_singleton()->print("Usage: %s [options] [scene]\n", p_binary); OS::get_singleton()->print("Options:\n"); - OS::get_singleton()->print("\t-path [dir] : Path to a game, containing godot.cfg\n"); + OS::get_singleton()->print("\t-path [dir] : Path to a game, containing *.godot\n"); #ifdef TOOLS_ENABLED OS::get_singleton()->print("\t-e,-editor : Bring up the editor instead of running the scene.\n"); #endif @@ -447,6 +447,23 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph } else { goto error; } + } else if (I->get().ends_with(".godot")) { + String path; + String file = I->get(); + int sep = MAX(file.find_last("/"), file.find_last("\\")); + if (sep == -1) + path = "."; + else { + path = file.substr(0, sep); + } + if (OS::get_singleton()->set_cwd(path) == OK) { + + } else { + game_path = path; + } +#ifdef TOOLS_ENABLED + editor = true; +#endif } else if (I->get() == "-bp") { // /breakpoints if (I->next()) { @@ -673,14 +690,14 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph else input_map->load_from_globals(); //keys for game - if (video_driver == "") // specified in godot.cfg + if (video_driver == "") // specified in *.godot video_driver = GLOBAL_DEF("display/driver/name", Variant((const char *)OS::get_singleton()->get_video_driver_name(0))); if (!force_res && use_custom_res && globals->has("display/window/width")) video_mode.width = globals->get("display/window/width"); if (!force_res && use_custom_res && globals->has("display/window/height")) video_mode.height = globals->get("display/window/height"); - if (!editor && (!bool(globals->get("display/window/allow_hidpi")) || force_lowdpi)) { + if (!editor && ((globals->has("display/window/allow_hidpi") && !globals->get("display/window/allow_hidpi")) || force_lowdpi)) { OS::get_singleton()->_allow_hidpi = false; } if (use_custom_res && globals->has("display/window/fullscreen")) @@ -725,7 +742,7 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph /* Determine Video Driver */ - if (audio_driver == "") { // specified in godot.cfg + if (audio_driver == "") { // specified in *.godot audio_driver = GLOBAL_DEF("audio/driver", OS::get_singleton()->get_audio_driver_name(0)); } @@ -1235,7 +1252,7 @@ bool Main::start() { String stretch_mode = GLOBAL_DEF("display/stretch/mode", "disabled"); String stretch_aspect = GLOBAL_DEF("display/stretch/aspect", "ignore"); - Size2i stretch_size = Size2(GLOBAL_DEF("display/screen/width", 0), GLOBAL_DEF("display/screen/height", 0)); + Size2i stretch_size = Size2(GLOBAL_DEF("display/window/width", 0), GLOBAL_DEF("display/window/height", 0)); SceneTree::StretchMode sml_sm = SceneTree::STRETCH_MODE_DISABLED; if (stretch_mode == "2d") diff --git a/main/tests/test_gui.cpp b/main/tests/test_gui.cpp index cf32bf7073..3d0b96ae5b 100644 --- a/main/tests/test_gui.cpp +++ b/main/tests/test_gui.cpp @@ -94,7 +94,7 @@ public: Sprite *sp = memnew( Sprite ); sp->set_texture( vp->get_render_target_texture() ); //sp->set_texture( ResourceLoader::load("res://ball.png") ); - sp->set_pos(Point2(300,300)); + sp->set_position(Point2(300,300)); get_root()->add_child(sp); @@ -113,7 +113,7 @@ public: Label *label = memnew(Label); - label->set_pos(Point2(80, 90)); + label->set_position(Point2(80, 90)); label->set_size(Point2(170, 80)); label->set_align(Label::ALIGN_FILL); //label->set_text("There"); @@ -123,7 +123,7 @@ public: Button *button = memnew(Button); - button->set_pos(Point2(20, 20)); + button->set_position(Point2(20, 20)); button->set_size(Point2(1, 1)); button->set_text("This is a biggie button"); @@ -141,7 +141,7 @@ public: Ref<ImageTexture> tt = memnew( ImageTexture ); tt->create_from_image(img); tf->set_texture(tt); - tf->set_pos(Point2(50,50)); + tf->set_position(Point2(50,50)); //tf->set_scale(Point2(0.3,0.3)); @@ -151,7 +151,7 @@ public: Tree *tree = memnew(Tree); tree->set_columns(2); - tree->set_pos(Point2(230, 210)); + tree->set_position(Point2(230, 210)); tree->set_size(Point2(150, 250)); TreeItem *item = tree->create_item(); @@ -192,14 +192,14 @@ public: LineEdit *line_edit = memnew(LineEdit); - line_edit->set_pos(Point2(30, 190)); + line_edit->set_position(Point2(30, 190)); line_edit->set_size(Point2(180, 1)); frame->add_child(line_edit); HScrollBar *hscroll = memnew(HScrollBar); - hscroll->set_pos(Point2(30, 290)); + hscroll->set_position(Point2(30, 290)); hscroll->set_size(Point2(180, 1)); hscroll->set_max(10); hscroll->set_page(4); @@ -208,7 +208,7 @@ public: SpinBox *spin = memnew(SpinBox); - spin->set_pos(Point2(30, 260)); + spin->set_position(Point2(30, 260)); spin->set_size(Point2(120, 1)); frame->add_child(spin); @@ -216,7 +216,7 @@ public: ProgressBar *progress = memnew(ProgressBar); - progress->set_pos(Point2(30, 330)); + progress->set_position(Point2(30, 330)); progress->set_size(Point2(120, 1)); frame->add_child(progress); @@ -225,7 +225,7 @@ public: MenuButton *menu_button = memnew(MenuButton); menu_button->set_text("I'm a menu!"); - menu_button->set_pos(Point2(30, 380)); + menu_button->set_position(Point2(30, 380)); menu_button->set_size(Point2(1, 1)); frame->add_child(menu_button); @@ -244,7 +244,7 @@ public: options->add_item("Hello, testing"); options->add_item("My Dearest"); - options->set_pos(Point2(230, 180)); + options->set_position(Point2(230, 180)); options->set_size(Point2(1, 1)); frame->add_child(options); @@ -253,7 +253,7 @@ public: Tree * tree = memnew( Tree ); tree->set_columns(2); - tree->set_pos( Point2( 230,210 ) ); + tree->set_position( Point2( 230,210 ) ); tree->set_size( Point2( 150,250 ) ); @@ -281,7 +281,7 @@ public: RichTextLabel *richtext = memnew(RichTextLabel); - richtext->set_pos(Point2(600, 210)); + richtext->set_position(Point2(600, 210)); richtext->set_size(Point2(180, 250)); richtext->set_anchor_and_margin(MARGIN_RIGHT, Control::ANCHOR_END, 20); @@ -337,21 +337,21 @@ public: tabc->add_child(ctl); label = memnew(Label); label->set_text("Some Label"); - label->set_pos(Point2(20, 20)); + label->set_position(Point2(20, 20)); ctl->add_child(label); ctl = memnew(Control); ctl->set_name("tab 3"); button = memnew(Button); button->set_text("Some Button"); - button->set_pos(Point2(30, 50)); + button->set_position(Point2(30, 50)); ctl->add_child(button); tabc->add_child(ctl); frame->add_child(tabc); - tabc->set_pos(Point2(400, 210)); + tabc->set_position(Point2(400, 210)); tabc->set_size(Point2(180, 250)); /*Ref<ImageTexture> text = memnew( ImageTexture ); @@ -359,14 +359,14 @@ public: Sprite* sprite = memnew(Sprite); sprite->set_texture(text); - sprite->set_pos(Point2(300, 300)); + sprite->set_position(Point2(300, 300)); frame->add_child(sprite); sprite->show(); Sprite* sprite2 = memnew(Sprite); sprite->set_texture(text); sprite->add_child(sprite2); - sprite2->set_pos(Point2(50, 50)); + sprite2->set_position(Point2(50, 50)); sprite2->show();*/ } }; diff --git a/main/tests/test_math.cpp b/main/tests/test_math.cpp index cb75dcec13..95a1672e67 100644 --- a/main/tests/test_math.cpp +++ b/main/tests/test_math.cpp @@ -602,7 +602,7 @@ MainLoop *test() { print_line(q3); print_line("before v: " + v + " a: " + rtos(a)); - q.get_axis_and_angle(v, a); + q.get_axis_angle(v, a); print_line("after v: " + v + " a: " + rtos(a)); } diff --git a/methods.py b/methods.py index 03216fb58b..cad87ad775 100644 --- a/methods.py +++ b/methods.py @@ -1165,7 +1165,7 @@ def update_version(): print("Using custom revision: " + rev) import version - f = open("core/version.h", "wb") + f = open("core/version_generated.h", "wb") f.write("#define VERSION_SHORT_NAME " + str(version.short_name) + "\n") f.write("#define VERSION_NAME " + str(version.name) + "\n") f.write("#define VERSION_MAJOR " + str(version.major) + "\n") @@ -1353,66 +1353,64 @@ def win32_spawn(sh, escape, cmd, args, spawnenv): return exit_code """ - def android_add_maven_repository(self, url): - self.android_maven_repos.append(url) - + if (url not in self.android_maven_repos): + self.android_maven_repos.append(url) def android_add_dependency(self, depline): - self.android_dependencies.append(depline) - + if (depline not in self.android_dependencies): + self.android_dependencies.append(depline) def android_add_java_dir(self, subpath): base_path = self.Dir(".").abspath + "/modules/" + self.current_module + "/" + subpath - self.android_java_dirs.append(base_path) - + if (base_path not in self.android_java_dirs): + self.android_java_dirs.append(base_path) def android_add_res_dir(self, subpath): base_path = self.Dir(".").abspath + "/modules/" + self.current_module + "/" + subpath - self.android_res_dirs.append(base_path) - + if (base_path not in self.android_res_dirs): + self.android_res_dirs.append(base_path) def android_add_aidl_dir(self, subpath): base_path = self.Dir(".").abspath + "/modules/" + self.current_module + "/" + subpath - self.android_aidl_dirs.append(base_path) - + if (base_path not in self.android_aidl_dirs): + self.android_aidl_dirs.append(base_path) def android_add_jni_dir(self, subpath): base_path = self.Dir(".").abspath + "/modules/" + self.current_module + "/" + subpath - self.android_jni_dirs.append(base_path) + if (base_path not in self.android_jni_dirs): + self.android_jni_dirs.append(base_path) def android_add_gradle_plugin(self, plugin): - self.android_gradle_plugins.append(plugin) + if (plugin not in self.android_gradle_plugins): + self.android_gradle_plugins.append(plugin) def android_add_gradle_classpath(self, classpath): - self.android_gradle_classpath.append(classpath) + if (classpath not in self.android_gradle_classpath): + self.android_gradle_classpath.append(classpath) def android_add_default_config(self, config): - self.android_default_config.append(config) - + if (config not in self.android_default_config): + self.android_default_config.append(config) def android_add_to_manifest(self, file): base_path = self.Dir(".").abspath + "/modules/" + self.current_module + "/" + file f = open(base_path, "rb") self.android_manifest_chunk += f.read() - def android_add_to_permissions(self, file): base_path = self.Dir(".").abspath + "/modules/" + self.current_module + "/" + file f = open(base_path, "rb") self.android_permission_chunk += f.read() - def android_add_to_attributes(self, file): base_path = self.Dir(".").abspath + "/modules/" + self.current_module + "/" + file f = open(base_path, "rb") self.android_appattributes_chunk += f.read() - def disable_module(self): self.disabled_modules.append(self.current_module) - def use_windows_spawn_fix(self, platform=None): if (os.name != "nt"): diff --git a/modules/dds/texture_loader_dds.cpp b/modules/dds/texture_loader_dds.cpp index f80e6e501e..d79b7685d1 100644 --- a/modules/dds/texture_loader_dds.cpp +++ b/modules/dds/texture_loader_dds.cpp @@ -144,12 +144,14 @@ RES ResourceFormatDDS::load(const String &p_path, const String &p_original_path, f->get_32(); f->get_32(); - /*print_line("DDS width: "+itos(width)); + /* + print_line("DDS width: "+itos(width)); print_line("DDS height: "+itos(height)); - print_line("DDS mipmaps: "+itos(mipmaps));*/ + print_line("DDS mipmaps: "+itos(mipmaps)); - //printf("fourcc: %x fflags: %x, rgbbits: %x, fsize: %x\n",format_fourcc,format_flags,format_rgb_bits,format_size); - //printf("rmask: %x gmask: %x, bmask: %x, amask: %x\n",format_red_mask,format_green_mask,format_blue_mask,format_alpha_mask); + printf("fourcc: %x fflags: %x, rgbbits: %x, fsize: %x\n",format_fourcc,format_flags,format_rgb_bits,format_size); + printf("rmask: %x gmask: %x, bmask: %x, amask: %x\n",format_red_mask,format_green_mask,format_blue_mask,format_alpha_mask); + */ //must avoid this later while (f->get_pos() < 128) diff --git a/modules/gdnative/api_generator.cpp b/modules/gdnative/api_generator.cpp index f5d010f0a2..d5f22ee7a3 100644 --- a/modules/gdnative/api_generator.cpp +++ b/modules/gdnative/api_generator.cpp @@ -103,8 +103,7 @@ struct ClassAPI { bool is_instanciable; // @Unclear bool is_creatable; - // @Unclear - bool memory_own; + bool is_reference; List<MethodAPI> methods; List<PropertyAPI> properties; @@ -161,7 +160,7 @@ List<ClassAPI> generate_c_api_classes() { ClassDB::get_inheriters_from_class("Reference", &inheriters); is_reference = !!inheriters.find(class_name); // @Unclear - class_api.memory_own = !class_api.is_singleton && is_reference; + class_api.is_reference = !class_api.is_singleton && is_reference; } // constants @@ -348,6 +347,7 @@ static List<String> generate_c_api_json(const List<ClassAPI> &p_api) { source.push_back(String("\t\t\"api_type\": \"") + (api.api_type == ClassDB::API_CORE ? "core" : (api.api_type == ClassDB::API_EDITOR ? "tools" : "none")) + "\",\n"); source.push_back(String("\t\t\"singleton\": ") + (api.is_singleton ? "true" : "false") + ",\n"); source.push_back(String("\t\t\"instanciable\": ") + (api.is_instanciable ? "true" : "false") + ",\n"); + source.push_back(String("\t\t\"is_reference\": ") + (api.is_reference ? "true" : "false") + ",\n"); // @Unclear // source.push_back(String("\t\t\"createable\": ") + (api.is_creatable ? "true" : "false") + ",\n"); @@ -402,6 +402,7 @@ static List<String> generate_c_api_json(const List<ClassAPI> &p_api) { source.push_back("\t\t\t\t\t{\n"); source.push_back("\t\t\t\t\t\t\"name\": \"" + e->get().argument_names[i] + "\",\n"); source.push_back("\t\t\t\t\t\t\"type\": \"" + e->get().argument_types[i] + "\",\n"); + source.push_back(String("\t\t\t\t\t\t\"has_default_value\": ") + (e->get().default_arguments.has(i) ? "true" : "false") + ",\n"); source.push_back("\t\t\t\t\t\t\"default_value\": \"" + (e->get().default_arguments.has(i) ? (String)e->get().default_arguments[i] : "") + "\"\n"); source.push_back(String("\t\t\t\t\t}") + ((i < e->get().argument_names.size() - 1) ? "," : "") + "\n"); } diff --git a/modules/gdnative/gdnative.cpp b/modules/gdnative/gdnative.cpp index 43b309ae36..09859d95bd 100644 --- a/modules/gdnative/gdnative.cpp +++ b/modules/gdnative/gdnative.cpp @@ -77,11 +77,9 @@ Error NativeLibrary::initialize(NativeLibrary *&p_native_lib, const StringName p godot_native_init_options options; options.in_editor = SceneTree::get_singleton()->is_editor_hint(); - /* options.core_api_hash = ClassDB::get_api_hash(ClassDB::API_CORE); options.editor_api_hash = ClassDB::get_api_hash(ClassDB::API_EDITOR); options.no_api_hash = ClassDB::get_api_hash(ClassDB::API_NONE); - */ library_init_fpointer(&options); // Catch errors? @@ -393,6 +391,54 @@ void GDNativeScript::get_script_signal_list(List<MethodInfo> *r_signals) const { } } +Variant GDNativeScript::_new(const Variant **p_args, int p_argcount, Variant::CallError &r_error) { + + /* STEP 1, CREATE */ + + if (!library.is_valid() || ((String)script_name).empty() || !script_data) { + r_error.error = Variant::CallError::CALL_ERROR_INVALID_METHOD; + return Variant(); + } + + r_error.error = Variant::CallError::CALL_OK; + REF ref; + Object *owner = NULL; + + GDNativeScriptData *_baseptr = script_data; + while (_baseptr->base_data) { + _baseptr = _baseptr->base_data; + } + + if (!(_baseptr->base_native_type == "")) { + owner = ClassDB::instance(_baseptr->base_native_type); + } else { + owner = memnew(Reference); //by default, no base means use reference + } + + Reference *r = owner->cast_to<Reference>(); + if (r) { + ref = REF(r); + } + + // GDScript does it like this: _create_instance(p_args, p_argcount, owner, r != NULL, r_error); + // @Todo support varargs for constructors. + GDNativeInstance *instance = (GDNativeInstance *)instance_create(owner); + + owner->set_script_instance(instance); + if (!instance) { + if (ref.is_null()) { + memdelete(owner); //no owner, sorry + } + return Variant(); + } + + if (ref.is_valid()) { + return ref; + } else { + return owner; + } +} + Ref<GDNativeLibrary> GDNativeScript::get_library() const { return library; } @@ -440,6 +486,8 @@ void GDNativeScript::_bind_methods() { ClassDB::bind_method(D_METHOD("get_script_name"), &GDNativeScript::get_script_name); ClassDB::bind_method(D_METHOD("set_script_name", "script_name"), &GDNativeScript::set_script_name); + ClassDB::bind_vararg_method(METHOD_FLAGS_DEFAULT, "new", &GDNativeScript::_new, MethodInfo(Variant::OBJECT, "new")); + ADD_PROPERTYNZ(PropertyInfo(Variant::OBJECT, "library", PROPERTY_HINT_RESOURCE_TYPE, "GDNativeLibrary"), "set_library", "get_library"); ADD_PROPERTYNZ(PropertyInfo(Variant::STRING, "script_name"), "set_script_name", "get_script_name"); } @@ -1167,27 +1215,25 @@ void GDNativeReloadNode::_notification(int p_what) { // update placeholders (if any) - GDNativeScript *script = NULL; + Set<GDNativeScript *> scripts; for (Set<GDNativeScript *>::Element *S = GDNativeScriptLanguage::get_singleton()->script_list.front(); S; S = S->next()) { if (lib->native_library->scripts.has(S->get()->get_script_name())) { - script = S->get(); + GDNativeScript *script = S->get(); script->script_data = lib->get_script_data(script->get_script_name()); - break; + scripts.insert(script); } } - if (script == NULL) { - // new class, cool. Nothing to do here - continue; - } - - if (script->placeholders.size() == 0) - continue; + for (Set<GDNativeScript *>::Element *S = scripts.front(); S; S = S->next()) { + GDNativeScript *script = S->get(); + if (script->placeholders.size() == 0) + continue; - for (Set<PlaceHolderScriptInstance *>::Element *P = script->placeholders.front(); P; P = P->next()) { - PlaceHolderScriptInstance *p = P->get(); - script->_update_placeholder(p); + for (Set<PlaceHolderScriptInstance *>::Element *P = script->placeholders.front(); P; P = P->next()) { + PlaceHolderScriptInstance *p = P->get(); + script->_update_placeholder(p); + } } } diff --git a/modules/gdnative/gdnative.h b/modules/gdnative/gdnative.h index 89270b4e26..27e0c3788b 100644 --- a/modules/gdnative/gdnative.h +++ b/modules/gdnative/gdnative.h @@ -184,6 +184,8 @@ public: virtual void get_script_method_list(List<MethodInfo> *p_list) const; virtual void get_script_property_list(List<PropertyInfo> *p_list) const; + Variant _new(const Variant **p_args, int p_argcount, Variant::CallError &r_error); + Ref<GDNativeLibrary> get_library() const; void set_library(Ref<GDNativeLibrary> p_library); diff --git a/modules/gdnative/godot.cpp b/modules/gdnative/godot.cpp index 5ad716d0cd..7477a28db6 100644 --- a/modules/gdnative/godot.cpp +++ b/modules/gdnative/godot.cpp @@ -182,6 +182,13 @@ void GDAPI *godot_native_get_userdata(godot_object *p_instance) { return NULL; } +godot_class_constructor GDAPI godot_get_class_constructor(const char *p_classname) { + ClassDB::ClassInfo *class_info = ClassDB::classes.getptr(StringName(p_classname)); + if (class_info) + return (godot_class_constructor)class_info->creation_func; + return NULL; +} + godot_dictionary GDAPI godot_get_global_constants() { godot_dictionary constants; godot_dictionary_new(&constants); diff --git a/modules/gdnative/godot.h b/modules/gdnative/godot.h index 45ac64feee..b05cafbe50 100644 --- a/modules/gdnative/godot.h +++ b/modules/gdnative/godot.h @@ -38,12 +38,26 @@ extern "C" { #define GDAPI_EXPORT #endif -#if !defined(_WIN32) && !defined(_MSC_VER) +#ifdef _WIN32 +#if defined(GDAPI_EXPORT) +#define GDCALLINGCONV +#define GDAPI __declspec(dllexport) GDCALLINGCONV +#else +#define GDCALLINGCONV +#define GDAPI __declspec(dllimport) GDCALLINGCONV +#endif +#elif defined(__APPLE__) +#include "TargetConditionals.h" +#if TARGET_OS_IPHONE +#define GDCALLINGCONV #define GDAPI -#elif defined(GDAPI_EXPORT) -#define GDAPI __declspec(dllexport) +#elif TARGET_OS_MAC +#define GDCALLINGCONV __attribute__((sysv_abi)) +#define GDAPI GDCALLINGCONV +#endif #else -#define GDAPI __declspec(dllimport) +#define GDCALLINGCONV __attribute__((sysv_abi)) +#define GDAPI GDCALLINGCONV #endif #include <stdbool.h> @@ -314,16 +328,16 @@ typedef struct godot_property_attributes { typedef struct godot_instance_create_func { // instance pointer, method_data - return user data - void *(*create_func)(godot_object *, void *); + GDCALLINGCONV void *(*create_func)(godot_object *, void *); void *method_data; - void (*free_func)(void *); -} godot_script_instance_func; + GDCALLINGCONV void (*free_func)(void *); +} godot_instance_create_func; typedef struct godot_instance_destroy_func { // instance pointer, method data, user data - void (*destroy_func)(godot_object *, void *, void *); + GDCALLINGCONV void (*destroy_func)(godot_object *, void *, void *); void *method_data; - void (*free_func)(void *); + GDCALLINGCONV void (*free_func)(void *); } godot_instance_destroy_func; void GDAPI godot_script_register_class(const char *p_name, const char *p_base, godot_instance_create_func p_create_func, godot_instance_destroy_func p_destroy_func); @@ -332,25 +346,25 @@ void GDAPI godot_script_register_tool_class(const char *p_name, const char *p_ba typedef struct godot_instance_method { // instance pointer, method data, user data, num args, args - return result as varaint - godot_variant (*method)(godot_object *, void *, void *, int, godot_variant **); + GDCALLINGCONV godot_variant (*method)(godot_object *, void *, void *, int, godot_variant **); void *method_data; - void (*free_func)(void *); + GDCALLINGCONV void (*free_func)(void *); } godot_instance_method; void GDAPI godot_script_register_method(const char *p_name, const char *p_function_name, godot_method_attributes p_attr, godot_instance_method p_method); typedef struct godot_property_set_func { // instance pointer, method data, user data, value - void (*set_func)(godot_object *, void *, void *, godot_variant); + GDCALLINGCONV void (*set_func)(godot_object *, void *, void *, godot_variant); void *method_data; - void (*free_func)(void *); + GDCALLINGCONV void (*free_func)(void *); } godot_property_set_func; typedef struct godot_property_get_func { // instance pointer, method data, user data, value - godot_variant (*get_func)(godot_object *, void *, void *); + GDCALLINGCONV godot_variant (*get_func)(godot_object *, void *, void *); void *method_data; - void (*free_func)(void *); + GDCALLINGCONV void (*free_func)(void *); } godot_property_get_func; void GDAPI godot_script_register_property(const char *p_name, const char *p_path, godot_property_attributes *p_attr, godot_property_set_func p_set_func, godot_property_get_func p_get_func); @@ -376,6 +390,11 @@ void GDAPI godot_script_register_signal(const char *p_name, const godot_signal * void GDAPI *godot_native_get_userdata(godot_object *p_instance); +// Calling convention? +typedef godot_object *(*godot_class_constructor)(); + +godot_class_constructor GDAPI godot_get_class_constructor(const char *p_classname); + godot_dictionary GDAPI godot_get_global_constants(); ////// System Functions diff --git a/modules/gdnative/godot/godot_basis.cpp b/modules/gdnative/godot/godot_basis.cpp index 4322acc401..474cd3d448 100644 --- a/modules/gdnative/godot/godot_basis.cpp +++ b/modules/gdnative/godot/godot_basis.cpp @@ -38,48 +38,176 @@ extern "C" { void _basis_api_anchor() { } -void GDAPI godot_basis_new(godot_basis *p_basis) { - Basis *basis = (Basis *)p_basis; - *basis = Basis(); +void GDAPI godot_basis_new(godot_basis *p_v) { + Basis *v = (Basis *)p_v; + *v = Basis(); } -void GDAPI godot_basis_new_with_euler_quat(godot_basis *p_basis, const godot_quat *p_euler) { - Basis *basis = (Basis *)p_basis; +void GDAPI godot_basis_new_with_euler_quat(godot_basis *p_v, const godot_quat *p_euler) { + Basis *v = (Basis *)p_v; Quat *euler = (Quat *)p_euler; - *basis = Basis(*euler); + *v = Basis(*euler); } -void GDAPI godot_basis_new_with_euler(godot_basis *p_basis, const godot_vector3 *p_euler) { - Basis *basis = (Basis *)p_basis; - Vector3 *euler = (Vector3 *)p_euler; - *basis = Basis(*euler); +void GDAPI godot_basis_new_with_euler(godot_basis *p_v, const godot_vector3 p_euler) { + Basis *v = (Basis *)p_v; + Vector3 *euler = (Vector3 *)&p_euler; + *v = Basis(*euler); } -godot_quat GDAPI godot_basis_as_quat(const godot_basis *p_basis) { - const Basis *basis = (const Basis *)p_basis; +void GDAPI godot_basis_new_with_axis_and_angle(godot_basis *p_v, const godot_vector3 p_axis, const godot_real p_phi) { + Basis *v = (Basis *)p_v; + const Vector3 *axis = (Vector3 *)&p_axis; + *v = Basis(*axis, p_phi); +} + +void GDAPI godot_basis_new_with_rows(godot_basis *p_v, const godot_vector3 p_row0, const godot_vector3 p_row1, const godot_vector3 p_row2) { + Basis *v = (Basis *)p_v; + const Vector3 *row0 = (Vector3 *)&p_row0; + const Vector3 *row1 = (Vector3 *)&p_row1; + const Vector3 *row2 = (Vector3 *)&p_row2; + *v = Basis(*row0, *row1, *row2); +} + +godot_quat GDAPI godot_basis_as_quat(const godot_basis *p_v) { + const Basis *v = (const Basis *)p_v; godot_quat quat; Quat *p_quat = (Quat *)&quat; - *p_quat = basis->operator Quat(); + *p_quat = v->operator Quat(); return quat; } -godot_vector3 GDAPI godot_basis_get_euler(const godot_basis *p_basis) { - const Basis *basis = (const Basis *)p_basis; - godot_vector3 euler; - Vector3 *p_euler = (Vector3 *)&euler; - *p_euler = basis->get_euler(); - return euler; -} - /* * p_elements is a pointer to an array of 3 (!!) vector3 */ -void GDAPI godot_basis_get_elements(godot_basis *p_basis, godot_vector3 *p_elements) { - Basis *basis = (Basis *)p_basis; +void GDAPI godot_basis_get_elements(godot_basis *p_v, godot_vector3 *p_elements) { + Basis *v = (Basis *)p_v; Vector3 *elements = (Vector3 *)p_elements; - elements[0] = basis->elements[0]; - elements[1] = basis->elements[1]; - elements[2] = basis->elements[2]; + elements[0] = v->elements[0]; + elements[1] = v->elements[1]; + elements[2] = v->elements[2]; +} + +godot_vector3 GDAPI godot_basis_get_axis(const godot_basis *p_v, const godot_int p_axis) { + godot_vector3 dest; + Vector3 *d = (Vector3 *)&dest; + const Basis *v = (Basis *)p_v; + *d = v->get_axis(p_axis); + return dest; +} + +void GDAPI godot_basis_set_axis(godot_basis *p_v, const godot_int p_axis, const godot_vector3 p_value) { + Basis *v = (Basis *)p_v; + const Vector3 *value = (Vector3 *)&p_value; + v->set_axis(p_axis, *value); +} + +godot_vector3 GDAPI godot_basis_get_row(const godot_basis *p_v, const godot_int p_row) { + godot_vector3 dest; + Vector3 *d = (Vector3 *)&dest; + const Basis *v = (Basis *)p_v; + *d = v->get_row(p_row); + return dest; +} + +void GDAPI godot_basis_set_row(godot_basis *p_v, const godot_int p_row, const godot_vector3 p_value) { + Basis *v = (Basis *)p_v; + const Vector3 *value = (Vector3 *)&p_value; + v->set_row(p_row, *value); +} + +godot_real godot_basis_determinant(const godot_basis *p_v) { + Basis *v = (Basis *)p_v; + return v->determinant(); +} + +godot_vector3 godot_basis_get_euler(const godot_basis *p_v) { + godot_vector3 dest; + Vector3 *d = (Vector3 *)&dest; + const Basis *v = (Basis *)p_v; + *d = v->get_euler(); + return dest; +} + +godot_int godot_basis_get_orthogonal_index(const godot_basis *p_v) { + const Basis *v = (Basis *)p_v; + return v->get_orthogonal_index(); +} + +godot_vector3 godot_basis_get_scale(const godot_basis *p_v) { + godot_vector3 dest; + Vector3 *d = (Vector3 *)&dest; + const Basis *v = (Basis *)p_v; + *d = v->get_scale(); + return dest; +} + +void godot_basis_inverse(godot_basis *p_dest, const godot_basis *p_v) { + Basis *d = (Basis *)p_dest; + const Basis *v = (Basis *)p_v; + *d = v->inverse(); +} + +void godot_basis_orthonormalized(godot_basis *p_dest, const godot_basis *p_v) { + Basis *d = (Basis *)p_dest; + const Basis *v = (Basis *)p_v; + *d = v->orthonormalized(); +} + +void godot_basis_rotated(godot_basis *p_dest, const godot_basis *p_v, const godot_vector3 p_axis, const godot_real p_phi) { + Basis *d = (Basis *)p_dest; + const Basis *v = (Basis *)p_v; + const Vector3 *axis = (Vector3 *)&p_axis; + *d = v->rotated(*axis, p_phi); +} + +void godot_basis_scaled(godot_basis *p_dest, const godot_basis *p_v, const godot_vector3 p_scale) { + Basis *d = (Basis *)p_dest; + const Basis *v = (Basis *)p_v; + const Vector3 *scale = (Vector3 *)&p_scale; + *d = v->scaled(*scale); +} + +godot_real godot_basis_tdotx(const godot_basis *p_v, const godot_vector3 p_with) { + const Basis *v = (Basis *)p_v; + const Vector3 *with = (Vector3 *)&p_with; + return v->tdotx(*with); +} + +godot_real godot_basis_tdoty(const godot_basis *p_v, const godot_vector3 p_with) { + const Basis *v = (Basis *)p_v; + const Vector3 *with = (Vector3 *)&p_with; + return v->tdoty(*with); +} + +godot_real godot_basis_tdotz(const godot_basis *p_v, const godot_vector3 p_with) { + const Basis *v = (Basis *)p_v; + const Vector3 *with = (Vector3 *)&p_with; + return v->tdotz(*with); +} + +void godot_basis_transposed(godot_basis *p_dest, const godot_basis *p_v) { + Basis *d = (Basis *)p_dest; + const Basis *v = (Basis *)p_v; + *d = v->transposed(); +} + +godot_vector3 godot_basis_xform(const godot_basis *p_v, const godot_vector3 p_vect) { + godot_vector3 dest; + Vector3 *d = (Vector3 *)&dest; + const Basis *v = (Basis *)p_v; + const Vector3 *vect = (Vector3 *)&p_vect; + *d = v->xform(*vect); + return dest; +} + +godot_vector3 godot_basis_xform_inv(const godot_basis *p_v, const godot_vector3 p_vect) { + godot_vector3 dest; + Vector3 *d = (Vector3 *)&dest; + const Basis *v = (Basis *)p_v; + const Vector3 *vect = (Vector3 *)&p_vect; + *d = v->xform_inv(*vect); + return dest; } #ifdef __cplusplus diff --git a/modules/gdnative/godot/godot_basis.h b/modules/gdnative/godot/godot_basis.h index a8f19bfde5..2803396997 100644 --- a/modules/gdnative/godot/godot_basis.h +++ b/modules/gdnative/godot/godot_basis.h @@ -43,18 +43,39 @@ typedef struct godot_basis { #endif #include "../godot.h" +#include "godot_quat.h" -void GDAPI godot_basis_new(godot_basis *p_basis); -void GDAPI godot_basis_new_with_euler_quat(godot_basis *p_basis, const godot_quat *p_euler); -void GDAPI godot_basis_new_with_euler(godot_basis *p_basis, const godot_vector3 *p_euler); +void GDAPI godot_basis_new(godot_basis *p_v); +void GDAPI godot_basis_new_with_euler_quat(godot_basis *p_v, const godot_quat *p_euler); +void GDAPI godot_basis_new_with_euler(godot_basis *p_v, const godot_vector3 p_euler); +void GDAPI godot_basis_new_with_axis_and_angle(godot_basis *p_v, const godot_vector3 p_axis, const godot_real p_phi); +void GDAPI godot_basis_new_with_rows(godot_basis *p_v, const godot_vector3 p_row0, const godot_vector3 p_row1, const godot_vector3 p_row2); -godot_quat GDAPI godot_basis_as_quat(const godot_basis *p_basis); -godot_vector3 GDAPI godot_basis_get_euler(const godot_basis *p_basis); +godot_quat GDAPI godot_basis_as_quat(const godot_basis *p_v); /* * p_elements is a pointer to an array of 3 (!!) vector3 */ -void GDAPI godot_basis_get_elements(godot_basis *p_basis, godot_vector3 *p_elements); +void GDAPI godot_basis_get_elements(godot_basis *p_v, godot_vector3 *p_elements); +godot_vector3 GDAPI godot_basis_get_axis(const godot_basis *p_v, const godot_int p_axis); +void GDAPI godot_basis_set_axis(godot_basis *p_v, const godot_int p_axis, const godot_vector3 p_value); +godot_vector3 GDAPI godot_basis_get_row(const godot_basis *p_v, const godot_int p_row); +void GDAPI godot_basis_set_row(godot_basis *p_v, const godot_int p_row, const godot_vector3 p_value); + +godot_real godot_basis_determinant(const godot_basis *p_v); +godot_vector3 godot_basis_get_euler(const godot_basis *p_v); +godot_int godot_basis_get_orthogonal_index(const godot_basis *p_v); +godot_vector3 godot_basis_get_scale(const godot_basis *p_v); +void godot_basis_inverse(godot_basis *p_dest, const godot_basis *p_v); +void godot_basis_orthonormalized(godot_basis *p_dest, const godot_basis *p_v); +void godot_basis_rotated(godot_basis *p_dest, const godot_basis *p_v, const godot_vector3 p_axis, const godot_real p_phi); +void godot_basis_scaled(godot_basis *p_dest, const godot_basis *p_v, const godot_vector3 p_scale); +godot_real godot_basis_tdotx(const godot_basis *p_v, const godot_vector3 p_with); +godot_real godot_basis_tdoty(const godot_basis *p_v, const godot_vector3 p_with); +godot_real godot_basis_tdotz(const godot_basis *p_v, const godot_vector3 p_with); +void godot_basis_transposed(godot_basis *p_dest, const godot_basis *p_v); +godot_vector3 godot_basis_xform(const godot_basis *p_v, const godot_vector3 p_vect); +godot_vector3 godot_basis_xform_inv(const godot_basis *p_v, const godot_vector3 p_vect); #ifdef __cplusplus } diff --git a/modules/gdnative/godot/godot_string.cpp b/modules/gdnative/godot/godot_string.cpp index 2a78b2c96f..92c0b04041 100644 --- a/modules/gdnative/godot/godot_string.cpp +++ b/modules/gdnative/godot/godot_string.cpp @@ -53,13 +53,13 @@ void GDAPI godot_string_new_data(godot_string *p_str, const char *p_contents, co *p = String::utf8(p_contents, p_size); } -void GDAPI godot_string_get_data(const godot_string *p_str, wchar_t *p_dest, int *p_size) { +void GDAPI godot_string_get_data(const godot_string *p_str, char *p_dest, int *p_size) { String *p = (String *)p_str; if (p_size != NULL) { - *p_size = p->length(); + *p_size = p->utf8().length(); } if (p_dest != NULL) { - memcpy(p_dest, p->ptr(), *p_size * sizeof(CharType)); + memcpy(p_dest, p->utf8().get_data(), *p_size); } } @@ -75,7 +75,12 @@ wchar_t GDAPI *godot_string_operator_index(godot_string *p_str, const godot_int return &(s->operator[](p_idx)); } -const wchar_t GDAPI *godot_string_c_str(const godot_string *p_str) { +const char GDAPI *godot_string_c_str(const godot_string *p_str) { + const String *s = (const String *)p_str; + return s->utf8().get_data(); +} + +const wchar_t GDAPI *godot_string_unicode_str(const godot_string *p_str) { const String *s = (const String *)p_str; return s->c_str(); } diff --git a/modules/gdnative/godot/godot_string.h b/modules/gdnative/godot/godot_string.h index 7cde482cce..83ed5d6ec1 100644 --- a/modules/gdnative/godot/godot_string.h +++ b/modules/gdnative/godot/godot_string.h @@ -35,6 +35,7 @@ extern "C" { #endif #include <stdint.h> +#include <wchar.h> #ifndef GODOT_CORE_API_GODOT_STRING_TYPE_DEFINED typedef struct godot_string { @@ -47,12 +48,13 @@ typedef struct godot_string { void GDAPI godot_string_new(godot_string *p_str); void GDAPI godot_string_new_data(godot_string *p_str, const char *p_contents, const int p_size); -void GDAPI godot_string_get_data(const godot_string *p_str, wchar_t *p_dest, int *p_size); +void GDAPI godot_string_get_data(const godot_string *p_str, char *p_dest, int *p_size); void GDAPI godot_string_copy_string(const godot_string *p_dest, const godot_string *p_src); wchar_t GDAPI *godot_string_operator_index(godot_string *p_str, const godot_int p_idx); -const wchar_t GDAPI *godot_string_c_str(const godot_string *p_str); +const char GDAPI *godot_string_c_str(const godot_string *p_str); +const wchar_t GDAPI *godot_string_unicode_str(const godot_string *p_str); godot_bool GDAPI godot_string_operator_equal(const godot_string *p_a, const godot_string *p_b); godot_bool GDAPI godot_string_operator_less(const godot_string *p_a, const godot_string *p_b); diff --git a/modules/gdnative/godot/godot_vector2.cpp b/modules/gdnative/godot/godot_vector2.cpp index dce4c03b5d..87e60b6245 100644 --- a/modules/gdnative/godot/godot_vector2.cpp +++ b/modules/gdnative/godot/godot_vector2.cpp @@ -35,13 +35,14 @@ extern "C" { #endif -void _vector2_api_anchor() { -} +void _vector2_api_anchor() {} -void GDAPI godot_vector2_new(godot_vector2 *p_v, godot_real p_x, godot_real p_y) { - Vector2 *v = (Vector2 *)p_v; +godot_vector2 GDAPI godot_vector2_new(const godot_real p_x, const godot_real p_y) { + godot_vector2 value; + Vector2 *v = (Vector2 *)&value; v->x = p_x; v->y = p_y; + return value; } void GDAPI godot_vector2_set_x(godot_vector2 *p_v, const godot_real p_x) { @@ -55,11 +56,11 @@ void GDAPI godot_vector2_set_y(godot_vector2 *p_v, const godot_real p_y) { } godot_real GDAPI godot_vector2_get_x(const godot_vector2 *p_v) { - Vector2 *v = (Vector2 *)p_v; + const Vector2 *v = (Vector2 *)p_v; return v->x; } godot_real GDAPI godot_vector2_get_y(const godot_vector2 *p_v) { - Vector2 *v = (Vector2 *)p_v; + const Vector2 *v = (Vector2 *)p_v; return v->y; } @@ -67,85 +68,227 @@ void GDAPI godot_vector2_normalize(godot_vector2 *p_v) { Vector2 *v = (Vector2 *)p_v; v->normalize(); } -void GDAPI godot_vector2_normalized(godot_vector2 *p_dest, const godot_vector2 *p_src) { - Vector2 *v = (Vector2 *)p_src; - Vector2 *d = (Vector2 *)p_dest; +godot_vector2 GDAPI godot_vector2_normalized(const godot_vector2 *p_v) { + godot_vector2 dest; + const Vector2 *v = (Vector2 *)p_v; + Vector2 *d = (Vector2 *)&dest; *d = v->normalized(); + return dest; } godot_real GDAPI godot_vector2_length(const godot_vector2 *p_v) { - Vector2 *v = (Vector2 *)p_v; + const Vector2 *v = (Vector2 *)p_v; return v->length(); } godot_real GDAPI godot_vector2_length_squared(const godot_vector2 *p_v) { - Vector2 *v = (Vector2 *)p_v; + const Vector2 *v = (Vector2 *)p_v; return v->length_squared(); } -godot_real GDAPI godot_vector2_distance_to(const godot_vector2 *p_a, const godot_vector2 *p_b) { - Vector2 *a = (Vector2 *)p_a; - Vector2 *b = (Vector2 *)p_b; - return a->distance_to(*b); +godot_real GDAPI godot_vector2_distance_to(const godot_vector2 *p_v, const godot_vector2 p_b) { + const Vector2 *v = (Vector2 *)p_v; + const Vector2 *b = (Vector2 *)&p_b; + return v->distance_to(*b); +} + +godot_real GDAPI godot_vector2_distance_squared_to(const godot_vector2 *p_v, const godot_vector2 p_b) { + const Vector2 *v = (Vector2 *)p_v; + const Vector2 *b = (Vector2 *)&p_b; + return v->distance_squared_to(*b); +} + +godot_vector2 GDAPI godot_vector2_operator_add(const godot_vector2 *p_v, const godot_vector2 p_b) { + godot_vector2 dest; + Vector2 *d = (Vector2 *)&dest; + const Vector2 *v = (Vector2 *)p_v; + const Vector2 *b = (Vector2 *)&p_b; + *d = *v + *b; + return dest; +} + +godot_vector2 GDAPI godot_vector2_operator_subtract(const godot_vector2 *p_v, const godot_vector2 p_b) { + godot_vector2 dest; + Vector2 *d = (Vector2 *)&dest; + const Vector2 *v = (Vector2 *)p_v; + const Vector2 *b = (Vector2 *)&p_b; + *d = *v - *b; + return dest; +} + +godot_vector2 GDAPI godot_vector2_operator_multiply_vector(const godot_vector2 *p_v, const godot_vector2 p_b) { + godot_vector2 dest; + Vector2 *d = (Vector2 *)&dest; + const Vector2 *v = (Vector2 *)p_v; + const Vector2 *b = (Vector2 *)&p_b; + *d = *v * *b; + return dest; +} + +godot_vector2 GDAPI godot_vector2_operator_multiply_scalar(const godot_vector2 *p_v, const godot_real p_b) { + godot_vector2 dest; + Vector2 *d = (Vector2 *)&dest; + const Vector2 *v = (Vector2 *)p_v; + *d = *v * p_b; + return dest; +} + +godot_vector2 GDAPI godot_vector2_operator_divide_vector(const godot_vector2 *p_v, const godot_vector2 p_b) { + godot_vector2 dest; + Vector2 *d = (Vector2 *)&dest; + const Vector2 *v = (Vector2 *)p_v; + const Vector2 *b = (Vector2 *)&p_b; + *d = *v / *b; + return dest; +} + +godot_vector2 GDAPI godot_vector2_operator_divide_scalar(const godot_vector2 *p_v, const godot_real p_b) { + godot_vector2 dest; + Vector2 *d = (Vector2 *)&dest; + const Vector2 *v = (Vector2 *)p_v; + *d = *v / p_b; + return dest; +} + +godot_bool GDAPI godot_vector2_operator_equal(const godot_vector2 *p_v, const godot_vector2 p_b) { + const Vector2 *v = (Vector2 *)p_v; + const Vector2 *b = (Vector2 *)&p_b; + return *v == *b; +} + +godot_bool GDAPI godot_vector2_operator_less(const godot_vector2 *p_v, const godot_vector2 p_b) { + const Vector2 *v = (Vector2 *)p_v; + const Vector2 *b = (Vector2 *)&p_b; + return *v < *b; +} + +godot_vector2 GDAPI godot_vector2_abs(const godot_vector2 *p_v) { + godot_vector2 dest; + Vector2 *d = (Vector2 *)&dest; + const Vector2 *v = (Vector2 *)p_v; + *d = v->abs(); + return dest; +} + +godot_real GDAPI godot_vector2_angle(const godot_vector2 *p_v) { + const Vector2 *v = (Vector2 *)p_v; + return v->angle(); +} + +godot_real GDAPI godot_vector2_angle_to(const godot_vector2 *p_v, const godot_vector2 p_to) { + const Vector2 *v = (Vector2 *)p_v; + const Vector2 *to = (Vector2 *)&p_to; + return v->angle_to(*to); +} + +godot_real GDAPI godot_vector2_angle_to_point(const godot_vector2 *p_v, const godot_vector2 p_to) { + const Vector2 *v = (Vector2 *)p_v; + const Vector2 *to = (Vector2 *)&p_to; + return v->angle_to_point(*to); +} + +godot_vector2 GDAPI godot_vector2_clamped(const godot_vector2 *p_v, const godot_real length) { + godot_vector2 dest; + Vector2 *d = (Vector2 *)&dest; + const Vector2 *v = (Vector2 *)p_v; + *d = v->clamped(length); + return dest; +} + +godot_vector2 GDAPI godot_vector2_cubic_interpolate( + const godot_vector2 *p_v, const godot_vector2 p_b, const godot_vector2 p_pre_a, + const godot_vector2 p_post_b, godot_real t) { + godot_vector2 dest; + Vector2 *d = (Vector2 *)&dest; + const Vector2 *v = (Vector2 *)p_v; + const Vector2 *b = (Vector2 *)&p_b; + const Vector2 *pre_a = (Vector2 *)&p_pre_a; + const Vector2 *post_b = (Vector2 *)&p_post_b; + *d = v->cubic_interpolate(*b, *pre_a, *post_b, t); + return dest; +} + +godot_real GDAPI godot_vector2_dot(const godot_vector2 *p_v, const godot_vector2 p_with) { + const Vector2 *v = (Vector2 *)p_v; + const Vector2 *with = (Vector2 *)&p_with; + return v->dot(*with); } -godot_real GDAPI godot_vector2_distance_squared_to(const godot_vector2 *p_a, const godot_vector2 *p_b) { - Vector2 *a = (Vector2 *)p_a; - Vector2 *b = (Vector2 *)p_b; - return a->distance_squared_to(*b); +godot_vector2 GDAPI godot_vector2_floor(const godot_vector2 *p_v) { + godot_vector2 dest; + Vector2 *d = (Vector2 *)&dest; + const Vector2 *v = (Vector2 *)p_v; + *d = v->floor(); + return dest; } -void GDAPI godot_vector2_operator_add(godot_vector2 *p_dest, const godot_vector2 *p_a, const godot_vector2 *p_b) { - Vector2 *dest = (Vector2 *)p_dest; - const Vector2 *a = (Vector2 *)p_a; - const Vector2 *b = (Vector2 *)p_b; - *dest = *a + *b; +godot_real GDAPI godot_vector2_aspect(const godot_vector2 *p_v) { + const Vector2 *v = (Vector2 *)p_v; + return v->aspect(); } -void GDAPI godot_vector2_operator_subtract(godot_vector2 *p_dest, const godot_vector2 *p_a, const godot_vector2 *p_b) { - Vector2 *dest = (Vector2 *)p_dest; - const Vector2 *a = (Vector2 *)p_a; - const Vector2 *b = (Vector2 *)p_b; - *dest = *a - *b; +godot_vector2 GDAPI godot_vector2_linear_interpolate( + const godot_vector2 *p_v, + const godot_vector2 p_b, + godot_real t) { + godot_vector2 dest; + Vector2 *d = (Vector2 *)&dest; + const Vector2 *v = (Vector2 *)p_v; + const Vector2 *b = (Vector2 *)&p_b; + *d = v->linear_interpolate(*b, t); + return dest; } -void GDAPI godot_vector2_operator_multiply_vector(godot_vector2 *p_dest, const godot_vector2 *p_a, const godot_vector2 *p_b) { - Vector2 *dest = (Vector2 *)p_dest; - const Vector2 *a = (Vector2 *)p_a; - const Vector2 *b = (Vector2 *)p_b; - *dest = *a * *b; +godot_vector2 GDAPI godot_vector2_reflect(const godot_vector2 *p_v, const godot_vector2 p_vec) { + const Vector2 *v = (Vector2 *)p_v; + const Vector2 *vec = (Vector2 *)&p_vec; + godot_vector2 dest; + Vector2 *d = (Vector2 *)&dest; + *d = v->reflect(*vec); + return dest; } -void GDAPI godot_vector2_operator_multiply_scalar(godot_vector2 *p_dest, const godot_vector2 *p_a, const godot_real p_b) { - Vector2 *dest = (Vector2 *)p_dest; - const Vector2 *a = (Vector2 *)p_a; - *dest = *a * p_b; +godot_vector2 GDAPI godot_vector2_rotated(const godot_vector2 *p_v, godot_real phi) { + const Vector2 *v = (Vector2 *)p_v; + godot_vector2 dest; + Vector2 *d = (Vector2 *)&dest; + *d = v->rotated(phi); + return dest; } -void GDAPI godot_vector2_operator_divide_vector(godot_vector2 *p_dest, const godot_vector2 *p_a, const godot_vector2 *p_b) { - Vector2 *dest = (Vector2 *)p_dest; - const Vector2 *a = (Vector2 *)p_a; - const Vector2 *b = (Vector2 *)p_b; - *dest = *a / *b; +godot_vector2 GDAPI godot_vector2_slide(const godot_vector2 *p_v, godot_vector2 p_vec) { + godot_vector2 dest; + Vector2 *d = (Vector2 *)&dest; + const Vector2 *v = (Vector2 *)p_v; + const Vector2 *vec = (Vector2 *)&p_vec; + *d = v->slide(*vec); + return dest; } -void GDAPI godot_vector2_operator_divide_scalar(godot_vector2 *p_dest, const godot_vector2 *p_a, const godot_real p_b) { - Vector2 *dest = (Vector2 *)p_dest; - const Vector2 *a = (Vector2 *)p_a; - *dest = *a / p_b; +godot_vector2 GDAPI godot_vector2_snapped(const godot_vector2 *p_v, godot_vector2 p_by) { + godot_vector2 dest; + Vector2 *d = (Vector2 *)&dest; + const Vector2 *v = (Vector2 *)p_v; + const Vector2 *by = (Vector2 *)&p_by; + *d = v->snapped(*by); + return dest; } -godot_bool GDAPI godot_vector2_operator_equal(const godot_vector2 *p_a, const godot_vector2 *p_b) { - const Vector2 *a = (Vector2 *)p_a; - const Vector2 *b = (Vector2 *)p_b; - return *a == *b; +godot_vector2 GDAPI godot_vector2_tangent(const godot_vector2 *p_v) { + godot_vector2 dest; + Vector2 *d = (Vector2 *)&dest; + const Vector2 *v = (Vector2 *)p_v; + *d = v->tangent(); + return dest; } -godot_bool GDAPI godot_vector2_operator_less(const godot_vector2 *p_a, const godot_vector2 *p_b) { - const Vector2 *a = (Vector2 *)p_a; - const Vector2 *b = (Vector2 *)p_b; - return *a < *b; +godot_string GDAPI godot_vector2_to_string(const godot_vector2 *p_v) { + godot_string dest; + String *d = (String *)&dest; + const Vector2 *v = (Vector2 *)p_v; + *d = "(" + *v + ")"; + return dest; } #ifdef __cplusplus diff --git a/modules/gdnative/godot/godot_vector2.h b/modules/gdnative/godot/godot_vector2.h index afda8aa10b..36a4f01d03 100644 --- a/modules/gdnative/godot/godot_vector2.h +++ b/modules/gdnative/godot/godot_vector2.h @@ -45,7 +45,7 @@ typedef struct godot_vector2 { #include "../godot.h" -void GDAPI godot_vector2_new(godot_vector2 *p_v, const godot_real p_x, const godot_real p_y); +godot_vector2 GDAPI godot_vector2_new(const godot_real p_x, const godot_real p_y); void GDAPI godot_vector2_set_x(godot_vector2 *p_v, const godot_real p_x); void GDAPI godot_vector2_set_y(godot_vector2 *p_v, const godot_real p_y); @@ -53,52 +53,43 @@ godot_real GDAPI godot_vector2_get_x(const godot_vector2 *p_v); godot_real GDAPI godot_vector2_get_y(const godot_vector2 *p_v); void GDAPI godot_vector2_normalize(godot_vector2 *p_v); -void GDAPI godot_vector2_normalized(godot_vector2 *p_dest, const godot_vector2 *p_src); +godot_vector2 GDAPI godot_vector2_normalized(const godot_vector2 *p_v); godot_real GDAPI godot_vector2_length(const godot_vector2 *p_v); godot_real GDAPI godot_vector2_length_squared(const godot_vector2 *p_v); -godot_real GDAPI godot_vector2_distance_to(const godot_vector2 *p_a, const godot_vector2 *p_b); -godot_real GDAPI godot_vector2_distance_squared_to(const godot_vector2 *p_a, const godot_vector2 *p_b); +godot_real GDAPI godot_vector2_distance_to(const godot_vector2 *p_v, const godot_vector2 p_b); +godot_real GDAPI godot_vector2_distance_squared_to(const godot_vector2 *p_v, const godot_vector2 p_b); -// @Incomplete -/* - * missing: - * - * angle_to - * angle_to_point - * dot - * cross_vector - * cross_scalar - * project - * plane_project - * clamped - * linear_interpolate - * cubic_interpolate - * cubic_interpolate_soft - * slide - * reflect - * angle - * abs - * rotated - * tangent - * floor - * snapped - * aspect - * - * - * to_string - */ +godot_vector2 GDAPI godot_vector2_abs(const godot_vector2 *p_v); +godot_real GDAPI godot_vector2_angle(const godot_vector2 *p_v); +godot_real GDAPI godot_vector2_angle_to(const godot_vector2 *p_v, const godot_vector2 p_to); +godot_real GDAPI godot_vector2_angle_to_point(const godot_vector2 *p_v, const godot_vector2 p_to); +godot_vector2 GDAPI godot_vector2_clamped(const godot_vector2 *p_v, godot_real length); +godot_vector2 GDAPI godot_vector2_cubic_interpolate(const godot_vector2 *p_v, + const godot_vector2 p_b, const godot_vector2 p_pre_a, + const godot_vector2 p_post_b, godot_real t); +godot_real GDAPI godot_vector2_dot(const godot_vector2 *p_v, const godot_vector2 p_with); +godot_vector2 GDAPI godot_vector2_floor(const godot_vector2 *p_v); +godot_real GDAPI godot_vector2_aspect(const godot_vector2 *p_v); +godot_vector2 GDAPI godot_vector2_linear_interpolate(const godot_vector2 *p_v, + const godot_vector2 p_b, godot_real t); +godot_vector2 GDAPI godot_vector2_reflect(const godot_vector2 *p_v, const godot_vector2 p_vec); +godot_vector2 GDAPI godot_vector2_rotated(const godot_vector2 *p_v, godot_real phi); +godot_vector2 GDAPI godot_vector2_slide(const godot_vector2 *p_v, godot_vector2 p_vec); +godot_vector2 GDAPI godot_vector2_snapped(const godot_vector2 *p_v, godot_vector2 p_by); +godot_vector2 GDAPI godot_vector2_tangent(const godot_vector2 *p_v); +godot_string GDAPI godot_vector2_to_string(const godot_vector2 *p_v); -void GDAPI godot_vector2_operator_add(godot_vector2 *p_dest, const godot_vector2 *p_a, const godot_vector2 *p_b); -void GDAPI godot_vector2_operator_subtract(godot_vector2 *p_dest, const godot_vector2 *p_a, const godot_vector2 *p_b); -void GDAPI godot_vector2_operator_multiply_vector(godot_vector2 *p_dest, const godot_vector2 *p_a, const godot_vector2 *p_b); -void GDAPI godot_vector2_operator_multiply_scalar(godot_vector2 *p_dest, const godot_vector2 *p_a, const godot_real p_b); -void GDAPI godot_vector2_operator_divide_vector(godot_vector2 *p_dest, const godot_vector2 *p_a, const godot_vector2 *p_b); -void GDAPI godot_vector2_operator_divide_scalar(godot_vector2 *p_dest, const godot_vector2 *p_a, const godot_real p_b); +godot_vector2 GDAPI godot_vector2_operator_add(const godot_vector2 *p_v, const godot_vector2 p_b); +godot_vector2 GDAPI godot_vector2_operator_subtract(const godot_vector2 *p_v, const godot_vector2 p_b); +godot_vector2 GDAPI godot_vector2_operator_multiply_vector(const godot_vector2 *p_v, const godot_vector2 p_b); +godot_vector2 GDAPI godot_vector2_operator_multiply_scalar(const godot_vector2 *p_v, const godot_real p_b); +godot_vector2 GDAPI godot_vector2_operator_divide_vector(const godot_vector2 *p_v, const godot_vector2 p_b); +godot_vector2 GDAPI godot_vector2_operator_divide_scalar(const godot_vector2 *p_v, const godot_real p_b); -godot_bool GDAPI godot_vector2_operator_equal(const godot_vector2 *p_a, const godot_vector2 *p_b); -godot_bool GDAPI godot_vector2_operator_less(const godot_vector2 *p_a, const godot_vector2 *p_b); +godot_bool GDAPI godot_vector2_operator_equal(const godot_vector2 *p_v, const godot_vector2 p_b); +godot_bool GDAPI godot_vector2_operator_less(const godot_vector2 *p_v, const godot_vector2 p_b); #ifdef __cplusplus } diff --git a/modules/gdnative/godot/godot_vector3.cpp b/modules/gdnative/godot/godot_vector3.cpp index f08bfbcf06..5f71b9f7e4 100644 --- a/modules/gdnative/godot/godot_vector3.cpp +++ b/modules/gdnative/godot/godot_vector3.cpp @@ -38,9 +38,11 @@ extern "C" { void _vector3_api_anchor() { } -void GDAPI godot_vector3_new(godot_vector3 *p_v, const godot_real p_x, const godot_real p_y, const godot_real p_z) { - Vector3 *v = (Vector3 *)p_v; +godot_vector3 GDAPI godot_vector3_new(const godot_real p_x, const godot_real p_y, const godot_real p_z) { + godot_vector3 value; + Vector3 *v = (Vector3 *)&value; *v = Vector3(p_x, p_y, p_z); + return value; } void GDAPI godot_vector3_set_axis(godot_vector3 *p_v, const godot_int p_axis, const godot_real p_val) { @@ -78,100 +80,261 @@ void GDAPI godot_vector3_normalize(godot_vector3 *p_v) { v->normalize(); } -void GDAPI godot_vector3_normalized(godot_vector3 *p_dest, const godot_vector3 *p_src) { - Vector3 *src = (Vector3 *)p_src; - Vector3 *dest = (Vector3 *)p_dest; - *dest = src->normalized(); +godot_vector3 GDAPI godot_vector3_normalized(const godot_vector3 *p_v) { + godot_vector3 dest; + Vector3 *d = (Vector3 *)&dest; + Vector3 *v = (Vector3 *)p_v; + *d = v->normalized(); + return dest; +} + +godot_vector3 godot_vector3_inverse(const godot_vector3 *p_v) { + godot_vector3 dest; + Vector3 *d = (Vector3 *)&dest; + const Vector3 *v = (Vector3 *)p_v; + *d = v->inverse(); + return dest; +} + +void godot_vector3_zero(godot_vector3 *p_v) { + Vector3 *v = (Vector3 *)p_v; + v->zero(); +} + +void godot_vector3_snap(godot_vector3 *p_v, const godot_real val) { + Vector3 *v = (Vector3 *)p_v; + v->snap(val); +} + +godot_vector3 godot_vector3_snapped(const godot_vector3 *p_v, const godot_real val) { + godot_vector3 dest; + Vector3 *d = (Vector3 *)&dest; + const Vector3 *v = (Vector3 *)p_v; + *d = v->snapped(val); + return dest; +} + +void godot_vector3_rotate(godot_vector3 *p_v, const godot_vector3 p_axis, const godot_real phi) { + Vector3 *v = (Vector3 *)p_v; + const Vector3 *axis = (Vector3 *)&p_axis; + v->rotate(*axis, phi); +} + +godot_vector3 godot_vector3_rotated(const godot_vector3 *p_v, const godot_vector3 p_axis, const godot_real phi) { + godot_vector3 dest; + Vector3 *d = (Vector3 *)&dest; + const Vector3 *v = (Vector3 *)p_v; + const Vector3 *axis = (Vector3 *)&p_axis; + *d = v->rotated(*axis, phi); + return dest; +} + +godot_vector3 godot_vector3_linear_interpolate(const godot_vector3 *p_v, const godot_vector3 p_b, const godot_real t) { + godot_vector3 dest; + Vector3 *d = (Vector3 *)&dest; + const Vector3 *v = (Vector3 *)p_v; + const Vector3 *b = (Vector3 *)&p_b; + *d = v->linear_interpolate(*b, t); + return dest; +} + +godot_vector3 godot_vector3_cubic_interpolate(const godot_vector3 *p_v, + const godot_vector3 p_b, const godot_vector3 p_pre_a, + const godot_vector3 p_post_b, const godot_real t) { + godot_vector3 dest; + Vector3 *d = (Vector3 *)&dest; + const Vector3 *v = (Vector3 *)p_v; + const Vector3 *b = (Vector3 *)&p_b; + const Vector3 *pre_a = (Vector3 *)&p_pre_a; + const Vector3 *post_b = (Vector3 *)&p_post_b; + *d = v->cubic_interpolate(*b, *pre_a, *post_b, t); + return dest; +} + +godot_vector3 godot_vector3_cubic_interpolaten(const godot_vector3 *p_v, + const godot_vector3 p_b, const godot_vector3 p_pre_a, + const godot_vector3 p_post_b, const godot_real t) { + godot_vector3 dest; + Vector3 *d = (Vector3 *)&dest; + const Vector3 *v = (Vector3 *)p_v; + const Vector3 *b = (Vector3 *)&p_b; + const Vector3 *pre_a = (Vector3 *)&p_pre_a; + const Vector3 *post_b = (Vector3 *)&p_post_b; + *d = v->cubic_interpolaten(*b, *pre_a, *post_b, t); + return dest; +} + +godot_vector3 godot_vector3_cross(const godot_vector3 *p_v, const godot_vector3 p_b) { + godot_vector3 dest; + Vector3 *d = (Vector3 *)&dest; + const Vector3 *v = (Vector3 *)p_v; + const Vector3 *b = (Vector3 *)&p_b; + *d = v->cross(*b); + return dest; +} + +godot_real godot_vector3_dot(const godot_vector3 *p_v, const godot_vector3 p_b) { + const Vector3 *v = (Vector3 *)p_v; + const Vector3 *b = (Vector3 *)&p_b; + return v->dot(*b); +} + +godot_basis godot_vector3_outer(const godot_vector3 *p_v, const godot_vector3 p_b) { + godot_basis dest; + Basis *d = (Basis *)&dest; + const Vector3 *v = (Vector3 *)p_v; + const Vector3 *b = (Vector3 *)&p_b; + *d = v->outer(*b); + return dest; +} + +godot_basis godot_vector3_to_diagonal_matrix(const godot_vector3 *p_v) { + godot_basis dest; + Basis *d = (Basis *)&dest; + const Vector3 *v = (Vector3 *)p_v; + *d = v->to_diagonal_matrix(); + return dest; +} + +godot_vector3 godot_vector3_abs(const godot_vector3 *p_v) { + godot_vector3 dest; + Vector3 *d = (Vector3 *)&dest; + const Vector3 *v = (Vector3 *)p_v; + *d = v->abs(); + return dest; +} + +godot_vector3 godot_vector3_floor(const godot_vector3 *p_v) { + godot_vector3 dest; + Vector3 *d = (Vector3 *)&dest; + const Vector3 *v = (Vector3 *)p_v; + *d = v->floor(); + return dest; +} + +godot_vector3 godot_vector3_ceil(const godot_vector3 *p_v) { + godot_vector3 dest; + Vector3 *d = (Vector3 *)&dest; + const Vector3 *v = (Vector3 *)p_v; + *d = v->ceil(); + return dest; +} + +godot_real GDAPI godot_vector3_distance_to(const godot_vector3 *p_v, const godot_vector3 p_b) { + Vector3 *v = (Vector3 *)p_v; + Vector3 *b = (Vector3 *)&p_b; + return v->distance_to(*b); +} + +godot_real GDAPI godot_vector3_distance_squared_to(const godot_vector3 *p_v, const godot_vector3 p_b) { + Vector3 *v = (Vector3 *)p_v; + Vector3 *b = (Vector3 *)&p_b; + return v->distance_squared_to(*b); } -/* - * inverse - * zero - * snap - * snapped - * rotate - * rotated - * - * - * linear_interpolate - * cubic_interpolate - * cubic_interpolaten - * cross - * dot - * outer - * to_diagonal_matrix - * abs - * floor - * ceil - */ +godot_real GDAPI godot_vector3_angle_to(const godot_vector3 *p_v, const godot_vector3 p_b) { + Vector3 *v = (Vector3 *)p_v; + Vector3 *b = (Vector3 *)&p_b; + return v->angle_to(*b); +} -godot_real GDAPI godot_vector3_distance_to(const godot_vector3 *p_a, const godot_vector3 *p_b) { - Vector3 *a = (Vector3 *)p_a; - Vector3 *b = (Vector3 *)p_b; - return a->distance_to(*b); +godot_vector3 godot_vector3_slide(const godot_vector3 *p_v, const godot_vector3 p_vec) { + godot_vector3 dest; + Vector3 *d = (Vector3 *)&dest; + const Vector3 *v = (Vector3 *)p_v; + const Vector3 *vec = (Vector3 *)&p_vec; + *d = v->slide(*vec); + return dest; } -godot_real GDAPI godot_vector3_distance_squared_to(const godot_vector3 *p_a, const godot_vector3 *p_b) { - Vector3 *a = (Vector3 *)p_a; - Vector3 *b = (Vector3 *)p_b; - return a->distance_squared_to(*b); +godot_vector3 godot_vector3_bounce(const godot_vector3 *p_v, const godot_vector3 p_vec) { + godot_vector3 dest; + Vector3 *d = (Vector3 *)&dest; + const Vector3 *v = (Vector3 *)p_v; + const Vector3 *vec = (Vector3 *)&p_vec; + *d = v->bounce(*vec); + return dest; } -/* - * slide - * reflect - */ +godot_vector3 godot_vector3_reflect(const godot_vector3 *p_v, const godot_vector3 p_vec) { + godot_vector3 dest; + Vector3 *d = (Vector3 *)&dest; + const Vector3 *v = (Vector3 *)p_v; + const Vector3 *vec = (Vector3 *)&p_vec; + *d = v->reflect(*vec); + return dest; +} + +godot_vector3 GDAPI godot_vector3_operator_add(const godot_vector3 *p_v, const godot_vector3 p_b) { + godot_vector3 dest; + Vector3 *d = (Vector3 *)&dest; + Vector3 *v = (Vector3 *)p_v; + Vector3 *b = (Vector3 *)&p_b; + *d = *v + *b; + return dest; +} -void GDAPI godot_vector3_operator_add(godot_vector3 *p_dest, const godot_vector3 *p_a, const godot_vector3 *p_b) { - Vector3 *dest = (Vector3 *)p_dest; - Vector3 *a = (Vector3 *)p_a; - Vector3 *b = (Vector3 *)p_b; - *dest = *a + *b; +godot_vector3 GDAPI godot_vector3_operator_subtract(const godot_vector3 *p_v, const godot_vector3 p_b) { + godot_vector3 dest; + Vector3 *d = (Vector3 *)&dest; + Vector3 *v = (Vector3 *)p_v; + Vector3 *b = (Vector3 *)&p_b; + *d = *v - *b; + return dest; } -void GDAPI godot_vector3_operator_subtract(godot_vector3 *p_dest, const godot_vector3 *p_a, const godot_vector3 *p_b) { - Vector3 *dest = (Vector3 *)p_dest; - Vector3 *a = (Vector3 *)p_a; - Vector3 *b = (Vector3 *)p_b; - *dest = *a - *b; +godot_vector3 GDAPI godot_vector3_operator_multiply_vector(const godot_vector3 *p_v, const godot_vector3 p_b) { + godot_vector3 dest; + Vector3 *d = (Vector3 *)&dest; + Vector3 *v = (Vector3 *)p_v; + Vector3 *b = (Vector3 *)&p_b; + *d = *v * *b; + return dest; } -void GDAPI godot_vector3_operator_multiply_vector(godot_vector3 *p_dest, const godot_vector3 *p_a, const godot_vector3 *p_b) { - Vector3 *dest = (Vector3 *)p_dest; - Vector3 *a = (Vector3 *)p_a; - Vector3 *b = (Vector3 *)p_b; - *dest = *a * *b; +godot_vector3 GDAPI godot_vector3_operator_multiply_scalar(const godot_vector3 *p_v, const godot_real p_b) { + godot_vector3 dest; + Vector3 *d = (Vector3 *)&dest; + Vector3 *v = (Vector3 *)p_v; + *d = *v * p_b; + return dest; } -void GDAPI godot_vector3_operator_multiply_scalar(godot_vector3 *p_dest, const godot_vector3 *p_a, const godot_real p_b) { - Vector3 *dest = (Vector3 *)p_dest; - Vector3 *a = (Vector3 *)p_a; - *dest = *a * p_b; +godot_vector3 GDAPI godot_vector3_operator_divide_vector(const godot_vector3 *p_v, const godot_vector3 p_b) { + godot_vector3 dest; + Vector3 *d = (Vector3 *)&dest; + Vector3 *v = (Vector3 *)p_v; + Vector3 *b = (Vector3 *)&p_b; + *d = *v / *b; + return dest; } -void GDAPI godot_vector3_operator_divide_vector(godot_vector3 *p_dest, const godot_vector3 *p_a, const godot_vector3 *p_b) { - Vector3 *dest = (Vector3 *)p_dest; - Vector3 *a = (Vector3 *)p_a; - Vector3 *b = (Vector3 *)p_b; - *dest = *a / *b; +godot_vector3 GDAPI godot_vector3_operator_divide_scalar(const godot_vector3 *p_v, const godot_real p_b) { + godot_vector3 dest; + Vector3 *d = (Vector3 *)&dest; + Vector3 *v = (Vector3 *)p_v; + *d = *v / p_b; + return dest; } -void GDAPI godot_vector3_operator_divide_scalar(godot_vector3 *p_dest, const godot_vector3 *p_a, const godot_real p_b) { - Vector3 *dest = (Vector3 *)p_dest; - Vector3 *a = (Vector3 *)p_a; - *dest = *a / p_b; +godot_bool GDAPI godot_vector3_operator_equal(const godot_vector3 *p_v, const godot_vector3 p_b) { + Vector3 *v = (Vector3 *)p_v; + Vector3 *b = (Vector3 *)&p_b; + return *v == *b; } -godot_bool GDAPI godot_vector3_operator_equal(const godot_vector3 *p_a, const godot_vector3 *p_b) { - Vector3 *a = (Vector3 *)p_a; - Vector3 *b = (Vector3 *)p_b; - return *a == *b; +godot_bool GDAPI godot_vector3_operator_less(const godot_vector3 *p_v, const godot_vector3 p_b) { + Vector3 *v = (Vector3 *)p_v; + Vector3 *b = (Vector3 *)&p_b; + return *v < *b; } -godot_bool GDAPI godot_vector3_operator_less(const godot_vector3 *p_a, const godot_vector3 *p_b) { - Vector3 *a = (Vector3 *)p_a; - Vector3 *b = (Vector3 *)p_b; - return *a < *b; +godot_string GDAPI godot_vector3_to_string(const godot_vector3 *p_v) { + godot_string dest; + String *d = (String *)&dest; + const Vector3 *v = (Vector3 *)p_v; + *d = "(" + *v + ")"; + return dest; } #ifdef __cplusplus diff --git a/modules/gdnative/godot/godot_vector3.h b/modules/gdnative/godot/godot_vector3.h index b7dc40965d..654ddd7792 100644 --- a/modules/gdnative/godot/godot_vector3.h +++ b/modules/gdnative/godot/godot_vector3.h @@ -42,9 +42,14 @@ typedef struct godot_vector3 { } godot_vector3; #endif +#define GODOT_VECTOR3_AXIX_X 0 +#define GODOT_VECTOR3_AXIX_Y 1 +#define GODOT_VECTOR3_AXIX_Z 2 + #include "../godot.h" +#include "godot_basis.h" -void GDAPI godot_vector3_new(godot_vector3 *p_v, const godot_real p_x, const godot_real p_y, const godot_real p_z); +godot_vector3 GDAPI godot_vector3_new(const godot_real p_x, const godot_real p_y, const godot_real p_z); void GDAPI godot_vector3_set_axis(godot_vector3 *p_v, const godot_int p_axis, const godot_real p_val); godot_real GDAPI godot_vector3_get_axis(const godot_vector3 *p_v, const godot_int p_axis); @@ -56,53 +61,50 @@ godot_real GDAPI godot_vector3_length(const godot_vector3 *p_v); godot_real GDAPI godot_vector3_length_squared(const godot_vector3 *p_v); void GDAPI godot_vector3_normalize(godot_vector3 *p_v); -void GDAPI godot_vector3_normalized(godot_vector3 *p_dest, const godot_vector3 *p_src); - -// @Incomplete - -/* - * inverse - * zero - * snap - * snapped - * rotate - * rotated - * - * - * linear_interpolate - * cubic_interpolate - * cubic_interpolaten - * cross - * dot - * outer - * to_diagonal_matrix - * abs - * floor - * ceil - */ - -godot_real GDAPI godot_vector3_distance_to(const godot_vector3 *p_a, const godot_vector3 *p_b); -godot_real GDAPI godot_vector3_distance_squared_to(const godot_vector3 *p_a, const godot_vector3 *p_b); - -// @Incomplete -/* - * slide - * reflect - */ - -void GDAPI godot_vector3_operator_add(godot_vector3 *p_dest, const godot_vector3 *p_a, const godot_vector3 *p_b); -void GDAPI godot_vector3_operator_subtract(godot_vector3 *p_dest, const godot_vector3 *p_a, const godot_vector3 *p_b); -void GDAPI godot_vector3_operator_multiply_vector(godot_vector3 *p_dest, const godot_vector3 *p_a, const godot_vector3 *p_b); -void GDAPI godot_vector3_operator_multiply_scalar(godot_vector3 *p_dest, const godot_vector3 *p_a, const godot_real p_b); -void GDAPI godot_vector3_operator_divide_vector(godot_vector3 *p_dest, const godot_vector3 *p_a, const godot_vector3 *p_b); -void GDAPI godot_vector3_operator_divide_scalar(godot_vector3 *p_dest, const godot_vector3 *p_a, const godot_real p_b); - -godot_bool GDAPI godot_vector3_operator_equal(const godot_vector3 *p_a, const godot_vector3 *p_b); -godot_bool GDAPI godot_vector3_operator_less(const godot_vector3 *p_a, const godot_vector3 *p_b); - -/* - * to_string - */ +godot_vector3 GDAPI godot_vector3_normalized(const godot_vector3 *p_v); + +godot_vector3 GDAPI godot_vector3_inverse(const godot_vector3 *p_v); +void GDAPI godot_vector3_zero(godot_vector3 *p_v); +void GDAPI godot_vector3_snap(godot_vector3 *p_v, const godot_real val); +godot_vector3 GDAPI godot_vector3_snapped(const godot_vector3 *p_v, const godot_real val); +void GDAPI godot_vector3_rotate(godot_vector3 *p_v, const godot_vector3 p_axis, const godot_real phi); +godot_vector3 GDAPI godot_vector3_rotated(const godot_vector3 *p_v, + const godot_vector3 p_axis, const godot_real phi); +godot_vector3 GDAPI godot_vector3_linear_interpolate(const godot_vector3 *p_v, + const godot_vector3 p_b, const godot_real t); +godot_vector3 GDAPI godot_vector3_cubic_interpolate(const godot_vector3 *p_v, + const godot_vector3 p_b, const godot_vector3 p_pre_a, + const godot_vector3 p_post_b, const godot_real t); +godot_vector3 GDAPI godot_vector3_cubic_interpolaten(const godot_vector3 *p_v, + const godot_vector3 p_b, const godot_vector3 p_pre_a, + const godot_vector3 p_post_b, const godot_real t); +godot_vector3 GDAPI godot_vector3_cross(const godot_vector3 *p_v, const godot_vector3 p_b); +godot_real GDAPI godot_vector3_dot(const godot_vector3 *p_v, const godot_vector3 p_b); +godot_basis GDAPI godot_vector3_outer(const godot_vector3 *p_v, const godot_vector3 p_b); +godot_basis GDAPI godot_vector3_to_diagonal_matrix(const godot_vector3 *p_v); +godot_vector3 GDAPI godot_vector3_abs(const godot_vector3 *p_v); +godot_vector3 GDAPI godot_vector3_floor(const godot_vector3 *p_v); +godot_vector3 GDAPI godot_vector3_ceil(const godot_vector3 *p_v); + +godot_real GDAPI godot_vector3_distance_to(const godot_vector3 *p_v, const godot_vector3 p_b); +godot_real GDAPI godot_vector3_distance_squared_to(const godot_vector3 *p_v, const godot_vector3 p_b); +godot_real GDAPI godot_vector3_angle_to(const godot_vector3 *p_v, const godot_vector3 p_b); + +godot_vector3 GDAPI godot_vector3_slide(const godot_vector3 *p_v, const godot_vector3 p_vec); +godot_vector3 GDAPI godot_vector3_bounce(const godot_vector3 *p_v, const godot_vector3 p_vec); +godot_vector3 GDAPI godot_vector3_reflect(const godot_vector3 *p_v, const godot_vector3 p_vec); + +godot_vector3 GDAPI godot_vector3_operator_add(const godot_vector3 *p_v, const godot_vector3 p_b); +godot_vector3 GDAPI godot_vector3_operator_subtract(const godot_vector3 *p_v, const godot_vector3 p_b); +godot_vector3 GDAPI godot_vector3_operator_multiply_vector(const godot_vector3 *p_v, const godot_vector3 p_b); +godot_vector3 GDAPI godot_vector3_operator_multiply_scalar(const godot_vector3 *p_v, const godot_real p_b); +godot_vector3 GDAPI godot_vector3_operator_divide_vector(const godot_vector3 *p_v, const godot_vector3 p_b); +godot_vector3 GDAPI godot_vector3_operator_divide_scalar(const godot_vector3 *p_v, const godot_real p_b); + +godot_bool GDAPI godot_vector3_operator_equal(const godot_vector3 *p_v, const godot_vector3 p_b); +godot_bool GDAPI godot_vector3_operator_less(const godot_vector3 *p_v, const godot_vector3 p_b); + +godot_string GDAPI godot_vector3_to_string(const godot_vector3 *p_v); #ifdef __cplusplus } diff --git a/modules/gdscript/gd_editor.cpp b/modules/gdscript/gd_editor.cpp index ae5bb5694c..c2f14f5466 100644 --- a/modules/gdscript/gd_editor.cpp +++ b/modules/gdscript/gd_editor.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ +#include "editor/editor_settings.h" #include "gd_compiler.h" #include "gd_script.h" #include "global_config.h" @@ -2391,8 +2392,27 @@ Error GDScriptLanguage::complete_code(const String &p_code, const String &p_base #endif +String GDScriptLanguage::_get_indentation() const { +#ifdef TOOLS_ENABLED + bool use_space_indentation = EDITOR_DEF("text_editor/indent/type", "Tabs") == "Tabs" ? 0 : 1; + + if (use_space_indentation) { + int indent_size = EDITOR_DEF("text_editor/indent/size", 4); + + String space_indent = ""; + for (int i = 0; i < indent_size; i++) { + space_indent += " "; + } + return space_indent; + } +#endif + return "\t"; +} + void GDScriptLanguage::auto_indent_code(String &p_code, int p_from_line, int p_to_line) const { + String indent = _get_indentation(); + Vector<String> lines = p_code.split("\n"); List<int> indent_stack; @@ -2432,8 +2452,9 @@ void GDScriptLanguage::auto_indent_code(String &p_code, int p_from_line, int p_t if (i >= p_from_line) { l = ""; - for (int j = 0; j < indent_stack.size(); j++) - l += "\t"; + for (int j = 0; j < indent_stack.size(); j++) { + l += indent; + } l += st; } else if (i > p_to_line) { diff --git a/modules/gdscript/gd_script.cpp b/modules/gdscript/gd_script.cpp index 2367f60740..fe20a842cf 100644 --- a/modules/gdscript/gd_script.cpp +++ b/modules/gdscript/gd_script.cpp @@ -1696,9 +1696,9 @@ void GDScriptLanguage::reload_tool_script(const Ref<Script> &p_script, bool p_so //same thing for placeholders #ifdef TOOLS_ENABLED - while (E->get()->placeholders.size()) { + for (Set<PlaceHolderScriptInstance *>::Element *P = E->get()->placeholders.front(); P; P = P->next()) { - Object *obj = E->get()->placeholders.front()->get()->get_owner(); + Object *obj = P->get()->get_owner(); //save instance info List<Pair<StringName, Variant> > state; if (obj->get_script_instance()) { diff --git a/modules/gdscript/gd_script.h b/modules/gdscript/gd_script.h index 93f8ee8721..f92c11b9e0 100644 --- a/modules/gdscript/gd_script.h +++ b/modules/gdscript/gd_script.h @@ -390,6 +390,7 @@ public: #ifdef TOOLS_ENABLED virtual Error lookup_code(const String &p_code, const String &p_symbol, const String &p_base_path, Object *p_owner, LookupResult &r_result); #endif + virtual String _get_indentation() const; virtual void auto_indent_code(String &p_code, int p_from_line, int p_to_line) const; virtual void add_global_constant(const StringName &p_variable, const Variant &p_value); diff --git a/modules/multiscript/SCsub b/modules/multiscript/SCsub new file mode 100644 index 0000000000..0882406761 --- /dev/null +++ b/modules/multiscript/SCsub @@ -0,0 +1,7 @@ +#!/usr/bin/env python + +Import('env') + +env.add_source_files(env.modules_sources, "*.cpp") + +Export('env') diff --git a/modules/multiscript/config.py b/modules/multiscript/config.py new file mode 100644 index 0000000000..5698a37295 --- /dev/null +++ b/modules/multiscript/config.py @@ -0,0 +1,8 @@ + + +def can_build(platform): + return True + + +def configure(env): + pass diff --git a/modules/multiscript/multiscript.cpp b/modules/multiscript/multiscript.cpp new file mode 100644 index 0000000000..b2633b7207 --- /dev/null +++ b/modules/multiscript/multiscript.cpp @@ -0,0 +1,750 @@ +/*************************************************************************/ +/* multiscript.cpp */ +/*************************************************************************/ +/* This file is part of: */ +/* GODOT ENGINE */ +/* http://www.godotengine.org */ +/*************************************************************************/ +/* Copyright (c) 2007-2017 Juan Linietsky, Ariel Manzur. */ +/* Copyright (c) 2014-2017 Godot Engine contributors (cf. AUTHORS.md) */ +/* */ +/* Permission is hereby granted, free of charge, to any person obtaining */ +/* a copy of this software and associated documentation files (the */ +/* "Software"), to deal in the Software without restriction, including */ +/* without limitation the rights to use, copy, modify, merge, publish, */ +/* distribute, sublicense, and/or sell copies of the Software, and to */ +/* permit persons to whom the Software is furnished to do so, subject to */ +/* the following conditions: */ +/* */ +/* The above copyright notice and this permission notice shall be */ +/* included in all copies or substantial portions of the Software. */ +/* */ +/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */ +/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */ +/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/ +/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */ +/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */ +/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ +/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +/*************************************************************************/ +#include "multiscript.h" + +bool MultiScriptInstance::set(const StringName &p_name, const Variant &p_value) { + + ScriptInstance **sarr = instances.ptr(); + int sc = instances.size(); + + for (int i = 0; i < sc; i++) { + + if (!sarr[i]) + continue; + + bool found = sarr[i]->set(p_name, p_value); + if (found) + return true; + } + + if (String(p_name).begins_with("script_")) { + bool valid; + owner->set(p_name, p_value, &valid); + return valid; + } + return false; +} + +bool MultiScriptInstance::get(const StringName &p_name, Variant &r_ret) const { + + ScriptInstance **sarr = instances.ptr(); + int sc = instances.size(); + + for (int i = 0; i < sc; i++) { + + if (!sarr[i]) + continue; + + bool found = sarr[i]->get(p_name, r_ret); + if (found) + return true; + } + if (String(p_name).begins_with("script_")) { + bool valid; + r_ret = owner->get(p_name, &valid); + return valid; + } + return false; +} +void MultiScriptInstance::get_property_list(List<PropertyInfo> *p_properties) const { + + ScriptInstance **sarr = instances.ptr(); + int sc = instances.size(); + + Set<String> existing; + + for (int i = 0; i < sc; i++) { + + if (!sarr[i]) + continue; + + List<PropertyInfo> pl; + sarr[i]->get_property_list(&pl); + + for (List<PropertyInfo>::Element *E = pl.front(); E; E = E->next()) { + + if (existing.has(E->get().name)) + continue; + + p_properties->push_back(E->get()); + existing.insert(E->get().name); + } + } + + p_properties->push_back(PropertyInfo(Variant::NIL, "Scripts", PROPERTY_HINT_NONE, String(), PROPERTY_USAGE_CATEGORY)); + + for (int i = 0; i < owner->scripts.size(); i++) { + + p_properties->push_back(PropertyInfo(Variant::OBJECT, "script_" + String::chr('a' + i), PROPERTY_HINT_RESOURCE_TYPE, "Script", PROPERTY_USAGE_EDITOR)); + } + + if (owner->scripts.size() < 25) { + + p_properties->push_back(PropertyInfo(Variant::OBJECT, "script_" + String::chr('a' + (owner->scripts.size())), PROPERTY_HINT_RESOURCE_TYPE, "Script", PROPERTY_USAGE_EDITOR)); + } +} + +void MultiScriptInstance::get_method_list(List<MethodInfo> *p_list) const { + + ScriptInstance **sarr = instances.ptr(); + int sc = instances.size(); + + Set<StringName> existing; + + for (int i = 0; i < sc; i++) { + + if (!sarr[i]) + continue; + + List<MethodInfo> ml; + sarr[i]->get_method_list(&ml); + + for (List<MethodInfo>::Element *E = ml.front(); E; E = E->next()) { + + if (existing.has(E->get().name)) + continue; + + p_list->push_back(E->get()); + existing.insert(E->get().name); + } + } +} +bool MultiScriptInstance::has_method(const StringName &p_method) const { + + ScriptInstance **sarr = instances.ptr(); + int sc = instances.size(); + + for (int i = 0; i < sc; i++) { + + if (!sarr[i]) + continue; + + if (sarr[i]->has_method(p_method)) + return true; + } + + return false; +} + +Variant MultiScriptInstance::call(const StringName &p_method, const Variant **p_args, int p_argcount, Variant::CallError &r_error) { + + ScriptInstance **sarr = instances.ptr(); + int sc = instances.size(); + + for (int i = 0; i < sc; i++) { + + if (!sarr[i]) + continue; + + Variant r = sarr[i]->call(p_method, p_args, p_argcount, r_error); + if (r_error.error == Variant::CallError::CALL_OK) + return r; + else if (r_error.error != Variant::CallError::CALL_ERROR_INVALID_METHOD) + return r; + } + + r_error.error = Variant::CallError::CALL_ERROR_INVALID_METHOD; + return Variant(); +} + +void MultiScriptInstance::call_multilevel(const StringName &p_method, const Variant **p_args, int p_argcount) { + + ScriptInstance **sarr = instances.ptr(); + int sc = instances.size(); + + for (int i = 0; i < sc; i++) { + + if (!sarr[i]) + continue; + + sarr[i]->call_multilevel(p_method, p_args, p_argcount); + } +} +void MultiScriptInstance::notification(int p_notification) { + + // ScriptInstance **sarr = instances.ptr(); + int sc = instances.size(); + + for (int i = 0; i < sc; i++) { + + ScriptInstance *instance = instances[i]; + + if (!instance) + continue; + + instance->notification(p_notification); + } +} + +Ref<Script> MultiScriptInstance::get_script() const { + + return owner; +} + +ScriptLanguage *MultiScriptInstance::get_language() { + + return MultiScriptLanguage::get_singleton(); +} + +MultiScriptInstance::~MultiScriptInstance() { + + owner->remove_instance(object); +} + +Variant::Type MultiScriptInstance::get_property_type(const StringName &p_name, bool *r_is_valid) const { + bool valid = false; + Variant::Type type; + + ScriptInstance **sarr = instances.ptr(); + int sc = instances.size(); + + for (int i = 0; i < sc; i++) { + + if (!sarr[i]) + continue; + + type = sarr[i]->get_property_type(p_name, &valid); + if (valid) { + *r_is_valid = valid; + return type; + } + } + *r_is_valid = false; + return Variant::NIL; +} + +ScriptInstance::RPCMode MultiScriptInstance::get_rpc_mode(const StringName &p_method) const { + ScriptInstance **sarr = instances.ptr(); + int sc = instances.size(); + + for (int i = 0; i < sc; i++) { + + if (!sarr[i]) + continue; + if (sarr[i]->has_method(p_method)) + return sarr[i]->get_rpc_mode(p_method); + } + return RPC_MODE_DISABLED; +} + +ScriptInstance::RPCMode MultiScriptInstance::get_rset_mode(const StringName &p_variable) const { + ScriptInstance **sarr = instances.ptr(); + int sc = instances.size(); + + for (int i = 0; i < sc; i++) { + + if (!sarr[i]) + continue; + + List<PropertyInfo> properties; + sarr[i]->get_property_list(&properties); + + for (List<PropertyInfo>::Element *P = properties.front(); P; P = P->next()) { + if (P->get().name == p_variable) { + return sarr[i]->get_rset_mode(p_variable); + } + } + } + return RPC_MODE_DISABLED; +} + +/////////////////// + +bool MultiScript::is_tool() const { + + for (int i = 0; i < scripts.size(); i++) { + + if (scripts[i]->is_tool()) + return true; + } + + return false; +} + +bool MultiScript::_set(const StringName &p_name, const Variant &p_value) { + + _THREAD_SAFE_METHOD_ + + String s = String(p_name); + if (s.begins_with("script_")) { + + int idx = s[7]; + if (idx == 0) + return false; + idx -= 'a'; + + ERR_FAIL_COND_V(idx < 0, false); + + Ref<Script> s = p_value; + + if (idx < scripts.size()) { + + if (s.is_null()) + remove_script(idx); + else + set_script(idx, s); + } else if (idx == scripts.size()) { + if (s.is_null()) + return false; + add_script(s); + } else + return false; + + return true; + } + + return false; +} + +bool MultiScript::_get(const StringName &p_name, Variant &r_ret) const { + + _THREAD_SAFE_METHOD_ + + String s = String(p_name); + if (s.begins_with("script_")) { + + int idx = s[7]; + if (idx == 0) + return false; + idx -= 'a'; + + ERR_FAIL_COND_V(idx < 0, false); + + if (idx < scripts.size()) { + + r_ret = get_script(idx); + return true; + } else if (idx == scripts.size()) { + r_ret = Ref<Script>(); + return true; + } + } + + return false; +} +void MultiScript::_get_property_list(List<PropertyInfo> *p_list) const { + + _THREAD_SAFE_METHOD_ + + for (int i = 0; i < scripts.size(); i++) { + + p_list->push_back(PropertyInfo(Variant::OBJECT, "script_" + String::chr('a' + i), PROPERTY_HINT_RESOURCE_TYPE, "Script")); + } + + if (scripts.size() < 25) { + + p_list->push_back(PropertyInfo(Variant::OBJECT, "script_" + String::chr('a' + (scripts.size())), PROPERTY_HINT_RESOURCE_TYPE, "Script")); + } +} + +void MultiScript::set_script(int p_idx, const Ref<Script> &p_script) { + + _THREAD_SAFE_METHOD_ + + ERR_FAIL_INDEX(p_idx, scripts.size()); + ERR_FAIL_COND(p_script.is_null()); + + scripts[p_idx] = p_script; + Ref<Script> s = p_script; + + for (Map<Object *, MultiScriptInstance *>::Element *E = instances.front(); E; E = E->next()) { + + MultiScriptInstance *msi = E->get(); + ScriptInstance *si = msi->instances[p_idx]; + if (si) { + msi->instances[p_idx] = NULL; + memdelete(si); + } + + if (p_script->can_instance()) + msi->instances[p_idx] = s->instance_create(msi->object); + } +} + +Ref<Script> MultiScript::get_script(int p_idx) const { + + _THREAD_SAFE_METHOD_ + + ERR_FAIL_INDEX_V(p_idx, scripts.size(), Ref<Script>()); + + return scripts[p_idx]; +} +void MultiScript::add_script(const Ref<Script> &p_script) { + + _THREAD_SAFE_METHOD_ + ERR_FAIL_COND(p_script.is_null()); + Multi *script_owner = memnew(Multi); + script_instances.push_back(script_owner); + scripts.push_back(p_script); + Ref<Script> s = p_script; + + for (Map<Object *, MultiScriptInstance *>::Element *E = instances.front(); E; E = E->next()) { + + MultiScriptInstance *msi = E->get(); + + if (p_script->can_instance()) { + script_owner->real_owner = msi->object; + msi->instances.push_back(s->instance_create(script_owner)); + } else { + msi->instances.push_back(NULL); + } + + msi->object->_change_notify(); + } + + _change_notify(); +} + +void MultiScript::remove_script(int p_idx) { + + _THREAD_SAFE_METHOD_ + + ERR_FAIL_INDEX(p_idx, scripts.size()); + + scripts.remove(p_idx); + script_instances.remove(p_idx); + + for (Map<Object *, MultiScriptInstance *>::Element *E = instances.front(); E; E = E->next()) { + + MultiScriptInstance *msi = E->get(); + ScriptInstance *si = msi->instances[p_idx]; + msi->instances.remove(p_idx); + if (si) { + memdelete(si); + } + + msi->object->_change_notify(); + } +} + +void MultiScript::remove_instance(Object *p_object) { + + _THREAD_SAFE_METHOD_ + instances.erase(p_object); +} + +bool MultiScript::can_instance() const { + + return true; +} + +StringName MultiScript::get_instance_base_type() const { + + return StringName(); +} +ScriptInstance *MultiScript::instance_create(Object *p_this) { + + _THREAD_SAFE_METHOD_ + MultiScriptInstance *msi = memnew(MultiScriptInstance); + msi->object = p_this; + msi->owner = this; + + for (int i = 0; i < scripts.size(); i++) { + + ScriptInstance *si; + + if (scripts[i]->can_instance()) { + script_instances[i]->real_owner = p_this; + si = scripts[i]->instance_create(script_instances[i]); + } else { + si = NULL; + } + + msi->instances.push_back(si); + } + + instances[p_this] = msi; + p_this->_change_notify(); + return msi; +} +bool MultiScript::instance_has(const Object *p_this) const { + + _THREAD_SAFE_METHOD_ + return instances.has((Object *)p_this); +} + +bool MultiScript::has_source_code() const { + + return false; +} +String MultiScript::get_source_code() const { + + return ""; +} +void MultiScript::set_source_code(const String &p_code) { +} +Error MultiScript::reload(bool p_keep_state) { + + for (int i = 0; i < scripts.size(); i++) + scripts[i]->reload(p_keep_state); + + return OK; +} + +String MultiScript::get_node_type() const { + + return ""; +} + +void MultiScript::_bind_methods() { +} + +ScriptLanguage *MultiScript::get_language() const { + + return MultiScriptLanguage::get_singleton(); +} + +/////////////// + +MultiScript::MultiScript() { +} + +MultiScript::~MultiScript() { + for (int i = 0; i < script_instances.size(); i++) { + memdelete(script_instances[i]); + } + + script_instances.resize(0); +} + +Ref<Script> MultiScript::get_base_script() const { + Ref<MultiScript> base_script; + return base_script; +} + +bool MultiScript::has_method(const StringName &p_method) const { + for (int i = 0; i < scripts.size(); i++) { + if (scripts[i]->has_method(p_method)) { + return true; + } + } + return false; +} + +MethodInfo MultiScript::get_method_info(const StringName &p_method) const { + for (int i = 0; i < scripts.size(); i++) { + if (scripts[i]->has_method(p_method)) { + return scripts[i]->get_method_info(p_method); + } + } + return MethodInfo(); +} + +bool MultiScript::has_script_signal(const StringName &p_signal) const { + for (int i = 0; i < scripts.size(); i++) { + if (scripts[i]->has_script_signal(p_signal)) { + return true; + } + } + return false; +} + +void MultiScript::get_script_signal_list(List<MethodInfo> *r_signals) const { + for (int i = 0; i < scripts.size(); i++) { + scripts[i]->get_script_signal_list(r_signals); + } +} + +bool MultiScript::get_property_default_value(const StringName &p_property, Variant &r_value) const { + for (int i = 0; i < scripts.size(); i++) { + + if (scripts[i]->get_property_default_value(p_property, r_value)) { + return true; + } + } + return false; +} + +void MultiScript::get_script_method_list(List<MethodInfo> *p_list) const { + for (int i = 0; i < scripts.size(); i++) { + scripts[i]->get_script_method_list(p_list); + } +} + +void MultiScript::get_script_property_list(List<PropertyInfo> *p_list) const { + for (int i = 0; i < scripts.size(); i++) { + scripts[i]->get_script_property_list(p_list); + } +} + +void MultiScript::update_exports() { + for (int i = 0; i < scripts.size(); i++) { + scripts[i]->update_exports(); + } +} + +MultiScriptLanguage *MultiScriptLanguage::singleton = NULL; + +MultiScriptLanguage *MultiScriptLanguage::get_singleton() { + return singleton; +} + +String MultiScriptLanguage::get_name() const { + return "MultiScript"; +} + +void MultiScriptLanguage::init() {} + +String MultiScriptLanguage::get_type() const { + return "MultiScript"; +} + +String MultiScriptLanguage::get_extension() const { + return ""; +} + +Error MultiScriptLanguage::execute_file(const String &p_path) { + return OK; +} + +void MultiScriptLanguage::finish() {} + +void MultiScriptLanguage::get_reserved_words(List<String> *p_words) const {} + +void MultiScriptLanguage::get_comment_delimiters(List<String> *p_delimiters) const {} + +void MultiScriptLanguage::get_string_delimiters(List<String> *p_delimiters) const {} + +Ref<Script> MultiScriptLanguage::get_template(const String &p_class_name, const String &p_base_class_name) const { + MultiScript *s = memnew(MultiScript); + s->base_class_name = p_base_class_name; + return Ref<MultiScript>(s); +} + +bool MultiScriptLanguage::validate(const String &p_script, int &r_line_error, int &r_col_error, String &r_test_error, const String &p_path, List<String> *r_fn) const { + return true; +} + +Script *MultiScriptLanguage::create_script() const { + return memnew(MultiScript); +} + +bool MultiScriptLanguage::has_named_classes() const { + return false; +} + +int MultiScriptLanguage::find_function(const String &p_function, const String &p_code) const { + return -1; +} + +String MultiScriptLanguage::make_function(const String &p_class, const String &p_name, const PoolStringArray &p_args) const { + return ""; +} + +String MultiScriptLanguage::debug_get_error() const { + return ""; +} + +int MultiScriptLanguage::debug_get_stack_level_count() const { + return 0; +} + +int MultiScriptLanguage::debug_get_stack_level_line(int p_level) const { + return 0; +} + +String MultiScriptLanguage::debug_get_stack_level_function(int p_level) const { + return ""; +} + +String MultiScriptLanguage::debug_get_stack_level_source(int p_level) const { + return ""; +} + +void MultiScriptLanguage::debug_get_stack_level_locals(int p_level, List<String> *p_locals, List<Variant> *p_values, int p_max_subitems, int p_max_depth) {} + +void MultiScriptLanguage::debug_get_stack_level_members(int p_level, List<String> *p_members, List<Variant> *p_values, int p_max_subitems, int p_max_depth) {} + +void MultiScriptLanguage::debug_get_globals(List<String> *p_locals, List<Variant> *p_values, int p_max_subitems, int p_max_depth) {} + +String MultiScriptLanguage::debug_parse_stack_level_expression(int p_level, const String &p_expression, int p_max_subitems, int p_max_depth) { + return ""; +} + +void MultiScriptLanguage::get_recognized_extensions(List<String> *p_extensions) const {} + +void MultiScriptLanguage::get_public_functions(List<MethodInfo> *p_functions) const {} + +MultiScriptLanguage::MultiScriptLanguage() { + singleton = this; +} + +MultiScriptLanguage::~MultiScriptLanguage() {} + +void MultiScriptLanguage::auto_indent_code(String &p_code, int p_from_line, int p_to_line) const { +} + +void MultiScriptLanguage::add_global_constant(const StringName &p_variable, const Variant &p_value) { +} + +void MultiScriptLanguage::reload_all_scripts() { +} + +void MultiScriptLanguage::reload_tool_script(const Ref<Script> &p_script, bool p_soft_reload) { +} + +void MultiScriptLanguage::get_public_constants(List<Pair<String, Variant> > *p_constants) const { +} + +void MultiScriptLanguage::profiling_start() { +} + +void MultiScriptLanguage::profiling_stop() { +} + +int MultiScriptLanguage::profiling_get_accumulated_data(ScriptLanguage::ProfilingInfo *p_info_arr, int p_info_max) { + return 0; +} + +int MultiScriptLanguage::profiling_get_frame_data(ScriptLanguage::ProfilingInfo *p_info_arr, int p_info_max) { + return 0; +} + +void Multi::_bind_methods() { + // ClassDB::bind_method("call", &Multi::call); + // ClassDB::bind_method("call_multilevel", &Multi::call_multilevel); + // ClassDB::bind_method("call_multilevel_reversed", &Multi::call_multilevel_reversed); +} + +Variant Multi::call(const StringName &p_method, const Variant **p_args, int p_argcount, Variant::CallError &r_error) { + if (real_owner) + return real_owner->call(p_method, p_args, p_argcount, r_error); + return Variant(); +} + +void Multi::call_multilevel(const StringName &p_method, const Variant **p_args, int p_argcount) { + if (real_owner) + real_owner->call_multilevel(p_method, p_args, p_argcount); +} + +void Multi::call_multilevel_reversed(const StringName &p_method, const Variant **p_args, int p_argcount) { + if (real_owner) + real_owner->call_multilevel_reversed(p_method, p_args, p_argcount); +} diff --git a/modules/multiscript/multiscript.h b/modules/multiscript/multiscript.h new file mode 100644 index 0000000000..7ec1d5402f --- /dev/null +++ b/modules/multiscript/multiscript.h @@ -0,0 +1,200 @@ +/*************************************************************************/ +/* multiscript.h */ +/*************************************************************************/ +/* This file is part of: */ +/* GODOT ENGINE */ +/* http://www.godotengine.org */ +/*************************************************************************/ +/* Copyright (c) 2007-2017 Juan Linietsky, Ariel Manzur. */ +/* Copyright (c) 2014-2017 Godot Engine contributors (cf. AUTHORS.md) */ +/* */ +/* Permission is hereby granted, free of charge, to any person obtaining */ +/* a copy of this software and associated documentation files (the */ +/* "Software"), to deal in the Software without restriction, including */ +/* without limitation the rights to use, copy, modify, merge, publish, */ +/* distribute, sublicense, and/or sell copies of the Software, and to */ +/* permit persons to whom the Software is furnished to do so, subject to */ +/* the following conditions: */ +/* */ +/* The above copyright notice and this permission notice shall be */ +/* included in all copies or substantial portions of the Software. */ +/* */ +/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */ +/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */ +/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/ +/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */ +/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */ +/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ +/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +/*************************************************************************/ +#ifndef MULTISCRIPT_H +#define MULTISCRIPT_H + +#include "os/thread_safe.h" +#include "script_language.h" + +class MultiScript; + +class Multi : public Object { + GDCLASS(Multi, Object) + + friend class MultiScript; + + Object *real_owner; + +public: + static void _bind_methods(); + + virtual Variant call(const StringName &p_method, const Variant **p_args, int p_argcount, Variant::CallError &r_error); + virtual void call_multilevel(const StringName &p_method, const Variant **p_args, int p_argcount); + virtual void call_multilevel_reversed(const StringName &p_method, const Variant **p_args, int p_argcount); +}; + +class MultiScriptInstance : public ScriptInstance { + friend class MultiScript; + mutable Vector<ScriptInstance *> instances; + Object *object; + mutable MultiScript *owner; + +public: + virtual bool set(const StringName &p_name, const Variant &p_value); + virtual bool get(const StringName &p_name, Variant &r_ret) const; + virtual void get_property_list(List<PropertyInfo> *p_properties) const; + + virtual void get_method_list(List<MethodInfo> *p_list) const; + virtual bool has_method(const StringName &p_method) const; + virtual Variant call(const StringName &p_method, const Variant **p_args, int p_argcount, Variant::CallError &r_error); + virtual void call_multilevel(const StringName &p_method, const Variant **p_args, int p_argcount); + virtual void notification(int p_notification); + + virtual Ref<Script> get_script() const; + + virtual ScriptLanguage *get_language(); + virtual ~MultiScriptInstance(); + + // ScriptInstance interface +public: + Variant::Type get_property_type(const StringName &p_name, bool *r_is_valid) const; + RPCMode get_rpc_mode(const StringName &p_method) const; + RPCMode get_rset_mode(const StringName &p_variable) const; +}; + +class MultiScript : public Script { + + _THREAD_SAFE_CLASS_ + friend class MultiScriptInstance; + friend class MultiScriptLanguage; + GDCLASS(MultiScript, Script) + + StringName base_class_name; + + Vector<Ref<Script> > scripts; + Vector<Multi *> script_instances; + + Map<Object *, MultiScriptInstance *> instances; + +protected: + bool _set(const StringName &p_name, const Variant &p_value); + bool _get(const StringName &p_name, Variant &r_ret) const; + void _get_property_list(List<PropertyInfo> *p_list) const; + + static void _bind_methods(); + +public: + void remove_instance(Object *p_object); + virtual bool can_instance() const; + + virtual StringName get_instance_base_type() const; + virtual ScriptInstance *instance_create(Object *p_this); + virtual bool instance_has(const Object *p_this) const; + + virtual bool has_source_code() const; + virtual String get_source_code() const; + virtual void set_source_code(const String &p_code); + virtual Error reload(bool p_keep_state = false); + + virtual bool is_tool() const; + + virtual String get_node_type() const; + + void set_script(int p_idx, const Ref<Script> &p_script); + Ref<Script> get_script(int p_idx) const; + void remove_script(int p_idx); + void add_script(const Ref<Script> &p_script); + + virtual ScriptLanguage *get_language() const; + + MultiScript(); + ~MultiScript(); + + virtual Ref<Script> get_base_script() const; + virtual bool has_method(const StringName &p_method) const; + virtual MethodInfo get_method_info(const StringName &p_method) const; + virtual bool has_script_signal(const StringName &p_signal) const; + virtual void get_script_signal_list(List<MethodInfo> *r_signals) const; + virtual bool get_property_default_value(const StringName &p_property, Variant &r_value) const; + virtual void get_script_method_list(List<MethodInfo> *p_list) const; + virtual void get_script_property_list(List<PropertyInfo> *p_list) const; + virtual void update_exports(); +}; + +class MultiScriptLanguage : public ScriptLanguage { + + static MultiScriptLanguage *singleton; + +public: + static _FORCE_INLINE_ MultiScriptLanguage *get_singleton(); + virtual String get_name() const; + + /* LANGUAGE FUNCTIONS */ + virtual void init(); + virtual String get_type() const; + virtual String get_extension() const; + virtual Error execute_file(const String &p_path); + virtual void finish(); + + /* EDITOR FUNCTIONS */ + virtual void get_reserved_words(List<String> *p_words) const; + virtual void get_comment_delimiters(List<String> *p_delimiters) const; + virtual void get_string_delimiters(List<String> *p_delimiters) const; + virtual Ref<Script> get_template(const String &p_class_name, const String &p_base_class_name) const; + virtual bool validate(const String &p_script, int &r_line_error, int &r_col_error, String &r_test_error, const String &p_path = "", List<String> *r_fn = NULL) const; + virtual Script *create_script() const; + virtual bool has_named_classes() const; + virtual int find_function(const String &p_function, const String &p_code) const; + virtual String make_function(const String &p_class, const String &p_name, const PoolStringArray &p_args) const; + + /* DEBUGGER FUNCTIONS */ + + virtual String debug_get_error() const; + virtual int debug_get_stack_level_count() const; + virtual int debug_get_stack_level_line(int p_level) const; + virtual String debug_get_stack_level_function(int p_level) const; + virtual String debug_get_stack_level_source(int p_level) const; + virtual void debug_get_stack_level_locals(int p_level, List<String> *p_locals, List<Variant> *p_values, int p_max_subitems = -1, int p_max_depth = -1); + virtual void debug_get_stack_level_members(int p_level, List<String> *p_members, List<Variant> *p_values, int p_max_subitems = -1, int p_max_depth = -1); + virtual void debug_get_globals(List<String> *p_locals, List<Variant> *p_values, int p_max_subitems = -1, int p_max_depth = -1); + virtual String debug_parse_stack_level_expression(int p_level, const String &p_expression, int p_max_subitems = -1, int p_max_depth = -1); + + /* LOADER FUNCTIONS */ + + virtual void get_recognized_extensions(List<String> *p_extensions) const; + virtual void get_public_functions(List<MethodInfo> *p_functions) const; + + MultiScriptLanguage(); + virtual ~MultiScriptLanguage(); + + // ScriptLanguage interface +public: + void auto_indent_code(String &p_code, int p_from_line, int p_to_line) const; + void add_global_constant(const StringName &p_variable, const Variant &p_value); + void reload_all_scripts(); + void reload_tool_script(const Ref<Script> &p_script, bool p_soft_reload); + void get_public_constants(List<Pair<String, Variant> > *p_constants) const; + void profiling_start(); + void profiling_stop(); + int profiling_get_accumulated_data(ProfilingInfo *p_info_arr, int p_info_max); + int profiling_get_frame_data(ProfilingInfo *p_info_arr, int p_info_max); +}; + +#endif // MULTISCRIPT_H diff --git a/modules/multiscript/register_types.cpp b/modules/multiscript/register_types.cpp new file mode 100644 index 0000000000..8170a2d9c1 --- /dev/null +++ b/modules/multiscript/register_types.cpp @@ -0,0 +1,51 @@ +/*************************************************************************/ +/* register_types.cpp */ +/*************************************************************************/ +/* This file is part of: */ +/* GODOT ENGINE */ +/* http://www.godotengine.org */ +/*************************************************************************/ +/* Copyright (c) 2007-2017 Juan Linietsky, Ariel Manzur. */ +/* Copyright (c) 2014-2017 Godot Engine contributors (cf. AUTHORS.md) */ +/* */ +/* Permission is hereby granted, free of charge, to any person obtaining */ +/* a copy of this software and associated documentation files (the */ +/* "Software"), to deal in the Software without restriction, including */ +/* without limitation the rights to use, copy, modify, merge, publish, */ +/* distribute, sublicense, and/or sell copies of the Software, and to */ +/* permit persons to whom the Software is furnished to do so, subject to */ +/* the following conditions: */ +/* */ +/* The above copyright notice and this permission notice shall be */ +/* included in all copies or substantial portions of the Software. */ +/* */ +/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */ +/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */ +/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/ +/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */ +/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */ +/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ +/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +/*************************************************************************/ +#include "register_types.h" + +#include "multiscript.h" + +#include "core/script_language.h" + +static MultiScriptLanguage *script_multi_script = NULL; + +void register_multiscript_types() { + script_multi_script = memnew(MultiScriptLanguage); + ScriptServer::register_language(script_multi_script); + ClassDB::register_class<MultiScript>(); + + // ClassDB::register_class<Multi>(); +} + +void unregister_multiscript_types() { + if (script_multi_script) { + ScriptServer::unregister_language(script_multi_script); + memdelete(script_multi_script); + } +} diff --git a/modules/multiscript/register_types.h b/modules/multiscript/register_types.h new file mode 100644 index 0000000000..b18d1adff2 --- /dev/null +++ b/modules/multiscript/register_types.h @@ -0,0 +1,31 @@ +/*************************************************************************/ +/* register_types.h */ +/*************************************************************************/ +/* This file is part of: */ +/* GODOT ENGINE */ +/* http://www.godotengine.org */ +/*************************************************************************/ +/* Copyright (c) 2007-2017 Juan Linietsky, Ariel Manzur. */ +/* Copyright (c) 2014-2017 Godot Engine contributors (cf. AUTHORS.md) */ +/* */ +/* Permission is hereby granted, free of charge, to any person obtaining */ +/* a copy of this software and associated documentation files (the */ +/* "Software"), to deal in the Software without restriction, including */ +/* without limitation the rights to use, copy, modify, merge, publish, */ +/* distribute, sublicense, and/or sell copies of the Software, and to */ +/* permit persons to whom the Software is furnished to do so, subject to */ +/* the following conditions: */ +/* */ +/* The above copyright notice and this permission notice shall be */ +/* included in all copies or substantial portions of the Software. */ +/* */ +/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */ +/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */ +/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/ +/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */ +/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */ +/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ +/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +/*************************************************************************/ +void register_multiscript_types(); +void unregister_multiscript_types(); diff --git a/modules/visual_script/visual_script.cpp b/modules/visual_script/visual_script.cpp index 53521c55a7..aec60391d3 100644 --- a/modules/visual_script/visual_script.cpp +++ b/modules/visual_script/visual_script.cpp @@ -1073,6 +1073,18 @@ void VisualScript::get_script_property_list(List<PropertyInfo> *p_list) const { } } +int VisualScript::get_member_line(const StringName &p_member) const { +#ifdef TOOLS_ENABLED + if (has_function(p_member)) { + for (Map<int, Function::NodeData>::Element *E = functions[p_member].nodes.front(); E; E = E->next()) { + if (E->get().node->cast_to<VisualScriptFunction>()) + return E->key(); + } + } +#endif + return -1; +} + #ifdef TOOLS_ENABLED bool VisualScript::are_subnodes_edited() const { diff --git a/modules/visual_script/visual_script.h b/modules/visual_script/visual_script.h index ee8ed2c965..273a819611 100644 --- a/modules/visual_script/visual_script.h +++ b/modules/visual_script/visual_script.h @@ -356,6 +356,8 @@ public: virtual void get_script_property_list(List<PropertyInfo> *p_list) const; + virtual int get_member_line(const StringName &p_member) const; + #ifdef TOOLS_ENABLED virtual bool are_subnodes_edited() const; #endif diff --git a/modules/visual_script/visual_script_editor.cpp b/modules/visual_script/visual_script_editor.cpp index ee5bd66aa2..f1816a762e 100644 --- a/modules/visual_script/visual_script_editor.cpp +++ b/modules/visual_script/visual_script_editor.cpp @@ -1017,7 +1017,7 @@ void VisualScriptEditor::_member_button(Object *p_item, int p_column, int p_butt } Rect2 pos = members->get_item_rect(ti); - new_function_menu->set_pos(members->get_global_pos() + pos.pos + Vector2(0, pos.size.y)); + new_function_menu->set_position(members->get_global_position() + pos.pos + Vector2(0, pos.size.y)); new_function_menu->popup(); return; } else if (p_button == 0) { @@ -2153,7 +2153,7 @@ void VisualScriptEditor::goto_line(int p_line, bool p_with_error) { _update_graph(); _update_members(); - call_deferred("_center_on_node", p_line); //editor might be just created and size might not exist yet + call_deferred("call_deferred", "_center_on_node", p_line); //editor might be just created and size might not exist yet return; } @@ -2163,6 +2163,12 @@ void VisualScriptEditor::goto_line(int p_line, bool p_with_error) { void VisualScriptEditor::trim_trailing_whitespace() { } +void VisualScriptEditor::convert_indent_to_spaces() { +} + +void VisualScriptEditor::convert_indent_to_tabs() { +} + void VisualScriptEditor::ensure_focus() { graph->grab_focus(); @@ -2192,18 +2198,6 @@ void VisualScriptEditor::get_breakpoints(List<int> *p_breakpoints) { } } -bool VisualScriptEditor::goto_method(const String &p_method) { - - if (!script->has_function(p_method)) - return false; - - edited_func = p_method; - selected = edited_func; - _update_members(); - _update_graph(); - return true; -} - void VisualScriptEditor::add_callback(const String &p_function, PoolStringArray p_args) { if (script->has_function(p_function)) { @@ -2517,7 +2511,7 @@ void VisualScriptEditor::_graph_connect_to_empty(const String &p_from, int p_fro port_action_pos = p_release_pos; port_action_popup->set_size(Size2(1, 1)); - port_action_popup->set_pos(graph->get_global_pos() + p_release_pos); + port_action_popup->set_position(graph->get_global_position() + p_release_pos); port_action_popup->popup(); } @@ -2806,7 +2800,7 @@ void VisualScriptEditor::_default_value_edited(Node *p_button, int p_id, int p_i existing = Variant::construct(pinfo.type, &existingp, 1, ce, false); } - default_value_edit->set_pos(p_button->cast_to<Control>()->get_global_pos() + Vector2(0, p_button->cast_to<Control>()->get_size().y)); + default_value_edit->set_position(p_button->cast_to<Control>()->get_global_position() + Vector2(0, p_button->cast_to<Control>()->get_size().y)); default_value_edit->set_size(Size2(1, 1)); if (default_value_edit->edit(NULL, pinfo.name, pinfo.type, existing, pinfo.hint, pinfo.hint_string)) { if (pinfo.hint == PROPERTY_HINT_MULTILINE_TEXT) diff --git a/modules/visual_script/visual_script_editor.h b/modules/visual_script/visual_script_editor.h index 7322da5cfb..1fd97cc1bc 100644 --- a/modules/visual_script/visual_script_editor.h +++ b/modules/visual_script/visual_script_editor.h @@ -240,11 +240,12 @@ public: virtual void set_edit_state(const Variant &p_state); virtual void goto_line(int p_line, bool p_with_error = false); virtual void trim_trailing_whitespace(); + virtual void convert_indent_to_spaces(); + virtual void convert_indent_to_tabs(); virtual void ensure_focus(); virtual void tag_saved_version(); virtual void reload(bool p_soft); virtual void get_breakpoints(List<int> *p_breakpoints); - virtual bool goto_method(const String &p_method); virtual void add_callback(const String &p_function, PoolStringArray p_args); virtual void update_settings(); virtual void set_debugger_active(bool p_active); diff --git a/modules/webp/image_loader_webp.cpp b/modules/webp/image_loader_webp.cpp index 39c8f812ac..889eac71a7 100644 --- a/modules/webp/image_loader_webp.cpp +++ b/modules/webp/image_loader_webp.cpp @@ -87,9 +87,11 @@ static Image _webp_lossy_unpack(const PoolVector<uint8_t> &p_buffer) { ERR_FAIL_V(Image()); } - //print_line("width: "+itos(features.width)); - //print_line("height: "+itos(features.height)); - //print_line("alpha: "+itos(features.has_alpha)); + /* + print_line("width: "+itos(features.width)); + print_line("height: "+itos(features.height)); + print_line("alpha: "+itos(features.has_alpha)); + */ PoolVector<uint8_t> dst_image; int datasize = features.width * features.height * (features.has_alpha ? 4 : 3); @@ -130,9 +132,11 @@ Error ImageLoaderWEBP::load_image(Image *p_image, FileAccess *f) { ERR_FAIL_V(ERR_FILE_CORRUPT); } + /* print_line("width: " + itos(features.width)); print_line("height: " + itos(features.height)); print_line("alpha: " + itos(features.has_alpha)); + */ src_w = PoolVector<uint8_t>::Write(); diff --git a/platform/android/SCsub b/platform/android/SCsub index a6da33e7bf..7fb3c876be 100644 --- a/platform/android/SCsub +++ b/platform/android/SCsub @@ -52,13 +52,13 @@ if len(env.android_maven_repos) > 0: gradle_maven_repos_text += "" for x in env.android_maven_repos: gradle_maven_repos_text += "\tmaven {\n" - gradle_maven_repos_text += "\t\t" + x + "\n" + gradle_maven_repos_text += "\t" + x + "\n" gradle_maven_repos_text += "\t}\n" gradle_maven_dependencies_text = "" for x in env.android_dependencies: - gradle_maven_dependencies_text += x + "\n" + gradle_maven_dependencies_text += x + "\n\t" gradle_java_dirs_text = "" @@ -98,7 +98,7 @@ targetSdk = 23 for x in env.android_default_config: if x.startswith("minSdkVersion") and int(x.split(" ")[-1]) < minSdk: x = "minSdkVersion " + str(minSdk) - if x.startswith("targetSdkVersion") and int(x.split()[-1]) > targetSdk: + if x.startswith("targetSdkVersion") and int(x.split(" ")[-1]) > targetSdk: x = "targetSdkVersion " + str(targetSdk) gradle_default_config_text += x + "\n\t\t" diff --git a/platform/android/export/export.cpp b/platform/android/export/export.cpp index 78c28ede50..72d665329e 100644 --- a/platform/android/export/export.cpp +++ b/platform/android/export/export.cpp @@ -3532,6 +3532,13 @@ public: devices_changed = true; quit_request = false; } + + ~EditorExportAndroid() { + quit_request = true; + Thread::wait_to_finish(device_thread); + memdelete(device_lock); + memdelete(device_thread); + } }; void register_android_exporter() { diff --git a/platform/android/os_android.cpp b/platform/android/os_android.cpp index 0cdc2bbddf..6772964c2f 100644 --- a/platform/android/os_android.cpp +++ b/platform/android/os_android.cpp @@ -245,7 +245,7 @@ bool OS_Android::is_mouse_grab_enabled() const { return false; } -Point2 OS_Android::get_mouse_pos() const { +Point2 OS_Android::get_mouse_position() const { return Point2(); } @@ -414,7 +414,7 @@ void OS_Android::process_touch(int p_what, int p_pointer, const Vector<TouchPos> ev.mouse_button.y = touch[0].pos.y; ev.mouse_button.global_x = touch[0].pos.x; ev.mouse_button.global_y = touch[0].pos.y; - input->set_mouse_pos(Point2(touch[0].pos.x, touch[0].pos.y)); + input->set_mouse_position(Point2(touch[0].pos.x, touch[0].pos.y)); last_mouse = touch[0].pos; input->parse_input_event(ev); } @@ -441,7 +441,7 @@ void OS_Android::process_touch(int p_what, int p_pointer, const Vector<TouchPos> ev.mouse_motion.button_mask = BUTTON_MASK_LEFT; ev.mouse_motion.x = p_points[0].pos.x; ev.mouse_motion.y = p_points[0].pos.y; - input->set_mouse_pos(Point2(ev.mouse_motion.x, ev.mouse_motion.y)); + input->set_mouse_position(Point2(ev.mouse_motion.x, ev.mouse_motion.y)); ev.mouse_motion.speed_x = input->get_last_mouse_speed().x; ev.mouse_motion.speed_y = input->get_last_mouse_speed().y; ev.mouse_motion.relative_x = p_points[0].pos.x - last_mouse.x; @@ -493,7 +493,7 @@ void OS_Android::process_touch(int p_what, int p_pointer, const Vector<TouchPos> ev.mouse_button.y = touch[0].pos.y; ev.mouse_button.global_x = touch[0].pos.x; ev.mouse_button.global_y = touch[0].pos.y; - input->set_mouse_pos(Point2(touch[0].pos.x, touch[0].pos.y)); + input->set_mouse_position(Point2(touch[0].pos.x, touch[0].pos.y)); input->parse_input_event(ev); for (int i = 0; i < touch.size(); i++) { diff --git a/platform/android/os_android.h b/platform/android/os_android.h index 87ab0bb757..f1da2867f0 100644 --- a/platform/android/os_android.h +++ b/platform/android/os_android.h @@ -171,7 +171,7 @@ public: virtual void set_mouse_show(bool p_show); virtual void set_mouse_grab(bool p_grab); virtual bool is_mouse_grab_enabled() const; - virtual Point2 get_mouse_pos() const; + virtual Point2 get_mouse_position() const; virtual int get_mouse_button_state() const; virtual void set_window_title(const String &p_title); diff --git a/platform/bb10/os_bb10.cpp b/platform/bb10/os_bb10.cpp index 0bfeff80da..b571d1640c 100644 --- a/platform/bb10/os_bb10.cpp +++ b/platform/bb10/os_bb10.cpp @@ -217,7 +217,7 @@ bool OSBB10::is_mouse_grab_enabled() const { //*sigh* technology has evolved so much since i was a kid.. return false; } -Point2 OSBB10::get_mouse_pos() const { +Point2 OSBB10::get_mouse_position() const { return Point2(); } @@ -348,7 +348,7 @@ void OSBB10::handle_screen_event(bps_event_t *event) { ievent.device = 0; ievent.mouse_motion.x = ievent.mouse_motion.global_x = mpos.x; ievent.mouse_motion.y = ievent.mouse_motion.global_y = mpos.y; - input->set_mouse_pos(Point2(ievent.mouse_motion.x, ievent.mouse_motion.y)); + input->set_mouse_position(Point2(ievent.mouse_motion.x, ievent.mouse_motion.y)); ievent.mouse_motion.speed_x = input->get_last_mouse_speed().x; ievent.mouse_motion.speed_y = input->get_last_mouse_speed().y; ievent.mouse_motion.relative_x = mrel.x; diff --git a/platform/bb10/os_bb10.h b/platform/bb10/os_bb10.h index 42781c85d8..91149b6f68 100644 --- a/platform/bb10/os_bb10.h +++ b/platform/bb10/os_bb10.h @@ -113,7 +113,7 @@ public: virtual void set_mouse_show(bool p_show); virtual void set_mouse_grab(bool p_grab); virtual bool is_mouse_grab_enabled() const; - virtual Point2 get_mouse_pos() const; + virtual Point2 get_mouse_position() const; virtual int get_mouse_button_state() const; virtual void set_window_title(const String &p_title); diff --git a/platform/haiku/haiku_direct_window.cpp b/platform/haiku/haiku_direct_window.cpp index bb2495d99c..fb6d9afd85 100644 --- a/platform/haiku/haiku_direct_window.cpp +++ b/platform/haiku/haiku_direct_window.cpp @@ -215,7 +215,7 @@ void HaikuDirectWindow::HandleMouseMoved(BMessage *message) { motion_event.mouse_motion.button_mask = GetMouseButtonState(buttons); motion_event.mouse_motion.x = pos.x; motion_event.mouse_motion.y = pos.y; - input->set_mouse_pos(pos); + input->set_mouse_position(pos); motion_event.mouse_motion.global_x = pos.x; motion_event.mouse_motion.global_y = pos.y; motion_event.mouse_motion.speed_x = input->get_last_mouse_speed().x; diff --git a/platform/haiku/os_haiku.cpp b/platform/haiku/os_haiku.cpp index 38aa6ae74d..3131f2bf1e 100644 --- a/platform/haiku/os_haiku.cpp +++ b/platform/haiku/os_haiku.cpp @@ -207,7 +207,7 @@ void OS_Haiku::swap_buffers() { context_gl->swap_buffers(); } -Point2 OS_Haiku::get_mouse_pos() const { +Point2 OS_Haiku::get_mouse_position() const { return window->GetLastMousePosition(); } diff --git a/platform/haiku/os_haiku.h b/platform/haiku/os_haiku.h index 1d6c31e39d..83e44734a6 100644 --- a/platform/haiku/os_haiku.h +++ b/platform/haiku/os_haiku.h @@ -89,7 +89,7 @@ public: virtual void make_rendering_thread(); virtual void swap_buffers(); - virtual Point2 get_mouse_pos() const; + virtual Point2 get_mouse_position() const; virtual int get_mouse_button_state() const; virtual void set_cursor_shape(CursorShape p_shape); diff --git a/platform/iphone/os_iphone.cpp b/platform/iphone/os_iphone.cpp index 0f693cd2cc..bc25afabea 100644 --- a/platform/iphone/os_iphone.cpp +++ b/platform/iphone/os_iphone.cpp @@ -233,7 +233,7 @@ void OSIPhone::mouse_button(int p_idx, int p_x, int p_y, bool p_pressed, bool p_ //mouse_list.pressed[p_idx] = p_pressed; - input->set_mouse_pos(Point2(ev.mouse_motion.x, ev.mouse_motion.y)); + input->set_mouse_position(Point2(ev.mouse_motion.x, ev.mouse_motion.y)); ev.mouse_button.button_index = BUTTON_LEFT; ev.mouse_button.doubleclick = p_doubleclick; ev.mouse_button.pressed = p_pressed; @@ -276,7 +276,7 @@ void OSIPhone::mouse_move(int p_idx, int p_prev_x, int p_prev_y, int p_x, int p_ ev.mouse_motion.relative_y = ev.mouse_motion.y - p_prev_x; }; - input->set_mouse_pos(Point2(ev.mouse_motion.x, ev.mouse_motion.y)); + input->set_mouse_position(Point2(ev.mouse_motion.x, ev.mouse_motion.y)); ev.mouse_motion.speed_x = input->get_last_mouse_speed().x; ev.mouse_motion.speed_y = input->get_last_mouse_speed().y; ev.mouse_motion.button_mask = 1; // pressed @@ -393,7 +393,7 @@ bool OSIPhone::is_mouse_grab_enabled() const { return true; }; -Point2 OSIPhone::get_mouse_pos() const { +Point2 OSIPhone::get_mouse_position() const { return Point2(); }; diff --git a/platform/iphone/os_iphone.h b/platform/iphone/os_iphone.h index b5fe93240a..754dea073f 100644 --- a/platform/iphone/os_iphone.h +++ b/platform/iphone/os_iphone.h @@ -150,7 +150,7 @@ public: virtual void set_mouse_show(bool p_show); virtual void set_mouse_grab(bool p_grab); virtual bool is_mouse_grab_enabled() const; - virtual Point2 get_mouse_pos() const; + virtual Point2 get_mouse_position() const; virtual int get_mouse_button_state() const; virtual void set_window_title(const String &p_title); diff --git a/platform/javascript/os_javascript.cpp b/platform/javascript/os_javascript.cpp index 84312fd059..71754502cb 100644 --- a/platform/javascript/os_javascript.cpp +++ b/platform/javascript/os_javascript.cpp @@ -332,9 +332,9 @@ bool OS_JavaScript::is_mouse_grab_enabled() const { return false; } -Point2 OS_JavaScript::get_mouse_pos() const { +Point2 OS_JavaScript::get_mouse_position() const { - return input->get_mouse_pos(); + return input->get_mouse_position(); } int OS_JavaScript::get_mouse_button_state() const { @@ -522,7 +522,7 @@ void OS_JavaScript::push_input(const InputEvent &p_ev) { InputEvent ev = p_ev; if (ev.type == InputEvent::MOUSE_MOTION) { - input->set_mouse_pos(Point2(ev.mouse_motion.x, ev.mouse_motion.y)); + input->set_mouse_position(Point2(ev.mouse_motion.x, ev.mouse_motion.y)); } else if (ev.type == InputEvent::MOUSE_BUTTON) { last_button_mask = ev.mouse_button.button_mask; } @@ -604,7 +604,7 @@ void OS_JavaScript::process_touch(int p_what, int p_pointer, const Vector<TouchP ev.mouse_motion.button_mask = BUTTON_MASK_LEFT; ev.mouse_motion.x = p_points[0].pos.x; ev.mouse_motion.y = p_points[0].pos.y; - input->set_mouse_pos(Point2(ev.mouse_motion.x, ev.mouse_motion.y)); + input->set_mouse_position(Point2(ev.mouse_motion.x, ev.mouse_motion.y)); ev.mouse_motion.speed_x = input->get_last_mouse_speed().x; ev.mouse_motion.speed_y = input->get_last_mouse_speed().y; ev.mouse_motion.relative_x = p_points[0].pos.x - last_mouse.x; diff --git a/platform/javascript/os_javascript.h b/platform/javascript/os_javascript.h index fe0be859e2..ea906c560f 100644 --- a/platform/javascript/os_javascript.h +++ b/platform/javascript/os_javascript.h @@ -122,7 +122,7 @@ public: virtual void set_mouse_show(bool p_show); virtual void set_mouse_grab(bool p_grab); virtual bool is_mouse_grab_enabled() const; - virtual Point2 get_mouse_pos() const; + virtual Point2 get_mouse_position() const; virtual int get_mouse_button_state() const; virtual void set_window_title(const String &p_title); diff --git a/platform/osx/os_osx.h b/platform/osx/os_osx.h index 01817d1b88..2ecc379a7f 100644 --- a/platform/osx/os_osx.h +++ b/platform/osx/os_osx.h @@ -145,7 +145,7 @@ public: virtual void set_mouse_grab(bool p_grab); virtual bool is_mouse_grab_enabled() const; virtual void warp_mouse_pos(const Point2 &p_to); - virtual Point2 get_mouse_pos() const; + virtual Point2 get_mouse_position() const; virtual int get_mouse_button_state() const; virtual void set_window_title(const String &p_title); diff --git a/platform/osx/os_osx.mm b/platform/osx/os_osx.mm index b52890cafb..c6c2e6dab1 100644 --- a/platform/osx/os_osx.mm +++ b/platform/osx/os_osx.mm @@ -391,7 +391,7 @@ static int button_mask = 0; ev.mouse_motion.relative_y = [event deltaY] * OS_OSX::singleton->_mouse_scale([[event window] backingScaleFactor]); ev.mouse_motion.mod = translateFlags([event modifierFlags]); - OS_OSX::singleton->input->set_mouse_pos(Point2(mouse_x, mouse_y)); + OS_OSX::singleton->input->set_mouse_position(Point2(mouse_x, mouse_y)); OS_OSX::singleton->push_input(ev); /* @@ -1224,7 +1224,7 @@ void OS_OSX::warp_mouse_pos(const Point2 &p_to) { } } -Point2 OS_OSX::get_mouse_pos() const { +Point2 OS_OSX::get_mouse_position() const { return Vector2(mouse_x, mouse_y); } diff --git a/platform/server/os_server.cpp b/platform/server/os_server.cpp index 5e1034a392..89af785d29 100644 --- a/platform/server/os_server.cpp +++ b/platform/server/os_server.cpp @@ -143,7 +143,7 @@ int OS_Server::get_mouse_button_state() const { return 0; } -Point2 OS_Server::get_mouse_pos() const { +Point2 OS_Server::get_mouse_position() const { return Point2(); } diff --git a/platform/server/os_server.h b/platform/server/os_server.h index b360a1e183..7c29b1e232 100644 --- a/platform/server/os_server.h +++ b/platform/server/os_server.h @@ -88,7 +88,7 @@ public: virtual void set_mouse_show(bool p_show); virtual void set_mouse_grab(bool p_grab); virtual bool is_mouse_grab_enabled() const; - virtual Point2 get_mouse_pos() const; + virtual Point2 get_mouse_position() const; virtual int get_mouse_button_state() const; virtual void set_window_title(const String &p_title); diff --git a/platform/uwp/os_uwp.cpp b/platform/uwp/os_uwp.cpp index bcce368ac4..8b7e821ab3 100644 --- a/platform/uwp/os_uwp.cpp +++ b/platform/uwp/os_uwp.cpp @@ -532,7 +532,7 @@ OSUWP::MouseMode OSUWP::get_mouse_mode() const { return mouse_mode; } -Point2 OSUWP::get_mouse_pos() const { +Point2 OSUWP::get_mouse_position() const { return Point2(old_x, old_y); } diff --git a/platform/uwp/os_uwp.h b/platform/uwp/os_uwp.h index eac98c80a1..88a1dddae3 100644 --- a/platform/uwp/os_uwp.h +++ b/platform/uwp/os_uwp.h @@ -190,7 +190,7 @@ public: void set_mouse_mode(MouseMode p_mode); MouseMode get_mouse_mode() const; - virtual Point2 get_mouse_pos() const; + virtual Point2 get_mouse_position() const; virtual int get_mouse_button_state() const; virtual void set_window_title(const String &p_title); diff --git a/platform/windows/os_windows.cpp b/platform/windows/os_windows.cpp index 13c4da58e0..99b6890913 100644 --- a/platform/windows/os_windows.cpp +++ b/platform/windows/os_windows.cpp @@ -402,7 +402,7 @@ LRESULT OS_Windows::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) SetCursorPos(pos.x, pos.y); } - input->set_mouse_pos(Point2(mm.x, mm.y)); + input->set_mouse_position(Point2(mm.x, mm.y)); mm.speed_x = input->get_last_mouse_speed().x; mm.speed_y = input->get_last_mouse_speed().y; @@ -1318,7 +1318,7 @@ void OS_Windows::warp_mouse_pos(const Point2 &p_to) { } } -Point2 OS_Windows::get_mouse_pos() const { +Point2 OS_Windows::get_mouse_position() const { return Point2(old_x, old_y); } @@ -1990,7 +1990,6 @@ String OS_Windows::get_executable_path() const { wchar_t bufname[4096]; GetModuleFileNameW(NULL, bufname, 4096); String s = bufname; - print_line("EXEC PATHP??: " + s); return s; } diff --git a/platform/windows/os_windows.h b/platform/windows/os_windows.h index 4c8c2c950f..87eceafa02 100644 --- a/platform/windows/os_windows.h +++ b/platform/windows/os_windows.h @@ -191,7 +191,7 @@ public: MouseMode get_mouse_mode() const; virtual void warp_mouse_pos(const Point2 &p_to); - virtual Point2 get_mouse_pos() const; + virtual Point2 get_mouse_position() const; virtual int get_mouse_button_state() const; virtual void set_window_title(const String &p_title); diff --git a/platform/x11/context_gl_x11.cpp b/platform/x11/context_gl_x11.cpp index 432aecb72e..ddf17481b1 100644 --- a/platform/x11/context_gl_x11.cpp +++ b/platform/x11/context_gl_x11.cpp @@ -152,8 +152,6 @@ Error ContextGL_X11::initialize() { XSync(x11_display, False); XSetErrorHandler(oldHandler); - print_line("ALL IS GOOD"); - glXMakeCurrent(x11_display, x11_window, p->glx_context); /* diff --git a/platform/x11/os_x11.cpp b/platform/x11/os_x11.cpp index d2650684c3..2e2fe3ba8a 100644 --- a/platform/x11/os_x11.cpp +++ b/platform/x11/os_x11.cpp @@ -548,7 +548,7 @@ void OS_X11::set_mouse_mode(MouseMode p_mode) { XWarpPointer(x11_display, None, x11_window, 0, 0, 0, 0, (int)center.x, (int)center.y); - input->set_mouse_pos(center); + input->set_mouse_position(center); } else { do_mouse_warp = false; } @@ -580,7 +580,7 @@ int OS_X11::get_mouse_button_state() const { return last_button_state; } -Point2 OS_X11::get_mouse_pos() const { +Point2 OS_X11::get_mouse_position() const { return last_mouse_pos; } @@ -1451,7 +1451,7 @@ void OS_X11::process_xevents() { motion_event.mouse_motion.button_mask = get_mouse_button_state(event.xmotion.state); motion_event.mouse_motion.x = pos.x; motion_event.mouse_motion.y = pos.y; - input->set_mouse_pos(pos); + input->set_mouse_position(pos); motion_event.mouse_motion.global_x = pos.x; motion_event.mouse_motion.global_y = pos.y; motion_event.mouse_motion.speed_x = input->get_last_mouse_speed().x; diff --git a/platform/x11/os_x11.h b/platform/x11/os_x11.h index 6bc072099c..44994e40ec 100644 --- a/platform/x11/os_x11.h +++ b/platform/x11/os_x11.h @@ -202,7 +202,7 @@ public: MouseMode get_mouse_mode() const; virtual void warp_mouse_pos(const Point2 &p_to); - virtual Point2 get_mouse_pos() const; + virtual Point2 get_mouse_position() const; virtual int get_mouse_button_state() const; virtual void set_window_title(const String &p_title); diff --git a/scene/2d/canvas_item.cpp b/scene/2d/canvas_item.cpp index 8c8ac835e8..f699c8f0e8 100644 --- a/scene/2d/canvas_item.cpp +++ b/scene/2d/canvas_item.cpp @@ -695,16 +695,16 @@ InputEvent CanvasItem::make_input_local(const InputEvent &p_event) const { return p_event.xform_by((get_canvas_transform() * get_global_transform()).affine_inverse()); } -Vector2 CanvasItem::get_global_mouse_pos() const { +Vector2 CanvasItem::get_global_mouse_position() const { ERR_FAIL_COND_V(!get_viewport(), Vector2()); - return get_canvas_transform().affine_inverse().xform(get_viewport()->get_mouse_pos()); + return get_canvas_transform().affine_inverse().xform(get_viewport()->get_mouse_position()); } Vector2 CanvasItem::get_local_mouse_pos() const { ERR_FAIL_COND_V(!get_viewport(), Vector2()); - return get_global_transform().affine_inverse().xform(get_global_mouse_pos()); + return get_global_transform().affine_inverse().xform(get_global_mouse_position()); } void CanvasItem::_bind_methods() { @@ -771,7 +771,7 @@ void CanvasItem::_bind_methods() { ClassDB::bind_method(D_METHOD("get_viewport_rect"), &CanvasItem::get_viewport_rect); ClassDB::bind_method(D_METHOD("get_canvas_transform"), &CanvasItem::get_canvas_transform); ClassDB::bind_method(D_METHOD("get_local_mouse_pos"), &CanvasItem::get_local_mouse_pos); - ClassDB::bind_method(D_METHOD("get_global_mouse_pos"), &CanvasItem::get_global_mouse_pos); + ClassDB::bind_method(D_METHOD("get_global_mouse_position"), &CanvasItem::get_global_mouse_position); ClassDB::bind_method(D_METHOD("get_canvas"), &CanvasItem::get_canvas); ClassDB::bind_method(D_METHOD("get_world_2d"), &CanvasItem::get_world_2d); //ClassDB::bind_method(D_METHOD("get_viewport"),&CanvasItem::get_viewport); diff --git a/scene/2d/canvas_item.h b/scene/2d/canvas_item.h index ce72f7e0c9..72fe5b93da 100644 --- a/scene/2d/canvas_item.h +++ b/scene/2d/canvas_item.h @@ -212,7 +212,7 @@ public: InputEvent make_input_local(const InputEvent &pevent) const; Vector2 make_canvas_pos_local(const Vector2 &screen_point) const; - Vector2 get_global_mouse_pos() const; + Vector2 get_global_mouse_position() const; Vector2 get_local_mouse_pos() const; void set_notify_local_transform(bool p_enable); diff --git a/scene/3d/ray_cast.cpp b/scene/3d/ray_cast.cpp index f984d8f06d..d3b4577c42 100644 --- a/scene/3d/ray_cast.cpp +++ b/scene/3d/ray_cast.cpp @@ -30,12 +30,15 @@ #include "ray_cast.h" #include "collision_object.h" +#include "mesh_instance.h" #include "servers/physics_server.h" void RayCast::set_cast_to(const Vector3 &p_point) { cast_to = p_point; if (is_inside_tree() && (get_tree()->is_editor_hint() || get_tree()->is_debugging_collisions_hint())) update_gizmo(); + if (is_inside_tree() && get_tree()->is_debugging_collisions_hint()) + _update_debug_shape(); } Vector3 RayCast::get_cast_to() const { @@ -95,6 +98,13 @@ void RayCast::set_enabled(bool p_enabled) { set_fixed_process(p_enabled); if (!p_enabled) collided = false; + + if (is_inside_tree() && get_tree()->is_debugging_collisions_hint()) { + if (p_enabled) + _update_debug_shape(); + else + _clear_debug_shape(); + } } bool RayCast::is_enabled() const { @@ -110,6 +120,9 @@ void RayCast::_notification(int p_what) { if (enabled && !get_tree()->is_editor_hint()) { set_fixed_process(true); + + if (get_tree()->is_debugging_collisions_hint()) + _update_debug_shape(); } else set_fixed_process(false); @@ -120,13 +133,23 @@ void RayCast::_notification(int p_what) { set_fixed_process(false); } + if (debug_shape) + _clear_debug_shape(); + } break; case NOTIFICATION_FIXED_PROCESS: { if (!enabled) break; + bool prev_collision_state = collided; _update_raycast_state(); + if (prev_collision_state != collided && get_tree()->is_debugging_collisions_hint()) { + if (debug_material.is_valid()) { + Ref<FixedSpatialMaterial> line_material = static_cast<Ref<FixedSpatialMaterial> >(debug_material); + line_material->set_albedo(collided ? Color(1.0, 0, 0) : Color(1.0, 0.8, 0.6)); + } + } } break; } @@ -232,6 +255,68 @@ void RayCast::_bind_methods() { ADD_PROPERTY(PropertyInfo(Variant::INT, "type_mask", PROPERTY_HINT_FLAGS, "Static,Kinematic,Rigid,Character,Area"), "set_type_mask", "get_type_mask"); } +void RayCast::_create_debug_shape() { + + if (!debug_material.is_valid()) { + debug_material = Ref<FixedSpatialMaterial>(memnew(FixedSpatialMaterial)); + + Ref<FixedSpatialMaterial> line_material = static_cast<Ref<FixedSpatialMaterial> >(debug_material); + line_material->set_flag(FixedSpatialMaterial::FLAG_UNSHADED, true); + line_material->set_line_width(3.0); + line_material->set_albedo(Color(1.0, 0.8, 0.6)); + } + + Ref<Mesh> mesh = memnew(Mesh); + + MeshInstance *mi = memnew(MeshInstance); + mi->set_mesh(mesh); + + add_child(mi); + debug_shape = mi; +} + +void RayCast::_update_debug_shape() { + + if (!enabled) + return; + + if (!debug_shape) + _create_debug_shape(); + + MeshInstance *mi = static_cast<MeshInstance *>(debug_shape); + if (!mi->get_mesh().is_valid()) + return; + + Ref<Mesh> mesh = mi->get_mesh(); + if (mesh->get_surface_count() > 0) + mesh->surface_remove(0); + + Array a; + a.resize(Mesh::ARRAY_MAX); + + Vector<Vector3> verts; + verts.push_back(Vector3()); + verts.push_back(cast_to); + a[Mesh::ARRAY_VERTEX] = verts; + + mesh->add_surface_from_arrays(Mesh::PRIMITIVE_LINES, a); + mesh->surface_set_material(0, debug_material); +} + +void RayCast::_clear_debug_shape() { + + if (!debug_shape) + return; + + MeshInstance *mi = static_cast<MeshInstance *>(debug_shape); + if (mi->is_inside_tree()) + mi->queue_delete(); + else + memdelete(mi); + + debug_shape = NULL; +} + RayCast::RayCast() { enabled = false; @@ -241,4 +326,5 @@ RayCast::RayCast() { layer_mask = 1; type_mask = PhysicsDirectSpaceState::TYPE_MASK_COLLISION; cast_to = Vector3(0, -1, 0); + debug_shape = NULL; } diff --git a/scene/3d/ray_cast.h b/scene/3d/ray_cast.h index 7ab7b57db3..63a53d724f 100644 --- a/scene/3d/ray_cast.h +++ b/scene/3d/ray_cast.h @@ -50,6 +50,13 @@ class RayCast : public Spatial { uint32_t layer_mask; uint32_t type_mask; + Node *debug_shape; + Ref<Material> debug_material; + + void _create_debug_shape(); + void _update_debug_shape(); + void _clear_debug_shape(); + protected: void _notification(int p_what); void _update_raycast_state(); diff --git a/scene/animation/animation_player.cpp b/scene/animation/animation_player.cpp index d6c68a1d82..c4ea42d461 100644 --- a/scene/animation/animation_player.cpp +++ b/scene/animation/animation_player.cpp @@ -611,7 +611,7 @@ void AnimationPlayer::_animation_update_transforms() { case SP_NONE: pa->object->set(pa->prop,pa->value_accum); break; //you are not speshul - case SP_NODE2D_POS: static_cast<Node2D*>(pa->object)->set_pos(pa->value_accum); break; + case SP_NODE2D_POS: static_cast<Node2D*>(pa->object)->set_position(pa->value_accum); break; case SP_NODE2D_ROT: static_cast<Node2D*>(pa->object)->set_rot(Math::deg2rad(pa->value_accum)); break; case SP_NODE2D_SCALE: static_cast<Node2D*>(pa->object)->set_scale(pa->value_accum); break; }*/ diff --git a/scene/gui/color_picker.cpp b/scene/gui/color_picker.cpp index 8a94d4918f..adb5e2f0b6 100644 --- a/scene/gui/color_picker.cpp +++ b/scene/gui/color_picker.cpp @@ -591,7 +591,7 @@ void ColorPickerButton::_color_changed(const Color &p_color) { void ColorPickerButton::pressed() { Size2 ms = Size2(300, picker->get_combined_minimum_size().height + 10); - popup->set_pos(get_global_pos() - Size2(0, ms.height)); + popup->set_position(get_global_position() - Size2(0, ms.height)); popup->set_size(ms); popup->popup(); picker->set_focus_on_line_edit(); diff --git a/scene/gui/color_ramp_edit.cpp b/scene/gui/color_ramp_edit.cpp index 0bc9205175..c6f73fe6e6 100644 --- a/scene/gui/color_ramp_edit.cpp +++ b/scene/gui/color_ramp_edit.cpp @@ -62,7 +62,7 @@ void ColorRampEdit::_show_color_picker() { return; Size2 ms = Size2(350, picker->get_combined_minimum_size().height + 10); picker->set_pick_color(points[grabbed].color); - popup->set_pos(get_global_pos() - Vector2(ms.width - get_size().width, ms.height)); + popup->set_position(get_global_position() - Vector2(ms.width - get_size().width, ms.height)); popup->set_size(ms); popup->popup(); } diff --git a/scene/gui/container.cpp b/scene/gui/container.cpp index d3096d7806..c428d524a4 100644 --- a/scene/gui/container.cpp +++ b/scene/gui/container.cpp @@ -107,7 +107,7 @@ void Container::fit_child_in_rect(Control *p_child, const Rect2 &p_rect) { for (int i = 0; i < 4; i++) p_child->set_anchor(Margin(i), ANCHOR_BEGIN); - p_child->set_pos(r.pos); + p_child->set_position(r.pos); p_child->set_size(r.size); p_child->set_rotation(0); p_child->set_scale(Vector2(1, 1)); diff --git a/scene/gui/control.cpp b/scene/gui/control.cpp index bda54181c7..e62a993651 100644 --- a/scene/gui/control.cpp +++ b/scene/gui/control.cpp @@ -58,7 +58,7 @@ void Control::edit_set_state(const Variant &p_state) { Dictionary s = p_state; Rect2 state = s["rect"]; - set_pos(state.pos); + set_position(state.pos); set_size(state.size); set_rotation(s["rot"]); set_scale(s["scale"]); @@ -96,13 +96,13 @@ void Control::edit_set_rect(const Rect2 &p_edit_rect) { postxf.set_rotation_and_scale(data.rotation, data.scale); Vector2 new_pos = postxf.xform(p_edit_rect.pos); - Vector2 pos = get_pos() + new_pos; + Vector2 pos = get_position() + new_pos; Rect2 new_rect = get_rect(); new_rect.pos = pos.snapped(Vector2(1, 1)); new_rect.size = p_edit_rect.size.snapped(Vector2(1, 1)); - set_pos(new_rect.pos); + set_position(new_rect.pos); set_size(new_rect.size); } @@ -353,7 +353,7 @@ void Control::remove_child_notify(Node *p_child) { void Control::_update_canvas_item_transform() { - Transform2D xform = Transform2D(data.rotation, get_pos()); + Transform2D xform = Transform2D(data.rotation, get_position()); xform.scale_basis(data.scale); VisualServer::get_singleton()->canvas_item_set_transform(get_canvas_item(), xform); } @@ -1390,12 +1390,12 @@ Size2 Control::get_end() const { return Size2(data.margin[2], data.margin[3]); } -Point2 Control::get_global_pos() const { +Point2 Control::get_global_position() const { return get_global_transform().get_origin(); } -void Control::set_global_pos(const Point2 &p_point) { +void Control::set_global_position(const Point2 &p_point) { Transform2D inv; @@ -1404,10 +1404,10 @@ void Control::set_global_pos(const Point2 &p_point) { inv = data.parent_canvas_item->get_global_transform().affine_inverse(); } - set_pos(inv.xform(p_point)); + set_position(inv.xform(p_point)); } -void Control::set_pos(const Size2 &p_point) { +void Control::set_position(const Size2 &p_point) { float pw = _get_parent_range(0); float ph = _get_parent_range(1); @@ -1459,7 +1459,7 @@ void Control::set_size(const Size2 &p_size) { _size_changed(); } -Size2 Control::get_pos() const { +Size2 Control::get_position() const { return data.pos_cache; } @@ -1471,7 +1471,7 @@ Size2 Control::get_size() const { Rect2 Control::get_global_rect() const { - return Rect2(get_global_pos(), get_size()); + return Rect2(get_global_position(), get_size()); } Rect2 Control::get_window_rect() const { @@ -1483,7 +1483,7 @@ Rect2 Control::get_window_rect() const { Rect2 Control::get_rect() const { - return Rect2(get_pos(), get_size()); + return Rect2(get_position(), get_size()); } Rect2 Control::get_item_rect() const { @@ -1886,7 +1886,7 @@ Control::CursorShape Control::get_cursor_shape(const Point2 &p_pos) const { Transform2D Control::get_transform() const { - Transform2D xform = Transform2D(data.rotation, get_pos()); + Transform2D xform = Transform2D(data.rotation, get_position()); xform.scale_basis(data.scale); return xform; } @@ -2315,10 +2315,10 @@ void Control::_bind_methods() { ClassDB::bind_method(D_METHOD("set_anchor_and_margin", "margin", "anchor_mode", "offset"), &Control::set_anchor_and_margin); ClassDB::bind_method(D_METHOD("set_begin", "pos"), &Control::set_begin); ClassDB::bind_method(D_METHOD("set_end", "pos"), &Control::set_end); - ClassDB::bind_method(D_METHOD("set_pos", "pos"), &Control::set_pos); + ClassDB::bind_method(D_METHOD("set_position", "pos"), &Control::set_position); ClassDB::bind_method(D_METHOD("set_size", "size"), &Control::set_size); ClassDB::bind_method(D_METHOD("set_custom_minimum_size", "size"), &Control::set_custom_minimum_size); - ClassDB::bind_method(D_METHOD("set_global_pos", "pos"), &Control::set_global_pos); + ClassDB::bind_method(D_METHOD("set_global_position", "pos"), &Control::set_global_position); ClassDB::bind_method(D_METHOD("set_rotation", "radians"), &Control::set_rotation); ClassDB::bind_method(D_METHOD("set_rotation_deg", "degrees"), &Control::set_rotation_deg); // TODO: Obsolete this method (old name) properly (GH-4397) @@ -2327,7 +2327,7 @@ void Control::_bind_methods() { ClassDB::bind_method(D_METHOD("get_margin", "margin"), &Control::get_margin); ClassDB::bind_method(D_METHOD("get_begin"), &Control::get_begin); ClassDB::bind_method(D_METHOD("get_end"), &Control::get_end); - ClassDB::bind_method(D_METHOD("get_pos"), &Control::get_pos); + ClassDB::bind_method(D_METHOD("get_position"), &Control::get_position); ClassDB::bind_method(D_METHOD("get_size"), &Control::get_size); ClassDB::bind_method(D_METHOD("get_rotation"), &Control::get_rotation); ClassDB::bind_method(D_METHOD("get_rotation_deg"), &Control::get_rotation_deg); @@ -2336,7 +2336,7 @@ void Control::_bind_methods() { ClassDB::bind_method(D_METHOD("get_scale"), &Control::get_scale); ClassDB::bind_method(D_METHOD("get_custom_minimum_size"), &Control::get_custom_minimum_size); ClassDB::bind_method(D_METHOD("get_parent_area_size"), &Control::get_size); - ClassDB::bind_method(D_METHOD("get_global_pos"), &Control::get_global_pos); + ClassDB::bind_method(D_METHOD("get_global_position"), &Control::get_global_position); ClassDB::bind_method(D_METHOD("get_rect"), &Control::get_rect); ClassDB::bind_method(D_METHOD("get_global_rect"), &Control::get_global_rect); ClassDB::bind_method(D_METHOD("set_area_as_parent_rect", "margin"), &Control::set_area_as_parent_rect, DEFVAL(0)); @@ -2438,7 +2438,7 @@ void Control::_bind_methods() { ADD_PROPERTYINZ(PropertyInfo(Variant::INT, "margin_bottom", PROPERTY_HINT_RANGE, "-4096,4096"), "set_margin", "get_margin", MARGIN_BOTTOM); ADD_GROUP("Rect", "rect_"); - ADD_PROPERTYNZ(PropertyInfo(Variant::VECTOR2, "rect_pos", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_EDITOR), "set_pos", "get_pos"); + ADD_PROPERTYNZ(PropertyInfo(Variant::VECTOR2, "rect_position", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_EDITOR), "set_position", "get_position"); ADD_PROPERTYNZ(PropertyInfo(Variant::VECTOR2, "rect_size", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_EDITOR), "set_size", "get_size"); ADD_PROPERTYNZ(PropertyInfo(Variant::VECTOR2, "rect_min_size"), "set_custom_minimum_size", "get_custom_minimum_size"); ADD_PROPERTYNZ(PropertyInfo(Variant::REAL, "rect_rotation", PROPERTY_HINT_RANGE, "-1080,1080,0.01"), "set_rotation_deg", "get_rotation_deg"); diff --git a/scene/gui/control.h b/scene/gui/control.h index 9075c5a6ed..5834d1550a 100644 --- a/scene/gui/control.h +++ b/scene/gui/control.h @@ -277,12 +277,12 @@ public: Point2 get_begin() const; Point2 get_end() const; - void set_pos(const Point2 &p_point); + void set_position(const Point2 &p_point); void set_size(const Size2 &p_size); - void set_global_pos(const Point2 &p_point); + void set_global_position(const Point2 &p_point); - Point2 get_pos() const; - Point2 get_global_pos() const; + Point2 get_position() const; + Point2 get_global_position() const; Size2 get_size() const; Rect2 get_rect() const; Rect2 get_global_rect() const; diff --git a/scene/gui/dialogs.cpp b/scene/gui/dialogs.cpp index c53b2bdb21..835775e13b 100644 --- a/scene/gui/dialogs.cpp +++ b/scene/gui/dialogs.cpp @@ -36,6 +36,8 @@ #include "editor/editor_node.h" #endif +// WindowDialog + void WindowDialog::_post_popup() { drag_type = DRAG_NONE; // just in case @@ -46,20 +48,20 @@ void WindowDialog::_fix_size() { // Perhaps this should be called when the viewport resizes as well or windows go out of bounds... // Ensure the whole window is visible. - Point2i pos = get_global_pos(); + Point2i pos = get_global_position(); Size2i size = get_size(); Size2i viewport_size = get_viewport_rect().size; // Windows require additional padding to keep the window chrome visible. - Ref<StyleBox> panel = get_stylebox("panel", "WindowDialog"); - float top = panel->get_margin(MARGIN_TOP); - float left = panel->get_margin(MARGIN_LEFT); - float bottom = panel->get_margin(MARGIN_BOTTOM); - float right = panel->get_margin(MARGIN_RIGHT); + Ref<StyleBoxTexture> panel = get_stylebox("panel", "WindowDialog"); + float top = panel->get_expand_margin_size(MARGIN_TOP); + float left = panel->get_expand_margin_size(MARGIN_LEFT); + float bottom = panel->get_expand_margin_size(MARGIN_BOTTOM); + float right = panel->get_expand_margin_size(MARGIN_RIGHT); pos.x = MAX(left, MIN(pos.x, viewport_size.x - size.x - right)); pos.y = MAX(top, MIN(pos.y, viewport_size.y - size.y - bottom)); - set_global_pos(pos); + set_global_position(pos); // Also resize the window to fit if a resize should be possible at all. if (resizable) { @@ -74,9 +76,9 @@ bool WindowDialog::has_point(const Point2 &p_point) const { Rect2 r(Point2(), get_size()); // Enlarge upwards for title bar. - int titlebar_height = get_constant("titlebar_height", "WindowDialog"); - r.pos.y -= titlebar_height; - r.size.y += titlebar_height; + int title_height = get_constant("title_height", "WindowDialog"); + r.pos.y -= title_height; + r.size.y += title_height; // Inflate by the resizable border thickness. if (resizable) { @@ -98,8 +100,8 @@ void WindowDialog::_gui_input(const InputEvent &p_event) { // Begin a possible dragging operation. drag_type = _drag_hit_test(Point2(p_event.mouse_button.x, p_event.mouse_button.y)); if (drag_type != DRAG_NONE) - drag_offset = get_global_mouse_pos() - get_pos(); - drag_offset_far = get_pos() + get_size() - get_global_mouse_pos(); + drag_offset = get_global_mouse_position() - get_position(); + drag_offset_far = get_position() + get_size() - get_global_mouse_position(); } else if (drag_type != DRAG_NONE && !p_event.mouse_button.pressed) { // End a dragging operation. drag_type = DRAG_NONE; @@ -136,7 +138,7 @@ void WindowDialog::_gui_input(const InputEvent &p_event) { set_default_cursor_shape(cursor); } else { // Update while in a dragging operation. - Point2 global_pos = get_global_mouse_pos(); + Point2 global_pos = get_global_mouse_position(); global_pos.y = MAX(global_pos.y, 0); // Ensure title bar stays visible. Rect2 rect = get_rect(); @@ -164,7 +166,7 @@ void WindowDialog::_gui_input(const InputEvent &p_event) { } set_size(rect.size); - set_pos(rect.pos); + set_position(rect.pos); } } } @@ -173,30 +175,21 @@ void WindowDialog::_notification(int p_what) { switch (p_what) { case NOTIFICATION_DRAW: { - RID canvas = get_canvas_item(); - Size2 size = get_size(); + // Draw the background. Ref<StyleBox> panel = get_stylebox("panel", "WindowDialog"); - int margin_left = static_cast<int>(panel->get_margin(MARGIN_LEFT)); - int margin_top = static_cast<int>(panel->get_margin(MARGIN_TOP)); - int margin_right = static_cast<int>(panel->get_margin(MARGIN_RIGHT)); - int margin_bottom = static_cast<int>(panel->get_margin(MARGIN_BOTTOM)); - - Rect2 rect; - rect.pos.x = -margin_left; - rect.pos.y = -margin_top; - rect.size.width = size.width + margin_left + margin_right; - rect.size.height = size.height + margin_top + margin_bottom; - - panel->draw(canvas, rect); + Size2 size = get_size(); + panel->draw(canvas, Rect2(0, 0, size.x, size.y)); - int title_height = get_constant("title_height", "WindowDialog"); + // Draw the title bar text. + Ref<Font> title_font = get_font("title_font", "WindowDialog"); Color title_color = get_color("title_color", "WindowDialog"); - Ref<Font> font = get_font("title_font", "WindowDialog"); - int ofs = (size.width - font->get_string_size(title).width) / 2; - draw_string(font, Point2(ofs, -title_height + font->get_ascent()), title, title_color, size.width - panel->get_minimum_size().width); - + int title_height = get_constant("title_height", "WindowDialog"); + int font_height = title_font->get_height() - title_font->get_descent() * 2; + int x = (size.x - title_font->get_string_size(title).x) / 2; + int y = (-title_height + font_height) / 2; + title_font->draw(canvas, Point2(x, y), title, title_color, size.x - panel->get_minimum_size().x); } break; case NOTIFICATION_THEME_CHANGED: @@ -238,12 +231,12 @@ int WindowDialog::_drag_hit_test(const Point2 &pos) const { int drag_type = DRAG_NONE; if (resizable) { - int titlebar_height = get_constant("titlebar_height", "WindowDialog"); + int title_height = get_constant("title_height", "WindowDialog"); int scaleborder_size = get_constant("scaleborder_size", "WindowDialog"); Rect2 rect = get_rect(); - if (pos.y < (-titlebar_height + scaleborder_size)) + if (pos.y < (-title_height + scaleborder_size)) drag_type = DRAG_RESIZE_TOP; else if (pos.y >= (rect.size.height - scaleborder_size)) drag_type = DRAG_RESIZE_BOTTOM; @@ -317,6 +310,8 @@ WindowDialog::WindowDialog() { WindowDialog::~WindowDialog() { } +// PopupDialog + void PopupDialog::_notification(int p_what) { if (p_what == NOTIFICATION_DRAW) { @@ -416,14 +411,14 @@ void AcceptDialog::_update_child_rects() { if (c == hbc || c == label || c == get_close_button() || c->is_set_as_toplevel()) continue; - c->set_pos(cpos); + c->set_position(cpos); c->set_size(csize); } cpos.y += csize.y + margin; csize.y = hminsize.y; - hbc->set_pos(cpos); + hbc->set_position(cpos); hbc->set_size(csize); } @@ -554,6 +549,8 @@ AcceptDialog::AcceptDialog() { AcceptDialog::~AcceptDialog() { } +// ConfirmationDialog + void ConfirmationDialog::_bind_methods() { ClassDB::bind_method(D_METHOD("get_cancel:Button"), &ConfirmationDialog::get_cancel); diff --git a/scene/gui/graph_edit.cpp b/scene/gui/graph_edit.cpp index 76baf20526..0c092a4e17 100644 --- a/scene/gui/graph_edit.cpp +++ b/scene/gui/graph_edit.cpp @@ -140,13 +140,13 @@ void GraphEdit::_update_scroll_offset() { Point2 pos = gn->get_offset() * zoom; pos -= Point2(h_scroll->get_value(), v_scroll->get_value()); - gn->set_pos(pos); + gn->set_position(pos); if (gn->get_scale() != Vector2(zoom, zoom)) { gn->set_scale(Vector2(zoom, zoom)); } } - connections_layer->set_pos(-Point2(h_scroll->get_value(), v_scroll->get_value())); + connections_layer->set_position(-Point2(h_scroll->get_value(), v_scroll->get_value())); set_block_minimum_size_adjust(false); awaiting_scroll_offset_update = false; } @@ -350,14 +350,14 @@ bool GraphEdit::_filter_input(const Point2 &p_point) { for (int j = 0; j < gn->get_connection_output_count(); j++) { - Vector2 pos = gn->get_connection_output_pos(j) + gn->get_pos(); + Vector2 pos = gn->get_connection_output_pos(j) + gn->get_position(); if (pos.distance_to(p_point) < grab_r) return true; } for (int j = 0; j < gn->get_connection_input_count(); j++) { - Vector2 pos = gn->get_connection_input_pos(j) + gn->get_pos(); + Vector2 pos = gn->get_connection_input_pos(j) + gn->get_position(); if (pos.distance_to(p_point) < grab_r) { return true; } @@ -383,7 +383,7 @@ void GraphEdit::_top_layer_input(const InputEvent &p_ev) { for (int j = 0; j < gn->get_connection_output_count(); j++) { - Vector2 pos = gn->get_connection_output_pos(j) + gn->get_pos(); + Vector2 pos = gn->get_connection_output_pos(j) + gn->get_position(); if (pos.distance_to(mpos) < grab_r) { if (valid_left_disconnect_types.has(gn->get_connection_output_type(j))) { @@ -430,7 +430,7 @@ void GraphEdit::_top_layer_input(const InputEvent &p_ev) { for (int j = 0; j < gn->get_connection_input_count(); j++) { - Vector2 pos = gn->get_connection_input_pos(j) + gn->get_pos(); + Vector2 pos = gn->get_connection_input_pos(j) + gn->get_position(); if (pos.distance_to(mpos) < grab_r) { @@ -497,7 +497,7 @@ void GraphEdit::_top_layer_input(const InputEvent &p_ev) { if (!connecting_out) { for (int j = 0; j < gn->get_connection_output_count(); j++) { - Vector2 pos = gn->get_connection_output_pos(j) + gn->get_pos(); + Vector2 pos = gn->get_connection_output_pos(j) + gn->get_position(); int type = gn->get_connection_output_type(j); if ((type == connecting_type || valid_connection_types.has(ConnType(type, connecting_type))) && pos.distance_to(mpos) < grab_r) { @@ -512,7 +512,7 @@ void GraphEdit::_top_layer_input(const InputEvent &p_ev) { for (int j = 0; j < gn->get_connection_input_count(); j++) { - Vector2 pos = gn->get_connection_input_pos(j) + gn->get_pos(); + Vector2 pos = gn->get_connection_input_pos(j) + gn->get_position(); int type = gn->get_connection_input_type(j); if ((type == connecting_type || valid_connection_types.has(ConnType(type, connecting_type))) && pos.distance_to(mpos) < grab_r) { connecting_target = true; @@ -704,7 +704,7 @@ void GraphEdit::_top_layer_draw() { pos = from->get_connection_output_pos(connecting_index); else pos = from->get_connection_input_pos(connecting_index); - pos += from->get_pos(); + pos += from->get_position(); Vector2 topos; topos = connecting_to; @@ -1229,7 +1229,7 @@ GraphEdit::GraphEdit() { HBoxContainer *zoom_hb = memnew(HBoxContainer); top_layer->add_child(zoom_hb); - zoom_hb->set_pos(Vector2(10, 10)); + zoom_hb->set_position(Vector2(10, 10)); zoom_minus = memnew(ToolButton); zoom_hb->add_child(zoom_minus); diff --git a/scene/gui/line_edit.cpp b/scene/gui/line_edit.cpp index 30bc4d1663..9abf9649c0 100644 --- a/scene/gui/line_edit.cpp +++ b/scene/gui/line_edit.cpp @@ -51,7 +51,7 @@ void LineEdit::_gui_input(InputEvent p_event) { const InputEventMouseButton &b = p_event.mouse_button; if (b.pressed && b.button_index == BUTTON_RIGHT) { - menu->set_pos(get_global_transform().xform(get_local_mouse_pos())); + menu->set_position(get_global_transform().xform(get_local_mouse_pos())); menu->set_size(Vector2(1, 1)); menu->popup(); grab_focus(); diff --git a/scene/gui/menu_button.cpp b/scene/gui/menu_button.cpp index 16277ed0d0..cf468f2257 100644 --- a/scene/gui/menu_button.cpp +++ b/scene/gui/menu_button.cpp @@ -50,10 +50,10 @@ void MenuButton::pressed() { emit_signal("about_to_show"); Size2 size = get_size(); - Point2 gp = get_global_pos(); - popup->set_global_pos(gp + Size2(0, size.height)); + Point2 gp = get_global_position(); + popup->set_global_position(gp + Size2(0, size.height)); popup->set_size(Size2(size.width, 0)); - popup->set_parent_rect(Rect2(Point2(gp - popup->get_global_pos()), get_size())); + popup->set_parent_rect(Rect2(Point2(gp - popup->get_global_position()), get_size())); popup->popup(); popup->call_deferred("grab_click_focus"); popup->set_invalidate_click_until_motion(); diff --git a/scene/gui/option_button.cpp b/scene/gui/option_button.cpp index 0bb68e7fa1..0806d35d48 100644 --- a/scene/gui/option_button.cpp +++ b/scene/gui/option_button.cpp @@ -87,7 +87,7 @@ void OptionButton::_selected(int p_which) { void OptionButton::pressed() { Size2 size = get_size(); - popup->set_global_pos(get_global_pos() + Size2(0, size.height)); + popup->set_global_position(get_global_position() + Size2(0, size.height)); popup->set_size(Size2(size.width, 0)); popup->popup(); diff --git a/scene/gui/popup.cpp b/scene/gui/popup.cpp index 523633166c..7d0b91a366 100644 --- a/scene/gui/popup.cpp +++ b/scene/gui/popup.cpp @@ -58,12 +58,12 @@ void Popup::_notification(int p_what) { void Popup::_fix_size() { #if 0 - Point2 pos = get_pos(); + Point2 pos = get_position(); Size2 size = get_size(); Point2 window_size = window==this ? get_parent_area_size() :window->get_size(); #else - Point2 pos = get_global_pos(); + Point2 pos = get_global_position(); Size2 size = get_size(); Point2 window_size = get_viewport_rect().size; @@ -79,10 +79,10 @@ void Popup::_fix_size() { pos.y = 0; #if 0 if (pos!=get_pos()) - set_pos(pos); + set_position(pos); #else - if (pos != get_pos()) - set_global_pos(pos); + if (pos != get_position()) + set_global_position(pos); #endif } @@ -171,7 +171,7 @@ void Popup::popup_centered(const Size2 &p_size) { rect.size = p_size == Size2() ? get_size() : p_size; rect.pos = ((window_size - rect.size) / 2.0).floor(); - set_pos(rect.pos); + set_position(rect.pos); set_size(rect.size); show_modal(exclusive); @@ -194,7 +194,7 @@ void Popup::popup_centered_ratio(float p_screen_ratio) { Point2 window_size = get_viewport_rect().size; rect.size = (window_size * p_screen_ratio).floor(); rect.pos = ((window_size - rect.size) / 2.0).floor(); - set_pos(rect.pos); + set_position(rect.pos); set_size(rect.size); show_modal(exclusive); @@ -216,7 +216,7 @@ void Popup::popup(const Rect2 &bounds) { // Fit the popup into the optionally provided bounds. if (!bounds.has_no_area()) { - set_pos(bounds.pos); + set_position(bounds.pos); set_size(bounds.size); } _fix_size(); diff --git a/scene/gui/popup_menu.cpp b/scene/gui/popup_menu.cpp index de16f3c525..6ac6eac655 100644 --- a/scene/gui/popup_menu.cpp +++ b/scene/gui/popup_menu.cpp @@ -169,7 +169,7 @@ void PopupMenu::_activate_submenu(int over) { if (pm->is_visible_in_tree()) return; //already visible! - Point2 p = get_global_pos(); + Point2 p = get_global_position(); Rect2 pr(p, get_size()); Ref<StyleBox> style = get_stylebox("panel"); @@ -179,13 +179,13 @@ void PopupMenu::_activate_submenu(int over) { if (pos.x + size.width > get_viewport_rect().size.width) pos.x = p.x - size.width; - pm->set_pos(pos); + pm->set_position(pos); pm->popup(); PopupMenu *pum = pm->cast_to<PopupMenu>(); if (pum) { - pr.pos -= pum->get_global_pos(); + pr.pos -= pum->get_global_position(); pum->clear_autohide_areas(); pum->add_autohide_area(Rect2(pr.pos.x, pr.pos.y, pr.size.x, items[over]._ofs_cache)); if (over < items.size() - 1) { @@ -266,15 +266,15 @@ void PopupMenu::_gui_input(const InputEvent &p_event) { case BUTTON_WHEEL_DOWN: { - if (get_global_pos().y + get_size().y > get_viewport_rect().size.y) { + if (get_global_position().y + get_size().y > get_viewport_rect().size.y) { int vseparation = get_constant("vseparation"); Ref<Font> font = get_font("font"); - Point2 pos = get_pos(); + Point2 pos = get_position(); int s = (vseparation + font->get_height()) * 3; pos.y -= s; - set_pos(pos); + set_position(pos); //update hover InputEvent ie; @@ -286,15 +286,15 @@ void PopupMenu::_gui_input(const InputEvent &p_event) { } break; case BUTTON_WHEEL_UP: { - if (get_global_pos().y < 0) { + if (get_global_position().y < 0) { int vseparation = get_constant("vseparation"); Ref<Font> font = get_font("font"); - Point2 pos = get_pos(); + Point2 pos = get_position(); int s = (vseparation + font->get_height()) * 3; pos.y += s; - set_pos(pos); + set_position(pos); //update hover InputEvent ie; diff --git a/scene/gui/tab_container.cpp b/scene/gui/tab_container.cpp index 0ef6fbdebd..0c7a58dc16 100644 --- a/scene/gui/tab_container.cpp +++ b/scene/gui/tab_container.cpp @@ -79,11 +79,11 @@ void TabContainer::_gui_input(const InputEvent &p_event) { if (popup && pos.x > size.width - menu->get_width()) { emit_signal("pre_popup_pressed"); - Vector2 popup_pos = get_global_pos(); + Vector2 popup_pos = get_global_position(); popup_pos.x += size.width - popup->get_size().width; popup_pos.y += menu->get_height(); - popup->set_global_pos(popup_pos); + popup->set_global_position(popup_pos); popup->popup(); return; } diff --git a/scene/gui/text_edit.cpp b/scene/gui/text_edit.cpp index 80c6a23b61..3c8545bd75 100644 --- a/scene/gui/text_edit.cpp +++ b/scene/gui/text_edit.cpp @@ -101,15 +101,15 @@ void TextEdit::Text::set_font(const Ref<Font> &p_font) { font = p_font; } -void TextEdit::Text::set_tab_size(int p_tab_size) { +void TextEdit::Text::set_indent_size(int p_indent_size) { - tab_size = p_tab_size; + indent_size = p_indent_size; } void TextEdit::Text::_update_line_cache(int p_line) const { int w = 0; - int tab_w = font->get_char_size(' ').width * tab_size; + int tab_w = font->get_char_size(' ').width * indent_size; int len = text[p_line].data.length(); const CharType *str = text[p_line].data.c_str(); @@ -360,7 +360,7 @@ void TextEdit::_click_selection_held() { if (Input::get_singleton()->is_mouse_button_pressed(BUTTON_LEFT) && selection.selecting_mode != Selection::MODE_NONE) { - Point2 mp = Input::get_singleton()->get_mouse_pos() - get_global_pos(); + Point2 mp = Input::get_singleton()->get_mouse_position() - get_global_position(); int row, col; _get_mouse_pos(Point2i(mp.x, mp.y), row, col); @@ -456,7 +456,7 @@ void TextEdit::_notification(int p_what) { int visible_rows = get_visible_rows(); - int tab_w = cache.font->get_char_size(' ').width * tab_size; + int tab_w = cache.font->get_char_size(' ').width * indent_size; Color color = cache.font_color; int in_region = -1; @@ -1305,7 +1305,38 @@ void TextEdit::backspace_at_cursor() { _is_pair_left_symbol(text[cursor.line][cursor.column - 1])) { _consume_backspace_for_pair_symbol(prev_line, prev_column); } else { - _remove_text(prev_line, prev_column, cursor.line, cursor.column); + // handle space indentation + if (cursor.column - indent_size >= 0 && indent_using_spaces) { + + // if there is enough spaces to count as a tab + bool unindent = true; + for (int i = 1; i <= indent_size; i++) { + if (text[cursor.line][cursor.column - i] != ' ') { + unindent = false; + break; + } + } + + // and it is before the first character + int i = 0; + while (i < cursor.column && i < text[cursor.line].length()) { + if (text[cursor.line][i] != ' ' && text[cursor.line][i] != '\t') { + unindent = false; + break; + } + i++; + } + + // then we can remove it as a single character. + if (unindent) { + _remove_text(cursor.line, cursor.column - indent_size, cursor.line, cursor.column); + prev_column = cursor.column - indent_size; + } else { + _remove_text(prev_line, prev_column, cursor.line, cursor.column); + } + } else { + _remove_text(prev_line, prev_column, cursor.line, cursor.column); + } } cursor_set_line(prev_line); @@ -1328,7 +1359,11 @@ void TextEdit::indent_selection_right() { for (int i = start_line; i <= end_line; i++) { String line_text = get_line(i); - line_text = '\t' + line_text; + if (indent_using_spaces) { + line_text = space_indent + line_text; + } else { + line_text = '\t' + line_text; + } set_line(i, line_text); } @@ -1359,8 +1394,8 @@ void TextEdit::indent_selection_left() { if (line_text.begins_with("\t")) { line_text = line_text.substr(1, line_text.length()); set_line(i, line_text); - } else if (line_text.begins_with(" ")) { - line_text = line_text.substr(4, line_text.length()); + } else if (line_text.begins_with(space_indent)) { + line_text = line_text.substr(indent_size, line_text.length()); set_line(i, line_text); } } @@ -1586,7 +1621,7 @@ void TextEdit::_gui_input(const InputEvent &p_gui_input) { if (mb.button_index == BUTTON_RIGHT && context_menu_enabled) { - menu->set_pos(get_global_transform().xform(get_local_mouse_pos())); + menu->set_position(get_global_transform().xform(get_local_mouse_pos())); menu->set_size(Vector2(1, 1)); menu->popup(); grab_focus(); @@ -1931,17 +1966,39 @@ void TextEdit::_gui_input(const InputEvent &p_gui_input) { String ins = "\n"; //keep indentation + int space_count = 0; for (int i = 0; i < text[cursor.line].length(); i++) { - if (text[cursor.line][i] == '\t') - ins += "\t"; - else + if (text[cursor.line][i] == '\t') { + if (indent_using_spaces) { + ins += space_indent; + } else { + ins += "\t"; + } + space_count = 0; + } else if (text[cursor.line][i] == ' ') { + space_count++; + + if (space_count == indent_size) { + if (indent_using_spaces) { + ins += space_indent; + } else { + ins += "\t"; + } + space_count = 0; + } + } else { break; + } } if (auto_indent) { // indent once again if previous line will end with ':' // (i.e. colon precedes current cursor position) if (cursor.column > 0 && text[cursor.line][cursor.column - 1] == ':') { - ins += "\t"; + if (indent_using_spaces) { + ins += space_indent; + } else { + ins += "\t"; + } } } @@ -1987,15 +2044,36 @@ void TextEdit::_gui_input(const InputEvent &p_gui_input) { } else { if (k.mod.shift) { + //simple unindent int cc = cursor.column; - if (cc > 0 && cc <= text[cursor.line].length() && text[cursor.line][cursor.column - 1] == '\t') { - //simple unindent + if (cc > 0 && cc <= text[cursor.line].length()) { + if (text[cursor.line][cursor.column - 1] == '\t') { + backspace_at_cursor(); + } else { + if (cursor.column - indent_size >= 0) { + + bool unindent = true; + for (int i = 1; i <= indent_size; i++) { + if (text[cursor.line][cursor.column - i] != ' ') { + unindent = false; + break; + } + } - backspace_at_cursor(); + if (unindent) { + _remove_text(cursor.line, cursor.column - indent_size, cursor.line, cursor.column); + cursor_set_column(cursor.column - indent_size); + } + } + } } } else { //simple indent - _insert_text_at_cursor("\t"); + if (indent_using_spaces) { + _insert_text_at_cursor(space_indent); + } else { + _insert_text_at_cursor("\t"); + } } } @@ -3103,7 +3181,7 @@ int TextEdit::get_char_pos_for(int p_px, String p_str) const { int px = 0; int c = 0; - int tab_w = cache.font->get_char_size(' ').width * tab_size; + int tab_w = cache.font->get_char_size(' ').width * indent_size; while (c < p_str.length()) { @@ -3135,7 +3213,7 @@ int TextEdit::get_column_x_offset(int p_char, String p_str) { int px = 0; - int tab_w = cache.font->get_char_size(' ').width * tab_size; + int tab_w = cache.font->get_char_size(' ').width * indent_size; for (int i = 0; i < p_char; i++) { @@ -3952,10 +4030,24 @@ void TextEdit::_push_current_op() { current_op.chain_forward = false; } -void TextEdit::set_tab_size(const int p_size) { +void TextEdit::set_indent_using_spaces(const bool p_use_spaces) { + indent_using_spaces = p_use_spaces; +} + +bool TextEdit::is_indent_using_spaces() const { + return indent_using_spaces; +} + +void TextEdit::set_indent_size(const int p_size) { ERR_FAIL_COND(p_size <= 0); - tab_size = p_size; - text.set_tab_size(p_size); + indent_size = p_size; + text.set_indent_size(p_size); + + space_indent = ""; + for (int i = 0; i < p_size; i++) { + space_indent += " "; + } + update(); } @@ -4448,8 +4540,8 @@ void TextEdit::_bind_methods() { ClassDB::bind_method(D_METHOD("get_text"), &TextEdit::get_text); ClassDB::bind_method(D_METHOD("get_line", "line"), &TextEdit::get_line); - ClassDB::bind_method(D_METHOD("cursor_set_column", "column", "adjust_viewport"), &TextEdit::cursor_set_column, DEFVAL(false)); - ClassDB::bind_method(D_METHOD("cursor_set_line", "line", "adjust_viewport"), &TextEdit::cursor_set_line, DEFVAL(false)); + ClassDB::bind_method(D_METHOD("cursor_set_column", "column", "adjust_viewport"), &TextEdit::cursor_set_column, DEFVAL(true)); + ClassDB::bind_method(D_METHOD("cursor_set_line", "line", "adjust_viewport"), &TextEdit::cursor_set_line, DEFVAL(true)); ClassDB::bind_method(D_METHOD("cursor_get_column"), &TextEdit::cursor_get_column); ClassDB::bind_method(D_METHOD("cursor_get_line"), &TextEdit::cursor_get_line); @@ -4542,8 +4634,8 @@ TextEdit::TextEdit() { cache.breakpoint_gutter_width = 0; breakpoint_gutter_width = 0; - tab_size = 4; - text.set_tab_size(tab_size); + indent_size = 4; + text.set_indent_size(indent_size); text.clear(); //text.insert(1,"Mongolia.."); //text.insert(2,"PAIS GENEROSO!!"); @@ -4631,6 +4723,8 @@ TextEdit::TextEdit() { auto_brace_completion_enabled = false; brace_matching_enabled = false; highlight_all_occurrences = false; + indent_using_spaces = false; + space_indent = " "; auto_indent = false; insert_mode = false; window_has_focus = true; diff --git a/scene/gui/text_edit.h b/scene/gui/text_edit.h index d5fe2950f4..905ea46bd7 100644 --- a/scene/gui/text_edit.h +++ b/scene/gui/text_edit.h @@ -141,12 +141,12 @@ class TextEdit : public Control { const Vector<ColorRegion> *color_regions; mutable Vector<Line> text; Ref<Font> font; - int tab_size; + int indent_size; void _update_line_cache(int p_line) const; public: - void set_tab_size(int p_tab_size); + void set_indent_size(int p_indent_size); void set_font(const Ref<Font> &p_font); void set_color_regions(const Vector<ColorRegion> *p_regions) { color_regions = p_regions; } int get_line_width(int p_line) const; @@ -163,7 +163,7 @@ class TextEdit : public Control { void clear(); void clear_caches(); _FORCE_INLINE_ const String &operator[](int p_line) const { return text[p_line].data; } - Text() { tab_size = 4; } + Text() { indent_size = 4; } }; struct TextOperation { @@ -221,7 +221,9 @@ class TextEdit : public Control { int max_chars; bool readonly; bool syntax_coloring; - int tab_size; + bool indent_using_spaces; + int indent_size; + String space_indent; Timer *caret_blink_timer; bool caret_blink_enabled; @@ -461,7 +463,9 @@ public: void redo(); void clear_undo_history(); - void set_tab_size(const int p_size); + void set_indent_using_spaces(const bool p_use_spaces); + bool is_indent_using_spaces() const; + void set_indent_size(const int p_size); void set_draw_tabs(bool p_draw); bool is_drawing_tabs() const; diff --git a/scene/gui/tree.cpp b/scene/gui/tree.cpp index 1cfaa58b92..bc7b7485d8 100644 --- a/scene/gui/tree.cpp +++ b/scene/gui/tree.cpp @@ -1041,7 +1041,7 @@ int Tree::draw_item(const Point2i &p_pos, const Point2 &p_draw_ofs, const Size2 cache.selected->draw(ci, r); } if (text_editor->is_visible_in_tree()) { - text_editor->set_pos(get_global_pos() + r.pos); + text_editor->set_position(get_global_position() + r.pos); } } @@ -1503,7 +1503,7 @@ int Tree::propagate_mouse_event(const Point2i &p_pos, int x_ofs, int y_ofs, bool cache.click_id = c.buttons[j].id; cache.click_item = p_item; cache.click_column = col; - cache.click_pos = get_global_mouse_pos() - get_global_pos(); + cache.click_pos = get_global_mouse_position() - get_global_position(); update(); //emit_signal("button_pressed"); return -1; @@ -1627,7 +1627,7 @@ int Tree::propagate_mouse_event(const Point2i &p_pos, int x_ofs, int y_ofs, bool } popup_menu->set_size(Size2(col_width, 0)); - popup_menu->set_pos(get_global_pos() + Point2i(col_ofs, _get_title_button_height() + y_ofs + item_h) - cache.offset); + popup_menu->set_position(get_global_position() + Point2i(col_ofs, _get_title_button_height() + y_ofs + item_h) - cache.offset); popup_menu->popup(); popup_edited_item = p_item; popup_edited_item_col = col; @@ -1693,7 +1693,7 @@ int Tree::propagate_mouse_event(const Point2i &p_pos, int x_ofs, int y_ofs, bool case TreeItem::CELL_MODE_CUSTOM: { edited_item = p_item; edited_col = col; - custom_popup_rect = Rect2i(get_global_pos() + Point2i(col_ofs, _get_title_button_height() + y_ofs + item_h - cache.offset.y), Size2(get_column_width(col), item_h)); + custom_popup_rect = Rect2i(get_global_position() + Point2i(col_ofs, _get_title_button_height() + y_ofs + item_h - cache.offset.y), Size2(get_column_width(col), item_h)); emit_signal("custom_popup_edited", ((bool)(x >= (col_width - item_h / 2)))); bring_up_editor = false; @@ -1710,7 +1710,7 @@ int Tree::propagate_mouse_event(const Point2i &p_pos, int x_ofs, int y_ofs, bool popup_edited_item = p_item; popup_edited_item_col = col; - pressing_item_rect = Rect2(get_global_pos() + Point2i(col_ofs, _get_title_button_height() + y_ofs) - cache.offset, Size2(col_width, item_h)); + pressing_item_rect = Rect2(get_global_position() + Point2i(col_ofs, _get_title_button_height() + y_ofs) - cache.offset, Size2(col_width, item_h)); pressing_for_editor_text = editor_text; pressing_for_editor = true; @@ -2379,7 +2379,7 @@ bool Tree::edit_selected() { edited_item = s; edited_col = col; - custom_popup_rect = Rect2i(get_global_pos() + rect.pos, rect.size); + custom_popup_rect = Rect2i(get_global_position() + rect.pos, rect.size); emit_signal("custom_popup_edited", false); item_edited(col, s); @@ -2394,7 +2394,7 @@ bool Tree::edit_selected() { } popup_menu->set_size(Size2(rect.size.width, 0)); - popup_menu->set_pos(get_global_pos() + rect.pos + Point2i(0, rect.size.height)); + popup_menu->set_position(get_global_position() + rect.pos + Point2i(0, rect.size.height)); popup_menu->popup(); popup_edited_item = s; popup_edited_item_col = col; @@ -2402,8 +2402,8 @@ bool Tree::edit_selected() { } else if (c.mode == TreeItem::CELL_MODE_STRING || c.mode == TreeItem::CELL_MODE_RANGE || c.mode == TreeItem::CELL_MODE_RANGE_EXPRESSION) { - Point2i textedpos = get_global_pos() + rect.pos; - text_editor->set_pos(textedpos); + Point2i textedpos = get_global_position() + rect.pos; + text_editor->set_position(textedpos); text_editor->set_size(rect.size); text_editor->clear(); text_editor->set_text(c.mode == TreeItem::CELL_MODE_STRING ? c.text : String::num(c.val, Math::step_decimals(c.step))); @@ -2411,7 +2411,7 @@ bool Tree::edit_selected() { if (c.mode == TreeItem::CELL_MODE_RANGE || c.mode == TreeItem::CELL_MODE_RANGE_EXPRESSION) { - value_editor->set_pos(textedpos + Point2i(0, text_editor->get_size().height)); + value_editor->set_position(textedpos + Point2i(0, text_editor->get_size().height)); value_editor->set_size(Size2(rect.size.width, 1)); value_editor->show_modal(); updating_value_editor = true; @@ -2529,7 +2529,7 @@ void Tree::_notification(int p_what) { if (p_what == NOTIFICATION_DRAG_BEGIN) { single_select_defer = NULL; - if (cache.scroll_speed > 0 && get_rect().has_point(get_viewport()->get_mouse_pos() - get_global_pos())) { + if (cache.scroll_speed > 0 && get_rect().has_point(get_viewport()->get_mouse_position() - get_global_position())) { scrolling = true; set_fixed_process(true); } @@ -2577,7 +2577,7 @@ void Tree::_notification(int p_what) { } if (scrolling) { - Point2 point = get_viewport()->get_mouse_pos() - get_global_pos(); + Point2 point = get_viewport()->get_mouse_position() - get_global_position(); if (point.x < cache.scroll_border) { point.x -= cache.scroll_border; } else if (point.x > get_size().width - cache.scroll_border) { diff --git a/scene/io/resource_format_wav.cpp b/scene/io/resource_format_wav.cpp index 53eefd26fe..dabbb79de3 100644 --- a/scene/io/resource_format_wav.cpp +++ b/scene/io/resource_format_wav.cpp @@ -98,7 +98,7 @@ RES ResourceFormatLoaderWAV::load(const String &p_path, const String& p_original /* chunk size */ uint32_t chunksize=file->get_32(); - uint32_t file_pos=file->get_pos(); //save file pos, so we can skip to next chunk safely + uint32_t file_pos=file->get_position(); //save file pos, so we can skip to next chunk safely if (file->eof_reached()) { diff --git a/scene/main/http_request.cpp b/scene/main/http_request.cpp index 783afc8b58..a9b2dba186 100644 --- a/scene/main/http_request.cpp +++ b/scene/main/http_request.cpp @@ -29,6 +29,8 @@ /*************************************************************************/ #include "http_request.h" +#include "version.h" + void HTTPRequest::_redirect_request(const String &p_new_url) { } diff --git a/scene/main/viewport.cpp b/scene/main/viewport.cpp index 31c9cb15a8..406640275c 100644 --- a/scene/main/viewport.cpp +++ b/scene/main/viewport.cpp @@ -1444,9 +1444,9 @@ void Viewport::_vp_unhandled_input(const InputEvent &p_ev) { unhandled_input(ev); } -Vector2 Viewport::get_mouse_pos() const { +Vector2 Viewport::get_mouse_position() const { - return (get_final_transform().affine_inverse() * _get_input_pre_xform()).xform(Input::get_singleton()->get_mouse_pos() - _get_window_offset()); + return (get_final_transform().affine_inverse() * _get_input_pre_xform()).xform(Input::get_singleton()->get_mouse_position() - _get_window_offset()); } void Viewport::warp_mouse(const Vector2 &p_pos) { @@ -1538,7 +1538,7 @@ void Viewport::_gui_show_tooltip() { else if (r.pos.y < 0) r.pos.y = 0; - gui.tooltip_popup->set_global_pos(r.pos); + gui.tooltip_popup->set_global_position(r.pos); gui.tooltip_popup->set_size(r.size); gui.tooltip_popup->raise(); @@ -1640,7 +1640,7 @@ Control *Viewport::_gui_find_control_at_pos(CanvasItem *p_node, const Point2 &p_ Control *c = p_node->cast_to<Control>(); if (c) { - //print_line("at "+String(c->get_path())+" POS "+c->get_pos()+" bt "+p_xform); + //print_line("at "+String(c->get_path())+" POS "+c->get_position()+" bt "+p_xform); } //subwindows first!! @@ -1993,7 +1993,7 @@ void Viewport::_gui_input_event(InputEvent p_event) { gui.mouse_over = over; if (gui.drag_preview) { - gui.drag_preview->set_pos(mpos); + gui.drag_preview->set_position(mpos); } if (!over) { @@ -2237,7 +2237,7 @@ void Viewport::_gui_set_drag_preview(Control *p_base, Control *p_control) { memdelete(gui.drag_preview); } p_control->set_as_toplevel(true); - p_control->set_pos(gui.last_mouse_pos); + p_control->set_position(gui.last_mouse_pos); p_base->get_root_parent_control()->add_child(p_control); //add as child of viewport p_control->raise(); if (gui.drag_preview) { @@ -2649,7 +2649,7 @@ void Viewport::_bind_methods() { ClassDB::bind_method(D_METHOD("is_audio_listener_2d", "enable"), &Viewport::is_audio_listener_2d); ClassDB::bind_method(D_METHOD("set_attach_to_screen_rect", "rect"), &Viewport::set_attach_to_screen_rect); - ClassDB::bind_method(D_METHOD("get_mouse_pos"), &Viewport::get_mouse_pos); + ClassDB::bind_method(D_METHOD("get_mouse_position"), &Viewport::get_mouse_position); ClassDB::bind_method(D_METHOD("warp_mouse", "to_pos"), &Viewport::warp_mouse); ClassDB::bind_method(D_METHOD("gui_has_modal_stack"), &Viewport::gui_has_modal_stack); diff --git a/scene/main/viewport.h b/scene/main/viewport.h index 242ee4b4e6..d784fc8ee9 100644 --- a/scene/main/viewport.h +++ b/scene/main/viewport.h @@ -400,7 +400,7 @@ public: void set_attach_to_screen_rect(const Rect2 &p_rect); Rect2 get_attach_to_screen_rect() const; - Vector2 get_mouse_pos() const; + Vector2 get_mouse_position() const; void warp_mouse(const Vector2 &p_pos); void set_physics_object_picking(bool p_enable); diff --git a/scene/resources/animation.cpp b/scene/resources/animation.cpp index cebec379e6..545c700354 100644 --- a/scene/resources/animation.cpp +++ b/scene/resources/animation.cpp @@ -1761,8 +1761,8 @@ bool Animation::_transform_track_optimize_key(const TKey<TransformKey> &t0, cons Vector3 v02, v01; real_t a02, a01; - r02.get_axis_and_angle(v02, a02); - r01.get_axis_and_angle(v01, a01); + r02.get_axis_angle(v02, a02); + r01.get_axis_angle(v01, a01); if (Math::abs(a02) > p_max_optimizable_angle) return false; diff --git a/scene/resources/default_theme/default_theme.cpp b/scene/resources/default_theme/default_theme.cpp index 595c0ecfd8..3a824a56a3 100644 --- a/scene/resources/default_theme/default_theme.cpp +++ b/scene/resources/default_theme/default_theme.cpp @@ -284,16 +284,10 @@ void fill_default_theme(Ref<Theme> &t, const Ref<Font> &default_font, const Ref< // ToolButton - Ref<StyleBox> tb_empty = memnew(StyleBoxEmpty); - tb_empty->set_default_margin(MARGIN_LEFT, 6 * scale); - tb_empty->set_default_margin(MARGIN_RIGHT, 6 * scale); - tb_empty->set_default_margin(MARGIN_TOP, 4 * scale); - tb_empty->set_default_margin(MARGIN_BOTTOM, 4 * scale); - - t->set_stylebox("normal", "ToolButton", tb_empty); - t->set_stylebox("pressed", "ToolButton", make_stylebox(button_pressed_png, 4, 4, 4, 4)); - t->set_stylebox("hover", "ToolButton", make_stylebox(button_normal_png, 4, 4, 4, 4)); - t->set_stylebox("disabled", "ToolButton", make_empty_stylebox(4, 4, 4, 4)); + t->set_stylebox("normal", "ToolButton", make_empty_stylebox(6, 4, 6, 4)); + t->set_stylebox("pressed", "ToolButton", make_stylebox(button_pressed_png, 4, 4, 4, 4, 6, 4, 6, 4)); + t->set_stylebox("hover", "ToolButton", make_stylebox(button_normal_png, 4, 4, 4, 4, 6, 4, 6, 4)); + t->set_stylebox("disabled", "ToolButton", make_empty_stylebox(6, 4, 6, 4)); t->set_stylebox("focus", "ToolButton", focus); t->set_font("font", "ToolButton", default_font); @@ -538,10 +532,8 @@ void fill_default_theme(Ref<Theme> &t, const Ref<Font> &default_font, const Ref< // WindowDialog - Ref<StyleBoxTexture> style_pp_win = sb_expand(make_stylebox(popup_window_png, 10, 26, 10, 8), 8, 24, 8, 6); - t->set_stylebox("panel", "WindowDialog", style_pp_win); - t->set_constant("titlebar_height", "WindowDialog", 20 * scale); - t->set_constant("scaleborder_size", "WindowDialog", 4); + t->set_stylebox("panel", "WindowDialog", sb_expand(make_stylebox(popup_window_png, 10, 26, 10, 8), 8, 24, 8, 6)); + t->set_constant("scaleborder_size", "WindowDialog", 4 * scale); t->set_font("title_font", "WindowDialog", large_font); t->set_color("title_color", "WindowDialog", Color(0, 0, 0)); diff --git a/scene/resources/packed_scene.cpp b/scene/resources/packed_scene.cpp index 7738157330..50fbb6a162 100644 --- a/scene/resources/packed_scene.cpp +++ b/scene/resources/packed_scene.cpp @@ -1775,7 +1775,7 @@ void PackedScene::set_path(const String &p_path, bool p_take_over) { void PackedScene::_bind_methods() { ClassDB::bind_method(D_METHOD("pack", "path:Node"), &PackedScene::pack); - ClassDB::bind_method(D_METHOD("instance:Node", "edit_state"), &PackedScene::instance, DEFVAL(false)); + ClassDB::bind_method(D_METHOD("instance:Node", "edit_state"), &PackedScene::instance, DEFVAL(GEN_EDIT_STATE_DISABLED)); ClassDB::bind_method(D_METHOD("can_instance"), &PackedScene::can_instance); ClassDB::bind_method(D_METHOD("_set_bundled_scene"), &PackedScene::_set_bundled_scene); ClassDB::bind_method(D_METHOD("_get_bundled_scene"), &PackedScene::_get_bundled_scene); diff --git a/scene/resources/style_box.cpp b/scene/resources/style_box.cpp index 35158806ca..13529c8572 100644 --- a/scene/resources/style_box.cpp +++ b/scene/resources/style_box.cpp @@ -138,6 +138,11 @@ void StyleBoxTexture::draw(RID p_canvas_item, const Rect2 &p_rect) const { texture->get_rect_region(rect, src_rect, rect, src_rect); + rect.pos.x -= expand_margin[MARGIN_LEFT]; + rect.pos.y -= expand_margin[MARGIN_TOP]; + rect.size.x += expand_margin[MARGIN_LEFT] + expand_margin[MARGIN_RIGHT]; + rect.size.y += expand_margin[MARGIN_TOP] + expand_margin[MARGIN_BOTTOM]; + VisualServer::get_singleton()->canvas_item_add_nine_patch(p_canvas_item, rect, src_rect, texture->get_rid(), Vector2(margin[MARGIN_LEFT], margin[MARGIN_TOP]), Vector2(margin[MARGIN_RIGHT], margin[MARGIN_BOTTOM]), VS::NINE_PATCH_STRETCH, VS::NINE_PATCH_STRETCH, draw_center, modulate); } diff --git a/scene/resources/texture.cpp b/scene/resources/texture.cpp index 0889306bad..f0ac30a76e 100644 --- a/scene/resources/texture.cpp +++ b/scene/resources/texture.cpp @@ -459,25 +459,27 @@ Error StreamTexture::_load_data(const String &p_path, int &tw, int &th, int &fla flags = f->get_32(); //texture flags! uint32_t df = f->get_32(); //data format + /* print_line("width: " + itos(tw)); print_line("height: " + itos(th)); print_line("flags: " + itos(flags)); print_line("df: " + itos(df)); + */ if (request_3d_callback && df & FORMAT_BIT_DETECT_3D) { - print_line("request detect 3D at " + p_path); + //print_line("request detect 3D at " + p_path); VS::get_singleton()->texture_set_detect_3d_callback(texture, _requested_3d, this); } else { - print_line("not requesting detect 3D at " + p_path); + //print_line("not requesting detect 3D at " + p_path); VS::get_singleton()->texture_set_detect_3d_callback(texture, NULL, NULL); } if (request_srgb_callback && df & FORMAT_BIT_DETECT_SRGB) { - print_line("request detect srgb at " + p_path); + //print_line("request detect srgb at " + p_path); VS::get_singleton()->texture_set_detect_srgb_callback(texture, _requested_srgb, this); } else { + //print_line("not requesting detect srgb at " + p_path); VS::get_singleton()->texture_set_detect_srgb_callback(texture, NULL, NULL); - print_line("not requesting detect srgb at " + p_path); } if (!(df & FORMAT_BIT_STREAM)) { @@ -493,7 +495,7 @@ Error StreamTexture::_load_data(const String &p_path, int &tw, int &th, int &fla uint32_t mipmaps = f->get_32(); uint32_t size = f->get_32(); - print_line("mipmaps: " + itos(mipmaps)); + //print_line("mipmaps: " + itos(mipmaps)); while (mipmaps > 1 && p_size_limit > 0 && (sw > p_size_limit || sh > p_size_limit)) { @@ -539,7 +541,7 @@ Error StreamTexture::_load_data(const String &p_path, int &tw, int &th, int &fla mipmap_images.push_back(img); } - print_line("mipmap read total: " + itos(mipmap_images.size())); + //print_line("mipmap read total: " + itos(mipmap_images.size())); memdelete(f); //no longer needed @@ -626,7 +628,7 @@ Error StreamTexture::_load_data(const String &p_path, int &tw, int &th, int &fla { PoolVector<uint8_t>::Write w = img_data.write(); int bytes = f->get_buffer(w.ptr(), total_size - ofs); - print_line("requested read: " + itos(total_size - ofs) + " but got: " + itos(bytes)); + //print_line("requested read: " + itos(total_size - ofs) + " but got: " + itos(bytes)); memdelete(f); diff --git a/servers/audio_server.cpp b/servers/audio_server.cpp index 1b1ed45862..f3bba4ae90 100644 --- a/servers/audio_server.cpp +++ b/servers/audio_server.cpp @@ -761,6 +761,10 @@ void AudioServer::finish() { } buses.clear(); + + if (AudioDriver::get_singleton()) { + AudioDriver::get_singleton()->finish(); + } } void AudioServer::update() { } diff --git a/servers/physics/body_sw.cpp b/servers/physics/body_sw.cpp index 9def425f28..715f93c1c1 100644 --- a/servers/physics/body_sw.cpp +++ b/servers/physics/body_sw.cpp @@ -495,7 +495,7 @@ void BodySW::integrate_forces(real_t p_step) { Vector3 axis; real_t angle; - rot.get_axis_and_angle(axis, angle); + rot.get_axis_angle(axis, angle); axis.normalize(); angular_velocity = axis.normalized() * (angle / p_step); @@ -638,7 +638,7 @@ void BodySW::simulate_motion(const Transform& p_xform,real_t p_step) { Vector3 axis; real_t angle; - rot.get_axis_and_angle(axis,angle); + rot.get_axis_angle(axis,angle); axis.normalize(); angular_velocity=axis.normalized() * (angle/p_step); linear_velocity = (p_xform.origin - get_transform().origin)/p_step; |