diff options
490 files changed, 35891 insertions, 15089 deletions
diff --git a/.gitignore b/.gitignore index b347b348a5..0de1e682a0 100644 --- a/.gitignore +++ b/.gitignore @@ -88,6 +88,9 @@ bld/ [Tt]est[Rr]esult*/ [Bb]uild[Ll]og.* +# Hints for improving IntelliSense, created together with VS project +cpp.hint + #NUNIT *.VisualState.xml TestResult.xml diff --git a/AUTHORS.md b/AUTHORS.md index 3fd8227fa7..588ce97322 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -30,16 +30,20 @@ name is available. Alexander Holland (AlexHolly) Alexey Velikiy (jonyrock) Alket Rexhepi (alketii) + Andrea Catania (AndreaCatania) Andreas Haas (Hinsbart) Anton Yabchinskiy (a12n) Aren Villanueva (kurikaesu) Ariel Manzur (punto-) Bastiaan Olij (BastiaanOlij) + Ben Brookshire (sheepandshepherd) + Bernard Liebl (poke1024) Bojidar Marinov (bojidar-bg) BÅ‚ażej SzczygieÅ‚ (zaps166) Carl Olsson (not-surt) Dana Olson (adolson) Daniel J. Ramirez (djrm) + Дмитрий Сальников (DmitriySalnikov) Emmanuel Leblond (touilleMan) Fabio Alessandrelli (Faless) Ferenc Arn (tagcup) @@ -54,6 +58,7 @@ name is available. Hiroshi Ogawa (hi-ogawa) Hubert Jarosz (Marqin) Hugo Locurcio (Calinou) + Ian (ianb96) Ignacio Etcheverry (neikeq) Indah Sylvia (ISylvox) J08nY @@ -69,6 +74,8 @@ name is available. Mariano Javier Suligoy (MarianoGnu) Mario Schlack (hurikhan) Masoud BH (masoudbh3) + Matthias Hölzl (hoelzl) + Max Hilbrunner (mhilbrunner) Nathan Warden (NathanWarden) Nuno Donato (nunodonato) Ovnuniarchos @@ -77,6 +84,7 @@ name is available. Pawel Kowal (pkowal1982) Pedro J. Estébanez (RandomShaper) Poommetee Ketson (Noshyaar) + PrzemysÅ‚aw GoÅ‚Ä…b (n-pigeon) Ralf Hölzemer (rollenrolm) Ramesh Ravone (RameshRavone) Ray Koopa (RayKoopa) @@ -17,32 +17,35 @@ None so far, but your company could be the first! :) ## Gold sponsors Gamblify <https://www.gamblify.com> + GameDev.TV <https://www.gamedev.tv> ## Mini sponsors Andreas Andreas Hirschauer Christian Uldall Pedersen + Christoph Woinke E Hewert Hein-Pieter van Braam Matthieu Huvé Nathan Warden Neal Gompa (Conan Kudo) Olimpiu Metiu + Pascal Julien Ruslan Mustakov Slobodan Milnovic ## Gold donors + 3Dexplorer Alexander Otto + Andy Meier Asdf - Blair Allen cheese65536 Jake Bo Javier Manuele Finocchiaro Officine Pixel S.n.c. - Ranoller Rémi Verschelde Stephan Lanfermann @@ -50,8 +53,10 @@ None so far, but your company could be the first! :) Austen McRae Bernhard Liebl Gerald E Butler + Jahn Johansen Jordan M Lucas Kris Michael + Ranoller BanjoNode2D Chris Serino @@ -63,7 +68,6 @@ None so far, but your company could be the first! :) Henrique Alves Laurence Bannister Leo - mhilbrunner PrzemysÅ‚aw GoÅ‚Ä…b (n-pigeon) Robert Willes Robin Arys @@ -72,9 +76,12 @@ None so far, but your company could be the first! :) Testus Maximus Thomas Bjarnelöf Xavier Tan + Zaq Poi Amanda Haldy Andreas Haas + Andres Cuevas + Arnaud Verstuyf Bryanna M Chris Brown Cody Parker @@ -82,16 +89,16 @@ None so far, but your company could be the first! :) Ezra Theunissen flesk François Cantin + Giovanni Solimeno Hendrik Mans Jeppe Zapp Justin Arnold Justo Delgado Baudà Leandro Voltolino Lucien Boudy - Myles Noah + Ryan Estes Trent McPheron - x1212 ## Silver donors @@ -102,23 +109,36 @@ None so far, but your company could be the first! :) Avencherus Bastian Böhm Ben Vercammen + Blair Allen Bryan Stevenson Christian Baune Christian Winter Collin Shooltz + Daniel Kaplan + David Cravens + David May + Diego Moreira Guimarães Dominik Wetzel + Eric Martini Fabian Becker fengjiongmax - Fredy Romero Sam + Frank C. Simmons Geequlim Gerrit Großkopf Guldoman + Gustav Dahlström + HardRound hatniX HeartBeast Heribert Hirth Hunter Jones + Jaime Ruiz-Borau Vizárraga + Jeff Hungerford + Jesse Liles + joe513 Jonathon Josh 'Cheeseness' Bush + Juan Negrier JuDelCo Julian Murgia Juraj Móza @@ -127,6 +147,7 @@ None so far, but your company could be the first! :) Kevin Kamper Meejach Petersen Klavdij Voncina Kobi Malul + Linus Lind Lundgren Lisandro Lorea magodev Martin Novák @@ -134,7 +155,9 @@ None so far, but your company could be the first! :) Matthew Valancy Matthias Hölzl Max R.R. Collada + mhilbrunner Michael Gringauz + Michael Tintiuc Mikael Olsson MoM Moritz Laass @@ -142,9 +165,10 @@ None so far, but your company could be the first! :) Neil Blakey-Milner Nik Lee Niko Leopold - nvgrod + Oleg Tyshchenko Pablo Seibelt Pan Ip + Pat LaBine Patrick Nafarrete Paul Mason PaweÅ‚ Kowal @@ -153,17 +177,15 @@ None so far, but your company could be the first! :) rayos Richman Stewart Roger Smith - Ryan Estes + Roman Tinkov Sam Van Campenhout - Sam Vila Sasori Olkof Scott D. Yelich Sootstone - Tavo Tell TheHappieCat Theo Cranmore + Thomas Norman Tom Larrow - Troy Bonneau UltyX Wout Standaert Xananax & karroffel diff --git a/SConstruct b/SConstruct index 10982211ac..61edb1233b 100644 --- a/SConstruct +++ b/SConstruct @@ -22,6 +22,7 @@ platform_flags = {} # flags for each platform active_platforms = [] active_platform_ids = [] platform_exporters = [] +platform_apis = [] global_defaults = [] for x in glob.glob("platform/*"): @@ -34,6 +35,8 @@ for x in glob.glob("platform/*"): if (os.path.exists(x + "/export/export.cpp")): platform_exporters.append(x[9:]) + if (os.path.exists(x + "/api/api.cpp")): + platform_apis.append(x[9:]) if (os.path.exists(x + "/globals/global_defaults.cpp")): global_defaults.append(x[9:]) if (detect.is_active()): @@ -215,6 +218,7 @@ env_base.Append(CPPPATH=['#core', '#core/math', '#editor', '#drivers', '#']) # configure ENV for platform env_base.platform_exporters = platform_exporters +env_base.platform_apis = platform_apis """ sys.path.append("./platform/"+env_base["platform"]) @@ -322,6 +326,8 @@ if selected_platform in platform_list: env.Append(CCFLAGS=['/W2'] + disable_nonessential_warnings) else: # 'no' env.Append(CCFLAGS=['/w']) + # Set exception handling model to avoid warnings caused by Windows system headers. + env.Append(CCFLAGS=['/EHsc']) else: # Rest of the world if (env["warnings"] == 'extra'): env.Append(CCFLAGS=['-Wall', '-Wextra']) @@ -438,6 +444,7 @@ if selected_platform in platform_list: SConscript("editor/SCsub") SConscript("drivers/SCsub") + SConscript("platform/SCsub") SConscript("modules/SCsub") SConscript("main/SCsub") @@ -447,6 +454,7 @@ if selected_platform in platform_list: if env['vsproj']: env['CPPPATH'] = [Dir(path) for path in env['CPPPATH']] methods.generate_vs_project(env, GetOption("num_jobs")) + methods.generate_cpp_hint_file("cpp.hint") # Check for the existence of headers conf = Configure(env) diff --git a/core/array.cpp b/core/array.cpp index 171c11776c..b7d4ae413a 100644 --- a/core/array.cpp +++ b/core/array.cpp @@ -265,6 +265,49 @@ Array &Array::sort_custom(Object *p_obj, const StringName &p_function) { return *this; } +template <typename Less> +_FORCE_INLINE_ int bisect(const Vector<Variant> &p_array, const Variant &p_value, bool p_before, const Less &p_less) { + + int lo = 0; + int hi = p_array.size(); + if (p_before) { + while (lo < hi) { + const int mid = (lo + hi) / 2; + if (p_less(p_array.get(mid), p_value)) { + lo = mid + 1; + } else { + hi = mid; + } + } + } else { + while (lo < hi) { + const int mid = (lo + hi) / 2; + if (p_less(p_value, p_array.get(mid))) { + hi = mid; + } else { + lo = mid + 1; + } + } + } + return lo; +} + +int Array::bsearch(const Variant &p_value, bool p_before) { + + return bisect(_p->array, p_value, p_before, _ArrayVariantSort()); +} + +int Array::bsearch_custom(const Variant &p_value, Object *p_obj, const StringName &p_function, bool p_before) { + + ERR_FAIL_NULL_V(p_obj, 0); + + _ArrayVariantSortCustom less; + less.obj = p_obj; + less.func = p_function; + + return bisect(_p->array, p_value, p_before, less); +} + Array &Array::invert() { _p->array.invert(); diff --git a/core/array.h b/core/array.h index 2c29103108..3d70a31d2f 100644 --- a/core/array.h +++ b/core/array.h @@ -70,6 +70,8 @@ public: Array &sort(); Array &sort_custom(Object *p_obj, const StringName &p_function); + int bsearch(const Variant &p_value, bool p_before = true); + int bsearch_custom(const Variant &p_value, Object *p_obj, const StringName &p_function, bool p_before = true); Array &invert(); int find(const Variant &p_value, int p_from = 0) const; diff --git a/core/bind/core_bind.cpp b/core/bind/core_bind.cpp index e1adb250e7..999befaf67 100644 --- a/core/bind/core_bind.cpp +++ b/core/bind/core_bind.cpp @@ -888,9 +888,9 @@ void _OS::dump_resources_to_file(const String &p_file) { OS::get_singleton()->dump_resources_to_file(p_file.utf8().get_data()); } -String _OS::get_data_dir() const { +String _OS::get_user_data_dir() const { - return OS::get_singleton()->get_data_dir(); + return OS::get_singleton()->get_user_data_dir(); }; Error _OS::native_video_play(String p_path, float p_volume, String p_audio_track, String p_subtitle_track) { @@ -1088,7 +1088,7 @@ void _OS::_bind_methods() { ClassDB::bind_method(D_METHOD("get_static_memory_peak_usage"), &_OS::get_static_memory_peak_usage); ClassDB::bind_method(D_METHOD("get_dynamic_memory_usage"), &_OS::get_dynamic_memory_usage); - ClassDB::bind_method(D_METHOD("get_data_dir"), &_OS::get_data_dir); + ClassDB::bind_method(D_METHOD("get_user_data_dir"), &_OS::get_user_data_dir); ClassDB::bind_method(D_METHOD("get_system_dir", "dir"), &_OS::get_system_dir); ClassDB::bind_method(D_METHOD("get_unique_id"), &_OS::get_unique_id); diff --git a/core/bind/core_bind.h b/core/bind/core_bind.h index 9be8895443..8163b08d76 100644 --- a/core/bind/core_bind.h +++ b/core/bind/core_bind.h @@ -297,7 +297,7 @@ public: String get_system_dir(SystemDir p_dir) const; - String get_data_dir() const; + String get_user_data_dir() const; void alert(const String &p_alert, const String &p_title = "ALERT!"); diff --git a/core/color.h b/core/color.h index 972b6a1b33..da2bfdcd98 100644 --- a/core/color.h +++ b/core/color.h @@ -101,6 +101,24 @@ struct Color { return res; } + _FORCE_INLINE_ Color darkened(float p_amount) const { + + Color res = *this; + res.r = CLAMP(res.r * (1.0f - p_amount), 0.0, 1.0); + res.g = CLAMP(res.g * (1.0f - p_amount), 0.0, 1.0); + res.b = CLAMP(res.b * (1.0f - p_amount), 0.0, 1.0); + return res; + } + + _FORCE_INLINE_ Color lightened(float p_amount) const { + + Color res = *this; + res.r = CLAMP(res.r + (1.0f - res.r) * p_amount, 0.0, 1.0); + res.g = CLAMP(res.g + (1.0f - res.g) * p_amount, 0.0, 1.0); + res.b = CLAMP(res.b + (1.0f - res.b) * p_amount, 0.0, 1.0); + return res; + } + _FORCE_INLINE_ uint32_t to_rgbe9995() const { const float pow2to9 = 512.0f; diff --git a/core/command_queue_mt.cpp b/core/command_queue_mt.cpp index 8e2aa24c22..2028a18a06 100644 --- a/core/command_queue_mt.cpp +++ b/core/command_queue_mt.cpp @@ -76,6 +76,30 @@ CommandQueueMT::SyncSemaphore *CommandQueueMT::_alloc_sync_sem() { return &sync_sems[idx]; } +bool CommandQueueMT::dealloc_one() { +tryagain: + if (dealloc_ptr == write_ptr) { + // The queue is empty + return false; + } + + uint32_t size = *(uint32_t *)&command_mem[dealloc_ptr]; + + if (size == 0) { + // End of command buffer wrap down + dealloc_ptr = 0; + goto tryagain; + } + + if (size & 1) { + // Still used, nothing can be deallocated + return false; + } + + dealloc_ptr += (size >> 1) + sizeof(uint32_t); + return true; +} + CommandQueueMT::CommandQueueMT(bool p_sync) { read_ptr = 0; diff --git a/core/command_queue_mt.h b/core/command_queue_mt.h index e37d593f9f..697fec3fc4 100644 --- a/core/command_queue_mt.h +++ b/core/command_queue_mt.h @@ -39,6 +39,230 @@ @author Juan Linietsky <reduzio@gmail.com> */ +#define COMMA(N) _COMMA_##N +#define _COMMA_0 +#define _COMMA_1 , +#define _COMMA_2 , +#define _COMMA_3 , +#define _COMMA_4 , +#define _COMMA_5 , +#define _COMMA_6 , +#define _COMMA_7 , +#define _COMMA_8 , +#define _COMMA_9 , +#define _COMMA_10 , +#define _COMMA_11 , +#define _COMMA_12 , + +// 1-based comma separed list of ITEMs +#define COMMA_SEP_LIST(ITEM, LENGTH) _COMMA_SEP_LIST_##LENGTH(ITEM) +#define _COMMA_SEP_LIST_12(ITEM) \ + _COMMA_SEP_LIST_11(ITEM) \ + , ITEM(12) +#define _COMMA_SEP_LIST_11(ITEM) \ + _COMMA_SEP_LIST_10(ITEM) \ + , ITEM(11) +#define _COMMA_SEP_LIST_10(ITEM) \ + _COMMA_SEP_LIST_9(ITEM) \ + , ITEM(10) +#define _COMMA_SEP_LIST_9(ITEM) \ + _COMMA_SEP_LIST_8(ITEM) \ + , ITEM(9) +#define _COMMA_SEP_LIST_8(ITEM) \ + _COMMA_SEP_LIST_7(ITEM) \ + , ITEM(8) +#define _COMMA_SEP_LIST_7(ITEM) \ + _COMMA_SEP_LIST_6(ITEM) \ + , ITEM(7) +#define _COMMA_SEP_LIST_6(ITEM) \ + _COMMA_SEP_LIST_5(ITEM) \ + , ITEM(6) +#define _COMMA_SEP_LIST_5(ITEM) \ + _COMMA_SEP_LIST_4(ITEM) \ + , ITEM(5) +#define _COMMA_SEP_LIST_4(ITEM) \ + _COMMA_SEP_LIST_3(ITEM) \ + , ITEM(4) +#define _COMMA_SEP_LIST_3(ITEM) \ + _COMMA_SEP_LIST_2(ITEM) \ + , ITEM(3) +#define _COMMA_SEP_LIST_2(ITEM) \ + _COMMA_SEP_LIST_1(ITEM) \ + , ITEM(2) +#define _COMMA_SEP_LIST_1(ITEM) \ + _COMMA_SEP_LIST_0(ITEM) \ + ITEM(1) +#define _COMMA_SEP_LIST_0(ITEM) + +// 1-based semicolon separed list of ITEMs +#define SEMIC_SEP_LIST(ITEM, LENGTH) _SEMIC_SEP_LIST_##LENGTH(ITEM) +#define _SEMIC_SEP_LIST_12(ITEM) \ + _SEMIC_SEP_LIST_11(ITEM); \ + ITEM(12) +#define _SEMIC_SEP_LIST_11(ITEM) \ + _SEMIC_SEP_LIST_10(ITEM); \ + ITEM(11) +#define _SEMIC_SEP_LIST_10(ITEM) \ + _SEMIC_SEP_LIST_9(ITEM); \ + ITEM(10) +#define _SEMIC_SEP_LIST_9(ITEM) \ + _SEMIC_SEP_LIST_8(ITEM); \ + ITEM(9) +#define _SEMIC_SEP_LIST_8(ITEM) \ + _SEMIC_SEP_LIST_7(ITEM); \ + ITEM(8) +#define _SEMIC_SEP_LIST_7(ITEM) \ + _SEMIC_SEP_LIST_6(ITEM); \ + ITEM(7) +#define _SEMIC_SEP_LIST_6(ITEM) \ + _SEMIC_SEP_LIST_5(ITEM); \ + ITEM(6) +#define _SEMIC_SEP_LIST_5(ITEM) \ + _SEMIC_SEP_LIST_4(ITEM); \ + ITEM(5) +#define _SEMIC_SEP_LIST_4(ITEM) \ + _SEMIC_SEP_LIST_3(ITEM); \ + ITEM(4) +#define _SEMIC_SEP_LIST_3(ITEM) \ + _SEMIC_SEP_LIST_2(ITEM); \ + ITEM(3) +#define _SEMIC_SEP_LIST_2(ITEM) \ + _SEMIC_SEP_LIST_1(ITEM); \ + ITEM(2) +#define _SEMIC_SEP_LIST_1(ITEM) \ + _SEMIC_SEP_LIST_0(ITEM) \ + ITEM(1) +#define _SEMIC_SEP_LIST_0(ITEM) + +// 1-based space separed list of ITEMs +#define SPACE_SEP_LIST(ITEM, LENGTH) _SPACE_SEP_LIST_##LENGTH(ITEM) +#define _SPACE_SEP_LIST_12(ITEM) \ + _SPACE_SEP_LIST_11(ITEM) \ + ITEM(12) +#define _SPACE_SEP_LIST_11(ITEM) \ + _SPACE_SEP_LIST_10(ITEM) \ + ITEM(11) +#define _SPACE_SEP_LIST_10(ITEM) \ + _SPACE_SEP_LIST_9(ITEM) \ + ITEM(10) +#define _SPACE_SEP_LIST_9(ITEM) \ + _SPACE_SEP_LIST_8(ITEM) \ + ITEM(9) +#define _SPACE_SEP_LIST_8(ITEM) \ + _SPACE_SEP_LIST_7(ITEM) \ + ITEM(8) +#define _SPACE_SEP_LIST_7(ITEM) \ + _SPACE_SEP_LIST_6(ITEM) \ + ITEM(7) +#define _SPACE_SEP_LIST_6(ITEM) \ + _SPACE_SEP_LIST_5(ITEM) \ + ITEM(6) +#define _SPACE_SEP_LIST_5(ITEM) \ + _SPACE_SEP_LIST_4(ITEM) \ + ITEM(5) +#define _SPACE_SEP_LIST_4(ITEM) \ + _SPACE_SEP_LIST_3(ITEM) \ + ITEM(4) +#define _SPACE_SEP_LIST_3(ITEM) \ + _SPACE_SEP_LIST_2(ITEM) \ + ITEM(3) +#define _SPACE_SEP_LIST_2(ITEM) \ + _SPACE_SEP_LIST_1(ITEM) \ + ITEM(2) +#define _SPACE_SEP_LIST_1(ITEM) \ + _SPACE_SEP_LIST_0(ITEM) \ + ITEM(1) +#define _SPACE_SEP_LIST_0(ITEM) + +#define ARG(N) p##N +#define PARAM(N) P##N p##N +#define TYPE_PARAM(N) class P##N +#define PARAM_DECL(N) typename GetSimpleTypeT<P##N>::type_t p##N + +#define DECL_CMD(N) \ + template <class T, class M COMMA(N) COMMA_SEP_LIST(TYPE_PARAM, N)> \ + struct Command##N : public CommandBase { \ + T *instance; \ + M method; \ + SEMIC_SEP_LIST(PARAM_DECL, N); \ + virtual void call() { \ + (instance->*method)(COMMA_SEP_LIST(ARG, N)); \ + } \ + }; + +#define DECL_CMD_RET(N) \ + template <class T, class M, COMMA_SEP_LIST(TYPE_PARAM, N) COMMA(N) class R> \ + struct CommandRet##N : public SyncCommand { \ + R *ret; \ + T *instance; \ + M method; \ + SEMIC_SEP_LIST(PARAM_DECL, N); \ + virtual void call() { \ + *ret = (instance->*method)(COMMA_SEP_LIST(ARG, N)); \ + } \ + }; + +#define DECL_CMD_SYNC(N) \ + template <class T, class M COMMA(N) COMMA_SEP_LIST(TYPE_PARAM, N)> \ + struct CommandSync##N : public SyncCommand { \ + T *instance; \ + M method; \ + SEMIC_SEP_LIST(PARAM_DECL, N); \ + virtual void call() { \ + (instance->*method)(COMMA_SEP_LIST(ARG, N)); \ + } \ + }; + +#define TYPE_ARG(N) P##N +#define CMD_TYPE(N) Command##N<T, M COMMA(N) COMMA_SEP_LIST(TYPE_ARG, N)> +#define CMD_ASSIGN_PARAM(N) cmd->p##N = p##N + +#define DECL_PUSH(N) \ + template <class T, class M COMMA(N) COMMA_SEP_LIST(TYPE_PARAM, N)> \ + void push(T *p_instance, M p_method COMMA(N) COMMA_SEP_LIST(PARAM, N)) { \ + CMD_TYPE(N) *cmd = allocate_and_lock<CMD_TYPE(N)>(); \ + cmd->instance = p_instance; \ + cmd->method = p_method; \ + SEMIC_SEP_LIST(CMD_ASSIGN_PARAM, N); \ + unlock(); \ + if (sync) sync->post(); \ + } + +#define CMD_RET_TYPE(N) CommandRet##N<T, M, COMMA_SEP_LIST(TYPE_ARG, N) COMMA(N) R> + +#define DECL_PUSH_AND_RET(N) \ + template <class T, class M, COMMA_SEP_LIST(TYPE_PARAM, N) COMMA(N) class R> \ + void push_and_ret(T *p_instance, M p_method, COMMA_SEP_LIST(PARAM, N) COMMA(N) R *r_ret) { \ + SyncSemaphore *ss = _alloc_sync_sem(); \ + CMD_RET_TYPE(N) *cmd = allocate_and_lock<CMD_RET_TYPE(N)>(); \ + cmd->instance = p_instance; \ + cmd->method = p_method; \ + SEMIC_SEP_LIST(CMD_ASSIGN_PARAM, N); \ + cmd->ret = r_ret; \ + cmd->sync_sem = ss; \ + unlock(); \ + if (sync) sync->post(); \ + ss->sem->wait(); \ + } + +#define CMD_SYNC_TYPE(N) CommandSync##N<T, M COMMA(N) COMMA_SEP_LIST(TYPE_ARG, N)> + +#define DECL_PUSH_AND_SYNC(N) \ + template <class T, class M COMMA(N) COMMA_SEP_LIST(TYPE_PARAM, N)> \ + void push_and_sync(T *p_instance, M p_method COMMA(N) COMMA_SEP_LIST(PARAM, N)) { \ + SyncSemaphore *ss = _alloc_sync_sem(); \ + CMD_SYNC_TYPE(N) *cmd = allocate_and_lock<CMD_SYNC_TYPE(N)>(); \ + cmd->instance = p_instance; \ + cmd->method = p_method; \ + SEMIC_SEP_LIST(CMD_ASSIGN_PARAM, N); \ + cmd->sync_sem = ss; \ + unlock(); \ + if (sync) sync->post(); \ + ss->sem->wait(); \ + } + +#define MAX_CMD_PARAMS 12 + class CommandQueueMT { struct SyncSemaphore { @@ -50,556 +274,35 @@ class CommandQueueMT { struct CommandBase { virtual void call() = 0; + virtual void post(){}; virtual ~CommandBase(){}; }; - template <class T, class M> - struct Command0 : public CommandBase { - - T *instance; - M method; - - virtual void call() { (instance->*method)(); } - }; - - template <class T, class M, class P1> - struct Command1 : public CommandBase { - - T *instance; - M method; - typename GetSimpleTypeT<P1>::type_t p1; - - virtual void call() { (instance->*method)(p1); } - }; - - template <class T, class M, class P1, class P2> - struct Command2 : public CommandBase { - - T *instance; - M method; - typename GetSimpleTypeT<P1>::type_t p1; - typename GetSimpleTypeT<P2>::type_t p2; - - virtual void call() { (instance->*method)(p1, p2); } - }; - - template <class T, class M, class P1, class P2, class P3> - struct Command3 : public CommandBase { - - T *instance; - M method; - typename GetSimpleTypeT<P1>::type_t p1; - typename GetSimpleTypeT<P2>::type_t p2; - typename GetSimpleTypeT<P3>::type_t p3; - - virtual void call() { (instance->*method)(p1, p2, p3); } - }; - - template <class T, class M, class P1, class P2, class P3, class P4> - struct Command4 : public CommandBase { - - T *instance; - M method; - typename GetSimpleTypeT<P1>::type_t p1; - typename GetSimpleTypeT<P2>::type_t p2; - typename GetSimpleTypeT<P3>::type_t p3; - typename GetSimpleTypeT<P4>::type_t p4; - - virtual void call() { (instance->*method)(p1, p2, p3, p4); } - }; - - template <class T, class M, class P1, class P2, class P3, class P4, class P5> - struct Command5 : public CommandBase { - - T *instance; - M method; - typename GetSimpleTypeT<P1>::type_t p1; - typename GetSimpleTypeT<P2>::type_t p2; - typename GetSimpleTypeT<P3>::type_t p3; - typename GetSimpleTypeT<P4>::type_t p4; - typename GetSimpleTypeT<P5>::type_t p5; - - virtual void call() { (instance->*method)(p1, p2, p3, p4, p5); } - }; - - template <class T, class M, class P1, class P2, class P3, class P4, class P5, class P6> - struct Command6 : public CommandBase { - - T *instance; - M method; - typename GetSimpleTypeT<P1>::type_t p1; - typename GetSimpleTypeT<P2>::type_t p2; - typename GetSimpleTypeT<P3>::type_t p3; - typename GetSimpleTypeT<P4>::type_t p4; - typename GetSimpleTypeT<P5>::type_t p5; - typename GetSimpleTypeT<P6>::type_t p6; - - virtual void call() { (instance->*method)(p1, p2, p3, p4, p5, p6); } - }; - - template <class T, class M, class P1, class P2, class P3, class P4, class P5, class P6, class P7> - struct Command7 : public CommandBase { - - T *instance; - M method; - typename GetSimpleTypeT<P1>::type_t p1; - typename GetSimpleTypeT<P2>::type_t p2; - typename GetSimpleTypeT<P3>::type_t p3; - typename GetSimpleTypeT<P4>::type_t p4; - typename GetSimpleTypeT<P5>::type_t p5; - typename GetSimpleTypeT<P6>::type_t p6; - typename GetSimpleTypeT<P7>::type_t p7; - - virtual void call() { (instance->*method)(p1, p2, p3, p4, p5, p6, p7); } - }; - - template <class T, class M, class P1, class P2, class P3, class P4, class P5, class P6, class P7, class P8> - struct Command8 : public CommandBase { - - T *instance; - M method; - typename GetSimpleTypeT<P1>::type_t p1; - typename GetSimpleTypeT<P2>::type_t p2; - typename GetSimpleTypeT<P3>::type_t p3; - typename GetSimpleTypeT<P4>::type_t p4; - typename GetSimpleTypeT<P5>::type_t p5; - typename GetSimpleTypeT<P6>::type_t p6; - typename GetSimpleTypeT<P7>::type_t p7; - typename GetSimpleTypeT<P8>::type_t p8; - - virtual void call() { (instance->*method)(p1, p2, p3, p4, p5, p6, p7, p8); } - }; - - template <class T, class M, class P1, class P2, class P3, class P4, class P5, class P6, class P7, class P8, class P9> - struct Command9 : public CommandBase { - - T *instance; - M method; - typename GetSimpleTypeT<P1>::type_t p1; - typename GetSimpleTypeT<P2>::type_t p2; - typename GetSimpleTypeT<P3>::type_t p3; - typename GetSimpleTypeT<P4>::type_t p4; - typename GetSimpleTypeT<P5>::type_t p5; - typename GetSimpleTypeT<P6>::type_t p6; - typename GetSimpleTypeT<P7>::type_t p7; - typename GetSimpleTypeT<P8>::type_t p8; - typename GetSimpleTypeT<P9>::type_t p9; - - virtual void call() { (instance->*method)(p1, p2, p3, p4, p5, p6, p7, p8, p9); } - }; - - template <class T, class M, class P1, class P2, class P3, class P4, class P5, class P6, class P7, class P8, class P9, class P10> - struct Command10 : public CommandBase { - - T *instance; - M method; - typename GetSimpleTypeT<P1>::type_t p1; - typename GetSimpleTypeT<P2>::type_t p2; - typename GetSimpleTypeT<P3>::type_t p3; - typename GetSimpleTypeT<P4>::type_t p4; - typename GetSimpleTypeT<P5>::type_t p5; - typename GetSimpleTypeT<P6>::type_t p6; - typename GetSimpleTypeT<P7>::type_t p7; - typename GetSimpleTypeT<P8>::type_t p8; - typename GetSimpleTypeT<P9>::type_t p9; - typename GetSimpleTypeT<P10>::type_t p10; - - virtual void call() { (instance->*method)(p1, p2, p3, p4, p5, p6, p7, p8, p9, p10); } - }; - - template <class T, class M, class P1, class P2, class P3, class P4, class P5, class P6, class P7, class P8, class P9, class P10, class P11> - struct Command11 : public CommandBase { - - T *instance; - M method; - typename GetSimpleTypeT<P1>::type_t p1; - typename GetSimpleTypeT<P2>::type_t p2; - typename GetSimpleTypeT<P3>::type_t p3; - typename GetSimpleTypeT<P4>::type_t p4; - typename GetSimpleTypeT<P5>::type_t p5; - typename GetSimpleTypeT<P6>::type_t p6; - typename GetSimpleTypeT<P7>::type_t p7; - typename GetSimpleTypeT<P8>::type_t p8; - typename GetSimpleTypeT<P9>::type_t p9; - typename GetSimpleTypeT<P10>::type_t p10; - typename GetSimpleTypeT<P11>::type_t p11; - - virtual void call() { (instance->*method)(p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11); } - }; - - template <class T, class M, class P1, class P2, class P3, class P4, class P5, class P6, class P7, class P8, class P9, class P10, class P11, class P12> - struct Command12 : public CommandBase { - - T *instance; - M method; - typename GetSimpleTypeT<P1>::type_t p1; - typename GetSimpleTypeT<P2>::type_t p2; - typename GetSimpleTypeT<P3>::type_t p3; - typename GetSimpleTypeT<P4>::type_t p4; - typename GetSimpleTypeT<P5>::type_t p5; - typename GetSimpleTypeT<P6>::type_t p6; - typename GetSimpleTypeT<P7>::type_t p7; - typename GetSimpleTypeT<P8>::type_t p8; - typename GetSimpleTypeT<P9>::type_t p9; - typename GetSimpleTypeT<P10>::type_t p10; - typename GetSimpleTypeT<P11>::type_t p11; - typename GetSimpleTypeT<P12>::type_t p12; - - virtual void call() { (instance->*method)(p1, p2, p3, p4, p5, p6, p7, p8, p9, p10, p11, p12); } - }; - - /* comands that return */ - - template <class T, class M, class R> - struct CommandRet0 : public CommandBase { - - T *instance; - M method; - R *ret; - SyncSemaphore *sync; - - virtual void call() { - *ret = (instance->*method)(); - sync->sem->post(); - sync->in_use = false; - } - }; - - template <class T, class M, class P1, class R> - struct CommandRet1 : public CommandBase { - - T *instance; - M method; - typename GetSimpleTypeT<P1>::type_t p1; - R *ret; - SyncSemaphore *sync; - - virtual void call() { - *ret = (instance->*method)(p1); - sync->sem->post(); - sync->in_use = false; - } - }; - - template <class T, class M, class P1, class P2, class R> - struct CommandRet2 : public CommandBase { - - T *instance; - M method; - typename GetSimpleTypeT<P1>::type_t p1; - typename GetSimpleTypeT<P2>::type_t p2; - R *ret; - SyncSemaphore *sync; - - virtual void call() { - *ret = (instance->*method)(p1, p2); - sync->sem->post(); - sync->in_use = false; - } - }; - - template <class T, class M, class P1, class P2, class P3, class R> - struct CommandRet3 : public CommandBase { - - T *instance; - M method; - typename GetSimpleTypeT<P1>::type_t p1; - typename GetSimpleTypeT<P2>::type_t p2; - typename GetSimpleTypeT<P3>::type_t p3; - R *ret; - SyncSemaphore *sync; - - virtual void call() { - *ret = (instance->*method)(p1, p2, p3); - sync->sem->post(); - sync->in_use = false; - } - }; - - template <class T, class M, class P1, class P2, class P3, class P4, class R> - struct CommandRet4 : public CommandBase { - - T *instance; - M method; - typename GetSimpleTypeT<P1>::type_t p1; - typename GetSimpleTypeT<P2>::type_t p2; - typename GetSimpleTypeT<P3>::type_t p3; - typename GetSimpleTypeT<P4>::type_t p4; - R *ret; - SyncSemaphore *sync; - - virtual void call() { - *ret = (instance->*method)(p1, p2, p3, p4); - sync->sem->post(); - sync->in_use = false; - } - }; - - template <class T, class M, class P1, class P2, class P3, class P4, class P5, class R> - struct CommandRet5 : public CommandBase { - - T *instance; - M method; - typename GetSimpleTypeT<P1>::type_t p1; - typename GetSimpleTypeT<P2>::type_t p2; - typename GetSimpleTypeT<P3>::type_t p3; - typename GetSimpleTypeT<P4>::type_t p4; - typename GetSimpleTypeT<P5>::type_t p5; - R *ret; - SyncSemaphore *sync; - - virtual void call() { - *ret = (instance->*method)(p1, p2, p3, p4, p5); - sync->sem->post(); - sync->in_use = false; - } - }; - - template <class T, class M, class P1, class P2, class P3, class P4, class P5, class P6, class R> - struct CommandRet6 : public CommandBase { - - T *instance; - M method; - typename GetSimpleTypeT<P1>::type_t p1; - typename GetSimpleTypeT<P2>::type_t p2; - typename GetSimpleTypeT<P3>::type_t p3; - typename GetSimpleTypeT<P4>::type_t p4; - typename GetSimpleTypeT<P5>::type_t p5; - typename GetSimpleTypeT<P6>::type_t p6; - R *ret; - SyncSemaphore *sync; - - virtual void call() { - *ret = (instance->*method)(p1, p2, p3, p4, p5, p6); - sync->sem->post(); - sync->in_use = false; - } - }; + struct SyncCommand : public CommandBase { - template <class T, class M, class P1, class P2, class P3, class P4, class P5, class P6, class P7, class R> - struct CommandRet7 : public CommandBase { - - T *instance; - M method; - typename GetSimpleTypeT<P1>::type_t p1; - typename GetSimpleTypeT<P2>::type_t p2; - typename GetSimpleTypeT<P3>::type_t p3; - typename GetSimpleTypeT<P4>::type_t p4; - typename GetSimpleTypeT<P5>::type_t p5; - typename GetSimpleTypeT<P6>::type_t p6; - typename GetSimpleTypeT<P7>::type_t p7; - R *ret; - SyncSemaphore *sync; - - virtual void call() { - *ret = (instance->*method)(p1, p2, p3, p4, p5, p6, p7); - sync->sem->post(); - sync->in_use = false; - } - }; + SyncSemaphore *sync_sem; - template <class T, class M, class P1, class P2, class P3, class P4, class P5, class P6, class P7, class P8, class R> - struct CommandRet8 : public CommandBase { - - T *instance; - M method; - typename GetSimpleTypeT<P1>::type_t p1; - typename GetSimpleTypeT<P2>::type_t p2; - typename GetSimpleTypeT<P3>::type_t p3; - typename GetSimpleTypeT<P4>::type_t p4; - typename GetSimpleTypeT<P5>::type_t p5; - typename GetSimpleTypeT<P6>::type_t p6; - typename GetSimpleTypeT<P7>::type_t p7; - typename GetSimpleTypeT<P8>::type_t p8; - R *ret; - SyncSemaphore *sync; - - virtual void call() { - *ret = (instance->*method)(p1, p2, p3, p4, p5, p6, p7, p8); - sync->sem->post(); - sync->in_use = false; + virtual void post() { + sync_sem->sem->post(); + sync_sem->in_use = false; } }; - /** commands that don't return but sync */ + DECL_CMD(0) + SPACE_SEP_LIST(DECL_CMD, 12) /* comands that return */ + DECL_CMD_RET(0) + SPACE_SEP_LIST(DECL_CMD_RET, 12) - template <class T, class M> - struct CommandSync0 : public CommandBase { - - T *instance; - M method; - - SyncSemaphore *sync; - - virtual void call() { - (instance->*method)(); - sync->sem->post(); - sync->in_use = false; - } - }; - - template <class T, class M, class P1> - struct CommandSync1 : public CommandBase { - - T *instance; - M method; - typename GetSimpleTypeT<P1>::type_t p1; - - SyncSemaphore *sync; - - virtual void call() { - (instance->*method)(p1); - sync->sem->post(); - sync->in_use = false; - } - }; - - template <class T, class M, class P1, class P2> - struct CommandSync2 : public CommandBase { - - T *instance; - M method; - typename GetSimpleTypeT<P1>::type_t p1; - typename GetSimpleTypeT<P2>::type_t p2; - - SyncSemaphore *sync; - - virtual void call() { - (instance->*method)(p1, p2); - sync->sem->post(); - sync->in_use = false; - } - }; - - template <class T, class M, class P1, class P2, class P3> - struct CommandSync3 : public CommandBase { - - T *instance; - M method; - typename GetSimpleTypeT<P1>::type_t p1; - typename GetSimpleTypeT<P2>::type_t p2; - typename GetSimpleTypeT<P3>::type_t p3; - - SyncSemaphore *sync; - - virtual void call() { - (instance->*method)(p1, p2, p3); - sync->sem->post(); - sync->in_use = false; - } - }; - - template <class T, class M, class P1, class P2, class P3, class P4> - struct CommandSync4 : public CommandBase { - - T *instance; - M method; - typename GetSimpleTypeT<P1>::type_t p1; - typename GetSimpleTypeT<P2>::type_t p2; - typename GetSimpleTypeT<P3>::type_t p3; - typename GetSimpleTypeT<P4>::type_t p4; - - SyncSemaphore *sync; - - virtual void call() { - (instance->*method)(p1, p2, p3, p4); - sync->sem->post(); - sync->in_use = false; - } - }; - - template <class T, class M, class P1, class P2, class P3, class P4, class P5> - struct CommandSync5 : public CommandBase { - - T *instance; - M method; - typename GetSimpleTypeT<P1>::type_t p1; - typename GetSimpleTypeT<P2>::type_t p2; - typename GetSimpleTypeT<P3>::type_t p3; - typename GetSimpleTypeT<P4>::type_t p4; - typename GetSimpleTypeT<P5>::type_t p5; - - SyncSemaphore *sync; - - virtual void call() { - (instance->*method)(p1, p2, p3, p4, p5); - sync->sem->post(); - sync->in_use = false; - } - }; - - template <class T, class M, class P1, class P2, class P3, class P4, class P5, class P6> - struct CommandSync6 : public CommandBase { - - T *instance; - M method; - typename GetSimpleTypeT<P1>::type_t p1; - typename GetSimpleTypeT<P2>::type_t p2; - typename GetSimpleTypeT<P3>::type_t p3; - typename GetSimpleTypeT<P4>::type_t p4; - typename GetSimpleTypeT<P5>::type_t p5; - typename GetSimpleTypeT<P6>::type_t p6; - - SyncSemaphore *sync; - - virtual void call() { - (instance->*method)(p1, p2, p3, p4, p5, p6); - sync->sem->post(); - sync->in_use = false; - } - }; - - template <class T, class M, class P1, class P2, class P3, class P4, class P5, class P6, class P7> - struct CommandSync7 : public CommandBase { - - T *instance; - M method; - typename GetSimpleTypeT<P1>::type_t p1; - typename GetSimpleTypeT<P2>::type_t p2; - typename GetSimpleTypeT<P3>::type_t p3; - typename GetSimpleTypeT<P4>::type_t p4; - typename GetSimpleTypeT<P5>::type_t p5; - typename GetSimpleTypeT<P6>::type_t p6; - typename GetSimpleTypeT<P7>::type_t p7; - - SyncSemaphore *sync; - - virtual void call() { - (instance->*method)(p1, p2, p3, p4, p5, p6, p7); - sync->sem->post(); - sync->in_use = false; - } - }; - - template <class T, class M, class P1, class P2, class P3, class P4, class P5, class P6, class P7, class P8> - struct CommandSync8 : public CommandBase { - - T *instance; - M method; - typename GetSimpleTypeT<P1>::type_t p1; - typename GetSimpleTypeT<P2>::type_t p2; - typename GetSimpleTypeT<P3>::type_t p3; - typename GetSimpleTypeT<P4>::type_t p4; - typename GetSimpleTypeT<P5>::type_t p5; - typename GetSimpleTypeT<P6>::type_t p6; - typename GetSimpleTypeT<P7>::type_t p7; - typename GetSimpleTypeT<P8>::type_t p8; - - SyncSemaphore *sync; - - virtual void call() { - (instance->*method)(p1, p2, p3, p4, p5, p6, p7, p8); - sync->sem->post(); - sync->in_use = false; - } - }; + /* commands that don't return but sync */ + DECL_CMD_SYNC(0) + SPACE_SEP_LIST(DECL_CMD_SYNC, 12) /***** BASE *******/ enum { - COMMAND_MEM_SIZE_KB = 256, + COMMAND_MEM_SIZE_KB = 256 * 1024, COMMAND_MEM_SIZE = COMMAND_MEM_SIZE_KB * 1024, SYNC_SEMAPHORES = 8 }; @@ -607,6 +310,7 @@ class CommandQueueMT { uint8_t command_mem[COMMAND_MEM_SIZE]; uint32_t read_ptr; uint32_t write_ptr; + uint32_t dealloc_ptr; SyncSemaphore sync_sems[SYNC_SEMAPHORES]; Mutex *mutex; Semaphore *sync; @@ -619,18 +323,30 @@ class CommandQueueMT { tryagain: - if (write_ptr < read_ptr) { - // behind read_ptr, check that there is room - if ((read_ptr - write_ptr) <= alloc_size) + if (write_ptr < dealloc_ptr) { + // behind dealloc_ptr, check that there is room + if ((dealloc_ptr - write_ptr) <= alloc_size) { + + // There is no more room, try to deallocate something + if (dealloc_one()) { + goto tryagain; + } return NULL; - } else if (write_ptr >= read_ptr) { - // ahead of read_ptr, check that there is room + } + } else if (write_ptr >= dealloc_ptr) { + // ahead of dealloc_ptr, check that there is room - if ((COMMAND_MEM_SIZE - write_ptr) < alloc_size + 4) { + if ((COMMAND_MEM_SIZE - write_ptr) < alloc_size + sizeof(uint32_t)) { // no room at the end, wrap down; - if (read_ptr == 0) // don't want write_ptr to become read_ptr + if (dealloc_ptr == 0) { // don't want write_ptr to become dealloc_ptr + + // There is no more room, try to deallocate something + if (dealloc_one()) { + goto tryagain; + } return NULL; + } // if this happens, it's a bug ERR_FAIL_COND_V((COMMAND_MEM_SIZE - write_ptr) < sizeof(uint32_t), NULL); @@ -642,9 +358,11 @@ class CommandQueueMT { goto tryagain; } } - // allocate the size + // Allocate the size and the 'in use' bit. + // First bit used to mark if command is still in use (1) + // or if it has been destroyed and can be deallocated (0). uint32_t *p = (uint32_t *)&command_mem[write_ptr]; - *p = sizeof(T); + *p = (sizeof(T) << 1) | 1; write_ptr += sizeof(uint32_t); // allocate the command T *cmd = memnew_placement(&command_mem[write_ptr], T); @@ -669,15 +387,16 @@ class CommandQueueMT { return ret; } - bool flush_one() { - + bool flush_one(bool p_lock = true) { + if (p_lock) lock(); tryagain: // tried to read an empty queue if (read_ptr == write_ptr) return false; - uint32_t size = *(uint32_t *)(&command_mem[read_ptr]); + uint32_t size_ptr = read_ptr; + uint32_t size = *(uint32_t *)&command_mem[read_ptr] >> 1; if (size == 0) { //end of ringbuffer, wrap @@ -689,11 +408,17 @@ class CommandQueueMT { CommandBase *cmd = reinterpret_cast<CommandBase *>(&command_mem[read_ptr]); + read_ptr += size; + + if (p_lock) unlock(); cmd->call(); - cmd->~CommandBase(); + if (p_lock) lock(); - read_ptr += size; + cmd->post(); + cmd->~CommandBase(); + *(uint32_t *)&command_mem[size_ptr] &= ~1; + if (p_lock) unlock(); return true; } @@ -701,681 +426,33 @@ class CommandQueueMT { void unlock(); void wait_for_flush(); SyncSemaphore *_alloc_sync_sem(); + bool dealloc_one(); public: /* NORMAL PUSH COMMANDS */ + DECL_PUSH(0) + SPACE_SEP_LIST(DECL_PUSH, 12) - template <class T, class M> - void push(T *p_instance, M p_method) { - - Command0<T, M> *cmd = allocate_and_lock<Command0<T, M> >(); - - cmd->instance = p_instance; - cmd->method = p_method; - - unlock(); - - if (sync) sync->post(); - } - - template <class T, class M, class P1> - void push(T *p_instance, M p_method, P1 p1) { - - Command1<T, M, P1> *cmd = allocate_and_lock<Command1<T, M, P1> >(); - - cmd->instance = p_instance; - cmd->method = p_method; - cmd->p1 = p1; - - unlock(); - - if (sync) sync->post(); - } - - template <class T, class M, class P1, class P2> - void push(T *p_instance, M p_method, P1 p1, P2 p2) { - - Command2<T, M, P1, P2> *cmd = allocate_and_lock<Command2<T, M, P1, P2> >(); - - cmd->instance = p_instance; - cmd->method = p_method; - cmd->p1 = p1; - cmd->p2 = p2; - - unlock(); - - if (sync) sync->post(); - } - - template <class T, class M, class P1, class P2, class P3> - void push(T *p_instance, M p_method, P1 p1, P2 p2, P3 p3) { - - Command3<T, M, P1, P2, P3> *cmd = allocate_and_lock<Command3<T, M, P1, P2, P3> >(); - - cmd->instance = p_instance; - cmd->method = p_method; - cmd->p1 = p1; - cmd->p2 = p2; - cmd->p3 = p3; - - unlock(); - - if (sync) sync->post(); - } - - template <class T, class M, class P1, class P2, class P3, class P4> - void push(T *p_instance, M p_method, P1 p1, P2 p2, P3 p3, P4 p4) { - - Command4<T, M, P1, P2, P3, P4> *cmd = allocate_and_lock<Command4<T, M, P1, P2, P3, P4> >(); - - cmd->instance = p_instance; - cmd->method = p_method; - cmd->p1 = p1; - cmd->p2 = p2; - cmd->p3 = p3; - cmd->p4 = p4; - - unlock(); - - if (sync) sync->post(); - } - - template <class T, class M, class P1, class P2, class P3, class P4, class P5> - void push(T *p_instance, M p_method, P1 p1, P2 p2, P3 p3, P4 p4, P5 p5) { - - Command5<T, M, P1, P2, P3, P4, P5> *cmd = allocate_and_lock<Command5<T, M, P1, P2, P3, P4, P5> >(); - - cmd->instance = p_instance; - cmd->method = p_method; - cmd->p1 = p1; - cmd->p2 = p2; - cmd->p3 = p3; - cmd->p4 = p4; - cmd->p5 = p5; - - unlock(); - - if (sync) sync->post(); - } - - template <class T, class M, class P1, class P2, class P3, class P4, class P5, class P6> - void push(T *p_instance, M p_method, P1 p1, P2 p2, P3 p3, P4 p4, P5 p5, P6 p6) { - - Command6<T, M, P1, P2, P3, P4, P5, P6> *cmd = allocate_and_lock<Command6<T, M, P1, P2, P3, P4, P5, P6> >(); - - cmd->instance = p_instance; - cmd->method = p_method; - cmd->p1 = p1; - cmd->p2 = p2; - cmd->p3 = p3; - cmd->p4 = p4; - cmd->p5 = p5; - cmd->p6 = p6; - - unlock(); - - if (sync) sync->post(); - } - - template <class T, class M, class P1, class P2, class P3, class P4, class P5, class P6, class P7> - void push(T *p_instance, M p_method, P1 p1, P2 p2, P3 p3, P4 p4, P5 p5, P6 p6, P7 p7) { - - Command7<T, M, P1, P2, P3, P4, P5, P6, P7> *cmd = allocate_and_lock<Command7<T, M, P1, P2, P3, P4, P5, P6, P7> >(); - - cmd->instance = p_instance; - cmd->method = p_method; - cmd->p1 = p1; - cmd->p2 = p2; - cmd->p3 = p3; - cmd->p4 = p4; - cmd->p5 = p5; - cmd->p6 = p6; - cmd->p7 = p7; - - unlock(); - - if (sync) sync->post(); - } - - template <class T, class M, class P1, class P2, class P3, class P4, class P5, class P6, class P7, class P8> - void push(T *p_instance, M p_method, P1 p1, P2 p2, P3 p3, P4 p4, P5 p5, P6 p6, P7 p7, P8 p8) { - - Command8<T, M, P1, P2, P3, P4, P5, P6, P7, P8> *cmd = allocate_and_lock<Command8<T, M, P1, P2, P3, P4, P5, P6, P7, P8> >(); - - cmd->instance = p_instance; - cmd->method = p_method; - cmd->p1 = p1; - cmd->p2 = p2; - cmd->p3 = p3; - cmd->p4 = p4; - cmd->p5 = p5; - cmd->p6 = p6; - cmd->p7 = p7; - cmd->p8 = p8; - - unlock(); - - if (sync) sync->post(); - } + /* PUSH AND RET COMMANDS */ + DECL_PUSH_AND_RET(0) + SPACE_SEP_LIST(DECL_PUSH_AND_RET, 12) - template <class T, class M, class P1, class P2, class P3, class P4, class P5, class P6, class P7, class P8, class P9> - void push(T *p_instance, M p_method, P1 p1, P2 p2, P3 p3, P4 p4, P5 p5, P6 p6, P7 p7, P8 p8, P9 p9) { - - Command9<T, M, P1, P2, P3, P4, P5, P6, P7, P8, P9> *cmd = allocate_and_lock<Command9<T, M, P1, P2, P3, P4, P5, P6, P7, P8, P9> >(); - - cmd->instance = p_instance; - cmd->method = p_method; - cmd->p1 = p1; - cmd->p2 = p2; - cmd->p3 = p3; - cmd->p4 = p4; - cmd->p5 = p5; - cmd->p6 = p6; - cmd->p7 = p7; - cmd->p8 = p8; - cmd->p9 = p9; - - unlock(); - - if (sync) sync->post(); - } - - template <class T, class M, class P1, class P2, class P3, class P4, class P5, class P6, class P7, class P8, class P9, class P10> - void push(T *p_instance, M p_method, P1 p1, P2 p2, P3 p3, P4 p4, P5 p5, P6 p6, P7 p7, P8 p8, P9 p9, P10 p10) { - - Command10<T, M, P1, P2, P3, P4, P5, P6, P7, P8, P9, P10> *cmd = allocate_and_lock<Command10<T, M, P1, P2, P3, P4, P5, P6, P7, P8, P9, P10> >(); - - cmd->instance = p_instance; - cmd->method = p_method; - cmd->p1 = p1; - cmd->p2 = p2; - cmd->p3 = p3; - cmd->p4 = p4; - cmd->p5 = p5; - cmd->p6 = p6; - cmd->p7 = p7; - cmd->p8 = p8; - cmd->p9 = p9; - cmd->p10 = p10; - - unlock(); - - if (sync) sync->post(); - } - - template <class T, class M, class P1, class P2, class P3, class P4, class P5, class P6, class P7, class P8, class P9, class P10, class P11> - void push(T *p_instance, M p_method, P1 p1, P2 p2, P3 p3, P4 p4, P5 p5, P6 p6, P7 p7, P8 p8, P9 p9, P10 p10, P11 p11) { - - Command11<T, M, P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11> *cmd = allocate_and_lock<Command11<T, M, P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11> >(); - - cmd->instance = p_instance; - cmd->method = p_method; - cmd->p1 = p1; - cmd->p2 = p2; - cmd->p3 = p3; - cmd->p4 = p4; - cmd->p5 = p5; - cmd->p6 = p6; - cmd->p7 = p7; - cmd->p8 = p8; - cmd->p9 = p9; - cmd->p10 = p10; - cmd->p11 = p11; - - unlock(); - - if (sync) sync->post(); - } - - template <class T, class M, class P1, class P2, class P3, class P4, class P5, class P6, class P7, class P8, class P9, class P10, class P11, class P12> - void push(T *p_instance, M p_method, P1 p1, P2 p2, P3 p3, P4 p4, P5 p5, P6 p6, P7 p7, P8 p8, P9 p9, P10 p10, P11 p11, P12 p12) { - - Command12<T, M, P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12> *cmd = allocate_and_lock<Command12<T, M, P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12> >(); - - cmd->instance = p_instance; - cmd->method = p_method; - cmd->p1 = p1; - cmd->p2 = p2; - cmd->p3 = p3; - cmd->p4 = p4; - cmd->p5 = p5; - cmd->p6 = p6; - cmd->p7 = p7; - cmd->p8 = p8; - cmd->p9 = p9; - cmd->p10 = p10; - cmd->p11 = p11; - cmd->p12 = p12; - - unlock(); - - if (sync) sync->post(); - } - - /*** PUSH AND RET COMMANDS ***/ - - template <class T, class M, class R> - void push_and_ret(T *p_instance, M p_method, R *r_ret) { - - SyncSemaphore *ss = _alloc_sync_sem(); - - CommandRet0<T, M, R> *cmd = allocate_and_lock<CommandRet0<T, M, R> >(); - - cmd->instance = p_instance; - cmd->method = p_method; - cmd->ret = r_ret; - - cmd->sync = ss; - - unlock(); - - if (sync) sync->post(); - ss->sem->wait(); - } - - template <class T, class M, class P1, class R> - void push_and_ret(T *p_instance, M p_method, P1 p1, R *r_ret) { - - SyncSemaphore *ss = _alloc_sync_sem(); - - CommandRet1<T, M, P1, R> *cmd = allocate_and_lock<CommandRet1<T, M, P1, R> >(); - - cmd->instance = p_instance; - cmd->method = p_method; - cmd->p1 = p1; - cmd->ret = r_ret; - - cmd->sync = ss; - - unlock(); - - if (sync) sync->post(); - ss->sem->wait(); - } - - template <class T, class M, class P1, class P2, class R> - void push_and_ret(T *p_instance, M p_method, P1 p1, P2 p2, R *r_ret) { - - SyncSemaphore *ss = _alloc_sync_sem(); - - CommandRet2<T, M, P1, P2, R> *cmd = allocate_and_lock<CommandRet2<T, M, P1, P2, R> >(); - - cmd->instance = p_instance; - cmd->method = p_method; - cmd->p1 = p1; - cmd->p2 = p2; - cmd->ret = r_ret; - - cmd->sync = ss; - - unlock(); - - if (sync) sync->post(); - ss->sem->wait(); - } - - template <class T, class M, class P1, class P2, class P3, class R> - void push_and_ret(T *p_instance, M p_method, P1 p1, P2 p2, P3 p3, R *r_ret) { - - SyncSemaphore *ss = _alloc_sync_sem(); - - CommandRet3<T, M, P1, P2, P3, R> *cmd = allocate_and_lock<CommandRet3<T, M, P1, P2, P3, R> >(); - - cmd->instance = p_instance; - cmd->method = p_method; - cmd->p1 = p1; - cmd->p2 = p2; - cmd->p3 = p3; - cmd->ret = r_ret; - - cmd->sync = ss; - - unlock(); - - if (sync) sync->post(); - ss->sem->wait(); - } - - template <class T, class M, class P1, class P2, class P3, class P4, class R> - void push_and_ret(T *p_instance, M p_method, P1 p1, P2 p2, P3 p3, P4 p4, R *r_ret) { - - SyncSemaphore *ss = _alloc_sync_sem(); - - CommandRet4<T, M, P1, P2, P3, P4, R> *cmd = allocate_and_lock<CommandRet4<T, M, P1, P2, P3, P4, R> >(); - - cmd->instance = p_instance; - cmd->method = p_method; - cmd->p1 = p1; - cmd->p2 = p2; - cmd->p3 = p3; - cmd->p4 = p4; - cmd->ret = r_ret; - - cmd->sync = ss; - - unlock(); - - if (sync) sync->post(); - ss->sem->wait(); - } - - template <class T, class M, class P1, class P2, class P3, class P4, class P5, class R> - void push_and_ret(T *p_instance, M p_method, P1 p1, P2 p2, P3 p3, P4 p4, P5 p5, R *r_ret) { - - SyncSemaphore *ss = _alloc_sync_sem(); - - CommandRet5<T, M, P1, P2, P3, P4, P5, R> *cmd = allocate_and_lock<CommandRet5<T, M, P1, P2, P3, P4, P5, R> >(); - - cmd->instance = p_instance; - cmd->method = p_method; - cmd->p1 = p1; - cmd->p2 = p2; - cmd->p3 = p3; - cmd->p4 = p4; - cmd->p5 = p5; - cmd->ret = r_ret; - - cmd->sync = ss; - - unlock(); - - if (sync) sync->post(); - ss->sem->wait(); - } - - template <class T, class M, class P1, class P2, class P3, class P4, class P5, class P6, class R> - void push_and_ret(T *p_instance, M p_method, P1 p1, P2 p2, P3 p3, P4 p4, P5 p5, P6 p6, R *r_ret) { - - SyncSemaphore *ss = _alloc_sync_sem(); - - CommandRet6<T, M, P1, P2, P3, P4, P5, P6, R> *cmd = allocate_and_lock<CommandRet6<T, M, P1, P2, P3, P4, P5, P6, R> >(); - - cmd->instance = p_instance; - cmd->method = p_method; - cmd->p1 = p1; - cmd->p2 = p2; - cmd->p3 = p3; - cmd->p4 = p4; - cmd->p5 = p5; - cmd->p6 = p6; - cmd->ret = r_ret; - - cmd->sync = ss; - - unlock(); - - if (sync) sync->post(); - ss->sem->wait(); - } - - template <class T, class M, class P1, class P2, class P3, class P4, class P5, class P6, class P7, class R> - void push_and_ret(T *p_instance, M p_method, P1 p1, P2 p2, P3 p3, P4 p4, P5 p5, P6 p6, P7 p7, R *r_ret) { - - SyncSemaphore *ss = _alloc_sync_sem(); - - CommandRet7<T, M, P1, P2, P3, P4, P5, P6, P7, R> *cmd = allocate_and_lock<CommandRet7<T, M, P1, P2, P3, P4, P5, P6, P7, R> >(); - - cmd->instance = p_instance; - cmd->method = p_method; - cmd->p1 = p1; - cmd->p2 = p2; - cmd->p3 = p3; - cmd->p4 = p4; - cmd->p5 = p5; - cmd->p6 = p6; - cmd->p7 = p7; - cmd->ret = r_ret; - - cmd->sync = ss; - - unlock(); - - if (sync) sync->post(); - ss->sem->wait(); - } - - template <class T, class M, class P1, class P2, class P3, class P4, class P5, class P6, class P7, class P8, class R> - void push_and_ret(T *p_instance, M p_method, P1 p1, P2 p2, P3 p3, P4 p4, P5 p5, P6 p6, P7 p7, P8 p8, R *r_ret) { - - SyncSemaphore *ss = _alloc_sync_sem(); - - CommandRet8<T, M, P1, P2, P3, P4, P5, P6, P7, P8, R> *cmd = allocate_and_lock<CommandRet8<T, M, P1, P2, P3, P4, P5, P6, P7, P8, R> >(); - - cmd->instance = p_instance; - cmd->method = p_method; - cmd->p1 = p1; - cmd->p2 = p2; - cmd->p3 = p3; - cmd->p4 = p4; - cmd->p5 = p5; - cmd->p6 = p6; - cmd->p7 = p7; - cmd->p8 = p8; - cmd->ret = r_ret; - - cmd->sync = ss; - - unlock(); - - if (sync) sync->post(); - ss->sem->wait(); - } - - template <class T, class M> - void push_and_sync(T *p_instance, M p_method) { - - SyncSemaphore *ss = _alloc_sync_sem(); - - CommandSync0<T, M> *cmd = allocate_and_lock<CommandSync0<T, M> >(); - - cmd->instance = p_instance; - cmd->method = p_method; - - cmd->sync = ss; - - unlock(); - - if (sync) sync->post(); - ss->sem->wait(); - } - - template <class T, class M, class P1> - void push_and_sync(T *p_instance, M p_method, P1 p1) { - - SyncSemaphore *ss = _alloc_sync_sem(); - - CommandSync1<T, M, P1> *cmd = allocate_and_lock<CommandSync1<T, M, P1> >(); - - cmd->instance = p_instance; - cmd->method = p_method; - cmd->p1 = p1; - - cmd->sync = ss; - - unlock(); - - if (sync) sync->post(); - ss->sem->wait(); - } - - template <class T, class M, class P1, class P2> - void push_and_sync(T *p_instance, M p_method, P1 p1, P2 p2) { - - SyncSemaphore *ss = _alloc_sync_sem(); - - CommandSync2<T, M, P1, P2> *cmd = allocate_and_lock<CommandSync2<T, M, P1, P2> >(); - - cmd->instance = p_instance; - cmd->method = p_method; - cmd->p1 = p1; - cmd->p2 = p2; - - cmd->sync = ss; - - unlock(); - - if (sync) sync->post(); - ss->sem->wait(); - } - - template <class T, class M, class P1, class P2, class P3> - void push_and_sync(T *p_instance, M p_method, P1 p1, P2 p2, P3 p3) { - - SyncSemaphore *ss = _alloc_sync_sem(); - - CommandSync3<T, M, P1, P2, P3> *cmd = allocate_and_lock<CommandSync3<T, M, P1, P2, P3> >(); - - cmd->instance = p_instance; - cmd->method = p_method; - cmd->p1 = p1; - cmd->p2 = p2; - cmd->p3 = p3; - - cmd->sync = ss; - - unlock(); - - if (sync) sync->post(); - ss->sem->wait(); - } - - template <class T, class M, class P1, class P2, class P3, class P4> - void push_and_sync(T *p_instance, M p_method, P1 p1, P2 p2, P3 p3, P4 p4) { - - SyncSemaphore *ss = _alloc_sync_sem(); - - CommandSync4<T, M, P1, P2, P3, P4> *cmd = allocate_and_lock<CommandSync4<T, M, P1, P2, P3, P4> >(); - - cmd->instance = p_instance; - cmd->method = p_method; - cmd->p1 = p1; - cmd->p2 = p2; - cmd->p3 = p3; - cmd->p4 = p4; - - cmd->sync = ss; - - unlock(); - - if (sync) sync->post(); - ss->sem->wait(); - } - - template <class T, class M, class P1, class P2, class P3, class P4, class P5> - void push_and_sync(T *p_instance, M p_method, P1 p1, P2 p2, P3 p3, P4 p4, P5 p5) { - - SyncSemaphore *ss = _alloc_sync_sem(); - - CommandSync5<T, M, P1, P2, P3, P4, P5> *cmd = allocate_and_lock<CommandSync5<T, M, P1, P2, P3, P4, P5> >(); - - cmd->instance = p_instance; - cmd->method = p_method; - cmd->p1 = p1; - cmd->p2 = p2; - cmd->p3 = p3; - cmd->p4 = p4; - cmd->p5 = p5; - - cmd->sync = ss; - - unlock(); - - if (sync) sync->post(); - ss->sem->wait(); - } - - template <class T, class M, class P1, class P2, class P3, class P4, class P5, class P6> - void push_and_sync(T *p_instance, M p_method, P1 p1, P2 p2, P3 p3, P4 p4, P5 p5, P6 p6) { - - SyncSemaphore *ss = _alloc_sync_sem(); - - CommandSync6<T, M, P1, P2, P3, P4, P5, P6> *cmd = allocate_and_lock<CommandSync6<T, M, P1, P2, P3, P4, P5, P6> >(); - - cmd->instance = p_instance; - cmd->method = p_method; - cmd->p1 = p1; - cmd->p2 = p2; - cmd->p3 = p3; - cmd->p4 = p4; - cmd->p5 = p5; - cmd->p6 = p6; - - cmd->sync = ss; - - unlock(); - - if (sync) sync->post(); - ss->sem->wait(); - } - - template <class T, class M, class P1, class P2, class P3, class P4, class P5, class P6, class P7> - void push_and_sync(T *p_instance, M p_method, P1 p1, P2 p2, P3 p3, P4 p4, P5 p5, P6 p6, P7 p7) { - - SyncSemaphore *ss = _alloc_sync_sem(); - - CommandSync7<T, M, P1, P2, P3, P4, P5, P6, P7> *cmd = allocate_and_lock<CommandSync7<T, M, P1, P2, P3, P4, P5, P6, P7> >(); - - cmd->instance = p_instance; - cmd->method = p_method; - cmd->p1 = p1; - cmd->p2 = p2; - cmd->p3 = p3; - cmd->p4 = p4; - cmd->p5 = p5; - cmd->p6 = p6; - cmd->p7 = p7; - - cmd->sync = ss; - - unlock(); - - if (sync) sync->post(); - ss->sem->wait(); - } - - template <class T, class M, class P1, class P2, class P3, class P4, class P5, class P6, class P7, class P8> - void push_and_sync(T *p_instance, M p_method, P1 p1, P2 p2, P3 p3, P4 p4, P5 p5, P6 p6, P7 p7, P8 p8) { - - SyncSemaphore *ss = _alloc_sync_sem(); - - CommandSync8<T, M, P1, P2, P3, P4, P5, P6, P7, P8> *cmd = allocate_and_lock<CommandSync8<T, M, P1, P2, P3, P4, P5, P6, P7, P8> >(); - - cmd->instance = p_instance; - cmd->method = p_method; - cmd->p1 = p1; - cmd->p2 = p2; - cmd->p3 = p3; - cmd->p4 = p4; - cmd->p5 = p5; - cmd->p6 = p6; - cmd->p7 = p7; - cmd->p8 = p8; - - cmd->sync = ss; - - unlock(); - - if (sync) sync->post(); - ss->sem->wait(); - } + /* PUSH AND RET SYNC COMMANDS*/ + DECL_PUSH_AND_SYNC(0) + SPACE_SEP_LIST(DECL_PUSH_AND_SYNC, 12) void wait_and_flush_one() { ERR_FAIL_COND(!sync); sync->wait(); - lock(); flush_one(); - unlock(); } void flush_all() { //ERR_FAIL_COND(sync); lock(); - while (true) { - bool exit = !flush_one(); - if (exit) - break; - } + while (flush_one(false)) + ; unlock(); } @@ -1383,4 +460,20 @@ public: ~CommandQueueMT(); }; +#undef ARG +#undef PARAM +#undef TYPE_PARAM +#undef PARAM_DECL +#undef DECL_CMD +#undef DECL_CMD_RET +#undef DECL_CMD_SYNC +#undef TYPE_ARG +#undef CMD_TYPE +#undef CMD_ASSIGN_PARAM +#undef DECL_PUSH +#undef CMD_RET_TYPE +#undef DECL_PUSH_AND_RET +#undef CMD_SYNC_TYPE +#undef DECL_CMD_SYNC + #endif diff --git a/core/engine.cpp b/core/engine.cpp index 31abcd62ef..53c7a73b43 100644 --- a/core/engine.cpp +++ b/core/engine.cpp @@ -84,17 +84,17 @@ Dictionary Engine::get_version_info() const { #else dict["patch"] = 0; #endif - dict["status"] = _MKSTR(VERSION_STATUS); - dict["revision"] = _MKSTR(VERSION_REVISION); + dict["status"] = VERSION_STATUS; + dict["build"] = VERSION_BUILD; dict["year"] = VERSION_YEAR; - String hash = String(VERSION_HASH); + String hash = VERSION_HASH; dict["hash"] = hash.length() == 0 ? String("unknown") : hash; String stringver = String(dict["major"]) + "." + String(dict["minor"]); if ((int)dict["patch"] != 0) stringver += "." + String(dict["patch"]); - stringver += "-" + String(dict["status"]) + " (" + String(dict["revision"]) + ")"; + stringver += "-" + String(dict["status"]) + " (" + String(dict["build"]) + ")"; dict["string"] = stringver; return dict; diff --git a/core/global_constants.cpp b/core/global_constants.cpp index 7854f342b0..48101c8cf1 100644 --- a/core/global_constants.cpp +++ b/core/global_constants.cpp @@ -557,7 +557,7 @@ void register_global_constants() { BIND_GLOBAL_ENUM_CONSTANT_CUSTOM("TYPE_TRANSFORM2D", Variant::TRANSFORM2D); BIND_GLOBAL_ENUM_CONSTANT_CUSTOM("TYPE_PLANE", Variant::PLANE); BIND_GLOBAL_ENUM_CONSTANT_CUSTOM("TYPE_QUAT", Variant::QUAT); // 10 - BIND_GLOBAL_ENUM_CONSTANT_CUSTOM("TYPE_RECT3", Variant::RECT3); + BIND_GLOBAL_ENUM_CONSTANT_CUSTOM("TYPE_AABB", Variant::AABB); BIND_GLOBAL_ENUM_CONSTANT_CUSTOM("TYPE_BASIS", Variant::BASIS); BIND_GLOBAL_ENUM_CONSTANT_CUSTOM("TYPE_TRANSFORM", Variant::TRANSFORM); BIND_GLOBAL_ENUM_CONSTANT_CUSTOM("TYPE_COLOR", Variant::COLOR); diff --git a/core/helper/math_fieldwise.cpp b/core/helper/math_fieldwise.cpp index 228611f8b3..2cd8a4f392 100644 --- a/core/helper/math_fieldwise.cpp +++ b/core/helper/math_fieldwise.cpp @@ -46,8 +46,8 @@ Variant fieldwise_assign(const Variant &p_target, const Variant &p_source, const switch (p_source.get_type()) { - /* clang-format makes a mess of this macro usage */ - /* clang-format off */ + /* clang-format makes a mess of this macro usage */ + /* clang-format off */ case Variant::VECTOR2: { @@ -106,9 +106,9 @@ Variant fieldwise_assign(const Variant &p_target, const Variant &p_source, const return target; } - case Variant::RECT3: { + case Variant::AABB: { - SETUP_TYPE(Rect3) + SETUP_TYPE(AABB) /**/ TRY_TRANSFER_FIELD("px", position.x) else TRY_TRANSFER_FIELD("py", position.y) diff --git a/core/image.cpp b/core/image.cpp index 42684e7ea7..422c0e407b 100644 --- a/core/image.cpp +++ b/core/image.cpp @@ -757,22 +757,24 @@ void Image::resize(int p_width, int p_height, Interpolation p_interpolation) { _copy_internals_from(dst); } -void Image::crop(int p_width, int p_height) { +void Image::crop_from_point(int p_x, int p_y, int p_width, int p_height) { if (!_can_modify(format)) { ERR_EXPLAIN("Cannot crop in indexed, compressed or custom image formats."); ERR_FAIL(); } + ERR_FAIL_COND(p_x < 0); + ERR_FAIL_COND(p_y < 0); ERR_FAIL_COND(p_width <= 0); ERR_FAIL_COND(p_height <= 0); - ERR_FAIL_COND(p_width > MAX_WIDTH); - ERR_FAIL_COND(p_height > MAX_HEIGHT); + ERR_FAIL_COND(p_x + p_width > MAX_WIDTH); + ERR_FAIL_COND(p_y + p_height > MAX_HEIGHT); /* to save memory, cropping should be done in-place, however, since this function will most likely either not be used much, or in critical areas, for now it wont, because it's a waste of time. */ - if (p_width == width && p_height == height) + if (p_width == width && p_height == height && p_x == 0 && p_y == 0) return; uint8_t pdata[16]; //largest is 16 @@ -784,9 +786,11 @@ void Image::crop(int p_width, int p_height) { PoolVector<uint8_t>::Read r = data.read(); PoolVector<uint8_t>::Write w = dst.data.write(); - for (int y = 0; y < p_height; y++) { + int m_h = p_y + p_height; + int m_w = p_x + p_width; + for (int y = p_y; y < m_h; y++) { - for (int x = 0; x < p_width; x++) { + for (int x = p_x; x < m_w; x++) { if ((x >= width || y >= height)) { for (uint32_t i = 0; i < pixel_size; i++) @@ -795,7 +799,7 @@ void Image::crop(int p_width, int p_height) { _get_pixelb(x, y, pixel_size, r.ptr(), pdata); } - dst._put_pixelb(x, y, pixel_size, w.ptr(), pdata); + dst._put_pixelb(x - p_x, y - p_y, pixel_size, w.ptr(), pdata); } } } @@ -805,6 +809,11 @@ void Image::crop(int p_width, int p_height) { _copy_internals_from(dst); } +void Image::crop(int p_width, int p_height) { + + crop_from_point(0, 0, p_width, p_height); +} + void Image::flip_y() { if (!_can_modify(format)) { diff --git a/core/image.h b/core/image.h index 27df65a898..24693aa706 100644 --- a/core/image.h +++ b/core/image.h @@ -207,6 +207,7 @@ public: /** * Crop the image to a specific size, if larger, then the image is filled by black */ + void crop_from_point(int p_x, int p_y, int p_width, int p_height); void crop(int p_width, int p_height); void flip_x(); diff --git a/core/io/logger.cpp b/core/io/logger.cpp index ce2ce44b1d..7177359c8a 100644 --- a/core/io/logger.cpp +++ b/core/io/logger.cpp @@ -29,6 +29,7 @@ /*************************************************************************/ #include "logger.h" + #include "os/dir_access.h" #include "os/os.h" #include "print_string.h" @@ -259,6 +260,10 @@ void CompositeLogger::log_error(const char *p_function, const char *p_file, int } } +void CompositeLogger::add_logger(Logger *p_logger) { + loggers.push_back(p_logger); +} + CompositeLogger::~CompositeLogger() { for (int i = 0; i < loggers.size(); ++i) { memdelete(loggers[i]); diff --git a/core/io/logger.h b/core/io/logger.h index cf0cc7699f..f8a394193f 100644 --- a/core/io/logger.h +++ b/core/io/logger.h @@ -101,6 +101,8 @@ public: virtual void logv(const char *p_format, va_list p_list, bool p_err); virtual void log_error(const char *p_function, const char *p_file, int p_line, const char *p_code, const char *p_rationale, ErrorType p_type = ERR_ERROR); + void add_logger(Logger *p_logger); + virtual ~CompositeLogger(); }; diff --git a/core/io/marshalls.cpp b/core/io/marshalls.cpp index d388a622de..37320d7a77 100644 --- a/core/io/marshalls.cpp +++ b/core/io/marshalls.cpp @@ -159,7 +159,7 @@ Error decode_variant(Variant &r_variant, const uint8_t *p_buffer, int p_len, int r_variant = str; } break; - // math types + // math types case Variant::VECTOR2: { @@ -245,10 +245,10 @@ Error decode_variant(Variant &r_variant, const uint8_t *p_buffer, int p_len, int (*r_len) += 4 * 4; } break; - case Variant::RECT3: { + case Variant::AABB: { ERR_FAIL_COND_V(len < (int)4 * 6, ERR_INVALID_DATA); - Rect3 val; + AABB val; val.position.x = decode_float(&buf[0]); val.position.y = decode_float(&buf[4]); val.position.z = decode_float(&buf[8]); @@ -324,7 +324,6 @@ Error decode_variant(Variant &r_variant, const uint8_t *p_buffer, int p_len, int ERR_FAIL_COND_V(len < 12, ERR_INVALID_DATA); Vector<StringName> names; Vector<StringName> subnames; - StringName prop; uint32_t namecount = strlen &= 0x7FFFFFFF; uint32_t subnamecount = decode_uint32(buf + 4); @@ -333,9 +332,10 @@ Error decode_variant(Variant &r_variant, const uint8_t *p_buffer, int p_len, int len -= 12; buf += 12; + if (flags & 2) // Obsolete format with property seperate from subpath + subnamecount++; + uint32_t total = namecount + subnamecount; - if (flags & 2) - total++; if (r_len) (*r_len) += 12; @@ -359,10 +359,8 @@ Error decode_variant(Variant &r_variant, const uint8_t *p_buffer, int p_len, int if (i < namecount) names.push_back(str); - else if (i < namecount + subnamecount) - subnames.push_back(str); else - prop = str; + subnames.push_back(str); buf += strlen + pad; len -= strlen + pad; @@ -371,7 +369,7 @@ Error decode_variant(Variant &r_variant, const uint8_t *p_buffer, int p_len, int (*r_len) += 4 + strlen + pad; } - r_variant = NodePath(names, subnames, flags & 1, prop); + r_variant = NodePath(names, subnames, flags & 1); } else { //old format, just a string @@ -919,8 +917,6 @@ Error encode_variant(const Variant &p_variant, uint8_t *r_buffer, int &r_len, bo uint32_t flags = 0; if (np.is_absolute()) flags |= 1; - if (np.get_property() != StringName()) - flags |= 2; encode_uint32(flags, buf + 8); @@ -930,8 +926,6 @@ Error encode_variant(const Variant &p_variant, uint8_t *r_buffer, int &r_len, bo r_len += 12; int total = np.get_name_count() + np.get_subname_count(); - if (np.get_property() != StringName()) - total++; for (int i = 0; i < total; i++) { @@ -939,10 +933,8 @@ Error encode_variant(const Variant &p_variant, uint8_t *r_buffer, int &r_len, bo if (i < np.get_name_count()) str = np.get_name(i); - else if (i < np.get_name_count() + np.get_subname_count()) - str = np.get_subname(i - np.get_subname_count()); else - str = np.get_property(); + str = np.get_subname(i - np.get_name_count()); CharString utf8 = str.utf8(); @@ -967,7 +959,7 @@ Error encode_variant(const Variant &p_variant, uint8_t *r_buffer, int &r_len, bo _encode_string(p_variant, buf, r_len); } break; - // math types + // math types case Variant::VECTOR2: { @@ -1045,10 +1037,10 @@ Error encode_variant(const Variant &p_variant, uint8_t *r_buffer, int &r_len, bo r_len += 4 * 4; } break; - case Variant::RECT3: { + case Variant::AABB: { if (buf) { - Rect3 aabb = p_variant; + AABB aabb = p_variant; encode_float(aabb.position.x, &buf[0]); encode_float(aabb.position.y, &buf[4]); encode_float(aabb.position.z, &buf[8]); diff --git a/core/io/resource_format_binary.cpp b/core/io/resource_format_binary.cpp index 03c3c5f615..df0d41ea9d 100644 --- a/core/io/resource_format_binary.cpp +++ b/core/io/resource_format_binary.cpp @@ -52,7 +52,7 @@ enum { VARIANT_VECTOR3 = 12, VARIANT_PLANE = 13, VARIANT_QUAT = 14, - VARIANT_RECT3 = 15, + VARIANT_AABB = 15, VARIANT_MATRIX3 = 16, VARIANT_TRANSFORM = 17, VARIANT_MATRIX32 = 18, @@ -84,8 +84,10 @@ enum { OBJECT_INTERNAL_RESOURCE = 2, OBJECT_EXTERNAL_RESOURCE_INDEX = 3, //version 2: added 64 bits support for float and int - FORMAT_VERSION = 2, - FORMAT_VERSION_CAN_RENAME_DEPS = 1 + //version 3: changed nodepath encoding + FORMAT_VERSION = 3, + FORMAT_VERSION_CAN_RENAME_DEPS = 1, + FORMAT_VERSION_NO_NODEPATH_PROPERTY = 3, }; @@ -196,9 +198,9 @@ Error ResourceInteractiveLoaderBinary::parse_variant(Variant &r_v) { r_v = v; } break; - case VARIANT_RECT3: { + case VARIANT_AABB: { - Rect3 v; + AABB v; v.position.x = f->get_real(); v.position.y = f->get_real(); v.position.z = f->get_real(); @@ -267,21 +269,22 @@ Error ResourceInteractiveLoaderBinary::parse_variant(Variant &r_v) { Vector<StringName> names; Vector<StringName> subnames; - StringName property; bool absolute; int name_count = f->get_16(); uint32_t subname_count = f->get_16(); absolute = subname_count & 0x8000; subname_count &= 0x7FFF; + if (ver_format < FORMAT_VERSION_NO_NODEPATH_PROPERTY) { + subname_count += 1; // has a property field, so we should count it as well + } for (int i = 0; i < name_count; i++) names.push_back(_get_string()); for (uint32_t i = 0; i < subname_count; i++) subnames.push_back(_get_string()); - property = _get_string(); - NodePath np = NodePath(names, subnames, absolute, property); + NodePath np = NodePath(names, subnames, absolute); r_v = np; @@ -856,7 +859,7 @@ void ResourceInteractiveLoaderBinary::open(FileAccess *p_f) { uint32_t ver_major = f->get_32(); uint32_t ver_minor = f->get_32(); - uint32_t ver_format = f->get_32(); + ver_format = f->get_32(); print_bl("big endian: " + itos(big_endian)); #ifdef BIG_ENDIAN_ENABLED @@ -1374,10 +1377,10 @@ void ResourceFormatSaverBinaryInstance::write_variant(const Variant &p_property, f->store_real(val.w); } break; - case Variant::RECT3: { + case Variant::AABB: { - f->store_32(VARIANT_RECT3); - Rect3 val = p_property; + f->store_32(VARIANT_AABB); + AABB val = p_property; f->store_real(val.position.x); f->store_real(val.position.y); f->store_real(val.position.z); @@ -1454,7 +1457,6 @@ void ResourceFormatSaverBinaryInstance::write_variant(const Variant &p_property, f->store_32(get_string_index(np.get_name(i))); for (int i = 0; i < np.get_subname_count(); i++) f->store_32(get_string_index(np.get_subname(i))); - f->store_32(get_string_index(np.get_property())); } break; case Variant::_RID: { @@ -1685,7 +1687,6 @@ void ResourceFormatSaverBinaryInstance::_find_resources(const Variant &p_variant get_string_index(np.get_name(i)); for (int i = 0; i < np.get_subname_count(); i++) get_string_index(np.get_subname(i)); - get_string_index(np.get_property()); } break; default: {} diff --git a/core/io/resource_format_binary.h b/core/io/resource_format_binary.h index 2316f05b3c..687da0a9b4 100644 --- a/core/io/resource_format_binary.h +++ b/core/io/resource_format_binary.h @@ -41,6 +41,7 @@ class ResourceInteractiveLoaderBinary : public ResourceInteractiveLoader { String res_path; String type; Ref<Resource> resource; + uint32_t ver_format; FileAccess *f; diff --git a/core/math/rect3.cpp b/core/math/aabb.cpp index 6f01000f61..737a42b337 100644 --- a/core/math/rect3.cpp +++ b/core/math/aabb.cpp @@ -1,5 +1,5 @@ /*************************************************************************/ -/* rect3.cpp */ +/* aabb.cpp */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ @@ -27,25 +27,25 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "rect3.h" +#include "aabb.h" #include "print_string.h" -real_t Rect3::get_area() const { +real_t AABB::get_area() const { return size.x * size.y * size.z; } -bool Rect3::operator==(const Rect3 &p_rval) const { +bool AABB::operator==(const AABB &p_rval) const { return ((position == p_rval.position) && (size == p_rval.size)); } -bool Rect3::operator!=(const Rect3 &p_rval) const { +bool AABB::operator!=(const AABB &p_rval) const { return ((position != p_rval.position) || (size != p_rval.size)); } -void Rect3::merge_with(const Rect3 &p_aabb) { +void AABB::merge_with(const AABB &p_aabb) { Vector3 beg_1, beg_2; Vector3 end_1, end_2; @@ -68,7 +68,7 @@ void Rect3::merge_with(const Rect3 &p_aabb) { size = max - min; } -Rect3 Rect3::intersection(const Rect3 &p_aabb) const { +AABB AABB::intersection(const AABB &p_aabb) const { Vector3 src_min = position; Vector3 src_max = position + size; @@ -78,7 +78,7 @@ Rect3 Rect3::intersection(const Rect3 &p_aabb) const { Vector3 min, max; if (src_min.x > dst_max.x || src_max.x < dst_min.x) - return Rect3(); + return AABB(); else { min.x = (src_min.x > dst_min.x) ? src_min.x : dst_min.x; @@ -86,7 +86,7 @@ Rect3 Rect3::intersection(const Rect3 &p_aabb) const { } if (src_min.y > dst_max.y || src_max.y < dst_min.y) - return Rect3(); + return AABB(); else { min.y = (src_min.y > dst_min.y) ? src_min.y : dst_min.y; @@ -94,17 +94,17 @@ Rect3 Rect3::intersection(const Rect3 &p_aabb) const { } if (src_min.z > dst_max.z || src_max.z < dst_min.z) - return Rect3(); + return AABB(); else { min.z = (src_min.z > dst_min.z) ? src_min.z : dst_min.z; max.z = (src_max.z < dst_max.z) ? src_max.z : dst_max.z; } - return Rect3(min, max - min); + return AABB(min, max - min); } -bool Rect3::intersects_ray(const Vector3 &p_from, const Vector3 &p_dir, Vector3 *r_clip, Vector3 *r_normal) const { +bool AABB::intersects_ray(const Vector3 &p_from, const Vector3 &p_dir, Vector3 *r_clip, Vector3 *r_normal) const { Vector3 c1, c2; Vector3 end = position + size; @@ -147,7 +147,7 @@ bool Rect3::intersects_ray(const Vector3 &p_from, const Vector3 &p_dir, Vector3 return true; } -bool Rect3::intersects_segment(const Vector3 &p_from, const Vector3 &p_to, Vector3 *r_clip, Vector3 *r_normal) const { +bool AABB::intersects_segment(const Vector3 &p_from, const Vector3 &p_to, Vector3 *r_clip, Vector3 *r_normal) const { real_t min = 0, max = 1; int axis = 0; @@ -205,7 +205,7 @@ bool Rect3::intersects_segment(const Vector3 &p_from, const Vector3 &p_to, Vecto return true; } -bool Rect3::intersects_plane(const Plane &p_plane) const { +bool AABB::intersects_plane(const Plane &p_plane) const { Vector3 points[8] = { Vector3(position.x, position.y, position.z), @@ -232,7 +232,7 @@ bool Rect3::intersects_plane(const Plane &p_plane) const { return under && over; } -Vector3 Rect3::get_longest_axis() const { +Vector3 AABB::get_longest_axis() const { Vector3 axis(1, 0, 0); real_t max_size = size.x; @@ -249,7 +249,7 @@ Vector3 Rect3::get_longest_axis() const { return axis; } -int Rect3::get_longest_axis_index() const { +int AABB::get_longest_axis_index() const { int axis = 0; real_t max_size = size.x; @@ -267,7 +267,7 @@ int Rect3::get_longest_axis_index() const { return axis; } -Vector3 Rect3::get_shortest_axis() const { +Vector3 AABB::get_shortest_axis() const { Vector3 axis(1, 0, 0); real_t max_size = size.x; @@ -284,7 +284,7 @@ Vector3 Rect3::get_shortest_axis() const { return axis; } -int Rect3::get_shortest_axis_index() const { +int AABB::get_shortest_axis_index() const { int axis = 0; real_t max_size = size.x; @@ -302,25 +302,25 @@ int Rect3::get_shortest_axis_index() const { return axis; } -Rect3 Rect3::merge(const Rect3 &p_with) const { +AABB AABB::merge(const AABB &p_with) const { - Rect3 aabb = *this; + AABB aabb = *this; aabb.merge_with(p_with); return aabb; } -Rect3 Rect3::expand(const Vector3 &p_vector) const { - Rect3 aabb = *this; +AABB AABB::expand(const Vector3 &p_vector) const { + AABB aabb = *this; aabb.expand_to(p_vector); return aabb; } -Rect3 Rect3::grow(real_t p_by) const { +AABB AABB::grow(real_t p_by) const { - Rect3 aabb = *this; + AABB aabb = *this; aabb.grow_by(p_by); return aabb; } -void Rect3::get_edge(int p_edge, Vector3 &r_from, Vector3 &r_to) const { +void AABB::get_edge(int p_edge, Vector3 &r_from, Vector3 &r_to) const { ERR_FAIL_INDEX(p_edge, 12); switch (p_edge) { @@ -394,7 +394,7 @@ void Rect3::get_edge(int p_edge, Vector3 &r_from, Vector3 &r_to) const { } } -Rect3::operator String() const { +AABB::operator String() const { return String() + position + " - " + size; } diff --git a/core/math/rect3.h b/core/math/aabb.h index c3a2f5fbfb..c60213496a 100644 --- a/core/math/rect3.h +++ b/core/math/aabb.h @@ -1,5 +1,5 @@ /*************************************************************************/ -/* rect3.h */ +/* aabb.h */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ @@ -39,7 +39,7 @@ * This is implemented by a point (position) and the box size */ -class Rect3 { +class AABB { public: Vector3 position; Vector3 size; @@ -60,16 +60,16 @@ public: const Vector3 &get_size() const { return size; } void set_size(const Vector3 &p_size) { size = p_size; } - bool operator==(const Rect3 &p_rval) const; - bool operator!=(const Rect3 &p_rval) const; + bool operator==(const AABB &p_rval) const; + bool operator!=(const AABB &p_rval) const; - _FORCE_INLINE_ bool intersects(const Rect3 &p_aabb) const; /// Both AABBs overlap - _FORCE_INLINE_ bool intersects_inclusive(const Rect3 &p_aabb) const; /// Both AABBs (or their faces) overlap - _FORCE_INLINE_ bool encloses(const Rect3 &p_aabb) const; /// p_aabb is completely inside this + _FORCE_INLINE_ bool intersects(const AABB &p_aabb) const; /// Both AABBs overlap + _FORCE_INLINE_ bool intersects_inclusive(const AABB &p_aabb) const; /// Both AABBs (or their faces) overlap + _FORCE_INLINE_ bool encloses(const AABB &p_aabb) const; /// p_aabb is completely inside this - Rect3 merge(const Rect3 &p_with) const; - void merge_with(const Rect3 &p_aabb); ///merge with another AABB - Rect3 intersection(const Rect3 &p_aabb) const; ///get box where two intersect, empty if no intersection occurs + AABB merge(const AABB &p_with) const; + void merge_with(const AABB &p_aabb); ///merge with another AABB + AABB intersection(const AABB &p_aabb) const; ///get box where two intersect, empty if no intersection occurs bool intersects_segment(const Vector3 &p_from, const Vector3 &p_to, Vector3 *r_clip = NULL, Vector3 *r_normal = NULL) const; bool intersects_ray(const Vector3 &p_from, const Vector3 &p_dir, Vector3 *r_clip = NULL, Vector3 *r_normal = NULL) const; _FORCE_INLINE_ bool smits_intersect_ray(const Vector3 &p_from, const Vector3 &p_dir, real_t t0, real_t t1) const; @@ -88,26 +88,26 @@ public: int get_shortest_axis_index() const; _FORCE_INLINE_ real_t get_shortest_axis_size() const; - Rect3 grow(real_t p_by) const; + AABB grow(real_t p_by) const; _FORCE_INLINE_ void grow_by(real_t p_amount); void get_edge(int p_edge, Vector3 &r_from, Vector3 &r_to) const; _FORCE_INLINE_ Vector3 get_endpoint(int p_point) const; - Rect3 expand(const Vector3 &p_vector) const; + AABB expand(const Vector3 &p_vector) const; _FORCE_INLINE_ void project_range_in_plane(const Plane &p_plane, real_t &r_min, real_t &r_max) const; _FORCE_INLINE_ void expand_to(const Vector3 &p_vector); /** expand to contain a point if necessary */ operator String() const; - _FORCE_INLINE_ Rect3() {} - inline Rect3(const Vector3 &p_pos, const Vector3 &p_size) + _FORCE_INLINE_ AABB() {} + inline AABB(const Vector3 &p_pos, const Vector3 &p_size) : position(p_pos), size(p_size) { } }; -inline bool Rect3::intersects(const Rect3 &p_aabb) const { +inline bool AABB::intersects(const AABB &p_aabb) const { if (position.x >= (p_aabb.position.x + p_aabb.size.x)) return false; @@ -125,7 +125,7 @@ inline bool Rect3::intersects(const Rect3 &p_aabb) const { return true; } -inline bool Rect3::intersects_inclusive(const Rect3 &p_aabb) const { +inline bool AABB::intersects_inclusive(const AABB &p_aabb) const { if (position.x > (p_aabb.position.x + p_aabb.size.x)) return false; @@ -143,7 +143,7 @@ inline bool Rect3::intersects_inclusive(const Rect3 &p_aabb) const { return true; } -inline bool Rect3::encloses(const Rect3 &p_aabb) const { +inline bool AABB::encloses(const AABB &p_aabb) const { Vector3 src_min = position; Vector3 src_max = position + size; @@ -159,7 +159,7 @@ inline bool Rect3::encloses(const Rect3 &p_aabb) const { (src_max.z > dst_max.z)); } -Vector3 Rect3::get_support(const Vector3 &p_normal) const { +Vector3 AABB::get_support(const Vector3 &p_normal) const { Vector3 half_extents = size * 0.5; Vector3 ofs = position + half_extents; @@ -171,7 +171,7 @@ Vector3 Rect3::get_support(const Vector3 &p_normal) const { ofs; } -Vector3 Rect3::get_endpoint(int p_point) const { +Vector3 AABB::get_endpoint(int p_point) const { switch (p_point) { case 0: return Vector3(position.x, position.y, position.z); @@ -187,7 +187,7 @@ Vector3 Rect3::get_endpoint(int p_point) const { ERR_FAIL_V(Vector3()); } -bool Rect3::intersects_convex_shape(const Plane *p_planes, int p_plane_count) const { +bool AABB::intersects_convex_shape(const Plane *p_planes, int p_plane_count) const { Vector3 half_extents = size * 0.5; Vector3 ofs = position + half_extents; @@ -206,7 +206,7 @@ bool Rect3::intersects_convex_shape(const Plane *p_planes, int p_plane_count) co return true; } -bool Rect3::has_point(const Vector3 &p_point) const { +bool AABB::has_point(const Vector3 &p_point) const { if (p_point.x < position.x) return false; @@ -224,7 +224,7 @@ bool Rect3::has_point(const Vector3 &p_point) const { return true; } -inline void Rect3::expand_to(const Vector3 &p_vector) { +inline void AABB::expand_to(const Vector3 &p_vector) { Vector3 begin = position; Vector3 end = position + size; @@ -247,7 +247,7 @@ inline void Rect3::expand_to(const Vector3 &p_vector) { size = end - begin; } -void Rect3::project_range_in_plane(const Plane &p_plane, real_t &r_min, real_t &r_max) const { +void AABB::project_range_in_plane(const Plane &p_plane, real_t &r_min, real_t &r_max) const { Vector3 half_extents(size.x * 0.5, size.y * 0.5, size.z * 0.5); Vector3 center(position.x + half_extents.x, position.y + half_extents.y, position.z + half_extents.z); @@ -258,7 +258,7 @@ void Rect3::project_range_in_plane(const Plane &p_plane, real_t &r_min, real_t & r_max = distance + length; } -inline real_t Rect3::get_longest_axis_size() const { +inline real_t AABB::get_longest_axis_size() const { real_t max_size = size.x; @@ -273,7 +273,7 @@ inline real_t Rect3::get_longest_axis_size() const { return max_size; } -inline real_t Rect3::get_shortest_axis_size() const { +inline real_t AABB::get_shortest_axis_size() const { real_t max_size = size.x; @@ -288,7 +288,7 @@ inline real_t Rect3::get_shortest_axis_size() const { return max_size; } -bool Rect3::smits_intersect_ray(const Vector3 &p_from, const Vector3 &p_dir, real_t t0, real_t t1) const { +bool AABB::smits_intersect_ray(const Vector3 &p_from, const Vector3 &p_dir, real_t t0, real_t t1) const { real_t divx = 1.0 / p_dir.x; real_t divy = 1.0 / p_dir.y; @@ -332,7 +332,7 @@ bool Rect3::smits_intersect_ray(const Vector3 &p_from, const Vector3 &p_dir, rea return ((tmin < t1) && (tmax > t0)); } -void Rect3::grow_by(real_t p_amount) { +void AABB::grow_by(real_t p_amount) { position.x -= p_amount; position.y -= p_amount; diff --git a/core/math/bsp_tree.cpp b/core/math/bsp_tree.cpp index be950568cf..bdc040160f 100644 --- a/core/math/bsp_tree.cpp +++ b/core/math/bsp_tree.cpp @@ -31,7 +31,7 @@ #include "error_macros.h" #include "print_string.h" -void BSP_Tree::from_aabb(const Rect3 &p_aabb) { +void BSP_Tree::from_aabb(const AABB &p_aabb) { planes.clear(); @@ -67,7 +67,7 @@ Vector<Plane> BSP_Tree::get_planes() const { return planes; } -Rect3 BSP_Tree::get_aabb() const { +AABB BSP_Tree::get_aabb() const { return aabb; } @@ -577,7 +577,7 @@ BSP_Tree::BSP_Tree(const PoolVector<Face3> &p_faces, real_t p_error_radius) { error_radius = p_error_radius; } -BSP_Tree::BSP_Tree(const Vector<Node> &p_nodes, const Vector<Plane> &p_planes, const Rect3 &p_aabb, real_t p_error_radius) +BSP_Tree::BSP_Tree(const Vector<Node> &p_nodes, const Vector<Plane> &p_planes, const AABB &p_aabb, real_t p_error_radius) : nodes(p_nodes), planes(p_planes), aabb(p_aabb), diff --git a/core/math/bsp_tree.h b/core/math/bsp_tree.h index 2e762ba4de..f64a13ce39 100644 --- a/core/math/bsp_tree.h +++ b/core/math/bsp_tree.h @@ -30,11 +30,11 @@ #ifndef BSP_TREE_H #define BSP_TREE_H +#include "aabb.h" #include "dvector.h" #include "face3.h" #include "method_ptrcall.h" #include "plane.h" -#include "rect3.h" #include "variant.h" #include "vector.h" /** @@ -64,7 +64,7 @@ private: Vector<Node> nodes; Vector<Plane> planes; - Rect3 aabb; + AABB aabb; real_t error_radius; int _get_points_inside(int p_node, const Vector3 *p_points, int *p_indices, const Vector3 &p_center, const Vector3 &p_half_extents, int p_indices_count) const; @@ -76,7 +76,7 @@ public: bool is_empty() const { return nodes.size() == 0; } Vector<Node> get_nodes() const; Vector<Plane> get_planes() const; - Rect3 get_aabb() const; + AABB get_aabb() const; bool point_is_inside(const Vector3 &p_point) const; int get_points_inside(const Vector3 *p_points, int p_point_count) const; @@ -85,12 +85,12 @@ public: operator Variant() const; - void from_aabb(const Rect3 &p_aabb); + void from_aabb(const AABB &p_aabb); BSP_Tree(); BSP_Tree(const Variant &p_variant); BSP_Tree(const PoolVector<Face3> &p_faces, real_t p_error_radius = 0); - BSP_Tree(const Vector<Node> &p_nodes, const Vector<Plane> &p_planes, const Rect3 &p_aabb, real_t p_error_radius = 0); + BSP_Tree(const Vector<Node> &p_nodes, const Vector<Plane> &p_planes, const AABB &p_aabb, real_t p_error_radius = 0); ~BSP_Tree(); }; diff --git a/core/math/camera_matrix.cpp b/core/math/camera_matrix.cpp index 2c587762e8..c5f1d57441 100644 --- a/core/math/camera_matrix.cpp +++ b/core/math/camera_matrix.cpp @@ -596,7 +596,7 @@ void CameraMatrix::make_scale(const Vector3 &p_scale) { matrix[2][2] = p_scale.z; } -void CameraMatrix::scale_translate_to_fit(const Rect3 &p_aabb) { +void CameraMatrix::scale_translate_to_fit(const AABB &p_aabb) { Vector3 min = p_aabb.position; Vector3 max = p_aabb.position + p_aabb.size; diff --git a/core/math/camera_matrix.h b/core/math/camera_matrix.h index 3145d73356..15d6b8128e 100644 --- a/core/math/camera_matrix.h +++ b/core/math/camera_matrix.h @@ -86,7 +86,7 @@ struct CameraMatrix { operator String() const; - void scale_translate_to_fit(const Rect3 &p_aabb); + void scale_translate_to_fit(const AABB &p_aabb); void make_scale(const Vector3 &p_scale); int get_pixels_per_meter(int p_for_pixel_width) const; operator Transform() const; diff --git a/core/math/face3.cpp b/core/math/face3.cpp index e1b172e491..070ce77db4 100644 --- a/core/math/face3.cpp +++ b/core/math/face3.cpp @@ -189,13 +189,13 @@ ClockDirection Face3::get_clock_dir() const { return (normal.dot(vertex[0]) >= 0) ? CLOCKWISE : COUNTERCLOCKWISE; } -bool Face3::intersects_aabb(const Rect3 &p_aabb) const { +bool Face3::intersects_aabb(const AABB &p_aabb) const { /** TEST PLANE **/ if (!p_aabb.intersects_plane(get_plane())) return false; -/** TEST FACE AXIS */ + /** TEST FACE AXIS */ #define TEST_AXIS(m_ax) \ { \ diff --git a/core/math/face3.h b/core/math/face3.h index 8e4a25fb7a..561fa31238 100644 --- a/core/math/face3.h +++ b/core/math/face3.h @@ -30,8 +30,8 @@ #ifndef FACE3_H #define FACE3_H +#include "aabb.h" #include "plane.h" -#include "rect3.h" #include "transform.h" #include "vector3.h" @@ -76,16 +76,16 @@ public: void get_support(const Vector3 &p_normal, const Transform &p_transform, Vector3 *p_vertices, int *p_count, int p_max) const; void project_range(const Vector3 &p_normal, const Transform &p_transform, real_t &r_min, real_t &r_max) const; - Rect3 get_aabb() const { + AABB get_aabb() const { - Rect3 aabb(vertex[0], Vector3()); + AABB aabb(vertex[0], Vector3()); aabb.expand_to(vertex[1]); aabb.expand_to(vertex[2]); return aabb; } - bool intersects_aabb(const Rect3 &p_aabb) const; - _FORCE_INLINE_ bool intersects_aabb2(const Rect3 &p_aabb) const; + bool intersects_aabb(const AABB &p_aabb) const; + _FORCE_INLINE_ bool intersects_aabb2(const AABB &p_aabb) const; operator String() const; inline Face3() {} @@ -96,7 +96,7 @@ public: } }; -bool Face3::intersects_aabb2(const Rect3 &p_aabb) const { +bool Face3::intersects_aabb2(const AABB &p_aabb) const { Vector3 perp = (vertex[0] - vertex[2]).cross(vertex[0] - vertex[1]); @@ -256,6 +256,6 @@ bool Face3::intersects_aabb2(const Rect3 &p_aabb) const { return true; } -//this sucks... + //this sucks... #endif // FACE3_H diff --git a/core/math/geometry.cpp b/core/math/geometry.cpp index 7c8fb6f17d..39bd34f03c 100644 --- a/core/math/geometry.cpp +++ b/core/math/geometry.cpp @@ -300,7 +300,7 @@ enum _CellFlags { static inline void _plot_face(uint8_t ***p_cell_status, int x, int y, int z, int len_x, int len_y, int len_z, const Vector3 &voxelsize, const Face3 &p_face) { - Rect3 aabb(Vector3(x, y, z), Vector3(len_x, len_y, len_z)); + AABB aabb(Vector3(x, y, z), Vector3(len_x, len_y, len_z)); aabb.position = aabb.position * voxelsize; aabb.size = aabb.size * voxelsize; @@ -575,7 +575,7 @@ PoolVector<Face3> Geometry::wrap_geometry(PoolVector<Face3> p_array, real_t *p_e PoolVector<Face3>::Read facesr = p_array.read(); const Face3 *faces = facesr.ptr(); - Rect3 global_aabb; + AABB global_aabb; for (int i = 0; i < face_count; i++) { diff --git a/core/math/octree.h b/core/math/octree.h index 95a67943fd..6acd4c5f75 100644 --- a/core/math/octree.h +++ b/core/math/octree.h @@ -30,10 +30,10 @@ #ifndef OCTREE_H #define OCTREE_H +#include "aabb.h" #include "list.h" #include "map.h" #include "print_string.h" -#include "rect3.h" #include "variant.h" #include "vector3.h" @@ -106,7 +106,7 @@ private: struct Octant { // cached for FAST plane check - Rect3 aabb; + AABB aabb; uint64_t last_pass; Octant *parent; @@ -152,8 +152,8 @@ private: OctreeElementID _id; Octant *common_parent; - Rect3 aabb; - Rect3 container_aabb; + AABB aabb; + AABB container_aabb; List<PairData *, AL> pair_list; @@ -334,7 +334,7 @@ private: } void _insert_element(Element *p_element, Octant *p_octant); - void _ensure_valid_root(const Rect3 &p_aabb); + void _ensure_valid_root(const AABB &p_aabb); bool _remove_element_from_octant(Element *p_element, Octant *p_octant, Octant *p_limit = NULL); void _remove_element(Element *p_element); void _pair_element(Element *p_element, Octant *p_octant); @@ -351,7 +351,7 @@ private: }; void _cull_convex(Octant *p_octant, _CullConvexData *p_cull); - void _cull_aabb(Octant *p_octant, const Rect3 &p_aabb, T **p_result_array, int *p_result_idx, int p_result_max, int *p_subindex_array, uint32_t p_mask); + void _cull_aabb(Octant *p_octant, const AABB &p_aabb, T **p_result_array, int *p_result_idx, int p_result_max, int *p_subindex_array, uint32_t p_mask); void _cull_segment(Octant *p_octant, const Vector3 &p_from, const Vector3 &p_to, T **p_result_array, int *p_result_idx, int p_result_max, int *p_subindex_array, uint32_t p_mask); void _cull_point(Octant *p_octant, const Vector3 &p_point, T **p_result_array, int *p_result_idx, int p_result_max, int *p_subindex_array, uint32_t p_mask); @@ -370,8 +370,8 @@ private: } public: - OctreeElementID create(T *p_userdata, const Rect3 &p_aabb = Rect3(), int p_subindex = 0, bool p_pairable = false, uint32_t p_pairable_type = 0, uint32_t pairable_mask = 1); - void move(OctreeElementID p_id, const Rect3 &p_aabb); + OctreeElementID create(T *p_userdata, const AABB &p_aabb = AABB(), int p_subindex = 0, bool p_pairable = false, uint32_t p_pairable_type = 0, uint32_t pairable_mask = 1); + void move(OctreeElementID p_id, const AABB &p_aabb); void set_pairable(OctreeElementID p_id, bool p_pairable = false, uint32_t p_pairable_type = 0, uint32_t pairable_mask = 1); void erase(OctreeElementID p_id); @@ -380,7 +380,7 @@ public: int get_subindex(OctreeElementID p_id) const; int cull_convex(const Vector<Plane> &p_convex, T **p_result_array, int p_result_max, uint32_t p_mask = 0xFFFFFFFF); - int cull_aabb(const Rect3 &p_aabb, T **p_result_array, int p_result_max, int *p_subindex_array = NULL, uint32_t p_mask = 0xFFFFFFFF); + int cull_aabb(const AABB &p_aabb, T **p_result_array, int p_result_max, int *p_subindex_array = NULL, uint32_t p_mask = 0xFFFFFFFF); int cull_segment(const Vector3 &p_from, const Vector3 &p_to, T **p_result_array, int p_result_max, int *p_subindex_array = NULL, uint32_t p_mask = 0xFFFFFFFF); int cull_point(const Vector3 &p_point, T **p_result_array, int p_result_max, int *p_subindex_array = NULL, uint32_t p_mask = 0xFFFFFFFF); @@ -479,7 +479,7 @@ void Octree<T, use_pairs, AL>::_insert_element(Element *p_element, Octant *p_oct } else { /* check againt AABB where child should be */ - Rect3 aabb = p_octant->aabb; + AABB aabb = p_octant->aabb; aabb.size *= 0.5; if (i & 1) @@ -535,12 +535,12 @@ void Octree<T, use_pairs, AL>::_insert_element(Element *p_element, Octant *p_oct } template <class T, bool use_pairs, class AL> -void Octree<T, use_pairs, AL>::_ensure_valid_root(const Rect3 &p_aabb) { +void Octree<T, use_pairs, AL>::_ensure_valid_root(const AABB &p_aabb) { if (!root) { // octre is empty - Rect3 base(Vector3(), Vector3(1.0, 1.0, 1.0) * unit_size); + AABB base(Vector3(), Vector3(1.0, 1.0, 1.0) * unit_size); while (!base.encloses(p_aabb)) { @@ -563,7 +563,7 @@ void Octree<T, use_pairs, AL>::_ensure_valid_root(const Rect3 &p_aabb) { } else { - Rect3 base = root->aabb; + AABB base = root->aabb; while (!base.encloses(p_aabb)) { @@ -793,7 +793,7 @@ void Octree<T, use_pairs, AL>::_remove_element(Element *p_element) { } template <class T, bool use_pairs, class AL> -OctreeElementID Octree<T, use_pairs, AL>::create(T *p_userdata, const Rect3 &p_aabb, int p_subindex, bool p_pairable, uint32_t p_pairable_type, uint32_t p_pairable_mask) { +OctreeElementID Octree<T, use_pairs, AL>::create(T *p_userdata, const AABB &p_aabb, int p_subindex, bool p_pairable, uint32_t p_pairable_type, uint32_t p_pairable_mask) { // check for AABB validity #ifdef DEBUG_ENABLED @@ -833,7 +833,7 @@ OctreeElementID Octree<T, use_pairs, AL>::create(T *p_userdata, const Rect3 &p_a } template <class T, bool use_pairs, class AL> -void Octree<T, use_pairs, AL>::move(OctreeElementID p_id, const Rect3 &p_aabb) { +void Octree<T, use_pairs, AL>::move(OctreeElementID p_id, const AABB &p_aabb) { #ifdef DEBUG_ENABLED // check for AABB validity @@ -859,7 +859,7 @@ void Octree<T, use_pairs, AL>::move(OctreeElementID p_id, const Rect3 &p_aabb) { if (old_has_surf) { _remove_element(&e); // removing e.common_parent = NULL; - e.aabb = Rect3(); + e.aabb = AABB(); _optimize(); } else { _ensure_valid_root(p_aabb); // inserting @@ -886,7 +886,7 @@ void Octree<T, use_pairs, AL>::move(OctreeElementID p_id, const Rect3 &p_aabb) { return; } - Rect3 combined = e.aabb; + AABB combined = e.aabb; combined.merge_with(p_aabb); _ensure_valid_root(combined); @@ -1072,7 +1072,7 @@ void Octree<T, use_pairs, AL>::_cull_convex(Octant *p_octant, _CullConvexData *p } template <class T, bool use_pairs, class AL> -void Octree<T, use_pairs, AL>::_cull_aabb(Octant *p_octant, const Rect3 &p_aabb, T **p_result_array, int *p_result_idx, int p_result_max, int *p_subindex_array, uint32_t p_mask) { +void Octree<T, use_pairs, AL>::_cull_aabb(Octant *p_octant, const AABB &p_aabb, T **p_result_array, int *p_result_idx, int p_result_max, int *p_subindex_array, uint32_t p_mask) { if (*p_result_idx == p_result_max) return; //pointless @@ -1313,7 +1313,7 @@ int Octree<T, use_pairs, AL>::cull_convex(const Vector<Plane> &p_convex, T **p_r } template <class T, bool use_pairs, class AL> -int Octree<T, use_pairs, AL>::cull_aabb(const Rect3 &p_aabb, T **p_result_array, int p_result_max, int *p_subindex_array, uint32_t p_mask) { +int Octree<T, use_pairs, AL>::cull_aabb(const AABB &p_aabb, T **p_result_array, int p_result_max, int *p_subindex_array, uint32_t p_mask) { if (!root) return 0; diff --git a/core/math/quick_hull.cpp b/core/math/quick_hull.cpp index e0137b6921..946d9f6b79 100644 --- a/core/math/quick_hull.cpp +++ b/core/math/quick_hull.cpp @@ -38,7 +38,7 @@ Error QuickHull::build(const Vector<Vector3> &p_points, Geometry::MeshData &r_me /* CREATE AABB VOLUME */ - Rect3 aabb; + AABB aabb; for (int i = 0; i < p_points.size(); i++) { if (i == 0) { diff --git a/core/math/quick_hull.h b/core/math/quick_hull.h index 47ed22615b..f014d0decc 100644 --- a/core/math/quick_hull.h +++ b/core/math/quick_hull.h @@ -30,9 +30,9 @@ #ifndef QUICK_HULL_H #define QUICK_HULL_H +#include "aabb.h" #include "geometry.h" #include "list.h" -#include "rect3.h" #include "set.h" class QuickHull { diff --git a/core/math/transform.h b/core/math/transform.h index 566bf482a9..4d91869121 100644 --- a/core/math/transform.h +++ b/core/math/transform.h @@ -30,9 +30,9 @@ #ifndef TRANSFORM_H #define TRANSFORM_H +#include "aabb.h" #include "matrix3.h" #include "plane.h" -#include "rect3.h" /** @author Juan Linietsky <reduzio@gmail.com> */ @@ -80,8 +80,8 @@ public: _FORCE_INLINE_ Plane xform(const Plane &p_plane) const; _FORCE_INLINE_ Plane xform_inv(const Plane &p_plane) const; - _FORCE_INLINE_ Rect3 xform(const Rect3 &p_aabb) const; - _FORCE_INLINE_ Rect3 xform_inv(const Rect3 &p_aabb) const; + _FORCE_INLINE_ AABB xform(const AABB &p_aabb) const; + _FORCE_INLINE_ AABB xform_inv(const AABB &p_aabb) const; void operator*=(const Transform &p_transform); Transform operator*(const Transform &p_transform) const; @@ -153,14 +153,14 @@ _FORCE_INLINE_ Plane Transform::xform_inv(const Plane &p_plane) const { return Plane(normal, d); } -_FORCE_INLINE_ Rect3 Transform::xform(const Rect3 &p_aabb) const { +_FORCE_INLINE_ AABB Transform::xform(const AABB &p_aabb) const { /* define vertices */ Vector3 x = basis.get_axis(0) * p_aabb.size.x; Vector3 y = basis.get_axis(1) * p_aabb.size.y; Vector3 z = basis.get_axis(2) * p_aabb.size.z; Vector3 pos = xform(p_aabb.position); //could be even further optimized - Rect3 new_aabb; + AABB new_aabb; new_aabb.position = pos; new_aabb.expand_to(pos + x); new_aabb.expand_to(pos + y); @@ -172,7 +172,7 @@ _FORCE_INLINE_ Rect3 Transform::xform(const Rect3 &p_aabb) const { return new_aabb; } -_FORCE_INLINE_ Rect3 Transform::xform_inv(const Rect3 &p_aabb) const { +_FORCE_INLINE_ AABB Transform::xform_inv(const AABB &p_aabb) const { /* define vertices */ Vector3 vertices[8] = { @@ -186,7 +186,7 @@ _FORCE_INLINE_ Rect3 Transform::xform_inv(const Rect3 &p_aabb) const { Vector3(p_aabb.position.x, p_aabb.position.y, p_aabb.position.z) }; - Rect3 ret; + AABB ret; ret.position = xform_inv(vertices[0]); diff --git a/core/math/triangle_mesh.cpp b/core/math/triangle_mesh.cpp index 3b246cb183..5f57c7c26a 100644 --- a/core/math/triangle_mesh.cpp +++ b/core/math/triangle_mesh.cpp @@ -44,7 +44,7 @@ int TriangleMesh::_create_bvh(BVH *p_bvh, BVH **p_bb, int p_from, int p_size, in return -1; } - Rect3 aabb; + AABB aabb; aabb = p_bb[p_from]->aabb; for (int i = 1; i < p_size; i++) { @@ -166,7 +166,7 @@ void TriangleMesh::create(const PoolVector<Vector3> &p_faces) { valid = true; } -Vector3 TriangleMesh::get_area_normal(const Rect3 &p_aabb) const { +Vector3 TriangleMesh::get_area_normal(const AABB &p_aabb) const { uint32_t *stack = (uint32_t *)alloca(sizeof(int) * max_depth); diff --git a/core/math/triangle_mesh.h b/core/math/triangle_mesh.h index 2bf67fffcb..4bd9fecf37 100644 --- a/core/math/triangle_mesh.h +++ b/core/math/triangle_mesh.h @@ -47,7 +47,7 @@ class TriangleMesh : public Reference { struct BVH { - Rect3 aabb; + AABB aabb; Vector3 center; //used for sorting int left; int right; @@ -88,7 +88,7 @@ public: bool is_valid() const; bool intersect_segment(const Vector3 &p_begin, const Vector3 &p_end, Vector3 &r_point, Vector3 &r_normal) const; bool intersect_ray(const Vector3 &p_begin, const Vector3 &p_dir, Vector3 &r_point, Vector3 &r_normal) const; - Vector3 get_area_normal(const Rect3 &p_aabb) const; + Vector3 get_area_normal(const AABB &p_aabb) const; PoolVector<Face3> get_faces() const; void create(const PoolVector<Vector3> &p_faces); diff --git a/core/method_ptrcall.h b/core/method_ptrcall.h index 2875eb912f..d819dfbc27 100644 --- a/core/method_ptrcall.h +++ b/core/method_ptrcall.h @@ -119,7 +119,7 @@ MAKE_PTRARG_BY_REFERENCE(Vector3); MAKE_PTRARG(Transform2D); MAKE_PTRARG_BY_REFERENCE(Plane); MAKE_PTRARG(Quat); -MAKE_PTRARG_BY_REFERENCE(Rect3); +MAKE_PTRARG_BY_REFERENCE(AABB); MAKE_PTRARG_BY_REFERENCE(Basis); MAKE_PTRARG_BY_REFERENCE(Transform); MAKE_PTRARG_BY_REFERENCE(Color); diff --git a/core/node_path.cpp b/core/node_path.cpp index 15f950f605..a12152aca6 100644 --- a/core/node_path.cpp +++ b/core/node_path.cpp @@ -48,8 +48,6 @@ uint32_t NodePath::hash() const { h = h ^ ssn[i].hash(); } - h = h ^ data->property.hash(); - return h; } @@ -81,13 +79,6 @@ StringName NodePath::get_name(int p_idx) const { return data->path[p_idx]; } -StringName NodePath::get_property() const { - - if (!data) - return StringName(); - return data->property; -} - int NodePath::get_subname_count() const { if (!data) @@ -128,9 +119,6 @@ bool NodePath::operator==(const NodePath &p_path) const { if (data->subpath.size() != p_path.data->subpath.size()) return false; - if (data->property != p_path.data->property) - return false; - for (int i = 0; i < data->path.size(); i++) { if (data->path[i] != p_path.data->path[i]) @@ -184,8 +172,6 @@ NodePath::operator String() const { ret += ":" + data->subpath[i].operator String(); } - if (data->property.operator String() != "") - ret += ":" + String(data->property); return ret; } @@ -205,6 +191,7 @@ Vector<StringName> NodePath::get_names() const { return data->path; return Vector<StringName>(); } + Vector<StringName> NodePath::get_subnames() const { if (data) @@ -212,6 +199,21 @@ Vector<StringName> NodePath::get_subnames() const { return Vector<StringName>(); } +StringName NodePath::get_concatenated_subnames() const { + ERR_FAIL_COND_V(!data, StringName()); + + if (!data->concatenated_subpath) { + int spc = data->subpath.size(); + String concatenated; + const StringName *ssn = data->subpath.ptr(); + for (int i = 0; i < spc; i++) { + concatenated += i == 0 ? ssn[i].operator String() : ":" + ssn[i]; + } + data->concatenated_subpath = concatenated; + } + return data->concatenated_subpath; +} + NodePath NodePath::rel_path_to(const NodePath &p_np) const { ERR_FAIL_COND_V(!is_absolute(), NodePath()); @@ -250,10 +252,27 @@ NodePath NodePath::rel_path_to(const NodePath &p_np) const { if (relpath.size() == 0) relpath.push_back("."); - return NodePath(relpath, p_np.get_subnames(), false, p_np.get_property()); + return NodePath(relpath, p_np.get_subnames(), false); } -NodePath::NodePath(const Vector<StringName> &p_path, bool p_absolute, const String &p_property) { +NodePath NodePath::get_as_property_path() const { + + if (!data->path.size()) { + return *this; + } else { + Vector<StringName> new_path = data->subpath; + + String initial_subname = data->path[0]; + for (size_t i = 1; i < data->path.size(); i++) { + initial_subname += i == 0 ? data->path[i].operator String() : "/" + data->path[i]; + } + new_path.insert(0, initial_subname); + + return NodePath(Vector<StringName>(), new_path, false); + } +} + +NodePath::NodePath(const Vector<StringName> &p_path, bool p_absolute) { data = NULL; @@ -264,14 +283,14 @@ NodePath::NodePath(const Vector<StringName> &p_path, bool p_absolute, const Stri data->refcount.init(); data->absolute = p_absolute; data->path = p_path; - data->property = p_property; + data->has_slashes = true; } -NodePath::NodePath(const Vector<StringName> &p_path, const Vector<StringName> &p_subpath, bool p_absolute, const String &p_property) { +NodePath::NodePath(const Vector<StringName> &p_path, const Vector<StringName> &p_subpath, bool p_absolute) { data = NULL; - if (p_path.size() == 0) + if (p_path.size() == 0 && p_subpath.size() == 0) return; data = memnew(Data); @@ -279,7 +298,7 @@ NodePath::NodePath(const Vector<StringName> &p_path, const Vector<StringName> &p data->absolute = p_absolute; data->path = p_path; data->subpath = p_subpath; - data->property = p_property; + data->has_slashes = true; } void NodePath::simplify() { @@ -320,11 +339,11 @@ NodePath::NodePath(const String &p_path) { return; String path = p_path; - StringName property; Vector<StringName> subpath; int absolute = (path[0] == '/') ? 1 : 0; bool last_is_slash = true; + bool has_slashes = false; int slices = 0; int subpath_pos = path.find(":"); @@ -337,16 +356,13 @@ NodePath::NodePath(const String &p_path) { if (path[i] == ':' || path[i] == 0) { String str = path.substr(from, i - from); - if (path[i] == ':') { - if (str == "") { - ERR_EXPLAIN("Invalid NodePath: " + p_path); - ERR_FAIL(); - } - subpath.push_back(str); - } else { - //property can be empty - property = str; + if (str == "") { + if (path[i] == 0) continue; // Allow end-of-path : + + ERR_EXPLAIN("Invalid NodePath: " + p_path); + ERR_FAIL(); } + subpath.push_back(str); from = i + 1; } @@ -360,6 +376,7 @@ NodePath::NodePath(const String &p_path) { if (path[i] == '/') { last_is_slash = true; + has_slashes = true; } else { if (last_is_slash) @@ -369,13 +386,13 @@ NodePath::NodePath(const String &p_path) { } } - if (slices == 0 && !absolute && !property) + if (slices == 0 && !absolute && !subpath.size()) return; data = memnew(Data); data->refcount.init(); data->absolute = absolute ? true : false; - data->property = property; + data->has_slashes = has_slashes; data->subpath = subpath; if (slices == 0) diff --git a/core/node_path.h b/core/node_path.h index eb5b9eb6cf..063c4f62db 100644 --- a/core/node_path.h +++ b/core/node_path.h @@ -41,10 +41,11 @@ class NodePath { struct Data { SafeRefCount refcount; - StringName property; Vector<StringName> path; Vector<StringName> subpath; + StringName concatenated_subpath; bool absolute; + bool has_slashes; }; Data *data; @@ -53,7 +54,7 @@ class NodePath { public: _FORCE_INLINE_ StringName get_sname() const { - if (data && data->path.size() == 1 && data->subpath.empty() && !data->property) { + if (data && data->path.size() == 1 && data->subpath.empty()) { return data->path[0]; } else { return operator String(); @@ -67,13 +68,13 @@ public: StringName get_subname(int p_idx) const; Vector<StringName> get_names() const; Vector<StringName> get_subnames() const; + StringName get_concatenated_subnames() const; NodePath rel_path_to(const NodePath &p_np) const; + NodePath get_as_property_path() const; void prepend_period(); - StringName get_property() const; - NodePath get_parent() const; uint32_t hash() const; @@ -88,8 +89,8 @@ public: void simplify(); NodePath simplified() const; - NodePath(const Vector<StringName> &p_path, bool p_absolute, const String &p_property = ""); - NodePath(const Vector<StringName> &p_path, const Vector<StringName> &p_subpath, bool p_absolute, const String &p_property = ""); + NodePath(const Vector<StringName> &p_path, bool p_absolute); + NodePath(const Vector<StringName> &p_path, const Vector<StringName> &p_subpath, bool p_absolute); NodePath(const NodePath &p_path); NodePath(const String &p_path); NodePath(); diff --git a/core/object.cpp b/core/object.cpp index 823cbe14d4..631676d827 100644 --- a/core/object.cpp +++ b/core/object.cpp @@ -517,6 +517,80 @@ Variant Object::get(const StringName &p_name, bool *r_valid) const { } } +void Object::set_indexed(const Vector<StringName> &p_names, const Variant &p_value, bool *r_valid) { + if (p_names.empty()) { + if (r_valid) + *r_valid = false; + return; + } + if (p_names.size() == 1) { + set(p_names[0], p_value, r_valid); + return; + } + + bool valid = false; + if (!r_valid) r_valid = &valid; + + List<Variant> value_stack; + + value_stack.push_back(get(p_names[0], r_valid)); + + if (!*r_valid) { + value_stack.clear(); + return; + } + + for (int i = 1; i < p_names.size() - 1; i++) { + value_stack.push_back(value_stack.back()->get().get_named(p_names[i], r_valid)); + + if (!*r_valid) { + value_stack.clear(); + return; + } + } + + value_stack.push_back(p_value); // p_names[p_names.size() - 1] + + for (int i = p_names.size() - 1; i > 0; i--) { + + value_stack.back()->prev()->get().set_named(p_names[i], value_stack.back()->get(), r_valid); + value_stack.pop_back(); + + if (!*r_valid) { + value_stack.clear(); + return; + } + } + + set(p_names[0], value_stack.back()->get(), r_valid); + value_stack.pop_back(); + + ERR_FAIL_COND(!value_stack.empty()); +} + +Variant Object::get_indexed(const Vector<StringName> &p_names, bool *r_valid) const { + if (p_names.empty()) { + if (r_valid) + *r_valid = false; + return Variant(); + } + bool valid = false; + + Variant current_value = get(p_names[0]); + for (int i = 1; i < p_names.size(); i++) { + current_value = current_value.get_named(p_names[i], &valid); + + if (!valid) { + if (r_valid) + *r_valid = false; + return Variant(); + } + } + if (r_valid) + *r_valid = true; + return current_value; +} + void Object::get_property_list(List<PropertyInfo> *p_list, bool p_reversed) const { if (script_instance && p_reversed) { @@ -1416,6 +1490,16 @@ Variant Object::_get_bind(const String &p_name) const { return get(p_name); } +void Object::_set_indexed_bind(const NodePath &p_name, const Variant &p_value) { + + set_indexed(p_name.get_as_property_path().get_subnames(), p_value); +} + +Variant Object::_get_indexed_bind(const NodePath &p_name) const { + + return get_indexed(p_name.get_as_property_path().get_subnames()); +} + void Object::initialize_class() { static bool initialized = false; @@ -1513,6 +1597,8 @@ void Object::_bind_methods() { ClassDB::bind_method(D_METHOD("is_class", "type"), &Object::is_class); ClassDB::bind_method(D_METHOD("set", "property", "value"), &Object::_set_bind); ClassDB::bind_method(D_METHOD("get", "property"), &Object::_get_bind); + ClassDB::bind_method(D_METHOD("set_indexed", "property", "value"), &Object::_set_indexed_bind); + ClassDB::bind_method(D_METHOD("get_indexed", "property"), &Object::_get_indexed_bind); ClassDB::bind_method(D_METHOD("get_property_list"), &Object::_get_property_list_bind); ClassDB::bind_method(D_METHOD("get_method_list"), &Object::_get_method_list_bind); ClassDB::bind_method(D_METHOD("notification", "what", "reversed"), &Object::notification, DEFVAL(false)); @@ -1661,6 +1747,43 @@ Variant::Type Object::get_static_property_type(const StringName &p_property, boo return Variant::NIL; } +Variant::Type Object::get_static_property_type_indexed(const Vector<StringName> &p_path, bool *r_valid) const { + + bool valid = false; + Variant::Type t = get_static_property_type(p_path[0], &valid); + if (!valid) { + if (r_valid) + *r_valid = false; + + return Variant::NIL; + } + + Variant::CallError ce; + Variant check = Variant::construct(t, NULL, 0, ce); + + for (int i = 1; i < p_path.size(); i++) { + if (check.get_type() == Variant::OBJECT || check.get_type() == Variant::DICTIONARY || check.get_type() == Variant::ARRAY) { + // We cannot be sure about the type of properties this types can have + if (r_valid) + *r_valid = false; + return Variant::NIL; + } + + check = check.get_named(p_path[i], &valid); + + if (!valid) { + if (r_valid) + *r_valid = false; + return Variant::NIL; + } + } + + if (r_valid) + *r_valid = true; + + return check.get_type(); +} + bool Object::is_queued_for_deletion() const { return _is_queued_for_deletion; } diff --git a/core/object.h b/core/object.h index 7af2c78fc3..3ac699f978 100644 --- a/core/object.h +++ b/core/object.h @@ -477,6 +477,8 @@ private: Array _get_incoming_connections() const; void _set_bind(const String &p_set, const Variant &p_value); Variant _get_bind(const String &p_name) const; + void _set_indexed_bind(const NodePath &p_name, const Variant &p_value); + Variant _get_indexed_bind(const NodePath &p_name) const; void *_script_instance_bindings[MAX_SCRIPT_INSTANCE_BINDINGS]; @@ -627,6 +629,8 @@ public: void set(const StringName &p_name, const Variant &p_value, bool *r_valid = NULL); Variant get(const StringName &p_name, bool *r_valid = NULL) const; + void set_indexed(const Vector<StringName> &p_names, const Variant &p_value, bool *r_valid = NULL); + Variant get_indexed(const Vector<StringName> &p_names, bool *r_valid = NULL) const; void get_property_list(List<PropertyInfo> *p_list, bool p_reversed = false) const; @@ -687,6 +691,7 @@ public: bool is_blocking_signals() const; Variant::Type get_static_property_type(const StringName &p_property, bool *r_valid = NULL) const; + Variant::Type get_static_property_type_indexed(const Vector<StringName> &p_path, bool *r_valid = NULL) const; virtual void get_translatable_strings(List<String> *p_strings) const; diff --git a/core/os/dir_access.cpp b/core/os/dir_access.cpp index 0875f78478..6d4b46f4da 100644 --- a/core/os/dir_access.cpp +++ b/core/os/dir_access.cpp @@ -38,7 +38,7 @@ String DirAccess::_get_root_path() const { switch (_access_type) { case ACCESS_RESOURCES: return ProjectSettings::get_singleton()->get_resource_path(); - case ACCESS_USERDATA: return OS::get_singleton()->get_data_dir(); + case ACCESS_USERDATA: return OS::get_singleton()->get_user_data_dir(); default: return ""; } @@ -98,6 +98,7 @@ static Error _erase_recursive(DirAccess *da) { err = _erase_recursive(da); if (err) { print_line("err recurso " + E->get()); + da->change_dir(".."); return err; } err = da->change_dir(".."); @@ -217,7 +218,7 @@ String DirAccess::fix_path(String p_path) const { if (p_path.begins_with("user://")) { - String data_dir = OS::get_singleton()->get_data_dir(); + String data_dir = OS::get_singleton()->get_user_data_dir(); if (data_dir != "") { return p_path.replace_first("user:/", data_dir); @@ -340,6 +341,102 @@ Error DirAccess::copy(String p_from, String p_to, int chmod_flags) { return err; } +// Changes dir for the current scope, returning back to the original dir +// when scope exits +class DirChanger { + DirAccess *da; + String original_dir; + +public: + DirChanger(DirAccess *p_da, String p_dir) { + da = p_da; + original_dir = p_da->get_current_dir(); + p_da->change_dir(p_dir); + } + + ~DirChanger() { + da->change_dir(original_dir); + } +}; + +Error DirAccess::_copy_dir(DirAccess *p_target_da, String p_to, int p_chmod_flags) { + List<String> dirs; + + String curdir = get_current_dir(); + list_dir_begin(); + String n = get_next(); + while (n != String()) { + + if (n != "." && n != "..") { + + if (current_is_dir()) + dirs.push_back(n); + else { + String rel_path = n; + if (!n.is_rel_path()) { + list_dir_end(); + return ERR_BUG; + } + Error err = copy(get_current_dir() + "/" + n, p_to + rel_path, p_chmod_flags); + if (err) { + list_dir_end(); + return err; + } + } + } + + n = get_next(); + } + + list_dir_end(); + + for (List<String>::Element *E = dirs.front(); E; E = E->next()) { + String rel_path = E->get(); + String target_dir = p_to + rel_path; + if (!p_target_da->dir_exists(target_dir)) { + Error err = p_target_da->make_dir(target_dir); + ERR_FAIL_COND_V(err, err); + } + + Error err = change_dir(E->get()); + ERR_FAIL_COND_V(err, err); + err = _copy_dir(p_target_da, p_to + rel_path + "/", p_chmod_flags); + if (err) { + change_dir(".."); + ERR_PRINT("Failed to copy recursively"); + return err; + } + err = change_dir(".."); + if (err) { + ERR_PRINT("Failed to go back"); + return err; + } + } + + return OK; +} + +Error DirAccess::copy_dir(String p_from, String p_to, int p_chmod_flags) { + ERR_FAIL_COND_V(!dir_exists(p_from), ERR_FILE_NOT_FOUND); + + DirAccess *target_da = DirAccess::create_for_path(p_to); + ERR_FAIL_COND_V(!target_da, ERR_CANT_CREATE); + + if (!target_da->dir_exists(p_to)) { + Error err = target_da->make_dir_recursive(p_to); + if (err) { + memdelete(target_da); + } + ERR_FAIL_COND_V(err, err); + } + + DirChanger dir_changer(this, p_from); + Error err = _copy_dir(target_da, p_to + "/", p_chmod_flags); + memdelete(target_da); + + return err; +} + bool DirAccess::exists(String p_dir) { DirAccess *da = DirAccess::create_for_path(p_dir); diff --git a/core/os/dir_access.h b/core/os/dir_access.h index 7fa3ce5cf1..f3d1320041 100644 --- a/core/os/dir_access.h +++ b/core/os/dir_access.h @@ -52,6 +52,9 @@ public: private: AccessType _access_type; static CreateFunc create_func[ACCESS_MAX]; ///< set this to instance a filesystem object + + Error _copy_dir(DirAccess *p_target_da, String p_to, int p_chmod_flags); + protected: String _get_root_path() const; String _get_root_string() const; @@ -89,6 +92,7 @@ public: static bool exists(String p_dir); virtual size_t get_space_left() = 0; + Error copy_dir(String p_from, String p_to, int chmod_flags = -1); virtual Error copy(String p_from, String p_to, int chmod_flags = -1); virtual Error rename(String p_from, String p_to) = 0; virtual Error remove(String p_name) = 0; diff --git a/core/os/file_access.cpp b/core/os/file_access.cpp index fcb3b58fed..5fdd2b9135 100644 --- a/core/os/file_access.cpp +++ b/core/os/file_access.cpp @@ -152,7 +152,7 @@ String FileAccess::fix_path(const String &p_path) const { if (r_path.begins_with("user://")) { - String data_dir = OS::get_singleton()->get_data_dir(); + String data_dir = OS::get_singleton()->get_user_data_dir(); if (data_dir != "") { return r_path.replace("user:/", data_dir); diff --git a/core/os/input_event.cpp b/core/os/input_event.cpp index 6b43f2c63b..3cdd9ae0e0 100644 --- a/core/os/input_event.cpp +++ b/core/os/input_event.cpp @@ -177,6 +177,14 @@ bool InputEventWithModifiers::get_command() const { return command; } +void InputEventWithModifiers::set_modifiers_from_event(const InputEventWithModifiers *event) { + + set_alt(event->get_alt()); + set_shift(event->get_shift()); + set_control(event->get_control()); + set_metakey(event->get_metakey()); +} + void InputEventWithModifiers::_bind_methods() { ClassDB::bind_method(D_METHOD("set_alt", "enable"), &InputEventWithModifiers::set_alt); @@ -270,16 +278,16 @@ String InputEventKey::as_text() const { return kc; if (get_metakey()) { - kc = "Meta+" + kc; + kc = find_keycode_name(KEY_META) + ("+" + kc); } if (get_alt()) { - kc = "Alt+" + kc; + kc = find_keycode_name(KEY_ALT) + ("+" + kc); } if (get_shift()) { - kc = "Shift+" + kc; + kc = find_keycode_name(KEY_SHIFT) + ("+" + kc); } if (get_control()) { - kc = "Ctrl+" + kc; + kc = find_keycode_name(KEY_CONTROL) + ("+" + kc); } return kc; } @@ -436,10 +444,7 @@ Ref<InputEvent> InputEventMouseButton::xformed_by(const Transform2D &p_xform, co mb->set_id(get_id()); mb->set_device(get_device()); - mb->set_alt(get_alt()); - mb->set_shift(get_shift()); - mb->set_control(get_control()); - mb->set_metakey(get_metakey()); + mb->set_modifiers_from_event(this); mb->set_position(l); mb->set_global_position(g); @@ -555,10 +560,7 @@ Ref<InputEvent> InputEventMouseMotion::xformed_by(const Transform2D &p_xform, co mm->set_id(get_id()); mm->set_device(get_device()); - mm->set_alt(get_alt()); - mm->set_shift(get_shift()); - mm->set_control(get_control()); - mm->set_metakey(get_metakey()); + mm->set_modifiers_from_event(this); mm->set_position(l); mm->set_global_position(g); @@ -930,3 +932,75 @@ void InputEventAction::_bind_methods() { InputEventAction::InputEventAction() { pressed = false; } +///////////////////////////// + +void InputEventGesture::set_position(const Vector2 &p_pos) { + + pos = p_pos; +} + +Vector2 InputEventGesture::get_position() const { + + return pos; +} +///////////////////////////// + +void InputEventMagnifyGesture::set_factor(real_t p_factor) { + + factor = p_factor; +} + +real_t InputEventMagnifyGesture::get_factor() const { + + return factor; +} + +Ref<InputEvent> InputEventMagnifyGesture::xformed_by(const Transform2D &p_xform, const Vector2 &p_local_ofs) const { + + Ref<InputEventMagnifyGesture> ev; + ev.instance(); + + ev->set_id(get_id()); + ev->set_device(get_device()); + ev->set_modifiers_from_event(this); + + ev->set_position(p_xform.xform(get_position() + p_local_ofs)); + ev->set_factor(get_factor()); + + return ev; +} + +InputEventMagnifyGesture::InputEventMagnifyGesture() { + + factor = 1.0; +} +///////////////////////////// + +void InputEventPanGesture::set_delta(const Vector2 &p_delta) { + + delta = p_delta; +} + +Vector2 InputEventPanGesture::get_delta() const { + return delta; +} + +Ref<InputEvent> InputEventPanGesture::xformed_by(const Transform2D &p_xform, const Vector2 &p_local_ofs) const { + + Ref<InputEventPanGesture> ev; + ev.instance(); + + ev->set_id(get_id()); + ev->set_device(get_device()); + ev->set_modifiers_from_event(this); + + ev->set_position(p_xform.xform(get_position() + p_local_ofs)); + ev->set_delta(get_delta()); + + return ev; +} + +InputEventPanGesture::InputEventPanGesture() { + + delta = Vector2(0, 0); +} diff --git a/core/os/input_event.h b/core/os/input_event.h index de3c0232ff..2cba60bede 100644 --- a/core/os/input_event.h +++ b/core/os/input_event.h @@ -213,6 +213,8 @@ public: void set_command(bool p_enabled); bool get_command() const; + void set_modifiers_from_event(const InputEventWithModifiers *event); + InputEventWithModifiers(); }; @@ -468,4 +470,42 @@ public: InputEventAction(); }; +class InputEventGesture : public InputEventWithModifiers { + + GDCLASS(InputEventGesture, InputEventWithModifiers) + + Vector2 pos; + +public: + void set_position(const Vector2 &p_pos); + Vector2 get_position() const; +}; + +class InputEventMagnifyGesture : public InputEventGesture { + + GDCLASS(InputEventMagnifyGesture, InputEventGesture) + real_t factor; + +public: + void set_factor(real_t p_factor); + real_t get_factor() const; + + virtual Ref<InputEvent> xformed_by(const Transform2D &p_xform, const Vector2 &p_local_ofs = Vector2()) const; + + InputEventMagnifyGesture(); +}; + +class InputEventPanGesture : public InputEventGesture { + + GDCLASS(InputEventPanGesture, InputEventGesture) + Vector2 delta; + +public: + void set_delta(const Vector2 &p_delta); + Vector2 get_delta() const; + + virtual Ref<InputEvent> xformed_by(const Transform2D &p_xform, const Vector2 &p_local_ofs = Vector2()) const; + + InputEventPanGesture(); +}; #endif diff --git a/core/os/keyboard.cpp b/core/os/keyboard.cpp index edf4f3e2f9..dead3b6ac0 100644 --- a/core/os/keyboard.cpp +++ b/core/os/keyboard.cpp @@ -60,7 +60,11 @@ static const _KeyCodeText _keycodes[] = { {KEY_PAGEDOWN ,"PageDown"}, {KEY_SHIFT ,"Shift"}, {KEY_CONTROL ,"Control"}, +#ifdef OSX_ENABLED + {KEY_META ,"Command"}, +#else {KEY_META ,"Meta"}, +#endif {KEY_ALT ,"Alt"}, {KEY_CAPSLOCK ,"CapsLock"}, {KEY_NUMLOCK ,"NumLock"}, @@ -390,14 +394,22 @@ bool keycode_has_unicode(uint32_t p_keycode) { String keycode_get_string(uint32_t p_code) { String codestr; - if (p_code & KEY_MASK_SHIFT) - codestr += "Shift+"; - if (p_code & KEY_MASK_ALT) - codestr += "Alt+"; - if (p_code & KEY_MASK_CTRL) - codestr += "Ctrl+"; - if (p_code & KEY_MASK_META) - codestr += "Meta+"; + if (p_code & KEY_MASK_SHIFT) { + codestr += find_keycode_name(KEY_SHIFT); + codestr += "+"; + } + if (p_code & KEY_MASK_ALT) { + codestr += find_keycode_name(KEY_ALT); + codestr += "+"; + } + if (p_code & KEY_MASK_CTRL) { + codestr += find_keycode_name(KEY_CONTROL); + codestr += "+"; + } + if (p_code & KEY_MASK_META) { + codestr += find_keycode_name(KEY_META); + codestr += "+"; + } p_code &= KEY_CODE_MASK; @@ -433,6 +445,21 @@ int find_keycode(const String &p_code) { return 0; } +const char *find_keycode_name(int p_keycode) { + + const _KeyCodeText *kct = &_keycodes[0]; + + while (kct->text) { + + if (kct->code == p_keycode) { + return kct->text; + } + kct++; + } + + return ""; +} + struct _KeyCodeReplace { int from; int to; diff --git a/core/os/keyboard.h b/core/os/keyboard.h index 509ff23a93..f49cbc6b18 100644 --- a/core/os/keyboard.h +++ b/core/os/keyboard.h @@ -326,6 +326,7 @@ enum KeyModifierMask { String keycode_get_string(uint32_t p_code); bool keycode_has_unicode(uint32_t p_keycode); int find_keycode(const String &p_code); +const char *find_keycode_name(int p_keycode); int keycode_get_count(); int keycode_get_value_by_index(int p_index); const char *keycode_get_name_by_index(int p_index); diff --git a/core/os/memory.cpp b/core/os/memory.cpp index 74d5cbbea1..439951f711 100644 --- a/core/os/memory.cpp +++ b/core/os/memory.cpp @@ -44,6 +44,26 @@ void *operator new(size_t p_size, void *(*p_allocfunc)(size_t p_size)) { return p_allocfunc(p_size); } +#ifdef _MSC_VER +void operator delete(void *p_mem, const char *p_description) { + + ERR_EXPLAINC("Call to placement delete should not happen."); + CRASH_NOW(); +} + +void operator delete(void *p_mem, void *(*p_allocfunc)(size_t p_size)) { + + ERR_EXPLAINC("Call to placement delete should not happen."); + CRASH_NOW(); +} + +void operator delete(void *p_mem, void *p_pointer, size_t check, const char *p_description) { + + ERR_EXPLAINC("Call to placement delete should not happen."); + CRASH_NOW(); +} +#endif + #ifdef DEBUG_ENABLED uint64_t Memory::mem_usage = 0; uint64_t Memory::max_usage = 0; diff --git a/core/os/memory.h b/core/os/memory.h index f8b3da579b..7801d56837 100644 --- a/core/os/memory.h +++ b/core/os/memory.h @@ -72,6 +72,14 @@ void *operator new(size_t p_size, void *(*p_allocfunc)(size_t p_size)); ///< ope void *operator new(size_t p_size, void *p_pointer, size_t check, const char *p_description); ///< operator new that takes a description and uses a pointer to the preallocated memory +#ifdef _MSC_VER +// When compiling with VC++ 2017, the above declarations of placement new generate many irrelevant warnings (C4291). +// The purpose of the following definitions is to muffle these warnings, not to provide a usable implementation of placement delete. +void operator delete(void *p_mem, const char *p_description); +void operator delete(void *p_mem, void *(*p_allocfunc)(size_t p_size)); +void operator delete(void *p_mem, void *p_pointer, size_t check, const char *p_description); +#endif + #define memalloc(m_size) Memory::alloc_static(m_size) #define memrealloc(m_mem, m_size) Memory::realloc_static(m_mem, m_size) #define memfree(m_size) Memory::free_static(m_size) diff --git a/core/os/os.cpp b/core/os/os.cpp index eb5d5be33d..84937c0e59 100644 --- a/core/os/os.cpp +++ b/core/os/os.cpp @@ -33,6 +33,7 @@ #include "input.h" #include "os/file_access.h" #include "project_settings.h" +#include "version_generated.gen.h" #include <stdarg.h> @@ -62,15 +63,21 @@ void OS::debug_break(){ // something }; -void OS::_set_logger(Logger *p_logger) { +void OS::_set_logger(CompositeLogger *p_logger) { if (_logger) { memdelete(_logger); } _logger = p_logger; } -void OS::initialize_logger() { - _set_logger(memnew(StdLogger)); +void OS::add_logger(Logger *p_logger) { + if (!_logger) { + Vector<Logger *> loggers; + loggers.push_back(p_logger); + _logger = memnew(CompositeLogger(loggers)); + } else { + _logger->add_logger(p_logger); + } } void OS::print_error(const char *p_function, const char *p_file, int p_line, const char *p_code, const char *p_rationale, Logger::ErrorType p_type) { @@ -262,16 +269,7 @@ String OS::get_locale() const { return "en"; } -String OS::get_resource_dir() const { - - return ProjectSettings::get_singleton()->get_resource_path(); -} - -String OS::get_system_dir(SystemDir p_dir) const { - - return "."; -} - +// Helper function used by OS_Unix and OS_Windows String OS::get_safe_application_name() const { String an = ProjectSettings::get_singleton()->get("application/config/name"); Vector<String> invalid_char = String("\\ / : * ? \" < > |").split(" "); @@ -281,11 +279,51 @@ String OS::get_safe_application_name() const { return an; } -String OS::get_data_dir() const { +// Path to data, config, cache, etc. OS-specific folders + +// Get properly capitalized engine name for system paths +String OS::get_godot_dir_name() const { + + // Default to lowercase, so only override when different case is needed + return String(VERSION_SHORT_NAME).to_lower(); +} + +// OS equivalent of XDG_DATA_HOME +String OS::get_data_path() const { + + return "."; +} + +// OS equivalent of XDG_CONFIG_HOME +String OS::get_config_path() const { + + return "."; +} + +// OS equivalent of XDG_CACHE_HOME +String OS::get_cache_path() const { + + return "."; +} + +// OS specific path for user:// +String OS::get_user_data_dir() const { return "."; }; +// Absolute path to res:// +String OS::get_resource_dir() const { + + return ProjectSettings::get_singleton()->get_resource_path(); +} + +// Access system-specific dirs like Documents, Downloads, etc. +String OS::get_system_dir(SystemDir p_dir) const { + + return "."; +} + Error OS::shell_open(String p_uri) { return ERR_UNAVAILABLE; }; @@ -374,9 +412,9 @@ OS::ScreenOrientation OS::get_screen_orientation() const { return (OS::ScreenOrientation)_orientation; } -void OS::_ensure_data_dir() { +void OS::_ensure_user_data_dir() { - String dd = get_data_dir(); + String dd = get_user_data_dir(); DirAccess *da = DirAccess::open(dd); if (da) { memdelete(da); @@ -516,6 +554,33 @@ bool OS::has_feature(const String &p_feature) { if (sizeof(void *) == 4 && p_feature == "32") { return true; } +#if defined(__x86_64) || defined(__x86_64__) || defined(__amd64__) + if (p_feature == "x86_64") { + return true; + } +#elif (defined(__i386) || defined(__i386__)) + if (p_feature == "x86") { + return true; + } +#elif defined(__aarch64__) + if (p_feature == "arm64") { + return true; + } +#elif defined(__arm__) +#if defined(__ARM_ARCH_7A__) + if (p_feature == "armv7a" || p_feature == "armv7") { + return true; + } +#endif +#if defined(__ARM_ARCH_7S__) + if (p_feature == "armv7s" || p_feature == "armv7") { + return true; + } +#endif + if (p_feature == "arm") { + return true; + } +#endif if (_check_internal_feature_support(p_feature)) return true; @@ -545,7 +610,10 @@ OS::OS() { _stack_bottom = (void *)(&stack_bottom); _logger = NULL; - _set_logger(memnew(StdLogger)); + + Vector<Logger *> loggers; + loggers.push_back(memnew(StdLogger)); + _set_logger(memnew(CompositeLogger(loggers))); } OS::~OS() { diff --git a/core/os/os.h b/core/os/os.h index faecdb0e07..fe4ffb2922 100644 --- a/core/os/os.h +++ b/core/os/os.h @@ -62,10 +62,10 @@ class OS { void *_stack_bottom; - Logger *_logger; + CompositeLogger *_logger; protected: - void _set_logger(Logger *p_logger); + void _set_logger(CompositeLogger *p_logger); public: typedef void (*ImeCallback)(void *p_inp, String p_text, Point2 p_selection); @@ -90,13 +90,15 @@ public: bool fullscreen; bool resizable; bool borderless_window; + bool maximized; float get_aspect() const { return (float)width / (float)height; } - VideoMode(int p_width = 1024, int p_height = 600, bool p_fullscreen = false, bool p_resizable = true, bool p_borderless_window = false) { + VideoMode(int p_width = 1024, int p_height = 600, bool p_fullscreen = false, bool p_resizable = true, bool p_borderless_window = false, bool p_maximized = false) { width = p_width; height = p_height; fullscreen = p_fullscreen; resizable = p_resizable; borderless_window = p_borderless_window; + maximized = p_maximized; } }; @@ -112,7 +114,8 @@ protected: virtual int get_audio_driver_count() const = 0; virtual const char *get_audio_driver_name(int p_driver) const = 0; - virtual void initialize_logger(); + void add_logger(Logger *p_logger); + virtual void initialize_core() = 0; virtual void initialize(const VideoMode &p_desired, int p_video_driver, int p_audio_driver) = 0; @@ -124,7 +127,7 @@ protected: virtual void set_cmdline(const char *p_execpath, const List<String> &p_args); - void _ensure_data_dir(); + void _ensure_user_data_dir(); virtual bool _check_internal_feature_support(const String &p_feature) = 0; public: @@ -200,7 +203,6 @@ public: virtual void set_low_processor_usage_mode(bool p_enabled); virtual bool is_in_low_processor_usage_mode() const; - virtual String get_installed_templates_path() const { return ""; } virtual String get_executable_path() const; virtual Error execute(const String &p_path, const List<String> &p_arguments, bool p_blocking, ProcessID *r_child_id = NULL, String *r_pipe = NULL, int *r_exitcode = NULL, bool read_stderr = false) = 0; virtual Error kill(const ProcessID &p_pid) = 0; @@ -334,10 +336,14 @@ public: virtual String get_locale() const; String get_safe_application_name() const; - virtual String get_data_dir() const; - virtual String get_resource_dir() const; + virtual String get_godot_dir_name() const; - virtual Error move_to_trash(const String &p_path) { return FAILED; } + virtual String get_data_path() const; + virtual String get_config_path() const; + virtual String get_cache_path() const; + + virtual String get_user_data_dir() const; + virtual String get_resource_dir() const; enum SystemDir { SYSTEM_DIR_DESKTOP, @@ -352,6 +358,8 @@ public: virtual String get_system_dir(SystemDir p_dir) const; + virtual Error move_to_trash(const String &p_path) { return FAILED; } + virtual void set_no_window_mode(bool p_enable); virtual bool is_no_window_mode_enabled() const; diff --git a/core/packed_data_container.cpp b/core/packed_data_container.cpp index ad8438e416..3748df12f7 100644 --- a/core/packed_data_container.cpp +++ b/core/packed_data_container.cpp @@ -234,7 +234,7 @@ uint32_t PackedDataContainer::_pack(const Variant &p_data, Vector<uint8_t> &tmpd case Variant::TRANSFORM2D: case Variant::PLANE: case Variant::QUAT: - case Variant::RECT3: + case Variant::AABB: case Variant::BASIS: case Variant::TRANSFORM: case Variant::POOL_BYTE_ARRAY: diff --git a/core/print_string.cpp b/core/print_string.cpp index 92a04cbf0b..520fb3daec 100644 --- a/core/print_string.cpp +++ b/core/print_string.cpp @@ -82,7 +82,25 @@ void print_line(String p_string) { PrintHandlerList *l = print_handler_list; while (l) { - l->printfunc(l->userdata, p_string); + l->printfunc(l->userdata, p_string, false); + l = l->next; + } + + _global_unlock(); +} + +void print_error(String p_string) { + + if (!_print_error_enabled) + return; + + OS::get_singleton()->printerr("%s\n", p_string.utf8().get_data()); + + _global_lock(); + PrintHandlerList *l = print_handler_list; + while (l) { + + l->printfunc(l->userdata, p_string, true); l = l->next; } diff --git a/core/print_string.h b/core/print_string.h index 9f8420c31a..6b68380b9d 100644 --- a/core/print_string.h +++ b/core/print_string.h @@ -34,7 +34,7 @@ extern void (*_print_func)(String); -typedef void (*PrintHandlerFunc)(void *, const String &p_string); +typedef void (*PrintHandlerFunc)(void *, const String &p_string, bool p_error); struct PrintHandlerList { @@ -56,5 +56,6 @@ void remove_print_handler(PrintHandlerList *p_handler); extern bool _print_line_enabled; extern bool _print_error_enabled; extern void print_line(String p_string); +extern void print_error(String p_string); #endif diff --git a/core/project_settings.cpp b/core/project_settings.cpp index 65a6f2b83c..361464ee1f 100644 --- a/core/project_settings.cpp +++ b/core/project_settings.cpp @@ -116,7 +116,7 @@ String ProjectSettings::globalize_path(const String &p_path) const { return p_path.replace("res://", ""); } else if (p_path.begins_with("user://")) { - String data_dir = OS::get_singleton()->get_data_dir(); + String data_dir = OS::get_singleton()->get_user_data_dir(); if (data_dir != "") { return p_path.replace("user:/", data_dir); diff --git a/core/script_debugger_remote.cpp b/core/script_debugger_remote.cpp index f77fb116c7..5e06339b9e 100644 --- a/core/script_debugger_remote.cpp +++ b/core/script_debugger_remote.cpp @@ -35,6 +35,8 @@ #include "os/input.h" #include "os/os.h" #include "project_settings.h" +#include "scene/main/node.h" + void ScriptDebuggerRemote::_send_video_memory() { List<ResourceUsage> usage; @@ -201,20 +203,39 @@ void ScriptDebuggerRemote::debug(ScriptLanguage *p_script, bool p_can_continue) List<String> members; List<Variant> member_vals; - + if (ScriptInstance *inst = p_script->debug_get_stack_level_instance(lv)) { + members.push_back("self"); + member_vals.push_back(inst->get_owner()); + } p_script->debug_get_stack_level_members(lv, &members, &member_vals); - ERR_CONTINUE(members.size() != member_vals.size()); List<String> locals; List<Variant> local_vals; - p_script->debug_get_stack_level_locals(lv, &locals, &local_vals); - ERR_CONTINUE(locals.size() != local_vals.size()); + List<String> globals; + List<Variant> globals_vals; + p_script->debug_get_globals(&globals, &globals_vals); + ERR_CONTINUE(globals.size() != globals_vals.size()); + packet_peer_stream->put_var("stack_frame_vars"); - packet_peer_stream->put_var(2 + locals.size() * 2 + members.size() * 2); + packet_peer_stream->put_var(3 + (locals.size() + members.size() + globals.size()) * 2); + + { //locals + packet_peer_stream->put_var(locals.size()); + + List<String>::Element *E = locals.front(); + List<Variant>::Element *F = local_vals.front(); + + while (E) { + _put_variable(E->get(), F->get()); + + E = E->next(); + F = F->next(); + } + } { //members packet_peer_stream->put_var(members.size()); @@ -231,11 +252,11 @@ void ScriptDebuggerRemote::debug(ScriptLanguage *p_script, bool p_can_continue) } } - { //locals - packet_peer_stream->put_var(locals.size()); + { //globals + packet_peer_stream->put_var(globals.size()); - List<String>::Element *E = locals.front(); - List<Variant>::Element *F = local_vals.front(); + List<String>::Element *E = globals.front(); + List<Variant>::Element *F = globals_vals.front(); while (E) { _put_variable(E->get(), F->get()); @@ -532,56 +553,88 @@ void ScriptDebuggerRemote::_send_object_id(ObjectID p_id) { if (!obj) return; - List<PropertyInfo> pinfo; - obj->get_property_list(&pinfo, true); + typedef Pair<PropertyInfo, Variant> PropertyDesc; + List<PropertyDesc> properties; - int props_to_send = 0; - for (List<PropertyInfo>::Element *E = pinfo.front(); E; E = E->next()) { + if (ScriptInstance *si = obj->get_script_instance()) { + if (!si->get_script().is_null()) { - if (E->get().usage & (PROPERTY_USAGE_EDITOR | PROPERTY_USAGE_CATEGORY)) { - props_to_send++; - } - } + Set<StringName> members; + si->get_script()->get_members(&members); + for (Set<StringName>::Element *E = members.front(); E; E = E->next()) { - packet_peer_stream->put_var("message:inspect_object"); - packet_peer_stream->put_var(props_to_send * 5 + 4); - packet_peer_stream->put_var(p_id); - packet_peer_stream->put_var(obj->get_class()); - if (obj->is_class("Resource") || obj->is_class("Node")) - packet_peer_stream->put_var(obj->call("get_path")); - else - packet_peer_stream->put_var(""); + Variant m; + if (si->get(E->get(), m)) { + PropertyInfo pi(m.get_type(), String("Members/") + E->get()); + properties.push_back(PropertyDesc(pi, m)); + } + } - packet_peer_stream->put_var(props_to_send); + Map<StringName, Variant> constants; + si->get_script()->get_constants(&constants); + for (Map<StringName, Variant>::Element *E = constants.front(); E; E = E->next()) { + PropertyInfo pi(E->value().get_type(), (String("Constants/") + E->key())); + properties.push_back(PropertyDesc(pi, E->value())); + } + } + } + if (Node *node = Object::cast_to<Node>(obj)) { + PropertyInfo pi(Variant::NODE_PATH, String("Node/path")); + properties.push_front(PropertyDesc(pi, node->get_path())); + } else if (Resource *res = Object::cast_to<Resource>(obj)) { + if (Script *s = Object::cast_to<Script>(res)) { + Map<StringName, Variant> constants; + s->get_constants(&constants); + for (Map<StringName, Variant>::Element *E = constants.front(); E; E = E->next()) { + PropertyInfo pi(E->value().get_type(), String("Constants/") + E->key()); + properties.push_front(PropertyDesc(pi, E->value())); + } + } + } + List<PropertyInfo> pinfo; + obj->get_property_list(&pinfo, true); for (List<PropertyInfo>::Element *E = pinfo.front(); E; E = E->next()) { - if (E->get().usage & (PROPERTY_USAGE_EDITOR | PROPERTY_USAGE_CATEGORY)) { + properties.push_back(PropertyDesc(E->get(), obj->get(E->get().name))); + } + } - if (E->get().usage & PROPERTY_USAGE_CATEGORY) { - packet_peer_stream->put_var("*" + E->get().name); - } else { - packet_peer_stream->put_var(E->get().name); - } - - Variant var = obj->get(E->get().name); - packet_peer_stream->put_var(E->get().type); - //only send information that can be sent.. - - int len = 0; //test how big is this to encode - encode_variant(var, NULL, len); - - if (len > packet_peer_stream->get_output_buffer_max_size()) { //limit to max size - packet_peer_stream->put_var(PROPERTY_HINT_OBJECT_TOO_BIG); - packet_peer_stream->put_var(""); - packet_peer_stream->put_var(Variant()); - } else { - packet_peer_stream->put_var(E->get().hint); - packet_peer_stream->put_var(E->get().hint_string); - packet_peer_stream->put_var(var); - } + Array send_props; + for (int i = 0; i < properties.size(); i++) { + const PropertyInfo &pi = properties[i].first; + const Variant &var = properties[i].second; + RES res = var; + + Array prop; + prop.push_back(pi.name); + prop.push_back(pi.type); + + //only send information that can be sent.. + int len = 0; //test how big is this to encode + encode_variant(var, NULL, len); + if (len > packet_peer_stream->get_output_buffer_max_size()) { //limit to max size + prop.push_back(PROPERTY_HINT_OBJECT_TOO_BIG); + prop.push_back(""); + prop.push_back(pi.usage); + prop.push_back(Variant()); + } else { + prop.push_back(pi.hint); + if (res.is_null()) + prop.push_back(pi.hint_string); + else + prop.push_back(String("RES:") + res->get_path()); + prop.push_back(pi.usage); + prop.push_back(var); } + send_props.push_back(prop); } + + packet_peer_stream->put_var("message:inspect_object"); + packet_peer_stream->put_var(3); + packet_peer_stream->put_var(p_id); + packet_peer_stream->put_var(obj->get_class()); + packet_peer_stream->put_var(send_props); } void ScriptDebuggerRemote::_set_object_property(ObjectID p_id, const String &p_property, const Variant &p_value) { @@ -590,7 +643,11 @@ void ScriptDebuggerRemote::_set_object_property(ObjectID p_id, const String &p_p if (!obj) return; - obj->set(p_property, p_value); + String prop_name = p_property; + if (p_property.begins_with("Members/")) + prop_name = p_property.substr(8, p_property.length()); + + obj->set(prop_name, p_value); } void ScriptDebuggerRemote::_poll_events() { @@ -832,7 +889,7 @@ void ScriptDebuggerRemote::send_message(const String &p_message, const Array &p_ mutex->unlock(); } -void ScriptDebuggerRemote::_print_handler(void *p_this, const String &p_string) { +void ScriptDebuggerRemote::_print_handler(void *p_this, const String &p_string, bool p_error) { ScriptDebuggerRemote *sdr = (ScriptDebuggerRemote *)p_this; diff --git a/core/script_debugger_remote.h b/core/script_debugger_remote.h index 22137d1350..90d2daf1f8 100644 --- a/core/script_debugger_remote.h +++ b/core/script_debugger_remote.h @@ -94,7 +94,7 @@ class ScriptDebuggerRemote : public ScriptDebugger { uint64_t msec_count; bool locking; //hack to avoid a deadloop - static void _print_handler(void *p_this, const String &p_string); + static void _print_handler(void *p_this, const String &p_string, bool p_error); PrintHandlerList phl; diff --git a/core/script_language.h b/core/script_language.h index 5da72d0492..3d01381f3b 100644 --- a/core/script_language.h +++ b/core/script_language.h @@ -120,6 +120,9 @@ public: virtual int get_member_line(const StringName &p_member) const { return -1; } + virtual void get_constants(Map<StringName, Variant> *p_constants) {} + virtual void get_members(Set<StringName> *p_constants) {} + Script() {} }; @@ -130,6 +133,7 @@ public: virtual void get_property_list(List<PropertyInfo> *p_properties) const = 0; virtual Variant::Type get_property_type(const StringName &p_name, bool *r_is_valid = NULL) const = 0; + virtual Object *get_owner() { return NULL; } virtual void get_property_state(List<Pair<StringName, Variant> > &state); virtual void get_method_list(List<MethodInfo> *p_list) const = 0; @@ -244,7 +248,8 @@ public: virtual String debug_get_stack_level_source(int p_level) const = 0; 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) = 0; 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) = 0; - virtual void debug_get_globals(List<String> *p_locals, List<Variant> *p_values, int p_max_subitems = -1, int p_max_depth = -1) = 0; + virtual ScriptInstance *debug_get_stack_level_instance(int p_level) { return NULL; } + virtual void debug_get_globals(List<String> *p_globals, List<Variant> *p_values, int p_max_subitems = -1, int p_max_depth = -1) = 0; virtual String debug_parse_stack_level_expression(int p_level, const String &p_expression, int p_max_subitems = -1, int p_max_depth = -1) = 0; struct StackInfo { diff --git a/core/translation.cpp b/core/translation.cpp index 7e4d4feb89..dcca58692a 100644 --- a/core/translation.cpp +++ b/core/translation.cpp @@ -333,6 +333,7 @@ static const char *locale_list[] = { "sq_KV", // Albanian (Kosovo) "sq_MK", // Albanian (Macedonia) "sr", // Serbian + "sr_Cyrl", // Serbian (Cyrillic) "sr_ME", // Serbian (Montenegro) "sr_RS", // Serbian (Serbia) "ss_ZA", // Swati (South Africa) @@ -693,6 +694,7 @@ static const char *locale_names[] = { "Albanian (Kosovo)", "Albanian (Macedonia)", "Serbian", + "Serbian (Cyrillic)", "Serbian (Montenegro)", "Serbian (Serbia)", "Swati (South Africa)", diff --git a/core/type_info.h b/core/type_info.h index 9fb80af0eb..24d96c51e8 100644 --- a/core/type_info.h +++ b/core/type_info.h @@ -82,7 +82,7 @@ MAKE_TYPE_INFO(Vector3, Variant::VECTOR3) MAKE_TYPE_INFO(Transform2D, Variant::TRANSFORM2D) MAKE_TYPE_INFO(Plane, Variant::PLANE) MAKE_TYPE_INFO(Quat, Variant::QUAT) -MAKE_TYPE_INFO(Rect3, Variant::RECT3) +MAKE_TYPE_INFO(AABB, Variant::AABB) MAKE_TYPE_INFO(Basis, Variant::BASIS) MAKE_TYPE_INFO(Transform, Variant::TRANSFORM) MAKE_TYPE_INFO(Color, Variant::COLOR) diff --git a/core/ustring.cpp b/core/ustring.cpp index 7c3a784c5b..8d40f56386 100644 --- a/core/ustring.cpp +++ b/core/ustring.cpp @@ -862,6 +862,17 @@ Vector<int> String::split_ints_mk(const Vector<String> &p_splitters, bool p_allo return ret; } +String String::join(Vector<String> parts) { + String ret; + for (int i = 0; i < parts.size(); ++i) { + if (i > 0) { + ret += *this; + } + ret += parts[i]; + } + return ret; +} + CharType String::char_uppercase(CharType p_char) { return _find_upper(p_char); diff --git a/core/ustring.h b/core/ustring.h index 353c8e6c1d..9c24133b55 100644 --- a/core/ustring.h +++ b/core/ustring.h @@ -169,6 +169,8 @@ public: Vector<int> split_ints(const String &p_splitter, bool p_allow_empty = true) const; Vector<int> split_ints_mk(const Vector<String> &p_splitters, bool p_allow_empty = true) const; + String join(Vector<String> parts); + static CharType char_uppercase(CharType p_char); static CharType char_lowercase(CharType p_char); String to_upper() const; diff --git a/core/variant.cpp b/core/variant.cpp index f70e4a5218..0f97b98a6f 100644 --- a/core/variant.cpp +++ b/core/variant.cpp @@ -94,9 +94,9 @@ String Variant::get_type_name(Variant::Type p_type) { } break;*/ - case RECT3: { + case AABB: { - return "Rect3"; + return "AABB"; } break; case QUAT: { @@ -267,6 +267,7 @@ bool Variant::can_convert(Variant::Type p_type_from, Variant::Type p_type_to) { static const Type valid[] = { QUAT, + VECTOR3, NIL }; @@ -512,6 +513,7 @@ bool Variant::can_convert_strict(Variant::Type p_type_from, Variant::Type p_type static const Type valid[] = { QUAT, + VECTOR3, NIL }; @@ -754,9 +756,9 @@ bool Variant::is_zero() const { } break;*/ - case RECT3: { + case AABB: { - return *_data._rect3 == Rect3(); + return *_data._aabb == ::AABB(); } break; case QUAT: { @@ -954,9 +956,9 @@ void Variant::reference(const Variant &p_variant) { memnew_placement(_data._mem, Plane(*reinterpret_cast<const Plane *>(p_variant._data._mem))); } break; - case RECT3: { + case AABB: { - _data._rect3 = memnew(Rect3(*p_variant._data._rect3)); + _data._aabb = memnew(::AABB(*p_variant._data._aabb)); } break; case QUAT: { @@ -1079,9 +1081,9 @@ void Variant::clear() { memdelete(_data._transform2d); } break; - case RECT3: { + case AABB: { - memdelete(_data._rect3); + memdelete(_data._aabb); } break; case BASIS: { @@ -1426,7 +1428,7 @@ Variant::operator String() const { case PLANE: return operator Plane(); //case QUAT: - case RECT3: return operator Rect3(); + case AABB: return operator ::AABB(); case QUAT: return "(" + operator Quat() + ")"; case BASIS: { @@ -1617,12 +1619,12 @@ Variant::operator Plane() const { else return Plane(); } -Variant::operator Rect3() const { +Variant::operator ::AABB() const { - if (type == RECT3) - return *_data._rect3; + if (type == AABB) + return *_data._aabb; else - return Rect3(); + return ::AABB(); } Variant::operator Basis() const { @@ -1631,7 +1633,9 @@ Variant::operator Basis() const { return *_data._basis; else if (type == QUAT) return *reinterpret_cast<const Quat *>(_data._mem); - else if (type == TRANSFORM) + else if (type == VECTOR3) { + return Basis(*reinterpret_cast<const Vector3 *>(_data._mem)); + } else if (type == TRANSFORM) // unexposed in Variant::can_convert? return _data._transform->basis; else return Basis(); @@ -2188,10 +2192,10 @@ Variant::Variant(const Plane &p_plane) { type = PLANE; memnew_placement(_data._mem, Plane(p_plane)); } -Variant::Variant(const Rect3 &p_aabb) { +Variant::Variant(const ::AABB &p_aabb) { - type = RECT3; - _data._rect3 = memnew(Rect3(p_aabb)); + type = AABB; + _data._aabb = memnew(::AABB(p_aabb)); } Variant::Variant(const Basis &p_matrix) { @@ -2524,9 +2528,9 @@ void Variant::operator=(const Variant &p_variant) { *reinterpret_cast<Plane *>(_data._mem) = *reinterpret_cast<const Plane *>(p_variant._data._mem); } break; - case RECT3: { + case AABB: { - *_data._rect3 = *(p_variant._data._rect3); + *_data._aabb = *(p_variant._data._aabb); } break; case QUAT: { @@ -2686,13 +2690,13 @@ uint32_t Variant::hash() const { } break;*/ - case RECT3: { + case AABB: { uint32_t hash = 5831; for (int i = 0; i < 3; i++) { - hash = hash_djb2_one_float(_data._rect3->position[i], hash); - hash = hash_djb2_one_float(_data._rect3->size[i], hash); + hash = hash_djb2_one_float(_data._aabb->position[i], hash); + hash = hash_djb2_one_float(_data._aabb->size[i], hash); } return hash; @@ -2952,9 +2956,9 @@ bool Variant::hash_compare(const Variant &p_variant) const { (hash_compare_scalar(l->d, r->d)); } break; - case RECT3: { - const Rect3 *l = _data._rect3; - const Rect3 *r = p_variant._data._rect3; + case AABB: { + const ::AABB *l = _data._aabb; + const ::AABB *r = p_variant._data._aabb; return (hash_compare_vector3(l->position, r->position) && (hash_compare_vector3(l->size, r->size))); diff --git a/core/variant.h b/core/variant.h index 45066af401..8ba4d576cf 100644 --- a/core/variant.h +++ b/core/variant.h @@ -34,6 +34,7 @@ @author Juan Linietsky <reduzio@gmail.com> */ +#include "aabb.h" #include "array.h" #include "color.h" #include "dictionary.h" @@ -45,7 +46,6 @@ #include "node_path.h" #include "plane.h" #include "quat.h" -#include "rect3.h" #include "ref_ptr.h" #include "rid.h" #include "transform.h" @@ -89,7 +89,7 @@ public: TRANSFORM2D, PLANE, QUAT, // 10 - RECT3, + AABB, BASIS, TRANSFORM, @@ -136,7 +136,7 @@ private: int64_t _int; double _real; Transform2D *_transform2d; - Rect3 *_rect3; + ::AABB *_aabb; Basis *_basis; Transform *_transform; RefPtr *_resource; @@ -184,7 +184,7 @@ public: operator Rect2() const; operator Vector3() const; operator Plane() const; - operator Rect3() const; + operator ::AABB() const; operator Quat() const; operator Basis() const; operator Transform() const; @@ -253,7 +253,7 @@ public: Variant(const Rect2 &p_rect2); Variant(const Vector3 &p_vector3); Variant(const Plane &p_plane); - Variant(const Rect3 &p_aabb); + Variant(const ::AABB &p_aabb); Variant(const Quat &p_quat); Variant(const Basis &p_transform); Variant(const Transform2D &p_transform); diff --git a/core/variant_call.cpp b/core/variant_call.cpp index 05f0478003..4a140bdb99 100644 --- a/core/variant_call.cpp +++ b/core/variant_call.cpp @@ -437,6 +437,8 @@ struct _VariantCall { VCALL_LOCALMEM0R(Color, contrasted); VCALL_LOCALMEM2R(Color, linear_interpolate); VCALL_LOCALMEM1R(Color, blend); + VCALL_LOCALMEM1R(Color, lightened); + VCALL_LOCALMEM1R(Color, darkened); VCALL_LOCALMEM1R(Color, to_html); VCALL_LOCALMEM0R(RID, get_id); @@ -446,7 +448,8 @@ struct _VariantCall { VCALL_LOCALMEM1R(NodePath, get_name); VCALL_LOCALMEM0R(NodePath, get_subname_count); VCALL_LOCALMEM1R(NodePath, get_subname); - VCALL_LOCALMEM0R(NodePath, get_property); + VCALL_LOCALMEM0R(NodePath, get_concatenated_subnames); + VCALL_LOCALMEM0R(NodePath, get_as_property_path); VCALL_LOCALMEM0R(NodePath, is_empty); VCALL_LOCALMEM0R(Dictionary, size); @@ -483,6 +486,8 @@ struct _VariantCall { VCALL_LOCALMEM1(Array, erase); VCALL_LOCALMEM0(Array, sort); VCALL_LOCALMEM2(Array, sort_custom); + VCALL_LOCALMEM2R(Array, bsearch); + VCALL_LOCALMEM4R(Array, bsearch_custom); VCALL_LOCALMEM0R(Array, duplicate); VCALL_LOCALMEM0(Array, invert); @@ -655,26 +660,26 @@ struct _VariantCall { #define VCALL_PTR5R(m_type, m_method) \ static void _call_##m_type##_##m_method(Variant &r_ret, Variant &p_self, const Variant **p_args) { r_ret = reinterpret_cast<m_type *>(p_self._data._ptr)->m_method(*p_args[0], *p_args[1], *p_args[2], *p_args[3], *p_args[4]); } - VCALL_PTR0R(Rect3, get_area); - VCALL_PTR0R(Rect3, has_no_area); - VCALL_PTR0R(Rect3, has_no_surface); - VCALL_PTR1R(Rect3, intersects); - VCALL_PTR1R(Rect3, encloses); - VCALL_PTR1R(Rect3, merge); - VCALL_PTR1R(Rect3, intersection); - VCALL_PTR1R(Rect3, intersects_plane); - VCALL_PTR2R(Rect3, intersects_segment); - VCALL_PTR1R(Rect3, has_point); - VCALL_PTR1R(Rect3, get_support); - VCALL_PTR0R(Rect3, get_longest_axis); - VCALL_PTR0R(Rect3, get_longest_axis_index); - VCALL_PTR0R(Rect3, get_longest_axis_size); - VCALL_PTR0R(Rect3, get_shortest_axis); - VCALL_PTR0R(Rect3, get_shortest_axis_index); - VCALL_PTR0R(Rect3, get_shortest_axis_size); - VCALL_PTR1R(Rect3, expand); - VCALL_PTR1R(Rect3, grow); - VCALL_PTR1R(Rect3, get_endpoint); + VCALL_PTR0R(AABB, get_area); + VCALL_PTR0R(AABB, has_no_area); + VCALL_PTR0R(AABB, has_no_surface); + VCALL_PTR1R(AABB, intersects); + VCALL_PTR1R(AABB, encloses); + VCALL_PTR1R(AABB, merge); + VCALL_PTR1R(AABB, intersection); + VCALL_PTR1R(AABB, intersects_plane); + VCALL_PTR2R(AABB, intersects_segment); + VCALL_PTR1R(AABB, has_point); + VCALL_PTR1R(AABB, get_support); + VCALL_PTR0R(AABB, get_longest_axis); + VCALL_PTR0R(AABB, get_longest_axis_index); + VCALL_PTR0R(AABB, get_longest_axis_size); + VCALL_PTR0R(AABB, get_shortest_axis); + VCALL_PTR0R(AABB, get_shortest_axis_index); + VCALL_PTR0R(AABB, get_shortest_axis_size); + VCALL_PTR1R(AABB, expand); + VCALL_PTR1R(AABB, grow); + VCALL_PTR1R(AABB, get_endpoint); VCALL_PTR0R(Transform2D, inverse); VCALL_PTR0R(Transform2D, affine_inverse); @@ -755,7 +760,7 @@ struct _VariantCall { case Variant::VECTOR3: r_ret = reinterpret_cast<Transform *>(p_self._data._ptr)->xform(p_args[0]->operator Vector3()); return; case Variant::PLANE: r_ret = reinterpret_cast<Transform *>(p_self._data._ptr)->xform(p_args[0]->operator Plane()); return; - case Variant::RECT3: r_ret = reinterpret_cast<Transform *>(p_self._data._ptr)->xform(p_args[0]->operator Rect3()); return; + case Variant::AABB: r_ret = reinterpret_cast<Transform *>(p_self._data._ptr)->xform(p_args[0]->operator ::AABB()); return; default: r_ret = Variant(); } } @@ -766,7 +771,7 @@ struct _VariantCall { case Variant::VECTOR3: r_ret = reinterpret_cast<Transform *>(p_self._data._ptr)->xform_inv(p_args[0]->operator Vector3()); return; case Variant::PLANE: r_ret = reinterpret_cast<Transform *>(p_self._data._ptr)->xform_inv(p_args[0]->operator Plane()); return; - case Variant::RECT3: r_ret = reinterpret_cast<Transform *>(p_self._data._ptr)->xform_inv(p_args[0]->operator Rect3()); return; + case Variant::AABB: r_ret = reinterpret_cast<Transform *>(p_self._data._ptr)->xform_inv(p_args[0]->operator ::AABB()); return; default: r_ret = Variant(); } } @@ -878,9 +883,9 @@ struct _VariantCall { r_ret = Color::hex(*p_args[0]); } - static void Rect3_init1(Variant &r_ret, const Variant **p_args) { + static void AABB_init1(Variant &r_ret, const Variant **p_args) { - r_ret = Rect3(*p_args[0], *p_args[1]); + r_ret = ::AABB(*p_args[0], *p_args[1]); } static void Basis_init1(Variant &r_ret, const Variant **p_args) { @@ -897,11 +902,6 @@ 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; @@ -1058,8 +1058,8 @@ Variant Variant::construct(const Variant::Type p_type, const Variant **p_args, i case TRANSFORM2D: return Transform2D(); case PLANE: return Plane(); case QUAT: return Quat(); - case RECT3: - return Rect3(); // 10 + case AABB: + return ::AABB(); // 10 case BASIS: return Basis(); case TRANSFORM: return Transform(); @@ -1138,8 +1138,8 @@ Variant Variant::construct(const Variant::Type p_type, const Variant **p_args, i case VECTOR3: return (Vector3(*p_args[0])); case PLANE: return (Plane(*p_args[0])); case QUAT: return (Quat(*p_args[0])); - case RECT3: - return (Rect3(*p_args[0])); // 10 + case AABB: + return (::AABB(*p_args[0])); // 10 case BASIS: return (Basis(p_args[0]->operator Basis())); case TRANSFORM: return (Transform(p_args[0]->operator Transform())); @@ -1581,6 +1581,8 @@ void register_variant_methods() { ADDFUNC0R(COLOR, COLOR, Color, contrasted, varray()); ADDFUNC2R(COLOR, COLOR, Color, linear_interpolate, COLOR, "b", REAL, "t", varray()); ADDFUNC1R(COLOR, COLOR, Color, blend, COLOR, "over", varray()); + ADDFUNC1R(COLOR, COLOR, Color, lightened, REAL, "amount", varray()); + ADDFUNC1R(COLOR, COLOR, Color, darkened, REAL, "amount", varray()); ADDFUNC1R(COLOR, STRING, Color, to_html, BOOL, "with_alpha", varray(true)); ADDFUNC0R(_RID, INT, RID, get_id, varray()); @@ -1590,7 +1592,8 @@ void register_variant_methods() { ADDFUNC1R(NODE_PATH, STRING, NodePath, get_name, INT, "idx", varray()); ADDFUNC0R(NODE_PATH, INT, NodePath, get_subname_count, varray()); ADDFUNC1R(NODE_PATH, STRING, NodePath, get_subname, INT, "idx", varray()); - ADDFUNC0R(NODE_PATH, STRING, NodePath, get_property, varray()); + ADDFUNC0R(NODE_PATH, STRING, NodePath, get_concatenated_subnames, varray()); + ADDFUNC0R(NODE_PATH, NODE_PATH, NodePath, get_as_property_path, varray()); ADDFUNC0R(NODE_PATH, BOOL, NodePath, is_empty, varray()); ADDFUNC0R(DICTIONARY, INT, Dictionary, size, varray()); @@ -1625,6 +1628,8 @@ void register_variant_methods() { ADDFUNC0RNC(ARRAY, NIL, Array, pop_front, varray()); ADDFUNC0NC(ARRAY, NIL, Array, sort, varray()); ADDFUNC2NC(ARRAY, NIL, Array, sort_custom, OBJECT, "obj", STRING, "func", varray()); + ADDFUNC2R(ARRAY, INT, Array, bsearch, NIL, "value", BOOL, "before", varray(true)); + ADDFUNC4R(ARRAY, INT, Array, bsearch_custom, NIL, "value", OBJECT, "obj", STRING, "func", BOOL, "before", varray(true)); ADDFUNC0NC(ARRAY, NIL, Array, invert, varray()); ADDFUNC0RNC(ARRAY, ARRAY, Array, duplicate, varray()); @@ -1707,26 +1712,26 @@ void register_variant_methods() { //pointerbased - ADDFUNC0R(RECT3, REAL, Rect3, get_area, varray()); - ADDFUNC0R(RECT3, BOOL, Rect3, has_no_area, varray()); - ADDFUNC0R(RECT3, BOOL, Rect3, has_no_surface, varray()); - ADDFUNC1R(RECT3, BOOL, Rect3, intersects, RECT3, "with", varray()); - ADDFUNC1R(RECT3, BOOL, Rect3, encloses, RECT3, "with", varray()); - ADDFUNC1R(RECT3, RECT3, Rect3, merge, RECT3, "with", varray()); - ADDFUNC1R(RECT3, RECT3, Rect3, intersection, RECT3, "with", varray()); - ADDFUNC1R(RECT3, BOOL, Rect3, intersects_plane, PLANE, "plane", varray()); - ADDFUNC2R(RECT3, BOOL, Rect3, intersects_segment, VECTOR3, "from", VECTOR3, "to", varray()); - ADDFUNC1R(RECT3, BOOL, Rect3, has_point, VECTOR3, "point", varray()); - ADDFUNC1R(RECT3, VECTOR3, Rect3, get_support, VECTOR3, "dir", varray()); - ADDFUNC0R(RECT3, VECTOR3, Rect3, get_longest_axis, varray()); - ADDFUNC0R(RECT3, INT, Rect3, get_longest_axis_index, varray()); - ADDFUNC0R(RECT3, REAL, Rect3, get_longest_axis_size, varray()); - ADDFUNC0R(RECT3, VECTOR3, Rect3, get_shortest_axis, varray()); - ADDFUNC0R(RECT3, INT, Rect3, get_shortest_axis_index, varray()); - ADDFUNC0R(RECT3, REAL, Rect3, get_shortest_axis_size, varray()); - ADDFUNC1R(RECT3, RECT3, Rect3, expand, VECTOR3, "to_point", varray()); - ADDFUNC1R(RECT3, RECT3, Rect3, grow, REAL, "by", varray()); - ADDFUNC1R(RECT3, VECTOR3, Rect3, get_endpoint, INT, "idx", varray()); + ADDFUNC0R(AABB, REAL, AABB, get_area, varray()); + ADDFUNC0R(AABB, BOOL, AABB, has_no_area, varray()); + ADDFUNC0R(AABB, BOOL, AABB, has_no_surface, varray()); + ADDFUNC1R(AABB, BOOL, AABB, intersects, AABB, "with", varray()); + ADDFUNC1R(AABB, BOOL, AABB, encloses, AABB, "with", varray()); + ADDFUNC1R(AABB, AABB, AABB, merge, AABB, "with", varray()); + ADDFUNC1R(AABB, AABB, AABB, intersection, AABB, "with", varray()); + ADDFUNC1R(AABB, BOOL, AABB, intersects_plane, PLANE, "plane", varray()); + ADDFUNC2R(AABB, BOOL, AABB, intersects_segment, VECTOR3, "from", VECTOR3, "to", varray()); + ADDFUNC1R(AABB, BOOL, AABB, has_point, VECTOR3, "point", varray()); + ADDFUNC1R(AABB, VECTOR3, AABB, get_support, VECTOR3, "dir", varray()); + ADDFUNC0R(AABB, VECTOR3, AABB, get_longest_axis, varray()); + ADDFUNC0R(AABB, INT, AABB, get_longest_axis_index, varray()); + ADDFUNC0R(AABB, REAL, AABB, get_longest_axis_size, varray()); + ADDFUNC0R(AABB, VECTOR3, AABB, get_shortest_axis, varray()); + ADDFUNC0R(AABB, INT, AABB, get_shortest_axis_index, varray()); + ADDFUNC0R(AABB, REAL, AABB, get_shortest_axis_size, varray()); + ADDFUNC1R(AABB, AABB, AABB, expand, VECTOR3, "to_point", varray()); + ADDFUNC1R(AABB, AABB, AABB, grow, REAL, "by", varray()); + ADDFUNC1R(AABB, VECTOR3, AABB, get_endpoint, INT, "idx", varray()); ADDFUNC0R(TRANSFORM2D, TRANSFORM2D, Transform2D, inverse, varray()); ADDFUNC0R(TRANSFORM2D, TRANSFORM2D, Transform2D, affine_inverse, varray()); @@ -1791,11 +1796,10 @@ void register_variant_methods() { _VariantCall::add_constructor(_VariantCall::Color_init1, Variant::COLOR, "r", Variant::REAL, "g", Variant::REAL, "b", Variant::REAL, "a", Variant::REAL); _VariantCall::add_constructor(_VariantCall::Color_init2, Variant::COLOR, "r", Variant::REAL, "g", Variant::REAL, "b", Variant::REAL); - _VariantCall::add_constructor(_VariantCall::Rect3_init1, Variant::RECT3, "position", Variant::VECTOR3, "size", Variant::VECTOR3); + _VariantCall::add_constructor(_VariantCall::AABB_init1, Variant::AABB, "position", Variant::VECTOR3, "size", Variant::VECTOR3); _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/variant_op.cpp b/core/variant_op.cpp index 6362090902..c793d70ed8 100644 --- a/core/variant_op.cpp +++ b/core/variant_op.cpp @@ -48,7 +48,7 @@ CASE_TYPE(PREFIX, OP, TRANSFORM2D) \ CASE_TYPE(PREFIX, OP, PLANE) \ CASE_TYPE(PREFIX, OP, QUAT) \ - CASE_TYPE(PREFIX, OP, RECT3) \ + CASE_TYPE(PREFIX, OP, AABB) \ CASE_TYPE(PREFIX, OP, BASIS) \ CASE_TYPE(PREFIX, OP, TRANSFORM) \ CASE_TYPE(PREFIX, OP, COLOR) \ @@ -81,7 +81,7 @@ TYPE(PREFIX, OP, TRANSFORM2D), \ TYPE(PREFIX, OP, PLANE), \ TYPE(PREFIX, OP, QUAT), \ - TYPE(PREFIX, OP, RECT3), \ + TYPE(PREFIX, OP, AABB), \ TYPE(PREFIX, OP, BASIS), \ TYPE(PREFIX, OP, TRANSFORM), \ TYPE(PREFIX, OP, COLOR), \ @@ -465,7 +465,7 @@ void Variant::evaluate(const Operator &p_op, const Variant &p_a, DEFAULT_OP_LOCALMEM_NULL(math, OP_EQUAL, VECTOR3, ==, Vector3); DEFAULT_OP_LOCALMEM_NULL(math, OP_EQUAL, PLANE, ==, Plane); DEFAULT_OP_LOCALMEM_NULL(math, OP_EQUAL, QUAT, ==, Quat); - DEFAULT_OP_PTRREF_NULL(math, OP_EQUAL, RECT3, ==, _rect3); + DEFAULT_OP_PTRREF_NULL(math, OP_EQUAL, AABB, ==, _aabb); DEFAULT_OP_PTRREF_NULL(math, OP_EQUAL, BASIS, ==, _basis); DEFAULT_OP_PTRREF_NULL(math, OP_EQUAL, TRANSFORM, ==, _transform); DEFAULT_OP_LOCALMEM_NULL(math, OP_EQUAL, COLOR, ==, Color); @@ -555,7 +555,7 @@ void Variant::evaluate(const Operator &p_op, const Variant &p_a, DEFAULT_OP_LOCALMEM_NULL(math, OP_NOT_EQUAL, VECTOR3, !=, Vector3); DEFAULT_OP_LOCALMEM_NULL(math, OP_NOT_EQUAL, PLANE, !=, Plane); DEFAULT_OP_LOCALMEM_NULL(math, OP_NOT_EQUAL, QUAT, !=, Quat); - DEFAULT_OP_PTRREF_NULL(math, OP_NOT_EQUAL, RECT3, !=, _rect3); + DEFAULT_OP_PTRREF_NULL(math, OP_NOT_EQUAL, AABB, !=, _aabb); DEFAULT_OP_PTRREF_NULL(math, OP_NOT_EQUAL, BASIS, !=, _basis); DEFAULT_OP_PTRREF_NULL(math, OP_NOT_EQUAL, TRANSFORM, !=, _transform); DEFAULT_OP_LOCALMEM_NULL(math, OP_NOT_EQUAL, COLOR, !=, Color); @@ -629,7 +629,7 @@ void Variant::evaluate(const Operator &p_op, const Variant &p_a, CASE_TYPE(math, OP_LESS, TRANSFORM2D) CASE_TYPE(math, OP_LESS, PLANE) CASE_TYPE(math, OP_LESS, QUAT) - CASE_TYPE(math, OP_LESS, RECT3) + CASE_TYPE(math, OP_LESS, AABB) CASE_TYPE(math, OP_LESS, BASIS) CASE_TYPE(math, OP_LESS, TRANSFORM) CASE_TYPE(math, OP_LESS, COLOR) @@ -658,7 +658,7 @@ void Variant::evaluate(const Operator &p_op, const Variant &p_a, CASE_TYPE(math, OP_LESS_EQUAL, TRANSFORM2D) CASE_TYPE(math, OP_LESS_EQUAL, PLANE) CASE_TYPE(math, OP_LESS_EQUAL, QUAT) - CASE_TYPE(math, OP_LESS_EQUAL, RECT3) + CASE_TYPE(math, OP_LESS_EQUAL, AABB) CASE_TYPE(math, OP_LESS_EQUAL, BASIS) CASE_TYPE(math, OP_LESS_EQUAL, TRANSFORM) CASE_TYPE(math, OP_LESS_EQUAL, COLOR) @@ -733,7 +733,7 @@ void Variant::evaluate(const Operator &p_op, const Variant &p_a, CASE_TYPE(math, OP_GREATER, TRANSFORM2D) CASE_TYPE(math, OP_GREATER, PLANE) CASE_TYPE(math, OP_GREATER, QUAT) - CASE_TYPE(math, OP_GREATER, RECT3) + CASE_TYPE(math, OP_GREATER, AABB) CASE_TYPE(math, OP_GREATER, BASIS) CASE_TYPE(math, OP_GREATER, TRANSFORM) CASE_TYPE(math, OP_GREATER, COLOR) @@ -762,7 +762,7 @@ void Variant::evaluate(const Operator &p_op, const Variant &p_a, CASE_TYPE(math, OP_GREATER_EQUAL, TRANSFORM2D) CASE_TYPE(math, OP_GREATER_EQUAL, PLANE) CASE_TYPE(math, OP_GREATER_EQUAL, QUAT) - CASE_TYPE(math, OP_GREATER_EQUAL, RECT3) + CASE_TYPE(math, OP_GREATER_EQUAL, AABB) CASE_TYPE(math, OP_GREATER_EQUAL, BASIS) CASE_TYPE(math, OP_GREATER_EQUAL, TRANSFORM) CASE_TYPE(math, OP_GREATER_EQUAL, COLOR) @@ -818,7 +818,7 @@ void Variant::evaluate(const Operator &p_op, const Variant &p_a, CASE_TYPE(math, OP_ADD, RECT2) CASE_TYPE(math, OP_ADD, TRANSFORM2D) CASE_TYPE(math, OP_ADD, PLANE) - CASE_TYPE(math, OP_ADD, RECT3) + CASE_TYPE(math, OP_ADD, AABB) CASE_TYPE(math, OP_ADD, BASIS) CASE_TYPE(math, OP_ADD, TRANSFORM) CASE_TYPE(math, OP_ADD, NODE_PATH) @@ -842,7 +842,7 @@ void Variant::evaluate(const Operator &p_op, const Variant &p_a, CASE_TYPE(math, OP_SUBTRACT, RECT2) CASE_TYPE(math, OP_SUBTRACT, TRANSFORM2D) CASE_TYPE(math, OP_SUBTRACT, PLANE) - CASE_TYPE(math, OP_SUBTRACT, RECT3) + CASE_TYPE(math, OP_SUBTRACT, AABB) CASE_TYPE(math, OP_SUBTRACT, BASIS) CASE_TYPE(math, OP_SUBTRACT, TRANSFORM) CASE_TYPE(math, OP_SUBTRACT, NODE_PATH) @@ -923,7 +923,7 @@ void Variant::evaluate(const Operator &p_op, const Variant &p_a, CASE_TYPE(math, OP_MULTIPLY, STRING) CASE_TYPE(math, OP_MULTIPLY, RECT2) CASE_TYPE(math, OP_MULTIPLY, PLANE) - CASE_TYPE(math, OP_MULTIPLY, RECT3) + CASE_TYPE(math, OP_MULTIPLY, AABB) CASE_TYPE(math, OP_MULTIPLY, NODE_PATH) CASE_TYPE(math, OP_MULTIPLY, _RID) CASE_TYPE(math, OP_MULTIPLY, OBJECT) @@ -964,7 +964,7 @@ void Variant::evaluate(const Operator &p_op, const Variant &p_a, CASE_TYPE(math, OP_DIVIDE, RECT2) CASE_TYPE(math, OP_DIVIDE, TRANSFORM2D) CASE_TYPE(math, OP_DIVIDE, PLANE) - CASE_TYPE(math, OP_DIVIDE, RECT3) + CASE_TYPE(math, OP_DIVIDE, AABB) CASE_TYPE(math, OP_DIVIDE, BASIS) CASE_TYPE(math, OP_DIVIDE, TRANSFORM) CASE_TYPE(math, OP_DIVIDE, NODE_PATH) @@ -995,7 +995,7 @@ void Variant::evaluate(const Operator &p_op, const Variant &p_a, CASE_TYPE(math, OP_POSITIVE, STRING) CASE_TYPE(math, OP_POSITIVE, RECT2) CASE_TYPE(math, OP_POSITIVE, TRANSFORM2D) - CASE_TYPE(math, OP_POSITIVE, RECT3) + CASE_TYPE(math, OP_POSITIVE, AABB) CASE_TYPE(math, OP_POSITIVE, BASIS) CASE_TYPE(math, OP_POSITIVE, TRANSFORM) CASE_TYPE(math, OP_POSITIVE, COLOR) @@ -1029,7 +1029,7 @@ void Variant::evaluate(const Operator &p_op, const Variant &p_a, CASE_TYPE(math, OP_NEGATE, STRING) CASE_TYPE(math, OP_NEGATE, RECT2) CASE_TYPE(math, OP_NEGATE, TRANSFORM2D) - CASE_TYPE(math, OP_NEGATE, RECT3) + CASE_TYPE(math, OP_NEGATE, AABB) CASE_TYPE(math, OP_NEGATE, BASIS) CASE_TYPE(math, OP_NEGATE, TRANSFORM) CASE_TYPE(math, OP_NEGATE, NODE_PATH) @@ -1088,7 +1088,7 @@ void Variant::evaluate(const Operator &p_op, const Variant &p_a, CASE_TYPE(math, OP_MODULE, TRANSFORM2D) CASE_TYPE(math, OP_MODULE, PLANE) CASE_TYPE(math, OP_MODULE, QUAT) - CASE_TYPE(math, OP_MODULE, RECT3) + CASE_TYPE(math, OP_MODULE, AABB) CASE_TYPE(math, OP_MODULE, BASIS) CASE_TYPE(math, OP_MODULE, TRANSFORM) CASE_TYPE(math, OP_MODULE, COLOR) @@ -1384,10 +1384,10 @@ void Variant::set_named(const StringName &p_index, const Variant &p_value, bool } } break; // 10 - case RECT3: { + case AABB: { if (p_value.type == Variant::VECTOR3) { - Rect3 *v = _data._rect3; + ::AABB *v = _data._aabb; //scalar name if (p_index == CoreStringNames::singleton->position) { v->position = *reinterpret_cast<const Vector3 *>(p_value._data._mem); @@ -1609,9 +1609,9 @@ Variant Variant::get_named(const StringName &p_index, bool *r_valid) const { } } break; // 10 - case RECT3: { + case AABB: { - const Rect3 *v = _data._rect3; + const ::AABB *v = _data._aabb; //scalar name if (p_index == CoreStringNames::singleton->position) { return v->position; @@ -1982,7 +1982,7 @@ void Variant::set(const Variant &p_index, const Variant &p_value, bool *r_valid) } } break; // 10 - case RECT3: { + case AABB: { if (p_value.type != Variant::VECTOR3) return; @@ -1991,7 +1991,7 @@ void Variant::set(const Variant &p_index, const Variant &p_value, bool *r_valid) //scalar name const String *str = reinterpret_cast<const String *>(p_index._data._mem); - Rect3 *v = _data._rect3; + ::AABB *v = _data._aabb; if (*str == "position") { valid = true; v->position = p_value; @@ -2400,13 +2400,13 @@ Variant Variant::get(const Variant &p_index, bool *r_valid) const { } } break; // 10 - case RECT3: { + case AABB: { if (p_index.get_type() == Variant::STRING) { //scalar name const String *str = reinterpret_cast<const String *>(p_index._data._mem); - const Rect3 *v = _data._rect3; + const ::AABB *v = _data._aabb; if (*str == "position") { valid = true; return v->position; @@ -2835,7 +2835,7 @@ void Variant::get_property_list(List<PropertyInfo> *p_list) const { p_list->push_back(PropertyInfo(Variant::REAL, "w")); } break; // 10 - case RECT3: { + case AABB: { p_list->push_back(PropertyInfo(Variant::VECTOR3, "position")); p_list->push_back(PropertyInfo(Variant::VECTOR3, "size")); p_list->push_back(PropertyInfo(Variant::VECTOR3, "end")); @@ -3457,10 +3457,10 @@ void Variant::blend(const Variant &a, const Variant &b, float c, Variant &r_dst) r_dst = *reinterpret_cast<const Vector3 *>(a._data._mem) + *reinterpret_cast<const Vector3 *>(b._data._mem) * c; } return; - case RECT3: { - const Rect3 *ra = reinterpret_cast<const Rect3 *>(a._data._mem); - const Rect3 *rb = reinterpret_cast<const Rect3 *>(b._data._mem); - r_dst = Rect3(ra->position + rb->position * c, ra->size + rb->size * c); + case AABB: { + const ::AABB *ra = reinterpret_cast<const ::AABB *>(a._data._mem); + const ::AABB *rb = reinterpret_cast<const ::AABB *>(b._data._mem); + r_dst = ::AABB(ra->position + rb->position * c, ra->size + rb->size * c); } return; case QUAT: { @@ -3591,8 +3591,8 @@ void Variant::interpolate(const Variant &a, const Variant &b, float c, Variant & r_dst = reinterpret_cast<const Quat *>(a._data._mem)->slerp(*reinterpret_cast<const Quat *>(b._data._mem), c); } return; - case RECT3: { - r_dst = Rect3(a._data._rect3->position.linear_interpolate(b._data._rect3->position, c), a._data._rect3->size.linear_interpolate(b._data._rect3->size, c)); + case AABB: { + r_dst = ::AABB(a._data._aabb->position.linear_interpolate(b._data._aabb->position, c), a._data._aabb->size.linear_interpolate(b._data._aabb->size, c)); } return; case BASIS: { diff --git a/core/variant_parser.cpp b/core/variant_parser.cpp index d60d10cd3a..1c02c627b5 100644 --- a/core/variant_parser.cpp +++ b/core/variant_parser.cpp @@ -595,7 +595,7 @@ Error VariantParser::parse_value(Token &token, Variant &value, Stream *p_stream, value = Quat(args[0], args[1], args[2], args[3]); return OK; - } else if (id == "Rect3" || id == "AABB") { + } else if (id == "AABB" || id == "Rect3") { Vector<float> args; Error err = _parse_construct<float>(p_stream, args, line, r_err_str); @@ -606,7 +606,7 @@ Error VariantParser::parse_value(Token &token, Variant &value, Stream *p_stream, r_err_str = "Expected 6 arguments for constructor"; } - value = Rect3(Vector3(args[0], args[1], args[2]), Vector3(args[3], args[4], args[5])); + value = AABB(Vector3(args[0], args[1], args[2]), Vector3(args[3], args[4], args[5])); return OK; } else if (id == "Basis" || id == "Matrix3") { //compatibility @@ -1634,10 +1634,10 @@ Error VariantWriter::write(const Variant &p_variant, StoreStringFunc p_store_str p_store_string_func(p_store_string_ud, "Plane( " + rtosfix(p.normal.x) + ", " + rtosfix(p.normal.y) + ", " + rtosfix(p.normal.z) + ", " + rtosfix(p.d) + " )"); } break; - case Variant::RECT3: { + case Variant::AABB: { - Rect3 aabb = p_variant; - p_store_string_func(p_store_string_ud, "Rect3( " + rtosfix(aabb.position.x) + ", " + rtosfix(aabb.position.y) + ", " + rtosfix(aabb.position.z) + ", " + rtosfix(aabb.size.x) + ", " + rtosfix(aabb.size.y) + ", " + rtosfix(aabb.size.z) + " )"); + AABB aabb = p_variant; + p_store_string_func(p_store_string_ud, "AABB( " + rtosfix(aabb.position.x) + ", " + rtosfix(aabb.position.y) + ", " + rtosfix(aabb.position.z) + ", " + rtosfix(aabb.size.x) + ", " + rtosfix(aabb.size.y) + ", " + rtosfix(aabb.size.z) + " )"); } break; case Variant::QUAT: { diff --git a/core/version.h b/core/version.h index 7d2c47df6a..b217d82c5d 100644 --- a/core/version.h +++ b/core/version.h @@ -30,8 +30,8 @@ #include "version_generated.gen.h" #ifdef VERSION_PATCH -#define VERSION_MKSTRING "" _MKSTR(VERSION_MAJOR) "." _MKSTR(VERSION_MINOR) "." _MKSTR(VERSION_PATCH) "." _MKSTR(VERSION_STATUS) "." _MKSTR(VERSION_REVISION) VERSION_MODULE_CONFIG +#define VERSION_MKSTRING "" _MKSTR(VERSION_MAJOR) "." _MKSTR(VERSION_MINOR) "." _MKSTR(VERSION_PATCH) "." VERSION_STATUS "." VERSION_BUILD VERSION_MODULE_CONFIG #else -#define VERSION_MKSTRING "" _MKSTR(VERSION_MAJOR) "." _MKSTR(VERSION_MINOR) "." _MKSTR(VERSION_STATUS) "." _MKSTR(VERSION_REVISION) VERSION_MODULE_CONFIG +#define VERSION_MKSTRING "" _MKSTR(VERSION_MAJOR) "." _MKSTR(VERSION_MINOR) "." VERSION_STATUS "." VERSION_BUILD VERSION_MODULE_CONFIG #endif // VERSION_PATCH -#define VERSION_FULL_NAME "" _MKSTR(VERSION_NAME) " v" VERSION_MKSTRING +#define VERSION_FULL_NAME "" VERSION_NAME " v" VERSION_MKSTRING diff --git a/doc/classes/@GDScript.xml b/doc/classes/@GDScript.xml index 49ec412ba0..15ada7fdfa 100644 --- a/doc/classes/@GDScript.xml +++ b/doc/classes/@GDScript.xml @@ -138,6 +138,17 @@ Decodes a byte array back to a value. </description> </method> + <method name="cartesian2polar"> + <return type="Vector2"> + </return> + <argument index="0" name="x" type="float"> + </argument> + <argument index="1" name="y" type="float"> + </argument> + <description> + Converts a 2D point expressed in the cartesian coordinate system (x and y axis) to the polar coordinate system (a distance from the origin and an angle). + </description> + </method> <method name="ceil"> <return type="float"> </return> @@ -604,6 +615,17 @@ [/codeblock] </description> </method> + <method name="polar2cartesian"> + <return type="Vector2"> + </return> + <argument index="0" name="r" type="float"> + </argument> + <argument index="1" name="th" type="float"> + </argument> + <description> + Converts a 2D point expressed in the polar coordinate system (a distance from the origin [code]r[/code] and an angle [code]th[/code]) to the cartesian coordinate system (x and y axis). + </description> + </method> <method name="pow"> <return type="float"> </return> diff --git a/doc/classes/@GlobalScope.xml b/doc/classes/@GlobalScope.xml index 258b06f320..d9bdf0e3cf 100644 --- a/doc/classes/@GlobalScope.xml +++ b/doc/classes/@GlobalScope.xml @@ -44,6 +44,8 @@ <member name="JSON" type="JSON" setter="" getter=""> [JSON] singleton </member> + <member name="JavaScript" type="JavaScript" setter="" getter=""> + </member> <member name="Marshalls" type="Reference" setter="" getter=""> [Marshalls] singleton </member> @@ -1332,8 +1334,8 @@ <constant name="TYPE_QUAT" value="10"> Variable is of type [Quat]. </constant> - <constant name="TYPE_RECT3" value="11"> - Variable is of type [Rect3]. + <constant name="TYPE_AABB" value="11"> + Variable is of type [AABB]. </constant> <constant name="TYPE_BASIS" value="12"> Variable is of type [Basis]. diff --git a/doc/classes/Rect3.xml b/doc/classes/AABB.xml index 88be5fa419..494dcb8fce 100644 --- a/doc/classes/Rect3.xml +++ b/doc/classes/AABB.xml @@ -1,18 +1,18 @@ <?xml version="1.0" encoding="UTF-8" ?> -<class name="Rect3" category="Built-In Types" version="3.0-alpha"> +<class name="AABB" category="Built-In Types" version="3.0-alpha"> <brief_description> Axis-Aligned Bounding Box. </brief_description> <description> - Rect3 consists of a position, a size, and several utility functions. It is typically used for fast overlap tests. + AABB consists of a position, a size, and several utility functions. It is typically used for fast overlap tests. </description> <tutorials> </tutorials> <demos> </demos> <methods> - <method name="Rect3"> - <return type="Rect3"> + <method name="AABB"> + <return type="AABB"> </return> <argument index="0" name="position" type="Vector3"> </argument> @@ -25,26 +25,26 @@ <method name="encloses"> <return type="bool"> </return> - <argument index="0" name="with" type="Rect3"> + <argument index="0" name="with" type="AABB"> </argument> <description> - Returns [code]true[/code] if this [code]Rect3[/code] completely encloses another one. + Returns [code]true[/code] if this [code]AABB[/code] completely encloses another one. </description> </method> <method name="expand"> - <return type="Rect3"> + <return type="AABB"> </return> <argument index="0" name="to_point" type="Vector3"> </argument> <description> - Returns this [code]Rect3[/code] expanded to include a given point. + Returns this [code]AABB[/code] expanded to include a given point. </description> </method> <method name="get_area"> <return type="float"> </return> <description> - Gets the area of the [code]Rect3[/code]. + Gets the area of the [code]AABB[/code]. </description> </method> <method name="get_endpoint"> @@ -53,49 +53,49 @@ <argument index="0" name="idx" type="int"> </argument> <description> - Gets the position of the 8 endpoints of the [code]Rect3[/code] in space. + Gets the position of the 8 endpoints of the [code]AABB[/code] in space. </description> </method> <method name="get_longest_axis"> <return type="Vector3"> </return> <description> - Returns the normalized longest axis of the [code]Rect3[/code]. + Returns the normalized longest axis of the [code]AABB[/code]. </description> </method> <method name="get_longest_axis_index"> <return type="int"> </return> <description> - Returns the index of the longest axis of the [code]Rect3[/code] (according to [Vector3]::AXIS* enum). + Returns the index of the longest axis of the [code]AABB[/code] (according to [Vector3]::AXIS* enum). </description> </method> <method name="get_longest_axis_size"> <return type="float"> </return> <description> - Returns the scalar length of the longest axis of the [code]Rect3[/code]. + Returns the scalar length of the longest axis of the [code]AABB[/code]. </description> </method> <method name="get_shortest_axis"> <return type="Vector3"> </return> <description> - Returns the normalized shortest axis of the [code]Rect3[/code]. + Returns the normalized shortest axis of the [code]AABB[/code]. </description> </method> <method name="get_shortest_axis_index"> <return type="int"> </return> <description> - Returns the index of the shortest axis of the [code]Rect3[/code] (according to [Vector3]::AXIS* enum). + Returns the index of the shortest axis of the [code]AABB[/code] (according to [Vector3]::AXIS* enum). </description> </method> <method name="get_shortest_axis_size"> <return type="float"> </return> <description> - Returns the scalar length of the shortest axis of the [code]Rect3[/code]. + Returns the scalar length of the shortest axis of the [code]AABB[/code]. </description> </method> <method name="get_support"> @@ -108,26 +108,26 @@ </description> </method> <method name="grow"> - <return type="Rect3"> + <return type="AABB"> </return> <argument index="0" name="by" type="float"> </argument> <description> - Returns a copy of the [code]Rect3[/code] grown a given amount of units towards all the sides. + Returns a copy of the [code]AABB[/code] grown a given amount of units towards all the sides. </description> </method> <method name="has_no_area"> <return type="bool"> </return> <description> - Returns [code]true[/code] if the [code]Rect3[/code] is flat or empty. + Returns [code]true[/code] if the [code]AABB[/code] is flat or empty. </description> </method> <method name="has_no_surface"> <return type="bool"> </return> <description> - Returns [code]true[/code] if the [code]Rect3[/code] is empty. + Returns [code]true[/code] if the [code]AABB[/code] is empty. </description> </method> <method name="has_point"> @@ -136,25 +136,25 @@ <argument index="0" name="point" type="Vector3"> </argument> <description> - Returns [code]true[/code] if the [code]Rect3[/code] contains a point. + Returns [code]true[/code] if the [code]AABB[/code] contains a point. </description> </method> <method name="intersection"> - <return type="Rect3"> + <return type="AABB"> </return> - <argument index="0" name="with" type="Rect3"> + <argument index="0" name="with" type="AABB"> </argument> <description> - Returns the intersection between two [code]Rect3[/code]. An empty Rect3 (size 0,0,0) is returned on failure. + Returns the intersection between two [code]AABB[/code]. An empty AABB (size 0,0,0) is returned on failure. </description> </method> <method name="intersects"> <return type="bool"> </return> - <argument index="0" name="with" type="Rect3"> + <argument index="0" name="with" type="AABB"> </argument> <description> - Returns [code]true[/code] if the [code]Rect3[/code] overlaps with another. + Returns [code]true[/code] if the [code]AABB[/code] overlaps with another. </description> </method> <method name="intersects_plane"> @@ -163,7 +163,7 @@ <argument index="0" name="plane" type="Plane"> </argument> <description> - Returns [code]true[/code] if the [code]Rect3[/code] is on both sides of a plane. + Returns [code]true[/code] if the [code]AABB[/code] is on both sides of a plane. </description> </method> <method name="intersects_segment"> @@ -174,16 +174,16 @@ <argument index="1" name="to" type="Vector3"> </argument> <description> - Returns [code]true[/code] if the [code]Rect3[/code] intersects the line segment between [code]from[/code] and [code]to[/code]. + Returns [code]true[/code] if the [code]AABB[/code] intersects the line segment between [code]from[/code] and [code]to[/code]. </description> </method> <method name="merge"> - <return type="Rect3"> + <return type="AABB"> </return> - <argument index="0" name="with" type="Rect3"> + <argument index="0" name="with" type="AABB"> </argument> <description> - Returns a larger Rect3 that contains this Rect3 and [code]with[/code]. + Returns a larger AABB that contains this AABB and [code]with[/code]. </description> </method> </methods> diff --git a/doc/classes/Array.xml b/doc/classes/Array.xml index 203c60e644..3bb40755a6 100644 --- a/doc/classes/Array.xml +++ b/doc/classes/Array.xml @@ -260,6 +260,32 @@ Sort the array using a custom method and return reference to the array. The arguments are an object that holds the method and the name of such method. The custom method receives two arguments (a pair of elements from the array) and must return true if the first argument is less than the second, and return false otherwise. Note: you cannot randomize the return value as the heapsort algorithm expects a deterministic result. Doing so will result in unexpected behavior. </description> </method> + <method name="bsearch"> + <return type="int"> + </return> + <argument index="0" name="value" type="var"> + </argument> + <argument index="1" name="before" type="bool" default="true"> + </argument> + <description> + Finds the index of an existing value (or the insertion index that maintains sorting order, if the value is not yet present in the array) using binary search. Optionally, a before specifier can be passed. If false, the returned index comes after all existing entries of the value in the array. Note that calling bsearch on an unsorted array results in unexpected behavior. + </description> + </method> + <method name="bsearch_custom"> + <return type="int"> + </return> + <argument index="0" name="value" type="var"> + </argument> + <argument index="1" name="obj" type="Object"> + </argument> + <argument index="2" name="func" type="String"> + </argument> + <argument index="3" name="before" type="bool" default="true"> + </argument> + <description> + Finds the index of an existing value (or the insertion index that maintains sorting order, if the value is not yet present in the array) using binary search and a custom comparison method. Optionally, a before specifier can be passed. If false, the returned index comes after all existing entries of the value in the array. The custom method receives two arguments (an element from the array and the value searched for) and must return true if the first argument is less than the second, and return false otherwise. Note that calling bsearch on an unsorted array results in unexpected behavior. + </description> + </method> </methods> <constants> </constants> diff --git a/doc/classes/ArrayMesh.xml b/doc/classes/ArrayMesh.xml index 10456f805d..6c9b191371 100644 --- a/doc/classes/ArrayMesh.xml +++ b/doc/classes/ArrayMesh.xml @@ -66,7 +66,7 @@ </description> </method> <method name="get_custom_aabb" qualifiers="const"> - <return type="Rect3"> + <return type="AABB"> </return> <description> </description> @@ -95,7 +95,7 @@ <method name="set_custom_aabb"> <return type="void"> </return> - <argument index="0" name="aabb" type="Rect3"> + <argument index="0" name="aabb" type="AABB"> </argument> <description> </description> diff --git a/doc/classes/AudioServer.xml b/doc/classes/AudioServer.xml index ee334e26a2..83a06bcd4d 100644 --- a/doc/classes/AudioServer.xml +++ b/doc/classes/AudioServer.xml @@ -287,7 +287,7 @@ <argument index="1" name="send" type="String"> </argument> <description> - Connects the output of the bus at [code]bus_idx[/code] to the bus named [code]send[/send]. + Connects the output of the bus at [code]bus_idx[/code] to the bus named [code]send[/code]. </description> </method> <method name="set_bus_solo"> diff --git a/doc/classes/CanvasItem.xml b/doc/classes/CanvasItem.xml index dd192e2166..bb3a9b3845 100644 --- a/doc/classes/CanvasItem.xml +++ b/doc/classes/CanvasItem.xml @@ -346,14 +346,14 @@ Get the global transform matrix of this item in relation to the canvas. </description> </method> - <method name="get_item_and_children_rect" qualifiers="const"> + <method name="edit_get_item_and_children_rect" qualifiers="const"> <return type="Rect2"> </return> <description> Get a [Rect2] with the boundaries of this item and its children. </description> </method> - <method name="get_item_rect" qualifiers="const"> + <method name="edit_get_rect" qualifiers="const"> <return type="Rect2"> </return> <description> diff --git a/doc/classes/Color.xml b/doc/classes/Color.xml index 479eb719d4..ce49ec6654 100644 --- a/doc/classes/Color.xml +++ b/doc/classes/Color.xml @@ -126,6 +126,32 @@ [/codeblock] </description> </method> + <method name="lightened"> + <return type="Color"> + </return> + <argument index="0" name="amount" type="float"> + </argument> + <description> + Returns a new color resulting from making this color lighter by the specified percentage (0-1). + [codeblock] + var green = Color(0.0, 1.0, 0.0) + var lightgreen = green.lightened(0.2) # 20% lighter than regular green + [/codeblock] + </description> + </method> + <method name="darkened"> + <return type="Color"> + </return> + <argument index="0" name="amount" type="float"> + </argument> + <description> + Returns a new color resulting from making this color darker by the specified percentage (0-1). + [codeblock] + var green = Color(0.0, 1.0, 0.0) + var darkgreen = green.darkened(0.2) # 20% darker than regular green + [/codeblock] + </description> + </method> <method name="linear_interpolate"> <return type="Color"> </return> diff --git a/doc/classes/Control.xml b/doc/classes/Control.xml index 79870dd411..57966fb74e 100644 --- a/doc/classes/Control.xml +++ b/doc/classes/Control.xml @@ -60,7 +60,7 @@ <argument index="1" name="constant" type="int"> </argument> <description> - Overrides an integer constant in the [theme] resource the node uses. If the [code]constant[code] is invalid, Godot clears the override. See [member Theme.INVALID_CONSTANT] for more information. + Overrides an integer constant in the [Theme] resource the node uses. If the [code]constant[/code] is invalid, Godot clears the override. See [member Theme.INVALID_CONSTANT] for more information. </description> </method> <method name="add_font_override"> @@ -228,7 +228,14 @@ <argument index="0" name="margin" type="int" enum="Margin"> </argument> <description> - Return the forced neighbour for moving the input focus to. When pressing TAB or directional/joypad directions focus is moved to the next control in that direction. However, the neighbour to move to can be forced with this function. + Return the forced neighbour for moving the input focus to. When pressing directional/joypad directions, focus is moved to the next control in that direction. However, the neighbour to move to can be forced with this function. + </description> + </method> + <method name="get_focus_next" qualifiers="const"> + <return type="NodePath"> + </return> + <description> + Return the 'focus_next' for moving input focus to. When pressing TAB, focus is moved to the next control in the tree. However, the control to move to can be forced with this function. </description> </method> <method name="get_focus_owner" qualifiers="const"> @@ -238,6 +245,13 @@ Return which control is owning the keyboard focus, or null if no one. </description> </method> + <method name="get_focus_previous" qualifiers="const"> + <return type="NodePath"> + </return> + <description> + Return the 'focus_previous' for moving input focus to. When pressing Shift+TAB focus is moved to the previous control in the tree. However, the control to move to can be forced with this function. + </description> + </method> <method name="get_font" qualifiers="const"> <return type="Font"> </return> @@ -676,7 +690,25 @@ <argument index="1" name="neighbour" type="NodePath"> </argument> <description> - Force a neighbour for moving the input focus to. When pressing TAB or directional/joypad directions focus is moved to the next control in that direction. However, the neighbour to move to can be forced with this function. + Force a neighbour for moving the input focus to. When pressing directional/joypad directions, focus is moved to the next control in that direction. However, the neighbour to move to can be forced with this function. + </description> + </method> + <method name="set_focus_next"> + <return type="void"> + </return> + <argument index="0" name="next" type="NodePath"> + </argument> + <description> + Force the 'focus_next' for moving input focus to. When pressing TAB, focus is moved to the next control in the tree. However, the control to move to can be forced with this function. + </description> + </method> + <method name="set_focus_previous"> + <return type="void"> + </return> + <argument index="0" name="previous" type="NodePath"> + </argument> + <description> + Force the 'focus_previous' for moving input focus to. When pressing Shift+TAB, focus is moved to the previous control in the tree. However, the control to move to can be forced with this function. </description> </method> <method name="set_global_position"> diff --git a/doc/classes/EditorSettings.xml b/doc/classes/EditorSettings.xml index a0e4fdb8e0..e58516d461 100644 --- a/doc/classes/EditorSettings.xml +++ b/doc/classes/EditorSettings.xml @@ -55,7 +55,7 @@ Get the list of favorite directories for this project. </description> </method> - <method name="get_project_settings_path" qualifiers="const"> + <method name="get_project_settings_dir" qualifiers="const"> <return type="String"> </return> <description> @@ -77,7 +77,7 @@ <description> </description> </method> - <method name="get_settings_path" qualifiers="const"> + <method name="get_settings_dir" qualifiers="const"> <return type="String"> </return> <description> diff --git a/doc/classes/EditorSpatialGizmo.xml b/doc/classes/EditorSpatialGizmo.xml index e111eec3b9..758024c99b 100644 --- a/doc/classes/EditorSpatialGizmo.xml +++ b/doc/classes/EditorSpatialGizmo.xml @@ -24,7 +24,7 @@ </return> <argument index="0" name="triangles" type="TriangleMesh"> </argument> - <argument index="1" name="bounds" type="Rect3"> + <argument index="1" name="bounds" type="AABB"> </argument> <description> Add collision triangles to the gizmo for picking. A [TriangleMesh] can be generated from a regular [Mesh] too. Call this function during [method redraw]. diff --git a/doc/classes/Engine.xml b/doc/classes/Engine.xml index f43bbc2e9d..090e0d7910 100644 --- a/doc/classes/Engine.xml +++ b/doc/classes/Engine.xml @@ -71,8 +71,8 @@ "minor" - Holds the minor version number as a String "patch" - Holds the patch version number as a String "status" - Holds the status (e.g. "beta", "rc1", "rc2", ... "stable") as a String - "revision" - Holds the revision (e.g. "custom-build") as a String - "string" - major + minor + patch + status + revision in a single String + "build" - Holds the build name (e.g. "custom-build") as a String + "string" - major + minor + patch + status + build in a single String </description> </method> <method name="has_singleton" qualifiers="const"> diff --git a/doc/classes/GIProbeData.xml b/doc/classes/GIProbeData.xml index 3777eba6af..5d118be776 100644 --- a/doc/classes/GIProbeData.xml +++ b/doc/classes/GIProbeData.xml @@ -16,7 +16,7 @@ </description> </method> <method name="get_bounds" qualifiers="const"> - <return type="Rect3"> + <return type="AABB"> </return> <description> </description> @@ -86,7 +86,7 @@ <method name="set_bounds"> <return type="void"> </return> - <argument index="0" name="bounds" type="Rect3"> + <argument index="0" name="bounds" type="AABB"> </argument> <description> </description> @@ -167,7 +167,7 @@ <members> <member name="bias" type="float" setter="set_bias" getter="get_bias"> </member> - <member name="bounds" type="Rect3" setter="set_bounds" getter="get_bounds"> + <member name="bounds" type="AABB" setter="set_bounds" getter="get_bounds"> </member> <member name="cell_size" type="float" setter="set_cell_size" getter="get_cell_size"> </member> diff --git a/doc/classes/Image.xml b/doc/classes/Image.xml index 4f8da7af9e..b6eb26ce8c 100644 --- a/doc/classes/Image.xml +++ b/doc/classes/Image.xml @@ -377,13 +377,13 @@ </argument> <description> Sets the [Color] of the pixel at [code](x, y)[/code] if the image is unlocked. Example: - [code] + [codeblock] var img = Image.new() img.lock() img.set_pixel(x, y, color) # Does not have an effect img.unlock() img.set_pixel(x, y, color) # Works - [/code]. + [/codeblock] </description> </method> <method name="shrink_x2"> diff --git a/doc/classes/InputEvent.xml b/doc/classes/InputEvent.xml index 1cebed7efc..e4404fc258 100644 --- a/doc/classes/InputEvent.xml +++ b/doc/classes/InputEvent.xml @@ -18,7 +18,7 @@ <argument index="0" name="event" type="InputEvent"> </argument> <description> - Returns [code]true[/code] if this event matches [code]event[event]. + Returns [code]true[/code] if this event matches [code]event[/code]. </description> </method> <method name="as_text" qualifiers="const"> diff --git a/doc/classes/InputEventAction.xml b/doc/classes/InputEventAction.xml index 13d3a14511..383f8360fb 100644 --- a/doc/classes/InputEventAction.xml +++ b/doc/classes/InputEventAction.xml @@ -4,7 +4,7 @@ Input event type for actions. </brief_description> <description> - Contains a generic action which can be targeted from several type of inputs. Actions can be created from the project settings menu [code]Project > Project Settings > Input Map[/Code]. See [method Node._input]. + Contains a generic action which can be targeted from several type of inputs. Actions can be created from the project settings menu [code]Project > Project Settings > Input Map[/code]. See [method Node._input]. </description> <tutorials> http://docs.godotengine.org/en/stable/learning/features/inputs/inputevent.html#actions diff --git a/doc/classes/InputMap.xml b/doc/classes/InputMap.xml index a04b9e78ae..d5a1d85def 100644 --- a/doc/classes/InputMap.xml +++ b/doc/classes/InputMap.xml @@ -4,7 +4,7 @@ Singleton that manages [InputEventAction]. </brief_description> <description> - Manages all [InputEventAction] which can be created/modified from the project settings menu [code]Project > Project Settings > Input Map[/Code] or in code with [method add_action] and [method action_add_event]. See [method Node._input]. + Manages all [InputEventAction] which can be created/modified from the project settings menu [code]Project > Project Settings > Input Map[/code] or in code with [method add_action] and [method action_add_event]. See [method Node._input]. </description> <tutorials> http://docs.godotengine.org/en/stable/learning/features/inputs/inputevent.html#inputmap diff --git a/doc/classes/JavaScript.xml b/doc/classes/JavaScript.xml new file mode 100644 index 0000000000..9dd386f08e --- /dev/null +++ b/doc/classes/JavaScript.xml @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<class name="JavaScript" inherits="Object" category="Core" version="3.0-alpha"> + <brief_description> + Singleton that connects the engine with the browser's JavaScript context in HTML5 export. + </brief_description> + <description> + The JavaScript singleton is implemented only in HTML5 export. It's used to access the browser's JavaScript context. This allows interaction with embedding pages or calling third-party JavaScript APIs. + </description> + <tutorials> + http://docs.godotengine.org/en/stable/learning/workflow/export/exporting_for_web.html#calling-javascript-from-script + </tutorials> + <demos> + </demos> + <methods> + <method name="eval"> + <return type="Variant"> + </return> + <argument index="0" name="code" type="String"> + </argument> + <argument index="1" name="use_global_execution_context" type="bool" default="false"> + </argument> + <description> + Execute the string [code]code[/code] as JavaScript code within the browser window. This is a call to the actual global JavaScript function [code]eval()[/code]. + If [code]use_global_execution_context[/code] is [code]true[/code], the code will be evaluated in the global execution context. Otherwise, it is evaluated in the execution context of a function within the engine's runtime environment. + </description> + </method> + </methods> + <constants> + </constants> +</class> diff --git a/doc/classes/KinematicBody.xml b/doc/classes/KinematicBody.xml index b827db474d..a423974753 100644 --- a/doc/classes/KinematicBody.xml +++ b/doc/classes/KinematicBody.xml @@ -32,7 +32,7 @@ <argument index="0" name="slide_idx" type="int"> </argument> <description> - Returns a [KinematicCollision], which contains information about a collision that occured during the last [method move_and_slide] call. Since the body can collide several times in a single call to [method move_and_slide], you must specify the index of the collision in the range 0 to ([method get_slide_count]()-1). + Returns a [KinematicCollision], which contains information about a collision that occured during the last [method move_and_slide] call. Since the body can collide several times in a single call to [method move_and_slide], you must specify the index of the collision in the range 0 to ([method get_slide_count] - 1). </description> </method> <method name="get_slide_count" qualifiers="const"> diff --git a/doc/classes/KinematicBody2D.xml b/doc/classes/KinematicBody2D.xml index 264e414ad4..7285c780e5 100644 --- a/doc/classes/KinematicBody2D.xml +++ b/doc/classes/KinematicBody2D.xml @@ -32,7 +32,7 @@ <argument index="0" name="slide_idx" type="int"> </argument> <description> - Returns a [KinematicCollision2D], which contains information about a collision that occured during the last [method move_and_slide] call. Since the body can collide several times in a single call to [method move_and_slide], you must specify the index of the collision in the range 0 to ([method get_slide_count]()-1). + Returns a [KinematicCollision2D], which contains information about a collision that occured during the last [method move_and_slide] call. Since the body can collide several times in a single call to [method move_and_slide], you must specify the index of the collision in the range 0 to ([method get_slide_count] - 1). </description> </method> <method name="get_slide_count" qualifiers="const"> diff --git a/doc/classes/Line2D.xml b/doc/classes/Line2D.xml index f49a806f0e..7b76d94c95 100644 --- a/doc/classes/Line2D.xml +++ b/doc/classes/Line2D.xml @@ -63,7 +63,7 @@ <argument index="0" name="i" type="int"> </argument> <description> - Returns point [code]i[code]'s position. + Returns point [code]i[/code]'s position. </description> </method> <method name="get_points" qualifiers="const"> diff --git a/doc/classes/MultiMesh.xml b/doc/classes/MultiMesh.xml index 73384c27e4..b6a89d09f4 100644 --- a/doc/classes/MultiMesh.xml +++ b/doc/classes/MultiMesh.xml @@ -7,7 +7,7 @@ MultiMesh provides low level mesh instancing. If the amount of [Mesh] instances needed goes from hundreds to thousands (and most need to be visible at close proximity) creating such a large amount of [MeshInstance] nodes may affect performance by using too much CPU or video memory. For this case a MultiMesh becomes very useful, as it can draw thousands of instances with little API overhead. As a drawback, if the instances are too far away of each other, performance may be reduced as every single instance will always rendered (they are spatially indexed as one, for the whole object). - Since instances may have any behavior, the Rect3 used for visibility must be provided by the user. + Since instances may have any behavior, the AABB used for visibility must be provided by the user. </description> <tutorials> </tutorials> @@ -15,10 +15,10 @@ </demos> <methods> <method name="get_aabb" qualifiers="const"> - <return type="Rect3"> + <return type="AABB"> </return> <description> - Return the visibility Rect3. + Return the visibility AABB. </description> </method> <method name="get_color_format" qualifiers="const"> diff --git a/doc/classes/Nil.xml b/doc/classes/Nil.xml index 1fccdc0148..a4bd60d53e 100644 --- a/doc/classes/Nil.xml +++ b/doc/classes/Nil.xml @@ -100,7 +100,7 @@ </description> </method> <method name="Nil"> - <argument index="0" name="from" type="Rect3"> + <argument index="0" name="from" type="AABB"> </argument> <description> </description> diff --git a/doc/classes/OS.xml b/doc/classes/OS.xml index db70b99de4..8f82040eca 100644 --- a/doc/classes/OS.xml +++ b/doc/classes/OS.xml @@ -127,11 +127,11 @@ Returns the current screen index (0 padded). </description> </method> - <method name="get_data_dir" qualifiers="const"> + <method name="get_user_data_dir" qualifiers="const"> <return type="String"> </return> <description> - Returns the absolute directory path of user data path([user://]). + Returns the absolute directory path where user data is written ([code]user://[/code]). </description> </method> <method name="get_date" qualifiers="const"> diff --git a/doc/classes/Particles.xml b/doc/classes/Particles.xml index 4e070f67fd..9a9279b0a7 100644 --- a/doc/classes/Particles.xml +++ b/doc/classes/Particles.xml @@ -13,7 +13,7 @@ </demos> <methods> <method name="capture_aabb" qualifiers="const"> - <return type="Rect3"> + <return type="AABB"> </return> <description> </description> @@ -105,7 +105,7 @@ </description> </method> <method name="get_visibility_aabb" qualifiers="const"> - <return type="Rect3"> + <return type="AABB"> </return> <description> </description> @@ -247,7 +247,7 @@ <method name="set_visibility_aabb"> <return type="void"> </return> - <argument index="0" name="aabb" type="Rect3"> + <argument index="0" name="aabb" type="AABB"> </argument> <description> </description> @@ -300,7 +300,7 @@ <member name="speed_scale" type="float" setter="set_speed_scale" getter="get_speed_scale"> Speed scaling ratio. Default value: [code]1[/code]. </member> - <member name="visibility_aabb" type="Rect3" setter="set_visibility_aabb" getter="get_visibility_aabb"> + <member name="visibility_aabb" type="AABB" setter="set_visibility_aabb" getter="get_visibility_aabb"> </member> </members> <constants> diff --git a/doc/classes/RichTextLabel.xml b/doc/classes/RichTextLabel.xml index 693bd5cf2f..18e77ff5e3 100644 --- a/doc/classes/RichTextLabel.xml +++ b/doc/classes/RichTextLabel.xml @@ -403,6 +403,20 @@ Triggered when the user clicks on content between [url] tags. If the meta is defined in text, e.g. [code][url={"data"="hi"}]hi[/url][/code], then the parameter for this signal will be a [String] type. If a particular type or an object is desired, the [method push_meta] method must be used to manually insert the data into the tag stack. </description> </signal> + <signal name="meta_hover_started"> + <argument index="0" name="meta" type="Nil"> + </argument> + <description> + Triggers when the mouse enters a meta tag. + </description> + </signal> + <signal name="meta_hover_ended"> + <argument index="0" name="meta" type="Nil"> + </argument> + <description> + Triggers when the mouse exits a meta tag. + </description> + </signal> </signals> <constants> <constant name="ALIGN_LEFT" value="0"> diff --git a/doc/classes/String.xml b/doc/classes/String.xml index ecf9e54ee7..60c5e75dec 100644 --- a/doc/classes/String.xml +++ b/doc/classes/String.xml @@ -95,10 +95,10 @@ <method name="String"> <return type="String"> </return> - <argument index="0" name="from" type="Rect3"> + <argument index="0" name="from" type="AABB"> </argument> <description> - Constructs a new String from the given [Rect3]. + Constructs a new String from the given [AABB]. </description> </method> <method name="String"> diff --git a/doc/classes/VisibilityNotifier.xml b/doc/classes/VisibilityNotifier.xml index 1dfa60a5ac..90f1974697 100644 --- a/doc/classes/VisibilityNotifier.xml +++ b/doc/classes/VisibilityNotifier.xml @@ -12,7 +12,7 @@ </demos> <methods> <method name="get_aabb" qualifiers="const"> - <return type="Rect3"> + <return type="AABB"> </return> <description> Returns the bounding box of the VisibilityNotifier. @@ -28,7 +28,7 @@ <method name="set_aabb"> <return type="void"> </return> - <argument index="0" name="rect" type="Rect3"> + <argument index="0" name="rect" type="AABB"> </argument> <description> Set the visibility bounding box of the VisibilityNotifier. @@ -36,7 +36,7 @@ </method> </methods> <members> - <member name="aabb" type="Rect3" setter="set_aabb" getter="get_aabb"> + <member name="aabb" type="AABB" setter="set_aabb" getter="get_aabb"> The VisibilityNotifier's bounding box. </member> </members> diff --git a/doc/classes/VisualInstance.xml b/doc/classes/VisualInstance.xml index be2d38bf9f..7108eb13c5 100644 --- a/doc/classes/VisualInstance.xml +++ b/doc/classes/VisualInstance.xml @@ -10,7 +10,7 @@ </demos> <methods> <method name="get_aabb" qualifiers="const"> - <return type="Rect3"> + <return type="AABB"> </return> <description> </description> @@ -22,7 +22,7 @@ </description> </method> <method name="get_transformed_aabb" qualifiers="const"> - <return type="Rect3"> + <return type="AABB"> </return> <description> </description> diff --git a/doc/classes/VisualServer.xml b/doc/classes/VisualServer.xml index 1030e4ecc0..d716d99e5d 100644 --- a/doc/classes/VisualServer.xml +++ b/doc/classes/VisualServer.xml @@ -1035,7 +1035,7 @@ </description> </method> <method name="mesh_get_custom_aabb" qualifiers="const"> - <return type="Rect3"> + <return type="AABB"> </return> <argument index="0" name="mesh" type="RID"> </argument> @@ -1085,13 +1085,13 @@ </return> <argument index="0" name="mesh" type="RID"> </argument> - <argument index="1" name="aabb" type="Rect3"> + <argument index="1" name="aabb" type="AABB"> </argument> <description> </description> </method> <method name="mesh_surface_get_aabb" qualifiers="const"> - <return type="Rect3"> + <return type="AABB"> </return> <argument index="0" name="mesh" type="RID"> </argument> diff --git a/doc/tools/makerst.py b/doc/tools/makerst.py index dc015d781b..cd0108019b 100644 --- a/doc/tools/makerst.py +++ b/doc/tools/makerst.py @@ -7,6 +7,7 @@ import os import xml.etree.ElementTree as ET input_list = [] +cur_file = "" for arg in sys.argv[1:]: if arg.endswith(os.sep): @@ -206,6 +207,7 @@ def rstize_text(text, cclass): elif cmd == '/code': tag_text = '``' inside_code = False + escape_post = True elif inside_code: tag_text = '[' + tag_text + ']' elif cmd.find('html') == 0: @@ -217,7 +219,10 @@ def rstize_text(text, cclass): param = tag_text[space_pos + 1:] if param.find('.') != -1: - (class_param, method_param) = param.split('.') + ss = param.split('.') + if len(ss) > 2: + sys.exit("Bad reference: '" + param + "' in file: " + cur_file) + (class_param, method_param) = ss tag_text = ':ref:`' + class_param + '.' + method_param + '<class_' + class_param + '_' + method_param + '>`' else: tag_text = ':ref:`' + param + '<class_' + cclass + "_" + param + '>`' @@ -519,8 +524,8 @@ for path in input_list: elif os.path.isfile(path) and path.endswith('.xml'): file_list.append(path) -for file in file_list: - tree = ET.parse(file) +for cur_file in file_list: + tree = ET.parse(cur_file) doc = tree.getroot() if 'version' not in doc.attrib: diff --git a/drivers/SCsub b/drivers/SCsub index 34d6254578..938927f3a9 100644 --- a/drivers/SCsub +++ b/drivers/SCsub @@ -34,7 +34,12 @@ if env['tools']: SConscript("convex_decomp/SCsub") if env['vsproj']: + import os + path = os.getcwd() + # Change directory so the path resolves correctly in the function call. + os.chdir("..") env.AddToVSProject(env.drivers_sources) + os.chdir(path) if env.split_drivers: env.split_lib("drivers") diff --git a/drivers/gl_context/context_gl.cpp b/drivers/gl_context/context_gl.cpp index a453eef227..1581512369 100644 --- a/drivers/gl_context/context_gl.cpp +++ b/drivers/gl_context/context_gl.cpp @@ -29,7 +29,7 @@ /*************************************************************************/ #include "context_gl.h" -#if defined(OPENGL_ENABLED) || defined(GLES2_ENABLED) +#if defined(OPENGL_ENABLED) || defined(GLES_ENABLED) ContextGL *ContextGL::singleton = NULL; diff --git a/drivers/gl_context/context_gl.h b/drivers/gl_context/context_gl.h index 399657eb52..3496f2948c 100644 --- a/drivers/gl_context/context_gl.h +++ b/drivers/gl_context/context_gl.h @@ -30,7 +30,7 @@ #ifndef CONTEXT_GL_H #define CONTEXT_GL_H -#if defined(OPENGL_ENABLED) || defined(GLES2_ENABLED) +#if defined(OPENGL_ENABLED) || defined(GLES_ENABLED) #include "typedefs.h" diff --git a/drivers/gles3/rasterizer_canvas_gles3.cpp b/drivers/gles3/rasterizer_canvas_gles3.cpp index 5d62d2f5a0..308a18aa9d 100644 --- a/drivers/gles3/rasterizer_canvas_gles3.cpp +++ b/drivers/gles3/rasterizer_canvas_gles3.cpp @@ -149,13 +149,6 @@ void RasterizerCanvasGLES3::canvas_begin() { storage->frame.clear_request = false; } - /*canvas_shader.unbind(); - canvas_shader.set_custom_shader(0); - canvas_shader.set_conditional(CanvasShaderGLES2::USE_MODULATE,false); - canvas_shader.bind(); - canvas_shader.set_uniform(CanvasShaderGLES2::TEXTURE, 0); - canvas_use_modulate=false;*/ - reset_canvas(); state.canvas_shader.set_conditional(CanvasShaderGLES3::USE_TEXTURE_RECT, true); @@ -911,61 +904,6 @@ void RasterizerCanvasGLES3::_canvas_item_render_commands(Item *p_item, Item *cur } } -#if 0 -void RasterizerGLES2::_canvas_item_setup_shader_params(ShaderMaterial *material,Shader* shader) { - - if (canvas_shader.bind()) - rebind_texpixel_size=true; - - if (material->shader_version!=shader->version) { - //todo optimize uniforms - material->shader_version=shader->version; - } - - if (shader->has_texscreen && framebuffer.active) { - - int x = viewport.x; - int y = window_size.height-(viewport.height+viewport.y); - - canvas_shader.set_uniform(CanvasShaderGLES2::TEXSCREEN_SCREEN_MULT,Vector2(float(viewport.width)/framebuffer.width,float(viewport.height)/framebuffer.height)); - canvas_shader.set_uniform(CanvasShaderGLES2::TEXSCREEN_SCREEN_CLAMP,Color(float(x)/framebuffer.width,float(y)/framebuffer.height,float(x+viewport.width)/framebuffer.width,float(y+viewport.height)/framebuffer.height)); - canvas_shader.set_uniform(CanvasShaderGLES2::TEXSCREEN_TEX,max_texture_units-1); - glActiveTexture(GL_TEXTURE0+max_texture_units-1); - glBindTexture(GL_TEXTURE_2D,framebuffer.sample_color); - if (framebuffer.scale==1 && !canvas_texscreen_used) { -#ifdef GLEW_ENABLED - if (current_rt) { - glReadBuffer(GL_COLOR_ATTACHMENT0); - } else { - glReadBuffer(GL_BACK); - } -#endif - if (current_rt) { - glCopyTexSubImage2D(GL_TEXTURE_2D,0,viewport.x,viewport.y,viewport.x,viewport.y,viewport.width,viewport.height); - canvas_shader.set_uniform(CanvasShaderGLES2::TEXSCREEN_SCREEN_CLAMP,Color(float(x)/framebuffer.width,float(viewport.y)/framebuffer.height,float(x+viewport.width)/framebuffer.width,float(y+viewport.height)/framebuffer.height)); - //window_size.height-(viewport.height+viewport.y) - } else { - glCopyTexSubImage2D(GL_TEXTURE_2D,0,x,y,x,y,viewport.width,viewport.height); - } - - canvas_texscreen_used=true; - } - - glActiveTexture(GL_TEXTURE0); - - } - - if (shader->has_screen_uv) { - canvas_shader.set_uniform(CanvasShaderGLES2::SCREEN_UV_MULT,Vector2(1.0/viewport.width,1.0/viewport.height)); - } - - - uses_texpixel_size=shader->uses_texpixel_size; - -} - -#endif - void RasterizerCanvasGLES3::_copy_texscreen(const Rect2 &p_rect) { glDisable(GL_BLEND); @@ -1570,6 +1508,7 @@ void RasterizerCanvasGLES3::reset_canvas() { glDisable(GL_CULL_FACE); glDisable(GL_DEPTH_TEST); glDisable(GL_SCISSOR_TEST); + glDisable(GL_DITHER); glEnable(GL_BLEND); glBlendEquation(GL_FUNC_ADD); if (storage->frame.current_rt && storage->frame.current_rt->flags[RasterizerStorage::RENDER_TARGET_TRANSPARENT]) { diff --git a/drivers/gles3/rasterizer_gles3.cpp b/drivers/gles3/rasterizer_gles3.cpp index 220a3533b7..ee61481a86 100644 --- a/drivers/gles3/rasterizer_gles3.cpp +++ b/drivers/gles3/rasterizer_gles3.cpp @@ -141,28 +141,22 @@ void RasterizerGLES3::initialize() { print_line("Using GLES3 video driver"); } -#ifdef GLEW_ENABLED - GLuint res = glewInit(); - ERR_FAIL_COND(res != GLEW_OK); - if (OS::get_singleton()->is_stdout_verbose()) { - print_line(String("GLES2: Using GLEW ") + (const char *)glewGetString(GLEW_VERSION)); +#ifdef GLAD_ENABLED + if (!gladLoadGL()) { + ERR_PRINT("Error initializing GLAD"); } - // Check for GL 2.1 compatibility, if not bail out - if (!glewIsSupported("GL_VERSION_3_0")) { - ERR_PRINT("Your system's graphic drivers seem not to support OpenGL 3.0+ / GLES 3.0, sorry :(\n" +// GLVersion seems to be used for both GL and GL ES, so we need different version checks for them +#ifdef OPENGL_ENABLED // OpenGL 3.3 Core Profile required + if (GLVersion.major < 3 && GLVersion.minor < 3) { +#else // OpenGL ES 3.0 + if (GLVersion.major < 3) { +#endif + ERR_PRINT("Your system's graphic drivers seem not to support OpenGL 3.3 / OpenGL ES 3.0, sorry :(\n" "Try a drivers update, buy a new GPU or try software rendering on Linux; Godot will now crash with a segmentation fault."); - OS::get_singleton()->alert("Your system's graphic drivers seem not to support OpenGL 3.0+ / GLES 3.0, sorry :(\n" + OS::get_singleton()->alert("Your system's graphic drivers seem not to support OpenGL 3.3 / OpenGL ES 3.0, sorry :(\n" "Godot Engine will self-destruct as soon as you acknowledge this error message.", - "Fatal error: Insufficient OpenGL / GLES drivers"); - // TODO: If it's even possible, we should stop the execution without segfault and memory leaks :) - } -#endif - -#ifdef GLAD_ENABLED - - if (!gladLoadGL()) { - ERR_PRINT("Error initializing GLAD"); + "Fatal error: Insufficient OpenGL / GLES driver support"); } #ifdef __APPLE__ @@ -175,21 +169,20 @@ void RasterizerGLES3::initialize() { } #endif -#endif +#endif // GLAD_ENABLED - /* glDebugMessageControlARB(GL_DEBUG_SOURCE_API_ARB,GL_DEBUG_TYPE_ERROR_ARB,GL_DEBUG_SEVERITY_HIGH_ARB,0,NULL,GL_TRUE); + /* // For debugging + glDebugMessageControlARB(GL_DEBUG_SOURCE_API_ARB,GL_DEBUG_TYPE_ERROR_ARB,GL_DEBUG_SEVERITY_HIGH_ARB,0,NULL,GL_TRUE); glDebugMessageControlARB(GL_DEBUG_SOURCE_API_ARB,GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR_ARB,GL_DEBUG_SEVERITY_HIGH_ARB,0,NULL,GL_TRUE); glDebugMessageControlARB(GL_DEBUG_SOURCE_API_ARB,GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR_ARB,GL_DEBUG_SEVERITY_HIGH_ARB,0,NULL,GL_TRUE); glDebugMessageControlARB(GL_DEBUG_SOURCE_API_ARB,GL_DEBUG_TYPE_PORTABILITY_ARB,GL_DEBUG_SEVERITY_HIGH_ARB,0,NULL,GL_TRUE); glDebugMessageControlARB(GL_DEBUG_SOURCE_API_ARB,GL_DEBUG_TYPE_PERFORMANCE_ARB,GL_DEBUG_SEVERITY_HIGH_ARB,0,NULL,GL_TRUE); glDebugMessageControlARB(GL_DEBUG_SOURCE_API_ARB,GL_DEBUG_TYPE_OTHER_ARB,GL_DEBUG_SEVERITY_HIGH_ARB,0,NULL,GL_TRUE); glDebugMessageInsertARB( - GL_DEBUG_SOURCE_API_ARB, GL_DEBUG_TYPE_OTHER_ARB, 1, GL_DEBUG_SEVERITY_HIGH_ARB,5, "hello"); - -*/ + */ const GLubyte *renderer = glGetString(GL_RENDERER); print_line("OpenGL ES 3.0 Renderer: " + String((const char *)renderer)); diff --git a/drivers/gles3/rasterizer_storage_gles3.cpp b/drivers/gles3/rasterizer_storage_gles3.cpp index 5071fbba01..a41d84a2aa 100644 --- a/drivers/gles3/rasterizer_storage_gles3.cpp +++ b/drivers/gles3/rasterizer_storage_gles3.cpp @@ -2600,7 +2600,7 @@ RID RasterizerStorageGLES3::mesh_create() { return mesh_owner.make_rid(mesh); } -void RasterizerStorageGLES3::mesh_add_surface(RID p_mesh, uint32_t p_format, VS::PrimitiveType p_primitive, const PoolVector<uint8_t> &p_array, int p_vertex_count, const PoolVector<uint8_t> &p_index_array, int p_index_count, const Rect3 &p_aabb, const Vector<PoolVector<uint8_t> > &p_blend_shapes, const Vector<Rect3> &p_bone_aabbs) { +void RasterizerStorageGLES3::mesh_add_surface(RID p_mesh, uint32_t p_format, VS::PrimitiveType p_primitive, const PoolVector<uint8_t> &p_array, int p_vertex_count, const PoolVector<uint8_t> &p_index_array, int p_index_count, const AABB &p_aabb, const Vector<PoolVector<uint8_t> > &p_blend_shapes, const Vector<AABB> &p_bone_aabbs) { PoolVector<uint8_t> array = p_array; @@ -3240,11 +3240,11 @@ VS::PrimitiveType RasterizerStorageGLES3::mesh_surface_get_primitive_type(RID p_ return mesh->surfaces[p_surface]->primitive; } -Rect3 RasterizerStorageGLES3::mesh_surface_get_aabb(RID p_mesh, int p_surface) const { +AABB RasterizerStorageGLES3::mesh_surface_get_aabb(RID p_mesh, int p_surface) const { const Mesh *mesh = mesh_owner.getornull(p_mesh); - ERR_FAIL_COND_V(!mesh, Rect3()); - ERR_FAIL_INDEX_V(p_surface, mesh->surfaces.size(), Rect3()); + ERR_FAIL_COND_V(!mesh, AABB()); + ERR_FAIL_INDEX_V(p_surface, mesh->surfaces.size(), AABB()); return mesh->surfaces[p_surface]->aabb; } @@ -3279,11 +3279,11 @@ Vector<PoolVector<uint8_t> > RasterizerStorageGLES3::mesh_surface_get_blend_shap return bsarr; } -Vector<Rect3> RasterizerStorageGLES3::mesh_surface_get_skeleton_aabb(RID p_mesh, int p_surface) const { +Vector<AABB> RasterizerStorageGLES3::mesh_surface_get_skeleton_aabb(RID p_mesh, int p_surface) const { const Mesh *mesh = mesh_owner.getornull(p_mesh); - ERR_FAIL_COND_V(!mesh, Vector<Rect3>()); - ERR_FAIL_INDEX_V(p_surface, mesh->surfaces.size(), Vector<Rect3>()); + ERR_FAIL_COND_V(!mesh, Vector<AABB>()); + ERR_FAIL_INDEX_V(p_surface, mesh->surfaces.size(), Vector<AABB>()); return mesh->surfaces[p_surface]->skeleton_bone_aabb; } @@ -3337,7 +3337,7 @@ int RasterizerStorageGLES3::mesh_get_surface_count(RID p_mesh) const { return mesh->surfaces.size(); } -void RasterizerStorageGLES3::mesh_set_custom_aabb(RID p_mesh, const Rect3 &p_aabb) { +void RasterizerStorageGLES3::mesh_set_custom_aabb(RID p_mesh, const AABB &p_aabb) { Mesh *mesh = mesh_owner.getornull(p_mesh); ERR_FAIL_COND(!mesh); @@ -3345,37 +3345,37 @@ void RasterizerStorageGLES3::mesh_set_custom_aabb(RID p_mesh, const Rect3 &p_aab mesh->custom_aabb = p_aabb; } -Rect3 RasterizerStorageGLES3::mesh_get_custom_aabb(RID p_mesh) const { +AABB RasterizerStorageGLES3::mesh_get_custom_aabb(RID p_mesh) const { const Mesh *mesh = mesh_owner.getornull(p_mesh); - ERR_FAIL_COND_V(!mesh, Rect3()); + ERR_FAIL_COND_V(!mesh, AABB()); return mesh->custom_aabb; } -Rect3 RasterizerStorageGLES3::mesh_get_aabb(RID p_mesh, RID p_skeleton) const { +AABB RasterizerStorageGLES3::mesh_get_aabb(RID p_mesh, RID p_skeleton) const { Mesh *mesh = mesh_owner.get(p_mesh); - ERR_FAIL_COND_V(!mesh, Rect3()); + ERR_FAIL_COND_V(!mesh, AABB()); - if (mesh->custom_aabb != Rect3()) + if (mesh->custom_aabb != AABB()) return mesh->custom_aabb; Skeleton *sk = NULL; if (p_skeleton.is_valid()) sk = skeleton_owner.get(p_skeleton); - Rect3 aabb; + AABB aabb; if (sk && sk->size != 0) { for (int i = 0; i < mesh->surfaces.size(); i++) { - Rect3 laabb; + AABB laabb; if ((mesh->surfaces[i]->format & VS::ARRAY_FORMAT_BONES) && mesh->surfaces[i]->skeleton_bone_aabb.size()) { int bs = mesh->surfaces[i]->skeleton_bone_aabb.size(); - const Rect3 *skbones = mesh->surfaces[i]->skeleton_bone_aabb.ptr(); + const AABB *skbones = mesh->surfaces[i]->skeleton_bone_aabb.ptr(); const bool *skused = mesh->surfaces[i]->skeleton_bone_used.ptr(); int sbs = sk->size; @@ -3401,7 +3401,7 @@ Rect3 RasterizerStorageGLES3::mesh_get_aabb(RID p_mesh, RID p_skeleton) const { mtx.basis[1].y = texture[base_ofs + 1]; mtx.origin.y = texture[base_ofs + 3]; - Rect3 baabb = mtx.xform(skbones[j]); + AABB baabb = mtx.xform(skbones[j]); if (first) { laabb = baabb; first = false; @@ -3434,7 +3434,7 @@ Rect3 RasterizerStorageGLES3::mesh_get_aabb(RID p_mesh, RID p_skeleton) const { mtx.basis[2].z = texture[base_ofs + 2]; mtx.origin.z = texture[base_ofs + 3]; - Rect3 baabb = mtx.xform(skbones[j]); + AABB baabb = mtx.xform(skbones[j]); if (first) { laabb = baabb; first = false; @@ -4028,10 +4028,10 @@ int RasterizerStorageGLES3::multimesh_get_visible_instances(RID p_multimesh) con return multimesh->visible_instances; } -Rect3 RasterizerStorageGLES3::multimesh_get_aabb(RID p_multimesh) const { +AABB RasterizerStorageGLES3::multimesh_get_aabb(RID p_multimesh) const { MultiMesh *multimesh = multimesh_owner.getornull(p_multimesh); - ERR_FAIL_COND_V(!multimesh, Rect3()); + ERR_FAIL_COND_V(!multimesh, AABB()); const_cast<RasterizerStorageGLES3 *>(this)->update_dirty_multimeshes(); //update pending AABBs @@ -4053,7 +4053,7 @@ void RasterizerStorageGLES3::update_dirty_multimeshes() { if (multimesh->size && multimesh->dirty_aabb) { - Rect3 mesh_aabb; + AABB mesh_aabb; if (multimesh->mesh.is_valid()) { mesh_aabb = mesh_get_aabb(multimesh->mesh, RID()); @@ -4065,7 +4065,7 @@ void RasterizerStorageGLES3::update_dirty_multimeshes() { int count = multimesh->data.size(); float *data = multimesh->data.ptr(); - Rect3 aabb; + AABB aabb; if (multimesh->transform_format == VS::MULTIMESH_TRANSFORM_2D) { @@ -4080,7 +4080,7 @@ void RasterizerStorageGLES3::update_dirty_multimeshes() { xform.basis[1][1] = dataptr[5]; xform.origin[1] = dataptr[7]; - Rect3 laabb = xform.xform(mesh_aabb); + AABB laabb = xform.xform(mesh_aabb); if (i == 0) aabb = laabb; else @@ -4106,7 +4106,7 @@ void RasterizerStorageGLES3::update_dirty_multimeshes() { xform.basis.elements[2][2] = dataptr[10]; xform.origin.z = dataptr[11]; - Rect3 laabb = xform.xform(mesh_aabb); + AABB laabb = xform.xform(mesh_aabb); if (i == 0) aabb = laabb; else @@ -4242,10 +4242,10 @@ void RasterizerStorageGLES3::immediate_clear(RID p_immediate) { im->instance_change_notify(); } -Rect3 RasterizerStorageGLES3::immediate_get_aabb(RID p_immediate) const { +AABB RasterizerStorageGLES3::immediate_get_aabb(RID p_immediate) const { Immediate *im = immediate_owner.get(p_immediate); - ERR_FAIL_COND_V(!im, Rect3()); + ERR_FAIL_COND_V(!im, AABB()); return im->aabb; } @@ -4466,6 +4466,7 @@ RID RasterizerStorageGLES3::light_create(VS::LightType p_type) { light->type = p_type; light->param[VS::LIGHT_PARAM_ENERGY] = 1.0; + light->param[VS::LIGHT_PARAM_INDIRECT_ENERGY] = 1.0; light->param[VS::LIGHT_PARAM_SPECULAR] = 0.5; light->param[VS::LIGHT_PARAM_RANGE] = 1.0; light->param[VS::LIGHT_PARAM_SPOT_ANGLE] = 45; @@ -4694,10 +4695,10 @@ uint64_t RasterizerStorageGLES3::light_get_version(RID p_light) const { return light->version; } -Rect3 RasterizerStorageGLES3::light_get_aabb(RID p_light) const { +AABB RasterizerStorageGLES3::light_get_aabb(RID p_light) const { const Light *light = light_owner.getornull(p_light); - ERR_FAIL_COND_V(!light, Rect3()); + ERR_FAIL_COND_V(!light, AABB()); switch (light->type) { @@ -4705,22 +4706,22 @@ Rect3 RasterizerStorageGLES3::light_get_aabb(RID p_light) const { float len = light->param[VS::LIGHT_PARAM_RANGE]; float size = Math::tan(Math::deg2rad(light->param[VS::LIGHT_PARAM_SPOT_ANGLE])) * len; - return Rect3(Vector3(-size, -size, -len), Vector3(size * 2, size * 2, len)); + return AABB(Vector3(-size, -size, -len), Vector3(size * 2, size * 2, len)); } break; case VS::LIGHT_OMNI: { float r = light->param[VS::LIGHT_PARAM_RANGE]; - return Rect3(-Vector3(r, r, r), Vector3(r, r, r) * 2); + return AABB(-Vector3(r, r, r), Vector3(r, r, r) * 2); } break; case VS::LIGHT_DIRECTIONAL: { - return Rect3(); + return AABB(); } break; default: {} } - ERR_FAIL_V(Rect3()); - return Rect3(); + ERR_FAIL_V(AABB()); + return AABB(); } /* PROBE API */ @@ -4842,11 +4843,11 @@ void RasterizerStorageGLES3::reflection_probe_set_cull_mask(RID p_probe, uint32_ reflection_probe->instance_change_notify(); } -Rect3 RasterizerStorageGLES3::reflection_probe_get_aabb(RID p_probe) const { +AABB RasterizerStorageGLES3::reflection_probe_get_aabb(RID p_probe) const { const ReflectionProbe *reflection_probe = reflection_probe_owner.getornull(p_probe); - ERR_FAIL_COND_V(!reflection_probe, Rect3()); + ERR_FAIL_COND_V(!reflection_probe, AABB()); - Rect3 aabb; + AABB aabb; aabb.position = -reflection_probe->extents; aabb.size = reflection_probe->extents * 2.0; @@ -4903,7 +4904,7 @@ RID RasterizerStorageGLES3::gi_probe_create() { GIProbe *gip = memnew(GIProbe); - gip->bounds = Rect3(Vector3(), Vector3(1, 1, 1)); + gip->bounds = AABB(Vector3(), Vector3(1, 1, 1)); gip->dynamic_range = 1.0; gip->energy = 1.0; gip->propagation = 1.0; @@ -4917,7 +4918,7 @@ RID RasterizerStorageGLES3::gi_probe_create() { return gi_probe_owner.make_rid(gip); } -void RasterizerStorageGLES3::gi_probe_set_bounds(RID p_probe, const Rect3 &p_bounds) { +void RasterizerStorageGLES3::gi_probe_set_bounds(RID p_probe, const AABB &p_bounds) { GIProbe *gip = gi_probe_owner.getornull(p_probe); ERR_FAIL_COND(!gip); @@ -4926,10 +4927,10 @@ void RasterizerStorageGLES3::gi_probe_set_bounds(RID p_probe, const Rect3 &p_bou gip->version++; gip->instance_change_notify(); } -Rect3 RasterizerStorageGLES3::gi_probe_get_bounds(RID p_probe) const { +AABB RasterizerStorageGLES3::gi_probe_get_bounds(RID p_probe) const { const GIProbe *gip = gi_probe_owner.getornull(p_probe); - ERR_FAIL_COND_V(!gip, Rect3()); + ERR_FAIL_COND_V(!gip, AABB()); return gip->bounds; } @@ -5338,7 +5339,7 @@ void RasterizerStorageGLES3::_particles_update_histories(Particles *particles) { particles->clear = true; } -void RasterizerStorageGLES3::particles_set_custom_aabb(RID p_particles, const Rect3 &p_aabb) { +void RasterizerStorageGLES3::particles_set_custom_aabb(RID p_particles, const AABB &p_aabb) { Particles *particles = particles_owner.getornull(p_particles); ERR_FAIL_COND(!particles); @@ -5429,15 +5430,15 @@ void RasterizerStorageGLES3::particles_request_process(RID p_particles) { } } -Rect3 RasterizerStorageGLES3::particles_get_current_aabb(RID p_particles) { +AABB RasterizerStorageGLES3::particles_get_current_aabb(RID p_particles) { const Particles *particles = particles_owner.getornull(p_particles); - ERR_FAIL_COND_V(!particles, Rect3()); + ERR_FAIL_COND_V(!particles, AABB()); glBindBuffer(GL_ARRAY_BUFFER, particles->particle_buffers[0]); float *data = (float *)glMapBufferRange(GL_ARRAY_BUFFER, 0, particles->amount * 16 * 6, GL_MAP_READ_BIT); - Rect3 aabb; + AABB aabb; Transform inv = particles->emission_transform.affine_inverse(); @@ -5459,7 +5460,7 @@ Rect3 RasterizerStorageGLES3::particles_get_current_aabb(RID p_particles) { float longest_axis = 0; for (int i = 0; i < particles->draw_passes.size(); i++) { if (particles->draw_passes[i].is_valid()) { - Rect3 maabb = mesh_get_aabb(particles->draw_passes[i], RID()); + AABB maabb = mesh_get_aabb(particles->draw_passes[i], RID()); longest_axis = MAX(maabb.get_longest_axis_size(), longest_axis); } } @@ -5469,10 +5470,10 @@ Rect3 RasterizerStorageGLES3::particles_get_current_aabb(RID p_particles) { return aabb; } -Rect3 RasterizerStorageGLES3::particles_get_aabb(RID p_particles) const { +AABB RasterizerStorageGLES3::particles_get_aabb(RID p_particles) const { const Particles *particles = particles_owner.getornull(p_particles); - ERR_FAIL_COND_V(!particles, Rect3()); + ERR_FAIL_COND_V(!particles, AABB()); return particles->custom_aabb; } @@ -7027,14 +7028,22 @@ void RasterizerStorageGLES3::initialize() { glBindBuffer(GL_ARRAY_BUFFER, resources.quadie); { const float qv[16] = { - -1, -1, - 0, 0, - -1, 1, - 0, 1, - 1, 1, - 1, 1, - 1, -1, - 1, 0, + -1, + -1, + 0, + 0, + -1, + 1, + 0, + 1, + 1, + 1, + 1, + 1, + 1, + -1, + 1, + 0, }; glBufferData(GL_ARRAY_BUFFER, sizeof(float) * 16, qv, GL_STATIC_DRAW); diff --git a/drivers/gles3/rasterizer_storage_gles3.h b/drivers/gles3/rasterizer_storage_gles3.h index bd5aad29c9..8aa8235b42 100644 --- a/drivers/gles3/rasterizer_storage_gles3.h +++ b/drivers/gles3/rasterizer_storage_gles3.h @@ -592,7 +592,7 @@ public: GLuint instancing_array_wireframe_id; int index_wireframe_len; - Vector<Rect3> skeleton_bone_aabb; + Vector<AABB> skeleton_bone_aabb; Vector<bool> skeleton_bone_used; //bool packed; @@ -604,7 +604,7 @@ public: Vector<BlendShape> blend_shapes; - Rect3 aabb; + AABB aabb; int array_len; int index_array_len; @@ -659,7 +659,7 @@ public: Vector<Surface *> surfaces; int blend_shape_count; VS::BlendShapeMode blend_shape_mode; - Rect3 custom_aabb; + AABB custom_aabb; mutable uint64_t last_pass; SelfList<MultiMesh>::List multimeshes; @@ -684,7 +684,7 @@ public: virtual RID mesh_create(); - virtual void mesh_add_surface(RID p_mesh, uint32_t p_format, VS::PrimitiveType p_primitive, const PoolVector<uint8_t> &p_array, int p_vertex_count, const PoolVector<uint8_t> &p_index_array, int p_index_count, const Rect3 &p_aabb, const Vector<PoolVector<uint8_t> > &p_blend_shapes = Vector<PoolVector<uint8_t> >(), const Vector<Rect3> &p_bone_aabbs = Vector<Rect3>()); + virtual void mesh_add_surface(RID p_mesh, uint32_t p_format, VS::PrimitiveType p_primitive, const PoolVector<uint8_t> &p_array, int p_vertex_count, const PoolVector<uint8_t> &p_index_array, int p_index_count, const AABB &p_aabb, const Vector<PoolVector<uint8_t> > &p_blend_shapes = Vector<PoolVector<uint8_t> >(), const Vector<AABB> &p_bone_aabbs = Vector<AABB>()); virtual void mesh_set_blend_shape_count(RID p_mesh, int p_amount); virtual int mesh_get_blend_shape_count(RID p_mesh) const; @@ -706,17 +706,17 @@ public: virtual uint32_t mesh_surface_get_format(RID p_mesh, int p_surface) const; virtual VS::PrimitiveType mesh_surface_get_primitive_type(RID p_mesh, int p_surface) const; - virtual Rect3 mesh_surface_get_aabb(RID p_mesh, int p_surface) const; + virtual AABB mesh_surface_get_aabb(RID p_mesh, int p_surface) const; virtual Vector<PoolVector<uint8_t> > mesh_surface_get_blend_shapes(RID p_mesh, int p_surface) const; - virtual Vector<Rect3> mesh_surface_get_skeleton_aabb(RID p_mesh, int p_surface) const; + virtual Vector<AABB> mesh_surface_get_skeleton_aabb(RID p_mesh, int p_surface) const; virtual void mesh_remove_surface(RID p_mesh, int p_surface); virtual int mesh_get_surface_count(RID p_mesh) const; - virtual void mesh_set_custom_aabb(RID p_mesh, const Rect3 &p_aabb); - virtual Rect3 mesh_get_custom_aabb(RID p_mesh) const; + virtual void mesh_set_custom_aabb(RID p_mesh, const AABB &p_aabb); + virtual AABB mesh_get_custom_aabb(RID p_mesh) const; - virtual Rect3 mesh_get_aabb(RID p_mesh, RID p_skeleton) const; + virtual AABB mesh_get_aabb(RID p_mesh, RID p_skeleton) const; virtual void mesh_clear(RID p_mesh); void mesh_render_blend_shapes(Surface *s, float *p_weights); @@ -729,7 +729,7 @@ public: VS::MultimeshTransformFormat transform_format; VS::MultimeshColorFormat color_format; Vector<float> data; - Rect3 aabb; + AABB aabb; SelfList<MultiMesh> update_list; SelfList<MultiMesh> mesh_list; GLuint buffer; @@ -780,7 +780,7 @@ public: virtual void multimesh_set_visible_instances(RID p_multimesh, int p_visible); virtual int multimesh_get_visible_instances(RID p_multimesh) const; - virtual Rect3 multimesh_get_aabb(RID p_multimesh) const; + virtual AABB multimesh_get_aabb(RID p_multimesh) const; /* IMMEDIATE API */ @@ -801,7 +801,7 @@ public: List<Chunk> chunks; bool building; int mask; - Rect3 aabb; + AABB aabb; Immediate() { type = GEOMETRY_IMMEDIATE; @@ -830,7 +830,7 @@ public: virtual void immediate_clear(RID p_immediate); virtual void immediate_set_material(RID p_immediate, RID p_material); virtual RID immediate_get_material(RID p_immediate) const; - virtual Rect3 immediate_get_aabb(RID p_immediate) const; + virtual AABB immediate_get_aabb(RID p_immediate) const; /* SKELETON API */ @@ -918,7 +918,7 @@ public: virtual float light_get_param(RID p_light, VS::LightParam p_param); virtual Color light_get_color(RID p_light); - virtual Rect3 light_get_aabb(RID p_light) const; + virtual AABB light_get_aabb(RID p_light) const; virtual uint64_t light_get_version(RID p_light) const; /* PROBE API */ @@ -956,7 +956,7 @@ public: virtual void reflection_probe_set_enable_shadows(RID p_probe, bool p_enable); virtual void reflection_probe_set_cull_mask(RID p_probe, uint32_t p_layers); - virtual Rect3 reflection_probe_get_aabb(RID p_probe) const; + virtual AABB reflection_probe_get_aabb(RID p_probe) const; virtual VS::ReflectionProbeUpdateMode reflection_probe_get_update_mode(RID p_probe) const; virtual uint32_t reflection_probe_get_cull_mask(RID p_probe) const; @@ -969,7 +969,7 @@ public: struct GIProbe : public Instantiable { - Rect3 bounds; + AABB bounds; Transform to_cell; float cell_size; @@ -990,8 +990,8 @@ public: virtual RID gi_probe_create(); - virtual void gi_probe_set_bounds(RID p_probe, const Rect3 &p_bounds); - virtual Rect3 gi_probe_get_bounds(RID p_probe) const; + virtual void gi_probe_set_bounds(RID p_probe, const AABB &p_bounds); + virtual AABB gi_probe_get_bounds(RID p_probe) const; virtual void gi_probe_set_cell_size(RID p_probe, float p_size); virtual float gi_probe_get_cell_size(RID p_probe) const; @@ -1058,7 +1058,7 @@ public: float explosiveness; float randomness; bool restart_request; - Rect3 custom_aabb; + AABB custom_aabb; bool use_local_coords; RID process_material; @@ -1113,7 +1113,7 @@ public: restart_request = false; - custom_aabb = Rect3(Vector3(-4, -4, -4), Vector3(8, 8, 8)); + custom_aabb = AABB(Vector3(-4, -4, -4), Vector3(8, 8, 8)); draw_order = VS::PARTICLES_DRAW_ORDER_INDEX; particle_buffers[0] = 0; @@ -1155,7 +1155,7 @@ public: virtual void particles_set_pre_process_time(RID p_particles, float p_time); virtual void particles_set_explosiveness_ratio(RID p_particles, float p_ratio); virtual void particles_set_randomness_ratio(RID p_particles, float p_ratio); - virtual void particles_set_custom_aabb(RID p_particles, const Rect3 &p_aabb); + virtual void particles_set_custom_aabb(RID p_particles, const AABB &p_aabb); virtual void particles_set_speed_scale(RID p_particles, float p_scale); virtual void particles_set_use_local_coordinates(RID p_particles, bool p_enable); virtual void particles_set_process_material(RID p_particles, RID p_material); @@ -1169,8 +1169,8 @@ public: virtual void particles_set_draw_pass_mesh(RID p_particles, int p_pass, RID p_mesh); virtual void particles_request_process(RID p_particles); - virtual Rect3 particles_get_current_aabb(RID p_particles); - virtual Rect3 particles_get_aabb(RID p_particles) const; + virtual AABB particles_get_current_aabb(RID p_particles); + virtual AABB particles_get_aabb(RID p_particles) const; virtual void _particles_update_histories(Particles *particles); diff --git a/drivers/gles3/shader_compiler_gles3.cpp b/drivers/gles3/shader_compiler_gles3.cpp index ad08c59de8..325df8e4f1 100644 --- a/drivers/gles3/shader_compiler_gles3.cpp +++ b/drivers/gles3/shader_compiler_gles3.cpp @@ -741,6 +741,7 @@ ShaderCompilerGLES3::ShaderCompilerGLES3() { actions[VS::SHADER_CANVAS_ITEM].usage_defines["NORMAL"] = "#define NORMAL_USED\n"; actions[VS::SHADER_CANVAS_ITEM].usage_defines["NORMALMAP"] = "#define NORMALMAP_USED\n"; actions[VS::SHADER_CANVAS_ITEM].usage_defines["SHADOW_COLOR"] = "#define SHADOW_COLOR_USED\n"; + actions[VS::SHADER_CANVAS_ITEM].usage_defines["LIGHT"] = "#define USE_LIGHT_SHADER_CODE\n"; actions[VS::SHADER_CANVAS_ITEM].render_mode_defines["skip_vertex_transform"] = "#define SKIP_TRANSFORM_USED\n"; @@ -828,6 +829,9 @@ ShaderCompilerGLES3::ShaderCompilerGLES3() { actions[VS::SHADER_SPATIAL].usage_defines["SCREEN_TEXTURE"] = "#define SCREEN_TEXTURE_USED\n"; actions[VS::SHADER_SPATIAL].usage_defines["SCREEN_UV"] = "#define SCREEN_UV_USED\n"; + actions[VS::SHADER_SPATIAL].usage_defines["DIFFUSE_LIGHT"] = "#define USE_LIGHT_SHADER_CODE\n"; + actions[VS::SHADER_SPATIAL].usage_defines["SPECULAR_LIGHT"] = "#define USE_LIGHT_SHADER_CODE\n"; + actions[VS::SHADER_SPATIAL].renames["SSS_STRENGTH"] = "sss_strength"; actions[VS::SHADER_SPATIAL].render_mode_defines["skip_vertex_transform"] = "#define SKIP_TRANSFORM_USED\n"; diff --git a/drivers/unix/SCsub b/drivers/unix/SCsub index c560e1289f..ada8255580 100644 --- a/drivers/unix/SCsub +++ b/drivers/unix/SCsub @@ -2,16 +2,6 @@ Import('env') -g_set_p = '#ifdef UNIX_ENABLED\n' -g_set_p += '#include "os_unix.h"\n' -g_set_p += 'String OS_Unix::get_global_settings_path() const {\n' -g_set_p += '\treturn "' + env["unix_global_settings_path"] + '";\n' -g_set_p += '}\n' -g_set_p += '#endif' -f = open("os_unix_global_settings_path.gen.cpp", "w") -f.write(g_set_p) -f.close() - env.add_source_files(env.drivers_sources, "*.cpp") env["check_c_headers"] = [ [ "mntent.h", "HAVE_MNTENT" ] ] diff --git a/drivers/unix/os_unix.cpp b/drivers/unix/os_unix.cpp index 729abd57ef..0d102902e8 100644 --- a/drivers/unix/os_unix.cpp +++ b/drivers/unix/os_unix.cpp @@ -133,15 +133,6 @@ void OS_Unix::initialize_core() { } } -void OS_Unix::initialize_logger() { - Vector<Logger *> loggers; - loggers.push_back(memnew(UnixTerminalLogger)); - // FIXME: Reenable once we figure out how to get this properly in user:// - // instead of littering the user's working dirs (res:// + pwd) with log files (GH-12277) - //loggers.push_back(memnew(RotatedFileLogger("user://logs/log.txt"))); - _set_logger(memnew(CompositeLogger(loggers))); -} - void OS_Unix::finalize_core() { } @@ -454,32 +445,21 @@ int OS_Unix::get_processor_count() const { return sysconf(_SC_NPROCESSORS_CONF); } -String OS_Unix::get_data_dir() const { - - String an = get_safe_application_name(); - if (an != "") { +String OS_Unix::get_user_data_dir() const { - if (has_environment("HOME")) { - - bool use_godot = ProjectSettings::get_singleton()->get("application/config/use_shared_user_dir"); - if (use_godot) - return get_environment("HOME") + "/.godot/app_userdata/" + an; - else - return get_environment("HOME") + "/." + an; + String appname = get_safe_application_name(); + if (appname != "") { + bool use_godot_dir = ProjectSettings::get_singleton()->get("application/config/use_shared_user_dir"); + if (use_godot_dir) { + return get_data_path().plus_file(get_godot_dir_name()).plus_file("app_userdata").plus_file(appname); + } else { + return get_data_path().plus_file(appname); } } return ProjectSettings::get_singleton()->get_resource_path(); } -String OS_Unix::get_installed_templates_path() const { - String p = get_global_settings_path(); - if (p != "") - return p + "/templates/"; - else - return ""; -} - String OS_Unix::get_executable_path() const { #ifdef __linux__ @@ -554,4 +534,10 @@ void UnixTerminalLogger::log_error(const char *p_function, const char *p_file, i UnixTerminalLogger::~UnixTerminalLogger() {} +OS_Unix::OS_Unix() { + Vector<Logger *> loggers; + loggers.push_back(memnew(UnixTerminalLogger)); + _set_logger(memnew(CompositeLogger(loggers))); +} + #endif diff --git a/drivers/unix/os_unix.h b/drivers/unix/os_unix.h index 82c7dee3b9..5b3fb824f0 100644 --- a/drivers/unix/os_unix.h +++ b/drivers/unix/os_unix.h @@ -53,7 +53,6 @@ protected: virtual int get_audio_driver_count() const; virtual const char *get_audio_driver_name(int p_driver) const; - virtual void initialize_logger(); virtual void initialize_core(); virtual int unix_initialize_audio(int p_audio_driver); //virtual void initialize(int p_video_driver,int p_audio_driver); @@ -62,9 +61,9 @@ protected: String stdin_buf; - String get_global_settings_path() const; - public: + OS_Unix(); + virtual void alert(const String &p_alert, const String &p_title = "ALERT!"); virtual String get_stdin_string(bool p_block); @@ -108,11 +107,8 @@ public: virtual void debug_break(); - virtual String get_installed_templates_path() const; virtual String get_executable_path() const; - virtual String get_data_dir() const; - - //virtual void run( MainLoop * p_main_loop ); + virtual String get_user_data_dir() const; }; class UnixTerminalLogger : public StdLogger { diff --git a/editor/animation_editor.cpp b/editor/animation_editor.cpp index 54eb695178..1d70f8ba55 100644 --- a/editor/animation_editor.cpp +++ b/editor/animation_editor.cpp @@ -966,7 +966,9 @@ void AnimationKeyEditor::_cleanup_animation(Ref<Animation> p_animation) { Object *obj = NULL; RES res; - Node *node = root->get_node_and_resource(p_animation->track_get_path(i), res); + Vector<StringName> leftover_path; + + Node *node = root->get_node_and_resource(p_animation->track_get_path(i), res, leftover_path); if (res.is_valid()) { obj = res.ptr(); @@ -975,7 +977,7 @@ void AnimationKeyEditor::_cleanup_animation(Ref<Animation> p_animation) { } if (obj && p_animation->track_get_type(i) == Animation::TYPE_VALUE) { - valid_type = obj->get_static_property_type(p_animation->track_get_path(i).get_property(), &prop_exists); + valid_type = obj->get_static_property_type_indexed(leftover_path, &prop_exists); } if (!obj && cleanup_tracks->is_pressed()) { @@ -1315,7 +1317,9 @@ void AnimationKeyEditor::_track_editor_draw() { Object *obj = NULL; RES res; - Node *node = root ? root->get_node_and_resource(animation->track_get_path(idx), res) : (Node *)NULL; + Vector<StringName> leftover_path; + + Node *node = root ? root->get_node_and_resource(animation->track_get_path(idx), res, leftover_path) : (Node *)NULL; if (res.is_valid()) { obj = res.ptr(); @@ -1324,7 +1328,8 @@ void AnimationKeyEditor::_track_editor_draw() { } if (obj && animation->track_get_type(idx) == Animation::TYPE_VALUE) { - valid_type = obj->get_static_property_type(animation->track_get_path(idx).get_property(), &prop_exists); + // While leftover_path might be still empty, we wouldn't be able to get here anyway + valid_type = obj->get_static_property_type_indexed(leftover_path, &prop_exists); } if (/*mouse_over.over!=MouseOver::OVER_NONE &&*/ idx == mouse_over.track) { @@ -1368,7 +1373,7 @@ void AnimationKeyEditor::_track_editor_draw() { icon_ofs.x-=hsep; */ - track_ofs[0] = size.width - icon_ofs.x; + track_ofs[0] = size.width - icon_ofs.x + ofs.x; icon_ofs.x -= down_icon->get_width(); te->draw_texture(down_icon, icon_ofs - Size2(0, 4 * EDSCALE)); @@ -1380,7 +1385,7 @@ void AnimationKeyEditor::_track_editor_draw() { icon_ofs.x -= hsep; te->draw_line(Point2(icon_ofs.x, ofs.y + y), Point2(icon_ofs.x, ofs.y + y + h), sepcolor); - track_ofs[1] = size.width - icon_ofs.x; + track_ofs[1] = size.width - icon_ofs.x + ofs.x; icon_ofs.x -= down_icon->get_width(); te->draw_texture(down_icon, icon_ofs - Size2(0, 4 * EDSCALE)); @@ -1394,7 +1399,7 @@ void AnimationKeyEditor::_track_editor_draw() { icon_ofs.x -= hsep; te->draw_line(Point2(icon_ofs.x, ofs.y + y), Point2(icon_ofs.x, ofs.y + y + h), sepcolor); - track_ofs[2] = size.width - icon_ofs.x; + track_ofs[2] = size.width - icon_ofs.x + ofs.x; if (animation->track_get_type(idx) == Animation::TYPE_VALUE) { @@ -1415,13 +1420,12 @@ void AnimationKeyEditor::_track_editor_draw() { icon_ofs.x -= hsep; te->draw_line(Point2(icon_ofs.x, ofs.y + y), Point2(icon_ofs.x, ofs.y + y + h), sepcolor); - track_ofs[3] = size.width - icon_ofs.x; + track_ofs[3] = size.width - icon_ofs.x + ofs.x; icon_ofs.x -= hsep; icon_ofs.x -= add_key_icon->get_width(); te->draw_texture((mouse_over.over == MouseOver::OVER_ADD_KEY && mouse_over.track == idx) ? add_key_icon_hl : add_key_icon, icon_ofs); - - track_ofs[4] = size.width - icon_ofs.x; + track_ofs[4] = size.width - icon_ofs.x + ofs.x; //draw the keys; int tt = animation->track_get_type(idx); @@ -1649,26 +1653,34 @@ PropertyInfo AnimationKeyEditor::_find_hint_for_track(int p_idx, NodePath &r_bas return PropertyInfo(); RES res; - Node *node = root->get_node_and_resource(path, res); + Vector<StringName> leftover_path; + Node *node = root->get_node_and_resource(path, res, leftover_path, true); if (node) { r_base_path = node->get_path(); } - String property = path.get_property(); - if (property == "") + if (leftover_path.empty()) return PropertyInfo(); - List<PropertyInfo> pinfo; + Variant property_info_base; if (res.is_valid()) - res->get_property_list(&pinfo); + property_info_base = res; else if (node) - node->get_property_list(&pinfo); + property_info_base = node; + + for (int i = 0; i < leftover_path.size() - 1; i++) { + property_info_base = property_info_base.get_named(leftover_path[i]); + } + + List<PropertyInfo> pinfo; + property_info_base.get_property_list(&pinfo); for (List<PropertyInfo>::Element *E = pinfo.front(); E; E = E->next()) { - if (E->get().name == property) + if (E->get().name == leftover_path[leftover_path.size() - 1]) { return E->get(); + } } return PropertyInfo(); @@ -2080,7 +2092,7 @@ void AnimationKeyEditor::_track_editor_gui_input(const Ref<InputEvent> &p_input) return; } - if (mpos.x < name_limit) { + if (mpos.x < name_limit - (type_icon[0]->get_width() / 2.0)) { //name column // area @@ -2780,7 +2792,8 @@ void AnimationKeyEditor::_track_editor_gui_input(const Ref<InputEvent> &p_input) Object *obj = NULL; RES res; - Node *node = root->get_node_and_resource(animation->track_get_path(idx), res); + Vector<StringName> leftover_path; + Node *node = root->get_node_and_resource(animation->track_get_path(idx), res, leftover_path); if (res.is_valid()) { obj = res.ptr(); @@ -2789,7 +2802,7 @@ void AnimationKeyEditor::_track_editor_gui_input(const Ref<InputEvent> &p_input) } if (obj) { - valid_type = obj->get_static_property_type(animation->track_get_path(idx).get_property(), &prop_exists); + valid_type = obj->get_static_property_type_indexed(leftover_path, &prop_exists); } text += "type: " + Variant::get_type_name(v.get_type()) + "\n"; @@ -2890,6 +2903,18 @@ void AnimationKeyEditor::_track_editor_gui_input(const Ref<InputEvent> &p_input) } } } + + Ref<InputEventMagnifyGesture> magnify_gesture = p_input; + if (magnify_gesture.is_valid()) { + zoom->set_value(zoom->get_value() * magnify_gesture->get_factor()); + } + + Ref<InputEventPanGesture> pan_gesture = p_input; + if (pan_gesture.is_valid()) { + + h_scroll->set_value(h_scroll->get_value() - h_scroll->get_page() * pan_gesture->get_delta().x / 8); + v_scroll->set_value(v_scroll->get_value() - v_scroll->get_page() * pan_gesture->get_delta().y / 8); + } } void AnimationKeyEditor::_notification(int p_what) { @@ -3330,7 +3355,7 @@ int AnimationKeyEditor::_confirm_insert(InsertData p_id, int p_last_track) { h.type == Variant::VECTOR2 || h.type == Variant::RECT2 || h.type == Variant::VECTOR3 || - h.type == Variant::RECT3 || + h.type == Variant::AABB || h.type == Variant::QUAT || h.type == Variant::COLOR || h.type == Variant::TRANSFORM) { diff --git a/editor/code_editor.cpp b/editor/code_editor.cpp index 0100c221c4..216f2027fb 100644 --- a/editor/code_editor.cpp +++ b/editor/code_editor.cpp @@ -56,6 +56,7 @@ void GotoLineDialog::ok_pressed() { if (get_line() < 1 || get_line() > text_editor->get_line_count()) return; + text_editor->unfold_line(get_line() - 1); text_editor->cursor_set_line(get_line() - 1); hide(); } @@ -139,6 +140,7 @@ bool FindReplaceBar::_search(uint32_t p_flags, int p_from_line, int p_from_col) if (found) { if (!preserve_cursor) { + text_edit->unfold_line(line); text_edit->cursor_set_line(line, false); text_edit->cursor_set_column(col + text.length(), false); text_edit->center_viewport_to_cursor(); @@ -167,6 +169,7 @@ void FindReplaceBar::_replace() { if (result_line != -1 && result_col != -1) { text_edit->begin_complex_operation(); + text_edit->unfold_line(result_line); text_edit->select(result_line, result_col, result_line, result_col + get_search_text().length()); text_edit->insert_text_at_cursor(get_replace_text()); @@ -214,6 +217,7 @@ void FindReplaceBar::_replace_all() { prev_match = Point2i(result_line, result_col + replace_text.length()); + text_edit->unfold_line(result_line); text_edit->select(result_line, result_col, result_line, match_to.y); if (selection_enabled && is_selection_only()) { @@ -751,6 +755,7 @@ bool FindReplaceDialog::_search() { if (found) { // print_line("found"); + text_edit->unfold_line(line); text_edit->cursor_set_line(line); if (is_backwards()) text_edit->cursor_set_column(col); @@ -974,6 +979,23 @@ void CodeTextEditor::_text_editor_gui_input(const Ref<InputEvent> &p_event) { } } + Ref<InputEventMagnifyGesture> magnify_gesture = p_event; + if (magnify_gesture.is_valid()) { + + Ref<DynamicFont> font = text_editor->get_font("font"); + + if (font.is_valid()) { + if (font->get_size() != (int)font_size) { + font_size = font->get_size(); + } + + font_size *= powf(magnify_gesture->get_factor(), 0.25); + + _add_font_size((int)font_size - font->get_size()); + } + return; + } + Ref<InputEventKey> k = p_event; if (k.is_valid()) { @@ -994,14 +1016,15 @@ void CodeTextEditor::_text_editor_gui_input(const Ref<InputEvent> &p_event) { void CodeTextEditor::_zoom_in() { font_resize_val += EDSCALE; - - if (font_resize_timer->get_time_left() == 0) - font_resize_timer->start(); + _zoom_changed(); } void CodeTextEditor::_zoom_out() { font_resize_val -= EDSCALE; + _zoom_changed(); +} +void CodeTextEditor::_zoom_changed() { if (font_resize_timer->get_time_left() == 0) font_resize_timer->start(); } @@ -1062,16 +1085,25 @@ void CodeTextEditor::_complete_request() { void CodeTextEditor::_font_resize_timeout() { + if (_add_font_size(font_resize_val)) { + font_resize_val = 0; + } +} + +bool CodeTextEditor::_add_font_size(int p_delta) { + Ref<DynamicFont> font = text_editor->get_font("font"); if (font.is_valid()) { - int new_size = CLAMP(font->get_size() + font_resize_val, 8 * EDSCALE, 96 * EDSCALE); + int new_size = CLAMP(font->get_size() + p_delta, 8 * EDSCALE, 96 * EDSCALE); if (new_size != font->get_size()) { EditorSettings::get_singleton()->set("interface/editor/source_font_size", new_size / EDSCALE); font->set_size(new_size); } - font_resize_val = 0; + return true; + } else { + return false; } } @@ -1093,6 +1125,8 @@ void CodeTextEditor::update_editor_settings() { text_editor->cursor_set_blink_enabled(EditorSettings::get_singleton()->get("text_editor/cursor/caret_blink")); text_editor->cursor_set_blink_speed(EditorSettings::get_singleton()->get("text_editor/cursor/caret_blink_speed")); text_editor->set_draw_breakpoint_gutter(EditorSettings::get_singleton()->get("text_editor/line_numbers/show_breakpoint_gutter")); + text_editor->set_hiding_enabled(EditorSettings::get_singleton()->get("text_editor/line_numbers/code_folding")); + text_editor->set_draw_fold_gutter(EditorSettings::get_singleton()->get("text_editor/line_numbers/code_folding")); text_editor->cursor_set_block_mode(EditorSettings::get_singleton()->get("text_editor/cursor/block_caret")); text_editor->set_smooth_scroll_enabled(EditorSettings::get_singleton()->get("text_editor/open_scripts/smooth_scrolling")); text_editor->set_v_scroll_speed(EditorSettings::get_singleton()->get("text_editor/open_scripts/v_scroll_speed")); @@ -1278,6 +1312,7 @@ CodeTextEditor::CodeTextEditor() { code_complete_timer->connect("timeout", this, "_code_complete_timer_timeout"); font_resize_val = 0; + font_size = -1; font_resize_timer = memnew(Timer); add_child(font_resize_timer); font_resize_timer->set_one_shot(true); diff --git a/editor/code_editor.h b/editor/code_editor.h index 410dd99878..656ea4b47b 100644 --- a/editor/code_editor.h +++ b/editor/code_editor.h @@ -204,6 +204,7 @@ class CodeTextEditor : public VBoxContainer { Timer *font_resize_timer; int font_resize_val; + real_t font_size; Label *error; @@ -212,10 +213,12 @@ class CodeTextEditor : public VBoxContainer { void _update_font(); void _complete_request(); void _font_resize_timeout(); + bool _add_font_size(int p_delta); void _text_editor_gui_input(const Ref<InputEvent> &p_event); void _zoom_in(); void _zoom_out(); + void _zoom_changed(); void _reset_zoom(); CodeTextEditorCodeCompleteFunc code_complete_func; diff --git a/editor/connections_dialog.cpp b/editor/connections_dialog.cpp index b4c2ac95cc..cd60455f4f 100644 --- a/editor/connections_dialog.cpp +++ b/editor/connections_dialog.cpp @@ -209,7 +209,7 @@ void ConnectDialog::_add_bind() { case Variant::VECTOR3: value = Vector3(); break; case Variant::PLANE: value = Plane(); break; case Variant::QUAT: value = Quat(); break; - case Variant::RECT3: value = Rect3(); break; + case Variant::AABB: value = AABB(); break; case Variant::BASIS: value = Basis(); break; case Variant::TRANSFORM: value = Transform(); break; case Variant::COLOR: value = Color(); break; @@ -295,7 +295,7 @@ ConnectDialog::ConnectDialog() { type_list->add_item("Vector3", Variant::VECTOR3); type_list->add_item("Plane", Variant::PLANE); type_list->add_item("Quat", Variant::QUAT); - type_list->add_item("Rect3", Variant::RECT3); + type_list->add_item("AABB", Variant::AABB); type_list->add_item("Basis", Variant::BASIS); type_list->add_item("Transform", Variant::TRANSFORM); //type_list->add_separator(); diff --git a/editor/create_dialog.cpp b/editor/create_dialog.cpp index 02af304dc6..c058d290bf 100644 --- a/editor/create_dialog.cpp +++ b/editor/create_dialog.cpp @@ -41,7 +41,7 @@ void CreateDialog::popup_create(bool p_dontclear) { recent->clear(); - FileAccess *f = FileAccess::open(EditorSettings::get_singleton()->get_project_settings_path().plus_file("create_recent." + base_type), FileAccess::READ); + FileAccess *f = FileAccess::open(EditorSettings::get_singleton()->get_project_settings_dir().plus_file("create_recent." + base_type), FileAccess::READ); if (f) { @@ -63,7 +63,7 @@ void CreateDialog::popup_create(bool p_dontclear) { favorites->clear(); - f = FileAccess::open(EditorSettings::get_singleton()->get_project_settings_path().plus_file("favorites." + base_type), FileAccess::READ); + f = FileAccess::open(EditorSettings::get_singleton()->get_project_settings_dir().plus_file("favorites." + base_type), FileAccess::READ); favorite_list.clear(); @@ -316,7 +316,7 @@ void CreateDialog::_confirmed() { if (!ti) return; - FileAccess *f = FileAccess::open(EditorSettings::get_singleton()->get_project_settings_path().plus_file("create_recent." + base_type), FileAccess::WRITE); + FileAccess *f = FileAccess::open(EditorSettings::get_singleton()->get_project_settings_dir().plus_file("create_recent." + base_type), FileAccess::WRITE); if (f) { f->store_line(get_selected_type()); @@ -476,7 +476,7 @@ void CreateDialog::_favorite_toggled() { void CreateDialog::_save_favorite_list() { - FileAccess *f = FileAccess::open(EditorSettings::get_singleton()->get_project_settings_path().plus_file("favorites." + base_type), FileAccess::WRITE); + FileAccess *f = FileAccess::open(EditorSettings::get_singleton()->get_project_settings_dir().plus_file("favorites." + base_type), FileAccess::WRITE); if (f) { diff --git a/editor/dependency_editor.cpp b/editor/dependency_editor.cpp index 29e2423e9b..ec0ca3add5 100644 --- a/editor/dependency_editor.cpp +++ b/editor/dependency_editor.cpp @@ -281,6 +281,47 @@ DependencyEditor::DependencyEditor() { } ///////////////////////////////////// +void DependencyEditorOwners::_list_rmb_select(int p_item, const Vector2 &p_pos) { + + file_options->clear(); + file_options->set_size(Size2(1, 1)); + if (p_item >= 0) { + file_options->add_item(TTR("Open"), FILE_OPEN); + } + + file_options->set_position(owners->get_global_position() + p_pos); + file_options->popup(); +} + +void DependencyEditorOwners::_select_file(int p_idx) { + + String fpath = owners->get_item_text(p_idx); + + if (ResourceLoader::get_resource_type(fpath) == "PackedScene") { + editor->open_request(fpath); + hide(); + emit_signal("confirmed"); + } +} + +void DependencyEditorOwners::_file_option(int p_option) { + + switch (p_option) { + case FILE_OPEN: { + int idx = owners->get_current(); + if (idx < 0 || idx >= owners->get_item_count()) + break; + _select_file(idx); + } break; + } +} + +void DependencyEditorOwners::_bind_methods() { + + ClassDB::bind_method(D_METHOD("_list_rmb_select"), &DependencyEditorOwners::_list_rmb_select); + ClassDB::bind_method(D_METHOD("_file_option"), &DependencyEditorOwners::_file_option); + ClassDB::bind_method(D_METHOD("_select_file"), &DependencyEditorOwners::_select_file); +} void DependencyEditorOwners::_fill_owners(EditorFileSystemDirectory *efsd) { @@ -329,9 +370,19 @@ void DependencyEditorOwners::show(const String &p_path) { set_title(TTR("Owners Of:") + " " + p_path.get_file()); } -DependencyEditorOwners::DependencyEditorOwners() { +DependencyEditorOwners::DependencyEditorOwners(EditorNode *p_editor) { + + editor = p_editor; + + file_options = memnew(PopupMenu); + add_child(file_options); + file_options->connect("id_pressed", this, "_file_option"); owners = memnew(ItemList); + owners->set_select_mode(ItemList::SELECT_SINGLE); + owners->connect("item_rmb_selected", this, "_list_rmb_select"); + owners->connect("item_activated", this, "_select_file"); + owners->set_allow_rmb_select(true); add_child(owners); } diff --git a/editor/dependency_editor.h b/editor/dependency_editor.h index c7e9baa5c2..9b0aca67d5 100644 --- a/editor/dependency_editor.h +++ b/editor/dependency_editor.h @@ -36,6 +36,7 @@ #include "scene/gui/tree.h" class EditorFileSystemDirectory; +class EditorNode; class DependencyEditor : public AcceptDialog { GDCLASS(DependencyEditor, AcceptDialog); @@ -71,12 +72,25 @@ class DependencyEditorOwners : public AcceptDialog { GDCLASS(DependencyEditorOwners, AcceptDialog); ItemList *owners; + PopupMenu *file_options; + EditorNode *editor; String editing; + void _fill_owners(EditorFileSystemDirectory *efsd); + static void _bind_methods(); + void _list_rmb_select(int p_item, const Vector2 &p_pos); + void _select_file(int p_idx); + void _file_option(int p_option); + +private: + enum FileMenu { + FILE_OPEN + }; + public: void show(const String &p_path); - DependencyEditorOwners(); + DependencyEditorOwners(EditorNode *p_editor); }; class DependencyRemoveDialog : public ConfirmationDialog { diff --git a/editor/dictionary_property_edit.cpp b/editor/dictionary_property_edit.cpp new file mode 100644 index 0000000000..5b5a7ec9b0 --- /dev/null +++ b/editor/dictionary_property_edit.cpp @@ -0,0 +1,189 @@ +/*************************************************************************/ +/* dictionary_property_edit.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 "dictionary_property_edit.h" +#include "editor_node.h" + +void DictionaryPropertyEdit::_notif_change() { + _change_notify(); +} + +void DictionaryPropertyEdit::_notif_changev(const String &p_v) { + _change_notify(p_v.utf8().get_data()); +} + +void DictionaryPropertyEdit::_set_key(const Variant &p_old_key, const Variant &p_new_key) { + + // TODO: Set key of a dictionary is not allowd yet + return; +} + +void DictionaryPropertyEdit::_set_value(const Variant &p_key, const Variant &p_value) { + + Dictionary dict = get_dictionary(); + dict[p_key] = p_value; + Object *o = ObjectDB::get_instance(obj); + if (!o) + return; + + o->set(property, dict); +} + +Variant DictionaryPropertyEdit::get_dictionary() const { + + Object *o = ObjectDB::get_instance(obj); + if (!o) + return Dictionary(); + Variant dict = o->get(property); + if (dict.get_type() != Variant::DICTIONARY) + return Dictionary(); + return dict; +} + +void DictionaryPropertyEdit::_get_property_list(List<PropertyInfo> *p_list) const { + + Dictionary dict = get_dictionary(); + + Array keys = dict.keys(); + keys.sort(); + + for (int i = 0; i < keys.size(); i++) { + String index = itos(i); + + const Variant &key = keys[i]; + PropertyInfo pi(key.get_type(), index + ": key"); + p_list->push_back(pi); + + const Variant &value = dict[key]; + pi = PropertyInfo(value.get_type(), index + ": value"); + p_list->push_back(pi); + } +} + +void DictionaryPropertyEdit::edit(Object *p_obj, const StringName &p_prop) { + + property = p_prop; + obj = p_obj->get_instance_id(); +} + +Node *DictionaryPropertyEdit::get_node() { + + Object *o = ObjectDB::get_instance(obj); + if (!o) + return NULL; + + return cast_to<Node>(o); +} + +void DictionaryPropertyEdit::_bind_methods() { + + ClassDB::bind_method(D_METHOD("_set_key"), &DictionaryPropertyEdit::_set_key); + ClassDB::bind_method(D_METHOD("_set_value"), &DictionaryPropertyEdit::_set_value); + ClassDB::bind_method(D_METHOD("_notif_change"), &DictionaryPropertyEdit::_notif_change); + ClassDB::bind_method(D_METHOD("_notif_changev"), &DictionaryPropertyEdit::_notif_changev); +} + +bool DictionaryPropertyEdit::_set(const StringName &p_name, const Variant &p_value) { + + Dictionary dict = get_dictionary(); + Array keys = dict.keys(); + keys.sort(); + + String pn = p_name; + int slash = pn.find(": "); + if (slash != -1 && pn.length() > slash) { + String type = pn.substr(slash + 2, pn.length()); + int index = pn.substr(0, slash).to_int(); + if (type == "key" && index < keys.size()) { + + const Variant &key = keys[index]; + UndoRedo *ur = EditorNode::get_singleton()->get_undo_redo(); + + ur->create_action(TTR("Change Dictionary Key")); + ur->add_do_method(this, "_set_key", key, p_value); + ur->add_undo_method(this, "_set_key", p_value, key); + ur->add_do_method(this, "_notif_changev", p_name); + ur->add_undo_method(this, "_notif_changev", p_name); + ur->commit_action(); + + return true; + } else if (type == "value" && index < keys.size()) { + const Variant &key = keys[index]; + if (dict.has(key)) { + + Variant value = dict[key]; + UndoRedo *ur = EditorNode::get_singleton()->get_undo_redo(); + + ur->create_action(TTR("Change Dictionary Value")); + ur->add_do_method(this, "_set_value", key, p_value); + ur->add_undo_method(this, "_set_value", key, value); + ur->add_do_method(this, "_notif_changev", p_name); + ur->add_undo_method(this, "_notif_changev", p_name); + ur->commit_action(); + + return true; + } + } + } + + return false; +} + +bool DictionaryPropertyEdit::_get(const StringName &p_name, Variant &r_ret) const { + + Dictionary dict = get_dictionary(); + Array keys = dict.keys(); + keys.sort(); + + String pn = p_name; + int slash = pn.find(": "); + + if (slash != -1 && pn.length() > slash) { + + String type = pn.substr(slash + 2, pn.length()); + int index = pn.substr(0, slash).to_int(); + + if (type == "key" && index < keys.size()) { + r_ret = keys[index]; + return true; + } else if (type == "value" && index < keys.size()) { + const Variant &key = keys[index]; + if (dict.has(key)) { + r_ret = dict[key]; + return true; + } + } + } + + return false; +} + +DictionaryPropertyEdit::DictionaryPropertyEdit() { + obj = 0; +} diff --git a/editor/dictionary_property_edit.h b/editor/dictionary_property_edit.h new file mode 100644 index 0000000000..7a86727fb2 --- /dev/null +++ b/editor/dictionary_property_edit.h @@ -0,0 +1,62 @@ +/*************************************************************************/ +/* dictionary_property_edit.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 DICTIONARY_PROPERTY_EDIT_H +#define DICTIONARY_PROPERTY_EDIT_H + +#include "scene/main/node.h" + +class DictionaryPropertyEdit : public Reference { + GDCLASS(DictionaryPropertyEdit, Reference); + + ObjectID obj; + StringName property; + + void _notif_change(); + void _notif_changev(const String &p_v); + void _set_key(const Variant &p_old_key, const Variant &p_new_key); + void _set_value(const Variant &p_key, const Variant &p_value); + + Variant get_dictionary() const; + +protected: + static void _bind_methods(); + 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; + +public: + void edit(Object *p_obj, const StringName &p_prop); + + Node *get_node(); + + DictionaryPropertyEdit(); +}; + +#endif // DICTIONARY_PROPERTY_EDIT_H diff --git a/editor/doc/doc_data.cpp b/editor/doc/doc_data.cpp index f7f823c945..1f9884aa70 100644 --- a/editor/doc/doc_data.cpp +++ b/editor/doc/doc_data.cpp @@ -951,7 +951,7 @@ Error DocData::save_classes(const String &p_default_path, const Map<String, Stri if (c.category == "") category = "Core"; header += " category=\"" + category + "\""; - header += String(" version=\"") + _MKSTR(VERSION_MAJOR) + "." + _MKSTR(VERSION_MINOR) + "-" + _MKSTR(VERSION_STATUS) + "\""; + header += String(" version=\"") + itos(VERSION_MAJOR) + "." + itos(VERSION_MINOR) + "-" + VERSION_STATUS + "\""; header += ">"; _write_string(f, 0, header); _write_string(f, 1, "<brief_description>"); diff --git a/editor/doc/doc_dump.cpp b/editor/doc/doc_dump.cpp index 13dbb149d5..9dd05d9d0f 100644 --- a/editor/doc/doc_dump.cpp +++ b/editor/doc/doc_dump.cpp @@ -82,7 +82,7 @@ void DocDump::dump(const String &p_file) { FileAccess *f = FileAccess::open(p_file, FileAccess::WRITE); _write_string(f, 0, "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>"); - _write_string(f, 0, String("<doc version=\"") + _MKSTR(VERSION_MAJOR) + "." + _MKSTR(VERSION_MINOR) + "-" + _MKSTR(VERSION_STATUS) + "\" name=\"Engine Types\">"); + _write_string(f, 0, String("<doc version=\"") + itos(VERSION_MAJOR) + "." + itos(VERSION_MINOR) + "-" + VERSION_STATUS + "\" name=\"Engine Types\">"); while (class_list.size()) { @@ -182,7 +182,7 @@ void DocDump::dump(const String &p_file) { case Variant::VECTOR3: case Variant::PLANE: case Variant::QUAT: - case Variant::RECT3: + case Variant::AABB: case Variant::BASIS: case Variant::COLOR: case Variant::POOL_BYTE_ARRAY: diff --git a/editor/editor_data.cpp b/editor/editor_data.cpp index 2cb5340b8b..443004f820 100644 --- a/editor/editor_data.cpp +++ b/editor/editor_data.cpp @@ -913,8 +913,8 @@ void EditorSelection::update() { if (!changed) return; - emit_signal("selection_changed"); changed = false; + emit_signal("selection_changed"); } List<Node *> &EditorSelection::get_selected_node_list() { diff --git a/editor/editor_export.cpp b/editor/editor_export.cpp index a458a10cd2..8c8d9c4c79 100644 --- a/editor/editor_export.cpp +++ b/editor/editor_export.cpp @@ -336,33 +336,18 @@ Error EditorExportPlatform::_save_zip_file(void *p_userdata, const String &p_pat String EditorExportPlatform::find_export_template(String template_file_name, String *err) const { - String base_name = itos(VERSION_MAJOR) + "." + itos(VERSION_MINOR) + "-" + _MKSTR(VERSION_STATUS) + "/" + template_file_name; - String user_file = EditorSettings::get_singleton()->get_settings_path() + "/templates/" + base_name; - String system_file = OS::get_singleton()->get_installed_templates_path(); - bool has_system_path = (system_file != ""); - system_file = system_file.plus_file(base_name); - - // Prefer user file - if (FileAccess::exists(user_file)) { - return user_file; - } + String current_version = itos(VERSION_MAJOR) + "." + itos(VERSION_MINOR) + "-" + VERSION_STATUS + VERSION_MODULE_CONFIG; + String template_path = EditorSettings::get_singleton()->get_templates_dir().plus_file(current_version).plus_file(template_file_name); - // Now check system file - if (has_system_path) { - if (FileAccess::exists(system_file)) { - return system_file; - } + if (FileAccess::exists(template_path)) { + return template_path; } // Not found if (err) { - *err += "No export template found at \"" + user_file + "\""; - if (has_system_path) - *err += "\n or \"" + system_file + "\"."; - else - *err += "."; + *err += "No export template found at \"" + template_path + "\"."; } - return String(); // not found + return String(); } bool EditorExportPlatform::exists_export_template(String template_file_name, String *err) const { @@ -485,9 +470,52 @@ void EditorExportPlugin::add_file(const String &p_path, const Vector<uint8_t> &p extra_files.push_back(ef); } -void EditorExportPlugin::add_shared_object(const String &p_path) { +void EditorExportPlugin::add_shared_object(const String &p_path, const Vector<String> &tags) { + + shared_objects.push_back(SharedObject(p_path, tags)); +} + +void EditorExportPlugin::add_ios_framework(const String &p_path) { + ios_frameworks.push_back(p_path); +} + +Vector<String> EditorExportPlugin::get_ios_frameworks() const { + return ios_frameworks; +} + +void EditorExportPlugin::add_ios_plist_content(const String &p_plist_content) { + ios_plist_content += p_plist_content + "\n"; +} + +String EditorExportPlugin::get_ios_plist_content() const { + return ios_plist_content; +} + +void EditorExportPlugin::add_ios_linker_flags(const String &p_flags) { + if (ios_linker_flags.length() > 0) { + ios_linker_flags += ' '; + } + ios_linker_flags += p_flags; +} + +String EditorExportPlugin::get_ios_linker_flags() const { + return ios_linker_flags; +} - shared_objects.push_back(p_path); +void EditorExportPlugin::add_ios_bundle_file(const String &p_path) { + ios_bundle_files.push_back(p_path); +} + +Vector<String> EditorExportPlugin::get_ios_bundle_files() const { + return ios_bundle_files; +} + +void EditorExportPlugin::add_ios_cpp_code(const String &p_code) { + ios_cpp_code += p_code; +} + +String EditorExportPlugin::get_ios_cpp_code() const { + return ios_cpp_code; } void EditorExportPlugin::_export_file_script(const String &p_path, const String &p_type, const PoolVector<String> &p_features) { @@ -497,17 +525,17 @@ void EditorExportPlugin::_export_file_script(const String &p_path, const String } } -void EditorExportPlugin::_export_begin_script(const PoolVector<String> &p_features) { +void EditorExportPlugin::_export_begin_script(const PoolVector<String> &p_features, bool p_debug, const String &p_path, int p_flags) { if (get_script_instance()) { - get_script_instance()->call("_export_begin", p_features); + get_script_instance()->call("_export_begin", p_features, p_debug, p_path, p_flags); } } void EditorExportPlugin::_export_file(const String &p_path, const String &p_type, const Set<String> &p_features) { } -void EditorExportPlugin::_export_begin(const Set<String> &p_features) { +void EditorExportPlugin::_export_begin(const Set<String> &p_features, bool p_debug, const String &p_path, int p_flags) { } void EditorExportPlugin::skip() { @@ -517,33 +545,58 @@ void EditorExportPlugin::skip() { void EditorExportPlugin::_bind_methods() { - ClassDB::bind_method(D_METHOD("add_shared_object", "path"), &EditorExportPlugin::add_shared_object); + ClassDB::bind_method(D_METHOD("add_shared_object", "path", "tags"), &EditorExportPlugin::add_shared_object); ClassDB::bind_method(D_METHOD("add_file", "path", "file", "remap"), &EditorExportPlugin::add_file); + ClassDB::bind_method(D_METHOD("add_ios_framework", "path"), &EditorExportPlugin::add_ios_framework); + ClassDB::bind_method(D_METHOD("add_ios_plist_content", "plist_content"), &EditorExportPlugin::add_ios_plist_content); + ClassDB::bind_method(D_METHOD("add_ios_linker_flags", "flags"), &EditorExportPlugin::add_ios_linker_flags); + ClassDB::bind_method(D_METHOD("add_ios_bundle_file", "path"), &EditorExportPlugin::add_ios_bundle_file); + ClassDB::bind_method(D_METHOD("add_ios_cpp_code", "code"), &EditorExportPlugin::add_ios_cpp_code); ClassDB::bind_method(D_METHOD("skip"), &EditorExportPlugin::skip); BIND_VMETHOD(MethodInfo("_export_file", PropertyInfo(Variant::STRING, "path"), PropertyInfo(Variant::STRING, "type"), PropertyInfo(Variant::POOL_STRING_ARRAY, "features"))); - BIND_VMETHOD(MethodInfo("_export_begin", PropertyInfo(Variant::POOL_STRING_ARRAY, "features"))); + BIND_VMETHOD(MethodInfo("_export_begin", PropertyInfo(Variant::POOL_STRING_ARRAY, "features"), PropertyInfo(Variant::BOOL, "is_debug"), PropertyInfo(Variant::STRING, "path"), PropertyInfo(Variant::INT, "flags"))); } EditorExportPlugin::EditorExportPlugin() { skipped = false; } -Error EditorExportPlatform::export_project_files(const Ref<EditorExportPreset> &p_preset, EditorExportSaveFunction p_func, void *p_udata, EditorExportSaveSharedObject p_so_func) { - +EditorExportPlatform::FeatureContainers EditorExportPlatform::get_feature_containers(const Ref<EditorExportPreset> &p_preset) { Ref<EditorExportPlatform> platform = p_preset->get_platform(); List<String> feature_list; + platform->get_platform_features(&feature_list); platform->get_preset_features(p_preset, &feature_list); - //figure out features - Set<String> features; - PoolVector<String> features_pv; + + FeatureContainers result; for (List<String>::Element *E = feature_list.front(); E; E = E->next()) { - features.insert(E->get()); - features_pv.push_back(E->get()); + result.features.insert(E->get()); + result.features_pv.push_back(E->get()); } + return result; +} +EditorExportPlatform::ExportNotifier::ExportNotifier(EditorExportPlatform &p_platform, const Ref<EditorExportPreset> &p_preset, bool p_debug, const String &p_path, int p_flags) { + FeatureContainers features = p_platform.get_feature_containers(p_preset); Vector<Ref<EditorExportPlugin> > export_plugins = EditorExport::get_singleton()->get_export_plugins(); + //initial export plugin callback + for (int i = 0; i < export_plugins.size(); i++) { + if (export_plugins[i]->get_script_instance()) { //script based + export_plugins[i]->_export_begin_script(features.features_pv, p_debug, p_path, p_flags); + } else { + export_plugins[i]->_export_begin(features.features, p_debug, p_path, p_flags); + } + } +} + +EditorExportPlatform::ExportNotifier::~ExportNotifier() { + Vector<Ref<EditorExportPlugin> > export_plugins = EditorExport::get_singleton()->get_export_plugins(); + for (int i = 0; i < export_plugins.size(); i++) { + export_plugins[i]->_export_end(); + } +} +Error EditorExportPlatform::export_project_files(const Ref<EditorExportPreset> &p_preset, EditorExportSaveFunction p_func, void *p_udata, EditorExportSaveSharedObject p_so_func) { //figure out paths of files that will be exported Set<String> paths; Vector<String> path_remaps; @@ -566,13 +619,8 @@ Error EditorExportPlatform::export_project_files(const Ref<EditorExportPreset> & _edit_filter_list(paths, p_preset->get_include_filter(), false); _edit_filter_list(paths, p_preset->get_exclude_filter(), true); - //initial export plugin callback + Vector<Ref<EditorExportPlugin> > export_plugins = EditorExport::get_singleton()->get_export_plugins(); for (int i = 0; i < export_plugins.size(); i++) { - if (export_plugins[i]->get_script_instance()) { //script based - export_plugins[i]->_export_begin_script(features_pv); - } else { - export_plugins[i]->_export_begin(features); - } if (p_so_func) { for (int j = 0; j < export_plugins[i]->shared_objects.size(); j++) { p_so_func(p_udata, export_plugins[i]->shared_objects[j]); @@ -585,6 +633,10 @@ Error EditorExportPlatform::export_project_files(const Ref<EditorExportPreset> & export_plugins[i]->_clear(); } + FeatureContainers feature_containers = get_feature_containers(p_preset); + Set<String> &features = feature_containers.features; + PoolVector<String> &features_pv = feature_containers.features_pv; + //store everything in the export medium int idx = 0; int total = paths.size(); @@ -692,7 +744,7 @@ Error EditorExportPlatform::export_project_files(const Ref<EditorExportPreset> & } String config_file = "project.binary"; - String engine_cfb = EditorSettings::get_singleton()->get_settings_path() + "/tmp/tmp" + config_file; + String engine_cfb = EditorSettings::get_singleton()->get_cache_dir().plus_file("tmp" + config_file); ProjectSettings::get_singleton()->save_custom(engine_cfb, custom_map, custom_list); Vector<uint8_t> data = FileAccess::get_file_as_array(engine_cfb); @@ -701,19 +753,29 @@ Error EditorExportPlatform::export_project_files(const Ref<EditorExportPreset> & return OK; } -Error EditorExportPlatform::save_pack(const Ref<EditorExportPreset> &p_preset, const String &p_path) { +Error EditorExportPlatform::_add_shared_object(void *p_userdata, const SharedObject &p_so) { + PackData *pack_data = (PackData *)p_userdata; + if (pack_data->so_files) { + pack_data->so_files->push_back(p_so); + } + + return OK; +} + +Error EditorExportPlatform::save_pack(const Ref<EditorExportPreset> &p_preset, const String &p_path, Vector<SharedObject> *p_so_files) { EditorProgress ep("savepack", TTR("Packing"), 102); - String tmppath = EditorSettings::get_singleton()->get_settings_path() + "/tmp/packtmp"; + String tmppath = EditorSettings::get_singleton()->get_cache_dir().plus_file("packtmp"); FileAccess *ftmp = FileAccess::open(tmppath, FileAccess::WRITE); ERR_FAIL_COND_V(!ftmp, ERR_CANT_CREATE) PackData pd; pd.ep = &ep; pd.f = ftmp; + pd.so_files = p_so_files; - Error err = export_project_files(p_preset, _save_pack_file, &pd); + Error err = export_project_files(p_preset, _save_pack_file, &pd, _add_shared_object); memdelete(ftmp); //close tmp file @@ -1218,6 +1280,7 @@ String EditorExportPlatformPC::get_binary_extension() const { } Error EditorExportPlatformPC::export_project(const Ref<EditorExportPreset> &p_preset, bool p_debug, const String &p_path, int p_flags) { + ExportNotifier notifier(*this, p_preset, p_debug, p_path, p_flags); String custom_debug = p_preset->get("custom_template/debug"); String custom_release = p_preset->get("custom_template/release"); diff --git a/editor/editor_export.h b/editor/editor_export.h index 50379b9683..346c3b58e1 100644 --- a/editor/editor_export.h +++ b/editor/editor_export.h @@ -118,13 +118,24 @@ public: EditorExportPreset(); }; +struct SharedObject { + String path; + Vector<String> tags; + + SharedObject(const String &p_path, const Vector<String> &p_tags) + : path(p_path), tags(p_tags) { + } + + SharedObject() {} +}; + class EditorExportPlatform : public Reference { GDCLASS(EditorExportPlatform, Reference) public: typedef Error (*EditorExportSaveFunction)(void *p_userdata, const String &p_path, const Vector<uint8_t> &p_data, int p_file, int p_total); - typedef Error (*EditorExportSaveSharedObject)(void *p_userdata, const String &p_path); + typedef Error (*EditorExportSaveSharedObject)(void *p_userdata, const SharedObject &p_so); private: struct SavedData { @@ -144,6 +155,7 @@ private: FileAccess *f; Vector<SavedData> file_ofs; EditorProgress *ep; + Vector<SharedObject> *so_files; }; struct ZipData { @@ -152,6 +164,11 @@ private: EditorProgress *ep; }; + struct FeatureContainers { + Set<String> features; + PoolVector<String> features_pv; + }; + void _export_find_resources(EditorFileSystemDirectory *p_dir, Set<String> &p_paths); void _export_find_dependencies(const String &p_path, Set<String> &p_paths); @@ -162,7 +179,16 @@ private: void _edit_files_with_filter(DirAccess *da, const Vector<String> &p_filters, Set<String> &r_list, bool exclude); void _edit_filter_list(Set<String> &r_list, const String &p_filter, bool exclude); + static Error _add_shared_object(void *p_userdata, const SharedObject &p_so); + protected: + struct ExportNotifier { + ExportNotifier(EditorExportPlatform &p_platform, const Ref<EditorExportPreset> &p_preset, bool p_debug, const String &p_path, int p_flags); + ~ExportNotifier(); + }; + + FeatureContainers get_feature_containers(const Ref<EditorExportPreset> &p_preset); + bool exists_export_template(String template_file_name, String *err) const; String find_export_template(String template_file_name, String *err = NULL) const; void gen_export_flags(Vector<String> &r_flags, int p_flags); @@ -192,7 +218,7 @@ public: Error export_project_files(const Ref<EditorExportPreset> &p_preset, EditorExportSaveFunction p_func, void *p_udata, EditorExportSaveSharedObject p_so_func = NULL); - Error save_pack(const Ref<EditorExportPreset> &p_preset, const String &p_path); + Error save_pack(const Ref<EditorExportPreset> &p_preset, const String &p_path, Vector<SharedObject> *p_so_files = NULL); Error save_zip(const Ref<EditorExportPreset> &p_preset, const String &p_path); virtual bool poll_devices() { return false; } @@ -225,7 +251,7 @@ class EditorExportPlugin : public Reference { friend class EditorExportPlatform; - Vector<String> shared_objects; + Vector<SharedObject> shared_objects; struct ExtraFile { String path; Vector<uint8_t> data; @@ -234,26 +260,53 @@ class EditorExportPlugin : public Reference { Vector<ExtraFile> extra_files; bool skipped; + Vector<String> ios_frameworks; + String ios_plist_content; + String ios_linker_flags; + Vector<String> ios_bundle_files; + String ios_cpp_code; + _FORCE_INLINE_ void _clear() { shared_objects.clear(); extra_files.clear(); skipped = false; } + _FORCE_INLINE_ void _export_end() { + ios_frameworks.clear(); + ios_bundle_files.clear(); + ios_plist_content = ""; + ios_linker_flags = ""; + ios_cpp_code = ""; + } + void _export_file_script(const String &p_path, const String &p_type, const PoolVector<String> &p_features); - void _export_begin_script(const PoolVector<String> &p_features); + void _export_begin_script(const PoolVector<String> &p_features, bool p_debug, const String &p_path, int p_flags); protected: void add_file(const String &p_path, const Vector<uint8_t> &p_file, bool p_remap); - void add_shared_object(const String &p_path); + void add_shared_object(const String &p_path, const Vector<String> &tags); + + void add_ios_framework(const String &p_path); + void add_ios_plist_content(const String &p_plist_content); + void add_ios_linker_flags(const String &p_flags); + void add_ios_bundle_file(const String &p_path); + void add_ios_cpp_code(const String &p_code); + void skip(); virtual void _export_file(const String &p_path, const String &p_type, const Set<String> &p_features); - virtual void _export_begin(const Set<String> &p_features); + virtual void _export_begin(const Set<String> &p_features, bool p_debug, const String &p_path, int p_flags); static void _bind_methods(); public: + Vector<String> get_ios_frameworks() const; + String get_ios_plist_content() const; + String get_ios_linker_flags() const; + Vector<String> get_ios_bundle_files() const; + String get_ios_cpp_code() const; + EditorExportPlugin(); }; diff --git a/editor/editor_file_dialog.cpp b/editor/editor_file_dialog.cpp index a0ca9b88e0..f8b9425a4e 100644 --- a/editor/editor_file_dialog.cpp +++ b/editor/editor_file_dialog.cpp @@ -541,6 +541,9 @@ void EditorFileDialog::update_file_list() { while ((item = dir_access->get_next(&isdir)) != "") { + if (item == ".") + continue; + ishidden = dir_access->current_is_hidden(); if (show_hidden || !ishidden) { @@ -562,7 +565,7 @@ void EditorFileDialog::update_file_list() { while (!dirs.empty()) { const String &dir_name = dirs.front()->get(); - item_list->add_item(dir_name + "/"); + item_list->add_item(dir_name); if (display_mode == DISPLAY_THUMBNAILS) { diff --git a/editor/editor_file_system.cpp b/editor/editor_file_system.cpp index 9db3bcba00..8d5bad3346 100644 --- a/editor/editor_file_system.cpp +++ b/editor/editor_file_system.cpp @@ -188,7 +188,7 @@ void EditorFileSystem::_scan_filesystem() { String project = ProjectSettings::get_singleton()->get_resource_path(); - String fscache = EditorSettings::get_singleton()->get_project_settings_path().plus_file("filesystem_cache3"); + String fscache = EditorSettings::get_singleton()->get_project_settings_dir().plus_file("filesystem_cache3"); FileAccess *f = FileAccess::open(fscache, FileAccess::READ); if (f) { @@ -238,7 +238,7 @@ void EditorFileSystem::_scan_filesystem() { memdelete(f); } - String update_cache = EditorSettings::get_singleton()->get_project_settings_path().plus_file("filesystem_update3"); + String update_cache = EditorSettings::get_singleton()->get_project_settings_dir().plus_file("filesystem_update3"); if (FileAccess::exists(update_cache)) { { @@ -282,7 +282,7 @@ void EditorFileSystem::_scan_filesystem() { } void EditorFileSystem::_save_filesystem_cache() { - String fscache = EditorSettings::get_singleton()->get_project_settings_path().plus_file("filesystem_cache3"); + String fscache = EditorSettings::get_singleton()->get_project_settings_dir().plus_file("filesystem_cache3"); FileAccess *f = FileAccess::open(fscache, FileAccess::WRITE); _save_filesystem_cache(filesystem, f); @@ -1180,7 +1180,7 @@ EditorFileSystemDirectory *EditorFileSystem::get_filesystem_path(const String &p void EditorFileSystem::_save_late_updated_files() { //files that already existed, and were modified, need re-scanning for dependencies upon project restart. This is done via saving this special file - String fscache = EditorSettings::get_singleton()->get_project_settings_path().plus_file("filesystem_update3"); + String fscache = EditorSettings::get_singleton()->get_project_settings_dir().plus_file("filesystem_update3"); FileAccessRef f = FileAccess::open(fscache, FileAccess::WRITE); for (Set<String>::Element *E = late_update_files.front(); E; E = E->next()) { f->store_line(E->get()); diff --git a/editor/editor_help.cpp b/editor/editor_help.cpp index cc7f1cac43..4b372e7afd 100644 --- a/editor/editor_help.cpp +++ b/editor/editor_help.cpp @@ -564,18 +564,37 @@ void EditorHelp::_class_desc_select(const String &p_select) { emit_signal("go_to_help", "class_name:" + p_select.substr(1, p_select.length())); return; } else if (p_select.begins_with("@")) { + String tag = p_select.substr(1, 6); + String link = p_select.substr(7, p_select.length()); + + String topic; + Map<String, int> *table = NULL; + + if (tag == "method") { + topic = "class_method"; + table = &this->method_line; + } else if (tag == "member") { + topic = "class_property"; + table = &this->property_line; + } else if (tag == "enum ") { + topic = "class_enum"; + table = &this->enum_line; + } else if (tag == "signal") { + topic = "class_signal"; + table = &this->signal_line; + } else { + return; + } - String m = p_select.substr(1, p_select.length()); - - if (m.find(".") != -1) { + if (link.find(".") != -1) { //must go somewhere else - emit_signal("go_to_help", "class_method:" + m.get_slice(".", 0) + ":" + m.get_slice(".", 0)); + emit_signal("go_to_help", topic + ":" + link.get_slice(".", 0) + ":" + link.get_slice(".", 1)); } else { - if (!method_line.has(m)) + if (!table->has(link)) return; - class_desc->scroll_to_line(method_line[m]); + class_desc->scroll_to_line((*table)[link]); } } else if (p_select.begins_with("http")) { OS::get_singleton()->shell_open(p_select); @@ -808,7 +827,7 @@ Error EditorHelp::_goto_desc(const String &p_class, int p_vscr) { } class_desc->push_cell(); if (describe) { - class_desc->push_meta("@" + cd.properties[i].name); + class_desc->push_meta("@member" + cd.properties[i].name); } class_desc->push_font(doc_code_font); @@ -881,7 +900,7 @@ Error EditorHelp::_goto_desc(const String &p_class, int p_vscr) { if (methods[i].description != "") { method_descr = true; - class_desc->push_meta("@" + methods[i].name); + class_desc->push_meta("@method" + methods[i].name); } class_desc->push_color(headline_color); _add_text(methods[i].name); @@ -1240,7 +1259,7 @@ Error EditorHelp::_goto_desc(const String &p_class, int p_vscr) { for (int i = 0; i < cd.properties.size(); i++) { - method_line[cd.properties[i].name] = class_desc->get_line_count() - 2; + property_line[cd.properties[i].name] = class_desc->get_line_count() - 2; class_desc->push_table(2); class_desc->set_table_column_expand(1, 1); @@ -1452,7 +1471,6 @@ void EditorHelp::_help_callback(const String &p_topic) { line = property_line[name]; } else if (what == "class_enum") { - print_line("go to enum:"); if (enum_line.has(name)) line = enum_line[name]; } else if (what == "class_theme_item") { @@ -1535,12 +1553,13 @@ static void _add_text_to_rt(const String &p_bbcode, RichTextLabel *p_rt) { p_rt->add_text("["); pos = brk_pos + 1; - } else if (tag.begins_with("method ")) { + } else if (tag.begins_with("method ") || tag.begins_with("member ") || tag.begins_with("signal ") || tag.begins_with("enum ")) { - String m = tag.substr(7, tag.length()); + String link_target = tag.substr(tag.find(" ") + 1, tag.length()); + String link_tag = tag.substr(0, tag.find(" ")).rpad(6); p_rt->push_color(link_color); - p_rt->push_meta("@" + m); - p_rt->add_text(m + "()"); + p_rt->push_meta("@" + link_tag + link_target); + p_rt->add_text(link_target + (tag.begins_with("method ") ? "()" : "")); p_rt->pop(); p_rt->pop(); pos = brk_end + 1; diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index b3a8490fe9..a32ade3b71 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -141,13 +141,33 @@ void EditorNode::_update_scene_tabs() { } scene_tabs->set_current_tab(editor_data.get_edited_scene()); - scene_tabs->ensure_tab_visible(editor_data.get_edited_scene()); + + int current = editor_data.get_edited_scene(); + if (scene_tabs->get_offset_buttons_visible()) { + // move add button to fixed position on the tabbar + if (scene_tab_add->get_parent() == scene_tabs) { + scene_tab_add->set_position(Point2(0, 0)); + scene_tabs->remove_child(scene_tab_add); + tabbar_container->add_child(scene_tab_add); + tabbar_container->move_child(scene_tab_add, 1); + } + } else { + // move add button to after last tab + if (scene_tab_add->get_parent() == tabbar_container) { + tabbar_container->remove_child(scene_tab_add); + scene_tabs->add_child(scene_tab_add); + } + Rect2 last_tab = Rect2(); + if (scene_tabs->get_tab_count() != 0) + last_tab = scene_tabs->get_tab_rect(scene_tabs->get_tab_count() - 1); + scene_tab_add->set_position(Point2(last_tab.get_position().x + last_tab.get_size().x + 3, last_tab.get_position().y)); + } } void EditorNode::_update_title() { String appname = ProjectSettings::get_singleton()->get("application/config/name"); - String title = appname.empty() ? String(VERSION_FULL_NAME) : String(_MKSTR(VERSION_NAME) + String(" - ") + appname); + String title = appname.empty() ? String(VERSION_FULL_NAME) : String(VERSION_NAME + String(" - ") + appname); String edited = editor_data.get_edited_scene_root() ? editor_data.get_edited_scene_root()->get_filename() : String(); if (!edited.empty()) title += " - " + String(edited.get_file()); @@ -283,8 +303,7 @@ void EditorNode::_notification(int p_what) { if (p_what == EditorSettings::NOTIFICATION_EDITOR_SETTINGS_CHANGED) { scene_tabs->set_tab_close_display_policy((bool(EDITOR_DEF("interface/editor/always_show_close_button_in_scene_tabs", false)) ? Tabs::CLOSE_BUTTON_SHOW_ALWAYS : Tabs::CLOSE_BUTTON_SHOW_ACTIVE_ONLY)); - property_editor->set_enable_capitalize_paths(bool(EDITOR_DEF("interface/editor/capitalize_properties", true))); - Ref<Theme> theme = create_custom_theme(theme_base->get_theme()); + Ref<Theme> theme = create_editor_theme(theme_base->get_theme()); theme_base->set_theme(theme); gui_base->set_theme(theme); @@ -327,6 +346,7 @@ void EditorNode::_notification(int p_what) { prev_scene->set_icon(gui_base->get_icon("PrevScene", "EditorIcons")); distraction_free->set_icon(gui_base->get_icon("DistractionFree", "EditorIcons")); + scene_tab_add->set_icon(gui_base->get_icon("Add", "EditorIcons")); resource_new_button->set_icon(gui_base->get_icon("New", "EditorIcons")); resource_load_button->set_icon(gui_base->get_icon("Load", "EditorIcons")); @@ -344,6 +364,10 @@ void EditorNode::_notification(int p_what) { dock_tab_move_right->set_icon(theme->get_icon("Forward", "EditorIcons")); update_menu->set_icon(gui_base->get_icon("Progress1", "EditorIcons")); } + + if (p_what == Control::NOTIFICATION_RESIZED) { + _update_scene_tabs(); + } } void EditorNode::_fs_changed() { @@ -379,7 +403,15 @@ void EditorNode::_fs_changed() { // ensures export_project does not loop infinitely, because notifications may // come during the export export_defer.preset = ""; - platform->export_project(preset, export_defer.debug, export_defer.path, /*p_flags*/ 0); + if (!preset->is_runnable() && (export_defer.path.ends_with(".pck") || export_defer.path.ends_with(".zip"))) { + if (export_defer.path.ends_with(".zip")) { + platform->save_zip(preset, export_defer.path); + } else if (export_defer.path.ends_with(".pck")) { + platform->save_pack(preset, export_defer.path); + } + } else { + platform->export_project(preset, export_defer.debug, export_defer.path, /*p_flags*/ 0); + } } } @@ -705,7 +737,7 @@ void EditorNode::_get_scene_metadata(const String &p_file) { if (!scene) return; - String path = EditorSettings::get_singleton()->get_project_settings_path().plus_file(p_file.get_file() + "-editstate-" + p_file.md5_text() + ".cfg"); + String path = EditorSettings::get_singleton()->get_project_settings_dir().plus_file(p_file.get_file() + "-editstate-" + p_file.md5_text() + ".cfg"); Ref<ConfigFile> cf; cf.instance(); @@ -739,7 +771,7 @@ void EditorNode::_set_scene_metadata(const String &p_file, int p_idx) { scene->set_meta("__editor_run_settings__", Variant()); //clear it (no point in keeping it) scene->set_meta("__editor_plugin_states__", Variant()); - String path = EditorSettings::get_singleton()->get_project_settings_path().plus_file(p_file.get_file() + "-editstate-" + p_file.md5_text() + ".cfg"); + String path = EditorSettings::get_singleton()->get_project_settings_dir().plus_file(p_file.get_file() + "-editstate-" + p_file.md5_text() + ".cfg"); Ref<ConfigFile> cf; cf.instance(); @@ -906,27 +938,33 @@ void EditorNode::_save_scene_with_preview(String p_file, int p_idx) { int preview_size = EditorSettings::get_singleton()->get("filesystem/file_dialog/thumbnail_size"); preview_size *= EDSCALE; - int width, height; - if (img->get_width() > preview_size && img->get_width() >= img->get_height()) { - width = preview_size; - height = img->get_height() * preview_size / img->get_width(); - } else if (img->get_height() > preview_size && img->get_height() >= img->get_width()) { + // consider a square region + int vp_size = MIN(img->get_width(), img->get_height()); + int x = (img->get_width() - vp_size) / 2; + int y = (img->get_height() - vp_size) / 2; + + img->convert(Image::FORMAT_RGB8); - height = preview_size; - width = img->get_width() * preview_size / img->get_height(); + if (vp_size < preview_size) { + // just square it. + img->crop_from_point(x, y, vp_size, vp_size); } else { + int ratio = vp_size / preview_size; + int size = preview_size * (ratio / 2); - width = img->get_width(); - height = img->get_height(); + x = (img->get_width() - size) / 2; + y = (img->get_height() - size) / 2; + + img->crop_from_point(x, y, size, size); + // We could get better pictures with better filters + img->resize(preview_size, preview_size, Image::INTERPOLATE_CUBIC); } - img->convert(Image::FORMAT_RGB8); - img->resize(width, height); img->flip_y(); //save thumbnail directly, as thumbnailer may not update due to actual scene not changing md5 - String temp_path = EditorSettings::get_singleton()->get_settings_path().plus_file("tmp"); + String temp_path = EditorSettings::get_singleton()->get_cache_dir(); String cache_base = ProjectSettings::get_singleton()->globalize_path(p_file).md5_text(); cache_base = temp_path.plus_file("resthumb-" + cache_base); @@ -1109,7 +1147,7 @@ void EditorNode::_dialog_action(String p_file) { _save_default_environment(); _save_scene_with_preview(p_file); - _run(false); + _run(false, p_file); } } break; @@ -1198,7 +1236,7 @@ void EditorNode::_dialog_action(String p_file) { Ref<ConfigFile> config; config.instance(); - Error err = config->load(EditorSettings::get_singleton()->get_settings_path().plus_file("editor_layouts-3.cfg")); + Error err = config->load(EditorSettings::get_singleton()->get_editor_layouts_config()); if (err == ERR_CANT_OPEN) { config.instance(); // new config @@ -1209,7 +1247,7 @@ void EditorNode::_dialog_action(String p_file) { _save_docks_to_config(config, p_file); - config->save(EditorSettings::get_singleton()->get_settings_path().plus_file("editor_layouts-3.cfg")); + config->save(EditorSettings::get_singleton()->get_editor_layouts_config()); layout_dialog->hide(); _update_layouts_menu(); @@ -1226,7 +1264,7 @@ void EditorNode::_dialog_action(String p_file) { Ref<ConfigFile> config; config.instance(); - Error err = config->load(EditorSettings::get_singleton()->get_settings_path().plus_file("editor_layouts-3.cfg")); + Error err = config->load(EditorSettings::get_singleton()->get_editor_layouts_config()); if (err != OK || !config->has_section(p_file)) { show_warning(TTR("Layout name not found!")); @@ -1240,7 +1278,7 @@ void EditorNode::_dialog_action(String p_file) { config->set_value(p_file, E->get(), Variant()); } - config->save(EditorSettings::get_singleton()->get_settings_path().plus_file("editor_layouts-3.cfg")); + config->save(EditorSettings::get_singleton()->get_editor_layouts_config()); layout_dialog->hide(); _update_layouts_menu(); @@ -1330,6 +1368,8 @@ void EditorNode::_prepare_history() { } } else if (Object::cast_to<Node>(obj)) { text = Object::cast_to<Node>(obj)->get_name(); + } else if (obj->is_class("ScriptEditorDebuggerInspectedObject")) { + text = obj->call("get_title"); } else { text = obj->get_class(); } @@ -1425,6 +1465,7 @@ void EditorNode::_edit_current() { object_menu->set_disabled(true); + bool capitalize = bool(EDITOR_DEF("interface/editor/capitalize_properties", true)); bool is_resource = current_obj->is_class("Resource"); bool is_node = current_obj->is_class("Node"); resource_save_button->set_disabled(!is_resource); @@ -1478,6 +1519,11 @@ void EditorNode::_edit_current() { } else { + if (current_obj->is_class("ScriptEditorDebuggerInspectedObject")) { + editable_warning = TTR("This is a remote object so changes to it will not be kept.\nPlease read the documentation relevant to debugging to better understand this workflow."); + capitalize = false; + } + property_editor->edit(current_obj); node_dock->set_node(NULL); } @@ -1487,6 +1533,10 @@ void EditorNode::_edit_current() { property_editable_warning_dialog->set_text(editable_warning); } + if (property_editor->is_capitalize_paths_enabled() != capitalize) { + property_editor->set_enable_capitalize_paths(capitalize); + } + /* Take care of PLUGIN EDITOR */ EditorPlugin *main_plugin = editor_data.get_editor(current_obj); @@ -1759,6 +1809,7 @@ void EditorNode::_menu_option_confirm(int p_option, bool p_confirmed) { int idx = editor_data.add_edited_scene(-1); _scene_tab_changed(idx); editor_data.clear_editor_states(); + _update_scene_tabs(); } break; case FILE_NEW_INHERITED_SCENE: @@ -3273,7 +3324,7 @@ void EditorNode::register_editor_types() { ClassDB::register_class<EditorResourceConversionPlugin>(); // FIXME: Is this stuff obsolete, or should it be ported to new APIs? - //ClassDB::register_class<EditorScenePostImport>(); + ClassDB::register_class<EditorScenePostImport>(); //ClassDB::register_type<EditorImportExport>(); } @@ -3581,7 +3632,7 @@ void EditorNode::_save_docks() { _save_docks_to_config(config, "docks"); editor_data.get_plugin_window_layout(config); - config->save(EditorSettings::get_singleton()->get_project_settings_path().plus_file("editor_layout.cfg")); + config->save(EditorSettings::get_singleton()->get_project_settings_dir().plus_file("editor_layout.cfg")); } void EditorNode::_save_docks_to_config(Ref<ConfigFile> p_layout, const String &p_section) { @@ -3643,7 +3694,7 @@ void EditorNode::_load_docks() { Ref<ConfigFile> config; config.instance(); - Error err = config->load(EditorSettings::get_singleton()->get_project_settings_path().plus_file("editor_layout.cfg")); + Error err = config->load(EditorSettings::get_singleton()->get_project_settings_dir().plus_file("editor_layout.cfg")); if (err != OK) { //no config if (overridden_default_layout >= 0) { @@ -3812,7 +3863,7 @@ void EditorNode::_update_layouts_menu() { Ref<ConfigFile> config; config.instance(); - Error err = config->load(EditorSettings::get_singleton()->get_settings_path().plus_file("editor_layouts-3.cfg")); + Error err = config->load(EditorSettings::get_singleton()->get_editor_layouts_config()); if (err != OK) { return; //no config } @@ -3860,7 +3911,7 @@ void EditorNode::_layout_menu_option(int p_id) { Ref<ConfigFile> config; config.instance(); - Error err = config->load(EditorSettings::get_singleton()->get_settings_path().plus_file("editor_layouts-3.cfg")); + Error err = config->load(EditorSettings::get_singleton()->get_editor_layouts_config()); if (err != OK) { return; //no config } @@ -3897,6 +3948,7 @@ void EditorNode::_scene_tab_closed(int p_tab) { } else { _discard_changes(); } + _update_scene_tabs(); } void EditorNode::_scene_tab_hover(int p_tab) { @@ -4276,12 +4328,19 @@ Variant EditorNode::drag_files_and_dirs(const Vector<String> &p_paths, Control * void EditorNode::_dropped_files(const Vector<String> &p_files, int p_screen) { - /* - String cur_path = filesystem_dock->get_current_path(); - for(int i=0;i<EditorImportExport::get_singleton()->get_import_plugin_count();i++) { - EditorImportExport::get_singleton()->get_import_plugin(i)->import_from_drop(p_files,cur_path); + String to_path = ProjectSettings::get_singleton()->globalize_path(get_filesystem_dock()->get_current_path()); + DirAccessRef dir = DirAccess::create(DirAccess::ACCESS_FILESYSTEM); + + for (int i = 0; i < p_files.size(); i++) { + + String from = p_files[i]; + if (!ResourceFormatImporter::get_singleton()->can_be_imported(from)) { + continue; + } + String to = to_path.plus_file(from.get_file()); + dir->copy(from, to); } - */ + EditorFileSystem::get_singleton()->scan_changes(); } void EditorNode::_file_access_close_error_notify(const String &p_str) { @@ -4552,6 +4611,11 @@ static Node *_resource_get_edited_scene() { return EditorNode::get_singleton()->get_edited_scene(); } +void EditorNode::_print_handler(void *p_this, const String &p_string, bool p_error) { + EditorNode *en = (EditorNode *)p_this; + en->log->add_message(p_string, p_error); +} + EditorNode::EditorNode() { Resource::_get_local_scene_func = _resource_get_edited_scene; @@ -4788,7 +4852,12 @@ EditorNode::EditorNode() { dock_tab_move_left->set_focus_mode(Control::FOCUS_NONE); dock_tab_move_left->connect("pressed", this, "_dock_move_left"); dock_hb->add_child(dock_tab_move_left); - dock_hb->add_spacer(); + + Label *dock_label = memnew(Label); + dock_label->set_text(TTR("Dock Position")); + dock_label->set_h_size_flags(Control::SIZE_EXPAND_FILL); + dock_hb->add_child(dock_label); + dock_tab_move_right = memnew(ToolButton); dock_tab_move_right->set_icon(theme->get_icon("Forward", "EditorIcons")); dock_tab_move_right->set_focus_mode(Control::FOCUS_NONE); @@ -4858,20 +4927,28 @@ EditorNode::EditorNode() { scene_tabs->connect("mouse_exited", this, "_scene_tab_exit"); scene_tabs->connect("gui_input", this, "_scene_tab_input"); scene_tabs->connect("reposition_active_tab_request", this, "_reposition_active_tab"); + scene_tabs->connect("resized", this, "_update_scene_tabs"); - HBoxContainer *tabbar_container = memnew(HBoxContainer); + tabbar_container = memnew(HBoxContainer); scene_tabs->set_h_size_flags(Control::SIZE_EXPAND_FILL); srt->add_child(tabbar_container); tabbar_container->add_child(scene_tabs); distraction_free = memnew(ToolButton); - tabbar_container->add_child(distraction_free); distraction_free->set_shortcut(ED_SHORTCUT("editor/distraction_free_mode", TTR("Distraction Free Mode"), KEY_MASK_CMD | KEY_MASK_SHIFT | KEY_F11)); distraction_free->set_tooltip(TTR("Toggle distraction-free mode.")); distraction_free->connect("pressed", this, "_toggle_distraction_free_mode"); distraction_free->set_icon(gui_base->get_icon("DistractionFree", "EditorIcons")); distraction_free->set_toggle_mode(true); + scene_tab_add = memnew(ToolButton); + tabbar_container->add_child(scene_tab_add); + tabbar_container->add_child(distraction_free); + scene_tab_add->set_tooltip(TTR("Add a new scene.")); + scene_tab_add->set_icon(gui_base->get_icon("Add", "EditorIcons")); + scene_tab_add->add_color_override("icon_color_normal", Color(0.6f, 0.6f, 0.6f, 0.8f)); + scene_tab_add->connect("pressed", this, "_menu_option", make_binds(FILE_NEW_SCENE)); + scene_root_parent = memnew(PanelContainer); scene_root_parent->set_custom_minimum_size(Size2(0, 80) * EDSCALE); scene_root_parent->add_style_override("panel", gui_base->get_stylebox("Content", "EditorStyles")); @@ -5652,6 +5729,10 @@ EditorNode::EditorNode() { _dim_timer->connect("timeout", this, "_dim_timeout"); add_child(_dim_timer); + print_handler.printfunc = _print_handler; + print_handler.userdata = this; + add_print_handler(&print_handler); + ED_SHORTCUT("editor/editor_2d", TTR("Open 2D Editor"), KEY_F1); ED_SHORTCUT("editor/editor_3d", TTR("Open 3D Editor"), KEY_F2); ED_SHORTCUT("editor/editor_script", TTR("Open Script Editor"), KEY_F3); //hack neded for script editor F3 search to work :) Assign like this or don't use F3 @@ -5663,6 +5744,7 @@ EditorNode::EditorNode() { EditorNode::~EditorNode() { + remove_print_handler(&print_handler); memdelete(EditorHelp::get_doc_data()); memdelete(editor_selection); memdelete(editor_plugins_over); diff --git a/editor/editor_node.h b/editor/editor_node.h index 81ff886228..a2b4a0a049 100644 --- a/editor/editor_node.h +++ b/editor/editor_node.h @@ -30,6 +30,7 @@ #ifndef EDITOR_NODE_H #define EDITOR_NODE_H +#include "core/print_string.h" #include "editor/connections_dialog.h" #include "editor/create_dialog.h" #include "editor/editor_about.h" @@ -343,7 +344,10 @@ private: int dock_popup_selected; Timer *dock_drag_timer; bool docks_visible; + + HBoxContainer *tabbar_container; ToolButton *distraction_free; + ToolButton *scene_tab_add; bool scene_distraction; bool script_distraction; @@ -610,6 +614,9 @@ private: Vector<Ref<EditorResourceConversionPlugin> > resource_conversion_plugins; + PrintHandlerList print_handler; + static void _print_handler(void *p_this, const String &p_string, bool p_error); + protected: void _notification(int p_what); static void _bind_methods(); diff --git a/editor/editor_path.cpp b/editor/editor_path.cpp index 0587939a1a..f0d3c29c11 100644 --- a/editor/editor_path.cpp +++ b/editor/editor_path.cpp @@ -149,14 +149,14 @@ void EditorPath::_notification(int p_what) { if (name == "") name = r->get_class(); - } else if (Object::cast_to<Node>(obj)) { - + } else if (obj->is_class("ScriptEditorDebuggerInspectedObject")) + name = obj->call("get_title"); + else if (Object::cast_to<Node>(obj)) name = Object::cast_to<Node>(obj)->get_name(); - } else if (Object::cast_to<Resource>(obj) && Object::cast_to<Resource>(obj)->get_name() != "") { + else if (Object::cast_to<Resource>(obj) && Object::cast_to<Resource>(obj)->get_name() != "") name = Object::cast_to<Resource>(obj)->get_name(); - } else { + else name = obj->get_class(); - } set_tooltip(obj->get_class()); diff --git a/editor/editor_plugin.cpp b/editor/editor_plugin.cpp index 0bd677ca1b..38e8b301b7 100644 --- a/editor/editor_plugin.cpp +++ b/editor/editor_plugin.cpp @@ -102,14 +102,14 @@ Vector<Ref<Texture> > EditorInterface::make_mesh_previews(const Vector<Ref<Mesh> textures.push_back(Ref<Texture>()); continue; } - Rect3 aabb = mesh->get_aabb(); + AABB aabb = mesh->get_aabb(); print_line("aabb: " + aabb); Vector3 ofs = aabb.position + aabb.size * 0.5; aabb.position -= ofs; Transform xform; xform.basis = Basis().rotated(Vector3(0, 1, 0), -Math_PI * 0.25); xform.basis = Basis().rotated(Vector3(1, 0, 0), Math_PI * 0.25) * xform.basis; - Rect3 rot_aabb = xform.xform(aabb); + AABB rot_aabb = xform.xform(aabb); print_line("rot_aabb: " + rot_aabb); float m = MAX(rot_aabb.size.x, rot_aabb.size.y) * 0.5; if (m == 0) { @@ -455,7 +455,11 @@ void EditorPlugin::make_visible(bool p_visible) { void EditorPlugin::edit(Object *p_object) { if (get_script_instance() && get_script_instance()->has_method("edit")) { - get_script_instance()->call("edit", p_object); + if (p_object->is_class("Resource")) { + get_script_instance()->call("edit", Ref<Resource>(Object::cast_to<Resource>(p_object))); + } else { + get_script_instance()->call("edit", p_object); + } } } diff --git a/editor/editor_resource_preview.cpp b/editor/editor_resource_preview.cpp index 5b4bdb59d3..467451cd2b 100644 --- a/editor/editor_resource_preview.cpp +++ b/editor/editor_resource_preview.cpp @@ -198,7 +198,7 @@ void EditorResourcePreview::_thread() { } else { - String temp_path = EditorSettings::get_singleton()->get_settings_path().plus_file("tmp"); + String temp_path = EditorSettings::get_singleton()->get_cache_dir(); String cache_base = ProjectSettings::get_singleton()->globalize_path(item.path).md5_text(); cache_base = temp_path.plus_file("resthumb-" + cache_base); diff --git a/editor/editor_settings.cpp b/editor/editor_settings.cpp index bf4ef3ae39..582bb977b8 100644 --- a/editor/editor_settings.cpp +++ b/editor/editor_settings.cpp @@ -135,7 +135,7 @@ bool EditorSettings::_get(const StringName &p_name, Variant &r_ret) const { void EditorSettings::_initial_set(const StringName &p_name, const Variant &p_value) { set(p_name, p_value); props[p_name].initial = p_value; - props[p_name].initial_set = true; + props[p_name].has_default_value = true; } struct _EVCSort { @@ -221,7 +221,7 @@ bool EditorSettings::has_default_value(const String &p_setting) const { if (!props.has(p_setting)) return false; - return props[p_setting].initial_set; + return props[p_setting].has_default_value; } void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) { @@ -307,7 +307,7 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) { _initial_set("filesystem/directories/default_project_path", OS::get_singleton()->has_environment("HOME") ? OS::get_singleton()->get_environment("HOME") : OS::get_singleton()->get_system_dir(OS::SYSTEM_DIR_DOCUMENTS)); hints["filesystem/directories/default_project_path"] = PropertyInfo(Variant::STRING, "filesystem/directories/default_project_path", PROPERTY_HINT_GLOBAL_DIR); _initial_set("filesystem/directories/default_project_export_path", ""); - hints["global/default_project_export_path"] = PropertyInfo(Variant::STRING, "global/default_project_export_path", PROPERTY_HINT_GLOBAL_DIR); + hints["filesystem/directories/default_project_export_path"] = PropertyInfo(Variant::STRING, "filesystem/directories/default_project_export_path", PROPERTY_HINT_GLOBAL_DIR); _initial_set("interface/editor/show_script_in_scene_tabs", false); _initial_set("text_editor/theme/color_theme", "Adaptive"); @@ -334,6 +334,7 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) { _initial_set("text_editor/line_numbers/show_line_numbers", true); _initial_set("text_editor/line_numbers/line_numbers_zero_padded", false); _initial_set("text_editor/line_numbers/show_breakpoint_gutter", true); + _initial_set("text_editor/line_numbers/code_folding", true); _initial_set("text_editor/line_numbers/show_line_length_guideline", false); _initial_set("text_editor/line_numbers/line_length_guideline_column", 80); hints["text_editor/line_numbers/line_length_guideline_column"] = PropertyInfo(Variant::INT, "text_editor/line_numbers/line_length_guideline_column", PROPERTY_HINT_RANGE, "20, 160, 10"); @@ -423,6 +424,7 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) { _initial_set("editors/2d/bone_ik_color", Color(0.9, 0.9, 0.45, 0.9)); _initial_set("editors/2d/keep_margins_when_changing_anchors", false); _initial_set("editors/2d/warped_mouse_panning", true); + _initial_set("editors/2d/simple_spacebar_panning", false); _initial_set("editors/2d/scroll_to_pan", false); _initial_set("editors/2d/pan_speed", 20); @@ -639,10 +641,14 @@ void EditorSettings::create() { return; //pointless DirAccess *dir = NULL; - Variant meta; + String data_path; + String data_dir; String config_path; String config_dir; + String cache_path; + String cache_dir; + Ref<ConfigFile> extra_config = memnew(ConfigFile); String exe_path = OS::get_singleton()->get_executable_path().get_base_dir(); @@ -659,38 +665,50 @@ void EditorSettings::create() { memdelete(d); if (self_contained) { - // editor is self contained + + // editor is self contained, all in same folder + data_path = exe_path; + data_dir = data_path.plus_file("editor_data"); config_path = exe_path; - config_dir = "editor_data"; + config_dir = data_dir; + cache_path = exe_path; + cache_dir = data_dir.plus_file("cache"); } else { - if (OS::get_singleton()->has_environment("APPDATA")) { - // Most likely under windows, save here - config_path = OS::get_singleton()->get_environment("APPDATA"); - config_dir = String(_MKSTR(VERSION_SHORT_NAME)).capitalize(); - } else if (OS::get_singleton()->has_environment("HOME")) { - - config_path = OS::get_singleton()->get_environment("HOME"); - config_dir = "." + String(_MKSTR(VERSION_SHORT_NAME)).to_lower(); + // Typically XDG_DATA_HOME or %APPDATA% + data_path = OS::get_singleton()->get_data_path(); + data_dir = data_path.plus_file(OS::get_singleton()->get_godot_dir_name()); + // Can be different from data_path e.g. on Linux or macOS + config_path = OS::get_singleton()->get_config_path(); + config_dir = config_path.plus_file(OS::get_singleton()->get_godot_dir_name()); + // Can be different from above paths, otherwise a subfolder of data_dir + cache_path = OS::get_singleton()->get_cache_path(); + if (cache_path == data_path) { + cache_dir = data_dir.plus_file("cache"); + } else { + cache_dir = cache_path.plus_file(OS::get_singleton()->get_godot_dir_name()); } - }; + } ClassDB::register_class<EditorSettings>(); //otherwise it can't be unserialized + String config_file_path; - if (config_path != "") { + if (data_path != "" && config_path != "" && cache_path != "") { + + // Validate/create data dir and subdirectories dir = DirAccess::create(DirAccess::ACCESS_FILESYSTEM); - if (dir->change_dir(config_path) != OK) { - ERR_PRINT("Cannot find path for config directory!"); + if (dir->change_dir(data_path) != OK) { + ERR_PRINT("Cannot find path for data directory!"); memdelete(dir); goto fail; } - if (dir->change_dir(config_dir) != OK) { - dir->make_dir(config_dir); - if (dir->change_dir(config_dir) != OK) { - ERR_PRINT("Cannot create config directory!"); + if (dir->change_dir(data_dir) != OK) { + dir->make_dir(data_dir); + if (dir->change_dir(data_dir) != OK) { + ERR_PRINT("Cannot create data directory!"); memdelete(dir); goto fail; } @@ -699,10 +717,43 @@ void EditorSettings::create() { if (dir->change_dir("templates") != OK) { dir->make_dir("templates"); } else { - dir->change_dir(".."); } + // Validate/create cache dir + + if (dir->change_dir(cache_path) != OK) { + ERR_PRINT("Cannot find path for cache directory!"); + memdelete(dir); + goto fail; + } + + if (dir->change_dir(cache_dir) != OK) { + dir->make_dir(cache_dir); + if (dir->change_dir(cache_dir) != OK) { + ERR_PRINT("Cannot create cache directory!"); + memdelete(dir); + goto fail; + } + } + + // Validate/create config dir and subdirectories + + if (dir->change_dir(config_path) != OK) { + ERR_PRINT("Cannot find path for config directory!"); + memdelete(dir); + goto fail; + } + + if (dir->change_dir(config_dir) != OK) { + dir->make_dir(config_dir); + if (dir->change_dir(config_dir) != OK) { + ERR_PRINT("Cannot create config directory!"); + memdelete(dir); + goto fail; + } + } + if (dir->change_dir("text_editor_themes") != OK) { dir->make_dir("text_editor_themes"); } else { @@ -714,52 +765,40 @@ void EditorSettings::create() { } else { dir->change_dir(".."); } - _create_script_templates(dir->get_current_dir() + "/script_templates"); - - if (dir->change_dir("tmp") != OK) { - dir->make_dir("tmp"); - } else { - - dir->change_dir(".."); - } + _create_script_templates(dir->get_current_dir().plus_file("script_templates")); - if (dir->change_dir("config") != OK) { - dir->make_dir("config"); + if (dir->change_dir("projects") != OK) { + dir->make_dir("projects"); } else { - dir->change_dir(".."); } - dir->change_dir("config"); + // Validate/create project-specific config dir - String pcp = ProjectSettings::get_singleton()->get_resource_path(); - if (pcp.ends_with("/")) - pcp = config_path.substr(0, pcp.size() - 1); - pcp = pcp.get_file() + "-" + pcp.md5_text(); + dir->change_dir("projects"); + String project_config_dir = ProjectSettings::get_singleton()->get_resource_path(); + if (project_config_dir.ends_with("/")) + project_config_dir = config_path.substr(0, project_config_dir.size() - 1); + project_config_dir = project_config_dir.get_file() + "-" + project_config_dir.md5_text(); - if (dir->change_dir(pcp)) { - dir->make_dir(pcp); + if (dir->change_dir(project_config_dir) != OK) { + dir->make_dir(project_config_dir); } else { dir->change_dir(".."); } - dir->change_dir(".."); - // path at least is validated, so validate config file - - String config_file_name = "editor_settings-" + String(_MKSTR(VERSION_MAJOR)) + ".tres"; - config_file_path = config_path + "/" + config_dir + "/" + config_file_name; - - String open_path = config_file_path; + // Validate editor config file + String config_file_name = "editor_settings-" + itos(VERSION_MAJOR) + ".tres"; + config_file_path = config_dir.plus_file(config_file_name); if (!dir->file_exists(config_file_name)) { - goto fail; } memdelete(dir); - singleton = ResourceLoader::load(open_path, "EditorSettings"); + singleton = ResourceLoader::load(config_file_path, "EditorSettings"); if (singleton.is_null()) { WARN_PRINT("Could not open config file."); @@ -768,8 +807,10 @@ void EditorSettings::create() { singleton->save_changed_setting = true; singleton->config_file_path = config_file_path; - singleton->project_config_path = pcp; - singleton->settings_path = config_path + "/" + config_dir; + singleton->project_config_dir = project_config_dir; + singleton->settings_dir = config_dir; + singleton->data_dir = data_dir; + singleton->cache_dir = cache_dir; if (OS::get_singleton()->is_stdout_verbose()) { @@ -799,7 +840,9 @@ fail: singleton = Ref<EditorSettings>(memnew(EditorSettings)); singleton->save_changed_setting = true; singleton->config_file_path = config_file_path; - singleton->settings_path = config_path + "/" + config_dir; + singleton->settings_dir = config_dir; + singleton->data_dir = data_dir; + singleton->cache_dir = cache_dir; singleton->_load_defaults(extra_config); singleton->setup_language(); singleton->setup_network(); @@ -922,9 +965,10 @@ void EditorSettings::raise_order(const String &p_setting) { void EditorSettings::set_initial_value(const StringName &p_setting, const Variant &p_value) { - ERR_FAIL_COND(!props.has(p_setting)); + if (!props.has(p_setting)) + return; props[p_setting].initial = p_value; - props[p_setting].initial_set = true; + props[p_setting].has_default_value = true; } Variant _EDITOR_DEF(const String &p_setting, const Variant &p_default) { @@ -932,10 +976,10 @@ Variant _EDITOR_DEF(const String &p_setting, const Variant &p_default) { Variant ret = p_default; if (EditorSettings::get_singleton()->has_setting(p_setting)) ret = EditorSettings::get_singleton()->get(p_setting); - if (!EditorSettings::get_singleton()->has_default_value(p_setting)) { - EditorSettings::get_singleton()->set_initial_value(p_setting, p_default); + else EditorSettings::get_singleton()->set(p_setting, p_default); - } + if (!EditorSettings::get_singleton()->has_default_value(p_setting)) + EditorSettings::get_singleton()->set_initial_value(p_setting, p_default); return ret; } @@ -969,21 +1013,52 @@ void EditorSettings::add_property_hint(const PropertyInfo &p_hint) { hints[p_hint.name] = p_hint; } -// Settings paths and saved metadata +// Data directories -String EditorSettings::get_settings_path() const { +String EditorSettings::get_data_dir() const { - return settings_path; + return data_dir; } -String EditorSettings::get_project_settings_path() const { +String EditorSettings::get_templates_dir() const { - return get_settings_path().plus_file("config").plus_file(project_config_path); + return get_data_dir().plus_file("templates"); } +// Config directories + +String EditorSettings::get_settings_dir() const { + + return settings_dir; +} + +String EditorSettings::get_project_settings_dir() const { + + return get_settings_dir().plus_file("projects").plus_file(project_config_dir); +} + +String EditorSettings::get_text_editor_themes_dir() const { + + return get_settings_dir().plus_file("text_editor_themes"); +} + +String EditorSettings::get_script_templates_dir() const { + + return get_settings_dir().plus_file("script_templates"); +} + +// Cache directory + +String EditorSettings::get_cache_dir() const { + + return cache_dir; +} + +// Metadata + void EditorSettings::set_project_metadata(const String &p_section, const String &p_key, Variant p_data) { Ref<ConfigFile> cf = memnew(ConfigFile); - String path = get_project_settings_path().plus_file("project_metadata.cfg"); + String path = get_project_settings_dir().plus_file("project_metadata.cfg"); cf->load(path); cf->set_value(p_section, p_key, p_data); cf->save(path); @@ -991,7 +1066,7 @@ void EditorSettings::set_project_metadata(const String &p_section, const String Variant EditorSettings::get_project_metadata(const String &p_section, const String &p_key, Variant p_default) { Ref<ConfigFile> cf = memnew(ConfigFile); - String path = get_project_settings_path().plus_file("project_metadata.cfg"); + String path = get_project_settings_dir().plus_file("project_metadata.cfg"); Error err = cf->load(path); if (err != OK) { return p_default; @@ -1002,7 +1077,7 @@ Variant EditorSettings::get_project_metadata(const String &p_section, const Stri void EditorSettings::set_favorite_dirs(const Vector<String> &p_favorites_dirs) { favorite_dirs = p_favorites_dirs; - FileAccess *f = FileAccess::open(get_project_settings_path().plus_file("favorite_dirs"), FileAccess::WRITE); + FileAccess *f = FileAccess::open(get_project_settings_dir().plus_file("favorite_dirs"), FileAccess::WRITE); if (f) { for (int i = 0; i < favorite_dirs.size(); i++) f->store_line(favorite_dirs[i]); @@ -1018,7 +1093,7 @@ Vector<String> EditorSettings::get_favorite_dirs() const { void EditorSettings::set_recent_dirs(const Vector<String> &p_recent_dirs) { recent_dirs = p_recent_dirs; - FileAccess *f = FileAccess::open(get_project_settings_path().plus_file("recent_dirs"), FileAccess::WRITE); + FileAccess *f = FileAccess::open(get_project_settings_dir().plus_file("recent_dirs"), FileAccess::WRITE); if (f) { for (int i = 0; i < recent_dirs.size(); i++) f->store_line(recent_dirs[i]); @@ -1033,7 +1108,7 @@ Vector<String> EditorSettings::get_recent_dirs() const { void EditorSettings::load_favorites() { - FileAccess *f = FileAccess::open(get_project_settings_path().plus_file("favorite_dirs"), FileAccess::READ); + FileAccess *f = FileAccess::open(get_project_settings_dir().plus_file("favorite_dirs"), FileAccess::READ); if (f) { String line = f->get_line().strip_edges(); while (line != "") { @@ -1043,7 +1118,7 @@ void EditorSettings::load_favorites() { memdelete(f); } - f = FileAccess::open(get_project_settings_path().plus_file("recent_dirs"), FileAccess::READ); + f = FileAccess::open(get_project_settings_dir().plus_file("recent_dirs"), FileAccess::READ); if (f) { String line = f->get_line().strip_edges(); while (line != "") { @@ -1056,7 +1131,7 @@ void EditorSettings::load_favorites() { void EditorSettings::list_text_editor_themes() { String themes = "Adaptive,Default"; - DirAccess *d = DirAccess::open(get_settings_path().plus_file("text_editor_themes")); + DirAccess *d = DirAccess::open(get_text_editor_themes_dir()); if (d) { d->list_dir_begin(); String file = d->get_next(); @@ -1078,7 +1153,7 @@ void EditorSettings::load_text_editor_theme() { return; } - String theme_path = get_settings_path().plus_file("text_editor_themes").plus_file((String)get("text_editor/theme/color_theme") + ".tet"); + String theme_path = get_text_editor_themes_dir().plus_file((String)get("text_editor/theme/color_theme") + ".tet"); Ref<ConfigFile> cf = memnew(ConfigFile); Error err = cf->load(theme_path); @@ -1116,9 +1191,9 @@ bool EditorSettings::import_text_editor_theme(String p_file) { return false; } - DirAccess *d = DirAccess::open(get_settings_path().plus_file("text_editor_themes")); + DirAccess *d = DirAccess::open(get_text_editor_themes_dir()); if (d) { - d->copy(p_file, get_settings_path().plus_file("text_editor_themes").plus_file(p_file.get_file())); + d->copy(p_file, get_text_editor_themes_dir().plus_file(p_file.get_file())); memdelete(d); return true; } @@ -1133,7 +1208,7 @@ bool EditorSettings::save_text_editor_theme() { if (p_file.get_file().to_lower() == "default" || p_file.get_file().to_lower() == "adaptive") { return false; } - String theme_path = get_settings_path().plus_file("text_editor_themes").plus_file(p_file + ".tet"); + String theme_path = get_text_editor_themes_dir().plus_file(p_file + ".tet"); return _save_text_editor_theme(theme_path); } @@ -1151,7 +1226,7 @@ bool EditorSettings::save_text_editor_theme_as(String p_file) { list_text_editor_themes(); String theme_name = p_file.substr(0, p_file.length() - 4).get_file(); - if (p_file.get_base_dir() == get_settings_path().plus_file("text_editor_themes")) { + if (p_file.get_base_dir() == get_text_editor_themes_dir()) { _initial_set("text_editor/theme/color_theme", theme_name); load_text_editor_theme(); } @@ -1163,7 +1238,7 @@ bool EditorSettings::save_text_editor_theme_as(String p_file) { Vector<String> EditorSettings::get_script_templates(const String &p_extension) { Vector<String> templates; - DirAccess *d = DirAccess::open(get_settings_path().plus_file("script_templates")); + DirAccess *d = DirAccess::open(get_script_templates_dir()); if (d) { d->list_dir_begin(); String file = d->get_next(); @@ -1179,6 +1254,11 @@ Vector<String> EditorSettings::get_script_templates(const String &p_extension) { return templates; } +String EditorSettings::get_editor_layouts_config() const { + + return get_settings_dir().plus_file("editor_layouts.cfg"); +} + // Shortcuts void EditorSettings::add_shortcut(const String &p_name, Ref<ShortCut> &p_shortcut) { @@ -1285,8 +1365,8 @@ void EditorSettings::_bind_methods() { ClassDB::bind_method(D_METHOD("property_get_revert", "name"), &EditorSettings::property_get_revert); ClassDB::bind_method(D_METHOD("add_property_info", "info"), &EditorSettings::_add_property_info_bind); - ClassDB::bind_method(D_METHOD("get_settings_path"), &EditorSettings::get_settings_path); - ClassDB::bind_method(D_METHOD("get_project_settings_path"), &EditorSettings::get_project_settings_path); + ClassDB::bind_method(D_METHOD("get_settings_dir"), &EditorSettings::get_settings_dir); + ClassDB::bind_method(D_METHOD("get_project_settings_dir"), &EditorSettings::get_project_settings_dir); ClassDB::bind_method(D_METHOD("set_favorite_dirs", "dirs"), &EditorSettings::set_favorite_dirs); ClassDB::bind_method(D_METHOD("get_favorite_dirs"), &EditorSettings::get_favorite_dirs); diff --git a/editor/editor_settings.h b/editor/editor_settings.h index 29665369c4..a8c991a6d9 100644 --- a/editor/editor_settings.h +++ b/editor/editor_settings.h @@ -66,13 +66,13 @@ private: int order; Variant variant; Variant initial; - bool initial_set; + bool has_default_value; bool hide_from_editor; bool save; VariantContainer() { order = 0; hide_from_editor = false; - initial_set = false; + has_default_value = false; save = false; } VariantContainer(const Variant &p_variant, int p_order) { @@ -93,9 +93,11 @@ private: Map<String, Ref<ShortCut> > shortcuts; String resource_path; + String settings_dir; + String data_dir; + String cache_dir; String config_file_path; - String settings_path; - String project_config_path; + String project_config_dir; Vector<String> favorite_dirs; Vector<String> recent_dirs; @@ -147,8 +149,13 @@ public: void set_resource_clipboard(const Ref<Resource> &p_resource) { clipboard = p_resource; } Ref<Resource> get_resource_clipboard() const { return clipboard; } - String get_settings_path() const; - String get_project_settings_path() const; + String get_data_dir() const; + String get_templates_dir() const; + String get_settings_dir() const; + String get_project_settings_dir() const; + String get_text_editor_themes_dir() const; + String get_script_templates_dir() const; + String get_cache_dir() const; void set_project_metadata(const String &p_section, const String &p_key, Variant p_data); Variant get_project_metadata(const String &p_section, const String &p_key, Variant p_default); @@ -166,6 +173,7 @@ public: bool save_text_editor_theme_as(String p_file); Vector<String> get_script_templates(const String &p_extension); + String get_editor_layouts_config() const; void add_shortcut(const String &p_name, Ref<ShortCut> &p_shortcut); bool is_shortcut(const String &p_name, const Ref<InputEvent> &p_event) const; diff --git a/editor/editor_themes.cpp b/editor/editor_themes.cpp index 0f9f50095d..ae29b7420e 100644 --- a/editor/editor_themes.cpp +++ b/editor/editor_themes.cpp @@ -738,6 +738,13 @@ Ref<Theme> create_editor_theme(const Ref<Theme> p_theme) { theme->set_stylebox("button", "Tabs", style_menu); theme->set_icon("increment", "TabContainer", theme->get_icon("GuiScrollArrowRight", "EditorIcons")); theme->set_icon("decrement", "TabContainer", theme->get_icon("GuiScrollArrowLeft", "EditorIcons")); + theme->set_icon("increment", "Tabs", theme->get_icon("GuiScrollArrowRight", "EditorIcons")); + theme->set_icon("decrement", "Tabs", theme->get_icon("GuiScrollArrowLeft", "EditorIcons")); + theme->set_icon("increment_highlight", "Tabs", theme->get_icon("GuiScrollArrowRight", "EditorIcons")); + theme->set_icon("decrement_highlight", "Tabs", theme->get_icon("GuiScrollArrowLeft", "EditorIcons")); + theme->set_icon("increment_highlight", "TabContainer", theme->get_icon("GuiScrollArrowRight", "EditorIcons")); + theme->set_icon("decrement_highlight", "TabContainer", theme->get_icon("GuiScrollArrowLeft", "EditorIcons")); + theme->set_constant("hseparation", "Tabs", 4 * EDSCALE); // Content of each tab Ref<StyleBoxFlat> style_content_panel = style_default->duplicate(); diff --git a/editor/export_template_manager.cpp b/editor/export_template_manager.cpp index 8641fc7667..d208bbe662 100644 --- a/editor/export_template_manager.cpp +++ b/editor/export_template_manager.cpp @@ -35,6 +35,7 @@ #include "io/zip_io.h" #include "os/dir_access.h" #include "version.h" + void ExportTemplateManager::_update_template_list() { while (current_hb->get_child_count()) { @@ -46,7 +47,7 @@ void ExportTemplateManager::_update_template_list() { } DirAccess *d = DirAccess::create(DirAccess::ACCESS_FILESYSTEM); - Error err = d->change_dir(EditorSettings::get_singleton()->get_settings_path().plus_file("templates")); + Error err = d->change_dir(EditorSettings::get_singleton()->get_templates_dir()); d->list_dir_begin(); Set<String> templates; @@ -66,7 +67,7 @@ void ExportTemplateManager::_update_template_list() { memdelete(d); - String current_version = itos(VERSION_MAJOR) + "." + itos(VERSION_MINOR) + "-" + _MKSTR(VERSION_STATUS) + VERSION_MODULE_CONFIG; + String current_version = itos(VERSION_MAJOR) + "." + itos(VERSION_MINOR) + "-" + VERSION_STATUS + VERSION_MODULE_CONFIG; Label *current = memnew(Label); current->set_h_size_flags(SIZE_EXPAND_FILL); @@ -142,7 +143,7 @@ void ExportTemplateManager::_uninstall_template(const String &p_version) { void ExportTemplateManager::_uninstall_template_confirm() { DirAccess *d = DirAccess::create(DirAccess::ACCESS_FILESYSTEM); - Error err = d->change_dir(EditorSettings::get_singleton()->get_settings_path().plus_file("templates")); + Error err = d->change_dir(EditorSettings::get_singleton()->get_templates_dir()); ERR_FAIL_COND(err != OK); @@ -244,7 +245,7 @@ void ExportTemplateManager::_install_from_file(const String &p_file) { return; } - String template_path = EditorSettings::get_singleton()->get_settings_path().plus_file("templates").plus_file(version); + String template_path = EditorSettings::get_singleton()->get_templates_dir().plus_file(version); DirAccess *d = DirAccess::create(DirAccess::ACCESS_FILESYSTEM); Error err = d->make_dir_recursive(template_path); @@ -393,7 +394,7 @@ void ExportTemplateManager::_http_download_templates_completed(int p_status, int if (p_code != 200) { template_list_state->set_text(TTR("Failed:") + " " + itos(p_code)); } else { - String path = EditorSettings::get_singleton()->get_settings_path().plus_file("tmp").plus_file("tmp_templates.tpz"); + String path = EditorSettings::get_singleton()->get_cache_dir().plus_file("tmp_templates.tpz"); FileAccess *f = FileAccess::open(path, FileAccess::WRITE); if (!f) { template_list_state->set_text(TTR("Can't write file.")); diff --git a/editor/filesystem_dock.cpp b/editor/filesystem_dock.cpp index 533401b317..2ddfea00e3 100644 --- a/editor/filesystem_dock.cpp +++ b/editor/filesystem_dock.cpp @@ -1417,18 +1417,18 @@ void FileSystemDock::_files_list_rmb_select(int p_item, const Vector2 &p_pos) { if (all_files_scenes) { file_options->add_item(TTR("Instance"), FILE_INSTANCE); } + file_options->add_separator(); if (filenames.size() == 1) { - file_options->add_separator(); file_options->add_item(TTR("Edit Dependencies.."), FILE_DEPENDENCIES); file_options->add_item(TTR("View Owners.."), FILE_OWNERS); + file_options->add_separator(); } } else if (all_folders && foldernames.size() > 0) { file_options->add_item(TTR("Open"), FILE_OPEN); + file_options->add_separator(); } - file_options->add_separator(); - int num_items = filenames.size() + foldernames.size(); if (num_items >= 1) { if (num_items == 1) { @@ -1447,6 +1447,16 @@ void FileSystemDock::_files_list_rmb_select(int p_item, const Vector2 &p_pos) { file_options->popup(); } +void FileSystemDock::_rmb_pressed(const Vector2 &p_pos) { + file_options->clear(); + file_options->set_size(Size2(1, 1)); + + file_options->add_item(TTR("New Folder.."), FILE_NEW_FOLDER); + file_options->add_item(TTR("Show In File Manager"), FILE_SHOW_IN_EXPLORER); + file_options->set_position(files->get_global_position() + p_pos); + file_options->popup(); +} + void FileSystemDock::select_file(const String &p_file) { navigate_to_path(p_file); @@ -1547,6 +1557,7 @@ void FileSystemDock::_bind_methods() { ClassDB::bind_method(D_METHOD("_file_selected"), &FileSystemDock::_file_selected); ClassDB::bind_method(D_METHOD("_file_multi_selected"), &FileSystemDock::_file_multi_selected); ClassDB::bind_method(D_METHOD("_update_import_dock"), &FileSystemDock::_update_import_dock); + ClassDB::bind_method(D_METHOD("_rmb_pressed"), &FileSystemDock::_rmb_pressed); ADD_SIGNAL(MethodInfo("instance", PropertyInfo(Variant::POOL_STRING_ARRAY, "files"))); ADD_SIGNAL(MethodInfo("open")); @@ -1665,6 +1676,7 @@ FileSystemDock::FileSystemDock(EditorNode *p_editor) { files->connect("item_rmb_selected", this, "_files_list_rmb_select"); files->connect("item_selected", this, "_file_selected"); files->connect("multi_selected", this, "_file_multi_selected"); + files->connect("rmb_clicked", this, "_rmb_pressed"); files->set_allow_rmb_select(true); file_list_vb->add_child(files); @@ -1683,7 +1695,7 @@ FileSystemDock::FileSystemDock(EditorNode *p_editor) { deps_editor = memnew(DependencyEditor); add_child(deps_editor); - owners_editor = memnew(DependencyEditorOwners); + owners_editor = memnew(DependencyEditorOwners(editor)); add_child(owners_editor); remove_dialog = memnew(DependencyRemoveDialog); diff --git a/editor/filesystem_dock.h b/editor/filesystem_dock.h index d100de8b72..f1fd342052 100644 --- a/editor/filesystem_dock.h +++ b/editor/filesystem_dock.h @@ -192,6 +192,7 @@ private: void _dir_rmb_pressed(const Vector2 &p_pos); void _files_list_rmb_select(int p_item, const Vector2 &p_pos); + void _rmb_pressed(const Vector2 &p_pos); struct FileInfo { String name; diff --git a/editor/icons/icon_GUI_ellipsis.svg b/editor/icons/icon_GUI_ellipsis.svg new file mode 100644 index 0000000000..5565fd2947 --- /dev/null +++ b/editor/icons/icon_GUI_ellipsis.svg @@ -0,0 +1,5 @@ +<svg width="14" height="8" version="1.1" viewBox="0 0 14 8" xmlns="http://www.w3.org/2000/svg"> +<g transform="translate(0 -1044.4)"> +<path transform="translate(0 1040.4)" d="m3.8594 4c-2.1381 0-3.8594 1.7213-3.8594 3.8594v0.28125c0 2.1381 1.7213 3.8594 3.8594 3.8594h6.2812c2.1381 0 3.8594-1.7213 3.8594-3.8594v-0.28125c0-2.1381-1.7213-3.8594-3.8594-3.8594zm-0.85938 3a1 1 0 0 1 1 1 1 1 0 0 1 -1 1 1 1 0 0 1 -1 -1 1 1 0 0 1 1 -1zm4 0a1 1 0 0 1 1 1 1 1 0 0 1 -1 1 1 1 0 0 1 -1 -1 1 1 0 0 1 1 -1zm4 0a1 1 0 0 1 1 1 1 1 0 0 1 -1 1 1 1 0 0 1 -1 -1 1 1 0 0 1 1 -1z" fill="#fff" fill-opacity=".39216"/> +</g> +</svg> diff --git a/editor/icons/icon_animation.svg b/editor/icons/icon_animation.svg index 146403ece5..600faeeddb 100644 --- a/editor/icons/icon_animation.svg +++ b/editor/icons/icon_animation.svg @@ -1,5 +1,3 @@ <svg width="16" height="16" version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg"> -<g transform="translate(0 -1036.4)"> -<path transform="translate(0 1036.4)" d="m8 2a6 6 0 0 0 -6 6 6 6 0 0 0 6 6 6 6 0 0 0 4 -1.5352v1.5352h0.001953a2 2 0 0 0 0.26562 1 2 2 0 0 0 1.7324 1h1v-1-1h-0.5a0.5 0.49999 0 0 1 -0.5 -0.5v-0.5-5a6 6 0 0 0 -6 -6zm0 1a1 1 0 0 1 1 1 1 1 0 0 1 -1 1 1 1 0 0 1 -1 -1 1 1 0 0 1 1 -1zm3.4414 2a1 1 0 0 1 0.88867 0.5 1 1 0 0 1 -0.36523 1.3652 1 1 0 0 1 -1.3672 -0.36523 1 1 0 0 1 0.36719 -1.3652 1 1 0 0 1 0.47656 -0.13477zm-6.9531 0.0019531a1 1 0 0 1 0.54688 0.13281 1 1 0 0 1 0.36719 1.3652 1 1 0 0 1 -1.3672 0.36523 1 1 0 0 1 -0.36523 -1.3652 1 1 0 0 1 0.81836 -0.49805zm0.023438 3.998a1 1 0 0 1 0.89062 0.5 1 1 0 0 1 -0.36719 1.3652 1 1 0 0 1 -1.3652 -0.36523 1 1 0 0 1 0.36523 -1.3652 1 1 0 0 1 0.47656 -0.13477zm6.9043 0.0019531a1 1 0 0 1 0.54883 0.13281 1 1 0 0 1 0.36523 1.3652 1 1 0 0 1 -1.3652 0.36523 1 1 0 0 1 -0.36719 -1.3652 1 1 0 0 1 0.81836 -0.49805zm-3.416 1.998a1 1 0 0 1 1 1 1 1 0 0 1 -1 1 1 1 0 0 1 -1 -1 1 1 0 0 1 1 -1z" fill="#e0e0e0"/> -</g> +<path d="m8 2a6 6 0 0 0 -6 6 6 6 0 0 0 6 6 6 6 0 0 0 4 -1.5352v1.5352h0.001953a2 2 0 0 0 0.26562 1 2 2 0 0 0 1.7324 1h1v-1-1h-0.5a0.5 0.49999 0 0 1 -0.5 -0.5v-0.5-5a6 6 0 0 0 -6 -6zm0 1a1 1 0 0 1 1 1 1 1 0 0 1 -1 1 1 1 0 0 1 -1 -1 1 1 0 0 1 1 -1zm3.4414 2a1 1 0 0 1 0.88867 0.5 1 1 0 0 1 -0.36523 1.3652 1 1 0 0 1 -1.3672 -0.36523 1 1 0 0 1 0.36719 -1.3652 1 1 0 0 1 0.47656 -0.13477zm-6.9531 0.0019531a1 1 0 0 1 0.54688 0.13281 1 1 0 0 1 0.36719 1.3652 1 1 0 0 1 -1.3672 0.36523 1 1 0 0 1 -0.36523 -1.3652 1 1 0 0 1 0.81836 -0.49805zm0.023438 3.998a1 1 0 0 1 0.89062 0.5 1 1 0 0 1 -0.36719 1.3652 1 1 0 0 1 -1.3652 -0.36523 1 1 0 0 1 0.36523 -1.3652 1 1 0 0 1 0.47656 -0.13477zm6.9043 0.0019531a1 1 0 0 1 0.54883 0.13281 1 1 0 0 1 0.36523 1.3652 1 1 0 0 1 -1.3652 0.36523 1 1 0 0 1 -0.36719 -1.3652 1 1 0 0 1 0.81836 -0.49805zm-3.416 1.998a1 1 0 0 1 1 1 1 1 0 0 1 -1 1 1 1 0 0 1 -1 -1 1 1 0 0 1 1 -1z" fill="#e0e0e0"/> </svg> diff --git a/editor/icons/icon_area.svg b/editor/icons/icon_area.svg index ac673d10fc..5e1a385f58 100644 --- a/editor/icons/icon_area.svg +++ b/editor/icons/icon_area.svg @@ -1,5 +1,3 @@ <svg width="16" height="16" version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg"> -<g transform="translate(0 -1036.4)"> -<path transform="translate(0 1036.4)" d="m1 1v2 2h2v-2h2v-2h-4zm10 0v2h2v2h2v-4h-4zm-7 3v2 4 2h8v-2-6h-8zm2 2h4v4h-4v-4zm-5 5v2 2h2 2v-2h-2v-2h-2zm12 0v2h-2v2h4v-2-2h-2z" fill="#fc9c9c"/> -</g> +<path d="m1 1v2 2h2v-2h2v-2h-4zm10 0v2h2v2h2v-4h-4zm-7 3v2 4 2h8v-2-6h-8zm2 2h4v4h-4v-4zm-5 5v2 2h2 2v-2h-2v-2h-2zm12 0v2h-2v2h4v-2-2h-2z" fill="#fc9c9c"/> </svg> diff --git a/editor/icons/icon_area_2d.svg b/editor/icons/icon_area_2d.svg index d6ecb6abe5..28fc4d7804 100644 --- a/editor/icons/icon_area_2d.svg +++ b/editor/icons/icon_area_2d.svg @@ -1,5 +1,3 @@ <svg width="16" height="16" version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg"> -<g transform="translate(0 -1036.4)"> -<path transform="translate(0 1036.4)" d="m1 1v2 2h2v-2h2v-2h-4zm10 0v2h2v2h2v-4h-4zm-7 3v2 4 2h8v-2-6h-8zm2 2h4v4h-4v-4zm-5 5v2 2h2 2v-2h-2v-2h-2zm12 0v2h-2v2h4v-2-2h-2z" fill="#a5b7f3"/> -</g> +<path d="m1 1v2 2h2v-2h2v-2h-4zm10 0v2h2v2h2v-4h-4zm-7 3v2 4 2h8v-2-6h-8zm2 2h4v4h-4v-4zm-5 5v2 2h2 2v-2h-2v-2h-2zm12 0v2h-2v2h4v-2-2h-2z" fill="#a5b7f3"/> </svg> diff --git a/editor/icons/icon_array_mesh.svg b/editor/icons/icon_array_mesh.svg index 68890c4366..867fc95b0c 100644 --- a/editor/icons/icon_array_mesh.svg +++ b/editor/icons/icon_array_mesh.svg @@ -1,5 +1,3 @@ <svg width="16" height="16" version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg"> -<g transform="translate(0 -1036.4)"> -<path transform="translate(0 1036.4)" d="m3 1a2 2 0 0 0 -2 2 2 2 0 0 0 2 2 2 2 0 0 0 2 -2 2 2 0 0 0 -2 -2zm10 0a2 2 0 0 0 -2 2 2 2 0 0 0 2 2 2 2 0 0 0 2 -2 2 2 0 0 0 -2 -2zm-2 7v3h-3v2h3v3h2v-3h3v-2h-3v-3h-2zm-8 3a2 2 0 0 0 -2 2 2 2 0 0 0 2 2 2 2 0 0 0 2 -2 2 2 0 0 0 -2 -2z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="#ffd684" image-rendering="auto" shape-rendering="auto" solid-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-east-asian:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/> -</g> +<path d="m3 1a2 2 0 0 0 -2 2 2 2 0 0 0 2 2 2 2 0 0 0 2 -2 2 2 0 0 0 -2 -2zm10 0a2 2 0 0 0 -2 2 2 2 0 0 0 2 2 2 2 0 0 0 2 -2 2 2 0 0 0 -2 -2zm-2 7v3h-3v2h3v3h2v-3h3v-2h-3v-3h-2zm-8 3a2 2 0 0 0 -2 2 2 2 0 0 0 2 2 2 2 0 0 0 2 -2 2 2 0 0 0 -2 -2z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="#ffd684" image-rendering="auto" shape-rendering="auto" solid-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-east-asian:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/> </svg> diff --git a/editor/icons/icon_editor_handle_add.svg b/editor/icons/icon_editor_handle_add.svg deleted file mode 100644 index 0e7fe7129a..0000000000 --- a/editor/icons/icon_editor_handle_add.svg +++ /dev/null @@ -1,6 +0,0 @@ -<svg width="8" height="8" version="1.1" viewBox="0 0 8 8" xmlns="http://www.w3.org/2000/svg"> - <g transform="translate(0 -1044.4)"> - <ellipse cx="4" cy="1048.4" rx="4" ry="4" fill="#fff"/> - <ellipse cx="4" cy="1048.4" rx="2.8572" ry="2.8571" fill="#84ff84"/> - </g> -</svg> diff --git a/editor/icons/icon_editor_handle_selected.svg b/editor/icons/icon_editor_handle_selected.svg deleted file mode 100644 index 8d338c1fbd..0000000000 --- a/editor/icons/icon_editor_handle_selected.svg +++ /dev/null @@ -1,6 +0,0 @@ -<svg width="8" height="8" version="1.1" viewBox="0 0 8 8" xmlns="http://www.w3.org/2000/svg"> - <g transform="translate(0 -1044.4)"> - <ellipse cx="4" cy="1048.4" rx="4" ry="4" fill="#fff"/> - <ellipse cx="4" cy="1048.4" rx="2.8572" ry="2.8571" fill="#8484ff"/> - </g> -</svg> diff --git a/editor/icons/icon_h_button_array.svg b/editor/icons/icon_h_button_array.svg deleted file mode 100644 index 3f95dbbde1..0000000000 --- a/editor/icons/icon_h_button_array.svg +++ /dev/null @@ -1,5 +0,0 @@ -<svg width="16" height="16" version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg"> -<g transform="translate(0 -1036.4)"> -<path transform="translate(0 1036.4)" d="m4 1v3.1328l-1.4453-0.96484-1.1094 1.6641 3 2c0.3359 0.2239 0.77347 0.2239 1.1094 0l3-2-1.1094-1.6641-1.4453 0.96484v-3.1328h-2zm8 4v2h-2v2h2v2h2v-2h2v-2h-2v-2h-2zm-8.5 4c-0.831 0-1.5 0.669-1.5 1.5v0.5 1h-1v2h8v-2h-1v-1-0.5c0-0.831-0.669-1.5-1.5-1.5h-3z" fill="#a5efac"/> -</g> -</svg> diff --git a/editor/icons/icon_onion.svg b/editor/icons/icon_onion.svg new file mode 100644 index 0000000000..5bb2a99423 --- /dev/null +++ b/editor/icons/icon_onion.svg @@ -0,0 +1,3 @@ +<svg width="16" height="16" version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg"> +<path d="m8 1c-2 2-7 4-7 8s3 6 7 6c-7-3-6.5995-7.703 0-13-2.2981 3.9516-5.4951 8.9197 0 13 4.8692-4.2391 2.7733-8.1815 1-12 5.5855 4.704 5.3995 8.6488-1 12 4 0 7-2 7-6s-5-6-7-8z" fill="#e0e0e0"/> +</svg> diff --git a/editor/icons/icon_texture_button.svg b/editor/icons/icon_texture_button.svg index 17f87ab861..19f5e8d5c9 100644 --- a/editor/icons/icon_texture_button.svg +++ b/editor/icons/icon_texture_button.svg @@ -1,7 +1,5 @@ <svg width="16" height="16" version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg"> <g transform="translate(0 -1036.4)"> -<path transform="translate(0 1036.4)" d="m1 3v8h14v-8h-1-12-1zm8 2h1v1h1v2h1v2h-2-2-2-2v-1h1v-1h1v-1h2v-1h1v-1z" fill="#a5efac"/> -<rect transform="scale(1,-1)" x="1" y="-1049.4" width="14" height="2.0001" fill="#a5efac"/> -<rect transform="scale(1,-1)" x="1" y="-1049.4" width="14" height="2.0001" fill-opacity=".078431"/> +<path transform="translate(0 1036.4)" d="m8 1v2h6v10h-4v2h6v-14h-8zm-5 1v3.1328l-1.4453-0.96484-1.1094 1.6641 3 2c0.3359 0.2239 0.77347 0.2239 1.1094 0l3-2-1.1094-1.6641-1.4453 0.96484v-3.1328h-2zm7 4v1h-1v1h-1v1h1v2h2 2v-2h-1v-2h-1v-1h-1zm-7.5 4c-0.831 0-1.5 0.669-1.5 1.5v0.5 1h-1v2h8v-2h-1v-1-0.5c0-0.831-0.669-1.5-1.5-1.5h-3z" fill="#a5efac"/> </g> </svg> diff --git a/editor/icons/icon_texture_rect.svg b/editor/icons/icon_texture_rect.svg index 86d24ac223..2dbbe7f247 100644 --- a/editor/icons/icon_texture_rect.svg +++ b/editor/icons/icon_texture_rect.svg @@ -1,6 +1,5 @@ <svg width="16" height="16" version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg"> <g transform="translate(0 -1036.4)"> -<rect x="2" y="1038.4" width="12" height="12" fill="none" stroke="#a5efac" stroke-linecap="round" stroke-width="2"/> -<path d="m9 1042.4v1h-1v1h-2v1h-1v1h-1v1h2 2 2 2v-2h-1v-2h-1v-1h-1z" fill="#a5efac"/> +<path transform="translate(0 1036.4)" d="m1 1v14h14v-14h-14zm2 2h10v10h-10v-10zm6 3v1h-1v1h-2v1h-1v1h-1v1h2 2 2 2v-2h-1v-2h-1v-1h-1z" color="#000000" color-rendering="auto" dominant-baseline="auto" fill="#a5efac" image-rendering="auto" shape-rendering="auto" solid-color="#000000" style="font-feature-settings:normal;font-variant-alternates:normal;font-variant-caps:normal;font-variant-ligatures:normal;font-variant-numeric:normal;font-variant-position:normal;isolation:auto;mix-blend-mode:normal;shape-padding:0;text-decoration-color:#000000;text-decoration-line:none;text-decoration-style:solid;text-indent:0;text-orientation:mixed;text-transform:none;white-space:normal"/> </g> </svg> diff --git a/editor/icons/icon_v_button_array.svg b/editor/icons/icon_v_button_array.svg deleted file mode 100644 index ac7ce6064c..0000000000 --- a/editor/icons/icon_v_button_array.svg +++ /dev/null @@ -1,6 +0,0 @@ -<svg width="16" height="16" version="1.1" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg"> -<g transform="translate(0 -1036.4)" fill="#a5efac"> -<path transform="translate(0 1036.4)" d="m7 1v2.1328l-1.4453-0.96484-1.1094 1.6641 3 2c0.3359 0.2239 0.77347 0.2239 1.1094 0l3-2-1.1094-1.6641-1.4453 0.96484v-2.1328h-2zm-0.5 6c-0.831 0-1.5 0.669-1.5 1.5v0.5h-1v2h2v-2h4v2h2v-2h-1v-0.5c0-0.831-0.669-1.5-1.5-1.5h-3z"/> -<path d="m7 1046.4v2h-2v2h2v2h2v-2h2v-2h-2v-2z"/> -</g> -</svg> diff --git a/editor/import/resource_importer_obj.cpp b/editor/import/resource_importer_obj.cpp index 4541c77085..bd24aac99b 100644 --- a/editor/import/resource_importer_obj.cpp +++ b/editor/import/resource_importer_obj.cpp @@ -413,6 +413,7 @@ Node *EditorOBJImporter::import_scene(const String &p_path, uint32_t p_flags, in for (List<Ref<Mesh> >::Element *E = meshes.front(); E; E = E->next()) { MeshInstance *mi = memnew(MeshInstance); + mi->set_mesh(E->get()); mi->set_name(E->get()->get_name()); scene->add_child(mi); mi->set_owner(scene); diff --git a/editor/import/resource_importer_scene.cpp b/editor/import/resource_importer_scene.cpp index d8c3b8d3ed..63d4039295 100644 --- a/editor/import/resource_importer_scene.cpp +++ b/editor/import/resource_importer_scene.cpp @@ -302,7 +302,7 @@ Node *ResourceImporterScene::_fix_node(Node *p_node, Node *p_root, Map<Ref<Array // get mesh instance and bounding box MeshInstance *mi = Object::cast_to<MeshInstance>(p_node); - Rect3 aabb = mi->get_aabb(); + AABB aabb = mi->get_aabb(); // create a new rigid body collision node RigidBody *rigid_body = memnew(RigidBody); @@ -907,12 +907,11 @@ void ResourceImporterScene::_make_external_resources(Node *p_node, const String String ext_name = p_base_path.plus_file(_make_extname(mat->get_name()) + ".material"); if (p_keep_materials && FileAccess::exists(ext_name)) { //if exists, use it - Ref<Material> existing = ResourceLoader::load(ext_name); - p_materials[mat] = existing; + p_materials[mat] = ResourceLoader::load(ext_name); } else { ResourceSaver::save(ext_name, mat, ResourceSaver::FLAG_CHANGE_PATH); - p_materials[mat] = mat; + p_materials[mat] = ResourceLoader::load(ext_name); } } @@ -936,7 +935,8 @@ void ResourceImporterScene::_make_external_resources(Node *p_node, const String String ext_name = p_base_path.plus_file(_make_extname(mesh->get_name()) + ".mesh"); ResourceSaver::save(ext_name, mesh, ResourceSaver::FLAG_CHANGE_PATH); - p_meshes[mesh] = mesh; + p_meshes[mesh] = ResourceLoader::load(ext_name); + p_node->set(E->get().name, p_meshes[mesh]); mesh_just_added = true; } } @@ -956,18 +956,24 @@ void ResourceImporterScene::_make_external_resources(Node *p_node, const String ; if (FileAccess::exists(ext_name)) { //if exists, use it - Ref<Material> existing = ResourceLoader::load(ext_name); - p_materials[mat] = existing; + p_materials[mat] = ResourceLoader::load(ext_name); } else { ResourceSaver::save(ext_name, mat, ResourceSaver::FLAG_CHANGE_PATH); - p_materials[mat] = mat; + p_materials[mat] = ResourceLoader::load(ext_name); } } if (p_materials[mat] != mat) { mesh->surface_set_material(i, p_materials[mat]); + + //re-save the mesh since a material is now assigned + if (p_make_meshes) { + String ext_name = p_base_path.plus_file(_make_extname(mesh->get_name()) + ".mesh"); + ResourceSaver::save(ext_name, mesh, ResourceSaver::FLAG_CHANGE_PATH); + p_meshes[mesh] = ResourceLoader::load(ext_name); + } } } diff --git a/editor/plugins/animation_tree_editor_plugin.cpp b/editor/plugins/animation_tree_editor_plugin.cpp index 22d23e1c72..8fe6538653 100644 --- a/editor/plugins/animation_tree_editor_plugin.cpp +++ b/editor/plugins/animation_tree_editor_plugin.cpp @@ -1196,14 +1196,14 @@ void AnimationTreeEditor::_edit_filters() { if (base) { NodePath np = E->get(); - if (np.get_property() != StringName()) { + if (np.get_subname_count() == 1) { Node *n = base->get_node(np); Skeleton *s = Object::cast_to<Skeleton>(n); if (s) { String skelbase = E->get().substr(0, E->get().find(":")); - int bidx = s->find_bone(np.get_property()); + int bidx = s->find_bone(np.get_subname(0)); if (bidx != -1) { int bparent = s->get_bone_parent(bidx); @@ -1213,7 +1213,7 @@ void AnimationTreeEditor::_edit_filters() { String bpn = skelbase + ":" + s->get_bone_name(bparent); if (pm.has(bpn)) { parent = pm[bpn]; - descr = np.get_property(); + descr = np.get_subname(0); } } else { diff --git a/editor/plugins/asset_library_editor_plugin.cpp b/editor/plugins/asset_library_editor_plugin.cpp index d2e7feb6e1..b63352389e 100644 --- a/editor/plugins/asset_library_editor_plugin.cpp +++ b/editor/plugins/asset_library_editor_plugin.cpp @@ -47,9 +47,9 @@ void EditorAssetLibraryItem::configure(const String &p_title, int p_asset_id, co for (int i = 0; i < 5; i++) { if (i < p_rating) - stars[i]->set_texture(get_icon("RatingStar", "EditorIcons")); + stars[i]->set_texture(get_icon("Favorites", "EditorIcons")); else - stars[i]->set_texture(get_icon("RatingNoStar", "EditorIcons")); + stars[i]->set_texture(get_icon("NonFavorite", "EditorIcons")); } } @@ -273,15 +273,15 @@ EditorAssetLibraryItemDescription::EditorAssetLibraryItemDescription() { HBoxContainer *hbox = memnew(HBoxContainer); vbox->add_child(hbox); - vbox->add_constant_override("separation", 15); + vbox->add_constant_override("separation", 15 * EDSCALE); VBoxContainer *desc_vbox = memnew(VBoxContainer); hbox->add_child(desc_vbox); - hbox->add_constant_override("separation", 15); + hbox->add_constant_override("separation", 15 * EDSCALE); item = memnew(EditorAssetLibraryItem); desc_vbox->add_child(item); - desc_vbox->set_custom_minimum_size(Size2(300, 0)); + desc_vbox->set_custom_minimum_size(Size2(300 * EDSCALE, 0)); desc_bg = memnew(PanelContainer); desc_vbox->add_child(desc_bg); @@ -292,12 +292,12 @@ EditorAssetLibraryItemDescription::EditorAssetLibraryItemDescription() { desc_bg->add_child(description); preview = memnew(TextureRect); - preview->set_custom_minimum_size(Size2(640, 345)); + preview->set_custom_minimum_size(Size2(640 * EDSCALE, 345 * EDSCALE)); hbox->add_child(preview); previews_bg = memnew(PanelContainer); vbox->add_child(previews_bg); - previews_bg->set_custom_minimum_size(Size2(0, 85)); + previews_bg->set_custom_minimum_size(Size2(0, 101 * EDSCALE)); previews = memnew(ScrollContainer); previews_bg->add_child(previews); @@ -445,7 +445,7 @@ void EditorAssetLibraryItemDownload::_install() { void EditorAssetLibraryItemDownload::_make_request() { download->cancel_request(); - download->set_download_file(EditorSettings::get_singleton()->get_settings_path().plus_file("tmp").plus_file("tmp_asset_" + itos(asset_id)) + ".zip"); + download->set_download_file(EditorSettings::get_singleton()->get_cache_dir().plus_file("tmp_asset_" + itos(asset_id)) + ".zip"); Error err = download->request(host); if (err != OK) { @@ -680,7 +680,7 @@ void EditorAssetLibrary::_image_update(bool use_cache, bool final, const PoolByt PoolByteArray image_data = p_data; if (use_cache) { - String cache_filename_base = EditorSettings::get_singleton()->get_settings_path().plus_file("tmp").plus_file("assetimage_" + image_queue[p_queue_id].image_url.md5_text()); + String cache_filename_base = EditorSettings::get_singleton()->get_cache_dir().plus_file("assetimage_" + image_queue[p_queue_id].image_url.md5_text()); FileAccess *file = FileAccess::open(cache_filename_base + ".data", FileAccess::READ); @@ -702,15 +702,28 @@ void EditorAssetLibrary::_image_update(bool use_cache, bool final, const PoolByt Ref<Image> image = Ref<Image>(memnew(Image(r.ptr(), len))); if (!image->empty()) { - float max_height = 10000; switch (image_queue[p_queue_id].image_type) { - case IMAGE_QUEUE_ICON: max_height = 80; break; - case IMAGE_QUEUE_THUMBNAIL: max_height = 80; break; - case IMAGE_QUEUE_SCREENSHOT: max_height = 345; break; - } - float scale_ratio = max_height / image->get_height(); - if (scale_ratio < 1) { - image->resize(image->get_width() * scale_ratio, image->get_height() * scale_ratio, Image::INTERPOLATE_CUBIC); + case IMAGE_QUEUE_ICON: + + image->resize(80 * EDSCALE, 80 * EDSCALE, Image::INTERPOLATE_CUBIC); + + break; + case IMAGE_QUEUE_THUMBNAIL: { + float max_height = 85 * EDSCALE; + + float scale_ratio = max_height / (image->get_height() * EDSCALE); + if (scale_ratio < 1) { + image->resize(image->get_width() * EDSCALE * scale_ratio, image->get_height() * EDSCALE * scale_ratio, Image::INTERPOLATE_CUBIC); + } + } break; + case IMAGE_QUEUE_SCREENSHOT: { + float max_height = 397 * EDSCALE; + + float scale_ratio = max_height / (image->get_height() * EDSCALE); + if (scale_ratio < 1) { + image->resize(image->get_width() * EDSCALE * scale_ratio, image->get_height() * EDSCALE * scale_ratio, Image::INTERPOLATE_CUBIC); + } + } break; } Ref<ImageTexture> tex; @@ -738,7 +751,7 @@ void EditorAssetLibrary::_image_request_completed(int p_status, int p_code, cons if (p_code != HTTPClient::RESPONSE_NOT_MODIFIED) { for (int i = 0; i < headers.size(); i++) { if (headers[i].findn("ETag:") == 0) { // Save etag - String cache_filename_base = EditorSettings::get_singleton()->get_settings_path().plus_file("tmp").plus_file("assetimage_" + image_queue[p_queue_id].image_url.md5_text()); + String cache_filename_base = EditorSettings::get_singleton()->get_cache_dir().plus_file("assetimage_" + image_queue[p_queue_id].image_url.md5_text()); String new_etag = headers[i].substr(headers[i].find(":") + 1, headers[i].length()).strip_edges(); FileAccess *file; @@ -786,7 +799,7 @@ void EditorAssetLibrary::_update_image_queue() { for (Map<int, ImageQueue>::Element *E = image_queue.front(); E; E = E->next()) { if (!E->get().active && current_images < max_images) { - String cache_filename_base = EditorSettings::get_singleton()->get_settings_path().plus_file("tmp").plus_file("assetimage_" + E->get().image_url.md5_text()); + String cache_filename_base = EditorSettings::get_singleton()->get_cache_dir().plus_file("assetimage_" + E->get().image_url.md5_text()); Vector<String> headers; if (FileAccess::exists(cache_filename_base + ".etag") && FileAccess::exists(cache_filename_base + ".data")) { diff --git a/editor/plugins/canvas_item_editor_plugin.cpp b/editor/plugins/canvas_item_editor_plugin.cpp index 38467369db..3940dd9044 100644 --- a/editor/plugins/canvas_item_editor_plugin.cpp +++ b/editor/plugins/canvas_item_editor_plugin.cpp @@ -176,9 +176,9 @@ void CanvasItemEditor::_edit_set_pivot(const Vector2 &mouse_pos) { for (List<Node *>::Element *E = selection.front(); E; E = E->next()) { Node2D *n2d = Object::cast_to<Node2D>(E->get()); - if (n2d && n2d->edit_has_pivot()) { + if (n2d && n2d->_edit_use_pivot()) { - Vector2 offset = n2d->edit_get_pivot(); + Vector2 offset = n2d->_edit_get_pivot(); Vector2 gpos = n2d->get_global_position(); Vector2 local_mouse_pos = n2d->get_canvas_transform().affine_inverse().xform(mouse_pos); @@ -186,9 +186,9 @@ void CanvasItemEditor::_edit_set_pivot(const Vector2 &mouse_pos) { Vector2 motion_ofs = gpos - 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_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_position", gpos); - undo_redo->add_undo_method(n2d, "edit_set_pivot", offset); + undo_redo->add_undo_method(n2d, "_edit_set_pivot", offset); for (int i = 0; i < n2d->get_child_count(); i++) { Node2D *n2dc = Object::cast_to<Node2D>(n2d->get_child(i)); if (!n2dc) @@ -249,8 +249,8 @@ void CanvasItemEditor::_snap_other_nodes(Point2 p_value, Point2 &r_current_snap, Transform2D ci_transform = canvas_item->get_global_transform_with_canvas(); Transform2D to_snap_transform = p_to_snap ? p_to_snap->get_global_transform_with_canvas() : Transform2D(); if (fmod(ci_transform.get_rotation() - to_snap_transform.get_rotation(), (real_t)360.0) == 0.0) { - Point2 begin = ci_transform.xform(canvas_item->get_item_rect().get_position()); - Point2 end = ci_transform.xform(canvas_item->get_item_rect().get_position() + canvas_item->get_item_rect().get_size()); + Point2 begin = ci_transform.xform(canvas_item->_edit_get_rect().get_position()); + Point2 end = ci_transform.xform(canvas_item->_edit_get_rect().get_position() + canvas_item->_edit_get_rect().get_size()); _snap_if_closer_point(p_value, begin, r_current_snap, r_snapped, ci_transform.get_rotation()); _snap_if_closer_point(p_value, end, r_current_snap, r_snapped, ci_transform.get_rotation()); @@ -282,8 +282,8 @@ Point2 CanvasItemEditor::snap_point(Point2 p_target, unsigned int p_modes, const end = p_canvas_item->get_global_transform_with_canvas().xform(_anchor_to_position(c, Point2(1, 1))); can_snap = true; } else if (const CanvasItem *parent_ci = Object::cast_to<CanvasItem>(p_canvas_item->get_parent())) { - begin = p_canvas_item->get_transform().affine_inverse().xform(parent_ci->get_item_rect().get_position()); - end = p_canvas_item->get_transform().affine_inverse().xform(parent_ci->get_item_rect().get_position() + parent_ci->get_item_rect().get_size()); + begin = p_canvas_item->get_transform().affine_inverse().xform(parent_ci->_edit_get_rect().get_position()); + end = p_canvas_item->get_transform().affine_inverse().xform(parent_ci->_edit_get_rect().get_position() + parent_ci->_edit_get_rect().get_size()); can_snap = true; } @@ -306,8 +306,8 @@ Point2 CanvasItemEditor::snap_point(Point2 p_target, unsigned int p_modes, const // Self sides (for anchors) if ((snap_active && snap_node_sides && (p_modes & SNAP_NODE_SIDES)) || (p_forced_modes & SNAP_NODE_SIDES)) { - begin = p_canvas_item->get_global_transform_with_canvas().xform(p_canvas_item->get_item_rect().get_position()); - end = p_canvas_item->get_global_transform_with_canvas().xform(p_canvas_item->get_item_rect().get_position() + p_canvas_item->get_item_rect().get_size()); + begin = p_canvas_item->get_global_transform_with_canvas().xform(p_canvas_item->_edit_get_rect().get_position()); + end = p_canvas_item->get_global_transform_with_canvas().xform(p_canvas_item->_edit_get_rect().get_position() + p_canvas_item->_edit_get_rect().get_size()); _snap_if_closer_point(p_target, begin, output, snapped, rotation); _snap_if_closer_point(p_target, end, output, snapped, rotation); } @@ -629,7 +629,7 @@ void CanvasItemEditor::_find_canvas_items_at_pos(const Point2 &p_pos, Node *p_no if (c && c->is_visible_in_tree() && !c->has_meta("_edit_lock_") && !Object::cast_to<CanvasLayer>(c)) { - Rect2 rect = c->get_item_rect(); + Rect2 rect = c->_edit_get_rect(); Point2 local_pos = (p_parent_xform * p_canvas_xform * c->get_transform()).affine_inverse().xform(p_pos); if (rect.has_point(local_pos)) { @@ -675,7 +675,7 @@ void CanvasItemEditor::_find_canvas_items_at_rect(const Rect2 &p_rect, Node *p_n if (c && c->is_visible_in_tree() && !c->has_meta("_edit_lock_") && !Object::cast_to<CanvasLayer>(c)) { - Rect2 rect = c->get_item_rect(); + Rect2 rect = c->_edit_get_rect(); Transform2D xform = p_parent_xform * p_canvas_xform * c->get_transform(); if (p_rect.has_point(xform.xform(rect.position)) && @@ -767,15 +767,15 @@ void CanvasItemEditor::_key_move(const Vector2 &p_dir, bool p_snap, KeyMoveMODE if (p_snap) drag *= grid_step * Math::pow(2.0, grid_step_multiplier); - undo_redo->add_undo_method(canvas_item, "edit_set_state", canvas_item->edit_get_state()); + undo_redo->add_undo_method(canvas_item, "_edit_set_state", canvas_item->_edit_get_state()); if (p_move_mode == MOVE_VIEW_BASE) { // drag = transform.affine_inverse().basis_xform(p_dir); // zoom sensitive drag = canvas_item->get_global_transform_with_canvas().affine_inverse().basis_xform(drag); - Rect2 local_rect = canvas_item->get_item_rect(); + Rect2 local_rect = canvas_item->_edit_get_rect(); local_rect.position += drag; - undo_redo->add_do_method(canvas_item, "edit_set_rect", local_rect); + undo_redo->add_do_method(canvas_item, "_edit_set_rect", local_rect); } else { // p_move_mode==MOVE_LOCAL_BASE || p_move_mode==MOVE_LOCAL_WITH_ROT @@ -816,7 +816,7 @@ Point2 CanvasItemEditor::_find_topleftmost_point() { if (canvas_item->get_viewport() != EditorNode::get_singleton()->get_scene_root()) continue; - Rect2 rect = canvas_item->get_item_rect(); + Rect2 rect = canvas_item->_edit_get_rect(); Transform2D xform = canvas_item->get_global_transform_with_canvas(); r2.expand_to(xform.xform(rect.position)); @@ -877,7 +877,7 @@ CanvasItemEditor::DragType CanvasItemEditor::_get_resize_handle_drag_type(const ERR_FAIL_COND_V(!canvas_item, DRAG_NONE); - Rect2 rect = canvas_item->get_item_rect(); + Rect2 rect = canvas_item->_edit_get_rect(); Transform2D xforml = canvas_item->get_global_transform_with_canvas(); Transform2D xform = transform * xforml; @@ -1011,14 +1011,14 @@ void CanvasItemEditor::_prepare_drag(const Point2 &p_click_pos) { if (!se) continue; - se->undo_state = canvas_item->edit_get_state(); + se->undo_state = canvas_item->_edit_get_state(); if (Object::cast_to<Node2D>(canvas_item)) - se->undo_pivot = Object::cast_to<Node2D>(canvas_item)->edit_get_pivot(); + se->undo_pivot = Object::cast_to<Node2D>(canvas_item)->_edit_get_pivot(); if (Object::cast_to<Control>(canvas_item)) se->undo_pivot = Object::cast_to<Control>(canvas_item)->get_pivot_offset(); se->pre_drag_xform = canvas_item->get_global_transform_with_canvas(); - se->pre_drag_rect = canvas_item->get_item_rect(); + se->pre_drag_rect = canvas_item->_edit_get_rect(); } if (selection.size() == 1 && Object::cast_to<Node2D>(selection[0]) && bone_ik_list.size() == 0) { @@ -1442,6 +1442,22 @@ void CanvasItemEditor::_gui_input_viewport(const Ref<InputEvent> &p_event) { } } + Ref<InputEventMagnifyGesture> magnify_gesture = p_event; + if (magnify_gesture.is_valid()) { + + _zoom_on_position(zoom * magnify_gesture->get_factor(), magnify_gesture->get_position()); + return; + } + + Ref<InputEventPanGesture> pan_gesture = p_event; + if (pan_gesture.is_valid()) { + + const Vector2 delta = (int(EditorSettings::get_singleton()->get("editors/2d/pan_speed")) / zoom) * pan_gesture->get_delta(); + h_scroll->set_value(h_scroll->get_value() + delta.x); + v_scroll->set_value(v_scroll->get_value() + delta.y); + return; + } + Ref<InputEventMouseButton> b = p_event; if (b.is_valid()) { // Button event @@ -1500,7 +1516,7 @@ void CanvasItemEditor::_gui_input_viewport(const Ref<InputEvent> &p_event) { // Cancel a drag if (bone_ik_list.size()) { for (List<BoneIK>::Element *E = bone_ik_list.back(); E; E = E->prev()) { - E->get().node->edit_set_state(E->get().orig_state); + E->get().node->_edit_set_state(E->get().orig_state); } bone_ik_list.clear(); @@ -1519,9 +1535,9 @@ void CanvasItemEditor::_gui_input_viewport(const Ref<InputEvent> &p_event) { if (!se) continue; - canvas_item->edit_set_state(se->undo_state); + canvas_item->_edit_set_state(se->undo_state); if (Object::cast_to<Node2D>(canvas_item)) - Object::cast_to<Node2D>(canvas_item)->edit_set_pivot(se->undo_pivot); + Object::cast_to<Node2D>(canvas_item)->_edit_set_pivot(se->undo_pivot); if (Object::cast_to<Control>(canvas_item)) Object::cast_to<Control>(canvas_item)->set_pivot_offset(se->undo_pivot); } @@ -1574,8 +1590,8 @@ void CanvasItemEditor::_gui_input_viewport(const Ref<InputEvent> &p_event) { for (List<BoneIK>::Element *E = bone_ik_list.back(); E; E = E->prev()) { - undo_redo->add_do_method(E->get().node, "edit_set_state", E->get().node->edit_get_state()); - undo_redo->add_undo_method(E->get().node, "edit_set_state", E->get().orig_state); + undo_redo->add_do_method(E->get().node, "_edit_set_state", E->get().node->_edit_get_state()); + undo_redo->add_undo_method(E->get().node, "_edit_set_state", E->get().orig_state); } undo_redo->add_do_method(viewport, "update"); @@ -1601,14 +1617,14 @@ void CanvasItemEditor::_gui_input_viewport(const Ref<InputEvent> &p_event) { if (!se) continue; - Variant state = canvas_item->edit_get_state(); - undo_redo->add_do_method(canvas_item, "edit_set_state", state); - undo_redo->add_undo_method(canvas_item, "edit_set_state", se->undo_state); + Variant state = canvas_item->_edit_get_state(); + undo_redo->add_do_method(canvas_item, "_edit_set_state", state); + undo_redo->add_undo_method(canvas_item, "_edit_set_state", se->undo_state); { Node2D *pvt = Object::cast_to<Node2D>(canvas_item); - if (pvt && pvt->edit_has_pivot()) { - undo_redo->add_do_method(canvas_item, "edit_set_pivot", pvt->edit_get_pivot()); - undo_redo->add_undo_method(canvas_item, "edit_set_pivot", se->undo_pivot); + if (pvt && pvt->_edit_use_pivot()) { + undo_redo->add_do_method(canvas_item, "_edit_set_pivot", pvt->_edit_get_pivot()); + undo_redo->add_undo_method(canvas_item, "_edit_set_pivot", se->undo_pivot); } Control *cnt = Object::cast_to<Control>(canvas_item); @@ -1709,7 +1725,7 @@ void CanvasItemEditor::_gui_input_viewport(const Ref<InputEvent> &p_event) { BoneIK bik; bik.node = b; bik.len = len; - bik.orig_state = b->edit_get_state(); + bik.orig_state = b->_edit_get_state(); bone_ik_list.push_back(bik); @@ -1741,13 +1757,13 @@ void CanvasItemEditor::_gui_input_viewport(const Ref<InputEvent> &p_event) { if ((b->get_control() && tool == TOOL_SELECT) || tool == TOOL_ROTATE) { drag = DRAG_ROTATE; drag_from = transform.affine_inverse().xform(click); - se->undo_state = canvas_item->edit_get_state(); + se->undo_state = canvas_item->_edit_get_state(); if (Object::cast_to<Node2D>(canvas_item)) - se->undo_pivot = Object::cast_to<Node2D>(canvas_item)->edit_get_pivot(); + se->undo_pivot = Object::cast_to<Node2D>(canvas_item)->_edit_get_pivot(); if (Object::cast_to<Control>(canvas_item)) se->undo_pivot = Object::cast_to<Control>(canvas_item)->get_pivot_offset(); se->pre_drag_xform = canvas_item->get_global_transform_with_canvas(); - se->pre_drag_rect = canvas_item->get_item_rect(); + se->pre_drag_rect = canvas_item->_edit_get_rect(); return; } @@ -1764,13 +1780,13 @@ void CanvasItemEditor::_gui_input_viewport(const Ref<InputEvent> &p_event) { drag = _get_resize_handle_drag_type(click, drag_point_from); if (drag != DRAG_NONE) { drag_from = transform.affine_inverse().xform(click); - se->undo_state = canvas_item->edit_get_state(); + se->undo_state = canvas_item->_edit_get_state(); if (Object::cast_to<Node2D>(canvas_item)) - se->undo_pivot = Object::cast_to<Node2D>(canvas_item)->edit_get_pivot(); + se->undo_pivot = Object::cast_to<Node2D>(canvas_item)->_edit_get_pivot(); if (Object::cast_to<Control>(canvas_item)) se->undo_pivot = Object::cast_to<Control>(canvas_item)->get_pivot_offset(); se->pre_drag_xform = canvas_item->get_global_transform_with_canvas(); - se->pre_drag_rect = canvas_item->get_item_rect(); + se->pre_drag_rect = canvas_item->_edit_get_rect(); return; } @@ -1780,9 +1796,9 @@ void CanvasItemEditor::_gui_input_viewport(const Ref<InputEvent> &p_event) { drag = _get_anchor_handle_drag_type(click, drag_point_from); if (drag != DRAG_NONE) { drag_from = transform.affine_inverse().xform(click); - se->undo_state = canvas_item->edit_get_state(); + se->undo_state = canvas_item->_edit_get_state(); se->pre_drag_xform = canvas_item->get_global_transform_with_canvas(); - se->pre_drag_rect = canvas_item->get_item_rect(); + se->pre_drag_rect = canvas_item->_edit_get_rect(); return; } } @@ -1858,7 +1874,17 @@ void CanvasItemEditor::_gui_input_viewport(const Ref<InputEvent> &p_event) { } if (drag == DRAG_NONE) { - if (((m->get_button_mask() & BUTTON_MASK_LEFT) && tool == TOOL_PAN) || (m->get_button_mask() & BUTTON_MASK_MIDDLE) || ((m->get_button_mask() & BUTTON_MASK_LEFT) && Input::get_singleton()->is_key_pressed(KEY_SPACE))) { + bool space_pressed = Input::get_singleton()->is_key_pressed(KEY_SPACE); + bool simple_panning = EditorSettings::get_singleton()->get("editors/2d/simple_spacebar_panning"); + int button = m->get_button_mask(); + + // Check if any of the panning triggers are activated + bool panning_tool = (button & BUTTON_MASK_LEFT) && tool == TOOL_PAN; + bool panning_middle_button = button & BUTTON_MASK_MIDDLE; + bool panning_spacebar = (button & BUTTON_MASK_LEFT) && space_pressed; + bool panning_spacebar_simple = space_pressed && simple_panning; + + if (panning_tool || panning_middle_button || panning_spacebar || panning_spacebar_simple) { // Pan the viewport Point2i relative; if (bool(EditorSettings::get_singleton()->get("editors/2d/warped_mouse_panning"))) { @@ -1890,9 +1916,9 @@ void CanvasItemEditor::_gui_input_viewport(const Ref<InputEvent> &p_event) { bool dragging_bone = drag == DRAG_ALL && selection.size() == 1 && bone_ik_list.size(); if (!dragging_bone) { - canvas_item->edit_set_state(se->undo_state); //reset state and reapply + canvas_item->_edit_set_state(se->undo_state); //reset state and reapply if (Object::cast_to<Node2D>(canvas_item)) - Object::cast_to<Node2D>(canvas_item)->edit_set_pivot(se->undo_pivot); + Object::cast_to<Node2D>(canvas_item)->_edit_set_pivot(se->undo_pivot); if (Object::cast_to<Control>(canvas_item)) Object::cast_to<Control>(canvas_item)->set_pivot_offset(se->undo_pivot); } @@ -2003,10 +2029,10 @@ void CanvasItemEditor::_gui_input_viewport(const Ref<InputEvent> &p_event) { canvas_item->get_global_transform_with_canvas().affine_inverse().xform(dto) - canvas_item->get_global_transform_with_canvas().affine_inverse().xform(dfrom); - Rect2 local_rect = canvas_item->get_item_rect(); + Rect2 local_rect = canvas_item->_edit_get_rect(); Vector2 begin = local_rect.position; Vector2 end = local_rect.position + local_rect.size; - Vector2 minsize = canvas_item->edit_get_minimum_size(); + Vector2 minsize = canvas_item->_edit_get_minimum_size(); if (uniform) { // Keep the height/width ratio of the item @@ -2084,7 +2110,7 @@ void CanvasItemEditor::_gui_input_viewport(const Ref<InputEvent> &p_event) { if (Object::cast_to<Node2D>(canvas_item)) { Node2D *n2d = Object::cast_to<Node2D>(canvas_item); - n2d->edit_set_pivot(se->undo_pivot + drag_vector); + n2d->_edit_set_pivot(se->undo_pivot + drag_vector); } if (Object::cast_to<Control>(canvas_item)) { Object::cast_to<Control>(canvas_item)->set_pivot_offset(se->undo_pivot + drag_vector); @@ -2103,7 +2129,7 @@ void CanvasItemEditor::_gui_input_viewport(const Ref<InputEvent> &p_event) { local_rect.position = begin; local_rect.size = end - begin; - canvas_item->edit_set_rect(local_rect); + canvas_item->_edit_set_rect(local_rect); } else { //ok, all that had to be done was done, now solve IK @@ -2454,7 +2480,7 @@ void CanvasItemEditor::_draw_selection() { if (!se) continue; - Rect2 rect = canvas_item->get_item_rect(); + Rect2 rect = canvas_item->_edit_get_rect(); if (show_helpers && drag != DRAG_NONE && drag != DRAG_PIVOT) { const Transform2D pre_drag_xform = transform * se->pre_drag_xform; @@ -2496,7 +2522,7 @@ void CanvasItemEditor::_draw_selection() { Node2D *node2d = Object::cast_to<Node2D>(canvas_item); if (node2d) { - if (node2d->edit_has_pivot()) { + if (node2d->_edit_use_pivot()) { viewport->draw_texture(pivot_icon, xform.get_origin() + (-pivot_icon->get_size() / 2).floor()); can_move_pivot = true; pivot_found = true; @@ -2868,7 +2894,7 @@ void CanvasItemEditor::_get_encompassing_rect(Node *p_node, Rect2 &r_rect, const CanvasItem *c = Object::cast_to<CanvasItem>(p_node); if (c && c->is_visible_in_tree()) { - Rect2 rect = c->get_item_rect(); + Rect2 rect = c->_edit_get_rect(); Transform2D xform = p_xform * c->get_transform(); r_rect.expand_to(xform.xform(rect.position)); r_rect.expand_to(xform.xform(rect.position + Point2(rect.size.x, 0))); @@ -2963,7 +2989,7 @@ void CanvasItemEditor::_notification(int p_what) { if (!se) continue; - Rect2 r = canvas_item->get_item_rect(); + Rect2 r = canvas_item->_edit_get_rect(); Transform2D xform = canvas_item->get_transform(); if (r != se->prev_rect || xform != se->prev_xform) { @@ -3899,7 +3925,7 @@ void CanvasItemEditor::_focus_selection(int p_op) { //if (!canvas_item->is_visible_in_tree()) continue; ++count; - Rect2 item_rect = canvas_item->get_item_rect(); + Rect2 item_rect = canvas_item->_edit_get_rect(); Vector2 pos = canvas_item->get_global_transform().get_origin(); Vector2 scale = canvas_item->get_global_transform().get_scale(); diff --git a/editor/plugins/collision_polygon_editor_plugin.cpp b/editor/plugins/collision_polygon_editor_plugin.cpp index 24c4813771..0818c8975e 100644 --- a/editor/plugins/collision_polygon_editor_plugin.cpp +++ b/editor/plugins/collision_polygon_editor_plugin.cpp @@ -389,7 +389,7 @@ void CollisionPolygonEditor::_polygon_draw() { rect = rect.grow(1); - Rect3 r; + AABB r; r.position.x = rect.position.x; r.position.y = rect.position.y; r.position.z = depth; diff --git a/editor/plugins/editor_preview_plugins.cpp b/editor/plugins/editor_preview_plugins.cpp index 5f73d0b465..ed04c90cc5 100644 --- a/editor/plugins/editor_preview_plugins.cpp +++ b/editor/plugins/editor_preview_plugins.cpp @@ -184,7 +184,7 @@ Ref<Texture> EditorPackedScenePreviewPlugin::generate(const RES &p_from) { Ref<Texture> EditorPackedScenePreviewPlugin::generate_from_path(const String &p_path) { - String temp_path = EditorSettings::get_singleton()->get_settings_path().plus_file("tmp"); + String temp_path = EditorSettings::get_singleton()->get_cache_dir(); String cache_base = ProjectSettings::get_singleton()->globalize_path(p_path).md5_text(); cache_base = temp_path.plus_file("resthumb-" + cache_base); @@ -790,13 +790,13 @@ Ref<Texture> EditorMeshPreviewPlugin::generate(const RES &p_from) { VS::get_singleton()->instance_set_base(mesh_instance, mesh->get_rid()); - Rect3 aabb = mesh->get_aabb(); + AABB aabb = mesh->get_aabb(); Vector3 ofs = aabb.position + aabb.size * 0.5; aabb.position -= ofs; Transform xform; xform.basis = Basis().rotated(Vector3(0, 1, 0), -Math_PI * 0.125); xform.basis = Basis().rotated(Vector3(1, 0, 0), Math_PI * 0.125) * xform.basis; - Rect3 rot_aabb = xform.xform(aabb); + AABB rot_aabb = xform.xform(aabb); float m = MAX(rot_aabb.size.x, rot_aabb.size.y) * 0.5; if (m == 0) return Ref<Texture>(); diff --git a/editor/plugins/mesh_editor_plugin.cpp b/editor/plugins/mesh_editor_plugin.cpp index 74618aecc2..60e8858b2d 100644 --- a/editor/plugins/mesh_editor_plugin.cpp +++ b/editor/plugins/mesh_editor_plugin.cpp @@ -95,7 +95,7 @@ void MeshEditor::edit(Ref<Mesh> p_mesh) { rot_y = 0; _update_rotation(); - Rect3 aabb = mesh->get_aabb(); + AABB aabb = mesh->get_aabb(); print_line("aabb: " + aabb); Vector3 ofs = aabb.position + aabb.size * 0.5; float m = aabb.get_longest_axis_size(); diff --git a/editor/plugins/particles_editor_plugin.cpp b/editor/plugins/particles_editor_plugin.cpp index 10834b74ff..f4a9960087 100644 --- a/editor/plugins/particles_editor_plugin.cpp +++ b/editor/plugins/particles_editor_plugin.cpp @@ -153,15 +153,15 @@ void ParticlesEditor::_generate_aabb() { EditorProgress ep("gen_aabb", TTR("Generating AABB"), int(time)); - Rect3 rect; + AABB rect; while (running < time) { uint64_t ticks = OS::get_singleton()->get_ticks_usec(); ep.step("Generating..", int(running), true); OS::get_singleton()->delay_usec(1000); - Rect3 capture = node->capture_aabb(); - if (rect == Rect3()) + AABB capture = node->capture_aabb(); + if (rect == AABB()) rect = capture; else rect.merge_with(capture); @@ -247,7 +247,7 @@ void ParticlesEditor::_generate_emission_points() { PoolVector<Face3>::Read r = geometry.read(); - Rect3 aabb; + AABB aabb; for (int i = 0; i < gcount; i++) { diff --git a/editor/plugins/polygon_2d_editor_plugin.cpp b/editor/plugins/polygon_2d_editor_plugin.cpp index a525983c75..ebb5f57e99 100644 --- a/editor/plugins/polygon_2d_editor_plugin.cpp +++ b/editor/plugins/polygon_2d_editor_plugin.cpp @@ -339,6 +339,19 @@ void Polygon2DEditor::_uv_input(const Ref<InputEvent> &p_input) { uv_edit_draw->update(); } } + + Ref<InputEventMagnifyGesture> magnify_gesture = p_input; + if (magnify_gesture.is_valid()) { + + uv_zoom->set_value(uv_zoom->get_value() * magnify_gesture->get_factor()); + } + + Ref<InputEventPanGesture> pan_gesture = p_input; + if (pan_gesture.is_valid()) { + + uv_hscroll->set_value(uv_hscroll->get_value() + uv_hscroll->get_page() * pan_gesture->get_delta().x / 8); + uv_vscroll->set_value(uv_vscroll->get_value() + uv_vscroll->get_page() * pan_gesture->get_delta().y / 8); + } } void Polygon2DEditor::_uv_scroll_changed(float) { diff --git a/editor/plugins/script_editor_plugin.cpp b/editor/plugins/script_editor_plugin.cpp index 607ccaa4e7..3c2d52c128 100644 --- a/editor/plugins/script_editor_plugin.cpp +++ b/editor/plugins/script_editor_plugin.cpp @@ -586,6 +586,32 @@ void ScriptEditor::_close_docs_tab() { } } +void ScriptEditor::_close_other_tabs() { + + int child_count = tab_container->get_child_count(); + int current_idx = tab_container->get_current_tab(); + for (int i = child_count - 1; i >= 0; i--) { + + if (i == current_idx) { + continue; + } + + tab_container->set_current_tab(i); + ScriptEditorBase *se = Object::cast_to<ScriptEditorBase>(tab_container->get_child(i)); + + if (se) { + + // Maybe there are unsaved changes + if (se->is_unsaved()) { + _ask_close_current_unsaved_tab(se); + continue; + } + } + + _close_current_tab(); + } +} + void ScriptEditor::_close_all_tabs() { int child_count = tab_container->get_child_count(); @@ -855,7 +881,7 @@ void ScriptEditor::_menu_option(int p_option) { file_dialog_option = FILE_SAVE_THEME_AS; file_dialog->clear_filters(); file_dialog->add_filter("*.tet"); - file_dialog->set_current_path(EditorSettings::get_singleton()->get_settings_path() + "/text_editor_themes/" + EditorSettings::get_singleton()->get("text_editor/theme/color_theme")); + file_dialog->set_current_path(EditorSettings::get_singleton()->get_text_editor_themes_dir().plus_file(EditorSettings::get_singleton()->get("text_editor/theme/color_theme"))); file_dialog->popup_centered_ratio(); file_dialog->set_title(TTR("Save Theme As..")); } break; @@ -1003,6 +1029,9 @@ void ScriptEditor::_menu_option(int p_option) { case CLOSE_DOCS: { _close_docs_tab(); } break; + case CLOSE_OTHER_TABS: { + _close_other_tabs(); + } break; case CLOSE_ALL: { _close_all_tabs(); } break; @@ -1078,6 +1107,9 @@ void ScriptEditor::_menu_option(int p_option) { case CLOSE_DOCS: { _close_docs_tab(); } break; + case CLOSE_OTHER_TABS: { + _close_other_tabs(); + } break; case CLOSE_ALL: { _close_all_tabs(); } break; @@ -1119,6 +1151,7 @@ void ScriptEditor::_notification(int p_what) { editor->connect("script_add_function_request", this, "_add_callback"); editor->connect("resource_saved", this, "_res_saved_callback"); script_list->connect("item_selected", this, "_script_selected"); + members_overview->connect("item_selected", this, "_members_overview_selected"); help_overview->connect("item_selected", this, "_help_overview_selected"); script_split->connect("dragged", this, "_script_split_dragged"); @@ -1583,7 +1616,7 @@ void ScriptEditor::_update_script_names() { } } - if (_sort_list_on_update) { + if (_sort_list_on_update && !sedata.empty()) { sedata.sort(); // change actual order of tab_container so that the order can be rearranged by user @@ -2139,6 +2172,8 @@ void ScriptEditor::_make_script_list_context_menu() { context_menu->add_shortcut(ED_GET_SHORTCUT("script_editor/save"), FILE_SAVE); context_menu->add_shortcut(ED_GET_SHORTCUT("script_editor/save_as"), FILE_SAVE_AS); context_menu->add_shortcut(ED_GET_SHORTCUT("script_editor/close_file"), FILE_CLOSE); + context_menu->add_shortcut(ED_GET_SHORTCUT("script_editor/close_all"), CLOSE_ALL); + context_menu->add_shortcut(ED_GET_SHORTCUT("script_editor/close_other_tabs"), CLOSE_OTHER_TABS); context_menu->add_separator(); context_menu->add_shortcut(ED_GET_SHORTCUT("script_editor/reload_script_soft"), FILE_TOOL_RELOAD_SOFT); @@ -2458,6 +2493,7 @@ void ScriptEditor::_bind_methods() { ClassDB::bind_method("_close_discard_current_tab", &ScriptEditor::_close_discard_current_tab); ClassDB::bind_method("_close_docs_tab", &ScriptEditor::_close_docs_tab); ClassDB::bind_method("_close_all_tabs", &ScriptEditor::_close_all_tabs); + ClassDB::bind_method("_close_other_tabs", &ScriptEditor::_close_other_tabs); ClassDB::bind_method("_open_recent_script", &ScriptEditor::_open_recent_script); ClassDB::bind_method("_editor_play", &ScriptEditor::_editor_play); ClassDB::bind_method("_editor_pause", &ScriptEditor::_editor_pause); @@ -2539,7 +2575,6 @@ ScriptEditor::ScriptEditor(EditorNode *p_editor) { script_list->set_v_size_flags(SIZE_EXPAND_FILL); script_split->set_split_offset(140); //list_split->set_split_offset(500); - _sort_list_on_update = true; script_list->connect("gui_input", this, "_script_list_gui_input"); script_list->set_allow_rmb_select(true); @@ -2604,6 +2639,7 @@ ScriptEditor::ScriptEditor(EditorNode *p_editor) { file_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/close_docs", TTR("Close Docs")), CLOSE_DOCS); file_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/close_file", TTR("Close"), KEY_MASK_CMD | KEY_W), FILE_CLOSE); file_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/close_all", TTR("Close All")), CLOSE_ALL); + file_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/close_other_tabs", TTR("Close Other Tabs")), CLOSE_OTHER_TABS); file_menu->get_popup()->add_separator(); file_menu->get_popup()->add_shortcut(ED_SHORTCUT("script_editor/run_file", TTR("Run"), KEY_MASK_CMD | KEY_MASK_SHIFT | KEY_X), FILE_RUN); file_menu->get_popup()->add_separator(); @@ -2861,7 +2897,7 @@ ScriptEditorPlugin::ScriptEditorPlugin(EditorNode *p_node) { EDITOR_DEF("text_editor/open_scripts/script_temperature_enabled", true); EDITOR_DEF("text_editor/open_scripts/highlight_current_script", true); EDITOR_DEF("text_editor/open_scripts/script_temperature_history_size", 15); - EDITOR_DEF("text_editor/open_scripts/current_script_background_color", Color(1, 1, 1, 0.5)); + EDITOR_DEF("text_editor/open_scripts/current_script_background_color", Color(1, 1, 1, 0.3)); EDITOR_DEF("text_editor/open_scripts/group_help_pages", true); EditorSettings::get_singleton()->add_property_hint(PropertyInfo(Variant::INT, "text_editor/open_scripts/sort_scripts_by", PROPERTY_HINT_ENUM, "Name,Path")); EDITOR_DEF("text_editor/open_scripts/sort_scripts_by", 0); diff --git a/editor/plugins/script_editor_plugin.h b/editor/plugins/script_editor_plugin.h index b8317f9e86..77ca4bc9d9 100644 --- a/editor/plugins/script_editor_plugin.h +++ b/editor/plugins/script_editor_plugin.h @@ -135,6 +135,7 @@ class ScriptEditor : public PanelContainer { FILE_CLOSE, CLOSE_DOCS, CLOSE_ALL, + CLOSE_OTHER_TABS, TOGGLE_SCRIPTS_PANEL, FILE_TOOL_RELOAD, FILE_TOOL_RELOAD_SOFT, @@ -251,6 +252,7 @@ class ScriptEditor : public PanelContainer { void _close_current_tab(); void _close_discard_current_tab(const String &p_str); void _close_docs_tab(); + void _close_other_tabs(); void _close_all_tabs(); void _ask_close_current_unsaved_tab(ScriptEditorBase *current); diff --git a/editor/plugins/script_text_editor.cpp b/editor/plugins/script_text_editor.cpp index 6b945157e8..214f24b386 100644 --- a/editor/plugins/script_text_editor.cpp +++ b/editor/plugins/script_text_editor.cpp @@ -201,7 +201,7 @@ void ScriptTextEditor::_set_theme_for_script() { text_edit->add_keyword_color("Rect2", basetype_color); text_edit->add_keyword_color("Transform2D", basetype_color); text_edit->add_keyword_color("Vector3", basetype_color); - text_edit->add_keyword_color("Rect3", basetype_color); + text_edit->add_keyword_color("AABB", basetype_color); text_edit->add_keyword_color("Basis", basetype_color); text_edit->add_keyword_color("Plane", basetype_color); text_edit->add_keyword_color("Transform", basetype_color); @@ -518,7 +518,9 @@ void ScriptTextEditor::tag_saved_version() { } void ScriptTextEditor::goto_line(int p_line, bool p_with_error) { - code_editor->get_text_edit()->call_deferred("cursor_set_line", p_line); + TextEdit *tx = code_editor->get_text_edit(); + tx->unfold_line(p_line); + tx->call_deferred("cursor_set_line", p_line); } void ScriptTextEditor::ensure_focus() { @@ -712,15 +714,6 @@ void ScriptTextEditor::_breakpoint_toggled(int p_row) { ScriptEditor::get_singleton()->get_debugger()->set_breakpoint(script->get_path(), p_row + 1, code_editor->get_text_edit()->is_line_set_as_breakpoint(p_row)); } -static void swap_lines(TextEdit *tx, int line1, int line2) { - String tmp = tx->get_line(line1); - String tmp2 = tx->get_line(line2); - tx->set_line(line2, tmp); - tx->set_line(line1, tmp2); - - tx->cursor_set_line(line2); -} - void ScriptTextEditor::_lookup_symbol(const String &p_symbol, int p_row, int p_column) { Node *base = get_tree()->get_edited_scene_root(); @@ -799,39 +792,41 @@ void ScriptTextEditor::_lookup_symbol(const String &p_symbol, int p_row, int p_c void ScriptTextEditor::_edit_option(int p_op) { + TextEdit *tx = code_editor->get_text_edit(); + switch (p_op) { case EDIT_UNDO: { - code_editor->get_text_edit()->undo(); - code_editor->get_text_edit()->call_deferred("grab_focus"); + + tx->undo(); + tx->call_deferred("grab_focus"); } break; case EDIT_REDO: { - code_editor->get_text_edit()->redo(); - code_editor->get_text_edit()->call_deferred("grab_focus"); + + tx->redo(); + tx->call_deferred("grab_focus"); } break; case EDIT_CUT: { - code_editor->get_text_edit()->cut(); - code_editor->get_text_edit()->call_deferred("grab_focus"); + tx->cut(); + tx->call_deferred("grab_focus"); } break; case EDIT_COPY: { - code_editor->get_text_edit()->copy(); - code_editor->get_text_edit()->call_deferred("grab_focus"); + tx->copy(); + tx->call_deferred("grab_focus"); } break; case EDIT_PASTE: { - code_editor->get_text_edit()->paste(); - code_editor->get_text_edit()->call_deferred("grab_focus"); + tx->paste(); + tx->call_deferred("grab_focus"); } break; case EDIT_SELECT_ALL: { - code_editor->get_text_edit()->select_all(); - code_editor->get_text_edit()->call_deferred("grab_focus"); - + tx->select_all(); + tx->call_deferred("grab_focus"); } break; case EDIT_MOVE_LINE_UP: { - TextEdit *tx = code_editor->get_text_edit(); Ref<Script> scr = script; if (scr.is_null()) return; @@ -850,6 +845,9 @@ void ScriptTextEditor::_edit_option(int p_op) { if (line_id == 0 || next_id < 0) return; + tx->unfold_line(line_id); + tx->unfold_line(next_id); + tx->swap_lines(line_id, next_id); tx->cursor_set_line(next_id); } @@ -863,16 +861,17 @@ void ScriptTextEditor::_edit_option(int p_op) { if (line_id == 0 || next_id < 0) return; + tx->unfold_line(line_id); + tx->unfold_line(next_id); + tx->swap_lines(line_id, next_id); tx->cursor_set_line(next_id); } tx->end_complex_operation(); tx->update(); - } break; case EDIT_MOVE_LINE_DOWN: { - TextEdit *tx = code_editor->get_text_edit(); Ref<Script> scr = get_edited_script(); if (scr.is_null()) return; @@ -891,6 +890,9 @@ void ScriptTextEditor::_edit_option(int p_op) { if (line_id == tx->get_line_count() - 1 || next_id > tx->get_line_count()) return; + tx->unfold_line(line_id); + tx->unfold_line(next_id); + tx->swap_lines(line_id, next_id); tx->cursor_set_line(next_id); } @@ -904,6 +906,9 @@ void ScriptTextEditor::_edit_option(int p_op) { if (line_id == tx->get_line_count() - 1 || next_id > tx->get_line_count()) return; + tx->unfold_line(line_id); + tx->unfold_line(next_id); + tx->swap_lines(line_id, next_id); tx->cursor_set_line(next_id); } @@ -913,7 +918,6 @@ void ScriptTextEditor::_edit_option(int p_op) { } break; case EDIT_INDENT_LEFT: { - TextEdit *tx = code_editor->get_text_edit(); Ref<Script> scr = get_edited_script(); if (scr.is_null()) return; @@ -938,11 +942,9 @@ void ScriptTextEditor::_edit_option(int p_op) { tx->end_complex_operation(); tx->update(); //tx->deselect(); - } break; case EDIT_INDENT_RIGHT: { - TextEdit *tx = code_editor->get_text_edit(); Ref<Script> scr = get_edited_script(); if (scr.is_null()) return; @@ -959,11 +961,9 @@ void ScriptTextEditor::_edit_option(int p_op) { tx->end_complex_operation(); tx->update(); //tx->deselect(); - } break; case EDIT_DELETE_LINE: { - TextEdit *tx = code_editor->get_text_edit(); Ref<Script> scr = get_edited_script(); if (scr.is_null()) return; @@ -972,13 +972,12 @@ void ScriptTextEditor::_edit_option(int p_op) { int line = tx->cursor_get_line(); tx->set_line(tx->cursor_get_line(), ""); tx->backspace_at_cursor(); + tx->unfold_line(line); tx->cursor_set_line(line); tx->end_complex_operation(); - } break; case EDIT_CLONE_DOWN: { - TextEdit *tx = code_editor->get_text_edit(); Ref<Script> scr = get_edited_script(); if (scr.is_null()) return; @@ -997,6 +996,7 @@ void ScriptTextEditor::_edit_option(int p_op) { tx->begin_complex_operation(); for (int i = from_line; i <= to_line; i++) { + tx->unfold_line(i); if (i >= tx->get_line_count() - 1) { tx->set_line(i, tx->get_line(i) + "\n"); } @@ -1012,11 +1012,29 @@ void ScriptTextEditor::_edit_option(int p_op) { tx->end_complex_operation(); tx->update(); + } break; + case EDIT_FOLD_LINE: { + + tx->fold_line(tx->cursor_get_line()); + tx->update(); + } break; + case EDIT_UNFOLD_LINE: { + + tx->unfold_line(tx->cursor_get_line()); + tx->update(); + } break; + case EDIT_FOLD_ALL_LINES: { + + tx->fold_all_lines(); + tx->update(); + } break; + case EDIT_UNFOLD_ALL_LINES: { + tx->unhide_all_lines(); + tx->update(); } break; case EDIT_TOGGLE_COMMENT: { - TextEdit *tx = code_editor->get_text_edit(); Ref<Script> scr = get_edited_script(); if (scr.is_null()) return; @@ -1065,62 +1083,65 @@ void ScriptTextEditor::_edit_option(int p_op) { tx->end_complex_operation(); tx->update(); //tx->deselect(); - } break; case EDIT_COMPLETE: { - code_editor->get_text_edit()->query_code_comple(); - + tx->query_code_comple(); } break; case EDIT_AUTO_INDENT: { - TextEdit *te = code_editor->get_text_edit(); - String text = te->get_text(); + String text = tx->get_text(); Ref<Script> scr = get_edited_script(); if (scr.is_null()) return; - te->begin_complex_operation(); + tx->begin_complex_operation(); int begin, end; - if (te->is_selection_active()) { - begin = te->get_selection_from_line(); - end = te->get_selection_to_line(); + if (tx->is_selection_active()) { + begin = tx->get_selection_from_line(); + end = tx->get_selection_to_line(); // ignore if the cursor is not past the first column - if (te->get_selection_to_column() == 0) { + if (tx->get_selection_to_column() == 0) { end--; } } else { begin = 0; - end = te->get_line_count() - 1; + end = tx->get_line_count() - 1; } scr->get_language()->auto_indent_code(text, begin, end); Vector<String> lines = text.split("\n"); for (int i = begin; i <= end; ++i) { - te->set_line(i, lines[i]); + tx->set_line(i, lines[i]); } - te->end_complex_operation(); - + tx->end_complex_operation(); } break; 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; case EDIT_TO_UPPERCASE: { + _convert_case(UPPER); } break; case EDIT_TO_LOWERCASE: { + _convert_case(LOWER); } break; case EDIT_CAPITALIZE: { + _convert_case(CAPITALIZE); } break; case SEARCH_FIND: { @@ -1145,41 +1166,47 @@ void ScriptTextEditor::_edit_option(int p_op) { } break; case SEARCH_GOTO_LINE: { - goto_line_dialog->popup_find_line(code_editor->get_text_edit()); + goto_line_dialog->popup_find_line(tx); } break; case DEBUG_TOGGLE_BREAKPOINT: { - int line = code_editor->get_text_edit()->cursor_get_line(); - bool dobreak = !code_editor->get_text_edit()->is_line_set_as_breakpoint(line); - code_editor->get_text_edit()->set_line_as_breakpoint(line, dobreak); + + int line = tx->cursor_get_line(); + bool dobreak = !tx->is_line_set_as_breakpoint(line); + tx->set_line_as_breakpoint(line, dobreak); ScriptEditor::get_singleton()->get_debugger()->set_breakpoint(get_edited_script()->get_path(), line + 1, dobreak); } break; case DEBUG_REMOVE_ALL_BREAKPOINTS: { + List<int> bpoints; - code_editor->get_text_edit()->get_breakpoints(&bpoints); + tx->get_breakpoints(&bpoints); for (List<int>::Element *E = bpoints.front(); E; E = E->next()) { int line = E->get(); - bool dobreak = !code_editor->get_text_edit()->is_line_set_as_breakpoint(line); - code_editor->get_text_edit()->set_line_as_breakpoint(line, dobreak); + bool dobreak = !tx->is_line_set_as_breakpoint(line); + tx->set_line_as_breakpoint(line, dobreak); ScriptEditor::get_singleton()->get_debugger()->set_breakpoint(get_edited_script()->get_path(), line + 1, dobreak); } } case DEBUG_GOTO_NEXT_BREAKPOINT: { + List<int> bpoints; - code_editor->get_text_edit()->get_breakpoints(&bpoints); + tx->get_breakpoints(&bpoints); if (bpoints.size() <= 0) { return; } - int line = code_editor->get_text_edit()->cursor_get_line(); + int line = tx->cursor_get_line(); + // wrap around if (line >= bpoints[bpoints.size() - 1]) { - code_editor->get_text_edit()->cursor_set_line(bpoints[0]); + tx->unfold_line(bpoints[0]); + tx->cursor_set_line(bpoints[0]); } else { for (List<int>::Element *E = bpoints.front(); E; E = E->next()) { int bline = E->get(); if (bline > line) { - code_editor->get_text_edit()->cursor_set_line(bline); + tx->unfold_line(bline); + tx->cursor_set_line(bline); return; } } @@ -1187,21 +1214,24 @@ void ScriptTextEditor::_edit_option(int p_op) { } break; case DEBUG_GOTO_PREV_BREAKPOINT: { + List<int> bpoints; - code_editor->get_text_edit()->get_breakpoints(&bpoints); + tx->get_breakpoints(&bpoints); if (bpoints.size() <= 0) { return; } - int line = code_editor->get_text_edit()->cursor_get_line(); + int line = tx->cursor_get_line(); // wrap around if (line <= bpoints[0]) { - code_editor->get_text_edit()->cursor_set_line(bpoints[bpoints.size() - 1]); + tx->unfold_line(bpoints[bpoints.size() - 1]); + tx->cursor_set_line(bpoints[bpoints.size() - 1]); } else { for (List<int>::Element *E = bpoints.back(); E; E = E->prev()) { int bline = E->get(); if (bline < line) { - code_editor->get_text_edit()->cursor_set_line(bline); + tx->unfold_line(bline); + tx->cursor_set_line(bline); return; } } @@ -1210,9 +1240,10 @@ void ScriptTextEditor::_edit_option(int p_op) { } break; case HELP_CONTEXTUAL: { - String text = code_editor->get_text_edit()->get_selection_text(); + + String text = tx->get_selection_text(); if (text == "") - text = code_editor->get_text_edit()->get_word_under_cursor(); + text = tx->get_word_under_cursor(); if (text != "") { emit_signal("request_help_search", text); } @@ -1398,6 +1429,9 @@ void ScriptTextEditor::_text_edit_gui_input(const Ref<InputEvent> &ev) { Vector2 mpos = mb->get_global_position() - tx->get_global_position(); bool have_selection = (tx->get_selection_text().length() > 0); bool have_color = (tx->get_word_at_pos(mpos) == "Color"); + int fold_state = 0; + bool can_fold = tx->can_fold(row); + bool is_folded = tx->is_folded(row); if (have_color) { String line = tx->get_line(row); @@ -1428,7 +1462,7 @@ void ScriptTextEditor::_text_edit_gui_input(const Ref<InputEvent> &ev) { have_color = false; } } - _make_context_menu(have_selection, have_color); + _make_context_menu(have_selection, have_color, can_fold, is_folded); } } } @@ -1447,7 +1481,7 @@ void ScriptTextEditor::_color_changed(const Color &p_color) { code_editor->get_text_edit()->set_line(color_line, new_line); } -void ScriptTextEditor::_make_context_menu(bool p_selection, bool p_color) { +void ScriptTextEditor::_make_context_menu(bool p_selection, bool p_color, bool p_can_fold, bool p_is_folded) { context_menu->clear(); if (p_selection) { @@ -1467,6 +1501,13 @@ void ScriptTextEditor::_make_context_menu(bool p_selection, bool p_color) { context_menu->add_shortcut(ED_GET_SHORTCUT("script_text_editor/indent_right"), EDIT_INDENT_RIGHT); context_menu->add_shortcut(ED_GET_SHORTCUT("script_text_editor/toggle_comment"), EDIT_TOGGLE_COMMENT); } + if (p_can_fold) { + // can fold + context_menu->add_shortcut(ED_GET_SHORTCUT("script_text_editor/fold_line"), EDIT_FOLD_LINE); + } else if (p_is_folded) { + // can unfold + context_menu->add_shortcut(ED_GET_SHORTCUT("script_text_editor/unfold_line"), EDIT_UNFOLD_LINE); + } if (p_color) { context_menu->add_separator(); context_menu->add_item(TTR("Pick Color"), EDIT_PICK_COLOR); @@ -1530,6 +1571,10 @@ ScriptTextEditor::ScriptTextEditor() { edit_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("script_text_editor/delete_line"), EDIT_DELETE_LINE); edit_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("script_text_editor/toggle_comment"), EDIT_TOGGLE_COMMENT); edit_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("script_text_editor/clone_down"), EDIT_CLONE_DOWN); + edit_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("script_text_editor/fold_line"), EDIT_FOLD_LINE); + edit_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("script_text_editor/fold_all_lines"), EDIT_FOLD_ALL_LINES); + edit_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("script_text_editor/unfold_line"), EDIT_UNFOLD_LINE); + edit_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("script_text_editor/unfold_all_lines"), EDIT_UNFOLD_ALL_LINES); edit_menu->get_popup()->add_separator(); #ifdef OSX_ENABLED edit_menu->get_popup()->add_shortcut(ED_GET_SHORTCUT("script_text_editor/complete_symbol"), EDIT_COMPLETE); @@ -1607,6 +1652,10 @@ void ScriptTextEditor::register_editor() { ED_SHORTCUT("script_text_editor/indent_right", TTR("Indent Right"), 0); ED_SHORTCUT("script_text_editor/toggle_comment", TTR("Toggle Comment"), KEY_MASK_CMD | KEY_K); ED_SHORTCUT("script_text_editor/clone_down", TTR("Clone Down"), KEY_MASK_CMD | KEY_B); + ED_SHORTCUT("script_text_editor/fold_line", TTR("Fold Line"), KEY_MASK_ALT | KEY_LEFT); + ED_SHORTCUT("script_text_editor/unfold_line", TTR("Unfold Line"), KEY_MASK_ALT | KEY_RIGHT); + ED_SHORTCUT("script_text_editor/fold_all_lines", TTR("Fold All Lines"), 0); + ED_SHORTCUT("script_text_editor/unfold_all_lines", TTR("Unfold All Lines"), 0); #ifdef OSX_ENABLED ED_SHORTCUT("script_text_editor/complete_symbol", TTR("Complete Symbol"), KEY_MASK_CTRL | KEY_SPACE); #else diff --git a/editor/plugins/script_text_editor.h b/editor/plugins/script_text_editor.h index 83f3ea57c0..722015ef3e 100644 --- a/editor/plugins/script_text_editor.h +++ b/editor/plugins/script_text_editor.h @@ -91,6 +91,10 @@ class ScriptTextEditor : public ScriptEditorBase { EDIT_TO_UPPERCASE, EDIT_TO_LOWERCASE, EDIT_CAPITALIZE, + EDIT_FOLD_LINE, + EDIT_UNFOLD_LINE, + EDIT_FOLD_ALL_LINES, + EDIT_UNFOLD_ALL_LINES, SEARCH_FIND, SEARCH_FIND_NEXT, SEARCH_FIND_PREV, @@ -118,7 +122,7 @@ protected: static void _bind_methods(); void _edit_option(int p_op); - void _make_context_menu(bool p_selection, bool p_color); + void _make_context_menu(bool p_selection, bool p_color, bool p_can_fold, bool p_is_folded); void _text_edit_gui_input(const Ref<InputEvent> &ev); void _color_changed(const Color &p_color); diff --git a/editor/plugins/spatial_editor_plugin.cpp b/editor/plugins/spatial_editor_plugin.cpp index ca80908ab5..20dda8b695 100644 --- a/editor/plugins/spatial_editor_plugin.cpp +++ b/editor/plugins/spatial_editor_plugin.cpp @@ -758,17 +758,49 @@ bool SpatialEditorViewport::_gizmo_select(const Vector2 &p_screenpos, bool p_hig } } + bool is_plane_scale = false; + // plane select + if (col_axis == -1) { + col_d = 1e20; + + for (int i = 0; i < 3; i++) { + + Vector3 ivec2 = gt.basis.get_axis((i + 1) % 3).normalized(); + Vector3 ivec3 = gt.basis.get_axis((i + 2) % 3).normalized(); + + Vector3 grabber_pos = gt.origin + (ivec2 + ivec3) * gs * (GIZMO_PLANE_SIZE + GIZMO_PLANE_DST); + + Vector3 r; + Plane plane(gt.origin, gt.basis.get_axis(i).normalized()); + + if (plane.intersects_ray(ray_pos, ray, &r)) { + + float dist = r.distance_to(grabber_pos); + if (dist < (gs * GIZMO_PLANE_SIZE)) { + + float d = ray_pos.distance_to(r); + if (d < col_d) { + col_d = d; + col_axis = i; + + is_plane_scale = true; + } + } + } + } + } + if (col_axis != -1) { if (p_highlight_only) { - spatial_editor->select_gizmo_highlight_axis(col_axis + 9); + spatial_editor->select_gizmo_highlight_axis(col_axis + (is_plane_scale ? 12 : 9)); } else { //handle scale _edit.mode = TRANSFORM_SCALE; _compute_edit(Point2(p_screenpos.x, p_screenpos.y)); - _edit.plane = TransformPlane(TRANSFORM_X_AXIS + col_axis); + _edit.plane = TransformPlane(TRANSFORM_X_AXIS + col_axis + (is_plane_scale ? 3 : 0)); } return true; } @@ -1065,7 +1097,7 @@ void SpatialEditorViewport::_sinput(const Ref<InputEvent> &p_event) { if (get_selected_count() == 0) break; //bye - //handle rotate + //handle scale _edit.mode = TRANSFORM_SCALE; _compute_edit(b->get_position()); break; @@ -1255,6 +1287,7 @@ void SpatialEditorViewport::_sinput(const Ref<InputEvent> &p_event) { Vector3 motion_mask; Plane plane; + bool plane_mv = false; switch (_edit.plane) { case TRANSFORM_VIEW: @@ -1273,6 +1306,21 @@ void SpatialEditorViewport::_sinput(const Ref<InputEvent> &p_event) { motion_mask = spatial_editor->get_gizmo_transform().basis.get_axis(2); plane = Plane(_edit.center, motion_mask.cross(motion_mask.cross(_get_camera_normal())).normalized()); break; + case TRANSFORM_YZ: + motion_mask = spatial_editor->get_gizmo_transform().basis.get_axis(2) + spatial_editor->get_gizmo_transform().basis.get_axis(1); + plane = Plane(_edit.center, spatial_editor->get_gizmo_transform().basis.get_axis(0)); + plane_mv = true; + break; + case TRANSFORM_XZ: + motion_mask = spatial_editor->get_gizmo_transform().basis.get_axis(2) + spatial_editor->get_gizmo_transform().basis.get_axis(0); + plane = Plane(_edit.center, spatial_editor->get_gizmo_transform().basis.get_axis(1)); + plane_mv = true; + break; + case TRANSFORM_XY: + motion_mask = spatial_editor->get_gizmo_transform().basis.get_axis(0) + spatial_editor->get_gizmo_transform().basis.get_axis(1); + plane = Plane(_edit.center, spatial_editor->get_gizmo_transform().basis.get_axis(2)); + plane_mv = true; + break; } Vector3 intersection; @@ -1284,8 +1332,19 @@ void SpatialEditorViewport::_sinput(const Ref<InputEvent> &p_event) { break; Vector3 motion = intersection - click; - if (motion_mask != Vector3()) { - motion = motion_mask.dot(motion) * motion_mask; + if (_edit.plane != TRANSFORM_VIEW) { + + if (!plane_mv) { + + motion = motion_mask.dot(motion) * motion_mask; + + } else { + + // Alternative planar scaling mode + if (_get_key_modifier(m) != KEY_SHIFT) { + motion = motion_mask.dot(motion) * motion_mask; + } + } } else { float center_click_dist = click.distance_to(_edit.center); @@ -1326,6 +1385,10 @@ void SpatialEditorViewport::_sinput(const Ref<InputEvent> &p_event) { continue; } + if (sp->has_meta("_edit_lock_")) { + continue; + } + Transform original = se->original; Transform original_local = se->original_local; Transform base = Transform(Basis(), _edit.center); @@ -1379,7 +1442,6 @@ void SpatialEditorViewport::_sinput(const Ref<InputEvent> &p_event) { switch (_edit.plane) { case TRANSFORM_VIEW: - motion_mask = Vector3(0, 0, 0); plane = Plane(_edit.center, _get_camera_normal()); break; case TRANSFORM_X_AXIS: @@ -1417,7 +1479,7 @@ void SpatialEditorViewport::_sinput(const Ref<InputEvent> &p_event) { break; Vector3 motion = intersection - click; - if (motion_mask != Vector3()) { + if (_edit.plane != TRANSFORM_VIEW) { if (!plane_mv) { motion = motion_mask.dot(motion) * motion_mask; } @@ -1451,6 +1513,10 @@ void SpatialEditorViewport::_sinput(const Ref<InputEvent> &p_event) { continue; } + if (sp->has_meta("_edit_lock_")) { + continue; + } + Transform original = se->original; Transform t; @@ -1547,6 +1613,10 @@ void SpatialEditorViewport::_sinput(const Ref<InputEvent> &p_event) { if (!se) continue; + if (sp->has_meta("_edit_lock_")) { + continue; + } + Transform t; if (local_coords) { @@ -1624,92 +1694,78 @@ void SpatialEditorViewport::_sinput(const Ref<InputEvent> &p_event) { switch (nav_mode) { case NAVIGATION_PAN: { + _nav_pan(m, _get_warped_mouse_motion(m)); - real_t pan_speed = 1 / 150.0; - int pan_speed_modifier = 10; - if (nav_scheme == NAVIGATION_MAYA && m->get_shift()) - pan_speed *= pan_speed_modifier; + } break; - Point2i relative = _get_warped_mouse_motion(m); + case NAVIGATION_ZOOM: { + _nav_zoom(m, m->get_relative()); - Transform camera_transform; + } break; - camera_transform.translate(cursor.pos); - camera_transform.basis.rotate(Vector3(1, 0, 0), -cursor.x_rot); - camera_transform.basis.rotate(Vector3(0, 1, 0), -cursor.y_rot); - Vector3 translation(-relative.x * pan_speed, relative.y * pan_speed, 0); - translation *= cursor.distance / DISTANCE_DEFAULT; - camera_transform.translate(translation); - cursor.pos = camera_transform.origin; + case NAVIGATION_ORBIT: { + _nav_orbit(m, _get_warped_mouse_motion(m)); + + } break; + + case NAVIGATION_LOOK: { + _nav_look(m, _get_warped_mouse_motion(m)); + + } break; + + default: {} + } + } + + Ref<InputEventMagnifyGesture> magnify_gesture = p_event; + if (magnify_gesture.is_valid()) { + + if (is_freelook_active()) + scale_freelook_speed(magnify_gesture->get_factor()); + else + scale_cursor_distance(1.0 / magnify_gesture->get_factor()); + } + + Ref<InputEventPanGesture> pan_gesture = p_event; + if (pan_gesture.is_valid()) { + + NavigationScheme nav_scheme = (NavigationScheme)EditorSettings::get_singleton()->get("editors/3d/navigation/navigation_scheme").operator int(); + NavigationMode nav_mode = NAVIGATION_NONE; + + if (nav_scheme == NAVIGATION_GODOT) { + + int mod = _get_key_modifier(pan_gesture); + + if (mod == _get_key_modifier_setting("editors/3d/navigation/pan_modifier")) + nav_mode = NAVIGATION_PAN; + else if (mod == _get_key_modifier_setting("editors/3d/navigation/zoom_modifier")) + nav_mode = NAVIGATION_ZOOM; + else if (mod == _get_key_modifier_setting("editors/3d/navigation/orbit_modifier")) + nav_mode = NAVIGATION_ORBIT; + + } else if (nav_scheme == NAVIGATION_MAYA) { + if (pan_gesture->get_alt()) + nav_mode = NAVIGATION_PAN; + } + + switch (nav_mode) { + case NAVIGATION_PAN: { + _nav_pan(m, pan_gesture->get_delta()); } break; case NAVIGATION_ZOOM: { - real_t zoom_speed = 1 / 80.0; - int zoom_speed_modifier = 10; - if (nav_scheme == NAVIGATION_MAYA && m->get_shift()) - zoom_speed *= zoom_speed_modifier; - - NavigationZoomStyle zoom_style = (NavigationZoomStyle)EditorSettings::get_singleton()->get("editors/3d/navigation/zoom_style").operator int(); - if (zoom_style == NAVIGATION_ZOOM_HORIZONTAL) { - if (m->get_relative().x > 0) - scale_cursor_distance(1 - m->get_relative().x * zoom_speed); - else if (m->get_relative().x < 0) - scale_cursor_distance(1.0 / (1 + m->get_relative().x * zoom_speed)); - } else { - if (m->get_relative().y > 0) - scale_cursor_distance(1 + m->get_relative().y * zoom_speed); - else if (m->get_relative().y < 0) - scale_cursor_distance(1.0 / (1 - m->get_relative().y * zoom_speed)); - } + _nav_zoom(m, pan_gesture->get_delta()); } break; case NAVIGATION_ORBIT: { - Point2i relative = _get_warped_mouse_motion(m); - - real_t degrees_per_pixel = EditorSettings::get_singleton()->get("editors/3d/navigation_feel/orbit_sensitivity"); - real_t radians_per_pixel = Math::deg2rad(degrees_per_pixel); - - cursor.x_rot += relative.y * radians_per_pixel; - cursor.y_rot += relative.x * radians_per_pixel; - if (cursor.x_rot > Math_PI / 2.0) - cursor.x_rot = Math_PI / 2.0; - if (cursor.x_rot < -Math_PI / 2.0) - cursor.x_rot = -Math_PI / 2.0; - name = ""; - _update_name(); + _nav_orbit(m, pan_gesture->get_delta()); + } break; case NAVIGATION_LOOK: { - // Freelook only works properly in perspective. - // It technically works too in ortho, but it's awful for a user due to fov being near zero - if (!orthogonal) { - Point2i relative = _get_warped_mouse_motion(m); - - real_t degrees_per_pixel = EditorSettings::get_singleton()->get("editors/3d/navigation_feel/orbit_sensitivity"); - real_t radians_per_pixel = Math::deg2rad(degrees_per_pixel); - - // Note: do NOT assume the camera has the "current" transform, because it is interpolated and may have "lag". - Transform prev_camera_transform = to_camera_transform(cursor); - - cursor.x_rot += relative.y * radians_per_pixel; - cursor.y_rot += relative.x * radians_per_pixel; - if (cursor.x_rot > Math_PI / 2.0) - cursor.x_rot = Math_PI / 2.0; - if (cursor.x_rot < -Math_PI / 2.0) - cursor.x_rot = -Math_PI / 2.0; - - // Look is like the opposite of Orbit: the focus point rotates around the camera - Transform camera_transform = to_camera_transform(cursor); - Vector3 pos = camera_transform.xform(Vector3(0, 0, 0)); - Vector3 prev_pos = prev_camera_transform.xform(Vector3(0, 0, 0)); - Vector3 diff = prev_pos - pos; - cursor.pos += diff; - - name = ""; - _update_name(); - } + _nav_look(m, pan_gesture->get_delta()); } break; @@ -1815,6 +1871,94 @@ void SpatialEditorViewport::_sinput(const Ref<InputEvent> &p_event) { accept_event(); } +void SpatialEditorViewport::_nav_pan(Ref<InputEventWithModifiers> p_event, const Vector2 &p_relative) { + + const NavigationScheme nav_scheme = (NavigationScheme)EditorSettings::get_singleton()->get("editors/3d/navigation/navigation_scheme").operator int(); + + real_t pan_speed = 1 / 150.0; + int pan_speed_modifier = 10; + if (nav_scheme == NAVIGATION_MAYA && p_event->get_shift()) + pan_speed *= pan_speed_modifier; + + Transform camera_transform; + + camera_transform.translate(cursor.pos); + camera_transform.basis.rotate(Vector3(1, 0, 0), -cursor.x_rot); + camera_transform.basis.rotate(Vector3(0, 1, 0), -cursor.y_rot); + Vector3 translation(-p_relative.x * pan_speed, p_relative.y * pan_speed, 0); + translation *= cursor.distance / DISTANCE_DEFAULT; + camera_transform.translate(translation); + cursor.pos = camera_transform.origin; +} + +void SpatialEditorViewport::_nav_zoom(Ref<InputEventWithModifiers> p_event, const Vector2 &p_relative) { + + const NavigationScheme nav_scheme = (NavigationScheme)EditorSettings::get_singleton()->get("editors/3d/navigation/navigation_scheme").operator int(); + + real_t zoom_speed = 1 / 80.0; + int zoom_speed_modifier = 10; + if (nav_scheme == NAVIGATION_MAYA && p_event->get_shift()) + zoom_speed *= zoom_speed_modifier; + + NavigationZoomStyle zoom_style = (NavigationZoomStyle)EditorSettings::get_singleton()->get("editors/3d/navigation/zoom_style").operator int(); + if (zoom_style == NAVIGATION_ZOOM_HORIZONTAL) { + if (p_relative.x > 0) + scale_cursor_distance(1 - p_relative.x * zoom_speed); + else if (p_relative.x < 0) + scale_cursor_distance(1.0 / (1 + p_relative.x * zoom_speed)); + } else { + if (p_relative.y > 0) + scale_cursor_distance(1 + p_relative.y * zoom_speed); + else if (p_relative.y < 0) + scale_cursor_distance(1.0 / (1 - p_relative.y * zoom_speed)); + } +} + +void SpatialEditorViewport::_nav_orbit(Ref<InputEventWithModifiers> p_event, const Vector2 &p_relative) { + + real_t degrees_per_pixel = EditorSettings::get_singleton()->get("editors/3d/navigation_feel/orbit_sensitivity"); + real_t radians_per_pixel = Math::deg2rad(degrees_per_pixel); + + cursor.x_rot += p_relative.y * radians_per_pixel; + cursor.y_rot += p_relative.x * radians_per_pixel; + if (cursor.x_rot > Math_PI / 2.0) + cursor.x_rot = Math_PI / 2.0; + if (cursor.x_rot < -Math_PI / 2.0) + cursor.x_rot = -Math_PI / 2.0; + name = ""; + _update_name(); +} + +void SpatialEditorViewport::_nav_look(Ref<InputEventWithModifiers> p_event, const Vector2 &p_relative) { + + // Freelook only works properly in perspective. + // It technically works too in ortho, but it's awful for a user due to fov being near zero + if (!orthogonal) { + real_t degrees_per_pixel = EditorSettings::get_singleton()->get("editors/3d/navigation_feel/orbit_sensitivity"); + real_t radians_per_pixel = Math::deg2rad(degrees_per_pixel); + + // Note: do NOT assume the camera has the "current" transform, because it is interpolated and may have "lag". + Transform prev_camera_transform = to_camera_transform(cursor); + + cursor.x_rot += p_relative.y * radians_per_pixel; + cursor.y_rot += p_relative.x * radians_per_pixel; + if (cursor.x_rot > Math_PI / 2.0) + cursor.x_rot = Math_PI / 2.0; + if (cursor.x_rot < -Math_PI / 2.0) + cursor.x_rot = -Math_PI / 2.0; + + // Look is like the opposite of Orbit: the focus point rotates around the camera + Transform camera_transform = to_camera_transform(cursor); + Vector3 pos = camera_transform.xform(Vector3(0, 0, 0)); + Vector3 prev_pos = prev_camera_transform.xform(Vector3(0, 0, 0)); + Vector3 diff = prev_pos - pos; + cursor.pos += diff; + + name = ""; + _update_name(); + } +} + void SpatialEditorViewport::set_freelook_active(bool active_now) { if (!freelook_active && active_now) { @@ -2011,7 +2155,7 @@ void SpatialEditorViewport::_notification(int p_what) { if (se->aabb.has_no_surface()) { - se->aabb = vi ? vi->get_aabb() : Rect3(Vector3(-0.2, -0.2, -0.2), Vector3(0.4, 0.4, 0.4)); + se->aabb = vi ? vi->get_aabb() : AABB(Vector3(-0.2, -0.2, -0.2), Vector3(0.4, 0.4, 0.4)); } Transform t = sp->get_global_transform(); @@ -2099,6 +2243,29 @@ void SpatialEditorViewport::_notification(int p_what) { } } + // FPS Counter. + bool show_fps = view_menu->get_popup()->is_item_checked(view_menu->get_popup()->get_item_index(VIEW_FPS)); + if (show_fps != fps->is_visible()) { + if (show_fps) + fps->show(); + else + fps->hide(); + } + + if (show_fps) { + String text; + const float temp_fps = Engine::get_singleton()->get_frames_per_second(); + text += TTR("FPS") + ": " + itos(temp_fps) + " (" + String::num(1000.0f / temp_fps, 2) + " ms)"; + + if (fps_label->get_text() != text || surface->get_size() != prev_size) { + fps_label->set_text(text); + Size2 ms = fps->get_size(); + Size2 size = surface->get_size(); + size.y = ms.y + 20; + fps->set_position(size - ms - Vector2(20, 0) * EDSCALE); + } + } + prev_size = surface->get_size(); } @@ -2109,6 +2276,7 @@ void SpatialEditorViewport::_notification(int p_what) { surface->connect("mouse_entered", this, "_smouseenter"); surface->connect("mouse_exited", this, "_smouseexit"); info->add_style_override("panel", get_stylebox("panel", "Panel")); + fps->add_style_override("panel", get_stylebox("panel", "Panel")); preview_camera->set_icon(get_icon("Camera", "EditorIcons")); _init_gizmo_instance(index); } @@ -2431,6 +2599,13 @@ void SpatialEditorViewport::_menu_option(int p_option) { view_menu->get_popup()->set_item_checked(idx, !current); } break; + case VIEW_FPS: { + + int idx = view_menu->get_popup()->get_item_index(VIEW_FPS); + bool current = view_menu->get_popup()->is_item_checked(idx); + view_menu->get_popup()->set_item_checked(idx, !current); + + } break; case VIEW_DISPLAY_NORMAL: { viewport->set_debug_draw(Viewport::DEBUG_DRAW_DISABLED); @@ -2516,6 +2691,14 @@ void SpatialEditorViewport::_init_gizmo_instance(int p_idx) { //VS::get_singleton()->instance_geometry_set_flag(scale_gizmo_instance[i],VS::INSTANCE_FLAG_DEPH_SCALE,true); VS::get_singleton()->instance_geometry_set_cast_shadows_setting(scale_gizmo_instance[i], VS::SHADOW_CASTING_SETTING_OFF); VS::get_singleton()->instance_set_layer_mask(scale_gizmo_instance[i], layer); + + scale_plane_gizmo_instance[i] = VS::get_singleton()->instance_create(); + VS::get_singleton()->instance_set_base(scale_plane_gizmo_instance[i], spatial_editor->get_scale_plane_gizmo(i)->get_rid()); + VS::get_singleton()->instance_set_scenario(scale_plane_gizmo_instance[i], get_tree()->get_root()->get_world()->get_scenario()); + VS::get_singleton()->instance_set_visible(scale_plane_gizmo_instance[i], false); + //VS::get_singleton()->instance_geometry_set_flag(scale_plane_gizmo_instance[i],VS::INSTANCE_FLAG_DEPH_SCALE,true); + VS::get_singleton()->instance_geometry_set_cast_shadows_setting(scale_plane_gizmo_instance[i], VS::SHADOW_CASTING_SETTING_OFF); + VS::get_singleton()->instance_set_layer_mask(scale_plane_gizmo_instance[i], layer); } } @@ -2526,6 +2709,7 @@ void SpatialEditorViewport::_finish_gizmo_instances() { VS::get_singleton()->free(move_plane_gizmo_instance[i]); VS::get_singleton()->free(rotate_gizmo_instance[i]); VS::get_singleton()->free(scale_gizmo_instance[i]); + VS::get_singleton()->free(scale_plane_gizmo_instance[i]); } } void SpatialEditorViewport::_toggle_camera_preview(bool p_activate) { @@ -2622,6 +2806,8 @@ void SpatialEditorViewport::update_transform_gizmo_view() { VisualServer::get_singleton()->instance_set_visible(rotate_gizmo_instance[i], spatial_editor->is_gizmo_visible() && (spatial_editor->get_tool_mode() == SpatialEditor::TOOL_MODE_SELECT || spatial_editor->get_tool_mode() == SpatialEditor::TOOL_MODE_ROTATE)); VisualServer::get_singleton()->instance_set_transform(scale_gizmo_instance[i], xform); VisualServer::get_singleton()->instance_set_visible(scale_gizmo_instance[i], spatial_editor->is_gizmo_visible() && (spatial_editor->get_tool_mode() == SpatialEditor::TOOL_MODE_SCALE)); + VisualServer::get_singleton()->instance_set_transform(scale_plane_gizmo_instance[i], xform); + VisualServer::get_singleton()->instance_set_visible(scale_plane_gizmo_instance[i], spatial_editor->is_gizmo_visible() && (spatial_editor->get_tool_mode() == SpatialEditor::TOOL_MODE_SCALE)); } } @@ -2756,7 +2942,7 @@ void SpatialEditorViewport::focus_selection() { cursor.pos = center; } -void SpatialEditorViewport::assign_pending_data_pointers(Spatial *p_preview_node, Rect3 *p_preview_bounds, AcceptDialog *p_accept) { +void SpatialEditorViewport::assign_pending_data_pointers(Spatial *p_preview_node, AABB *p_preview_bounds, AcceptDialog *p_accept) { preview_node = p_preview_node; preview_bounds = p_preview_bounds; accept = p_accept; @@ -2819,14 +3005,14 @@ Vector3 SpatialEditorViewport::_get_instance_position(const Point2 &p_pos) const return point + offset; } -Rect3 SpatialEditorViewport::_calculate_spatial_bounds(const Spatial *p_parent, const Rect3 p_bounds) { - Rect3 bounds = p_bounds; +AABB SpatialEditorViewport::_calculate_spatial_bounds(const Spatial *p_parent, const AABB p_bounds) { + AABB bounds = p_bounds; for (int i = 0; i < p_parent->get_child_count(); i++) { Spatial *child = Object::cast_to<Spatial>(p_parent->get_child(i)); if (child) { MeshInstance *mesh_instance = Object::cast_to<MeshInstance>(child); if (mesh_instance) { - Rect3 mesh_instance_bounds = mesh_instance->get_aabb(); + AABB mesh_instance_bounds = mesh_instance->get_aabb(); mesh_instance_bounds.position += mesh_instance->get_global_transform().origin - p_parent->get_global_transform().origin; bounds.merge_with(mesh_instance_bounds); } @@ -2858,7 +3044,7 @@ void SpatialEditorViewport::_create_preview(const Vector<String> &files) const { editor->get_scene_root()->add_child(preview_node); } } - *preview_bounds = _calculate_spatial_bounds(preview_node, Rect3()); + *preview_bounds = _calculate_spatial_bounds(preview_node, AABB()); } void SpatialEditorViewport::_remove_preview() { @@ -3149,6 +3335,7 @@ SpatialEditorViewport::SpatialEditorViewport(SpatialEditor *p_spatial_editor, Ed view_menu->get_popup()->add_check_shortcut(ED_SHORTCUT("spatial_editor/view_environment", TTR("View Environment")), VIEW_ENVIRONMENT); view_menu->get_popup()->add_check_shortcut(ED_SHORTCUT("spatial_editor/view_gizmos", TTR("View Gizmos")), VIEW_GIZMOS); view_menu->get_popup()->add_check_shortcut(ED_SHORTCUT("spatial_editor/view_information", TTR("View Information")), VIEW_INFORMATION); + view_menu->get_popup()->add_check_shortcut(ED_SHORTCUT("spatial_editor/view_fps", TTR("View FPS")), VIEW_FPS); view_menu->get_popup()->set_item_checked(view_menu->get_popup()->get_item_index(VIEW_ENVIRONMENT), true); view_menu->get_popup()->add_separator(); view_menu->get_popup()->add_check_shortcut(ED_SHORTCUT("spatial_editor/view_half_resolution", TTR("Half Resolution")), VIEW_HALF_RESOLUTION); @@ -3191,6 +3378,14 @@ SpatialEditorViewport::SpatialEditorViewport(SpatialEditor *p_spatial_editor, Ed info->add_child(info_label); info->hide(); + // FPS Counter. + fps = memnew(PanelContainer); + fps->set_self_modulate(Color(1, 1, 1, 0.4)); + surface->add_child(fps); + fps_label = memnew(Label); + fps->add_child(fps_label); + fps->hide(); + accept = NULL; freelook_active = false; @@ -3528,13 +3723,14 @@ void SpatialEditor::select_gizmo_highlight_axis(int p_axis) { move_plane_gizmo[i]->surface_set_material(0, (i + 6) == p_axis ? gizmo_hl : plane_gizmo_color[i]); rotate_gizmo[i]->surface_set_material(0, (i + 3) == p_axis ? gizmo_hl : gizmo_color[i]); scale_gizmo[i]->surface_set_material(0, (i + 9) == p_axis ? gizmo_hl : gizmo_color[i]); + scale_plane_gizmo[i]->surface_set_material(0, (i + 12) == p_axis ? gizmo_hl : plane_gizmo_color[i]); } } void SpatialEditor::update_transform_gizmo() { List<Node *> &selection = editor_selection->get_selected_node_list(); - Rect3 center; + AABB center; bool first = true; Basis gizmo_basis; @@ -3595,7 +3791,7 @@ Object *SpatialEditor::_get_editor_data(Object *p_what) { void SpatialEditor::_generate_selection_box() { - Rect3 aabb(Vector3(), Vector3(1, 1, 1)); + AABB aabb(Vector3(), Vector3(1, 1, 1)); aabb.grow_by(aabb.get_longest_axis_size() / 20.0); Ref<SurfaceTool> st = memnew(SurfaceTool); @@ -3984,6 +4180,44 @@ void SpatialEditor::_menu_item_pressed(int p_option) { settings_dialog->popup_centered(settings_vbc->get_combined_minimum_size() + Size2(50, 50)); } break; + case MENU_LOCK_SELECTED: { + + List<Node *> &selection = editor_selection->get_selected_node_list(); + + for (List<Node *>::Element *E = selection.front(); E; E = E->next()) { + + Spatial *spatial = Object::cast_to<Spatial>(E->get()); + if (!spatial || !spatial->is_visible_in_tree()) + continue; + + if (spatial->get_viewport() != EditorNode::get_singleton()->get_scene_root()) + continue; + + spatial->set_meta("_edit_lock_", true); + emit_signal("item_lock_status_changed"); + } + + _refresh_menu_icons(); + } break; + case MENU_UNLOCK_SELECTED: { + + List<Node *> &selection = editor_selection->get_selected_node_list(); + + for (List<Node *>::Element *E = selection.front(); E; E = E->next()) { + + Spatial *spatial = Object::cast_to<Spatial>(E->get()); + if (!spatial || !spatial->is_visible_in_tree()) + continue; + + if (spatial->get_viewport() != EditorNode::get_singleton()->get_scene_root()) + continue; + + spatial->set_meta("_edit_lock_", Variant()); + emit_signal("item_lock_status_changed"); + } + + _refresh_menu_icons(); + } break; } } @@ -4101,6 +4335,7 @@ void SpatialEditor::_init_indicators() { move_plane_gizmo[i] = Ref<ArrayMesh>(memnew(ArrayMesh)); rotate_gizmo[i] = Ref<ArrayMesh>(memnew(ArrayMesh)); scale_gizmo[i] = Ref<ArrayMesh>(memnew(ArrayMesh)); + scale_plane_gizmo[i] = Ref<ArrayMesh>(memnew(ArrayMesh)); Ref<SpatialMaterial> mat = memnew(SpatialMaterial); mat->set_flag(SpatialMaterial::FLAG_UNSHADED, true); @@ -4296,6 +4531,49 @@ void SpatialEditor::_init_indicators() { surftool->set_material(mat); surftool->commit(scale_gizmo[i]); } + + // Plane Scale + { + Ref<SurfaceTool> surftool = memnew(SurfaceTool); + surftool->begin(Mesh::PRIMITIVE_TRIANGLES); + + Vector3 vec = ivec2 - ivec3; + Vector3 plane[4] = { + vec * GIZMO_PLANE_DST, + vec * GIZMO_PLANE_DST + ivec2 * GIZMO_PLANE_SIZE, + vec * (GIZMO_PLANE_DST + GIZMO_PLANE_SIZE), + vec * GIZMO_PLANE_DST - ivec3 * GIZMO_PLANE_SIZE + }; + + Basis ma(ivec, Math_PI / 2); + + Vector3 points[4] = { + ma.xform(plane[0]), + ma.xform(plane[1]), + ma.xform(plane[2]), + ma.xform(plane[3]), + }; + surftool->add_vertex(points[0]); + surftool->add_vertex(points[1]); + surftool->add_vertex(points[2]); + + surftool->add_vertex(points[0]); + surftool->add_vertex(points[2]); + surftool->add_vertex(points[3]); + + Ref<SpatialMaterial> plane_mat = memnew(SpatialMaterial); + plane_mat->set_flag(SpatialMaterial::FLAG_UNSHADED, true); + plane_mat->set_on_top_of_alpha(); + plane_mat->set_feature(SpatialMaterial::FEATURE_TRANSPARENT, true); + plane_mat->set_cull_mode(SpatialMaterial::CULL_DISABLED); + Color col; + col[i] = 1.0; + col.a = gizmo_alph; + plane_mat->set_albedo(col); + plane_gizmo_color[i] = plane_mat; // needed, so we can draw planes from both sides + surftool->set_material(plane_mat); + surftool->commit(scale_plane_gizmo[i]); + } } } @@ -4323,6 +4601,28 @@ bool SpatialEditor::is_any_freelook_active() const { return false; } +void SpatialEditor::_refresh_menu_icons() { + + bool all_locked = true; + + List<Node *> &selection = editor_selection->get_selected_node_list(); + + if (selection.empty()) { + all_locked = false; + } else { + for (List<Node *>::Element *E = selection.front(); E; E = E->next()) { + if (Object::cast_to<Spatial>(E->get()) && !Object::cast_to<Spatial>(E->get())->has_meta("_edit_lock_")) { + all_locked = false; + break; + } + } + } + + tool_button[TOOL_LOCK_SELECTED]->set_visible(!all_locked); + tool_button[TOOL_LOCK_SELECTED]->set_disabled(selection.empty()); + tool_button[TOOL_UNLOCK_SELECTED]->set_visible(all_locked); +} + void SpatialEditor::_unhandled_key_input(Ref<InputEvent> p_event) { if (!is_visible_in_tree() || get_viewport()->gui_has_modal_stack()) @@ -4361,6 +4661,8 @@ void SpatialEditor::_notification(int p_what) { tool_button[SpatialEditor::TOOL_MODE_ROTATE]->set_icon(get_icon("ToolRotate", "EditorIcons")); tool_button[SpatialEditor::TOOL_MODE_SCALE]->set_icon(get_icon("ToolScale", "EditorIcons")); tool_button[SpatialEditor::TOOL_MODE_LIST_SELECT]->set_icon(get_icon("ListSelect", "EditorIcons")); + tool_button[SpatialEditor::TOOL_LOCK_SELECTED]->set_icon(get_icon("Lock", "EditorIcons")); + tool_button[SpatialEditor::TOOL_UNLOCK_SELECTED]->set_icon(get_icon("Unlock", "EditorIcons")); view_menu->get_popup()->set_item_icon(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_1_VIEWPORT), get_icon("Panels1", "EditorIcons")); view_menu->get_popup()->set_item_icon(view_menu->get_popup()->get_item_index(MENU_VIEW_USE_2_VIEWPORTS), get_icon("Panels2", "EditorIcons")); @@ -4371,7 +4673,11 @@ void SpatialEditor::_notification(int p_what) { _menu_item_pressed(MENU_VIEW_USE_1_VIEWPORT); + _refresh_menu_icons(); + get_tree()->connect("node_removed", this, "_node_removed"); + EditorNode::get_singleton()->get_scene_tree_dock()->get_tree_editor()->connect("node_changed", this, "_refresh_menu_icons"); + editor_selection->connect("selection_changed", this, "_refresh_menu_icons"); } if (p_what == NOTIFICATION_ENTER_TREE) { @@ -4418,9 +4724,9 @@ VSplitContainer *SpatialEditor::get_shader_split() { return shader_split; } -HSplitContainer *SpatialEditor::get_palette_split() { +HBoxContainer *SpatialEditor::get_palette_split() { - return palette_split; + return palette_split_container; } void SpatialEditor::_request_gizmo(Object *p_obj) { @@ -4514,8 +4820,10 @@ void SpatialEditor::_bind_methods() { ClassDB::bind_method("_get_editor_data", &SpatialEditor::_get_editor_data); ClassDB::bind_method("_request_gizmo", &SpatialEditor::_request_gizmo); ClassDB::bind_method("_toggle_maximize_view", &SpatialEditor::_toggle_maximize_view); + ClassDB::bind_method("_refresh_menu_icons", &SpatialEditor::_refresh_menu_icons); ADD_SIGNAL(MethodInfo("transform_key_request")); + ADD_SIGNAL(MethodInfo("item_lock_status_changed")); } void SpatialEditor::clear() { @@ -4617,12 +4925,24 @@ SpatialEditor::SpatialEditor(EditorNode *p_editor) { tool_button[TOOL_MODE_LIST_SELECT]->connect("pressed", this, "_menu_item_pressed", button_binds); tool_button[TOOL_MODE_LIST_SELECT]->set_tooltip(TTR("Show a list of all objects at the position clicked\n(same as Alt+RMB in select mode).")); + tool_button[TOOL_LOCK_SELECTED] = memnew(ToolButton); + hbc_menu->add_child(tool_button[TOOL_LOCK_SELECTED]); + button_binds[0] = MENU_LOCK_SELECTED; + tool_button[TOOL_LOCK_SELECTED]->connect("pressed", this, "_menu_item_pressed", button_binds); + tool_button[TOOL_LOCK_SELECTED]->set_tooltip(TTR("Lock the selected object in place (can't be moved).")); + + tool_button[TOOL_UNLOCK_SELECTED] = memnew(ToolButton); + hbc_menu->add_child(tool_button[TOOL_UNLOCK_SELECTED]); + button_binds[0] = MENU_UNLOCK_SELECTED; + tool_button[TOOL_UNLOCK_SELECTED]->connect("pressed", this, "_menu_item_pressed", button_binds); + tool_button[TOOL_UNLOCK_SELECTED]->set_tooltip(TTR("Unlock the selected object (can be moved).")); + vs = memnew(VSeparator); hbc_menu->add_child(vs); // Drag and drop support; preview_node = memnew(Spatial); - preview_bounds = Rect3(); + preview_bounds = AABB(); ED_SHORTCUT("spatial_editor/bottom_view", TTR("Bottom View"), KEY_MASK_ALT + KEY_KP_7); ED_SHORTCUT("spatial_editor/top_view", TTR("Top View"), KEY_KP_7); @@ -4697,6 +5017,10 @@ SpatialEditor::SpatialEditor(EditorNode *p_editor) { palette_split->set_v_size_flags(SIZE_EXPAND_FILL); vbc->add_child(palette_split); + palette_split_container = memnew(HBoxContainer); + palette_split_container->set_v_size_flags(SIZE_EXPAND_FILL); + palette_split->add_child(palette_split_container); + shader_split = memnew(VSplitContainer); shader_split->set_h_size_flags(SIZE_EXPAND_FILL); palette_split->add_child(shader_split); diff --git a/editor/plugins/spatial_editor_plugin.h b/editor/plugins/spatial_editor_plugin.h index c2b698068f..58c464c3ea 100644 --- a/editor/plugins/spatial_editor_plugin.h +++ b/editor/plugins/spatial_editor_plugin.h @@ -88,6 +88,7 @@ class SpatialEditorViewport : public Control { VIEW_AUDIO_DOPPLER, VIEW_GIZMOS, VIEW_INFORMATION, + VIEW_FPS, VIEW_DISPLAY_NORMAL, VIEW_DISPLAY_WIREFRAME, VIEW_DISPLAY_OVERDRAW, @@ -108,7 +109,7 @@ private: Size2 prev_size; Spatial *preview_node; - Rect3 *preview_bounds; + AABB *preview_bounds; Vector<String> selected_files; AcceptDialog *accept; @@ -138,6 +139,9 @@ private: PanelContainer *info; Label *info_label; + PanelContainer *fps; + Label *fps_label; + struct _RayResult { Spatial *item; @@ -166,6 +170,11 @@ private: void _select_region(); bool _gizmo_select(const Vector2 &p_screenpos, bool p_highlight_only = false); + void _nav_pan(Ref<InputEventWithModifiers> p_event, const Vector2 &p_relative); + void _nav_zoom(Ref<InputEventWithModifiers> p_event, const Vector2 &p_relative); + void _nav_orbit(Ref<InputEventWithModifiers> p_event, const Vector2 &p_relative); + void _nav_look(Ref<InputEventWithModifiers> p_event, const Vector2 &p_relative); + float get_znear() const; float get_zfar() const; float get_fov() const; @@ -255,7 +264,7 @@ private: real_t zoom_indicator_delay; - RID move_gizmo_instance[3], move_plane_gizmo_instance[3], rotate_gizmo_instance[3], scale_gizmo_instance[3]; + RID move_gizmo_instance[3], move_plane_gizmo_instance[3], rotate_gizmo_instance[3], scale_gizmo_instance[3], scale_plane_gizmo_instance[3]; String last_message; String message; @@ -287,7 +296,7 @@ private: Point2i _get_warped_mouse_motion(const Ref<InputEventMouseMotion> &p_ev_mouse_motion) const; Vector3 _get_instance_position(const Point2 &p_pos) const; - static Rect3 _calculate_spatial_bounds(const Spatial *p_parent, const Rect3 p_bounds); + static AABB _calculate_spatial_bounds(const Spatial *p_parent, const AABB p_bounds); void _create_preview(const Vector<String> &files) const; void _remove_preview(); bool _cyclical_dependency_exists(const String &p_target_scene_path, Node *p_desired_node); @@ -314,7 +323,7 @@ public: void assign_pending_data_pointers( Spatial *p_preview_node, - Rect3 *p_preview_bounds, + AABB *p_preview_bounds, AcceptDialog *p_accept); Viewport *get_viewport_node() { return viewport; } @@ -327,7 +336,7 @@ class SpatialEditorSelectedItem : public Object { GDCLASS(SpatialEditorSelectedItem, Object); public: - Rect3 aabb; + AABB aabb; Transform original; // original location when moving Transform original_local; Transform last_xform; // last transform @@ -387,6 +396,8 @@ public: TOOL_MODE_ROTATE, TOOL_MODE_SCALE, TOOL_MODE_LIST_SELECT, + TOOL_LOCK_SELECTED, + TOOL_UNLOCK_SELECTED, TOOL_MAX }; @@ -401,6 +412,7 @@ private: SpatialEditorViewport *viewports[VIEWPORTS_COUNT]; VSplitContainer *shader_split; HSplitContainer *palette_split; + HBoxContainer *palette_split_container; ///// @@ -418,7 +430,7 @@ private: bool grid_enable[3]; //should be always visible if true bool grid_enabled; - Ref<ArrayMesh> move_gizmo[3], move_plane_gizmo[3], rotate_gizmo[3], scale_gizmo[3]; + Ref<ArrayMesh> move_gizmo[3], move_plane_gizmo[3], rotate_gizmo[3], scale_gizmo[3], scale_plane_gizmo[3]; Ref<SpatialMaterial> gizmo_color[3]; Ref<SpatialMaterial> plane_gizmo_color[3]; Ref<SpatialMaterial> gizmo_hl; @@ -435,7 +447,7 @@ private: // Scene drag and drop support Spatial *preview_node; - Rect3 preview_bounds; + AABB preview_bounds; /* struct Selected { @@ -475,7 +487,8 @@ private: MENU_VIEW_ORIGIN, MENU_VIEW_GRID, MENU_VIEW_CAMERA_SETTINGS, - + MENU_LOCK_SELECTED, + MENU_UNLOCK_SELECTED }; Button *tool_button[TOOL_MAX]; @@ -483,6 +496,9 @@ private: MenuButton *transform_menu; MenuButton *view_menu; + ToolButton *lock_button; + ToolButton *unlock_button; + AcceptDialog *accept; ConfirmationDialog *snap_dialog; @@ -539,6 +555,8 @@ private: bool is_any_freelook_active() const; + void _refresh_menu_icons(); + protected: void _notification(int p_what); //void _gui_input(InputEvent p_event); @@ -571,6 +589,7 @@ public: Ref<ArrayMesh> get_move_plane_gizmo(int idx) const { return move_plane_gizmo[idx]; } Ref<ArrayMesh> get_rotate_gizmo(int idx) const { return rotate_gizmo[idx]; } Ref<ArrayMesh> get_scale_gizmo(int idx) const { return scale_gizmo[idx]; } + Ref<ArrayMesh> get_scale_plane_gizmo(int idx) const { return scale_plane_gizmo[idx]; } void update_transform_gizmo(); @@ -588,7 +607,7 @@ public: void add_control_to_menu_panel(Control *p_control); VSplitContainer *get_shader_split(); - HSplitContainer *get_palette_split(); + HBoxContainer *get_palette_split(); Spatial *get_selected() { return selected; } diff --git a/editor/plugins/tile_map_editor_plugin.cpp b/editor/plugins/tile_map_editor_plugin.cpp index 0ee0eed3a2..4092fd3994 100644 --- a/editor/plugins/tile_map_editor_plugin.cpp +++ b/editor/plugins/tile_map_editor_plugin.cpp @@ -187,10 +187,13 @@ void TileMapEditor::_set_cell(const Point2i &p_pos, int p_value, bool p_flip_h, if (p_with_undo) { undo_redo->add_do_method(node, "set_cellv", Point2(p_pos), p_value, p_flip_h, p_flip_v, p_transpose); + undo_redo->add_do_method(node, "make_bitmask_area_dirty", Point2(p_pos)); undo_redo->add_undo_method(node, "set_cellv", Point2(p_pos), prev_val, prev_flip_h, prev_flip_v, prev_transpose); + undo_redo->add_undo_method(node, "make_bitmask_area_dirty", Point2(p_pos)); } else { node->set_cell(p_pos.x, p_pos.y, p_value, p_flip_h, p_flip_v, p_transpose); + node->update_bitmask_area(Point2(p_pos)); } } @@ -306,6 +309,12 @@ void TileMapEditor::_update_palette() { if (tex.is_valid()) { Rect2 region = tileset->tile_get_region(entries[i].id); + if (tileset->tile_get_is_autotile(entries[i].id)) { + int spacing = tileset->autotile_get_spacing(entries[i].id); + region.size = tileset->autotile_get_size(entries[i].id); + region.position += (region.size + Vector2(spacing, spacing)) * tileset->autotile_get_icon_coordinate(entries[i].id); + } + if (!region.has_no_area()) palette->set_item_icon_region(palette->get_item_count() - 1, region); @@ -363,7 +372,7 @@ PoolVector<Vector2> TileMapEditor::_bucket_fill(const Point2i &p_start, bool era return PoolVector<Vector2>(); } - Rect2i r = node->get_item_rect(); + Rect2i r = node->_edit_get_rect(); r.position = r.position / node->get_cell_size(); r.size = r.size / node->get_cell_size(); @@ -499,6 +508,11 @@ void TileMapEditor::_draw_cell(int p_cell, const Point2i &p_point, bool p_flip_h Vector2 tile_ofs = node->get_tileset()->tile_get_texture_offset(p_cell); Rect2 r = node->get_tileset()->tile_get_region(p_cell); + if (node->get_tileset()->tile_get_is_autotile(p_cell)) { + int spacing = node->get_tileset()->autotile_get_spacing(p_cell); + r.size = node->get_tileset()->autotile_get_size(p_cell); + r.position += (r.size + Vector2(spacing, spacing)) * node->get_tileset()->autotile_get_icon_coordinate(p_cell); + } Size2 sc = p_xform.get_scale(); Rect2 rect = Rect2(); diff --git a/editor/plugins/tile_map_editor_plugin.h b/editor/plugins/tile_map_editor_plugin.h index 73474a3f3d..c7a5bf0cc6 100644 --- a/editor/plugins/tile_map_editor_plugin.h +++ b/editor/plugins/tile_map_editor_plugin.h @@ -137,6 +137,8 @@ class TileMapEditor : public VBoxContainer { bool flip_h; bool flip_v; bool transpose; + int auto_x; + int auto_y; }; List<TileData> copydata; diff --git a/editor/plugins/tile_set_editor_plugin.cpp b/editor/plugins/tile_set_editor_plugin.cpp index f2f71ba6b1..bbed7ff98d 100644 --- a/editor/plugins/tile_set_editor_plugin.cpp +++ b/editor/plugins/tile_set_editor_plugin.cpp @@ -29,6 +29,7 @@ /*************************************************************************/ #include "tile_set_editor_plugin.h" +#include "editor/plugins/canvas_item_editor_plugin.h" #include "scene/2d/physics_body_2d.h" #include "scene/2d/sprite.h" @@ -271,6 +272,7 @@ void TileSetEditorPlugin::edit(Object *p_node) { if (Object::cast_to<TileSet>(p_node)) { tileset_editor->edit(Object::cast_to<TileSet>(p_node)); tileset_editor->show(); + autotile_editor->edit(p_node); } else tileset_editor->hide(); } @@ -282,19 +284,1151 @@ bool TileSetEditorPlugin::handles(Object *p_node) const { void TileSetEditorPlugin::make_visible(bool p_visible) { - if (p_visible) + if (p_visible) { tileset_editor->show(); - else + autotile_button->show(); + autotile_editor->side_panel->show(); + if (autotile_button->is_pressed()) { + autotile_editor->show(); + } + } else { tileset_editor->hide(); + autotile_editor->side_panel->hide(); + autotile_editor->hide(); + autotile_button->hide(); + } } TileSetEditorPlugin::TileSetEditorPlugin(EditorNode *p_node) { tileset_editor = memnew(TileSetEditor(p_node)); - p_node->get_viewport()->add_child(tileset_editor); + add_control_to_container(CONTAINER_CANVAS_EDITOR_MENU, tileset_editor); tileset_editor->set_anchors_and_margins_preset(Control::PRESET_WIDE); tileset_editor->set_anchor(MARGIN_BOTTOM, Control::ANCHOR_BEGIN); tileset_editor->set_end(Point2(0, 22)); tileset_editor->hide(); + + autotile_editor = memnew(AutotileEditor(p_node)); + add_control_to_container(CONTAINER_CANVAS_EDITOR_SIDE, autotile_editor->side_panel); + autotile_editor->side_panel->set_anchors_and_margins_preset(Control::PRESET_WIDE); + autotile_editor->side_panel->set_custom_minimum_size(Size2(200, 0)); + autotile_editor->side_panel->hide(); + autotile_button = p_node->add_bottom_panel_item("Autotiles", autotile_editor); + autotile_button->hide(); +} + +AutotileEditor::AutotileEditor(EditorNode *p_editor) { + + editor = p_editor; + + //Side Panel + side_panel = memnew(Control); + side_panel->set_name("Autotiles"); + + VSplitContainer *split = memnew(VSplitContainer); + side_panel->add_child(split); + split->set_anchors_and_margins_preset(Control::PRESET_WIDE); + + autotile_list = memnew(ItemList); + autotile_list->set_v_size_flags(SIZE_EXPAND_FILL); + autotile_list->set_h_size_flags(SIZE_EXPAND_FILL); + autotile_list->set_custom_minimum_size(Size2(02, 200)); + autotile_list->connect("item_selected", this, "_on_autotile_selected"); + split->add_child(autotile_list); + + property_editor = memnew(PropertyEditor); + property_editor->set_v_size_flags(SIZE_EXPAND_FILL); + property_editor->set_h_size_flags(SIZE_EXPAND_FILL); + split->add_child(property_editor); + + helper = memnew(AutotileEditorHelper(this)); + property_editor->edit(helper); + + // Editor + + dragging_point = -1; + creating_shape = false; + + set_custom_minimum_size(Size2(0, 150)); + + VBoxContainer *main_vb = memnew(VBoxContainer); + add_child(main_vb); + main_vb->set_anchors_and_margins_preset(Control::PRESET_WIDE); + + HBoxContainer *tool_hb = memnew(HBoxContainer); + Ref<ButtonGroup> g(memnew(ButtonGroup)); + + String label[EDITMODE_MAX] = { "Icon", "Bitmask", "Collision", "Occlusion", "Navigation", "Priority" }; + + for (int i = 0; i < (int)EDITMODE_MAX; i++) { + tool_editmode[i] = memnew(Button); + tool_editmode[i]->set_text(label[i]); + tool_editmode[i]->set_toggle_mode(true); + tool_editmode[i]->set_button_group(g); + Vector<Variant> args; + args.push_back(i); + tool_editmode[i]->connect("pressed", this, "_on_edit_mode_changed", args); + tool_hb->add_child(tool_editmode[i]); + } + tool_editmode[EDITMODE_ICON]->set_pressed(true); + + main_vb->add_child(tool_hb); + main_vb->add_child(memnew(HSeparator)); + + toolbar = memnew(HBoxContainer); + for (int i = 0; i < (int)TOOLBAR_MAX; i++) { + tool_containers[i] = memnew(HBoxContainer); + toolbar->add_child(tool_containers[i]); + tool_containers[i]->hide(); + } + + Ref<ButtonGroup> tg(memnew(ButtonGroup)); + + tools[TOOL_SELECT] = memnew(ToolButton); + tool_containers[TOOLBAR_DUMMY]->add_child(tools[TOOL_SELECT]); + tools[TOOL_SELECT]->set_tooltip("Select sub-tile to use as icon, this will be also used on invalid autotile bindings."); + tools[TOOL_SELECT]->set_toggle_mode(true); + tools[TOOL_SELECT]->set_button_group(tg); + tools[TOOL_SELECT]->set_pressed(true); + tool_containers[TOOLBAR_DUMMY]->show(); + + Vector<Variant> p; + tools[BITMASK_COPY] = memnew(ToolButton); + p.push_back((int)BITMASK_COPY); + tools[BITMASK_COPY]->connect("pressed", this, "_on_tool_clicked", p); + tool_containers[TOOLBAR_BITMASK]->add_child(tools[BITMASK_COPY]); + tools[BITMASK_PASTE] = memnew(ToolButton); + p = Vector<Variant>(); + p.push_back((int)BITMASK_PASTE); + tools[BITMASK_PASTE]->connect("pressed", this, "_on_tool_clicked", p); + tool_containers[TOOLBAR_BITMASK]->add_child(tools[BITMASK_PASTE]); + tools[BITMASK_CLEAR] = memnew(ToolButton); + p = Vector<Variant>(); + p.push_back((int)BITMASK_CLEAR); + tools[BITMASK_CLEAR]->connect("pressed", this, "_on_tool_clicked", p); + tool_containers[TOOLBAR_BITMASK]->add_child(tools[BITMASK_CLEAR]); + + tools[SHAPE_NEW_POLYGON] = memnew(ToolButton); + tool_containers[TOOLBAR_SHAPE]->add_child(tools[SHAPE_NEW_POLYGON]); + tools[SHAPE_NEW_POLYGON]->set_toggle_mode(true); + tools[SHAPE_NEW_POLYGON]->set_button_group(tg); + tool_containers[TOOLBAR_SHAPE]->add_child(memnew(VSeparator)); + tools[SHAPE_DELETE] = memnew(ToolButton); + p = Vector<Variant>(); + p.push_back((int)SHAPE_DELETE); + tools[SHAPE_DELETE]->connect("pressed", this, "_on_tool_clicked", p); + tool_containers[TOOLBAR_SHAPE]->add_child(tools[SHAPE_DELETE]); + //tools[SHAPE_CREATE_FROM_NOT_BITMASKED] = memnew(ToolButton); + //tool_containers[TOOLBAR_SHAPE]->add_child(tools[SHAPE_CREATE_FROM_NOT_BITMASKED]); + tool_containers[TOOLBAR_SHAPE]->add_change_receptor(memnew(VSeparator)); + tools[SHAPE_KEEP_INSIDE_TILE] = memnew(ToolButton); + tools[SHAPE_KEEP_INSIDE_TILE]->set_toggle_mode(true); + tools[SHAPE_KEEP_INSIDE_TILE]->set_pressed(true); + tool_containers[TOOLBAR_SHAPE]->add_child(tools[SHAPE_KEEP_INSIDE_TILE]); + tools[SHAPE_SNAP_TO_BITMASK_GRID] = memnew(ToolButton); + tools[SHAPE_SNAP_TO_BITMASK_GRID]->set_toggle_mode(true); + tools[SHAPE_SNAP_TO_BITMASK_GRID]->set_pressed(true); + tool_containers[TOOLBAR_SHAPE]->add_child(tools[SHAPE_SNAP_TO_BITMASK_GRID]); + + spin_priority = memnew(SpinBox); + spin_priority->set_min(1); + spin_priority->set_max(255); + spin_priority->set_step(1); + spin_priority->set_custom_minimum_size(Size2(100, 0)); + spin_priority->connect("value_changed", this, "_on_priority_changed"); + spin_priority->hide(); + toolbar->add_child(spin_priority); + + Control *separator = memnew(Control); + separator->set_h_size_flags(SIZE_EXPAND_FILL); + toolbar->add_child(separator); + + tools[ZOOM_OUT] = memnew(ToolButton); + p = Vector<Variant>(); + p.push_back((int)ZOOM_OUT); + tools[ZOOM_OUT]->connect("pressed", this, "_on_tool_clicked", p); + toolbar->add_child(tools[ZOOM_OUT]); + tools[ZOOM_1] = memnew(ToolButton); + p = Vector<Variant>(); + p.push_back((int)ZOOM_1); + tools[ZOOM_1]->connect("pressed", this, "_on_tool_clicked", p); + toolbar->add_child(tools[ZOOM_1]); + tools[ZOOM_IN] = memnew(ToolButton); + p = Vector<Variant>(); + p.push_back((int)ZOOM_IN); + tools[ZOOM_IN]->connect("pressed", this, "_on_tool_clicked", p); + toolbar->add_child(tools[ZOOM_IN]); + + main_vb->add_child(toolbar); + + ScrollContainer *scroll = memnew(ScrollContainer); + main_vb->add_child(scroll); + scroll->set_v_size_flags(SIZE_EXPAND_FILL); + + workspace_container = memnew(Control); + scroll->add_child(workspace_container); + + workspace = memnew(Control); + workspace->connect("draw", this, "_on_workspace_draw"); + workspace->connect("gui_input", this, "_on_workspace_input"); + workspace_container->add_child(workspace); + + preview = memnew(Sprite); + workspace->add_child(preview); + preview->set_centered(false); + preview->set_draw_behind_parent(true); + preview->set_region(true); +} + +void AutotileEditor::_bind_methods() { + + ClassDB::bind_method("_on_autotile_selected", &AutotileEditor::_on_autotile_selected); + ClassDB::bind_method("_on_edit_mode_changed", &AutotileEditor::_on_edit_mode_changed); + ClassDB::bind_method("_on_workspace_draw", &AutotileEditor::_on_workspace_draw); + ClassDB::bind_method("_on_workspace_input", &AutotileEditor::_on_workspace_input); + ClassDB::bind_method("_on_tool_clicked", &AutotileEditor::_on_tool_clicked); + ClassDB::bind_method("_on_priority_changed", &AutotileEditor::_on_priority_changed); +} + +void AutotileEditor::_notification(int p_what) { + + if (p_what == NOTIFICATION_ENTER_TREE) { + tools[TOOL_SELECT]->set_icon(get_icon("ToolSelect", "EditorIcons")); + tools[BITMASK_COPY]->set_icon(get_icon("Duplicate", "EditorIcons")); + tools[BITMASK_PASTE]->set_icon(get_icon("Override", "EditorIcons")); + tools[BITMASK_CLEAR]->set_icon(get_icon("Clear", "EditorIcons")); + tools[SHAPE_NEW_POLYGON]->set_icon(get_icon("CollisionPolygon2D", "EditorIcons")); + tools[SHAPE_DELETE]->set_icon(get_icon("Remove", "EditorIcons")); + tools[SHAPE_KEEP_INSIDE_TILE]->set_icon(get_icon("Snap", "EditorIcons")); + tools[SHAPE_SNAP_TO_BITMASK_GRID]->set_icon(get_icon("SnapGrid", "EditorIcons")); + tools[ZOOM_OUT]->set_icon(get_icon("ZoomLess", "EditorIcons")); + tools[ZOOM_1]->set_icon(get_icon("ZoomReset", "EditorIcons")); + tools[ZOOM_IN]->set_icon(get_icon("ZoomMore", "EditorIcons")); + } +} + +void AutotileEditor::_on_autotile_selected(int p_index) { + + if (get_current_tile() >= 0) { + current_item_index = p_index; + preview->set_texture(tile_set->tile_get_texture(get_current_tile())); + preview->set_region_rect(tile_set->tile_get_region(get_current_tile())); + workspace->set_custom_minimum_size(tile_set->tile_get_region(get_current_tile()).size); + } else { + current_item_index = -1; + preview->set_texture(NULL); + workspace->set_custom_minimum_size(Size2i()); + } + helper->_change_notify(""); + workspace->update(); +} + +void AutotileEditor::_on_edit_mode_changed(int p_edit_mode) { + + edit_mode = (EditMode)p_edit_mode; + switch (edit_mode) { + case EDITMODE_BITMASK: { + tool_containers[TOOLBAR_DUMMY]->show(); + tool_containers[TOOLBAR_BITMASK]->show(); + tool_containers[TOOLBAR_SHAPE]->hide(); + tools[TOOL_SELECT]->set_pressed(true); + tools[TOOL_SELECT]->set_tooltip("LMB: set bit on.\nRMB: set bit off."); + spin_priority->hide(); + } break; + case EDITMODE_COLLISION: + case EDITMODE_NAVIGATION: + case EDITMODE_OCCLUSION: { + tool_containers[TOOLBAR_DUMMY]->show(); + tool_containers[TOOLBAR_BITMASK]->hide(); + tool_containers[TOOLBAR_SHAPE]->show(); + tools[TOOL_SELECT]->set_tooltip("Select current edited sub-tile."); + spin_priority->hide(); + } break; + default: { + tool_containers[TOOLBAR_DUMMY]->show(); + tool_containers[TOOLBAR_BITMASK]->hide(); + tool_containers[TOOLBAR_SHAPE]->hide(); + if (edit_mode == EDITMODE_ICON) { + tools[TOOL_SELECT]->set_tooltip("Select sub-tile to use as icon, this will be also used on invalid autotile bindings."); + spin_priority->hide(); + } else { + tools[TOOL_SELECT]->set_tooltip("Select sub-tile to change it's priority."); + spin_priority->show(); + } + } break; + } + workspace->update(); +} + +void AutotileEditor::_on_workspace_draw() { + + if (get_current_tile() >= 0 && !tile_set.is_null()) { + int spacing = tile_set->autotile_get_spacing(get_current_tile()); + Vector2 size = tile_set->autotile_get_size(get_current_tile()); + Rect2i region = tile_set->tile_get_region(get_current_tile()); + Color c(0.347214, 0.722656, 0.617063); + + switch (edit_mode) { + case EDITMODE_ICON: { + Vector2 coord = tile_set->autotile_get_icon_coordinate(get_current_tile()); + draw_highlight_tile(coord); + } break; + case EDITMODE_BITMASK: { + c = Color(1, 0, 0, 0.5); + for (float x = 0; x < region.size.x / (spacing + size.x); x++) { + for (float y = 0; y < region.size.y / (spacing + size.y); y++) { + Vector2 coord(x, y); + Point2 anchor(coord.x * (spacing + size.x), coord.y * (spacing + size.y)); + uint16_t mask = tile_set->autotile_get_bitmask(get_current_tile(), coord); + if (tile_set->autotile_get_bitmask_mode(get_current_tile()) == TileSet::BITMASK_2X2) { + if (mask & TileSet::BIND_TOPLEFT) { + workspace->draw_rect(Rect2(anchor, size / 2), c); + } + if (mask & TileSet::BIND_TOPRIGHT) { + workspace->draw_rect(Rect2(anchor + Vector2(size.x / 2, 0), size / 2), c); + } + if (mask & TileSet::BIND_BOTTOMLEFT) { + workspace->draw_rect(Rect2(anchor + Vector2(0, size.y / 2), size / 2), c); + } + if (mask & TileSet::BIND_BOTTOMRIGHT) { + workspace->draw_rect(Rect2(anchor + size / 2, size / 2), c); + } + } else if (tile_set->autotile_get_bitmask_mode(get_current_tile()) == TileSet::BITMASK_3X3) { + if (mask & TileSet::BIND_TOPLEFT) { + workspace->draw_rect(Rect2(anchor, size / 3), c); + } + if (mask & TileSet::BIND_TOP) { + workspace->draw_rect(Rect2(anchor + Vector2(size.x / 3, 0), size / 3), c); + } + if (mask & TileSet::BIND_TOPRIGHT) { + workspace->draw_rect(Rect2(anchor + Vector2((size.x / 3) * 2, 0), size / 3), c); + } + if (mask & TileSet::BIND_LEFT) { + workspace->draw_rect(Rect2(anchor + Vector2(0, size.y / 3), size / 3), c); + } + if (mask & TileSet::BIND_CENTER) { + workspace->draw_rect(Rect2(anchor + Vector2(size.x / 3, size.y / 3), size / 3), c); + } + if (mask & TileSet::BIND_RIGHT) { + workspace->draw_rect(Rect2(anchor + Vector2((size.x / 3) * 2, size.y / 3), size / 3), c); + } + if (mask & TileSet::BIND_BOTTOMLEFT) { + workspace->draw_rect(Rect2(anchor + Vector2(0, (size.y / 3) * 2), size / 3), c); + } + if (mask & TileSet::BIND_BOTTOM) { + workspace->draw_rect(Rect2(anchor + Vector2(size.x / 3, (size.y / 3) * 2), size / 3), c); + } + if (mask & TileSet::BIND_BOTTOMRIGHT) { + workspace->draw_rect(Rect2(anchor + (size / 3) * 2, size / 3), c); + } + } + } + } + } break; + case EDITMODE_COLLISION: + case EDITMODE_OCCLUSION: + case EDITMODE_NAVIGATION: { + Vector2 coord = edited_shape_coord; + draw_highlight_tile(coord); + draw_polygon_shapes(); + } break; + case EDITMODE_PRIORITY: { + spin_priority->set_value(tile_set->autotile_get_subtile_priority(get_current_tile(), edited_shape_coord)); + uint16_t mask = tile_set->autotile_get_bitmask(get_current_tile(), edited_shape_coord); + Vector<Vector2> queue_others; + int total = 0; + for (Map<Vector2, uint16_t>::Element *E = tile_set->autotile_get_bitmask_map(get_current_tile()).front(); E; E = E->next()) { + if (E->value() == mask) { + total += tile_set->autotile_get_subtile_priority(get_current_tile(), E->key()); + if (E->key() != edited_shape_coord) { + queue_others.push_back(E->key()); + } + } + } + spin_priority->set_suffix(" / " + String::num(total, 0)); + draw_highlight_tile(edited_shape_coord, queue_others); + } break; + } + + float j = -size.x; //make sure to draw at 0 + while (j < region.size.x) { + j += size.x; + if (spacing <= 0) { + workspace->draw_line(Point2(j, 0), Point2(j, region.size.y), c); + } else { + workspace->draw_rect(Rect2(Point2(j, 0), Size2(spacing, region.size.y)), c); + } + j += spacing; + } + j = -size.y; //make sure to draw at 0 + while (j < region.size.y) { + j += size.y; + if (spacing <= 0) { + workspace->draw_line(Point2(0, j), Point2(region.size.x, j), c); + } else { + workspace->draw_rect(Rect2(Point2(0, j), Size2(region.size.x, spacing)), c); + } + j += spacing; + } + } +} + +#define MIN_DISTANCE_SQUARED 10 +void AutotileEditor::_on_workspace_input(const Ref<InputEvent> &p_ie) { + + if (get_current_tile() >= 0 && !tile_set.is_null()) { + Ref<InputEventMouseButton> mb = p_ie; + Ref<InputEventMouseMotion> mm = p_ie; + + static bool dragging; + static bool erasing; + + int spacing = tile_set->autotile_get_spacing(get_current_tile()); + Vector2 size = tile_set->autotile_get_size(get_current_tile()); + switch (edit_mode) { + case EDITMODE_ICON: { + if (mb.is_valid()) { + if (mb->is_pressed() && mb->get_button_index() == BUTTON_LEFT) { + Vector2 coord((int)(mb->get_position().x / (spacing + size.x)), (int)(mb->get_position().y / (spacing + size.y))); + tile_set->autotile_set_icon_coordinate(get_current_tile(), coord); + Rect2 region = tile_set->tile_get_region(get_current_tile()); + region.size = size; + coord.x *= (spacing + size.x); + coord.y *= (spacing + size.y); + region.position += coord; + autotile_list->set_item_icon_region(current_item_index, region); + workspace->update(); + } + } + } break; + case EDITMODE_BITMASK: { + if (mb.is_valid()) { + if (mb->is_pressed()) { + if (dragging) { + return; + } + if (mb->get_button_index() == BUTTON_RIGHT || mb->get_button_index() == BUTTON_LEFT) { + dragging = true; + erasing = (mb->get_button_index() == BUTTON_RIGHT); + Vector2 coord((int)(mb->get_position().x / (spacing + size.x)), (int)(mb->get_position().y / (spacing + size.y))); + Vector2 pos(coord.x * (spacing + size.x), coord.y * (spacing + size.y)); + pos = mb->get_position() - pos; + uint16_t bit; + if (tile_set->autotile_get_bitmask_mode(get_current_tile()) == TileSet::BITMASK_2X2) { + if (pos.x < size.x / 2) { + if (pos.y < size.y / 2) { + bit = TileSet::BIND_TOPLEFT; + } else { + bit = TileSet::BIND_BOTTOMLEFT; + } + } else { + if (pos.y < size.y / 2) { + bit = TileSet::BIND_TOPRIGHT; + } else { + bit = TileSet::BIND_BOTTOMRIGHT; + } + } + } else if (tile_set->autotile_get_bitmask_mode(get_current_tile()) == TileSet::BITMASK_3X3) { + if (pos.x < size.x / 3) { + if (pos.y < size.y / 3) { + bit = TileSet::BIND_TOPLEFT; + } else if (pos.y > (size.y / 3) * 2) { + bit = TileSet::BIND_BOTTOMLEFT; + } else { + bit = TileSet::BIND_LEFT; + } + } else if (pos.x > (size.x / 3) * 2) { + if (pos.y < size.y / 3) { + bit = TileSet::BIND_TOPRIGHT; + } else if (pos.y > (size.y / 3) * 2) { + bit = TileSet::BIND_BOTTOMRIGHT; + } else { + bit = TileSet::BIND_RIGHT; + } + } else { + if (pos.y < size.y / 3) { + bit = TileSet::BIND_TOP; + } else if (pos.y > (size.y / 3) * 2) { + bit = TileSet::BIND_BOTTOM; + } else { + bit = TileSet::BIND_CENTER; + } + } + } + uint16_t mask = tile_set->autotile_get_bitmask(get_current_tile(), coord); + if (erasing) { + mask &= ~bit; + } else { + mask |= bit; + } + tile_set->autotile_set_bitmask(get_current_tile(), coord, mask); + workspace->update(); + } + } else { + if ((erasing && mb->get_button_index() == BUTTON_RIGHT) || (!erasing && mb->get_button_index() == BUTTON_LEFT)) { + dragging = false; + erasing = false; + } + } + } + if (mm.is_valid()) { + if (dragging) { + Vector2 coord((int)(mm->get_position().x / (spacing + size.x)), (int)(mm->get_position().y / (spacing + size.y))); + Vector2 pos(coord.x * (spacing + size.x), coord.y * (spacing + size.y)); + pos = mm->get_position() - pos; + uint16_t bit; + if (tile_set->autotile_get_bitmask_mode(get_current_tile()) == TileSet::BITMASK_2X2) { + if (pos.x < size.x / 2) { + if (pos.y < size.y / 2) { + bit = TileSet::BIND_TOPLEFT; + } else { + bit = TileSet::BIND_BOTTOMLEFT; + } + } else { + if (pos.y < size.y / 2) { + bit = TileSet::BIND_TOPRIGHT; + } else { + bit = TileSet::BIND_BOTTOMRIGHT; + } + } + } else if (tile_set->autotile_get_bitmask_mode(get_current_tile()) == TileSet::BITMASK_3X3) { + if (pos.x < size.x / 3) { + if (pos.y < size.y / 3) { + bit = TileSet::BIND_TOPLEFT; + } else if (pos.y > (size.y / 3) * 2) { + bit = TileSet::BIND_BOTTOMLEFT; + } else { + bit = TileSet::BIND_LEFT; + } + } else if (pos.x > (size.x / 3) * 2) { + if (pos.y < size.y / 3) { + bit = TileSet::BIND_TOPRIGHT; + } else if (pos.y > (size.y / 3) * 2) { + bit = TileSet::BIND_BOTTOMRIGHT; + } else { + bit = TileSet::BIND_RIGHT; + } + } else { + if (pos.y < size.y / 3) { + bit = TileSet::BIND_TOP; + } else if (pos.y > (size.y / 3) * 2) { + bit = TileSet::BIND_BOTTOM; + } else { + bit = TileSet::BIND_CENTER; + } + } + } + uint16_t mask = tile_set->autotile_get_bitmask(get_current_tile(), coord); + if (erasing) { + mask &= ~bit; + } else { + mask |= bit; + } + tile_set->autotile_set_bitmask(get_current_tile(), coord, mask); + workspace->update(); + } + } + } break; + case EDITMODE_COLLISION: + case EDITMODE_OCCLUSION: + case EDITMODE_NAVIGATION: + case EDITMODE_PRIORITY: { + Vector2 shape_anchor = edited_shape_coord; + shape_anchor.x *= (size.x + spacing); + shape_anchor.y *= (size.y + spacing); + if (tools[TOOL_SELECT]->is_pressed()) { + if (mb.is_valid()) { + if (mb->is_pressed() && mb->get_button_index() == BUTTON_LEFT) { + if (edit_mode != EDITMODE_PRIORITY && current_shape.size() > 0) { + for (int i = 0; i < current_shape.size(); i++) { + if ((current_shape[i] - mb->get_position()).length_squared() <= MIN_DISTANCE_SQUARED) { + dragging_point = i; + workspace->update(); + return; + } + } + } + Vector2 coord((int)(mb->get_position().x / (spacing + size.x)), (int)(mb->get_position().y / (spacing + size.y))); + if (edited_shape_coord != coord) { + edited_shape_coord = coord; + edited_occlusion_shape = tile_set->autotile_get_light_occluder(get_current_tile(), edited_shape_coord); + edited_navigation_shape = tile_set->autotile_get_navigation_polygon(get_current_tile(), edited_shape_coord); + shape_anchor = edited_shape_coord; + shape_anchor.x *= (size.x + spacing); + shape_anchor.y *= (size.y + spacing); + if (edit_mode == EDITMODE_OCCLUSION) { + current_shape.resize(0); + if (edited_occlusion_shape.is_valid()) { + for (int i = 0; i < edited_occlusion_shape->get_polygon().size(); i++) { + current_shape.push_back(edited_occlusion_shape->get_polygon()[i] + shape_anchor); + } + } + } else if (edit_mode == EDITMODE_NAVIGATION) { + current_shape.resize(0); + if (edited_navigation_shape.is_valid()) { + if (edited_navigation_shape->get_polygon_count() > 0) { + PoolVector<Vector2> vertices = edited_navigation_shape->get_vertices(); + for (int i = 0; i < edited_navigation_shape->get_polygon(0).size(); i++) { + current_shape.push_back(vertices[edited_navigation_shape->get_polygon(0)[i]] + shape_anchor); + } + } + } + } + } else { + if (edit_mode == EDITMODE_COLLISION) { + Vector<TileSet::ShapeData> sd = tile_set->tile_get_shapes(get_current_tile()); + for (int i = 0; i < sd.size(); i++) { + if (sd[i].autotile_coord == coord) { + Ref<ConcavePolygonShape2D> shape = sd[i].shape; + if (shape.is_valid()) { + //FIXME: i need a way to know if the point is countained on the polygon instead of the rect + Rect2 bounding_rect; + PoolVector2Array polygon; + bounding_rect.position = shape->get_segments()[0]; + for (int j = 0; j < shape->get_segments().size(); j += 2) { + polygon.push_back(shape->get_segments()[j] + shape_anchor); + bounding_rect.expand_to(shape->get_segments()[j] + shape_anchor); + } + if (bounding_rect.has_point(mb->get_position())) { + current_shape = polygon; + edited_collision_shape = shape; + } + } + } + } + } + } + workspace->update(); + } else if (!mb->is_pressed() && mb->get_button_index() == BUTTON_LEFT) { + if (edit_mode == EDITMODE_COLLISION) { + if (dragging_point >= 0) { + dragging_point = -1; + + PoolVector<Vector2> segments; + segments.resize(current_shape.size() * 2); + PoolVector<Vector2>::Write w = segments.write(); + + for (int i = 0; i < current_shape.size(); i++) { + w[(i << 1) + 0] = current_shape[i] - shape_anchor; + w[(i << 1) + 1] = current_shape[(i + 1) % current_shape.size()] - shape_anchor; + } + + w = PoolVector<Vector2>::Write(); + edited_collision_shape->set_segments(segments); + + workspace->update(); + } + } else if (edit_mode == EDITMODE_OCCLUSION) { + if (dragging_point >= 0) { + dragging_point = -1; + + PoolVector<Vector2> polygon; + polygon.resize(current_shape.size()); + PoolVector<Vector2>::Write w = polygon.write(); + + for (int i = 0; i < current_shape.size(); i++) { + w[i] = current_shape[i] - shape_anchor; + } + + w = PoolVector<Vector2>::Write(); + edited_occlusion_shape->set_polygon(polygon); + + workspace->update(); + } + } else if (edit_mode == EDITMODE_NAVIGATION) { + if (dragging_point >= 0) { + dragging_point = -1; + + PoolVector<Vector2> polygon; + Vector<int> indices; + polygon.resize(current_shape.size()); + PoolVector<Vector2>::Write w = polygon.write(); + + for (int i = 0; i < current_shape.size(); i++) { + w[i] = current_shape[i] - shape_anchor; + indices.push_back(i); + } + + w = PoolVector<Vector2>::Write(); + edited_navigation_shape->set_vertices(polygon); + edited_navigation_shape->add_polygon(indices); + + workspace->update(); + } + } + } + } else if (mm.is_valid()) { + if (dragging_point >= 0) { + current_shape.set(dragging_point, snap_point(mm->get_position())); + workspace->update(); + } + } + } else if (tools[SHAPE_NEW_POLYGON]->is_pressed()) { + if (mb.is_valid()) { + if (mb->is_pressed() && mb->get_button_index() == BUTTON_LEFT) { + Vector2 pos = mb->get_position(); + pos = snap_point(pos); + if (creating_shape) { + if (current_shape.size() > 0) { + if ((pos - current_shape[0]).length_squared() <= MIN_DISTANCE_SQUARED) { + if (current_shape.size() > 2) { + close_shape(shape_anchor); + workspace->update(); + return; + } + } + } + current_shape.push_back(pos); + workspace->update(); + } else { + creating_shape = true; + current_shape.resize(0); + current_shape.push_back(snap_point(pos)); + } + } else if (mb->is_pressed() && mb->get_button_index() == BUTTON_RIGHT) { + if (creating_shape) { + close_shape(shape_anchor); + } + } + } else if (mm.is_valid()) { + if (creating_shape) { + workspace->update(); + } + } + } + } break; + } + } +} + +void AutotileEditor::_on_tool_clicked(int p_tool) { + if (p_tool == BITMASK_COPY) { + bitmask_map_copy = tile_set->autotile_get_bitmask_map(get_current_tile()); + } else if (p_tool == BITMASK_PASTE) { + tile_set->autotile_clear_bitmask_map(get_current_tile()); + for (Map<Vector2, uint16_t>::Element *E = bitmask_map_copy.front(); E; E = E->next()) { + tile_set->autotile_set_bitmask(get_current_tile(), E->key(), E->value()); + } + workspace->update(); + } else if (p_tool == BITMASK_CLEAR) { + tile_set->autotile_clear_bitmask_map(get_current_tile()); + workspace->update(); + } else if (p_tool == SHAPE_DELETE) { + if (!edited_collision_shape.is_null()) { + Vector<TileSet::ShapeData> sd = tile_set->tile_get_shapes(get_current_tile()); + int index; + for (int i = 0; i < sd.size(); i++) { + if (sd[i].shape == edited_collision_shape) { + index = i; + break; + } + } + if (index >= 0) { + sd.remove(index); + tile_set->tile_set_shapes(get_current_tile(), sd); + edited_collision_shape.unref(); + current_shape.resize(0); + workspace->update(); + } + } + } else if (p_tool == ZOOM_OUT) { + float scale = workspace->get_scale().x; + if (scale > 0.1) { + scale /= 2; + workspace->set_scale(Vector2(scale, scale)); + workspace_container->set_custom_minimum_size(preview->get_region_rect().size * scale); + } + } else if (p_tool == ZOOM_1) { + workspace->set_scale(Vector2(1, 1)); + workspace_container->set_custom_minimum_size(preview->get_region_rect().size); + } else if (p_tool == ZOOM_IN) { + float scale = workspace->get_scale().x; + scale *= 2; + workspace->set_scale(Vector2(scale, scale)); + workspace_container->set_custom_minimum_size(preview->get_region_rect().size * scale); + } +} + +void AutotileEditor::_on_priority_changed(float val) { + tile_set->autotile_set_subtile_priority(get_current_tile(), edited_shape_coord, (int)val); + workspace->update(); +} + +void AutotileEditor::draw_highlight_tile(Vector2 coord, const Vector<Vector2> &other_highlighted) { + + Vector2 size = tile_set->autotile_get_size(get_current_tile()); + int spacing = tile_set->autotile_get_spacing(get_current_tile()); + Rect2 region = tile_set->tile_get_region(get_current_tile()); + coord.x *= (size.x + spacing); + coord.y *= (size.y + spacing); + workspace->draw_rect(Rect2(0, 0, region.size.x, coord.y), Color(0.5, 0.5, 0.5, 0.5)); + workspace->draw_rect(Rect2(0, coord.y, coord.x, size.y), Color(0.5, 0.5, 0.5, 0.5)); + workspace->draw_rect(Rect2(coord.x + size.x, coord.y, region.size.x - coord.x - size.x, size.y), Color(0.5, 0.5, 0.5, 0.5)); + workspace->draw_rect(Rect2(0, coord.y + size.y, region.size.x, region.size.y - size.y - coord.y), Color(0.5, 0.5, 0.5, 0.5)); + coord += Vector2(1, 1); + workspace->draw_rect(Rect2(coord, size - Vector2(2, 2)), Color(1, 0, 0), false); + for (int i = 0; i < other_highlighted.size(); i++) { + coord = other_highlighted[i]; + coord.x *= (size.x + spacing); + coord.y *= (size.y + spacing); + coord += Vector2(1, 1); + workspace->draw_rect(Rect2(coord, size - Vector2(2, 2)), Color(1, 0, 0), false); + } +} + +void AutotileEditor::draw_polygon_shapes() { + + int t_id = get_current_tile(); + if (t_id < 0) + return; + + switch (edit_mode) { + case EDITMODE_COLLISION: { + Vector<TileSet::ShapeData> sd = tile_set->tile_get_shapes(t_id); + for (int i = 0; i < sd.size(); i++) { + Vector2 coord = sd[i].autotile_coord; + Vector2 anchor = tile_set->autotile_get_size(t_id); + anchor.x += tile_set->autotile_get_spacing(t_id); + anchor.y += tile_set->autotile_get_spacing(t_id); + anchor.x *= coord.x; + anchor.y *= coord.y; + Ref<ConcavePolygonShape2D> shape = sd[i].shape; + if (shape.is_valid()) { + Color c_bg; + Color c_border; + if (coord == edited_shape_coord && sd[i].shape == edited_collision_shape) { + c_bg = Color(0, 1, 1, 0.5); + c_border = Color(0, 1, 1); + } else { + c_bg = Color(0.9, 0.7, 0.07, 0.5); + c_border = Color(0.9, 0.7, 0.07, 1); + } + Vector<Vector2> polygon; + Vector<Color> colors; + if (shape == edited_collision_shape) { + for (int j = 0; j < current_shape.size(); j++) { + polygon.push_back(current_shape[j]); + colors.push_back(c_bg); + } + } else { + for (int j = 0; j < shape->get_segments().size(); j += 2) { + polygon.push_back(shape->get_segments()[j] + anchor); + colors.push_back(c_bg); + } + } + workspace->draw_polygon(polygon, colors); + if (coord == edited_shape_coord) { + for (int j = 0; j < shape->get_segments().size(); j += 2) { + workspace->draw_line(shape->get_segments()[j] + anchor, shape->get_segments()[j + 1] + anchor, c_border, 1, true); + } + if (shape == edited_collision_shape) { + for (int j = 0; j < current_shape.size(); j++) { + workspace->draw_circle(current_shape[j], 5, Color(1, 0, 0)); + } + } + } + } + } + } break; + case EDITMODE_OCCLUSION: { + Map<Vector2, Ref<OccluderPolygon2D> > map = tile_set->autotile_get_light_oclusion_map(t_id); + for (Map<Vector2, Ref<OccluderPolygon2D> >::Element *E = map.front(); E; E = E->next()) { + Vector2 coord = E->key(); + Vector2 anchor = tile_set->autotile_get_size(t_id); + anchor.x += tile_set->autotile_get_spacing(t_id); + anchor.y += tile_set->autotile_get_spacing(t_id); + anchor.x *= coord.x; + anchor.y *= coord.y; + Ref<OccluderPolygon2D> shape = E->value(); + if (shape.is_valid()) { + Color c_bg; + Color c_border; + if (coord == edited_shape_coord && shape == edited_occlusion_shape) { + c_bg = Color(0, 1, 1, 0.5); + c_border = Color(0, 1, 1); + } else { + c_bg = Color(0.9, 0.7, 0.07, 0.5); + c_border = Color(0.9, 0.7, 0.07, 1); + } + Vector<Vector2> polygon; + Vector<Color> colors; + if (shape == edited_occlusion_shape) { + for (int j = 0; j < current_shape.size(); j++) { + polygon.push_back(current_shape[j]); + colors.push_back(c_bg); + } + } else { + for (int j = 0; j < shape->get_polygon().size(); j++) { + polygon.push_back(shape->get_polygon()[j] + anchor); + colors.push_back(c_bg); + } + } + workspace->draw_polygon(polygon, colors); + if (coord == edited_shape_coord) { + for (int j = 0; j < shape->get_polygon().size() - 1; j++) { + workspace->draw_line(shape->get_polygon()[j] + anchor, shape->get_polygon()[j + 1] + anchor, c_border, 1, true); + } + workspace->draw_line(shape->get_polygon()[shape->get_polygon().size() - 1] + anchor, shape->get_polygon()[0] + anchor, c_border, 1, true); + if (shape == edited_occlusion_shape) { + for (int j = 0; j < current_shape.size(); j++) { + workspace->draw_circle(current_shape[j], 5, Color(1, 0, 0)); + } + } + } + } + } + } break; + case EDITMODE_NAVIGATION: { + Map<Vector2, Ref<NavigationPolygon> > map = tile_set->autotile_get_navigation_map(t_id); + for (Map<Vector2, Ref<NavigationPolygon> >::Element *E = map.front(); E; E = E->next()) { + Vector2 coord = E->key(); + Vector2 anchor = tile_set->autotile_get_size(t_id); + anchor.x += tile_set->autotile_get_spacing(t_id); + anchor.y += tile_set->autotile_get_spacing(t_id); + anchor.x *= coord.x; + anchor.y *= coord.y; + Ref<NavigationPolygon> shape = E->value(); + if (shape.is_valid()) { + Color c_bg; + Color c_border; + if (coord == edited_shape_coord && shape == edited_navigation_shape) { + c_bg = Color(0, 1, 1, 0.5); + c_border = Color(0, 1, 1); + } else { + c_bg = Color(0.9, 0.7, 0.07, 0.5); + c_border = Color(0.9, 0.7, 0.07, 1); + } + Vector<Vector2> polygon; + Vector<Color> colors; + if (shape == edited_navigation_shape) { + for (int j = 0; j < current_shape.size(); j++) { + polygon.push_back(current_shape[j]); + colors.push_back(c_bg); + } + } else if (shape->get_polygon_count() > 0) { + PoolVector<Vector2> vertices = shape->get_vertices(); + for (int j = 0; j < shape->get_polygon(0).size(); j++) { + polygon.push_back(vertices[shape->get_polygon(0)[j]] + anchor); + colors.push_back(c_bg); + } + } + workspace->draw_polygon(polygon, colors); + if (coord == edited_shape_coord) { + if (shape->get_polygon_count() > 0) { + PoolVector<Vector2> vertices = shape->get_vertices(); + for (int j = 0; j < shape->get_polygon(0).size() - 1; j++) { + workspace->draw_line(vertices[shape->get_polygon(0)[j]] + anchor, vertices[shape->get_polygon(0)[j + 1]] + anchor, c_border, 1, true); + } + if (shape == edited_navigation_shape) { + for (int j = 0; j < current_shape.size(); j++) { + workspace->draw_circle(current_shape[j], 5, Color(1, 0, 0)); + } + } + } + } + } + } + } break; + } + if (creating_shape) { + for (int j = 0; j < current_shape.size() - 1; j++) { + workspace->draw_line(current_shape[j], current_shape[j + 1], Color(0, 1, 1), 1, true); + } + workspace->draw_line(current_shape[current_shape.size() - 1], snap_point(workspace->get_local_mouse_position()), Color(0, 1, 1), 1, true); + } +} + +void AutotileEditor::close_shape(const Vector2 &shape_anchor) { + + creating_shape = false; + + if (edit_mode == EDITMODE_COLLISION) { + Ref<ConcavePolygonShape2D> shape = memnew(ConcavePolygonShape2D); + + PoolVector<Vector2> segments; + segments.resize(current_shape.size() * 2); + PoolVector<Vector2>::Write w = segments.write(); + + for (int i = 0; i < current_shape.size(); i++) { + w[(i << 1) + 0] = current_shape[i] - shape_anchor; + w[(i << 1) + 1] = current_shape[(i + 1) % current_shape.size()] - shape_anchor; + } + + w = PoolVector<Vector2>::Write(); + shape->set_segments(segments); + + tile_set->tile_add_shape(get_current_tile(), shape, Transform2D(), false, edited_shape_coord); + edited_collision_shape = shape; + tools[TOOL_SELECT]->set_pressed(true); + workspace->update(); + } else if (edit_mode == EDITMODE_OCCLUSION) { + Ref<OccluderPolygon2D> shape = memnew(OccluderPolygon2D); + + PoolVector<Vector2> polygon; + polygon.resize(current_shape.size()); + PoolVector<Vector2>::Write w = polygon.write(); + + for (int i = 0; i < current_shape.size(); i++) { + w[i] = current_shape[i] - shape_anchor; + } + + w = PoolVector<Vector2>::Write(); + shape->set_polygon(polygon); + + tile_set->autotile_set_light_occluder(get_current_tile(), shape, edited_shape_coord); + edited_occlusion_shape = shape; + tools[TOOL_SELECT]->set_pressed(true); + workspace->update(); + } else if (edit_mode == EDITMODE_NAVIGATION) { + Ref<NavigationPolygon> shape = memnew(NavigationPolygon); + + PoolVector<Vector2> polygon; + Vector<int> indices; + polygon.resize(current_shape.size()); + PoolVector<Vector2>::Write w = polygon.write(); + + for (int i = 0; i < current_shape.size(); i++) { + w[i] = current_shape[i] - shape_anchor; + indices.push_back(i); + } + + w = PoolVector<Vector2>::Write(); + shape->set_vertices(polygon); + shape->add_polygon(indices); + tile_set->autotile_set_navigation_polygon(get_current_tile(), shape, edited_shape_coord); + edited_navigation_shape = shape; + tools[TOOL_SELECT]->set_pressed(true); + workspace->update(); + } +} + +Vector2 AutotileEditor::snap_point(const Vector2 &point) { + Vector2 p = point; + Vector2 coord = edited_shape_coord; + Vector2 tile_size = tile_set->autotile_get_size(get_current_tile()); + int spacing = tile_set->autotile_get_spacing(get_current_tile()); + Vector2 anchor = coord; + anchor.x *= (tile_size.x + spacing); + anchor.y *= (tile_size.y + spacing); + Rect2 region(anchor, tile_size); + if (tools[SHAPE_KEEP_INSIDE_TILE]->is_pressed()) { + if (p.x < region.position.x) + p.x = region.position.x; + if (p.y < region.position.y) + p.y = region.position.y; + if (p.x > region.position.x + region.size.x) + p.x = region.position.x + region.size.x; + if (p.y > region.position.y + region.size.y) + p.y = region.position.y + region.size.y; + } + if (tools[SHAPE_SNAP_TO_BITMASK_GRID]->is_pressed()) { + Vector2 p2 = p; + if (tile_set->autotile_get_bitmask_mode(get_current_tile()) == TileSet::BITMASK_2X2) { + p2.x = Math::stepify(p2.x, tile_size.x / 2); + p2.y = Math::stepify(p2.y, tile_size.y / 2); + if ((p2 - p).length_squared() <= MAX(tile_size.y / 4, MIN_DISTANCE_SQUARED)) { + p = p2; + } + } else if (tile_set->autotile_get_bitmask_mode(get_current_tile()) == TileSet::BITMASK_3X3) { + p2.x = Math::stepify(p2.x, tile_size.x / 3); + p2.y = Math::stepify(p2.y, tile_size.y / 3); + if ((p2 - p).length_squared() <= MAX(tile_size.y / 6, MIN_DISTANCE_SQUARED)) { + p = p2; + } + } + } + p.floor(); + return p; +} + +void AutotileEditor::edit(Object *p_node) { + + tile_set = Ref<TileSet>(Object::cast_to<TileSet>(p_node)); + helper->set_tileset(tile_set); + + autotile_list->clear(); + List<int> ids; + tile_set->get_tile_list(&ids); + for (List<int>::Element *E = ids.front(); E; E = E->next()) { + if (tile_set->tile_get_is_autotile(E->get())) { + autotile_list->add_item(tile_set->tile_get_name(E->get())); + autotile_list->set_item_metadata(autotile_list->get_item_count() - 1, E->get()); + autotile_list->set_item_icon(autotile_list->get_item_count() - 1, tile_set->tile_get_texture(E->get())); + Rect2 region = tile_set->tile_get_region(E->get()); + region.size = tile_set->autotile_get_size(E->get()); + Vector2 pos = tile_set->autotile_get_icon_coordinate(E->get()); + pos.x *= (tile_set->autotile_get_spacing(E->get()) + region.size.x); + pos.y *= (tile_set->autotile_get_spacing(E->get()) + region.size.y); + region.position += pos; + autotile_list->set_item_icon_region(autotile_list->get_item_count() - 1, region); + } + } + if (autotile_list->get_item_count() > 0) { + autotile_list->select(0); + _on_autotile_selected(0); + } + helper->_change_notify(""); +} + +int AutotileEditor::get_current_tile() { + + if (autotile_list->get_selected_items().size() == 0) + return -1; + else + return autotile_list->get_item_metadata(autotile_list->get_selected_items()[0]); +} + +void AutotileEditorHelper::set_tileset(const Ref<TileSet> &p_tileset) { + + tile_set = p_tileset; +} + +bool AutotileEditorHelper::_set(const StringName &p_name, const Variant &p_value) { + + if (autotile_editor->get_current_tile() < 0 || tile_set.is_null()) + return false; + + String name = p_name.operator String(); + bool v = false; + if (name == "bitmask_mode") { + tile_set->set(String::num(autotile_editor->get_current_tile(), 0) + "/autotile/bitmask_mode", p_value, &v); + } else if (name.left(7) == "layout/") { + tile_set->set(String::num(autotile_editor->get_current_tile(), 0) + "/autotile" + name.right(6), p_value, &v); + } + if (v) { + tile_set->_change_notify(""); + autotile_editor->workspace->update(); + } + return v; +} + +bool AutotileEditorHelper::_get(const StringName &p_name, Variant &r_ret) const { + + if (autotile_editor->get_current_tile() < 0 || tile_set.is_null()) + return false; + + String name = p_name.operator String(); + if (name == "bitmask_mode") { + r_ret = tile_set->get(String::num(autotile_editor->get_current_tile(), 0) + "/autotile/bitmask_mode"); + } else if (name.left(7) == "layout/") { + bool v; + r_ret = tile_set->get(String::num(autotile_editor->get_current_tile(), 0) + "/autotile" + name.right(6), &v); + return v; + } +} + +void AutotileEditorHelper::_get_property_list(List<PropertyInfo> *p_list) const { + + if (autotile_editor->get_current_tile() < 0 || tile_set.is_null()) + return; + + p_list->push_back(PropertyInfo(Variant::INT, "bitmask_mode", PROPERTY_HINT_ENUM, "2x2,3x3")); + p_list->push_back(PropertyInfo(Variant::VECTOR2, "layout/tile_size")); + p_list->push_back(PropertyInfo(Variant::INT, "layout/spacing", PROPERTY_HINT_RANGE, "0,256,1")); +} + +AutotileEditorHelper::AutotileEditorHelper(AutotileEditor *p_autotile_editor) { + + autotile_editor = p_autotile_editor; } diff --git a/editor/plugins/tile_set_editor_plugin.h b/editor/plugins/tile_set_editor_plugin.h index 677ee05b55..d60d0d5c3c 100644 --- a/editor/plugins/tile_set_editor_plugin.h +++ b/editor/plugins/tile_set_editor_plugin.h @@ -32,10 +32,126 @@ #include "editor/editor_name_dialog.h" #include "editor/editor_node.h" +#include "scene/2d/sprite.h" +#include "scene/resources/concave_polygon_shape_2d.h" #include "scene/resources/tile_set.h" +class AutotileEditorHelper; +class AutotileEditor : public Control { + + friend class TileSetEditorPlugin; + friend class AutotileEditorHelper; + GDCLASS(AutotileEditor, Control); + + enum EditMode { + EDITMODE_ICON, + EDITMODE_BITMASK, + EDITMODE_COLLISION, + EDITMODE_OCCLUSION, + EDITMODE_NAVIGATION, + EDITMODE_PRIORITY, + EDITMODE_MAX + }; + + enum AutotileToolbars { + TOOLBAR_DUMMY, + TOOLBAR_BITMASK, + TOOLBAR_SHAPE, + TOOLBAR_MAX + }; + + enum AutotileTools { + TOOL_SELECT, + BITMASK_COPY, + BITMASK_PASTE, + BITMASK_CLEAR, + SHAPE_NEW_POLYGON, + SHAPE_DELETE, + SHAPE_CREATE_FROM_BITMASK, + SHAPE_CREATE_FROM_NOT_BITMASK, + SHAPE_KEEP_INSIDE_TILE, + SHAPE_SNAP_TO_BITMASK_GRID, + ZOOM_OUT, + ZOOM_1, + ZOOM_IN, + TOOL_MAX + }; + + Ref<TileSet> tile_set; + Ref<ConcavePolygonShape2D> edited_collision_shape; + Ref<OccluderPolygon2D> edited_occlusion_shape; + Ref<NavigationPolygon> edited_navigation_shape; + + EditorNode *editor; + + int current_item_index; + Sprite *preview; + Control *workspace_container; + Control *workspace; + Button *tool_editmode[EDITMODE_MAX]; + HBoxContainer *tool_containers[TOOLBAR_MAX]; + HBoxContainer *toolbar; + ToolButton *tools[TOOL_MAX]; + SpinBox *spin_priority; + EditMode edit_mode; + + bool creating_shape; + int dragging_point; + Vector2 edited_shape_coord; + PoolVector2Array current_shape; + Map<Vector2, uint16_t> bitmask_map_copy; + + Control *side_panel; + ItemList *autotile_list; + PropertyEditor *property_editor; + AutotileEditorHelper *helper; + + AutotileEditor(EditorNode *p_editor); + +protected: + static void _bind_methods(); + void _notification(int p_what); + +private: + void _on_autotile_selected(int p_index); + void _on_edit_mode_changed(int p_edit_mode); + void _on_workspace_draw(); + void _on_workspace_input(const Ref<InputEvent> &p_ie); + void _on_tool_clicked(int p_tool); + void _on_priority_changed(float val); + + void draw_highlight_tile(Vector2 coord, const Vector<Vector2> &other_highlighted = Vector<Vector2>()); + void draw_grid(const Vector2 &size, int spacing); + void draw_polygon_shapes(); + void close_shape(const Vector2 &shape_anchor); + Vector2 snap_point(const Vector2 &point); + + void edit(Object *p_node); + int get_current_tile(); +}; + +class AutotileEditorHelper : public Object { + + friend class AutotileEditor; + GDCLASS(AutotileEditorHelper, Object); + + Ref<TileSet> tile_set; + AutotileEditor *autotile_editor; + +public: + void set_tileset(const Ref<TileSet> &p_tileset); + +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; + + AutotileEditorHelper(AutotileEditor *p_autotile_editor); +}; + class TileSetEditor : public Control { + friend class TileSetEditorPlugin; GDCLASS(TileSetEditor, Control); Ref<TileSet> tileset; @@ -77,8 +193,11 @@ class TileSetEditorPlugin : public EditorPlugin { GDCLASS(TileSetEditorPlugin, EditorPlugin); TileSetEditor *tileset_editor; + AutotileEditor *autotile_editor; EditorNode *editor; + ToolButton *autotile_button; + public: virtual String get_name() const { return "TileSet"; } bool has_main_screen() const { return false; } diff --git a/editor/project_export.cpp b/editor/project_export.cpp index dda2851166..6500b10a3a 100644 --- a/editor/project_export.cpp +++ b/editor/project_export.cpp @@ -717,6 +717,7 @@ void ProjectExportDialog::_export_project() { export_project->set_access(FileDialog::ACCESS_FILESYSTEM); export_project->clear_filters(); + export_project->set_current_file(default_filename); String extension = platform->get_binary_extension(); if (extension != String()) { export_project->add_filter("*." + extension + " ; " + platform->get_name() + " Export"); @@ -726,6 +727,9 @@ void ProjectExportDialog::_export_project() { } void ProjectExportDialog::_export_project_to_path(const String &p_path) { + // Save this name for use in future exports (but drop the file extension) + default_filename = p_path.get_basename().get_file(); + EditorSettings::get_singleton()->set_project_metadata("export_options", "default_filename", default_filename); Ref<EditorExportPreset> current = EditorExport::get_singleton()->get_export_preset(presets->get_current()); ERR_FAIL_COND(current.is_null()); @@ -970,6 +974,8 @@ ProjectExportDialog::ProjectExportDialog() { set_hide_on_ok(false); editor_icons = "EditorIcons"; + + default_filename = EditorSettings::get_singleton()->get_project_metadata("export_options", "default_filename", String()); } ProjectExportDialog::~ProjectExportDialog() { diff --git a/editor/project_export.h b/editor/project_export.h index 288b0c290f..b258112fa8 100644 --- a/editor/project_export.h +++ b/editor/project_export.h @@ -99,6 +99,8 @@ private: Label *export_error; HBoxContainer *export_templates_error; + String default_filename; + void _patch_selected(const String &p_path); void _patch_deleted(); diff --git a/editor/project_manager.cpp b/editor/project_manager.cpp index cc9de3e44d..16b85121ef 100644 --- a/editor/project_manager.cpp +++ b/editor/project_manager.cpp @@ -233,7 +233,7 @@ private: fdialog->set_mode(FileDialog::MODE_OPEN_FILE); fdialog->clear_filters(); - fdialog->add_filter("project.godot ; " _MKSTR(VERSION_NAME) " Project"); + fdialog->add_filter("project.godot ; " VERSION_NAME " Project"); } else { fdialog->set_mode(FileDialog::MODE_OPEN_DIR); } @@ -1483,13 +1483,13 @@ ProjectManager::ProjectManager() { String cp; cp.push_back(0xA9); cp.push_back(0); - OS::get_singleton()->set_window_title(_MKSTR(VERSION_NAME) + String(" - ") + TTR("Project Manager") + " - " + cp + " 2008-2017 Juan Linietsky, Ariel Manzur & Godot Contributors"); + OS::get_singleton()->set_window_title(VERSION_NAME + String(" - ") + TTR("Project Manager") + " - " + cp + " 2008-2017 Juan Linietsky, Ariel Manzur & Godot Contributors"); HBoxContainer *top_hb = memnew(HBoxContainer); vb->add_child(top_hb); CenterContainer *ccl = memnew(CenterContainer); Label *l = memnew(Label); - l->set_text(_MKSTR(VERSION_NAME) + String(" - ") + TTR("Project Manager")); + l->set_text(VERSION_NAME + String(" - ") + TTR("Project Manager")); ccl->add_child(l); top_hb->add_child(ccl); top_hb->add_spacer(); @@ -1498,11 +1498,8 @@ ProjectManager::ProjectManager() { if (hash.length() != 0) hash = "." + hash.left(7); l->set_text("v" VERSION_MKSTRING "" + hash); - //l->add_font_override("font",get_font("bold","Fonts")); l->set_align(Label::ALIGN_CENTER); top_hb->add_child(l); - //vb->add_child(memnew(HSeparator)); - //vb->add_margin_child("\n",memnew(Control)); Control *center_box = memnew(Control); center_box->set_v_size_flags(SIZE_EXPAND_FILL); diff --git a/editor/project_settings_editor.cpp b/editor/project_settings_editor.cpp index b07280a4cd..900f7625bc 100644 --- a/editor/project_settings_editor.cpp +++ b/editor/project_settings_editor.cpp @@ -360,7 +360,7 @@ void ProjectSettingsEditor::_wait_for_key(const Ref<InputEvent> &p_event) { last_wait_for_key = p_event; String str = keycode_get_string(k->get_scancode()).capitalize(); if (k->get_metakey()) - str = TTR("Meta+") + str; + str = vformat("%s+", find_keycode_name(KEY_META)) + str; if (k->get_shift()) str = TTR("Shift+") + str; if (k->get_alt()) @@ -642,7 +642,7 @@ void ProjectSettingsEditor::_update_actions() { String str = keycode_get_string(k->get_scancode()).capitalize(); if (k->get_metakey()) - str = TTR("Meta+") + str; + str = vformat("%s+", find_keycode_name(KEY_META)) + str; if (k->get_shift()) str = TTR("Shift+") + str; if (k->get_alt()) diff --git a/editor/property_editor.cpp b/editor/property_editor.cpp index 002ae568ff..bc7d8f4b14 100644 --- a/editor/property_editor.cpp +++ b/editor/property_editor.cpp @@ -40,6 +40,7 @@ #include "core/project_settings.h" #include "editor/array_property_edit.h" #include "editor/create_dialog.h" +#include "editor/dictionary_property_edit.h" #include "editor/editor_export.h" #include "editor/editor_file_system.h" #include "editor/editor_help.h" @@ -415,7 +416,11 @@ bool CustomPropertyEditor::edit(Object *p_owner, const String &p_name, Variant:: menu->clear(); Vector<String> options = hint_text.split(","); for (int i = 0; i < options.size(); i++) { - menu->add_item(options[i], i); + if (options[i].find(":") != -1) { + menu->add_item(options[i].get_slicec(':', 0), options[i].get_slicec(':', 1).to_int()); + } else { + menu->add_item(options[i], i); + } } menu->set_position(get_position()); menu->popup(); @@ -755,7 +760,7 @@ bool CustomPropertyEditor::edit(Object *p_owner, const String &p_name, Variant:: value_editor[3]->set_text(String::num(q.w)); } break; - case Variant::RECT3: { + case Variant::AABB: { field_names.push_back("px"); field_names.push_back("py"); @@ -765,7 +770,7 @@ bool CustomPropertyEditor::edit(Object *p_owner, const String &p_name, Variant:: field_names.push_back("sz"); config_value_editors(6, 3, 16, field_names); - Rect3 aabb = v; + AABB aabb = v; value_editor[0]->set_text(String::num(aabb.position.x)); value_editor[1]->set_text(String::num(aabb.position.y)); value_editor[2]->set_text(String::num(aabb.position.z)); @@ -1153,7 +1158,8 @@ void CustomPropertyEditor::_node_path_selected(NodePath p_path) { node = Object::cast_to<Node>(owner); else if (owner->is_class("ArrayPropertyEdit")) node = Object::cast_to<ArrayPropertyEdit>(owner)->get_node(); - + else if (owner->is_class("DictionaryPropertyEdit")) + node = Object::cast_to<DictionaryPropertyEdit>(owner)->get_node(); if (!node) { v = p_path; emit_signal("variant_changed"); @@ -1585,7 +1591,7 @@ void CustomPropertyEditor::_modified(String p_string) { _emit_changed_whole_or_field(); } break; - case Variant::RECT3: { + case Variant::AABB: { Vector3 pos; Vector3 size; @@ -1605,7 +1611,7 @@ void CustomPropertyEditor::_modified(String p_string) { size.y = value_editor[4]->get_text().to_double(); size.z = value_editor[5]->get_text().to_double(); } - v = Rect3(pos, size); + v = AABB(pos, size); _emit_changed_whole_or_field(); } break; @@ -1727,7 +1733,7 @@ void CustomPropertyEditor::_focus_enter() { case Variant::VECTOR3: case Variant::PLANE: case Variant::QUAT: - case Variant::RECT3: + case Variant::AABB: case Variant::TRANSFORM2D: case Variant::BASIS: case Variant::TRANSFORM: { @@ -1752,7 +1758,7 @@ void CustomPropertyEditor::_focus_exit() { case Variant::VECTOR3: case Variant::PLANE: case Variant::QUAT: - case Variant::RECT3: + case Variant::AABB: case Variant::TRANSFORM2D: case Variant::BASIS: case Variant::TRANSFORM: { @@ -2238,7 +2244,7 @@ void PropertyEditor::set_item_text(TreeItem *p_item, int p_type, const String &p case Variant::VECTOR3: case Variant::QUAT: case Variant::VECTOR2: - case Variant::RECT3: + case Variant::AABB: case Variant::RECT2: case Variant::TRANSFORM2D: case Variant::BASIS: @@ -3211,9 +3217,14 @@ void PropertyEditor::update_tree() { } break; case Variant::DICTIONARY: { + Variant v = obj->get(p.name); + item->set_cell_mode(1, TreeItem::CELL_MODE_STRING); - item->set_editable(1, false); - item->set_text(1, obj->get(p.name).operator String()); + item->set_text(1, String("Dictionary{") + itos(v.call("size")) + "}"); + item->add_button(1, get_icon("EditResource", "EditorIcons")); + + if (show_type_icons) + item->set_icon(0, get_icon("DictionaryData", "EditorIcons")); } break; @@ -3367,13 +3378,13 @@ void PropertyEditor::update_tree() { item->set_icon(0, get_icon("Plane", "EditorIcons")); } break; - case Variant::RECT3: { + case Variant::AABB: { item->set_cell_mode(1, TreeItem::CELL_MODE_CUSTOM); item->set_editable(1, true); - item->set_text(1, "Rect3"); + item->set_text(1, "AABB"); if (show_type_icons) - item->set_icon(0, get_icon("Rect3", "EditorIcons")); + item->set_icon(0, get_icon("AABB", "EditorIcons")); } break; case Variant::QUAT: { @@ -3412,7 +3423,9 @@ void PropertyEditor::update_tree() { type = p.hint_string; RES res = obj->get(p.name).operator RefPtr(); - + if (type.begins_with("RES:") && type != "RES:") { // Remote resources + res = ResourceLoader::load(type.substr(4, type.length())); + } Ref<EncodedObjectAsID> encoded = obj->get(p.name); //for debugger and remote tools if (encoded.is_valid()) { @@ -3423,6 +3436,7 @@ void PropertyEditor::update_tree() { item->set_editable(1, true); } else if (obj->get(p.name).get_type() == Variant::NIL || res.is_null()) { + item->set_text(1, "<null>"); item->set_icon(1, Ref<Texture>()); item->set_custom_as_button(1, false); @@ -3581,7 +3595,7 @@ void PropertyEditor::_edit_set(const String &p_name, const Variant &p_value, boo } } - if (!undo_redo || Object::cast_to<ArrayPropertyEdit>(obj)) { //kind of hacky + if (!undo_redo || Object::cast_to<ArrayPropertyEdit>(obj) || Object::cast_to<DictionaryPropertyEdit>(obj)) { //kind of hacky obj->set(p_name, p_value); if (p_refresh_all) @@ -3714,7 +3728,7 @@ void PropertyEditor::_item_edited() { _edit_set(name, item->get_text(1), refresh_all); } } break; - // math types + // math types case Variant::VECTOR3: { @@ -3725,7 +3739,7 @@ void PropertyEditor::_item_edited() { case Variant::QUAT: { } break; - case Variant::RECT3: { + case Variant::AABB: { } break; case Variant::BASIS: { @@ -3979,8 +3993,20 @@ void PropertyEditor::_edit_button(Object *p_item, int p_column, int p_button) { Ref<ArrayPropertyEdit> ape = memnew(ArrayPropertyEdit); ape->edit(obj, n, ht, Variant::Type(t)); - EditorNode::get_singleton()->push_item(ape.ptr()); + + } else if (t == Variant::DICTIONARY) { + + Variant v = obj->get(n); + + if (v.get_type() != t) { + Variant::CallError ce; + v = Variant::construct(Variant::Type(t), NULL, 0, ce); + } + + Ref<DictionaryPropertyEdit> dpe = memnew(DictionaryPropertyEdit); + dpe->edit(obj, n); + EditorNode::get_singleton()->push_item(dpe.ptr()); } } } diff --git a/editor/pvrtc_compress.cpp b/editor/pvrtc_compress.cpp index 13d74a6593..575ff40287 100644 --- a/editor/pvrtc_compress.cpp +++ b/editor/pvrtc_compress.cpp @@ -62,12 +62,12 @@ static void _compress_image(Image::CompressMode p_mode, Image *p_image) { } return; } - String spath = EditorSettings::get_singleton()->get_settings_path(); + String tmppath = EditorSettings::get_singleton()->get_cache_dir(); List<String> args; - String src_img = spath + "/" + "_tmp_src_img.png"; - String dst_img = spath + "/" + "_tmp_dst_img.pvr"; + String src_img = tmppath.plus_file("_tmp_src_img.png"); + String dst_img = tmppath.plus_file("_tmp_dst_img.pvr"); args.push_back("-i"); args.push_back(src_img); diff --git a/editor/scene_tree_dock.cpp b/editor/scene_tree_dock.cpp index 816156ef00..ca3f13b07d 100644 --- a/editor/scene_tree_dock.cpp +++ b/editor/scene_tree_dock.cpp @@ -443,8 +443,8 @@ void SceneTreeDock::_tool_selected(int p_tool, bool p_confirm_override) { List<Node *> owned; node->get_owned_by(node->get_owner(), &owned); - Map<Node *, Node *> duplimap; - Node *dup = _duplicate(node, duplimap); + Map<const Node *, Node *> duplimap; + Node *dup = node->duplicate_from_editor(duplimap); ERR_CONTINUE(!dup); @@ -745,6 +745,10 @@ void SceneTreeDock::_notification(int p_what) { canvas_item_plugin->get_canvas_item_editor()->connect("item_group_status_changed", scene_tree, "_update_tree"); scene_tree->connect("node_changed", canvas_item_plugin->get_canvas_item_editor()->get_viewport_control(), "update"); } + + SpatialEditorPlugin *spatial_editor_plugin = Object::cast_to<SpatialEditorPlugin>(editor_data->get_editor("3D")); + spatial_editor_plugin->get_spatial_editor()->connect("item_lock_status_changed", scene_tree, "_update_tree"); + button_add->set_icon(get_icon("Add", "EditorIcons")); button_instance->set_icon(get_icon("Instance", "EditorIcons")); button_create_script->set_icon(get_icon("ScriptCreate", "EditorIcons")); @@ -821,82 +825,6 @@ void SceneTreeDock::_node_renamed() { _node_selected(); } -Node *SceneTreeDock::_duplicate(Node *p_node, Map<Node *, Node *> &duplimap) { - - Node *node = NULL; - - if (p_node->get_filename() != "") { //an instance - - Ref<PackedScene> sd = ResourceLoader::load(p_node->get_filename()); - ERR_FAIL_COND_V(!sd.is_valid(), NULL); - node = sd->instance(PackedScene::GEN_EDIT_STATE_INSTANCE); - ERR_FAIL_COND_V(!node, NULL); - node->set_scene_instance_load_placeholder(p_node->get_scene_instance_load_placeholder()); - } else { - Object *obj = ClassDB::instance(p_node->get_class()); - ERR_FAIL_COND_V(!obj, NULL); - node = Object::cast_to<Node>(obj); - if (!node) - memdelete(obj); - ERR_FAIL_COND_V(!node, NULL); - } - - List<PropertyInfo> plist; - - p_node->get_property_list(&plist); - - for (List<PropertyInfo>::Element *E = plist.front(); E; E = E->next()) { - - if (!(E->get().usage & PROPERTY_USAGE_STORAGE)) - continue; - String name = E->get().name; - Variant value = p_node->get(name); - // Duplicate dictionaries and arrays, mainly needed for __meta__ - if (value.get_type() == Variant::DICTIONARY) { - value = Dictionary(value).copy(); - } else if (value.get_type() == Variant::ARRAY) { - value = Array(value).duplicate(); - } - node->set(name, value); - } - - List<Connection> conns; - p_node->get_all_signal_connections(&conns); - for (List<Connection>::Element *E = conns.front(); E; E = E->next()) { - if (E->get().flags & CONNECT_PERSIST) { - node->connect(E->get().signal, E->get().target, E->get().method, E->get().binds, E->get().flags); - } - } - - List<Node::GroupInfo> group_info; - p_node->get_groups(&group_info); - for (List<Node::GroupInfo>::Element *E = group_info.front(); E; E = E->next()) { - - if (E->get().persistent) - node->add_to_group(E->get().name, true); - } - - node->set_name(p_node->get_name()); - duplimap[p_node] = node; - - for (int i = 0; i < p_node->get_child_count(); i++) { - - Node *child = p_node->get_child(i); - if (p_node->get_owner() != child->get_owner()) - continue; //don't bother with not in-scene nodes. - - Node *dup = _duplicate(child, duplimap); - if (!dup) { - memdelete(node); - return NULL; - } - - node->add_child(dup); - } - - return node; -} - void SceneTreeDock::_set_owners(Node *p_owner, const Array &p_nodes) { for (int i = 0; i < p_nodes.size(); i++) { @@ -1058,7 +986,7 @@ void SceneTreeDock::perform_node_renames(Node *p_base, List<Pair<NodePath, NodeP //will be renamed NodePath rel_path = new_root_path.rel_path_to(E->get().second); - NodePath new_path = NodePath(rel_path.get_names(), track_np.get_subnames(), false, track_np.get_property()); + NodePath new_path = NodePath(rel_path.get_names(), track_np.get_subnames(), false); if (new_path == track_np) continue; //bleh editor_data->get_undo_redo().add_do_method(anim.ptr(), "track_set_path", i, new_path); @@ -1459,6 +1387,8 @@ void SceneTreeDock::_create() { for (List<PropertyInfo>::Element *E = pinfo.front(); E; E = E->next()) { if (!(E->get().usage & PROPERTY_USAGE_STORAGE)) continue; + if (E->get().name == "__meta__") + continue; newnode->set(E->get().name, n->get(E->get().name)); } @@ -1897,16 +1827,24 @@ void SceneTreeDock::add_remote_tree_editor(Control *p_remote) { void SceneTreeDock::show_remote_tree() { - button_hb->show(); _remote_tree_selected(); } void SceneTreeDock::hide_remote_tree() { - button_hb->hide(); _local_tree_selected(); } +void SceneTreeDock::show_tab_buttons() { + + button_hb->show(); +} + +void SceneTreeDock::hide_tab_buttons() { + + button_hb->hide(); +} + void SceneTreeDock::_remote_tree_selected() { scene_tree->hide(); @@ -1923,6 +1861,8 @@ void SceneTreeDock::_local_tree_selected() { remote_tree->hide(); edit_remote->set_pressed(false); edit_local->set_pressed(true); + + _node_selected(); } void SceneTreeDock::_bind_methods() { diff --git a/editor/scene_tree_dock.h b/editor/scene_tree_dock.h index 97d3c4748a..41d5bda180 100644 --- a/editor/scene_tree_dock.h +++ b/editor/scene_tree_dock.h @@ -130,7 +130,6 @@ class SceneTreeDock : public VBoxContainer { void _add_children_to_popup(Object *p_obj, int p_depth); - Node *_duplicate(Node *p_node, Map<Node *, Node *> &duplimap); void _node_reparent(NodePath p_path, bool p_keep_global_xform); void _do_reparent(Node *p_new_parent, int p_position_in_parent, Vector<Node *> p_nodes, bool p_keep_global_xform); @@ -203,6 +202,8 @@ public: void add_remote_tree_editor(Control *p_remote); void show_remote_tree(); void hide_remote_tree(); + void show_tab_buttons(); + void hide_tab_buttons(); void open_script_dialog(Node *p_for_node); SceneTreeDock(EditorNode *p_editor, Node *p_scene_root, EditorSelection *p_editor_selection, EditorData &p_editor_data); diff --git a/editor/scene_tree_editor.cpp b/editor/scene_tree_editor.cpp index c4b86c6b2b..dfda8a780d 100644 --- a/editor/scene_tree_editor.cpp +++ b/editor/scene_tree_editor.cpp @@ -88,7 +88,7 @@ void SceneTreeEditor::_cell_button_pressed(Object *p_item, int p_column, int p_i } else if (p_id == BUTTON_LOCK) { - if (n->is_class("CanvasItem")) { + if (n->is_class("CanvasItem") || n->is_class("Spatial")) { n->set_meta("_edit_lock_", Variant()); _update_tree(); emit_signal("node_changed"); @@ -266,6 +266,10 @@ bool SceneTreeEditor::_add_nodes(Node *p_node, TreeItem *p_parent) { _update_visibility_color(p_node, item); } else if (p_node->is_class("Spatial")) { + bool is_locked = p_node->has_meta("_edit_lock_"); + if (is_locked) + item->add_button(0, get_icon("Lock", "EditorIcons"), BUTTON_LOCK, false, TTR("Node is locked.\nClick to unlock")); + bool v = p_node->call("is_visible"); if (v) item->add_button(0, get_icon("Visible", "EditorIcons"), BUTTON_VISIBILITY, false, TTR("Toggle Visibility")); diff --git a/editor/script_create_dialog.cpp b/editor/script_create_dialog.cpp index 0f1712c224..3cab14b0c4 100644 --- a/editor/script_create_dialog.cpp +++ b/editor/script_create_dialog.cpp @@ -128,7 +128,7 @@ void ScriptCreateDialog::_template_changed(int p_template) { } String ext = ScriptServer::get_language(language_menu->get_selected())->get_extension(); String name = template_list[p_template - 1] + "." + ext; - script_template = EditorSettings::get_singleton()->get_settings_path() + "/script_templates/" + name; + script_template = EditorSettings::get_singleton()->get_script_templates_dir().plus_file(name); } void ScriptCreateDialog::ok_pressed() { diff --git a/editor/script_editor_debugger.cpp b/editor/script_editor_debugger.cpp index bc2423fffd..8974bda926 100644 --- a/editor/script_editor_debugger.cpp +++ b/editor/script_editor_debugger.cpp @@ -116,7 +116,7 @@ class ScriptEditorDebuggerInspectedObject : public Object { protected: bool _set(const StringName &p_name, const Variant &p_value) { - if (!prop_values.has(p_name)) + if (!prop_values.has(p_name) || String(p_name).begins_with("Constants/")) return false; emit_signal("value_edited", p_name, p_value); @@ -132,6 +132,7 @@ protected: r_ret = prop_values[p_name]; return true; } + void _get_property_list(List<PropertyInfo> *p_list) const { p_list->clear(); //sorry, no want category @@ -142,23 +143,52 @@ protected: static void _bind_methods() { + ClassDB::bind_method(D_METHOD("get_title"), &ScriptEditorDebuggerInspectedObject::get_title); + ClassDB::bind_method(D_METHOD("get_variant"), &ScriptEditorDebuggerInspectedObject::get_variant); + ClassDB::bind_method(D_METHOD("clear"), &ScriptEditorDebuggerInspectedObject::clear); + ClassDB::bind_method(D_METHOD("get_remote_object_id"), &ScriptEditorDebuggerInspectedObject::get_remote_object_id); + ADD_SIGNAL(MethodInfo("value_edited")); } public: - ObjectID last_edited_id; + String type_name; + ObjectID remote_object_id; List<PropertyInfo> prop_list; Map<StringName, Variant> prop_values; + ObjectID get_remote_object_id() { + return remote_object_id; + } + + String get_title() { + if (remote_object_id) + return TTR("Remote ") + String(type_name) + ": " + itos(remote_object_id); + else + return "<null>"; + } + Variant get_variant(const StringName &p_name) { + + Variant var; + _get(p_name, var); + return var; + } + + void clear() { + + prop_list.clear(); + prop_values.clear(); + } void update() { _change_notify(); } - void update_single(const char *p_prop) { _change_notify(p_prop); } - ScriptEditorDebuggerInspectedObject() { last_edited_id = 0; } + ScriptEditorDebuggerInspectedObject() { + remote_object_id = 0; + } }; void ScriptEditorDebugger::debug_next() { @@ -297,7 +327,6 @@ Size2 ScriptEditorDebugger::get_minimum_size() const { void ScriptEditorDebugger::_parse_message(const String &p_msg, const Array &p_data) { if (p_msg == "debug_enter") { - Array msg; msg.push_back("get_stack_dump"); ppeer->put_var(msg); @@ -315,12 +344,10 @@ void ScriptEditorDebugger::_parse_message(const String &p_msg, const Array &p_da if (error != "") { tabs->set_current_tab(0); } - profiler->set_enabled(false); - EditorNode::get_singleton()->get_pause_button()->set_pressed(true); - EditorNode::get_singleton()->make_bottom_panel_item_visible(this); + _clear_remote_objects(); } else if (p_msg == "debug_exit") { @@ -337,9 +364,8 @@ void ScriptEditorDebugger::_parse_message(const String &p_msg, const Array &p_da //tabs->set_current_tab(0); profiler->set_enabled(true); profiler->disable_seeking(); - + inspector->edit(NULL); EditorNode::get_singleton()->get_pause_button()->set_pressed(false); - } else if (p_msg == "message:click_ctrl") { clicked_ctrl->set_text(p_data[0]); @@ -399,55 +425,57 @@ void ScriptEditorDebugger::_parse_message(const String &p_msg, const Array &p_da le_set->set_disabled(false); } else if (p_msg == "message:inspect_object") { + ScriptEditorDebuggerInspectedObject *debugObj = NULL; + ObjectID id = p_data[0]; String type = p_data[1]; - Variant path = p_data[2]; //what to do yet, i don't know - int prop_count = p_data[3]; + Array properties = p_data[2]; - int idx = 4; - - if (inspected_object->last_edited_id != id) { - inspected_object->prop_list.clear(); - inspected_object->prop_values.clear(); + bool is_new_object = false; + if (remote_objects.has(id)) { + debugObj = remote_objects[id]; + } else { + debugObj = memnew(ScriptEditorDebuggerInspectedObject); + debugObj->remote_object_id = id; + debugObj->type_name = type; + remote_objects[id] = debugObj; + is_new_object = true; + debugObj->connect("value_edited", this, "_scene_tree_property_value_edited"); } - for (int i = 0; i < prop_count; i++) { + for (int i = 0; i < properties.size(); i++) { + + Array prop = properties[i]; + if (prop.size() != 6) + continue; PropertyInfo pinfo; - pinfo.name = p_data[idx++]; - pinfo.type = Variant::Type(int(p_data[idx++])); - pinfo.hint = PropertyHint(int(p_data[idx++])); - pinfo.hint_string = p_data[idx++]; - if (pinfo.name.begins_with("*")) { - pinfo.name = pinfo.name.substr(1, pinfo.name.length()); - pinfo.usage = PROPERTY_USAGE_CATEGORY; - } else { - pinfo.usage = PROPERTY_USAGE_EDITOR; + pinfo.name = prop[0]; + pinfo.type = Variant::Type(int(prop[1])); + pinfo.hint = PropertyHint(int(prop[2])); + pinfo.hint_string = prop[3]; + pinfo.usage = PropertyUsageFlags(int(prop[4])); + Variant var = prop[5]; + + String hint_string = pinfo.hint_string; + if (hint_string.begins_with("RES:") && hint_string != "RES:") { + String path = hint_string.substr(4, hint_string.length()); + var = ResourceLoader::load(path); } - if (inspected_object->last_edited_id != id) { + if (is_new_object) { //don't update.. it's the same, instead refresh - inspected_object->prop_list.push_back(pinfo); + debugObj->prop_list.push_back(pinfo); } - inspected_object->prop_values[pinfo.name] = p_data[idx++]; - - if (inspected_object->last_edited_id == id) { - //same, just update value, don't rebuild - inspected_object->update_single(pinfo.name.ascii().get_data()); - } + debugObj->prop_values[pinfo.name] = var; } - if (inspected_object->last_edited_id != id) { - //only if different - inspected_object->update(); + if (editor->get_editor_history()->get_current() != debugObj->get_instance_id()) { + editor->push_item(debugObj, ""); + } else { + debugObj->update(); } - - inspected_object->last_edited_id = id; - - tabs->set_current_tab(inspect_info->get_index()); - inspect_properties->edit(inspected_object); - } else if (p_msg == "message:video_mem") { vmem_tree->clear(); @@ -502,7 +530,6 @@ void ScriptEditorDebugger::_parse_message(const String &p_msg, const Array &p_da int ofs = 0; int mcount = p_data[ofs]; - ofs++; for (int i = 0; i < mcount; i++) { @@ -521,12 +548,34 @@ void ScriptEditorDebugger::_parse_message(const String &p_msg, const Array &p_da v = s.get_slice(":", 1).to_int(); } - variables->add_property("members/" + n, v, h, hs); + variables->add_property("Locals/" + n, v, h, hs); } - ofs += mcount * 2; + ofs += mcount * 2; mcount = p_data[ofs]; + ofs++; + for (int i = 0; i < mcount; i++) { + + String n = p_data[ofs + i * 2 + 0]; + Variant v = p_data[ofs + i * 2 + 1]; + PropertyHint h = PROPERTY_HINT_NONE; + String hs = String(); + + if (n.begins_with("*")) { + n = n.substr(1, n.length()); + h = PROPERTY_HINT_OBJECT_ID; + String s = v; + s = s.replace("[", ""); + hs = s.get_slice(":", 0); + v = s.get_slice(":", 1).to_int(); + } + + variables->add_property("Members/" + n, v, h, hs); + } + + ofs += mcount * 2; + mcount = p_data[ofs]; ofs++; for (int i = 0; i < mcount; i++) { @@ -545,7 +594,7 @@ void ScriptEditorDebugger::_parse_message(const String &p_msg, const Array &p_da v = s.get_slice(":", 1).to_int(); } - variables->add_property("locals/" + n, v, h, hs); + variables->add_property("Globals/" + n, v, h, hs); } variables->update(); @@ -908,7 +957,7 @@ void ScriptEditorDebugger::_notification(int p_what) { if (connection.is_valid()) { inspect_scene_tree_timeout -= get_process_delta_time(); if (inspect_scene_tree_timeout < 0) { - inspect_scene_tree_timeout = EditorSettings::get_singleton()->get("debugger/scene_tree_refresh_interval"); + inspect_scene_tree_timeout = EditorSettings::get_singleton()->get("debugger/remote_scene_tree_refresh_interval"); if (inspect_scene_tree->is_visible_in_tree()) { _scene_tree_request(); @@ -1078,6 +1127,15 @@ void ScriptEditorDebugger::_notification(int p_what) { tabs->add_style_override("tab_bg", editor->get_gui_base()->get_stylebox("DebuggerTabBG", "EditorStyles")); tabs->set_margin(MARGIN_LEFT, -EditorNode::get_singleton()->get_gui_base()->get_stylebox("BottomPanelDebuggerOverride", "EditorStyles")->get_margin(MARGIN_LEFT)); tabs->set_margin(MARGIN_RIGHT, EditorNode::get_singleton()->get_gui_base()->get_stylebox("BottomPanelDebuggerOverride", "EditorStyles")->get_margin(MARGIN_RIGHT)); + + bool enable_rl = EditorSettings::get_singleton()->get("docks/scene_tree/draw_relationship_lines"); + Color rl_color = EditorSettings::get_singleton()->get("docks/scene_tree/relationship_line_color"); + + if (enable_rl) { + inspect_scene_tree->add_constant_override("draw_relationship_lines", 1); + inspect_scene_tree->add_color_override("relationship_line_color", rl_color); + } else + inspect_scene_tree->add_constant_override("draw_relationship_lines", 0); } break; } } @@ -1101,6 +1159,13 @@ void ScriptEditorDebugger::start() { EditorNode::get_log()->add_message(String("Error listening on port ") + itos(remote_port), true); return; } + + EditorNode::get_singleton()->get_scene_tree_dock()->show_tab_buttons(); + auto_switch_remote_scene_tree = (bool)EditorSettings::get_singleton()->get("debugger/auto_switch_to_remote_scene_tree"); + if (auto_switch_remote_scene_tree) { + EditorNode::get_singleton()->get_scene_tree_dock()->show_remote_tree(); + } + set_process(true); } @@ -1133,11 +1198,12 @@ void ScriptEditorDebugger::stop() { le_set->set_disabled(true); profiler->set_enabled(true); - inspect_properties->edit(NULL); inspect_scene_tree->clear(); EditorNode::get_singleton()->get_pause_button()->set_pressed(false); EditorNode::get_singleton()->get_pause_button()->set_disabled(true); + EditorNode::get_singleton()->get_scene_tree_dock()->hide_remote_tree(); + EditorNode::get_singleton()->get_scene_tree_dock()->hide_tab_buttons(); if (hide_on_stop) { if (is_visible_in_tree()) @@ -1604,6 +1670,24 @@ void ScriptEditorDebugger::_paused() { } } +void ScriptEditorDebugger::_set_remote_object(ObjectID p_id, ScriptEditorDebuggerInspectedObject *p_obj) { + + if (remote_objects.has(p_id)) + memdelete(remote_objects[p_id]); + remote_objects[p_id] = p_obj; +} + +void ScriptEditorDebugger::_clear_remote_objects() { + + for (Map<ObjectID, ScriptEditorDebuggerInspectedObject *>::Element *E = remote_objects.front(); E; E = E->next()) { + if (editor->get_editor_history()->get_current() == E->value()->get_instance_id()) { + editor->push_item(NULL); + } + memdelete(E->value()); + } + remote_objects.clear(); +} + void ScriptEditorDebugger::_bind_methods() { ClassDB::bind_method(D_METHOD("_stack_dump_frame_selected"), &ScriptEditorDebugger::_stack_dump_frame_selected); @@ -1649,6 +1733,7 @@ ScriptEditorDebugger::ScriptEditorDebugger(EditorNode *p_editor) { ppeer = Ref<PacketPeerStream>(memnew(PacketPeerStream)); ppeer->set_input_buffer_max_size(1024 * 1024 * 8); //8mb should be enough editor = p_editor; + editor->get_property_editor()->connect("object_id_selected", this, "_scene_tree_property_select_object"); tabs = memnew(TabContainer); tabs->set_tab_align(TabContainer::ALIGN_LEFT); @@ -1761,41 +1846,19 @@ ScriptEditorDebugger::ScriptEditorDebugger(EditorNode *p_editor) { tabs->add_child(error_split); } - { // inquire - - inspect_info = memnew(HSplitContainer); - inspect_info->set_name(TTR("Remote Inspector")); - tabs->add_child(inspect_info); - - VBoxContainer *info_left = memnew(VBoxContainer); - info_left->set_h_size_flags(SIZE_EXPAND_FILL); - inspect_info->add_child(info_left); + { // remote scene tree inspect_scene_tree = memnew(Tree); - info_left->add_margin_child(TTR("Live Scene Tree:"), inspect_scene_tree, true); + EditorNode::get_singleton()->get_scene_tree_dock()->add_remote_tree_editor(inspect_scene_tree); + inspect_scene_tree->set_v_size_flags(SIZE_EXPAND_FILL); inspect_scene_tree->connect("cell_selected", this, "_scene_tree_selected"); inspect_scene_tree->connect("item_collapsed", this, "_scene_tree_folded"); - // - - VBoxContainer *info_right = memnew(VBoxContainer); - info_right->set_h_size_flags(SIZE_EXPAND_FILL); - inspect_info->add_child(info_right); - - inspect_properties = memnew(PropertyEditor); - inspect_properties->hide_top_label(); - inspect_properties->set_show_categories(true); - inspect_properties->connect("object_id_selected", this, "_scene_tree_property_select_object"); - - info_right->add_margin_child(TTR("Remote Object Properties: "), inspect_properties, true); - - inspect_scene_tree_timeout = EDITOR_DEF("debugger/scene_tree_refresh_interval", 1.0); + auto_switch_remote_scene_tree = EDITOR_DEF("debugger/auto_switch_to_remote_scene_tree", true); + inspect_scene_tree_timeout = EDITOR_DEF("debugger/remote_scene_tree_refresh_interval", 1.0); inspect_edited_object_timeout = EDITOR_DEF("debugger/remote_inspect_refresh_interval", 0.2); inspected_object_id = 0; updating_scene_tree = false; - - inspected_object = memnew(ScriptEditorDebuggerInspectedObject); - inspected_object->connect("value_edited", this, "_scene_tree_property_value_edited"); } { //profiler @@ -1952,5 +2015,5 @@ ScriptEditorDebugger::~ScriptEditorDebugger() { ppeer->set_stream_peer(Ref<StreamPeer>()); server->stop(); - memdelete(inspected_object); + _clear_remote_objects(); } diff --git a/editor/script_editor_debugger.h b/editor/script_editor_debugger.h index d18a625eef..82dcba469c 100644 --- a/editor/script_editor_debugger.h +++ b/editor/script_editor_debugger.h @@ -72,19 +72,19 @@ class ScriptEditorDebugger : public Control { Button *le_set; Button *le_clear; - Tree *inspect_scene_tree; - HSplitContainer *inspect_info; - PropertyEditor *inspect_properties; + bool updating_scene_tree; float inspect_scene_tree_timeout; float inspect_edited_object_timeout; + bool auto_switch_remote_scene_tree; ObjectID inspected_object_id; - ScriptEditorDebuggerInspectedObject *inspected_object; - bool updating_scene_tree; + ScriptEditorDebuggerVariables *variables; + Map<ObjectID, ScriptEditorDebuggerInspectedObject *> remote_objects; Set<ObjectID> unfold_cache; HSplitContainer *error_split; ItemList *error_list; ItemList *error_stack; + Tree *inspect_scene_tree; int error_count; int last_error_count; @@ -96,7 +96,6 @@ class ScriptEditorDebugger : public Control { TabContainer *tabs; Label *reason; - ScriptEditorDebuggerVariables *variables; Button *step; Button *next; @@ -174,6 +173,9 @@ class ScriptEditorDebugger : public Control { void _paused(); + void _set_remote_object(ObjectID p_id, ScriptEditorDebuggerInspectedObject *p_obj); + void _clear_remote_objects(); + protected: void _notification(int p_what); static void _bind_methods(); diff --git a/editor/settings_config_dialog.cpp b/editor/settings_config_dialog.cpp index c052845be9..853761f689 100644 --- a/editor/settings_config_dialog.cpp +++ b/editor/settings_config_dialog.cpp @@ -291,7 +291,7 @@ void EditorSettingsDialog::_wait_for_key(const Ref<InputEvent> &p_event) { last_wait_for_key = k; String str = keycode_get_string(k->get_scancode()).capitalize(); if (k->get_metakey()) - str = TTR("Meta+") + str; + str = vformat("%s+", find_keycode_name(KEY_META)) + str; if (k->get_shift()) str = TTR("Shift+") + str; if (k->get_alt()) diff --git a/editor/spatial_editor_gizmos.cpp b/editor/spatial_editor_gizmos.cpp index 3f8d93d976..3ffc61cb45 100644 --- a/editor/spatial_editor_gizmos.cpp +++ b/editor/spatial_editor_gizmos.cpp @@ -149,7 +149,7 @@ void EditorSpatialGizmo::add_lines(const Vector<Vector3> &p_lines, const Ref<Mat md = MAX(0, p_lines[i].length()); } if (md) { - mesh->set_custom_aabb(Rect3(Vector3(-md, -md, -md), Vector3(md, md, md) * 2.0)); + mesh->set_custom_aabb(AABB(Vector3(-md, -md, -md), Vector3(md, md, md) * 2.0)); } } @@ -196,7 +196,7 @@ void EditorSpatialGizmo::add_unscaled_billboard(const Ref<Material> &p_material, md = MAX(0, vs[i].length()); } if (md) { - mesh->set_custom_aabb(Rect3(Vector3(-md, -md, -md), Vector3(md, md, md) * 2.0)); + mesh->set_custom_aabb(AABB(Vector3(-md, -md, -md), Vector3(md, md, md) * 2.0)); } } @@ -211,7 +211,7 @@ void EditorSpatialGizmo::add_unscaled_billboard(const Ref<Material> &p_material, instances.push_back(ins); } -void EditorSpatialGizmo::add_collision_triangles(const Ref<TriangleMesh> &p_tmesh, const Rect3 &p_bounds) { +void EditorSpatialGizmo::add_collision_triangles(const Ref<TriangleMesh> &p_tmesh, const AABB &p_bounds) { collision_mesh = p_tmesh; collision_mesh_bounds = p_bounds; @@ -270,7 +270,7 @@ void EditorSpatialGizmo::add_handles(const Vector<Vector3> &p_handles, bool p_bi md = MAX(0, p_handles[i].length()); } if (md) { - mesh->set_custom_aabb(Rect3(Vector3(-md, -md, -md), Vector3(md, md, md) * 2.0)); + mesh->set_custom_aabb(AABB(Vector3(-md, -md, -md), Vector3(md, md, md) * 2.0)); } } @@ -1274,7 +1274,7 @@ void MeshInstanceSpatialGizmo::redraw() { Ref<TriangleMesh> tm = m->generate_triangle_mesh(); if (tm.is_valid()) { - Rect3 aabb; + AABB aabb; add_collision_triangles(tm, aabb); } } @@ -1336,7 +1336,7 @@ void SkeletonSpatialGizmo::redraw() { weights[0] = 1; - Rect3 aabb; + AABB aabb; Color bonecolor = Color(1.0, 0.4, 0.4, 0.3); Color rootcolor = Color(0.4, 1.0, 0.4, 0.1); @@ -1961,7 +1961,7 @@ void CollisionShapeSpatialGizmo::redraw() { Ref<BoxShape> bs = s; Vector<Vector3> lines; - Rect3 aabb; + AABB aabb; aabb.position = -bs->get_extents(); aabb.size = aabb.position * -2; @@ -2191,7 +2191,7 @@ void VisibilityNotifierGizmo::set_handle(int p_idx, Camera *p_camera, const Poin //gt.orthonormalize(); Transform gi = gt.affine_inverse(); - Rect3 aabb = notifier->get_aabb(); + AABB aabb = notifier->get_aabb(); Vector3 ray_from = p_camera->project_ray_origin(p_point); Vector3 ray_dir = p_camera->project_ray_normal(p_point); @@ -2234,7 +2234,7 @@ void VisibilityNotifierGizmo::redraw() { clear(); Vector<Vector3> lines; - Rect3 aabb = notifier->get_aabb(); + AABB aabb = notifier->get_aabb(); for (int i = 0; i < 12; i++) { Vector3 a, b; @@ -2293,7 +2293,7 @@ void ParticlesGizmo::set_handle(int p_idx, Camera *p_camera, const Point2 &p_poi bool move = p_idx >= 3; p_idx = p_idx % 3; - Rect3 aabb = particles->get_visibility_aabb(); + AABB aabb = particles->get_visibility_aabb(); Vector3 ray_from = p_camera->project_ray_origin(p_point); Vector3 ray_dir = p_camera->project_ray_normal(p_point); @@ -2347,7 +2347,7 @@ void ParticlesGizmo::redraw() { clear(); Vector<Vector3> lines; - Rect3 aabb = particles->get_visibility_aabb(); + AABB aabb = particles->get_visibility_aabb(); for (int i = 0; i < 12; i++) { Vector3 a, b; @@ -2420,7 +2420,7 @@ String ReflectionProbeGizmo::get_handle_name(int p_idx) const { } Variant ReflectionProbeGizmo::get_handle_value(int p_idx) const { - return Rect3(probe->get_extents(), probe->get_origin_offset()); + return AABB(probe->get_extents(), probe->get_origin_offset()); } void ReflectionProbeGizmo::set_handle(int p_idx, Camera *p_camera, const Point2 &p_point) { @@ -2474,7 +2474,7 @@ void ReflectionProbeGizmo::set_handle(int p_idx, Camera *p_camera, const Point2 void ReflectionProbeGizmo::commit_handle(int p_idx, const Variant &p_restore, bool p_cancel) { - Rect3 restore = p_restore; + AABB restore = p_restore; if (p_cancel) { probe->set_extents(restore.position); @@ -2499,7 +2499,7 @@ void ReflectionProbeGizmo::redraw() { Vector<Vector3> internal_lines; Vector3 extents = probe->get_extents(); - Rect3 aabb; + AABB aabb; aabb.position = -extents; aabb.size = extents * 2; @@ -2641,7 +2641,7 @@ void GIProbeGizmo::redraw() { static const int subdivs[GIProbe::SUBDIV_MAX] = { 64, 128, 256, 512 }; - Rect3 aabb = Rect3(-extents, extents * 2); + AABB aabb = AABB(-extents, extents * 2); int subdiv = subdivs[probe->get_subdiv()]; float cell_size = aabb.get_longest_axis_size() / subdiv; diff --git a/editor/spatial_editor_gizmos.h b/editor/spatial_editor_gizmos.h index afe64c723c..751bad2b13 100644 --- a/editor/spatial_editor_gizmos.h +++ b/editor/spatial_editor_gizmos.h @@ -78,7 +78,7 @@ class EditorSpatialGizmo : public SpatialEditorGizmo { Vector<Vector3> collision_segments; Ref<TriangleMesh> collision_mesh; - Rect3 collision_mesh_bounds; + AABB collision_mesh_bounds; struct Handle { Vector3 pos; @@ -100,7 +100,7 @@ protected: void add_lines(const Vector<Vector3> &p_lines, const Ref<Material> &p_material, bool p_billboard = false); void add_mesh(const Ref<ArrayMesh> &p_mesh, bool p_billboard = false, const RID &p_skeleton = RID()); void add_collision_segments(const Vector<Vector3> &p_lines); - void add_collision_triangles(const Ref<TriangleMesh> &p_tmesh, const Rect3 &p_bounds = Rect3()); + void add_collision_triangles(const Ref<TriangleMesh> &p_tmesh, const AABB &p_bounds = AABB()); void add_unscaled_billboard(const Ref<Material> &p_material, float p_scale = 1); void add_handles(const Vector<Vector3> &p_handles, bool p_billboard = false, bool p_secondary = false); void add_solid_box(Ref<Material> &p_material, Vector3 size); diff --git a/editor/translations/ar.po b/editor/translations/ar.po index 0309680da9..0376d07109 100644 --- a/editor/translations/ar.po +++ b/editor/translations/ar.po @@ -13,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: Godot Engine editor\n" -"PO-Revision-Date: 2017-10-25 20:58+0000\n" -"Last-Translator: Wajdi Feki <wajdi.feki@gmail.com>\n" +"PO-Revision-Date: 2017-11-02 21:44+0000\n" +"Last-Translator: omar anwar aglan <omar.aglan91@yahoo.com>\n" "Language-Team: Arabic <https://hosted.weblate.org/projects/godot-engine/" "godot/ar/>\n" "Language: ar\n" @@ -22,7 +22,7 @@ msgstr "" "Content-Transfer-Encoding: 8-bit\n" "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 " "&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n" -"X-Generator: Weblate 2.17\n" +"X-Generator: Weblate 2.18-dev\n" #: editor/animation_editor.cpp msgid "Disabled" @@ -30,7 +30,7 @@ msgstr "معطّل" #: editor/animation_editor.cpp msgid "All Selection" -msgstr "ÙƒÙÙ„ الإختيار" +msgstr "ÙƒÙÙ„ المÙØدد" #: editor/animation_editor.cpp msgid "Move Add Key" @@ -74,7 +74,7 @@ msgstr "Øذ٠مسار التØريك" #: editor/animation_editor.cpp msgid "Set Transitions to:" -msgstr "تØديد التØولات Ù„:" +msgstr "تØديد التØويلات لـ:" #: editor/animation_editor.cpp msgid "Anim Track Rename" @@ -94,17 +94,18 @@ msgstr "تغيير صيغة الغلا٠لمسار التØريك" #: editor/animation_editor.cpp msgid "Edit Node Curve" -msgstr "تØرير منØÙ‰ العقدة" +msgstr "تØرير منØنى العقدة" #: editor/animation_editor.cpp msgid "Edit Selection Curve" -msgstr "تØرير منØÙ‰ الإختيار" +msgstr "تØرير منØنى الإختيار" #: editor/animation_editor.cpp msgid "Anim Delete Keys" msgstr "Ù…ÙØ§ØªÙŠØ Øذ٠التØريك" #: editor/animation_editor.cpp editor/plugins/tile_map_editor_plugin.cpp +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Duplicate Selection" msgstr "إختيار النسخ" @@ -114,7 +115,7 @@ msgstr "نسخ Ù…Øمّل" #: editor/animation_editor.cpp msgid "Remove Selection" -msgstr "Øذ٠الإختيار" +msgstr "Øذ٠المÙØدد" #: editor/animation_editor.cpp msgid "Continuous" @@ -179,7 +180,7 @@ msgstr "خارج-داخل" #: editor/animation_editor.cpp msgid "Transitions" -msgstr "تØولات" +msgstr "تØويلات" #: editor/animation_editor.cpp msgid "Optimize Animation" @@ -489,7 +490,7 @@ msgstr "إمسØ" #: editor/connections_dialog.cpp msgid "Add Extra Call Argument:" -msgstr "إضاÙØ© وسيطة إستدعاء إضاÙية" +msgstr "إضاÙØ© وسيطة إستدعاء إضاÙية:" #: editor/connections_dialog.cpp msgid "Extra Call Arguments:" @@ -640,6 +641,13 @@ msgstr "Ù…Øرر التبعيات" msgid "Search Replacement Resource:" msgstr "البØØ« عن مورد بديل:" +#: editor/dependency_editor.cpp editor/editor_file_dialog.cpp +#: editor/editor_help.cpp editor/editor_node.cpp editor/filesystem_dock.cpp +#: editor/plugins/script_editor_plugin.cpp editor/property_selector.cpp +#: editor/quick_open.cpp scene/gui/file_dialog.cpp +msgid "Open" +msgstr "Ø¥ÙتØ" + #: editor/dependency_editor.cpp msgid "Owners Of:" msgstr "ملاك:" @@ -658,9 +666,8 @@ msgstr "" "Ø¥Ù…Ø³Ø Ø¹Ù„ÙŠ أية Øال؟ (لا رجعة)" #: editor/dependency_editor.cpp -#, fuzzy msgid "Cannot remove:\n" -msgstr "لا يمكن الØÙ„." +msgstr "لا يمكن المسØ:\n" #: editor/dependency_editor.cpp msgid "Error loading:" @@ -713,6 +720,15 @@ msgstr "Ø¥Ù…Ø³Ø Ø§Ù„Ù…Ù„Ùات المØددة؟" msgid "Delete" msgstr "مسØ" +#: editor/dictionary_property_edit.cpp +msgid "Change Dictionary Key" +msgstr "" + +#: editor/dictionary_property_edit.cpp +#, fuzzy +msgid "Change Dictionary Value" +msgstr "تغيير قيمة ÙÙŠ المصÙÙˆÙØ©" + #: editor/editor_about.cpp msgid "Thanks from the Godot community!" msgstr "شكراً من مجتمع Godot!" @@ -897,9 +913,8 @@ msgid "Duplicate" msgstr "تكرير" #: editor/editor_audio_buses.cpp -#, fuzzy msgid "Reset Volume" -msgstr "إرجاع التكبير" +msgstr "إرجاع الصوت" #: editor/editor_audio_buses.cpp msgid "Delete Effect" @@ -922,9 +937,8 @@ msgid "Duplicate Audio Bus" msgstr "تكرير بيوس الصوت" #: editor/editor_audio_buses.cpp -#, fuzzy msgid "Reset Bus Volume" -msgstr "إرجاع التكبير" +msgstr "إرجاع صوت البيس" #: editor/editor_audio_buses.cpp msgid "Move Audio Bus" @@ -1134,12 +1148,6 @@ msgstr "جميع الأنواع المعتمدة" msgid "All Files (*)" msgstr "كل الملÙات (*)" -#: editor/editor_file_dialog.cpp editor/editor_help.cpp editor/editor_node.cpp -#: editor/filesystem_dock.cpp editor/plugins/script_editor_plugin.cpp -#: editor/property_selector.cpp editor/quick_open.cpp scene/gui/file_dialog.cpp -msgid "Open" -msgstr "Ø¥ÙتØ" - #: editor/editor_file_dialog.cpp scene/gui/file_dialog.cpp msgid "Open a File" msgstr "Ø¥ÙØªØ Ù…Ù„Ù" @@ -1207,9 +1215,8 @@ msgid "Move Favorite Down" msgstr "Øرك المÙÙضلة للأسÙÙ„" #: editor/editor_file_dialog.cpp -#, fuzzy msgid "Go to parent folder" -msgstr "لا يمكن إنشاء المجلد." +msgstr "إذهب إلي المجلد السابق" #: editor/editor_file_dialog.cpp scene/gui/file_dialog.cpp msgid "Directories & Files:" @@ -1270,27 +1277,24 @@ msgid "Brief Description:" msgstr "وص٠مختصر:" #: editor/editor_help.cpp -#, fuzzy msgid "Members" -msgstr "الأعضاء:" +msgstr "الأعضاء" #: editor/editor_help.cpp modules/visual_script/visual_script_editor.cpp msgid "Members:" msgstr "الأعضاء:" #: editor/editor_help.cpp -#, fuzzy msgid "Public Methods" -msgstr "الطرق العامة:" +msgstr "الطرق العامة" #: editor/editor_help.cpp msgid "Public Methods:" msgstr "الطرق العامة:" #: editor/editor_help.cpp -#, fuzzy msgid "GUI Theme Items" -msgstr "عناصر ثيم واجهة المستخدم:" +msgstr "عناصر ثيم واجهة المستخدم" #: editor/editor_help.cpp msgid "GUI Theme Items:" @@ -1301,9 +1305,8 @@ msgid "Signals:" msgstr "الإشارات:" #: editor/editor_help.cpp -#, fuzzy msgid "Enumerations" -msgstr "التعدادات:" +msgstr "التعدادات" #: editor/editor_help.cpp msgid "Enumerations:" @@ -1314,18 +1317,16 @@ msgid "enum " msgstr "التعداد " #: editor/editor_help.cpp -#, fuzzy msgid "Constants" -msgstr "الثوابت:" +msgstr "الثوابت" #: editor/editor_help.cpp msgid "Constants:" msgstr "الثوابت:" #: editor/editor_help.cpp -#, fuzzy msgid "Description" -msgstr "الوصÙ:" +msgstr "الوصÙ" #: editor/editor_help.cpp msgid "Properties" @@ -1344,9 +1345,8 @@ msgstr "" "المساهمة واØد [color=$color][url=$url]!" #: editor/editor_help.cpp -#, fuzzy msgid "Methods" -msgstr "قائمة الطرق:" +msgstr "قائمة الطرق" #: editor/editor_help.cpp msgid "Method Description:" @@ -1400,14 +1400,12 @@ msgid "Error while saving." msgstr "خطأ خلال الØÙظ." #: editor/editor_node.cpp -#, fuzzy msgid "Can't open '%s'." -msgstr "لا يمكن الØÙ„." +msgstr "لا يمكن ÙØªØ '%s'." #: editor/editor_node.cpp -#, fuzzy msgid "Error while parsing '%s'." -msgstr "خطأ خلال الØÙظ." +msgstr "خطأ خلال تØميل '%s'." #: editor/editor_node.cpp msgid "Unexpected end of file '%s'." @@ -1415,12 +1413,11 @@ msgstr "نهاية مل٠غير مرتقبة 's%'." #: editor/editor_node.cpp msgid "Missing '%s' or its dependencies." -msgstr "" +msgstr "'%s' Ù…Ùقود أو Ø£Øدي إعتمادته." #: editor/editor_node.cpp -#, fuzzy msgid "Error while loading '%s'." -msgstr "خطأ خلال الØÙظ." +msgstr "خطأ خلال تØميل '%s'." #: editor/editor_node.cpp msgid "Saving Scene" @@ -1485,18 +1482,25 @@ msgid "" "Please read the documentation relevant to importing scenes to better " "understand this workflow." msgstr "" +"هذا المصدر ينتمي إلي مشهد قد تم إستيراده، إذا لا يمكن تعديله.\n" +"من Ùضلك إقرأ التوثيق المرتبط بإستيراد المشاهد لكي تÙهم بشكل Ø£Ùضل كيÙية عمل " +"هذا النظام." #: editor/editor_node.cpp msgid "" "This resource belongs to a scene that was instanced or inherited.\n" "Changes to it will not be kept when saving the current scene." msgstr "" +"هذا المصدر ينتمي إلي مشهد قد تم توضيØØ© أو إيراثه.\n" +"تغييره لن ÙŠÙØÙظ Øينما يتم ØÙظ المشهد الØالي." #: editor/editor_node.cpp msgid "" "This resource was imported, so it's not editable. Change its settings in the " "import panel and then re-import." msgstr "" +"هذا المورد قد تم إستيراده، إذا لا يمكن تعديله. غير إعدادته ÙÙŠ قائمة " +"الإستيراد ومن ثم أعد إستيراده." #: editor/editor_node.cpp msgid "" @@ -1505,6 +1509,21 @@ msgid "" "Please read the documentation relevant to importing scenes to better " "understand this workflow." msgstr "" +"المشهد تم إستيراده، إذا أي تغيير Ùيه لن ÙŠÙØÙظ.\n" +"Ø§Ù„Ø¥ÙŠØ¶Ø§Ø Ø£Ùˆ الإيراث Ø³ÙˆÙ ÙŠØ³Ù…Ø Ø¨ØÙظ أي تغيير Ùيه.\n" +"من Ùضلك إقرأ التوثيق المرتبط بإستيراد المشاهد لكي تÙهم بشكل Ø£Ùضل طريقة عمل " +"هذا النظام." + +#: editor/editor_node.cpp +#, fuzzy +msgid "" +"This is a remote object so changes to it will not be kept.\n" +"Please read the documentation relevant to debugging to better understand " +"this workflow." +msgstr "" +"هذا المصدر ينتمي إلي مشهد قد تم إستيراده، إذا لا يمكن تعديله.\n" +"من Ùضلك إقرأ التوثيق المرتبط بإستيراد المشاهد لكي تÙهم بشكل Ø£Ùضل كيÙية عمل " +"هذا النظام." #: editor/editor_node.cpp msgid "Copy Params" @@ -1562,6 +1581,8 @@ msgid "" "You can change it later in \"Project Settings\" under the 'application' " "category." msgstr "" +"المشهد المÙØدد '%s' ليس مل٠مشهد. Øدد مشهد صالØØŸ\n" +"يمكنك تغييره لاØقاً ÙÙŠ \"إعدادات المشروع\" تØت قسم 'التطبيق'." #: editor/editor_node.cpp msgid "Current scene was never saved, please save it prior to running." @@ -1569,43 +1590,43 @@ msgstr "المشهد الØالي لم يتم ØÙظه. الرجاء ØÙظ ال #: editor/editor_node.cpp msgid "Could not start subprocess!" -msgstr "" +msgstr "لا يمكن بدء عملية جانبية!" #: editor/editor_node.cpp msgid "Open Scene" -msgstr "" +msgstr "ÙØªØ Ù…Ø´Ù‡Ø¯" #: editor/editor_node.cpp msgid "Open Base Scene" -msgstr "" +msgstr "ÙØªØ Ù…Ø´Ù‡Ø¯ أساسي" #: editor/editor_node.cpp msgid "Quick Open Scene.." -msgstr "" +msgstr "ÙØªØ Ø³Ø±ÙŠØ¹ للمشهد..." #: editor/editor_node.cpp msgid "Quick Open Script.." -msgstr "" +msgstr "ÙØªØ Ø³Ø±ÙŠØ¹ للكود..." #: editor/editor_node.cpp msgid "Save & Close" -msgstr "ØÙظ Ùˆ اغلاق" +msgstr "ØÙظ Ùˆ إغلاق" #: editor/editor_node.cpp msgid "Save changes to '%s' before closing?" -msgstr "هل تريد ØÙظ التغييرات Ù„'%s' قبل الاغلاق؟" +msgstr "هل تريد ØÙظ التغييرات إلي'%s' قبل الإغلاق؟" #: editor/editor_node.cpp msgid "Save Scene As.." -msgstr "ØÙظ المشهد Ùƒ.." +msgstr "ØÙظ المشهد كـ.." #: editor/editor_node.cpp msgid "No" -msgstr "" +msgstr "لا" #: editor/editor_node.cpp msgid "Yes" -msgstr "" +msgstr "نعم" #: editor/editor_node.cpp msgid "This scene has never been saved. Save before running?" @@ -1613,51 +1634,56 @@ msgstr "هذا المشهد لم يتم ØÙظه. هل تود ØÙظه قبل ت #: editor/editor_node.cpp editor/scene_tree_dock.cpp msgid "This operation can't be done without a scene." -msgstr "" +msgstr "هذه العملية لا يمكن الإكتمال من غير مشهد." #: editor/editor_node.cpp msgid "Export Mesh Library" -msgstr "" +msgstr "تصدير مكتبة الأشكال" + +#: editor/editor_node.cpp +#, fuzzy +msgid "This operation can't be done without a root node." +msgstr "هذه العملية لا يمكن أن تتم من غير عقدة Ù…Øددة." #: editor/editor_node.cpp msgid "Export Tile Set" -msgstr "" +msgstr "تصدير مجموعة الشبكة" #: editor/editor_node.cpp msgid "This operation can't be done without a selected node." -msgstr "" +msgstr "هذه العملية لا يمكن أن تتم من غير عقدة Ù…Øددة." #: editor/editor_node.cpp msgid "Current scene not saved. Open anyway?" -msgstr "لم يتم ØÙظ المشهد الØالي. استمر بالÙØªØ Ø¹Ù„Ù‰ اية Øال؟" +msgstr "لم يتم ØÙظ المشهد الØالي. Ø¥ÙتØÙ‡ علي أية Øال؟" #: editor/editor_node.cpp msgid "Can't reload a scene that was never saved." -msgstr "لا يمكن اعادة تØميل مشهد لم يتم ØÙظه من قبل." +msgstr "لا يمكن إعادة تØميل مشهد لم يتم ØÙظه من قبل." #: editor/editor_node.cpp msgid "Revert" -msgstr "" +msgstr "إرجاع" #: editor/editor_node.cpp msgid "This action cannot be undone. Revert anyway?" -msgstr "" +msgstr "هذا الÙعل لا يمكن إرجاعة. إرجاع علي أية Øال؟" #: editor/editor_node.cpp msgid "Quick Run Scene.." -msgstr "" +msgstr "تشغيل مشهد بسرعة..." #: editor/editor_node.cpp msgid "Quit" -msgstr "" +msgstr "خروج" #: editor/editor_node.cpp msgid "Exit the editor?" -msgstr "" +msgstr "خروج من المÙعدل؟" #: editor/editor_node.cpp msgid "Open Project Manager?" -msgstr "" +msgstr "ÙØªØ Ù…Ø¯ÙŠØ± المشروع؟" #: editor/editor_node.cpp msgid "Save & Quit" @@ -1678,14 +1704,16 @@ msgid "" "This option is deprecated. Situations where refresh must be forced are now " "considered a bug. Please report." msgstr "" +"هذا الإعداد Ù…Ùعطل. الØالة Øيث التØديث يجب أن يطبق بالقوة هي الأن تعتبر خطأ. " +"من Ùضلك أبلغ عن الخطأ." #: editor/editor_node.cpp msgid "Pick a Main Scene" -msgstr "" +msgstr "إختر المشهد الأساسي" #: editor/editor_node.cpp msgid "Unable to enable addon plugin at: '%s' parsing of config failed." -msgstr "" +msgstr "غير قادر علي تÙعيل إضاÙØ© البرنامج المÙساعد ÙÙŠ: '%s' تØميل الظبط Ùشل." #: editor/editor_node.cpp msgid "Unable to find script field for addon plugin at: 'res://addons/%s'." @@ -1713,7 +1741,7 @@ msgstr "" #: editor/editor_node.cpp editor/plugins/canvas_item_editor_plugin.cpp #: editor/plugins/spatial_editor_plugin.cpp editor/scene_tree_dock.cpp msgid "Ugh" -msgstr "" +msgstr "آخخ" #: editor/editor_node.cpp msgid "" @@ -1749,11 +1777,20 @@ msgid "Switch Scene Tab" msgstr "" #: editor/editor_node.cpp -msgid "%d more file(s)" +msgid "%d more files or folders" msgstr "" #: editor/editor_node.cpp -msgid "%d more file(s) or folder(s)" +#, fuzzy +msgid "%d more folders" +msgstr "إذهب إلي المجلد السابق" + +#: editor/editor_node.cpp +msgid "%d more files" +msgstr "" + +#: editor/editor_node.cpp +msgid "Dock Position" msgstr "" #: editor/editor_node.cpp @@ -1765,6 +1802,11 @@ msgid "Toggle distraction-free mode." msgstr "" #: editor/editor_node.cpp +#, fuzzy +msgid "Add a new scene." +msgstr "أض٠مسارات جديدة." + +#: editor/editor_node.cpp msgid "Scene" msgstr "" @@ -1829,13 +1871,12 @@ msgid "TileSet.." msgstr "" #: editor/editor_node.cpp editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp scene/gui/line_edit.cpp -#: scene/gui/text_edit.cpp +#: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Undo" msgstr "" #: editor/editor_node.cpp editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp +#: scene/gui/line_edit.cpp msgid "Redo" msgstr "" @@ -2253,7 +2294,7 @@ msgstr "" #: editor/editor_run_script.cpp msgid "Write your logic in the _run() method." -msgstr "أكتب منطقك ÙÙŠ الطريقة ()run_" +msgstr "أكتب منطقك ÙÙŠ الطريقة ()run_." #: editor/editor_run_script.cpp msgid "There is an edited scene already." @@ -2316,6 +2357,11 @@ msgid "(Current)" msgstr "" #: editor/export_template_manager.cpp +#, fuzzy +msgid "Retrieving mirrors, please wait.." +msgstr "خطأ ÙÙŠ الإتصال، من Ùضلك Øاول مجدداً." + +#: editor/export_template_manager.cpp msgid "Remove template version '%s'?" msgstr "" @@ -2350,6 +2396,111 @@ msgid "Importing:" msgstr "" #: editor/export_template_manager.cpp +msgid "" +"No download links found for this version. Direct download is only available " +"for official releases." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Can't resolve." +msgstr "لا يمكن الØÙ„." + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Can't connect." +msgstr "لا يمكن إتمام الاتصال." + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "No response." +msgstr "لا يوجد إستجابة." + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Req. Failed." +msgstr "Ùشل الطلب." + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Redirect Loop." +msgstr "اعادة توجيه Øلقة التكرار." + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Failed:" +msgstr "Ùشل:" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Can't write file." +msgstr "لا يمكن كتابة الملÙ:\n" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Download Complete." +msgstr "خطأ ÙÙŠ التØميل" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Error requesting url: " +msgstr "خطأ ÙÙŠ ØÙظ الأطلس:" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Connecting to Mirror.." +msgstr "جاري الاتصال..." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Disconnected" +msgstr "قطع الاتصال" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Resolving" +msgstr "جاري الØÙ„..." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Can't Resolve" +msgstr "لا يمكن الØÙ„." + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Connecting.." +msgstr "جاري الاتصال..." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Can't Conect" +msgstr "لا يمكن إتمام الاتصال." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Connected" +msgstr "وصل" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Requesting.." +msgstr "جار الطلب..." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Downloading" +msgstr "خطأ ÙÙŠ التØميل" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Connection Error" +msgstr "جاري الاتصال..." + +#: editor/export_template_manager.cpp +msgid "SSL Handshake Error" +msgstr "" + +#: editor/export_template_manager.cpp msgid "Current Version:" msgstr "" @@ -2373,12 +2524,20 @@ msgstr "" msgid "Export Template Manager" msgstr "" +#: editor/export_template_manager.cpp +msgid "Download Templates" +msgstr "" + +#: editor/export_template_manager.cpp +msgid "Select mirror from list: " +msgstr "" + #: editor/file_type_cache.cpp msgid "Can't open file_type_cache.cch for writing, not saving file type cache!" msgstr "" #: editor/filesystem_dock.cpp -msgid "Cannot navigate to '" +msgid "Cannot navigate to '%s' as it has not been found in the file system!" msgstr "" #: editor/filesystem_dock.cpp @@ -2396,12 +2555,6 @@ msgid "" msgstr "" #: editor/filesystem_dock.cpp -msgid "" -"\n" -"Source: " -msgstr "" - -#: editor/filesystem_dock.cpp msgid "Cannot move/rename resources root." msgstr "" @@ -2663,8 +2816,7 @@ msgid "Remove Poly And Point" msgstr "" #: editor/plugins/abstract_polygon_2d_editor.cpp -#: editor/plugins/light_occluder_2d_editor_plugin.cpp -msgid "Create a new polygon from scratch." +msgid "Create a new polygon from scratch" msgstr "" #: editor/plugins/abstract_polygon_2d_editor.cpp @@ -2675,6 +2827,11 @@ msgid "" "RMB: Erase Point." msgstr "" +#: editor/plugins/abstract_polygon_2d_editor.cpp +#, fuzzy +msgid "Delete points" +msgstr "عملية تØريك" + #: editor/plugins/animation_player_editor_plugin.cpp msgid "Toggle Autoplay" msgstr "" @@ -3009,18 +3166,10 @@ msgid "Can't resolve hostname:" msgstr "لا يمكن ØÙ„ أسم المÙضيÙ:" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Can't resolve." -msgstr "لا يمكن الØÙ„." - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Connection error, please try again." msgstr "خطأ ÙÙŠ الإتصال، من Ùضلك Øاول مجدداً." #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Can't connect." -msgstr "لا يمكن إتمام الاتصال." - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Can't connect to host:" msgstr "لا يمكن الإتصال بالمÙضيÙ:" @@ -3029,30 +3178,14 @@ msgid "No response from host:" msgstr "لا ردّ من المÙضيÙ:" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "No response." -msgstr "لا يوجد إستجابة." - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Request failed, return code:" msgstr "Ùشل إتمام الطلب٫ الرمز الذي تم إرجاعه:" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Req. Failed." -msgstr "Ùشل الطلب." - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Request failed, too many redirects" msgstr "Ùشل الطلب٫ السبب هو اعادة التØويل مرات اكثر من اللازم" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Redirect Loop." -msgstr "اعادة توجيه Øلقة التكرار." - -#: editor/plugins/asset_library_editor_plugin.cpp -msgid "Failed:" -msgstr "Ùشل:" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Bad download hash, assuming file has been tampered with." msgstr "تجزئة تØميل سيئة، من المتوقع أن يكون المل٠قد تم العبث به." @@ -3081,14 +3214,6 @@ msgid "Resolving.." msgstr "جاري الØÙ„..." #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Connecting.." -msgstr "جاري الاتصال..." - -#: editor/plugins/asset_library_editor_plugin.cpp -msgid "Requesting.." -msgstr "جار الطلب..." - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Error making request" msgstr "خطأ ÙÙŠ إنشاء الطلب" @@ -3201,6 +3326,38 @@ msgid "Move Action" msgstr "عملية تØريك" #: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Move vertical guide" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Create new vertical guide" +msgstr "عمل اشتراك" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Remove vertical guide" +msgstr "Ø¥Ù…Ø³Ø Ø§Ù„Ù…ÙØ§ØªÙŠØ Ø§Ù„Ùاسدة" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Move horizontal guide" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Create new horizontal guide" +msgstr "عمل اشتراك" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Remove horizontal guide" +msgstr "Ø¥Ù…Ø³Ø Ø§Ù„Ù…ÙØ§ØªÙŠØ Ø§Ù„Ùاسدة" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Create new horizontal and vertical guides" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp msgid "Edit IK Chain" msgstr "" @@ -3322,10 +3479,16 @@ msgid "Snap to other nodes" msgstr "" #: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Snap to guides" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Lock the selected object in place (can't be moved)." msgstr "" #: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Unlock the selected object (can be moved)." msgstr "" @@ -3376,6 +3539,10 @@ msgid "Show rulers" msgstr "" #: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Show guides" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp msgid "Center Selection" msgstr "" @@ -3564,6 +3731,10 @@ msgstr "" msgid "Hold Shift to edit tangents individually" msgstr "" +#: editor/plugins/gi_probe_editor_plugin.cpp +msgid "Bake GI Probe" +msgstr "" + #: editor/plugins/gradient_editor_plugin.cpp msgid "Add/Remove Color Ramp Point" msgstr "" @@ -3596,6 +3767,10 @@ msgid "Create Occluder Polygon" msgstr "" #: editor/plugins/light_occluder_2d_editor_plugin.cpp +msgid "Create a new polygon from scratch." +msgstr "" + +#: editor/plugins/light_occluder_2d_editor_plugin.cpp msgid "Edit existing polygon:" msgstr "" @@ -3611,58 +3786,6 @@ msgstr "" msgid "RMB: Erase Point." msgstr "" -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Remove Point from Line2D" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Add Point to Line2D" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Move Point in Line2D" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Select Points" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Shift+Drag: Select Control Points" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Click: Add Point" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Right Click: Delete Point" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Add Point (in empty space)" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Split Segment (in line)" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Delete Point" -msgstr "" - #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Mesh is empty!" msgstr "" @@ -4061,16 +4184,46 @@ msgid "Move Out-Control in Curve" msgstr "" #: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Select Points" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Shift+Drag: Select Control Points" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Click: Add Point" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Right Click: Delete Point" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp msgid "Select Control Points (Shift+Drag)" msgstr "" #: editor/plugins/path_2d_editor_plugin.cpp #: editor/plugins/path_editor_plugin.cpp +msgid "Add Point (in empty space)" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp msgid "Split Segment (in curve)" msgstr "" #: editor/plugins/path_2d_editor_plugin.cpp #: editor/plugins/path_editor_plugin.cpp +msgid "Delete Point" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp msgid "Close Curve" msgstr "" @@ -4211,7 +4364,6 @@ msgstr "" #: editor/plugins/resource_preloader_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp #: editor/plugins/sprite_frames_editor_plugin.cpp editor/property_editor.cpp #: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Paste" @@ -4256,6 +4408,21 @@ msgid " Class Reference" msgstr " مرجع الصنÙ" #: editor/plugins/script_editor_plugin.cpp +#, fuzzy +msgid "Sort" +msgstr "ترتيب:" + +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp +msgid "Move Up" +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp +msgid "Move Down" +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp msgid "Next script" msgstr "" @@ -4307,6 +4474,10 @@ msgstr "" msgid "Close All" msgstr "" +#: editor/plugins/script_editor_plugin.cpp +msgid "Close Other Tabs" +msgstr "" + #: editor/plugins/script_editor_plugin.cpp editor/project_manager.cpp msgid "Run" msgstr "" @@ -4317,13 +4488,11 @@ msgstr "" #: editor/plugins/script_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Find.." msgstr "" #: editor/plugins/script_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Find Next" msgstr "" @@ -4427,33 +4596,22 @@ msgstr "" msgid "Capitalize" msgstr "" -#: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp scene/gui/line_edit.cpp +#: editor/plugins/script_text_editor.cpp scene/gui/line_edit.cpp #: scene/gui/text_edit.cpp msgid "Cut" msgstr "" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp #: editor/plugins/sprite_frames_editor_plugin.cpp editor/property_editor.cpp #: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Copy" msgstr "" -#: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp scene/gui/line_edit.cpp +#: editor/plugins/script_text_editor.cpp scene/gui/line_edit.cpp #: scene/gui/text_edit.cpp msgid "Select All" msgstr "" -#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp -msgid "Move Up" -msgstr "" - -#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp -msgid "Move Down" -msgstr "" - #: editor/plugins/script_text_editor.cpp msgid "Delete Line" msgstr "" @@ -4475,6 +4633,23 @@ msgid "Clone Down" msgstr "" #: editor/plugins/script_text_editor.cpp +#, fuzzy +msgid "Fold Line" +msgstr "إذهب إلي الخط" + +#: editor/plugins/script_text_editor.cpp +msgid "Unfold Line" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Fold All Lines" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Unfold All Lines" +msgstr "" + +#: editor/plugins/script_text_editor.cpp msgid "Complete Symbol" msgstr "" @@ -4520,12 +4695,10 @@ msgid "Convert To Lowercase" msgstr "" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Find Previous" msgstr "" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Replace.." msgstr "" @@ -4534,7 +4707,6 @@ msgid "Goto Function.." msgstr "" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Goto Line.." msgstr "" @@ -4699,6 +4871,15 @@ msgid "View Plane Transform." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "Scaling: " +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Translating: " +msgstr "تØول" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Rotating %s degrees." msgstr "" @@ -4779,6 +4960,10 @@ msgid "Vertices" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "FPS" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Align with view" msgstr "" @@ -4811,6 +4996,16 @@ msgid "View Information" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "View FPS" +msgstr "إظهار الملÙات" + +#: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Half Resolution" +msgstr "تكبير المØدد" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Audio Listener" msgstr "" @@ -4938,6 +5133,11 @@ msgid "Tool Scale" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Toggle Freelook" +msgstr "أظهر المÙÙضلة" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Transform" msgstr "" @@ -5215,6 +5415,10 @@ msgid "Create Empty Editor Template" msgstr "" #: editor/plugins/theme_editor_plugin.cpp +msgid "Create From Current Editor Theme" +msgstr "" + +#: editor/plugins/theme_editor_plugin.cpp msgid "CheckBox Radio1" msgstr "" @@ -5388,7 +5592,7 @@ msgid "Runnable" msgstr "" #: editor/project_export.cpp -msgid "Delete patch '" +msgid "Delete patch '%s' from list?" msgstr "" #: editor/project_export.cpp @@ -5684,10 +5888,6 @@ msgid "Add Input Action Event" msgstr "" #: editor/project_settings_editor.cpp editor/settings_config_dialog.cpp -msgid "Meta+" -msgstr "" - -#: editor/project_settings_editor.cpp editor/settings_config_dialog.cpp msgid "Shift+" msgstr "" @@ -5809,11 +6009,11 @@ msgid "Select a setting item first!" msgstr "" #: editor/project_settings_editor.cpp -msgid "No property '" +msgid "No property '%s' exists." msgstr "" #: editor/project_settings_editor.cpp -msgid "Setting '" +msgid "Setting '%s' is internal, and it can't be deleted." msgstr "" #: editor/project_settings_editor.cpp @@ -6285,6 +6485,15 @@ msgid "Clear a script for the selected node." msgstr "" #: editor/scene_tree_dock.cpp +#, fuzzy +msgid "Remote" +msgstr "إمسØ" + +#: editor/scene_tree_dock.cpp +msgid "Local" +msgstr "" + +#: editor/scene_tree_dock.cpp msgid "Clear Inheritance? (No Undo!)" msgstr "" @@ -6470,6 +6679,11 @@ msgid "Attach Node Script" msgstr "" #: editor/script_editor_debugger.cpp +#, fuzzy +msgid "Remote " +msgstr "إمسØ" + +#: editor/script_editor_debugger.cpp msgid "Bytes:" msgstr "" @@ -6526,18 +6740,6 @@ msgid "Stack Trace (if applicable):" msgstr "" #: editor/script_editor_debugger.cpp -msgid "Remote Inspector" -msgstr "" - -#: editor/script_editor_debugger.cpp -msgid "Live Scene Tree:" -msgstr "" - -#: editor/script_editor_debugger.cpp -msgid "Remote Object Properties: " -msgstr "" - -#: editor/script_editor_debugger.cpp msgid "Profiler" msgstr "" @@ -6669,7 +6871,7 @@ msgstr "" msgid "GDNative" msgstr "" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp #: modules/visual_script/visual_script_builtin_funcs.cpp #, fuzzy msgid "Invalid type argument to convert(), use TYPE_* constants." @@ -6677,7 +6879,7 @@ msgstr "" "صن٠إØدى المتغيرات المدخلة (arguments) غير صØÙŠØ ÙÙŠ ()convert . إستعمل ثابتة " "_*TYPE" -#: modules/gdscript/gd_functions.cpp modules/mono/glue/glue_header.h +#: modules/gdscript/gdscript_functions.cpp modules/mono/glue/glue_header.h #: modules/visual_script/visual_script_builtin_funcs.cpp #, fuzzy msgid "Not enough bytes for decoding bytes, or invalid format." @@ -6685,45 +6887,45 @@ msgstr "" "لا يوجد ما يكÙÙŠ من البيتات (bytes) Ù„ÙÙƒ تشيÙرة البيتات أو بنيتها (format) غير " "صØÙŠØØ©." -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "step argument is zero!" msgstr "الخطوة (المتغيرة المدخلة/argument) تساوي صÙر !" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp #, fuzzy msgid "Not a script with an instance" msgstr "الشÙرة (script) لا تملك نسخة." -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Not based on a script" msgstr "لا تستند الى Ø´Ùرة مصدرية" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Not based on a resource file" msgstr "لا تستند على مل٠مورد" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary format (missing @path)" msgstr "" "instance dictionary format نموذج الشكل القاموسي غير ØµØ§Ù„Ø - المسار Ù…Ùقود" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary format (can't load script at @path)" msgstr "" "instance dictionary format نموذج الشكل القاموسي غير ØµØ§Ù„Ø - لا يمكن تØميل " "السكريبت من المسار" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary format (invalid script at @path)" msgstr "" "instance dictionary format نموذج الشكل القاموسي غير ØµØ§Ù„Ø - السكريبت ÙÙŠ " "المسار غير صالØ" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary (invalid subclasses)" msgstr "مجسّد القاموس غير ØµØ§Ù„Ø (أصنا٠Ùرعية غير صالØØ©)" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Object can't provide a length." msgstr "" @@ -6736,15 +6938,23 @@ msgid "GridMap Duplicate Selection" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp +msgid "Floor:" +msgstr "" + +#: modules/gridmap/grid_map_editor_plugin.cpp +msgid "Grid Map" +msgstr "" + +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Snap View" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp -msgid "Prev Level (%sDown Wheel)" +msgid "Previous Floor" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp -msgid "Next Level (%sUp Wheel)" +msgid "Next Floor" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp @@ -6812,12 +7022,9 @@ msgid "Erase Area" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp -msgid "Selection -> Duplicate" -msgstr "" - -#: modules/gridmap/grid_map_editor_plugin.cpp -msgid "Selection -> Clear" -msgstr "" +#, fuzzy +msgid "Clear Selection" +msgstr "تكبير المØدد" #: modules/gridmap/grid_map_editor_plugin.cpp msgid "GridMap Settings" @@ -6938,7 +7145,7 @@ msgid "Duplicate VisualScript Nodes" msgstr "" #: modules/visual_script/visual_script_editor.cpp -msgid "Hold Meta to drop a Getter. Hold Shift to drop a generic signature." +msgid "Hold %s to drop a Getter. Hold Shift to drop a generic signature." msgstr "" #: modules/visual_script/visual_script_editor.cpp @@ -6946,7 +7153,7 @@ msgid "Hold Ctrl to drop a Getter. Hold Shift to drop a generic signature." msgstr "" #: modules/visual_script/visual_script_editor.cpp -msgid "Hold Meta to drop a simple reference to the node." +msgid "Hold %s to drop a simple reference to the node." msgstr "" #: modules/visual_script/visual_script_editor.cpp @@ -6954,7 +7161,7 @@ msgid "Hold Ctrl to drop a simple reference to the node." msgstr "" #: modules/visual_script/visual_script_editor.cpp -msgid "Hold Meta to drop a Variable Setter." +msgid "Hold %s to drop a Variable Setter." msgstr "" #: modules/visual_script/visual_script_editor.cpp @@ -7182,12 +7389,22 @@ msgid "Could not write file:\n" msgstr "لا يمكن كتابة الملÙ:\n" #: platform/javascript/export/export.cpp -msgid "Could not read file:\n" +msgid "Could not open template for export:\n" +msgstr "لا يمكن ÙØªØ Ø§Ù„Ù‚Ø§Ù„Ø¨ من أجل التصدير.\n" + +#: platform/javascript/export/export.cpp +msgid "Invalid export template:\n" +msgstr "" + +#: platform/javascript/export/export.cpp +#, fuzzy +msgid "Could not read custom HTML shell:\n" msgstr "لا يمكن قرأة الملÙ:\n" #: platform/javascript/export/export.cpp -msgid "Could not open template for export:\n" -msgstr "لا يمكن ÙØªØ Ø§Ù„Ù‚Ø§Ù„Ø¨ من أجل التصدير.\n" +#, fuzzy +msgid "Could not read boot splash image file:\n" +msgstr "لا يمكن قرأة الملÙ:\n" #: scene/2d/animated_sprite.cpp msgid "" @@ -7282,18 +7499,6 @@ msgstr "" msgid "Path property must point to a valid Node2D node to work." msgstr "" -#: scene/2d/sprite.cpp -msgid "" -"Path property must point to a valid Viewport node to work. Such Viewport " -"must be set to 'render target' mode." -msgstr "" - -#: scene/2d/sprite.cpp -msgid "" -"The Viewport set in the path property must be set as 'render target' in " -"order for this sprite to work." -msgstr "" - #: scene/2d/visibility_notifier_2d.cpp msgid "" "VisibilityEnable2D works best when used with the edited scene root directly " @@ -7352,6 +7557,14 @@ msgid "" "shape resource for it!" msgstr "" +#: scene/3d/gi_probe.cpp +msgid "Plotting Meshes" +msgstr "" + +#: scene/3d/gi_probe.cpp +msgid "Finishing Plot" +msgstr "" + #: scene/3d/navigation_mesh.cpp msgid "A NavigationMesh resource must be set or created for this node to work." msgstr "" @@ -7429,6 +7642,10 @@ msgid "" "minimum size manually." msgstr "" +#: scene/gui/tree.cpp +msgid "(Other)" +msgstr "" + #: scene/main/scene_tree.cpp msgid "" "Default Environment as specified in Project Setings (Rendering -> Viewport -" @@ -7474,9 +7691,6 @@ msgstr "" #~ msgid "Removed:" #~ msgstr "Ù…ÙسÙØ:" -#~ msgid "Error saving atlas:" -#~ msgstr "خطأ ÙÙŠ ØÙظ الأطلس:" - #~ msgid "Could not save atlas subtexture:" #~ msgstr "لا يمكن ØÙظ النسيج الÙرعي للأطلس:" diff --git a/editor/translations/bg.po b/editor/translations/bg.po index 21e2b4f27d..abf2efb0b4 100644 --- a/editor/translations/bg.po +++ b/editor/translations/bg.po @@ -100,6 +100,7 @@ msgid "Anim Delete Keys" msgstr "" #: editor/animation_editor.cpp editor/plugins/tile_map_editor_plugin.cpp +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Duplicate Selection" msgstr "" @@ -629,6 +630,13 @@ msgstr "" msgid "Search Replacement Resource:" msgstr "" +#: editor/dependency_editor.cpp editor/editor_file_dialog.cpp +#: editor/editor_help.cpp editor/editor_node.cpp editor/filesystem_dock.cpp +#: editor/plugins/script_editor_plugin.cpp editor/property_selector.cpp +#: editor/quick_open.cpp scene/gui/file_dialog.cpp +msgid "Open" +msgstr "" + #: editor/dependency_editor.cpp msgid "Owners Of:" msgstr "" @@ -699,6 +707,14 @@ msgstr "" msgid "Delete" msgstr "" +#: editor/dictionary_property_edit.cpp +msgid "Change Dictionary Key" +msgstr "" + +#: editor/dictionary_property_edit.cpp +msgid "Change Dictionary Value" +msgstr "" + #: editor/editor_about.cpp msgid "Thanks from the Godot community!" msgstr "" @@ -1122,12 +1138,6 @@ msgstr "" msgid "All Files (*)" msgstr "" -#: editor/editor_file_dialog.cpp editor/editor_help.cpp editor/editor_node.cpp -#: editor/filesystem_dock.cpp editor/plugins/script_editor_plugin.cpp -#: editor/property_selector.cpp editor/quick_open.cpp scene/gui/file_dialog.cpp -msgid "Open" -msgstr "" - #: editor/editor_file_dialog.cpp scene/gui/file_dialog.cpp msgid "Open a File" msgstr "" @@ -1489,6 +1499,13 @@ msgid "" msgstr "" #: editor/editor_node.cpp +msgid "" +"This is a remote object so changes to it will not be kept.\n" +"Please read the documentation relevant to debugging to better understand " +"this workflow." +msgstr "" + +#: editor/editor_node.cpp msgid "Copy Params" msgstr "" @@ -1600,6 +1617,10 @@ msgid "Export Mesh Library" msgstr "" #: editor/editor_node.cpp +msgid "This operation can't be done without a root node." +msgstr "" + +#: editor/editor_node.cpp msgid "Export Tile Set" msgstr "" @@ -1729,11 +1750,20 @@ msgid "Switch Scene Tab" msgstr "" #: editor/editor_node.cpp -msgid "%d more file(s)" +msgid "%d more files or folders" +msgstr "" + +#: editor/editor_node.cpp +#, fuzzy +msgid "%d more folders" +msgstr "ÐеуÑпешно Ñъздаване на папка." + +#: editor/editor_node.cpp +msgid "%d more files" msgstr "" #: editor/editor_node.cpp -msgid "%d more file(s) or folder(s)" +msgid "Dock Position" msgstr "" #: editor/editor_node.cpp @@ -1745,6 +1775,11 @@ msgid "Toggle distraction-free mode." msgstr "" #: editor/editor_node.cpp +#, fuzzy +msgid "Add a new scene." +msgstr "ДобавÑне на нови пътечки." + +#: editor/editor_node.cpp msgid "Scene" msgstr "Сцена" @@ -1809,13 +1844,12 @@ msgid "TileSet.." msgstr "" #: editor/editor_node.cpp editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp scene/gui/line_edit.cpp -#: scene/gui/text_edit.cpp +#: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Undo" msgstr "" #: editor/editor_node.cpp editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp +#: scene/gui/line_edit.cpp msgid "Redo" msgstr "" @@ -2298,6 +2332,10 @@ msgid "(Current)" msgstr "" #: editor/export_template_manager.cpp +msgid "Retrieving mirrors, please wait.." +msgstr "" + +#: editor/export_template_manager.cpp msgid "Remove template version '%s'?" msgstr "" @@ -2333,6 +2371,106 @@ msgid "Importing:" msgstr "ВнаÑÑне:" #: editor/export_template_manager.cpp +msgid "" +"No download links found for this version. Direct download is only available " +"for official releases." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Can't resolve." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Can't connect." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "No response." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Req. Failed." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Redirect Loop." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Failed:" +msgstr "" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Can't write file." +msgstr "ÐеуÑпешно Ñъздаване на папка." + +#: editor/export_template_manager.cpp +msgid "Download Complete." +msgstr "" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Error requesting url: " +msgstr "Имаше грешка при внаÑÑнето:" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Connecting to Mirror.." +msgstr "Свързване.." + +#: editor/export_template_manager.cpp +msgid "Disconnected" +msgstr "" + +#: editor/export_template_manager.cpp +msgid "Resolving" +msgstr "" + +#: editor/export_template_manager.cpp +msgid "Can't Resolve" +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Connecting.." +msgstr "Свързване.." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Can't Conect" +msgstr "Създаване на нов проект" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Connected" +msgstr "ИзрÑзване на възелите" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Requesting.." +msgstr "Запитване.." + +#: editor/export_template_manager.cpp +msgid "Downloading" +msgstr "" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Connection Error" +msgstr "Свързване.." + +#: editor/export_template_manager.cpp +msgid "SSL Handshake Error" +msgstr "" + +#: editor/export_template_manager.cpp msgid "Current Version:" msgstr "" @@ -2358,12 +2496,21 @@ msgstr "Избиране на вÑичко" msgid "Export Template Manager" msgstr "" +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Download Templates" +msgstr "Шаблони" + +#: editor/export_template_manager.cpp +msgid "Select mirror from list: " +msgstr "" + #: editor/file_type_cache.cpp msgid "Can't open file_type_cache.cch for writing, not saving file type cache!" msgstr "" #: editor/filesystem_dock.cpp -msgid "Cannot navigate to '" +msgid "Cannot navigate to '%s' as it has not been found in the file system!" msgstr "" #: editor/filesystem_dock.cpp @@ -2381,12 +2528,6 @@ msgid "" msgstr "" #: editor/filesystem_dock.cpp -msgid "" -"\n" -"Source: " -msgstr "" - -#: editor/filesystem_dock.cpp msgid "Cannot move/rename resources root." msgstr "" @@ -2652,8 +2793,7 @@ msgid "Remove Poly And Point" msgstr "" #: editor/plugins/abstract_polygon_2d_editor.cpp -#: editor/plugins/light_occluder_2d_editor_plugin.cpp -msgid "Create a new polygon from scratch." +msgid "Create a new polygon from scratch" msgstr "" #: editor/plugins/abstract_polygon_2d_editor.cpp @@ -2664,6 +2804,11 @@ msgid "" "RMB: Erase Point." msgstr "" +#: editor/plugins/abstract_polygon_2d_editor.cpp +#, fuzzy +msgid "Delete points" +msgstr "Изтриване на анимациÑта?" + #: editor/plugins/animation_player_editor_plugin.cpp msgid "Toggle Autoplay" msgstr "" @@ -2999,18 +3144,10 @@ msgid "Can't resolve hostname:" msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Can't resolve." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Connection error, please try again." msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Can't connect." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Can't connect to host:" msgstr "" @@ -3019,30 +3156,14 @@ msgid "No response from host:" msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "No response." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Request failed, return code:" msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Req. Failed." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Request failed, too many redirects" msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Redirect Loop." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp -msgid "Failed:" -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Bad download hash, assuming file has been tampered with." msgstr "" @@ -3071,14 +3192,6 @@ msgid "Resolving.." msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Connecting.." -msgstr "Свързване.." - -#: editor/plugins/asset_library_editor_plugin.cpp -msgid "Requesting.." -msgstr "Запитване.." - -#: editor/plugins/asset_library_editor_plugin.cpp #, fuzzy msgid "Error making request" msgstr "Имаше грешка при зареждане на Ñцената." @@ -3192,6 +3305,36 @@ msgid "Move Action" msgstr "" #: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Move vertical guide" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Create new vertical guide" +msgstr "Създаване на нов Ñкрипт" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Remove vertical guide" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Move horizontal guide" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Create new horizontal guide" +msgstr "Създаване на нов Ñкрипт" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Remove horizontal guide" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Create new horizontal and vertical guides" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp msgid "Edit IK Chain" msgstr "" @@ -3313,10 +3456,16 @@ msgid "Snap to other nodes" msgstr "" #: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Snap to guides" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Lock the selected object in place (can't be moved)." msgstr "" #: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Unlock the selected object (can be moved)." msgstr "" @@ -3367,6 +3516,10 @@ msgid "Show rulers" msgstr "" #: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Show guides" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp msgid "Center Selection" msgstr "" @@ -3552,6 +3705,10 @@ msgstr "" msgid "Hold Shift to edit tangents individually" msgstr "" +#: editor/plugins/gi_probe_editor_plugin.cpp +msgid "Bake GI Probe" +msgstr "" + #: editor/plugins/gradient_editor_plugin.cpp msgid "Add/Remove Color Ramp Point" msgstr "" @@ -3584,6 +3741,10 @@ msgid "Create Occluder Polygon" msgstr "" #: editor/plugins/light_occluder_2d_editor_plugin.cpp +msgid "Create a new polygon from scratch." +msgstr "" + +#: editor/plugins/light_occluder_2d_editor_plugin.cpp msgid "Edit existing polygon:" msgstr "" @@ -3599,58 +3760,6 @@ msgstr "" msgid "RMB: Erase Point." msgstr "" -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Remove Point from Line2D" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Add Point to Line2D" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Move Point in Line2D" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Select Points" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Shift+Drag: Select Control Points" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Click: Add Point" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Right Click: Delete Point" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Add Point (in empty space)" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Split Segment (in line)" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Delete Point" -msgstr "" - #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Mesh is empty!" msgstr "" @@ -4048,16 +4157,46 @@ msgid "Move Out-Control in Curve" msgstr "" #: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Select Points" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Shift+Drag: Select Control Points" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Click: Add Point" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Right Click: Delete Point" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp msgid "Select Control Points (Shift+Drag)" msgstr "" #: editor/plugins/path_2d_editor_plugin.cpp #: editor/plugins/path_editor_plugin.cpp +msgid "Add Point (in empty space)" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp msgid "Split Segment (in curve)" msgstr "" #: editor/plugins/path_2d_editor_plugin.cpp #: editor/plugins/path_editor_plugin.cpp +msgid "Delete Point" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp msgid "Close Curve" msgstr "" @@ -4194,7 +4333,6 @@ msgstr "" #: editor/plugins/resource_preloader_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp #: editor/plugins/sprite_frames_editor_plugin.cpp editor/property_editor.cpp #: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Paste" @@ -4239,6 +4377,21 @@ msgid " Class Reference" msgstr "" #: editor/plugins/script_editor_plugin.cpp +#, fuzzy +msgid "Sort" +msgstr "Подреждане:" + +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp +msgid "Move Up" +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp +msgid "Move Down" +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp msgid "Next script" msgstr "" @@ -4290,6 +4443,10 @@ msgstr "" msgid "Close All" msgstr "ЗатварÑне на вÑичко" +#: editor/plugins/script_editor_plugin.cpp +msgid "Close Other Tabs" +msgstr "" + #: editor/plugins/script_editor_plugin.cpp editor/project_manager.cpp msgid "Run" msgstr "ПуÑкане" @@ -4300,13 +4457,11 @@ msgstr "" #: editor/plugins/script_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Find.." msgstr "" #: editor/plugins/script_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Find Next" msgstr "" @@ -4410,33 +4565,22 @@ msgstr "" msgid "Capitalize" msgstr "" -#: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp scene/gui/line_edit.cpp +#: editor/plugins/script_text_editor.cpp scene/gui/line_edit.cpp #: scene/gui/text_edit.cpp msgid "Cut" msgstr "ИзрÑзване" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp #: editor/plugins/sprite_frames_editor_plugin.cpp editor/property_editor.cpp #: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Copy" msgstr "Копиране" -#: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp scene/gui/line_edit.cpp +#: editor/plugins/script_text_editor.cpp scene/gui/line_edit.cpp #: scene/gui/text_edit.cpp msgid "Select All" msgstr "Избиране на вÑичко" -#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp -msgid "Move Up" -msgstr "" - -#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp -msgid "Move Down" -msgstr "" - #: editor/plugins/script_text_editor.cpp #, fuzzy msgid "Delete Line" @@ -4459,6 +4603,23 @@ msgid "Clone Down" msgstr "" #: editor/plugins/script_text_editor.cpp +#, fuzzy +msgid "Fold Line" +msgstr "Изтриване на анимациÑта?" + +#: editor/plugins/script_text_editor.cpp +msgid "Unfold Line" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Fold All Lines" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Unfold All Lines" +msgstr "" + +#: editor/plugins/script_text_editor.cpp msgid "Complete Symbol" msgstr "" @@ -4504,12 +4665,10 @@ msgid "Convert To Lowercase" msgstr "" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Find Previous" msgstr "" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Replace.." msgstr "" @@ -4518,7 +4677,6 @@ msgid "Goto Function.." msgstr "" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Goto Line.." msgstr "" @@ -4683,6 +4841,15 @@ msgid "View Plane Transform." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "Scaling: " +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Translating: " +msgstr "ДобавÑне на превод" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Rotating %s degrees." msgstr "" @@ -4763,6 +4930,10 @@ msgid "Vertices" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "FPS" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Align with view" msgstr "" @@ -4795,6 +4966,15 @@ msgid "View Information" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "View FPS" +msgstr "Преглед на файловете" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Half Resolution" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Audio Listener" msgstr "" @@ -4924,6 +5104,10 @@ msgid "Tool Scale" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "Toggle Freelook" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Transform" msgstr "" @@ -5200,6 +5384,10 @@ msgid "Create Empty Editor Template" msgstr "" #: editor/plugins/theme_editor_plugin.cpp +msgid "Create From Current Editor Theme" +msgstr "" + +#: editor/plugins/theme_editor_plugin.cpp msgid "CheckBox Radio1" msgstr "" @@ -5374,7 +5562,7 @@ msgid "Runnable" msgstr "" #: editor/project_export.cpp -msgid "Delete patch '" +msgid "Delete patch '%s' from list?" msgstr "" #: editor/project_export.cpp @@ -5673,10 +5861,6 @@ msgid "Add Input Action Event" msgstr "" #: editor/project_settings_editor.cpp editor/settings_config_dialog.cpp -msgid "Meta+" -msgstr "" - -#: editor/project_settings_editor.cpp editor/settings_config_dialog.cpp msgid "Shift+" msgstr "" @@ -5798,13 +5982,12 @@ msgid "Select a setting item first!" msgstr "" #: editor/project_settings_editor.cpp -msgid "No property '" +msgid "No property '%s' exists." msgstr "" #: editor/project_settings_editor.cpp -#, fuzzy -msgid "Setting '" -msgstr "ÐаÑтройки" +msgid "Setting '%s' is internal, and it can't be deleted." +msgstr "" #: editor/project_settings_editor.cpp msgid "Delete Item" @@ -6278,6 +6461,15 @@ msgid "Clear a script for the selected node." msgstr "" #: editor/scene_tree_dock.cpp +#, fuzzy +msgid "Remote" +msgstr "ЗатварÑне на вÑичко" + +#: editor/scene_tree_dock.cpp +msgid "Local" +msgstr "" + +#: editor/scene_tree_dock.cpp msgid "Clear Inheritance? (No Undo!)" msgstr "" @@ -6466,6 +6658,11 @@ msgid "Attach Node Script" msgstr "Ðова Ñцена" #: editor/script_editor_debugger.cpp +#, fuzzy +msgid "Remote " +msgstr "ЗатварÑне на вÑичко" + +#: editor/script_editor_debugger.cpp msgid "Bytes:" msgstr "" @@ -6522,18 +6719,6 @@ msgid "Stack Trace (if applicable):" msgstr "" #: editor/script_editor_debugger.cpp -msgid "Remote Inspector" -msgstr "" - -#: editor/script_editor_debugger.cpp -msgid "Live Scene Tree:" -msgstr "" - -#: editor/script_editor_debugger.cpp -msgid "Remote Object Properties: " -msgstr "" - -#: editor/script_editor_debugger.cpp msgid "Profiler" msgstr "" @@ -6666,59 +6851,59 @@ msgstr "" msgid "GDNative" msgstr "" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp #: modules/visual_script/visual_script_builtin_funcs.cpp msgid "Invalid type argument to convert(), use TYPE_* constants." msgstr "" "Ðевалиден агрумент тип на convert(), използвайте конÑтантите започващи Ñ " "TYPE_*." -#: modules/gdscript/gd_functions.cpp modules/mono/glue/glue_header.h +#: modules/gdscript/gdscript_functions.cpp modules/mono/glue/glue_header.h #: modules/visual_script/visual_script_builtin_funcs.cpp msgid "Not enough bytes for decoding bytes, or invalid format." msgstr "ÐедоÑтатъчно байтове за разкодиране или недейÑтвителен формат." -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "step argument is zero!" msgstr "Стъпката на range() е нула!" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp #, fuzzy msgid "Not a script with an instance" msgstr "Скриптът нÑма инÑтанциÑ" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp #, fuzzy msgid "Not based on a script" msgstr "Обектът не е базиран на Ñкрипт" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp #, fuzzy msgid "Not based on a resource file" msgstr "Обектът не е базиран на реÑурÑен файл" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp #, fuzzy msgid "Invalid instance dictionary format (missing @path)" msgstr "Ðевалиден формат на инÑтанциÑта в речника (липÑва @path)" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary format (can't load script at @path)" msgstr "" "Ðевалиден формат на инÑтанциÑта в речника (Ñкриптът в @path не може да бъде " "зареден)" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary format (invalid script at @path)" msgstr "" "Ðевалиден формат на инÑтанциÑта в речника (Ñкриптът в @path е невалиден)" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp #, fuzzy msgid "Invalid instance dictionary (invalid subclasses)" msgstr "Ðевалиден формат на инÑтанциÑта в речника (невалиден подклаÑ)" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Object can't provide a length." msgstr "" @@ -6731,15 +6916,24 @@ msgid "GridMap Duplicate Selection" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp -msgid "Snap View" +msgid "Floor:" +msgstr "" + +#: modules/gridmap/grid_map_editor_plugin.cpp +msgid "Grid Map" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp -msgid "Prev Level (%sDown Wheel)" +msgid "Snap View" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp -msgid "Next Level (%sUp Wheel)" +#, fuzzy +msgid "Previous Floor" +msgstr "Предишен подпрозорец" + +#: modules/gridmap/grid_map_editor_plugin.cpp +msgid "Next Floor" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp @@ -6810,12 +7004,9 @@ msgid "Erase Area" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp -msgid "Selection -> Duplicate" -msgstr "" - -#: modules/gridmap/grid_map_editor_plugin.cpp -msgid "Selection -> Clear" -msgstr "" +#, fuzzy +msgid "Clear Selection" +msgstr "Ðова Ñцена" #: modules/gridmap/grid_map_editor_plugin.cpp #, fuzzy @@ -6937,7 +7128,7 @@ msgid "Duplicate VisualScript Nodes" msgstr "" #: modules/visual_script/visual_script_editor.cpp -msgid "Hold Meta to drop a Getter. Hold Shift to drop a generic signature." +msgid "Hold %s to drop a Getter. Hold Shift to drop a generic signature." msgstr "" #: modules/visual_script/visual_script_editor.cpp @@ -6945,7 +7136,7 @@ msgid "Hold Ctrl to drop a Getter. Hold Shift to drop a generic signature." msgstr "" #: modules/visual_script/visual_script_editor.cpp -msgid "Hold Meta to drop a simple reference to the node." +msgid "Hold %s to drop a simple reference to the node." msgstr "" #: modules/visual_script/visual_script_editor.cpp @@ -6953,7 +7144,7 @@ msgid "Hold Ctrl to drop a simple reference to the node." msgstr "" #: modules/visual_script/visual_script_editor.cpp -msgid "Hold Meta to drop a Variable Setter." +msgid "Hold %s to drop a Variable Setter." msgstr "" #: modules/visual_script/visual_script_editor.cpp @@ -7185,12 +7376,21 @@ msgstr "ÐеуÑпешно Ñъздаване на папка." #: platform/javascript/export/export.cpp #, fuzzy -msgid "Could not read file:\n" +msgid "Could not open template for export:\n" msgstr "ÐеуÑпешно Ñъздаване на папка." #: platform/javascript/export/export.cpp +msgid "Invalid export template:\n" +msgstr "" + +#: platform/javascript/export/export.cpp #, fuzzy -msgid "Could not open template for export:\n" +msgid "Could not read custom HTML shell:\n" +msgstr "ÐеуÑпешно Ñъздаване на папка." + +#: platform/javascript/export/export.cpp +#, fuzzy +msgid "Could not read boot splash image file:\n" msgstr "ÐеуÑпешно Ñъздаване на папка." #: scene/2d/animated_sprite.cpp @@ -7306,20 +7506,6 @@ msgstr "" "Параметърът 'Path' Ñ‚Ñ€Ñбва да Ñочи към дейÑтвителен възел Node2D, за да " "работи." -#: scene/2d/sprite.cpp -msgid "" -"Path property must point to a valid Viewport node to work. Such Viewport " -"must be set to 'render target' mode." -msgstr "" -"Параметъра 'Path' Ñ‚Ñ€Ñбва да Ñочи към валиден Viewport нод за да работи. Този " -"Viewport Ñ‚Ñ€Ñбва да бъде наÑтройен в режим 'рендъринг цел'(render target)." - -#: scene/2d/sprite.cpp -msgid "" -"The Viewport set in the path property must be set as 'render target' in " -"order for this sprite to work." -msgstr "" - #: scene/2d/visibility_notifier_2d.cpp msgid "" "VisibilityEnable2D works best when used with the edited scene root directly " @@ -7378,6 +7564,14 @@ msgid "" "shape resource for it!" msgstr "" +#: scene/3d/gi_probe.cpp +msgid "Plotting Meshes" +msgstr "" + +#: scene/3d/gi_probe.cpp +msgid "Finishing Plot" +msgstr "" + #: scene/3d/navigation_mesh.cpp msgid "A NavigationMesh resource must be set or created for this node to work." msgstr "" @@ -7458,6 +7652,10 @@ msgid "" "minimum size manually." msgstr "" +#: scene/gui/tree.cpp +msgid "(Other)" +msgstr "" + #: scene/main/scene_tree.cpp msgid "" "Default Environment as specified in Project Setings (Rendering -> Viewport -" @@ -7488,6 +7686,18 @@ msgstr "Грешка при зареждането на шрифта." msgid "Invalid font size." msgstr "" +#, fuzzy +#~ msgid "Setting '" +#~ msgstr "ÐаÑтройки" + +#~ msgid "" +#~ "Path property must point to a valid Viewport node to work. Such Viewport " +#~ "must be set to 'render target' mode." +#~ msgstr "" +#~ "Параметъра 'Path' Ñ‚Ñ€Ñбва да Ñочи към валиден Viewport нод за да работи. " +#~ "Този Viewport Ñ‚Ñ€Ñбва да бъде наÑтройен в режим 'рендъринг цел'(render " +#~ "target)." + #~ msgid "Exporting for %s" #~ msgstr "ИзнаÑÑне за %s" @@ -7529,9 +7739,6 @@ msgstr "" #~ msgid "Import Image:" #~ msgstr "ВнаÑÑне на изображение:" -#~ msgid "Error importing:" -#~ msgstr "Имаше грешка при внаÑÑнето:" - #~ msgid "Import Textures for Atlas (2D)" #~ msgstr "ВнаÑÑне на текÑтури за ÐÑ‚Ð»Ð°Ñ (двуизмерно)" diff --git a/editor/translations/bn.po b/editor/translations/bn.po index 3e93381dcd..624eeef44a 100644 --- a/editor/translations/bn.po +++ b/editor/translations/bn.po @@ -101,6 +101,7 @@ msgid "Anim Delete Keys" msgstr "অà§à¦¯à¦¾à¦¨à¦¿à¦®à§‡à¦¶à¦¨à§‡à¦° (Anim) চাবিগà§à¦²à§‹ অপসারণ করà§à¦¨" #: editor/animation_editor.cpp editor/plugins/tile_map_editor_plugin.cpp +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Duplicate Selection" msgstr "নিরà§à¦¬à¦¾à¦šà¦¿à¦¤ সমূহ অনà§à¦²à¦¿à¦ªà¦¿ করà§à¦¨" @@ -638,6 +639,13 @@ msgstr "নিরà§à¦à¦°à¦¤à¦¾-সমূহের à¦à¦¡à¦¿à¦Ÿà¦°" msgid "Search Replacement Resource:" msgstr "পà§à¦°à¦¤à¦¿à¦¸à§à¦¥à¦¾à¦ªà¦• রিসোরà§à¦¸-à¦à¦° অনà§à¦¸à¦¨à§à¦§à¦¾à¦¨ করà§à¦¨:" +#: editor/dependency_editor.cpp editor/editor_file_dialog.cpp +#: editor/editor_help.cpp editor/editor_node.cpp editor/filesystem_dock.cpp +#: editor/plugins/script_editor_plugin.cpp editor/property_selector.cpp +#: editor/quick_open.cpp scene/gui/file_dialog.cpp +msgid "Open" +msgstr "খà§à¦²à§à¦¨" + #: editor/dependency_editor.cpp msgid "Owners Of:" msgstr "সà§à¦¬à¦¤à§à¦¬à¦¾à¦§à¦¿à¦•à¦¾à¦°à§€à¦¸à¦®à§‚হ:" @@ -711,6 +719,16 @@ msgstr "নিরà§à¦¬à¦¾à¦šà¦¿à¦¤ ফাইলসমূহ অপসারণ msgid "Delete" msgstr "অপসারণ করà§à¦¨" +#: editor/dictionary_property_edit.cpp +#, fuzzy +msgid "Change Dictionary Key" +msgstr "অà§à¦¯à¦¾à¦¨à¦¿à¦®à§‡à¦¶à¦¨à§‡à¦° নাম পরিবরà§à¦¤à¦¨ করà§à¦¨:" + +#: editor/dictionary_property_edit.cpp +#, fuzzy +msgid "Change Dictionary Value" +msgstr "শà§à¦°à§‡à¦£à§€à¦¬à¦¿à¦¨à§à¦¯à¦¾à¦¸/সারির মান পরিবরà§à¦¤à¦¨ করà§à¦¨" + #: editor/editor_about.cpp msgid "Thanks from the Godot community!" msgstr "Godot কমিউনিটি হতে আপনাকে ধনà§à¦¯à¦¬à¦¾à¦¦!" @@ -1159,12 +1177,6 @@ msgstr "সব ফাইল পরিচিতি সমà§à¦ªà¦¨à§à¦¨" msgid "All Files (*)" msgstr "সব ফাইল (*)" -#: editor/editor_file_dialog.cpp editor/editor_help.cpp editor/editor_node.cpp -#: editor/filesystem_dock.cpp editor/plugins/script_editor_plugin.cpp -#: editor/property_selector.cpp editor/quick_open.cpp scene/gui/file_dialog.cpp -msgid "Open" -msgstr "খà§à¦²à§à¦¨" - #: editor/editor_file_dialog.cpp scene/gui/file_dialog.cpp msgid "Open a File" msgstr "à¦à¦•à¦Ÿà¦¿ ফাইল খà§à¦²à§à¦¨" @@ -1536,6 +1548,13 @@ msgid "" msgstr "" #: editor/editor_node.cpp +msgid "" +"This is a remote object so changes to it will not be kept.\n" +"Please read the documentation relevant to debugging to better understand " +"this workflow." +msgstr "" + +#: editor/editor_node.cpp msgid "Copy Params" msgstr "মানসমূহ পà§à¦°à¦¤à¦¿à¦²à¦¿à¦ªà¦¿/কপি করà§à¦¨" @@ -1659,6 +1678,11 @@ msgid "Export Mesh Library" msgstr "Mesh Library à¦à¦•à§à¦¸à¦ªà§‹à¦°à§à¦Ÿ করà§à¦¨" #: editor/editor_node.cpp +#, fuzzy +msgid "This operation can't be done without a root node." +msgstr "দৃশà§à¦¯ ছাড়া à¦à¦Ÿà¦¿ করা সমà§à¦à¦¬ হবে না।" + +#: editor/editor_node.cpp msgid "Export Tile Set" msgstr "Tile Set à¦à¦•à§à¦¸à¦ªà§‹à¦°à§à¦Ÿ করà§à¦¨" @@ -1791,12 +1815,23 @@ msgid "Switch Scene Tab" msgstr "দৃশà§à¦¯à§‡à¦° টà§à¦¯à¦¾à¦¬ পরিবরà§à¦¤à¦¨ করà§à¦¨" #: editor/editor_node.cpp -msgid "%d more file(s)" +#, fuzzy +msgid "%d more files or folders" +msgstr "%d টি অধিক ফাইল(সমূহ) বা ফোলà§à¦¡à¦¾à¦°(সমূহ)" + +#: editor/editor_node.cpp +#, fuzzy +msgid "%d more folders" msgstr "%d টি অধিক ফাইল(সমূহ)" #: editor/editor_node.cpp -msgid "%d more file(s) or folder(s)" -msgstr "%d টি অধিক ফাইল(সমূহ) বা ফোলà§à¦¡à¦¾à¦°(সমূহ)" +#, fuzzy +msgid "%d more files" +msgstr "%d টি অধিক ফাইল(সমূহ)" + +#: editor/editor_node.cpp +msgid "Dock Position" +msgstr "" #: editor/editor_node.cpp msgid "Distraction Free Mode" @@ -1808,6 +1843,11 @@ msgid "Toggle distraction-free mode." msgstr "বিকà§à¦·à§‡à¦ª-হীন মোড" #: editor/editor_node.cpp +#, fuzzy +msgid "Add a new scene." +msgstr "নতà§à¦¨ টà§à¦°à§à¦¯à¦¾à¦•/পথ-সমূহ যোগ করà§à¦¨à¥¤" + +#: editor/editor_node.cpp msgid "Scene" msgstr "দৃশà§à¦¯" @@ -1873,13 +1913,12 @@ msgid "TileSet.." msgstr "TileSet (টাইল-সেট).." #: editor/editor_node.cpp editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp scene/gui/line_edit.cpp -#: scene/gui/text_edit.cpp +#: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Undo" msgstr "সাবেক অবসà§à¦¥à¦¾à§Ÿ যান/আনডà§" #: editor/editor_node.cpp editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp +#: scene/gui/line_edit.cpp msgid "Redo" msgstr "পà§à¦¨à¦°à¦¾à¦¯à¦¼ করà§à¦¨" @@ -2399,6 +2438,10 @@ msgid "(Current)" msgstr "বরà§à¦¤à¦®à¦¾à¦¨:" #: editor/export_template_manager.cpp +msgid "Retrieving mirrors, please wait.." +msgstr "" + +#: editor/export_template_manager.cpp msgid "Remove template version '%s'?" msgstr "" @@ -2435,6 +2478,114 @@ msgid "Importing:" msgstr "ইমà§à¦ªà§‹à¦°à§à¦Ÿ হচà§à¦›à§‡:" #: editor/export_template_manager.cpp +msgid "" +"No download links found for this version. Direct download is only available " +"for official releases." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Can't resolve." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Can't connect." +msgstr "সংযোগ.." + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "No response." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Req. Failed." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Redirect Loop." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Failed:" +msgstr "" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Can't write file." +msgstr "টাইলটি খà§à¦à¦œà§‡ পাওয়া যায়নি:" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Download Complete." +msgstr "নীচে" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Error requesting url: " +msgstr "à¦à¦Ÿà¦²à¦¾à¦¸/মানচিতà§à¦°à¦¾à¦¬à¦²à§€ সংরকà§à¦·à¦£à§‡ সমসà§à¦¯à¦¾ হয়েছে:" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Connecting to Mirror.." +msgstr "সংযোগ.." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Disconnected" +msgstr "সংযোগ বিচà§à¦›à¦¿à¦¨à§à¦¨ করà§à¦¨" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Resolving" +msgstr "সংরকà§à¦·à¦¿à¦¤ হচà§à¦›à§‡.." + +#: editor/export_template_manager.cpp +msgid "Can't Resolve" +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Connecting.." +msgstr "সংযোগ.." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Can't Conect" +msgstr "সংযোগ.." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Connected" +msgstr "সংযোগ" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Requesting.." +msgstr "পরীকà§à¦·à¦¾à¦®à§‚লক উৎস" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Downloading" +msgstr "নীচে" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Connection Error" +msgstr "সংযোগ.." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "SSL Handshake Error" +msgstr "à¦à§à¦²/সমসà§à¦¯à¦¾-সমূহ লোড করà§à¦¨" + +#: editor/export_template_manager.cpp #, fuzzy msgid "Current Version:" msgstr "বরà§à¦¤à¦®à¦¾à¦¨ দৃশà§à¦¯" @@ -2464,6 +2615,15 @@ msgstr "নিরà§à¦¬à¦¾à¦šà¦¿à¦¤ ফাইলসমূহ অপসারণ msgid "Export Template Manager" msgstr "à¦à¦•à§à¦¸à¦ªà§‹à¦°à§à¦Ÿ টেমপà§à¦²à§‡à¦Ÿà¦¸à¦®à§‚হ লোড হচà§à¦›à§‡" +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Download Templates" +msgstr "বসà§à¦¤à§ অপসারণ করà§à¦¨" + +#: editor/export_template_manager.cpp +msgid "Select mirror from list: " +msgstr "" + #: editor/file_type_cache.cpp msgid "Can't open file_type_cache.cch for writing, not saving file type cache!" msgstr "" @@ -2471,7 +2631,7 @@ msgstr "" "সংরকà§à¦·à¦¿à¦¤ হচà§à¦›à§‡ না!" #: editor/filesystem_dock.cpp -msgid "Cannot navigate to '" +msgid "Cannot navigate to '%s' as it has not been found in the file system!" msgstr "" #: editor/filesystem_dock.cpp @@ -2490,13 +2650,6 @@ msgstr "" #: editor/filesystem_dock.cpp #, fuzzy -msgid "" -"\n" -"Source: " -msgstr "উৎস:" - -#: editor/filesystem_dock.cpp -#, fuzzy msgid "Cannot move/rename resources root." msgstr "ফনà§à¦Ÿà§‡à¦° উৎস লোড/পà§à¦°à¦¸à§‡à¦¸ করা সমà§à¦à¦¬ হচà§à¦›à§‡ না।" @@ -2772,8 +2925,8 @@ msgid "Remove Poly And Point" msgstr "পলি à¦à¦¬à¦‚ বিনà§à¦¦à§ অপসারণ করà§à¦¨" #: editor/plugins/abstract_polygon_2d_editor.cpp -#: editor/plugins/light_occluder_2d_editor_plugin.cpp -msgid "Create a new polygon from scratch." +#, fuzzy +msgid "Create a new polygon from scratch" msgstr "আরমà§à¦ হতে নতà§à¦¨ polygon তৈরি করà§à¦¨à¥¤" #: editor/plugins/abstract_polygon_2d_editor.cpp @@ -2784,6 +2937,11 @@ msgid "" "RMB: Erase Point." msgstr "" +#: editor/plugins/abstract_polygon_2d_editor.cpp +#, fuzzy +msgid "Delete points" +msgstr "বিনà§à¦¦à§ অপসারণ করà§à¦¨" + #: editor/plugins/animation_player_editor_plugin.cpp msgid "Toggle Autoplay" msgstr "সà§à¦¬à§Ÿà¦‚কà§à¦°à¦¿à§Ÿà¦à¦¾à¦¬à§‡ চালানো টগল করà§à¦¨" @@ -3122,20 +3280,11 @@ msgid "Can't resolve hostname:" msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Can't resolve." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Connection error, please try again." msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp #, fuzzy -msgid "Can't connect." -msgstr "সংযোগ.." - -#: editor/plugins/asset_library_editor_plugin.cpp -#, fuzzy msgid "Can't connect to host:" msgstr "নোডের সাথে সংযà§à¦•à§à¦¤ করà§à¦¨:" @@ -3144,31 +3293,15 @@ msgid "No response from host:" msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "No response." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp #, fuzzy msgid "Request failed, return code:" msgstr "আবেদনকৃত ফাইল ফরমà§à¦¯à¦¾à¦Ÿ/ধরণ অজানা:" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Req. Failed." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Request failed, too many redirects" msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Redirect Loop." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp -msgid "Failed:" -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Bad download hash, assuming file has been tampered with." msgstr "" @@ -3199,16 +3332,6 @@ msgstr "সংরকà§à¦·à¦¿à¦¤ হচà§à¦›à§‡.." #: editor/plugins/asset_library_editor_plugin.cpp #, fuzzy -msgid "Connecting.." -msgstr "সংযোগ.." - -#: editor/plugins/asset_library_editor_plugin.cpp -#, fuzzy -msgid "Requesting.." -msgstr "পরীকà§à¦·à¦¾à¦®à§‚লক উৎস" - -#: editor/plugins/asset_library_editor_plugin.cpp -#, fuzzy msgid "Error making request" msgstr "রিসোরà§à¦¸ সংরকà§à¦·à¦£à§‡ সমসà§à¦¯à¦¾ হয়েছে!" @@ -3322,6 +3445,39 @@ msgid "Move Action" msgstr "পà§à¦°à¦•à§à¦°à¦¿à¦¯à¦¼à¦¾ সà§à¦¥à¦¾à¦¨à¦¾à¦¨à§à¦¤à¦° করà§à¦¨" #: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Move vertical guide" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Create new vertical guide" +msgstr "নতà§à¦¨ সà§à¦•à§à¦°à¦¿à¦ªà§à¦Ÿ তৈরি করà§à¦¨" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Remove vertical guide" +msgstr "চলক/à¦à§‡à¦°à¦¿à§Ÿà§‡à¦¬à¦² অপসারণ করà§à¦¨" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Move horizontal guide" +msgstr "বকà§à¦°à¦°à§‡à¦–ায় বিনà§à¦¦à§ সরান" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Create new horizontal guide" +msgstr "নতà§à¦¨ সà§à¦•à§à¦°à¦¿à¦ªà§à¦Ÿ তৈরি করà§à¦¨" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Remove horizontal guide" +msgstr "অগà§à¦°à¦¹à¦¨à¦¯à§‹à¦—à§à¦¯ চাবিসমূহ অপসারণ করà§à¦¨" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Create new horizontal and vertical guides" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp msgid "Edit IK Chain" msgstr "IK চেইন সমà§à¦ªà¦¾à¦¦à¦¨ করà§à¦¨" @@ -3451,10 +3607,17 @@ msgid "Snap to other nodes" msgstr "" #: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Snap to guides" +msgstr "সà§à¦¨à§à¦¯à¦¾à¦ª মোড:" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Lock the selected object in place (can't be moved)." msgstr "নিরà§à¦¬à¦¾à¦šà¦¿à¦¤ বসà§à¦¤à§à¦Ÿà¦¿à¦•à§‡ à¦à¦‡ সà§à¦¥à¦¾à¦¨à§‡ আটকিয়ে রাখà§à¦¨ (সরানো সমà§à¦à¦¬ হবেনা)।" #: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Unlock the selected object (can be moved)." msgstr "নিরà§à¦¬à¦¾à¦šà¦¿à¦¤ বসà§à¦¤à§à¦Ÿà¦¿à¦•à§‡ মà§à¦•à§à¦¤ করà§à¦¨ (সরানো সমà§à¦à¦¬ হবে)।" @@ -3507,6 +3670,11 @@ msgid "Show rulers" msgstr "বোনà§â€Œ/হাড় দেখান" #: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Show guides" +msgstr "বোনà§â€Œ/হাড় দেখান" + +#: editor/plugins/canvas_item_editor_plugin.cpp msgid "Center Selection" msgstr "নিরà§à¦¬à¦¾à¦šà¦¨à¦•à§‡ কেনà§à¦¦à§à¦°à§€à¦à§‚ত করà§à¦¨" @@ -3706,6 +3874,10 @@ msgstr "" msgid "Hold Shift to edit tangents individually" msgstr "" +#: editor/plugins/gi_probe_editor_plugin.cpp +msgid "Bake GI Probe" +msgstr "" + #: editor/plugins/gradient_editor_plugin.cpp msgid "Add/Remove Color Ramp Point" msgstr "রঙà§à¦—ের রâ€à§à¦¯à¦¾à¦®à§à¦ª বিনà§à¦¦à§ সংযোজন/বিয়োজন করà§à¦¨" @@ -3738,6 +3910,10 @@ msgid "Create Occluder Polygon" msgstr "অকলà§à¦¡à¦¾à¦° (occluder) পলিগন তৈরি করà§à¦¨" #: editor/plugins/light_occluder_2d_editor_plugin.cpp +msgid "Create a new polygon from scratch." +msgstr "আরমà§à¦ হতে নতà§à¦¨ polygon তৈরি করà§à¦¨à¥¤" + +#: editor/plugins/light_occluder_2d_editor_plugin.cpp msgid "Edit existing polygon:" msgstr "বিদà§à¦¯à¦®à¦¾à¦¨ পলিগন সমà§à¦ªà¦¾à¦¦à¦¨ করà§à¦¨:" @@ -3753,62 +3929,6 @@ msgstr "কনà§à¦Ÿà§à¦°à§‹à¦² + মাউসের বাম বোতাম: msgid "RMB: Erase Point." msgstr "মাউসের ডান বোতাম: বিনà§à¦¦à§ মà§à¦›à§‡ ফেলà§à¦¨à¥¤" -#: editor/plugins/line_2d_editor_plugin.cpp -#, fuzzy -msgid "Remove Point from Line2D" -msgstr "বকà§à¦°à¦°à§‡à¦–া হতে বিনà§à¦¦à§ অপসারণ করà§à¦¨" - -#: editor/plugins/line_2d_editor_plugin.cpp -#, fuzzy -msgid "Add Point to Line2D" -msgstr "বকà§à¦°à¦°à§‡à¦–ায় বিনà§à¦¦à§ যোগ করà§à¦¨" - -#: editor/plugins/line_2d_editor_plugin.cpp -#, fuzzy -msgid "Move Point in Line2D" -msgstr "বকà§à¦°à¦°à§‡à¦–ায় বিনà§à¦¦à§ সরান" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Select Points" -msgstr "বিনà§à¦¦à§à¦¸à¦®à§‚হ নিরà§à¦¬à¦¾à¦šà¦¨ করà§à¦¨" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Shift+Drag: Select Control Points" -msgstr "শিফট + টান: নিয়নà§à¦¤à§à¦°à¦£ বিনà§à¦¦à§à¦¸à¦®à§‚হ নিরà§à¦¬à¦¾à¦šà¦¨ করà§à¦¨" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Click: Add Point" -msgstr "কà§à¦²à¦¿à¦•: বিনà§à¦¦à§ যোগ করà§à¦¨" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Right Click: Delete Point" -msgstr "ডান কà§à¦²à¦¿à¦•: বিনà§à¦¦à§ অপসারণ করà§à¦¨" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Add Point (in empty space)" -msgstr "বিনà§à¦¦à§ যোগ করà§à¦¨ (শূনà§à¦¯à¦¸à§à¦¥à¦¾à¦¨à§‡)" - -#: editor/plugins/line_2d_editor_plugin.cpp -#, fuzzy -msgid "Split Segment (in line)" -msgstr "অংশ বিà¦à¦•à§à¦¤ করà§à¦¨ (বকà§à¦°à¦°à§‡à¦–ায়)" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Delete Point" -msgstr "বিনà§à¦¦à§ অপসারণ করà§à¦¨" - #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Mesh is empty!" msgstr "মেসটি খালি!" @@ -4229,16 +4349,46 @@ msgid "Move Out-Control in Curve" msgstr "বকà§à¦°à¦°à§‡à¦–া বহিঃ-নিয়নà§à¦¤à§à¦°à¦£à§‡ সরান" #: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Select Points" +msgstr "বিনà§à¦¦à§à¦¸à¦®à§‚হ নিরà§à¦¬à¦¾à¦šà¦¨ করà§à¦¨" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Shift+Drag: Select Control Points" +msgstr "শিফট + টান: নিয়নà§à¦¤à§à¦°à¦£ বিনà§à¦¦à§à¦¸à¦®à§‚হ নিরà§à¦¬à¦¾à¦šà¦¨ করà§à¦¨" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Click: Add Point" +msgstr "কà§à¦²à¦¿à¦•: বিনà§à¦¦à§ যোগ করà§à¦¨" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Right Click: Delete Point" +msgstr "ডান কà§à¦²à¦¿à¦•: বিনà§à¦¦à§ অপসারণ করà§à¦¨" + +#: editor/plugins/path_2d_editor_plugin.cpp msgid "Select Control Points (Shift+Drag)" msgstr "নিয়নà§à¦¤à§à¦°à¦£ বিনà§à¦¦à§à¦¸à¦®à§‚হ নিরà§à¦¬à¦¾à¦šà¦¨ করà§à¦¨ (শিফট + টান)" #: editor/plugins/path_2d_editor_plugin.cpp #: editor/plugins/path_editor_plugin.cpp +msgid "Add Point (in empty space)" +msgstr "বিনà§à¦¦à§ যোগ করà§à¦¨ (শূনà§à¦¯à¦¸à§à¦¥à¦¾à¦¨à§‡)" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp msgid "Split Segment (in curve)" msgstr "অংশ বিà¦à¦•à§à¦¤ করà§à¦¨ (বকà§à¦°à¦°à§‡à¦–ায়)" #: editor/plugins/path_2d_editor_plugin.cpp #: editor/plugins/path_editor_plugin.cpp +msgid "Delete Point" +msgstr "বিনà§à¦¦à§ অপসারণ করà§à¦¨" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp msgid "Close Curve" msgstr "বকà§à¦°à¦°à§‡à¦–া বনà§à¦§ করà§à¦¨" @@ -4380,7 +4530,6 @@ msgstr "রিসোরà§à¦¸ লোড করà§à¦¨" #: editor/plugins/resource_preloader_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp #: editor/plugins/sprite_frames_editor_plugin.cpp editor/property_editor.cpp #: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Paste" @@ -4426,6 +4575,21 @@ msgid " Class Reference" msgstr "" #: editor/plugins/script_editor_plugin.cpp +#, fuzzy +msgid "Sort" +msgstr "সাজান:" + +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp +msgid "Move Up" +msgstr "উপরে যান" + +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp +msgid "Move Down" +msgstr "নীচে যান" + +#: editor/plugins/script_editor_plugin.cpp msgid "Next script" msgstr "পরবরà§à¦¤à§€ সà§à¦•à§à¦°à¦¿à¦ªà§à¦Ÿ" @@ -4477,6 +4641,10 @@ msgstr "ডকà§à¦®à§‡à¦¨à§à¦Ÿà¦¸à¦®à§‚হ বনà§à¦§ করà§à¦¨" msgid "Close All" msgstr "সবগà§à¦²à¦¿ বনà§à¦§ করà§à¦¨" +#: editor/plugins/script_editor_plugin.cpp +msgid "Close Other Tabs" +msgstr "" + #: editor/plugins/script_editor_plugin.cpp editor/project_manager.cpp msgid "Run" msgstr "চালান" @@ -4488,13 +4656,11 @@ msgstr "ফেবরিট/পà§à¦°à¦¿à¦¯à¦¼-সমূহ অদলবদল/ঠ#: editor/plugins/script_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Find.." msgstr "খà§à¦à¦œà§à¦¨.." #: editor/plugins/script_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Find Next" msgstr "পরবরà§à¦¤à§€ খà§à¦à¦œà§à¦¨" @@ -4604,33 +4770,22 @@ msgstr "" msgid "Capitalize" msgstr "" -#: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp scene/gui/line_edit.cpp +#: editor/plugins/script_text_editor.cpp scene/gui/line_edit.cpp #: scene/gui/text_edit.cpp msgid "Cut" msgstr "করà§à¦¤à¦¨/কাট করà§à¦¨" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp #: editor/plugins/sprite_frames_editor_plugin.cpp editor/property_editor.cpp #: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Copy" msgstr "পà§à¦°à¦¤à¦¿à¦²à¦¿à¦ªà¦¿/কপি করà§à¦¨" -#: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp scene/gui/line_edit.cpp +#: editor/plugins/script_text_editor.cpp scene/gui/line_edit.cpp #: scene/gui/text_edit.cpp msgid "Select All" msgstr "সবগà§à¦²à¦¿ বাছাই করà§à¦¨" -#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp -msgid "Move Up" -msgstr "উপরে যান" - -#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp -msgid "Move Down" -msgstr "নীচে যান" - #: editor/plugins/script_text_editor.cpp #, fuzzy msgid "Delete Line" @@ -4653,6 +4808,23 @@ msgid "Clone Down" msgstr "কà§à¦²à§‹à¦¨ করে নীচে নিন" #: editor/plugins/script_text_editor.cpp +#, fuzzy +msgid "Fold Line" +msgstr "লাইন-ঠযান" + +#: editor/plugins/script_text_editor.cpp +msgid "Unfold Line" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Fold All Lines" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Unfold All Lines" +msgstr "" + +#: editor/plugins/script_text_editor.cpp msgid "Complete Symbol" msgstr "সিমà§à¦¬à¦² সমà§à¦ªà§‚রà§à¦£ করà§à¦¨" @@ -4700,12 +4872,10 @@ msgid "Convert To Lowercase" msgstr "à¦à¦¤à§‡ রূপানà§à¦¤à¦° করà§à¦¨.." #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Find Previous" msgstr "পূরà§à¦¬à§‡ খà§à¦à¦œà§à¦¨" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Replace.." msgstr "পà§à¦°à¦¤à¦¿à¦¸à§à¦¥à¦¾à¦ªà¦¨.." @@ -4714,7 +4884,6 @@ msgid "Goto Function.." msgstr "ফাংশনে যান.." #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Goto Line.." msgstr "লাইনে যান.." @@ -4879,6 +5048,16 @@ msgid "View Plane Transform." msgstr "পà§à¦²à§‡à¦¨-à¦à¦° রà§à¦ªà¦¾à¦¨à§à¦¤à¦° দেখà§à¦¨à¥¤" #: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Scaling: " +msgstr "সà§à¦•à§‡à¦²/মাপ:" + +#: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Translating: " +msgstr "অনà§à¦¬à¦¾à¦¦à¦¸à¦®à§‚হ:" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Rotating %s degrees." msgstr "%s ডিগà§à¦°à¦¿ ঘূরà§à¦£à¦¿à¦¤ হচà§à¦›à§‡à¥¤" @@ -4963,6 +5142,10 @@ msgid "Vertices" msgstr "à¦à¦¾à¦°à¦Ÿà§‡à¦•à§à¦¸" #: editor/plugins/spatial_editor_plugin.cpp +msgid "FPS" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Align with view" msgstr "দরà§à¦¶à¦¨à§‡à¦° সাথে সারিবদà§à¦§ করà§à¦¨" @@ -4998,6 +5181,16 @@ msgid "View Information" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "View FPS" +msgstr "ফাইল" + +#: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Half Resolution" +msgstr "নিরà§à¦¬à¦¾à¦šà¦¿à¦¤ সমূহের আকার পরিবরà§à¦¤à¦¨ করà§à¦¨" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Audio Listener" msgstr "অডিও শà§à¦°à§‹à¦¤à¦¾" @@ -5136,6 +5329,11 @@ msgid "Tool Scale" msgstr "সà§à¦•à§‡à¦²/মাপ:" #: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Toggle Freelook" +msgstr "পূরà§à¦£-পরà§à¦¦à¦¾ অদলবদল/টগল করà§à¦¨" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Transform" msgstr "রà§à¦ªà¦¾à¦¨à§à¦¤à¦°" @@ -5415,6 +5613,11 @@ msgid "Create Empty Editor Template" msgstr "à¦à¦¡à¦¿à¦Ÿà¦°à§‡à¦° খালি টেমপà§à¦²à§‡à¦Ÿ তৈরি করà§à¦¨" #: editor/plugins/theme_editor_plugin.cpp +#, fuzzy +msgid "Create From Current Editor Theme" +msgstr "à¦à¦¡à¦¿à¦Ÿà¦°à§‡à¦° খালি টেমপà§à¦²à§‡à¦Ÿ তৈরি করà§à¦¨" + +#: editor/plugins/theme_editor_plugin.cpp msgid "CheckBox Radio1" msgstr "CheckBox Radio১" @@ -5594,7 +5797,7 @@ msgstr "সকà§à¦°à¦¿à¦¯à¦¼ করà§à¦¨" #: editor/project_export.cpp #, fuzzy -msgid "Delete patch '" +msgid "Delete patch '%s' from list?" msgstr "ইনপà§à¦Ÿ অপসারণ করà§à¦¨" #: editor/project_export.cpp @@ -5921,10 +6124,6 @@ msgid "Add Input Action Event" msgstr "ইনপà§à¦Ÿ অà§à¦¯à¦¾à¦•à¦¶à¦¨ ইà¦à§‡à¦¨à§à¦Ÿ যোগ করà§à¦¨" #: editor/project_settings_editor.cpp editor/settings_config_dialog.cpp -msgid "Meta+" -msgstr "Meta+" - -#: editor/project_settings_editor.cpp editor/settings_config_dialog.cpp msgid "Shift+" msgstr "Shift+" @@ -6051,13 +6250,12 @@ msgstr "" #: editor/project_settings_editor.cpp #, fuzzy -msgid "No property '" +msgid "No property '%s' exists." msgstr "পà§à¦°à¦ªà¦¾à¦°à§à¦Ÿà¦¿:" #: editor/project_settings_editor.cpp -#, fuzzy -msgid "Setting '" -msgstr "সেটিংস" +msgid "Setting '%s' is internal, and it can't be deleted." +msgstr "" #: editor/project_settings_editor.cpp #, fuzzy @@ -6549,6 +6747,16 @@ msgid "Clear a script for the selected node." msgstr "নিরà§à¦¬à¦¾à¦šà¦¿à¦¤ নোড হতে à¦à¦•à¦Ÿà¦¿ সà§à¦•à§à¦°à¦¿à¦ªà§à¦Ÿ পরিসà§à¦•à¦¾à¦° করà§à¦¨à¥¤" #: editor/scene_tree_dock.cpp +#, fuzzy +msgid "Remote" +msgstr "অপসারণ করà§à¦¨" + +#: editor/scene_tree_dock.cpp +#, fuzzy +msgid "Local" +msgstr "ঘটনাসà§à¦¥à¦²" + +#: editor/scene_tree_dock.cpp msgid "Clear Inheritance? (No Undo!)" msgstr "উতà§à¦¤à¦°à¦¾à¦§à¦¿à¦•à¦¾à¦°à¦¤à§à¦¬ পরিসà§à¦•à¦¾à¦° করবেন? (ফেরৎ পাবেন না!)" @@ -6745,6 +6953,11 @@ msgid "Attach Node Script" msgstr "নোড সà§à¦•à§à¦°à¦¿à¦ªà§à¦Ÿ সংযà§à¦•à§à¦¤ করà§à¦¨" #: editor/script_editor_debugger.cpp +#, fuzzy +msgid "Remote " +msgstr "অপসারণ করà§à¦¨" + +#: editor/script_editor_debugger.cpp msgid "Bytes:" msgstr "বাইটস:" @@ -6801,18 +7014,6 @@ msgid "Stack Trace (if applicable):" msgstr "পদাঙà§à¦• সà§à¦¤à§‚প করà§à¦¨ (পà§à¦°à¦¯à§‹à¦œà§à¦¯ হলে):" #: editor/script_editor_debugger.cpp -msgid "Remote Inspector" -msgstr "রিমোট পরীকà§à¦·à¦•" - -#: editor/script_editor_debugger.cpp -msgid "Live Scene Tree:" -msgstr "দৃশà§à¦¯à§‡à¦° সকà§à¦°à¦¿à¦¯à¦¼ শাখা:" - -#: editor/script_editor_debugger.cpp -msgid "Remote Object Properties: " -msgstr "রিমোট বসà§à¦¤à§à¦° পà§à¦°à§‹à¦ªà¦¾à¦°à§à¦Ÿà¦¿à¦¸: " - -#: editor/script_editor_debugger.cpp msgid "Profiler" msgstr "পà§à¦°à§‹à¦«à¦¾à¦‡à¦²à¦¾à¦°" @@ -6946,49 +7147,49 @@ msgstr "" msgid "GDNative" msgstr "" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp #: modules/visual_script/visual_script_builtin_funcs.cpp msgid "Invalid type argument to convert(), use TYPE_* constants." msgstr "অগà§à¦°à¦¹à¦£à¦¯à§‹à¦—à§à¦¯ মান/আরà§à¦—à§à¦®à§‡à¦¨à§à¦Ÿ convert()-ঠগিয়েছে, TYPE_* ধà§à¦°à§à¦¬à¦• বà§à¦¯à¦¬à¦¹à¦¾à¦° করà§à¦¨à¥¤" -#: modules/gdscript/gd_functions.cpp modules/mono/glue/glue_header.h +#: modules/gdscript/gdscript_functions.cpp modules/mono/glue/glue_header.h #: modules/visual_script/visual_script_builtin_funcs.cpp msgid "Not enough bytes for decoding bytes, or invalid format." msgstr "বিনà§à¦¯à¦¾à¦¸ জানার জনà§à¦¯ যথেষà§à¦Ÿ বাইট নেই, অথবা à¦à§à¦² ফরমà§à¦¯à¦¾à¦Ÿà¥¤" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "step argument is zero!" msgstr "ধাপ মান/আরà§à¦—à§à¦®à§‡à¦¨à§à¦Ÿ শূনà§à¦¯!" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Not a script with an instance" msgstr "ইনসà§à¦Ÿà§à¦¯à¦¾à¦¨à§à¦¸ বিহীন সà§à¦•à§à¦°à¦¿à¦ªà§à¦Ÿ" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Not based on a script" msgstr "সà§à¦•à§à¦°à¦¿à¦ªà§à¦Ÿ নিরà§à¦à¦° নয়" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Not based on a resource file" msgstr "রিসোরà§à¦¸ ফাইল à¦à¦¿à¦¤à§à¦¤à¦¿à¦• নয়" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary format (missing @path)" msgstr "à¦à§à¦² dictionary ফরমà§à¦¯à¦¾à¦Ÿ (@path নেই)" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary format (can't load script at @path)" msgstr "à¦à§à¦² dictionary ফরমà§à¦¯à¦¾à¦Ÿ (@path-ঠসà§à¦•à§à¦°à¦¿à¦ªà§à¦Ÿ লোড অসমà§à¦à¦¬)" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary format (invalid script at @path)" msgstr "à¦à§à¦² dictionary ফরমà§à¦¯à¦¾à¦Ÿ (@path-ঠà¦à§à¦² সà§à¦•à§à¦°à¦¿à¦ªà§à¦Ÿ)" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary (invalid subclasses)" msgstr "à¦à§à¦² dictionary ফরমà§à¦¯à¦¾à¦Ÿ (à¦à§à¦² subclasses)" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Object can't provide a length." msgstr "" @@ -7003,16 +7204,26 @@ msgid "GridMap Duplicate Selection" msgstr "নিরà§à¦¬à¦¾à¦šà¦¿à¦¤ সমূহ অনà§à¦²à¦¿à¦ªà¦¿ করà§à¦¨" #: modules/gridmap/grid_map_editor_plugin.cpp +msgid "Floor:" +msgstr "" + +#: modules/gridmap/grid_map_editor_plugin.cpp +#, fuzzy +msgid "Grid Map" +msgstr "গà§à¦°à¦¿à¦¡ সà§à¦¨à§à¦¯à¦¾à¦ª" + +#: modules/gridmap/grid_map_editor_plugin.cpp #, fuzzy msgid "Snap View" msgstr "শীরà§à¦· দরà§à¦¶à¦¨" #: modules/gridmap/grid_map_editor_plugin.cpp -msgid "Prev Level (%sDown Wheel)" -msgstr "" +#, fuzzy +msgid "Previous Floor" +msgstr "পূরà§à¦¬à§‡à¦° টà§à¦¯à¦¾à¦¬" #: modules/gridmap/grid_map_editor_plugin.cpp -msgid "Next Level (%sUp Wheel)" +msgid "Next Floor" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp @@ -7088,13 +7299,8 @@ msgstr "TileMap মà§à¦›à§‡ ফেলà§à¦¨" #: modules/gridmap/grid_map_editor_plugin.cpp #, fuzzy -msgid "Selection -> Duplicate" -msgstr "শà§à¦§à§à¦®à¦¾à¦¤à§à¦° নিরà§à¦¬à¦¾à¦šà¦¿à¦¤à¦¸à¦®à§‚হ" - -#: modules/gridmap/grid_map_editor_plugin.cpp -#, fuzzy -msgid "Selection -> Clear" -msgstr "শà§à¦§à§à¦®à¦¾à¦¤à§à¦° নিরà§à¦¬à¦¾à¦šà¦¿à¦¤à¦¸à¦®à§‚হ" +msgid "Clear Selection" +msgstr "নিরà§à¦¬à¦¾à¦šà¦¨à¦•à§‡ কেনà§à¦¦à§à¦°à§€à¦à§‚ত করà§à¦¨" #: modules/gridmap/grid_map_editor_plugin.cpp #, fuzzy @@ -7230,7 +7436,8 @@ msgid "Duplicate VisualScript Nodes" msgstr "গà§à¦°à¦¾à¦« নোড(সমূহ) পà§à¦°à¦¤à¦¿à¦²à¦¿à¦ªà¦¿ করà§à¦¨" #: modules/visual_script/visual_script_editor.cpp -msgid "Hold Meta to drop a Getter. Hold Shift to drop a generic signature." +#, fuzzy +msgid "Hold %s to drop a Getter. Hold Shift to drop a generic signature." msgstr "" "গেটার (Getter) তৈরি করতে/নামাতে মেটা কী (Meta) চেপে রাখà§à¦¨à¥¤ জেনেরিক সিগনেচার " "(generic signature) তৈরি করতে/নামাতে শিফট কী (Shift) চেপে রাখà§à¦¨à¥¤" @@ -7242,7 +7449,8 @@ msgstr "" "(generic signature) তৈরি করতে/নামাতে শিফট কী (Shift) চেপে রাখà§à¦¨à¥¤" #: modules/visual_script/visual_script_editor.cpp -msgid "Hold Meta to drop a simple reference to the node." +#, fuzzy +msgid "Hold %s to drop a simple reference to the node." msgstr "" "নোডে সাধারণ সমà§à¦ªà¦°à§à¦• (reference) তৈরি করতে/নামাতে মেটা কী (Meta) চেপে রাখà§à¦¨à¥¤" @@ -7252,7 +7460,8 @@ msgstr "" "নোডে সাধারণ সমà§à¦ªà¦°à§à¦• (reference) তৈরি করতে/নামাতে কনà§à¦Ÿà§à¦°à§‹à¦² কী (Ctrl) চেপে রাখà§à¦¨à¥¤" #: modules/visual_script/visual_script_editor.cpp -msgid "Hold Meta to drop a Variable Setter." +#, fuzzy +msgid "Hold %s to drop a Variable Setter." msgstr "চলক সেটার (Variable Setter) তৈরি করতে/নামাতে মেটা কী (Meta) চেপে রাখà§à¦¨à¥¤" #: modules/visual_script/visual_script_editor.cpp @@ -7494,13 +7703,23 @@ msgstr "টাইলটি খà§à¦à¦œà§‡ পাওয়া যায়নি:" #: platform/javascript/export/export.cpp #, fuzzy -msgid "Could not read file:\n" +msgid "Could not open template for export:\n" +msgstr "ফোলà§à¦¡à¦¾à¦° তৈরী করা সমà§à¦à¦¬ হয়নি।" + +#: platform/javascript/export/export.cpp +#, fuzzy +msgid "Invalid export template:\n" +msgstr "à¦à¦•à§à¦¸à¦ªà§‹à¦°à§à¦Ÿà§‡à¦° টেমপà§à¦²à§‡à¦Ÿà¦¸à¦®à§‚হ ইনà§à¦¸à¦Ÿà¦² করà§à¦¨" + +#: platform/javascript/export/export.cpp +#, fuzzy +msgid "Could not read custom HTML shell:\n" msgstr "টাইলটি খà§à¦à¦œà§‡ পাওয়া যায়নি:" #: platform/javascript/export/export.cpp #, fuzzy -msgid "Could not open template for export:\n" -msgstr "ফোলà§à¦¡à¦¾à¦° তৈরী করা সমà§à¦à¦¬ হয়নি।" +msgid "Could not read boot splash image file:\n" +msgstr "টাইলটি খà§à¦à¦œà§‡ পাওয়া যায়নি:" #: scene/2d/animated_sprite.cpp msgid "" @@ -7610,22 +7829,6 @@ msgstr "" msgid "Path property must point to a valid Node2D node to work." msgstr "Path à¦à¦° দিক অবশà§à¦¯à¦‡ à¦à¦•à¦Ÿà¦¿ কারà§à¦¯à¦•à¦° Node2D à¦à¦° দিকে নিরà§à¦¦à§‡à¦¶ করাতে হবে।" -#: scene/2d/sprite.cpp -msgid "" -"Path property must point to a valid Viewport node to work. Such Viewport " -"must be set to 'render target' mode." -msgstr "" -"Path à¦à¦° দিক অবশà§à¦¯à¦‡ à¦à¦•à¦Ÿà¦¿ কারà§à¦¯à¦•à¦° Viewport à¦à¦° দিকে নিরà§à¦¦à§‡à¦¶ করাতে হবে। সেই " -"Viewport অবশà§à¦¯à¦‡ 'render target' মোডে নিরà§à¦§à¦¾à¦°à¦¨ করতে হবে।" - -#: scene/2d/sprite.cpp -msgid "" -"The Viewport set in the path property must be set as 'render target' in " -"order for this sprite to work." -msgstr "" -"à¦à¦‡ sprite টি কারà§à¦¯à¦•à¦° করতে path পà§à¦°à§‹à¦ªà¦¾à¦°à§à¦Ÿà¦¿à¦¤à§‡ নিরà§à¦§à¦¾à¦°à¦¿à¦¤ Viewport টি অবশà§à¦¯à¦‡ 'render " -"target' ঠনিরà§à¦§à¦¾à¦°à¦¿à¦¤ করতে হবে।" - #: scene/2d/visibility_notifier_2d.cpp msgid "" "VisibilityEnable2D works best when used with the edited scene root directly " @@ -7694,6 +7897,15 @@ msgstr "" "সফলà§à¦à¦¾à¦¬à§‡ কাজ করতে CollisionShape à¦à¦° à¦à¦•à¦Ÿà¦¿ আকৃতি পà§à¦°à§Ÿà§‹à¦œà¦¨à¥¤ অনà§à¦—à§à¦°à¦¹ করে তার জনà§à¦¯ à¦à¦•à¦Ÿà¦¿ " "আকৃতি তৈরি করà§à¦¨!" +#: scene/3d/gi_probe.cpp +#, fuzzy +msgid "Plotting Meshes" +msgstr "ছবিসমূহ বà§à¦²à¦¿à¦Ÿà¦¿à¦‚ (Blitting) করা হচà§à¦›à§‡" + +#: scene/3d/gi_probe.cpp +msgid "Finishing Plot" +msgstr "" + #: scene/3d/navigation_mesh.cpp msgid "A NavigationMesh resource must be set or created for this node to work." msgstr "" @@ -7783,6 +7995,10 @@ msgid "" "minimum size manually." msgstr "" +#: scene/gui/tree.cpp +msgid "(Other)" +msgstr "" + #: scene/main/scene_tree.cpp msgid "" "Default Environment as specified in Project Setings (Rendering -> Viewport -" @@ -7817,6 +8033,66 @@ msgstr "ফনà§à¦Ÿ তà§à¦²à¦¤à§‡/লোডে সমসà§à¦¯à¦¾ হয়েঠmsgid "Invalid font size." msgstr "ফনà§à¦Ÿà§‡à¦° আকার অগà§à¦°à¦¹à¦¨à¦¯à§‹à¦—à§à¦¯à¥¤" +#, fuzzy +#~ msgid "" +#~ "\n" +#~ "Source: " +#~ msgstr "উৎস:" + +#, fuzzy +#~ msgid "Remove Point from Line2D" +#~ msgstr "বকà§à¦°à¦°à§‡à¦–া হতে বিনà§à¦¦à§ অপসারণ করà§à¦¨" + +#, fuzzy +#~ msgid "Add Point to Line2D" +#~ msgstr "বকà§à¦°à¦°à§‡à¦–ায় বিনà§à¦¦à§ যোগ করà§à¦¨" + +#, fuzzy +#~ msgid "Move Point in Line2D" +#~ msgstr "বকà§à¦°à¦°à§‡à¦–ায় বিনà§à¦¦à§ সরান" + +#, fuzzy +#~ msgid "Split Segment (in line)" +#~ msgstr "অংশ বিà¦à¦•à§à¦¤ করà§à¦¨ (বকà§à¦°à¦°à§‡à¦–ায়)" + +#~ msgid "Meta+" +#~ msgstr "Meta+" + +#, fuzzy +#~ msgid "Setting '" +#~ msgstr "সেটিংস" + +#~ msgid "Remote Inspector" +#~ msgstr "রিমোট পরীকà§à¦·à¦•" + +#~ msgid "Live Scene Tree:" +#~ msgstr "দৃশà§à¦¯à§‡à¦° সকà§à¦°à¦¿à¦¯à¦¼ শাখা:" + +#~ msgid "Remote Object Properties: " +#~ msgstr "রিমোট বসà§à¦¤à§à¦° পà§à¦°à§‹à¦ªà¦¾à¦°à§à¦Ÿà¦¿à¦¸: " + +#, fuzzy +#~ msgid "Selection -> Duplicate" +#~ msgstr "শà§à¦§à§à¦®à¦¾à¦¤à§à¦° নিরà§à¦¬à¦¾à¦šà¦¿à¦¤à¦¸à¦®à§‚হ" + +#, fuzzy +#~ msgid "Selection -> Clear" +#~ msgstr "শà§à¦§à§à¦®à¦¾à¦¤à§à¦° নিরà§à¦¬à¦¾à¦šà¦¿à¦¤à¦¸à¦®à§‚হ" + +#~ msgid "" +#~ "Path property must point to a valid Viewport node to work. Such Viewport " +#~ "must be set to 'render target' mode." +#~ msgstr "" +#~ "Path à¦à¦° দিক অবশà§à¦¯à¦‡ à¦à¦•à¦Ÿà¦¿ কারà§à¦¯à¦•à¦° Viewport à¦à¦° দিকে নিরà§à¦¦à§‡à¦¶ করাতে হবে। সেই " +#~ "Viewport অবশà§à¦¯à¦‡ 'render target' মোডে নিরà§à¦§à¦¾à¦°à¦¨ করতে হবে।" + +#~ msgid "" +#~ "The Viewport set in the path property must be set as 'render target' in " +#~ "order for this sprite to work." +#~ msgstr "" +#~ "à¦à¦‡ sprite টি কারà§à¦¯à¦•à¦° করতে path পà§à¦°à§‹à¦ªà¦¾à¦°à§à¦Ÿà¦¿à¦¤à§‡ নিরà§à¦§à¦¾à¦°à¦¿à¦¤ Viewport টি অবশà§à¦¯à¦‡ " +#~ "'render target' ঠনিরà§à¦§à¦¾à¦°à¦¿à¦¤ করতে হবে।" + #~ msgid "Filter:" #~ msgstr "ফিলà§à¦Ÿà¦¾à¦°:" @@ -7838,9 +8114,6 @@ msgstr "ফনà§à¦Ÿà§‡à¦° আকার অগà§à¦°à¦¹à¦¨à¦¯à§‹à¦—à§à¦¯à¥¤" #~ msgid "Removed:" #~ msgstr "অপসারিত:" -#~ msgid "Error saving atlas:" -#~ msgstr "à¦à¦Ÿà¦²à¦¾à¦¸/মানচিতà§à¦°à¦¾à¦¬à¦²à§€ সংরকà§à¦·à¦£à§‡ সমসà§à¦¯à¦¾ হয়েছে:" - #~ msgid "Could not save atlas subtexture:" #~ msgstr "à¦à¦Ÿà¦²à¦¾à¦¸/মানচিতà§à¦°à¦¾à¦¬à¦²à§€à¦° উপ-গঠনবিনà§à¦¯à¦¾à¦¸ (subtexture) সংরকà§à¦·à¦£ অসমরà§à¦¥ হয়েছে:" @@ -8223,9 +8496,6 @@ msgstr "ফনà§à¦Ÿà§‡à¦° আকার অগà§à¦°à¦¹à¦¨à¦¯à§‹à¦—à§à¦¯à¥¤" #~ msgid "Cropping Images" #~ msgstr "ছবিসমূহ ছাà¦à¦Ÿà¦¾ হচà§à¦›à§‡" -#~ msgid "Blitting Images" -#~ msgstr "ছবিসমূহ বà§à¦²à¦¿à¦Ÿà¦¿à¦‚ (Blitting) করা হচà§à¦›à§‡" - #~ msgid "Couldn't save atlas image:" #~ msgstr "à¦à¦Ÿà¦²à¦¾à¦¸/মানচিতà§à¦°à¦¾à¦¬à¦²à§€à¦° ছবি সংরকà§à¦·à¦£ করা সমà§à¦à¦¬ হচà§à¦›à§‡ না:" @@ -8596,9 +8866,6 @@ msgstr "ফনà§à¦Ÿà§‡à¦° আকার অগà§à¦°à¦¹à¦¨à¦¯à§‹à¦—à§à¦¯à¥¤" #~ msgid "Save Translatable Strings" #~ msgstr "অনà§à¦¬à¦¾à¦¦-সমà§à¦à¦¬ শবà§à¦¦à¦®à¦¾à¦²à¦¾/বাকà§à¦¯-সমূহ সংরকà§à¦·à¦£ করà§à¦¨" -#~ msgid "Install Export Templates" -#~ msgstr "à¦à¦•à§à¦¸à¦ªà§‹à¦°à§à¦Ÿà§‡à¦° টেমপà§à¦²à§‡à¦Ÿà¦¸à¦®à§‚হ ইনà§à¦¸à¦Ÿà¦² করà§à¦¨" - #~ msgid "Edit Script Options" #~ msgstr "সà§à¦•à§à¦°à¦¿à¦ªà§à¦Ÿ-à¦à¦° সিদà§à¦§à¦¾à¦¨à§à¦¤à¦¸à¦®à§‚হ সমà§à¦ªà¦¾à¦¦à¦¨ করà§à¦¨" diff --git a/editor/translations/ca.po b/editor/translations/ca.po index 1a5a285b94..83131d7640 100644 --- a/editor/translations/ca.po +++ b/editor/translations/ca.po @@ -3,20 +3,20 @@ # Copyright (C) 2014-2017 Godot Engine contributors (cf. AUTHORS.md) # This file is distributed under the same license as the Godot source code. # -# Roger BR <drai_kin@hotmail.com>, 2016. +# Roger Blanco Ribera <roger.blancoribera@gmail.com>, 2016-2017. # msgid "" msgstr "" "Project-Id-Version: Godot Engine editor\n" -"PO-Revision-Date: 2016-10-11 08:26+0000\n" -"Last-Translator: Roger BR <drai_kin@hotmail.com>\n" +"PO-Revision-Date: 2017-11-22 12:05+0000\n" +"Last-Translator: Roger Blanco Ribera <roger.blancoribera@gmail.com>\n" "Language-Team: Catalan <https://hosted.weblate.org/projects/godot-engine/" "godot/ca/>\n" "Language: ca\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8-bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 2.9-dev\n" +"X-Generator: Weblate 2.18-dev\n" #: editor/animation_editor.cpp msgid "Disabled" @@ -28,85 +28,84 @@ msgstr "Tota la Selecció" #: editor/animation_editor.cpp msgid "Move Add Key" -msgstr "Mou Afegir Clau" +msgstr "Mou o Afegeix una Clau" #: editor/animation_editor.cpp msgid "Anim Change Transition" -msgstr "Canvia Transició" +msgstr "Modifica la Transició d'Animació" #: editor/animation_editor.cpp msgid "Anim Change Transform" -msgstr "Canvia Transformació" +msgstr "Modifica la Transformació de l'Animació" #: editor/animation_editor.cpp msgid "Anim Change Value" -msgstr "Canvia Valor" +msgstr "Modifica el Valor" #: editor/animation_editor.cpp -#, fuzzy msgid "Anim Change Call" -msgstr "Canvia Crida (Call)" +msgstr "Modifica la Crida" #: editor/animation_editor.cpp msgid "Anim Add Track" -msgstr "Afegeix Pista" +msgstr "Afegeix una Pista" #: editor/animation_editor.cpp msgid "Anim Duplicate Keys" -msgstr "Duplica Claus" +msgstr "Duplica les Claus" #: editor/animation_editor.cpp msgid "Move Anim Track Up" -msgstr "Mou Pista Amunt" +msgstr "Mou la Pista Amunt" #: editor/animation_editor.cpp msgid "Move Anim Track Down" -msgstr "Mou Pista Avall" +msgstr "Mou la Pista Avall" #: editor/animation_editor.cpp msgid "Remove Anim Track" -msgstr "Treu Pista" +msgstr "Treu la Pista" #: editor/animation_editor.cpp msgid "Set Transitions to:" -msgstr "Posa les Transicions a:" +msgstr "Estableix les Transicions com :" #: editor/animation_editor.cpp msgid "Anim Track Rename" -msgstr "Reanomena Pista" +msgstr "Reanomena la Pista" #: editor/animation_editor.cpp msgid "Anim Track Change Interpolation" -msgstr "Canvia Interpolació de Pista" +msgstr "Modifica l'Interpolació de la Pista" #: editor/animation_editor.cpp msgid "Anim Track Change Value Mode" -msgstr "Canvia Valor del Mode de Pista" +msgstr "Modifica el Valor del Mode de Pista" #: editor/animation_editor.cpp -#, fuzzy msgid "Anim Track Change Wrap Mode" -msgstr "Canvia Valor del Mode de Pista" +msgstr "Modifica el Valor del Mode d'Ajustament de Pista" #: editor/animation_editor.cpp msgid "Edit Node Curve" -msgstr "Edita Corba del Node" +msgstr "Edita la Corba del Node" #: editor/animation_editor.cpp msgid "Edit Selection Curve" -msgstr "Edita Corba de Selecció" +msgstr "Edita la Corba de Selecció" #: editor/animation_editor.cpp msgid "Anim Delete Keys" -msgstr "Esborra Claus" +msgstr "Esborra les Claus" #: editor/animation_editor.cpp editor/plugins/tile_map_editor_plugin.cpp +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Duplicate Selection" msgstr "Duplica la Selecció" #: editor/animation_editor.cpp msgid "Duplicate Transposed" -msgstr "Duplica Transposats" +msgstr "Duplica'l Transposat" #: editor/animation_editor.cpp msgid "Remove Selection" @@ -126,11 +125,11 @@ msgstr "Activador" #: editor/animation_editor.cpp msgid "Anim Add Key" -msgstr "Afegeix Clau" +msgstr "Afegeix una Clau" #: editor/animation_editor.cpp msgid "Anim Move Keys" -msgstr "Mou Claus" +msgstr "Mou les Claus" #: editor/animation_editor.cpp msgid "Scale Selection" @@ -138,7 +137,7 @@ msgstr "Escala la Selecció" #: editor/animation_editor.cpp msgid "Scale From Cursor" -msgstr "Escala des del Cursor" +msgstr "Escala amb el Cursor" #: editor/animation_editor.cpp msgid "Goto Next Step" @@ -208,39 +207,39 @@ msgstr "Crea i Insereix" #: editor/animation_editor.cpp msgid "Anim Insert Track & Key" -msgstr "Insereix Pista i Clau" +msgstr "Insereix una Pista i una Clau" #: editor/animation_editor.cpp msgid "Anim Insert Key" -msgstr "Insereix Clau" +msgstr "Insereix una Clau" #: editor/animation_editor.cpp msgid "Change Anim Len" -msgstr "Canvia durada" +msgstr "Modifica la durada" #: editor/animation_editor.cpp msgid "Change Anim Loop" -msgstr "Canvia bucle" +msgstr "Modifica la repetició de l'Animació" #: editor/animation_editor.cpp msgid "Anim Create Typed Value Key" -msgstr "Crea Clau de Valor Tipat" +msgstr "Crea una Clau de Valor Tipat" #: editor/animation_editor.cpp msgid "Anim Insert" -msgstr "Insereix Animació" +msgstr "Insereix una Animació" #: editor/animation_editor.cpp msgid "Anim Scale Keys" -msgstr "Escala Claus" +msgstr "Escala les Claus" #: editor/animation_editor.cpp msgid "Anim Add Call Track" -msgstr "Afegeix Pista de Crida" +msgstr "Afegeix una Pista de Crida" #: editor/animation_editor.cpp msgid "Animation zoom." -msgstr "Zoom d'animació." +msgstr "Zoom de l'animació." #: editor/animation_editor.cpp msgid "Length (s):" @@ -256,7 +255,7 @@ msgstr "Pas (s):" #: editor/animation_editor.cpp msgid "Cursor step snap (in seconds)." -msgstr "Pas de desplaçament del cursor (s)." +msgstr "Pas del cursor (s)." #: editor/animation_editor.cpp msgid "Enable/Disable looping in animation." @@ -264,19 +263,19 @@ msgstr "Activa/Desactiva el bucle de l'animació." #: editor/animation_editor.cpp msgid "Add new tracks." -msgstr "Afegeix noves pistes." +msgstr "Afegir noves pistes." #: editor/animation_editor.cpp msgid "Move current track up." -msgstr "Mou amunt la pista actual." +msgstr "Moure amunt la pista actual." #: editor/animation_editor.cpp msgid "Move current track down." -msgstr "Mou avall la pista actual." +msgstr "Moure avall la pista actual." #: editor/animation_editor.cpp msgid "Remove selected track." -msgstr "Treu la pista seleccionada." +msgstr "Treure la pista seleccionada." #: editor/animation_editor.cpp msgid "Track tools" @@ -329,7 +328,7 @@ msgstr "Cridar Funcions en el Node \"Which\"?" #: editor/animation_editor.cpp msgid "Remove invalid keys" -msgstr "Treu claus invà lides" +msgstr "Treure claus invà lides" #: editor/animation_editor.cpp msgid "Remove unresolved and empty tracks" @@ -353,11 +352,11 @@ msgstr "Redimensiona Matriu" #: editor/array_property_edit.cpp msgid "Change Array Value Type" -msgstr "Canvia Tipus de la Matriu" +msgstr "Modifica el Tipus de la Taula" #: editor/array_property_edit.cpp msgid "Change Array Value" -msgstr "Canvia Valor de la Matriu" +msgstr "Modifica el Valor de la Taula" #: editor/code_editor.cpp msgid "Go to Line" @@ -372,9 +371,8 @@ msgid "No Matches" msgstr "Cap Coincidència" #: editor/code_editor.cpp -#, fuzzy msgid "Replaced %d occurrence(s)." -msgstr "Reemplaçades %d ocurrència/es." +msgstr "%d ocurrència/es reemplaçades." #: editor/code_editor.cpp msgid "Replace" @@ -465,6 +463,8 @@ msgid "" "Target method not found! Specify a valid method or attach a script to target " "Node." msgstr "" +"El mètode objectiu no s'ha trobat! Especifiqueu un mètode và lid o adjunteu-" +"li un script." #: editor/connections_dialog.cpp msgid "Connect To Node:" @@ -474,18 +474,18 @@ msgstr "Connecta al Node:" #: editor/groups_editor.cpp editor/plugins/item_list_editor_plugin.cpp #: editor/plugins/theme_editor_plugin.cpp editor/project_settings_editor.cpp msgid "Add" -msgstr "Afegeix" +msgstr "Afegir" #: editor/connections_dialog.cpp editor/dependency_editor.cpp #: editor/plugins/animation_tree_editor_plugin.cpp #: editor/plugins/theme_editor_plugin.cpp editor/project_manager.cpp #: editor/project_settings_editor.cpp msgid "Remove" -msgstr "Treu" +msgstr "Treure" #: editor/connections_dialog.cpp msgid "Add Extra Call Argument:" -msgstr "Afegeix Argument de Crida Extra:" +msgstr "Afegir Argument de Crida Extra:" #: editor/connections_dialog.cpp msgid "Extra Call Arguments:" @@ -504,9 +504,8 @@ msgid "Deferred" msgstr "Diferit" #: editor/connections_dialog.cpp -#, fuzzy msgid "Oneshot" -msgstr "D'un cop" +msgstr "Un sol cop" #: editor/connections_dialog.cpp editor/dependency_editor.cpp #: editor/export_template_manager.cpp @@ -637,6 +636,13 @@ msgstr "Editor de Dependències" msgid "Search Replacement Resource:" msgstr "Cerca Recurs Reemplaçant:" +#: editor/dependency_editor.cpp editor/editor_file_dialog.cpp +#: editor/editor_help.cpp editor/editor_node.cpp editor/filesystem_dock.cpp +#: editor/plugins/script_editor_plugin.cpp editor/property_selector.cpp +#: editor/quick_open.cpp scene/gui/file_dialog.cpp +msgid "Open" +msgstr "Obre" + #: editor/dependency_editor.cpp msgid "Owners Of:" msgstr "Propietaris de:" @@ -656,7 +662,7 @@ msgstr "" #: editor/dependency_editor.cpp msgid "Cannot remove:\n" -msgstr "" +msgstr "No es pot eliminar:\n" #: editor/dependency_editor.cpp msgid "Error loading:" @@ -709,6 +715,16 @@ msgstr "Esborra fitxers seleccionats?" msgid "Delete" msgstr "Esborra" +#: editor/dictionary_property_edit.cpp +#, fuzzy +msgid "Change Dictionary Key" +msgstr "Modifica el Nom de l'Animació:" + +#: editor/dictionary_property_edit.cpp +#, fuzzy +msgid "Change Dictionary Value" +msgstr "Modifica el Valor de la Taula" + #: editor/editor_about.cpp msgid "Thanks from the Godot community!" msgstr "Grà cies de la part de la Comunitat del Godot!" @@ -719,65 +735,63 @@ msgstr "Grà cies!" #: editor/editor_about.cpp msgid "Godot Engine contributors" -msgstr "" +msgstr "Col·laboradors de Godot Engine" #: editor/editor_about.cpp -#, fuzzy msgid "Project Founders" -msgstr "Configuració del Projecte" +msgstr "Fundadors del Projecte" #: editor/editor_about.cpp msgid "Lead Developer" -msgstr "" +msgstr "Desenvolupador Principal" #: editor/editor_about.cpp editor/project_manager.cpp msgid "Project Manager" -msgstr "" +msgstr "Gestor De Projectes" #: editor/editor_about.cpp msgid "Developers" -msgstr "" +msgstr "Desenvolupadors" #: editor/editor_about.cpp -#, fuzzy msgid "Authors" -msgstr "Autor:" +msgstr "Autors" #: editor/editor_about.cpp msgid "Platinum Sponsors" -msgstr "" +msgstr "Patrocinadors Platinum" #: editor/editor_about.cpp msgid "Gold Sponsors" -msgstr "" +msgstr "Patrocinadors Gold" #: editor/editor_about.cpp msgid "Mini Sponsors" -msgstr "" +msgstr "Mini Patrocinadors" #: editor/editor_about.cpp msgid "Gold Donors" -msgstr "" +msgstr "Donants Gold" #: editor/editor_about.cpp msgid "Silver Donors" -msgstr "" +msgstr "Donants Silver" #: editor/editor_about.cpp msgid "Bronze Donors" -msgstr "" +msgstr "Donants Bronze" #: editor/editor_about.cpp msgid "Donors" -msgstr "" +msgstr "Donants" #: editor/editor_about.cpp msgid "License" -msgstr "" +msgstr "Llicència" #: editor/editor_about.cpp msgid "Thirdparty License" -msgstr "" +msgstr "Llicència externa" #: editor/editor_about.cpp msgid "" @@ -786,212 +800,199 @@ msgid "" "is an exhaustive list of all such thirdparty components with their " "respective copyright statements and license terms." msgstr "" +"El motor Godot es recolza en una sèrie de biblioteques lliures i de codi " +"obert, totes elles compatibles amb els termes de la llicència MIT. Tot " +"seguit podeu trobar la llista exhaustiva de tots aquests components externs " +"amb llurs respectius drets d'autor i termes de llicenciament." #: editor/editor_about.cpp -#, fuzzy msgid "All Components" -msgstr "Constants:" +msgstr "Tots els Components" #: editor/editor_about.cpp -#, fuzzy msgid "Components" -msgstr "Constants:" +msgstr "Components" #: editor/editor_about.cpp msgid "Licenses" -msgstr "" +msgstr "Llicències" #: editor/editor_asset_installer.cpp editor/project_manager.cpp msgid "Error opening package file, not in zip format." -msgstr "" +msgstr "Error en obrir el paquet d'arxius. El fitxer no té el format zip." #: editor/editor_asset_installer.cpp -#, fuzzy msgid "Uncompressing Assets" -msgstr "Sense Compressió" +msgstr "Descomprimint Recursos" #: editor/editor_asset_installer.cpp editor/project_manager.cpp msgid "Package Installed Successfully!" -msgstr "" +msgstr "Paquet instal·lat correctament!" #: editor/editor_asset_installer.cpp #: editor/plugins/asset_library_editor_plugin.cpp msgid "Success!" -msgstr "" +msgstr "Èxit!" #: editor/editor_asset_installer.cpp #: editor/plugins/asset_library_editor_plugin.cpp editor/project_manager.cpp msgid "Install" -msgstr "" +msgstr "Instal·lar" #: editor/editor_asset_installer.cpp msgid "Package Installer" -msgstr "" +msgstr "Instal·lador de paquets" #: editor/editor_audio_buses.cpp msgid "Speakers" -msgstr "" +msgstr "Altaveus" #: editor/editor_audio_buses.cpp msgid "Add Effect" -msgstr "" +msgstr "Afegir un efecte" #: editor/editor_audio_buses.cpp -#, fuzzy msgid "Rename Audio Bus" -msgstr "Reanomena AutoCà rrega" +msgstr "Reanomena Bus d'Àudio" #: editor/editor_audio_buses.cpp msgid "Toggle Audio Bus Solo" -msgstr "" +msgstr "Commuta el bus d'à udio solo" #: editor/editor_audio_buses.cpp msgid "Toggle Audio Bus Mute" -msgstr "" +msgstr "Silenciar/Desilenciar Bus d'Àudio" #: editor/editor_audio_buses.cpp msgid "Toggle Audio Bus Bypass Effects" -msgstr "" +msgstr "Commuta els Efectes de Bypass del Bus d'Àudio" #: editor/editor_audio_buses.cpp msgid "Select Audio Bus Send" -msgstr "" +msgstr "Seleccionar l'enviament del Bus d'Àudio" #: editor/editor_audio_buses.cpp msgid "Add Audio Bus Effect" -msgstr "" +msgstr "Afegir Efecte de bus d'Àudio" #: editor/editor_audio_buses.cpp msgid "Move Bus Effect" -msgstr "" +msgstr "Moure Efecte de Bus" #: editor/editor_audio_buses.cpp -#, fuzzy msgid "Delete Bus Effect" -msgstr "Elimina Seleccionats" +msgstr "Eliminar Efecte de Bus" #: editor/editor_audio_buses.cpp msgid "Audio Bus, Drag and Drop to rearrange." -msgstr "" +msgstr "Bus d'Àudio, reorganitza Arrossegant i Deixant anar." #: editor/editor_audio_buses.cpp msgid "Solo" -msgstr "" +msgstr "Solitari" #: editor/editor_audio_buses.cpp msgid "Mute" -msgstr "" +msgstr "Silencia" #: editor/editor_audio_buses.cpp msgid "Bypass" -msgstr "" +msgstr "Derivació" #: editor/editor_audio_buses.cpp -#, fuzzy msgid "Bus options" -msgstr "Opcions de Depuració (Debug)" +msgstr "Opcions del Bus" #: editor/editor_audio_buses.cpp editor/plugins/tile_map_editor_plugin.cpp #: editor/scene_tree_dock.cpp msgid "Duplicate" -msgstr "" +msgstr "Duplicar" #: editor/editor_audio_buses.cpp -#, fuzzy msgid "Reset Volume" -msgstr "Reinicia el Zoom" +msgstr "Restablir el Volum" #: editor/editor_audio_buses.cpp -#, fuzzy msgid "Delete Effect" -msgstr "Elimina Seleccionats" +msgstr "Elimina l'Efecte" #: editor/editor_audio_buses.cpp msgid "Add Audio Bus" -msgstr "" +msgstr "Afegir Bus d'Àudio" #: editor/editor_audio_buses.cpp msgid "Master bus can't be deleted!" -msgstr "" +msgstr "El Bus Mestre no es pot pas eliminar!" #: editor/editor_audio_buses.cpp -#, fuzzy msgid "Delete Audio Bus" -msgstr "Elimina Disposició (Layout)" +msgstr "Elimina Bus d'Àudio" #: editor/editor_audio_buses.cpp -#, fuzzy msgid "Duplicate Audio Bus" -msgstr "Duplica la Selecció" +msgstr "Duplicar el Bus d'Àudio" #: editor/editor_audio_buses.cpp -#, fuzzy msgid "Reset Bus Volume" -msgstr "Reinicia el Zoom" +msgstr "Restablir el Volum del Bus" #: editor/editor_audio_buses.cpp -#, fuzzy msgid "Move Audio Bus" -msgstr "Mou Afegir Clau" +msgstr "Moure Bus d'Àudio" #: editor/editor_audio_buses.cpp msgid "Save Audio Bus Layout As.." -msgstr "" +msgstr "Desar el Disseny del Bus d'Àudio com..." #: editor/editor_audio_buses.cpp msgid "Location for New Layout.." -msgstr "" +msgstr "Ubicació del Nou Disseny..." #: editor/editor_audio_buses.cpp msgid "Open Audio Bus Layout" -msgstr "" +msgstr "Obre un Disseny de Bus d'Àudio" #: editor/editor_audio_buses.cpp msgid "There is no 'res://default_bus_layout.tres' file." -msgstr "" +msgstr "No s'ha trobat cap 'res://default_bus_layout.tres'." #: editor/editor_audio_buses.cpp -#, fuzzy msgid "Invalid file, not an audio bus layout." -msgstr "" -"Extensió de fitxer no và lida.\n" -"Utilitzeu .fnt." +msgstr "Fitxer incorrecte. No és un disseny de bus d'à udio." #: editor/editor_audio_buses.cpp msgid "Add Bus" -msgstr "" +msgstr "Afegir Bus" #: editor/editor_audio_buses.cpp msgid "Create a new Bus Layout." -msgstr "" +msgstr "Crea un nou Disseny de Bus." #: editor/editor_audio_buses.cpp editor/property_editor.cpp #: editor/script_create_dialog.cpp msgid "Load" -msgstr "" +msgstr "Carregar" #: editor/editor_audio_buses.cpp -#, fuzzy msgid "Load an existing Bus Layout." -msgstr "Carrega un recurs des del disc i edita'l." +msgstr "Carregar un Disseny de Bus existent." #: editor/editor_audio_buses.cpp #: editor/plugins/animation_player_editor_plugin.cpp msgid "Save As" -msgstr "" +msgstr "Desar com a" #: editor/editor_audio_buses.cpp msgid "Save this Bus Layout to a file." -msgstr "" +msgstr "Desar el Disseny del Bus en un fitxer." #: editor/editor_audio_buses.cpp editor/import_dock.cpp -#, fuzzy msgid "Load Default" -msgstr "Predeterminat" +msgstr "Carregar Valors predeterminats" #: editor/editor_audio_buses.cpp msgid "Load the default Bus Layout." -msgstr "" +msgstr "Carregar el disseny del Bus predeterminat." #: editor/editor_autoload_settings.cpp msgid "Invalid name." @@ -1030,7 +1031,7 @@ msgstr "Fora del camà dels recursos." #: editor/editor_autoload_settings.cpp msgid "Add AutoLoad" -msgstr "Afegeix AutoCà rrega" +msgstr "Afegir AutoCà rrega" #: editor/editor_autoload_settings.cpp msgid "Autoload '%s' already exists!" @@ -1046,7 +1047,7 @@ msgstr "Commuta les Globals d'AutoCà rrega" #: editor/editor_autoload_settings.cpp msgid "Move Autoload" -msgstr "Mou AutoCà rrega" +msgstr "Moure AutoCà rrega" #: editor/editor_autoload_settings.cpp msgid "Remove Autoload" @@ -1094,9 +1095,8 @@ msgid "Updating scene.." msgstr "Actualitzant escena.." #: editor/editor_dir_dialog.cpp -#, fuzzy msgid "Please select a base directory first" -msgstr "Desa l'escena abans." +msgstr "Elegiu primer un directori base" #: editor/editor_dir_dialog.cpp msgid "Choose a Directory" @@ -1133,7 +1133,7 @@ msgstr "Compressió" #: editor/editor_export.cpp platform/javascript/export/export.cpp msgid "Template file not found:\n" -msgstr "" +msgstr "no s'ha trobat la Plantilla:\n" #: editor/editor_file_dialog.cpp scene/gui/file_dialog.cpp msgid "File Exists, Overwrite?" @@ -1147,12 +1147,6 @@ msgstr "Tots Reconeguts" msgid "All Files (*)" msgstr "Tots els Fitxers (*)" -#: editor/editor_file_dialog.cpp editor/editor_help.cpp editor/editor_node.cpp -#: editor/filesystem_dock.cpp editor/plugins/script_editor_plugin.cpp -#: editor/property_selector.cpp editor/quick_open.cpp scene/gui/file_dialog.cpp -msgid "Open" -msgstr "Obre" - #: editor/editor_file_dialog.cpp scene/gui/file_dialog.cpp msgid "Open a File" msgstr "Obre un Fitxer" @@ -1213,16 +1207,15 @@ msgstr "Enfoca CamÃ" #: editor/editor_file_dialog.cpp msgid "Move Favorite Up" -msgstr "Mou Favorit Amunt" +msgstr "Moure Favorit Amunt" #: editor/editor_file_dialog.cpp msgid "Move Favorite Down" -msgstr "Mou Favorit Avall" +msgstr "Moure Favorit Avall" #: editor/editor_file_dialog.cpp -#, fuzzy msgid "Go to parent folder" -msgstr "No s'ha pogut crear la carpeta." +msgstr "Aneu a la carpeta principal" #: editor/editor_file_dialog.cpp scene/gui/file_dialog.cpp msgid "Directories & Files:" @@ -1246,9 +1239,8 @@ msgid "ScanSources" msgstr "Escaneja Fonts" #: editor/editor_file_system.cpp -#, fuzzy msgid "(Re)Importing Assets" -msgstr "Re-Importació" +msgstr "(Re)Important Recursos" #: editor/editor_help.cpp editor/editor_node.cpp #: editor/plugins/script_editor_plugin.cpp @@ -1265,7 +1257,7 @@ msgstr "Cerca Classes" #: editor/editor_help.cpp editor/plugins/spatial_editor_plugin.cpp msgid "Top" -msgstr "" +msgstr "Dalt" #: editor/editor_help.cpp editor/property_editor.cpp msgid "Class:" @@ -1284,27 +1276,24 @@ msgid "Brief Description:" msgstr "Descripció breu:" #: editor/editor_help.cpp -#, fuzzy msgid "Members" -msgstr "Membres:" +msgstr "Membres" #: editor/editor_help.cpp modules/visual_script/visual_script_editor.cpp msgid "Members:" msgstr "Membres:" #: editor/editor_help.cpp -#, fuzzy msgid "Public Methods" -msgstr "Mètodes públics:" +msgstr "Mètodes Públics" #: editor/editor_help.cpp msgid "Public Methods:" msgstr "Mètodes públics:" #: editor/editor_help.cpp -#, fuzzy msgid "GUI Theme Items" -msgstr "Elements del Tema de la GUI:" +msgstr "Elements del Tema de la GUI" #: editor/editor_help.cpp msgid "GUI Theme Items:" @@ -1315,53 +1304,48 @@ msgid "Signals:" msgstr "Senyals:" #: editor/editor_help.cpp -#, fuzzy msgid "Enumerations" -msgstr "Funcions:" +msgstr "Enumeracions" #: editor/editor_help.cpp -#, fuzzy msgid "Enumerations:" -msgstr "Funcions:" +msgstr "Enumeracions:" #: editor/editor_help.cpp msgid "enum " -msgstr "" +msgstr "enum " #: editor/editor_help.cpp -#, fuzzy msgid "Constants" -msgstr "Constants:" +msgstr "Constants" #: editor/editor_help.cpp msgid "Constants:" msgstr "Constants:" #: editor/editor_help.cpp -#, fuzzy msgid "Description" -msgstr "Descripció:" +msgstr "Descripció" #: editor/editor_help.cpp -#, fuzzy msgid "Properties" -msgstr "Propietats de l'objecte." +msgstr "Propietats" #: editor/editor_help.cpp -#, fuzzy msgid "Property Description:" -msgstr "Descripció breu:" +msgstr "Descripció de la Propietat:" #: editor/editor_help.cpp msgid "" "There is currently no description for this property. Please help us by " "[color=$color][url=$url]contributing one[/url][/color]!" msgstr "" +"Aquesta proprietat no disposa de cap descripció. Podeu contribuir tot color=" +"$color][url=$url] aportant-ne una[/url][/color]!" #: editor/editor_help.cpp -#, fuzzy msgid "Methods" -msgstr "Llista de mètodes:" +msgstr "Mètodes" #: editor/editor_help.cpp msgid "Method Description:" @@ -1372,15 +1356,16 @@ msgid "" "There is currently no description for this method. Please help us by [color=" "$color][url=$url]contributing one[/url][/color]!" msgstr "" +"Aquest mètode no disposa de cap descripció. Podeu contribuir tot color=" +"$color][url=$url] aportant-ne una[/url][/color]!" #: editor/editor_help.cpp msgid "Search Text" msgstr "Cerca Text" #: editor/editor_log.cpp -#, fuzzy msgid "Output:" -msgstr " Sortida:" +msgstr "Sortida:" #: editor/editor_log.cpp editor/plugins/animation_tree_editor_plugin.cpp #: editor/property_editor.cpp editor/script_editor_debugger.cpp @@ -1414,28 +1399,24 @@ msgid "Error while saving." msgstr "Error en desar." #: editor/editor_node.cpp -#, fuzzy msgid "Can't open '%s'." -msgstr "No es pot operar en '..'" +msgstr "No es pot obrir '%s' ." #: editor/editor_node.cpp -#, fuzzy msgid "Error while parsing '%s'." -msgstr "Error en desar." +msgstr "Error en l'anà lisi de '%s'." #: editor/editor_node.cpp msgid "Unexpected end of file '%s'." -msgstr "" +msgstr "Inesperat final del fitxer a '%s'." #: editor/editor_node.cpp -#, fuzzy msgid "Missing '%s' or its dependencies." -msgstr "Escena '%s' té dependències no và lides:" +msgstr "Falta '%s' o les seves dependències." #: editor/editor_node.cpp -#, fuzzy msgid "Error while loading '%s'." -msgstr "Error en desar." +msgstr "S'ha produït un error en carregar '% s'." #: editor/editor_node.cpp msgid "Saving Scene" @@ -1450,9 +1431,8 @@ msgid "Creating Thumbnail" msgstr "Creant Miniatura" #: editor/editor_node.cpp -#, fuzzy msgid "This operation can't be done without a tree root." -msgstr "No es pot desfer aquesta acció. Vol revertir igualament?" +msgstr "Aquesta operació no es pot fer sense cap arrel d'arbre." #: editor/editor_node.cpp msgid "" @@ -1491,7 +1471,7 @@ msgstr "S'han sobreescrit els Ajustos Predeterminats de l'Editor." #: editor/editor_node.cpp msgid "Layout name not found!" -msgstr "No s'ha trobat el nom de l'ajust!" +msgstr "No s'ha trobat el nom del Disseny!" #: editor/editor_node.cpp msgid "Restored default layout to base settings." @@ -1503,18 +1483,24 @@ msgid "" "Please read the documentation relevant to importing scenes to better " "understand this workflow." msgstr "" +"Aquest recurs pertany a una escena importada, aixà que no és editable.\n" +"Referiu-vos a la documentació rellevant per a la importació d'escenes." #: editor/editor_node.cpp msgid "" "This resource belongs to a scene that was instanced or inherited.\n" "Changes to it will not be kept when saving the current scene." msgstr "" +"Aquest recurs pertany a una escena instanciada o heretada.\n" +"Els canvis efectuats no es conservaran en desar l'escena." #: editor/editor_node.cpp msgid "" "This resource was imported, so it's not editable. Change its settings in the " "import panel and then re-import." msgstr "" +"En ser importat, un recurs no és editable. Canvieu-ne la configuració en el " +"panell d'importació i abansd'importar." #: editor/editor_node.cpp msgid "" @@ -1523,6 +1509,20 @@ msgid "" "Please read the documentation relevant to importing scenes to better " "understand this workflow." msgstr "" +"En ser una escena importada, no se'n conservaran els canvis. \n" +"Instanciar o heretar l'escena permetria la seva modificació.\n" +"Referiu-vos a la documentació rellevant a la importació d'escenes per a més " +"informació." + +#: editor/editor_node.cpp +#, fuzzy +msgid "" +"This is a remote object so changes to it will not be kept.\n" +"Please read the documentation relevant to debugging to better understand " +"this workflow." +msgstr "" +"Aquest recurs pertany a una escena importada, aixà que no és editable.\n" +"Referiu-vos a la documentació rellevant per a la importació d'escenes." #: editor/editor_node.cpp msgid "Copy Params" @@ -1557,15 +1557,14 @@ msgid "There is no defined scene to run." msgstr "No s'ha definit cap escena per executar." #: editor/editor_node.cpp -#, fuzzy msgid "" "No main scene has ever been defined, select one?\n" "You can change it later in \"Project Settings\" under the 'application' " "category." msgstr "" "No s'ha definit cap escena principal. Seleccioneu-ne una.\n" -"És possible triar-ne una altra més endavant a \"Configuració del Projecte\" " -"en la categoria \"aplicació\"." +"És possible triar-ne una altra des de \"Configuració del Projecte\" en la " +"categoria \"aplicació\"." #: editor/editor_node.cpp msgid "" @@ -1614,13 +1613,12 @@ msgid "Quick Open Script.." msgstr "Obertura Rà pida d'Scripts..." #: editor/editor_node.cpp -#, fuzzy msgid "Save & Close" -msgstr "Desa un Fitxer" +msgstr "Desar i Tancar" #: editor/editor_node.cpp msgid "Save changes to '%s' before closing?" -msgstr "" +msgstr "Desar els canvis a '%s' abans de tancar?" #: editor/editor_node.cpp msgid "Save Scene As.." @@ -1628,7 +1626,7 @@ msgstr "Desa Escena com..." #: editor/editor_node.cpp msgid "No" -msgstr "" +msgstr "No" #: editor/editor_node.cpp msgid "Yes" @@ -1641,19 +1639,24 @@ msgstr "" #: editor/editor_node.cpp editor/scene_tree_dock.cpp msgid "This operation can't be done without a scene." -msgstr "" +msgstr "Aquesta operació no es pot dur a terme sense una escena." #: editor/editor_node.cpp msgid "Export Mesh Library" msgstr "Exporta Biblioteca de Models" #: editor/editor_node.cpp +#, fuzzy +msgid "This operation can't be done without a root node." +msgstr "Aquesta operació no es pot dur a terme sense un node seleccionat." + +#: editor/editor_node.cpp msgid "Export Tile Set" msgstr "Exporta el joc de Mosaics (Tiles)" #: editor/editor_node.cpp msgid "This operation can't be done without a selected node." -msgstr "" +msgstr "Aquesta operació no es pot dur a terme sense un node seleccionat." #: editor/editor_node.cpp msgid "Current scene not saved. Open anyway?" @@ -1685,26 +1688,29 @@ msgstr "Voleu Sortir de l'editor?" #: editor/editor_node.cpp msgid "Open Project Manager?" -msgstr "" +msgstr "Obre el Gestor de Projectes?" #: editor/editor_node.cpp -#, fuzzy msgid "Save & Quit" -msgstr "Desa un Fitxer" +msgstr "Desar i Sortir" #: editor/editor_node.cpp msgid "Save changes to the following scene(s) before quitting?" -msgstr "" +msgstr "Desar els canvis a la(les) escena(es) següent(s) abans de Sortir?" #: editor/editor_node.cpp msgid "Save changes the following scene(s) before opening Project Manager?" msgstr "" +"Desar els canvis a la(les) següent(s) escenes abans d'obrir el Gestor de " +"Projectes?" #: editor/editor_node.cpp msgid "" "This option is deprecated. Situations where refresh must be forced are now " "considered a bug. Please report." msgstr "" +"Aquesta opció és obsoleta. Es consideren ara errors les situacions on s'ha " +"de forçar el refrescament. Si us plau reporteu-ho." #: editor/editor_node.cpp msgid "Pick a Main Scene" @@ -1713,30 +1719,39 @@ msgstr "Tria una Escena Principal" #: editor/editor_node.cpp msgid "Unable to enable addon plugin at: '%s' parsing of config failed." msgstr "" +"No es pot habilitar el complement a: '%s' ha fallat l'anà lisi de la " +"configuració." #: editor/editor_node.cpp msgid "Unable to find script field for addon plugin at: 'res://addons/%s'." msgstr "" +"No s'ha pogut trobar el camp d'script per al complement a: 'res: // addons /" +"% s'." #: editor/editor_node.cpp -#, fuzzy msgid "Unable to load addon script from path: '%s'." -msgstr "Error carregant lletra." +msgstr "Error carregant el script complement des del camÃ: '%s'." #: editor/editor_node.cpp msgid "" "Unable to load addon script from path: '%s' Base type is not EditorPlugin." msgstr "" +"No s'ha carregat el script d'addon des del camÃ: El tipus base de '% s' no " +"és EditorPlugin." #: editor/editor_node.cpp msgid "Unable to load addon script from path: '%s' Script is not in tool mode." msgstr "" +"No s'ha carregat el script d'addon des del camÃ: El script '% s' no és en " +"el mode d'Eina." #: editor/editor_node.cpp msgid "" "Scene '%s' was automatically imported, so it can't be modified.\n" "To make changes to it, a new inherited scene can be created." msgstr "" +"En ser importada automà ticament, l'escena '%s' no es pot modificar. Per fer-" +"hi canvis, creeu una nova escena heretada." #: editor/editor_node.cpp editor/plugins/canvas_item_editor_plugin.cpp #: editor/plugins/spatial_editor_plugin.cpp editor/scene_tree_dock.cpp @@ -1756,17 +1771,16 @@ msgid "Scene '%s' has broken dependencies:" msgstr "Escena '%s' té dependències no và lides:" #: editor/editor_node.cpp -#, fuzzy msgid "Clear Recent Scenes" -msgstr "Reverteix Escena" +msgstr "Netejar Escenes Recents" #: editor/editor_node.cpp msgid "Save Layout" -msgstr "Desar Disposició (Layout)" +msgstr "Desar Disseny" #: editor/editor_node.cpp msgid "Delete Layout" -msgstr "Elimina Disposició (Layout)" +msgstr "Elimina Disseny" #: editor/editor_node.cpp editor/import_dock.cpp #: editor/script_create_dialog.cpp @@ -1775,24 +1789,39 @@ msgstr "Predeterminat" #: editor/editor_node.cpp msgid "Switch Scene Tab" -msgstr "Canvia la pestanya d'escena" +msgstr "Mou-te entre les pestanyes d'Escena" #: editor/editor_node.cpp -msgid "%d more file(s)" +#, fuzzy +msgid "%d more files or folders" +msgstr "%d fitxer(s) o directori(s) més" + +#: editor/editor_node.cpp +#, fuzzy +msgid "%d more folders" msgstr "%d fitxer(s) més" #: editor/editor_node.cpp -msgid "%d more file(s) or folder(s)" -msgstr "%d fitxer(s) o directori(s) més" +#, fuzzy +msgid "%d more files" +msgstr "%d fitxer(s) més" + +#: editor/editor_node.cpp +msgid "Dock Position" +msgstr "" #: editor/editor_node.cpp msgid "Distraction Free Mode" msgstr "Mode Lliure de Distraccions" #: editor/editor_node.cpp -#, fuzzy msgid "Toggle distraction-free mode." -msgstr "Mode Lliure de Distraccions" +msgstr "Mode Lliure de Distraccions." + +#: editor/editor_node.cpp +#, fuzzy +msgid "Add a new scene." +msgstr "Afegir noves pistes." #: editor/editor_node.cpp msgid "Scene" @@ -1811,9 +1840,8 @@ msgid "Previous tab" msgstr "Pestanya Anterior" #: editor/editor_node.cpp -#, fuzzy msgid "Filter Files.." -msgstr "Filtrat Rà pid de Fitxers..." +msgstr "Filtrat de Fitxers..." #: editor/editor_node.cpp msgid "Operations with scene files." @@ -1860,13 +1888,12 @@ msgid "TileSet.." msgstr "Joc de Mosaics (TileSet)..." #: editor/editor_node.cpp editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp scene/gui/line_edit.cpp -#: scene/gui/text_edit.cpp +#: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Undo" msgstr "Desfés" #: editor/editor_node.cpp editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp +#: scene/gui/line_edit.cpp msgid "Redo" msgstr "Refés" @@ -1879,9 +1906,8 @@ msgid "Miscellaneous project or scene-wide tools." msgstr "Eines và ries o d'escena." #: editor/editor_node.cpp -#, fuzzy msgid "Project" -msgstr "Exporta Projecte" +msgstr "Projecte" #: editor/editor_node.cpp msgid "Project Settings" @@ -1905,7 +1931,7 @@ msgstr "Surt a la Llista de Projectes" #: editor/editor_node.cpp editor/plugins/script_editor_plugin.cpp msgid "Debug" -msgstr "" +msgstr "Depurar" #: editor/editor_node.cpp msgid "Deploy with Remote Debug" @@ -1996,9 +2022,8 @@ msgstr "" "millora el rendiment." #: editor/editor_node.cpp -#, fuzzy msgid "Editor" -msgstr "Edita" +msgstr "Editor" #: editor/editor_node.cpp editor/settings_config_dialog.cpp msgid "Editor Settings" @@ -2006,37 +2031,35 @@ msgstr "Configuració de l'Editor" #: editor/editor_node.cpp msgid "Editor Layout" -msgstr "Disposició de l'Editor" +msgstr "Disseny de l'Editor" #: editor/editor_node.cpp -#, fuzzy msgid "Toggle Fullscreen" -msgstr "Mode Pantalla completa" +msgstr "Mode Pantalla Completa" #: editor/editor_node.cpp editor/project_export.cpp -#, fuzzy msgid "Manage Export Templates" -msgstr "Carregant Plantilles d'Exportació" +msgstr "Gestionar Plantilles d'Exportació" #: editor/editor_node.cpp msgid "Help" -msgstr "" +msgstr "Ajuda" #: editor/editor_node.cpp editor/plugins/script_editor_plugin.cpp msgid "Classes" -msgstr "" +msgstr "Classes" #: editor/editor_node.cpp editor/plugins/script_editor_plugin.cpp msgid "Online Docs" -msgstr "" +msgstr "Documentació en lÃnia" #: editor/editor_node.cpp msgid "Q&A" -msgstr "" +msgstr "Preguntes i Respostes" #: editor/editor_node.cpp msgid "Issue Tracker" -msgstr "" +msgstr "Seguiment d'Incidències" #: editor/editor_node.cpp editor/plugins/asset_library_editor_plugin.cpp msgid "Community" @@ -2100,7 +2123,7 @@ msgstr "Actualitza Canvis" #: editor/editor_node.cpp msgid "Disable Update Spinner" -msgstr "" +msgstr "Desactiva l'Indicador d'Actualització" #: editor/editor_node.cpp msgid "Inspector" @@ -2140,7 +2163,7 @@ msgstr "Propietats de l'objecte." #: editor/editor_node.cpp msgid "Changes may be lost!" -msgstr "" +msgstr "Es podrien perdre els canvis!" #: editor/editor_node.cpp editor/plugins/asset_library_editor_plugin.cpp #: editor/project_manager.cpp @@ -2153,7 +2176,7 @@ msgstr "SistemaDeFitxers" #: editor/editor_node.cpp editor/node_dock.cpp msgid "Node" -msgstr "" +msgstr "Node" #: editor/editor_node.cpp msgid "Output" @@ -2161,7 +2184,7 @@ msgstr "Sortida" #: editor/editor_node.cpp msgid "Don't Save" -msgstr "" +msgstr "No Desis" #: editor/editor_node.cpp msgid "Import Templates From ZIP File" @@ -2188,9 +2211,8 @@ msgid "Open & Run a Script" msgstr "Obre i Executa un Script" #: editor/editor_node.cpp -#, fuzzy msgid "New Inherited" -msgstr "Nova Escena heretada..." +msgstr "Nou Heretat" #: editor/editor_node.cpp msgid "Load Errors" @@ -2198,44 +2220,39 @@ msgstr "Errors de Cà rrega" #: editor/editor_node.cpp editor/plugins/tile_map_editor_plugin.cpp msgid "Select" -msgstr "" +msgstr "Seleccionar" #: editor/editor_node.cpp -#, fuzzy msgid "Open 2D Editor" -msgstr "Obre un Directori" +msgstr "Obre l'Editor 2D" #: editor/editor_node.cpp -#, fuzzy msgid "Open 3D Editor" -msgstr "Obre un Directori" +msgstr "Obre l'Editor 3D" #: editor/editor_node.cpp -#, fuzzy msgid "Open Script Editor" -msgstr "Editor de Dependències" +msgstr "Editor d'Scripts" #: editor/editor_node.cpp -#, fuzzy msgid "Open Asset Library" -msgstr "Exporta Biblioteca" +msgstr "Exportar Biblioteca de Recursos" #: editor/editor_node.cpp -#, fuzzy msgid "Open the next Editor" -msgstr "Editor de Dependències" +msgstr "Obre l'Editor Següent" #: editor/editor_node.cpp msgid "Open the previous Editor" -msgstr "" +msgstr "Obre l'Editor precedent" #: editor/editor_plugin.cpp msgid "Creating Mesh Previews" -msgstr "" +msgstr "Creant Previsualitzacions de Malles" #: editor/editor_plugin.cpp msgid "Thumbnail.." -msgstr "" +msgstr "Miniatura.." #: editor/editor_plugin_settings.cpp msgid "Installed Plugins:" @@ -2283,9 +2300,8 @@ msgid "Frame %" msgstr "% del Fotograma" #: editor/editor_profiler.cpp -#, fuzzy msgid "Physics Frame %" -msgstr "% del Fotograma Fix" +msgstr "Fotograma de FÃsica %" #: editor/editor_profiler.cpp editor/script_editor_debugger.cpp msgid "Time:" @@ -2305,13 +2321,15 @@ msgstr "Fotograma núm.:" #: editor/editor_run_native.cpp msgid "Select device from the list" -msgstr "" +msgstr "Seleccionar un dispositiu de la llista" #: editor/editor_run_native.cpp msgid "" "No runnable export preset found for this platform.\n" "Please add a runnable preset in the export menu." msgstr "" +"No s'ha trobat cap patró d'exportació executable per aquesta plataforma. \n" +"Afegiu un patró predeterminat en el menú d'exportació." #: editor/editor_run_script.cpp msgid "Write your logic in the _run() method." @@ -2355,32 +2373,36 @@ msgstr "Importa des del Node:" #: editor/export_template_manager.cpp msgid "Re-Download" -msgstr "" +msgstr "Tornar a Descarregar" #: editor/export_template_manager.cpp msgid "Uninstall" -msgstr "" +msgstr "Desinstal·lar" #: editor/export_template_manager.cpp -#, fuzzy msgid "(Installed)" -msgstr "Instà ncia" +msgstr "(Instal·lat)" #: editor/export_template_manager.cpp msgid "Download" -msgstr "" +msgstr "Descarregar" #: editor/export_template_manager.cpp msgid "(Missing)" -msgstr "" +msgstr "(Mancant)" #: editor/export_template_manager.cpp msgid "(Current)" -msgstr "" +msgstr "(Actual)" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Retrieving mirrors, please wait.." +msgstr "S'ha produït un error en la connexió. Torneu-ho a provar." #: editor/export_template_manager.cpp msgid "Remove template version '%s'?" -msgstr "" +msgstr "Eliminar la versió \"%s\" de la plantilla ?" #: editor/export_template_manager.cpp msgid "Can't open export templates zip." @@ -2388,60 +2410,171 @@ msgstr "No s'ha pogut obrir el zip amb les plantilles d'exportació." #: editor/export_template_manager.cpp msgid "Invalid version.txt format inside templates." -msgstr "" +msgstr "El format de version.txt dins de les plantilles no és và lid." #: editor/export_template_manager.cpp msgid "" "Invalid version.txt format inside templates. Revision is not a valid " "identifier." msgstr "" +"El format de version.txt dins les plantilles no és và lid. \"Revision\" no és " +"un indentificador và lid." #: editor/export_template_manager.cpp msgid "No version.txt found inside templates." -msgstr "" +msgstr "No s'ha trobat cap version.txt dins les plantilles." #: editor/export_template_manager.cpp -#, fuzzy msgid "Error creating path for templates:\n" -msgstr "Error en desar atles:" +msgstr "Error en crear el camà per a les plantilles:\n" #: editor/export_template_manager.cpp -#, fuzzy msgid "Extracting Export Templates" -msgstr "Carregant Plantilles d'Exportació" +msgstr "Extraient Plantilles d'Exportació" #: editor/export_template_manager.cpp msgid "Importing:" msgstr "Importació:" #: editor/export_template_manager.cpp +msgid "" +"No download links found for this version. Direct download is only available " +"for official releases." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Can't resolve." +msgstr "No es pot resoldre." + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Can't connect." +msgstr "No es pot connectar.." + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "No response." +msgstr "Cap resposta." + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Req. Failed." +msgstr "Ha fallat la sol·licitud." + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Redirect Loop." +msgstr "Bucle de redirecció." + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Failed:" +msgstr "Ha fallat:" + +#: editor/export_template_manager.cpp #, fuzzy -msgid "Current Version:" -msgstr "Versió:" +msgid "Can't write file." +msgstr "No s'ha pogut crear la carpeta." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Download Complete." +msgstr "Error en la Descà rrega" #: editor/export_template_manager.cpp #, fuzzy +msgid "Error requesting url: " +msgstr "Error en desar atles:" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Connecting to Mirror.." +msgstr "Connexió en marxa..." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Disconnected" +msgstr "Desconnecta" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Resolving" +msgstr "s'està resolent.." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Can't Resolve" +msgstr "No es pot resoldre." + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Connecting.." +msgstr "Connexió en marxa..." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Can't Conect" +msgstr "No es pot connectar.." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Connected" +msgstr "Connecta" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Requesting.." +msgstr "Sol·licitud en marxa..." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Downloading" +msgstr "Descarregar" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Connection Error" +msgstr "Connexió en marxa..." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "SSL Handshake Error" +msgstr "Errors de Cà rrega" + +#: editor/export_template_manager.cpp +msgid "Current Version:" +msgstr "Versió Actual:" + +#: editor/export_template_manager.cpp msgid "Installed Versions:" -msgstr "Connectors Instal·lats:" +msgstr "Versions instal·lades:" #: editor/export_template_manager.cpp msgid "Install From File" -msgstr "" +msgstr "Instal·lar des d'un Fitxer" #: editor/export_template_manager.cpp -#, fuzzy msgid "Remove Template" -msgstr "Treu la Selecció" +msgstr "Eliminar Plantilla" #: editor/export_template_manager.cpp -#, fuzzy msgid "Select template file" -msgstr "Esborra fitxers seleccionats?" +msgstr "Selecciona fitxer de plantilla" #: editor/export_template_manager.cpp -#, fuzzy msgid "Export Template Manager" -msgstr "Carregant Plantilles d'Exportació" +msgstr "Gestor de Plantilles d'Exportació" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Download Templates" +msgstr "Treure la Selecció" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Select mirror from list: " +msgstr "Seleccionar un dispositiu de la llista" #: editor/file_type_cache.cpp msgid "Can't open file_type_cache.cch for writing, not saving file type cache!" @@ -2450,106 +2583,92 @@ msgstr "" "tipus de fitxers!" #: editor/filesystem_dock.cpp -msgid "Cannot navigate to '" +msgid "Cannot navigate to '%s' as it has not been found in the file system!" msgstr "" #: editor/filesystem_dock.cpp msgid "View items as a grid of thumbnails" -msgstr "" +msgstr "Veure com a graella de miniatures" #: editor/filesystem_dock.cpp msgid "View items as a list" -msgstr "" +msgstr "Veure com a llista" #: editor/filesystem_dock.cpp msgid "" "\n" "Status: Import of file failed. Please fix file and reimport manually." msgstr "" - -#: editor/filesystem_dock.cpp -#, fuzzy -msgid "" "\n" -"Source: " -msgstr "Lletra:" +"Estat: No s'ha pogut importar. Corregeixi el fitxer i torni a importar." #: editor/filesystem_dock.cpp -#, fuzzy msgid "Cannot move/rename resources root." -msgstr "No es pot carregar/processar la lletra." +msgstr "No es pot moure/reanomenar l'arrel dels recursos." #: editor/filesystem_dock.cpp -#, fuzzy msgid "Cannot move a folder into itself.\n" -msgstr "No es pot importar un fitxer dins de si mateix:" +msgstr "No es pot moure un directori dins si mateix:\n" #: editor/filesystem_dock.cpp -#, fuzzy msgid "Error moving:\n" -msgstr "Error en carregar:" +msgstr "Error en moure:\n" #: editor/filesystem_dock.cpp -#, fuzzy msgid "Unable to update dependencies:\n" -msgstr "Escena '%s' té dependències no và lides:" +msgstr "No s'han pogut actualitzar les dependències:\n" #: editor/filesystem_dock.cpp msgid "No name provided" -msgstr "" +msgstr "Manca Nom" #: editor/filesystem_dock.cpp msgid "Provided name contains invalid characters" -msgstr "" +msgstr "El nom conté carà cters que no són và lids" #: editor/filesystem_dock.cpp -#, fuzzy msgid "No name provided." -msgstr "Renomena o Mou..." +msgstr "Manca Nom." #: editor/filesystem_dock.cpp -#, fuzzy msgid "Name contains invalid characters." -msgstr "Carà cters và lids:" +msgstr "El Nom conté carà cters que no són và lids." #: editor/filesystem_dock.cpp msgid "A file or folder with this name already exists." -msgstr "" +msgstr "Ja existeix un Fitxer o Directori amb aquest nom." #: editor/filesystem_dock.cpp -#, fuzzy msgid "Renaming file:" -msgstr "Reanomena Variable" +msgstr "Reanomenant fitxer:" #: editor/filesystem_dock.cpp msgid "Renaming folder:" -msgstr "" +msgstr "Reanomenant directori:" #: editor/filesystem_dock.cpp msgid "Expand all" -msgstr "" +msgstr "Expandir tot" #: editor/filesystem_dock.cpp msgid "Collapse all" -msgstr "" +msgstr "Col·lapsar tot" #: editor/filesystem_dock.cpp msgid "Copy Path" msgstr "Copia CamÃ" #: editor/filesystem_dock.cpp -#, fuzzy msgid "Rename.." -msgstr "Renomena o Mou..." +msgstr "Reanomenar.." #: editor/filesystem_dock.cpp msgid "Move To.." -msgstr "Mou cap a..." +msgstr "Moure cap a..." #: editor/filesystem_dock.cpp -#, fuzzy msgid "New Folder.." -msgstr "Crea una Carpeta" +msgstr "Nou Directori.." #: editor/filesystem_dock.cpp msgid "Show In File Manager" @@ -2581,7 +2700,7 @@ msgstr "ReAnalitza Sistema de Fitxers" #: editor/filesystem_dock.cpp msgid "Toggle folder status as Favorite" -msgstr "Canvia l'estat del directori a Preferit" +msgstr "Modifica l'estat del directori com a Favorit" #: editor/filesystem_dock.cpp msgid "Instance the selected scene(s) as child of the selected node." @@ -2591,66 +2710,64 @@ msgstr "Instancia les escenes seleccionades com a filles del node seleccionat." msgid "" "Scanning Files,\n" "Please Wait.." -msgstr "" +msgstr "Analitzant Fitxers..." #: editor/filesystem_dock.cpp msgid "Move" -msgstr "Mou" +msgstr "Moure" #: editor/filesystem_dock.cpp editor/plugins/animation_tree_editor_plugin.cpp #: editor/project_manager.cpp msgid "Rename" -msgstr "" +msgstr "Reanomenar" #: editor/groups_editor.cpp msgid "Add to Group" -msgstr "Afegeix al Grup" +msgstr "Afegir al Grup" #: editor/groups_editor.cpp msgid "Remove from Group" -msgstr "Treu del Grup" +msgstr "Treure del Grup" #: editor/import/resource_importer_scene.cpp -#, fuzzy msgid "Import as Single Scene" -msgstr "Important Escena..." +msgstr "Importar com a Única Escena" #: editor/import/resource_importer_scene.cpp msgid "Import with Separate Animations" -msgstr "" +msgstr "Importació amb Animacions Separades" #: editor/import/resource_importer_scene.cpp msgid "Import with Separate Materials" -msgstr "" +msgstr "Importar Materials Separadament" #: editor/import/resource_importer_scene.cpp msgid "Import with Separate Objects" -msgstr "" +msgstr "Importar Objectes Separadament" #: editor/import/resource_importer_scene.cpp msgid "Import with Separate Objects+Materials" -msgstr "" +msgstr "Importar Objectes+Materials Separadament" #: editor/import/resource_importer_scene.cpp msgid "Import with Separate Objects+Animations" -msgstr "" +msgstr "Importar Objectes+Animacions Separadament" #: editor/import/resource_importer_scene.cpp msgid "Import with Separate Materials+Animations" -msgstr "" +msgstr "Importar Materials+Animacions Separadament" #: editor/import/resource_importer_scene.cpp msgid "Import with Separate Objects+Materials+Animations" -msgstr "" +msgstr "Importar Objectes+Materials+Animacions Separadament" #: editor/import/resource_importer_scene.cpp -#, fuzzy msgid "Import as Multiple Scenes" -msgstr "Importa Escena 3D" +msgstr "Importar com a Múltiples Escenes" #: editor/import/resource_importer_scene.cpp msgid "Import as Multiple Scenes+Materials" -msgstr "" +msgstr "Importar com a Múltiples Escenes+Materials" #: editor/import/resource_importer_scene.cpp #: editor/plugins/cube_grid_theme_editor_plugin.cpp @@ -2683,72 +2800,69 @@ msgstr "Desant..." #: editor/import_dock.cpp msgid "Set as Default for '%s'" -msgstr "" +msgstr "Establir com a valor Predeterminat per a '%s'" #: editor/import_dock.cpp msgid "Clear Default for '%s'" -msgstr "" +msgstr "Neteja el valor Predeterminat de '%s'" #: editor/import_dock.cpp -#, fuzzy msgid " Files" -msgstr "Fitxer:" +msgstr " Fitxers" #: editor/import_dock.cpp -#, fuzzy msgid "Import As:" -msgstr "Importa" +msgstr "Importar com a:" #: editor/import_dock.cpp editor/property_editor.cpp msgid "Preset.." -msgstr "" +msgstr "Configuració.." #: editor/import_dock.cpp -#, fuzzy msgid "Reimport" -msgstr "ReImporta" +msgstr "ReImportar" #: editor/multi_node_edit.cpp msgid "MultiNode Set" -msgstr "" +msgstr "Establir MultiNode" #: editor/node_dock.cpp msgid "Groups" -msgstr "" +msgstr "Grups" #: editor/node_dock.cpp msgid "Select a Node to edit Signals and Groups." -msgstr "" +msgstr "Seleccioneu un Node per editar Senyals i Grups." #: editor/plugins/abstract_polygon_2d_editor.cpp #: editor/plugins/light_occluder_2d_editor_plugin.cpp msgid "Create Poly" -msgstr "" +msgstr "Crea PolÃgon" #: editor/plugins/abstract_polygon_2d_editor.cpp #: editor/plugins/collision_polygon_editor_plugin.cpp #: editor/plugins/light_occluder_2d_editor_plugin.cpp msgid "Edit Poly" -msgstr "" +msgstr "Edita PolÃgon" #: editor/plugins/abstract_polygon_2d_editor.cpp msgid "Insert Point" -msgstr "" +msgstr "Insereix un Punt" #: editor/plugins/abstract_polygon_2d_editor.cpp #: editor/plugins/collision_polygon_editor_plugin.cpp #: editor/plugins/light_occluder_2d_editor_plugin.cpp msgid "Edit Poly (Remove Point)" -msgstr "" +msgstr "Edita el PolÃgon (Elimina un Punt)" #: editor/plugins/abstract_polygon_2d_editor.cpp msgid "Remove Poly And Point" -msgstr "" +msgstr "Elimina el PolÃgon i el Punt" #: editor/plugins/abstract_polygon_2d_editor.cpp -#: editor/plugins/light_occluder_2d_editor_plugin.cpp -msgid "Create a new polygon from scratch." -msgstr "" +#, fuzzy +msgid "Create a new polygon from scratch" +msgstr "Crea un nou PolÃgon del no-res." #: editor/plugins/abstract_polygon_2d_editor.cpp msgid "" @@ -2757,467 +2871,433 @@ msgid "" "Ctrl+LMB: Split Segment.\n" "RMB: Erase Point." msgstr "" +"Edita un PolÃgon existent:\n" +"Clic Esquerra: Mou un Punt.\n" +"Ctrl+Clic Esquerra: Divideix un Segment.\n" +"Clic Dreta: Elimina un Punt." + +#: editor/plugins/abstract_polygon_2d_editor.cpp +#, fuzzy +msgid "Delete points" +msgstr "Elimina el Punt" #: editor/plugins/animation_player_editor_plugin.cpp msgid "Toggle Autoplay" -msgstr "" +msgstr "Reproducció Automà tica" #: editor/plugins/animation_player_editor_plugin.cpp msgid "New Animation Name:" -msgstr "" +msgstr "Nom de la Nova Animació:" #: editor/plugins/animation_player_editor_plugin.cpp msgid "New Anim" -msgstr "" +msgstr "Nova Animació" #: editor/plugins/animation_player_editor_plugin.cpp msgid "Change Animation Name:" -msgstr "" +msgstr "Modifica el Nom de l'Animació:" #: editor/plugins/animation_player_editor_plugin.cpp -#, fuzzy msgid "Delete Animation?" -msgstr "Animació d'Escenes 3D" +msgstr "Eliminar l'Animació?" #: editor/plugins/animation_player_editor_plugin.cpp #: editor/plugins/sprite_frames_editor_plugin.cpp msgid "Remove Animation" -msgstr "" +msgstr "Eliminar l'Animació" #: editor/plugins/animation_player_editor_plugin.cpp msgid "ERROR: Invalid animation name!" -msgstr "" +msgstr "ERROR: El Nom de l'Animació no és và lid!" #: editor/plugins/animation_player_editor_plugin.cpp msgid "ERROR: Animation name already exists!" -msgstr "" +msgstr "ERROR: Ja existeix aquest nom d'Animació!" #: editor/plugins/animation_player_editor_plugin.cpp #: editor/plugins/sprite_frames_editor_plugin.cpp msgid "Rename Animation" -msgstr "" +msgstr "Reanomenar Animació" #: editor/plugins/animation_player_editor_plugin.cpp #: editor/plugins/sprite_frames_editor_plugin.cpp msgid "Add Animation" -msgstr "" +msgstr "Afegir Animació" #: editor/plugins/animation_player_editor_plugin.cpp msgid "Blend Next Changed" -msgstr "" +msgstr "Mesclar Següent Canviat" #: editor/plugins/animation_player_editor_plugin.cpp msgid "Change Blend Time" -msgstr "" +msgstr "Modifica el Temps de Mescla" #: editor/plugins/animation_player_editor_plugin.cpp msgid "Load Animation" -msgstr "" +msgstr "Carrega l'Animació" #: editor/plugins/animation_player_editor_plugin.cpp msgid "Duplicate Animation" -msgstr "" +msgstr "Duplica l'Animació" #: editor/plugins/animation_player_editor_plugin.cpp msgid "ERROR: No animation to copy!" -msgstr "" +msgstr "ERROR: Cap animació per copiar!" #: editor/plugins/animation_player_editor_plugin.cpp msgid "ERROR: No animation resource on clipboard!" -msgstr "" +msgstr "ERROR: Cap recurs d'animació al porta-retalls!" #: editor/plugins/animation_player_editor_plugin.cpp msgid "Pasted Animation" -msgstr "" +msgstr "Animació Enganxada" #: editor/plugins/animation_player_editor_plugin.cpp msgid "Paste Animation" -msgstr "" +msgstr "Enganxar Animació" #: editor/plugins/animation_player_editor_plugin.cpp msgid "ERROR: No animation to edit!" -msgstr "" +msgstr "ERROR: Cap animació per editar!" #: editor/plugins/animation_player_editor_plugin.cpp msgid "Play selected animation backwards from current pos. (A)" msgstr "" +"Reprodueix enrera l'animació seleccionada des de la posició actual. (A)" #: editor/plugins/animation_player_editor_plugin.cpp msgid "Play selected animation backwards from end. (Shift+A)" -msgstr "" +msgstr "Reprodueix enrera l'animació seleccionada des del final. (Maj+A)" #: editor/plugins/animation_player_editor_plugin.cpp msgid "Stop animation playback. (S)" -msgstr "" +msgstr "Aturar la reproducció de l'animació. (S)" #: editor/plugins/animation_player_editor_plugin.cpp msgid "Play selected animation from start. (Shift+D)" -msgstr "" +msgstr "Reproduir l'animació seleccionada des de l'inici. (Maj+D)" #: editor/plugins/animation_player_editor_plugin.cpp msgid "Play selected animation from current pos. (D)" -msgstr "" +msgstr "Reproduir l'animació seleccionada des de la posició actual. (D)" #: editor/plugins/animation_player_editor_plugin.cpp msgid "Animation position (in seconds)." -msgstr "" +msgstr "Posició de l'Animació (en segons)." #: editor/plugins/animation_player_editor_plugin.cpp msgid "Scale animation playback globally for the node." -msgstr "" +msgstr "Escalar globalment la reproducció de l'animació pel node." #: editor/plugins/animation_player_editor_plugin.cpp msgid "Create new animation in player." -msgstr "" +msgstr "Crea una nova animació en el reproductor." #: editor/plugins/animation_player_editor_plugin.cpp msgid "Load animation from disk." -msgstr "" +msgstr "Carregar un animació del del disc." #: editor/plugins/animation_player_editor_plugin.cpp msgid "Load an animation from disk." -msgstr "" +msgstr "Carregar una animació des del disc." #: editor/plugins/animation_player_editor_plugin.cpp msgid "Save the current animation" -msgstr "" +msgstr "Desar l'animació actual" #: editor/plugins/animation_player_editor_plugin.cpp msgid "Display list of animations in player." -msgstr "" +msgstr "Mostrar la llista d'animacions en el reproductor." #: editor/plugins/animation_player_editor_plugin.cpp msgid "Autoplay on Load" -msgstr "" +msgstr "Reproducció Automà tica en Carregar" #: editor/plugins/animation_player_editor_plugin.cpp msgid "Edit Target Blend Times" -msgstr "" +msgstr "Edita els Temps de Mescla dels Objectius" #: editor/plugins/animation_player_editor_plugin.cpp msgid "Animation Tools" -msgstr "" +msgstr "Eines d'Animació" #: editor/plugins/animation_player_editor_plugin.cpp msgid "Copy Animation" -msgstr "" +msgstr "Copiar l'Animació" #: editor/plugins/animation_player_editor_plugin.cpp msgid "Create New Animation" -msgstr "" +msgstr "Crea una Nova Animació" #: editor/plugins/animation_player_editor_plugin.cpp msgid "Animation Name:" -msgstr "" +msgstr "Nom de l'Animació:" #: editor/plugins/animation_player_editor_plugin.cpp #: editor/plugins/resource_preloader_editor_plugin.cpp #: editor/plugins/sprite_frames_editor_plugin.cpp editor/property_editor.cpp #: editor/script_create_dialog.cpp msgid "Error!" -msgstr "" +msgstr "Error !" #: editor/plugins/animation_player_editor_plugin.cpp msgid "Blend Times:" -msgstr "" +msgstr "Temps de mescla:" #: editor/plugins/animation_player_editor_plugin.cpp msgid "Next (Auto Queue):" -msgstr "" +msgstr "Següent (Enviar a la Cua):" #: editor/plugins/animation_player_editor_plugin.cpp msgid "Cross-Animation Blend Times" -msgstr "" +msgstr "Temps de mescla entre Animacions" #: editor/plugins/animation_player_editor_plugin.cpp #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Animation" -msgstr "" +msgstr "Animació" #: editor/plugins/animation_tree_editor_plugin.cpp msgid "New name:" -msgstr "" +msgstr "Nou nom:" #: editor/plugins/animation_tree_editor_plugin.cpp -#, fuzzy msgid "Edit Filters" -msgstr "Filtres" +msgstr "Edita Filtres" #: editor/plugins/animation_tree_editor_plugin.cpp #: editor/plugins/multimesh_editor_plugin.cpp msgid "Scale:" -msgstr "" +msgstr "Escala:" #: editor/plugins/animation_tree_editor_plugin.cpp msgid "Fade In (s):" -msgstr "" +msgstr "Fosa d'entrada (s):" #: editor/plugins/animation_tree_editor_plugin.cpp msgid "Fade Out (s):" -msgstr "" +msgstr "Fosa de sortida (s):" #: editor/plugins/animation_tree_editor_plugin.cpp msgid "Blend" -msgstr "" +msgstr "Mescla" #: editor/plugins/animation_tree_editor_plugin.cpp msgid "Mix" -msgstr "" +msgstr "Mesclar" #: editor/plugins/animation_tree_editor_plugin.cpp msgid "Auto Restart:" -msgstr "" +msgstr "Reinici automà tic :" #: editor/plugins/animation_tree_editor_plugin.cpp msgid "Restart (s):" -msgstr "" +msgstr "Reinici (s):" #: editor/plugins/animation_tree_editor_plugin.cpp msgid "Random Restart (s):" -msgstr "" +msgstr "Reinici aleatori (s):" #: editor/plugins/animation_tree_editor_plugin.cpp msgid "Start!" -msgstr "" +msgstr "Inicia!" #: editor/plugins/animation_tree_editor_plugin.cpp #: editor/plugins/multimesh_editor_plugin.cpp msgid "Amount:" -msgstr "" +msgstr "Quantitat:" #: editor/plugins/animation_tree_editor_plugin.cpp msgid "Blend:" -msgstr "" +msgstr "Mescla:" #: editor/plugins/animation_tree_editor_plugin.cpp msgid "Blend 0:" -msgstr "" +msgstr "Mescla 0:" #: editor/plugins/animation_tree_editor_plugin.cpp msgid "Blend 1:" -msgstr "" +msgstr "Mescla 1:" #: editor/plugins/animation_tree_editor_plugin.cpp msgid "X-Fade Time (s):" -msgstr "" +msgstr "Durada de la fosa (s):" #: editor/plugins/animation_tree_editor_plugin.cpp msgid "Current:" -msgstr "" +msgstr "Actual:" #: editor/plugins/animation_tree_editor_plugin.cpp msgid "Add Input" -msgstr "" +msgstr "Afegeix una Entrada" #: editor/plugins/animation_tree_editor_plugin.cpp msgid "Clear Auto-Advance" -msgstr "" +msgstr "Neteja l'Autoavenç" #: editor/plugins/animation_tree_editor_plugin.cpp msgid "Set Auto-Advance" -msgstr "" +msgstr "Estableix l'Autoavenç" #: editor/plugins/animation_tree_editor_plugin.cpp msgid "Delete Input" -msgstr "" +msgstr "Elimina l'Entrada" #: editor/plugins/animation_tree_editor_plugin.cpp msgid "Animation tree is valid." -msgstr "" +msgstr "L'arbre d'animació és và lid." #: editor/plugins/animation_tree_editor_plugin.cpp msgid "Animation tree is invalid." -msgstr "" +msgstr "L'arbre d'animació no és và lid." #: editor/plugins/animation_tree_editor_plugin.cpp msgid "Animation Node" -msgstr "" +msgstr "Node d'Animació" #: editor/plugins/animation_tree_editor_plugin.cpp msgid "OneShot Node" -msgstr "" +msgstr "Node unSolCop" #: editor/plugins/animation_tree_editor_plugin.cpp msgid "Mix Node" -msgstr "" +msgstr "Node de Mescla" #: editor/plugins/animation_tree_editor_plugin.cpp msgid "Blend2 Node" -msgstr "" +msgstr "Node Mescla2" #: editor/plugins/animation_tree_editor_plugin.cpp msgid "Blend3 Node" -msgstr "" +msgstr "Node Mescla3" #: editor/plugins/animation_tree_editor_plugin.cpp msgid "Blend4 Node" -msgstr "" +msgstr "Node Mescla4" #: editor/plugins/animation_tree_editor_plugin.cpp msgid "TimeScale Node" -msgstr "" +msgstr "Node escalaTemps" #: editor/plugins/animation_tree_editor_plugin.cpp msgid "TimeSeek Node" -msgstr "" +msgstr "Node cercaTemps" #: editor/plugins/animation_tree_editor_plugin.cpp msgid "Transition Node" -msgstr "" +msgstr "Node de Transició" #: editor/plugins/animation_tree_editor_plugin.cpp msgid "Import Animations.." -msgstr "" +msgstr "Importa animacions..." #: editor/plugins/animation_tree_editor_plugin.cpp msgid "Edit Node Filters" -msgstr "" +msgstr "Edita els filtres de Node" #: editor/plugins/animation_tree_editor_plugin.cpp msgid "Filters.." -msgstr "" +msgstr "Filtres..." #: editor/plugins/asset_library_editor_plugin.cpp msgid "Free" -msgstr "" +msgstr "Allibera" #: editor/plugins/asset_library_editor_plugin.cpp -#, fuzzy msgid "Contents:" -msgstr "Constants:" +msgstr "Continguts:" #: editor/plugins/asset_library_editor_plugin.cpp -#, fuzzy msgid "View Files" -msgstr "Fitxer:" +msgstr "Veure Fitxers" #: editor/plugins/asset_library_editor_plugin.cpp msgid "Can't resolve hostname:" -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp -msgid "Can't resolve." -msgstr "" +msgstr "No es pot resoldre l'amfitrió:" #: editor/plugins/asset_library_editor_plugin.cpp msgid "Connection error, please try again." -msgstr "" +msgstr "S'ha produït un error en la connexió. Torneu-ho a provar." #: editor/plugins/asset_library_editor_plugin.cpp -#, fuzzy -msgid "Can't connect." -msgstr "Connecta.." - -#: editor/plugins/asset_library_editor_plugin.cpp -#, fuzzy msgid "Can't connect to host:" -msgstr "Connecta al Node:" +msgstr "No es pot connectar a l'amfitrió:" #: editor/plugins/asset_library_editor_plugin.cpp msgid "No response from host:" -msgstr "" +msgstr "Cap resposta de l'amfitrió:" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "No response." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp -#, fuzzy msgid "Request failed, return code:" -msgstr "Format de fitxer desconegut:" - -#: editor/plugins/asset_library_editor_plugin.cpp -msgid "Req. Failed." -msgstr "" +msgstr "Ha fallat la sol·licitud, codi de devolució:" #: editor/plugins/asset_library_editor_plugin.cpp msgid "Request failed, too many redirects" -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp -msgid "Redirect Loop." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp -msgid "Failed:" -msgstr "" +msgstr "Ha fallat la sol·licitud. Massa redireccionaments" #: editor/plugins/asset_library_editor_plugin.cpp msgid "Bad download hash, assuming file has been tampered with." -msgstr "" +msgstr "Error en la descà rrega (hash incorrecte). El fitxer fou manipulat." #: editor/plugins/asset_library_editor_plugin.cpp msgid "Expected:" -msgstr "" +msgstr "Esperat:" #: editor/plugins/asset_library_editor_plugin.cpp msgid "Got:" -msgstr "" +msgstr "Rebut:" #: editor/plugins/asset_library_editor_plugin.cpp msgid "Failed sha256 hash check" -msgstr "" +msgstr "Ha fallat la comprovació del hash sha256" #: editor/plugins/asset_library_editor_plugin.cpp msgid "Asset Download Error:" -msgstr "" +msgstr "Error en la descà rrega de l'Actiu:" #: editor/plugins/asset_library_editor_plugin.cpp msgid "Fetching:" -msgstr "" +msgstr "Recollida:" #: editor/plugins/asset_library_editor_plugin.cpp -#, fuzzy msgid "Resolving.." -msgstr "Desant..." - -#: editor/plugins/asset_library_editor_plugin.cpp -#, fuzzy -msgid "Connecting.." -msgstr "Connecta.." - -#: editor/plugins/asset_library_editor_plugin.cpp -#, fuzzy -msgid "Requesting.." -msgstr "Provant" +msgstr "s'està resolent.." #: editor/plugins/asset_library_editor_plugin.cpp -#, fuzzy msgid "Error making request" -msgstr "Error en desar recurs!" +msgstr "Error en la sol·licitud" #: editor/plugins/asset_library_editor_plugin.cpp msgid "Idle" -msgstr "" +msgstr "Inactiu" #: editor/plugins/asset_library_editor_plugin.cpp msgid "Retry" -msgstr "" +msgstr "Torneu a provar" #: editor/plugins/asset_library_editor_plugin.cpp -#, fuzzy msgid "Download Error" -msgstr "Errors de Cà rrega" +msgstr "Error en la Descà rrega" #: editor/plugins/asset_library_editor_plugin.cpp msgid "Download for this asset is already in progress!" -msgstr "" +msgstr "Ja s'està baixant aquest actiu!" #: editor/plugins/asset_library_editor_plugin.cpp msgid "first" -msgstr "" +msgstr "Inici" #: editor/plugins/asset_library_editor_plugin.cpp msgid "prev" -msgstr "" +msgstr "anterior" #: editor/plugins/asset_library_editor_plugin.cpp msgid "next" -msgstr "" +msgstr "següent" #: editor/plugins/asset_library_editor_plugin.cpp msgid "last" -msgstr "" +msgstr "darrer" #: editor/plugins/asset_library_editor_plugin.cpp msgid "All" @@ -3226,7 +3306,7 @@ msgstr "Tot" #: editor/plugins/asset_library_editor_plugin.cpp #: editor/project_settings_editor.cpp msgid "Plugins" -msgstr "" +msgstr "Connectors" #: editor/plugins/asset_library_editor_plugin.cpp msgid "Sort:" @@ -3263,89 +3343,124 @@ msgstr "Arxiu ZIP d'Actius" #: editor/plugins/camera_editor_plugin.cpp msgid "Preview" -msgstr "" +msgstr "Previsualització" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Configure Snap" -msgstr "" +msgstr "Configura l'Alineament" #: editor/plugins/canvas_item_editor_plugin.cpp #: editor/plugins/polygon_2d_editor_plugin.cpp msgid "Grid Offset:" -msgstr "" +msgstr "òfset de la graella:" #: editor/plugins/canvas_item_editor_plugin.cpp #: editor/plugins/polygon_2d_editor_plugin.cpp msgid "Grid Step:" -msgstr "" +msgstr "Pas de la Graella:" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Rotation Offset:" -msgstr "" +msgstr "òfset de la Rotació:" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Rotation Step:" -msgstr "" +msgstr "Pas de la Rotació:" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Move Pivot" -msgstr "" +msgstr "Mou el Pivot" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Move Action" +msgstr "Mou l'Acció" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Move vertical guide" msgstr "" #: editor/plugins/canvas_item_editor_plugin.cpp -msgid "Edit IK Chain" +#, fuzzy +msgid "Create new vertical guide" +msgstr "Crea un nou script" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Remove vertical guide" +msgstr "Elimina la Variable" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Move horizontal guide" +msgstr "Mou un Punt de la Corba" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Create new horizontal guide" +msgstr "Crea un nou script" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Remove horizontal guide" +msgstr "Treure claus invà lides" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Create new horizontal and vertical guides" msgstr "" #: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Edit IK Chain" +msgstr "Edita la Cadena CI" + +#: editor/plugins/canvas_item_editor_plugin.cpp msgid "Edit CanvasItem" -msgstr "" +msgstr "Modifica el elementCanvas" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Anchors only" -msgstr "" +msgstr "Només Ancoratges" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Change Anchors and Margins" -msgstr "" +msgstr "Modifica Ancoratges i Marges" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Change Anchors" -msgstr "" +msgstr "Modifica Ancoratges" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Paste Pose" -msgstr "" +msgstr "Enganxa Positura" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Select Mode" -msgstr "" +msgstr "Mode de selecció" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Drag: Rotate" -msgstr "" +msgstr "Arrossega: gira" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Alt+Drag: Move" -msgstr "" +msgstr "Alt+Arrosegar: Mou" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Press 'v' to Change Pivot, 'Shift+v' to Drag Pivot (while moving)." msgstr "" +"Premeu 'v' per canviar el Pivot, 'Maj+v' per arrosegar el Pivot (mentre es " +"mou)." #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Alt+RMB: Depth list selection" -msgstr "" +msgstr "Alt+Clic Dret: Selecció detallada per llista" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Move Mode" -msgstr "" +msgstr "Mode de moviment" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Rotate Mode" -msgstr "" +msgstr "Mode de Rotació" #: editor/plugins/canvas_item_editor_plugin.cpp #: editor/plugins/spatial_editor_plugin.cpp @@ -3353,462 +3468,423 @@ msgid "" "Show a list of all objects at the position clicked\n" "(same as Alt+RMB in select mode)." msgstr "" +"Mostra la llista de tots els objectes en la posició clicada\n" +"(Tal com Alt+Clic Dreta en el mode de Selecció)." #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Click to change object's rotation pivot." -msgstr "" +msgstr "Clica per modificar el pivot rotacional de l'objecte." #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Pan Mode" -msgstr "" +msgstr "Mode d'Escombratge lateral" #: editor/plugins/canvas_item_editor_plugin.cpp -#, fuzzy msgid "Toggles snapping" -msgstr "Commuta el punt d'Interrupció" +msgstr "Act/Desactiva Acoblament" #: editor/plugins/canvas_item_editor_plugin.cpp #: editor/plugins/spatial_editor_plugin.cpp msgid "Use Snap" -msgstr "" +msgstr "Alinea" #: editor/plugins/canvas_item_editor_plugin.cpp -#, fuzzy msgid "Snapping options" -msgstr "Opcions d'Animació" +msgstr "Opcions d'Acoblament" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Snap to grid" -msgstr "" +msgstr "Alinea-ho amb la graella" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Use Rotation Snap" -msgstr "" +msgstr "Rotació alineada" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Configure Snap..." -msgstr "" +msgstr "Configura l'Alineament..." #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Snap Relative" -msgstr "" +msgstr "Alineament Relatiu" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Use Pixel Snap" -msgstr "" +msgstr "Alinea-ho amb els Pixels" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Smart snapping" -msgstr "" +msgstr "Alineament intel·ligent" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Snap to parent" -msgstr "" +msgstr "Alinea-ho amb el Pare" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Snap to node anchor" -msgstr "" +msgstr "Alinea-ho amb el node d'ancoratge" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Snap to node sides" -msgstr "" +msgstr "Alinea-ho amb els costats del node" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Snap to other nodes" -msgstr "" +msgstr "Alinea-ho amb altres nodes" #: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Snap to guides" +msgstr "Alinea-ho amb la graella" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Lock the selected object in place (can't be moved)." -msgstr "" +msgstr "Immobilitza l'Objecte." #: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Unlock the selected object (can be moved)." -msgstr "" +msgstr "Allibera l'Objecte." #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Makes sure the object's children are not selectable." -msgstr "" +msgstr "Impossibilita la selecció dels nodes fills." #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Restores the object's children's ability to be selected." -msgstr "" +msgstr "Permet la selecció de nodes fills." #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Make Bones" -msgstr "" +msgstr "Crea els ossos" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Clear Bones" -msgstr "" +msgstr "Esborra els Ossos" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Show Bones" -msgstr "" +msgstr "Mostra els Ossos" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Make IK Chain" -msgstr "" +msgstr "Crea una cadena CI" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Clear IK Chain" -msgstr "" +msgstr "Esborra la cadena CI" #: editor/plugins/canvas_item_editor_plugin.cpp #: editor/plugins/spatial_editor_plugin.cpp msgid "View" -msgstr "" +msgstr "Vista" #: editor/plugins/canvas_item_editor_plugin.cpp #: editor/plugins/polygon_2d_editor_plugin.cpp msgid "Show Grid" -msgstr "" +msgstr "Mostra la graella" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Show helpers" -msgstr "" +msgstr "Mostrar els Ajudants" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Show rulers" -msgstr "" +msgstr "Mostra els regles" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Show guides" +msgstr "Mostra els regles" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Center Selection" -msgstr "" +msgstr "Centra la Selecció" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Frame Selection" -msgstr "" +msgstr "Enquadra la Selecció" #: editor/plugins/canvas_item_editor_plugin.cpp -#, fuzzy msgid "Layout" -msgstr "Desar Disposició (Layout)" +msgstr "Desar Disseny" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Insert Keys" -msgstr "" +msgstr "Insereix Claus" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Insert Key" -msgstr "" +msgstr "Insereix una clau" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Insert Key (Existing Tracks)" -msgstr "" +msgstr "Insereix una Clau (Pistes existents)" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Copy Pose" -msgstr "" +msgstr "Còpia la Postura" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Clear Pose" -msgstr "" +msgstr "Reestableix la Postura" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Drag pivot from mouse position" -msgstr "" +msgstr "Arrossega el pivot des de l la posició del ratolÃ" #: editor/plugins/canvas_item_editor_plugin.cpp -#, fuzzy msgid "Set pivot at mouse position" -msgstr "Treu Senyal" +msgstr "Estableix el pivot a la posició del ratolÃ" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Multiply grid step by 2" -msgstr "" +msgstr "Multiplica l'increment de la graella per 2" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Divide grid step by 2" -msgstr "" +msgstr "Divideix l'increment de la graella per 2" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Add %s" -msgstr "" +msgstr "Afegeix %s" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Adding %s..." -msgstr "" +msgstr "Afegint %s..." #: editor/plugins/canvas_item_editor_plugin.cpp #: editor/plugins/spatial_editor_plugin.cpp editor/scene_tree_dock.cpp msgid "Create Node" -msgstr "" +msgstr "Crea un Node" #: editor/plugins/canvas_item_editor_plugin.cpp #: editor/plugins/spatial_editor_plugin.cpp editor/scene_tree_dock.cpp msgid "Error instancing scene from %s" -msgstr "" +msgstr "Error en instanciar l'escena des de %s" #: editor/plugins/canvas_item_editor_plugin.cpp #: editor/plugins/spatial_editor_plugin.cpp editor/scene_tree_dock.cpp msgid "OK :(" -msgstr "" +msgstr "Buenu, pos molt bé, pos adiós... :(" #: editor/plugins/canvas_item_editor_plugin.cpp #: editor/plugins/spatial_editor_plugin.cpp editor/scene_tree_dock.cpp msgid "No parent to instance a child at." -msgstr "" +msgstr "No hi ha cap node Pare per instanciar-li un fill." #: editor/plugins/canvas_item_editor_plugin.cpp #: editor/plugins/spatial_editor_plugin.cpp editor/scene_tree_dock.cpp msgid "This operation requires a single selected node." -msgstr "" +msgstr "Aquesta operació requereix un únic node seleccionat." #: editor/plugins/canvas_item_editor_plugin.cpp -#, fuzzy msgid "Change default type" -msgstr "Canvia Tipus de la Matriu" +msgstr "Modifica el tipus per defecte" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "" "Drag & drop + Shift : Add node as sibling\n" "Drag & drop + Alt : Change node type" msgstr "" +"Arrossegar i deixar anar + Maj: Afegeix un node com a germà \n" +"Arrossegar i deixar anar + Maj: Canvia el tipus del node" #: editor/plugins/collision_polygon_editor_plugin.cpp msgid "Create Poly3D" -msgstr "" +msgstr "Crea un Poly3D" #: editor/plugins/collision_shape_2d_editor_plugin.cpp msgid "Set Handle" -msgstr "" +msgstr "Estableix la Nansa" #: editor/plugins/cube_grid_theme_editor_plugin.cpp msgid "Remove item %d?" -msgstr "" +msgstr "Elimina l'element %d?" #: editor/plugins/cube_grid_theme_editor_plugin.cpp #: editor/plugins/theme_editor_plugin.cpp #: editor/plugins/tile_set_editor_plugin.cpp msgid "Add Item" -msgstr "" +msgstr "Afegeix un Element" #: editor/plugins/cube_grid_theme_editor_plugin.cpp msgid "Remove Selected Item" -msgstr "" +msgstr "Elimina l'Element Seleccionat" #: editor/plugins/cube_grid_theme_editor_plugin.cpp msgid "Import from Scene" -msgstr "" +msgstr "Importa des de l'Escena" #: editor/plugins/cube_grid_theme_editor_plugin.cpp msgid "Update from Scene" -msgstr "" +msgstr "Actualitza des de l'Escena" #: editor/plugins/curve_editor_plugin.cpp msgid "Flat0" -msgstr "" +msgstr "Flat0" #: editor/plugins/curve_editor_plugin.cpp msgid "Flat1" -msgstr "" +msgstr "Flat1" #: editor/plugins/curve_editor_plugin.cpp -#, fuzzy msgid "Ease in" -msgstr "Escala la Selecció" +msgstr "Suavitza l'entrada" #: editor/plugins/curve_editor_plugin.cpp msgid "Ease out" -msgstr "" +msgstr "Suavitza la Sortida" #: editor/plugins/curve_editor_plugin.cpp msgid "Smoothstep" -msgstr "" +msgstr "pas de Suavització" #: editor/plugins/curve_editor_plugin.cpp msgid "Modify Curve Point" -msgstr "" +msgstr "Modifica el Punt de la Corba" #: editor/plugins/curve_editor_plugin.cpp msgid "Modify Curve Tangent" -msgstr "" +msgstr "Modifica la Tangent de la Corba" #: editor/plugins/curve_editor_plugin.cpp -#, fuzzy msgid "Load Curve Preset" -msgstr "Errors de Cà rrega" +msgstr "Carrega un ajustament per la Corba" #: editor/plugins/curve_editor_plugin.cpp -#, fuzzy msgid "Add point" -msgstr "Afegeix Senyal" +msgstr "Afegeix un punt" #: editor/plugins/curve_editor_plugin.cpp -#, fuzzy msgid "Remove point" -msgstr "Treu Senyal" +msgstr "Elimina el punt" #: editor/plugins/curve_editor_plugin.cpp -#, fuzzy msgid "Left linear" -msgstr "Lineal" +msgstr "Lineal esquerra" #: editor/plugins/curve_editor_plugin.cpp msgid "Right linear" -msgstr "" +msgstr "Lineal dreta" #: editor/plugins/curve_editor_plugin.cpp -#, fuzzy msgid "Load preset" -msgstr "Errors de Cà rrega" +msgstr "Carrega un ajustament" #: editor/plugins/curve_editor_plugin.cpp -#, fuzzy msgid "Remove Curve Point" -msgstr "Treu Senyal" +msgstr "Elimina un punt de la Corba" #: editor/plugins/curve_editor_plugin.cpp msgid "Toggle Curve Linear Tangent" -msgstr "" +msgstr "Tangent Lineal" #: editor/plugins/curve_editor_plugin.cpp msgid "Hold Shift to edit tangents individually" +msgstr "Prem Maj. per editar les tangents individualment" + +#: editor/plugins/gi_probe_editor_plugin.cpp +msgid "Bake GI Probe" msgstr "" #: editor/plugins/gradient_editor_plugin.cpp msgid "Add/Remove Color Ramp Point" -msgstr "" +msgstr "Afegeix/Elimina un Punt en la Rampa de Color" #: editor/plugins/gradient_editor_plugin.cpp #: editor/plugins/shader_graph_editor_plugin.cpp msgid "Modify Color Ramp" -msgstr "" +msgstr "Modifica la Rampa de Color" #: editor/plugins/item_list_editor_plugin.cpp msgid "Item %d" -msgstr "" +msgstr "Element %d" #: editor/plugins/item_list_editor_plugin.cpp msgid "Items" -msgstr "" +msgstr "Elements" #: editor/plugins/item_list_editor_plugin.cpp msgid "Item List Editor" -msgstr "" +msgstr "Editor de Llistes d'Elements" #: editor/plugins/light_occluder_2d_editor_plugin.cpp msgid "" "No OccluderPolygon2D resource on this node.\n" "Create and assign one?" msgstr "" +"No s'ha trobat cap recurs de tipus OccluderPolygon2D en aquest node.\n" +"Vol Crear i assignar-ne un ara?" #: editor/plugins/light_occluder_2d_editor_plugin.cpp msgid "Create Occluder Polygon" -msgstr "" +msgstr "Crea un PolÃgon Oclusor" + +#: editor/plugins/light_occluder_2d_editor_plugin.cpp +msgid "Create a new polygon from scratch." +msgstr "Crea un nou PolÃgon del no-res." #: editor/plugins/light_occluder_2d_editor_plugin.cpp msgid "Edit existing polygon:" -msgstr "" +msgstr "Edita un polÃgon existent:" #: editor/plugins/light_occluder_2d_editor_plugin.cpp msgid "LMB: Move Point." -msgstr "" +msgstr "Clic Esquerra: Mou un Punt." #: editor/plugins/light_occluder_2d_editor_plugin.cpp msgid "Ctrl+LMB: Split Segment." -msgstr "" +msgstr "Ctrl + Clic Esquerra: Divideix el Segment." #: editor/plugins/light_occluder_2d_editor_plugin.cpp msgid "RMB: Erase Point." -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Remove Point from Line2D" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#, fuzzy -msgid "Add Point to Line2D" -msgstr "Vés a la LÃnia" - -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Move Point in Line2D" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Select Points" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Shift+Drag: Select Control Points" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Click: Add Point" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Right Click: Delete Point" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Add Point (in empty space)" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Split Segment (in line)" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Delete Point" -msgstr "" +msgstr "Clic Dret: Eliminar un Punt." #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Mesh is empty!" -msgstr "" +msgstr "La malla és buida!" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Create Static Trimesh Body" -msgstr "" +msgstr "Crea un Cos Està tic a partir d'una malla de triangles" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Create Static Convex Body" -msgstr "" +msgstr "Crea un Cos Està tic Convex" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "This doesn't work on scene root!" -msgstr "" +msgstr "No es pot executar en una escena arrel!" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Create Trimesh Shape" -msgstr "" +msgstr "Crea un forma amb una malla de triangles" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Create Convex Shape" -msgstr "" +msgstr "Crea una Forma Convexa" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Create Navigation Mesh" -msgstr "" +msgstr "Crea un malla de Navegació" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "MeshInstance lacks a Mesh!" -msgstr "" +msgstr "MeshInstance manca d'una Malla!" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Mesh has not surface to create outlines from!" -msgstr "" +msgstr "La Malla manca d'una superfÃcie on delinear-hi els contorns!" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Could not create outline!" -msgstr "" +msgstr "No es pot crear el contorn!" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Create Outline" -msgstr "" +msgstr "Crea el Contorn" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Mesh" @@ -3816,444 +3892,467 @@ msgstr "Malla" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Create Trimesh Static Body" -msgstr "" +msgstr "Crea un Cos Està tic a partir d'una malla de triangles" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Create Convex Static Body" -msgstr "" +msgstr "Crea un Cos Està tic Convex" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Create Trimesh Collision Sibling" -msgstr "" +msgstr "Crea una Col·lisió entre malles de triangles germanes" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Create Convex Collision Sibling" -msgstr "" +msgstr "Crea col·lisions convexes entre nodes germans" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Create Outline Mesh.." -msgstr "" +msgstr "Crea una malla de contorn..." #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Create Outline Mesh" -msgstr "" +msgstr "Crea la Malla de Contorn" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Outline Size:" -msgstr "" +msgstr "Mida del Contorn:" #: editor/plugins/multimesh_editor_plugin.cpp msgid "No mesh source specified (and no MultiMesh set in node)." -msgstr "" +msgstr "Manca una malla d'origen (ni s'ha establert cap MultiMesh en el node)." #: editor/plugins/multimesh_editor_plugin.cpp msgid "No mesh source specified (and MultiMesh contains no Mesh)." -msgstr "" +msgstr "Manca una malla d'origen ( i MultiMesh no conté cap malla)." #: editor/plugins/multimesh_editor_plugin.cpp msgid "Mesh source is invalid (invalid path)." -msgstr "" +msgstr "La Malla d'origen no és và lida (camà incorrecte)." #: editor/plugins/multimesh_editor_plugin.cpp msgid "Mesh source is invalid (not a MeshInstance)." -msgstr "" +msgstr "La Malla d'origen no és và lida ( No és una MeshInstance)." #: editor/plugins/multimesh_editor_plugin.cpp msgid "Mesh source is invalid (contains no Mesh resource)." -msgstr "" +msgstr "La Malla d'origen no és và lida ( Li manca un recurs de tipus Malla)." #: editor/plugins/multimesh_editor_plugin.cpp msgid "No surface source specified." -msgstr "" +msgstr "Manca una superfÃcie d'origen." #: editor/plugins/multimesh_editor_plugin.cpp msgid "Surface source is invalid (invalid path)." -msgstr "" +msgstr "La SuperfÃcie no és và lida (camà incorrecte)." #: editor/plugins/multimesh_editor_plugin.cpp msgid "Surface source is invalid (no geometry)." -msgstr "" +msgstr "La SuperfÃcie d'origen no és và lida (li manca geometria)." #: editor/plugins/multimesh_editor_plugin.cpp msgid "Surface source is invalid (no faces)." -msgstr "" +msgstr "La SuperfÃcie d'origen no és và lida (li manquen cares)." #: editor/plugins/multimesh_editor_plugin.cpp msgid "Parent has no solid faces to populate." -msgstr "" +msgstr "el node Pare no disposa de cares sòlides per omplir." #: editor/plugins/multimesh_editor_plugin.cpp msgid "Couldn't map area." -msgstr "" +msgstr "No es pot cartografiar la zona." #: editor/plugins/multimesh_editor_plugin.cpp msgid "Select a Source Mesh:" -msgstr "" +msgstr "Selecciona una Malla d'Origen:" #: editor/plugins/multimesh_editor_plugin.cpp msgid "Select a Target Surface:" -msgstr "" +msgstr "Selecciona una SuperfÃcie Objectiu:" #: editor/plugins/multimesh_editor_plugin.cpp msgid "Populate Surface" -msgstr "" +msgstr "Omple la SuperfÃcie" #: editor/plugins/multimesh_editor_plugin.cpp msgid "Populate MultiMesh" -msgstr "" +msgstr "Omple el MultiMesh" #: editor/plugins/multimesh_editor_plugin.cpp msgid "Target Surface:" -msgstr "" +msgstr "SuperfÃcie Objectiu:" #: editor/plugins/multimesh_editor_plugin.cpp msgid "Source Mesh:" -msgstr "" +msgstr "Malla d'Origen:" #: editor/plugins/multimesh_editor_plugin.cpp msgid "X-Axis" -msgstr "" +msgstr "Eix X" #: editor/plugins/multimesh_editor_plugin.cpp msgid "Y-Axis" -msgstr "" +msgstr "Eix Y" #: editor/plugins/multimesh_editor_plugin.cpp msgid "Z-Axis" -msgstr "" +msgstr "Eix Z" #: editor/plugins/multimesh_editor_plugin.cpp msgid "Mesh Up Axis:" -msgstr "" +msgstr "Eix Vertical de la Malla:" #: editor/plugins/multimesh_editor_plugin.cpp msgid "Random Rotation:" -msgstr "" +msgstr "Rotació aleatòria:" #: editor/plugins/multimesh_editor_plugin.cpp msgid "Random Tilt:" -msgstr "" +msgstr "Inclinació aleatòria:" #: editor/plugins/multimesh_editor_plugin.cpp msgid "Random Scale:" -msgstr "" +msgstr "Escala aleatòria:" #: editor/plugins/multimesh_editor_plugin.cpp msgid "Populate" -msgstr "" +msgstr "Omple" #: editor/plugins/navigation_mesh_editor_plugin.cpp msgid "Bake!" -msgstr "" +msgstr "Calcula!" #: editor/plugins/navigation_mesh_editor_plugin.cpp msgid "Bake the navigation mesh.\n" -msgstr "" +msgstr "Cou la malla de navegació.\n" #: editor/plugins/navigation_mesh_editor_plugin.cpp msgid "Clear the navigation mesh." -msgstr "" +msgstr "Reestableix la malla de navegació." #: editor/plugins/navigation_mesh_generator.cpp msgid "Setting up Configuration..." -msgstr "" +msgstr "Establint la Configuració..." #: editor/plugins/navigation_mesh_generator.cpp msgid "Calculating grid size..." -msgstr "" +msgstr "Calculant la mida de la graella..." #: editor/plugins/navigation_mesh_generator.cpp msgid "Creating heightfield..." -msgstr "" +msgstr "Creant un camp de desplaçaments verticals..." #: editor/plugins/navigation_mesh_generator.cpp -#, fuzzy msgid "Marking walkable triangles..." -msgstr "Cadenes Traduïbles..." +msgstr "Marcant els triangles transitables..." #: editor/plugins/navigation_mesh_generator.cpp msgid "Constructing compact heightfield..." -msgstr "" +msgstr "Construcció d'un camp compacte de desplaçaments verticals..." #: editor/plugins/navigation_mesh_generator.cpp msgid "Eroding walkable area..." -msgstr "" +msgstr "Erosionant l'à rea transitable..." #: editor/plugins/navigation_mesh_generator.cpp msgid "Partitioning..." -msgstr "" +msgstr "Establint Particions..." #: editor/plugins/navigation_mesh_generator.cpp msgid "Creating contours..." -msgstr "" +msgstr "Creant els contorns..." #: editor/plugins/navigation_mesh_generator.cpp msgid "Creating polymesh..." -msgstr "" +msgstr "creant la polyMesh..." #: editor/plugins/navigation_mesh_generator.cpp msgid "Converting to native navigation mesh..." -msgstr "" +msgstr "Convertint-ho en una malla de navegació nativa..." #: editor/plugins/navigation_mesh_generator.cpp msgid "Navigation Mesh Generator Setup:" -msgstr "" +msgstr "Configuració del Generador de Malles de Navegació:" #: editor/plugins/navigation_mesh_generator.cpp msgid "Parsing Geometry..." -msgstr "" +msgstr "Analitzant la Geometria..." #: editor/plugins/navigation_mesh_generator.cpp msgid "Done!" -msgstr "" +msgstr "Fet!" #: editor/plugins/navigation_polygon_editor_plugin.cpp msgid "Create Navigation Polygon" -msgstr "" +msgstr "Crea un PolÃgon de Navegació" #: editor/plugins/particles_2d_editor_plugin.cpp msgid "Clear Emission Mask" -msgstr "" +msgstr "Esborra la Mà scara d'Emissió" #: editor/plugins/particles_2d_editor_plugin.cpp #: editor/plugins/particles_editor_plugin.cpp msgid "Generating AABB" -msgstr "" +msgstr "Generant AABB" #: editor/plugins/particles_2d_editor_plugin.cpp msgid "Can only set point into a ParticlesMaterial process material" -msgstr "" +msgstr "Només es poden establir punts en materials de procés ParticlesMaterial" #: editor/plugins/particles_2d_editor_plugin.cpp msgid "Error loading image:" -msgstr "" +msgstr "Error en carregar la imatge:" #: editor/plugins/particles_2d_editor_plugin.cpp msgid "No pixels with transparency > 128 in image.." -msgstr "" +msgstr "Cap pÃxel amb transparència > 128 en la imatge..." #: editor/plugins/particles_2d_editor_plugin.cpp msgid "Set Emission Mask" -msgstr "" +msgstr "Estableix la Mà scara d'Emissió" #: editor/plugins/particles_2d_editor_plugin.cpp msgid "Generate Visibility Rect" -msgstr "" +msgstr "Genera un Rectangle de Visibilitat" #: editor/plugins/particles_2d_editor_plugin.cpp msgid "Load Emission Mask" -msgstr "" +msgstr "Carrega una Mà scara d'Emissió" #: editor/plugins/particles_2d_editor_plugin.cpp #: editor/plugins/particles_editor_plugin.cpp msgid "Particles" -msgstr "" +msgstr "PartÃcules" #: editor/plugins/particles_2d_editor_plugin.cpp msgid "Generated Point Count:" -msgstr "" +msgstr "Recompte de punts generats:" #: editor/plugins/particles_2d_editor_plugin.cpp #: editor/plugins/particles_editor_plugin.cpp -#, fuzzy msgid "Generation Time (sec):" -msgstr "Temps Mitjà (s)" +msgstr "Temps de generació (s):" #: editor/plugins/particles_2d_editor_plugin.cpp msgid "Emission Mask" -msgstr "" +msgstr "Mà scara d'Emissió" #: editor/plugins/particles_2d_editor_plugin.cpp msgid "Capture from Pixel" -msgstr "" +msgstr "Captura des d'un PÃxel" #: editor/plugins/particles_2d_editor_plugin.cpp msgid "Emission Colors" -msgstr "" +msgstr "Colors d'Emissió" #: editor/plugins/particles_editor_plugin.cpp msgid "Node does not contain geometry." -msgstr "" +msgstr "El Node no conté cap geometria." #: editor/plugins/particles_editor_plugin.cpp msgid "Node does not contain geometry (faces)." -msgstr "" +msgstr "El Node no conté cap geometria (cares)." #: editor/plugins/particles_editor_plugin.cpp msgid "A processor material of type 'ParticlesMaterial' is required." -msgstr "" +msgstr "Un material processador de tipus 'ParticlesMaterial' és obligatori." #: editor/plugins/particles_editor_plugin.cpp msgid "Faces contain no area!" -msgstr "" +msgstr "Les Cares no tenen à rea!" #: editor/plugins/particles_editor_plugin.cpp msgid "No faces!" -msgstr "" +msgstr "Cap Cara!" #: editor/plugins/particles_editor_plugin.cpp msgid "Generate AABB" -msgstr "" +msgstr "Genera AABB" #: editor/plugins/particles_editor_plugin.cpp msgid "Create Emission Points From Mesh" -msgstr "" +msgstr "Crea Punts d'Emissió des d'una Malla" #: editor/plugins/particles_editor_plugin.cpp msgid "Create Emission Points From Node" -msgstr "" +msgstr "Crea Punts d'Emissió des d'un Node" #: editor/plugins/particles_editor_plugin.cpp msgid "Clear Emitter" -msgstr "" +msgstr "Esborra l'Emissor" #: editor/plugins/particles_editor_plugin.cpp msgid "Create Emitter" -msgstr "" +msgstr "Crea un Emissor" #: editor/plugins/particles_editor_plugin.cpp msgid "Emission Points:" -msgstr "" +msgstr "Punts d'Emissió:" #: editor/plugins/particles_editor_plugin.cpp -#, fuzzy msgid "Surface Points" -msgstr "SuperfÃcie %d" +msgstr "Punts de la SuperfÃcie" #: editor/plugins/particles_editor_plugin.cpp msgid "Surface Points+Normal (Directed)" -msgstr "" +msgstr "Punts + Normal (Dirigida)" #: editor/plugins/particles_editor_plugin.cpp msgid "Volume" -msgstr "" +msgstr "Volum" #: editor/plugins/particles_editor_plugin.cpp msgid "Emission Source: " -msgstr "" +msgstr "Font d'Emissió: " #: editor/plugins/particles_editor_plugin.cpp msgid "Generate Visibility AABB" -msgstr "" +msgstr "Genera un AABB de Visibilitat" #: editor/plugins/path_2d_editor_plugin.cpp msgid "Remove Point from Curve" -msgstr "" +msgstr "Elimina un Punt de la Corba" #: editor/plugins/path_2d_editor_plugin.cpp msgid "Remove Out-Control from Curve" -msgstr "" +msgstr "Elimina Out-Control de la Corba" #: editor/plugins/path_2d_editor_plugin.cpp msgid "Remove In-Control from Curve" -msgstr "" +msgstr "Elimina In-Control de la Corba" #: editor/plugins/path_2d_editor_plugin.cpp #: editor/plugins/path_editor_plugin.cpp msgid "Add Point to Curve" -msgstr "" +msgstr "Afegeix un Punt a la Corba" #: editor/plugins/path_2d_editor_plugin.cpp msgid "Move Point in Curve" -msgstr "" +msgstr "Mou un Punt de la Corba" #: editor/plugins/path_2d_editor_plugin.cpp msgid "Move In-Control in Curve" -msgstr "" +msgstr "Mou In-Control de la Corba" #: editor/plugins/path_2d_editor_plugin.cpp msgid "Move Out-Control in Curve" -msgstr "" +msgstr "Mou Out-Control de la Corba" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Select Points" +msgstr "Selecciona Punts" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Shift+Drag: Select Control Points" +msgstr "Maj.+ Arrossegar: Selecciona Punts de Control" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Click: Add Point" +msgstr "Clic: Afegeix un Punt" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Right Click: Delete Point" +msgstr "Clic Dret: Elimina el Punt" #: editor/plugins/path_2d_editor_plugin.cpp msgid "Select Control Points (Shift+Drag)" -msgstr "" +msgstr "Selecciona Punts de Control (Maj.+Arrossegar)" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Add Point (in empty space)" +msgstr "Afegeix un Punt (en l'espai buit)" #: editor/plugins/path_2d_editor_plugin.cpp #: editor/plugins/path_editor_plugin.cpp msgid "Split Segment (in curve)" -msgstr "" +msgstr "Parteix el Segment (de la Corba)" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Delete Point" +msgstr "Elimina el Punt" #: editor/plugins/path_2d_editor_plugin.cpp #: editor/plugins/path_editor_plugin.cpp msgid "Close Curve" -msgstr "" +msgstr "Tanca la Corba" #: editor/plugins/path_editor_plugin.cpp msgid "Curve Point #" -msgstr "" +msgstr "Punt num. # de la Corba" #: editor/plugins/path_editor_plugin.cpp -#, fuzzy msgid "Set Curve Point Position" -msgstr "Treu Senyal" +msgstr "Estableix la Posició del Punt de la Corba" #: editor/plugins/path_editor_plugin.cpp -#, fuzzy msgid "Set Curve In Position" -msgstr "Treu Senyal" +msgstr "Estableix la Posició d'Entrada de la Corba" #: editor/plugins/path_editor_plugin.cpp -#, fuzzy msgid "Set Curve Out Position" -msgstr "Treu Senyal" +msgstr "Estableix la Posició de Sortida de la Corba" #: editor/plugins/path_editor_plugin.cpp msgid "Split Path" -msgstr "" +msgstr "Parteix el CamÃ" #: editor/plugins/path_editor_plugin.cpp msgid "Remove Path Point" -msgstr "" +msgstr "Elimina un Punt del CamÃ" #: editor/plugins/path_editor_plugin.cpp -#, fuzzy msgid "Remove Out-Control Point" -msgstr "Treure Autocà rrega" +msgstr "Elimina el Punt Out-Control" #: editor/plugins/path_editor_plugin.cpp msgid "Remove In-Control Point" -msgstr "" +msgstr "Elimina el Punt In-Control" #: editor/plugins/polygon_2d_editor_plugin.cpp msgid "Create UV Map" -msgstr "" +msgstr "Crea un Mapa UV" #: editor/plugins/polygon_2d_editor_plugin.cpp msgid "Transform UV Map" -msgstr "" +msgstr "Transforma el Mapa UV" #: editor/plugins/polygon_2d_editor_plugin.cpp msgid "Polygon 2D UV Editor" -msgstr "" +msgstr "Editor d'UVs de PolÃgons 2D" #: editor/plugins/polygon_2d_editor_plugin.cpp msgid "Move Point" -msgstr "" +msgstr "Mou el Punt" #: editor/plugins/polygon_2d_editor_plugin.cpp msgid "Ctrl: Rotate" -msgstr "" +msgstr "Ctrl: Gira" #: editor/plugins/polygon_2d_editor_plugin.cpp msgid "Shift: Move All" -msgstr "" +msgstr "Maj.: Mou'ho tot" #: editor/plugins/polygon_2d_editor_plugin.cpp msgid "Shift+Ctrl: Scale" -msgstr "" +msgstr "Maj.+Ctrl: Escala" #: editor/plugins/polygon_2d_editor_plugin.cpp msgid "Move Polygon" -msgstr "" +msgstr "Mou el PolÃgon" #: editor/plugins/polygon_2d_editor_plugin.cpp msgid "Rotate Polygon" -msgstr "" +msgstr "Gira el PolÃgon" #: editor/plugins/polygon_2d_editor_plugin.cpp msgid "Scale Polygon" -msgstr "" +msgstr "Escala el PolÃgon" #: editor/plugins/polygon_2d_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp @@ -4265,58 +4364,57 @@ msgstr "Edita" #: editor/plugins/polygon_2d_editor_plugin.cpp msgid "Polygon->UV" -msgstr "" +msgstr "PolÃgon -> UV" #: editor/plugins/polygon_2d_editor_plugin.cpp msgid "UV->Polygon" -msgstr "" +msgstr "UV->PolÃgon" #: editor/plugins/polygon_2d_editor_plugin.cpp msgid "Clear UV" -msgstr "" +msgstr "Esborra UVs" #: editor/plugins/polygon_2d_editor_plugin.cpp #: editor/plugins/spatial_editor_plugin.cpp msgid "Snap" -msgstr "" +msgstr "Alinea" #: editor/plugins/polygon_2d_editor_plugin.cpp msgid "Enable Snap" -msgstr "" +msgstr "Activa l'Alineament" #: editor/plugins/polygon_2d_editor_plugin.cpp msgid "Grid" -msgstr "" +msgstr "Graella" #: editor/plugins/resource_preloader_editor_plugin.cpp msgid "ERROR: Couldn't load resource!" -msgstr "" +msgstr "Error: no es pot carregar el recurs!" #: editor/plugins/resource_preloader_editor_plugin.cpp msgid "Add Resource" -msgstr "" +msgstr "Afegeix un Recurs" #: editor/plugins/resource_preloader_editor_plugin.cpp msgid "Rename Resource" -msgstr "" +msgstr "Reanomena el Recurs" #: editor/plugins/resource_preloader_editor_plugin.cpp #: editor/plugins/sprite_frames_editor_plugin.cpp msgid "Delete Resource" -msgstr "" +msgstr "Elimina el Recurs" #: editor/plugins/resource_preloader_editor_plugin.cpp msgid "Resource clipboard is empty!" -msgstr "" +msgstr "El porta-retalls de Recursos és buit!" #: editor/plugins/resource_preloader_editor_plugin.cpp #: editor/plugins/sprite_frames_editor_plugin.cpp msgid "Load Resource" -msgstr "" +msgstr "Carrega un Recurs" #: editor/plugins/resource_preloader_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp #: editor/plugins/sprite_frames_editor_plugin.cpp editor/property_editor.cpp #: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Paste" @@ -4324,197 +4422,217 @@ msgstr "Enganxa" #: editor/plugins/script_editor_plugin.cpp msgid "Clear Recent Files" -msgstr "" +msgstr "Esborra la llista de Fitxers recents" #: editor/plugins/script_editor_plugin.cpp msgid "" "Close and save changes?\n" "\"" msgstr "" +"Tancar i desar els canvis?\n" +"\"" #: editor/plugins/script_editor_plugin.cpp msgid "Error while saving theme" -msgstr "" +msgstr "Error en desar el tema" #: editor/plugins/script_editor_plugin.cpp msgid "Error saving" -msgstr "" +msgstr "Error en desar" #: editor/plugins/script_editor_plugin.cpp msgid "Error importing theme" -msgstr "" +msgstr "Error en importar el tema" #: editor/plugins/script_editor_plugin.cpp msgid "Error importing" -msgstr "" +msgstr "Error en importar" #: editor/plugins/script_editor_plugin.cpp msgid "Import Theme" -msgstr "" +msgstr "Importa un Tema" #: editor/plugins/script_editor_plugin.cpp msgid "Save Theme As.." -msgstr "" +msgstr "Desa el Tema com a..." #: editor/plugins/script_editor_plugin.cpp msgid " Class Reference" +msgstr " Referència de Classe" + +#: editor/plugins/script_editor_plugin.cpp +#, fuzzy +msgid "Sort" +msgstr "Ordena:" + +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp +msgid "Move Up" msgstr "" #: editor/plugins/script_editor_plugin.cpp -msgid "Next script" +#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp +msgid "Move Down" msgstr "" #: editor/plugins/script_editor_plugin.cpp +msgid "Next script" +msgstr "Script Següent" + +#: editor/plugins/script_editor_plugin.cpp msgid "Previous script" -msgstr "" +msgstr "Script Anterior" #: editor/plugins/script_editor_plugin.cpp msgid "File" -msgstr "" +msgstr "Fitxer" #: editor/plugins/script_editor_plugin.cpp editor/property_editor.cpp msgid "New" -msgstr "" +msgstr "Nou" #: editor/plugins/script_editor_plugin.cpp msgid "Save All" -msgstr "" +msgstr "Desa-ho Tot" #: editor/plugins/script_editor_plugin.cpp msgid "Soft Reload Script" -msgstr "" +msgstr "Recarrega parcialment el Script" #: editor/plugins/script_editor_plugin.cpp msgid "History Prev" -msgstr "" +msgstr "Anterior en l'Historial" #: editor/plugins/script_editor_plugin.cpp msgid "History Next" -msgstr "" +msgstr "Següent en l'Historial" #: editor/plugins/script_editor_plugin.cpp msgid "Reload Theme" -msgstr "" +msgstr "Recarrega el Tema" #: editor/plugins/script_editor_plugin.cpp msgid "Save Theme" -msgstr "" +msgstr "Desa el Tema" #: editor/plugins/script_editor_plugin.cpp msgid "Save Theme As" -msgstr "" +msgstr "Anomena i Desa el Tema" #: editor/plugins/script_editor_plugin.cpp msgid "Close Docs" -msgstr "" +msgstr "Tanca la Documentació" #: editor/plugins/script_editor_plugin.cpp -#, fuzzy msgid "Close All" -msgstr "Tanca" +msgstr "Tanca-ho Tot" + +#: editor/plugins/script_editor_plugin.cpp +msgid "Close Other Tabs" +msgstr "" #: editor/plugins/script_editor_plugin.cpp editor/project_manager.cpp msgid "Run" -msgstr "" +msgstr "Executa" #: editor/plugins/script_editor_plugin.cpp -#, fuzzy msgid "Toggle Scripts Panel" -msgstr "Commuta Favorit" +msgstr "Panell de Scripts" #: editor/plugins/script_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Find.." -msgstr "" +msgstr "Cerca..." #: editor/plugins/script_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Find Next" -msgstr "" +msgstr "Cerca el Següent" #: editor/plugins/script_editor_plugin.cpp editor/script_editor_debugger.cpp +#, fuzzy msgid "Step Over" -msgstr "" +msgstr "Sobrepassa-ho" #: editor/plugins/script_editor_plugin.cpp editor/script_editor_debugger.cpp msgid "Step Into" -msgstr "" +msgstr "Pas endins" #: editor/plugins/script_editor_plugin.cpp editor/script_editor_debugger.cpp msgid "Break" -msgstr "" +msgstr "Atura" #: editor/plugins/script_editor_plugin.cpp editor/project_manager.cpp #: editor/script_editor_debugger.cpp msgid "Continue" -msgstr "" +msgstr "Continua" #: editor/plugins/script_editor_plugin.cpp msgid "Keep Debugger Open" -msgstr "" +msgstr "Manté el Depurador Obert" #: editor/plugins/script_editor_plugin.cpp -#, fuzzy msgid "Debug with external editor" -msgstr "Editor de Dependències" +msgstr "Depura amb un editor extern" #: editor/plugins/script_editor_plugin.cpp msgid "Open Godot online documentation" -msgstr "" +msgstr "Obre la Documentació en lÃnia" #: editor/plugins/script_editor_plugin.cpp msgid "Search the class hierarchy." -msgstr "" +msgstr "Cerca dins la jerarquia de classes." #: editor/plugins/script_editor_plugin.cpp msgid "Search the reference documentation." -msgstr "" +msgstr "Cerca dins la documentació de referència." #: editor/plugins/script_editor_plugin.cpp msgid "Go to previous edited document." -msgstr "" +msgstr "Vés a l'anterior document editat." #: editor/plugins/script_editor_plugin.cpp msgid "Go to next edited document." -msgstr "" +msgstr "Vés al següent document editat." #: editor/plugins/script_editor_plugin.cpp -#, fuzzy msgid "Discard" -msgstr "Discret" +msgstr "Descarta'l" #: editor/plugins/script_editor_plugin.cpp msgid "Create Script" -msgstr "" +msgstr "Crea un Script" #: editor/plugins/script_editor_plugin.cpp msgid "" "The following files are newer on disk.\n" "What action should be taken?:" msgstr "" +"El disc conté versions més recents dels fitxer següents. \n" +"Quina acció s'ha de seguir?:" #: editor/plugins/script_editor_plugin.cpp msgid "Reload" -msgstr "" +msgstr "Tornar a Carregar" #: editor/plugins/script_editor_plugin.cpp msgid "Resave" -msgstr "" +msgstr "Torna a Desar" #: editor/plugins/script_editor_plugin.cpp editor/script_editor_debugger.cpp msgid "Debugger" -msgstr "" +msgstr "Depurador" #: editor/plugins/script_editor_plugin.cpp msgid "" "Built-in scripts can only be edited when the scene they belong to is loaded" msgstr "" +"Només es poden editar els Scripts Integrats amb la seva escena associada " +"carregada." #: editor/plugins/script_text_editor.cpp msgid "Only resources from filesystem can be dropped." -msgstr "" +msgstr "Només es poden dipositar Recursos del sistema de fitxers" #: editor/plugins/script_text_editor.cpp msgid "Pick Color" @@ -4537,33 +4655,22 @@ msgstr "" msgid "Capitalize" msgstr "" -#: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp scene/gui/line_edit.cpp +#: editor/plugins/script_text_editor.cpp scene/gui/line_edit.cpp #: scene/gui/text_edit.cpp msgid "Cut" msgstr "Talla" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp #: editor/plugins/sprite_frames_editor_plugin.cpp editor/property_editor.cpp #: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Copy" msgstr "Copia" -#: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp scene/gui/line_edit.cpp +#: editor/plugins/script_text_editor.cpp scene/gui/line_edit.cpp #: scene/gui/text_edit.cpp msgid "Select All" msgstr "Selecciona-ho Tot" -#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp -msgid "Move Up" -msgstr "" - -#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp -msgid "Move Down" -msgstr "" - #: editor/plugins/script_text_editor.cpp #, fuzzy msgid "Delete Line" @@ -4586,6 +4693,23 @@ msgid "Clone Down" msgstr "" #: editor/plugins/script_text_editor.cpp +#, fuzzy +msgid "Fold Line" +msgstr "Vés a la LÃnia" + +#: editor/plugins/script_text_editor.cpp +msgid "Unfold Line" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Fold All Lines" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Unfold All Lines" +msgstr "" + +#: editor/plugins/script_text_editor.cpp msgid "Complete Symbol" msgstr "" @@ -4633,12 +4757,10 @@ msgid "Convert To Lowercase" msgstr "Converteix a..." #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Find Previous" msgstr "" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Replace.." msgstr "" @@ -4647,7 +4769,6 @@ msgid "Goto Function.." msgstr "" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Goto Line.." msgstr "" @@ -4812,6 +4933,16 @@ msgid "View Plane Transform." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Scaling: " +msgstr "Escala:" + +#: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Translating: " +msgstr "Translació Alineada:" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Rotating %s degrees." msgstr "" @@ -4895,6 +5026,10 @@ msgid "Vertices" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "FPS" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Align with view" msgstr "" @@ -4927,6 +5062,16 @@ msgid "View Information" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "View FPS" +msgstr "Veure Fitxers" + +#: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Half Resolution" +msgstr "Escala la Selecció" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Audio Listener" msgstr "" @@ -5051,7 +5196,7 @@ msgstr "Tota la Selecció" #: editor/plugins/spatial_editor_plugin.cpp #, fuzzy msgid "Tool Move" -msgstr "Mou" +msgstr "Moure" #: editor/plugins/spatial_editor_plugin.cpp msgid "Tool Rotate" @@ -5062,12 +5207,17 @@ msgid "Tool Scale" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Toggle Freelook" +msgstr "Mode Pantalla Completa" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Transform" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp msgid "Configure Snap.." -msgstr "" +msgstr "Configura l'Alineament..." #: editor/plugins/spatial_editor_plugin.cpp msgid "Local Coords" @@ -5116,19 +5266,19 @@ msgstr "Configuració" #: editor/plugins/spatial_editor_plugin.cpp msgid "Snap Settings" -msgstr "Configuració de Desplaçament" +msgstr "Configuració de l'Alineament" #: editor/plugins/spatial_editor_plugin.cpp msgid "Translate Snap:" -msgstr "" +msgstr "Translació Alineada:" #: editor/plugins/spatial_editor_plugin.cpp msgid "Rotate Snap (deg.):" -msgstr "" +msgstr "Rotació Alineada (graus):" #: editor/plugins/spatial_editor_plugin.cpp msgid "Scale Snap (%):" -msgstr "" +msgstr "Escala Alineada (%):" #: editor/plugins/spatial_editor_plugin.cpp msgid "Viewport Settings" @@ -5249,7 +5399,7 @@ msgstr "" #: editor/plugins/texture_region_editor_plugin.cpp msgid "Snap Mode:" -msgstr "" +msgstr "Mode Imant:" #: editor/plugins/texture_region_editor_plugin.cpp msgid "<None>" @@ -5257,11 +5407,11 @@ msgstr "" #: editor/plugins/texture_region_editor_plugin.cpp msgid "Pixel Snap" -msgstr "" +msgstr "Alinea-ho amb els Pixels" #: editor/plugins/texture_region_editor_plugin.cpp msgid "Grid Snap" -msgstr "" +msgstr "Alinea-ho a la graella" #: editor/plugins/texture_region_editor_plugin.cpp msgid "Auto Slice" @@ -5307,12 +5457,12 @@ msgstr "" #: editor/plugins/theme_editor_plugin.cpp #, fuzzy msgid "Remove All Items" -msgstr "Treu la Selecció" +msgstr "Treure la Selecció" #: editor/plugins/theme_editor_plugin.cpp #, fuzzy msgid "Remove All" -msgstr "Treu" +msgstr "Treure" #: editor/plugins/theme_editor_plugin.cpp msgid "Edit theme.." @@ -5339,6 +5489,10 @@ msgid "Create Empty Editor Template" msgstr "" #: editor/plugins/theme_editor_plugin.cpp +msgid "Create From Current Editor Theme" +msgstr "" + +#: editor/plugins/theme_editor_plugin.cpp msgid "CheckBox Radio1" msgstr "" @@ -5414,7 +5568,7 @@ msgstr "" #: editor/plugins/tile_map_editor_plugin.cpp #, fuzzy msgid "Erase Selection" -msgstr "Escala la Selecció" +msgstr "Escalar la Selecció" #: editor/plugins/tile_map_editor_plugin.cpp msgid "Paint TileMap" @@ -5516,8 +5670,8 @@ msgstr "Activa" #: editor/project_export.cpp #, fuzzy -msgid "Delete patch '" -msgstr "Elimina Disposició (Layout)" +msgid "Delete patch '%s' from list?" +msgstr "Elimina Pedaç '" #: editor/project_export.cpp #, fuzzy @@ -5779,7 +5933,7 @@ msgstr "" #: editor/project_manager.cpp #, fuzzy msgid "Templates" -msgstr "Treu la Selecció" +msgstr "Treure la Selecció" #: editor/project_manager.cpp msgid "Exit" @@ -5827,10 +5981,6 @@ msgid "Add Input Action Event" msgstr "" #: editor/project_settings_editor.cpp editor/settings_config_dialog.cpp -msgid "Meta+" -msgstr "Meta +" - -#: editor/project_settings_editor.cpp editor/settings_config_dialog.cpp msgid "Shift+" msgstr "Maj +" @@ -5889,11 +6039,11 @@ msgstr "" #: editor/project_settings_editor.cpp #: modules/visual_script/visual_script_editor.cpp msgid "Change" -msgstr "Canvia" +msgstr "Modifica" #: editor/project_settings_editor.cpp msgid "Joypad Axis Index:" -msgstr "" +msgstr "Ãndex de l'eix de la maneta:" #: editor/project_settings_editor.cpp msgid "Axis" @@ -5901,11 +6051,11 @@ msgstr "Eix" #: editor/project_settings_editor.cpp msgid "Joypad Button Index:" -msgstr "" +msgstr "Ãndex del Botó de la Maneta:" #: editor/project_settings_editor.cpp msgid "Add Input Action" -msgstr "" +msgstr "Afegeix una Acció d'Entrada" #: editor/project_settings_editor.cpp msgid "Erase Input Action Event" @@ -5946,20 +6096,19 @@ msgstr "Roda Avall." #: editor/project_settings_editor.cpp #, fuzzy msgid "Add Global Property" -msgstr "Afegeix Propietat d'Accés (Getter)" +msgstr "Afegir Propietat d'Accés (Getter)" #: editor/project_settings_editor.cpp msgid "Select a setting item first!" msgstr "" #: editor/project_settings_editor.cpp -msgid "No property '" +msgid "No property '%s' exists." msgstr "" #: editor/project_settings_editor.cpp -#, fuzzy -msgid "Setting '" -msgstr "Configuració" +msgid "Setting '%s' is internal, and it can't be deleted." +msgstr "" #: editor/project_settings_editor.cpp #, fuzzy @@ -6016,9 +6165,8 @@ msgid "Remove Resource Remap Option" msgstr "" #: editor/project_settings_editor.cpp -#, fuzzy msgid "Changed Locale Filter" -msgstr "Canvia Tipus de la Matriu" +msgstr "S'ha Modificat el Filtre de Locale" #: editor/project_settings_editor.cpp msgid "Changed Locale Filter Mode" @@ -6158,112 +6306,104 @@ msgid "New Script" msgstr "Executa Script" #: editor/property_editor.cpp -#, fuzzy msgid "Make Unique" -msgstr "Crea SubRecurs Únic" +msgstr "Fes-lo Únic" #: editor/property_editor.cpp -#, fuzzy msgid "Show in File System" -msgstr "SistemaDeFitxers" +msgstr "Mostra'l en el Sistema de Fitxers" #: editor/property_editor.cpp -#, fuzzy msgid "Convert To %s" -msgstr "Converteix a..." +msgstr "Converteix a %s" #: editor/property_editor.cpp msgid "Error loading file: Not a resource!" -msgstr "" +msgstr "S'ha produït un error en llegir el fitxer: No és un recurs!" #: editor/property_editor.cpp -#, fuzzy msgid "Selected node is not a Viewport!" -msgstr "Selecciona Node(s) per Importar" +msgstr "El Node seleccionat no és una Vista!" #: editor/property_editor.cpp -#, fuzzy msgid "Pick a Node" -msgstr "Camà al Node:" +msgstr "Escull un Node" #: editor/property_editor.cpp msgid "Bit %d, val %d." -msgstr "" +msgstr "Bit %d, valor %d." #: editor/property_editor.cpp msgid "On" -msgstr "" +msgstr "Activat" #: editor/property_editor.cpp modules/visual_script/visual_script_editor.cpp msgid "Set" -msgstr "Especifica" +msgstr "Estableix" #: editor/property_editor.cpp msgid "Properties:" -msgstr "" +msgstr "Propietats:" #: editor/property_editor.cpp msgid "Sections:" -msgstr "" +msgstr "Seccions:" #: editor/property_selector.cpp -#, fuzzy msgid "Select Property" -msgstr "Afegeix Col.locador de Proprietat (Setter)" +msgstr "Selecciona una Propietat" #: editor/property_selector.cpp -#, fuzzy msgid "Select Virtual Method" -msgstr "Mètodes públics:" +msgstr "Selecciona un Mètode Virtual" #: editor/property_selector.cpp -#, fuzzy msgid "Select Method" -msgstr "Mètodes públics:" +msgstr "Selecciona un Mètode" #: editor/pvrtc_compress.cpp msgid "Could not execute PVRTC tool:" -msgstr "" +msgstr "No s'ha pogut executar l'eina PVRTC:" #: editor/pvrtc_compress.cpp msgid "Can't load back converted image using PVRTC tool:" -msgstr "" +msgstr "No s'ha pogut recarregar la imatge convertida mitjançant l'eina PVRTC:" #: editor/reparent_dialog.cpp editor/scene_tree_dock.cpp msgid "Reparent Node" -msgstr "" +msgstr "Torna a Parentar el Node" #: editor/reparent_dialog.cpp msgid "Reparent Location (Select new Parent):" -msgstr "" +msgstr "Reemparentar l'Ubicació (Selecciona un nou Pare):" #: editor/reparent_dialog.cpp msgid "Keep Global Transform" -msgstr "" +msgstr "Manté la Transformació Global" #: editor/reparent_dialog.cpp editor/scene_tree_dock.cpp msgid "Reparent" -msgstr "" +msgstr "Canvia el Parentatge" #: editor/run_settings_dialog.cpp msgid "Run Mode:" -msgstr "" +msgstr "Mode d'Execució:" #: editor/run_settings_dialog.cpp msgid "Current Scene" -msgstr "" +msgstr "Escena Actual" #: editor/run_settings_dialog.cpp msgid "Main Scene" -msgstr "" +msgstr "Escena Principal" #: editor/run_settings_dialog.cpp msgid "Main Scene Arguments:" -msgstr "" +msgstr "Arguments de l'Escena Principal:" #: editor/run_settings_dialog.cpp msgid "Scene Run Settings" -msgstr "Configuració d'Execució d'Escenes" +msgstr "Configuració de l'Execució de l'Escena" #: editor/scene_tree_dock.cpp editor/script_create_dialog.cpp #: scene/gui/dialogs.cpp @@ -6294,7 +6434,7 @@ msgstr "" #: editor/scene_tree_dock.cpp msgid "This operation can't be done on the tree root." -msgstr "" +msgstr "Aquesta operació no es pot executar en l'arrel de l'arbre." #: editor/scene_tree_dock.cpp msgid "Move Node In Parent" @@ -6314,7 +6454,7 @@ msgstr "" #: editor/scene_tree_dock.cpp msgid "Can not perform with the root node." -msgstr "" +msgstr "No es pot executar en el node arrel." #: editor/scene_tree_dock.cpp msgid "This operation can't be done on instanced scenes." @@ -6431,6 +6571,8 @@ msgid "" "Instance a scene file as a Node. Creates an inherited scene if no root node " "exists." msgstr "" +"Instancia l'escena com a Node. Crea una escena heretada si no existÃs un " +"node arrel." #: editor/scene_tree_dock.cpp #, fuzzy @@ -6446,6 +6588,15 @@ msgid "Clear a script for the selected node." msgstr "" #: editor/scene_tree_dock.cpp +#, fuzzy +msgid "Remote" +msgstr "Treure" + +#: editor/scene_tree_dock.cpp +msgid "Local" +msgstr "" + +#: editor/scene_tree_dock.cpp msgid "Clear Inheritance? (No Undo!)" msgstr "" @@ -6603,9 +6754,8 @@ msgid "Built-in script (into scene file)" msgstr "" #: editor/script_create_dialog.cpp -#, fuzzy msgid "Create new script file" -msgstr "Crea Subscripció" +msgstr "Crea un nou script" #: editor/script_create_dialog.cpp #, fuzzy @@ -6629,7 +6779,7 @@ msgstr "Classe:" #: editor/script_create_dialog.cpp #, fuzzy msgid "Template" -msgstr "Treu la Selecció" +msgstr "Treure la Selecció" #: editor/script_create_dialog.cpp #, fuzzy @@ -6642,6 +6792,11 @@ msgid "Attach Node Script" msgstr "Executa Script" #: editor/script_editor_debugger.cpp +#, fuzzy +msgid "Remote " +msgstr "Treure" + +#: editor/script_editor_debugger.cpp msgid "Bytes:" msgstr "" @@ -6698,18 +6853,6 @@ msgid "Stack Trace (if applicable):" msgstr "" #: editor/script_editor_debugger.cpp -msgid "Remote Inspector" -msgstr "" - -#: editor/script_editor_debugger.cpp -msgid "Live Scene Tree:" -msgstr "" - -#: editor/script_editor_debugger.cpp -msgid "Remote Object Properties: " -msgstr "" - -#: editor/script_editor_debugger.cpp msgid "Profiler" msgstr "" @@ -6767,7 +6910,7 @@ msgstr "" #: editor/script_editor_debugger.cpp msgid "Live Edit Root:" -msgstr "" +msgstr "Arrel per l'Edició en directe:" #: editor/script_editor_debugger.cpp msgid "Set From Tree" @@ -6843,53 +6986,53 @@ msgstr "" msgid "GDNative" msgstr "" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp #: modules/visual_script/visual_script_builtin_funcs.cpp msgid "Invalid type argument to convert(), use TYPE_* constants." msgstr "Argument de tipus invà lid per a convert(), utilitzi constants TYPE_*." -#: modules/gdscript/gd_functions.cpp modules/mono/glue/glue_header.h +#: modules/gdscript/gdscript_functions.cpp modules/mono/glue/glue_header.h #: modules/visual_script/visual_script_builtin_funcs.cpp msgid "Not enough bytes for decoding bytes, or invalid format." msgstr "" "Nombre insuficient de bytes per a descodificar els bytes, o el format és " "invà lid." -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "step argument is zero!" msgstr "L'argument pas (step) és zero!" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Not a script with an instance" msgstr "Script sense instà ncia" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Not based on a script" msgstr "No basat en un script" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Not based on a resource file" msgstr "No basat en un arxiu de recursos" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary format (missing @path)" msgstr "Format del diccionari d'instà ncies invà lid (manca @path)" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary format (can't load script at @path)" msgstr "" "Format del diccionari d'instà ncies invà lid (no es pot carregar l'script a " "@path)" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary format (invalid script at @path)" msgstr "Format del diccionari d'instà ncies invà lid (script invà lid a @path)" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary (invalid subclasses)" msgstr "Diccionari d'instà ncies invà lid (subclasses invà lides)" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Object can't provide a length." msgstr "" @@ -6901,18 +7044,28 @@ msgstr "Elimina Seleccionats" #: modules/gridmap/grid_map_editor_plugin.cpp #, fuzzy msgid "GridMap Duplicate Selection" -msgstr "Duplica la Selecció" +msgstr "Duplicar la Selecció" #: modules/gridmap/grid_map_editor_plugin.cpp -msgid "Snap View" +msgid "Floor:" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp -msgid "Prev Level (%sDown Wheel)" -msgstr "" +#, fuzzy +msgid "Grid Map" +msgstr "Alinea-ho a la graella" #: modules/gridmap/grid_map_editor_plugin.cpp -msgid "Next Level (%sUp Wheel)" +msgid "Snap View" +msgstr "Alinea la Vista" + +#: modules/gridmap/grid_map_editor_plugin.cpp +#, fuzzy +msgid "Previous Floor" +msgstr "Pestanya Anterior" + +#: modules/gridmap/grid_map_editor_plugin.cpp +msgid "Next Floor" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp @@ -6983,13 +7136,8 @@ msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp #, fuzzy -msgid "Selection -> Duplicate" -msgstr "Selecció Només" - -#: modules/gridmap/grid_map_editor_plugin.cpp -#, fuzzy -msgid "Selection -> Clear" -msgstr "Selecció Només" +msgid "Clear Selection" +msgstr "Centra la Selecció" #: modules/gridmap/grid_map_editor_plugin.cpp #, fuzzy @@ -7048,23 +7196,20 @@ msgid "Change Signal Arguments" msgstr "Edita els Arguments del Senyal:" #: modules/visual_script/visual_script_editor.cpp -#, fuzzy msgid "Change Argument Type" -msgstr "Canvia Tipus de la Matriu" +msgstr "Modifica el Tipus d'Argument" #: modules/visual_script/visual_script_editor.cpp -#, fuzzy msgid "Change Argument name" -msgstr "Canvia Valor de la Matriu" +msgstr "Modifica el nom de l'Argument" #: modules/visual_script/visual_script_editor.cpp msgid "Set Variable Default Value" -msgstr "" +msgstr "Estableix el Valor Predeterminat de la Variable" #: modules/visual_script/visual_script_editor.cpp -#, fuzzy msgid "Set Variable Type" -msgstr "Edita Variable:" +msgstr "Estableix el Tipus de Variable" #: modules/visual_script/visual_script_editor.cpp msgid "Functions:" @@ -7096,39 +7241,38 @@ msgstr "Reanomena Senyal" #: modules/visual_script/visual_script_editor.cpp msgid "Add Function" -msgstr "Afegeix Funció" +msgstr "Afegir Funció" #: modules/visual_script/visual_script_editor.cpp msgid "Add Variable" -msgstr "Afegeix Variable" +msgstr "Afegir Variable" #: modules/visual_script/visual_script_editor.cpp msgid "Add Signal" -msgstr "Afegeix Senyal" +msgstr "Afegir Senyal" #: modules/visual_script/visual_script_editor.cpp -#, fuzzy msgid "Change Expression" -msgstr "Canvia Transició" +msgstr "Modifica l'Expressió" #: modules/visual_script/visual_script_editor.cpp msgid "Add Node" -msgstr "Afegeix Node" +msgstr "Afegeix un Node" #: modules/visual_script/visual_script_editor.cpp -#, fuzzy msgid "Remove VisualScript Nodes" -msgstr "Treu claus invà lides" +msgstr "Elimina els Nodes de VisualScript" #: modules/visual_script/visual_script_editor.cpp msgid "Duplicate VisualScript Nodes" -msgstr "" +msgstr "Duplica els Nodes de VisualScript" #: modules/visual_script/visual_script_editor.cpp -msgid "Hold Meta to drop a Getter. Hold Shift to drop a generic signature." +#, fuzzy +msgid "Hold %s to drop a Getter. Hold Shift to drop a generic signature." msgstr "" -"Retén Meta per dipositar un mètode Accessor (Getter). Retén Maj per " -"dipositar una firma genèrica." +"Retn Meta per dipositar un mètode Accessor (Getter). Retén Maj per dipositar " +"una firma genèrica." #: modules/visual_script/visual_script_editor.cpp msgid "Hold Ctrl to drop a Getter. Hold Shift to drop a generic signature." @@ -7137,7 +7281,8 @@ msgstr "" "dipositar una firma genèrica." #: modules/visual_script/visual_script_editor.cpp -msgid "Hold Meta to drop a simple reference to the node." +#, fuzzy +msgid "Hold %s to drop a simple reference to the node." msgstr "Retén Meta per dipositar una referència simple al node." #: modules/visual_script/visual_script_editor.cpp @@ -7145,7 +7290,8 @@ msgid "Hold Ctrl to drop a simple reference to the node." msgstr "Retén Ctrl per dipositar una referència simple al node." #: modules/visual_script/visual_script_editor.cpp -msgid "Hold Meta to drop a Variable Setter." +#, fuzzy +msgid "Hold %s to drop a Variable Setter." msgstr "Retén Meta per dipositar una variable d'Actualització (Setter)." #: modules/visual_script/visual_script_editor.cpp @@ -7154,44 +7300,39 @@ msgstr "Retén Ctrl per dipositar una Variable d'Actualització (Setter)." #: modules/visual_script/visual_script_editor.cpp msgid "Add Preload Node" -msgstr "Afegeix Node de Precà rrega" +msgstr "Afegir Node de Precà rrega" #: modules/visual_script/visual_script_editor.cpp msgid "Add Node(s) From Tree" -msgstr "Afegeix Node(s) des d'Arbre" +msgstr "Afegir Node(s) des d'Arbre" #: modules/visual_script/visual_script_editor.cpp msgid "Add Getter Property" -msgstr "Afegeix Propietat d'Accés (Getter)" +msgstr "Afegir Propietat d'Accés (Getter)" #: modules/visual_script/visual_script_editor.cpp msgid "Add Setter Property" -msgstr "Afegeix Propietat d'Actualització (Setter)" +msgstr "Afegir Propietat d'Actualització (Setter)" #: modules/visual_script/visual_script_editor.cpp -#, fuzzy msgid "Change Base Type" -msgstr "Canvia Tipus de la Matriu" +msgstr "Modifica el Tipus de Base" #: modules/visual_script/visual_script_editor.cpp -#, fuzzy msgid "Move Node(s)" -msgstr "Copia Nodes" +msgstr "Mou els Nodes" #: modules/visual_script/visual_script_editor.cpp -#, fuzzy msgid "Remove VisualScript Node" -msgstr "Treu Variable" +msgstr "Elimina el Node de VisualScript" #: modules/visual_script/visual_script_editor.cpp -#, fuzzy msgid "Connect Nodes" -msgstr "Connecta al Node:" +msgstr "Connecta els Nodes" #: modules/visual_script/visual_script_editor.cpp -#, fuzzy msgid "Condition" -msgstr "Transició" +msgstr "Condició" #: modules/visual_script/visual_script_editor.cpp msgid "Sequence" @@ -7227,54 +7368,48 @@ msgid "Script already has function '%s'" msgstr "" #: modules/visual_script/visual_script_editor.cpp -#, fuzzy msgid "Change Input Value" -msgstr "Canvia Valor de la Matriu" +msgstr "Modifica el Valor de l'Entrada" #: modules/visual_script/visual_script_editor.cpp -#, fuzzy msgid "Can't copy the function node." -msgstr "No es pot operar en '..'" +msgstr "No es pot copiar el node de funció." #: modules/visual_script/visual_script_editor.cpp -#, fuzzy msgid "Clipboard is empty!" -msgstr "El camà per desar és buit!" +msgstr "El porta-retalls és buit!" #: modules/visual_script/visual_script_editor.cpp -#, fuzzy msgid "Paste VisualScript Nodes" -msgstr "Camà al Node:" +msgstr "Enganxa els Nodes de VisualScript" #: modules/visual_script/visual_script_editor.cpp msgid "Remove Function" -msgstr "Treu Funció" +msgstr "Elimina la Funció" #: modules/visual_script/visual_script_editor.cpp -#, fuzzy msgid "Edit Variable" -msgstr "Edita Variable:" +msgstr "Edita la Variable" #: modules/visual_script/visual_script_editor.cpp msgid "Remove Variable" -msgstr "Treu Variable" +msgstr "Elimina la Variable" #: modules/visual_script/visual_script_editor.cpp -#, fuzzy msgid "Edit Signal" -msgstr "Editant Senyal:" +msgstr "Edita el Senyal" #: modules/visual_script/visual_script_editor.cpp msgid "Remove Signal" -msgstr "Treu Senyal" +msgstr "Elimina el Senyal" #: modules/visual_script/visual_script_editor.cpp msgid "Editing Variable:" -msgstr "Editant Variable:" +msgstr "Edició de la Variable:" #: modules/visual_script/visual_script_editor.cpp msgid "Editing Signal:" -msgstr "Editant Senyal:" +msgstr "Edició del Senyal:" #: modules/visual_script/visual_script_editor.cpp msgid "Base Type:" @@ -7290,7 +7425,7 @@ msgstr "Selecciona o crea una funció per editar la corba" #: modules/visual_script/visual_script_editor.cpp msgid "Edit Signal Arguments:" -msgstr "Edita els Arguments del Senyal:" +msgstr "Edita Arguments del Senyal:" #: modules/visual_script/visual_script_editor.cpp msgid "Edit Variable:" @@ -7390,12 +7525,22 @@ msgstr "No s'ha pogut crear la carpeta." #: platform/javascript/export/export.cpp #, fuzzy -msgid "Could not read file:\n" +msgid "Could not open template for export:\n" msgstr "No s'ha pogut crear la carpeta." #: platform/javascript/export/export.cpp #, fuzzy -msgid "Could not open template for export:\n" +msgid "Invalid export template:\n" +msgstr "Instal·la Plantilles d'Exportació" + +#: platform/javascript/export/export.cpp +#, fuzzy +msgid "Could not read custom HTML shell:\n" +msgstr "No s'ha pogut crear la carpeta." + +#: platform/javascript/export/export.cpp +#, fuzzy +msgid "Could not read boot splash image file:\n" msgstr "No s'ha pogut crear la carpeta." #: scene/2d/animated_sprite.cpp @@ -7512,31 +7657,13 @@ msgstr "" msgid "Path property must point to a valid Node2D node to work." msgstr "Cal que la propietat Camà (Path) assenyali un Node2D và lid." -#: scene/2d/sprite.cpp -msgid "" -"Path property must point to a valid Viewport node to work. Such Viewport " -"must be set to 'render target' mode." -msgstr "" -"Cal que la propietat Camà (Path) assenyali un node de Vista (Viewport) " -"và lid. Aquest ha de ser especificat en el mode \"destinació de renderització" -"\" (render target)." - -#: scene/2d/sprite.cpp -msgid "" -"The Viewport set in the path property must be set as 'render target' in " -"order for this sprite to work." -msgstr "" -"La Vista (Viewport) especificada en la propietat \"CamÃ\" (Path) ha " -"d'utilitzar el mode 'Destinació de renderització' (render target) perquè " -"l'sprite funcioni." - #: scene/2d/visibility_notifier_2d.cpp msgid "" "VisibilityEnable2D works best when used with the edited scene root directly " "as parent." msgstr "" -"VisibilityEnable2D funciona millor quan l'arrel de l'escena editada " -"s'utilitza com a pare." +"Un node VisibilityEnable2D funcionarà millor en ser emparentat directament " +"amb l'arrel de l'escena." #: scene/3d/arvr_nodes.cpp msgid "ARVRCamera must have an ARVROrigin node as its parent" @@ -7598,6 +7725,14 @@ msgstr "" "Cal proveir una forma perquè CollisionShape funcioni. Creeu-li un recurs de " "forma!" +#: scene/3d/gi_probe.cpp +msgid "Plotting Meshes" +msgstr "" + +#: scene/3d/gi_probe.cpp +msgid "Finishing Plot" +msgstr "" + #: scene/3d/navigation_mesh.cpp msgid "A NavigationMesh resource must be set or created for this node to work." msgstr "" @@ -7688,6 +7823,10 @@ msgid "" "minimum size manually." msgstr "" +#: scene/gui/tree.cpp +msgid "(Other)" +msgstr "" + #: scene/main/scene_tree.cpp msgid "" "Default Environment as specified in Project Setings (Rendering -> Viewport -" @@ -7722,6 +7861,59 @@ msgstr "Error carregant lletra." msgid "Invalid font size." msgstr "La mida de la lletra no és và lida." +#~ msgid "Cannot navigate to '" +#~ msgstr "No es pot navegar fins '" + +#~ msgid "" +#~ "\n" +#~ "Source: " +#~ msgstr "" +#~ "\n" +#~ "Font: " + +#~ msgid "Remove Point from Line2D" +#~ msgstr "Elimina un Punt de la LÃnia2D" + +#~ msgid "Add Point to Line2D" +#~ msgstr "Afegeix punt a la LÃnia2D" + +#~ msgid "Move Point in Line2D" +#~ msgstr "Mou el Punt de la LÃnia2D" + +#~ msgid "Split Segment (in line)" +#~ msgstr "Parteix el Segment (en la lÃnia)" + +#~ msgid "Meta+" +#~ msgstr "Meta +" + +#, fuzzy +#~ msgid "Setting '" +#~ msgstr "Configuració" + +#, fuzzy +#~ msgid "Selection -> Duplicate" +#~ msgstr "Selecció Només" + +#, fuzzy +#~ msgid "Selection -> Clear" +#~ msgstr "Selecció Només" + +#~ msgid "" +#~ "Path property must point to a valid Viewport node to work. Such Viewport " +#~ "must be set to 'render target' mode." +#~ msgstr "" +#~ "Cal que la propietat Camà (Path) assenyali un node de Vista (Viewport) " +#~ "và lid. Aquest ha de ser especificat en el mode \"destinació de " +#~ "renderització\" (render target)." + +#~ msgid "" +#~ "The Viewport set in the path property must be set as 'render target' in " +#~ "order for this sprite to work." +#~ msgstr "" +#~ "La Vista (Viewport) especificada en la propietat \"CamÃ\" (Path) ha " +#~ "d'utilitzar el mode 'Destinació de renderització' (render target) perquè " +#~ "l'sprite funcioni." + #~ msgid "Filter:" #~ msgstr "Filtre:" @@ -7740,9 +7932,6 @@ msgstr "La mida de la lletra no és và lida." #~ msgid "Removed:" #~ msgstr "Eliminat:" -#~ msgid "Error saving atlas:" -#~ msgstr "Error en desar atles:" - #~ msgid "Could not save atlas subtexture:" #~ msgstr "No s'ha pogut desar la subtextura de l'atles:" @@ -8179,9 +8368,6 @@ msgstr "La mida de la lletra no és và lida." #~ msgid "Save Translatable Strings" #~ msgstr "Desa els texts Traduïbles" -#~ msgid "Install Export Templates" -#~ msgstr "Instal·la Plantilles d'Exportació" - #, fuzzy #~ msgid "Create Android keystore" #~ msgstr "Crea una Carpeta" diff --git a/editor/translations/cs.po b/editor/translations/cs.po index 8083094a39..5e2400928d 100644 --- a/editor/translations/cs.po +++ b/editor/translations/cs.po @@ -102,6 +102,7 @@ msgid "Anim Delete Keys" msgstr "Animace: smazat klÃÄe" #: editor/animation_editor.cpp editor/plugins/tile_map_editor_plugin.cpp +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Duplicate Selection" msgstr "Duplikovat výbÄ›r" @@ -636,6 +637,13 @@ msgstr "Editor závislostÃ" msgid "Search Replacement Resource:" msgstr "Hledat náhradnà zdroj:" +#: editor/dependency_editor.cpp editor/editor_file_dialog.cpp +#: editor/editor_help.cpp editor/editor_node.cpp editor/filesystem_dock.cpp +#: editor/plugins/script_editor_plugin.cpp editor/property_selector.cpp +#: editor/quick_open.cpp scene/gui/file_dialog.cpp +msgid "Open" +msgstr "OtevÅ™Ãt" + #: editor/dependency_editor.cpp msgid "Owners Of:" msgstr "VlastnÃci:" @@ -708,6 +716,15 @@ msgstr "Odstranit vybrané soubory?" msgid "Delete" msgstr "Odstranit" +#: editor/dictionary_property_edit.cpp +msgid "Change Dictionary Key" +msgstr "" + +#: editor/dictionary_property_edit.cpp +#, fuzzy +msgid "Change Dictionary Value" +msgstr "ZmÄ›nit hodnotu pole" + #: editor/editor_about.cpp msgid "Thanks from the Godot community!" msgstr "" @@ -1135,12 +1152,6 @@ msgstr "VÅ¡echny rozpoznatelné" msgid "All Files (*)" msgstr "VÅ¡echny soubory (*)" -#: editor/editor_file_dialog.cpp editor/editor_help.cpp editor/editor_node.cpp -#: editor/filesystem_dock.cpp editor/plugins/script_editor_plugin.cpp -#: editor/property_selector.cpp editor/quick_open.cpp scene/gui/file_dialog.cpp -msgid "Open" -msgstr "OtevÅ™Ãt" - #: editor/editor_file_dialog.cpp scene/gui/file_dialog.cpp msgid "Open a File" msgstr "OtevÅ™Ãt soubor" @@ -1505,6 +1516,13 @@ msgid "" msgstr "" #: editor/editor_node.cpp +msgid "" +"This is a remote object so changes to it will not be kept.\n" +"Please read the documentation relevant to debugging to better understand " +"this workflow." +msgstr "" + +#: editor/editor_node.cpp msgid "Copy Params" msgstr "" @@ -1615,6 +1633,10 @@ msgid "Export Mesh Library" msgstr "" #: editor/editor_node.cpp +msgid "This operation can't be done without a root node." +msgstr "" + +#: editor/editor_node.cpp msgid "Export Tile Set" msgstr "" @@ -1742,11 +1764,20 @@ msgid "Switch Scene Tab" msgstr "" #: editor/editor_node.cpp -msgid "%d more file(s)" +msgid "%d more files or folders" +msgstr "" + +#: editor/editor_node.cpp +#, fuzzy +msgid "%d more folders" +msgstr "Nelze vytvoÅ™it složku." + +#: editor/editor_node.cpp +msgid "%d more files" msgstr "" #: editor/editor_node.cpp -msgid "%d more file(s) or folder(s)" +msgid "Dock Position" msgstr "" #: editor/editor_node.cpp @@ -1758,6 +1789,11 @@ msgid "Toggle distraction-free mode." msgstr "" #: editor/editor_node.cpp +#, fuzzy +msgid "Add a new scene." +msgstr "PÅ™idat nové stopy." + +#: editor/editor_node.cpp msgid "Scene" msgstr "" @@ -1822,13 +1858,12 @@ msgid "TileSet.." msgstr "" #: editor/editor_node.cpp editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp scene/gui/line_edit.cpp -#: scene/gui/text_edit.cpp +#: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Undo" msgstr "ZpÄ›t" #: editor/editor_node.cpp editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp +#: scene/gui/line_edit.cpp msgid "Redo" msgstr "Znovu" @@ -2316,6 +2351,10 @@ msgid "(Current)" msgstr "" #: editor/export_template_manager.cpp +msgid "Retrieving mirrors, please wait.." +msgstr "" + +#: editor/export_template_manager.cpp msgid "Remove template version '%s'?" msgstr "" @@ -2351,6 +2390,111 @@ msgid "Importing:" msgstr "" #: editor/export_template_manager.cpp +msgid "" +"No download links found for this version. Direct download is only available " +"for official releases." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Can't resolve." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Can't connect." +msgstr "PÅ™ipojit.." + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "No response." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Req. Failed." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Redirect Loop." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Failed:" +msgstr "" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Can't write file." +msgstr "Nelze vytvoÅ™it složku." + +#: editor/export_template_manager.cpp +msgid "Download Complete." +msgstr "" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Error requesting url: " +msgstr "Chyba nahrávánà fontu." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Connecting to Mirror.." +msgstr "PÅ™ipojit.." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Disconnected" +msgstr "Odpojit" + +#: editor/export_template_manager.cpp +msgid "Resolving" +msgstr "" + +#: editor/export_template_manager.cpp +msgid "Can't Resolve" +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Connecting.." +msgstr "PÅ™ipojit.." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Can't Conect" +msgstr "PÅ™ipojit.." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Connected" +msgstr "PÅ™ipojit" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Requesting.." +msgstr "Testované" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Downloading" +msgstr "Chyba pÅ™i naÄÃtánÃ:" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Connection Error" +msgstr "PÅ™ipojit.." + +#: editor/export_template_manager.cpp +msgid "SSL Handshake Error" +msgstr "" + +#: editor/export_template_manager.cpp msgid "Current Version:" msgstr "" @@ -2376,12 +2520,21 @@ msgstr "Odstranit vybrané soubory?" msgid "Export Template Manager" msgstr "" +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Download Templates" +msgstr "Odstranit výbÄ›r" + +#: editor/export_template_manager.cpp +msgid "Select mirror from list: " +msgstr "" + #: editor/file_type_cache.cpp msgid "Can't open file_type_cache.cch for writing, not saving file type cache!" msgstr "" #: editor/filesystem_dock.cpp -msgid "Cannot navigate to '" +msgid "Cannot navigate to '%s' as it has not been found in the file system!" msgstr "" #: editor/filesystem_dock.cpp @@ -2399,13 +2552,6 @@ msgid "" msgstr "" #: editor/filesystem_dock.cpp -#, fuzzy -msgid "" -"\n" -"Source: " -msgstr "Zdroj" - -#: editor/filesystem_dock.cpp msgid "Cannot move/rename resources root." msgstr "" @@ -2669,8 +2815,7 @@ msgid "Remove Poly And Point" msgstr "" #: editor/plugins/abstract_polygon_2d_editor.cpp -#: editor/plugins/light_occluder_2d_editor_plugin.cpp -msgid "Create a new polygon from scratch." +msgid "Create a new polygon from scratch" msgstr "" #: editor/plugins/abstract_polygon_2d_editor.cpp @@ -2681,6 +2826,11 @@ msgid "" "RMB: Erase Point." msgstr "" +#: editor/plugins/abstract_polygon_2d_editor.cpp +#, fuzzy +msgid "Delete points" +msgstr "Odstranit" + #: editor/plugins/animation_player_editor_plugin.cpp msgid "Toggle Autoplay" msgstr "" @@ -3019,20 +3169,11 @@ msgid "Can't resolve hostname:" msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Can't resolve." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Connection error, please try again." msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp #, fuzzy -msgid "Can't connect." -msgstr "PÅ™ipojit.." - -#: editor/plugins/asset_library_editor_plugin.cpp -#, fuzzy msgid "Can't connect to host:" msgstr "PÅ™ipojit k uzlu:" @@ -3041,30 +3182,14 @@ msgid "No response from host:" msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "No response." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Request failed, return code:" msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Req. Failed." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Request failed, too many redirects" msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Redirect Loop." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp -msgid "Failed:" -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Bad download hash, assuming file has been tampered with." msgstr "" @@ -3094,16 +3219,6 @@ msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp #, fuzzy -msgid "Connecting.." -msgstr "PÅ™ipojit.." - -#: editor/plugins/asset_library_editor_plugin.cpp -#, fuzzy -msgid "Requesting.." -msgstr "Testované" - -#: editor/plugins/asset_library_editor_plugin.cpp -#, fuzzy msgid "Error making request" msgstr "Chyba nahrávánà fontu." @@ -3216,6 +3331,38 @@ msgid "Move Action" msgstr "" #: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Move vertical guide" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Create new vertical guide" +msgstr "VytvoÅ™it odbÄ›r" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Remove vertical guide" +msgstr "Odstranit promÄ›nnou" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Move horizontal guide" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Create new horizontal guide" +msgstr "VytvoÅ™it odbÄ›r" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Remove horizontal guide" +msgstr "Odstranit neplatné klÃÄe" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Create new horizontal and vertical guides" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp msgid "Edit IK Chain" msgstr "" @@ -3338,10 +3485,16 @@ msgid "Snap to other nodes" msgstr "" #: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Snap to guides" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Lock the selected object in place (can't be moved)." msgstr "" #: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Unlock the selected object (can be moved)." msgstr "" @@ -3392,6 +3545,10 @@ msgid "Show rulers" msgstr "" #: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Show guides" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp msgid "Center Selection" msgstr "" @@ -3583,6 +3740,10 @@ msgstr "" msgid "Hold Shift to edit tangents individually" msgstr "" +#: editor/plugins/gi_probe_editor_plugin.cpp +msgid "Bake GI Probe" +msgstr "" + #: editor/plugins/gradient_editor_plugin.cpp msgid "Add/Remove Color Ramp Point" msgstr "" @@ -3615,6 +3776,10 @@ msgid "Create Occluder Polygon" msgstr "" #: editor/plugins/light_occluder_2d_editor_plugin.cpp +msgid "Create a new polygon from scratch." +msgstr "" + +#: editor/plugins/light_occluder_2d_editor_plugin.cpp msgid "Edit existing polygon:" msgstr "" @@ -3630,59 +3795,6 @@ msgstr "" msgid "RMB: Erase Point." msgstr "" -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Remove Point from Line2D" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#, fuzzy -msgid "Add Point to Line2D" -msgstr "Běž na řádek" - -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Move Point in Line2D" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Select Points" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Shift+Drag: Select Control Points" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Click: Add Point" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Right Click: Delete Point" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Add Point (in empty space)" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Split Segment (in line)" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Delete Point" -msgstr "" - #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Mesh is empty!" msgstr "" @@ -4080,16 +4192,46 @@ msgid "Move Out-Control in Curve" msgstr "" #: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Select Points" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Shift+Drag: Select Control Points" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Click: Add Point" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Right Click: Delete Point" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp msgid "Select Control Points (Shift+Drag)" msgstr "" #: editor/plugins/path_2d_editor_plugin.cpp #: editor/plugins/path_editor_plugin.cpp +msgid "Add Point (in empty space)" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp msgid "Split Segment (in curve)" msgstr "" #: editor/plugins/path_2d_editor_plugin.cpp #: editor/plugins/path_editor_plugin.cpp +msgid "Delete Point" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp msgid "Close Curve" msgstr "" @@ -4230,7 +4372,6 @@ msgstr "" #: editor/plugins/resource_preloader_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp #: editor/plugins/sprite_frames_editor_plugin.cpp editor/property_editor.cpp #: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Paste" @@ -4275,6 +4416,21 @@ msgid " Class Reference" msgstr "" #: editor/plugins/script_editor_plugin.cpp +#, fuzzy +msgid "Sort" +msgstr "Řadit:" + +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp +msgid "Move Up" +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp +msgid "Move Down" +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp msgid "Next script" msgstr "" @@ -4327,6 +4483,10 @@ msgstr "" msgid "Close All" msgstr "ZavÅ™Ãt" +#: editor/plugins/script_editor_plugin.cpp +msgid "Close Other Tabs" +msgstr "" + #: editor/plugins/script_editor_plugin.cpp editor/project_manager.cpp msgid "Run" msgstr "" @@ -4337,13 +4497,11 @@ msgstr "" #: editor/plugins/script_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Find.." msgstr "" #: editor/plugins/script_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Find Next" msgstr "" @@ -4449,33 +4607,22 @@ msgstr "" msgid "Capitalize" msgstr "" -#: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp scene/gui/line_edit.cpp +#: editor/plugins/script_text_editor.cpp scene/gui/line_edit.cpp #: scene/gui/text_edit.cpp msgid "Cut" msgstr "Vyjmout" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp #: editor/plugins/sprite_frames_editor_plugin.cpp editor/property_editor.cpp #: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Copy" msgstr "KopÃrovat" -#: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp scene/gui/line_edit.cpp +#: editor/plugins/script_text_editor.cpp scene/gui/line_edit.cpp #: scene/gui/text_edit.cpp msgid "Select All" msgstr "Vybrat vÅ¡e" -#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp -msgid "Move Up" -msgstr "" - -#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp -msgid "Move Down" -msgstr "" - #: editor/plugins/script_text_editor.cpp #, fuzzy msgid "Delete Line" @@ -4498,6 +4645,23 @@ msgid "Clone Down" msgstr "" #: editor/plugins/script_text_editor.cpp +#, fuzzy +msgid "Fold Line" +msgstr "Běž na řádek" + +#: editor/plugins/script_text_editor.cpp +msgid "Unfold Line" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Fold All Lines" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Unfold All Lines" +msgstr "" + +#: editor/plugins/script_text_editor.cpp msgid "Complete Symbol" msgstr "" @@ -4544,12 +4708,10 @@ msgid "Convert To Lowercase" msgstr "PÅ™ipojit k uzlu:" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Find Previous" msgstr "" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Replace.." msgstr "" @@ -4558,7 +4720,6 @@ msgid "Goto Function.." msgstr "" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Goto Line.." msgstr "" @@ -4723,6 +4884,15 @@ msgid "View Plane Transform." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "Scaling: " +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Translating: " +msgstr "PÅ™echod" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Rotating %s degrees." msgstr "" @@ -4804,6 +4974,10 @@ msgid "Vertices" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "FPS" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Align with view" msgstr "" @@ -4836,6 +5010,16 @@ msgid "View Information" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "View FPS" +msgstr "Soubor:" + +#: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Half Resolution" +msgstr "ZmÄ›nit měřÃtko výbÄ›ru" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Audio Listener" msgstr "" @@ -4967,6 +5151,11 @@ msgid "Tool Scale" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Toggle Freelook" +msgstr "PÅ™epnout breakpoint" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Transform" msgstr "" @@ -5244,6 +5433,10 @@ msgid "Create Empty Editor Template" msgstr "" #: editor/plugins/theme_editor_plugin.cpp +msgid "Create From Current Editor Theme" +msgstr "" + +#: editor/plugins/theme_editor_plugin.cpp msgid "CheckBox Radio1" msgstr "" @@ -5421,7 +5614,7 @@ msgstr "Povolit" #: editor/project_export.cpp #, fuzzy -msgid "Delete patch '" +msgid "Delete patch '%s' from list?" msgstr "Odstranit" #: editor/project_export.cpp @@ -5723,10 +5916,6 @@ msgid "Add Input Action Event" msgstr "" #: editor/project_settings_editor.cpp editor/settings_config_dialog.cpp -msgid "Meta+" -msgstr "" - -#: editor/project_settings_editor.cpp editor/settings_config_dialog.cpp msgid "Shift+" msgstr "Shift+" @@ -5849,13 +6038,12 @@ msgid "Select a setting item first!" msgstr "" #: editor/project_settings_editor.cpp -msgid "No property '" +msgid "No property '%s' exists." msgstr "" #: editor/project_settings_editor.cpp -#, fuzzy -msgid "Setting '" -msgstr "Testované" +msgid "Setting '%s' is internal, and it can't be deleted." +msgstr "" #: editor/project_settings_editor.cpp #, fuzzy @@ -6337,6 +6525,15 @@ msgid "Clear a script for the selected node." msgstr "" #: editor/scene_tree_dock.cpp +#, fuzzy +msgid "Remote" +msgstr "Odebrat" + +#: editor/scene_tree_dock.cpp +msgid "Local" +msgstr "" + +#: editor/scene_tree_dock.cpp msgid "Clear Inheritance? (No Undo!)" msgstr "" @@ -6529,6 +6726,11 @@ msgid "Attach Node Script" msgstr "" #: editor/script_editor_debugger.cpp +#, fuzzy +msgid "Remote " +msgstr "Odebrat" + +#: editor/script_editor_debugger.cpp msgid "Bytes:" msgstr "" @@ -6585,18 +6787,6 @@ msgid "Stack Trace (if applicable):" msgstr "" #: editor/script_editor_debugger.cpp -msgid "Remote Inspector" -msgstr "" - -#: editor/script_editor_debugger.cpp -msgid "Live Scene Tree:" -msgstr "" - -#: editor/script_editor_debugger.cpp -msgid "Remote Object Properties: " -msgstr "" - -#: editor/script_editor_debugger.cpp msgid "Profiler" msgstr "" @@ -6728,50 +6918,50 @@ msgstr "" msgid "GDNative" msgstr "" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp #: modules/visual_script/visual_script_builtin_funcs.cpp msgid "Invalid type argument to convert(), use TYPE_* constants." msgstr "" "Neplatný typ argumentu funkce convert(), použijte nÄ›kterou z konstant TYPE_*" -#: modules/gdscript/gd_functions.cpp modules/mono/glue/glue_header.h +#: modules/gdscript/gdscript_functions.cpp modules/mono/glue/glue_header.h #: modules/visual_script/visual_script_builtin_funcs.cpp msgid "Not enough bytes for decoding bytes, or invalid format." msgstr "Nedostatek bajtů pro dekódovánà bajtů, nebo Å¡patný formát." -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "step argument is zero!" msgstr "Argument kroku je nula!" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Not a script with an instance" msgstr "Skript nemá instanci" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Not based on a script" msgstr "Nenà založeno na skriptu" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Not based on a resource file" msgstr "Nenà založeno na zdrojovém souboru" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary format (missing @path)" msgstr "Neplatná instance slovnÃkového formátu (chybà @path)" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary format (can't load script at @path)" msgstr "Neplatná instance slovnÃkového formátu (nemohu nahrát skript na @path)" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary format (invalid script at @path)" msgstr "Neplatná instance slovnÃkového formátu (nemohu nahrát skript na @path)" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary (invalid subclasses)" msgstr "Neplatná instance slovnÃku (neplatné podtÅ™Ãdy)" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Object can't provide a length." msgstr "" @@ -6786,15 +6976,23 @@ msgid "GridMap Duplicate Selection" msgstr "Duplikovat výbÄ›r" #: modules/gridmap/grid_map_editor_plugin.cpp +msgid "Floor:" +msgstr "" + +#: modules/gridmap/grid_map_editor_plugin.cpp +msgid "Grid Map" +msgstr "" + +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Snap View" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp -msgid "Prev Level (%sDown Wheel)" +msgid "Previous Floor" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp -msgid "Next Level (%sUp Wheel)" +msgid "Next Floor" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp @@ -6865,13 +7063,8 @@ msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp #, fuzzy -msgid "Selection -> Duplicate" -msgstr "Pouze výbÄ›r" - -#: modules/gridmap/grid_map_editor_plugin.cpp -#, fuzzy -msgid "Selection -> Clear" -msgstr "Pouze výbÄ›r" +msgid "Clear Selection" +msgstr "ZmÄ›nit měřÃtko výbÄ›ru" #: modules/gridmap/grid_map_editor_plugin.cpp #, fuzzy @@ -7007,7 +7200,7 @@ msgstr "" #: modules/visual_script/visual_script_editor.cpp #, fuzzy -msgid "Hold Meta to drop a Getter. Hold Shift to drop a generic signature." +msgid "Hold %s to drop a Getter. Hold Shift to drop a generic signature." msgstr "" "Podržte Meta k uvolnÄ›nà getteru. Podržte Shift k uvolnÄ›nà generického " "podpisu." @@ -7020,7 +7213,8 @@ msgstr "" "podpisu." #: modules/visual_script/visual_script_editor.cpp -msgid "Hold Meta to drop a simple reference to the node." +#, fuzzy +msgid "Hold %s to drop a simple reference to the node." msgstr "Podržte Meta k uvolnÄ›nà jednoduché reference na uzel." #: modules/visual_script/visual_script_editor.cpp @@ -7029,8 +7223,9 @@ msgid "Hold Ctrl to drop a simple reference to the node." msgstr "Podržte Ctrl k uvolnÄ›nà jednoduché reference na uzel." #: modules/visual_script/visual_script_editor.cpp -msgid "Hold Meta to drop a Variable Setter." -msgstr "" +#, fuzzy +msgid "Hold %s to drop a Variable Setter." +msgstr "Podržte Meta k uvolnÄ›nà jednoduché reference na uzel." #: modules/visual_script/visual_script_editor.cpp msgid "Hold Ctrl to drop a Variable Setter." @@ -7269,12 +7464,22 @@ msgstr "Nelze vytvoÅ™it složku." #: platform/javascript/export/export.cpp #, fuzzy -msgid "Could not read file:\n" +msgid "Could not open template for export:\n" msgstr "Nelze vytvoÅ™it složku." #: platform/javascript/export/export.cpp #, fuzzy -msgid "Could not open template for export:\n" +msgid "Invalid export template:\n" +msgstr "Neplatné jméno vlastnosti." + +#: platform/javascript/export/export.cpp +#, fuzzy +msgid "Could not read custom HTML shell:\n" +msgstr "Nelze vytvoÅ™it složku." + +#: platform/javascript/export/export.cpp +#, fuzzy +msgid "Could not read boot splash image file:\n" msgstr "Nelze vytvoÅ™it složku." #: scene/2d/animated_sprite.cpp @@ -7387,22 +7592,6 @@ msgid "Path property must point to a valid Node2D node to work." msgstr "" "Pro zajiÅ¡tÄ›nà funkÄnosti musà vlastnost path ukazovat na platný uzel Node2D." -#: scene/2d/sprite.cpp -msgid "" -"Path property must point to a valid Viewport node to work. Such Viewport " -"must be set to 'render target' mode." -msgstr "" -"Pro zajiÅ¡tÄ›nà funkÄnostà musà vlastnost path ukazovat na platný uzel " -"Viewport. Takový Viewport musà být nastaven do módu 'render target'." - -#: scene/2d/sprite.cpp -msgid "" -"The Viewport set in the path property must be set as 'render target' in " -"order for this sprite to work." -msgstr "" -"Aby tento sprite mohl fungovat, Viewport nastavený ve vlastnosti path musà " -"být nastaven do módu 'render target'." - #: scene/2d/visibility_notifier_2d.cpp msgid "" "VisibilityEnable2D works best when used with the edited scene root directly " @@ -7469,6 +7658,14 @@ msgstr "" "Aby CollisionShape mohl fungovat, musà mu být poskytnut tvar. VytvoÅ™te mu " "prosÃm zdroj tvar!" +#: scene/3d/gi_probe.cpp +msgid "Plotting Meshes" +msgstr "" + +#: scene/3d/gi_probe.cpp +msgid "Finishing Plot" +msgstr "" + #: scene/3d/navigation_mesh.cpp msgid "A NavigationMesh resource must be set or created for this node to work." msgstr "" @@ -7560,6 +7757,10 @@ msgid "" "minimum size manually." msgstr "" +#: scene/gui/tree.cpp +msgid "(Other)" +msgstr "" + #: scene/main/scene_tree.cpp msgid "" "Default Environment as specified in Project Setings (Rendering -> Viewport -" @@ -7594,6 +7795,42 @@ msgstr "Chyba nahrávánà fontu." msgid "Invalid font size." msgstr "Neplatná velikost fontu." +#, fuzzy +#~ msgid "" +#~ "\n" +#~ "Source: " +#~ msgstr "Zdroj" + +#, fuzzy +#~ msgid "Add Point to Line2D" +#~ msgstr "Běž na řádek" + +#, fuzzy +#~ msgid "Setting '" +#~ msgstr "Testované" + +#, fuzzy +#~ msgid "Selection -> Duplicate" +#~ msgstr "Pouze výbÄ›r" + +#, fuzzy +#~ msgid "Selection -> Clear" +#~ msgstr "Pouze výbÄ›r" + +#~ msgid "" +#~ "Path property must point to a valid Viewport node to work. Such Viewport " +#~ "must be set to 'render target' mode." +#~ msgstr "" +#~ "Pro zajiÅ¡tÄ›nà funkÄnostà musà vlastnost path ukazovat na platný uzel " +#~ "Viewport. Takový Viewport musà být nastaven do módu 'render target'." + +#~ msgid "" +#~ "The Viewport set in the path property must be set as 'render target' in " +#~ "order for this sprite to work." +#~ msgstr "" +#~ "Aby tento sprite mohl fungovat, Viewport nastavený ve vlastnosti path " +#~ "musà být nastaven do módu 'render target'." + #~ msgid "Filter:" #~ msgstr "Filtr:" diff --git a/editor/translations/da.po b/editor/translations/da.po index 50da2c54b8..850acd62be 100644 --- a/editor/translations/da.po +++ b/editor/translations/da.po @@ -100,6 +100,7 @@ msgid "Anim Delete Keys" msgstr "Anim slet Keys" #: editor/animation_editor.cpp editor/plugins/tile_map_editor_plugin.cpp +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Duplicate Selection" msgstr "Dubler valg" @@ -634,6 +635,13 @@ msgstr "Afhængigheds Editor" msgid "Search Replacement Resource:" msgstr "" +#: editor/dependency_editor.cpp editor/editor_file_dialog.cpp +#: editor/editor_help.cpp editor/editor_node.cpp editor/filesystem_dock.cpp +#: editor/plugins/script_editor_plugin.cpp editor/property_selector.cpp +#: editor/quick_open.cpp scene/gui/file_dialog.cpp +msgid "Open" +msgstr "Ã…ben" + #: editor/dependency_editor.cpp msgid "Owners Of:" msgstr "" @@ -704,6 +712,15 @@ msgstr "" msgid "Delete" msgstr "" +#: editor/dictionary_property_edit.cpp +msgid "Change Dictionary Key" +msgstr "" + +#: editor/dictionary_property_edit.cpp +#, fuzzy +msgid "Change Dictionary Value" +msgstr "Ændre Array-værdi" + #: editor/editor_about.cpp msgid "Thanks from the Godot community!" msgstr "" @@ -1129,12 +1146,6 @@ msgstr "Alle Genkendte" msgid "All Files (*)" msgstr "Alle filer (*)" -#: editor/editor_file_dialog.cpp editor/editor_help.cpp editor/editor_node.cpp -#: editor/filesystem_dock.cpp editor/plugins/script_editor_plugin.cpp -#: editor/property_selector.cpp editor/quick_open.cpp scene/gui/file_dialog.cpp -msgid "Open" -msgstr "Ã…ben" - #: editor/editor_file_dialog.cpp scene/gui/file_dialog.cpp msgid "Open a File" msgstr "Ã…ben en Fil" @@ -1499,6 +1510,13 @@ msgid "" msgstr "" #: editor/editor_node.cpp +msgid "" +"This is a remote object so changes to it will not be kept.\n" +"Please read the documentation relevant to debugging to better understand " +"this workflow." +msgstr "" + +#: editor/editor_node.cpp msgid "Copy Params" msgstr "" @@ -1609,6 +1627,10 @@ msgid "Export Mesh Library" msgstr "" #: editor/editor_node.cpp +msgid "This operation can't be done without a root node." +msgstr "" + +#: editor/editor_node.cpp msgid "Export Tile Set" msgstr "" @@ -1736,11 +1758,20 @@ msgid "Switch Scene Tab" msgstr "" #: editor/editor_node.cpp -msgid "%d more file(s)" +msgid "%d more files or folders" +msgstr "" + +#: editor/editor_node.cpp +#, fuzzy +msgid "%d more folders" +msgstr "Kunne ikke oprette mappe." + +#: editor/editor_node.cpp +msgid "%d more files" msgstr "" #: editor/editor_node.cpp -msgid "%d more file(s) or folder(s)" +msgid "Dock Position" msgstr "" #: editor/editor_node.cpp @@ -1752,6 +1783,11 @@ msgid "Toggle distraction-free mode." msgstr "" #: editor/editor_node.cpp +#, fuzzy +msgid "Add a new scene." +msgstr "Tilføje nye tracks." + +#: editor/editor_node.cpp msgid "Scene" msgstr "" @@ -1816,13 +1852,12 @@ msgid "TileSet.." msgstr "" #: editor/editor_node.cpp editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp scene/gui/line_edit.cpp -#: scene/gui/text_edit.cpp +#: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Undo" msgstr "Fortryd" #: editor/editor_node.cpp editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp +#: scene/gui/line_edit.cpp msgid "Redo" msgstr "" @@ -2308,6 +2343,10 @@ msgid "(Current)" msgstr "" #: editor/export_template_manager.cpp +msgid "Retrieving mirrors, please wait.." +msgstr "" + +#: editor/export_template_manager.cpp msgid "Remove template version '%s'?" msgstr "" @@ -2342,6 +2381,110 @@ msgid "Importing:" msgstr "" #: editor/export_template_manager.cpp +msgid "" +"No download links found for this version. Direct download is only available " +"for official releases." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Can't resolve." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Can't connect." +msgstr "Forbind..." + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "No response." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Req. Failed." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Redirect Loop." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Failed:" +msgstr "" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Can't write file." +msgstr "Kunne ikke oprette mappe." + +#: editor/export_template_manager.cpp +msgid "Download Complete." +msgstr "" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Error requesting url: " +msgstr "Error loading skrifttype." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Connecting to Mirror.." +msgstr "Forbind..." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Disconnected" +msgstr "Afbryd" + +#: editor/export_template_manager.cpp +msgid "Resolving" +msgstr "" + +#: editor/export_template_manager.cpp +msgid "Can't Resolve" +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Connecting.." +msgstr "Forbind..." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Can't Conect" +msgstr "Forbind..." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Connected" +msgstr "Tilslut" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Requesting.." +msgstr "Tester" + +#: editor/export_template_manager.cpp +msgid "Downloading" +msgstr "" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Connection Error" +msgstr "Forbind..." + +#: editor/export_template_manager.cpp +msgid "SSL Handshake Error" +msgstr "" + +#: editor/export_template_manager.cpp msgid "Current Version:" msgstr "" @@ -2367,12 +2510,21 @@ msgstr "Vælg alle" msgid "Export Template Manager" msgstr "" +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Download Templates" +msgstr "Fjern markering" + +#: editor/export_template_manager.cpp +msgid "Select mirror from list: " +msgstr "" + #: editor/file_type_cache.cpp msgid "Can't open file_type_cache.cch for writing, not saving file type cache!" msgstr "" #: editor/filesystem_dock.cpp -msgid "Cannot navigate to '" +msgid "Cannot navigate to '%s' as it has not been found in the file system!" msgstr "" #: editor/filesystem_dock.cpp @@ -2390,13 +2542,6 @@ msgid "" msgstr "" #: editor/filesystem_dock.cpp -#, fuzzy -msgid "" -"\n" -"Source: " -msgstr "Ressource" - -#: editor/filesystem_dock.cpp msgid "Cannot move/rename resources root." msgstr "" @@ -2658,8 +2803,7 @@ msgid "Remove Poly And Point" msgstr "" #: editor/plugins/abstract_polygon_2d_editor.cpp -#: editor/plugins/light_occluder_2d_editor_plugin.cpp -msgid "Create a new polygon from scratch." +msgid "Create a new polygon from scratch" msgstr "" #: editor/plugins/abstract_polygon_2d_editor.cpp @@ -2670,6 +2814,11 @@ msgid "" "RMB: Erase Point." msgstr "" +#: editor/plugins/abstract_polygon_2d_editor.cpp +#, fuzzy +msgid "Delete points" +msgstr "Optimer Animation" + #: editor/plugins/animation_player_editor_plugin.cpp msgid "Toggle Autoplay" msgstr "" @@ -3008,20 +3157,11 @@ msgid "Can't resolve hostname:" msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Can't resolve." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Connection error, please try again." msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp #, fuzzy -msgid "Can't connect." -msgstr "Forbind..." - -#: editor/plugins/asset_library_editor_plugin.cpp -#, fuzzy msgid "Can't connect to host:" msgstr "Opret forbindelse til Node:" @@ -3030,30 +3170,14 @@ msgid "No response from host:" msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "No response." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Request failed, return code:" msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Req. Failed." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Request failed, too many redirects" msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Redirect Loop." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp -msgid "Failed:" -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Bad download hash, assuming file has been tampered with." msgstr "" @@ -3083,16 +3207,6 @@ msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp #, fuzzy -msgid "Connecting.." -msgstr "Forbind..." - -#: editor/plugins/asset_library_editor_plugin.cpp -#, fuzzy -msgid "Requesting.." -msgstr "Tester" - -#: editor/plugins/asset_library_editor_plugin.cpp -#, fuzzy msgid "Error making request" msgstr "Error loading skrifttype." @@ -3205,6 +3319,38 @@ msgid "Move Action" msgstr "" #: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Move vertical guide" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Create new vertical guide" +msgstr "Opret abonnement" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Remove vertical guide" +msgstr "Fjern Variabel" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Move horizontal guide" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Create new horizontal guide" +msgstr "Opret abonnement" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Remove horizontal guide" +msgstr "Fjerne ugyldige keys" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Create new horizontal and vertical guides" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp msgid "Edit IK Chain" msgstr "" @@ -3326,10 +3472,16 @@ msgid "Snap to other nodes" msgstr "" #: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Snap to guides" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Lock the selected object in place (can't be moved)." msgstr "" #: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Unlock the selected object (can be moved)." msgstr "" @@ -3380,6 +3532,10 @@ msgid "Show rulers" msgstr "" #: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Show guides" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp msgid "Center Selection" msgstr "" @@ -3571,6 +3727,10 @@ msgstr "" msgid "Hold Shift to edit tangents individually" msgstr "" +#: editor/plugins/gi_probe_editor_plugin.cpp +msgid "Bake GI Probe" +msgstr "" + #: editor/plugins/gradient_editor_plugin.cpp msgid "Add/Remove Color Ramp Point" msgstr "" @@ -3603,6 +3763,10 @@ msgid "Create Occluder Polygon" msgstr "" #: editor/plugins/light_occluder_2d_editor_plugin.cpp +msgid "Create a new polygon from scratch." +msgstr "" + +#: editor/plugins/light_occluder_2d_editor_plugin.cpp msgid "Edit existing polygon:" msgstr "" @@ -3618,59 +3782,6 @@ msgstr "" msgid "RMB: Erase Point." msgstr "" -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Remove Point from Line2D" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#, fuzzy -msgid "Add Point to Line2D" -msgstr "GÃ¥ til linje" - -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Move Point in Line2D" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Select Points" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Shift+Drag: Select Control Points" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Click: Add Point" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Right Click: Delete Point" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Add Point (in empty space)" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Split Segment (in line)" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Delete Point" -msgstr "" - #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Mesh is empty!" msgstr "" @@ -4068,16 +4179,46 @@ msgid "Move Out-Control in Curve" msgstr "" #: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Select Points" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Shift+Drag: Select Control Points" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Click: Add Point" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Right Click: Delete Point" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp msgid "Select Control Points (Shift+Drag)" msgstr "" #: editor/plugins/path_2d_editor_plugin.cpp #: editor/plugins/path_editor_plugin.cpp +msgid "Add Point (in empty space)" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp msgid "Split Segment (in curve)" msgstr "" #: editor/plugins/path_2d_editor_plugin.cpp #: editor/plugins/path_editor_plugin.cpp +msgid "Delete Point" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp msgid "Close Curve" msgstr "" @@ -4218,7 +4359,6 @@ msgstr "" #: editor/plugins/resource_preloader_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp #: editor/plugins/sprite_frames_editor_plugin.cpp editor/property_editor.cpp #: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Paste" @@ -4263,6 +4403,21 @@ msgid " Class Reference" msgstr "" #: editor/plugins/script_editor_plugin.cpp +#, fuzzy +msgid "Sort" +msgstr "Sorter:" + +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp +msgid "Move Up" +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp +msgid "Move Down" +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp msgid "Next script" msgstr "" @@ -4315,6 +4470,10 @@ msgstr "" msgid "Close All" msgstr "Luk" +#: editor/plugins/script_editor_plugin.cpp +msgid "Close Other Tabs" +msgstr "" + #: editor/plugins/script_editor_plugin.cpp editor/project_manager.cpp msgid "Run" msgstr "" @@ -4325,13 +4484,11 @@ msgstr "" #: editor/plugins/script_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Find.." msgstr "" #: editor/plugins/script_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Find Next" msgstr "" @@ -4437,33 +4594,22 @@ msgstr "" msgid "Capitalize" msgstr "" -#: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp scene/gui/line_edit.cpp +#: editor/plugins/script_text_editor.cpp scene/gui/line_edit.cpp #: scene/gui/text_edit.cpp msgid "Cut" msgstr "Cut" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp #: editor/plugins/sprite_frames_editor_plugin.cpp editor/property_editor.cpp #: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Copy" msgstr "Kopier" -#: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp scene/gui/line_edit.cpp +#: editor/plugins/script_text_editor.cpp scene/gui/line_edit.cpp #: scene/gui/text_edit.cpp msgid "Select All" msgstr "Vælg alle" -#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp -msgid "Move Up" -msgstr "" - -#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp -msgid "Move Down" -msgstr "" - #: editor/plugins/script_text_editor.cpp #, fuzzy msgid "Delete Line" @@ -4486,6 +4632,23 @@ msgid "Clone Down" msgstr "" #: editor/plugins/script_text_editor.cpp +#, fuzzy +msgid "Fold Line" +msgstr "GÃ¥ til linje" + +#: editor/plugins/script_text_editor.cpp +msgid "Unfold Line" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Fold All Lines" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Unfold All Lines" +msgstr "" + +#: editor/plugins/script_text_editor.cpp msgid "Complete Symbol" msgstr "" @@ -4532,12 +4695,10 @@ msgid "Convert To Lowercase" msgstr "Opret forbindelse til Node:" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Find Previous" msgstr "" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Replace.." msgstr "" @@ -4546,7 +4707,6 @@ msgid "Goto Function.." msgstr "" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Goto Line.." msgstr "" @@ -4711,6 +4871,15 @@ msgid "View Plane Transform." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "Scaling: " +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Translating: " +msgstr "Overgang" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Rotating %s degrees." msgstr "" @@ -4792,6 +4961,10 @@ msgid "Vertices" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "FPS" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Align with view" msgstr "" @@ -4824,6 +4997,16 @@ msgid "View Information" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "View FPS" +msgstr "Fil:" + +#: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Half Resolution" +msgstr "Skalering Valg" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Audio Listener" msgstr "" @@ -4955,6 +5138,11 @@ msgid "Tool Scale" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Toggle Freelook" +msgstr "Skift/Toggle Breakpoint" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Transform" msgstr "" @@ -5232,6 +5420,10 @@ msgid "Create Empty Editor Template" msgstr "" #: editor/plugins/theme_editor_plugin.cpp +msgid "Create From Current Editor Theme" +msgstr "" + +#: editor/plugins/theme_editor_plugin.cpp msgid "CheckBox Radio1" msgstr "" @@ -5407,7 +5599,7 @@ msgid "Runnable" msgstr "" #: editor/project_export.cpp -msgid "Delete patch '" +msgid "Delete patch '%s' from list?" msgstr "" #: editor/project_export.cpp @@ -5707,10 +5899,6 @@ msgid "Add Input Action Event" msgstr "" #: editor/project_settings_editor.cpp editor/settings_config_dialog.cpp -msgid "Meta+" -msgstr "Meta +" - -#: editor/project_settings_editor.cpp editor/settings_config_dialog.cpp msgid "Shift+" msgstr "Shift+" @@ -5833,13 +6021,12 @@ msgid "Select a setting item first!" msgstr "" #: editor/project_settings_editor.cpp -msgid "No property '" +msgid "No property '%s' exists." msgstr "" #: editor/project_settings_editor.cpp -#, fuzzy -msgid "Setting '" -msgstr "Tester" +msgid "Setting '%s' is internal, and it can't be deleted." +msgstr "" #: editor/project_settings_editor.cpp #, fuzzy @@ -6318,6 +6505,15 @@ msgid "Clear a script for the selected node." msgstr "" #: editor/scene_tree_dock.cpp +#, fuzzy +msgid "Remote" +msgstr "Fjern" + +#: editor/scene_tree_dock.cpp +msgid "Local" +msgstr "" + +#: editor/scene_tree_dock.cpp msgid "Clear Inheritance? (No Undo!)" msgstr "" @@ -6509,6 +6705,11 @@ msgid "Attach Node Script" msgstr "" #: editor/script_editor_debugger.cpp +#, fuzzy +msgid "Remote " +msgstr "Fjern" + +#: editor/script_editor_debugger.cpp msgid "Bytes:" msgstr "" @@ -6565,18 +6766,6 @@ msgid "Stack Trace (if applicable):" msgstr "" #: editor/script_editor_debugger.cpp -msgid "Remote Inspector" -msgstr "" - -#: editor/script_editor_debugger.cpp -msgid "Live Scene Tree:" -msgstr "" - -#: editor/script_editor_debugger.cpp -msgid "Remote Object Properties: " -msgstr "" - -#: editor/script_editor_debugger.cpp msgid "Profiler" msgstr "" @@ -6708,49 +6897,49 @@ msgstr "" msgid "GDNative" msgstr "" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp #: modules/visual_script/visual_script_builtin_funcs.cpp msgid "Invalid type argument to convert(), use TYPE_* constants." msgstr "Ugyldigt type argument til convert(), brug TYPE_* konstanter." -#: modules/gdscript/gd_functions.cpp modules/mono/glue/glue_header.h +#: modules/gdscript/gdscript_functions.cpp modules/mono/glue/glue_header.h #: modules/visual_script/visual_script_builtin_funcs.cpp msgid "Not enough bytes for decoding bytes, or invalid format." msgstr "Ikke nok bytes til afkodning af bytes, eller ugyldigt format." -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "step argument is zero!" msgstr "trin argument er nul!" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Not a script with an instance" msgstr "Ikke et script med en instans" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Not based on a script" msgstr "Ikke baseret pÃ¥ et script" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Not based on a resource file" msgstr "Ikke baseret pÃ¥ en ressource fil" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary format (missing @path)" msgstr "Ugyldig instans ordbogs format (mangler @path)" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary format (can't load script at @path)" msgstr "Ugyldig instans ordbogs format (kan ikke indlæse script ved @path)" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary format (invalid script at @path)" msgstr "Ugyldig forekomst ordbog format (ugyldigt script pÃ¥ @path)" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary (invalid subclasses)" msgstr "Ugyldig forekomst ordbog (ugyldige underklasser)" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Object can't provide a length." msgstr "" @@ -6765,15 +6954,23 @@ msgid "GridMap Duplicate Selection" msgstr "Dubler valg" #: modules/gridmap/grid_map_editor_plugin.cpp +msgid "Floor:" +msgstr "" + +#: modules/gridmap/grid_map_editor_plugin.cpp +msgid "Grid Map" +msgstr "" + +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Snap View" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp -msgid "Prev Level (%sDown Wheel)" +msgid "Previous Floor" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp -msgid "Next Level (%sUp Wheel)" +msgid "Next Floor" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp @@ -6844,13 +7041,8 @@ msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp #, fuzzy -msgid "Selection -> Duplicate" -msgstr "Kun Valgte" - -#: modules/gridmap/grid_map_editor_plugin.cpp -#, fuzzy -msgid "Selection -> Clear" -msgstr "Kun Valgte" +msgid "Clear Selection" +msgstr "Skalering Valg" #: modules/gridmap/grid_map_editor_plugin.cpp msgid "GridMap Settings" @@ -6983,7 +7175,7 @@ msgid "Duplicate VisualScript Nodes" msgstr "" #: modules/visual_script/visual_script_editor.cpp -msgid "Hold Meta to drop a Getter. Hold Shift to drop a generic signature." +msgid "Hold %s to drop a Getter. Hold Shift to drop a generic signature." msgstr "" #: modules/visual_script/visual_script_editor.cpp @@ -6991,7 +7183,7 @@ msgid "Hold Ctrl to drop a Getter. Hold Shift to drop a generic signature." msgstr "" #: modules/visual_script/visual_script_editor.cpp -msgid "Hold Meta to drop a simple reference to the node." +msgid "Hold %s to drop a simple reference to the node." msgstr "" #: modules/visual_script/visual_script_editor.cpp @@ -6999,7 +7191,7 @@ msgid "Hold Ctrl to drop a simple reference to the node." msgstr "" #: modules/visual_script/visual_script_editor.cpp -msgid "Hold Meta to drop a Variable Setter." +msgid "Hold %s to drop a Variable Setter." msgstr "" #: modules/visual_script/visual_script_editor.cpp @@ -7243,12 +7435,22 @@ msgstr "Kunne ikke oprette mappe." #: platform/javascript/export/export.cpp #, fuzzy -msgid "Could not read file:\n" +msgid "Could not open template for export:\n" msgstr "Kunne ikke oprette mappe." #: platform/javascript/export/export.cpp #, fuzzy -msgid "Could not open template for export:\n" +msgid "Invalid export template:\n" +msgstr "Ugyldigt index egenskabsnavn." + +#: platform/javascript/export/export.cpp +#, fuzzy +msgid "Could not read custom HTML shell:\n" +msgstr "Kunne ikke oprette mappe." + +#: platform/javascript/export/export.cpp +#, fuzzy +msgid "Could not read boot splash image file:\n" msgstr "Kunne ikke oprette mappe." #: scene/2d/animated_sprite.cpp @@ -7362,22 +7564,6 @@ msgstr "" msgid "Path property must point to a valid Node2D node to work." msgstr "Egenskaben Path skal pege pÃ¥ en gyldig Node2D node for at virke." -#: scene/2d/sprite.cpp -msgid "" -"Path property must point to a valid Viewport node to work. Such Viewport " -"must be set to 'render target' mode." -msgstr "" -"Egenskaben Path skal pege pÃ¥ en gyldig Viewport node for at virke. SÃ¥dan en " -"Viewport skal indstilles til 'render target' tilstand." - -#: scene/2d/sprite.cpp -msgid "" -"The Viewport set in the path property must be set as 'render target' in " -"order for this sprite to work." -msgstr "" -"Viewport angivet i egenskaben path skal indstilles som 'render target' for " -"at denne sprite kan virke." - #: scene/2d/visibility_notifier_2d.cpp msgid "" "VisibilityEnable2D works best when used with the edited scene root directly " @@ -7446,6 +7632,14 @@ msgstr "" "En figur skal gives for at CollisionShape fungerer. Opret en figur ressource " "til det!" +#: scene/3d/gi_probe.cpp +msgid "Plotting Meshes" +msgstr "" + +#: scene/3d/gi_probe.cpp +msgid "Finishing Plot" +msgstr "" + #: scene/3d/navigation_mesh.cpp msgid "A NavigationMesh resource must be set or created for this node to work." msgstr "" @@ -7535,6 +7729,10 @@ msgid "" "minimum size manually." msgstr "" +#: scene/gui/tree.cpp +msgid "(Other)" +msgstr "" + #: scene/main/scene_tree.cpp msgid "" "Default Environment as specified in Project Setings (Rendering -> Viewport -" @@ -7569,6 +7767,45 @@ msgstr "Error loading skrifttype." msgid "Invalid font size." msgstr "Ugyldig skriftstørrelse." +#, fuzzy +#~ msgid "" +#~ "\n" +#~ "Source: " +#~ msgstr "Ressource" + +#, fuzzy +#~ msgid "Add Point to Line2D" +#~ msgstr "GÃ¥ til linje" + +#~ msgid "Meta+" +#~ msgstr "Meta +" + +#, fuzzy +#~ msgid "Setting '" +#~ msgstr "Tester" + +#, fuzzy +#~ msgid "Selection -> Duplicate" +#~ msgstr "Kun Valgte" + +#, fuzzy +#~ msgid "Selection -> Clear" +#~ msgstr "Kun Valgte" + +#~ msgid "" +#~ "Path property must point to a valid Viewport node to work. Such Viewport " +#~ "must be set to 'render target' mode." +#~ msgstr "" +#~ "Egenskaben Path skal pege pÃ¥ en gyldig Viewport node for at virke. SÃ¥dan " +#~ "en Viewport skal indstilles til 'render target' tilstand." + +#~ msgid "" +#~ "The Viewport set in the path property must be set as 'render target' in " +#~ "order for this sprite to work." +#~ msgstr "" +#~ "Viewport angivet i egenskaben path skal indstilles som 'render target' " +#~ "for at denne sprite kan virke." + #~ msgid "Filter:" #~ msgstr "Filter:" diff --git a/editor/translations/de.po b/editor/translations/de.po index 986987978c..9ead7ca6ca 100644 --- a/editor/translations/de.po +++ b/editor/translations/de.po @@ -25,8 +25,8 @@ msgid "" msgstr "" "Project-Id-Version: Godot Engine editor\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2017-10-07 04:45+0000\n" -"Last-Translator: anonymous <>\n" +"PO-Revision-Date: 2017-11-04 09:46+0000\n" +"Last-Translator: So Wieso <sowieso@dukun.de>\n" "Language-Team: German <https://hosted.weblate.org/projects/godot-engine/" "godot/de/>\n" "Language: de\n" @@ -34,7 +34,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 2.17-dev\n" +"X-Generator: Weblate 2.18-dev\n" #: editor/animation_editor.cpp msgid "Disabled" @@ -117,6 +117,7 @@ msgid "Anim Delete Keys" msgstr "Anim Schlüsselbilder löschen" #: editor/animation_editor.cpp editor/plugins/tile_map_editor_plugin.cpp +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Duplicate Selection" msgstr "Auswahl duplizieren" @@ -653,6 +654,13 @@ msgstr "Abhängigkeiteneditor" msgid "Search Replacement Resource:" msgstr "Ersatz-Ressource suchen:" +#: editor/dependency_editor.cpp editor/editor_file_dialog.cpp +#: editor/editor_help.cpp editor/editor_node.cpp editor/filesystem_dock.cpp +#: editor/plugins/script_editor_plugin.cpp editor/property_selector.cpp +#: editor/quick_open.cpp scene/gui/file_dialog.cpp +msgid "Open" +msgstr "Öffnen" + #: editor/dependency_editor.cpp msgid "Owners Of:" msgstr "Besitzer von:" @@ -672,9 +680,8 @@ msgstr "" "Trotzdem entfernen? (Nicht Wiederherstellbar)" #: editor/dependency_editor.cpp -#, fuzzy msgid "Cannot remove:\n" -msgstr "Kann nicht auflösen." +msgstr "Kann nicht entfernt werden:\n" #: editor/dependency_editor.cpp msgid "Error loading:" @@ -727,6 +734,16 @@ msgstr "Ausgewählte Dateien löschen?" msgid "Delete" msgstr "Löschen" +#: editor/dictionary_property_edit.cpp +#, fuzzy +msgid "Change Dictionary Key" +msgstr "Animationsname ändern:" + +#: editor/dictionary_property_edit.cpp +#, fuzzy +msgid "Change Dictionary Value" +msgstr "Array-Wert ändern" + #: editor/editor_about.cpp msgid "Thanks from the Godot community!" msgstr "Danke von der Godot-Gemeinschaft!" @@ -761,32 +778,31 @@ msgstr "Autoren" #: editor/editor_about.cpp msgid "Platinum Sponsors" -msgstr "" +msgstr "Platin Sponsoren" #: editor/editor_about.cpp msgid "Gold Sponsors" -msgstr "" +msgstr "Gold Sponsoren" #: editor/editor_about.cpp msgid "Mini Sponsors" -msgstr "" +msgstr "Klein Sponsoren" #: editor/editor_about.cpp msgid "Gold Donors" -msgstr "" +msgstr "Gold Unterstützer" #: editor/editor_about.cpp msgid "Silver Donors" -msgstr "" +msgstr "Silber Unterstützer" #: editor/editor_about.cpp -#, fuzzy msgid "Bronze Donors" -msgstr "Klone herunter" +msgstr "Bronze Unterstützer" #: editor/editor_about.cpp msgid "Donors" -msgstr "" +msgstr "Unterstützer" #: editor/editor_about.cpp msgid "License" @@ -827,7 +843,7 @@ msgstr "Fehler beim Öffnen der Paketdatei, kein Zip-Format." #: editor/editor_asset_installer.cpp msgid "Uncompressing Assets" -msgstr "Entpacke Assets" +msgstr "Entpacke Nutzerinhalte" #: editor/editor_asset_installer.cpp editor/project_manager.cpp msgid "Package Installed Successfully!" @@ -914,9 +930,8 @@ msgid "Duplicate" msgstr "Duplizieren" #: editor/editor_audio_buses.cpp -#, fuzzy msgid "Reset Volume" -msgstr "Vergrößerung zurücksetzen" +msgstr "Lautstärke zurücksetzen" #: editor/editor_audio_buses.cpp msgid "Delete Effect" @@ -939,9 +954,8 @@ msgid "Duplicate Audio Bus" msgstr "Audiobus duplizieren" #: editor/editor_audio_buses.cpp -#, fuzzy msgid "Reset Bus Volume" -msgstr "Vergrößerung zurücksetzen" +msgstr "Bus-Lautstärke zurücksetzen" #: editor/editor_audio_buses.cpp msgid "Move Audio Bus" @@ -1157,12 +1171,6 @@ msgstr "Alle bekannte Dateitypen" msgid "All Files (*)" msgstr "Alle Dateien (*)" -#: editor/editor_file_dialog.cpp editor/editor_help.cpp editor/editor_node.cpp -#: editor/filesystem_dock.cpp editor/plugins/script_editor_plugin.cpp -#: editor/property_selector.cpp editor/quick_open.cpp scene/gui/file_dialog.cpp -msgid "Open" -msgstr "Öffnen" - #: editor/editor_file_dialog.cpp scene/gui/file_dialog.cpp msgid "Open a File" msgstr "Datei öffnen" @@ -1230,9 +1238,8 @@ msgid "Move Favorite Down" msgstr "Favorit nach unten schieben" #: editor/editor_file_dialog.cpp -#, fuzzy msgid "Go to parent folder" -msgstr "Ordner konnte nicht erstellt werden." +msgstr "Gehe zu übergeordnetem Ordner" #: editor/editor_file_dialog.cpp scene/gui/file_dialog.cpp msgid "Directories & Files:" @@ -1257,7 +1264,7 @@ msgstr "Lese Quellen" #: editor/editor_file_system.cpp msgid "(Re)Importing Assets" -msgstr "Importiere Assets erneut" +msgstr "Importiere Nutzerinhalte erneut" #: editor/editor_help.cpp editor/editor_node.cpp #: editor/plugins/script_editor_plugin.cpp @@ -1293,27 +1300,24 @@ msgid "Brief Description:" msgstr "Kurze Beschreibung:" #: editor/editor_help.cpp -#, fuzzy msgid "Members" -msgstr "Mitglieder:" +msgstr "Mitglieder" #: editor/editor_help.cpp modules/visual_script/visual_script_editor.cpp msgid "Members:" msgstr "Mitglieder:" #: editor/editor_help.cpp -#, fuzzy msgid "Public Methods" -msgstr "Öffentliche Methoden:" +msgstr "Öffentliche Methoden" #: editor/editor_help.cpp msgid "Public Methods:" msgstr "Öffentliche Methoden:" #: editor/editor_help.cpp -#, fuzzy msgid "GUI Theme Items" -msgstr "GUI-Theme-Elemente:" +msgstr "Oberflächen-Thema-Elemente:" #: editor/editor_help.cpp msgid "GUI Theme Items:" @@ -1337,23 +1341,20 @@ msgid "enum " msgstr "Enum " #: editor/editor_help.cpp -#, fuzzy msgid "Constants" -msgstr "Konstanten:" +msgstr "Konstanten" #: editor/editor_help.cpp msgid "Constants:" msgstr "Konstanten:" #: editor/editor_help.cpp -#, fuzzy msgid "Description" -msgstr "Beschreibung:" +msgstr "Beschreibung" #: editor/editor_help.cpp -#, fuzzy msgid "Properties" -msgstr "Eigenschaften:" +msgstr "Eigenschaften" #: editor/editor_help.cpp msgid "Property Description:" @@ -1364,11 +1365,12 @@ msgid "" "There is currently no description for this property. Please help us by " "[color=$color][url=$url]contributing one[/url][/color]!" msgstr "" +"Es gibt zurzeit keine Beschreibung dieses Objekts. [color=$color][url=" +"$url]Ergänzungen durch eigene Beiträge[/url][/color] sind sehr erwünscht!" #: editor/editor_help.cpp -#, fuzzy msgid "Methods" -msgstr "Methodenliste:" +msgstr "Methoden" #: editor/editor_help.cpp msgid "Method Description:" @@ -1379,6 +1381,8 @@ msgid "" "There is currently no description for this method. Please help us by [color=" "$color][url=$url]contributing one[/url][/color]!" msgstr "" +"Es gibt zurzeit keine Beschreibung dieser Methode. [color=$color][url=" +"$url]Ergänzungen durch eigene Beiträge[/url][/color] sind sehr erwünscht!" #: editor/editor_help.cpp msgid "Search Text" @@ -1420,28 +1424,24 @@ msgid "Error while saving." msgstr "Fehler beim speichern." #: editor/editor_node.cpp -#, fuzzy msgid "Can't open '%s'." -msgstr "Kann mit ‚..‘ nicht arbeiten" +msgstr "‚%s‘ kann nicht geöffnet werden." #: editor/editor_node.cpp -#, fuzzy msgid "Error while parsing '%s'." -msgstr "Fehler beim speichern." +msgstr "Fehler beim Parsen von ‚%s‘." #: editor/editor_node.cpp msgid "Unexpected end of file '%s'." -msgstr "" +msgstr "Unerwartetes Dateiende ‚%s‘." #: editor/editor_node.cpp -#, fuzzy msgid "Missing '%s' or its dependencies." -msgstr "Szene '%s' hat defekte Abhängigkeiten:" +msgstr "‚%s‘ oder zugehörige Abhängigkeiten fehlen." #: editor/editor_node.cpp -#, fuzzy msgid "Error while loading '%s'." -msgstr "Fehler beim speichern." +msgstr "Fehler beim Laden von ‚%s‘." #: editor/editor_node.cpp msgid "Saving Scene" @@ -1508,18 +1508,27 @@ msgid "" "Please read the documentation relevant to importing scenes to better " "understand this workflow." msgstr "" +"Diese Ressource gehört zu einer importierten Szene, sie ist nicht " +"bearbeitbar.\n" +"Die Dokumentation zum Szenenimport beschreibt den nötigen Arbeitsablauf." #: editor/editor_node.cpp msgid "" "This resource belongs to a scene that was instanced or inherited.\n" "Changes to it will not be kept when saving the current scene." msgstr "" +"Diese Ressource gehört zu einer instantiierten oder geerbten Szene.\n" +"Änderungen an der Ressource werden beim Speichern der Szene nicht " +"mitgespeichert." #: editor/editor_node.cpp msgid "" "This resource was imported, so it's not editable. Change its settings in the " "import panel and then re-import." msgstr "" +"Diese Ressource wurde importiert und ist nicht bearbeitbar. Es kann " +"allerdings ein Neu-Import mit geänderten Einstellungen im Import-Menü " +"durchgeführt werden." #: editor/editor_node.cpp msgid "" @@ -1528,6 +1537,20 @@ msgid "" "Please read the documentation relevant to importing scenes to better " "understand this workflow." msgstr "" +"Diese Szene wurde importiert, Änderungen an ihr werden nicht gespeichert.\n" +"Instantiierung oder Vererbung sind nötig um Änderungen vorzunehmen.\n" +"Die Dokumentation zum Szenenimport beschreibt den nötigen Arbeitsablauf." + +#: editor/editor_node.cpp +#, fuzzy +msgid "" +"This is a remote object so changes to it will not be kept.\n" +"Please read the documentation relevant to debugging to better understand " +"this workflow." +msgstr "" +"Diese Ressource gehört zu einer importierten Szene, sie ist nicht " +"bearbeitbar.\n" +"Die Dokumentation zum Szenenimport beschreibt den nötigen Arbeitsablauf." #: editor/editor_node.cpp msgid "Copy Params" @@ -1650,6 +1673,11 @@ msgid "Export Mesh Library" msgstr "MeshLibrary exportieren" #: editor/editor_node.cpp +#, fuzzy +msgid "This operation can't be done without a root node." +msgstr "Diese Aktion kann nicht ohne ein ausgewähltes Node ausgeführt werden." + +#: editor/editor_node.cpp msgid "Export Tile Set" msgstr "Tileset exportieren" @@ -1710,37 +1738,41 @@ msgid "" "This option is deprecated. Situations where refresh must be forced are now " "considered a bug. Please report." msgstr "" +"Diese Option ist veraltet. Situationen die Neu-Laden erzwingen werden jetzt " +"als Fehler betrachtet. Meldung erwünscht." #: editor/editor_node.cpp msgid "Pick a Main Scene" msgstr "Wähle eine Hauptszene" #: editor/editor_node.cpp -#, fuzzy msgid "Unable to enable addon plugin at: '%s' parsing of config failed." -msgstr "Plugin bei ‚" +msgstr "" +"Erweiterung lässt sich nicht aktivieren: ‚%‘ Parsen der Konfiguration " +"fehlgeschlagen." #: editor/editor_node.cpp -#, fuzzy msgid "Unable to find script field for addon plugin at: 'res://addons/%s'." msgstr "" -"Skript-Feld für Addon-Plugin in ‚res://addons/‘ konnte nicht gefunden werden." +"Skript-Feld für Erweiterung in ‚res://addons/%s‘ konnte nicht gefunden " +"werden." #: editor/editor_node.cpp -#, fuzzy msgid "Unable to load addon script from path: '%s'." -msgstr "AddOn-Skript konnte nicht geladen werden: '" +msgstr "Erweiterungsskript konnte nicht geladen werden: ‚%s‘." #: editor/editor_node.cpp -#, fuzzy msgid "" "Unable to load addon script from path: '%s' Base type is not EditorPlugin." -msgstr "AddOn-Skript konnte nicht geladen werden: '" +msgstr "" +"Erweiterungsskript konnte nicht geladen werden: ‚%s‘ Basistyp ist nicht " +"EditorPlugin." #: editor/editor_node.cpp -#, fuzzy msgid "Unable to load addon script from path: '%s' Script is not in tool mode." -msgstr "AddOn-Skript konnte nicht geladen werden: '" +msgstr "" +"Erweiterungsskript konnte nicht geladen werden: ‚%s‘ Skript ist nicht im " +"Werkzeugmodus." #: editor/editor_node.cpp msgid "" @@ -1771,9 +1803,8 @@ msgid "Scene '%s' has broken dependencies:" msgstr "Szene '%s' hat defekte Abhängigkeiten:" #: editor/editor_node.cpp -#, fuzzy msgid "Clear Recent Scenes" -msgstr "Letzte Dateien leeren" +msgstr "Verlauf leeren" #: editor/editor_node.cpp msgid "Save Layout" @@ -1793,12 +1824,23 @@ msgid "Switch Scene Tab" msgstr "Szenentab wechseln" #: editor/editor_node.cpp -msgid "%d more file(s)" +#, fuzzy +msgid "%d more files or folders" +msgstr "%d weitere Datei(en) oder Ordner" + +#: editor/editor_node.cpp +#, fuzzy +msgid "%d more folders" msgstr "%d weitere Datei(en)" #: editor/editor_node.cpp -msgid "%d more file(s) or folder(s)" -msgstr "%d weitere Datei(en) oder Ordner" +#, fuzzy +msgid "%d more files" +msgstr "%d weitere Datei(en)" + +#: editor/editor_node.cpp +msgid "Dock Position" +msgstr "" #: editor/editor_node.cpp msgid "Distraction Free Mode" @@ -1809,6 +1851,11 @@ msgid "Toggle distraction-free mode." msgstr "Ablenkungsfreien Modus umschalten." #: editor/editor_node.cpp +#, fuzzy +msgid "Add a new scene." +msgstr "Neue Spuren hinzufügen." + +#: editor/editor_node.cpp msgid "Scene" msgstr "Szene" @@ -1873,13 +1920,12 @@ msgid "TileSet.." msgstr "TileSet.." #: editor/editor_node.cpp editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp scene/gui/line_edit.cpp -#: scene/gui/text_edit.cpp +#: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Undo" msgstr "Rückgängig machen" #: editor/editor_node.cpp editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp +#: scene/gui/line_edit.cpp msgid "Redo" msgstr "Wiederherstellen" @@ -2149,9 +2195,8 @@ msgid "Object properties." msgstr "Objekteigenschaften." #: editor/editor_node.cpp -#, fuzzy msgid "Changes may be lost!" -msgstr "Ändere Bildergruppe" +msgstr "Änderungen können verloren gehen!" #: editor/editor_node.cpp editor/plugins/asset_library_editor_plugin.cpp #: editor/project_manager.cpp @@ -2224,7 +2269,7 @@ msgstr "Skripteditor öffnen" #: editor/editor_node.cpp msgid "Open Asset Library" -msgstr "Öffne Bibliothek" +msgstr "Öffne Nutzerinhalte-Bibliothek" #: editor/editor_node.cpp msgid "Open the next Editor" @@ -2235,9 +2280,8 @@ msgid "Open the previous Editor" msgstr "Vorigen Editor öffnen" #: editor/editor_plugin.cpp -#, fuzzy msgid "Creating Mesh Previews" -msgstr "Erzeuge MeshLibrary" +msgstr "Mesh-Vorschauen erzeugen" #: editor/editor_plugin.cpp msgid "Thumbnail.." @@ -2289,9 +2333,8 @@ msgid "Frame %" msgstr "Bild %" #: editor/editor_profiler.cpp -#, fuzzy msgid "Physics Frame %" -msgstr "Fixiertes Bild %" +msgstr "Physik-Frame %" #: editor/editor_profiler.cpp editor/script_editor_debugger.cpp msgid "Time:" @@ -2386,6 +2429,11 @@ msgid "(Current)" msgstr "(Aktuell)" #: editor/export_template_manager.cpp +#, fuzzy +msgid "Retrieving mirrors, please wait.." +msgstr "Verbindungsfehler, bitte erneut versuchen." + +#: editor/export_template_manager.cpp msgid "Remove template version '%s'?" msgstr "Template-Version ‚%s‘ entfernen?" @@ -2422,6 +2470,112 @@ msgid "Importing:" msgstr "Importiere:" #: editor/export_template_manager.cpp +msgid "" +"No download links found for this version. Direct download is only available " +"for official releases." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Can't resolve." +msgstr "Kann nicht auflösen." + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Can't connect." +msgstr "Kann nicht verbinden." + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "No response." +msgstr "Keine Antwort." + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Req. Failed." +msgstr "Anfrage fehlgeschlagen." + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Redirect Loop." +msgstr "Weiterleitungsschleife." + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Failed:" +msgstr "Fehlgeschlagen:" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Can't write file." +msgstr "Konnte Datei nicht schreiben:\n" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Download Complete." +msgstr "Ãœbertragungsfehler" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Error requesting url: " +msgstr "Fehler beim speichern des Atlas:" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Connecting to Mirror.." +msgstr "Verbinde.." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Disconnected" +msgstr "Trennen" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Resolving" +msgstr "Löse auf.." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Can't Resolve" +msgstr "Kann nicht auflösen." + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Connecting.." +msgstr "Verbinde.." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Can't Conect" +msgstr "Kann nicht verbinden." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Connected" +msgstr "Verbinden" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Requesting.." +msgstr "Frage an.." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Downloading" +msgstr "Herunterladen" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Connection Error" +msgstr "Verbinde.." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "SSL Handshake Error" +msgstr "Ladefehler" + +#: editor/export_template_manager.cpp msgid "Current Version:" msgstr "Aktuelle Version:" @@ -2445,6 +2599,16 @@ msgstr "Vorlagendatei wählen" msgid "Export Template Manager" msgstr "Exportvorlagenverwaltung" +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Download Templates" +msgstr "Vorlagen" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Select mirror from list: " +msgstr "Gerät aus Liste auswählen" + #: editor/file_type_cache.cpp msgid "Can't open file_type_cache.cch for writing, not saving file type cache!" msgstr "" @@ -2452,83 +2616,68 @@ msgstr "" "Der Dateityp-Cache wird nicht gespeichert!" #: editor/filesystem_dock.cpp -msgid "Cannot navigate to '" -msgstr "Kann Ordner ‚" +msgid "Cannot navigate to '%s' as it has not been found in the file system!" +msgstr "" #: editor/filesystem_dock.cpp msgid "View items as a grid of thumbnails" -msgstr "" +msgstr "Einträge in Vorschaugitter anzeigen" #: editor/filesystem_dock.cpp msgid "View items as a list" -msgstr "" +msgstr "Einträge als Liste anzeigen" #: editor/filesystem_dock.cpp msgid "" "\n" "Status: Import of file failed. Please fix file and reimport manually." msgstr "" - -#: editor/filesystem_dock.cpp -msgid "" -"\n" -"Source: " -msgstr "" "\n" -"Quelle: " +"Status: Dateiimport fehlgeschlagen. Manuelle Reparatur und Neuimport nötig." #: editor/filesystem_dock.cpp -#, fuzzy msgid "Cannot move/rename resources root." -msgstr "Quellschriftart kann nicht geladen/verarbeitet werden." +msgstr "Ressourcen-Wurzel kann nicht verschoben oder umbenannt werden." #: editor/filesystem_dock.cpp -#, fuzzy msgid "Cannot move a folder into itself.\n" -msgstr "Datei kann nicht in sich selbst importiert werden:" +msgstr "Ordner kann nicht in sich selbst verschoben werden.\n" #: editor/filesystem_dock.cpp -#, fuzzy msgid "Error moving:\n" -msgstr "Fehler beim Verzeichnisverschieben:\n" +msgstr "Fehler beim Verschieben:\n" #: editor/filesystem_dock.cpp -#, fuzzy msgid "Unable to update dependencies:\n" -msgstr "Szene '%s' hat defekte Abhängigkeiten:" +msgstr "Fehler beim Aktualisieren der Abhängigkeiten:\n" #: editor/filesystem_dock.cpp msgid "No name provided" -msgstr "" +msgstr "Kein Name angegeben" #: editor/filesystem_dock.cpp msgid "Provided name contains invalid characters" -msgstr "" +msgstr "Angegebener Name enthält ungültige Zeichen" #: editor/filesystem_dock.cpp -#, fuzzy msgid "No name provided." -msgstr "Umbenennen oder Verschieben.." +msgstr "Kein Name angegeben." #: editor/filesystem_dock.cpp -#, fuzzy msgid "Name contains invalid characters." -msgstr "Gültige Zeichen:" +msgstr "Name enthält ungültige Zeichen." #: editor/filesystem_dock.cpp -#, fuzzy msgid "A file or folder with this name already exists." -msgstr "Gruppenname existiert bereits!" +msgstr "Es existiert bereits eine Datei oder ein Ordner mit diesem Namen." #: editor/filesystem_dock.cpp -#, fuzzy msgid "Renaming file:" -msgstr "Variable umbenennen" +msgstr "Benenne Datei um:" #: editor/filesystem_dock.cpp -#, fuzzy msgid "Renaming folder:" -msgstr "Node umbenennen" +msgstr "Benenne Ordner um:" #: editor/filesystem_dock.cpp msgid "Expand all" @@ -2543,18 +2692,16 @@ msgid "Copy Path" msgstr "Pfad kopieren" #: editor/filesystem_dock.cpp -#, fuzzy msgid "Rename.." -msgstr "Umbenennen" +msgstr "Umbenennen.." #: editor/filesystem_dock.cpp msgid "Move To.." msgstr "Verschiebe zu.." #: editor/filesystem_dock.cpp -#, fuzzy msgid "New Folder.." -msgstr "Ordner erstellen" +msgstr "Neuer Ordner.." #: editor/filesystem_dock.cpp msgid "Show In File Manager" @@ -2622,9 +2769,8 @@ msgid "Import as Single Scene" msgstr "Als einzelne Szene importieren" #: editor/import/resource_importer_scene.cpp -#, fuzzy msgid "Import with Separate Animations" -msgstr "Import mit separaten Materialien" +msgstr "Import mit separaten Animationen" #: editor/import/resource_importer_scene.cpp msgid "Import with Separate Materials" @@ -2639,19 +2785,16 @@ msgid "Import with Separate Objects+Materials" msgstr "Import mit separaten Objekten und Materialien" #: editor/import/resource_importer_scene.cpp -#, fuzzy msgid "Import with Separate Objects+Animations" -msgstr "Import mit separaten Objekten und Materialien" +msgstr "Import mit separaten Objekten und Animationen" #: editor/import/resource_importer_scene.cpp -#, fuzzy msgid "Import with Separate Materials+Animations" -msgstr "Import mit separaten Materialien" +msgstr "Import mit separaten Materialien und Animationen" #: editor/import/resource_importer_scene.cpp -#, fuzzy msgid "Import with Separate Objects+Materials+Animations" -msgstr "Import mit separaten Objekten und Materialien" +msgstr "Import mit separaten Objekten, Materialien und Animationen" #: editor/import/resource_importer_scene.cpp msgid "Import as Multiple Scenes" @@ -2738,9 +2881,8 @@ msgid "Edit Poly" msgstr "Polygon bearbeiten" #: editor/plugins/abstract_polygon_2d_editor.cpp -#, fuzzy msgid "Insert Point" -msgstr "Füge Ein" +msgstr "Punkt einfügen" #: editor/plugins/abstract_polygon_2d_editor.cpp #: editor/plugins/collision_polygon_editor_plugin.cpp @@ -2753,8 +2895,8 @@ msgid "Remove Poly And Point" msgstr "Polygon und Punkt entfernen" #: editor/plugins/abstract_polygon_2d_editor.cpp -#: editor/plugins/light_occluder_2d_editor_plugin.cpp -msgid "Create a new polygon from scratch." +#, fuzzy +msgid "Create a new polygon from scratch" msgstr "Polygon von Grund auf neu erstellen." #: editor/plugins/abstract_polygon_2d_editor.cpp @@ -2769,6 +2911,11 @@ msgstr "" "Strg+LMT: Segment aufteilen.\n" "RMT: Punkt löschen." +#: editor/plugins/abstract_polygon_2d_editor.cpp +#, fuzzy +msgid "Delete points" +msgstr "Punk löschen" + #: editor/plugins/animation_player_editor_plugin.cpp msgid "Toggle Autoplay" msgstr "Automatisches Abspielen umschalten" @@ -3103,18 +3250,10 @@ msgid "Can't resolve hostname:" msgstr "Kann Hostnamen nicht auflösen:" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Can't resolve." -msgstr "Kann nicht auflösen." - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Connection error, please try again." msgstr "Verbindungsfehler, bitte erneut versuchen." #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Can't connect." -msgstr "Kann nicht verbinden." - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Can't connect to host:" msgstr "Kann nicht zu Host verbinden:" @@ -3123,30 +3262,14 @@ msgid "No response from host:" msgstr "Keine Antwort von Host:" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "No response." -msgstr "Keine Antwort." - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Request failed, return code:" msgstr "Anfrage fehlgeschlagen: Rückgabewert:" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Req. Failed." -msgstr "Anfrage fehlgeschlagen." - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Request failed, too many redirects" msgstr "Anfrage fehlgeschlagen, zu viele Weiterleitungen" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Redirect Loop." -msgstr "Weiterleitungsschleife." - -#: editor/plugins/asset_library_editor_plugin.cpp -msgid "Failed:" -msgstr "Fehlgeschlagen:" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Bad download hash, assuming file has been tampered with." msgstr "Falsche Download-Prüfsumme, Datei könnte manipuliert worden sein." @@ -3164,7 +3287,7 @@ msgstr "Sha256-Prüfung fehlgeschlagen" #: editor/plugins/asset_library_editor_plugin.cpp msgid "Asset Download Error:" -msgstr "Asset-Download-Fehler:" +msgstr "Nutzerinhalte-Download-Fehler:" #: editor/plugins/asset_library_editor_plugin.cpp msgid "Fetching:" @@ -3175,14 +3298,6 @@ msgid "Resolving.." msgstr "Löse auf.." #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Connecting.." -msgstr "Verbinde.." - -#: editor/plugins/asset_library_editor_plugin.cpp -msgid "Requesting.." -msgstr "Frage an.." - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Error making request" msgstr "Fehler bei Anfrage" @@ -3200,7 +3315,7 @@ msgstr "Ãœbertragungsfehler" #: editor/plugins/asset_library_editor_plugin.cpp msgid "Download for this asset is already in progress!" -msgstr "Dieser Posten wird bereits herunter geladen!" +msgstr "Dieser Nutzerinhalt wird bereits herunter geladen!" #: editor/plugins/asset_library_editor_plugin.cpp msgid "first" @@ -3258,7 +3373,7 @@ msgstr "Testphase" #: editor/plugins/asset_library_editor_plugin.cpp msgid "Assets ZIP File" -msgstr "Projektdaten als ZIP-Datei" +msgstr "Nutzerinhalte als ZIP-Datei" #: editor/plugins/camera_editor_plugin.cpp msgid "Preview" @@ -3295,6 +3410,39 @@ msgid "Move Action" msgstr "Aktion verschieben" #: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Move vertical guide" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Create new vertical guide" +msgstr "Neue Skriptdatei erstellen" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Remove vertical guide" +msgstr "Variable entfernen" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Move horizontal guide" +msgstr "Punkt auf Kurve verschieben" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Create new horizontal guide" +msgstr "Neue Skriptdatei erstellen" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Remove horizontal guide" +msgstr "Ungültige Schlüsselbilder entfernen" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Create new horizontal and vertical guides" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp msgid "Edit IK Chain" msgstr "IK-Kette bearbeiten" @@ -3303,14 +3451,12 @@ msgid "Edit CanvasItem" msgstr "CanvasItem bearbeiten" #: editor/plugins/canvas_item_editor_plugin.cpp -#, fuzzy msgid "Anchors only" -msgstr "Anker" +msgstr "nur Anker" #: editor/plugins/canvas_item_editor_plugin.cpp -#, fuzzy msgid "Change Anchors and Margins" -msgstr "Ankerpunkte ändern" +msgstr "Anker und Ränder ändern" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Change Anchors" @@ -3369,9 +3515,8 @@ msgid "Pan Mode" msgstr "Schwenkmodus" #: editor/plugins/canvas_item_editor_plugin.cpp -#, fuzzy msgid "Toggles snapping" -msgstr "Haltepunkt umschalten" +msgstr "Einrasten umschalten" #: editor/plugins/canvas_item_editor_plugin.cpp #: editor/plugins/spatial_editor_plugin.cpp @@ -3379,23 +3524,20 @@ msgid "Use Snap" msgstr "Einrasten aktivieren" #: editor/plugins/canvas_item_editor_plugin.cpp -#, fuzzy msgid "Snapping options" -msgstr "Animationseinstellungen" +msgstr "Einrasteinstellungen" #: editor/plugins/canvas_item_editor_plugin.cpp -#, fuzzy msgid "Snap to grid" -msgstr "Einrastmodus:" +msgstr "Am Gitter einrasten" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Use Rotation Snap" msgstr "Rotationsraster benutzen" #: editor/plugins/canvas_item_editor_plugin.cpp -#, fuzzy msgid "Configure Snap..." -msgstr "Einrasten konfigurieren.." +msgstr "Einrasten konfigurieren..." #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Snap Relative" @@ -3407,31 +3549,37 @@ msgstr "Pixelraster benutzen" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Smart snapping" -msgstr "" +msgstr "Intelligentes Einrasten" #: editor/plugins/canvas_item_editor_plugin.cpp -#, fuzzy msgid "Snap to parent" -msgstr "Auf übergeordnetes Node ausdehnen" +msgstr "An Elternobjekt einrasten" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Snap to node anchor" -msgstr "" +msgstr "Am Node-Anker einrasten" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Snap to node sides" -msgstr "" +msgstr "An Node-Seiten einrasten" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Snap to other nodes" -msgstr "" +msgstr "An anderen Nodes einrasten" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Snap to guides" +msgstr "Am Gitter einrasten" #: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Lock the selected object in place (can't be moved)." msgstr "" "Das ausgewählte Objekt an seiner Position sperren (kann nicht bewegt werden)." #: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Unlock the selected object (can be moved)." msgstr "Das ausgewählte Objekt entsperren (kann bewegt werden)." @@ -3474,14 +3622,17 @@ msgid "Show Grid" msgstr "Raster anzeigen" #: editor/plugins/canvas_item_editor_plugin.cpp -#, fuzzy msgid "Show helpers" -msgstr "Knochen anzeigen" +msgstr "Helfer anzeigen" #: editor/plugins/canvas_item_editor_plugin.cpp -#, fuzzy msgid "Show rulers" -msgstr "Knochen anzeigen" +msgstr "Lineale anzeigen" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Show guides" +msgstr "Lineale anzeigen" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Center Selection" @@ -3492,9 +3643,8 @@ msgid "Frame Selection" msgstr "Auswahl einrahmen" #: editor/plugins/canvas_item_editor_plugin.cpp -#, fuzzy msgid "Layout" -msgstr "Layout speichern" +msgstr "Layout" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Insert Keys" @@ -3518,20 +3668,19 @@ msgstr "Pose zurücksetzen" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Drag pivot from mouse position" -msgstr "" +msgstr "Pivotpunkt von Mauszeigerposition ziehen" #: editor/plugins/canvas_item_editor_plugin.cpp -#, fuzzy msgid "Set pivot at mouse position" -msgstr "Position der Ausgangskurve setzen" +msgstr "Pivotpunkt auf Mausposition setzen" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Multiply grid step by 2" -msgstr "" +msgstr "Gitterstufe verdoppeln" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Divide grid step by 2" -msgstr "" +msgstr "Gitterstufe halbieren" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Add %s" @@ -3610,25 +3759,23 @@ msgstr "Aus Szene aktualisieren" #: editor/plugins/curve_editor_plugin.cpp msgid "Flat0" -msgstr "" +msgstr "Flach0" #: editor/plugins/curve_editor_plugin.cpp msgid "Flat1" -msgstr "" +msgstr "Flach1" #: editor/plugins/curve_editor_plugin.cpp -#, fuzzy msgid "Ease in" -msgstr "Einblenden" +msgstr "Einspannen" #: editor/plugins/curve_editor_plugin.cpp -#, fuzzy msgid "Ease out" -msgstr "Ausblenden" +msgstr "Ausspannen" #: editor/plugins/curve_editor_plugin.cpp msgid "Smoothstep" -msgstr "" +msgstr "Sanft-Stufig" #: editor/plugins/curve_editor_plugin.cpp msgid "Modify Curve Point" @@ -3674,6 +3821,10 @@ msgstr "Lineare Kurventangente umschalten" msgid "Hold Shift to edit tangents individually" msgstr "Umsch halten um Tangenten einzeln zu bearbeiten" +#: editor/plugins/gi_probe_editor_plugin.cpp +msgid "Bake GI Probe" +msgstr "" + #: editor/plugins/gradient_editor_plugin.cpp msgid "Add/Remove Color Ramp Point" msgstr "Farbverlaufspunkt hinzufügen/entfernen" @@ -3708,6 +3859,10 @@ msgid "Create Occluder Polygon" msgstr "Occluder-Polygon erzeugen" #: editor/plugins/light_occluder_2d_editor_plugin.cpp +msgid "Create a new polygon from scratch." +msgstr "Polygon von Grund auf neu erstellen." + +#: editor/plugins/light_occluder_2d_editor_plugin.cpp msgid "Edit existing polygon:" msgstr "Bestehendes Polygon bearbeiten:" @@ -3723,58 +3878,6 @@ msgstr "Strg+LMT: Segment aufteilen." msgid "RMB: Erase Point." msgstr "RMT: Punkt entfernen." -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Remove Point from Line2D" -msgstr "Punkt von Line2D entfernen" - -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Add Point to Line2D" -msgstr "Punkt zu Line2D hinzufügen" - -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Move Point in Line2D" -msgstr "Punkt in Line2D verschieben" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Select Points" -msgstr "Punkte auswählen" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Shift+Drag: Select Control Points" -msgstr "Shift+Ziehen: Kontrollpunkte auswählen" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Click: Add Point" -msgstr "Klicken: Punkt hinzufügen" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Right Click: Delete Point" -msgstr "Rechtsklick: Punkt löschen" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Add Point (in empty space)" -msgstr "Punkt hinzufügen (in leerem Raum)" - -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Split Segment (in line)" -msgstr "Segment aufteilen (in Linie)" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Delete Point" -msgstr "Punk löschen" - #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Mesh is empty!" msgstr "Mesh ist leer!" @@ -3957,73 +4060,64 @@ msgid "Bake!" msgstr "Backen!" #: editor/plugins/navigation_mesh_editor_plugin.cpp -#, fuzzy msgid "Bake the navigation mesh.\n" -msgstr "Navigations-Mesh erzeugen" +msgstr "Navigations-Mesh erzeugen.\n" #: editor/plugins/navigation_mesh_editor_plugin.cpp -#, fuzzy msgid "Clear the navigation mesh." -msgstr "Navigations-Mesh erzeugen" +msgstr "Navigations-Mesh löschen." #: editor/plugins/navigation_mesh_generator.cpp msgid "Setting up Configuration..." -msgstr "" +msgstr "Konfiguration wird erstellt..." #: editor/plugins/navigation_mesh_generator.cpp msgid "Calculating grid size..." -msgstr "" +msgstr "Gittergröße wird berechnet..." #: editor/plugins/navigation_mesh_generator.cpp -#, fuzzy msgid "Creating heightfield..." -msgstr "erstelle Licht-Octree" +msgstr "Höhenmodell erstellen..." #: editor/plugins/navigation_mesh_generator.cpp -#, fuzzy msgid "Marking walkable triangles..." -msgstr "Ãœbersetzbare Textbausteine.." +msgstr "Begehbare Dreiecke markieren..." #: editor/plugins/navigation_mesh_generator.cpp msgid "Constructing compact heightfield..." -msgstr "" +msgstr "Kompaktes Höhenmodell wir konstruiert..." #: editor/plugins/navigation_mesh_generator.cpp msgid "Eroding walkable area..." -msgstr "" +msgstr "Begehbare Gebiete werden erodiert..." #: editor/plugins/navigation_mesh_generator.cpp -#, fuzzy msgid "Partitioning..." -msgstr "Warnung" +msgstr "Einteilen..." #: editor/plugins/navigation_mesh_generator.cpp -#, fuzzy msgid "Creating contours..." -msgstr "Erstelle Octree-Textur" +msgstr "Konturen erzeugen..." #: editor/plugins/navigation_mesh_generator.cpp -#, fuzzy msgid "Creating polymesh..." -msgstr "Umriss-Mesh erzeugen.." +msgstr "Polymesh erzeugen..." #: editor/plugins/navigation_mesh_generator.cpp -#, fuzzy msgid "Converting to native navigation mesh..." -msgstr "Navigations-Mesh erzeugen" +msgstr "In natives Navigation-Mesh konvertieren..." #: editor/plugins/navigation_mesh_generator.cpp msgid "Navigation Mesh Generator Setup:" -msgstr "" +msgstr "Navigation-Mesh-Generatoreinstellungen:" #: editor/plugins/navigation_mesh_generator.cpp -#, fuzzy msgid "Parsing Geometry..." -msgstr "Analysiere Geometrie" +msgstr "Parse Geometrie…" #: editor/plugins/navigation_mesh_generator.cpp msgid "Done!" -msgstr "" +msgstr "Abgeschlossen!" #: editor/plugins/navigation_polygon_editor_plugin.cpp msgid "Create Navigation Polygon" @@ -4184,16 +4278,46 @@ msgid "Move Out-Control in Curve" msgstr "Ausgangsgriff auf Kurve verschieben" #: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Select Points" +msgstr "Punkte auswählen" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Shift+Drag: Select Control Points" +msgstr "Shift+Ziehen: Kontrollpunkte auswählen" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Click: Add Point" +msgstr "Klicken: Punkt hinzufügen" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Right Click: Delete Point" +msgstr "Rechtsklick: Punkt löschen" + +#: editor/plugins/path_2d_editor_plugin.cpp msgid "Select Control Points (Shift+Drag)" msgstr "Kontrollpunkte auswählen (Shift+Ziehen)" #: editor/plugins/path_2d_editor_plugin.cpp #: editor/plugins/path_editor_plugin.cpp +msgid "Add Point (in empty space)" +msgstr "Punkt hinzufügen (in leerem Raum)" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp msgid "Split Segment (in curve)" msgstr "Segment aufteilen (in Kurve)" #: editor/plugins/path_2d_editor_plugin.cpp #: editor/plugins/path_editor_plugin.cpp +msgid "Delete Point" +msgstr "Punk löschen" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp msgid "Close Curve" msgstr "Kurve schließen" @@ -4202,19 +4326,16 @@ msgid "Curve Point #" msgstr "Kurvenpunkt #" #: editor/plugins/path_editor_plugin.cpp -#, fuzzy msgid "Set Curve Point Position" -msgstr "Position des Kurvenpunkts setzen" +msgstr "Kurvenpunktposition festlegen" #: editor/plugins/path_editor_plugin.cpp -#, fuzzy msgid "Set Curve In Position" -msgstr "Position der Eingangskurve setzen" +msgstr "Kurven-Eingangsposition festlegen" #: editor/plugins/path_editor_plugin.cpp -#, fuzzy msgid "Set Curve Out Position" -msgstr "Position der Ausgangskurve setzen" +msgstr "Kurven-Ausgangsposition festlegen" #: editor/plugins/path_editor_plugin.cpp msgid "Split Path" @@ -4333,7 +4454,6 @@ msgstr "Ressource laden" #: editor/plugins/resource_preloader_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp #: editor/plugins/sprite_frames_editor_plugin.cpp editor/property_editor.cpp #: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Paste" @@ -4380,6 +4500,21 @@ msgid " Class Reference" msgstr " Klassenreferenz" #: editor/plugins/script_editor_plugin.cpp +#, fuzzy +msgid "Sort" +msgstr "Sortiere:" + +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp +msgid "Move Up" +msgstr "Schiebe hoch" + +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp +msgid "Move Down" +msgstr "Schiebe herunter" + +#: editor/plugins/script_editor_plugin.cpp msgid "Next script" msgstr "Nächstes Skript" @@ -4431,6 +4566,10 @@ msgstr "Dokumentation schließen" msgid "Close All" msgstr "Alle schließen" +#: editor/plugins/script_editor_plugin.cpp +msgid "Close Other Tabs" +msgstr "" + #: editor/plugins/script_editor_plugin.cpp editor/project_manager.cpp msgid "Run" msgstr "Ausführen" @@ -4441,13 +4580,11 @@ msgstr "Seitenleiste umschalten" #: editor/plugins/script_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Find.." msgstr "Finde.." #: editor/plugins/script_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Find Next" msgstr "Finde Nächstes" @@ -4555,33 +4692,22 @@ msgstr "Kleinbuchstaben" msgid "Capitalize" msgstr "Kapitalisiere" -#: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp scene/gui/line_edit.cpp +#: editor/plugins/script_text_editor.cpp scene/gui/line_edit.cpp #: scene/gui/text_edit.cpp msgid "Cut" msgstr "Ausschneiden" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp #: editor/plugins/sprite_frames_editor_plugin.cpp editor/property_editor.cpp #: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Copy" msgstr "Kopieren" -#: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp scene/gui/line_edit.cpp +#: editor/plugins/script_text_editor.cpp scene/gui/line_edit.cpp #: scene/gui/text_edit.cpp msgid "Select All" msgstr "Alles auswählen" -#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp -msgid "Move Up" -msgstr "Schiebe hoch" - -#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp -msgid "Move Down" -msgstr "Schiebe herunter" - #: editor/plugins/script_text_editor.cpp msgid "Delete Line" msgstr "Linie löschen" @@ -4603,6 +4729,23 @@ msgid "Clone Down" msgstr "Klone herunter" #: editor/plugins/script_text_editor.cpp +#, fuzzy +msgid "Fold Line" +msgstr "Gehe zu Zeile" + +#: editor/plugins/script_text_editor.cpp +msgid "Unfold Line" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Fold All Lines" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Unfold All Lines" +msgstr "" + +#: editor/plugins/script_text_editor.cpp msgid "Complete Symbol" msgstr "Symbol vervollständigen" @@ -4648,12 +4791,10 @@ msgid "Convert To Lowercase" msgstr "In Kleinbuchstaben konvertieren" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Find Previous" msgstr "Finde Vorheriges" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Replace.." msgstr "Ersetzen.." @@ -4662,7 +4803,6 @@ msgid "Goto Function.." msgstr "Springe zu Funktion.." #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Goto Line.." msgstr "Springe zu Zeile.." @@ -4827,6 +4967,16 @@ msgid "View Plane Transform." msgstr "Zeige Flächentransformation." #: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Scaling: " +msgstr "Skalierung:" + +#: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Translating: " +msgstr "Ãœbersetzungen:" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Rotating %s degrees." msgstr "Rotiere %s Grad." @@ -4907,6 +5057,10 @@ msgid "Vertices" msgstr "Vertices" #: editor/plugins/spatial_editor_plugin.cpp +msgid "FPS" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Align with view" msgstr "Auf Sicht ausrichten" @@ -4939,6 +5093,16 @@ msgid "View Information" msgstr "Sicht-Informationen" #: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "View FPS" +msgstr "Dateien anzeigen" + +#: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Half Resolution" +msgstr "Auswahl skalieren" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Audio Listener" msgstr "Audiosenke" @@ -5069,6 +5233,11 @@ msgid "Tool Scale" msgstr "Werkzeug Skalieren" #: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Toggle Freelook" +msgstr "Vollbildmodus umschalten" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Transform" msgstr "Transformation" @@ -5238,14 +5407,12 @@ msgid "Insert Empty (After)" msgstr "Empty einfügen (danach)" #: editor/plugins/sprite_frames_editor_plugin.cpp -#, fuzzy msgid "Move (Before)" -msgstr "Node(s) verschieben" +msgstr "Davor bewegen" #: editor/plugins/sprite_frames_editor_plugin.cpp -#, fuzzy msgid "Move (After)" -msgstr "nach links" +msgstr "Dahinter bewegen" #: editor/plugins/style_box_editor_plugin.cpp msgid "StyleBox Preview:" @@ -5322,11 +5489,11 @@ msgstr "Alles entfernen" #: editor/plugins/theme_editor_plugin.cpp msgid "Edit theme.." -msgstr "" +msgstr "Thema bearbeiten.." #: editor/plugins/theme_editor_plugin.cpp msgid "Theme editing menu." -msgstr "" +msgstr "Thema-Bearbeitungsmenü." #: editor/plugins/theme_editor_plugin.cpp msgid "Add Class Items" @@ -5345,6 +5512,11 @@ msgid "Create Empty Editor Template" msgstr "Leeres Editor-Template erstellen" #: editor/plugins/theme_editor_plugin.cpp +#, fuzzy +msgid "Create From Current Editor Theme" +msgstr "Leeres Editor-Template erstellen" + +#: editor/plugins/theme_editor_plugin.cpp msgid "CheckBox Radio1" msgstr "Kontrollkasten Radio1" @@ -5462,9 +5634,8 @@ msgid "Mirror Y" msgstr "Y-Koordinaten spiegeln" #: editor/plugins/tile_map_editor_plugin.cpp -#, fuzzy msgid "Paint Tile" -msgstr "Zeichne TileMap" +msgstr "Kachel zeichnen" #: editor/plugins/tile_map_editor_plugin.cpp msgid "Pick Tile" @@ -5519,7 +5690,8 @@ msgid "Runnable" msgstr "ausführbar" #: editor/project_export.cpp -msgid "Delete patch '" +#, fuzzy +msgid "Delete patch '%s' from list?" msgstr "Patch von Liste löschen" #: editor/project_export.cpp @@ -5527,9 +5699,8 @@ msgid "Delete preset '%s'?" msgstr "Vorlage ‚%s‘ löschen?" #: editor/project_export.cpp -#, fuzzy msgid "Export templates for this platform are missing/corrupted: " -msgstr "Export-Templates für diese Systeme fehlen:" +msgstr "Export-Vorlagen für dieses Systeme fehlen / sind fehlerhaft: " #: editor/project_export.cpp msgid "Presets" @@ -5606,9 +5777,8 @@ msgid "Export templates for this platform are missing:" msgstr "Export-Templates für diese Systeme fehlen:" #: editor/project_export.cpp -#, fuzzy msgid "Export templates for this platform are missing/corrupted:" -msgstr "Export-Templates für diese Systeme fehlen:" +msgstr "Export-Vorlagen für dieses Systeme fehlen / sind fehlerhaft:" #: editor/project_export.cpp msgid "Export With Debug" @@ -5617,22 +5787,23 @@ msgstr "Exportiere mit Debuginformationen" #: editor/project_manager.cpp #, fuzzy msgid "The path does not exist." -msgstr "Datei existiert nicht." +msgstr "Dieser Pfad existiert nicht." #: editor/project_manager.cpp -#, fuzzy msgid "Please choose a 'project.godot' file." -msgstr "Bitte außerhalb des Projektordners exportieren!" +msgstr "Eine ‚project.godot‘-Datei auswählen." #: editor/project_manager.cpp msgid "" "Your project will be created in a non empty folder (you might want to create " "a new folder)." msgstr "" +"Das Projekt wir in einem nicht-leeren Ordner erstellt (meist sind leere " +"Ordner die bessere Wahl)." #: editor/project_manager.cpp msgid "Please choose a folder that does not contain a 'project.godot' file." -msgstr "" +msgstr "Ein Ordner ohne ‚project.godot‘-Datei muss ausgewählt werden." #: editor/project_manager.cpp msgid "Imported Project" @@ -5644,21 +5815,19 @@ msgstr "" #: editor/project_manager.cpp msgid "It would be a good idea to name your project." -msgstr "" +msgstr "Es wird empfohlen das Projekt zu benennen." #: editor/project_manager.cpp msgid "Invalid project path (changed anything?)." msgstr "Ungültiger Projektpfad (etwas geändert?)." #: editor/project_manager.cpp -#, fuzzy msgid "Couldn't get project.godot in project path." -msgstr "Konnte project.godot im Projektpfad nicht erzeugen." +msgstr "project.godot konnte nicht im Projektpfad gefunden werden." #: editor/project_manager.cpp -#, fuzzy msgid "Couldn't edit project.godot in project path." -msgstr "Konnte project.godot im Projektpfad nicht erzeugen." +msgstr "project.godot des Projektpfads konnte nicht bearbeitet werden." #: editor/project_manager.cpp msgid "Couldn't create project.godot in project path." @@ -5669,14 +5838,12 @@ msgid "The following files failed extraction from package:" msgstr "Die folgenden Dateien ließen sich nicht aus dem Paket extrahieren:" #: editor/project_manager.cpp -#, fuzzy msgid "Rename Project" -msgstr "Unbenanntes Projekt" +msgstr "Projekt umbenennen" #: editor/project_manager.cpp -#, fuzzy msgid "Couldn't get project.godot in the project path." -msgstr "Konnte project.godot im Projektpfad nicht erzeugen." +msgstr "project.godot konnte nicht im Projektpfad gefunden werden." #: editor/project_manager.cpp msgid "New Game Project" @@ -5699,7 +5866,6 @@ msgid "Project Name:" msgstr "Projektname:" #: editor/project_manager.cpp -#, fuzzy msgid "Create folder" msgstr "Ordner erstellen" @@ -5720,9 +5886,8 @@ msgid "Unnamed Project" msgstr "Unbenanntes Projekt" #: editor/project_manager.cpp -#, fuzzy msgid "Can't open project" -msgstr "Projekt kann nicht ausgeführt werden" +msgstr "Projekt kann nicht geöffnet werden" #: editor/project_manager.cpp msgid "Are you sure to open more than one project?" @@ -5743,7 +5908,8 @@ msgid "" "Can't run project: Assets need to be imported.\n" "Please edit the project to trigger the initial import." msgstr "" -"Projekt kann nicht ausgeführt werden: Assets müssen importiert werden.\n" +"Projekt kann nicht ausgeführt werden: Nutzerinhalte müssen importiert " +"werden.\n" "Das Projekt muss eingestellt werden einen ersten Import einzuleiten." #: editor/project_manager.cpp @@ -5761,6 +5927,9 @@ msgid "" "Language changed.\n" "The UI will update next time the editor or project manager starts." msgstr "" +"Sprache geändert.\n" +"Die Benutzeroberfläche wird beim nächsten Start des Editors oder der " +"Projektverwaltung aktualisiert." #: editor/project_manager.cpp msgid "" @@ -5793,9 +5962,8 @@ msgid "Exit" msgstr "Verlassen" #: editor/project_manager.cpp -#, fuzzy msgid "Restart Now" -msgstr "Neu starten (s):" +msgstr "Jetzt Neustarten" #: editor/project_manager.cpp msgid "Can't run project" @@ -5834,10 +6002,6 @@ msgid "Add Input Action Event" msgstr "Eingabeaktionsereignis hinzufügen" #: editor/project_settings_editor.cpp editor/settings_config_dialog.cpp -msgid "Meta+" -msgstr "Meta+" - -#: editor/project_settings_editor.cpp editor/settings_config_dialog.cpp msgid "Shift+" msgstr "Umschalt+" @@ -5955,31 +6119,29 @@ msgid "Add Global Property" msgstr "Globale Eigenschaft hinzufügen" #: editor/project_settings_editor.cpp -#, fuzzy msgid "Select a setting item first!" -msgstr "Ein Einstellungspunkt muss zuerst ausgewählt werden!" +msgstr "Zuerst Einstellungspunkt auswählen!" #: editor/project_settings_editor.cpp -msgid "No property '" +#, fuzzy +msgid "No property '%s' exists." msgstr "Keine Eigenschaft ‚" #: editor/project_settings_editor.cpp -msgid "Setting '" -msgstr "Einstellung ‚" +msgid "Setting '%s' is internal, and it can't be deleted." +msgstr "" #: editor/project_settings_editor.cpp msgid "Delete Item" msgstr "Eintrag löschen" #: editor/project_settings_editor.cpp -#, fuzzy msgid "Can't contain '/' or ':'" -msgstr "Kann nicht zu Host verbinden:" +msgstr "Darf nicht ‚/‘ oder ‚:‘ beinhalten" #: editor/project_settings_editor.cpp -#, fuzzy msgid "Already existing" -msgstr "Persistente an- und ausschalten" +msgstr "Existiert bereits" #: editor/project_settings_editor.cpp msgid "Error saving settings." @@ -6022,13 +6184,12 @@ msgid "Remove Resource Remap Option" msgstr "Ressourcen-Remap-Option entfernen" #: editor/project_settings_editor.cpp -#, fuzzy msgid "Changed Locale Filter" -msgstr "Ãœberblendungszeit ändern" +msgstr "Sprachfilter geändert" #: editor/project_settings_editor.cpp msgid "Changed Locale Filter Mode" -msgstr "" +msgstr "Sprachfiltermodus geändert" #: editor/project_settings_editor.cpp msgid "Project Settings (project.godot)" @@ -6091,28 +6252,24 @@ msgid "Locale" msgstr "Lokalisierung" #: editor/project_settings_editor.cpp -#, fuzzy msgid "Locales Filter" -msgstr "Bildfilter:" +msgstr "Sprachfilter" #: editor/project_settings_editor.cpp -#, fuzzy msgid "Show all locales" -msgstr "Knochen anzeigen" +msgstr "Alle Sprachen anzeigen" #: editor/project_settings_editor.cpp msgid "Show only selected locales" -msgstr "" +msgstr "Nur ausgewählte Sprachen anzeigen" #: editor/project_settings_editor.cpp -#, fuzzy msgid "Filter mode:" -msgstr "Nodes filtern" +msgstr "Filtermodus:" #: editor/project_settings_editor.cpp -#, fuzzy msgid "Locales:" -msgstr "Lokalisierung" +msgstr "Sprachen:" #: editor/project_settings_editor.cpp msgid "AutoLoad" @@ -6163,18 +6320,16 @@ msgid "New Script" msgstr "Neues Skript" #: editor/property_editor.cpp -#, fuzzy msgid "Make Unique" -msgstr "Knochen erstellen" +msgstr "Einzigartig machen" #: editor/property_editor.cpp msgid "Show in File System" msgstr "Im Dateisystem anzeigen" #: editor/property_editor.cpp -#, fuzzy msgid "Convert To %s" -msgstr "Umwandeln zu.." +msgstr "Umwandeln zu %s" #: editor/property_editor.cpp msgid "Error loading file: Not a resource!" @@ -6213,9 +6368,8 @@ msgid "Select Property" msgstr "Eigenschaft auswählen" #: editor/property_selector.cpp -#, fuzzy msgid "Select Virtual Method" -msgstr "Methode auswählen" +msgstr "Virtuelle Methode auswählen" #: editor/property_selector.cpp msgid "Select Method" @@ -6450,6 +6604,16 @@ msgid "Clear a script for the selected node." msgstr "Leere ein Skript für das ausgewählte Node." #: editor/scene_tree_dock.cpp +#, fuzzy +msgid "Remote" +msgstr "Entfernen" + +#: editor/scene_tree_dock.cpp +#, fuzzy +msgid "Local" +msgstr "Lokalisierung" + +#: editor/scene_tree_dock.cpp msgid "Clear Inheritance? (No Undo!)" msgstr "Vererbung wirklich leeren? (Lässt sich nicht rückgängig machen!)" @@ -6535,9 +6699,8 @@ msgid "Scene Tree (Nodes):" msgstr "Szenenbaum (Nodes):" #: editor/scene_tree_editor.cpp -#, fuzzy msgid "Node Configuration Warning!" -msgstr "Node-Konfigurationswarnung:" +msgstr "Node-Konfigurationswarnung!" #: editor/scene_tree_editor.cpp msgid "Select a Node" @@ -6573,12 +6736,11 @@ msgstr "Ungültiger Pfad" #: editor/script_create_dialog.cpp msgid "Directory of the same name exists" -msgstr "" +msgstr "Ein Verzeichnis mit gleichem Namen existiert bereits" #: editor/script_create_dialog.cpp -#, fuzzy msgid "File exists, will be reused" -msgstr "Datei existiert bereits. Ãœberschreiben?" +msgstr "Datei existiert bereits, wird erneut verwendet" #: editor/script_create_dialog.cpp msgid "Invalid extension" @@ -6645,6 +6807,11 @@ msgid "Attach Node Script" msgstr "Node-Skript hinzufügen" #: editor/script_editor_debugger.cpp +#, fuzzy +msgid "Remote " +msgstr "Entfernen" + +#: editor/script_editor_debugger.cpp msgid "Bytes:" msgstr "Bytes:" @@ -6666,7 +6833,7 @@ msgstr "Funktion:" #: editor/script_editor_debugger.cpp msgid "Pick one or more items from the list to display the graph." -msgstr "" +msgstr "Ein oder mehrere Einträge der Liste auswählen um Graph anzuzeigen." #: editor/script_editor_debugger.cpp msgid "Errors" @@ -6701,18 +6868,6 @@ msgid "Stack Trace (if applicable):" msgstr "Stack Trace (falls geeignet):" #: editor/script_editor_debugger.cpp -msgid "Remote Inspector" -msgstr "Remote Inspektor" - -#: editor/script_editor_debugger.cpp -msgid "Live Scene Tree:" -msgstr "Echtzeit Szenenbaum:" - -#: editor/script_editor_debugger.cpp -msgid "Remote Object Properties: " -msgstr "Eigenschaften entfernter Objekte: " - -#: editor/script_editor_debugger.cpp msgid "Profiler" msgstr "Profiler" @@ -6830,70 +6985,68 @@ msgid "Change Probe Extents" msgstr "Sondenausmaße ändern" #: modules/gdnative/gd_native_library_editor.cpp -#, fuzzy msgid "Library" -msgstr "MeshLibrary.." +msgstr "Bibliothek" #: modules/gdnative/gd_native_library_editor.cpp -#, fuzzy msgid "Status" -msgstr "Status:" +msgstr "Status" #: modules/gdnative/gd_native_library_editor.cpp msgid "Libraries: " -msgstr "" +msgstr "Bibliotheken: " #: modules/gdnative/register_types.cpp msgid "GDNative" -msgstr "" +msgstr "GDNative" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp #: modules/visual_script/visual_script_builtin_funcs.cpp msgid "Invalid type argument to convert(), use TYPE_* constants." msgstr "" "Ungültiger Argument-Typ in convert()-Aufruf, TYPE_*-Konstanten benötigt." -#: modules/gdscript/gd_functions.cpp modules/mono/glue/glue_header.h +#: modules/gdscript/gdscript_functions.cpp modules/mono/glue/glue_header.h #: modules/visual_script/visual_script_builtin_funcs.cpp msgid "Not enough bytes for decoding bytes, or invalid format." msgstr "" "Nicht genügend Bytes zum dekodieren des Byte-Strings, oder ungültiges Format." -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "step argument is zero!" msgstr "Schrittargument ist null!" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Not a script with an instance" msgstr "Skript hat keine Instanz" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Not based on a script" msgstr "Nicht auf einem Skript basierend" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Not based on a resource file" msgstr "Nicht auf einer Ressourcendatei basierend" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary format (missing @path)" msgstr "Ungültiges Instanz-Verzeichnisformat (@path fehlt)" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary format (can't load script at @path)" msgstr "" "Ungültiges Instanz-Verzeichnisformat (Skript in @path kann nicht geladen " "werden)" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary format (invalid script at @path)" msgstr "Ungültiges Instanz-Verzeichnisformat (ungültiges Skript in @path)" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary (invalid subclasses)" msgstr "Ungültiges Instanz-Verzeichnisformat (ungültige Unterklasse)" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Object can't provide a length." msgstr "Objekt kann keine Länge vorweisen." @@ -6906,15 +7059,25 @@ msgid "GridMap Duplicate Selection" msgstr "GridMap-Auswahl duplizieren" #: modules/gridmap/grid_map_editor_plugin.cpp +msgid "Floor:" +msgstr "" + +#: modules/gridmap/grid_map_editor_plugin.cpp +#, fuzzy +msgid "Grid Map" +msgstr "Gitter-Einrasten" + +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Snap View" msgstr "Sicht einrasten" #: modules/gridmap/grid_map_editor_plugin.cpp -msgid "Prev Level (%sDown Wheel)" -msgstr "" +#, fuzzy +msgid "Previous Floor" +msgstr "Vorheriger Tab" #: modules/gridmap/grid_map_editor_plugin.cpp -msgid "Next Level (%sUp Wheel)" +msgid "Next Floor" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp @@ -6982,12 +7145,9 @@ msgid "Erase Area" msgstr "Bereich entfernen" #: modules/gridmap/grid_map_editor_plugin.cpp -msgid "Selection -> Duplicate" -msgstr "Auswahl → Duplizieren" - -#: modules/gridmap/grid_map_editor_plugin.cpp -msgid "Selection -> Clear" -msgstr "Auswahl → Löschen" +#, fuzzy +msgid "Clear Selection" +msgstr "Auswahl zentrieren" #: modules/gridmap/grid_map_editor_plugin.cpp msgid "GridMap Settings" @@ -6999,7 +7159,7 @@ msgstr "Auswahlradius:" #: modules/mono/editor/mono_bottom_panel.cpp msgid "Builds" -msgstr "" +msgstr "Fertigstellungen" #: modules/visual_script/visual_script.cpp msgid "" @@ -7116,7 +7276,8 @@ msgid "Duplicate VisualScript Nodes" msgstr "VisualScript-Nodes duplizieren" #: modules/visual_script/visual_script_editor.cpp -msgid "Hold Meta to drop a Getter. Hold Shift to drop a generic signature." +#, fuzzy +msgid "Hold %s to drop a Getter. Hold Shift to drop a generic signature." msgstr "" "Alt-Taste gedrückt halten, um einen Getter zu setzen. Umschalt-Taste halten, " "um eine allgemeine Signatur zu setzen." @@ -7128,7 +7289,8 @@ msgstr "" "allgemeine Signatur zu setzen." #: modules/visual_script/visual_script_editor.cpp -msgid "Hold Meta to drop a simple reference to the node." +#, fuzzy +msgid "Hold %s to drop a simple reference to the node." msgstr "Alt-Taste halten um einfache Referenz zu Node hinzuzufügen." #: modules/visual_script/visual_script_editor.cpp @@ -7136,7 +7298,8 @@ msgid "Hold Ctrl to drop a simple reference to the node." msgstr "Strg-Taste halten um einfache Referenz zu Node hinzuzufügen." #: modules/visual_script/visual_script_editor.cpp -msgid "Hold Meta to drop a Variable Setter." +#, fuzzy +msgid "Hold %s to drop a Variable Setter." msgstr "Alt-Taste halten um einen Variablen-Setter zu setzen." #: modules/visual_script/visual_script_editor.cpp @@ -7209,7 +7372,7 @@ msgstr "Abfragen" #: modules/visual_script/visual_script_editor.cpp msgid "Script already has function '%s'" -msgstr "" +msgstr "Skript enthält bereits Funktion ‚%s‘" #: modules/visual_script/visual_script_editor.cpp msgid "Change Input Value" @@ -7367,12 +7530,23 @@ msgid "Could not write file:\n" msgstr "Konnte Datei nicht schreiben:\n" #: platform/javascript/export/export.cpp -msgid "Could not read file:\n" +msgid "Could not open template for export:\n" +msgstr "Konnte Exportvorlage nicht öffnen:\n" + +#: platform/javascript/export/export.cpp +#, fuzzy +msgid "Invalid export template:\n" +msgstr "Exportvorlagen installieren" + +#: platform/javascript/export/export.cpp +#, fuzzy +msgid "Could not read custom HTML shell:\n" msgstr "Konnte Datei nicht lesen:\n" #: platform/javascript/export/export.cpp -msgid "Could not open template for export:\n" -msgstr "Konnte Exportvorlage nicht öffnen:\n" +#, fuzzy +msgid "Could not read boot splash image file:\n" +msgstr "Konnte Datei nicht lesen:\n" #: scene/2d/animated_sprite.cpp msgid "" @@ -7501,22 +7675,6 @@ msgstr "" "Die Pfad-Eigenschaft muss auf ein gültiges Node2D-Node zeigen um zu " "funktionieren." -#: scene/2d/sprite.cpp -msgid "" -"Path property must point to a valid Viewport node to work. Such Viewport " -"must be set to 'render target' mode." -msgstr "" -"Die Pfad Eigenschaft muss auf eine gültige Viewport Node verweisen um zu " -"funktionieren. Dieser Viewport muss in 'render target' Modus gesetzt werden." - -#: scene/2d/sprite.cpp -msgid "" -"The Viewport set in the path property must be set as 'render target' in " -"order for this sprite to work." -msgstr "" -"Der Viewport, der in der Pfad-Eigenschaft gesetzt wurde, muss als ‚Render " -"Target‘ definiert sein, damit das Sprite funktioniert." - #: scene/2d/visibility_notifier_2d.cpp msgid "" "VisibilityEnable2D works best when used with the edited scene root directly " @@ -7589,6 +7747,15 @@ msgstr "" "Damit CollisionShape funktionieren kann, muss eine Form vorhanden sein. " "Bitte erzeuge eine shape Ressource dafür!" +#: scene/3d/gi_probe.cpp +#, fuzzy +msgid "Plotting Meshes" +msgstr "Blitting Bilder" + +#: scene/3d/gi_probe.cpp +msgid "Finishing Plot" +msgstr "" + #: scene/3d/navigation_mesh.cpp msgid "A NavigationMesh resource must be set or created for this node to work." msgstr "" @@ -7644,6 +7811,9 @@ msgid "" "VehicleWheel serves to provide a wheel system to a VehicleBody. Please use " "it as a child of a VehicleBody." msgstr "" +"VehicleWheel ist verfügbar um mit VehicleBody ein Rädersystem zu " +"implementieren. Es kann ausschließlich als Unterobjekt von VehicleBody " +"verwendet werden." #: scene/gui/color_picker.cpp msgid "Raw Mode" @@ -7688,6 +7858,10 @@ msgstr "" "ein Control als Unterobjekt verwendet und dessen Minimalgröße eingestellt " "werden." +#: scene/gui/tree.cpp +msgid "(Other)" +msgstr "" + #: scene/main/scene_tree.cpp msgid "" "Default Environment as specified in Project Setings (Rendering -> Viewport -" @@ -7725,6 +7899,70 @@ msgstr "Fehler beim Laden der Schriftart." msgid "Invalid font size." msgstr "Ungültige Schriftgröße." +#~ msgid "Cannot navigate to '" +#~ msgstr "Kann Ordner ‚" + +#~ msgid "" +#~ "\n" +#~ "Source: " +#~ msgstr "" +#~ "\n" +#~ "Quelle: " + +#~ msgid "Remove Point from Line2D" +#~ msgstr "Punkt von Line2D entfernen" + +#~ msgid "Add Point to Line2D" +#~ msgstr "Punkt zu Line2D hinzufügen" + +#~ msgid "Move Point in Line2D" +#~ msgstr "Punkt in Line2D verschieben" + +#~ msgid "Split Segment (in line)" +#~ msgstr "Segment aufteilen (in Linie)" + +#~ msgid "Meta+" +#~ msgstr "Meta+" + +#~ msgid "Setting '" +#~ msgstr "Einstellung ‚" + +#~ msgid "Remote Inspector" +#~ msgstr "Remote Inspektor" + +#~ msgid "Live Scene Tree:" +#~ msgstr "Echtzeit Szenenbaum:" + +#~ msgid "Remote Object Properties: " +#~ msgstr "Eigenschaften entfernter Objekte: " + +#~ msgid "Prev Level (%sDown Wheel)" +#~ msgstr "Vorherige Stufe (%s Mausrad runter)" + +#~ msgid "Next Level (%sUp Wheel)" +#~ msgstr "Nächste Stufe (%s Mausrad hoch)" + +#~ msgid "Selection -> Duplicate" +#~ msgstr "Auswahl → Duplizieren" + +#~ msgid "Selection -> Clear" +#~ msgstr "Auswahl → Löschen" + +#~ msgid "" +#~ "Path property must point to a valid Viewport node to work. Such Viewport " +#~ "must be set to 'render target' mode." +#~ msgstr "" +#~ "Die Pfad Eigenschaft muss auf eine gültige Viewport Node verweisen um zu " +#~ "funktionieren. Dieser Viewport muss in 'render target' Modus gesetzt " +#~ "werden." + +#~ msgid "" +#~ "The Viewport set in the path property must be set as 'render target' in " +#~ "order for this sprite to work." +#~ msgstr "" +#~ "Der Viewport, der in der Pfad-Eigenschaft gesetzt wurde, muss als ‚Render " +#~ "Target‘ definiert sein, damit das Sprite funktioniert." + #~ msgid "Filter:" #~ msgstr "Filter:" @@ -7751,9 +7989,6 @@ msgstr "Ungültige Schriftgröße." #~ msgid "Removed:" #~ msgstr "Entfernt:" -#~ msgid "Error saving atlas:" -#~ msgstr "Fehler beim speichern des Atlas:" - #~ msgid "Could not save atlas subtexture:" #~ msgstr "Atlas Untertextur konnte nicht gespeichert werden:" @@ -8143,9 +8378,6 @@ msgstr "Ungültige Schriftgröße." #~ msgid "Cropping Images" #~ msgstr "Bilder werden beschnitten" -#~ msgid "Blitting Images" -#~ msgstr "Blitting Bilder" - #~ msgid "Couldn't save atlas image:" #~ msgstr "Atlas-Bild konnte nicht gespeichert werden:" @@ -8519,9 +8751,6 @@ msgstr "Ungültige Schriftgröße." #~ msgid "Save Translatable Strings" #~ msgstr "Speichere übersetzbare Zeichenketten" -#~ msgid "Install Export Templates" -#~ msgstr "Exportvorlagen installieren" - #~ msgid "Edit Script Options" #~ msgstr "Skriptoptionen bearbeiten" diff --git a/editor/translations/de_CH.po b/editor/translations/de_CH.po index 8c9e4cc1de..cfc980f488 100644 --- a/editor/translations/de_CH.po +++ b/editor/translations/de_CH.po @@ -99,6 +99,7 @@ msgid "Anim Delete Keys" msgstr "Anim Bilder löschen" #: editor/animation_editor.cpp editor/plugins/tile_map_editor_plugin.cpp +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Duplicate Selection" msgstr "" @@ -629,6 +630,13 @@ msgstr "" msgid "Search Replacement Resource:" msgstr "" +#: editor/dependency_editor.cpp editor/editor_file_dialog.cpp +#: editor/editor_help.cpp editor/editor_node.cpp editor/filesystem_dock.cpp +#: editor/plugins/script_editor_plugin.cpp editor/property_selector.cpp +#: editor/quick_open.cpp scene/gui/file_dialog.cpp +msgid "Open" +msgstr "Öffnen" + #: editor/dependency_editor.cpp msgid "Owners Of:" msgstr "" @@ -699,6 +707,15 @@ msgstr "" msgid "Delete" msgstr "" +#: editor/dictionary_property_edit.cpp +msgid "Change Dictionary Key" +msgstr "" + +#: editor/dictionary_property_edit.cpp +#, fuzzy +msgid "Change Dictionary Value" +msgstr "Typ ändern" + #: editor/editor_about.cpp msgid "Thanks from the Godot community!" msgstr "" @@ -1119,12 +1136,6 @@ msgstr "" msgid "All Files (*)" msgstr "Alle Dateien (*)" -#: editor/editor_file_dialog.cpp editor/editor_help.cpp editor/editor_node.cpp -#: editor/filesystem_dock.cpp editor/plugins/script_editor_plugin.cpp -#: editor/property_selector.cpp editor/quick_open.cpp scene/gui/file_dialog.cpp -msgid "Open" -msgstr "Öffnen" - #: editor/editor_file_dialog.cpp scene/gui/file_dialog.cpp msgid "Open a File" msgstr "Datei öffnen" @@ -1482,6 +1493,13 @@ msgid "" msgstr "" #: editor/editor_node.cpp +msgid "" +"This is a remote object so changes to it will not be kept.\n" +"Please read the documentation relevant to debugging to better understand " +"this workflow." +msgstr "" + +#: editor/editor_node.cpp msgid "Copy Params" msgstr "" @@ -1593,6 +1611,11 @@ msgid "Export Mesh Library" msgstr "" #: editor/editor_node.cpp +#, fuzzy +msgid "This operation can't be done without a root node." +msgstr "Ohne eine Szene kann das nicht funktionieren." + +#: editor/editor_node.cpp msgid "Export Tile Set" msgstr "" @@ -1721,11 +1744,20 @@ msgid "Switch Scene Tab" msgstr "" #: editor/editor_node.cpp -msgid "%d more file(s)" +msgid "%d more files or folders" msgstr "" #: editor/editor_node.cpp -msgid "%d more file(s) or folder(s)" +#, fuzzy +msgid "%d more folders" +msgstr "Node erstellen" + +#: editor/editor_node.cpp +msgid "%d more files" +msgstr "" + +#: editor/editor_node.cpp +msgid "Dock Position" msgstr "" #: editor/editor_node.cpp @@ -1737,6 +1769,10 @@ msgid "Toggle distraction-free mode." msgstr "" #: editor/editor_node.cpp +msgid "Add a new scene." +msgstr "" + +#: editor/editor_node.cpp msgid "Scene" msgstr "" @@ -1802,13 +1838,12 @@ msgid "TileSet.." msgstr "" #: editor/editor_node.cpp editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp scene/gui/line_edit.cpp -#: scene/gui/text_edit.cpp +#: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Undo" msgstr "" #: editor/editor_node.cpp editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp +#: scene/gui/line_edit.cpp msgid "Redo" msgstr "" @@ -2297,6 +2332,10 @@ msgid "(Current)" msgstr "" #: editor/export_template_manager.cpp +msgid "Retrieving mirrors, please wait.." +msgstr "" + +#: editor/export_template_manager.cpp msgid "Remove template version '%s'?" msgstr "" @@ -2332,6 +2371,107 @@ msgid "Importing:" msgstr "" #: editor/export_template_manager.cpp +msgid "" +"No download links found for this version. Direct download is only available " +"for official releases." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Can't resolve." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Can't connect." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "No response." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Req. Failed." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Redirect Loop." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Failed:" +msgstr "" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Can't write file." +msgstr "Neues Projekt erstellen" + +#: editor/export_template_manager.cpp +msgid "Download Complete." +msgstr "" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Error requesting url: " +msgstr "Szene kann nicht gespeichert werden." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Connecting to Mirror.." +msgstr "Connections editieren" + +#: editor/export_template_manager.cpp +msgid "Disconnected" +msgstr "" + +#: editor/export_template_manager.cpp +msgid "Resolving" +msgstr "" + +#: editor/export_template_manager.cpp +msgid "Can't Resolve" +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Connecting.." +msgstr "Connections editieren" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Can't Conect" +msgstr "Neues Projekt erstellen" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Connected" +msgstr "Verbindung zu Node:" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Requesting.." +msgstr "" + +#: editor/export_template_manager.cpp +msgid "Downloading" +msgstr "" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Connection Error" +msgstr "Connections editieren" + +#: editor/export_template_manager.cpp +msgid "SSL Handshake Error" +msgstr "" + +#: editor/export_template_manager.cpp msgid "Current Version:" msgstr "" @@ -2356,12 +2496,21 @@ msgstr "" msgid "Export Template Manager" msgstr "" +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Download Templates" +msgstr "Ungültige Bilder löschen" + +#: editor/export_template_manager.cpp +msgid "Select mirror from list: " +msgstr "" + #: editor/file_type_cache.cpp msgid "Can't open file_type_cache.cch for writing, not saving file type cache!" msgstr "" #: editor/filesystem_dock.cpp -msgid "Cannot navigate to '" +msgid "Cannot navigate to '%s' as it has not been found in the file system!" msgstr "" #: editor/filesystem_dock.cpp @@ -2379,12 +2528,6 @@ msgid "" msgstr "" #: editor/filesystem_dock.cpp -msgid "" -"\n" -"Source: " -msgstr "" - -#: editor/filesystem_dock.cpp msgid "Cannot move/rename resources root." msgstr "" @@ -2649,8 +2792,7 @@ msgid "Remove Poly And Point" msgstr "" #: editor/plugins/abstract_polygon_2d_editor.cpp -#: editor/plugins/light_occluder_2d_editor_plugin.cpp -msgid "Create a new polygon from scratch." +msgid "Create a new polygon from scratch" msgstr "" #: editor/plugins/abstract_polygon_2d_editor.cpp @@ -2661,6 +2803,11 @@ msgid "" "RMB: Erase Point." msgstr "" +#: editor/plugins/abstract_polygon_2d_editor.cpp +#, fuzzy +msgid "Delete points" +msgstr "Bild einfügen" + #: editor/plugins/animation_player_editor_plugin.cpp msgid "Toggle Autoplay" msgstr "Autoplay Umschalten" @@ -3002,18 +3149,10 @@ msgid "Can't resolve hostname:" msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Can't resolve." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Connection error, please try again." msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Can't connect." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp #, fuzzy msgid "Can't connect to host:" msgstr "Verbindung zu Node:" @@ -3023,30 +3162,14 @@ msgid "No response from host:" msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "No response." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Request failed, return code:" msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Req. Failed." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Request failed, too many redirects" msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Redirect Loop." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp -msgid "Failed:" -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Bad download hash, assuming file has been tampered with." msgstr "" @@ -3076,15 +3199,6 @@ msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp #, fuzzy -msgid "Connecting.." -msgstr "Connections editieren" - -#: editor/plugins/asset_library_editor_plugin.cpp -msgid "Requesting.." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp -#, fuzzy msgid "Error making request" msgstr "Szene kann nicht gespeichert werden." @@ -3197,6 +3311,38 @@ msgid "Move Action" msgstr "" #: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Move vertical guide" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Create new vertical guide" +msgstr "Neues Projekt erstellen" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Remove vertical guide" +msgstr "Ungültige Bilder löschen" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Move horizontal guide" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Create new horizontal guide" +msgstr "Neues Projekt erstellen" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Remove horizontal guide" +msgstr "Ungültige Bilder löschen" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Create new horizontal and vertical guides" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp msgid "Edit IK Chain" msgstr "" @@ -3319,10 +3465,16 @@ msgid "Snap to other nodes" msgstr "" #: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Snap to guides" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Lock the selected object in place (can't be moved)." msgstr "" #: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Unlock the selected object (can be moved)." msgstr "" @@ -3373,6 +3525,10 @@ msgid "Show rulers" msgstr "" #: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Show guides" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp msgid "Center Selection" msgstr "" @@ -3563,6 +3719,10 @@ msgstr "" msgid "Hold Shift to edit tangents individually" msgstr "" +#: editor/plugins/gi_probe_editor_plugin.cpp +msgid "Bake GI Probe" +msgstr "" + #: editor/plugins/gradient_editor_plugin.cpp msgid "Add/Remove Color Ramp Point" msgstr "" @@ -3595,6 +3755,10 @@ msgid "Create Occluder Polygon" msgstr "" #: editor/plugins/light_occluder_2d_editor_plugin.cpp +msgid "Create a new polygon from scratch." +msgstr "" + +#: editor/plugins/light_occluder_2d_editor_plugin.cpp msgid "Edit existing polygon:" msgstr "" @@ -3610,58 +3774,6 @@ msgstr "" msgid "RMB: Erase Point." msgstr "" -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Remove Point from Line2D" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Add Point to Line2D" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Move Point in Line2D" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Select Points" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Shift+Drag: Select Control Points" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Click: Add Point" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Right Click: Delete Point" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Add Point (in empty space)" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Split Segment (in line)" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Delete Point" -msgstr "" - #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Mesh is empty!" msgstr "" @@ -4065,16 +4177,46 @@ msgid "Move Out-Control in Curve" msgstr "" #: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Select Points" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Shift+Drag: Select Control Points" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Click: Add Point" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Right Click: Delete Point" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp msgid "Select Control Points (Shift+Drag)" msgstr "" #: editor/plugins/path_2d_editor_plugin.cpp #: editor/plugins/path_editor_plugin.cpp +msgid "Add Point (in empty space)" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp msgid "Split Segment (in curve)" msgstr "" #: editor/plugins/path_2d_editor_plugin.cpp #: editor/plugins/path_editor_plugin.cpp +msgid "Delete Point" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp msgid "Close Curve" msgstr "" @@ -4214,7 +4356,6 @@ msgstr "" #: editor/plugins/resource_preloader_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp #: editor/plugins/sprite_frames_editor_plugin.cpp editor/property_editor.cpp #: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Paste" @@ -4259,6 +4400,20 @@ msgid " Class Reference" msgstr "" #: editor/plugins/script_editor_plugin.cpp +msgid "Sort" +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp +msgid "Move Up" +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp +msgid "Move Down" +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp msgid "Next script" msgstr "" @@ -4310,6 +4465,10 @@ msgstr "" msgid "Close All" msgstr "" +#: editor/plugins/script_editor_plugin.cpp +msgid "Close Other Tabs" +msgstr "" + #: editor/plugins/script_editor_plugin.cpp editor/project_manager.cpp msgid "Run" msgstr "" @@ -4320,13 +4479,11 @@ msgstr "" #: editor/plugins/script_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Find.." msgstr "" #: editor/plugins/script_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Find Next" msgstr "" @@ -4430,33 +4587,22 @@ msgstr "" msgid "Capitalize" msgstr "" -#: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp scene/gui/line_edit.cpp +#: editor/plugins/script_text_editor.cpp scene/gui/line_edit.cpp #: scene/gui/text_edit.cpp msgid "Cut" msgstr "" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp #: editor/plugins/sprite_frames_editor_plugin.cpp editor/property_editor.cpp #: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Copy" msgstr "" -#: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp scene/gui/line_edit.cpp +#: editor/plugins/script_text_editor.cpp scene/gui/line_edit.cpp #: scene/gui/text_edit.cpp msgid "Select All" msgstr "" -#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp -msgid "Move Up" -msgstr "" - -#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp -msgid "Move Down" -msgstr "" - #: editor/plugins/script_text_editor.cpp #, fuzzy msgid "Delete Line" @@ -4479,6 +4625,23 @@ msgid "Clone Down" msgstr "" #: editor/plugins/script_text_editor.cpp +#, fuzzy +msgid "Fold Line" +msgstr "Bild einfügen" + +#: editor/plugins/script_text_editor.cpp +msgid "Unfold Line" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Fold All Lines" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Unfold All Lines" +msgstr "" + +#: editor/plugins/script_text_editor.cpp msgid "Complete Symbol" msgstr "" @@ -4525,12 +4688,10 @@ msgid "Convert To Lowercase" msgstr "Verbindung zu Node:" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Find Previous" msgstr "" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Replace.." msgstr "" @@ -4539,7 +4700,6 @@ msgid "Goto Function.." msgstr "" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Goto Line.." msgstr "" @@ -4704,6 +4864,15 @@ msgid "View Plane Transform." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "Scaling: " +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Translating: " +msgstr "Transition-Node" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Rotating %s degrees." msgstr "" @@ -4786,6 +4955,10 @@ msgid "Vertices" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "FPS" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Align with view" msgstr "" @@ -4818,6 +4991,15 @@ msgid "View Information" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "View FPS" +msgstr "Datei(en) öffnen" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Half Resolution" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Audio Listener" msgstr "" @@ -4947,6 +5129,10 @@ msgid "Tool Scale" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "Toggle Freelook" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Transform" msgstr "" @@ -5224,6 +5410,10 @@ msgid "Create Empty Editor Template" msgstr "" #: editor/plugins/theme_editor_plugin.cpp +msgid "Create From Current Editor Theme" +msgstr "" + +#: editor/plugins/theme_editor_plugin.cpp msgid "CheckBox Radio1" msgstr "" @@ -5397,7 +5587,7 @@ msgid "Runnable" msgstr "" #: editor/project_export.cpp -msgid "Delete patch '" +msgid "Delete patch '%s' from list?" msgstr "" #: editor/project_export.cpp @@ -5703,10 +5893,6 @@ msgid "Add Input Action Event" msgstr "" #: editor/project_settings_editor.cpp editor/settings_config_dialog.cpp -msgid "Meta+" -msgstr "" - -#: editor/project_settings_editor.cpp editor/settings_config_dialog.cpp msgid "Shift+" msgstr "" @@ -5829,11 +6015,11 @@ msgid "Select a setting item first!" msgstr "" #: editor/project_settings_editor.cpp -msgid "No property '" +msgid "No property '%s' exists." msgstr "" #: editor/project_settings_editor.cpp -msgid "Setting '" +msgid "Setting '%s' is internal, and it can't be deleted." msgstr "" #: editor/project_settings_editor.cpp @@ -6315,6 +6501,15 @@ msgid "Clear a script for the selected node." msgstr "" #: editor/scene_tree_dock.cpp +#, fuzzy +msgid "Remote" +msgstr "Ungültige Bilder löschen" + +#: editor/scene_tree_dock.cpp +msgid "Local" +msgstr "" + +#: editor/scene_tree_dock.cpp msgid "Clear Inheritance? (No Undo!)" msgstr "" @@ -6504,6 +6699,11 @@ msgid "Attach Node Script" msgstr "Script hinzufügen" #: editor/script_editor_debugger.cpp +#, fuzzy +msgid "Remote " +msgstr "Ungültige Bilder löschen" + +#: editor/script_editor_debugger.cpp msgid "Bytes:" msgstr "" @@ -6560,18 +6760,6 @@ msgid "Stack Trace (if applicable):" msgstr "" #: editor/script_editor_debugger.cpp -msgid "Remote Inspector" -msgstr "" - -#: editor/script_editor_debugger.cpp -msgid "Live Scene Tree:" -msgstr "" - -#: editor/script_editor_debugger.cpp -msgid "Remote Object Properties: " -msgstr "" - -#: editor/script_editor_debugger.cpp msgid "Profiler" msgstr "" @@ -6703,49 +6891,49 @@ msgstr "" msgid "GDNative" msgstr "" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp #: modules/visual_script/visual_script_builtin_funcs.cpp msgid "Invalid type argument to convert(), use TYPE_* constants." msgstr "" -#: modules/gdscript/gd_functions.cpp modules/mono/glue/glue_header.h +#: modules/gdscript/gdscript_functions.cpp modules/mono/glue/glue_header.h #: modules/visual_script/visual_script_builtin_funcs.cpp msgid "Not enough bytes for decoding bytes, or invalid format." msgstr "" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "step argument is zero!" msgstr "" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Not a script with an instance" msgstr "" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Not based on a script" msgstr "" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Not based on a resource file" msgstr "" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary format (missing @path)" msgstr "" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary format (can't load script at @path)" msgstr "" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary format (invalid script at @path)" msgstr "" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary (invalid subclasses)" msgstr "" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Object can't provide a length." msgstr "" @@ -6758,15 +6946,23 @@ msgid "GridMap Duplicate Selection" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp +msgid "Floor:" +msgstr "" + +#: modules/gridmap/grid_map_editor_plugin.cpp +msgid "Grid Map" +msgstr "" + +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Snap View" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp -msgid "Prev Level (%sDown Wheel)" +msgid "Previous Floor" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp -msgid "Next Level (%sUp Wheel)" +msgid "Next Floor" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp @@ -6836,12 +7032,9 @@ msgid "Erase Area" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp -msgid "Selection -> Duplicate" -msgstr "" - -#: modules/gridmap/grid_map_editor_plugin.cpp -msgid "Selection -> Clear" -msgstr "" +#, fuzzy +msgid "Clear Selection" +msgstr "Script hinzufügen" #: modules/gridmap/grid_map_editor_plugin.cpp #, fuzzy @@ -6970,7 +7163,7 @@ msgid "Duplicate VisualScript Nodes" msgstr "Node(s) duplizieren" #: modules/visual_script/visual_script_editor.cpp -msgid "Hold Meta to drop a Getter. Hold Shift to drop a generic signature." +msgid "Hold %s to drop a Getter. Hold Shift to drop a generic signature." msgstr "" #: modules/visual_script/visual_script_editor.cpp @@ -6978,7 +7171,7 @@ msgid "Hold Ctrl to drop a Getter. Hold Shift to drop a generic signature." msgstr "" #: modules/visual_script/visual_script_editor.cpp -msgid "Hold Meta to drop a simple reference to the node." +msgid "Hold %s to drop a simple reference to the node." msgstr "" #: modules/visual_script/visual_script_editor.cpp @@ -6986,7 +7179,7 @@ msgid "Hold Ctrl to drop a simple reference to the node." msgstr "" #: modules/visual_script/visual_script_editor.cpp -msgid "Hold Meta to drop a Variable Setter." +msgid "Hold %s to drop a Variable Setter." msgstr "" #: modules/visual_script/visual_script_editor.cpp @@ -7228,11 +7421,19 @@ msgid "Could not write file:\n" msgstr "" #: platform/javascript/export/export.cpp -msgid "Could not read file:\n" +msgid "Could not open template for export:\n" msgstr "" #: platform/javascript/export/export.cpp -msgid "Could not open template for export:\n" +msgid "Invalid export template:\n" +msgstr "" + +#: platform/javascript/export/export.cpp +msgid "Could not read custom HTML shell:\n" +msgstr "" + +#: platform/javascript/export/export.cpp +msgid "Could not read boot splash image file:\n" msgstr "" #: scene/2d/animated_sprite.cpp @@ -7342,18 +7543,6 @@ msgstr "" "Die Pfad-Variable muss auf einen gültigen Node2D Node zeigen um zu " "funktionieren." -#: scene/2d/sprite.cpp -msgid "" -"Path property must point to a valid Viewport node to work. Such Viewport " -"must be set to 'render target' mode." -msgstr "" - -#: scene/2d/sprite.cpp -msgid "" -"The Viewport set in the path property must be set as 'render target' in " -"order for this sprite to work." -msgstr "" - #: scene/2d/visibility_notifier_2d.cpp #, fuzzy msgid "" @@ -7415,6 +7604,14 @@ msgid "" "shape resource for it!" msgstr "" +#: scene/3d/gi_probe.cpp +msgid "Plotting Meshes" +msgstr "" + +#: scene/3d/gi_probe.cpp +msgid "Finishing Plot" +msgstr "" + #: scene/3d/navigation_mesh.cpp msgid "A NavigationMesh resource must be set or created for this node to work." msgstr "" @@ -7494,6 +7691,10 @@ msgid "" "minimum size manually." msgstr "" +#: scene/gui/tree.cpp +msgid "(Other)" +msgstr "" + #: scene/main/scene_tree.cpp msgid "" "Default Environment as specified in Project Setings (Rendering -> Viewport -" diff --git a/editor/translations/editor.pot b/editor/translations/editor.pot index efddb63796..821582b84b 100644 --- a/editor/translations/editor.pot +++ b/editor/translations/editor.pot @@ -93,6 +93,7 @@ msgid "Anim Delete Keys" msgstr "" #: editor/animation_editor.cpp editor/plugins/tile_map_editor_plugin.cpp +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Duplicate Selection" msgstr "" @@ -622,6 +623,13 @@ msgstr "" msgid "Search Replacement Resource:" msgstr "" +#: editor/dependency_editor.cpp editor/editor_file_dialog.cpp +#: editor/editor_help.cpp editor/editor_node.cpp editor/filesystem_dock.cpp +#: editor/plugins/script_editor_plugin.cpp editor/property_selector.cpp +#: editor/quick_open.cpp scene/gui/file_dialog.cpp +msgid "Open" +msgstr "" + #: editor/dependency_editor.cpp msgid "Owners Of:" msgstr "" @@ -692,6 +700,14 @@ msgstr "" msgid "Delete" msgstr "" +#: editor/dictionary_property_edit.cpp +msgid "Change Dictionary Key" +msgstr "" + +#: editor/dictionary_property_edit.cpp +msgid "Change Dictionary Value" +msgstr "" + #: editor/editor_about.cpp msgid "Thanks from the Godot community!" msgstr "" @@ -1107,12 +1123,6 @@ msgstr "" msgid "All Files (*)" msgstr "" -#: editor/editor_file_dialog.cpp editor/editor_help.cpp editor/editor_node.cpp -#: editor/filesystem_dock.cpp editor/plugins/script_editor_plugin.cpp -#: editor/property_selector.cpp editor/quick_open.cpp scene/gui/file_dialog.cpp -msgid "Open" -msgstr "" - #: editor/editor_file_dialog.cpp scene/gui/file_dialog.cpp msgid "Open a File" msgstr "" @@ -1465,6 +1475,13 @@ msgid "" msgstr "" #: editor/editor_node.cpp +msgid "" +"This is a remote object so changes to it will not be kept.\n" +"Please read the documentation relevant to debugging to better understand " +"this workflow." +msgstr "" + +#: editor/editor_node.cpp msgid "Copy Params" msgstr "" @@ -1574,6 +1591,10 @@ msgid "Export Mesh Library" msgstr "" #: editor/editor_node.cpp +msgid "This operation can't be done without a root node." +msgstr "" + +#: editor/editor_node.cpp msgid "Export Tile Set" msgstr "" @@ -1699,11 +1720,19 @@ msgid "Switch Scene Tab" msgstr "" #: editor/editor_node.cpp -msgid "%d more file(s)" +msgid "%d more files or folders" +msgstr "" + +#: editor/editor_node.cpp +msgid "%d more folders" +msgstr "" + +#: editor/editor_node.cpp +msgid "%d more files" msgstr "" #: editor/editor_node.cpp -msgid "%d more file(s) or folder(s)" +msgid "Dock Position" msgstr "" #: editor/editor_node.cpp @@ -1715,6 +1744,10 @@ msgid "Toggle distraction-free mode." msgstr "" #: editor/editor_node.cpp +msgid "Add a new scene." +msgstr "" + +#: editor/editor_node.cpp msgid "Scene" msgstr "" @@ -1779,13 +1812,12 @@ msgid "TileSet.." msgstr "" #: editor/editor_node.cpp editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp scene/gui/line_edit.cpp -#: scene/gui/text_edit.cpp +#: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Undo" msgstr "" #: editor/editor_node.cpp editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp +#: scene/gui/line_edit.cpp msgid "Redo" msgstr "" @@ -2266,6 +2298,10 @@ msgid "(Current)" msgstr "" #: editor/export_template_manager.cpp +msgid "Retrieving mirrors, please wait.." +msgstr "" + +#: editor/export_template_manager.cpp msgid "Remove template version '%s'?" msgstr "" @@ -2300,6 +2336,100 @@ msgid "Importing:" msgstr "" #: editor/export_template_manager.cpp +msgid "" +"No download links found for this version. Direct download is only available " +"for official releases." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Can't resolve." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Can't connect." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "No response." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Req. Failed." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Redirect Loop." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Failed:" +msgstr "" + +#: editor/export_template_manager.cpp +msgid "Can't write file." +msgstr "" + +#: editor/export_template_manager.cpp +msgid "Download Complete." +msgstr "" + +#: editor/export_template_manager.cpp +msgid "Error requesting url: " +msgstr "" + +#: editor/export_template_manager.cpp +msgid "Connecting to Mirror.." +msgstr "" + +#: editor/export_template_manager.cpp +msgid "Disconnected" +msgstr "" + +#: editor/export_template_manager.cpp +msgid "Resolving" +msgstr "" + +#: editor/export_template_manager.cpp +msgid "Can't Resolve" +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Connecting.." +msgstr "" + +#: editor/export_template_manager.cpp +msgid "Can't Conect" +msgstr "" + +#: editor/export_template_manager.cpp +msgid "Connected" +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Requesting.." +msgstr "" + +#: editor/export_template_manager.cpp +msgid "Downloading" +msgstr "" + +#: editor/export_template_manager.cpp +msgid "Connection Error" +msgstr "" + +#: editor/export_template_manager.cpp +msgid "SSL Handshake Error" +msgstr "" + +#: editor/export_template_manager.cpp msgid "Current Version:" msgstr "" @@ -2323,12 +2453,20 @@ msgstr "" msgid "Export Template Manager" msgstr "" +#: editor/export_template_manager.cpp +msgid "Download Templates" +msgstr "" + +#: editor/export_template_manager.cpp +msgid "Select mirror from list: " +msgstr "" + #: editor/file_type_cache.cpp msgid "Can't open file_type_cache.cch for writing, not saving file type cache!" msgstr "" #: editor/filesystem_dock.cpp -msgid "Cannot navigate to '" +msgid "Cannot navigate to '%s' as it has not been found in the file system!" msgstr "" #: editor/filesystem_dock.cpp @@ -2346,12 +2484,6 @@ msgid "" msgstr "" #: editor/filesystem_dock.cpp -msgid "" -"\n" -"Source: " -msgstr "" - -#: editor/filesystem_dock.cpp msgid "Cannot move/rename resources root." msgstr "" @@ -2609,8 +2741,7 @@ msgid "Remove Poly And Point" msgstr "" #: editor/plugins/abstract_polygon_2d_editor.cpp -#: editor/plugins/light_occluder_2d_editor_plugin.cpp -msgid "Create a new polygon from scratch." +msgid "Create a new polygon from scratch" msgstr "" #: editor/plugins/abstract_polygon_2d_editor.cpp @@ -2621,6 +2752,10 @@ msgid "" "RMB: Erase Point." msgstr "" +#: editor/plugins/abstract_polygon_2d_editor.cpp +msgid "Delete points" +msgstr "" + #: editor/plugins/animation_player_editor_plugin.cpp msgid "Toggle Autoplay" msgstr "" @@ -2955,18 +3090,10 @@ msgid "Can't resolve hostname:" msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Can't resolve." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Connection error, please try again." msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Can't connect." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Can't connect to host:" msgstr "" @@ -2975,30 +3102,14 @@ msgid "No response from host:" msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "No response." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Request failed, return code:" msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Req. Failed." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Request failed, too many redirects" msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Redirect Loop." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp -msgid "Failed:" -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Bad download hash, assuming file has been tampered with." msgstr "" @@ -3027,14 +3138,6 @@ msgid "Resolving.." msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Connecting.." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp -msgid "Requesting.." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Error making request" msgstr "" @@ -3147,6 +3250,34 @@ msgid "Move Action" msgstr "" #: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Move vertical guide" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Create new vertical guide" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Remove vertical guide" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Move horizontal guide" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Create new horizontal guide" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Remove horizontal guide" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Create new horizontal and vertical guides" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp msgid "Edit IK Chain" msgstr "" @@ -3267,10 +3398,16 @@ msgid "Snap to other nodes" msgstr "" #: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Snap to guides" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Lock the selected object in place (can't be moved)." msgstr "" #: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Unlock the selected object (can be moved)." msgstr "" @@ -3321,6 +3458,10 @@ msgid "Show rulers" msgstr "" #: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Show guides" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp msgid "Center Selection" msgstr "" @@ -3505,6 +3646,10 @@ msgstr "" msgid "Hold Shift to edit tangents individually" msgstr "" +#: editor/plugins/gi_probe_editor_plugin.cpp +msgid "Bake GI Probe" +msgstr "" + #: editor/plugins/gradient_editor_plugin.cpp msgid "Add/Remove Color Ramp Point" msgstr "" @@ -3537,6 +3682,10 @@ msgid "Create Occluder Polygon" msgstr "" #: editor/plugins/light_occluder_2d_editor_plugin.cpp +msgid "Create a new polygon from scratch." +msgstr "" + +#: editor/plugins/light_occluder_2d_editor_plugin.cpp msgid "Edit existing polygon:" msgstr "" @@ -3552,58 +3701,6 @@ msgstr "" msgid "RMB: Erase Point." msgstr "" -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Remove Point from Line2D" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Add Point to Line2D" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Move Point in Line2D" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Select Points" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Shift+Drag: Select Control Points" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Click: Add Point" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Right Click: Delete Point" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Add Point (in empty space)" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Split Segment (in line)" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Delete Point" -msgstr "" - #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Mesh is empty!" msgstr "" @@ -4001,16 +4098,46 @@ msgid "Move Out-Control in Curve" msgstr "" #: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Select Points" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Shift+Drag: Select Control Points" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Click: Add Point" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Right Click: Delete Point" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp msgid "Select Control Points (Shift+Drag)" msgstr "" #: editor/plugins/path_2d_editor_plugin.cpp #: editor/plugins/path_editor_plugin.cpp +msgid "Add Point (in empty space)" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp msgid "Split Segment (in curve)" msgstr "" #: editor/plugins/path_2d_editor_plugin.cpp #: editor/plugins/path_editor_plugin.cpp +msgid "Delete Point" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp msgid "Close Curve" msgstr "" @@ -4147,7 +4274,6 @@ msgstr "" #: editor/plugins/resource_preloader_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp #: editor/plugins/sprite_frames_editor_plugin.cpp editor/property_editor.cpp #: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Paste" @@ -4192,6 +4318,20 @@ msgid " Class Reference" msgstr "" #: editor/plugins/script_editor_plugin.cpp +msgid "Sort" +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp +msgid "Move Up" +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp +msgid "Move Down" +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp msgid "Next script" msgstr "" @@ -4243,6 +4383,10 @@ msgstr "" msgid "Close All" msgstr "" +#: editor/plugins/script_editor_plugin.cpp +msgid "Close Other Tabs" +msgstr "" + #: editor/plugins/script_editor_plugin.cpp editor/project_manager.cpp msgid "Run" msgstr "" @@ -4253,13 +4397,11 @@ msgstr "" #: editor/plugins/script_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Find.." msgstr "" #: editor/plugins/script_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Find Next" msgstr "" @@ -4363,33 +4505,22 @@ msgstr "" msgid "Capitalize" msgstr "" -#: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp scene/gui/line_edit.cpp +#: editor/plugins/script_text_editor.cpp scene/gui/line_edit.cpp #: scene/gui/text_edit.cpp msgid "Cut" msgstr "" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp #: editor/plugins/sprite_frames_editor_plugin.cpp editor/property_editor.cpp #: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Copy" msgstr "" -#: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp scene/gui/line_edit.cpp +#: editor/plugins/script_text_editor.cpp scene/gui/line_edit.cpp #: scene/gui/text_edit.cpp msgid "Select All" msgstr "" -#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp -msgid "Move Up" -msgstr "" - -#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp -msgid "Move Down" -msgstr "" - #: editor/plugins/script_text_editor.cpp msgid "Delete Line" msgstr "" @@ -4411,6 +4542,22 @@ msgid "Clone Down" msgstr "" #: editor/plugins/script_text_editor.cpp +msgid "Fold Line" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Unfold Line" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Fold All Lines" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Unfold All Lines" +msgstr "" + +#: editor/plugins/script_text_editor.cpp msgid "Complete Symbol" msgstr "" @@ -4456,12 +4603,10 @@ msgid "Convert To Lowercase" msgstr "" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Find Previous" msgstr "" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Replace.." msgstr "" @@ -4470,7 +4615,6 @@ msgid "Goto Function.." msgstr "" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Goto Line.." msgstr "" @@ -4635,6 +4779,14 @@ msgid "View Plane Transform." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "Scaling: " +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Translating: " +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Rotating %s degrees." msgstr "" @@ -4715,6 +4867,10 @@ msgid "Vertices" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "FPS" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Align with view" msgstr "" @@ -4747,6 +4903,14 @@ msgid "View Information" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "View FPS" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Half Resolution" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Audio Listener" msgstr "" @@ -4874,6 +5038,10 @@ msgid "Tool Scale" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "Toggle Freelook" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Transform" msgstr "" @@ -5148,6 +5316,10 @@ msgid "Create Empty Editor Template" msgstr "" #: editor/plugins/theme_editor_plugin.cpp +msgid "Create From Current Editor Theme" +msgstr "" + +#: editor/plugins/theme_editor_plugin.cpp msgid "CheckBox Radio1" msgstr "" @@ -5321,7 +5493,7 @@ msgid "Runnable" msgstr "" #: editor/project_export.cpp -msgid "Delete patch '" +msgid "Delete patch '%s' from list?" msgstr "" #: editor/project_export.cpp @@ -5614,10 +5786,6 @@ msgid "Add Input Action Event" msgstr "" #: editor/project_settings_editor.cpp editor/settings_config_dialog.cpp -msgid "Meta+" -msgstr "" - -#: editor/project_settings_editor.cpp editor/settings_config_dialog.cpp msgid "Shift+" msgstr "" @@ -5739,11 +5907,11 @@ msgid "Select a setting item first!" msgstr "" #: editor/project_settings_editor.cpp -msgid "No property '" +msgid "No property '%s' exists." msgstr "" #: editor/project_settings_editor.cpp -msgid "Setting '" +msgid "Setting '%s' is internal, and it can't be deleted." msgstr "" #: editor/project_settings_editor.cpp @@ -6210,6 +6378,14 @@ msgid "Clear a script for the selected node." msgstr "" #: editor/scene_tree_dock.cpp +msgid "Remote" +msgstr "" + +#: editor/scene_tree_dock.cpp +msgid "Local" +msgstr "" + +#: editor/scene_tree_dock.cpp msgid "Clear Inheritance? (No Undo!)" msgstr "" @@ -6392,6 +6568,10 @@ msgid "Attach Node Script" msgstr "" #: editor/script_editor_debugger.cpp +msgid "Remote " +msgstr "" + +#: editor/script_editor_debugger.cpp msgid "Bytes:" msgstr "" @@ -6448,18 +6628,6 @@ msgid "Stack Trace (if applicable):" msgstr "" #: editor/script_editor_debugger.cpp -msgid "Remote Inspector" -msgstr "" - -#: editor/script_editor_debugger.cpp -msgid "Live Scene Tree:" -msgstr "" - -#: editor/script_editor_debugger.cpp -msgid "Remote Object Properties: " -msgstr "" - -#: editor/script_editor_debugger.cpp msgid "Profiler" msgstr "" @@ -6591,49 +6759,49 @@ msgstr "" msgid "GDNative" msgstr "" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp #: modules/visual_script/visual_script_builtin_funcs.cpp msgid "Invalid type argument to convert(), use TYPE_* constants." msgstr "" -#: modules/gdscript/gd_functions.cpp modules/mono/glue/glue_header.h +#: modules/gdscript/gdscript_functions.cpp modules/mono/glue/glue_header.h #: modules/visual_script/visual_script_builtin_funcs.cpp msgid "Not enough bytes for decoding bytes, or invalid format." msgstr "" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "step argument is zero!" msgstr "" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Not a script with an instance" msgstr "" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Not based on a script" msgstr "" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Not based on a resource file" msgstr "" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary format (missing @path)" msgstr "" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary format (can't load script at @path)" msgstr "" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary format (invalid script at @path)" msgstr "" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary (invalid subclasses)" msgstr "" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Object can't provide a length." msgstr "" @@ -6646,15 +6814,23 @@ msgid "GridMap Duplicate Selection" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp +msgid "Floor:" +msgstr "" + +#: modules/gridmap/grid_map_editor_plugin.cpp +msgid "Grid Map" +msgstr "" + +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Snap View" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp -msgid "Prev Level (%sDown Wheel)" +msgid "Previous Floor" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp -msgid "Next Level (%sUp Wheel)" +msgid "Next Floor" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp @@ -6722,11 +6898,7 @@ msgid "Erase Area" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp -msgid "Selection -> Duplicate" -msgstr "" - -#: modules/gridmap/grid_map_editor_plugin.cpp -msgid "Selection -> Clear" +msgid "Clear Selection" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp @@ -6848,7 +7020,7 @@ msgid "Duplicate VisualScript Nodes" msgstr "" #: modules/visual_script/visual_script_editor.cpp -msgid "Hold Meta to drop a Getter. Hold Shift to drop a generic signature." +msgid "Hold %s to drop a Getter. Hold Shift to drop a generic signature." msgstr "" #: modules/visual_script/visual_script_editor.cpp @@ -6856,7 +7028,7 @@ msgid "Hold Ctrl to drop a Getter. Hold Shift to drop a generic signature." msgstr "" #: modules/visual_script/visual_script_editor.cpp -msgid "Hold Meta to drop a simple reference to the node." +msgid "Hold %s to drop a simple reference to the node." msgstr "" #: modules/visual_script/visual_script_editor.cpp @@ -6864,7 +7036,7 @@ msgid "Hold Ctrl to drop a simple reference to the node." msgstr "" #: modules/visual_script/visual_script_editor.cpp -msgid "Hold Meta to drop a Variable Setter." +msgid "Hold %s to drop a Variable Setter." msgstr "" #: modules/visual_script/visual_script_editor.cpp @@ -7090,11 +7262,19 @@ msgid "Could not write file:\n" msgstr "" #: platform/javascript/export/export.cpp -msgid "Could not read file:\n" +msgid "Could not open template for export:\n" msgstr "" #: platform/javascript/export/export.cpp -msgid "Could not open template for export:\n" +msgid "Invalid export template:\n" +msgstr "" + +#: platform/javascript/export/export.cpp +msgid "Could not read custom HTML shell:\n" +msgstr "" + +#: platform/javascript/export/export.cpp +msgid "Could not read boot splash image file:\n" msgstr "" #: scene/2d/animated_sprite.cpp @@ -7186,18 +7366,6 @@ msgstr "" msgid "Path property must point to a valid Node2D node to work." msgstr "" -#: scene/2d/sprite.cpp -msgid "" -"Path property must point to a valid Viewport node to work. Such Viewport " -"must be set to 'render target' mode." -msgstr "" - -#: scene/2d/sprite.cpp -msgid "" -"The Viewport set in the path property must be set as 'render target' in " -"order for this sprite to work." -msgstr "" - #: scene/2d/visibility_notifier_2d.cpp msgid "" "VisibilityEnable2D works best when used with the edited scene root directly " @@ -7256,6 +7424,14 @@ msgid "" "shape resource for it!" msgstr "" +#: scene/3d/gi_probe.cpp +msgid "Plotting Meshes" +msgstr "" + +#: scene/3d/gi_probe.cpp +msgid "Finishing Plot" +msgstr "" + #: scene/3d/navigation_mesh.cpp msgid "A NavigationMesh resource must be set or created for this node to work." msgstr "" @@ -7333,6 +7509,10 @@ msgid "" "minimum size manually." msgstr "" +#: scene/gui/tree.cpp +msgid "(Other)" +msgstr "" + #: scene/main/scene_tree.cpp msgid "" "Default Environment as specified in Project Setings (Rendering -> Viewport -" diff --git a/editor/translations/el.po b/editor/translations/el.po index 02de498110..0767b07ea5 100644 --- a/editor/translations/el.po +++ b/editor/translations/el.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Godot Engine editor\n" -"PO-Revision-Date: 2017-10-24 18:46+0000\n" +"PO-Revision-Date: 2017-11-22 12:05+0000\n" "Last-Translator: George Tsiamasiotis <gtsiam@windowslive.com>\n" "Language-Team: Greek <https://hosted.weblate.org/projects/godot-engine/godot/" "el/>\n" @@ -16,7 +16,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8-bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 2.17\n" +"X-Generator: Weblate 2.18-dev\n" #: editor/animation_editor.cpp msgid "Disabled" @@ -99,6 +99,7 @@ msgid "Anim Delete Keys" msgstr "Anim ΔιαγÏαφή κλειδιών" #: editor/animation_editor.cpp editor/plugins/tile_map_editor_plugin.cpp +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Duplicate Selection" msgstr "Διπλασιασμός επιλογής" @@ -636,6 +637,13 @@ msgstr "ΕπεξεÏγαστής εξαÏτήσεων" msgid "Search Replacement Resource:" msgstr "Αναζήτηση αντικαταστάτη πόÏου:" +#: editor/dependency_editor.cpp editor/editor_file_dialog.cpp +#: editor/editor_help.cpp editor/editor_node.cpp editor/filesystem_dock.cpp +#: editor/plugins/script_editor_plugin.cpp editor/property_selector.cpp +#: editor/quick_open.cpp scene/gui/file_dialog.cpp +msgid "Open" +msgstr "Άνοιγμα" + #: editor/dependency_editor.cpp msgid "Owners Of:" msgstr "Ιδιοκτήτες του:" @@ -708,6 +716,16 @@ msgstr "ΔιαγÏαφή επιλεγμÎνων αÏχείων;" msgid "Delete" msgstr "ΔιαγÏαφή" +#: editor/dictionary_property_edit.cpp +#, fuzzy +msgid "Change Dictionary Key" +msgstr "Αλλαγή ονόματος κίνησης:" + +#: editor/dictionary_property_edit.cpp +#, fuzzy +msgid "Change Dictionary Value" +msgstr "Αλλαγή τιμής πίνακα" + #: editor/editor_about.cpp msgid "Thanks from the Godot community!" msgstr "ΕυχαÏιστίες από την κοινότητα της Godot!" @@ -1130,12 +1148,6 @@ msgstr "Όλα τα αναγνωÏισμÎνα" msgid "All Files (*)" msgstr "Όλα τα αÏχεία (*)" -#: editor/editor_file_dialog.cpp editor/editor_help.cpp editor/editor_node.cpp -#: editor/filesystem_dock.cpp editor/plugins/script_editor_plugin.cpp -#: editor/property_selector.cpp editor/quick_open.cpp scene/gui/file_dialog.cpp -msgid "Open" -msgstr "Άνοιγμα" - #: editor/editor_file_dialog.cpp scene/gui/file_dialog.cpp msgid "Open a File" msgstr "Άνοιγμα αÏχείου" @@ -1329,6 +1341,8 @@ msgid "" "There is currently no description for this property. Please help us by " "[color=$color][url=$url]contributing one[/url][/color]!" msgstr "" +"Δεν υπάÏχει ακόμη πεÏιγÏαφή για αυτήν την ιδιότητα. ΠαÏακαλοÏμε βοηθήστε μας " +"[color=$color][url=$url]γÏάφοντας μία[/url][/color]!" #: editor/editor_help.cpp msgid "Methods" @@ -1343,6 +1357,8 @@ msgid "" "There is currently no description for this method. Please help us by [color=" "$color][url=$url]contributing one[/url][/color]!" msgstr "" +"Δεν υπάÏχει ακόμη πεÏιγÏαφή για αυτήν την μÎθοδο. ΠαÏακαλοÏμε βοηθήστε μας " +"[color=$color][url=$url]γÏάφοντας μία[/url][/color]!" #: editor/editor_help.cpp msgid "Search Text" @@ -1393,7 +1409,7 @@ msgstr "Σφάλμα κατά η ανάλυση του '%s'." #: editor/editor_node.cpp msgid "Unexpected end of file '%s'." -msgstr "" +msgstr "Αναπάντεχο Ï„Îλος αÏχείου '%s'." #: editor/editor_node.cpp msgid "Missing '%s' or its dependencies." @@ -1468,18 +1484,26 @@ msgid "" "Please read the documentation relevant to importing scenes to better " "understand this workflow." msgstr "" +"Αυτός ο πόÏος ανήκει σε μία σκηνή που Îχει εισαχθεί, οπότε δεν είναι " +"επεξεÏγάσιμο.\n" +"ΠαÏακαλοÏμε διαβάστε την τεκμηÏίωση σχετική με την εισαγωγή σκηνών, για να " +"καταλάβετε καλÏτεÏα την διαδικασία." #: editor/editor_node.cpp msgid "" "This resource belongs to a scene that was instanced or inherited.\n" "Changes to it will not be kept when saving the current scene." msgstr "" +"Αυτός ο πόÏος ανήκει σε μία σκηνή που Îχει κλωνοποιηθεί ή κληÏονομηθεί.\n" +"Οι αλλαγÎÏ‚ δεν θα διατηÏηθοÏν κατά την αποθήκευση της Ï„ÏÎχουσας σκηνής." #: editor/editor_node.cpp msgid "" "This resource was imported, so it's not editable. Change its settings in the " "import panel and then re-import." msgstr "" +"Αυτός ο πόÏος Îχει εισαχθεί, οπότε δεν είναι επεξεÏγάσιμος. Αλλάξτε τις " +"Ïυθμίσεις στο πλαίσιο εισαγωγής και μετά επαν-εισάγετε." #: editor/editor_node.cpp msgid "" @@ -1488,6 +1512,22 @@ msgid "" "Please read the documentation relevant to importing scenes to better " "understand this workflow." msgstr "" +"Αυτή η σκηνή Îχει εισαχθεί, οπότε αλλαγÎÏ‚ σε αυτήν δεν θα διατηÏηθοÏν.\n" +"Η κλωνοποίηση ή η κληÏονόμηση της θα επιτÏÎψει την επεξεÏγασία της.\n" +"ΠαÏακαλοÏμε διαβάστε την τεκμηÏίωση σχετική με την εισαγωγή σκηνών, για να " +"καταλάβετε καλÏτεÏα την διαδικασία." + +#: editor/editor_node.cpp +#, fuzzy +msgid "" +"This is a remote object so changes to it will not be kept.\n" +"Please read the documentation relevant to debugging to better understand " +"this workflow." +msgstr "" +"Αυτός ο πόÏος ανήκει σε μία σκηνή που Îχει εισαχθεί, οπότε δεν είναι " +"επεξεÏγάσιμο.\n" +"ΠαÏακαλοÏμε διαβάστε την τεκμηÏίωση σχετική με την εισαγωγή σκηνών, για να " +"καταλάβετε καλÏτεÏα την διαδικασία." #: editor/editor_node.cpp msgid "Copy Params" @@ -1611,6 +1651,11 @@ msgid "Export Mesh Library" msgstr "Εξαγωγή βιβλιοθήκης πλεγμάτων" #: editor/editor_node.cpp +#, fuzzy +msgid "This operation can't be done without a root node." +msgstr "Αυτή η λειτουÏγία δεν μποÏεί να γίνει χωÏίς Îναν επιλεγμÎνο κόμβο." + +#: editor/editor_node.cpp msgid "Export Tile Set" msgstr "Εξαγωγή σετ πλακιδίων" @@ -1672,38 +1717,41 @@ msgid "" "This option is deprecated. Situations where refresh must be forced are now " "considered a bug. Please report." msgstr "" +"Αυτή η επιλογή Îχει αποÏÏιφθεί. Καταστάσεις στις οποίες Ï€ÏÎπει να γίνει " +"ανανÎωση θεωÏοÏνται σφάλματα, και σας ζητοÏμε να τις αναφÎÏετε." #: editor/editor_node.cpp msgid "Pick a Main Scene" msgstr "Επιλογή κÏÏιας σκηνής" #: editor/editor_node.cpp -#, fuzzy msgid "Unable to enable addon plugin at: '%s' parsing of config failed." -msgstr "ΑδÏνατη η ενεÏγοποίηση Ï€Ïόσθετης επÎκτασης στο: '" +msgstr "" +"ΑδÏνατη η ενεÏγοποίηση Ï€Ïόσθετης επÎκτασης στο: '%s'. ΑπÎτυχε η ανάλυση του " +"αÏχείου ÏÏθμισης." #: editor/editor_node.cpp -#, fuzzy msgid "Unable to find script field for addon plugin at: 'res://addons/%s'." msgstr "" "ΑδÏνατη η ÎÏ…Ïεση του πεδίου 'script' για την Ï€Ïόσθετη επÎκταση στο: 'res://" -"addons/" +"addons/%s'." #: editor/editor_node.cpp -#, fuzzy msgid "Unable to load addon script from path: '%s'." -msgstr "ΑδÏνατη η φόÏτωση δεσμής ενεÏγειών Ï€ÏοσθÎτου από τη διαδÏομή: '" +msgstr "ΑδÏνατη η φόÏτωση δεσμής ενεÏγειών Ï€ÏοσθÎτου από τη διαδÏομή: '%s'." #: editor/editor_node.cpp -#, fuzzy msgid "" "Unable to load addon script from path: '%s' Base type is not EditorPlugin." -msgstr "ΑδÏνατη η φόÏτωση δεσμής ενεÏγειών Ï€ÏοσθÎτου από τη διαδÏομή: '" +msgstr "" +"ΑδÏνατη η φόÏτωση δεσμής ενεÏγειών Ï€ÏοσθÎτου από τη διαδÏομή: '%s'. Ο " +"βασικός Ï„Ïπος δεν είναι το EditorPlugin." #: editor/editor_node.cpp -#, fuzzy msgid "Unable to load addon script from path: '%s' Script is not in tool mode." -msgstr "ΑδÏνατη η φόÏτωση δεσμής ενεÏγειών Ï€ÏοσθÎτου από τη διαδÏομή: '" +msgstr "" +"ΑδÏνατη η φόÏτωση δεσμής ενεÏγειών Ï€ÏοσθÎτου από τη διαδÏομή: '%s'. Δεν " +"είναι σε λειτουÏγία tool." #: editor/editor_node.cpp msgid "" @@ -1754,12 +1802,23 @@ msgid "Switch Scene Tab" msgstr "Εναλλαγή καÏÏ„Îλας σκηνής" #: editor/editor_node.cpp -msgid "%d more file(s)" +#, fuzzy +msgid "%d more files or folders" +msgstr "%d πεÏισσότεÏα αÏχεία ή φάκελοι" + +#: editor/editor_node.cpp +#, fuzzy +msgid "%d more folders" msgstr "%d πεÏισσότεÏα αÏχεία" #: editor/editor_node.cpp -msgid "%d more file(s) or folder(s)" -msgstr "%d πεÏισσότεÏα αÏχεία ή φάκελοι" +#, fuzzy +msgid "%d more files" +msgstr "%d πεÏισσότεÏα αÏχεία" + +#: editor/editor_node.cpp +msgid "Dock Position" +msgstr "" #: editor/editor_node.cpp msgid "Distraction Free Mode" @@ -1770,6 +1829,11 @@ msgid "Toggle distraction-free mode." msgstr "Εναλλαγή λειτουÏγίας χωÏίς πεÏισπασμοÏÏ‚." #: editor/editor_node.cpp +#, fuzzy +msgid "Add a new scene." +msgstr "Î Ïοσθήκη νÎων κομματιών." + +#: editor/editor_node.cpp msgid "Scene" msgstr "Σκηνή" @@ -1834,13 +1898,12 @@ msgid "TileSet.." msgstr "TileSet..." #: editor/editor_node.cpp editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp scene/gui/line_edit.cpp -#: scene/gui/text_edit.cpp +#: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Undo" msgstr "ΑναίÏεση" #: editor/editor_node.cpp editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp +#: scene/gui/line_edit.cpp msgid "Redo" msgstr "ΑκÏÏωση αναίÏεσης" @@ -2194,7 +2257,6 @@ msgid "Open the previous Editor" msgstr "Άνοιγμα του Ï€ÏοηγοÏμενου επεξεÏγαστή" #: editor/editor_plugin.cpp -#, fuzzy msgid "Creating Mesh Previews" msgstr "ΔημιουÏγία Ï€Ïοεπισκοπήσεων πλεγμάτων" @@ -2248,9 +2310,8 @@ msgid "Frame %" msgstr "ΚαÏÎ %" #: editor/editor_profiler.cpp -#, fuzzy msgid "Physics Frame %" -msgstr "ΣταθεÏÏŒ καÏÎ %" +msgstr "KαÏΠφυσικής %" #: editor/editor_profiler.cpp editor/script_editor_debugger.cpp msgid "Time:" @@ -2345,6 +2406,11 @@ msgid "(Current)" msgstr "(ΤÏÎχων)" #: editor/export_template_manager.cpp +#, fuzzy +msgid "Retrieving mirrors, please wait.." +msgstr "Σφάλμα σÏνδεσης, παÏακαλώ ξαναπÏοσπαθήστε." + +#: editor/export_template_manager.cpp msgid "Remove template version '%s'?" msgstr "ΑφαίÏεση Ï€Ïότυπης εκδοχής '%s';" @@ -2381,6 +2447,112 @@ msgid "Importing:" msgstr "Εισαγωγή:" #: editor/export_template_manager.cpp +msgid "" +"No download links found for this version. Direct download is only available " +"for official releases." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Can't resolve." +msgstr "Δεν είναι δυνατή η επίλυση." + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Can't connect." +msgstr "Δεν ήταν δυνατή η σÏνδεση." + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "No response." +msgstr "Δεν λήφθηκε απόκÏιση." + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Req. Failed." +msgstr "Το αίτημα απÎτυχε." + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Redirect Loop." +msgstr "Î’Ïόχος ανακατευθήνσεων." + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Failed:" +msgstr "ΑπÎτυχε:" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Can't write file." +msgstr "Δεν ήταν δυνατό το γÏάψιμο στο αÏχείο:\n" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Download Complete." +msgstr "Σφάλμα λήψης" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Error requesting url: " +msgstr "Σφάλμα κατά την αποθήκευση άτλαντα:" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Connecting to Mirror.." +msgstr "ΣÏνδεση.." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Disconnected" +msgstr "ΑποσÏνδεση" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Resolving" +msgstr "Επίλυση..." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Can't Resolve" +msgstr "Δεν είναι δυνατή η επίλυση." + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Connecting.." +msgstr "ΣÏνδεση.." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Can't Conect" +msgstr "Δεν ήταν δυνατή η σÏνδεση." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Connected" +msgstr "ΣÏνδεση" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Requesting.." +msgstr "Γίνεται αίτημα.." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Downloading" +msgstr "Λήψη" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Connection Error" +msgstr "ΣÏνδεση.." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "SSL Handshake Error" +msgstr "Σφάλματα φόÏτωσης" + +#: editor/export_template_manager.cpp msgid "Current Version:" msgstr "ΤÏÎχουσα Îκδοση:" @@ -2404,6 +2576,16 @@ msgstr "ΕπιλÎξτε Îνα αÏχείο Ï€ÏοτÏπων" msgid "Export Template Manager" msgstr "ΔιαχειÏιστής Ï€ÏοτÏπων εξαγωγής" +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Download Templates" +msgstr "Î Ïότυπα" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Select mirror from list: " +msgstr "ΕπιλÎξτε συσκευή από την λίστα" + #: editor/file_type_cache.cpp msgid "Can't open file_type_cache.cch for writing, not saving file type cache!" msgstr "" @@ -2411,82 +2593,69 @@ msgstr "" "αποθήκευσης cache Ï„Ïπου αÏχείου!" #: editor/filesystem_dock.cpp -msgid "Cannot navigate to '" -msgstr "ΑδÏνατη η πλοήγηση στο '" +msgid "Cannot navigate to '%s' as it has not been found in the file system!" +msgstr "" #: editor/filesystem_dock.cpp msgid "View items as a grid of thumbnails" -msgstr "" +msgstr "Εμφάνιση αντικειμÎνων σε πλÎγμα μικÏγÏαφιών" #: editor/filesystem_dock.cpp msgid "View items as a list" -msgstr "" +msgstr "Εμφάνιση αντικειμÎνων σε λίστα" #: editor/filesystem_dock.cpp msgid "" "\n" "Status: Import of file failed. Please fix file and reimport manually." msgstr "" - -#: editor/filesystem_dock.cpp -msgid "" -"\n" -"Source: " -msgstr "" "\n" -"Πηγή: " +"Κατάσταση: Η εισαγωγή απÎτυχε. ΠαÏακαλοÏμε διοÏθώστε το αÏχείο και " +"επανεισάγετε το χειÏοκίνητα." #: editor/filesystem_dock.cpp -#, fuzzy msgid "Cannot move/rename resources root." -msgstr "Δεν ήταν δυνατή η φόÏτωση/επεξεÏγασία της πηγαίας γÏαμματοσειÏάς." +msgstr "Δεν ήταν δυνατή η μετακίνηση/μετονομασία του πηγαίου καταλόγου." #: editor/filesystem_dock.cpp -#, fuzzy msgid "Cannot move a folder into itself.\n" -msgstr "Δεν είναι δυνατή η εισαγωγή ενός αÏχείου πάνω στον εαυτό του:" +msgstr "Δεν είναι δυνατή η μετακίνηση ενός φακÎλου στον εαυτό του.\n" #: editor/filesystem_dock.cpp -#, fuzzy msgid "Error moving:\n" -msgstr "Σφάλμα κατά την μετακίνηση καταλόγου:\n" +msgstr "Σφάλμα κατά την μετακίνηση:\n" #: editor/filesystem_dock.cpp -#, fuzzy msgid "Unable to update dependencies:\n" -msgstr "Η σκηνή '%s' Îχει σπασμÎνες εξαÏτήσεις:" +msgstr "ΑδÏνατη η ενημÎÏωση των εξαÏτήσεων:\n" #: editor/filesystem_dock.cpp msgid "No name provided" -msgstr "" +msgstr "Δεν δόθηκε όνομα" #: editor/filesystem_dock.cpp msgid "Provided name contains invalid characters" -msgstr "" +msgstr "Το δοσμÎνο όνομα πεÏιÎχει άκυÏους χαÏακτήÏες" #: editor/filesystem_dock.cpp -#, fuzzy msgid "No name provided." -msgstr "Μετονομασία ή μετακίνηση.." +msgstr "Δεν δόθηκε όνομα." #: editor/filesystem_dock.cpp -#, fuzzy msgid "Name contains invalid characters." -msgstr "ΈγκυÏοι χαÏακτήÏες:" +msgstr "Το όνομα πεÏιÎχει άκυÏους χαÏακτήÏες." #: editor/filesystem_dock.cpp msgid "A file or folder with this name already exists." -msgstr "" +msgstr "ΥπάÏχει ήδη Îνα αÏχείο ή φάκελος με αυτό το όνομα." #: editor/filesystem_dock.cpp -#, fuzzy msgid "Renaming file:" -msgstr "Μετονομασία μεταβλητής" +msgstr "Μετονομασία αÏχείου:" #: editor/filesystem_dock.cpp -#, fuzzy msgid "Renaming folder:" -msgstr "Μετονομασία κόμβου" +msgstr "Μετονομασία καταλόγου:" #: editor/filesystem_dock.cpp msgid "Expand all" @@ -2501,18 +2670,16 @@ msgid "Copy Path" msgstr "ΑντιγÏαφή διαδÏομής" #: editor/filesystem_dock.cpp -#, fuzzy msgid "Rename.." -msgstr "Μετονομασία" +msgstr "Μετονομασία.." #: editor/filesystem_dock.cpp msgid "Move To.." msgstr "Μετακίνηση σε..." #: editor/filesystem_dock.cpp -#, fuzzy msgid "New Folder.." -msgstr "ΔημιουÏγία φακÎλου" +msgstr "ÎÎος φακÎλου.." #: editor/filesystem_dock.cpp msgid "Show In File Manager" @@ -2582,9 +2749,8 @@ msgid "Import as Single Scene" msgstr "Εισαγωγή ως μονή σκηνή" #: editor/import/resource_importer_scene.cpp -#, fuzzy msgid "Import with Separate Animations" -msgstr "Εισαγωγή με ξεχωÏιστά υλικά" +msgstr "Εισαγωγή με ξεχωÏιστÎÏ‚ κινήσεις" #: editor/import/resource_importer_scene.cpp msgid "Import with Separate Materials" @@ -2599,19 +2765,16 @@ msgid "Import with Separate Objects+Materials" msgstr "Εισαγωγή με ξεχωÏιστά υλικά και αντικείμενα" #: editor/import/resource_importer_scene.cpp -#, fuzzy msgid "Import with Separate Objects+Animations" -msgstr "Εισαγωγή με ξεχωÏιστά υλικά και αντικείμενα" +msgstr "Εισαγωγή με ξεχωÏιστά αντικείμενα και κινήσεις" #: editor/import/resource_importer_scene.cpp -#, fuzzy msgid "Import with Separate Materials+Animations" -msgstr "Εισαγωγή με ξεχωÏιστά υλικά" +msgstr "Εισαγωγή με ξεχωÏιστά υλικά και κινήσεις" #: editor/import/resource_importer_scene.cpp -#, fuzzy msgid "Import with Separate Objects+Materials+Animations" -msgstr "Εισαγωγή με ξεχωÏιστά υλικά και αντικείμενα" +msgstr "Εισαγωγή με ξεχωÏιστά αντικείμενα, υλικά και κινήσεις" #: editor/import/resource_importer_scene.cpp msgid "Import as Multiple Scenes" @@ -2700,9 +2863,8 @@ msgid "Edit Poly" msgstr "ΕπεγεÏγασία πολυγώνου" #: editor/plugins/abstract_polygon_2d_editor.cpp -#, fuzzy msgid "Insert Point" -msgstr "Εισαγωγή" +msgstr "Εισαγωγή σημείου" #: editor/plugins/abstract_polygon_2d_editor.cpp #: editor/plugins/collision_polygon_editor_plugin.cpp @@ -2715,8 +2877,8 @@ msgid "Remove Poly And Point" msgstr "ΑφαίÏεση πολυγώνου και σημείου" #: editor/plugins/abstract_polygon_2d_editor.cpp -#: editor/plugins/light_occluder_2d_editor_plugin.cpp -msgid "Create a new polygon from scratch." +#, fuzzy +msgid "Create a new polygon from scratch" msgstr "ΔημιουÏγία νÎου πολυγώνου από την αÏχή." #: editor/plugins/abstract_polygon_2d_editor.cpp @@ -2731,6 +2893,11 @@ msgstr "" "Ctrl + ΑÏιστεÏÏŒ κλικ: ΔιαίÏεση τμήματος.\n" "Δεξί κλικ: ΔιαγÏαφή σημείου." +#: editor/plugins/abstract_polygon_2d_editor.cpp +#, fuzzy +msgid "Delete points" +msgstr "ΔιαγÏαφή σημείου" + #: editor/plugins/animation_player_editor_plugin.cpp msgid "Toggle Autoplay" msgstr "Εναλλαγή αυτόματης αναπαÏαγωγής" @@ -3065,18 +3232,10 @@ msgid "Can't resolve hostname:" msgstr "Δεν είναι δυνατή η επίλυση του ονόματος του κεντÏÎ¹ÎºÎ¿Ï Ï…Ï€Î¿Î»Î¿Î³Î¹ÏƒÏ„Î®:" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Can't resolve." -msgstr "Δεν είναι δυνατή η επίλυση." - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Connection error, please try again." msgstr "Σφάλμα σÏνδεσης, παÏακαλώ ξαναπÏοσπαθήστε." #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Can't connect." -msgstr "Δεν ήταν δυνατή η σÏνδεση." - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Can't connect to host:" msgstr "Δεν ήταν δυνατή η σÏνδεση στον κεντÏικό υπολογιστή:" @@ -3085,30 +3244,14 @@ msgid "No response from host:" msgstr "Δεν λήφθηκε απόκÏιση από τον κεντÏικό υπολογιστή:" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "No response." -msgstr "Δεν λήφθηκε απόκÏιση." - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Request failed, return code:" msgstr "Το αίτημα απÎτυχε, κώδικας επιστÏοφής:" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Req. Failed." -msgstr "Το αίτημα απÎτυχε." - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Request failed, too many redirects" msgstr "Το αίτημα απÎτυχε, πάÏα πολλÎÏ‚ ανακατευθήνσεις" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Redirect Loop." -msgstr "Î’Ïόχος ανακατευθήνσεων." - -#: editor/plugins/asset_library_editor_plugin.cpp -msgid "Failed:" -msgstr "ΑπÎτυχε:" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Bad download hash, assuming file has been tampered with." msgstr "" "ΕσφαλμÎνος κωδικός κατακεÏματισμοÏ, θα θεωÏηθεί ότι το αÏχείο Îχει αλοιωθεί." @@ -3138,14 +3281,6 @@ msgid "Resolving.." msgstr "Επίλυση..." #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Connecting.." -msgstr "ΣÏνδεση.." - -#: editor/plugins/asset_library_editor_plugin.cpp -msgid "Requesting.." -msgstr "Γίνεται αίτημα.." - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Error making request" msgstr "Σφάλμα κατά την Ï€Ïαγματοποίηση αιτήματος" @@ -3258,6 +3393,39 @@ msgid "Move Action" msgstr "ΕνÎÏγεια μετακίνησης" #: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Move vertical guide" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Create new vertical guide" +msgstr "ΔημιουÏγία νÎου αÏχείου δεσμής ενεÏγειών" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Remove vertical guide" +msgstr "ΑφαίÏεση μεταβλητής" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Move horizontal guide" +msgstr "Μετακίνηση σημείου στην καμπÏλη" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Create new horizontal guide" +msgstr "ΔημιουÏγία νÎου αÏχείου δεσμής ενεÏγειών" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Remove horizontal guide" +msgstr "ΑφαίÏεση άκυÏων κλειδιών" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Create new horizontal and vertical guides" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp msgid "Edit IK Chain" msgstr "ΕπεξεÏγασία Αλυσίδας IK" @@ -3266,14 +3434,12 @@ msgid "Edit CanvasItem" msgstr "ΕπεξεÏγασία στοιχείου κανβά" #: editor/plugins/canvas_item_editor_plugin.cpp -#, fuzzy msgid "Anchors only" -msgstr "ΆγκυÏα" +msgstr "Μόνο άγκυÏες" #: editor/plugins/canvas_item_editor_plugin.cpp -#, fuzzy msgid "Change Anchors and Margins" -msgstr "Αλλαγή αγκυÏών" +msgstr "Αλλαγή αγκÏÏων και πεÏιθωÏίων" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Change Anchors" @@ -3331,9 +3497,8 @@ msgid "Pan Mode" msgstr "ΛειτουÏγία Μετακίνησης κάμεÏας" #: editor/plugins/canvas_item_editor_plugin.cpp -#, fuzzy msgid "Toggles snapping" -msgstr "Εναλλαγή σημείου διακοπής" +msgstr "Εναλλαγή κουμπώματος" #: editor/plugins/canvas_item_editor_plugin.cpp #: editor/plugins/spatial_editor_plugin.cpp @@ -3341,23 +3506,20 @@ msgid "Use Snap" msgstr "ΧÏήση κουμπώματος" #: editor/plugins/canvas_item_editor_plugin.cpp -#, fuzzy msgid "Snapping options" -msgstr "ΕπιλογÎÏ‚ κίνησης" +msgstr "ΕπιλογÎÏ‚ κουμπώματος" #: editor/plugins/canvas_item_editor_plugin.cpp -#, fuzzy msgid "Snap to grid" -msgstr "ΛειτουÏγία κουμπώματος:" +msgstr "κουμπώματος στο πλÎγμα" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Use Rotation Snap" msgstr "ΧÏήση κουμπώματος πεÏιστÏοφής" #: editor/plugins/canvas_item_editor_plugin.cpp -#, fuzzy msgid "Configure Snap..." -msgstr "ΔιαμόÏφωση κουμπώματος.." +msgstr "ΔιαμόÏφωση κουμπώματος..." #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Snap Relative" @@ -3369,30 +3531,36 @@ msgstr "ΧÏήση κουμπώματος εικονοστοιχείου" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Smart snapping" -msgstr "" +msgstr "Έξυπνο κοÏμπωμα" #: editor/plugins/canvas_item_editor_plugin.cpp -#, fuzzy msgid "Snap to parent" -msgstr "Επικάλυψη γονÎα" +msgstr "ΚοÏμπωμα στον γονÎα" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Snap to node anchor" -msgstr "" +msgstr "ΚοÏμπωμα στην άγκυÏα του κόμβου" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Snap to node sides" -msgstr "" +msgstr "ΚοÏμπωμα στις πλευÏÎÏ‚ του κόμβου" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Snap to other nodes" -msgstr "" +msgstr "ΚοÏμπωμα σε άλλους κόμβους" #: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Snap to guides" +msgstr "κουμπώματος στο πλÎγμα" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Lock the selected object in place (can't be moved)." msgstr "Κλείδωμα του επιλεγμÎνου αντικείμÎνου (Δεν μποÏεί να μετακινηθεί)." #: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Unlock the selected object (can be moved)." msgstr "Ξεκλείδωμα του επιλεγμÎνου αντικείμÎνου (ΜποÏεί να μετακινηθεί)." @@ -3435,14 +3603,17 @@ msgid "Show Grid" msgstr "Εμφάνιση πλÎγματος" #: editor/plugins/canvas_item_editor_plugin.cpp -#, fuzzy msgid "Show helpers" -msgstr "Εμφάνιση οστών" +msgstr "Εμφάνιση βοηθών" #: editor/plugins/canvas_item_editor_plugin.cpp -#, fuzzy msgid "Show rulers" -msgstr "Εμφάνιση οστών" +msgstr "Εμφάνιση χαÏάκων" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Show guides" +msgstr "Εμφάνιση χαÏάκων" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Center Selection" @@ -3453,9 +3624,8 @@ msgid "Frame Selection" msgstr "Πλαισίωμα επιλογής" #: editor/plugins/canvas_item_editor_plugin.cpp -#, fuzzy msgid "Layout" -msgstr "Αποθήκευση διάταξης" +msgstr "Διάταξη" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Insert Keys" @@ -3479,20 +3649,19 @@ msgstr "ΕκκαθάÏιση στάσης" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Drag pivot from mouse position" -msgstr "" +msgstr "ΣÏÏσιμο κÎντÏου από την θÎση του ποντικιοÏ" #: editor/plugins/canvas_item_editor_plugin.cpp -#, fuzzy msgid "Set pivot at mouse position" -msgstr "ΟÏισμός θÎσης εξόδου καμπÏλης" +msgstr "ΟÏισμός κÎντÏου στον κÎÏσοÏα" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Multiply grid step by 2" -msgstr "" +msgstr "Πολλαπλασιαμός βήματος πλÎγματος με 2" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Divide grid step by 2" -msgstr "" +msgstr "ΔιαίÏεση βήματος πλÎγματος με 2" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Add %s" @@ -3572,25 +3741,23 @@ msgstr "ΑναπÏοσαÏμογή από την σκηνή" #: editor/plugins/curve_editor_plugin.cpp msgid "Flat0" -msgstr "" +msgstr "Επίπεδο 0" #: editor/plugins/curve_editor_plugin.cpp msgid "Flat1" -msgstr "" +msgstr "Επίπεδο 1" #: editor/plugins/curve_editor_plugin.cpp -#, fuzzy msgid "Ease in" -msgstr "Ομαλή κίνηση Ï€Ïος τα μÎσα" +msgstr "Ομαλά μÎσα" #: editor/plugins/curve_editor_plugin.cpp -#, fuzzy msgid "Ease out" -msgstr "Ομαλή κίνηση Ï€Ïος τα Îξω" +msgstr "Ομαλά Îξω" #: editor/plugins/curve_editor_plugin.cpp msgid "Smoothstep" -msgstr "" +msgstr "Ομαλό βήμα" #: editor/plugins/curve_editor_plugin.cpp msgid "Modify Curve Point" @@ -3636,6 +3803,10 @@ msgstr "Εναλλαγή γÏαμμικής εφαπτομÎνης καμπÏλΠmsgid "Hold Shift to edit tangents individually" msgstr "Πατήστε το Shift για να επεξεÏγαστείτε εφαπτομÎνες μεμονωμÎνα" +#: editor/plugins/gi_probe_editor_plugin.cpp +msgid "Bake GI Probe" +msgstr "" + #: editor/plugins/gradient_editor_plugin.cpp msgid "Add/Remove Color Ramp Point" msgstr "Î Ïοσθήκη αφαίÏεση σημείου διαβάθμισης χÏωμάτων" @@ -3670,6 +3841,10 @@ msgid "Create Occluder Polygon" msgstr "ΔημιουÏγία πολυγώνου εμποδίου" #: editor/plugins/light_occluder_2d_editor_plugin.cpp +msgid "Create a new polygon from scratch." +msgstr "ΔημιουÏγία νÎου πολυγώνου από την αÏχή." + +#: editor/plugins/light_occluder_2d_editor_plugin.cpp msgid "Edit existing polygon:" msgstr "ΕπεξεÏγασία υπαÏÎºÏ„Î¿Ï Ï€Î¿Î»Ï…Î³ÏŽÎ½Î¿Ï…:" @@ -3685,58 +3860,6 @@ msgstr "Ctrl+ΑÏιστεÏÏŒ κλικ: ΔιαχωÏσμός τμήματος." msgid "RMB: Erase Point." msgstr "Δεξί κλικ: ΔιαγÏαφή σημείου." -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Remove Point from Line2D" -msgstr "ΔιαγÏαφή σημείου από την δισδιάστατη γÏαμμή" - -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Add Point to Line2D" -msgstr "Î Ïόσθεσε σημείο στην δισδυάστατη γÏαμμή" - -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Move Point in Line2D" -msgstr "Μετακίινηση σημείου στην δισδιάστατη γÏαμμή" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Select Points" -msgstr "Επιλογή σημείων" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Shift+Drag: Select Control Points" -msgstr "Shift + ΣÏÏσιμο: Επιλογή σημείψν ελÎγχου" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Click: Add Point" -msgstr "Κλικ: Î Ïοσθήκη σημείου" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Right Click: Delete Point" -msgstr "Δεξί κλικ: ΔιαγÏαφή σημείου" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Add Point (in empty space)" -msgstr "Î Ïοσθήκη σημείου (σε άδειο χώÏο)" - -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Split Segment (in line)" -msgstr "ΔιαχωÏισμός τμήματος (στη γÏαμμή)" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Delete Point" -msgstr "ΔιαγÏαφή σημείου" - #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Mesh is empty!" msgstr "Το πλÎγμα είναι άδειο!" @@ -3920,73 +4043,64 @@ msgid "Bake!" msgstr "Î ÏοεπεξεÏγάσου!" #: editor/plugins/navigation_mesh_editor_plugin.cpp -#, fuzzy msgid "Bake the navigation mesh.\n" -msgstr "ΔημιουÏγία πλÎγματος πλοήγησης" +msgstr "Î Ïοετοιμασία του πλÎγματος πλοήγησης.\n" #: editor/plugins/navigation_mesh_editor_plugin.cpp -#, fuzzy msgid "Clear the navigation mesh." -msgstr "ΔημιουÏγία πλÎγματος πλοήγησης" +msgstr "ΕκκαθάÏιση του πλÎγματος πλοήγησης." #: editor/plugins/navigation_mesh_generator.cpp msgid "Setting up Configuration..." -msgstr "" +msgstr "ΡÏθμιση παÏαμÎÏ„Ïων..." #: editor/plugins/navigation_mesh_generator.cpp msgid "Calculating grid size..." -msgstr "" +msgstr "Υπολογισμός μεγÎθους πλÎγματος..." #: editor/plugins/navigation_mesh_generator.cpp -#, fuzzy msgid "Creating heightfield..." -msgstr "ΔημιουÏγία Î¿ÎºÏ„Î±Î´Î¹ÎºÎ¿Ï Î´ÎντÏου φωτός" +msgstr "ΔημιουÏγία πεδίου Ïψους..." #: editor/plugins/navigation_mesh_generator.cpp -#, fuzzy msgid "Marking walkable triangles..." -msgstr "ΜεταφÏάσιμες συμβολοσειÏÎÏ‚..." +msgstr "Επισήμανση βατών Ï„Ïιγώνων..." #: editor/plugins/navigation_mesh_generator.cpp msgid "Constructing compact heightfield..." -msgstr "" +msgstr "ΔημιουÏγία συμπυκνωμÎνου πεδίου Ïψους..." #: editor/plugins/navigation_mesh_generator.cpp msgid "Eroding walkable area..." -msgstr "" +msgstr "ΔιάβÏωση βατής πεÏιοχής..." #: editor/plugins/navigation_mesh_generator.cpp -#, fuzzy msgid "Partitioning..." -msgstr "Î Ïοειδοποίηση" +msgstr "ΔιαμεÏισμός..." #: editor/plugins/navigation_mesh_generator.cpp -#, fuzzy msgid "Creating contours..." -msgstr "ΔημιουÏγία υφής Î¿ÎºÏ„Î±Î´Î¹ÎºÎ¿Ï Î´ÎντÏου" +msgstr "ΔημιουÏγία πεÏιγÏαμμάτων..." #: editor/plugins/navigation_mesh_generator.cpp -#, fuzzy msgid "Creating polymesh..." -msgstr "ΔημιουÏγία πλÎγματος πεÏιγÏάμματος.." +msgstr "ΔημιουÏγία πολÏ-πλÎγματος..." #: editor/plugins/navigation_mesh_generator.cpp -#, fuzzy msgid "Converting to native navigation mesh..." -msgstr "ΔημιουÏγία πλÎγματος πλοήγησης" +msgstr "ΜετατÏοπή σε εγγενή πλÎγμα πλοήγησης..." #: editor/plugins/navigation_mesh_generator.cpp msgid "Navigation Mesh Generator Setup:" -msgstr "" +msgstr "ΡÏθμιση γενήτÏιας πλÎγματος πλοήγησης:" #: editor/plugins/navigation_mesh_generator.cpp -#, fuzzy msgid "Parsing Geometry..." -msgstr "Ανάλυση γεωμετÏίας" +msgstr "Ανάλυση γεωμετÏίας..." #: editor/plugins/navigation_mesh_generator.cpp msgid "Done!" -msgstr "" +msgstr "ΤÎλος!" #: editor/plugins/navigation_polygon_editor_plugin.cpp msgid "Create Navigation Polygon" @@ -4147,16 +4261,46 @@ msgid "Move Out-Control in Curve" msgstr "Μετακίνηση ελεγκτή εξόδου στην καμπÏλη" #: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Select Points" +msgstr "Επιλογή σημείων" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Shift+Drag: Select Control Points" +msgstr "Shift + ΣÏÏσιμο: Επιλογή σημείψν ελÎγχου" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Click: Add Point" +msgstr "Κλικ: Î Ïοσθήκη σημείου" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Right Click: Delete Point" +msgstr "Δεξί κλικ: ΔιαγÏαφή σημείου" + +#: editor/plugins/path_2d_editor_plugin.cpp msgid "Select Control Points (Shift+Drag)" msgstr "Επλογή σημείων ελÎγχου (Shift + ΣÏÏσιμο)" #: editor/plugins/path_2d_editor_plugin.cpp #: editor/plugins/path_editor_plugin.cpp +msgid "Add Point (in empty space)" +msgstr "Î Ïοσθήκη σημείου (σε άδειο χώÏο)" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp msgid "Split Segment (in curve)" msgstr "ΔιαχωÏισμός τμήματος (στην καμπÏλη)" #: editor/plugins/path_2d_editor_plugin.cpp #: editor/plugins/path_editor_plugin.cpp +msgid "Delete Point" +msgstr "ΔιαγÏαφή σημείου" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp msgid "Close Curve" msgstr "κλείσιμο καμπÏλης" @@ -4165,17 +4309,14 @@ msgid "Curve Point #" msgstr "Σημείο καμπÏλης #" #: editor/plugins/path_editor_plugin.cpp -#, fuzzy msgid "Set Curve Point Position" msgstr "ΟÏισμός θÎσης σημείου καμπÏλης" #: editor/plugins/path_editor_plugin.cpp -#, fuzzy msgid "Set Curve In Position" msgstr "ΟÏισμός θÎσης εισόδου καμπÏλης" #: editor/plugins/path_editor_plugin.cpp -#, fuzzy msgid "Set Curve Out Position" msgstr "ΟÏισμός θÎσης εξόδου καμπÏλης" @@ -4296,7 +4437,6 @@ msgstr "ΦόÏτωση πόÏου" #: editor/plugins/resource_preloader_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp #: editor/plugins/sprite_frames_editor_plugin.cpp editor/property_editor.cpp #: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Paste" @@ -4343,6 +4483,21 @@ msgid " Class Reference" msgstr " ΑναφοÏά κλασεων" #: editor/plugins/script_editor_plugin.cpp +#, fuzzy +msgid "Sort" +msgstr "Ταξινόμηση:" + +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp +msgid "Move Up" +msgstr "Μετακίνηση πάνω" + +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp +msgid "Move Down" +msgstr "Μετακίνηση κάτω" + +#: editor/plugins/script_editor_plugin.cpp msgid "Next script" msgstr "Επόμενη δεσμή ενεÏγειών" @@ -4394,6 +4549,10 @@ msgstr "Κλείσιμο τεκμηÏίωσης" msgid "Close All" msgstr "Κλείσιμο όλων" +#: editor/plugins/script_editor_plugin.cpp +msgid "Close Other Tabs" +msgstr "" + #: editor/plugins/script_editor_plugin.cpp editor/project_manager.cpp msgid "Run" msgstr "ΕκτÎλεση" @@ -4404,13 +4563,11 @@ msgstr "Εναλλαγή πλαισίου δεσμών ενεÏγειών" #: editor/plugins/script_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Find.." msgstr "ΕÏÏεση.." #: editor/plugins/script_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Find Next" msgstr "ΕÏÏεση επόμενου" @@ -4518,33 +4675,22 @@ msgstr "Πεζά" msgid "Capitalize" msgstr "Κεφαλαιοποίηση" -#: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp scene/gui/line_edit.cpp +#: editor/plugins/script_text_editor.cpp scene/gui/line_edit.cpp #: scene/gui/text_edit.cpp msgid "Cut" msgstr "Αποκοπή" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp #: editor/plugins/sprite_frames_editor_plugin.cpp editor/property_editor.cpp #: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Copy" msgstr "ΑντιγÏαφή" -#: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp scene/gui/line_edit.cpp +#: editor/plugins/script_text_editor.cpp scene/gui/line_edit.cpp #: scene/gui/text_edit.cpp msgid "Select All" msgstr "Επιλογή όλων" -#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp -msgid "Move Up" -msgstr "Μετακίνηση πάνω" - -#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp -msgid "Move Down" -msgstr "Μετακίνηση κάτω" - #: editor/plugins/script_text_editor.cpp msgid "Delete Line" msgstr "ΔιαγÏαφή γÏαμμής" @@ -4566,6 +4712,23 @@ msgid "Clone Down" msgstr "Κλωνοποίηση κάτω" #: editor/plugins/script_text_editor.cpp +#, fuzzy +msgid "Fold Line" +msgstr "Πήγαινε στη γÏαμμή" + +#: editor/plugins/script_text_editor.cpp +msgid "Unfold Line" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Fold All Lines" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Unfold All Lines" +msgstr "" + +#: editor/plugins/script_text_editor.cpp msgid "Complete Symbol" msgstr "ΣυμπλήÏωση συμβόλου" @@ -4611,12 +4774,10 @@ msgid "Convert To Lowercase" msgstr "ΜετατÏοπή σε πεζά" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Find Previous" msgstr "ΈυÏεση Ï€ÏοηγοÏμενου" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Replace.." msgstr "Αντικατάσταση.." @@ -4625,7 +4786,6 @@ msgid "Goto Function.." msgstr "Πήγαινε σε συνάÏτηση.." #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Goto Line.." msgstr "Πήγαινε σε γÏαμμή.." @@ -4790,6 +4950,16 @@ msgid "View Plane Transform." msgstr "Μετασχηματισμός στο επίπεδο θÎασης." #: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Scaling: " +msgstr "Κλιμάκωση:" + +#: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Translating: " +msgstr "ΜεταφÏάσεις:" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Rotating %s degrees." msgstr "ΠεÏιστÏοφή %s μοίÏες." @@ -4871,6 +5041,10 @@ msgid "Vertices" msgstr "ΚοÏυφÎÏ‚" #: editor/plugins/spatial_editor_plugin.cpp +msgid "FPS" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Align with view" msgstr "Στοίχηση με την Ï€Ïοβολή" @@ -4903,6 +5077,16 @@ msgid "View Information" msgstr "Εμφάνιση πληÏοφοÏιών" #: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "View FPS" +msgstr "Î Ïοβολή αÏχείων" + +#: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Half Resolution" +msgstr "ΜεγÎθυνση επιλογής" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Audio Listener" msgstr "ΑκÏοατής ήχου" @@ -5033,6 +5217,11 @@ msgid "Tool Scale" msgstr "ΕÏγαλείο κλιμάκωσης" #: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Toggle Freelook" +msgstr "Εναλλαγή πλήÏους οθόνης" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Transform" msgstr "Μετασχηματισμός" @@ -5202,14 +5391,12 @@ msgid "Insert Empty (After)" msgstr "Εισαγωγή άδειου (Μετά)" #: editor/plugins/sprite_frames_editor_plugin.cpp -#, fuzzy msgid "Move (Before)" -msgstr "Μετακίνηση κόμβων" +msgstr "Μετακίνηση (Î Ïιν)" #: editor/plugins/sprite_frames_editor_plugin.cpp -#, fuzzy msgid "Move (After)" -msgstr "Μετκίνιση αÏιστεÏά" +msgstr "Μετκίνιση (Μετά)" #: editor/plugins/style_box_editor_plugin.cpp msgid "StyleBox Preview:" @@ -5286,11 +5473,11 @@ msgstr "ΑφαίÏεση όλων" #: editor/plugins/theme_editor_plugin.cpp msgid "Edit theme.." -msgstr "" +msgstr "ΕπεξεÏγασία θÎματος.." #: editor/plugins/theme_editor_plugin.cpp msgid "Theme editing menu." -msgstr "" +msgstr "ÎœÎµÎ½Î¿Ï ÎµÏ€ÎµÎ¾ÎµÏγασίας θÎματος." #: editor/plugins/theme_editor_plugin.cpp msgid "Add Class Items" @@ -5309,6 +5496,11 @@ msgid "Create Empty Editor Template" msgstr "ΔημιουÏγία άδειου Ï€ÏοτÏπου επεξεÏγαστή" #: editor/plugins/theme_editor_plugin.cpp +#, fuzzy +msgid "Create From Current Editor Theme" +msgstr "ΔημιουÏγία άδειου Ï€ÏοτÏπου επεξεÏγαστή" + +#: editor/plugins/theme_editor_plugin.cpp msgid "CheckBox Radio1" msgstr "Κουμπί επιλογής1" @@ -5426,9 +5618,8 @@ msgid "Mirror Y" msgstr "ΣυμμετÏία στον άξονα Î¥" #: editor/plugins/tile_map_editor_plugin.cpp -#, fuzzy msgid "Paint Tile" -msgstr "Βάψιμο TileMap" +msgstr "Βάψιμο πλακιδίου" #: editor/plugins/tile_map_editor_plugin.cpp msgid "Pick Tile" @@ -5483,7 +5674,8 @@ msgid "Runnable" msgstr "ΕκτελÎσιμο" #: editor/project_export.cpp -msgid "Delete patch '" +#, fuzzy +msgid "Delete patch '%s' from list?" msgstr "ΔιαγÏαφή ενημÎÏωσης '" #: editor/project_export.cpp @@ -5491,9 +5683,9 @@ msgid "Delete preset '%s'?" msgstr "ΔιαγÏαφή διαμόÏφωσης '%s';" #: editor/project_export.cpp -#, fuzzy msgid "Export templates for this platform are missing/corrupted: " -msgstr "Τα Ï€Ïότυπα εξαγωγής για αυτή την πλατφόÏτμα λείπουν:" +msgstr "" +"Τα Ï€Ïότυπα εξαγωγής για αυτή την πλατφόÏτμα λείπουν ή είναι κατεστÏαμμÎνα: " #: editor/project_export.cpp msgid "Presets" @@ -5570,9 +5762,9 @@ msgid "Export templates for this platform are missing:" msgstr "Τα Ï€Ïότυπα εξαγωγής για αυτή την πλατφόÏτμα λείπουν:" #: editor/project_export.cpp -#, fuzzy msgid "Export templates for this platform are missing/corrupted:" -msgstr "Τα Ï€Ïότυπα εξαγωγής για αυτή την πλατφόÏτμα λείπουν:" +msgstr "" +"Τα Ï€Ïότυπα εξαγωγής για αυτή την πλατφόÏτμα λείπουν ή είναι κατεστÏαμμÎνα:" #: editor/project_export.cpp msgid "Export With Debug" @@ -5581,21 +5773,24 @@ msgstr "Εξαγωγή με αποσφαλμάτωση" #: editor/project_manager.cpp #, fuzzy msgid "The path does not exist." -msgstr "Το αÏχείο δεν υπάÏχει." +msgstr "Η διαδÏομή δεν υπάÏχει." #: editor/project_manager.cpp msgid "Please choose a 'project.godot' file." -msgstr "" +msgstr "ΠαÏακαλοÏμε επιλÎκτε Îνα αÏχείο 'project.godot'." #: editor/project_manager.cpp msgid "" "Your project will be created in a non empty folder (you might want to create " "a new folder)." msgstr "" +"Το ÎÏγο θα δημιουÏγηθεί σε Îναν μη-άδειο φάκελο (Ίσως θÎλετε να " +"δημιουÏγήσετε Îναν καινοÏÏγιο)." #: editor/project_manager.cpp msgid "Please choose a folder that does not contain a 'project.godot' file." msgstr "" +"ΠαÏακαλοÏμε επιλÎξτε Îναν φάκελο που δεν πεÏιÎχει Îνα αÏχείο 'project.godot'." #: editor/project_manager.cpp msgid "Imported Project" @@ -5603,25 +5798,24 @@ msgstr "ΕισαγμÎνο ÎÏγο" #: editor/project_manager.cpp msgid " " -msgstr "" +msgstr " " #: editor/project_manager.cpp msgid "It would be a good idea to name your project." -msgstr "" +msgstr "Είναι καλή ιδÎα να ονομάσετε το ÎÏγο σας." #: editor/project_manager.cpp msgid "Invalid project path (changed anything?)." msgstr "Μη ÎγκυÏη διαδÏομή ÎÏγου (Αλλάξατε τίποτα;)." #: editor/project_manager.cpp -#, fuzzy msgid "Couldn't get project.godot in project path." -msgstr "Δεν ήταν δυνατή η δημιουÏγία του project.godot στη διαδÏομή ÎÏγου." +msgstr "Δεν βÏÎθηκε το project.godot στη διαδÏομή του ÎÏγου." #: editor/project_manager.cpp -#, fuzzy msgid "Couldn't edit project.godot in project path." -msgstr "Δεν ήταν δυνατή η δημιουÏγία του project.godot στη διαδÏομή ÎÏγου." +msgstr "" +"Δεν ήταν δυνατή η επεξεÏγασία του project.godot στη διαδÏομή του ÎÏγου." #: editor/project_manager.cpp msgid "Couldn't create project.godot in project path." @@ -5632,14 +5826,12 @@ msgid "The following files failed extraction from package:" msgstr "Η εξαγωγή των ακόλουθων αÏχείων από το πακÎτο απÎτυχε:" #: editor/project_manager.cpp -#, fuzzy msgid "Rename Project" -msgstr "Ανώνυμο ÎÏγο" +msgstr "Μετονομασία ÎÏγου" #: editor/project_manager.cpp -#, fuzzy msgid "Couldn't get project.godot in the project path." -msgstr "Δεν ήταν δυνατή η δημιουÏγία του project.godot στη διαδÏομή ÎÏγου." +msgstr "Δεν βÏÎθηκε το project.godot στη διαδÏομή του ÎÏγου." #: editor/project_manager.cpp msgid "New Game Project" @@ -5662,7 +5854,6 @@ msgid "Project Name:" msgstr "Όνομα ÎÏγου:" #: editor/project_manager.cpp -#, fuzzy msgid "Create folder" msgstr "ΔημιουÏγία φακÎλου" @@ -5683,9 +5874,8 @@ msgid "Unnamed Project" msgstr "Ανώνυμο ÎÏγο" #: editor/project_manager.cpp -#, fuzzy msgid "Can't open project" -msgstr "Δεν είναι δυνατή η εκτÎλεση του ÎÏγου" +msgstr "Δεν ήταν δυνατό το άνοιγμα του ÎÏγου" #: editor/project_manager.cpp msgid "Are you sure to open more than one project?" @@ -5724,6 +5914,9 @@ msgid "" "Language changed.\n" "The UI will update next time the editor or project manager starts." msgstr "" +"Η γλώσσα άλλαξε.\n" +"Το πεÏιβάλλον θα αλλάξει την επόμενη φοÏά που θα ξεκινήσει ο επεξεÏγαστής ή " +"ο διαχειÏιστής ÎÏγων." #: editor/project_manager.cpp msgid "" @@ -5757,9 +5950,8 @@ msgid "Exit" msgstr "Έξοδος" #: editor/project_manager.cpp -#, fuzzy msgid "Restart Now" -msgstr "Επανεκκίνηση (δευτεÏόλεπτα):" +msgstr "Επανεκκίνηση Ï„ÏŽÏα" #: editor/project_manager.cpp msgid "Can't run project" @@ -5798,10 +5990,6 @@ msgid "Add Input Action Event" msgstr "Î Ïοσθήκη συμβάντος εισόδου" #: editor/project_settings_editor.cpp editor/settings_config_dialog.cpp -msgid "Meta+" -msgstr "Meta+" - -#: editor/project_settings_editor.cpp editor/settings_config_dialog.cpp msgid "Shift+" msgstr "Shift+" @@ -5919,31 +6107,29 @@ msgid "Add Global Property" msgstr "Î Ïοσθήκη καθολικής ιδιότητας" #: editor/project_settings_editor.cpp -#, fuzzy msgid "Select a setting item first!" msgstr "ΕπιλÎξτε Îνα αντικείμενο ÏÏθμισης Ï€Ïώτα!" #: editor/project_settings_editor.cpp -msgid "No property '" +#, fuzzy +msgid "No property '%s' exists." msgstr "Δεν υπάÏχει ιδιότητα '" #: editor/project_settings_editor.cpp -msgid "Setting '" -msgstr "Ρυθμίση '" +msgid "Setting '%s' is internal, and it can't be deleted." +msgstr "" #: editor/project_settings_editor.cpp msgid "Delete Item" msgstr "ΔιαγÏαφή αντικειμÎνου" #: editor/project_settings_editor.cpp -#, fuzzy msgid "Can't contain '/' or ':'" -msgstr "Δεν ήταν δυνατή η σÏνδεση στον κεντÏικό υπολογιστή:" +msgstr "Δεν μποÏεί να πεÏιÎχει '/' ή ':'" #: editor/project_settings_editor.cpp -#, fuzzy msgid "Already existing" -msgstr "Η ενÎÏγεια '%s' υπάÏχει ήδη!" +msgstr "ΥπάÏχει ήδη" #: editor/project_settings_editor.cpp msgid "Error saving settings." @@ -5986,13 +6172,12 @@ msgid "Remove Resource Remap Option" msgstr "ΑφαίÏεση επιλογής ανακατεÏθυνσης πόÏου" #: editor/project_settings_editor.cpp -#, fuzzy msgid "Changed Locale Filter" -msgstr "Αλλαγή χÏόνου ανάμειξης" +msgstr "Αλλαγή φίλτÏου τοπικών Ïυθμίσεων" #: editor/project_settings_editor.cpp msgid "Changed Locale Filter Mode" -msgstr "" +msgstr "Αλλαγή λειτουÏγίας φίλτÏου τοπικών Ïυθμίσεων" #: editor/project_settings_editor.cpp msgid "Project Settings (project.godot)" @@ -6055,28 +6240,24 @@ msgid "Locale" msgstr "ΠεÏιοχή" #: editor/project_settings_editor.cpp -#, fuzzy msgid "Locales Filter" -msgstr "ΠεÏιοχή" +msgstr "ΦίλτÏο τοπικών Ïυθμίσεων" #: editor/project_settings_editor.cpp -#, fuzzy msgid "Show all locales" -msgstr "Εμφάνιση οστών" +msgstr "Εμφάνιση όλων των τοπικών Ïυθμίσεων" #: editor/project_settings_editor.cpp msgid "Show only selected locales" -msgstr "" +msgstr "Εμφάνιση μόνο επιλεγμÎνων τοπικών Ïυθμίσεων" #: editor/project_settings_editor.cpp -#, fuzzy msgid "Filter mode:" -msgstr "ΦιλτÏάÏισμα κόμβων" +msgstr "ΛειτουÏγία φιλτÏαÏίσματος:" #: editor/project_settings_editor.cpp -#, fuzzy msgid "Locales:" -msgstr "ΠεÏιοχή" +msgstr "ΠεÏιοχÎÏ‚:" #: editor/project_settings_editor.cpp msgid "AutoLoad" @@ -6127,18 +6308,16 @@ msgid "New Script" msgstr "Îεα δεσμή ενεÏγειών" #: editor/property_editor.cpp -#, fuzzy msgid "Make Unique" -msgstr "ΔημιουÏγία οστών" +msgstr "Κάνε μοναδικό" #: editor/property_editor.cpp msgid "Show in File System" msgstr "Εμφάνιση στο σÏστημα αÏχείων" #: editor/property_editor.cpp -#, fuzzy msgid "Convert To %s" -msgstr "ΜετατÏοπή σε..." +msgstr "ΜετατÏοπή σε %s" #: editor/property_editor.cpp msgid "Error loading file: Not a resource!" @@ -6177,9 +6356,8 @@ msgid "Select Property" msgstr "Επιλογή ιδιότητας" #: editor/property_selector.cpp -#, fuzzy msgid "Select Virtual Method" -msgstr "Επιλογή μεθόδου" +msgstr "Επιλογή εικονικής μεθόδου" #: editor/property_selector.cpp msgid "Select Method" @@ -6417,6 +6595,16 @@ msgid "Clear a script for the selected node." msgstr "ΕκκαθάÏιση δεσμής ενεÏγειών για τον επιλεγμÎνο κόμβο." #: editor/scene_tree_dock.cpp +#, fuzzy +msgid "Remote" +msgstr "ΑφαίÏεση" + +#: editor/scene_tree_dock.cpp +#, fuzzy +msgid "Local" +msgstr "ΠεÏιοχή" + +#: editor/scene_tree_dock.cpp msgid "Clear Inheritance? (No Undo!)" msgstr "ΕκκαθάÏιση κληÏονομικότητας; (Δεν γίνεται ανÎÏαιση!)" @@ -6539,12 +6727,11 @@ msgstr "Μη ÎγκυÏη βασική διαδÏομή" #: editor/script_create_dialog.cpp msgid "Directory of the same name exists" -msgstr "" +msgstr "ΥπάÏχει ήδη Îνας κατάλογος με το ίδιο όνομα" #: editor/script_create_dialog.cpp -#, fuzzy msgid "File exists, will be reused" -msgstr "Το αÏχείο υπάÏχει. ΘÎλετε να το αντικαταστήσετε;" +msgstr "Το αÏχείο υπάÏχει, θα επαναχÏησιμοποιηθεί" #: editor/script_create_dialog.cpp msgid "Invalid extension" @@ -6611,6 +6798,11 @@ msgid "Attach Node Script" msgstr "ΣÏνδεση δεσμής ενεÏγειών κόμβου" #: editor/script_editor_debugger.cpp +#, fuzzy +msgid "Remote " +msgstr "ΑφαίÏεση" + +#: editor/script_editor_debugger.cpp msgid "Bytes:" msgstr "ΨηφιολÎξεις:" @@ -6633,6 +6825,8 @@ msgstr "ΣυνάÏτηση:" #: editor/script_editor_debugger.cpp msgid "Pick one or more items from the list to display the graph." msgstr "" +"ΕπιλÎξτε Îνα ή πεÏισσότεÏα αντικείμενα από την λίστα για να εμφανιστεί το " +"γÏάφημα." #: editor/script_editor_debugger.cpp msgid "Errors" @@ -6667,18 +6861,6 @@ msgid "Stack Trace (if applicable):" msgstr "Ιχνηλάτηση στοίβας (Εάν υφίσταται):" #: editor/script_editor_debugger.cpp -msgid "Remote Inspector" -msgstr "ΑπομακÏυσμÎνος επιθεωÏητής" - -#: editor/script_editor_debugger.cpp -msgid "Live Scene Tree:" -msgstr "Ζωντανό δÎντÏο σκηνής:" - -#: editor/script_editor_debugger.cpp -msgid "Remote Object Properties: " -msgstr "ΑπομακÏυσμÎνες ιδιότητες αντικειμÎνου: " - -#: editor/script_editor_debugger.cpp msgid "Profiler" msgstr "Î ÏόγÏαμμα δημιουÏγίας Ï€Ïοφιλ" @@ -6795,69 +6977,67 @@ msgid "Change Probe Extents" msgstr "Αλλαγή διαστάσεων αισθητήÏα" #: modules/gdnative/gd_native_library_editor.cpp -#, fuzzy msgid "Library" -msgstr "Βιβλιοθήκη πλεγμάτων..." +msgstr "Βιβλιοθήκη" #: modules/gdnative/gd_native_library_editor.cpp -#, fuzzy msgid "Status" -msgstr "Κατάσταση:" +msgstr "Κατάσταση" #: modules/gdnative/gd_native_library_editor.cpp msgid "Libraries: " -msgstr "" +msgstr "Βιβλιοθήκες: " #: modules/gdnative/register_types.cpp msgid "GDNative" -msgstr "" +msgstr "GDNative" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp #: modules/visual_script/visual_script_builtin_funcs.cpp msgid "Invalid type argument to convert(), use TYPE_* constants." msgstr "" "Μη ÎγκυÏη παÏάμετÏος στην convert(). ΧÏησιμοποιήστε τις σταθεÏÎÏ‚ TYPE_*." -#: modules/gdscript/gd_functions.cpp modules/mono/glue/glue_header.h +#: modules/gdscript/gdscript_functions.cpp modules/mono/glue/glue_header.h #: modules/visual_script/visual_script_builtin_funcs.cpp msgid "Not enough bytes for decoding bytes, or invalid format." msgstr "Δεν υπάÏχουν αÏκετά byte για την αποκωδικοποίηση, ή άκυÏη μοÏφή." -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "step argument is zero!" msgstr "Η παÏάμετÏος step είναι μηδÎν!" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Not a script with an instance" msgstr "Δεν είναι δεσμή ενεÏγειών με στιγμιότυπο" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Not based on a script" msgstr "Δεν είναι βασισμÎνο σε δεσμή ενεÏγειών" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Not based on a resource file" msgstr "Δεν βασίζεται σε αÏχείο πόÏων" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary format (missing @path)" msgstr "ΆκυÏη μοÏφή Î»ÎµÎ¾Î¹ÎºÎ¿Ï ÏƒÏ„Î¹Î³Î¼Î¹Î¿Ï„Ïπων (λείπει το @path)" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary format (can't load script at @path)" msgstr "" "ΆκυÏη μοÏφή Î»ÎµÎ¾Î¹ÎºÎ¿Ï ÏƒÏ„Î¹Î³Î¼Î¹Î¿Ï„Ïπων (αδÏνατη η φόÏτωση της δεσμής ενεÏγειών στο " "@path)" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary format (invalid script at @path)" msgstr "ΆκυÏη μοÏφή Î»ÎµÎ¾Î¹ÎºÎ¿Ï ÏƒÏ„Î¹Î³Î¼Î¹Î¿Ï„Ïπων (Μη ÎγκυÏη δεσμή ενεÏγειών στο @path)" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary (invalid subclasses)" msgstr "ΆκυÏη μοÏφή Î»ÎµÎ¾Î¹ÎºÎ¿Ï ÏƒÏ„Î¹Î³Î¼Î¹Î¿Ï„Ïπων (άκυÏες υπό-κλάσεις)" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Object can't provide a length." msgstr "Το αντικείμενο δεν Îχει μήκος." @@ -6870,18 +7050,26 @@ msgid "GridMap Duplicate Selection" msgstr "GridMap Διπλασιασμός επιλογής" #: modules/gridmap/grid_map_editor_plugin.cpp +msgid "Floor:" +msgstr "" + +#: modules/gridmap/grid_map_editor_plugin.cpp +#, fuzzy +msgid "Grid Map" +msgstr "ΚοÏμπωμα στο πλÎγμα" + +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Snap View" msgstr "ΚοÏμπωμα όψης" #: modules/gridmap/grid_map_editor_plugin.cpp #, fuzzy -msgid "Prev Level (%sDown Wheel)" -msgstr "Î ÏοηγοÏμενο επίπεδο (" +msgid "Previous Floor" +msgstr "Î ÏοηγοÏμενη καÏÏ„Îλα" #: modules/gridmap/grid_map_editor_plugin.cpp -#, fuzzy -msgid "Next Level (%sUp Wheel)" -msgstr "Επόμενο επίπεδο (" +msgid "Next Floor" +msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp msgid "Clip Disabled" @@ -6948,12 +7136,9 @@ msgid "Erase Area" msgstr "ΔιαγÏαφή πεÏσιοχής" #: modules/gridmap/grid_map_editor_plugin.cpp -msgid "Selection -> Duplicate" -msgstr "Επιλογή -> Διπλασιασμός" - -#: modules/gridmap/grid_map_editor_plugin.cpp -msgid "Selection -> Clear" -msgstr "Επιλογή -> ΕκκαθάÏιση" +#, fuzzy +msgid "Clear Selection" +msgstr "ΚεντÏάÏισμα επιλογής" #: modules/gridmap/grid_map_editor_plugin.cpp msgid "GridMap Settings" @@ -6965,7 +7150,7 @@ msgstr "Επιλογή απόστασης:" #: modules/mono/editor/mono_bottom_panel.cpp msgid "Builds" -msgstr "" +msgstr "Δόμηση" #: modules/visual_script/visual_script.cpp msgid "" @@ -7082,7 +7267,8 @@ msgid "Duplicate VisualScript Nodes" msgstr "Διπλασιασμός κόμβων VisualScript" #: modules/visual_script/visual_script_editor.cpp -msgid "Hold Meta to drop a Getter. Hold Shift to drop a generic signature." +#, fuzzy +msgid "Hold %s to drop a Getter. Hold Shift to drop a generic signature." msgstr "" "Πατήστε παÏατεταμÎνα το κουμπί Meta για να Ï€ÏοσθÎσετε Îναν Getter. Πατήστε " "παÏατεταμÎνα το Shift για να Ï€ÏοσθÎσετε μία γενική υπογÏαφή." @@ -7094,7 +7280,8 @@ msgstr "" "παÏατεταμÎνα το Shift για να Ï€ÏοσθÎσετε μία γενική υπογÏαφή." #: modules/visual_script/visual_script_editor.cpp -msgid "Hold Meta to drop a simple reference to the node." +#, fuzzy +msgid "Hold %s to drop a simple reference to the node." msgstr "" "Πατήστε παÏατεταμÎνα το κουμπί Meta για να Ï€ÏοσθÎσετε μία απλή αναφοÏά στον " "κόμβο." @@ -7105,7 +7292,8 @@ msgstr "" "Πατήστε παÏατεταμÎνα το Ctrl για να Ï€ÏοσθÎσετε μία απλή αναφοÏά στον κόμβο." #: modules/visual_script/visual_script_editor.cpp -msgid "Hold Meta to drop a Variable Setter." +#, fuzzy +msgid "Hold %s to drop a Variable Setter." msgstr "" "Πατήστε παÏατεταμÎνα το κουμπί Meta για να Ï€ÏοσθÎσετε Îναν Setter μεταβλητής." @@ -7179,7 +7367,7 @@ msgstr "ΠάÏε" #: modules/visual_script/visual_script_editor.cpp msgid "Script already has function '%s'" -msgstr "" +msgstr "Η δεσμή ενεÏγειών Îχει ήδη συνάÏτηση '%s'" #: modules/visual_script/visual_script_editor.cpp msgid "Change Input Value" @@ -7335,12 +7523,23 @@ msgid "Could not write file:\n" msgstr "Δεν ήταν δυνατό το γÏάψιμο στο αÏχείο:\n" #: platform/javascript/export/export.cpp -msgid "Could not read file:\n" +msgid "Could not open template for export:\n" +msgstr "Δεν ήταν δυνατό το άνοιγμα Ï€ÏοτÏπου για εξαγωγή:\n" + +#: platform/javascript/export/export.cpp +#, fuzzy +msgid "Invalid export template:\n" +msgstr "Εγκατάσταση Ï€ÏοτÏπων εξαγωγής" + +#: platform/javascript/export/export.cpp +#, fuzzy +msgid "Could not read custom HTML shell:\n" msgstr "Δεν ήταν δυνατή η ανάγνωση του αÏχείου:\n" #: platform/javascript/export/export.cpp -msgid "Could not open template for export:\n" -msgstr "Δεν ήταν δυνατό το άνοιγμα Ï€ÏοτÏπου για εξαγωγή:\n" +#, fuzzy +msgid "Could not read boot splash image file:\n" +msgstr "Δεν ήταν δυνατή η ανάγνωση του αÏχείου:\n" #: scene/2d/animated_sprite.cpp msgid "" @@ -7463,22 +7662,6 @@ msgstr "" "Η ιδιότητα Path Ï€ÏÎπει να δείχνει σε Îναν ÎγκυÏο κόμβο Node2D για να " "δουλÎψει." -#: scene/2d/sprite.cpp -msgid "" -"Path property must point to a valid Viewport node to work. Such Viewport " -"must be set to 'render target' mode." -msgstr "" -"Η ιδιότητα Path Ï€ÏÎπει να δείχνει σε Îναν ÎγκυÏο κόμβο Ï„Ïπου Viewport σε " -"λειτουÏγία 'render target' για να δουλÎψει." - -#: scene/2d/sprite.cpp -msgid "" -"The Viewport set in the path property must be set as 'render target' in " -"order for this sprite to work." -msgstr "" -"Το Viewport που οÏίστηκε στην ιδιότητα 'path' Ï€ÏÎπει να είναι σε λειτουÏγία " -"'render target' για να δουλÎψει αυτό to sprite." - #: scene/2d/visibility_notifier_2d.cpp msgid "" "VisibilityEnable2D works best when used with the edited scene root directly " @@ -7553,6 +7736,15 @@ msgstr "" "Ένα σχήμα Ï€ÏÎπει να δοθεί στο CollisionShape για να λειτουÏγήσει. " "ΔημιουÏγήστε Îνα πόÏο σχήματος για αυτό!" +#: scene/3d/gi_probe.cpp +#, fuzzy +msgid "Plotting Meshes" +msgstr "Συνδυασμός εικόνων" + +#: scene/3d/gi_probe.cpp +msgid "Finishing Plot" +msgstr "" + #: scene/3d/navigation_mesh.cpp msgid "A NavigationMesh resource must be set or created for this node to work." msgstr "" @@ -7609,6 +7801,8 @@ msgid "" "VehicleWheel serves to provide a wheel system to a VehicleBody. Please use " "it as a child of a VehicleBody." msgstr "" +"Το VehicleWheel δίνει Îνα σÏστημα Ï„Ïοχών για το VehicleBody. ΠαÏακαλοÏμε " +"χÏησιμοποιήστε το ως παιδί του VehicleBody." #: scene/gui/color_picker.cpp msgid "Raw Mode" @@ -7651,6 +7845,10 @@ msgstr "" "ΧÏησιμοποιήστε Îνα container ως παιδί (VBox, HBox, κτλ), ή Îνα Control και " "οÏίστε το Ï€ÏοσαÏμοσμÎνο ελάχιστο μÎγεθος χειÏοκίνητα." +#: scene/gui/tree.cpp +msgid "(Other)" +msgstr "" + #: scene/main/scene_tree.cpp msgid "" "Default Environment as specified in Project Setings (Rendering -> Viewport -" @@ -7687,6 +7885,69 @@ msgstr "Σφάλμα κατά την φόÏτωση της γÏαμματοσεΠmsgid "Invalid font size." msgstr "Μη ÎγκυÏο μÎγεθος γÏαμματοσειÏάς." +#~ msgid "Cannot navigate to '" +#~ msgstr "ΑδÏνατη η πλοήγηση στο '" + +#~ msgid "" +#~ "\n" +#~ "Source: " +#~ msgstr "" +#~ "\n" +#~ "Πηγή: " + +#~ msgid "Remove Point from Line2D" +#~ msgstr "ΔιαγÏαφή σημείου από την δισδιάστατη γÏαμμή" + +#~ msgid "Add Point to Line2D" +#~ msgstr "Î Ïόσθεσε σημείο στην δισδυάστατη γÏαμμή" + +#~ msgid "Move Point in Line2D" +#~ msgstr "Μετακίινηση σημείου στην δισδιάστατη γÏαμμή" + +#~ msgid "Split Segment (in line)" +#~ msgstr "ΔιαχωÏισμός τμήματος (στη γÏαμμή)" + +#~ msgid "Meta+" +#~ msgstr "Meta+" + +#~ msgid "Setting '" +#~ msgstr "Ρυθμίση '" + +#~ msgid "Remote Inspector" +#~ msgstr "ΑπομακÏυσμÎνος επιθεωÏητής" + +#~ msgid "Live Scene Tree:" +#~ msgstr "Ζωντανό δÎντÏο σκηνής:" + +#~ msgid "Remote Object Properties: " +#~ msgstr "ΑπομακÏυσμÎνες ιδιότητες αντικειμÎνου: " + +#~ msgid "Prev Level (%sDown Wheel)" +#~ msgstr "Î ÏοηγοÏμενο επίπεδο (%sΚάτω ΡοδÎλα)" + +#~ msgid "Next Level (%sUp Wheel)" +#~ msgstr "Επόμενο επίπεδο (%sΠάνω ÏοδÎλα)" + +#~ msgid "Selection -> Duplicate" +#~ msgstr "Επιλογή -> Διπλασιασμός" + +#~ msgid "Selection -> Clear" +#~ msgstr "Επιλογή -> ΕκκαθάÏιση" + +#~ msgid "" +#~ "Path property must point to a valid Viewport node to work. Such Viewport " +#~ "must be set to 'render target' mode." +#~ msgstr "" +#~ "Η ιδιότητα Path Ï€ÏÎπει να δείχνει σε Îναν ÎγκυÏο κόμβο Ï„Ïπου Viewport σε " +#~ "λειτουÏγία 'render target' για να δουλÎψει." + +#~ msgid "" +#~ "The Viewport set in the path property must be set as 'render target' in " +#~ "order for this sprite to work." +#~ msgstr "" +#~ "Το Viewport που οÏίστηκε στην ιδιότητα 'path' Ï€ÏÎπει να είναι σε " +#~ "λειτουÏγία 'render target' για να δουλÎψει αυτό to sprite." + #~ msgid "Filter:" #~ msgstr "ΦίλτÏο:" @@ -7711,9 +7972,6 @@ msgstr "Μη ÎγκυÏο μÎγεθος γÏαμματοσειÏάς." #~ msgid "Removed:" #~ msgstr "ΑφαιÏÎθηκαν:" -#~ msgid "Error saving atlas:" -#~ msgstr "Σφάλμα κατά την αποθήκευση άτλαντα:" - #~ msgid "Could not save atlas subtexture:" #~ msgstr "ΑδÏνατη η αποθήκευση υπό-εικόνας άτλαντα:" @@ -8106,9 +8364,6 @@ msgstr "Μη ÎγκυÏο μÎγεθος γÏαμματοσειÏάς." #~ msgid "Cropping Images" #~ msgstr "ΠεÏικοπή Εικόνων" -#~ msgid "Blitting Images" -#~ msgstr "Συνδυασμός εικόνων" - #~ msgid "Couldn't save atlas image:" #~ msgstr "Δεν ήταν δυνατή η αποθήκευση εικόνας άτλαντα:" @@ -8487,6 +8742,3 @@ msgstr "Μη ÎγκυÏο μÎγεθος γÏαμματοσειÏάς." #~ msgid "Save Translatable Strings" #~ msgstr "Αποθήκευση μεταφÏάσιμων συμβολοσειÏών" - -#~ msgid "Install Export Templates" -#~ msgstr "Εγκατάσταση Ï€ÏοτÏπων εξαγωγής" diff --git a/editor/translations/es.po b/editor/translations/es.po index dd4b811bff..10a535f20d 100644 --- a/editor/translations/es.po +++ b/editor/translations/es.po @@ -9,7 +9,7 @@ # Carlos López <genetita@gmail.com>, 2016. # Lisandro Lorea <lisandrolorea@gmail.com>, 2016-2017. # Rabid Orange <theorangerabid@gmail.com>, 2017. -# Roger BR <drai_kin@hotmail.com>, 2016. +# Roger Blanco Ribera <roger.blancoribera@gmail.com>, 2016-2017. # Sebastian Silva <sebastian@fuentelibre.org>, 2016. # Swyter <swyterzone@gmail.com>, 2016-2017. # @@ -17,8 +17,8 @@ msgid "" msgstr "" "Project-Id-Version: Godot Engine editor\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2017-10-23 01:48+0000\n" -"Last-Translator: Lisandro Lorea <lisandrolorea@gmail.com>\n" +"PO-Revision-Date: 2017-11-18 08:50+0000\n" +"Last-Translator: Roger Blanco Ribera <roger.blancoribera@gmail.com>\n" "Language-Team: Spanish <https://hosted.weblate.org/projects/godot-engine/" "godot/es/>\n" "Language: es\n" @@ -26,7 +26,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 2.17\n" +"X-Generator: Weblate 2.18-dev\n" #: editor/animation_editor.cpp msgid "Disabled" @@ -110,6 +110,7 @@ msgid "Anim Delete Keys" msgstr "Borrar claves de animación" #: editor/animation_editor.cpp editor/plugins/tile_map_editor_plugin.cpp +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Duplicate Selection" msgstr "Duplicar selección" @@ -650,6 +651,13 @@ msgstr "Editor de dependencias" msgid "Search Replacement Resource:" msgstr "Buscar reemplazo de recurso:" +#: editor/dependency_editor.cpp editor/editor_file_dialog.cpp +#: editor/editor_help.cpp editor/editor_node.cpp editor/filesystem_dock.cpp +#: editor/plugins/script_editor_plugin.cpp editor/property_selector.cpp +#: editor/quick_open.cpp scene/gui/file_dialog.cpp +msgid "Open" +msgstr "Abrir" + #: editor/dependency_editor.cpp msgid "Owners Of:" msgstr "Dueños de:" @@ -726,6 +734,16 @@ msgstr "¿Quieres eliminar los archivos seleccionados?" msgid "Delete" msgstr "Eliminar" +#: editor/dictionary_property_edit.cpp +#, fuzzy +msgid "Change Dictionary Key" +msgstr "Cambiar nombre de animación:" + +#: editor/dictionary_property_edit.cpp +#, fuzzy +msgid "Change Dictionary Value" +msgstr "Cambiar valor del «array»" + #: editor/editor_about.cpp msgid "Thanks from the Godot community!" msgstr "¡Muchas gracias de parte de la comunidad de Godot!" @@ -1191,12 +1209,6 @@ msgstr "Reconocidos" msgid "All Files (*)" msgstr "Todos los archivos (*)" -#: editor/editor_file_dialog.cpp editor/editor_help.cpp editor/editor_node.cpp -#: editor/filesystem_dock.cpp editor/plugins/script_editor_plugin.cpp -#: editor/property_selector.cpp editor/quick_open.cpp scene/gui/file_dialog.cpp -msgid "Open" -msgstr "Abrir" - #: editor/editor_file_dialog.cpp scene/gui/file_dialog.cpp msgid "Open a File" msgstr "Abrir un archivo" @@ -1571,6 +1583,13 @@ msgid "" msgstr "" #: editor/editor_node.cpp +msgid "" +"This is a remote object so changes to it will not be kept.\n" +"Please read the documentation relevant to debugging to better understand " +"this workflow." +msgstr "" + +#: editor/editor_node.cpp msgid "Copy Params" msgstr "Copiar parámetros" @@ -1696,6 +1715,11 @@ msgid "Export Mesh Library" msgstr "Exportar biblioteca de modelos" #: editor/editor_node.cpp +#, fuzzy +msgid "This operation can't be done without a root node." +msgstr "Esta operación no puede realizarse sin una escena." + +#: editor/editor_node.cpp msgid "Export Tile Set" msgstr "Exportar Tile Set" @@ -1841,12 +1865,23 @@ msgid "Switch Scene Tab" msgstr "Cambiar pestaña de escena" #: editor/editor_node.cpp -msgid "%d more file(s)" +#, fuzzy +msgid "%d more files or folders" +msgstr "%d archivos o carpetas más" + +#: editor/editor_node.cpp +#, fuzzy +msgid "%d more folders" msgstr "%d archivos más" #: editor/editor_node.cpp -msgid "%d more file(s) or folder(s)" -msgstr "%d archivos o carpetas más" +#, fuzzy +msgid "%d more files" +msgstr "%d archivos más" + +#: editor/editor_node.cpp +msgid "Dock Position" +msgstr "" #: editor/editor_node.cpp msgid "Distraction Free Mode" @@ -1858,6 +1893,11 @@ msgid "Toggle distraction-free mode." msgstr "Modo sin distracciones" #: editor/editor_node.cpp +#, fuzzy +msgid "Add a new scene." +msgstr "Añadir nuevas pistas." + +#: editor/editor_node.cpp msgid "Scene" msgstr "Escena" @@ -1924,13 +1964,12 @@ msgid "TileSet.." msgstr "TileSet.." #: editor/editor_node.cpp editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp scene/gui/line_edit.cpp -#: scene/gui/text_edit.cpp +#: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Undo" msgstr "Deshacer" #: editor/editor_node.cpp editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp +#: scene/gui/line_edit.cpp msgid "Redo" msgstr "Rehacer" @@ -2455,6 +2494,11 @@ msgid "(Current)" msgstr "Actual:" #: editor/export_template_manager.cpp +#, fuzzy +msgid "Retrieving mirrors, please wait.." +msgstr "Error de conexion, por favor intente otra vez." + +#: editor/export_template_manager.cpp msgid "Remove template version '%s'?" msgstr "Eliminar diseño de versión '%s'?" @@ -2493,6 +2537,112 @@ msgid "Importing:" msgstr "Importando:" #: editor/export_template_manager.cpp +msgid "" +"No download links found for this version. Direct download is only available " +"for official releases." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Can't resolve." +msgstr "No se ha podido resolver." + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Can't connect." +msgstr "No se puede conectar." + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "No response." +msgstr "No responde." + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Req. Failed." +msgstr "Solicitud fallida." + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Redirect Loop." +msgstr "Bucle de redireccionamiento." + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Failed:" +msgstr "Fallido:" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Can't write file." +msgstr "No se pudo cargar el tile:" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Download Complete." +msgstr "Error de Descarga" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Error requesting url: " +msgstr "Error al guardar atlas:" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Connecting to Mirror.." +msgstr "Conectando.." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Disconnected" +msgstr "Desconectar" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Resolving" +msgstr "Resolviendo…" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Can't Resolve" +msgstr "No se ha podido resolver." + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Connecting.." +msgstr "Conectando.." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Can't Conect" +msgstr "No se puede conectar." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Connected" +msgstr "Conectar" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Requesting.." +msgstr "Solicitando.." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Downloading" +msgstr "Abajo" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Connection Error" +msgstr "Conectando.." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "SSL Handshake Error" +msgstr "Errores de carga" + +#: editor/export_template_manager.cpp #, fuzzy msgid "Current Version:" msgstr "Escena actual" @@ -2522,6 +2672,16 @@ msgstr "¿Quieres eliminar los archivos seleccionados?" msgid "Export Template Manager" msgstr "Cargando plantillas de exportación" +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Download Templates" +msgstr "Remover Item" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Select mirror from list: " +msgstr "Seleccionar dispositivo de la lista" + #: editor/file_type_cache.cpp msgid "Can't open file_type_cache.cch for writing, not saving file type cache!" msgstr "" @@ -2529,8 +2689,8 @@ msgstr "" "de tipos de archivo!" #: editor/filesystem_dock.cpp -msgid "Cannot navigate to '" -msgstr "No se puede navegar a '" +msgid "Cannot navigate to '%s' as it has not been found in the file system!" +msgstr "" #: editor/filesystem_dock.cpp msgid "View items as a grid of thumbnails" @@ -2548,13 +2708,6 @@ msgstr "" #: editor/filesystem_dock.cpp #, fuzzy -msgid "" -"\n" -"Source: " -msgstr "Fuente:" - -#: editor/filesystem_dock.cpp -#, fuzzy msgid "Cannot move/rename resources root." msgstr "No se puede cargar/procesar la tipografÃa elegida." @@ -2839,8 +2992,8 @@ msgid "Remove Poly And Point" msgstr "Quitar polÃgono y punto" #: editor/plugins/abstract_polygon_2d_editor.cpp -#: editor/plugins/light_occluder_2d_editor_plugin.cpp -msgid "Create a new polygon from scratch." +#, fuzzy +msgid "Create a new polygon from scratch" msgstr "Crea un nuevo polÃgono desde cero." #: editor/plugins/abstract_polygon_2d_editor.cpp @@ -2855,6 +3008,11 @@ msgstr "" "Control + Click izquierdo: Dividir segmento.\n" "Click derecho: Borrar punto." +#: editor/plugins/abstract_polygon_2d_editor.cpp +#, fuzzy +msgid "Delete points" +msgstr "Eliminar punto" + #: editor/plugins/animation_player_editor_plugin.cpp msgid "Toggle Autoplay" msgstr "Des/activar reproducción automática" @@ -3193,18 +3351,10 @@ msgid "Can't resolve hostname:" msgstr "No se ha podido resolver el nombre de Dominio:" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Can't resolve." -msgstr "No se ha podido resolver." - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Connection error, please try again." msgstr "Error de conexion, por favor intente otra vez." #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Can't connect." -msgstr "No se puede conectar." - -#: editor/plugins/asset_library_editor_plugin.cpp #, fuzzy msgid "Can't connect to host:" msgstr "No se puede conectar al host:" @@ -3214,32 +3364,16 @@ msgid "No response from host:" msgstr "No hay respuesta desde el host:" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "No response." -msgstr "No responde." - -#: editor/plugins/asset_library_editor_plugin.cpp #, fuzzy msgid "Request failed, return code:" msgstr "Petición falida, código de retorno:" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Req. Failed." -msgstr "Solicitud fallida." - -#: editor/plugins/asset_library_editor_plugin.cpp #, fuzzy msgid "Request failed, too many redirects" msgstr "Petición fallida, demasiadas redirecciones" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Redirect Loop." -msgstr "Bucle de redireccionamiento." - -#: editor/plugins/asset_library_editor_plugin.cpp -msgid "Failed:" -msgstr "Fallido:" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Bad download hash, assuming file has been tampered with." msgstr "Error de descarga, al pareser el archivo ha sido manipulado." @@ -3264,17 +3398,8 @@ msgid "Fetching:" msgstr "Buscando:" #: editor/plugins/asset_library_editor_plugin.cpp -#, fuzzy msgid "Resolving.." -msgstr "Guardando…" - -#: editor/plugins/asset_library_editor_plugin.cpp -msgid "Connecting.." -msgstr "Conectando.." - -#: editor/plugins/asset_library_editor_plugin.cpp -msgid "Requesting.." -msgstr "Solicitando.." +msgstr "Resolviendo…" #: editor/plugins/asset_library_editor_plugin.cpp msgid "Error making request" @@ -3389,6 +3514,39 @@ msgid "Move Action" msgstr "Mover acción" #: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Move vertical guide" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Create new vertical guide" +msgstr "Crear script" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Remove vertical guide" +msgstr "Quitar variable" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Move horizontal guide" +msgstr "Mover Punto en Curva" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Create new horizontal guide" +msgstr "Crear script" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Remove horizontal guide" +msgstr "Quitar claves incorrectas" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Create new horizontal and vertical guides" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp msgid "Edit IK Chain" msgstr "Editar Cadena IK" @@ -3520,10 +3678,17 @@ msgid "Snap to other nodes" msgstr "" #: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Snap to guides" +msgstr "Modo de fijado:" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Lock the selected object in place (can't be moved)." msgstr "Inmovilizar el objeto." #: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Unlock the selected object (can be moved)." msgstr "Liberar el objeto." @@ -3577,6 +3742,11 @@ msgid "Show rulers" msgstr "Crear huesos" #: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Show guides" +msgstr "Crear huesos" + +#: editor/plugins/canvas_item_editor_plugin.cpp msgid "Center Selection" msgstr "Centrar selección" @@ -3781,6 +3951,10 @@ msgstr "Cambiar tangente de curva lineal" msgid "Hold Shift to edit tangents individually" msgstr "Mantén Mayus para editar las tangentes individualmente" +#: editor/plugins/gi_probe_editor_plugin.cpp +msgid "Bake GI Probe" +msgstr "" + #: editor/plugins/gradient_editor_plugin.cpp #, fuzzy msgid "Add/Remove Color Ramp Point" @@ -3816,6 +3990,10 @@ msgid "Create Occluder Polygon" msgstr "Crear polÃgono oclusor" #: editor/plugins/light_occluder_2d_editor_plugin.cpp +msgid "Create a new polygon from scratch." +msgstr "Crea un nuevo polÃgono desde cero." + +#: editor/plugins/light_occluder_2d_editor_plugin.cpp msgid "Edit existing polygon:" msgstr "Editar polÃgono existente:" @@ -3831,63 +4009,6 @@ msgstr "Ctrl + LMB: Partir segmento." msgid "RMB: Erase Point." msgstr "Clic derecho: Borrar punto." -#: editor/plugins/line_2d_editor_plugin.cpp -#, fuzzy -msgid "Remove Point from Line2D" -msgstr "Borrar punto de curva" - -#: editor/plugins/line_2d_editor_plugin.cpp -#, fuzzy -msgid "Add Point to Line2D" -msgstr "Añadir punto a curva" - -#: editor/plugins/line_2d_editor_plugin.cpp -#, fuzzy -msgid "Move Point in Line2D" -msgstr "Mover Punto en Curva" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Select Points" -msgstr "Seleccionar puntos" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Shift+Drag: Select Control Points" -msgstr "Mayús + arrastrar: Seleccionar puntos de control" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -#, fuzzy -msgid "Click: Add Point" -msgstr "Clic: Añadir punto" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Right Click: Delete Point" -msgstr "Clic derecho: Eliminar punto" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Add Point (in empty space)" -msgstr "Añadir punto (en espacio vacÃo)" - -#: editor/plugins/line_2d_editor_plugin.cpp -#, fuzzy -msgid "Split Segment (in line)" -msgstr "Dividir segmento (en curva)" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Delete Point" -msgstr "Eliminar punto" - #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Mesh is empty!" msgstr "¡El modelo está vacÃo!" @@ -4318,16 +4439,47 @@ msgid "Move Out-Control in Curve" msgstr "Mover Out-Control en Curva" #: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Select Points" +msgstr "Seleccionar puntos" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Shift+Drag: Select Control Points" +msgstr "Mayús + arrastrar: Seleccionar puntos de control" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +#, fuzzy +msgid "Click: Add Point" +msgstr "Clic: Añadir punto" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Right Click: Delete Point" +msgstr "Clic derecho: Eliminar punto" + +#: editor/plugins/path_2d_editor_plugin.cpp msgid "Select Control Points (Shift+Drag)" msgstr "Seleccionar puntos de control (Mayús + arrastrar)" #: editor/plugins/path_2d_editor_plugin.cpp #: editor/plugins/path_editor_plugin.cpp +msgid "Add Point (in empty space)" +msgstr "Añadir punto (en espacio vacÃo)" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp msgid "Split Segment (in curve)" msgstr "Dividir segmento (en curva)" #: editor/plugins/path_2d_editor_plugin.cpp #: editor/plugins/path_editor_plugin.cpp +msgid "Delete Point" +msgstr "Eliminar punto" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp msgid "Close Curve" msgstr "Cerrar curva" @@ -4469,7 +4621,6 @@ msgstr "Cargar recurso" #: editor/plugins/resource_preloader_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp #: editor/plugins/sprite_frames_editor_plugin.cpp editor/property_editor.cpp #: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Paste" @@ -4517,6 +4668,21 @@ msgid " Class Reference" msgstr " Referencia de clase" #: editor/plugins/script_editor_plugin.cpp +#, fuzzy +msgid "Sort" +msgstr "Ordenar:" + +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp +msgid "Move Up" +msgstr "Subir" + +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp +msgid "Move Down" +msgstr "Bajar" + +#: editor/plugins/script_editor_plugin.cpp msgid "Next script" msgstr "Script siguiente" @@ -4569,6 +4735,10 @@ msgstr "Cerrar documentación" msgid "Close All" msgstr "Cerrar" +#: editor/plugins/script_editor_plugin.cpp +msgid "Close Other Tabs" +msgstr "" + #: editor/plugins/script_editor_plugin.cpp editor/project_manager.cpp msgid "Run" msgstr "Ejecutar" @@ -4580,13 +4750,11 @@ msgstr "Añadir/quitar favorito" #: editor/plugins/script_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Find.." msgstr "Buscar.." #: editor/plugins/script_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Find Next" msgstr "Buscar siguiente" @@ -4698,35 +4866,24 @@ msgstr "Minúscula" #: editor/plugins/script_text_editor.cpp msgid "Capitalize" -msgstr "Insertar mayúsculas" +msgstr "Convertir en Mayúsculas" -#: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp scene/gui/line_edit.cpp +#: editor/plugins/script_text_editor.cpp scene/gui/line_edit.cpp #: scene/gui/text_edit.cpp msgid "Cut" msgstr "Cortar" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp #: editor/plugins/sprite_frames_editor_plugin.cpp editor/property_editor.cpp #: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Copy" msgstr "Copiar" -#: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp scene/gui/line_edit.cpp +#: editor/plugins/script_text_editor.cpp scene/gui/line_edit.cpp #: scene/gui/text_edit.cpp msgid "Select All" msgstr "Seleccionar todo" -#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp -msgid "Move Up" -msgstr "Subir" - -#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp -msgid "Move Down" -msgstr "Bajar" - #: editor/plugins/script_text_editor.cpp #, fuzzy msgid "Delete Line" @@ -4749,6 +4906,23 @@ msgid "Clone Down" msgstr "Clonar hacia abajo" #: editor/plugins/script_text_editor.cpp +#, fuzzy +msgid "Fold Line" +msgstr "Ir a lÃnea" + +#: editor/plugins/script_text_editor.cpp +msgid "Unfold Line" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Fold All Lines" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Unfold All Lines" +msgstr "" + +#: editor/plugins/script_text_editor.cpp msgid "Complete Symbol" msgstr "Completar sÃmbolo" @@ -4797,12 +4971,10 @@ msgid "Convert To Lowercase" msgstr "Convertir a…" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Find Previous" msgstr "Buscar anterior" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Replace.." msgstr "Reemplazar.." @@ -4811,7 +4983,6 @@ msgid "Goto Function.." msgstr "Ir a función.." #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Goto Line.." msgstr "Ir a lÃnea.." @@ -4978,6 +5149,16 @@ msgid "View Plane Transform." msgstr "Ver transformación en plano." #: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Scaling: " +msgstr "Escala:" + +#: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Translating: " +msgstr "Traducciones:" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Rotating %s degrees." msgstr "Girando %s grados." @@ -5064,6 +5245,10 @@ msgid "Vertices" msgstr "Vértice" #: editor/plugins/spatial_editor_plugin.cpp +msgid "FPS" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Align with view" msgstr "Alinear con vista" @@ -5099,6 +5284,16 @@ msgid "View Information" msgstr "Ver información" #: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "View FPS" +msgstr "Ver Archivos" + +#: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Half Resolution" +msgstr "Escalar selección" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Audio Listener" msgstr "Oyente de Audio" @@ -5242,6 +5437,11 @@ msgid "Tool Scale" msgstr "Escala:" #: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Toggle Freelook" +msgstr "Modo pantalla completa" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Transform" msgstr "Transformar" @@ -5521,6 +5721,11 @@ msgid "Create Empty Editor Template" msgstr "Crear plantilla de editor vacÃa" #: editor/plugins/theme_editor_plugin.cpp +#, fuzzy +msgid "Create From Current Editor Theme" +msgstr "Crear plantilla de editor vacÃa" + +#: editor/plugins/theme_editor_plugin.cpp msgid "CheckBox Radio1" msgstr "CheckBox Radio1" @@ -5701,7 +5906,7 @@ msgstr "Activar" #: editor/project_export.cpp #, fuzzy -msgid "Delete patch '" +msgid "Delete patch '%s' from list?" msgstr "Eliminar entrada" #: editor/project_export.cpp @@ -6038,10 +6243,6 @@ msgid "Add Input Action Event" msgstr "Añadir evento de acción de entrada" #: editor/project_settings_editor.cpp editor/settings_config_dialog.cpp -msgid "Meta+" -msgstr "Meta+" - -#: editor/project_settings_editor.cpp editor/settings_config_dialog.cpp msgid "Shift+" msgstr "Mayús+" @@ -6169,13 +6370,12 @@ msgstr "¡Selecciona un item primero!" #: editor/project_settings_editor.cpp #, fuzzy -msgid "No property '" +msgid "No property '%s' exists." msgstr "Propiedad:" #: editor/project_settings_editor.cpp -#, fuzzy -msgid "Setting '" -msgstr "Ajustes" +msgid "Setting '%s' is internal, and it can't be deleted." +msgstr "" #: editor/project_settings_editor.cpp #, fuzzy @@ -6429,9 +6629,8 @@ msgid "Sections:" msgstr "Selecciones:" #: editor/property_selector.cpp -#, fuzzy msgid "Select Property" -msgstr "Seleccionar puntos" +msgstr "Seleccionar Propiedad" #: editor/property_selector.cpp #, fuzzy @@ -6678,6 +6877,16 @@ msgid "Clear a script for the selected node." msgstr "Crear un nuevo script para el nodo seleccionado." #: editor/scene_tree_dock.cpp +#, fuzzy +msgid "Remote" +msgstr "Quitar" + +#: editor/scene_tree_dock.cpp +#, fuzzy +msgid "Local" +msgstr "Idioma" + +#: editor/scene_tree_dock.cpp msgid "Clear Inheritance? (No Undo!)" msgstr "¿Quieres limpiar la herencia? (No se puede deshacer)" @@ -6694,9 +6903,8 @@ msgid "Toggle CanvasItem Visible" msgstr "Act/Desact. CanvasItem Visible" #: editor/scene_tree_editor.cpp -#, fuzzy msgid "Node configuration warning:" -msgstr "Alerta de configuración de Nodos:" +msgstr "Alerta de configuración de nodos:" #: editor/scene_tree_editor.cpp #, fuzzy @@ -6892,6 +7100,11 @@ msgid "Attach Node Script" msgstr "Crear script de nodo" #: editor/script_editor_debugger.cpp +#, fuzzy +msgid "Remote " +msgstr "Quitar" + +#: editor/script_editor_debugger.cpp msgid "Bytes:" msgstr "Bytes:" @@ -6948,18 +7161,6 @@ msgid "Stack Trace (if applicable):" msgstr "Stack Trace (si aplica):" #: editor/script_editor_debugger.cpp -msgid "Remote Inspector" -msgstr "Inspector Remoto" - -#: editor/script_editor_debugger.cpp -msgid "Live Scene Tree:" -msgstr "Ãrbol de Escenas en Vivo:" - -#: editor/script_editor_debugger.cpp -msgid "Remote Object Properties: " -msgstr "Propiedades de Objeto Remoto: " - -#: editor/script_editor_debugger.cpp msgid "Profiler" msgstr "Profiler" @@ -7094,57 +7295,57 @@ msgstr "" msgid "GDNative" msgstr "" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp #: modules/visual_script/visual_script_builtin_funcs.cpp msgid "Invalid type argument to convert(), use TYPE_* constants." msgstr "" "El argumento para convert() no es correcto, prueba utilizando constantes " "TYPE_*." -#: modules/gdscript/gd_functions.cpp modules/mono/glue/glue_header.h +#: modules/gdscript/gdscript_functions.cpp modules/mono/glue/glue_header.h #: modules/visual_script/visual_script_builtin_funcs.cpp msgid "Not enough bytes for decoding bytes, or invalid format." msgstr "" "O no hay suficientes bytes para decodificar bytes o el formato no es " "correcto." -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "step argument is zero!" msgstr "¡El argumento «step» es cero!" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Not a script with an instance" msgstr "No es un script con una instancia" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Not based on a script" msgstr "No está basado en un script" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Not based on a resource file" msgstr "No está basado en un archivo de recursos" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary format (missing @path)" msgstr "El formato de diccionario de instancias no es correcto (falta @path)" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary format (can't load script at @path)" msgstr "" "El formato de diccionario de instancias no es correcto (no se puede cargar " "el script en @path)" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary format (invalid script at @path)" msgstr "" "El formato de diccionario de instancias no es correcto (script incorrecto en " "@path)" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary (invalid subclasses)" msgstr "El diccionario de instancias no es correcto (subclases erróneas)" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Object can't provide a length." msgstr "El objeto no puede proporcionar una longitud." @@ -7159,19 +7360,27 @@ msgid "GridMap Duplicate Selection" msgstr "Duplicar selección" #: modules/gridmap/grid_map_editor_plugin.cpp +msgid "Floor:" +msgstr "" + +#: modules/gridmap/grid_map_editor_plugin.cpp +#, fuzzy +msgid "Grid Map" +msgstr "Adherir a cuadrÃcula" + +#: modules/gridmap/grid_map_editor_plugin.cpp #, fuzzy msgid "Snap View" msgstr "Vista superior" #: modules/gridmap/grid_map_editor_plugin.cpp #, fuzzy -msgid "Prev Level (%sDown Wheel)" -msgstr "Nivel anterior (" +msgid "Previous Floor" +msgstr "Pestaña anterior" #: modules/gridmap/grid_map_editor_plugin.cpp -#, fuzzy -msgid "Next Level (%sUp Wheel)" -msgstr "Siguiente nivel (" +msgid "Next Floor" +msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp #, fuzzy @@ -7252,13 +7461,8 @@ msgstr "Borrar TileMap" #: modules/gridmap/grid_map_editor_plugin.cpp #, fuzzy -msgid "Selection -> Duplicate" -msgstr "Sólo selección" - -#: modules/gridmap/grid_map_editor_plugin.cpp -#, fuzzy -msgid "Selection -> Clear" -msgstr "Sólo selección" +msgid "Clear Selection" +msgstr "Centrar selección" #: modules/gridmap/grid_map_editor_plugin.cpp #, fuzzy @@ -7397,7 +7601,8 @@ msgid "Duplicate VisualScript Nodes" msgstr "Duplicar Nodo(s) de Gráfico" #: modules/visual_script/visual_script_editor.cpp -msgid "Hold Meta to drop a Getter. Hold Shift to drop a generic signature." +#, fuzzy +msgid "Hold %s to drop a Getter. Hold Shift to drop a generic signature." msgstr "" "Mantén pulsado Meta para quitar un «Setter». Mantén pulsado Mayús para " "quitar una firma genérica." @@ -7409,7 +7614,8 @@ msgstr "" "quitar una firma genérica." #: modules/visual_script/visual_script_editor.cpp -msgid "Hold Meta to drop a simple reference to the node." +#, fuzzy +msgid "Hold %s to drop a simple reference to the node." msgstr "Mantén pulsado Meta para quitar una referencia simple del nodo." #: modules/visual_script/visual_script_editor.cpp @@ -7417,7 +7623,8 @@ msgid "Hold Ctrl to drop a simple reference to the node." msgstr "Mantén pulsado Ctrl para quitar una referencia simple del nodo." #: modules/visual_script/visual_script_editor.cpp -msgid "Hold Meta to drop a Variable Setter." +#, fuzzy +msgid "Hold %s to drop a Variable Setter." msgstr "Mantén pulsado Meta para quitar un «Setter» de variable." #: modules/visual_script/visual_script_editor.cpp @@ -7667,13 +7874,23 @@ msgstr "No se pudo cargar el tile:" #: platform/javascript/export/export.cpp #, fuzzy -msgid "Could not read file:\n" +msgid "Could not open template for export:\n" +msgstr "No se pudo crear la carpeta." + +#: platform/javascript/export/export.cpp +#, fuzzy +msgid "Invalid export template:\n" +msgstr "Instalar plantillas de exportación" + +#: platform/javascript/export/export.cpp +#, fuzzy +msgid "Could not read custom HTML shell:\n" msgstr "No se pudo cargar el tile:" #: platform/javascript/export/export.cpp #, fuzzy -msgid "Could not open template for export:\n" -msgstr "No se pudo crear la carpeta." +msgid "Could not read boot splash image file:\n" +msgstr "No se pudo cargar el tile:" #: scene/2d/animated_sprite.cpp msgid "" @@ -7794,22 +8011,6 @@ msgstr "" msgid "Path property must point to a valid Node2D node to work." msgstr "La propiedad Path debe apuntar a un nodo Node2D válido para funcionar." -#: scene/2d/sprite.cpp -msgid "" -"Path property must point to a valid Viewport node to work. Such Viewport " -"must be set to 'render target' mode." -msgstr "" -"La propiedad Path debe apuntar a un nodo Viewport válido para funcionar. " -"Dicho Viewport debe ser seteado a modo 'render target'." - -#: scene/2d/sprite.cpp -msgid "" -"The Viewport set in the path property must be set as 'render target' in " -"order for this sprite to work." -msgstr "" -"El Viewport seteado en la propiedad path debe ser seteado como 'render " -"target' para que este sprite funcione." - #: scene/2d/visibility_notifier_2d.cpp msgid "" "VisibilityEnable2D works best when used with the edited scene root directly " @@ -7884,6 +8085,15 @@ msgstr "" "Se debe proveer un shape para que CollisionShape funcione. Creale un recurso " "shape!" +#: scene/3d/gi_probe.cpp +#, fuzzy +msgid "Plotting Meshes" +msgstr "Copiando datos de imágenes" + +#: scene/3d/gi_probe.cpp +msgid "Finishing Plot" +msgstr "" + #: scene/3d/navigation_mesh.cpp msgid "A NavigationMesh resource must be set or created for this node to work." msgstr "" @@ -7986,8 +8196,11 @@ msgstr "" "Usa un container como hijo (VBox,HBox,etc), o un Control y ajusta el tamaño " "mÃnimo personalizado manualmente." +#: scene/gui/tree.cpp +msgid "(Other)" +msgstr "" + #: scene/main/scene_tree.cpp -#, fuzzy msgid "" "Default Environment as specified in Project Setings (Rendering -> Viewport -" "> Default Environment) could not be loaded." @@ -8023,6 +8236,77 @@ msgstr "Error al cargar la tipografÃa." msgid "Invalid font size." msgstr "Tamaño de tipografÃa incorrecto." +#~ msgid "Cannot navigate to '" +#~ msgstr "No se puede navegar a '" + +#, fuzzy +#~ msgid "" +#~ "\n" +#~ "Source: " +#~ msgstr "Fuente:" + +#, fuzzy +#~ msgid "Remove Point from Line2D" +#~ msgstr "Borrar punto de curva" + +#, fuzzy +#~ msgid "Add Point to Line2D" +#~ msgstr "Añadir punto a curva" + +#, fuzzy +#~ msgid "Move Point in Line2D" +#~ msgstr "Mover Punto en Curva" + +#, fuzzy +#~ msgid "Split Segment (in line)" +#~ msgstr "Dividir segmento (en curva)" + +#~ msgid "Meta+" +#~ msgstr "Meta+" + +#, fuzzy +#~ msgid "Setting '" +#~ msgstr "Ajustes" + +#~ msgid "Remote Inspector" +#~ msgstr "Inspector Remoto" + +#~ msgid "Live Scene Tree:" +#~ msgstr "Ãrbol de Escenas en Vivo:" + +#~ msgid "Remote Object Properties: " +#~ msgstr "Propiedades de Objeto Remoto: " + +#, fuzzy +#~ msgid "Prev Level (%sDown Wheel)" +#~ msgstr "Nivel anterior (" + +#, fuzzy +#~ msgid "Next Level (%sUp Wheel)" +#~ msgstr "Siguiente nivel (" + +#, fuzzy +#~ msgid "Selection -> Duplicate" +#~ msgstr "Sólo selección" + +#, fuzzy +#~ msgid "Selection -> Clear" +#~ msgstr "Sólo selección" + +#~ msgid "" +#~ "Path property must point to a valid Viewport node to work. Such Viewport " +#~ "must be set to 'render target' mode." +#~ msgstr "" +#~ "La propiedad Path debe apuntar a un nodo Viewport válido para funcionar. " +#~ "Dicho Viewport debe ser seteado a modo 'render target'." + +#~ msgid "" +#~ "The Viewport set in the path property must be set as 'render target' in " +#~ "order for this sprite to work." +#~ msgstr "" +#~ "El Viewport seteado en la propiedad path debe ser seteado como 'render " +#~ "target' para que este sprite funcione." + #~ msgid "Filter:" #~ msgstr "Filtro:" @@ -8049,9 +8333,6 @@ msgstr "Tamaño de tipografÃa incorrecto." #~ msgid "Removed:" #~ msgstr "Eliminado:" -#~ msgid "Error saving atlas:" -#~ msgstr "Error al guardar atlas:" - #~ msgid "Could not save atlas subtexture:" #~ msgstr "No se pudo guardar la subtextura del altas:" @@ -8446,9 +8727,6 @@ msgstr "Tamaño de tipografÃa incorrecto." #~ msgid "Cropping Images" #~ msgstr "Recortando imágenes" -#~ msgid "Blitting Images" -#~ msgstr "Copiando datos de imágenes" - #~ msgid "Couldn't save atlas image:" #~ msgstr "No se pudo guardar la imagen de atlas:" @@ -8860,9 +9138,6 @@ msgstr "Tamaño de tipografÃa incorrecto." #~ msgid "Save Translatable Strings" #~ msgstr "Guardar cadenas traducibles" -#~ msgid "Install Export Templates" -#~ msgstr "Instalar plantillas de exportación" - #~ msgid "Edit Script Options" #~ msgstr "Editar opciones de script" diff --git a/editor/translations/es_AR.po b/editor/translations/es_AR.po index 3d0c4ee410..2c3910fd42 100644 --- a/editor/translations/es_AR.po +++ b/editor/translations/es_AR.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: Godot Engine editor\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2017-10-23 00:50+0000\n" +"PO-Revision-Date: 2017-11-01 18:55+0000\n" "Last-Translator: Lisandro Lorea <lisandrolorea@gmail.com>\n" "Language-Team: Spanish (Argentina) <https://hosted.weblate.org/projects/" "godot-engine/godot/es_AR/>\n" @@ -103,6 +103,7 @@ msgid "Anim Delete Keys" msgstr "Borrar Claves de Anim" #: editor/animation_editor.cpp editor/plugins/tile_map_editor_plugin.cpp +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Duplicate Selection" msgstr "Duplicar Selección" @@ -637,6 +638,13 @@ msgstr "Editor de Dependencias" msgid "Search Replacement Resource:" msgstr "Buscar Reemplazo de Recurso:" +#: editor/dependency_editor.cpp editor/editor_file_dialog.cpp +#: editor/editor_help.cpp editor/editor_node.cpp editor/filesystem_dock.cpp +#: editor/plugins/script_editor_plugin.cpp editor/property_selector.cpp +#: editor/quick_open.cpp scene/gui/file_dialog.cpp +msgid "Open" +msgstr "Abrir" + #: editor/dependency_editor.cpp msgid "Owners Of:" msgstr "Dueños De:" @@ -711,6 +719,16 @@ msgstr "Eliminar archivos seleccionados?" msgid "Delete" msgstr "Eliminar" +#: editor/dictionary_property_edit.cpp +#, fuzzy +msgid "Change Dictionary Key" +msgstr "Cambiar Nombre de Animación:" + +#: editor/dictionary_property_edit.cpp +#, fuzzy +msgid "Change Dictionary Value" +msgstr "Cambiar Valor del Array" + #: editor/editor_about.cpp msgid "Thanks from the Godot community!" msgstr "Gracias de parte de la comunidad Godot!" @@ -1136,12 +1154,6 @@ msgstr "Todas Reconocidas" msgid "All Files (*)" msgstr "Todos los Archivos (*)" -#: editor/editor_file_dialog.cpp editor/editor_help.cpp editor/editor_node.cpp -#: editor/filesystem_dock.cpp editor/plugins/script_editor_plugin.cpp -#: editor/property_selector.cpp editor/quick_open.cpp scene/gui/file_dialog.cpp -msgid "Open" -msgstr "Abrir" - #: editor/editor_file_dialog.cpp scene/gui/file_dialog.cpp msgid "Open a File" msgstr "Abrir un Archivo" @@ -1513,6 +1525,18 @@ msgstr "" "mejor este workflow." #: editor/editor_node.cpp +#, fuzzy +msgid "" +"This is a remote object so changes to it will not be kept.\n" +"Please read the documentation relevant to debugging to better understand " +"this workflow." +msgstr "" +"Este recurso pertenece a una escena que fue importada, por lo tanto no es " +"editable.\n" +"Por favor leé la documentación relevante a importar escenas para entender " +"mejor este workflow." + +#: editor/editor_node.cpp msgid "Copy Params" msgstr "Copiar Params" @@ -1633,6 +1657,11 @@ msgid "Export Mesh Library" msgstr "Exportar LibrerÃa de Meshes" #: editor/editor_node.cpp +#, fuzzy +msgid "This operation can't be done without a root node." +msgstr "Esta operación no puede hacerse sin un nodo seleccionado." + +#: editor/editor_node.cpp msgid "Export Tile Set" msgstr "Exportar Tile Set" @@ -1699,32 +1728,33 @@ msgid "Pick a Main Scene" msgstr "Elegà una Escena Principal" #: editor/editor_node.cpp -#, fuzzy msgid "Unable to enable addon plugin at: '%s' parsing of config failed." -msgstr "No se pudo activar el plugin de addon en : '" +msgstr "" +"No se pudo activar el plugin de addon en: '%s' falló el parseo de la " +"configuración." #: editor/editor_node.cpp -#, fuzzy msgid "Unable to find script field for addon plugin at: 'res://addons/%s'." msgstr "" "No se pudo encontrar el campo script para el plugin de addon en: 'res://" -"addons/" +"addons/%s'." #: editor/editor_node.cpp -#, fuzzy msgid "Unable to load addon script from path: '%s'." -msgstr "No se pudo cargar el script de addon desde la ruta: '" +msgstr "No se pudo cargar el script de addon desde la ruta: '%s'." #: editor/editor_node.cpp -#, fuzzy msgid "" "Unable to load addon script from path: '%s' Base type is not EditorPlugin." -msgstr "No se pudo cargar el script de addon desde la ruta: '" +msgstr "" +"No se pudo cargar el script de addon desde la ruta: El tipo base de '%s' no " +"es EditorPlugin." #: editor/editor_node.cpp -#, fuzzy msgid "Unable to load addon script from path: '%s' Script is not in tool mode." -msgstr "No se pudo cargar el script de addon desde la ruta: '" +msgstr "" +"No se pudo cargar el script de addon desde la ruta: El script '%s' no esta " +"en modo tool." #: editor/editor_node.cpp msgid "" @@ -1775,12 +1805,23 @@ msgid "Switch Scene Tab" msgstr "Cambiar Pestaña de Escena" #: editor/editor_node.cpp -msgid "%d more file(s)" +#, fuzzy +msgid "%d more files or folders" +msgstr "%d archivo(s) o carpeta(s) más" + +#: editor/editor_node.cpp +#, fuzzy +msgid "%d more folders" msgstr "%d archivo(s) más" #: editor/editor_node.cpp -msgid "%d more file(s) or folder(s)" -msgstr "%d archivo(s) o carpeta(s) más" +#, fuzzy +msgid "%d more files" +msgstr "%d archivo(s) más" + +#: editor/editor_node.cpp +msgid "Dock Position" +msgstr "" #: editor/editor_node.cpp msgid "Distraction Free Mode" @@ -1791,6 +1832,11 @@ msgid "Toggle distraction-free mode." msgstr "Act./Desact. modo sin distracciones." #: editor/editor_node.cpp +#, fuzzy +msgid "Add a new scene." +msgstr "Agregar nuevos tracks." + +#: editor/editor_node.cpp msgid "Scene" msgstr "Escena" @@ -1855,13 +1901,12 @@ msgid "TileSet.." msgstr "TileSet.." #: editor/editor_node.cpp editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp scene/gui/line_edit.cpp -#: scene/gui/text_edit.cpp +#: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Undo" msgstr "Deshacer" #: editor/editor_node.cpp editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp +#: scene/gui/line_edit.cpp msgid "Redo" msgstr "Rehacer" @@ -2268,9 +2313,8 @@ msgid "Frame %" msgstr "Frame %" #: editor/editor_profiler.cpp -#, fuzzy msgid "Physics Frame %" -msgstr "Fixed Frame %" +msgstr "Frames de FÃsica %" #: editor/editor_profiler.cpp editor/script_editor_debugger.cpp msgid "Time:" @@ -2366,6 +2410,11 @@ msgid "(Current)" msgstr "(Actual)" #: editor/export_template_manager.cpp +#, fuzzy +msgid "Retrieving mirrors, please wait.." +msgstr "Error de conexión, por favor intentá de nuevo." + +#: editor/export_template_manager.cpp msgid "Remove template version '%s'?" msgstr "Quitar plantilla version '%s'?" @@ -2402,6 +2451,112 @@ msgid "Importing:" msgstr "Importando:" #: editor/export_template_manager.cpp +msgid "" +"No download links found for this version. Direct download is only available " +"for official releases." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Can't resolve." +msgstr "No se ha podido resolver." + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Can't connect." +msgstr "No se puede conectar." + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "No response." +msgstr "Sin respuesta." + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Req. Failed." +msgstr "Solicitud fallida." + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Redirect Loop." +msgstr "Bucle de redireccionamiento." + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Failed:" +msgstr "Fallido:" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Can't write file." +msgstr "No se pudo escribir el archivo:\n" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Download Complete." +msgstr "Error de Descarga" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Error requesting url: " +msgstr "Error al guardar atlas:" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Connecting to Mirror.." +msgstr "Conectando.." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Disconnected" +msgstr "Desconectar" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Resolving" +msgstr "Resolviendo.." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Can't Resolve" +msgstr "No se ha podido resolver." + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Connecting.." +msgstr "Conectando.." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Can't Conect" +msgstr "No se puede conectar." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Connected" +msgstr "Conectar" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Requesting.." +msgstr "Solicitando.." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Downloading" +msgstr "Descargar" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Connection Error" +msgstr "Conectando.." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "SSL Handshake Error" +msgstr "Erroes de carga" + +#: editor/export_template_manager.cpp msgid "Current Version:" msgstr "Version Actual:" @@ -2425,6 +2580,16 @@ msgstr "Elegir archivo de plantilla" msgid "Export Template Manager" msgstr "Gestor de Plantillas de Exportación" +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Download Templates" +msgstr "Plantillas" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Select mirror from list: " +msgstr "Seleccionar dispositivo de la lista" + #: editor/file_type_cache.cpp msgid "Can't open file_type_cache.cch for writing, not saving file type cache!" msgstr "" @@ -2432,8 +2597,8 @@ msgstr "" "de tipos de archivo!" #: editor/filesystem_dock.cpp -msgid "Cannot navigate to '" -msgstr "No se puede navegar a '" +msgid "Cannot navigate to '%s' as it has not been found in the file system!" +msgstr "" #: editor/filesystem_dock.cpp msgid "View items as a grid of thumbnails" @@ -2453,14 +2618,6 @@ msgstr "" "reimportá manualmente." #: editor/filesystem_dock.cpp -msgid "" -"\n" -"Source: " -msgstr "" -"\n" -"Fuente: " - -#: editor/filesystem_dock.cpp msgid "Cannot move/rename resources root." msgstr "No se puede mover/renombrar la raiz de recursos." @@ -2721,8 +2878,8 @@ msgid "Remove Poly And Point" msgstr "Remover PolÃgono y Punto" #: editor/plugins/abstract_polygon_2d_editor.cpp -#: editor/plugins/light_occluder_2d_editor_plugin.cpp -msgid "Create a new polygon from scratch." +#, fuzzy +msgid "Create a new polygon from scratch" msgstr "Crear un nuevo polÃgono de cero." #: editor/plugins/abstract_polygon_2d_editor.cpp @@ -2737,6 +2894,11 @@ msgstr "" "Ctrl+Click izq: Dividir Segmento.\n" "Click der: Eliminar Punto." +#: editor/plugins/abstract_polygon_2d_editor.cpp +#, fuzzy +msgid "Delete points" +msgstr "Eliminar Punto" + #: editor/plugins/animation_player_editor_plugin.cpp msgid "Toggle Autoplay" msgstr "Activar/Desact. Autoplay" @@ -3073,18 +3235,10 @@ msgid "Can't resolve hostname:" msgstr "No se ha podido resolver el nombre del host:" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Can't resolve." -msgstr "No se ha podido resolver." - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Connection error, please try again." msgstr "Error de conexión, por favor intentá de nuevo." #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Can't connect." -msgstr "No se puede conectar." - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Can't connect to host:" msgstr "No se puede conectar al host:" @@ -3093,30 +3247,14 @@ msgid "No response from host:" msgstr "No hay respuesta desde el host:" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "No response." -msgstr "Sin respuesta." - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Request failed, return code:" msgstr "Solicitud fallida. Código de retorno:" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Req. Failed." -msgstr "Solicitud fallida." - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Request failed, too many redirects" msgstr "Solicitud fallida, demasiadas redireccinoes" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Redirect Loop." -msgstr "Bucle de redireccionamiento." - -#: editor/plugins/asset_library_editor_plugin.cpp -msgid "Failed:" -msgstr "Fallido:" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Bad download hash, assuming file has been tampered with." msgstr "Hash de descarga incorrecto, asumiendo que el archivo fue manipulado." @@ -3145,14 +3283,6 @@ msgid "Resolving.." msgstr "Resolviendo.." #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Connecting.." -msgstr "Conectando.." - -#: editor/plugins/asset_library_editor_plugin.cpp -msgid "Requesting.." -msgstr "Solicitando.." - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Error making request" msgstr "Error al realizar la solicitud" @@ -3265,6 +3395,39 @@ msgid "Move Action" msgstr "Mover Acción" #: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Move vertical guide" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Create new vertical guide" +msgstr "Crear script nuevo" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Remove vertical guide" +msgstr "Quitar Variable" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Move horizontal guide" +msgstr "Mover Punto en Curva" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Create new horizontal guide" +msgstr "Crear script nuevo" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Remove horizontal guide" +msgstr "Quitar claves inválidas" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Create new horizontal and vertical guides" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp msgid "Edit IK Chain" msgstr "Editar Cadena IK" @@ -3389,10 +3552,17 @@ msgid "Snap to other nodes" msgstr "Alinear a otros nodos" #: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Snap to guides" +msgstr "Alinear a la grilla" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Lock the selected object in place (can't be moved)." msgstr "Inmovilizar Objeto." #: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Unlock the selected object (can be moved)." msgstr "Desinmovilizar Objeto." @@ -3443,6 +3613,11 @@ msgid "Show rulers" msgstr "Mostrar reglas" #: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Show guides" +msgstr "Mostrar reglas" + +#: editor/plugins/canvas_item_editor_plugin.cpp msgid "Center Selection" msgstr "Centrar Selección" @@ -3629,6 +3804,10 @@ msgstr "Act./Desact. Tangente Lineal de Curva" msgid "Hold Shift to edit tangents individually" msgstr "Mantené Shift para editar tangentes individualmente" +#: editor/plugins/gi_probe_editor_plugin.cpp +msgid "Bake GI Probe" +msgstr "" + #: editor/plugins/gradient_editor_plugin.cpp msgid "Add/Remove Color Ramp Point" msgstr "Agregar/Quitar Punto de Rampa de Color" @@ -3663,6 +3842,10 @@ msgid "Create Occluder Polygon" msgstr "Crear PolÃgono Oclusor" #: editor/plugins/light_occluder_2d_editor_plugin.cpp +msgid "Create a new polygon from scratch." +msgstr "Crear un nuevo polÃgono de cero." + +#: editor/plugins/light_occluder_2d_editor_plugin.cpp msgid "Edit existing polygon:" msgstr "Editar polÃgono existente:" @@ -3678,58 +3861,6 @@ msgstr "Ctrl+Click Izq.: Partir Segmento en Dos." msgid "RMB: Erase Point." msgstr "Click Der.: Borrar Punto." -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Remove Point from Line2D" -msgstr "Remover Punto de Line2D" - -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Add Point to Line2D" -msgstr "Agregar Punto a Line2D" - -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Move Point in Line2D" -msgstr "Mover Punto en Line2D" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Select Points" -msgstr "Seleccionar Puntos" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Shift+Drag: Select Control Points" -msgstr "Shift+Arrastrar: Seleccionar Puntos de Control" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Click: Add Point" -msgstr "Click: Agregar Punto" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Right Click: Delete Point" -msgstr "Click Derecho: Eliminar Punto" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Add Point (in empty space)" -msgstr "Agregar Punto (en espacio vacÃo)" - -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Split Segment (in line)" -msgstr "Partir Segmento (en lÃnea)" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Delete Point" -msgstr "Eliminar Punto" - #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Mesh is empty!" msgstr "El Mesh esta vacÃo!" @@ -3944,7 +4075,6 @@ msgid "Eroding walkable area..." msgstr "Erocionando area caminable..." #: editor/plugins/navigation_mesh_generator.cpp -#, fuzzy msgid "Partitioning..." msgstr "Particionando..." @@ -4130,16 +4260,46 @@ msgid "Move Out-Control in Curve" msgstr "Mover Out-Control en Curva" #: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Select Points" +msgstr "Seleccionar Puntos" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Shift+Drag: Select Control Points" +msgstr "Shift+Arrastrar: Seleccionar Puntos de Control" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Click: Add Point" +msgstr "Click: Agregar Punto" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Right Click: Delete Point" +msgstr "Click Derecho: Eliminar Punto" + +#: editor/plugins/path_2d_editor_plugin.cpp msgid "Select Control Points (Shift+Drag)" msgstr "Seleccionar Puntos de Control (Shift+Arrastrar)" #: editor/plugins/path_2d_editor_plugin.cpp #: editor/plugins/path_editor_plugin.cpp +msgid "Add Point (in empty space)" +msgstr "Agregar Punto (en espacio vacÃo)" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp msgid "Split Segment (in curve)" msgstr "Partir Segmento (en curva)" #: editor/plugins/path_2d_editor_plugin.cpp #: editor/plugins/path_editor_plugin.cpp +msgid "Delete Point" +msgstr "Eliminar Punto" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp msgid "Close Curve" msgstr "Cerrar Curva" @@ -4276,7 +4436,6 @@ msgstr "Cargar Recurso" #: editor/plugins/resource_preloader_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp #: editor/plugins/sprite_frames_editor_plugin.cpp editor/property_editor.cpp #: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Paste" @@ -4323,6 +4482,21 @@ msgid " Class Reference" msgstr " Referencia de Clases" #: editor/plugins/script_editor_plugin.cpp +#, fuzzy +msgid "Sort" +msgstr "Ordenar:" + +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp +msgid "Move Up" +msgstr "Subir" + +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp +msgid "Move Down" +msgstr "Bajar" + +#: editor/plugins/script_editor_plugin.cpp msgid "Next script" msgstr "Script siguiente" @@ -4374,6 +4548,10 @@ msgstr "Cerrar Docs" msgid "Close All" msgstr "Cerrar Todos" +#: editor/plugins/script_editor_plugin.cpp +msgid "Close Other Tabs" +msgstr "" + #: editor/plugins/script_editor_plugin.cpp editor/project_manager.cpp msgid "Run" msgstr "Ejecutar" @@ -4384,13 +4562,11 @@ msgstr "Act/Desact. Panel de Scripts" #: editor/plugins/script_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Find.." msgstr "Encontrar.." #: editor/plugins/script_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Find Next" msgstr "Encontrar Siguiente" @@ -4498,33 +4674,22 @@ msgstr "Minúsculas" msgid "Capitalize" msgstr "Capitalizar" -#: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp scene/gui/line_edit.cpp +#: editor/plugins/script_text_editor.cpp scene/gui/line_edit.cpp #: scene/gui/text_edit.cpp msgid "Cut" msgstr "Cortar" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp #: editor/plugins/sprite_frames_editor_plugin.cpp editor/property_editor.cpp #: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Copy" msgstr "Copiar" -#: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp scene/gui/line_edit.cpp +#: editor/plugins/script_text_editor.cpp scene/gui/line_edit.cpp #: scene/gui/text_edit.cpp msgid "Select All" msgstr "Seleccionar Todo" -#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp -msgid "Move Up" -msgstr "Subir" - -#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp -msgid "Move Down" -msgstr "Bajar" - #: editor/plugins/script_text_editor.cpp msgid "Delete Line" msgstr "Eliminar LÃnea" @@ -4546,6 +4711,23 @@ msgid "Clone Down" msgstr "Clonar hacia Abajo" #: editor/plugins/script_text_editor.cpp +#, fuzzy +msgid "Fold Line" +msgstr "Ir a LÃnea" + +#: editor/plugins/script_text_editor.cpp +msgid "Unfold Line" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Fold All Lines" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Unfold All Lines" +msgstr "" + +#: editor/plugins/script_text_editor.cpp msgid "Complete Symbol" msgstr "Completar SÃmbolo" @@ -4591,12 +4773,10 @@ msgid "Convert To Lowercase" msgstr "Convertir A Minúscula" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Find Previous" msgstr "Encontrar Anterior" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Replace.." msgstr "Reemplazar.." @@ -4605,7 +4785,6 @@ msgid "Goto Function.." msgstr "Ir a Función.." #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Goto Line.." msgstr "Ir a LÃnea.." @@ -4770,6 +4949,16 @@ msgid "View Plane Transform." msgstr "Ver Transformación en Plano." #: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Scaling: " +msgstr "Escala:" + +#: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Translating: " +msgstr "Traducciones:" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Rotating %s degrees." msgstr "Torando %s grados." @@ -4850,6 +5039,10 @@ msgid "Vertices" msgstr "Vértices" #: editor/plugins/spatial_editor_plugin.cpp +msgid "FPS" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Align with view" msgstr "Alinear con vista" @@ -4882,6 +5075,16 @@ msgid "View Information" msgstr "Ver Información" #: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "View FPS" +msgstr "Ver Archivos" + +#: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Half Resolution" +msgstr "Escalar Selección" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Audio Listener" msgstr "Oyente de Audio" @@ -5012,6 +5215,11 @@ msgid "Tool Scale" msgstr "Herramienta Escalar" #: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Toggle Freelook" +msgstr "Act./Desact. Pantalla Completa" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Transform" msgstr "Transformar" @@ -5263,11 +5471,11 @@ msgstr "Quitar Todos" #: editor/plugins/theme_editor_plugin.cpp msgid "Edit theme.." -msgstr "" +msgstr "Editar tema.." #: editor/plugins/theme_editor_plugin.cpp msgid "Theme editing menu." -msgstr "" +msgstr "Menu de edición de temas." #: editor/plugins/theme_editor_plugin.cpp msgid "Add Class Items" @@ -5286,6 +5494,11 @@ msgid "Create Empty Editor Template" msgstr "Crear Plantilla de Editor VacÃa" #: editor/plugins/theme_editor_plugin.cpp +#, fuzzy +msgid "Create From Current Editor Theme" +msgstr "Crear Plantilla de Editor VacÃa" + +#: editor/plugins/theme_editor_plugin.cpp msgid "CheckBox Radio1" msgstr "CheckBox Radio1" @@ -5459,7 +5672,8 @@ msgid "Runnable" msgstr "Ejecutable" #: editor/project_export.cpp -msgid "Delete patch '" +#, fuzzy +msgid "Delete patch '%s' from list?" msgstr "Eliminar parche '" #: editor/project_export.cpp @@ -5557,6 +5771,7 @@ msgid "Export With Debug" msgstr "Exportar Como Debug" #: editor/project_manager.cpp +#, fuzzy msgid "The path does not exist." msgstr "La ruta no existe." @@ -5699,6 +5914,9 @@ msgid "" "Language changed.\n" "The UI will update next time the editor or project manager starts." msgstr "" +"Lenguaje cambiado.\n" +"La interfaz de usuario se actualizara la próxima vez que el editor o gestor " +"de proyectos inicie." #: editor/project_manager.cpp msgid "" @@ -5733,9 +5951,8 @@ msgid "Exit" msgstr "Salir" #: editor/project_manager.cpp -#, fuzzy msgid "Restart Now" -msgstr "Reiniciar (s):" +msgstr "Reiniciar Ahora" #: editor/project_manager.cpp msgid "Can't run project" @@ -5774,10 +5991,6 @@ msgid "Add Input Action Event" msgstr "Agregar Evento de Acción de Entrada" #: editor/project_settings_editor.cpp editor/settings_config_dialog.cpp -msgid "Meta+" -msgstr "Meta+" - -#: editor/project_settings_editor.cpp editor/settings_config_dialog.cpp msgid "Shift+" msgstr "Shift+" @@ -5899,12 +6112,13 @@ msgid "Select a setting item first!" msgstr "Selecciona un Ãtem primero!" #: editor/project_settings_editor.cpp -msgid "No property '" +#, fuzzy +msgid "No property '%s' exists." msgstr "No existe la propiedad '" #: editor/project_settings_editor.cpp -msgid "Setting '" -msgstr "Ajuste '" +msgid "Setting '%s' is internal, and it can't be deleted." +msgstr "" #: editor/project_settings_editor.cpp msgid "Delete Item" @@ -5959,13 +6173,12 @@ msgid "Remove Resource Remap Option" msgstr "Remover Opción de Remapeo de Recursos" #: editor/project_settings_editor.cpp -#, fuzzy msgid "Changed Locale Filter" -msgstr "Cambiar Tiempo de Blend" +msgstr "Cambiar Filtro de Locale" #: editor/project_settings_editor.cpp msgid "Changed Locale Filter Mode" -msgstr "" +msgstr "Cambiar Modo de Filtro de Locale" #: editor/project_settings_editor.cpp msgid "Project Settings (project.godot)" @@ -6028,28 +6241,24 @@ msgid "Locale" msgstr "Locale" #: editor/project_settings_editor.cpp -#, fuzzy msgid "Locales Filter" -msgstr "Filtro de Imágenes:" +msgstr "Filtro de Locales" #: editor/project_settings_editor.cpp -#, fuzzy msgid "Show all locales" -msgstr "Mostrar Huesos" +msgstr "Mostrar todos los locales" #: editor/project_settings_editor.cpp msgid "Show only selected locales" -msgstr "" +msgstr "Mostrar solo los locales seleccionados" #: editor/project_settings_editor.cpp -#, fuzzy msgid "Filter mode:" -msgstr "Filtrar nodos" +msgstr "Filtrar modo:" #: editor/project_settings_editor.cpp -#, fuzzy msgid "Locales:" -msgstr "Locale" +msgstr "Locales:" #: editor/project_settings_editor.cpp msgid "AutoLoad" @@ -6383,6 +6592,16 @@ msgid "Clear a script for the selected node." msgstr "Reestablecer un script para el nodo seleccionado." #: editor/scene_tree_dock.cpp +#, fuzzy +msgid "Remote" +msgstr "Quitar" + +#: editor/scene_tree_dock.cpp +#, fuzzy +msgid "Local" +msgstr "Locale" + +#: editor/scene_tree_dock.cpp msgid "Clear Inheritance? (No Undo!)" msgstr "Limpiar Herencia? (Imposible Deshacer!)" @@ -6575,6 +6794,11 @@ msgid "Attach Node Script" msgstr "Adjuntar Script de Nodo" #: editor/script_editor_debugger.cpp +#, fuzzy +msgid "Remote " +msgstr "Quitar" + +#: editor/script_editor_debugger.cpp msgid "Bytes:" msgstr "Bytes:" @@ -6631,18 +6855,6 @@ msgid "Stack Trace (if applicable):" msgstr "Stack Trace (si aplica):" #: editor/script_editor_debugger.cpp -msgid "Remote Inspector" -msgstr "Inspector Remoto" - -#: editor/script_editor_debugger.cpp -msgid "Live Scene Tree:" -msgstr "Ãrbol de Escenas en Vivo:" - -#: editor/script_editor_debugger.cpp -msgid "Remote Object Properties: " -msgstr "Propiedades de Objeto Remoto: " - -#: editor/script_editor_debugger.cpp msgid "Profiler" msgstr "Profiler" @@ -6774,53 +6986,53 @@ msgstr "Bibliotecas: " msgid "GDNative" msgstr "GDNative" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp #: modules/visual_script/visual_script_builtin_funcs.cpp msgid "Invalid type argument to convert(), use TYPE_* constants." msgstr "Argumento de tipo inválido para convert(), usá constantes TYPE_*." -#: modules/gdscript/gd_functions.cpp modules/mono/glue/glue_header.h +#: modules/gdscript/gdscript_functions.cpp modules/mono/glue/glue_header.h #: modules/visual_script/visual_script_builtin_funcs.cpp msgid "Not enough bytes for decoding bytes, or invalid format." msgstr "" "No hay suficientes bytes para decodificar bytes, o el formato es inválido." -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "step argument is zero!" msgstr "el argumento step es cero!" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Not a script with an instance" msgstr "No es un script con una instancia" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Not based on a script" msgstr "No está basado en un script" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Not based on a resource file" msgstr "No está basado en un archivo de recursos" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary format (missing @path)" msgstr "Formato de diccionario de instancias inválido (@path faltante)" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary format (can't load script at @path)" msgstr "" "Formato de diccionario de instancias inválido (no se puede cargar el script " "en @path)" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary format (invalid script at @path)" msgstr "" "Formato de diccionario de instancias inválido (script inválido en @path)" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary (invalid subclasses)" msgstr "Diccionario de instancias inválido (subclases inválidas)" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Object can't provide a length." msgstr "El objeto no puede proveer un largo." @@ -6833,16 +7045,26 @@ msgid "GridMap Duplicate Selection" msgstr "Duplicar Selección en GridMap" #: modules/gridmap/grid_map_editor_plugin.cpp +msgid "Floor:" +msgstr "" + +#: modules/gridmap/grid_map_editor_plugin.cpp +#, fuzzy +msgid "Grid Map" +msgstr "Snap de Grilla" + +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Snap View" msgstr "Anclar Vista" #: modules/gridmap/grid_map_editor_plugin.cpp -msgid "Prev Level (%sDown Wheel)" -msgstr "Nivel Previo (%sRueda Abajo)" +#, fuzzy +msgid "Previous Floor" +msgstr "Pestaña anterior" #: modules/gridmap/grid_map_editor_plugin.cpp -msgid "Next Level (%sUp Wheel)" -msgstr "Nivel Siguiente (%sRueda Arriba)" +msgid "Next Floor" +msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp msgid "Clip Disabled" @@ -6909,12 +7131,9 @@ msgid "Erase Area" msgstr "Borrar Ãrea" #: modules/gridmap/grid_map_editor_plugin.cpp -msgid "Selection -> Duplicate" -msgstr "Selección -> Duplicar" - -#: modules/gridmap/grid_map_editor_plugin.cpp -msgid "Selection -> Clear" -msgstr "Selección -> Restablecer" +#, fuzzy +msgid "Clear Selection" +msgstr "Centrar Selección" #: modules/gridmap/grid_map_editor_plugin.cpp msgid "GridMap Settings" @@ -7042,7 +7261,8 @@ msgid "Duplicate VisualScript Nodes" msgstr "Duplicar Nodos VisualScript" #: modules/visual_script/visual_script_editor.cpp -msgid "Hold Meta to drop a Getter. Hold Shift to drop a generic signature." +#, fuzzy +msgid "Hold %s to drop a Getter. Hold Shift to drop a generic signature." msgstr "" "Mantené pulsado Meta para depositar un Getter. Mantené pulsado Shift para " "depositar una firma generica." @@ -7054,7 +7274,8 @@ msgstr "" "depositar una firma genérica." #: modules/visual_script/visual_script_editor.cpp -msgid "Hold Meta to drop a simple reference to the node." +#, fuzzy +msgid "Hold %s to drop a simple reference to the node." msgstr "Mantené pulsado Meta para depositar una referencia simple al nodo." #: modules/visual_script/visual_script_editor.cpp @@ -7062,7 +7283,8 @@ msgid "Hold Ctrl to drop a simple reference to the node." msgstr "Mantené pulsado Ctrl para depositar una referencia simple al nodo." #: modules/visual_script/visual_script_editor.cpp -msgid "Hold Meta to drop a Variable Setter." +#, fuzzy +msgid "Hold %s to drop a Variable Setter." msgstr "Mantené pulsado Meta para depositar un Variable Setter." #: modules/visual_script/visual_script_editor.cpp @@ -7292,12 +7514,23 @@ msgid "Could not write file:\n" msgstr "No se pudo escribir el archivo:\n" #: platform/javascript/export/export.cpp -msgid "Could not read file:\n" +msgid "Could not open template for export:\n" +msgstr "No se pudo abrir la plantilla para exportar:\n" + +#: platform/javascript/export/export.cpp +#, fuzzy +msgid "Invalid export template:\n" +msgstr "Instalar Templates de Exportación" + +#: platform/javascript/export/export.cpp +#, fuzzy +msgid "Could not read custom HTML shell:\n" msgstr "No se pudo leer el archivo:\n" #: platform/javascript/export/export.cpp -msgid "Could not open template for export:\n" -msgstr "No se pudo abrir la plantilla para exportar:\n" +#, fuzzy +msgid "Could not read boot splash image file:\n" +msgstr "No se pudo leer el archivo:\n" #: scene/2d/animated_sprite.cpp msgid "" @@ -7416,22 +7649,6 @@ msgstr "" msgid "Path property must point to a valid Node2D node to work." msgstr "La propiedad Path debe apuntar a un nodo Node2D válido para funcionar." -#: scene/2d/sprite.cpp -msgid "" -"Path property must point to a valid Viewport node to work. Such Viewport " -"must be set to 'render target' mode." -msgstr "" -"La propiedad Path debe apuntar a un nodo Viewport válido para funcionar. " -"Dicho Viewport debe ser seteado a modo 'render target'." - -#: scene/2d/sprite.cpp -msgid "" -"The Viewport set in the path property must be set as 'render target' in " -"order for this sprite to work." -msgstr "" -"El Viewport seteado en la propiedad path debe ser seteado como 'render " -"target' para que este sprite funcione." - #: scene/2d/visibility_notifier_2d.cpp msgid "" "VisibilityEnable2D works best when used with the edited scene root directly " @@ -7504,6 +7721,15 @@ msgstr "" "Se debe proveer un shape para que CollisionShape funcione. Creale un recurso " "shape!" +#: scene/3d/gi_probe.cpp +#, fuzzy +msgid "Plotting Meshes" +msgstr "Haciendo Blitting de Imágenes" + +#: scene/3d/gi_probe.cpp +msgid "Finishing Plot" +msgstr "" + #: scene/3d/navigation_mesh.cpp msgid "A NavigationMesh resource must be set or created for this node to work." msgstr "" @@ -7600,6 +7826,10 @@ msgstr "" "Usá un container como hijo (VBox, HBox, etc), o un Control y seteá el tamaño " "mÃnimo personalizado de forma manual." +#: scene/gui/tree.cpp +msgid "(Other)" +msgstr "" + #: scene/main/scene_tree.cpp msgid "" "Default Environment as specified in Project Setings (Rendering -> Viewport -" @@ -7636,6 +7866,69 @@ msgstr "Error cargando tipografÃa." msgid "Invalid font size." msgstr "Tamaño de tipografÃa inválido." +#~ msgid "Cannot navigate to '" +#~ msgstr "No se puede navegar a '" + +#~ msgid "" +#~ "\n" +#~ "Source: " +#~ msgstr "" +#~ "\n" +#~ "Fuente: " + +#~ msgid "Remove Point from Line2D" +#~ msgstr "Remover Punto de Line2D" + +#~ msgid "Add Point to Line2D" +#~ msgstr "Agregar Punto a Line2D" + +#~ msgid "Move Point in Line2D" +#~ msgstr "Mover Punto en Line2D" + +#~ msgid "Split Segment (in line)" +#~ msgstr "Partir Segmento (en lÃnea)" + +#~ msgid "Meta+" +#~ msgstr "Meta+" + +#~ msgid "Setting '" +#~ msgstr "Ajuste '" + +#~ msgid "Remote Inspector" +#~ msgstr "Inspector Remoto" + +#~ msgid "Live Scene Tree:" +#~ msgstr "Ãrbol de Escenas en Vivo:" + +#~ msgid "Remote Object Properties: " +#~ msgstr "Propiedades de Objeto Remoto: " + +#~ msgid "Prev Level (%sDown Wheel)" +#~ msgstr "Nivel Previo (%sRueda Abajo)" + +#~ msgid "Next Level (%sUp Wheel)" +#~ msgstr "Nivel Siguiente (%sRueda Arriba)" + +#~ msgid "Selection -> Duplicate" +#~ msgstr "Selección -> Duplicar" + +#~ msgid "Selection -> Clear" +#~ msgstr "Selección -> Restablecer" + +#~ msgid "" +#~ "Path property must point to a valid Viewport node to work. Such Viewport " +#~ "must be set to 'render target' mode." +#~ msgstr "" +#~ "La propiedad Path debe apuntar a un nodo Viewport válido para funcionar. " +#~ "Dicho Viewport debe ser seteado a modo 'render target'." + +#~ msgid "" +#~ "The Viewport set in the path property must be set as 'render target' in " +#~ "order for this sprite to work." +#~ msgstr "" +#~ "El Viewport seteado en la propiedad path debe ser seteado como 'render " +#~ "target' para que este sprite funcione." + #~ msgid "Filter:" #~ msgstr "Filtro:" @@ -7660,9 +7953,6 @@ msgstr "Tamaño de tipografÃa inválido." #~ msgid "Removed:" #~ msgstr "Removido:" -#~ msgid "Error saving atlas:" -#~ msgstr "Error al guardar atlas:" - #~ msgid "Could not save atlas subtexture:" #~ msgstr "No se pudo guardar la subtextura de altas:" @@ -8052,9 +8342,6 @@ msgstr "Tamaño de tipografÃa inválido." #~ msgid "Cropping Images" #~ msgstr "Cropeando Imágenes" -#~ msgid "Blitting Images" -#~ msgstr "Haciendo Blitting de Imágenes" - #~ msgid "Couldn't save atlas image:" #~ msgstr "No se pudo guardar la imagen de atlas:" @@ -8443,9 +8730,6 @@ msgstr "Tamaño de tipografÃa inválido." #~ msgid "Save Translatable Strings" #~ msgstr "Guardar Strings Traducibles" -#~ msgid "Install Export Templates" -#~ msgstr "Instalar Templates de Exportación" - #~ msgid "Edit Script Options" #~ msgstr "Editar Opciones de Script" diff --git a/editor/translations/fa.po b/editor/translations/fa.po index 87e473d49c..f1fb67ca83 100644 --- a/editor/translations/fa.po +++ b/editor/translations/fa.po @@ -102,6 +102,7 @@ msgid "Anim Delete Keys" msgstr "کلیدها را در انیمیشن ØØ°Ù Ú©Ù†" #: editor/animation_editor.cpp editor/plugins/tile_map_editor_plugin.cpp +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Duplicate Selection" msgstr "انتخاب شده را به دو تا تکثیر Ú©Ù†" @@ -640,6 +641,13 @@ msgstr "ویرایشگر بستگی" msgid "Search Replacement Resource:" msgstr "منبع جایگزینی را جستجو Ú©Ù†:" +#: editor/dependency_editor.cpp editor/editor_file_dialog.cpp +#: editor/editor_help.cpp editor/editor_node.cpp editor/filesystem_dock.cpp +#: editor/plugins/script_editor_plugin.cpp editor/property_selector.cpp +#: editor/quick_open.cpp scene/gui/file_dialog.cpp +msgid "Open" +msgstr "باز Ú©Ù†" + #: editor/dependency_editor.cpp msgid "Owners Of:" msgstr "مالکانÙ:" @@ -714,6 +722,15 @@ msgstr "آیا پرونده‌های انتخاب شده Øذ٠شود؟" msgid "Delete" msgstr "ØØ°Ù Ú©Ù†" +#: editor/dictionary_property_edit.cpp +msgid "Change Dictionary Key" +msgstr "" + +#: editor/dictionary_property_edit.cpp +#, fuzzy +msgid "Change Dictionary Value" +msgstr "مقدار آرایه را تغییر بده" + #: editor/editor_about.cpp msgid "Thanks from the Godot community!" msgstr "" @@ -1143,12 +1160,6 @@ msgstr "همه ÛŒ موارد شناخته شده اند." msgid "All Files (*)" msgstr "تمام پرونده‌ها (*)" -#: editor/editor_file_dialog.cpp editor/editor_help.cpp editor/editor_node.cpp -#: editor/filesystem_dock.cpp editor/plugins/script_editor_plugin.cpp -#: editor/property_selector.cpp editor/quick_open.cpp scene/gui/file_dialog.cpp -msgid "Open" -msgstr "باز Ú©Ù†" - #: editor/editor_file_dialog.cpp scene/gui/file_dialog.cpp msgid "Open a File" msgstr "یک پرونده را باز Ú©Ù†" @@ -1515,6 +1526,13 @@ msgid "" msgstr "" #: editor/editor_node.cpp +msgid "" +"This is a remote object so changes to it will not be kept.\n" +"Please read the documentation relevant to debugging to better understand " +"this workflow." +msgstr "" + +#: editor/editor_node.cpp msgid "Copy Params" msgstr "" @@ -1625,6 +1643,10 @@ msgid "Export Mesh Library" msgstr "" #: editor/editor_node.cpp +msgid "This operation can't be done without a root node." +msgstr "" + +#: editor/editor_node.cpp msgid "Export Tile Set" msgstr "" @@ -1752,11 +1774,20 @@ msgid "Switch Scene Tab" msgstr "" #: editor/editor_node.cpp -msgid "%d more file(s)" +msgid "%d more files or folders" +msgstr "" + +#: editor/editor_node.cpp +#, fuzzy +msgid "%d more folders" +msgstr "نمی‌تواند یک پوشه ایجاد شود." + +#: editor/editor_node.cpp +msgid "%d more files" msgstr "" #: editor/editor_node.cpp -msgid "%d more file(s) or folder(s)" +msgid "Dock Position" msgstr "" #: editor/editor_node.cpp @@ -1768,6 +1799,11 @@ msgid "Toggle distraction-free mode." msgstr "" #: editor/editor_node.cpp +#, fuzzy +msgid "Add a new scene." +msgstr "ترک‌های جدید اضاÙÙ‡ Ú©Ù†." + +#: editor/editor_node.cpp msgid "Scene" msgstr "صØنه" @@ -1832,13 +1868,12 @@ msgid "TileSet.." msgstr "" #: editor/editor_node.cpp editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp scene/gui/line_edit.cpp -#: scene/gui/text_edit.cpp +#: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Undo" msgstr "خنثی کردن (Undo)" #: editor/editor_node.cpp editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp +#: scene/gui/line_edit.cpp msgid "Redo" msgstr "" @@ -2329,6 +2364,10 @@ msgid "(Current)" msgstr "" #: editor/export_template_manager.cpp +msgid "Retrieving mirrors, please wait.." +msgstr "" + +#: editor/export_template_manager.cpp msgid "Remove template version '%s'?" msgstr "" @@ -2363,6 +2402,113 @@ msgid "Importing:" msgstr "" #: editor/export_template_manager.cpp +msgid "" +"No download links found for this version. Direct download is only available " +"for official releases." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Can't resolve." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Can't connect." +msgstr "در Øال اتصال..." + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "No response." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Req. Failed." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Redirect Loop." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Failed:" +msgstr "" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Can't write file." +msgstr "نمی‌تواند یک پوشه ایجاد شود." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Download Complete." +msgstr "خطاهای بارگذاری" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Error requesting url: " +msgstr "خطای بارگذاری قلم." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Connecting to Mirror.." +msgstr "در Øال اتصال..." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Disconnected" +msgstr "عدم اتصال" + +#: editor/export_template_manager.cpp +msgid "Resolving" +msgstr "" + +#: editor/export_template_manager.cpp +msgid "Can't Resolve" +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Connecting.." +msgstr "در Øال اتصال..." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Can't Conect" +msgstr "در Øال اتصال..." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Connected" +msgstr "اتصال" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Requesting.." +msgstr "آزمودن" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Downloading" +msgstr "خطاهای بارگذاری" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Connection Error" +msgstr "در Øال اتصال..." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "SSL Handshake Error" +msgstr "خطاهای بارگذاری" + +#: editor/export_template_manager.cpp #, fuzzy msgid "Current Version:" msgstr "نسخه:" @@ -2390,12 +2536,21 @@ msgstr "آیا پرونده‌های انتخاب شده Øذ٠شود؟" msgid "Export Template Manager" msgstr "" +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Download Templates" +msgstr "برداشتن انتخاب شده" + +#: editor/export_template_manager.cpp +msgid "Select mirror from list: " +msgstr "" + #: editor/file_type_cache.cpp msgid "Can't open file_type_cache.cch for writing, not saving file type cache!" msgstr "" #: editor/filesystem_dock.cpp -msgid "Cannot navigate to '" +msgid "Cannot navigate to '%s' as it has not been found in the file system!" msgstr "" #: editor/filesystem_dock.cpp @@ -2413,13 +2568,6 @@ msgid "" msgstr "" #: editor/filesystem_dock.cpp -#, fuzzy -msgid "" -"\n" -"Source: " -msgstr "منبع" - -#: editor/filesystem_dock.cpp msgid "Cannot move/rename resources root." msgstr "" @@ -2684,8 +2832,7 @@ msgid "Remove Poly And Point" msgstr "" #: editor/plugins/abstract_polygon_2d_editor.cpp -#: editor/plugins/light_occluder_2d_editor_plugin.cpp -msgid "Create a new polygon from scratch." +msgid "Create a new polygon from scratch" msgstr "" #: editor/plugins/abstract_polygon_2d_editor.cpp @@ -2696,6 +2843,11 @@ msgid "" "RMB: Erase Point." msgstr "" +#: editor/plugins/abstract_polygon_2d_editor.cpp +#, fuzzy +msgid "Delete points" +msgstr "ØØ°Ù Ú©Ù†" + #: editor/plugins/animation_player_editor_plugin.cpp msgid "Toggle Autoplay" msgstr "" @@ -3034,20 +3186,11 @@ msgid "Can't resolve hostname:" msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Can't resolve." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Connection error, please try again." msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp #, fuzzy -msgid "Can't connect." -msgstr "در Øال اتصال..." - -#: editor/plugins/asset_library_editor_plugin.cpp -#, fuzzy msgid "Can't connect to host:" msgstr "اتصال به گره:" @@ -3056,30 +3199,14 @@ msgid "No response from host:" msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "No response." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Request failed, return code:" msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Req. Failed." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Request failed, too many redirects" msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Redirect Loop." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp -msgid "Failed:" -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Bad download hash, assuming file has been tampered with." msgstr "" @@ -3109,16 +3236,6 @@ msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp #, fuzzy -msgid "Connecting.." -msgstr "در Øال اتصال..." - -#: editor/plugins/asset_library_editor_plugin.cpp -#, fuzzy -msgid "Requesting.." -msgstr "آزمودن" - -#: editor/plugins/asset_library_editor_plugin.cpp -#, fuzzy msgid "Error making request" msgstr "خطای بارگذاری قلم." @@ -3232,6 +3349,38 @@ msgid "Move Action" msgstr "" #: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Move vertical guide" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Create new vertical guide" +msgstr "جدید ایجاد Ú©Ù†" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Remove vertical guide" +msgstr "برداشتن متغیر" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Move horizontal guide" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Create new horizontal guide" +msgstr "جدید ایجاد Ú©Ù†" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Remove horizontal guide" +msgstr "کلیدهای نامعتبر را ØØ°Ù Ú©Ù†" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Create new horizontal and vertical guides" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp msgid "Edit IK Chain" msgstr "" @@ -3353,10 +3502,16 @@ msgid "Snap to other nodes" msgstr "" #: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Snap to guides" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Lock the selected object in place (can't be moved)." msgstr "" #: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Unlock the selected object (can be moved)." msgstr "" @@ -3407,6 +3562,10 @@ msgid "Show rulers" msgstr "" #: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Show guides" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp msgid "Center Selection" msgstr "" @@ -3600,6 +3759,10 @@ msgstr "" msgid "Hold Shift to edit tangents individually" msgstr "" +#: editor/plugins/gi_probe_editor_plugin.cpp +msgid "Bake GI Probe" +msgstr "" + #: editor/plugins/gradient_editor_plugin.cpp msgid "Add/Remove Color Ramp Point" msgstr "" @@ -3632,6 +3795,10 @@ msgid "Create Occluder Polygon" msgstr "" #: editor/plugins/light_occluder_2d_editor_plugin.cpp +msgid "Create a new polygon from scratch." +msgstr "" + +#: editor/plugins/light_occluder_2d_editor_plugin.cpp msgid "Edit existing polygon:" msgstr "" @@ -3647,59 +3814,6 @@ msgstr "" msgid "RMB: Erase Point." msgstr "" -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Remove Point from Line2D" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#, fuzzy -msgid "Add Point to Line2D" -msgstr "برو به خط" - -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Move Point in Line2D" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Select Points" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Shift+Drag: Select Control Points" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Click: Add Point" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Right Click: Delete Point" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Add Point (in empty space)" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Split Segment (in line)" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Delete Point" -msgstr "" - #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Mesh is empty!" msgstr "" @@ -4097,16 +4211,46 @@ msgid "Move Out-Control in Curve" msgstr "" #: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Select Points" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Shift+Drag: Select Control Points" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Click: Add Point" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Right Click: Delete Point" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp msgid "Select Control Points (Shift+Drag)" msgstr "" #: editor/plugins/path_2d_editor_plugin.cpp #: editor/plugins/path_editor_plugin.cpp +msgid "Add Point (in empty space)" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp msgid "Split Segment (in curve)" msgstr "" #: editor/plugins/path_2d_editor_plugin.cpp #: editor/plugins/path_editor_plugin.cpp +msgid "Delete Point" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp msgid "Close Curve" msgstr "" @@ -4247,7 +4391,6 @@ msgstr "" #: editor/plugins/resource_preloader_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp #: editor/plugins/sprite_frames_editor_plugin.cpp editor/property_editor.cpp #: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Paste" @@ -4292,6 +4435,21 @@ msgid " Class Reference" msgstr "" #: editor/plugins/script_editor_plugin.cpp +#, fuzzy +msgid "Sort" +msgstr "مرتب‌سازی:" + +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp +msgid "Move Up" +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp +msgid "Move Down" +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp msgid "Next script" msgstr "" @@ -4344,6 +4502,10 @@ msgstr "" msgid "Close All" msgstr "بستن" +#: editor/plugins/script_editor_plugin.cpp +msgid "Close Other Tabs" +msgstr "" + #: editor/plugins/script_editor_plugin.cpp editor/project_manager.cpp msgid "Run" msgstr "" @@ -4354,13 +4516,11 @@ msgstr "" #: editor/plugins/script_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Find.." msgstr "" #: editor/plugins/script_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Find Next" msgstr "" @@ -4466,33 +4626,22 @@ msgstr "" msgid "Capitalize" msgstr "" -#: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp scene/gui/line_edit.cpp +#: editor/plugins/script_text_editor.cpp scene/gui/line_edit.cpp #: scene/gui/text_edit.cpp msgid "Cut" msgstr "بریدن" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp #: editor/plugins/sprite_frames_editor_plugin.cpp editor/property_editor.cpp #: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Copy" msgstr "Ú©Ù¾ÛŒ کردن" -#: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp scene/gui/line_edit.cpp +#: editor/plugins/script_text_editor.cpp scene/gui/line_edit.cpp #: scene/gui/text_edit.cpp msgid "Select All" msgstr "انتخاب همه" -#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp -msgid "Move Up" -msgstr "" - -#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp -msgid "Move Down" -msgstr "" - #: editor/plugins/script_text_editor.cpp #, fuzzy msgid "Delete Line" @@ -4515,6 +4664,23 @@ msgid "Clone Down" msgstr "" #: editor/plugins/script_text_editor.cpp +#, fuzzy +msgid "Fold Line" +msgstr "برو به خط" + +#: editor/plugins/script_text_editor.cpp +msgid "Unfold Line" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Fold All Lines" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Unfold All Lines" +msgstr "" + +#: editor/plugins/script_text_editor.cpp msgid "Complete Symbol" msgstr "" @@ -4561,12 +4727,10 @@ msgid "Convert To Lowercase" msgstr "اتصال به گره:" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Find Previous" msgstr "" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Replace.." msgstr "" @@ -4575,7 +4739,6 @@ msgid "Goto Function.." msgstr "" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Goto Line.." msgstr "" @@ -4740,6 +4903,15 @@ msgid "View Plane Transform." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "Scaling: " +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Translating: " +msgstr "انتقال" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Rotating %s degrees." msgstr "" @@ -4821,6 +4993,10 @@ msgid "Vertices" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "FPS" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Align with view" msgstr "" @@ -4853,6 +5029,16 @@ msgid "View Information" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "View FPS" +msgstr "پرونده:" + +#: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Half Resolution" +msgstr "انتخاب شده را تغییر مقیاس بده" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Audio Listener" msgstr "" @@ -4984,6 +5170,11 @@ msgid "Tool Scale" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Toggle Freelook" +msgstr "Øالت تمام صÙØÙ‡" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Transform" msgstr "" @@ -5261,6 +5452,10 @@ msgid "Create Empty Editor Template" msgstr "" #: editor/plugins/theme_editor_plugin.cpp +msgid "Create From Current Editor Theme" +msgstr "" + +#: editor/plugins/theme_editor_plugin.cpp msgid "CheckBox Radio1" msgstr "" @@ -5437,7 +5632,7 @@ msgstr "" #: editor/project_export.cpp #, fuzzy -msgid "Delete patch '" +msgid "Delete patch '%s' from list?" msgstr "ØØ°Ù Ú©Ù†" #: editor/project_export.cpp @@ -5741,10 +5936,6 @@ msgid "Add Input Action Event" msgstr "" #: editor/project_settings_editor.cpp editor/settings_config_dialog.cpp -msgid "Meta+" -msgstr "+Meta" - -#: editor/project_settings_editor.cpp editor/settings_config_dialog.cpp msgid "Shift+" msgstr "+Shift" @@ -5867,13 +6058,12 @@ msgid "Select a setting item first!" msgstr "" #: editor/project_settings_editor.cpp -msgid "No property '" +msgid "No property '%s' exists." msgstr "" #: editor/project_settings_editor.cpp -#, fuzzy -msgid "Setting '" -msgstr "ترجیØات" +msgid "Setting '%s' is internal, and it can't be deleted." +msgstr "" #: editor/project_settings_editor.cpp #, fuzzy @@ -6354,6 +6544,15 @@ msgid "Clear a script for the selected node." msgstr "" #: editor/scene_tree_dock.cpp +#, fuzzy +msgid "Remote" +msgstr "برداشتن" + +#: editor/scene_tree_dock.cpp +msgid "Local" +msgstr "" + +#: editor/scene_tree_dock.cpp msgid "Clear Inheritance? (No Undo!)" msgstr "" @@ -6548,6 +6747,11 @@ msgid "Attach Node Script" msgstr "صØنه جدید" #: editor/script_editor_debugger.cpp +#, fuzzy +msgid "Remote " +msgstr "برداشتن" + +#: editor/script_editor_debugger.cpp msgid "Bytes:" msgstr "" @@ -6604,18 +6808,6 @@ msgid "Stack Trace (if applicable):" msgstr "" #: editor/script_editor_debugger.cpp -msgid "Remote Inspector" -msgstr "" - -#: editor/script_editor_debugger.cpp -msgid "Live Scene Tree:" -msgstr "" - -#: editor/script_editor_debugger.cpp -msgid "Remote Object Properties: " -msgstr "" - -#: editor/script_editor_debugger.cpp msgid "Profiler" msgstr "" @@ -6749,56 +6941,56 @@ msgstr "" msgid "GDNative" msgstr "" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp #: modules/visual_script/visual_script_builtin_funcs.cpp msgid "Invalid type argument to convert(), use TYPE_* constants." msgstr "" "نوع آرگومان برای متد ()convert ‌ نامعتبر است ،‌ از ثابت های *_TYPE‌ استÙاده " "کنید ." -#: modules/gdscript/gd_functions.cpp modules/mono/glue/glue_header.h +#: modules/gdscript/gdscript_functions.cpp modules/mono/glue/glue_header.h #: modules/visual_script/visual_script_builtin_funcs.cpp msgid "Not enough bytes for decoding bytes, or invalid format." msgstr "" "تعداد بایت های مورد نظر برای رمزگشایی بایت ها کاÙÛŒ نیست ،‌ Ùˆ یا Ùرمت نامعتبر " "است ." -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "step argument is zero!" msgstr "آرگومان step صÙر است!" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp #, fuzzy msgid "Not a script with an instance" msgstr "اسکریپتی با یک نمونه نیست ." -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Not based on a script" msgstr "بر اساس یک اسکریپت نیست." -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Not based on a resource file" msgstr "بر اساس یک Ùایل منبع نیست." -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary format (missing @path)" msgstr "Ùرمت دیکشنری نمونه نامعتبر (pass@ Ù…Ùقود)" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary format (can't load script at @path)" msgstr "" "Ùرمت نمونه ÛŒ دیکشنری نامعتبر است . ( نمی توان اسکریپت را از مسیر path@ " "بارگذاری کرد.)" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary format (invalid script at @path)" msgstr "Ùرمت دیکشنری نمونه نامعتبر (اسکریپت نامعتبر در path@)" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary (invalid subclasses)" msgstr "نمونه ÛŒ دیکشنری نامعتبر است . (زیرکلاس‌های نامعتبر)" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Object can't provide a length." msgstr "" @@ -6813,15 +7005,24 @@ msgid "GridMap Duplicate Selection" msgstr "انتخاب شده را به دو تا تکثیر Ú©Ù†" #: modules/gridmap/grid_map_editor_plugin.cpp -msgid "Snap View" +msgid "Floor:" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp -msgid "Prev Level (%sDown Wheel)" +msgid "Grid Map" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp -msgid "Next Level (%sUp Wheel)" +msgid "Snap View" +msgstr "" + +#: modules/gridmap/grid_map_editor_plugin.cpp +#, fuzzy +msgid "Previous Floor" +msgstr "زبانه قبلی" + +#: modules/gridmap/grid_map_editor_plugin.cpp +msgid "Next Floor" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp @@ -6892,13 +7093,8 @@ msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp #, fuzzy -msgid "Selection -> Duplicate" -msgstr "تنها در قسمت انتخاب شده" - -#: modules/gridmap/grid_map_editor_plugin.cpp -#, fuzzy -msgid "Selection -> Clear" -msgstr "تنها در قسمت انتخاب شده" +msgid "Clear Selection" +msgstr "انتخاب شده را تغییر مقیاس بده" #: modules/gridmap/grid_map_editor_plugin.cpp #, fuzzy @@ -7034,7 +7230,7 @@ msgid "Duplicate VisualScript Nodes" msgstr "" #: modules/visual_script/visual_script_editor.cpp -msgid "Hold Meta to drop a Getter. Hold Shift to drop a generic signature." +msgid "Hold %s to drop a Getter. Hold Shift to drop a generic signature." msgstr "" #: modules/visual_script/visual_script_editor.cpp @@ -7042,7 +7238,7 @@ msgid "Hold Ctrl to drop a Getter. Hold Shift to drop a generic signature." msgstr "" #: modules/visual_script/visual_script_editor.cpp -msgid "Hold Meta to drop a simple reference to the node." +msgid "Hold %s to drop a simple reference to the node." msgstr "" #: modules/visual_script/visual_script_editor.cpp @@ -7050,7 +7246,7 @@ msgid "Hold Ctrl to drop a simple reference to the node." msgstr "" #: modules/visual_script/visual_script_editor.cpp -msgid "Hold Meta to drop a Variable Setter." +msgid "Hold %s to drop a Variable Setter." msgstr "" #: modules/visual_script/visual_script_editor.cpp @@ -7296,12 +7492,22 @@ msgstr "نمی‌تواند یک پوشه ایجاد شود." #: platform/javascript/export/export.cpp #, fuzzy -msgid "Could not read file:\n" +msgid "Could not open template for export:\n" msgstr "نمی‌تواند یک پوشه ایجاد شود." #: platform/javascript/export/export.cpp #, fuzzy -msgid "Could not open template for export:\n" +msgid "Invalid export template:\n" +msgstr "نام دارایی ایندکس نامعتبر." + +#: platform/javascript/export/export.cpp +#, fuzzy +msgid "Could not read custom HTML shell:\n" +msgstr "نمی‌تواند یک پوشه ایجاد شود." + +#: platform/javascript/export/export.cpp +#, fuzzy +msgid "Could not read boot splash image file:\n" msgstr "نمی‌تواند یک پوشه ایجاد شود." #: scene/2d/animated_sprite.cpp @@ -7418,22 +7624,6 @@ msgstr "" msgid "Path property must point to a valid Node2D node to work." msgstr "دارایی Path باید به یک گره Node2D معتبر اشاره کند تا کار کند." -#: scene/2d/sprite.cpp -msgid "" -"Path property must point to a valid Viewport node to work. Such Viewport " -"must be set to 'render target' mode." -msgstr "" -"دارایی Path باید به یک گره Viewport معتبر اشاره کند تا کار کند. این Viewport " -"باید روی Øالت render target تنظیم شود." - -#: scene/2d/sprite.cpp -msgid "" -"The Viewport set in the path property must be set as 'render target' in " -"order for this sprite to work." -msgstr "" -"Viewport تنظیم شده در داریی path باید به صورت render target برای این اسپرایت " -"تنظیم شود تا کار کند." - #: scene/2d/visibility_notifier_2d.cpp msgid "" "VisibilityEnable2D works best when used with the edited scene root directly " @@ -7504,6 +7694,14 @@ msgstr "" "باید یک Ø´Ú©Ù„ برای CollisionShape Ùراهم شده باشد تا عمل کند. لطÙا یک منبع Ø´Ú©Ù„ " "برای آن ایجاد کنید!" +#: scene/3d/gi_probe.cpp +msgid "Plotting Meshes" +msgstr "" + +#: scene/3d/gi_probe.cpp +msgid "Finishing Plot" +msgstr "" + #: scene/3d/navigation_mesh.cpp msgid "A NavigationMesh resource must be set or created for this node to work." msgstr "یک منبع NavigationMesh باید برای یک گره تنظیم یا ایجاد شود تا کار کند." @@ -7591,6 +7789,10 @@ msgid "" "minimum size manually." msgstr "" +#: scene/gui/tree.cpp +msgid "(Other)" +msgstr "" + #: scene/main/scene_tree.cpp msgid "" "Default Environment as specified in Project Setings (Rendering -> Viewport -" @@ -7625,6 +7827,45 @@ msgstr "خطای بارگذاری قلم." msgid "Invalid font size." msgstr "اندازه‌ی قلم نامعتبر." +#, fuzzy +#~ msgid "" +#~ "\n" +#~ "Source: " +#~ msgstr "منبع" + +#, fuzzy +#~ msgid "Add Point to Line2D" +#~ msgstr "برو به خط" + +#~ msgid "Meta+" +#~ msgstr "+Meta" + +#, fuzzy +#~ msgid "Setting '" +#~ msgstr "ترجیØات" + +#, fuzzy +#~ msgid "Selection -> Duplicate" +#~ msgstr "تنها در قسمت انتخاب شده" + +#, fuzzy +#~ msgid "Selection -> Clear" +#~ msgstr "تنها در قسمت انتخاب شده" + +#~ msgid "" +#~ "Path property must point to a valid Viewport node to work. Such Viewport " +#~ "must be set to 'render target' mode." +#~ msgstr "" +#~ "دارایی Path باید به یک گره Viewport معتبر اشاره کند تا کار کند. این " +#~ "Viewport باید روی Øالت render target تنظیم شود." + +#~ msgid "" +#~ "The Viewport set in the path property must be set as 'render target' in " +#~ "order for this sprite to work." +#~ msgstr "" +#~ "Viewport تنظیم شده در داریی path باید به صورت render target برای این " +#~ "اسپرایت تنظیم شود تا کار کند." + #~ msgid "Filter:" #~ msgstr "صاÙÛŒ:" diff --git a/editor/translations/fi.po b/editor/translations/fi.po index 12cafa85fc..75dc63cf12 100644 --- a/editor/translations/fi.po +++ b/editor/translations/fi.po @@ -4,19 +4,20 @@ # This file is distributed under the same license as the Godot source code. # # ekeimaja <ekeimaja@gmail.com>, 2017. +# Jarmo Riikonen <amatrelan@gmail.com>, 2017. # msgid "" msgstr "" "Project-Id-Version: Godot Engine editor\n" -"PO-Revision-Date: 2017-08-25 14:41+0000\n" -"Last-Translator: ekeimaja <ekeimaja@gmail.com>\n" +"PO-Revision-Date: 2017-10-31 22:45+0000\n" +"Last-Translator: Jarmo Riikonen <amatrelan@gmail.com>\n" "Language-Team: Finnish <https://hosted.weblate.org/projects/godot-engine/" "godot/fi/>\n" "Language: fi\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8-bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 2.17-dev\n" +"X-Generator: Weblate 2.17\n" #: editor/animation_editor.cpp msgid "Disabled" @@ -102,6 +103,7 @@ msgid "Anim Delete Keys" msgstr "Poista avaimet" #: editor/animation_editor.cpp editor/plugins/tile_map_editor_plugin.cpp +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Duplicate Selection" msgstr "Monista valinta" @@ -639,6 +641,13 @@ msgstr "Riippuvuusmuokkain" msgid "Search Replacement Resource:" msgstr "" +#: editor/dependency_editor.cpp editor/editor_file_dialog.cpp +#: editor/editor_help.cpp editor/editor_node.cpp editor/filesystem_dock.cpp +#: editor/plugins/script_editor_plugin.cpp editor/property_selector.cpp +#: editor/quick_open.cpp scene/gui/file_dialog.cpp +msgid "Open" +msgstr "Avaa" + #: editor/dependency_editor.cpp msgid "Owners Of:" msgstr "" @@ -711,6 +720,16 @@ msgstr "Poista valitut tiedostot?" msgid "Delete" msgstr "Poista" +#: editor/dictionary_property_edit.cpp +#, fuzzy +msgid "Change Dictionary Key" +msgstr "Vaihda animaation nimi:" + +#: editor/dictionary_property_edit.cpp +#, fuzzy +msgid "Change Dictionary Value" +msgstr "Vaihda taulukon arvoa" + #: editor/editor_about.cpp msgid "Thanks from the Godot community!" msgstr "Kiitos Godot-yhteisöltä!" @@ -1149,12 +1168,6 @@ msgstr "Kaikki tunnistettu" msgid "All Files (*)" msgstr "Kaikki tiedostot (*)" -#: editor/editor_file_dialog.cpp editor/editor_help.cpp editor/editor_node.cpp -#: editor/filesystem_dock.cpp editor/plugins/script_editor_plugin.cpp -#: editor/property_selector.cpp editor/quick_open.cpp scene/gui/file_dialog.cpp -msgid "Open" -msgstr "Avaa" - #: editor/editor_file_dialog.cpp scene/gui/file_dialog.cpp msgid "Open a File" msgstr "Avaa tiedosto" @@ -1528,6 +1541,13 @@ msgid "" msgstr "" #: editor/editor_node.cpp +msgid "" +"This is a remote object so changes to it will not be kept.\n" +"Please read the documentation relevant to debugging to better understand " +"this workflow." +msgstr "" + +#: editor/editor_node.cpp msgid "Copy Params" msgstr "Kopioi parametrit" @@ -1648,6 +1668,11 @@ msgid "Export Mesh Library" msgstr "Tuo Mesh-kirjasto" #: editor/editor_node.cpp +#, fuzzy +msgid "This operation can't be done without a root node." +msgstr "Tätä toimintoa ei voi tehdä ilman Sceneä." + +#: editor/editor_node.cpp msgid "Export Tile Set" msgstr "Tuo tileset" @@ -1783,11 +1808,21 @@ msgstr "Vaihda Scenen välilehteä" #: editor/editor_node.cpp #, fuzzy -msgid "%d more file(s)" +msgid "%d more files or folders" msgstr "%d muuta tiedostoa" #: editor/editor_node.cpp -msgid "%d more file(s) or folder(s)" +#, fuzzy +msgid "%d more folders" +msgstr "%d muuta tiedostoa" + +#: editor/editor_node.cpp +#, fuzzy +msgid "%d more files" +msgstr "%d muuta tiedostoa" + +#: editor/editor_node.cpp +msgid "Dock Position" msgstr "" #: editor/editor_node.cpp @@ -1799,8 +1834,13 @@ msgid "Toggle distraction-free mode." msgstr "" #: editor/editor_node.cpp +#, fuzzy +msgid "Add a new scene." +msgstr "Lisää uusia raitoja." + +#: editor/editor_node.cpp msgid "Scene" -msgstr "Scene" +msgstr "Näkymä" #: editor/editor_node.cpp msgid "Go to previously opened scene." @@ -1863,13 +1903,12 @@ msgid "TileSet.." msgstr "" #: editor/editor_node.cpp editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp scene/gui/line_edit.cpp -#: scene/gui/text_edit.cpp +#: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Undo" msgstr "Peru" #: editor/editor_node.cpp editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp +#: scene/gui/line_edit.cpp msgid "Redo" msgstr "Tee uudelleen" @@ -2365,6 +2404,10 @@ msgid "(Current)" msgstr "(Nykyinen)" #: editor/export_template_manager.cpp +msgid "Retrieving mirrors, please wait.." +msgstr "" + +#: editor/export_template_manager.cpp msgid "Remove template version '%s'?" msgstr "Poista mallin versio '%s'?" @@ -2399,6 +2442,114 @@ msgid "Importing:" msgstr "Tuodaan:" #: editor/export_template_manager.cpp +msgid "" +"No download links found for this version. Direct download is only available " +"for official releases." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Can't resolve." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Can't connect." +msgstr "Yhdistä..." + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "No response." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Req. Failed." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Redirect Loop." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Failed:" +msgstr "" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Can't write file." +msgstr "Ei voitu kirjoittaa tiedostoa:\n" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Download Complete." +msgstr "Lataa" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Error requesting url: " +msgstr "Virhe tallennettaessa atlas-kuvaa:" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Connecting to Mirror.." +msgstr "Yhdistä..." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Disconnected" +msgstr "Katkaise yhteys" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Resolving" +msgstr "Tallennetaan..." + +#: editor/export_template_manager.cpp +msgid "Can't Resolve" +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Connecting.." +msgstr "Yhdistä..." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Can't Conect" +msgstr "Yhdistä..." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Connected" +msgstr "Yhdistä" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Requesting.." +msgstr "Testaus" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Downloading" +msgstr "Lataa" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Connection Error" +msgstr "Yhdistä..." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "SSL Handshake Error" +msgstr "Lataa virheet" + +#: editor/export_template_manager.cpp msgid "Current Version:" msgstr "Nykyinen versio:" @@ -2422,13 +2573,22 @@ msgstr "Valitse mallin tiedosto" msgid "Export Template Manager" msgstr "" +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Download Templates" +msgstr "Poista malli" + +#: editor/export_template_manager.cpp +msgid "Select mirror from list: " +msgstr "" + #: editor/file_type_cache.cpp msgid "Can't open file_type_cache.cch for writing, not saving file type cache!" msgstr "" #: editor/filesystem_dock.cpp -msgid "Cannot navigate to '" -msgstr "Ei voida navigoida '" +msgid "Cannot navigate to '%s' as it has not been found in the file system!" +msgstr "" #: editor/filesystem_dock.cpp msgid "View items as a grid of thumbnails" @@ -2445,13 +2605,6 @@ msgid "" msgstr "" #: editor/filesystem_dock.cpp -#, fuzzy -msgid "" -"\n" -"Source: " -msgstr "Lähde:" - -#: editor/filesystem_dock.cpp msgid "Cannot move/rename resources root." msgstr "" @@ -2723,8 +2876,8 @@ msgid "Remove Poly And Point" msgstr "Poista polygoni ja piste" #: editor/plugins/abstract_polygon_2d_editor.cpp -#: editor/plugins/light_occluder_2d_editor_plugin.cpp -msgid "Create a new polygon from scratch." +#, fuzzy +msgid "Create a new polygon from scratch" msgstr "Luo uusi piste tyhjästä." #: editor/plugins/abstract_polygon_2d_editor.cpp @@ -2735,6 +2888,11 @@ msgid "" "RMB: Erase Point." msgstr "" +#: editor/plugins/abstract_polygon_2d_editor.cpp +#, fuzzy +msgid "Delete points" +msgstr "Poista piste" + #: editor/plugins/animation_player_editor_plugin.cpp msgid "Toggle Autoplay" msgstr "" @@ -3072,20 +3230,11 @@ msgid "Can't resolve hostname:" msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Can't resolve." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Connection error, please try again." msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp #, fuzzy -msgid "Can't connect." -msgstr "Yhdistä..." - -#: editor/plugins/asset_library_editor_plugin.cpp -#, fuzzy msgid "Can't connect to host:" msgstr "Yhdistä Nodeen:" @@ -3094,31 +3243,15 @@ msgid "No response from host:" msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "No response." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp #, fuzzy msgid "Request failed, return code:" msgstr "Pyydetty tiedostomuoto tuntematon:" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Req. Failed." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Request failed, too many redirects" msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Redirect Loop." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp -msgid "Failed:" -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Bad download hash, assuming file has been tampered with." msgstr "" @@ -3149,16 +3282,6 @@ msgstr "Tallennetaan..." #: editor/plugins/asset_library_editor_plugin.cpp #, fuzzy -msgid "Connecting.." -msgstr "Yhdistä..." - -#: editor/plugins/asset_library_editor_plugin.cpp -#, fuzzy -msgid "Requesting.." -msgstr "Testaus" - -#: editor/plugins/asset_library_editor_plugin.cpp -#, fuzzy msgid "Error making request" msgstr "Virhe tallennettaessa resurssia!" @@ -3273,6 +3396,39 @@ msgid "Move Action" msgstr "" #: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Move vertical guide" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Create new vertical guide" +msgstr "Luo uusi skripti" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Remove vertical guide" +msgstr "Poista muuttuja" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Move horizontal guide" +msgstr "Siirrä pistettä käyrällä" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Create new horizontal guide" +msgstr "Luo uusi skripti" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Remove horizontal guide" +msgstr "Poista virheelliset avaimet" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Create new horizontal and vertical guides" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp msgid "Edit IK Chain" msgstr "" @@ -3399,10 +3555,17 @@ msgid "Snap to other nodes" msgstr "" #: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Snap to guides" +msgstr "Laajenna Parentiin" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Lock the selected object in place (can't be moved)." msgstr "Lukitse valitut objektit paikalleen (ei voi liikutella)." #: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Unlock the selected object (can be moved)." msgstr "Poista valittujen objektien lukitus (voi liikutella)." @@ -3456,6 +3619,11 @@ msgid "Show rulers" msgstr "Näytä luut" #: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Show guides" +msgstr "Näytä luut" + +#: editor/plugins/canvas_item_editor_plugin.cpp msgid "Center Selection" msgstr "Valinta keskikohtaan" @@ -3656,6 +3824,10 @@ msgstr "" msgid "Hold Shift to edit tangents individually" msgstr "" +#: editor/plugins/gi_probe_editor_plugin.cpp +msgid "Bake GI Probe" +msgstr "" + #: editor/plugins/gradient_editor_plugin.cpp msgid "Add/Remove Color Ramp Point" msgstr "" @@ -3688,6 +3860,10 @@ msgid "Create Occluder Polygon" msgstr "" #: editor/plugins/light_occluder_2d_editor_plugin.cpp +msgid "Create a new polygon from scratch." +msgstr "Luo uusi piste tyhjästä." + +#: editor/plugins/light_occluder_2d_editor_plugin.cpp msgid "Edit existing polygon:" msgstr "Muokkaa olemassaolevaa polygonia:" @@ -3703,58 +3879,6 @@ msgstr "" msgid "RMB: Erase Point." msgstr "OHP: Pyyhi piste." -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Remove Point from Line2D" -msgstr "Poista piste Line2D:stä" - -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Add Point to Line2D" -msgstr "Lisää piste Line2D:hen" - -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Move Point in Line2D" -msgstr "Siirrä pistettä LIne 2D:ssä" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Select Points" -msgstr "Valitse pisteet" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Shift+Drag: Select Control Points" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Click: Add Point" -msgstr "Klikkaa: lisää piste" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Right Click: Delete Point" -msgstr "Oikea klikkaus: Poista piste" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Add Point (in empty space)" -msgstr "Lisää piste (tyhjyydessä)" - -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Split Segment (in line)" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Delete Point" -msgstr "Poista piste" - #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Mesh is empty!" msgstr "" @@ -4164,16 +4288,46 @@ msgid "Move Out-Control in Curve" msgstr "" #: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Select Points" +msgstr "Valitse pisteet" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Shift+Drag: Select Control Points" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Click: Add Point" +msgstr "Klikkaa: lisää piste" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Right Click: Delete Point" +msgstr "Oikea klikkaus: Poista piste" + +#: editor/plugins/path_2d_editor_plugin.cpp msgid "Select Control Points (Shift+Drag)" msgstr "" #: editor/plugins/path_2d_editor_plugin.cpp #: editor/plugins/path_editor_plugin.cpp +msgid "Add Point (in empty space)" +msgstr "Lisää piste (tyhjyydessä)" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp msgid "Split Segment (in curve)" msgstr "" #: editor/plugins/path_2d_editor_plugin.cpp #: editor/plugins/path_editor_plugin.cpp +msgid "Delete Point" +msgstr "Poista piste" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp msgid "Close Curve" msgstr "Sulje käyrä" @@ -4316,7 +4470,6 @@ msgstr "Lataa resurssi" #: editor/plugins/resource_preloader_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp #: editor/plugins/sprite_frames_editor_plugin.cpp editor/property_editor.cpp #: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Paste" @@ -4362,6 +4515,21 @@ msgid " Class Reference" msgstr "" #: editor/plugins/script_editor_plugin.cpp +#, fuzzy +msgid "Sort" +msgstr "Lajittele:" + +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp +msgid "Move Up" +msgstr "Siirrä ylös" + +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp +msgid "Move Down" +msgstr "Siirrä alas" + +#: editor/plugins/script_editor_plugin.cpp msgid "Next script" msgstr "Seuraava skripti" @@ -4413,6 +4581,10 @@ msgstr "Sulje dokumentaatio" msgid "Close All" msgstr "Sulje kaikki" +#: editor/plugins/script_editor_plugin.cpp +msgid "Close Other Tabs" +msgstr "" + #: editor/plugins/script_editor_plugin.cpp editor/project_manager.cpp msgid "Run" msgstr "Aja" @@ -4424,13 +4596,11 @@ msgstr "Näytä suosikit" #: editor/plugins/script_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Find.." msgstr "Etsi..." #: editor/plugins/script_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Find Next" msgstr "Etsi seuraava" @@ -4541,33 +4711,22 @@ msgstr "" msgid "Capitalize" msgstr "" -#: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp scene/gui/line_edit.cpp +#: editor/plugins/script_text_editor.cpp scene/gui/line_edit.cpp #: scene/gui/text_edit.cpp msgid "Cut" msgstr "Leikkaa" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp #: editor/plugins/sprite_frames_editor_plugin.cpp editor/property_editor.cpp #: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Copy" msgstr "Kopioi" -#: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp scene/gui/line_edit.cpp +#: editor/plugins/script_text_editor.cpp scene/gui/line_edit.cpp #: scene/gui/text_edit.cpp msgid "Select All" msgstr "Valitse kaikki" -#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp -msgid "Move Up" -msgstr "Siirrä ylös" - -#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp -msgid "Move Down" -msgstr "Siirrä alas" - #: editor/plugins/script_text_editor.cpp #, fuzzy msgid "Delete Line" @@ -4590,6 +4749,23 @@ msgid "Clone Down" msgstr "Kloonaa alas" #: editor/plugins/script_text_editor.cpp +#, fuzzy +msgid "Fold Line" +msgstr "Mene riville" + +#: editor/plugins/script_text_editor.cpp +msgid "Unfold Line" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Fold All Lines" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Unfold All Lines" +msgstr "" + +#: editor/plugins/script_text_editor.cpp msgid "Complete Symbol" msgstr "" @@ -4637,12 +4813,10 @@ msgid "Convert To Lowercase" msgstr "Muunna..." #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Find Previous" msgstr "Etsi edellinen" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Replace.." msgstr "Korvaa..." @@ -4651,7 +4825,6 @@ msgid "Goto Function.." msgstr "Mene funktioon..." #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Goto Line.." msgstr "Mene riville..." @@ -4816,6 +4989,16 @@ msgid "View Plane Transform." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Scaling: " +msgstr "Skaalaus:" + +#: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Translating: " +msgstr "Siirtymä" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Rotating %s degrees." msgstr "Kierto %s astetta." @@ -4901,6 +5084,10 @@ msgid "Vertices" msgstr "Ominaisuudet:" #: editor/plugins/spatial_editor_plugin.cpp +msgid "FPS" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Align with view" msgstr "Kohdista näkymään" @@ -4936,6 +5123,16 @@ msgid "View Information" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "View FPS" +msgstr " Tiedostot" + +#: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Half Resolution" +msgstr "Skaalaa valintaa" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Audio Listener" msgstr "" @@ -5073,6 +5270,11 @@ msgid "Tool Scale" msgstr "Skaalaus:" #: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Toggle Freelook" +msgstr "Siirry koko näytön tilaan" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Transform" msgstr "Muunna" @@ -5355,6 +5557,10 @@ msgid "Create Empty Editor Template" msgstr "" #: editor/plugins/theme_editor_plugin.cpp +msgid "Create From Current Editor Theme" +msgstr "" + +#: editor/plugins/theme_editor_plugin.cpp msgid "CheckBox Radio1" msgstr "" @@ -5534,7 +5740,7 @@ msgid "Runnable" msgstr "Suoritettava" #: editor/project_export.cpp -msgid "Delete patch '" +msgid "Delete patch '%s' from list?" msgstr "" #: editor/project_export.cpp @@ -5844,10 +6050,6 @@ msgid "Add Input Action Event" msgstr "" #: editor/project_settings_editor.cpp editor/settings_config_dialog.cpp -msgid "Meta+" -msgstr "" - -#: editor/project_settings_editor.cpp editor/settings_config_dialog.cpp msgid "Shift+" msgstr "" @@ -5970,13 +6172,12 @@ msgid "Select a setting item first!" msgstr "" #: editor/project_settings_editor.cpp -msgid "No property '" +msgid "No property '%s' exists." msgstr "" #: editor/project_settings_editor.cpp -#, fuzzy -msgid "Setting '" -msgstr "Asetukset" +msgid "Setting '%s' is internal, and it can't be deleted." +msgstr "" #: editor/project_settings_editor.cpp #, fuzzy @@ -6456,6 +6657,16 @@ msgid "Clear a script for the selected node." msgstr "" #: editor/scene_tree_dock.cpp +#, fuzzy +msgid "Remote" +msgstr "Poista" + +#: editor/scene_tree_dock.cpp +#, fuzzy +msgid "Local" +msgstr "Skaalaus:" + +#: editor/scene_tree_dock.cpp msgid "Clear Inheritance? (No Undo!)" msgstr "" @@ -6649,6 +6860,11 @@ msgid "Attach Node Script" msgstr "Liitä Noden skripti" #: editor/script_editor_debugger.cpp +#, fuzzy +msgid "Remote " +msgstr "Poista" + +#: editor/script_editor_debugger.cpp msgid "Bytes:" msgstr "Tavu(j)a:" @@ -6705,18 +6921,6 @@ msgid "Stack Trace (if applicable):" msgstr "" #: editor/script_editor_debugger.cpp -msgid "Remote Inspector" -msgstr "" - -#: editor/script_editor_debugger.cpp -msgid "Live Scene Tree:" -msgstr "" - -#: editor/script_editor_debugger.cpp -msgid "Remote Object Properties: " -msgstr "" - -#: editor/script_editor_debugger.cpp msgid "Profiler" msgstr "" @@ -6850,49 +7054,49 @@ msgstr "" msgid "GDNative" msgstr "" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp #: modules/visual_script/visual_script_builtin_funcs.cpp msgid "Invalid type argument to convert(), use TYPE_* constants." msgstr "" -#: modules/gdscript/gd_functions.cpp modules/mono/glue/glue_header.h +#: modules/gdscript/gdscript_functions.cpp modules/mono/glue/glue_header.h #: modules/visual_script/visual_script_builtin_funcs.cpp msgid "Not enough bytes for decoding bytes, or invalid format." msgstr "" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "step argument is zero!" msgstr "" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Not a script with an instance" msgstr "" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Not based on a script" msgstr "" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Not based on a resource file" msgstr "" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary format (missing @path)" msgstr "" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary format (can't load script at @path)" msgstr "" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary format (invalid script at @path)" msgstr "" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary (invalid subclasses)" msgstr "" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Object can't provide a length." msgstr "" @@ -6907,16 +7111,26 @@ msgid "GridMap Duplicate Selection" msgstr "Monista valinta" #: modules/gridmap/grid_map_editor_plugin.cpp +msgid "Floor:" +msgstr "" + +#: modules/gridmap/grid_map_editor_plugin.cpp +#, fuzzy +msgid "Grid Map" +msgstr "Ruudukko" + +#: modules/gridmap/grid_map_editor_plugin.cpp #, fuzzy msgid "Snap View" msgstr "Huippunäkymä" #: modules/gridmap/grid_map_editor_plugin.cpp -msgid "Prev Level (%sDown Wheel)" -msgstr "" +#, fuzzy +msgid "Previous Floor" +msgstr "Edellinen välilehti" #: modules/gridmap/grid_map_editor_plugin.cpp -msgid "Next Level (%sUp Wheel)" +msgid "Next Floor" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp @@ -6991,13 +7205,8 @@ msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp #, fuzzy -msgid "Selection -> Duplicate" -msgstr "Pelkkä valinta" - -#: modules/gridmap/grid_map_editor_plugin.cpp -#, fuzzy -msgid "Selection -> Clear" -msgstr "Pelkkä valinta" +msgid "Clear Selection" +msgstr "Valinta keskikohtaan" #: modules/gridmap/grid_map_editor_plugin.cpp #, fuzzy @@ -7124,7 +7333,7 @@ msgid "Duplicate VisualScript Nodes" msgstr "" #: modules/visual_script/visual_script_editor.cpp -msgid "Hold Meta to drop a Getter. Hold Shift to drop a generic signature." +msgid "Hold %s to drop a Getter. Hold Shift to drop a generic signature." msgstr "" #: modules/visual_script/visual_script_editor.cpp @@ -7132,7 +7341,7 @@ msgid "Hold Ctrl to drop a Getter. Hold Shift to drop a generic signature." msgstr "" #: modules/visual_script/visual_script_editor.cpp -msgid "Hold Meta to drop a simple reference to the node." +msgid "Hold %s to drop a simple reference to the node." msgstr "" #: modules/visual_script/visual_script_editor.cpp @@ -7140,7 +7349,7 @@ msgid "Hold Ctrl to drop a simple reference to the node." msgstr "" #: modules/visual_script/visual_script_editor.cpp -msgid "Hold Meta to drop a Variable Setter." +msgid "Hold %s to drop a Variable Setter." msgstr "" #: modules/visual_script/visual_script_editor.cpp @@ -7375,12 +7584,23 @@ msgid "Could not write file:\n" msgstr "Ei voitu kirjoittaa tiedostoa:\n" #: platform/javascript/export/export.cpp -msgid "Could not read file:\n" +msgid "Could not open template for export:\n" +msgstr "" + +#: platform/javascript/export/export.cpp +#, fuzzy +msgid "Invalid export template:\n" +msgstr "Hallitse vietäviä Templateja" + +#: platform/javascript/export/export.cpp +#, fuzzy +msgid "Could not read custom HTML shell:\n" msgstr "Ei voitu lukea tiedostoa:\n" #: platform/javascript/export/export.cpp -msgid "Could not open template for export:\n" -msgstr "" +#, fuzzy +msgid "Could not read boot splash image file:\n" +msgstr "Ei voitu lukea tiedostoa:\n" #: scene/2d/animated_sprite.cpp msgid "" @@ -7473,18 +7693,6 @@ msgstr "" msgid "Path property must point to a valid Node2D node to work." msgstr "Polku täytyy olla määritetty toimivaan Node2D solmuun toimiakseen." -#: scene/2d/sprite.cpp -msgid "" -"Path property must point to a valid Viewport node to work. Such Viewport " -"must be set to 'render target' mode." -msgstr "" - -#: scene/2d/sprite.cpp -msgid "" -"The Viewport set in the path property must be set as 'render target' in " -"order for this sprite to work." -msgstr "" - #: scene/2d/visibility_notifier_2d.cpp msgid "" "VisibilityEnable2D works best when used with the edited scene root directly " @@ -7543,6 +7751,14 @@ msgid "" "shape resource for it!" msgstr "" +#: scene/3d/gi_probe.cpp +msgid "Plotting Meshes" +msgstr "" + +#: scene/3d/gi_probe.cpp +msgid "Finishing Plot" +msgstr "" + #: scene/3d/navigation_mesh.cpp msgid "A NavigationMesh resource must be set or created for this node to work." msgstr "" @@ -7627,6 +7843,10 @@ msgstr "" "Käytä containeria lapsena (VBox, HBox, jne), tai Control:ia ja aseta haluttu " "minimikoko manuaalisesti." +#: scene/gui/tree.cpp +msgid "(Other)" +msgstr "" + #: scene/main/scene_tree.cpp msgid "" "Default Environment as specified in Project Setings (Rendering -> Viewport -" @@ -7661,6 +7881,36 @@ msgstr "Virhe fontin latauksessa." msgid "Invalid font size." msgstr "Virheellinen fonttikoko." +#~ msgid "Cannot navigate to '" +#~ msgstr "Ei voida navigoida '" + +#, fuzzy +#~ msgid "" +#~ "\n" +#~ "Source: " +#~ msgstr "Lähde:" + +#~ msgid "Remove Point from Line2D" +#~ msgstr "Poista piste Line2D:stä" + +#~ msgid "Add Point to Line2D" +#~ msgstr "Lisää piste Line2D:hen" + +#~ msgid "Move Point in Line2D" +#~ msgstr "Siirrä pistettä LIne 2D:ssä" + +#, fuzzy +#~ msgid "Setting '" +#~ msgstr "Asetukset" + +#, fuzzy +#~ msgid "Selection -> Duplicate" +#~ msgstr "Pelkkä valinta" + +#, fuzzy +#~ msgid "Selection -> Clear" +#~ msgstr "Pelkkä valinta" + #~ msgid "Filter:" #~ msgstr "Suodatin:" @@ -7679,9 +7929,6 @@ msgstr "Virheellinen fonttikoko." #~ msgid "Removed:" #~ msgstr "Poistettu:" -#~ msgid "Error saving atlas:" -#~ msgstr "Virhe tallennettaessa atlas-kuvaa:" - #~ msgid "Error loading scene." #~ msgstr "Virhe ladatessa Sceneä." @@ -7984,9 +8231,6 @@ msgstr "Virheellinen fonttikoko." #~ msgid "Import Languages:" #~ msgstr "Tuo kielet:" -#~ msgid "Translation" -#~ msgstr "Siirtymä" - #~ msgid "Transfer to Lightmaps:" #~ msgstr "Muunna Lightmapiksi:" diff --git a/editor/translations/fr.po b/editor/translations/fr.po index 9e2f80498d..55b5e0a283 100644 --- a/editor/translations/fr.po +++ b/editor/translations/fr.po @@ -10,6 +10,7 @@ # finkiki <specialpopol@gmx.fr>, 2016. # Gilles Roudiere <gilles.roudiere@gmail.com>, 2017. # Hugo Locurcio <hugo.l@openmailbox.org>, 2016-2017. +# Kanabenki <lucien.menassol@gmail.com>, 2017. # keltwookie <keltwookie@protonmail.com>, 2017. # Marc <marc.gilleron@gmail.com>, 2016-2017. # Nathan Lovato <nathan.lovato.art@gmail.com>, 2017. @@ -26,8 +27,8 @@ msgid "" msgstr "" "Project-Id-Version: Godot Engine editor\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2017-10-25 22:46+0000\n" -"Last-Translator: Robin Arys <robinarys@hotmail.com>\n" +"PO-Revision-Date: 2017-11-15 02:45+0000\n" +"Last-Translator: Kanabenki <lucien.menassol@gmail.com>\n" "Language-Team: French <https://hosted.weblate.org/projects/godot-engine/" "godot/fr/>\n" "Language: fr\n" @@ -35,7 +36,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n > 1;\n" -"X-Generator: Weblate 2.17\n" +"X-Generator: Weblate 2.18-dev\n" #: editor/animation_editor.cpp msgid "Disabled" @@ -118,6 +119,7 @@ msgid "Anim Delete Keys" msgstr "Anim Supprimer Clés" #: editor/animation_editor.cpp editor/plugins/tile_map_editor_plugin.cpp +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Duplicate Selection" msgstr "Dupliquer la sélection" @@ -655,6 +657,13 @@ msgstr "Éditeur de dépendances" msgid "Search Replacement Resource:" msgstr "Recherche ressource de remplacement :" +#: editor/dependency_editor.cpp editor/editor_file_dialog.cpp +#: editor/editor_help.cpp editor/editor_node.cpp editor/filesystem_dock.cpp +#: editor/plugins/script_editor_plugin.cpp editor/property_selector.cpp +#: editor/quick_open.cpp scene/gui/file_dialog.cpp +msgid "Open" +msgstr "Ouvrir" + #: editor/dependency_editor.cpp msgid "Owners Of:" msgstr "Propriétaires de :" @@ -733,6 +742,16 @@ msgstr "Supprimer les fichiers sélectionnés ?" msgid "Delete" msgstr "Supprimer" +#: editor/dictionary_property_edit.cpp +#, fuzzy +msgid "Change Dictionary Key" +msgstr "Modifier le nom de l'animation :" + +#: editor/dictionary_property_edit.cpp +#, fuzzy +msgid "Change Dictionary Value" +msgstr "Modifier valeur du tableau" + #: editor/editor_about.cpp msgid "Thanks from the Godot community!" msgstr "La communauté Godot vous dit merci !" @@ -767,32 +786,31 @@ msgstr "Auteurs" #: editor/editor_about.cpp msgid "Platinum Sponsors" -msgstr "" +msgstr "Sponsors Platine" #: editor/editor_about.cpp msgid "Gold Sponsors" -msgstr "" +msgstr "Sponsors Or" #: editor/editor_about.cpp msgid "Mini Sponsors" -msgstr "" +msgstr "Mini Sponsors" #: editor/editor_about.cpp msgid "Gold Donors" -msgstr "" +msgstr "Donateurs Or" #: editor/editor_about.cpp msgid "Silver Donors" -msgstr "" +msgstr "Donateurs Argent" #: editor/editor_about.cpp -#, fuzzy msgid "Bronze Donors" -msgstr "Cloner en dessous" +msgstr "Donateurs Bronze" #: editor/editor_about.cpp msgid "Donors" -msgstr "" +msgstr "Donateurs" #: editor/editor_about.cpp msgid "License" @@ -918,9 +936,8 @@ msgid "Duplicate" msgstr "Dupliquer" #: editor/editor_audio_buses.cpp -#, fuzzy msgid "Reset Volume" -msgstr "Réinitialiser le zoom" +msgstr "Réinitialiser le volume" #: editor/editor_audio_buses.cpp msgid "Delete Effect" @@ -943,9 +960,8 @@ msgid "Duplicate Audio Bus" msgstr "Dupliquer le transport audio" #: editor/editor_audio_buses.cpp -#, fuzzy msgid "Reset Bus Volume" -msgstr "Réinitialiser le zoom" +msgstr "Réinitialiser le volume de bus" #: editor/editor_audio_buses.cpp msgid "Move Audio Bus" @@ -1161,12 +1177,6 @@ msgstr "Tous les types de fichiers reconnus" msgid "All Files (*)" msgstr "Tous les fichiers (*)" -#: editor/editor_file_dialog.cpp editor/editor_help.cpp editor/editor_node.cpp -#: editor/filesystem_dock.cpp editor/plugins/script_editor_plugin.cpp -#: editor/property_selector.cpp editor/quick_open.cpp scene/gui/file_dialog.cpp -msgid "Open" -msgstr "Ouvrir" - #: editor/editor_file_dialog.cpp scene/gui/file_dialog.cpp msgid "Open a File" msgstr "Ouvrir un fichier" @@ -1234,9 +1244,8 @@ msgid "Move Favorite Down" msgstr "Déplacer le favori vers le bas" #: editor/editor_file_dialog.cpp -#, fuzzy msgid "Go to parent folder" -msgstr "Impossible de créer le dossier." +msgstr "Aller au dossier parent" #: editor/editor_file_dialog.cpp scene/gui/file_dialog.cpp msgid "Directories & Files:" @@ -1297,27 +1306,24 @@ msgid "Brief Description:" msgstr "Brève description :" #: editor/editor_help.cpp -#, fuzzy msgid "Members" -msgstr "Membres :" +msgstr "Membres" #: editor/editor_help.cpp modules/visual_script/visual_script_editor.cpp msgid "Members:" msgstr "Membres :" #: editor/editor_help.cpp -#, fuzzy msgid "Public Methods" -msgstr "Méthodes publiques :" +msgstr "Méthodes Publiques" #: editor/editor_help.cpp msgid "Public Methods:" msgstr "Méthodes publiques :" #: editor/editor_help.cpp -#, fuzzy msgid "GUI Theme Items" -msgstr "Items de thème GUI :" +msgstr "Items de thème GUI" #: editor/editor_help.cpp msgid "GUI Theme Items:" @@ -1328,9 +1334,8 @@ msgid "Signals:" msgstr "Signaux :" #: editor/editor_help.cpp -#, fuzzy msgid "Enumerations" -msgstr "Recensements :" +msgstr "Énumérations" #: editor/editor_help.cpp msgid "Enumerations:" @@ -1341,23 +1346,20 @@ msgid "enum " msgstr "enum_ " #: editor/editor_help.cpp -#, fuzzy msgid "Constants" -msgstr "Constantes :" +msgstr "Constantes" #: editor/editor_help.cpp msgid "Constants:" msgstr "Constantes :" #: editor/editor_help.cpp -#, fuzzy msgid "Description" -msgstr "Description :" +msgstr "Description" #: editor/editor_help.cpp -#, fuzzy msgid "Properties" -msgstr "Propriétés :" +msgstr "Propriétés" #: editor/editor_help.cpp msgid "Property Description:" @@ -1534,6 +1536,13 @@ msgid "" msgstr "" #: editor/editor_node.cpp +msgid "" +"This is a remote object so changes to it will not be kept.\n" +"Please read the documentation relevant to debugging to better understand " +"this workflow." +msgstr "" + +#: editor/editor_node.cpp msgid "Copy Params" msgstr "Copier paramètres" @@ -1656,6 +1665,11 @@ msgid "Export Mesh Library" msgstr "Exporter une bibliothèque de maillages" #: editor/editor_node.cpp +#, fuzzy +msgid "This operation can't be done without a root node." +msgstr "Cette opération ne peut être réalisée sans noeud sélectionné." + +#: editor/editor_node.cpp msgid "Export Tile Set" msgstr "Exporter un ensemble de tuiles" @@ -1798,12 +1812,23 @@ msgid "Switch Scene Tab" msgstr "Basculer entre les onglets de scène" #: editor/editor_node.cpp -msgid "%d more file(s)" +#, fuzzy +msgid "%d more files or folders" +msgstr "%d fichier(s) ou dossier(s) supplémentaire(s)" + +#: editor/editor_node.cpp +#, fuzzy +msgid "%d more folders" msgstr "%d fichier(s) supplémentaire(s)" #: editor/editor_node.cpp -msgid "%d more file(s) or folder(s)" -msgstr "%d fichier(s) ou dossier(s) supplémentaire(s)" +#, fuzzy +msgid "%d more files" +msgstr "%d fichier(s) supplémentaire(s)" + +#: editor/editor_node.cpp +msgid "Dock Position" +msgstr "" #: editor/editor_node.cpp msgid "Distraction Free Mode" @@ -1814,6 +1839,11 @@ msgid "Toggle distraction-free mode." msgstr "Basculer vers mode sans-distraction." #: editor/editor_node.cpp +#, fuzzy +msgid "Add a new scene." +msgstr "Ajouter de nouvelles pistes." + +#: editor/editor_node.cpp msgid "Scene" msgstr "Scène" @@ -1878,13 +1908,12 @@ msgid "TileSet.." msgstr "TileSet…" #: editor/editor_node.cpp editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp scene/gui/line_edit.cpp -#: scene/gui/text_edit.cpp +#: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Undo" msgstr "Annuler" #: editor/editor_node.cpp editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp +#: scene/gui/line_edit.cpp msgid "Redo" msgstr "Refaire" @@ -2391,6 +2420,11 @@ msgid "(Current)" msgstr "(Actuel)" #: editor/export_template_manager.cpp +#, fuzzy +msgid "Retrieving mirrors, please wait.." +msgstr "Erreur de connection, veuillez essayer à nouveau." + +#: editor/export_template_manager.cpp msgid "Remove template version '%s'?" msgstr "Supprimer la version '%s' du modèle ?" @@ -2427,6 +2461,112 @@ msgid "Importing:" msgstr "Importation :" #: editor/export_template_manager.cpp +msgid "" +"No download links found for this version. Direct download is only available " +"for official releases." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Can't resolve." +msgstr "Impossible à résoudre." + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Can't connect." +msgstr "Connection impossible." + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "No response." +msgstr "Pas de réponse." + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Req. Failed." +msgstr "Req. a Échoué." + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Redirect Loop." +msgstr "Boucle de Redirection." + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Failed:" +msgstr "Échec:" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Can't write file." +msgstr "Impossible d'écrire le fichier:\n" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Download Complete." +msgstr "Erreur de téléchargement" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Error requesting url: " +msgstr "Erreur de sauvegarde de l'atlas :" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Connecting to Mirror.." +msgstr "Connexion en cours.." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Disconnected" +msgstr "Déconnecter" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Resolving" +msgstr "Résolution.." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Can't Resolve" +msgstr "Impossible à résoudre." + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Connecting.." +msgstr "Connexion en cours.." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Can't Conect" +msgstr "Connection impossible." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Connected" +msgstr "Connecter" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Requesting.." +msgstr "Envoi d'une requête.." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Downloading" +msgstr "Télécharger" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Connection Error" +msgstr "Connexion en cours.." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "SSL Handshake Error" +msgstr "Erreurs de chargement" + +#: editor/export_template_manager.cpp msgid "Current Version:" msgstr "Version courante :" @@ -2450,6 +2590,16 @@ msgstr "Sélectionner le fichier de modèle" msgid "Export Template Manager" msgstr "Gestionnaire d'export de modèles" +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Download Templates" +msgstr "Modèles" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Select mirror from list: " +msgstr "Sélectionner appareil depuis la liste" + #: editor/file_type_cache.cpp msgid "Can't open file_type_cache.cch for writing, not saving file type cache!" msgstr "" @@ -2457,8 +2607,8 @@ msgstr "" "sera pas sauvé !" #: editor/filesystem_dock.cpp -msgid "Cannot navigate to '" -msgstr "Ne peux pas acceder à '" +msgid "Cannot navigate to '%s' as it has not been found in the file system!" +msgstr "" #: editor/filesystem_dock.cpp msgid "View items as a grid of thumbnails" @@ -2475,14 +2625,6 @@ msgid "" msgstr "" #: editor/filesystem_dock.cpp -msgid "" -"\n" -"Source: " -msgstr "" -"\n" -"Source : " - -#: editor/filesystem_dock.cpp #, fuzzy msgid "Cannot move/rename resources root." msgstr "Impossible de charger ou traiter la police source." @@ -2761,8 +2903,8 @@ msgid "Remove Poly And Point" msgstr "Retirer Polygone et Point" #: editor/plugins/abstract_polygon_2d_editor.cpp -#: editor/plugins/light_occluder_2d_editor_plugin.cpp -msgid "Create a new polygon from scratch." +#, fuzzy +msgid "Create a new polygon from scratch" msgstr "Créer un nouveau polygone à partir de rien." #: editor/plugins/abstract_polygon_2d_editor.cpp @@ -2777,6 +2919,11 @@ msgstr "" "Ctrl+Bouton gauche : Diviser section.\n" "Bouton droit: Effeacer point." +#: editor/plugins/abstract_polygon_2d_editor.cpp +#, fuzzy +msgid "Delete points" +msgstr "Supprimer le point" + #: editor/plugins/animation_player_editor_plugin.cpp msgid "Toggle Autoplay" msgstr "Activer/désactiver la lecture automatique" @@ -3112,18 +3259,10 @@ msgid "Can't resolve hostname:" msgstr "Impossible de résoudre le nom de l'hôte:" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Can't resolve." -msgstr "Impossible à résoudre." - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Connection error, please try again." msgstr "Erreur de connection, veuillez essayer à nouveau." #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Can't connect." -msgstr "Connection impossible." - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Can't connect to host:" msgstr "Connection à l'hôte impossible:" @@ -3132,30 +3271,14 @@ msgid "No response from host:" msgstr "Pas de réponse de l'hôte:" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "No response." -msgstr "Pas de réponse." - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Request failed, return code:" msgstr "La requête a échoué, code retourné:" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Req. Failed." -msgstr "Req. a Échoué." - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Request failed, too many redirects" msgstr "La requête a échoué, trop de redirections" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Redirect Loop." -msgstr "Boucle de Redirection." - -#: editor/plugins/asset_library_editor_plugin.cpp -msgid "Failed:" -msgstr "Échec:" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Bad download hash, assuming file has been tampered with." msgstr "Vérification du téléchargement échouée, le fichier a été altéré." @@ -3184,14 +3307,6 @@ msgid "Resolving.." msgstr "Résolution.." #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Connecting.." -msgstr "Connexion en cours.." - -#: editor/plugins/asset_library_editor_plugin.cpp -msgid "Requesting.." -msgstr "Envoi d'une requête.." - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Error making request" msgstr "Erreur lors de la requête" @@ -3304,6 +3419,39 @@ msgid "Move Action" msgstr "Déplacer l'action" #: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Move vertical guide" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Create new vertical guide" +msgstr "Créer nouveau fichier de script" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Remove vertical guide" +msgstr "Supprimer la variable" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Move horizontal guide" +msgstr "Déplacer le point dans la courbe" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Create new horizontal guide" +msgstr "Créer nouveau fichier de script" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Remove horizontal guide" +msgstr "Supprimer les clés invalides" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Create new horizontal and vertical guides" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp msgid "Edit IK Chain" msgstr "Modifier la chaîne IK" @@ -3435,10 +3583,17 @@ msgid "Snap to other nodes" msgstr "" #: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Snap to guides" +msgstr "Mode d'aimantation :" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Lock the selected object in place (can't be moved)." msgstr "Verrouiller l'objet sélectionné (il ne pourra plus être déplacé)." #: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Unlock the selected object (can be moved)." msgstr "Déverouiller l'objet sélectionné (il pourra être déplacé de nouveau)." @@ -3491,6 +3646,11 @@ msgid "Show rulers" msgstr "Afficher les os" #: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Show guides" +msgstr "Afficher les os" + +#: editor/plugins/canvas_item_editor_plugin.cpp msgid "Center Selection" msgstr "Centrer sur la sélection" @@ -3683,6 +3843,10 @@ msgstr "Basculer vers tangente linéaire de courbe" msgid "Hold Shift to edit tangents individually" msgstr "Maintenez l'appui sur Maj pour éditer les tangentes individuellement" +#: editor/plugins/gi_probe_editor_plugin.cpp +msgid "Bake GI Probe" +msgstr "" + #: editor/plugins/gradient_editor_plugin.cpp msgid "Add/Remove Color Ramp Point" msgstr "Ajouter/supprimer un point de rampe de couleur" @@ -3716,6 +3880,10 @@ msgid "Create Occluder Polygon" msgstr "Créer un polygone occulteur" #: editor/plugins/light_occluder_2d_editor_plugin.cpp +msgid "Create a new polygon from scratch." +msgstr "Créer un nouveau polygone à partir de rien." + +#: editor/plugins/light_occluder_2d_editor_plugin.cpp msgid "Edit existing polygon:" msgstr "Modifier un polygone existant :" @@ -3731,58 +3899,6 @@ msgstr "Contrôle + Bouton gauche : séparer le segment." msgid "RMB: Erase Point." msgstr "Bouton droit : effacer un point." -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Remove Point from Line2D" -msgstr "Supprimer point de Line2D" - -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Add Point to Line2D" -msgstr "Ajouter point à Line2D" - -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Move Point in Line2D" -msgstr "Déplacer point de Line2D" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Select Points" -msgstr "Sélectionner des points" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Shift+Drag: Select Control Points" -msgstr "Maj. + Glisser : sélectionner des points de contrôle" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Click: Add Point" -msgstr "Clic : ajouter un point" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Right Click: Delete Point" -msgstr "Clic droit : supprimer un point" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Add Point (in empty space)" -msgstr "Ajouter un point (dans un espace vide)" - -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Split Segment (in line)" -msgstr "Diviser le segment (dans la ligne)" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Delete Point" -msgstr "Supprimer le point" - #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Mesh is empty!" msgstr "Le maillage est vide !" @@ -4196,16 +4312,46 @@ msgid "Move Out-Control in Curve" msgstr "Déplacer Out-Control dans courbe" #: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Select Points" +msgstr "Sélectionner des points" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Shift+Drag: Select Control Points" +msgstr "Maj. + Glisser : sélectionner des points de contrôle" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Click: Add Point" +msgstr "Clic : ajouter un point" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Right Click: Delete Point" +msgstr "Clic droit : supprimer un point" + +#: editor/plugins/path_2d_editor_plugin.cpp msgid "Select Control Points (Shift+Drag)" msgstr "Sélectionner les points de contrôle (Maj. + glisser)" #: editor/plugins/path_2d_editor_plugin.cpp #: editor/plugins/path_editor_plugin.cpp +msgid "Add Point (in empty space)" +msgstr "Ajouter un point (dans un espace vide)" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp msgid "Split Segment (in curve)" msgstr "Diviser le segment (en courbe)" #: editor/plugins/path_2d_editor_plugin.cpp #: editor/plugins/path_editor_plugin.cpp +msgid "Delete Point" +msgstr "Supprimer le point" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp msgid "Close Curve" msgstr "Fermer la courbe" @@ -4345,7 +4491,6 @@ msgstr "Charger une ressource" #: editor/plugins/resource_preloader_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp #: editor/plugins/sprite_frames_editor_plugin.cpp editor/property_editor.cpp #: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Paste" @@ -4390,6 +4535,21 @@ msgid " Class Reference" msgstr " Référence de classe" #: editor/plugins/script_editor_plugin.cpp +#, fuzzy +msgid "Sort" +msgstr "Trier :" + +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp +msgid "Move Up" +msgstr "Déplacer vers le haut" + +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp +msgid "Move Down" +msgstr "Déplacer vers le bas" + +#: editor/plugins/script_editor_plugin.cpp msgid "Next script" msgstr "Script suivant" @@ -4441,6 +4601,10 @@ msgstr "Fermer les documentations" msgid "Close All" msgstr "Fermer tout" +#: editor/plugins/script_editor_plugin.cpp +msgid "Close Other Tabs" +msgstr "" + #: editor/plugins/script_editor_plugin.cpp editor/project_manager.cpp msgid "Run" msgstr "Lancer" @@ -4451,13 +4615,11 @@ msgstr "Basculer vers le panneau de scripts" #: editor/plugins/script_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Find.." msgstr "Trouver…" #: editor/plugins/script_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Find Next" msgstr "Trouver le suivant" @@ -4565,33 +4727,22 @@ msgstr "Minuscule" msgid "Capitalize" msgstr "Capitaliser" -#: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp scene/gui/line_edit.cpp +#: editor/plugins/script_text_editor.cpp scene/gui/line_edit.cpp #: scene/gui/text_edit.cpp msgid "Cut" msgstr "Couper" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp #: editor/plugins/sprite_frames_editor_plugin.cpp editor/property_editor.cpp #: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Copy" msgstr "Copier" -#: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp scene/gui/line_edit.cpp +#: editor/plugins/script_text_editor.cpp scene/gui/line_edit.cpp #: scene/gui/text_edit.cpp msgid "Select All" msgstr "Tout sélectionner" -#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp -msgid "Move Up" -msgstr "Déplacer vers le haut" - -#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp -msgid "Move Down" -msgstr "Déplacer vers le bas" - #: editor/plugins/script_text_editor.cpp msgid "Delete Line" msgstr "Supprimer ligne" @@ -4613,6 +4764,23 @@ msgid "Clone Down" msgstr "Cloner en dessous" #: editor/plugins/script_text_editor.cpp +#, fuzzy +msgid "Fold Line" +msgstr "Aller à la ligne" + +#: editor/plugins/script_text_editor.cpp +msgid "Unfold Line" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Fold All Lines" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Unfold All Lines" +msgstr "" + +#: editor/plugins/script_text_editor.cpp msgid "Complete Symbol" msgstr "Compléter le symbole" @@ -4658,12 +4826,10 @@ msgid "Convert To Lowercase" msgstr "Convertir en minuscule" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Find Previous" msgstr "trouver précédente" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Replace.." msgstr "Remplacer…" @@ -4672,7 +4838,6 @@ msgid "Goto Function.." msgstr "Aller à la fonction…" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Goto Line.." msgstr "Aller à la ligne…" @@ -4837,6 +5002,16 @@ msgid "View Plane Transform." msgstr "Transformation du plan de vue." #: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Scaling: " +msgstr "Échelle :" + +#: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Translating: " +msgstr "Traductions :" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Rotating %s degrees." msgstr "Rotation de %s degrés." @@ -4917,6 +5092,10 @@ msgid "Vertices" msgstr "Vertex" #: editor/plugins/spatial_editor_plugin.cpp +msgid "FPS" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Align with view" msgstr "Aligner avec la vue" @@ -4949,6 +5128,16 @@ msgid "View Information" msgstr "Voir information" #: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "View FPS" +msgstr "Voir Fichiers" + +#: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Half Resolution" +msgstr "Mettre à l'échelle la sélection" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Audio Listener" msgstr "Écouteur audio" @@ -5079,6 +5268,11 @@ msgid "Tool Scale" msgstr "Outil échelle" #: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Toggle Freelook" +msgstr "Basculer le mode plein écran" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Transform" msgstr "Transformation" @@ -5355,6 +5549,11 @@ msgid "Create Empty Editor Template" msgstr "Créer un nouveau modèle d'éditeur" #: editor/plugins/theme_editor_plugin.cpp +#, fuzzy +msgid "Create From Current Editor Theme" +msgstr "Créer un nouveau modèle d'éditeur" + +#: editor/plugins/theme_editor_plugin.cpp msgid "CheckBox Radio1" msgstr "Case à cocher Radio1" @@ -5529,7 +5728,8 @@ msgid "Runnable" msgstr "Activable" #: editor/project_export.cpp -msgid "Delete patch '" +#, fuzzy +msgid "Delete patch '%s' from list?" msgstr "Supprimer patch" #: editor/project_export.cpp @@ -5845,10 +6045,6 @@ msgid "Add Input Action Event" msgstr "Ajouter un événement d'action d'entrée" #: editor/project_settings_editor.cpp editor/settings_config_dialog.cpp -msgid "Meta+" -msgstr "Méta+" - -#: editor/project_settings_editor.cpp editor/settings_config_dialog.cpp msgid "Shift+" msgstr "Maj+" @@ -5971,12 +6167,13 @@ msgid "Select a setting item first!" msgstr "Choisissez d'abord un élément de réglage !" #: editor/project_settings_editor.cpp -msgid "No property '" +#, fuzzy +msgid "No property '%s' exists." msgstr "Pas de propriété" #: editor/project_settings_editor.cpp -msgid "Setting '" -msgstr "Paramètre" +msgid "Setting '%s' is internal, and it can't be deleted." +msgstr "" #: editor/project_settings_editor.cpp msgid "Delete Item" @@ -6460,6 +6657,16 @@ msgid "Clear a script for the selected node." msgstr "Effacer un script pour le nÅ“ud sélectionné." #: editor/scene_tree_dock.cpp +#, fuzzy +msgid "Remote" +msgstr "Supprimer" + +#: editor/scene_tree_dock.cpp +#, fuzzy +msgid "Local" +msgstr "Langue" + +#: editor/scene_tree_dock.cpp msgid "Clear Inheritance? (No Undo!)" msgstr "Effacer l'héritage ? (Pas de retour en arrière !)" @@ -6653,6 +6860,11 @@ msgid "Attach Node Script" msgstr "Attacher script de nÅ“ud" #: editor/script_editor_debugger.cpp +#, fuzzy +msgid "Remote " +msgstr "Supprimer" + +#: editor/script_editor_debugger.cpp msgid "Bytes:" msgstr "Octets :" @@ -6709,18 +6921,6 @@ msgid "Stack Trace (if applicable):" msgstr "Trace de pile (si applicable) :" #: editor/script_editor_debugger.cpp -msgid "Remote Inspector" -msgstr "Inspecteur distant" - -#: editor/script_editor_debugger.cpp -msgid "Live Scene Tree:" -msgstr "Arbre des scènes en direct :" - -#: editor/script_editor_debugger.cpp -msgid "Remote Object Properties: " -msgstr "Propriétés de l'objet distant : " - -#: editor/script_editor_debugger.cpp msgid "Profiler" msgstr "Profileur" @@ -6854,54 +7054,54 @@ msgstr "" msgid "GDNative" msgstr "" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp #: modules/visual_script/visual_script_builtin_funcs.cpp msgid "Invalid type argument to convert(), use TYPE_* constants." msgstr "" "Argument de type incorrect dans convert(), utilisez les constantes TYPE_*." -#: modules/gdscript/gd_functions.cpp modules/mono/glue/glue_header.h +#: modules/gdscript/gdscript_functions.cpp modules/mono/glue/glue_header.h #: modules/visual_script/visual_script_builtin_funcs.cpp msgid "Not enough bytes for decoding bytes, or invalid format." msgstr "Pas assez d'octets pour les octets de décodage, ou format non valide." -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "step argument is zero!" msgstr "L'argument du pas est zéro !" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Not a script with an instance" msgstr "N'est pas un script avec une instance" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Not based on a script" msgstr "N'est pas basé sur un script" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Not based on a resource file" msgstr "N'est pas basé sur un fichier de ressource" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary format (missing @path)" msgstr "Instance invalide pour le format de dictionnaire (@path manquant)" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary format (can't load script at @path)" msgstr "" "Instance invalide pour le format de dictionnaire (impossible de charger le " "script depuis @path)" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary format (invalid script at @path)" msgstr "" "Instance invalide pour le format de dictionnaire (script invalide dans @path)" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary (invalid subclasses)" msgstr "" "Instance invalide pour le format de dictionnaire (sous-classes invalides)" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Object can't provide a length." msgstr "L'objet ne peut fournir une longueur." @@ -6914,18 +7114,26 @@ msgid "GridMap Duplicate Selection" msgstr "Sélection de la duplication de GridMap" #: modules/gridmap/grid_map_editor_plugin.cpp +msgid "Floor:" +msgstr "" + +#: modules/gridmap/grid_map_editor_plugin.cpp +#, fuzzy +msgid "Grid Map" +msgstr "Aimanter à la grille" + +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Snap View" msgstr "Vue instantanée" #: modules/gridmap/grid_map_editor_plugin.cpp #, fuzzy -msgid "Prev Level (%sDown Wheel)" -msgstr "Niveau de prévisualisation (" +msgid "Previous Floor" +msgstr "Onglet precedent" #: modules/gridmap/grid_map_editor_plugin.cpp -#, fuzzy -msgid "Next Level (%sUp Wheel)" -msgstr "Niveau suivant (" +msgid "Next Floor" +msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp msgid "Clip Disabled" @@ -6992,12 +7200,9 @@ msgid "Erase Area" msgstr "Effacer zone" #: modules/gridmap/grid_map_editor_plugin.cpp -msgid "Selection -> Duplicate" -msgstr "Sélection -> Dupliquer" - -#: modules/gridmap/grid_map_editor_plugin.cpp -msgid "Selection -> Clear" -msgstr "Sélection -> Effacer" +#, fuzzy +msgid "Clear Selection" +msgstr "Centrer sur la sélection" #: modules/gridmap/grid_map_editor_plugin.cpp msgid "GridMap Settings" @@ -7126,7 +7331,8 @@ msgid "Duplicate VisualScript Nodes" msgstr "Dupliquer noeuds VisualScript" #: modules/visual_script/visual_script_editor.cpp -msgid "Hold Meta to drop a Getter. Hold Shift to drop a generic signature." +#, fuzzy +msgid "Hold %s to drop a Getter. Hold Shift to drop a generic signature." msgstr "" "Maintenir Meta pour déposer un accesseur. Maintenir Maj pour déposer une " "signature générique." @@ -7138,7 +7344,8 @@ msgstr "" "signature générique." #: modules/visual_script/visual_script_editor.cpp -msgid "Hold Meta to drop a simple reference to the node." +#, fuzzy +msgid "Hold %s to drop a simple reference to the node." msgstr "Maintenir Meta pour déposer une référence simple au nÅ“ud." #: modules/visual_script/visual_script_editor.cpp @@ -7146,7 +7353,8 @@ msgid "Hold Ctrl to drop a simple reference to the node." msgstr "Maintenir Ctrl pour déposer une référence simple au nÅ“ud." #: modules/visual_script/visual_script_editor.cpp -msgid "Hold Meta to drop a Variable Setter." +#, fuzzy +msgid "Hold %s to drop a Variable Setter." msgstr "Maintenir Meta pour déposer un mutateur de variable." #: modules/visual_script/visual_script_editor.cpp @@ -7376,12 +7584,23 @@ msgid "Could not write file:\n" msgstr "Impossible d'écrire le fichier:\n" #: platform/javascript/export/export.cpp -msgid "Could not read file:\n" +msgid "Could not open template for export:\n" +msgstr "Impossible d'ouvrir le modèle pour exportation:\n" + +#: platform/javascript/export/export.cpp +#, fuzzy +msgid "Invalid export template:\n" +msgstr "Installer les modèles d'exportation" + +#: platform/javascript/export/export.cpp +#, fuzzy +msgid "Could not read custom HTML shell:\n" msgstr "Impossible de lire le fichier:\n" #: platform/javascript/export/export.cpp -msgid "Could not open template for export:\n" -msgstr "Impossible d'ouvrir le modèle pour exportation:\n" +#, fuzzy +msgid "Could not read boot splash image file:\n" +msgstr "Impossible de lire le fichier:\n" #: scene/2d/animated_sprite.cpp msgid "" @@ -7506,22 +7725,6 @@ msgstr "" "La propriété Path doit pointer vers un nÅ“ud de type Node2D valide pour " "fonctionner." -#: scene/2d/sprite.cpp -msgid "" -"Path property must point to a valid Viewport node to work. Such Viewport " -"must be set to 'render target' mode." -msgstr "" -"La propriété Path doit pointer vers un nÅ“ud de type Viewport valide pour " -"fonctionner. Ce Viewport doit utiliser le mode « render target »." - -#: scene/2d/sprite.cpp -msgid "" -"The Viewport set in the path property must be set as 'render target' in " -"order for this sprite to work." -msgstr "" -"Le Viewport défini dans la propriété Path doit utiliser le mode « render " -"target » pour que cette sprite fonctionne." - #: scene/2d/visibility_notifier_2d.cpp msgid "" "VisibilityEnable2D works best when used with the edited scene root directly " @@ -7592,6 +7795,15 @@ msgstr "" "Une CollisionShape nécessite une forme pour fonctionner. Créez une ressource " "de forme pour cette CollisionShape !" +#: scene/3d/gi_probe.cpp +#, fuzzy +msgid "Plotting Meshes" +msgstr "Découpage des images" + +#: scene/3d/gi_probe.cpp +msgid "Finishing Plot" +msgstr "" + #: scene/3d/navigation_mesh.cpp msgid "A NavigationMesh resource must be set or created for this node to work." msgstr "" @@ -7690,6 +7902,10 @@ msgstr "" "Utilisez un conteneur comme enfant (VBox, HBox, etc.) ou un contrôle et " "définissez manuellement la taille minimale personnalisée." +#: scene/gui/tree.cpp +msgid "(Other)" +msgstr "" + #: scene/main/scene_tree.cpp msgid "" "Default Environment as specified in Project Setings (Rendering -> Viewport -" @@ -7726,6 +7942,71 @@ msgstr "Erreur lors du chargement de la police." msgid "Invalid font size." msgstr "Taille de police invalide." +#~ msgid "Cannot navigate to '" +#~ msgstr "Ne peux pas acceder à '" + +#~ msgid "" +#~ "\n" +#~ "Source: " +#~ msgstr "" +#~ "\n" +#~ "Source : " + +#~ msgid "Remove Point from Line2D" +#~ msgstr "Supprimer point de Line2D" + +#~ msgid "Add Point to Line2D" +#~ msgstr "Ajouter point à Line2D" + +#~ msgid "Move Point in Line2D" +#~ msgstr "Déplacer point de Line2D" + +#~ msgid "Split Segment (in line)" +#~ msgstr "Diviser le segment (dans la ligne)" + +#~ msgid "Meta+" +#~ msgstr "Méta+" + +#~ msgid "Setting '" +#~ msgstr "Paramètre" + +#~ msgid "Remote Inspector" +#~ msgstr "Inspecteur distant" + +#~ msgid "Live Scene Tree:" +#~ msgstr "Arbre des scènes en direct :" + +#~ msgid "Remote Object Properties: " +#~ msgstr "Propriétés de l'objet distant : " + +#, fuzzy +#~ msgid "Prev Level (%sDown Wheel)" +#~ msgstr "Niveau de prévisualisation (" + +#, fuzzy +#~ msgid "Next Level (%sUp Wheel)" +#~ msgstr "Niveau suivant (" + +#~ msgid "Selection -> Duplicate" +#~ msgstr "Sélection -> Dupliquer" + +#~ msgid "Selection -> Clear" +#~ msgstr "Sélection -> Effacer" + +#~ msgid "" +#~ "Path property must point to a valid Viewport node to work. Such Viewport " +#~ "must be set to 'render target' mode." +#~ msgstr "" +#~ "La propriété Path doit pointer vers un nÅ“ud de type Viewport valide pour " +#~ "fonctionner. Ce Viewport doit utiliser le mode « render target »." + +#~ msgid "" +#~ "The Viewport set in the path property must be set as 'render target' in " +#~ "order for this sprite to work." +#~ msgstr "" +#~ "Le Viewport défini dans la propriété Path doit utiliser le mode « render " +#~ "target » pour que cette sprite fonctionne." + #~ msgid "Filter:" #~ msgstr "Filtre:" @@ -7750,9 +8031,6 @@ msgstr "Taille de police invalide." #~ msgid "Removed:" #~ msgstr "Supprimé :" -#~ msgid "Error saving atlas:" -#~ msgstr "Erreur de sauvegarde de l'atlas :" - #~ msgid "Could not save atlas subtexture:" #~ msgstr "Impossible d'enregistrer la sous-texture atlas :" @@ -8143,9 +8421,6 @@ msgstr "Taille de police invalide." #~ msgid "Cropping Images" #~ msgstr "Rognage des images" -#~ msgid "Blitting Images" -#~ msgstr "Découpage des images" - #~ msgid "Couldn't save atlas image:" #~ msgstr "Impossible d'enregistrer l'image d'atlas :" @@ -8536,9 +8811,6 @@ msgstr "Taille de police invalide." #~ msgid "Save Translatable Strings" #~ msgstr "Enregistrer les chaînes traduisibles" -#~ msgid "Install Export Templates" -#~ msgstr "Installer les modèles d'exportation" - #~ msgid "Edit Script Options" #~ msgstr "Modifier les options du script" diff --git a/editor/translations/hu.po b/editor/translations/hu.po index 07457b4692..8508149f3c 100644 --- a/editor/translations/hu.po +++ b/editor/translations/hu.po @@ -99,6 +99,7 @@ msgid "Anim Delete Keys" msgstr "" #: editor/animation_editor.cpp editor/plugins/tile_map_editor_plugin.cpp +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Duplicate Selection" msgstr "" @@ -628,6 +629,13 @@ msgstr "" msgid "Search Replacement Resource:" msgstr "" +#: editor/dependency_editor.cpp editor/editor_file_dialog.cpp +#: editor/editor_help.cpp editor/editor_node.cpp editor/filesystem_dock.cpp +#: editor/plugins/script_editor_plugin.cpp editor/property_selector.cpp +#: editor/quick_open.cpp scene/gui/file_dialog.cpp +msgid "Open" +msgstr "" + #: editor/dependency_editor.cpp msgid "Owners Of:" msgstr "" @@ -698,6 +706,14 @@ msgstr "" msgid "Delete" msgstr "" +#: editor/dictionary_property_edit.cpp +msgid "Change Dictionary Key" +msgstr "" + +#: editor/dictionary_property_edit.cpp +msgid "Change Dictionary Value" +msgstr "" + #: editor/editor_about.cpp msgid "Thanks from the Godot community!" msgstr "" @@ -1113,12 +1129,6 @@ msgstr "" msgid "All Files (*)" msgstr "" -#: editor/editor_file_dialog.cpp editor/editor_help.cpp editor/editor_node.cpp -#: editor/filesystem_dock.cpp editor/plugins/script_editor_plugin.cpp -#: editor/property_selector.cpp editor/quick_open.cpp scene/gui/file_dialog.cpp -msgid "Open" -msgstr "" - #: editor/editor_file_dialog.cpp scene/gui/file_dialog.cpp msgid "Open a File" msgstr "" @@ -1471,6 +1481,13 @@ msgid "" msgstr "" #: editor/editor_node.cpp +msgid "" +"This is a remote object so changes to it will not be kept.\n" +"Please read the documentation relevant to debugging to better understand " +"this workflow." +msgstr "" + +#: editor/editor_node.cpp msgid "Copy Params" msgstr "" @@ -1580,6 +1597,10 @@ msgid "Export Mesh Library" msgstr "" #: editor/editor_node.cpp +msgid "This operation can't be done without a root node." +msgstr "" + +#: editor/editor_node.cpp msgid "Export Tile Set" msgstr "" @@ -1705,11 +1726,19 @@ msgid "Switch Scene Tab" msgstr "" #: editor/editor_node.cpp -msgid "%d more file(s)" +msgid "%d more files or folders" +msgstr "" + +#: editor/editor_node.cpp +msgid "%d more folders" +msgstr "" + +#: editor/editor_node.cpp +msgid "%d more files" msgstr "" #: editor/editor_node.cpp -msgid "%d more file(s) or folder(s)" +msgid "Dock Position" msgstr "" #: editor/editor_node.cpp @@ -1721,6 +1750,10 @@ msgid "Toggle distraction-free mode." msgstr "" #: editor/editor_node.cpp +msgid "Add a new scene." +msgstr "" + +#: editor/editor_node.cpp msgid "Scene" msgstr "" @@ -1785,13 +1818,12 @@ msgid "TileSet.." msgstr "" #: editor/editor_node.cpp editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp scene/gui/line_edit.cpp -#: scene/gui/text_edit.cpp +#: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Undo" msgstr "" #: editor/editor_node.cpp editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp +#: scene/gui/line_edit.cpp msgid "Redo" msgstr "" @@ -2272,6 +2304,10 @@ msgid "(Current)" msgstr "" #: editor/export_template_manager.cpp +msgid "Retrieving mirrors, please wait.." +msgstr "" + +#: editor/export_template_manager.cpp msgid "Remove template version '%s'?" msgstr "" @@ -2306,6 +2342,100 @@ msgid "Importing:" msgstr "" #: editor/export_template_manager.cpp +msgid "" +"No download links found for this version. Direct download is only available " +"for official releases." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Can't resolve." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Can't connect." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "No response." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Req. Failed." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Redirect Loop." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Failed:" +msgstr "" + +#: editor/export_template_manager.cpp +msgid "Can't write file." +msgstr "" + +#: editor/export_template_manager.cpp +msgid "Download Complete." +msgstr "" + +#: editor/export_template_manager.cpp +msgid "Error requesting url: " +msgstr "" + +#: editor/export_template_manager.cpp +msgid "Connecting to Mirror.." +msgstr "" + +#: editor/export_template_manager.cpp +msgid "Disconnected" +msgstr "" + +#: editor/export_template_manager.cpp +msgid "Resolving" +msgstr "" + +#: editor/export_template_manager.cpp +msgid "Can't Resolve" +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Connecting.." +msgstr "" + +#: editor/export_template_manager.cpp +msgid "Can't Conect" +msgstr "" + +#: editor/export_template_manager.cpp +msgid "Connected" +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Requesting.." +msgstr "" + +#: editor/export_template_manager.cpp +msgid "Downloading" +msgstr "" + +#: editor/export_template_manager.cpp +msgid "Connection Error" +msgstr "" + +#: editor/export_template_manager.cpp +msgid "SSL Handshake Error" +msgstr "" + +#: editor/export_template_manager.cpp msgid "Current Version:" msgstr "" @@ -2329,12 +2459,20 @@ msgstr "" msgid "Export Template Manager" msgstr "" +#: editor/export_template_manager.cpp +msgid "Download Templates" +msgstr "" + +#: editor/export_template_manager.cpp +msgid "Select mirror from list: " +msgstr "" + #: editor/file_type_cache.cpp msgid "Can't open file_type_cache.cch for writing, not saving file type cache!" msgstr "" #: editor/filesystem_dock.cpp -msgid "Cannot navigate to '" +msgid "Cannot navigate to '%s' as it has not been found in the file system!" msgstr "" #: editor/filesystem_dock.cpp @@ -2352,12 +2490,6 @@ msgid "" msgstr "" #: editor/filesystem_dock.cpp -msgid "" -"\n" -"Source: " -msgstr "" - -#: editor/filesystem_dock.cpp msgid "Cannot move/rename resources root." msgstr "" @@ -2615,8 +2747,7 @@ msgid "Remove Poly And Point" msgstr "" #: editor/plugins/abstract_polygon_2d_editor.cpp -#: editor/plugins/light_occluder_2d_editor_plugin.cpp -msgid "Create a new polygon from scratch." +msgid "Create a new polygon from scratch" msgstr "" #: editor/plugins/abstract_polygon_2d_editor.cpp @@ -2627,6 +2758,10 @@ msgid "" "RMB: Erase Point." msgstr "" +#: editor/plugins/abstract_polygon_2d_editor.cpp +msgid "Delete points" +msgstr "" + #: editor/plugins/animation_player_editor_plugin.cpp msgid "Toggle Autoplay" msgstr "" @@ -2961,18 +3096,10 @@ msgid "Can't resolve hostname:" msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Can't resolve." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Connection error, please try again." msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Can't connect." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Can't connect to host:" msgstr "" @@ -2981,30 +3108,14 @@ msgid "No response from host:" msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "No response." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Request failed, return code:" msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Req. Failed." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Request failed, too many redirects" msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Redirect Loop." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp -msgid "Failed:" -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Bad download hash, assuming file has been tampered with." msgstr "" @@ -3033,14 +3144,6 @@ msgid "Resolving.." msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Connecting.." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp -msgid "Requesting.." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Error making request" msgstr "" @@ -3153,6 +3256,34 @@ msgid "Move Action" msgstr "" #: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Move vertical guide" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Create new vertical guide" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Remove vertical guide" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Move horizontal guide" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Create new horizontal guide" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Remove horizontal guide" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Create new horizontal and vertical guides" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp msgid "Edit IK Chain" msgstr "" @@ -3273,10 +3404,16 @@ msgid "Snap to other nodes" msgstr "" #: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Snap to guides" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Lock the selected object in place (can't be moved)." msgstr "" #: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Unlock the selected object (can be moved)." msgstr "" @@ -3327,6 +3464,10 @@ msgid "Show rulers" msgstr "" #: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Show guides" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp msgid "Center Selection" msgstr "" @@ -3511,6 +3652,10 @@ msgstr "" msgid "Hold Shift to edit tangents individually" msgstr "" +#: editor/plugins/gi_probe_editor_plugin.cpp +msgid "Bake GI Probe" +msgstr "" + #: editor/plugins/gradient_editor_plugin.cpp msgid "Add/Remove Color Ramp Point" msgstr "" @@ -3543,6 +3688,10 @@ msgid "Create Occluder Polygon" msgstr "" #: editor/plugins/light_occluder_2d_editor_plugin.cpp +msgid "Create a new polygon from scratch." +msgstr "" + +#: editor/plugins/light_occluder_2d_editor_plugin.cpp msgid "Edit existing polygon:" msgstr "" @@ -3558,58 +3707,6 @@ msgstr "" msgid "RMB: Erase Point." msgstr "" -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Remove Point from Line2D" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Add Point to Line2D" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Move Point in Line2D" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Select Points" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Shift+Drag: Select Control Points" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Click: Add Point" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Right Click: Delete Point" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Add Point (in empty space)" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Split Segment (in line)" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Delete Point" -msgstr "" - #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Mesh is empty!" msgstr "" @@ -4007,16 +4104,46 @@ msgid "Move Out-Control in Curve" msgstr "" #: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Select Points" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Shift+Drag: Select Control Points" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Click: Add Point" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Right Click: Delete Point" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp msgid "Select Control Points (Shift+Drag)" msgstr "" #: editor/plugins/path_2d_editor_plugin.cpp #: editor/plugins/path_editor_plugin.cpp +msgid "Add Point (in empty space)" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp msgid "Split Segment (in curve)" msgstr "" #: editor/plugins/path_2d_editor_plugin.cpp #: editor/plugins/path_editor_plugin.cpp +msgid "Delete Point" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp msgid "Close Curve" msgstr "" @@ -4153,7 +4280,6 @@ msgstr "" #: editor/plugins/resource_preloader_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp #: editor/plugins/sprite_frames_editor_plugin.cpp editor/property_editor.cpp #: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Paste" @@ -4198,6 +4324,20 @@ msgid " Class Reference" msgstr "" #: editor/plugins/script_editor_plugin.cpp +msgid "Sort" +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp +msgid "Move Up" +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp +msgid "Move Down" +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp msgid "Next script" msgstr "" @@ -4249,6 +4389,10 @@ msgstr "" msgid "Close All" msgstr "" +#: editor/plugins/script_editor_plugin.cpp +msgid "Close Other Tabs" +msgstr "" + #: editor/plugins/script_editor_plugin.cpp editor/project_manager.cpp msgid "Run" msgstr "" @@ -4259,13 +4403,11 @@ msgstr "" #: editor/plugins/script_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Find.." msgstr "" #: editor/plugins/script_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Find Next" msgstr "" @@ -4369,33 +4511,22 @@ msgstr "" msgid "Capitalize" msgstr "" -#: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp scene/gui/line_edit.cpp +#: editor/plugins/script_text_editor.cpp scene/gui/line_edit.cpp #: scene/gui/text_edit.cpp msgid "Cut" msgstr "" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp #: editor/plugins/sprite_frames_editor_plugin.cpp editor/property_editor.cpp #: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Copy" msgstr "" -#: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp scene/gui/line_edit.cpp +#: editor/plugins/script_text_editor.cpp scene/gui/line_edit.cpp #: scene/gui/text_edit.cpp msgid "Select All" msgstr "" -#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp -msgid "Move Up" -msgstr "" - -#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp -msgid "Move Down" -msgstr "" - #: editor/plugins/script_text_editor.cpp msgid "Delete Line" msgstr "" @@ -4417,6 +4548,22 @@ msgid "Clone Down" msgstr "" #: editor/plugins/script_text_editor.cpp +msgid "Fold Line" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Unfold Line" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Fold All Lines" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Unfold All Lines" +msgstr "" + +#: editor/plugins/script_text_editor.cpp msgid "Complete Symbol" msgstr "" @@ -4462,12 +4609,10 @@ msgid "Convert To Lowercase" msgstr "" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Find Previous" msgstr "" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Replace.." msgstr "" @@ -4476,7 +4621,6 @@ msgid "Goto Function.." msgstr "" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Goto Line.." msgstr "" @@ -4641,6 +4785,14 @@ msgid "View Plane Transform." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "Scaling: " +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Translating: " +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Rotating %s degrees." msgstr "" @@ -4721,6 +4873,10 @@ msgid "Vertices" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "FPS" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Align with view" msgstr "" @@ -4753,6 +4909,14 @@ msgid "View Information" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "View FPS" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Half Resolution" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Audio Listener" msgstr "" @@ -4880,6 +5044,10 @@ msgid "Tool Scale" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "Toggle Freelook" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Transform" msgstr "" @@ -5154,6 +5322,10 @@ msgid "Create Empty Editor Template" msgstr "" #: editor/plugins/theme_editor_plugin.cpp +msgid "Create From Current Editor Theme" +msgstr "" + +#: editor/plugins/theme_editor_plugin.cpp msgid "CheckBox Radio1" msgstr "" @@ -5327,7 +5499,7 @@ msgid "Runnable" msgstr "" #: editor/project_export.cpp -msgid "Delete patch '" +msgid "Delete patch '%s' from list?" msgstr "" #: editor/project_export.cpp @@ -5620,10 +5792,6 @@ msgid "Add Input Action Event" msgstr "" #: editor/project_settings_editor.cpp editor/settings_config_dialog.cpp -msgid "Meta+" -msgstr "" - -#: editor/project_settings_editor.cpp editor/settings_config_dialog.cpp msgid "Shift+" msgstr "" @@ -5745,11 +5913,11 @@ msgid "Select a setting item first!" msgstr "" #: editor/project_settings_editor.cpp -msgid "No property '" +msgid "No property '%s' exists." msgstr "" #: editor/project_settings_editor.cpp -msgid "Setting '" +msgid "Setting '%s' is internal, and it can't be deleted." msgstr "" #: editor/project_settings_editor.cpp @@ -6216,6 +6384,14 @@ msgid "Clear a script for the selected node." msgstr "" #: editor/scene_tree_dock.cpp +msgid "Remote" +msgstr "" + +#: editor/scene_tree_dock.cpp +msgid "Local" +msgstr "" + +#: editor/scene_tree_dock.cpp msgid "Clear Inheritance? (No Undo!)" msgstr "" @@ -6398,6 +6574,10 @@ msgid "Attach Node Script" msgstr "" #: editor/script_editor_debugger.cpp +msgid "Remote " +msgstr "" + +#: editor/script_editor_debugger.cpp msgid "Bytes:" msgstr "" @@ -6454,18 +6634,6 @@ msgid "Stack Trace (if applicable):" msgstr "" #: editor/script_editor_debugger.cpp -msgid "Remote Inspector" -msgstr "" - -#: editor/script_editor_debugger.cpp -msgid "Live Scene Tree:" -msgstr "" - -#: editor/script_editor_debugger.cpp -msgid "Remote Object Properties: " -msgstr "" - -#: editor/script_editor_debugger.cpp msgid "Profiler" msgstr "" @@ -6597,49 +6765,49 @@ msgstr "" msgid "GDNative" msgstr "" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp #: modules/visual_script/visual_script_builtin_funcs.cpp msgid "Invalid type argument to convert(), use TYPE_* constants." msgstr "" -#: modules/gdscript/gd_functions.cpp modules/mono/glue/glue_header.h +#: modules/gdscript/gdscript_functions.cpp modules/mono/glue/glue_header.h #: modules/visual_script/visual_script_builtin_funcs.cpp msgid "Not enough bytes for decoding bytes, or invalid format." msgstr "" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "step argument is zero!" msgstr "" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Not a script with an instance" msgstr "" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Not based on a script" msgstr "" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Not based on a resource file" msgstr "" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary format (missing @path)" msgstr "" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary format (can't load script at @path)" msgstr "" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary format (invalid script at @path)" msgstr "" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary (invalid subclasses)" msgstr "" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Object can't provide a length." msgstr "" @@ -6652,15 +6820,23 @@ msgid "GridMap Duplicate Selection" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp +msgid "Floor:" +msgstr "" + +#: modules/gridmap/grid_map_editor_plugin.cpp +msgid "Grid Map" +msgstr "" + +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Snap View" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp -msgid "Prev Level (%sDown Wheel)" +msgid "Previous Floor" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp -msgid "Next Level (%sUp Wheel)" +msgid "Next Floor" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp @@ -6728,11 +6904,7 @@ msgid "Erase Area" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp -msgid "Selection -> Duplicate" -msgstr "" - -#: modules/gridmap/grid_map_editor_plugin.cpp -msgid "Selection -> Clear" +msgid "Clear Selection" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp @@ -6854,7 +7026,7 @@ msgid "Duplicate VisualScript Nodes" msgstr "" #: modules/visual_script/visual_script_editor.cpp -msgid "Hold Meta to drop a Getter. Hold Shift to drop a generic signature." +msgid "Hold %s to drop a Getter. Hold Shift to drop a generic signature." msgstr "" #: modules/visual_script/visual_script_editor.cpp @@ -6862,7 +7034,7 @@ msgid "Hold Ctrl to drop a Getter. Hold Shift to drop a generic signature." msgstr "" #: modules/visual_script/visual_script_editor.cpp -msgid "Hold Meta to drop a simple reference to the node." +msgid "Hold %s to drop a simple reference to the node." msgstr "" #: modules/visual_script/visual_script_editor.cpp @@ -6870,7 +7042,7 @@ msgid "Hold Ctrl to drop a simple reference to the node." msgstr "" #: modules/visual_script/visual_script_editor.cpp -msgid "Hold Meta to drop a Variable Setter." +msgid "Hold %s to drop a Variable Setter." msgstr "" #: modules/visual_script/visual_script_editor.cpp @@ -7096,11 +7268,19 @@ msgid "Could not write file:\n" msgstr "" #: platform/javascript/export/export.cpp -msgid "Could not read file:\n" +msgid "Could not open template for export:\n" msgstr "" #: platform/javascript/export/export.cpp -msgid "Could not open template for export:\n" +msgid "Invalid export template:\n" +msgstr "" + +#: platform/javascript/export/export.cpp +msgid "Could not read custom HTML shell:\n" +msgstr "" + +#: platform/javascript/export/export.cpp +msgid "Could not read boot splash image file:\n" msgstr "" #: scene/2d/animated_sprite.cpp @@ -7192,18 +7372,6 @@ msgstr "" msgid "Path property must point to a valid Node2D node to work." msgstr "" -#: scene/2d/sprite.cpp -msgid "" -"Path property must point to a valid Viewport node to work. Such Viewport " -"must be set to 'render target' mode." -msgstr "" - -#: scene/2d/sprite.cpp -msgid "" -"The Viewport set in the path property must be set as 'render target' in " -"order for this sprite to work." -msgstr "" - #: scene/2d/visibility_notifier_2d.cpp msgid "" "VisibilityEnable2D works best when used with the edited scene root directly " @@ -7262,6 +7430,14 @@ msgid "" "shape resource for it!" msgstr "" +#: scene/3d/gi_probe.cpp +msgid "Plotting Meshes" +msgstr "" + +#: scene/3d/gi_probe.cpp +msgid "Finishing Plot" +msgstr "" + #: scene/3d/navigation_mesh.cpp msgid "A NavigationMesh resource must be set or created for this node to work." msgstr "" @@ -7339,6 +7515,10 @@ msgid "" "minimum size manually." msgstr "" +#: scene/gui/tree.cpp +msgid "(Other)" +msgstr "" + #: scene/main/scene_tree.cpp msgid "" "Default Environment as specified in Project Setings (Rendering -> Viewport -" diff --git a/editor/translations/id.po b/editor/translations/id.po index 06fc7eb599..d58b8cca72 100644 --- a/editor/translations/id.po +++ b/editor/translations/id.po @@ -114,6 +114,7 @@ msgid "Anim Delete Keys" msgstr "Hapus Kunci Anim" #: editor/animation_editor.cpp editor/plugins/tile_map_editor_plugin.cpp +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Duplicate Selection" msgstr "Duplikat Pilihan" @@ -661,6 +662,13 @@ msgstr "Editor Ketergantungan" msgid "Search Replacement Resource:" msgstr "Cari Resource Pengganti:" +#: editor/dependency_editor.cpp editor/editor_file_dialog.cpp +#: editor/editor_help.cpp editor/editor_node.cpp editor/filesystem_dock.cpp +#: editor/plugins/script_editor_plugin.cpp editor/property_selector.cpp +#: editor/quick_open.cpp scene/gui/file_dialog.cpp +msgid "Open" +msgstr "Buka" + #: editor/dependency_editor.cpp msgid "Owners Of:" msgstr "Pemilik Dari:" @@ -739,6 +747,15 @@ msgstr "Hapus file yang dipilih?" msgid "Delete" msgstr "Hapus" +#: editor/dictionary_property_edit.cpp +msgid "Change Dictionary Key" +msgstr "" + +#: editor/dictionary_property_edit.cpp +#, fuzzy +msgid "Change Dictionary Value" +msgstr "Ubah Nilai Array" + #: editor/editor_about.cpp msgid "Thanks from the Godot community!" msgstr "" @@ -1170,12 +1187,6 @@ msgstr "Semua diakui" msgid "All Files (*)" msgstr "Semua File-file (*)" -#: editor/editor_file_dialog.cpp editor/editor_help.cpp editor/editor_node.cpp -#: editor/filesystem_dock.cpp editor/plugins/script_editor_plugin.cpp -#: editor/property_selector.cpp editor/quick_open.cpp scene/gui/file_dialog.cpp -msgid "Open" -msgstr "Buka" - #: editor/editor_file_dialog.cpp scene/gui/file_dialog.cpp msgid "Open a File" msgstr "Buka sebuah File" @@ -1552,6 +1563,13 @@ msgid "" msgstr "" #: editor/editor_node.cpp +msgid "" +"This is a remote object so changes to it will not be kept.\n" +"Please read the documentation relevant to debugging to better understand " +"this workflow." +msgstr "" + +#: editor/editor_node.cpp msgid "Copy Params" msgstr "Salin Parameter" @@ -1674,6 +1692,11 @@ msgid "Export Mesh Library" msgstr "Ekspor Mesh Library" #: editor/editor_node.cpp +#, fuzzy +msgid "This operation can't be done without a root node." +msgstr "Tindakan ini tidak dapat dibatalkan. Pulihkan saja?" + +#: editor/editor_node.cpp msgid "Export Tile Set" msgstr "Ekspor Tile Set" @@ -1806,12 +1829,23 @@ msgid "Switch Scene Tab" msgstr "Pilih Tab Scene" #: editor/editor_node.cpp -msgid "%d more file(s)" +#, fuzzy +msgid "%d more files or folders" +msgstr "%d file atau folder lagi" + +#: editor/editor_node.cpp +#, fuzzy +msgid "%d more folders" msgstr "%d file lagi" #: editor/editor_node.cpp -msgid "%d more file(s) or folder(s)" -msgstr "%d file atau folder lagi" +#, fuzzy +msgid "%d more files" +msgstr "%d file lagi" + +#: editor/editor_node.cpp +msgid "Dock Position" +msgstr "" #: editor/editor_node.cpp msgid "Distraction Free Mode" @@ -1823,6 +1857,11 @@ msgid "Toggle distraction-free mode." msgstr "Mode Tanpa Gangguan" #: editor/editor_node.cpp +#, fuzzy +msgid "Add a new scene." +msgstr "Tambah tracks baru." + +#: editor/editor_node.cpp msgid "Scene" msgstr "Suasana" @@ -1887,13 +1926,12 @@ msgid "TileSet.." msgstr "" #: editor/editor_node.cpp editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp scene/gui/line_edit.cpp -#: scene/gui/text_edit.cpp +#: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Undo" msgstr "Batal" #: editor/editor_node.cpp editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp +#: scene/gui/line_edit.cpp msgid "Redo" msgstr "" @@ -2384,6 +2422,11 @@ msgid "(Current)" msgstr "" #: editor/export_template_manager.cpp +#, fuzzy +msgid "Retrieving mirrors, please wait.." +msgstr "Gangguan koneks, silakan coba lagi." + +#: editor/export_template_manager.cpp msgid "Remove template version '%s'?" msgstr "" @@ -2420,6 +2463,112 @@ msgid "Importing:" msgstr "Mengimpor:" #: editor/export_template_manager.cpp +msgid "" +"No download links found for this version. Direct download is only available " +"for official releases." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Can't resolve." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Can't connect." +msgstr "Menyambungkan.." + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "No response." +msgstr "Tidak ada respon." + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Req. Failed." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Redirect Loop." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Failed:" +msgstr "" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Can't write file." +msgstr "Tidak dapat membuat folder." + +#: editor/export_template_manager.cpp +msgid "Download Complete." +msgstr "" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Error requesting url: " +msgstr "Gagal menyimpan atlas:" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Connecting to Mirror.." +msgstr "Menyambungkan.." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Disconnected" +msgstr "Tidak tersambung" + +#: editor/export_template_manager.cpp +msgid "Resolving" +msgstr "" + +#: editor/export_template_manager.cpp +msgid "Can't Resolve" +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Connecting.." +msgstr "Menyambungkan.." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Can't Conect" +msgstr "Menyambungkan.." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Connected" +msgstr "Menghubungkan" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Requesting.." +msgstr "Menguji" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Downloading" +msgstr "Error memuat:" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Connection Error" +msgstr "Menyambungkan.." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "SSL Handshake Error" +msgstr "Muat Galat" + +#: editor/export_template_manager.cpp msgid "Current Version:" msgstr "" @@ -2446,12 +2595,21 @@ msgstr "Hapus file yang dipilih?" msgid "Export Template Manager" msgstr "Memuat Ekspor Template-template." +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Download Templates" +msgstr "Hapus Pilihan" + +#: editor/export_template_manager.cpp +msgid "Select mirror from list: " +msgstr "" + #: editor/file_type_cache.cpp msgid "Can't open file_type_cache.cch for writing, not saving file type cache!" msgstr "" #: editor/filesystem_dock.cpp -msgid "Cannot navigate to '" +msgid "Cannot navigate to '%s' as it has not been found in the file system!" msgstr "" #: editor/filesystem_dock.cpp @@ -2469,13 +2627,6 @@ msgid "" msgstr "" #: editor/filesystem_dock.cpp -#, fuzzy -msgid "" -"\n" -"Source: " -msgstr "Resource" - -#: editor/filesystem_dock.cpp msgid "Cannot move/rename resources root." msgstr "" @@ -2747,8 +2898,7 @@ msgid "Remove Poly And Point" msgstr "" #: editor/plugins/abstract_polygon_2d_editor.cpp -#: editor/plugins/light_occluder_2d_editor_plugin.cpp -msgid "Create a new polygon from scratch." +msgid "Create a new polygon from scratch" msgstr "" #: editor/plugins/abstract_polygon_2d_editor.cpp @@ -2759,6 +2909,11 @@ msgid "" "RMB: Erase Point." msgstr "" +#: editor/plugins/abstract_polygon_2d_editor.cpp +#, fuzzy +msgid "Delete points" +msgstr "Hapus" + #: editor/plugins/animation_player_editor_plugin.cpp msgid "Toggle Autoplay" msgstr "" @@ -3097,21 +3252,12 @@ msgid "Can't resolve hostname:" msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Can't resolve." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp #, fuzzy msgid "Connection error, please try again." msgstr "Gangguan koneks, silakan coba lagi." #: editor/plugins/asset_library_editor_plugin.cpp #, fuzzy -msgid "Can't connect." -msgstr "Menyambungkan.." - -#: editor/plugins/asset_library_editor_plugin.cpp -#, fuzzy msgid "Can't connect to host:" msgstr "Sambungkan Ke Node:" @@ -3120,31 +3266,15 @@ msgid "No response from host:" msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "No response." -msgstr "Tidak ada respon." - -#: editor/plugins/asset_library_editor_plugin.cpp #, fuzzy msgid "Request failed, return code:" msgstr "Format file yang diminta tidak diketahui:" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Req. Failed." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Request failed, too many redirects" msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Redirect Loop." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp -msgid "Failed:" -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Bad download hash, assuming file has been tampered with." msgstr "" @@ -3174,16 +3304,6 @@ msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp #, fuzzy -msgid "Connecting.." -msgstr "Menyambungkan.." - -#: editor/plugins/asset_library_editor_plugin.cpp -#, fuzzy -msgid "Requesting.." -msgstr "Menguji" - -#: editor/plugins/asset_library_editor_plugin.cpp -#, fuzzy msgid "Error making request" msgstr "Error menyimpan resource!" @@ -3296,6 +3416,38 @@ msgid "Move Action" msgstr "" #: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Move vertical guide" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Create new vertical guide" +msgstr "Buat Subskribsi" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Remove vertical guide" +msgstr "Hapus Variabel" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Move horizontal guide" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Create new horizontal guide" +msgstr "Buat Subskribsi" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Remove horizontal guide" +msgstr "Hapus Tombol-tombol yang tidak sah" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Create new horizontal and vertical guides" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp msgid "Edit IK Chain" msgstr "" @@ -3417,10 +3569,16 @@ msgid "Snap to other nodes" msgstr "" #: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Snap to guides" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Lock the selected object in place (can't be moved)." msgstr "" #: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Unlock the selected object (can be moved)." msgstr "" @@ -3471,6 +3629,10 @@ msgid "Show rulers" msgstr "" #: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Show guides" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp msgid "Center Selection" msgstr "" @@ -3663,6 +3825,10 @@ msgstr "" msgid "Hold Shift to edit tangents individually" msgstr "" +#: editor/plugins/gi_probe_editor_plugin.cpp +msgid "Bake GI Probe" +msgstr "" + #: editor/plugins/gradient_editor_plugin.cpp msgid "Add/Remove Color Ramp Point" msgstr "" @@ -3695,6 +3861,10 @@ msgid "Create Occluder Polygon" msgstr "" #: editor/plugins/light_occluder_2d_editor_plugin.cpp +msgid "Create a new polygon from scratch." +msgstr "" + +#: editor/plugins/light_occluder_2d_editor_plugin.cpp msgid "Edit existing polygon:" msgstr "" @@ -3710,59 +3880,6 @@ msgstr "" msgid "RMB: Erase Point." msgstr "" -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Remove Point from Line2D" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#, fuzzy -msgid "Add Point to Line2D" -msgstr "Pergi ke Barisan" - -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Move Point in Line2D" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Select Points" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Shift+Drag: Select Control Points" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Click: Add Point" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Right Click: Delete Point" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Add Point (in empty space)" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Split Segment (in line)" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Delete Point" -msgstr "" - #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Mesh is empty!" msgstr "" @@ -4161,16 +4278,46 @@ msgid "Move Out-Control in Curve" msgstr "" #: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Select Points" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Shift+Drag: Select Control Points" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Click: Add Point" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Right Click: Delete Point" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp msgid "Select Control Points (Shift+Drag)" msgstr "" #: editor/plugins/path_2d_editor_plugin.cpp #: editor/plugins/path_editor_plugin.cpp +msgid "Add Point (in empty space)" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp msgid "Split Segment (in curve)" msgstr "" #: editor/plugins/path_2d_editor_plugin.cpp #: editor/plugins/path_editor_plugin.cpp +msgid "Delete Point" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp msgid "Close Curve" msgstr "" @@ -4311,7 +4458,6 @@ msgstr "" #: editor/plugins/resource_preloader_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp #: editor/plugins/sprite_frames_editor_plugin.cpp editor/property_editor.cpp #: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Paste" @@ -4356,6 +4502,21 @@ msgid " Class Reference" msgstr "" #: editor/plugins/script_editor_plugin.cpp +#, fuzzy +msgid "Sort" +msgstr "Sortir:" + +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp +msgid "Move Up" +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp +msgid "Move Down" +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp msgid "Next script" msgstr "" @@ -4407,6 +4568,10 @@ msgstr "Tutup Dokumentasi" msgid "Close All" msgstr "Tutup Semua" +#: editor/plugins/script_editor_plugin.cpp +msgid "Close Other Tabs" +msgstr "" + #: editor/plugins/script_editor_plugin.cpp editor/project_manager.cpp msgid "Run" msgstr "Jalankan" @@ -4418,13 +4583,11 @@ msgstr "Beralih Favorit" #: editor/plugins/script_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Find.." msgstr "Cari.." #: editor/plugins/script_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Find Next" msgstr "Pencarian Selanjutnya" @@ -4530,33 +4693,22 @@ msgstr "" msgid "Capitalize" msgstr "" -#: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp scene/gui/line_edit.cpp +#: editor/plugins/script_text_editor.cpp scene/gui/line_edit.cpp #: scene/gui/text_edit.cpp msgid "Cut" msgstr "Potong" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp #: editor/plugins/sprite_frames_editor_plugin.cpp editor/property_editor.cpp #: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Copy" msgstr "Kopy" -#: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp scene/gui/line_edit.cpp +#: editor/plugins/script_text_editor.cpp scene/gui/line_edit.cpp #: scene/gui/text_edit.cpp msgid "Select All" msgstr "Pilih Semua" -#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp -msgid "Move Up" -msgstr "" - -#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp -msgid "Move Down" -msgstr "" - #: editor/plugins/script_text_editor.cpp #, fuzzy msgid "Delete Line" @@ -4579,6 +4731,23 @@ msgid "Clone Down" msgstr "" #: editor/plugins/script_text_editor.cpp +#, fuzzy +msgid "Fold Line" +msgstr "Pergi ke Baris" + +#: editor/plugins/script_text_editor.cpp +msgid "Unfold Line" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Fold All Lines" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Unfold All Lines" +msgstr "" + +#: editor/plugins/script_text_editor.cpp msgid "Complete Symbol" msgstr "" @@ -4625,12 +4794,10 @@ msgid "Convert To Lowercase" msgstr "Sambungkan Ke Node:" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Find Previous" msgstr "" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Replace.." msgstr "" @@ -4639,7 +4806,6 @@ msgid "Goto Function.." msgstr "" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Goto Line.." msgstr "" @@ -4804,6 +4970,15 @@ msgid "View Plane Transform." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "Scaling: " +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Translating: " +msgstr "Transisi" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Rotating %s degrees." msgstr "" @@ -4886,6 +5061,10 @@ msgid "Vertices" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "FPS" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Align with view" msgstr "" @@ -4918,6 +5097,16 @@ msgid "View Information" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "View FPS" +msgstr "File:" + +#: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Half Resolution" +msgstr "Beri Skala Seleksi" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Audio Listener" msgstr "" @@ -5052,6 +5241,11 @@ msgid "Tool Scale" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Toggle Freelook" +msgstr "Mode Layar Penuh" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Transform" msgstr "" @@ -5329,6 +5523,10 @@ msgid "Create Empty Editor Template" msgstr "" #: editor/plugins/theme_editor_plugin.cpp +msgid "Create From Current Editor Theme" +msgstr "" + +#: editor/plugins/theme_editor_plugin.cpp msgid "CheckBox Radio1" msgstr "" @@ -5506,7 +5704,7 @@ msgstr "Aktifkan" #: editor/project_export.cpp #, fuzzy -msgid "Delete patch '" +msgid "Delete patch '%s' from list?" msgstr "Hapus Penampilan" #: editor/project_export.cpp @@ -5816,10 +6014,6 @@ msgid "Add Input Action Event" msgstr "" #: editor/project_settings_editor.cpp editor/settings_config_dialog.cpp -msgid "Meta+" -msgstr "Meta+" - -#: editor/project_settings_editor.cpp editor/settings_config_dialog.cpp msgid "Shift+" msgstr "Shift+" @@ -5944,13 +6138,12 @@ msgid "Select a setting item first!" msgstr "" #: editor/project_settings_editor.cpp -msgid "No property '" +msgid "No property '%s' exists." msgstr "" #: editor/project_settings_editor.cpp -#, fuzzy -msgid "Setting '" -msgstr "Mengatur.." +msgid "Setting '%s' is internal, and it can't be deleted." +msgstr "" #: editor/project_settings_editor.cpp #, fuzzy @@ -6435,6 +6628,15 @@ msgid "Clear a script for the selected node." msgstr "" #: editor/scene_tree_dock.cpp +#, fuzzy +msgid "Remote" +msgstr "Hapus" + +#: editor/scene_tree_dock.cpp +msgid "Local" +msgstr "" + +#: editor/scene_tree_dock.cpp msgid "Clear Inheritance? (No Undo!)" msgstr "" @@ -6629,6 +6831,11 @@ msgid "Attach Node Script" msgstr "Scene Baru" #: editor/script_editor_debugger.cpp +#, fuzzy +msgid "Remote " +msgstr "Hapus" + +#: editor/script_editor_debugger.cpp msgid "Bytes:" msgstr "" @@ -6685,18 +6892,6 @@ msgid "Stack Trace (if applicable):" msgstr "" #: editor/script_editor_debugger.cpp -msgid "Remote Inspector" -msgstr "" - -#: editor/script_editor_debugger.cpp -msgid "Live Scene Tree:" -msgstr "" - -#: editor/script_editor_debugger.cpp -msgid "Remote Object Properties: " -msgstr "" - -#: editor/script_editor_debugger.cpp msgid "Profiler" msgstr "" @@ -6832,50 +7027,50 @@ msgstr "" msgid "GDNative" msgstr "" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp #: modules/visual_script/visual_script_builtin_funcs.cpp msgid "Invalid type argument to convert(), use TYPE_* constants." msgstr "" "Tipe argument salah dalam menggunakan convert(), gunakan konstanta TYPE_*." -#: modules/gdscript/gd_functions.cpp modules/mono/glue/glue_header.h +#: modules/gdscript/gdscript_functions.cpp modules/mono/glue/glue_header.h #: modules/visual_script/visual_script_builtin_funcs.cpp msgid "Not enough bytes for decoding bytes, or invalid format." msgstr "Tidak cukup bytes untuk menerjemahkan, atau format tidak sah." -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "step argument is zero!" msgstr "Argumen langkah adalah nol!" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Not a script with an instance" msgstr "Bukan skrip dengan contoh" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Not based on a script" msgstr "Tidak berbasis pada skrip" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Not based on a resource file" msgstr "Tidak berbasis pada resource file" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary format (missing @path)" msgstr "Format kamus acuan tidak sah (@path hilang)" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary format (can't load script at @path)" msgstr "Format kamus acuan tidak sah (tidak dapat memuat script pada @path)" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary format (invalid script at @path)" msgstr "Format kamus acuan tidak sah (skrip tidak sah pada @path)" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary (invalid subclasses)" msgstr "Kamus acuan tidak sah (sub kelas tidak sah)" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Object can't provide a length." msgstr "" @@ -6890,15 +7085,24 @@ msgid "GridMap Duplicate Selection" msgstr "Duplikat Pilihan" #: modules/gridmap/grid_map_editor_plugin.cpp -msgid "Snap View" +msgid "Floor:" +msgstr "" + +#: modules/gridmap/grid_map_editor_plugin.cpp +msgid "Grid Map" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp -msgid "Prev Level (%sDown Wheel)" +msgid "Snap View" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp -msgid "Next Level (%sUp Wheel)" +#, fuzzy +msgid "Previous Floor" +msgstr "Tab sebelumnya" + +#: modules/gridmap/grid_map_editor_plugin.cpp +msgid "Next Floor" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp @@ -6969,13 +7173,8 @@ msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp #, fuzzy -msgid "Selection -> Duplicate" -msgstr "Hanya yang Dipilih" - -#: modules/gridmap/grid_map_editor_plugin.cpp -#, fuzzy -msgid "Selection -> Clear" -msgstr "Hanya yang Dipilih" +msgid "Clear Selection" +msgstr "Beri Skala Seleksi" #: modules/gridmap/grid_map_editor_plugin.cpp msgid "GridMap Settings" @@ -7109,7 +7308,8 @@ msgid "Duplicate VisualScript Nodes" msgstr "" #: modules/visual_script/visual_script_editor.cpp -msgid "Hold Meta to drop a Getter. Hold Shift to drop a generic signature." +#, fuzzy +msgid "Hold %s to drop a Getter. Hold Shift to drop a generic signature." msgstr "" "Tahan Meta untuk meletakkan sebuah Getter. Tahan Shift untuk meletakkan " "generic signature." @@ -7119,7 +7319,7 @@ msgid "Hold Ctrl to drop a Getter. Hold Shift to drop a generic signature." msgstr "" #: modules/visual_script/visual_script_editor.cpp -msgid "Hold Meta to drop a simple reference to the node." +msgid "Hold %s to drop a simple reference to the node." msgstr "" #: modules/visual_script/visual_script_editor.cpp @@ -7127,7 +7327,7 @@ msgid "Hold Ctrl to drop a simple reference to the node." msgstr "" #: modules/visual_script/visual_script_editor.cpp -msgid "Hold Meta to drop a Variable Setter." +msgid "Hold %s to drop a Variable Setter." msgstr "" #: modules/visual_script/visual_script_editor.cpp @@ -7372,12 +7572,22 @@ msgstr "Tidak dapat membuat folder." #: platform/javascript/export/export.cpp #, fuzzy -msgid "Could not read file:\n" +msgid "Could not open template for export:\n" msgstr "Tidak dapat membuat folder." #: platform/javascript/export/export.cpp #, fuzzy -msgid "Could not open template for export:\n" +msgid "Invalid export template:\n" +msgstr "Memuat Ekspor Template-template." + +#: platform/javascript/export/export.cpp +#, fuzzy +msgid "Could not read custom HTML shell:\n" +msgstr "Tidak dapat membuat folder." + +#: platform/javascript/export/export.cpp +#, fuzzy +msgid "Could not read boot splash image file:\n" msgstr "Tidak dapat membuat folder." #: scene/2d/animated_sprite.cpp @@ -7498,22 +7708,6 @@ msgid "Path property must point to a valid Node2D node to work." msgstr "" "Properti path harus menunjuk pada sebuah node Node2D yang sah untuk bekerja." -#: scene/2d/sprite.cpp -msgid "" -"Path property must point to a valid Viewport node to work. Such Viewport " -"must be set to 'render target' mode." -msgstr "" -"Properti path harus menunjuk pada node Viewport yang sah untuk bekerja. " -"Viewport tersebut harus diatur ke mode 'render target'." - -#: scene/2d/sprite.cpp -msgid "" -"The Viewport set in the path property must be set as 'render target' in " -"order for this sprite to work." -msgstr "" -"Pengaturan Vieport dalam properti path harus diatur sebagai 'render target' " -"agar sprite bekerja." - #: scene/2d/visibility_notifier_2d.cpp msgid "" "VisibilityEnable2D works best when used with the edited scene root directly " @@ -7584,6 +7778,14 @@ msgstr "" "Sebuah bentuk harus disediakan untuk CollisionShape untuk fungsi. Mohon " "ciptakan sebuah resource bentuk untuk itu!" +#: scene/3d/gi_probe.cpp +msgid "Plotting Meshes" +msgstr "" + +#: scene/3d/gi_probe.cpp +msgid "Finishing Plot" +msgstr "" + #: scene/3d/navigation_mesh.cpp msgid "A NavigationMesh resource must be set or created for this node to work." msgstr "" @@ -7676,6 +7878,10 @@ msgid "" "minimum size manually." msgstr "" +#: scene/gui/tree.cpp +msgid "(Other)" +msgstr "" + #: scene/main/scene_tree.cpp #, fuzzy msgid "" @@ -7715,6 +7921,45 @@ msgstr "Error memuat font." msgid "Invalid font size." msgstr "Ukuran font tidak sah." +#, fuzzy +#~ msgid "" +#~ "\n" +#~ "Source: " +#~ msgstr "Resource" + +#, fuzzy +#~ msgid "Add Point to Line2D" +#~ msgstr "Pergi ke Barisan" + +#~ msgid "Meta+" +#~ msgstr "Meta+" + +#, fuzzy +#~ msgid "Setting '" +#~ msgstr "Mengatur.." + +#, fuzzy +#~ msgid "Selection -> Duplicate" +#~ msgstr "Hanya yang Dipilih" + +#, fuzzy +#~ msgid "Selection -> Clear" +#~ msgstr "Hanya yang Dipilih" + +#~ msgid "" +#~ "Path property must point to a valid Viewport node to work. Such Viewport " +#~ "must be set to 'render target' mode." +#~ msgstr "" +#~ "Properti path harus menunjuk pada node Viewport yang sah untuk bekerja. " +#~ "Viewport tersebut harus diatur ke mode 'render target'." + +#~ msgid "" +#~ "The Viewport set in the path property must be set as 'render target' in " +#~ "order for this sprite to work." +#~ msgstr "" +#~ "Pengaturan Vieport dalam properti path harus diatur sebagai 'render " +#~ "target' agar sprite bekerja." + #~ msgid "Filter:" #~ msgstr "Filter:" @@ -7734,9 +7979,6 @@ msgstr "Ukuran font tidak sah." #~ msgid "Removed:" #~ msgstr "Dihapus:" -#~ msgid "Error saving atlas:" -#~ msgstr "Gagal menyimpan atlas:" - #~ msgid "Could not save atlas subtexture:" #~ msgstr "Tidak dapat menyimpan sub tekstur atlas:" diff --git a/editor/translations/it.po b/editor/translations/it.po index 45c48d6ac4..17489b7861 100644 --- a/editor/translations/it.po +++ b/editor/translations/it.po @@ -105,6 +105,7 @@ msgid "Anim Delete Keys" msgstr "Anim Elimina Key" #: editor/animation_editor.cpp editor/plugins/tile_map_editor_plugin.cpp +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Duplicate Selection" msgstr "Duplica Selezione" @@ -641,6 +642,13 @@ msgstr "Editor Dipendenze" msgid "Search Replacement Resource:" msgstr "Cerca Risorsa di Rimpiazzo:" +#: editor/dependency_editor.cpp editor/editor_file_dialog.cpp +#: editor/editor_help.cpp editor/editor_node.cpp editor/filesystem_dock.cpp +#: editor/plugins/script_editor_plugin.cpp editor/property_selector.cpp +#: editor/quick_open.cpp scene/gui/file_dialog.cpp +msgid "Open" +msgstr "Apri" + #: editor/dependency_editor.cpp msgid "Owners Of:" msgstr "Proprietari Di:" @@ -714,6 +722,16 @@ msgstr "Eliminare i file selezionati?" msgid "Delete" msgstr "Elimina" +#: editor/dictionary_property_edit.cpp +#, fuzzy +msgid "Change Dictionary Key" +msgstr "Cambia Nome Animazione:" + +#: editor/dictionary_property_edit.cpp +#, fuzzy +msgid "Change Dictionary Value" +msgstr "Cambia Valore Array" + #: editor/editor_about.cpp msgid "Thanks from the Godot community!" msgstr "Grazie dalla comunità di Godot!" @@ -1139,12 +1157,6 @@ msgstr "Tutti i Riconosciuti" msgid "All Files (*)" msgstr "Tutti i File (*)" -#: editor/editor_file_dialog.cpp editor/editor_help.cpp editor/editor_node.cpp -#: editor/filesystem_dock.cpp editor/plugins/script_editor_plugin.cpp -#: editor/property_selector.cpp editor/quick_open.cpp scene/gui/file_dialog.cpp -msgid "Open" -msgstr "Apri" - #: editor/editor_file_dialog.cpp scene/gui/file_dialog.cpp msgid "Open a File" msgstr "Apri un File" @@ -1517,6 +1529,18 @@ msgstr "" "scene per comprendere meglio questo workflow." #: editor/editor_node.cpp +#, fuzzy +msgid "" +"This is a remote object so changes to it will not be kept.\n" +"Please read the documentation relevant to debugging to better understand " +"this workflow." +msgstr "" +"Questa risorsa appartiene a una scena che è stata importata, di conseguenza " +"non è modificabile.\n" +"Si consiglia di leggere la documentazione riguardante l'importazione delle " +"scene per comprendere al meglio questo workflow." + +#: editor/editor_node.cpp msgid "Copy Params" msgstr "Copia parametri" @@ -1637,6 +1661,11 @@ msgid "Export Mesh Library" msgstr "Esporta Libreria Mesh" #: editor/editor_node.cpp +#, fuzzy +msgid "This operation can't be done without a root node." +msgstr "Questa operazione non può essere eseguita senza un nodo selezionato." + +#: editor/editor_node.cpp msgid "Export Tile Set" msgstr "Esporta Tile Set" @@ -1777,12 +1806,23 @@ msgid "Switch Scene Tab" msgstr "Cambia Tab di Scena" #: editor/editor_node.cpp -msgid "%d more file(s)" +#, fuzzy +msgid "%d more files or folders" +msgstr "% altri file o cartelle" + +#: editor/editor_node.cpp +#, fuzzy +msgid "%d more folders" msgstr "%d altri file" #: editor/editor_node.cpp -msgid "%d more file(s) or folder(s)" -msgstr "% altri file o cartelle" +#, fuzzy +msgid "%d more files" +msgstr "%d altri file" + +#: editor/editor_node.cpp +msgid "Dock Position" +msgstr "" #: editor/editor_node.cpp msgid "Distraction Free Mode" @@ -1793,6 +1833,11 @@ msgid "Toggle distraction-free mode." msgstr "Abilita modalità senza distrazioni." #: editor/editor_node.cpp +#, fuzzy +msgid "Add a new scene." +msgstr "Aggiungi nuova traccia." + +#: editor/editor_node.cpp msgid "Scene" msgstr "Scena" @@ -1857,13 +1902,12 @@ msgid "TileSet.." msgstr "TileSet.." #: editor/editor_node.cpp editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp scene/gui/line_edit.cpp -#: scene/gui/text_edit.cpp +#: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Undo" msgstr "Annulla" #: editor/editor_node.cpp editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp +#: scene/gui/line_edit.cpp msgid "Redo" msgstr "Redo" @@ -2367,6 +2411,11 @@ msgid "(Current)" msgstr "(Corrente)" #: editor/export_template_manager.cpp +#, fuzzy +msgid "Retrieving mirrors, please wait.." +msgstr "Errore di connessione, si prega di riprovare." + +#: editor/export_template_manager.cpp msgid "Remove template version '%s'?" msgstr "Rimuovere versione '%s' del template?" @@ -2403,6 +2452,112 @@ msgid "Importing:" msgstr "Importo:" #: editor/export_template_manager.cpp +msgid "" +"No download links found for this version. Direct download is only available " +"for official releases." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Can't resolve." +msgstr "Impossibile risolvete." + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Can't connect." +msgstr "Impossibile connettersi." + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "No response." +msgstr "Nessuna risposta." + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Req. Failed." +msgstr "Rich. Fall." + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Redirect Loop." +msgstr "Ridirigi Loop." + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Failed:" +msgstr "Fallito:" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Can't write file." +msgstr "Impossibile scrivere file:\n" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Download Complete." +msgstr "Errore durante il download" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Error requesting url: " +msgstr "Errore di salvataggio dell'atlas:" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Connecting to Mirror.." +msgstr "Connettendo.." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Disconnected" +msgstr "Disconnetti" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Resolving" +msgstr "Risolvendo.." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Can't Resolve" +msgstr "Impossibile risolvete." + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Connecting.." +msgstr "Connettendo.." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Can't Conect" +msgstr "Impossibile connettersi." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Connected" +msgstr "Connetti" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Requesting.." +msgstr "Richiedendo.." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Downloading" +msgstr "Scarica" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Connection Error" +msgstr "Connettendo.." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "SSL Handshake Error" +msgstr "Carica Errori" + +#: editor/export_template_manager.cpp msgid "Current Version:" msgstr "Versione Corrente:" @@ -2426,6 +2581,16 @@ msgstr "Seleziona file template" msgid "Export Template Manager" msgstr "Gestore Template Esportazione" +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Download Templates" +msgstr "Templates" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Select mirror from list: " +msgstr "Seleziona il dispositivo dall'elenco" + #: editor/file_type_cache.cpp msgid "Can't open file_type_cache.cch for writing, not saving file type cache!" msgstr "" @@ -2433,8 +2598,8 @@ msgstr "" "tipi di file!" #: editor/filesystem_dock.cpp -msgid "Cannot navigate to '" -msgstr "Impossibile navigare a '" +msgid "Cannot navigate to '%s' as it has not been found in the file system!" +msgstr "" #: editor/filesystem_dock.cpp msgid "View items as a grid of thumbnails" @@ -2454,14 +2619,6 @@ msgstr "" "reimportarlo manualmente." #: editor/filesystem_dock.cpp -msgid "" -"\n" -"Source: " -msgstr "" -"\n" -"Sorgente: " - -#: editor/filesystem_dock.cpp msgid "Cannot move/rename resources root." msgstr "Impossibile spostare/rinominare risorse root." @@ -2726,8 +2883,8 @@ msgid "Remove Poly And Point" msgstr "Rimuovi Poligono e Punto" #: editor/plugins/abstract_polygon_2d_editor.cpp -#: editor/plugins/light_occluder_2d_editor_plugin.cpp -msgid "Create a new polygon from scratch." +#, fuzzy +msgid "Create a new polygon from scratch" msgstr "Crea un nuovo poligono dal nulla." #: editor/plugins/abstract_polygon_2d_editor.cpp @@ -2738,6 +2895,11 @@ msgid "" "RMB: Erase Point." msgstr "" +#: editor/plugins/abstract_polygon_2d_editor.cpp +#, fuzzy +msgid "Delete points" +msgstr "Elimina Punto" + #: editor/plugins/animation_player_editor_plugin.cpp msgid "Toggle Autoplay" msgstr "Abilità Autoplay" @@ -3074,18 +3236,10 @@ msgid "Can't resolve hostname:" msgstr "Impossibile risolvere l'hostname:" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Can't resolve." -msgstr "Impossibile risolvete." - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Connection error, please try again." msgstr "Errore di connessione, si prega di riprovare." #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Can't connect." -msgstr "Impossibile connettersi." - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Can't connect to host:" msgstr "Impossibile connetersi all'host:" @@ -3094,30 +3248,14 @@ msgid "No response from host:" msgstr "Nessuna risposta dall'host:" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "No response." -msgstr "Nessuna risposta." - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Request failed, return code:" msgstr "Richiesta fallita, codice di return:" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Req. Failed." -msgstr "Rich. Fall." - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Request failed, too many redirects" msgstr "Richiesta fallita, troppi ridirezionamenti" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Redirect Loop." -msgstr "Ridirigi Loop." - -#: editor/plugins/asset_library_editor_plugin.cpp -msgid "Failed:" -msgstr "Fallito:" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Bad download hash, assuming file has been tampered with." msgstr "Hash di download non buono, si presume il file sia stato manipolato." @@ -3146,14 +3284,6 @@ msgid "Resolving.." msgstr "Risolvendo.." #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Connecting.." -msgstr "Connettendo.." - -#: editor/plugins/asset_library_editor_plugin.cpp -msgid "Requesting.." -msgstr "Richiedendo.." - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Error making request" msgstr "Errore nel fare richiesta" @@ -3266,6 +3396,39 @@ msgid "Move Action" msgstr "Azione di spostamento" #: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Move vertical guide" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Create new vertical guide" +msgstr "Crea nuovo file script" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Remove vertical guide" +msgstr "Rimuovi Variabile" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Move horizontal guide" +msgstr "Sposta Punto in curva" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Create new horizontal guide" +msgstr "Crea nuovo file script" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Remove horizontal guide" +msgstr "Rimuovi key invalidi" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Create new horizontal and vertical guides" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp msgid "Edit IK Chain" msgstr "Modifica Catena IK" @@ -3397,10 +3560,17 @@ msgid "Snap to other nodes" msgstr "" #: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Snap to guides" +msgstr "Modalità Snap:" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Lock the selected object in place (can't be moved)." msgstr "Blocca l'oggetto selezionato sul posto (non può essere mosso)." #: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Unlock the selected object (can be moved)." msgstr "Sblocca l'oggetto selezionato (può essere mosso)." @@ -3453,6 +3623,11 @@ msgid "Show rulers" msgstr "Mostra Ossa" #: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Show guides" +msgstr "Mostra Ossa" + +#: editor/plugins/canvas_item_editor_plugin.cpp msgid "Center Selection" msgstr "Centra Selezione" @@ -3649,6 +3824,10 @@ msgstr "" msgid "Hold Shift to edit tangents individually" msgstr "" +#: editor/plugins/gi_probe_editor_plugin.cpp +msgid "Bake GI Probe" +msgstr "" + #: editor/plugins/gradient_editor_plugin.cpp msgid "Add/Remove Color Ramp Point" msgstr "Aggiungi/Rimuovi Punto Rampa Colori" @@ -3681,6 +3860,10 @@ msgid "Create Occluder Polygon" msgstr "Crea Poligono di occlusione" #: editor/plugins/light_occluder_2d_editor_plugin.cpp +msgid "Create a new polygon from scratch." +msgstr "Crea un nuovo poligono dal nulla." + +#: editor/plugins/light_occluder_2d_editor_plugin.cpp msgid "Edit existing polygon:" msgstr "Modifica poligono esistente:" @@ -3696,58 +3879,6 @@ msgstr "Ctrl+LMB: dividi Segmento." msgid "RMB: Erase Point." msgstr "RMB: Elimina Punto." -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Remove Point from Line2D" -msgstr "Rimuovi Punto da Line2D" - -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Add Point to Line2D" -msgstr "Aggiungi Punto a Line2D" - -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Move Point in Line2D" -msgstr "Sposta Punto in Line2D" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Select Points" -msgstr "Selezione Punti" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Shift+Drag: Select Control Points" -msgstr "Shift+Trascina: Seleziona Punti di Controllo" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Click: Add Point" -msgstr "Click: Aggiungi Punto" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Right Click: Delete Point" -msgstr "Click Destro: Elimina Punto" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Add Point (in empty space)" -msgstr "Aggiungi Punto (in sapzio vuoto)" - -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Split Segment (in line)" -msgstr "Spezza Segmento (in linea)" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Delete Point" -msgstr "Elimina Punto" - #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Mesh is empty!" msgstr "La mesh è vuota!" @@ -4159,16 +4290,46 @@ msgid "Move Out-Control in Curve" msgstr "Sposta Out-Control sulla Curva" #: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Select Points" +msgstr "Selezione Punti" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Shift+Drag: Select Control Points" +msgstr "Shift+Trascina: Seleziona Punti di Controllo" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Click: Add Point" +msgstr "Click: Aggiungi Punto" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Right Click: Delete Point" +msgstr "Click Destro: Elimina Punto" + +#: editor/plugins/path_2d_editor_plugin.cpp msgid "Select Control Points (Shift+Drag)" msgstr "Seleziona Punti di Controllo (Shift+Trascina)" #: editor/plugins/path_2d_editor_plugin.cpp #: editor/plugins/path_editor_plugin.cpp +msgid "Add Point (in empty space)" +msgstr "Aggiungi Punto (in sapzio vuoto)" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp msgid "Split Segment (in curve)" msgstr "Spezza Segmento (in curva)" #: editor/plugins/path_2d_editor_plugin.cpp #: editor/plugins/path_editor_plugin.cpp +msgid "Delete Point" +msgstr "Elimina Punto" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp msgid "Close Curve" msgstr "Chiudi curva" @@ -4308,7 +4469,6 @@ msgstr "Carica Risorsa" #: editor/plugins/resource_preloader_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp #: editor/plugins/sprite_frames_editor_plugin.cpp editor/property_editor.cpp #: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Paste" @@ -4353,6 +4513,21 @@ msgid " Class Reference" msgstr "" #: editor/plugins/script_editor_plugin.cpp +#, fuzzy +msgid "Sort" +msgstr "Ordina:" + +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp +msgid "Move Up" +msgstr "Sposta Su" + +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp +msgid "Move Down" +msgstr "Sposta giù" + +#: editor/plugins/script_editor_plugin.cpp msgid "Next script" msgstr "Script successivo" @@ -4404,6 +4579,10 @@ msgstr "Chiudi Documentazione" msgid "Close All" msgstr "Chiudi Tutto" +#: editor/plugins/script_editor_plugin.cpp +msgid "Close Other Tabs" +msgstr "" + #: editor/plugins/script_editor_plugin.cpp editor/project_manager.cpp msgid "Run" msgstr "Esegui" @@ -4415,13 +4594,11 @@ msgstr "Attiva Preferito" #: editor/plugins/script_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Find.." msgstr "Trova.." #: editor/plugins/script_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Find Next" msgstr "Trova Successivo" @@ -4530,33 +4707,22 @@ msgstr "Minuscolo" msgid "Capitalize" msgstr "Aggiungi maiuscola iniziale" -#: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp scene/gui/line_edit.cpp +#: editor/plugins/script_text_editor.cpp scene/gui/line_edit.cpp #: scene/gui/text_edit.cpp msgid "Cut" msgstr "Taglia" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp #: editor/plugins/sprite_frames_editor_plugin.cpp editor/property_editor.cpp #: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Copy" msgstr "Copia" -#: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp scene/gui/line_edit.cpp +#: editor/plugins/script_text_editor.cpp scene/gui/line_edit.cpp #: scene/gui/text_edit.cpp msgid "Select All" msgstr "Seleziona tutti" -#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp -msgid "Move Up" -msgstr "Sposta Su" - -#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp -msgid "Move Down" -msgstr "Sposta giù" - #: editor/plugins/script_text_editor.cpp #, fuzzy msgid "Delete Line" @@ -4579,6 +4745,23 @@ msgid "Clone Down" msgstr "Clona Sotto" #: editor/plugins/script_text_editor.cpp +#, fuzzy +msgid "Fold Line" +msgstr "Vai alla Linea" + +#: editor/plugins/script_text_editor.cpp +msgid "Unfold Line" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Fold All Lines" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Unfold All Lines" +msgstr "" + +#: editor/plugins/script_text_editor.cpp msgid "Complete Symbol" msgstr "Completa Simbolo" @@ -4624,12 +4807,10 @@ msgid "Convert To Lowercase" msgstr "Converti In Minuscolo" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Find Previous" msgstr "Trova Precedente" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Replace.." msgstr "Rimpiazza.." @@ -4638,7 +4819,6 @@ msgid "Goto Function.." msgstr "Vai a Funzione.." #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Goto Line.." msgstr "Vai a Linea.." @@ -4803,6 +4983,16 @@ msgid "View Plane Transform." msgstr "Visualizza Tranform del Piano." #: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Scaling: " +msgstr "Scala:" + +#: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Translating: " +msgstr "Traduzioni:" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Rotating %s degrees." msgstr "Ruotando di %s gradi." @@ -4883,6 +5073,10 @@ msgid "Vertices" msgstr "Vertici" #: editor/plugins/spatial_editor_plugin.cpp +msgid "FPS" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Align with view" msgstr "Allinea a vista" @@ -4915,6 +5109,16 @@ msgid "View Information" msgstr "Visualizza Informazioni" #: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "View FPS" +msgstr "Vedi Files" + +#: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Half Resolution" +msgstr "Scala Selezione" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Audio Listener" msgstr "Audio Listener" @@ -5046,6 +5250,11 @@ msgid "Tool Scale" msgstr "Strumento Scala" #: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Toggle Freelook" +msgstr "Abilita/Disabilita Fullscreen" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Transform" msgstr "Transform" @@ -5325,6 +5534,11 @@ msgid "Create Empty Editor Template" msgstr "Crea Template Editor Vuota" #: editor/plugins/theme_editor_plugin.cpp +#, fuzzy +msgid "Create From Current Editor Theme" +msgstr "Crea Template Editor Vuota" + +#: editor/plugins/theme_editor_plugin.cpp msgid "CheckBox Radio1" msgstr "CheckBox Radio1" @@ -5502,7 +5716,8 @@ msgid "Runnable" msgstr "Eseguibile" #: editor/project_export.cpp -msgid "Delete patch '" +#, fuzzy +msgid "Delete patch '%s' from list?" msgstr "Elimina patch '" #: editor/project_export.cpp @@ -5819,10 +6034,6 @@ msgid "Add Input Action Event" msgstr "Aggiungi Evento di Azione Input" #: editor/project_settings_editor.cpp editor/settings_config_dialog.cpp -msgid "Meta+" -msgstr "Meta+" - -#: editor/project_settings_editor.cpp editor/settings_config_dialog.cpp msgid "Shift+" msgstr "Shift+" @@ -5946,13 +6157,12 @@ msgstr "" #: editor/project_settings_editor.cpp #, fuzzy -msgid "No property '" +msgid "No property '%s' exists." msgstr "Proprietà :" #: editor/project_settings_editor.cpp -#, fuzzy -msgid "Setting '" -msgstr "Impostazioni" +msgid "Setting '%s' is internal, and it can't be deleted." +msgstr "" #: editor/project_settings_editor.cpp #, fuzzy @@ -6438,6 +6648,16 @@ msgid "Clear a script for the selected node." msgstr "Svuota uno script per il nodo selezionato." #: editor/scene_tree_dock.cpp +#, fuzzy +msgid "Remote" +msgstr "Rimuovi" + +#: editor/scene_tree_dock.cpp +#, fuzzy +msgid "Local" +msgstr "Locale" + +#: editor/scene_tree_dock.cpp msgid "Clear Inheritance? (No Undo!)" msgstr "Liberare ereditarietà ? (No Undo!)" @@ -6634,6 +6854,11 @@ msgid "Attach Node Script" msgstr "Allega Script Nodo" #: editor/script_editor_debugger.cpp +#, fuzzy +msgid "Remote " +msgstr "Rimuovi" + +#: editor/script_editor_debugger.cpp msgid "Bytes:" msgstr "Bytes:" @@ -6690,18 +6915,6 @@ msgid "Stack Trace (if applicable):" msgstr "Stack Trace (se applicabile):" #: editor/script_editor_debugger.cpp -msgid "Remote Inspector" -msgstr "Inspector Remoto" - -#: editor/script_editor_debugger.cpp -msgid "Live Scene Tree:" -msgstr "Scene Tree Live:" - -#: editor/script_editor_debugger.cpp -msgid "Remote Object Properties: " -msgstr "Proprietà Oggetto Remoto: " - -#: editor/script_editor_debugger.cpp msgid "Profiler" msgstr "Profiler" @@ -6835,52 +7048,52 @@ msgstr "" msgid "GDNative" msgstr "" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp #: modules/visual_script/visual_script_builtin_funcs.cpp msgid "Invalid type argument to convert(), use TYPE_* constants." msgstr "Argomento tipo invalido per convert(), usare le costanti TYPE_*." -#: modules/gdscript/gd_functions.cpp modules/mono/glue/glue_header.h +#: modules/gdscript/gdscript_functions.cpp modules/mono/glue/glue_header.h #: modules/visual_script/visual_script_builtin_funcs.cpp msgid "Not enough bytes for decoding bytes, or invalid format." msgstr "" "Non vi sono abbastanza bytes per i bytes di decodifica, oppure formato " "invalido." -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "step argument is zero!" msgstr "step argument è zero!" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Not a script with an instance" msgstr "Non è uno script con un istanza" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Not based on a script" msgstr "Non si basa su uno script" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Not based on a resource file" msgstr "Non si basa su un file risorsa" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary format (missing @path)" msgstr "Istanza invalida formato dizionario (manca @path)" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary format (can't load script at @path)" msgstr "" "Istanza invalida formato dizionario (impossibile caricare script in @path)" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary format (invalid script at @path)" msgstr "Istanza invalida formato dizionario (script invalido in @path)" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary (invalid subclasses)" msgstr "Istanza invalida formato dizionario (sottoclassi invalide)" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Object can't provide a length." msgstr "" @@ -6895,16 +7108,26 @@ msgid "GridMap Duplicate Selection" msgstr "Duplica Selezione" #: modules/gridmap/grid_map_editor_plugin.cpp +msgid "Floor:" +msgstr "" + +#: modules/gridmap/grid_map_editor_plugin.cpp +#, fuzzy +msgid "Grid Map" +msgstr "Snap Griglia" + +#: modules/gridmap/grid_map_editor_plugin.cpp #, fuzzy msgid "Snap View" msgstr "Vista dall'Alto" #: modules/gridmap/grid_map_editor_plugin.cpp -msgid "Prev Level (%sDown Wheel)" -msgstr "" +#, fuzzy +msgid "Previous Floor" +msgstr "Scheda precedente" #: modules/gridmap/grid_map_editor_plugin.cpp -msgid "Next Level (%sUp Wheel)" +msgid "Next Floor" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp @@ -6980,13 +7203,8 @@ msgstr "Cancella TileMap" #: modules/gridmap/grid_map_editor_plugin.cpp #, fuzzy -msgid "Selection -> Duplicate" -msgstr "Solo Selezione" - -#: modules/gridmap/grid_map_editor_plugin.cpp -#, fuzzy -msgid "Selection -> Clear" -msgstr "Solo Selezione" +msgid "Clear Selection" +msgstr "Centra Selezione" #: modules/gridmap/grid_map_editor_plugin.cpp #, fuzzy @@ -7122,7 +7340,8 @@ msgid "Duplicate VisualScript Nodes" msgstr "Duplica Nodo(i) Grafico" #: modules/visual_script/visual_script_editor.cpp -msgid "Hold Meta to drop a Getter. Hold Shift to drop a generic signature." +#, fuzzy +msgid "Hold %s to drop a Getter. Hold Shift to drop a generic signature." msgstr "" "Mantieni premuto Meta per rilasciare un Getter. Mantieni premuto Shift per " "rilasciare una firma generica." @@ -7134,7 +7353,8 @@ msgstr "" "per rilasciare una firma generica." #: modules/visual_script/visual_script_editor.cpp -msgid "Hold Meta to drop a simple reference to the node." +#, fuzzy +msgid "Hold %s to drop a simple reference to the node." msgstr "Mantieni premuto Meta per rilasciare un riferimento semplice al nodo." #: modules/visual_script/visual_script_editor.cpp @@ -7142,7 +7362,8 @@ msgid "Hold Ctrl to drop a simple reference to the node." msgstr "Mantieni premuto Ctrl per rilasciare un riferimento semplice al nodo." #: modules/visual_script/visual_script_editor.cpp -msgid "Hold Meta to drop a Variable Setter." +#, fuzzy +msgid "Hold %s to drop a Variable Setter." msgstr "Mantieni premuto Meta per rilasciare un Setter Variabile." #: modules/visual_script/visual_script_editor.cpp @@ -7382,12 +7603,23 @@ msgid "Could not write file:\n" msgstr "Impossibile scrivere file:\n" #: platform/javascript/export/export.cpp -msgid "Could not read file:\n" +msgid "Could not open template for export:\n" +msgstr "Impossibile aprire template per l'esportazione:\n" + +#: platform/javascript/export/export.cpp +#, fuzzy +msgid "Invalid export template:\n" +msgstr "Installa Template di Esportazione" + +#: platform/javascript/export/export.cpp +#, fuzzy +msgid "Could not read custom HTML shell:\n" msgstr "Impossibile leggere file:\n" #: platform/javascript/export/export.cpp -msgid "Could not open template for export:\n" -msgstr "Impossibile aprire template per l'esportazione:\n" +#, fuzzy +msgid "Could not read boot splash image file:\n" +msgstr "Impossibile leggere file:\n" #: scene/2d/animated_sprite.cpp msgid "" @@ -7511,22 +7743,6 @@ msgid "Path property must point to a valid Node2D node to work." msgstr "" "La proprietà path deve puntare ad un nodo Node2D valido per funzionare." -#: scene/2d/sprite.cpp -msgid "" -"Path property must point to a valid Viewport node to work. Such Viewport " -"must be set to 'render target' mode." -msgstr "" -"La proprietà path deve puntare a un nodo Viewport valido per poter " -"funzionare. Tale Viewport deve essere impostata in modalità 'render target'." - -#: scene/2d/sprite.cpp -msgid "" -"The Viewport set in the path property must be set as 'render target' in " -"order for this sprite to work." -msgstr "" -"Il Viewport impostato nella proprietà path deve essere impostato come " -"'render target' affinché questa sprite funzioni." - #: scene/2d/visibility_notifier_2d.cpp msgid "" "VisibilityEnable2D works best when used with the edited scene root directly " @@ -7596,6 +7812,15 @@ msgstr "" "Perché CollisionShape funzioni deve essere fornita una forma. Si prega di " "creare una risorsa forma (shape)!" +#: scene/3d/gi_probe.cpp +#, fuzzy +msgid "Plotting Meshes" +msgstr "Bliting Immagini" + +#: scene/3d/gi_probe.cpp +msgid "Finishing Plot" +msgstr "" + #: scene/3d/navigation_mesh.cpp msgid "A NavigationMesh resource must be set or created for this node to work." msgstr "" @@ -7690,6 +7915,10 @@ msgstr "" "Usa un container come figlio (VBox,HBox,etc), o un Control impostando la " "dimensione minima manualmente." +#: scene/gui/tree.cpp +msgid "(Other)" +msgstr "" + #: scene/main/scene_tree.cpp msgid "" "Default Environment as specified in Project Setings (Rendering -> Viewport -" @@ -7726,6 +7955,67 @@ msgstr "Errore caricamento font." msgid "Invalid font size." msgstr "Dimensione font Invalida." +#~ msgid "Cannot navigate to '" +#~ msgstr "Impossibile navigare a '" + +#~ msgid "" +#~ "\n" +#~ "Source: " +#~ msgstr "" +#~ "\n" +#~ "Sorgente: " + +#~ msgid "Remove Point from Line2D" +#~ msgstr "Rimuovi Punto da Line2D" + +#~ msgid "Add Point to Line2D" +#~ msgstr "Aggiungi Punto a Line2D" + +#~ msgid "Move Point in Line2D" +#~ msgstr "Sposta Punto in Line2D" + +#~ msgid "Split Segment (in line)" +#~ msgstr "Spezza Segmento (in linea)" + +#~ msgid "Meta+" +#~ msgstr "Meta+" + +#, fuzzy +#~ msgid "Setting '" +#~ msgstr "Impostazioni" + +#~ msgid "Remote Inspector" +#~ msgstr "Inspector Remoto" + +#~ msgid "Live Scene Tree:" +#~ msgstr "Scene Tree Live:" + +#~ msgid "Remote Object Properties: " +#~ msgstr "Proprietà Oggetto Remoto: " + +#, fuzzy +#~ msgid "Selection -> Duplicate" +#~ msgstr "Solo Selezione" + +#, fuzzy +#~ msgid "Selection -> Clear" +#~ msgstr "Solo Selezione" + +#~ msgid "" +#~ "Path property must point to a valid Viewport node to work. Such Viewport " +#~ "must be set to 'render target' mode." +#~ msgstr "" +#~ "La proprietà path deve puntare a un nodo Viewport valido per poter " +#~ "funzionare. Tale Viewport deve essere impostata in modalità 'render " +#~ "target'." + +#~ msgid "" +#~ "The Viewport set in the path property must be set as 'render target' in " +#~ "order for this sprite to work." +#~ msgstr "" +#~ "Il Viewport impostato nella proprietà path deve essere impostato come " +#~ "'render target' affinché questa sprite funzioni." + #~ msgid "Filter:" #~ msgstr "Filtro:" @@ -7750,9 +8040,6 @@ msgstr "Dimensione font Invalida." #~ msgid "Removed:" #~ msgstr "Rimosso:" -#~ msgid "Error saving atlas:" -#~ msgstr "Errore di salvataggio dell'atlas:" - #~ msgid "Could not save atlas subtexture:" #~ msgstr "Impossibile salvare la substruttura dell'atlas:" @@ -8145,9 +8432,6 @@ msgstr "Dimensione font Invalida." #~ msgid "Cropping Images" #~ msgstr "Tagliando Immagini" -#~ msgid "Blitting Images" -#~ msgstr "Bliting Immagini" - #~ msgid "Couldn't save atlas image:" #~ msgstr "Impossibile salvare l'immagine di atlas:" @@ -8527,9 +8811,6 @@ msgstr "Dimensione font Invalida." #~ msgid "Save Translatable Strings" #~ msgstr "Salva Stringhe Traducibili" -#~ msgid "Install Export Templates" -#~ msgstr "Installa Template di Esportazione" - #~ msgid "Edit Script Options" #~ msgstr "Modifica le opzioni di script" diff --git a/editor/translations/ja.po b/editor/translations/ja.po index 59d3b9499b..ea9ca84dfb 100644 --- a/editor/translations/ja.po +++ b/editor/translations/ja.po @@ -109,6 +109,7 @@ msgid "Anim Delete Keys" msgstr "Anim ã‚ー削除" #: editor/animation_editor.cpp editor/plugins/tile_map_editor_plugin.cpp +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Duplicate Selection" msgstr "é¸æŠžç¯„囲を複製" @@ -705,6 +706,13 @@ msgstr "ä¾å˜é–¢ä¿‚エディタ" msgid "Search Replacement Resource:" msgstr "ç½®æ›ã™ã‚‹ãƒªã‚½ãƒ¼ã‚¹ã‚’探ã™:" +#: editor/dependency_editor.cpp editor/editor_file_dialog.cpp +#: editor/editor_help.cpp editor/editor_node.cpp editor/filesystem_dock.cpp +#: editor/plugins/script_editor_plugin.cpp editor/property_selector.cpp +#: editor/quick_open.cpp scene/gui/file_dialog.cpp +msgid "Open" +msgstr "é–‹ã" + #: editor/dependency_editor.cpp #, fuzzy msgid "Owners Of:" @@ -791,6 +799,16 @@ msgstr "é¸æŠžã—ãŸãƒ•ã‚¡ã‚¤ãƒ«ã‚’消去ã—ã¾ã™ã‹?" msgid "Delete" msgstr "消去" +#: editor/dictionary_property_edit.cpp +#, fuzzy +msgid "Change Dictionary Key" +msgstr "アニメーションã®åå‰ã‚’変更:" + +#: editor/dictionary_property_edit.cpp +#, fuzzy +msgid "Change Dictionary Value" +msgstr "é…列ã®å€¤ã‚’変更" + #: editor/editor_about.cpp msgid "Thanks from the Godot community!" msgstr "Godotコミュニティより感è¬ã‚’!" @@ -1269,12 +1287,6 @@ msgstr "知られã¦ã„ã‚‹ã™ã¹ã¦ã®" msgid "All Files (*)" msgstr "ã™ã¹ã¦ã®ãƒ•ã‚¡ã‚¤ãƒ«(*)" -#: editor/editor_file_dialog.cpp editor/editor_help.cpp editor/editor_node.cpp -#: editor/filesystem_dock.cpp editor/plugins/script_editor_plugin.cpp -#: editor/property_selector.cpp editor/quick_open.cpp scene/gui/file_dialog.cpp -msgid "Open" -msgstr "é–‹ã" - #: editor/editor_file_dialog.cpp scene/gui/file_dialog.cpp msgid "Open a File" msgstr "ファイルを開ã" @@ -1689,6 +1701,13 @@ msgid "" msgstr "" #: editor/editor_node.cpp +msgid "" +"This is a remote object so changes to it will not be kept.\n" +"Please read the documentation relevant to debugging to better understand " +"this workflow." +msgstr "" + +#: editor/editor_node.cpp #, fuzzy msgid "Copy Params" msgstr "パラメーターをコピーã™ã‚‹" @@ -1828,6 +1847,11 @@ msgid "Export Mesh Library" msgstr "メッシュライブラリã®ã‚¨ã‚¯ã‚¹ãƒãƒ¼ãƒˆ" #: editor/editor_node.cpp +#, fuzzy +msgid "This operation can't be done without a root node." +msgstr "ã“ã®å‡¦ç†ã«ã¯ã‚·ãƒ¼ãƒ³ãŒå¿…è¦ã§ã™." + +#: editor/editor_node.cpp msgid "Export Tile Set" msgstr "タイルセットã®ã‚¨ã‚¯ã‚¹ãƒãƒ¼ãƒˆ" @@ -1975,13 +1999,22 @@ msgstr "シーンタブを切り替ãˆã‚‹" #: editor/editor_node.cpp #, fuzzy -msgid "%d more file(s)" +msgid "%d more files or folders" +msgstr "%d 多ã„ファイルã‹ãƒ•ã‚©ãƒ«ãƒ€" + +#: editor/editor_node.cpp +#, fuzzy +msgid "%d more folders" msgstr "%d 多ã„ファイル" #: editor/editor_node.cpp #, fuzzy -msgid "%d more file(s) or folder(s)" -msgstr "%d 多ã„ファイルã‹ãƒ•ã‚©ãƒ«ãƒ€" +msgid "%d more files" +msgstr "%d 多ã„ファイル" + +#: editor/editor_node.cpp +msgid "Dock Position" +msgstr "" #: editor/editor_node.cpp msgid "Distraction Free Mode" @@ -1994,6 +2027,11 @@ msgstr "最低é™ãƒ¢ãƒ¼ãƒ‰" #: editor/editor_node.cpp #, fuzzy +msgid "Add a new scene." +msgstr "æ–°ã—ã„ãƒˆãƒ©ãƒƒã‚¯ã‚’è¿½åŠ ã€‚" + +#: editor/editor_node.cpp +#, fuzzy msgid "Scene" msgstr "シーン" @@ -2071,13 +2109,12 @@ msgid "TileSet.." msgstr "タイルセット.." #: editor/editor_node.cpp editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp scene/gui/line_edit.cpp -#: scene/gui/text_edit.cpp +#: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Undo" msgstr "å…ƒã«æˆ»ã™" #: editor/editor_node.cpp editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp +#: scene/gui/line_edit.cpp #, fuzzy msgid "Redo" msgstr "å†å®Ÿè¡Œ" @@ -2665,6 +2702,11 @@ msgstr "（ç¾åœ¨ã®ï¼‰" #: editor/export_template_manager.cpp #, fuzzy +msgid "Retrieving mirrors, please wait.." +msgstr "接続失敗　å†è©¦è¡Œã‚’" + +#: editor/export_template_manager.cpp +#, fuzzy msgid "Remove template version '%s'?" msgstr "テンプレート　ãƒãƒ¼ã‚¸ãƒ§ãƒ³'%s'を除去ã—ã¾ã™ã‹ï¼Ÿ" @@ -2707,6 +2749,120 @@ msgid "Importing:" msgstr "インãƒãƒ¼ãƒˆ:" #: editor/export_template_manager.cpp +msgid "" +"No download links found for this version. Direct download is only available " +"for official releases." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Can't resolve." +msgstr "解決ã§ãã¾ã›ã‚“." + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Can't connect." +msgstr "接続失敗." + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "No response." +msgstr "å¿œç”ãŒã‚ã‚Šã¾ã›ã‚“." + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Req. Failed." +msgstr "リクエスト失敗." + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Redirect Loop." +msgstr "リダイレクトã®ãƒ«ãƒ¼ãƒ—." + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Failed:" +msgstr "失敗:" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Can't write file." +msgstr "ファイルã«æ›¸ãè¾¼ã¿ã§ãã¾ã›ã‚“ã§ã—ãŸ:\n" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Download Complete." +msgstr "ダウンãƒãƒ¼ãƒ‰å¤±æ•—" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Error requesting url: " +msgstr "アトラスã®ä¿å˜ã«å¤±æ•—ã—ã¾ã—ãŸ:" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Connecting to Mirror.." +msgstr "接続ä¸.." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Disconnected" +msgstr "切æ–" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Resolving" +msgstr "解決ä¸.." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Can't Resolve" +msgstr "解決ã§ãã¾ã›ã‚“." + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Connecting.." +msgstr "接続ä¸.." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Can't Conect" +msgstr "接続失敗." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Connected" +msgstr "接続" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Requesting.." +msgstr "リクエストä¸.." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Downloading" +msgstr "ダウンãƒãƒ¼ãƒ‰" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Connection Error" +msgstr "接続ä¸.." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "SSL Handshake Error" +msgstr "èªã¿è¾¼ã¿ã‚¨ãƒ©ãƒ¼" + +#: editor/export_template_manager.cpp #, fuzzy msgid "Current Version:" msgstr "ç¾åœ¨ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³:" @@ -2736,6 +2892,15 @@ msgstr "ã™ã¹ã¦é¸æŠž" msgid "Export Template Manager" msgstr "エクスãƒãƒ¼ãƒˆã€€ãƒ†ãƒ³ãƒ—レート　マãƒãƒ¼ã‚¸ãƒ£ãƒ¼" +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Download Templates" +msgstr "é¸æŠžã—ã¦ã„ã‚‹ã‚‚ã®ã‚’削除" + +#: editor/export_template_manager.cpp +msgid "Select mirror from list: " +msgstr "" + #: editor/file_type_cache.cpp #, fuzzy msgid "Can't open file_type_cache.cch for writing, not saving file type cache!" @@ -2744,9 +2909,8 @@ msgstr "" "ä¿å˜ã§ãã¾ã›ã‚“!" #: editor/filesystem_dock.cpp -#, fuzzy -msgid "Cannot navigate to '" -msgstr "~ã«ç§»å‹•ã§ãã¾ã›ã‚“" +msgid "Cannot navigate to '%s' as it has not been found in the file system!" +msgstr "" #: editor/filesystem_dock.cpp msgid "View items as a grid of thumbnails" @@ -2764,13 +2928,6 @@ msgstr "" #: editor/filesystem_dock.cpp #, fuzzy -msgid "" -"\n" -"Source: " -msgstr "ソース:" - -#: editor/filesystem_dock.cpp -#, fuzzy msgid "Cannot move/rename resources root." msgstr "ソースã®ãƒ•ã‚©ãƒ³ãƒˆã‚’èªã¿è¾¼ã¿/処ç†ã§ãã¾ã›ã‚“." @@ -3069,9 +3226,8 @@ msgid "Remove Poly And Point" msgstr "ãƒãƒªã‚´ãƒ³ã¨ãƒã‚¤ãƒ³ãƒˆã‚’除去" #: editor/plugins/abstract_polygon_2d_editor.cpp -#: editor/plugins/light_occluder_2d_editor_plugin.cpp #, fuzzy -msgid "Create a new polygon from scratch." +msgid "Create a new polygon from scratch" msgstr "æ–°è¦ã«ãƒãƒªã‚´ãƒ³ã‚’生æˆã™ã‚‹" #: editor/plugins/abstract_polygon_2d_editor.cpp @@ -3082,6 +3238,11 @@ msgid "" "RMB: Erase Point." msgstr "" +#: editor/plugins/abstract_polygon_2d_editor.cpp +#, fuzzy +msgid "Delete points" +msgstr "ãƒã‚¤ãƒ³ãƒˆï¼ç‚¹ã‚’除去" + #: editor/plugins/animation_player_editor_plugin.cpp #, fuzzy msgid "Toggle Autoplay" @@ -3478,21 +3639,11 @@ msgstr "ホストåを解決ã§ãã¾ã›ã‚“:" #: editor/plugins/asset_library_editor_plugin.cpp #, fuzzy -msgid "Can't resolve." -msgstr "解決ã§ãã¾ã›ã‚“." - -#: editor/plugins/asset_library_editor_plugin.cpp -#, fuzzy msgid "Connection error, please try again." msgstr "接続失敗　å†è©¦è¡Œã‚’" #: editor/plugins/asset_library_editor_plugin.cpp #, fuzzy -msgid "Can't connect." -msgstr "接続失敗." - -#: editor/plugins/asset_library_editor_plugin.cpp -#, fuzzy msgid "Can't connect to host:" msgstr "ホストã«æŽ¥ç¶šã§ãã¾ã›ã‚“:" @@ -3503,36 +3654,16 @@ msgstr "ホストã‹ã‚‰å¿œç”ãŒã‚ã‚Šã¾ã›ã‚“:" #: editor/plugins/asset_library_editor_plugin.cpp #, fuzzy -msgid "No response." -msgstr "å¿œç”ãŒã‚ã‚Šã¾ã›ã‚“." - -#: editor/plugins/asset_library_editor_plugin.cpp -#, fuzzy msgid "Request failed, return code:" msgstr "リクエスト失敗　リターン コード:" #: editor/plugins/asset_library_editor_plugin.cpp #, fuzzy -msgid "Req. Failed." -msgstr "リクエスト失敗." - -#: editor/plugins/asset_library_editor_plugin.cpp -#, fuzzy msgid "Request failed, too many redirects" msgstr "リクエスト失敗　リダイレクトã®å›žæ•°ãŒå¤šã™ãŽã¾ã™" #: editor/plugins/asset_library_editor_plugin.cpp #, fuzzy -msgid "Redirect Loop." -msgstr "リダイレクトã®ãƒ«ãƒ¼ãƒ—." - -#: editor/plugins/asset_library_editor_plugin.cpp -#, fuzzy -msgid "Failed:" -msgstr "失敗:" - -#: editor/plugins/asset_library_editor_plugin.cpp -#, fuzzy msgid "Bad download hash, assuming file has been tampered with." msgstr "ダウンãƒãƒ¼ãƒ‰å†…容ã®ãƒãƒƒã‚·ãƒ¥ãŒä¸æ•´åˆã€€æ”¹ã–ã‚“ã®å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™." @@ -3568,16 +3699,6 @@ msgstr "解決ä¸.." #: editor/plugins/asset_library_editor_plugin.cpp #, fuzzy -msgid "Connecting.." -msgstr "接続ä¸.." - -#: editor/plugins/asset_library_editor_plugin.cpp -#, fuzzy -msgid "Requesting.." -msgstr "リクエストä¸.." - -#: editor/plugins/asset_library_editor_plugin.cpp -#, fuzzy msgid "Error making request" msgstr "リクエスト発行エラー" @@ -3714,6 +3835,39 @@ msgid "Move Action" msgstr "移動動作" #: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Move vertical guide" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Create new vertical guide" +msgstr "フォルダを作æˆ" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Remove vertical guide" +msgstr "無効ãªã‚ーを削除" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Move horizontal guide" +msgstr "曲線ã®ãƒã‚¤ãƒ³ãƒˆã‚’移動" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Create new horizontal guide" +msgstr "フォルダを作æˆ" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Remove horizontal guide" +msgstr "無効ãªã‚ーを削除" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Create new horizontal and vertical guides" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp #, fuzzy msgid "Edit IK Chain" msgstr "IK（インãƒãƒ¼ã‚¹ ã‚ãƒãƒžãƒ†ã‚£ã‚¯ã‚¹ï¼‰ãƒã‚§ãƒ¼ãƒ³ã®ç·¨é›†" @@ -3861,10 +4015,17 @@ msgstr "" #: editor/plugins/canvas_item_editor_plugin.cpp #, fuzzy +msgid "Snap to guides" +msgstr "Snapモード:" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy msgid "Lock the selected object in place (can't be moved)." msgstr "é¸æŠžã—ãŸã‚ªãƒ–ジェクトをãƒãƒƒã‚¯ã—ã¦ç§»å‹•ä¸èƒ½ã¨ã™ã‚‹." #: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp #, fuzzy msgid "Unlock the selected object (can be moved)." msgstr "é¸æŠžã—ãŸã‚ªãƒ–ジェクトをãƒãƒƒã‚¯è§£é™¤ã—ã¦ç§»å‹•å¯èƒ½ã¨ã™ã‚‹." @@ -3927,6 +4088,11 @@ msgstr "ボーンを表示ã™ã‚‹" #: editor/plugins/canvas_item_editor_plugin.cpp #, fuzzy +msgid "Show guides" +msgstr "ボーンを表示ã™ã‚‹" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy msgid "Center Selection" msgstr "é¸æŠžå¯¾è±¡ã‚’ä¸å¤®ã«" @@ -4135,6 +4301,10 @@ msgstr "" msgid "Hold Shift to edit tangents individually" msgstr "" +#: editor/plugins/gi_probe_editor_plugin.cpp +msgid "Bake GI Probe" +msgstr "" + #: editor/plugins/gradient_editor_plugin.cpp msgid "Add/Remove Color Ramp Point" msgstr "色変化ã®å‚¾æ–œã«ã€ãƒã‚¤ãƒ³ãƒˆï¼ç‚¹ã‚’è¿½åŠ ã¾ãŸã¯é™¤åŽ»ã™ã‚‹" @@ -4168,6 +4338,11 @@ msgid "Create Occluder Polygon" msgstr "オクルージョンを生ã˜ã‚‹ãƒãƒªã‚´ãƒ³ã‚’生æˆ" #: editor/plugins/light_occluder_2d_editor_plugin.cpp +#, fuzzy +msgid "Create a new polygon from scratch." +msgstr "æ–°è¦ã«ãƒãƒªã‚´ãƒ³ã‚’生æˆã™ã‚‹" + +#: editor/plugins/light_occluder_2d_editor_plugin.cpp msgid "Edit existing polygon:" msgstr "æ—¢å˜ã®ãƒãƒªã‚´ãƒ³ã‚’編集:" @@ -4184,63 +4359,6 @@ msgstr "Ctrl+マウス左ボタン: セグメントを分割" msgid "RMB: Erase Point." msgstr "マウスå³ãƒœã‚¿ãƒ³:ãƒã‚¤ãƒ³ãƒˆï¼ç‚¹ã‚’除去." -#: editor/plugins/line_2d_editor_plugin.cpp -#, fuzzy -msgid "Remove Point from Line2D" -msgstr "Line2Dã‹ã‚‰ãƒã‚¤ãƒ³ãƒˆï¼ç‚¹ã‚’除去" - -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Add Point to Line2D" -msgstr "Line2Dã«ãƒã‚¤ãƒ³ãƒˆï¼ç‚¹ã‚’è¿½åŠ " - -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Move Point in Line2D" -msgstr "Line2D ã®ãƒã‚¤ãƒ³ãƒˆï¼ç‚¹ã‚’移動" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Select Points" -msgstr "ãƒã‚¤ãƒ³ãƒˆï¼ç‚¹ã‚’é¸æŠž" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -#, fuzzy -msgid "Shift+Drag: Select Control Points" -msgstr "Shift+ドラッグ:コントãƒãƒ¼ãƒ«ãƒã‚¤ãƒ³ãƒˆã‚’é¸æŠž" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -#, fuzzy -msgid "Click: Add Point" -msgstr "クリック:ãƒã‚¤ãƒ³ãƒˆï¼ç‚¹ã‚’è¿½åŠ " - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -#, fuzzy -msgid "Right Click: Delete Point" -msgstr "å³ã‚¯ãƒªãƒƒã‚¯:ãƒã‚¤ãƒ³ãƒˆï¼ç‚¹ã‚’除去" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -#, fuzzy -msgid "Add Point (in empty space)" -msgstr "ãƒã‚¤ãƒ³ãƒˆï¼ç‚¹ã‚’è¿½åŠ ï¼ˆç©ºç™½ã«ï¼‰" - -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Split Segment (in line)" -msgstr "セグメント分割（線分内ã§ï¼‰" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Delete Point" -msgstr "ãƒã‚¤ãƒ³ãƒˆï¼ç‚¹ã‚’除去" - #: editor/plugins/mesh_instance_editor_plugin.cpp #, fuzzy msgid "Mesh is empty!" @@ -4715,17 +4833,51 @@ msgid "Move Out-Control in Curve" msgstr "曲線ã®Out-ãƒãƒ³ãƒ‰ãƒ«ã‚’移動ã™ã‚‹" #: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Select Points" +msgstr "ãƒã‚¤ãƒ³ãƒˆï¼ç‚¹ã‚’é¸æŠž" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +#, fuzzy +msgid "Shift+Drag: Select Control Points" +msgstr "Shift+ドラッグ:コントãƒãƒ¼ãƒ«ãƒã‚¤ãƒ³ãƒˆã‚’é¸æŠž" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +#, fuzzy +msgid "Click: Add Point" +msgstr "クリック:ãƒã‚¤ãƒ³ãƒˆï¼ç‚¹ã‚’è¿½åŠ " + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +#, fuzzy +msgid "Right Click: Delete Point" +msgstr "å³ã‚¯ãƒªãƒƒã‚¯:ãƒã‚¤ãƒ³ãƒˆï¼ç‚¹ã‚’除去" + +#: editor/plugins/path_2d_editor_plugin.cpp msgid "Select Control Points (Shift+Drag)" msgstr "コントãƒãƒ¼ãƒ«ãƒã‚¤ãƒ³ãƒˆã‚’é¸ã¶ (Shift+Drag)" #: editor/plugins/path_2d_editor_plugin.cpp #: editor/plugins/path_editor_plugin.cpp #, fuzzy +msgid "Add Point (in empty space)" +msgstr "ãƒã‚¤ãƒ³ãƒˆï¼ç‚¹ã‚’è¿½åŠ ï¼ˆç©ºç™½ã«ï¼‰" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +#, fuzzy msgid "Split Segment (in curve)" msgstr "分割ã™ã‚‹(曲線を)" #: editor/plugins/path_2d_editor_plugin.cpp #: editor/plugins/path_editor_plugin.cpp +msgid "Delete Point" +msgstr "ãƒã‚¤ãƒ³ãƒˆï¼ç‚¹ã‚’除去" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp msgid "Close Curve" msgstr "曲線を閉ã˜ã‚‹" @@ -4885,7 +5037,6 @@ msgstr "リソースをèªã¿è¾¼ã‚€" #: editor/plugins/resource_preloader_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp #: editor/plugins/sprite_frames_editor_plugin.cpp editor/property_editor.cpp #: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Paste" @@ -4933,6 +5084,21 @@ msgid " Class Reference" msgstr "" #: editor/plugins/script_editor_plugin.cpp +#, fuzzy +msgid "Sort" +msgstr "並ã¹æ›¿ãˆ:" + +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp +msgid "Move Up" +msgstr "上ã«ç§»å‹•" + +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp +msgid "Move Down" +msgstr "下ã«ç§»å‹•" + +#: editor/plugins/script_editor_plugin.cpp msgid "Next script" msgstr "次ã®ã‚¹ã‚¯ãƒªãƒ—ト" @@ -4989,6 +5155,10 @@ msgstr "é–‰ã˜ã‚‹" msgid "Close All" msgstr "é–‰ã˜ã‚‹" +#: editor/plugins/script_editor_plugin.cpp +msgid "Close Other Tabs" +msgstr "" + #: editor/plugins/script_editor_plugin.cpp editor/project_manager.cpp msgid "Run" msgstr "実行" @@ -5000,14 +5170,12 @@ msgstr "ãŠæ°—ã«å…¥ã‚Šã‚’切り替ãˆã‚‹" #: editor/plugins/script_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp #, fuzzy msgid "Find.." msgstr "検索.." #: editor/plugins/script_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp #, fuzzy msgid "Find Next" msgstr "次を探ã™" @@ -5121,33 +5289,22 @@ msgstr "å°æ–‡å—" msgid "Capitalize" msgstr "å…ˆé を大文å—ã«" -#: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp scene/gui/line_edit.cpp +#: editor/plugins/script_text_editor.cpp scene/gui/line_edit.cpp #: scene/gui/text_edit.cpp msgid "Cut" msgstr "切りå–ã‚Š" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp #: editor/plugins/sprite_frames_editor_plugin.cpp editor/property_editor.cpp #: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Copy" msgstr "コピー" -#: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp scene/gui/line_edit.cpp +#: editor/plugins/script_text_editor.cpp scene/gui/line_edit.cpp #: scene/gui/text_edit.cpp msgid "Select All" msgstr "ã™ã¹ã¦é¸æŠž" -#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp -msgid "Move Up" -msgstr "上ã«ç§»å‹•" - -#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp -msgid "Move Down" -msgstr "下ã«ç§»å‹•" - #: editor/plugins/script_text_editor.cpp #, fuzzy msgid "Delete Line" @@ -5173,6 +5330,23 @@ msgstr "複製ã—ã¦ãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰" #: editor/plugins/script_text_editor.cpp #, fuzzy +msgid "Fold Line" +msgstr "è¡Œã«ç§»å‹•" + +#: editor/plugins/script_text_editor.cpp +msgid "Unfold Line" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Fold All Lines" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Unfold All Lines" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +#, fuzzy msgid "Complete Symbol" msgstr "記å·ã™ã¹ã¦" @@ -5219,12 +5393,10 @@ msgid "Convert To Lowercase" msgstr "å°æ–‡å—ã«å¤‰æ›" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Find Previous" msgstr "å‰ã‚’検索" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Replace.." msgstr "ç½®ãæ›ãˆ.." @@ -5234,7 +5406,6 @@ msgid "Goto Function.." msgstr "関数～ã«ç§»å‹•.." #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp #, fuzzy msgid "Goto Line.." msgstr "～行ã«ç§»å‹•.." @@ -5418,6 +5589,16 @@ msgid "View Plane Transform." msgstr "ビュー平é¢ãƒˆãƒ©ãƒ³ã‚¹ãƒ•ã‚©ãƒ¼ãƒ ." #: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Scaling: " +msgstr "縮尺:" + +#: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Translating: " +msgstr "翻訳:" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Rotating %s degrees." msgstr "%s 度回転." @@ -5499,6 +5680,10 @@ msgid "Vertices" msgstr "é ‚ç‚¹" #: editor/plugins/spatial_editor_plugin.cpp +msgid "FPS" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Align with view" msgstr "シーンビューã«ã‚«ãƒ¡ãƒ©ã‚’åˆã‚ã›ã‚‹ï¼ˆAlign With View）" @@ -5536,6 +5721,16 @@ msgid "View Information" msgstr "æƒ…å ±ã‚’è¡¨ç¤º" #: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "View FPS" +msgstr "ビューファイル:" + +#: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Half Resolution" +msgstr "縮尺(Scale)ã®é¸æŠž" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Audio Listener" msgstr "" @@ -5674,6 +5869,11 @@ msgstr "拡大縮å°ãƒ„ール" #: editor/plugins/spatial_editor_plugin.cpp #, fuzzy +msgid "Toggle Freelook" +msgstr "フルスクリーンã®åˆ‡ã‚Šæ›¿ãˆ" + +#: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy msgid "Transform" msgstr "トランスフォーム" @@ -5968,6 +6168,11 @@ msgstr "空ã®ã‚¨ãƒ‡ã‚£ã‚¿ãƒ†ãƒ³ãƒ—レートを生æˆ" #: editor/plugins/theme_editor_plugin.cpp #, fuzzy +msgid "Create From Current Editor Theme" +msgstr "空ã®ã‚¨ãƒ‡ã‚£ã‚¿ãƒ†ãƒ³ãƒ—レートを生æˆ" + +#: editor/plugins/theme_editor_plugin.cpp +#, fuzzy msgid "CheckBox Radio1" msgstr "ãƒã‚§ãƒƒã‚¯ãƒœãƒƒã‚¯ã‚¹ã€€Radio1" @@ -6154,7 +6359,7 @@ msgstr "実行å¯èƒ½" #: editor/project_export.cpp #, fuzzy -msgid "Delete patch '" +msgid "Delete patch '%s' from list?" msgstr "パッãƒé™¤åŽ»'" #: editor/project_export.cpp @@ -6491,10 +6696,6 @@ msgid "Add Input Action Event" msgstr "å…¥åŠ›ã‚¢ã‚¯ã‚·ãƒ§ãƒ³ã‚¤ãƒ™ãƒ³ãƒˆã‚’è¿½åŠ " #: editor/project_settings_editor.cpp editor/settings_config_dialog.cpp -msgid "Meta+" -msgstr "Meta+" - -#: editor/project_settings_editor.cpp editor/settings_config_dialog.cpp msgid "Shift+" msgstr "Shift+" @@ -6627,13 +6828,12 @@ msgstr "" #: editor/project_settings_editor.cpp #, fuzzy -msgid "No property '" +msgid "No property '%s' exists." msgstr "プãƒãƒ‘ティ:" #: editor/project_settings_editor.cpp -#, fuzzy -msgid "Setting '" -msgstr "è¨å®š" +msgid "Setting '%s' is internal, and it can't be deleted." +msgstr "" #: editor/project_settings_editor.cpp #, fuzzy @@ -7166,6 +7366,16 @@ msgstr "é¸æŠžã—ãŸãƒŽãƒ¼ãƒ‰ã®ã‚¹ã‚¯ãƒªãƒ—トをクリア" #: editor/scene_tree_dock.cpp #, fuzzy +msgid "Remote" +msgstr "削除" + +#: editor/scene_tree_dock.cpp +#, fuzzy +msgid "Local" +msgstr "ãƒã‚±ãƒ¼ãƒ«" + +#: editor/scene_tree_dock.cpp +#, fuzzy msgid "Clear Inheritance? (No Undo!)" msgstr "継承をクリアã—ã¾ã™ã‹ï¼Ÿï¼ˆundoã§ãã¾ã›ã‚“!)" @@ -7379,6 +7589,11 @@ msgid "Attach Node Script" msgstr "ノードã«ã‚¹ã‚¯ãƒªãƒ—トを添付ã™ã‚‹" #: editor/script_editor_debugger.cpp +#, fuzzy +msgid "Remote " +msgstr "削除" + +#: editor/script_editor_debugger.cpp msgid "Bytes:" msgstr "ãƒã‚¤ãƒˆ:" @@ -7437,18 +7652,6 @@ msgid "Stack Trace (if applicable):" msgstr "スタックトレース（å¯èƒ½ãªã‚‰ï¼‰:" #: editor/script_editor_debugger.cpp -msgid "Remote Inspector" -msgstr "リモートインスペクター" - -#: editor/script_editor_debugger.cpp -msgid "Live Scene Tree:" -msgstr "" - -#: editor/script_editor_debugger.cpp -msgid "Remote Object Properties: " -msgstr "リモートオブジェクトã®ãƒ—ãƒãƒ‘ティ: " - -#: editor/script_editor_debugger.cpp msgid "Profiler" msgstr "プãƒãƒ•ã‚¡ã‚¤ãƒ©ãƒ¼" @@ -7588,55 +7791,55 @@ msgstr "" msgid "GDNative" msgstr "" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp #: modules/visual_script/visual_script_builtin_funcs.cpp #, fuzzy msgid "Invalid type argument to convert(), use TYPE_* constants." msgstr "Convert()ã«å¯¾ã—ã¦ç„¡åŠ¹ãªåž‹ã®å¼•æ•°ã§ã™ã€‚TYPE_* 定数を使ã£ã¦ãã ã•ã„。" -#: modules/gdscript/gd_functions.cpp modules/mono/glue/glue_header.h +#: modules/gdscript/gdscript_functions.cpp modules/mono/glue/glue_header.h #: modules/visual_script/visual_script_builtin_funcs.cpp #, fuzzy msgid "Not enough bytes for decoding bytes, or invalid format." msgstr "デコードãƒã‚¤ãƒˆã®ãƒã‚¤ãƒˆã¯å分ã§ã¯ã‚ã‚Šã¾ã›ã‚“。ã¾ãŸã¯ç„¡åŠ¹ãªå½¢å¼ã§ã™ã€‚" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "step argument is zero!" msgstr "ステップ引数ã¯ã‚¼ãƒã§ã™ï¼" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Not a script with an instance" msgstr "インスタンスを使用ã—ã¦ã„ãªã„スクリプトã§ã™" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Not based on a script" msgstr "スクリプトã«åŸºã¥ã„ã¦ã„ã¾ã›ã‚“" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Not based on a resource file" msgstr "リソースファイルã«åŸºã¥ã„ã¦ã„ã¾ã›ã‚“" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp #, fuzzy msgid "Invalid instance dictionary format (missing @path)" msgstr "無効ãªã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹è¾žæ›¸å½¢å¼ã§ã™ ( @path ãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“)" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp #, fuzzy msgid "Invalid instance dictionary format (can't load script at @path)" msgstr "無効ãªã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹è¾žæ›¸å½¢å¼ã§ã™ (@path ã§ã‚¹ã‚¯ãƒªãƒ—トをèªã¿è¾¼ã‚ã¾ã›ã‚“)" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp #, fuzzy msgid "Invalid instance dictionary format (invalid script at @path)" msgstr "無効ãªã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹è¾žæ›¸å½¢å¼ã§ã™ (@path ã§ç„¡åŠ¹ãªã‚¹ã‚¯ãƒªãƒ—ト)" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp #, fuzzy msgid "Invalid instance dictionary (invalid subclasses)" msgstr "無効ãªã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹è¾žæ›¸ã§ã™ (無効ãªã‚µãƒ–クラス)" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Object can't provide a length." msgstr "" @@ -7651,16 +7854,26 @@ msgid "GridMap Duplicate Selection" msgstr "é¸æŠžç¯„囲を複製" #: modules/gridmap/grid_map_editor_plugin.cpp +msgid "Floor:" +msgstr "" + +#: modules/gridmap/grid_map_editor_plugin.cpp +#, fuzzy +msgid "Grid Map" +msgstr "グリッドSnap" + +#: modules/gridmap/grid_map_editor_plugin.cpp #, fuzzy msgid "Snap View" msgstr "上é¢å›³" #: modules/gridmap/grid_map_editor_plugin.cpp -msgid "Prev Level (%sDown Wheel)" -msgstr "" +#, fuzzy +msgid "Previous Floor" +msgstr "以å‰ã®ã‚¿ãƒ–" #: modules/gridmap/grid_map_editor_plugin.cpp -msgid "Next Level (%sUp Wheel)" +msgid "Next Floor" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp @@ -7736,13 +7949,8 @@ msgstr "タイルマップを消去" #: modules/gridmap/grid_map_editor_plugin.cpp #, fuzzy -msgid "Selection -> Duplicate" -msgstr "é¸æŠžç¯„囲ã®ã¿" - -#: modules/gridmap/grid_map_editor_plugin.cpp -#, fuzzy -msgid "Selection -> Clear" -msgstr "é¸æŠžç¯„囲ã®ã¿" +msgid "Clear Selection" +msgstr "é¸æŠžå¯¾è±¡ã‚’ä¸å¤®ã«" #: modules/gridmap/grid_map_editor_plugin.cpp #, fuzzy @@ -7891,7 +8099,7 @@ msgstr "グラフノードを複製" #: modules/visual_script/visual_script_editor.cpp #, fuzzy -msgid "Hold Meta to drop a Getter. Hold Shift to drop a generic signature." +msgid "Hold %s to drop a Getter. Hold Shift to drop a generic signature." msgstr "" "メタã‚ーをä¿æŒã—ã¦getterã‚’è½ã¨ã™.Shiftã‚ーをä¿æŒã—ã¦ã‚¸ã‚§ãƒãƒªãƒƒã‚¯ã‚’指示ã™ã‚‹." @@ -7903,7 +8111,7 @@ msgstr "" #: modules/visual_script/visual_script_editor.cpp #, fuzzy -msgid "Hold Meta to drop a simple reference to the node." +msgid "Hold %s to drop a simple reference to the node." msgstr "メタã‚ーをä¿æŒã—ã¦å˜ç´”å‚照（simple reference)ã‚’è½ã¨ã™." #: modules/visual_script/visual_script_editor.cpp @@ -7913,7 +8121,7 @@ msgstr "Ctrlã‚ーをä¿æŒã—ã¦å˜ç´”å‚照（simple reference)ã‚’è½ã¨ã™." #: modules/visual_script/visual_script_editor.cpp #, fuzzy -msgid "Hold Meta to drop a Variable Setter." +msgid "Hold %s to drop a Variable Setter." msgstr "メタã‚ーをä¿æŒã—ã¦å¤‰æ•°ã®setterã‚’è½ã¨ã™" #: modules/visual_script/visual_script_editor.cpp @@ -8187,13 +8395,24 @@ msgid "Could not write file:\n" msgstr "ファイルã«æ›¸ãè¾¼ã¿ã§ãã¾ã›ã‚“ã§ã—ãŸ:\n" #: platform/javascript/export/export.cpp -msgid "Could not read file:\n" +#, fuzzy +msgid "Could not open template for export:\n" +msgstr "エクスãƒãƒ¼ãƒˆã™ã‚‹ãƒ†ãƒ³ãƒ—レートを開ã‘ã¾ã›ã‚“:\n" + +#: platform/javascript/export/export.cpp +#, fuzzy +msgid "Invalid export template:\n" +msgstr "テンプレート エクスãƒãƒ¼ãƒˆã‚’管ç†" + +#: platform/javascript/export/export.cpp +#, fuzzy +msgid "Could not read custom HTML shell:\n" msgstr "ファイルをèªã‚ã¾ã›ã‚“ã§ã—ãŸ:\n" #: platform/javascript/export/export.cpp #, fuzzy -msgid "Could not open template for export:\n" -msgstr "エクスãƒãƒ¼ãƒˆã™ã‚‹ãƒ†ãƒ³ãƒ—レートを開ã‘ã¾ã›ã‚“:\n" +msgid "Could not read boot splash image file:\n" +msgstr "ファイルをèªã‚ã¾ã›ã‚“ã§ã—ãŸ:\n" #: scene/2d/animated_sprite.cpp msgid "" @@ -8314,23 +8533,6 @@ msgid "Path property must point to a valid Node2D node to work." msgstr "" "Path プãƒãƒ‘ティã¯ã€å‹•ä½œã™ã‚‹ã‚ˆã†ã«æœ‰åŠ¹ãª Node2D ノードを示ã™å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚" -#: scene/2d/sprite.cpp -msgid "" -"Path property must point to a valid Viewport node to work. Such Viewport " -"must be set to 'render target' mode." -msgstr "" -"Path プãƒãƒ‘ティã¯ã€å‹•ä½œã™ã‚‹ã‚ˆã†ã«æœ‰åŠ¹ãªãƒ“ューãƒãƒ¼ãƒˆ ノードをãƒã‚¤ãƒ³ãƒˆã™ã‚‹å¿…è¦" -"ãŒã‚ã‚Šã¾ã™ã€‚ã“ã®ã‚ˆã†ãªãƒ“ューãƒãƒ¼ãƒˆã¯ã€'render target' モードã«è¨å®šã™ã‚‹å¿…è¦ãŒ" -"ã‚ã‚Šã¾ã™ã€‚" - -#: scene/2d/sprite.cpp -msgid "" -"The Viewport set in the path property must be set as 'render target' in " -"order for this sprite to work." -msgstr "" -"Path プãƒãƒ‘ティã«è¨å®šã—ãŸãƒ“ューãƒãƒ¼ãƒˆã¯ã€ã“ã®ã‚¹ãƒ—ライトã®å‹•ä½œã™ã‚‹é †åºã§ " -"'render target' ã¨ã—ã¦è¨å®šã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚" - #: scene/2d/visibility_notifier_2d.cpp msgid "" "VisibilityEnable2D works best when used with the edited scene root directly " @@ -8400,6 +8602,15 @@ msgstr "" "関数㮠CollisionShape ã®å½¢çŠ¶ã‚’指定ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚ãã‚Œã®ãŸã‚ã®ã‚·ã‚§ã‚¤ãƒ—リ" "ソースを作æˆã—ã¦ãã ã•ã„!" +#: scene/3d/gi_probe.cpp +#, fuzzy +msgid "Plotting Meshes" +msgstr "イメージをé…ç½®(Blit)" + +#: scene/3d/gi_probe.cpp +msgid "Finishing Plot" +msgstr "" + #: scene/3d/navigation_mesh.cpp msgid "A NavigationMesh resource must be set or created for this node to work." msgstr "" @@ -8499,6 +8710,10 @@ msgstr "" "ã‚’åã¨ã™ã‚‹ã‹ã€ã‚³ãƒ³ãƒˆãƒãƒ¼ãƒ«ã‚’カスタム最å°ã‚µã‚¤ã‚ºã«ãƒžãƒ‹ãƒ¥ã‚¢ãƒ«ã§æŒ‡å®šã—ã¦ä½¿ç”¨ã—ã¦" "ãã ã•ã„." +#: scene/gui/tree.cpp +msgid "(Other)" +msgstr "" + #: scene/main/scene_tree.cpp #, fuzzy msgid "" @@ -8536,6 +8751,65 @@ msgstr "フォントèªã¿è¾¼ã¿ã‚¨ãƒ©ãƒ¼ã€‚" msgid "Invalid font size." msgstr "無効ãªãƒ•ã‚©ãƒ³ãƒˆ サイズã§ã™ã€‚" +#, fuzzy +#~ msgid "Cannot navigate to '" +#~ msgstr "~ã«ç§»å‹•ã§ãã¾ã›ã‚“" + +#, fuzzy +#~ msgid "" +#~ "\n" +#~ "Source: " +#~ msgstr "ソース:" + +#, fuzzy +#~ msgid "Remove Point from Line2D" +#~ msgstr "Line2Dã‹ã‚‰ãƒã‚¤ãƒ³ãƒˆï¼ç‚¹ã‚’除去" + +#~ msgid "Add Point to Line2D" +#~ msgstr "Line2Dã«ãƒã‚¤ãƒ³ãƒˆï¼ç‚¹ã‚’è¿½åŠ " + +#~ msgid "Move Point in Line2D" +#~ msgstr "Line2D ã®ãƒã‚¤ãƒ³ãƒˆï¼ç‚¹ã‚’移動" + +#~ msgid "Split Segment (in line)" +#~ msgstr "セグメント分割（線分内ã§ï¼‰" + +#~ msgid "Meta+" +#~ msgstr "Meta+" + +#, fuzzy +#~ msgid "Setting '" +#~ msgstr "è¨å®š" + +#~ msgid "Remote Inspector" +#~ msgstr "リモートインスペクター" + +#~ msgid "Remote Object Properties: " +#~ msgstr "リモートオブジェクトã®ãƒ—ãƒãƒ‘ティ: " + +#, fuzzy +#~ msgid "Selection -> Duplicate" +#~ msgstr "é¸æŠžç¯„囲ã®ã¿" + +#, fuzzy +#~ msgid "Selection -> Clear" +#~ msgstr "é¸æŠžç¯„囲ã®ã¿" + +#~ msgid "" +#~ "Path property must point to a valid Viewport node to work. Such Viewport " +#~ "must be set to 'render target' mode." +#~ msgstr "" +#~ "Path プãƒãƒ‘ティã¯ã€å‹•ä½œã™ã‚‹ã‚ˆã†ã«æœ‰åŠ¹ãªãƒ“ューãƒãƒ¼ãƒˆ ノードをãƒã‚¤ãƒ³ãƒˆã™ã‚‹å¿…" +#~ "è¦ãŒã‚ã‚Šã¾ã™ã€‚ã“ã®ã‚ˆã†ãªãƒ“ューãƒãƒ¼ãƒˆã¯ã€'render target' モードã«è¨å®šã™ã‚‹å¿…" +#~ "è¦ãŒã‚ã‚Šã¾ã™ã€‚" + +#~ msgid "" +#~ "The Viewport set in the path property must be set as 'render target' in " +#~ "order for this sprite to work." +#~ msgstr "" +#~ "Path プãƒãƒ‘ティã«è¨å®šã—ãŸãƒ“ューãƒãƒ¼ãƒˆã¯ã€ã“ã®ã‚¹ãƒ—ライトã®å‹•ä½œã™ã‚‹é †åºã§ " +#~ "'render target' ã¨ã—ã¦è¨å®šã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚" + #~ msgid "Filter:" #~ msgstr "フィルター:" @@ -8562,10 +8836,6 @@ msgstr "無効ãªãƒ•ã‚©ãƒ³ãƒˆ サイズã§ã™ã€‚" #~ msgstr "å–り除ã„ãŸã®ã¯:" #, fuzzy -#~ msgid "Error saving atlas:" -#~ msgstr "アトラスã®ä¿å˜ã«å¤±æ•—ã—ã¾ã—ãŸ:" - -#, fuzzy #~ msgid "Could not save atlas subtexture:" #~ msgstr "アトラスã®è¦ç´ ã§ã‚るテクスãƒãƒ£ã®ä¿å˜ãŒã§ãã¾ã›ã‚“:" @@ -9044,10 +9314,6 @@ msgstr "無効ãªãƒ•ã‚©ãƒ³ãƒˆ サイズã§ã™ã€‚" #~ msgstr "イメージをクãƒãƒƒãƒ”ング（トリミング）" #, fuzzy -#~ msgid "Blitting Images" -#~ msgstr "イメージをé…ç½®(Blit)" - -#, fuzzy #~ msgid "Couldn't save atlas image:" #~ msgstr "アトラスイメージをä¿å˜ã§ãã¾ã›ã‚“ã§ã—ãŸ:" diff --git a/editor/translations/ko.po b/editor/translations/ko.po index 02141b6dc3..99d73d786e 100644 --- a/editor/translations/ko.po +++ b/editor/translations/ko.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: Godot Engine editor\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2017-10-24 20:47+0000\n" +"PO-Revision-Date: 2017-11-14 12:48+0000\n" "Last-Translator: 박한얼 <volzhs@gmail.com>\n" "Language-Team: Korean <https://hosted.weblate.org/projects/godot-engine/" "godot/ko/>\n" @@ -19,7 +19,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Weblate 2.17\n" +"X-Generator: Weblate 2.18-dev\n" #: editor/animation_editor.cpp msgid "Disabled" @@ -102,6 +102,7 @@ msgid "Anim Delete Keys" msgstr "키 ì‚ì œ" #: editor/animation_editor.cpp editor/plugins/tile_map_editor_plugin.cpp +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Duplicate Selection" msgstr "ì„ íƒí‚¤ ë³µì œ" @@ -637,6 +638,13 @@ msgstr "ì¢…ì† ê´€ê³„ 편집기" msgid "Search Replacement Resource:" msgstr "대체 리소스 검색:" +#: editor/dependency_editor.cpp editor/editor_file_dialog.cpp +#: editor/editor_help.cpp editor/editor_node.cpp editor/filesystem_dock.cpp +#: editor/plugins/script_editor_plugin.cpp editor/property_selector.cpp +#: editor/quick_open.cpp scene/gui/file_dialog.cpp +msgid "Open" +msgstr "열기" + #: editor/dependency_editor.cpp msgid "Owners Of:" msgstr "ì†Œìœ ìž:" @@ -709,6 +717,16 @@ msgstr "ì„ íƒëœ 파ì¼ë“¤ì„ ì‚ì œí•˜ì‹œê² ìŠµë‹ˆê¹Œ?" msgid "Delete" msgstr "ì‚ì œ" +#: editor/dictionary_property_edit.cpp +#, fuzzy +msgid "Change Dictionary Key" +msgstr "ì• ë‹ˆë©”ì´ì…˜ ì´ë¦„ 변경:" + +#: editor/dictionary_property_edit.cpp +#, fuzzy +msgid "Change Dictionary Value" +msgstr "ë°°ì—´ ê°’ 변경" + #: editor/editor_about.cpp msgid "Thanks from the Godot community!" msgstr "Godot ì»¤ë®¤ë‹ˆí‹°ì— ê°ì‚¬ë“œë¦½ë‹ˆë‹¤!" @@ -847,9 +865,8 @@ msgid "Toggle Audio Bus Mute" msgstr "오디오 버스 뮤트 í† ê¸€" #: editor/editor_audio_buses.cpp -#, fuzzy msgid "Toggle Audio Bus Bypass Effects" -msgstr "오디오 버스 ì´íŽ™íŠ¸ 무시 í† ê¸€" +msgstr "오디오 버스 ë°”ì´íŒ¨ìŠ¤ ì´íŽ™íŠ¸ í† ê¸€" #: editor/editor_audio_buses.cpp msgid "Select Audio Bus Send" @@ -880,7 +897,6 @@ msgid "Mute" msgstr "뮤트" #: editor/editor_audio_buses.cpp -#, fuzzy msgid "Bypass" msgstr "ë°”ì´íŒ¨ìŠ¤" @@ -1131,12 +1147,6 @@ msgstr "ì¸ì‹ 가능한 ëª¨ë“ íŒŒì¼" msgid "All Files (*)" msgstr "ëª¨ë“ íŒŒì¼ (*)" -#: editor/editor_file_dialog.cpp editor/editor_help.cpp editor/editor_node.cpp -#: editor/filesystem_dock.cpp editor/plugins/script_editor_plugin.cpp -#: editor/property_selector.cpp editor/quick_open.cpp scene/gui/file_dialog.cpp -msgid "Open" -msgstr "열기" - #: editor/editor_file_dialog.cpp scene/gui/file_dialog.cpp msgid "Open a File" msgstr "íŒŒì¼ ì—´ê¸°" @@ -1326,7 +1336,6 @@ msgid "Property Description:" msgstr "ì†ì„± 설명:" #: editor/editor_help.cpp -#, fuzzy msgid "" "There is currently no description for this property. Please help us by " "[color=$color][url=$url]contributing one[/url][/color]!" @@ -1506,6 +1515,17 @@ msgstr "" "를 확ì¸í•´ì£¼ì‹ì‹œì˜¤." #: editor/editor_node.cpp +#, fuzzy +msgid "" +"This is a remote object so changes to it will not be kept.\n" +"Please read the documentation relevant to debugging to better understand " +"this workflow." +msgstr "" +"ì´ ë¦¬ì†ŒìŠ¤ëŠ” ê°€ì ¸ì™”ë˜ ì”¬ì— ì†í•œ 것ì´ë¯€ë¡œ ìˆ˜ì •í• ìˆ˜ 없습니다.\n" +"ê´€ë ¨ ìž‘ì—… ì ˆì°¨ë¥¼ ë” ìž˜ ì´í•´í•˜ë ¤ë©´ 씬 ê°€ì ¸ì˜¤ê¸°(scene importing)ê³¼ ê´€ë ¨ëœ ë¬¸ì„œ" +"를 확ì¸í•´ì£¼ì‹ì‹œì˜¤." + +#: editor/editor_node.cpp msgid "Copy Params" msgstr "ì†ì„± 복사" @@ -1621,6 +1641,11 @@ msgid "Export Mesh Library" msgstr "메쉬 ë¼ì´ë¸ŒëŸ¬ë¦¬ 내보내기" #: editor/editor_node.cpp +#, fuzzy +msgid "This operation can't be done without a root node." +msgstr "ì´ ìž‘ì—…ì€ ì„ íƒëœ 노드가 ì—†ì„때는 불가합니다." + +#: editor/editor_node.cpp msgid "Export Tile Set" msgstr "íƒ€ì¼ ì…‹ 내보내기" @@ -1685,19 +1710,16 @@ msgid "Pick a Main Scene" msgstr "ë©”ì¸ ì”¬ ì„ íƒ" #: editor/editor_node.cpp -#, fuzzy msgid "Unable to enable addon plugin at: '%s' parsing of config failed." -msgstr "ì´ ê³³ì— ìžˆëŠ” 확장기능 플러그ì¸ì„ í™œì„±í™”í• ìˆ˜ 없습니다: '" +msgstr "확장기능 플러그ì¸ì„ í™œì„±í™”í• ìˆ˜ 없습니다: '%s' ì„¤ì • í•´ì„ ì‹¤íŒ¨." #: editor/editor_node.cpp -#, fuzzy msgid "Unable to find script field for addon plugin at: 'res://addons/%s'." -msgstr "ì´ ê³³ì— ìžˆëŠ” 확장기능 플러그ì¸ì„ í™œì„±í™”í• ìˆ˜ 없습니다: '" +msgstr "확장기능 플러그ì¸ì„ ì°¾ì„ ìˆ˜ 없습니다: 'res://addons/%s'." #: editor/editor_node.cpp -#, fuzzy msgid "Unable to load addon script from path: '%s'." -msgstr "ì´ ê³³ì— ìžˆëŠ” 확장기능 플러그ì¸ì„ í™œì„±í™”í• ìˆ˜ 없습니다: '" +msgstr "확장기능 스í¬ë¦½íŠ¸ë¥¼ ë¡œë“œí• ìˆ˜ 없습니다: '%s'." #: editor/editor_node.cpp msgid "" @@ -1755,12 +1777,23 @@ msgid "Switch Scene Tab" msgstr "씬 íƒ ì „í™˜" #: editor/editor_node.cpp -msgid "%d more file(s)" +#, fuzzy +msgid "%d more files or folders" +msgstr "%dê°œ 추가 íŒŒì¼ ë˜ëŠ” í´ë”" + +#: editor/editor_node.cpp +#, fuzzy +msgid "%d more folders" msgstr "%dê°œ 추가파ì¼" #: editor/editor_node.cpp -msgid "%d more file(s) or folder(s)" -msgstr "%dê°œ 추가 íŒŒì¼ ë˜ëŠ” í´ë”" +#, fuzzy +msgid "%d more files" +msgstr "%dê°œ 추가파ì¼" + +#: editor/editor_node.cpp +msgid "Dock Position" +msgstr "" #: editor/editor_node.cpp msgid "Distraction Free Mode" @@ -1771,6 +1804,11 @@ msgid "Toggle distraction-free mode." msgstr "집중 모드 í† ê¸€." #: editor/editor_node.cpp +#, fuzzy +msgid "Add a new scene." +msgstr "새 트랙 추가." + +#: editor/editor_node.cpp msgid "Scene" msgstr "씬" @@ -1835,13 +1873,12 @@ msgid "TileSet.." msgstr "íƒ€ì¼ ì…‹.." #: editor/editor_node.cpp editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp scene/gui/line_edit.cpp -#: scene/gui/text_edit.cpp +#: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Undo" msgstr "ë˜ëŒë¦¬ê¸°" #: editor/editor_node.cpp editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp +#: scene/gui/line_edit.cpp msgid "Redo" msgstr "다시 실행" @@ -2248,9 +2285,8 @@ msgid "Frame %" msgstr "í”„ë ˆìž„ %" #: editor/editor_profiler.cpp -#, fuzzy msgid "Physics Frame %" -msgstr "ê³ ì • í”„ë ˆìž„ %" +msgstr "물리 í”„ë ˆìž„ %" #: editor/editor_profiler.cpp editor/script_editor_debugger.cpp msgid "Time:" @@ -2343,6 +2379,10 @@ msgid "(Current)" msgstr "(현재)" #: editor/export_template_manager.cpp +msgid "Retrieving mirrors, please wait.." +msgstr "" + +#: editor/export_template_manager.cpp msgid "Remove template version '%s'?" msgstr "" @@ -2377,6 +2417,111 @@ msgid "Importing:" msgstr "ê°€ì ¸ì˜¤ëŠ” 중:" #: editor/export_template_manager.cpp +msgid "" +"No download links found for this version. Direct download is only available " +"for official releases." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Can't resolve." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Can't connect." +msgstr "ì—°ê²°í• ìˆ˜ ì—†ìŒ." + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "No response." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Req. Failed." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Redirect Loop." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Failed:" +msgstr "" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Can't write file." +msgstr "타ì¼ì„ ì°¾ì„ ìˆ˜ ì—†ìŒ:" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Download Complete." +msgstr "다운로드 ì—러" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Error requesting url: " +msgstr "ì•„í‹€ë¼ìŠ¤ ì €ìž¥ 중 ì—러:" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Connecting to Mirror.." +msgstr "연결중.." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Disconnected" +msgstr "ì—°ê²°í•´ì œ" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Resolving" +msgstr "í•´ê²° 중.." + +#: editor/export_template_manager.cpp +msgid "Can't Resolve" +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Connecting.." +msgstr "연결중.." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Can't Conect" +msgstr "ì—°ê²°í• ìˆ˜ ì—†ìŒ." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Connected" +msgstr "ì—°ê²°" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Requesting.." +msgstr "ìš”ì²ì¤‘.." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Downloading" +msgstr "다운로드" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Connection Error" +msgstr "연결중.." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "SSL Handshake Error" +msgstr "로드 ì—러" + +#: editor/export_template_manager.cpp msgid "Current Version:" msgstr "현재 ë²„ì „:" @@ -2400,12 +2545,22 @@ msgstr "템플릿 íŒŒì¼ ì„ íƒ" msgid "Export Template Manager" msgstr "내보내기 템플릿 ë§¤ë‹ˆì €" +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Download Templates" +msgstr "템플릿" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Select mirror from list: " +msgstr "목ë¡ì—ì„œ 기기를 ì„ íƒí•˜ì„¸ìš”" + #: editor/file_type_cache.cpp msgid "Can't open file_type_cache.cch for writing, not saving file type cache!" msgstr "file_type_cache.cch를 열수 없어서, íŒŒì¼ íƒ€ìž… ìºì‰¬ë¥¼ ì €ìž¥í•˜ì§€ 않습니다!" #: editor/filesystem_dock.cpp -msgid "Cannot navigate to '" +msgid "Cannot navigate to '%s' as it has not been found in the file system!" msgstr "" #: editor/filesystem_dock.cpp @@ -2423,14 +2578,6 @@ msgid "" msgstr "" #: editor/filesystem_dock.cpp -msgid "" -"\n" -"Source: " -msgstr "" -"\n" -"소스: " - -#: editor/filesystem_dock.cpp msgid "Cannot move/rename resources root." msgstr "리소스 루트를 옮기거나 ì´ë¦„ì„ ë³€ê²½í• ìˆ˜ 없습니다." @@ -2689,8 +2836,8 @@ msgid "Remove Poly And Point" msgstr "í´ë¦¬ê³¤ê³¼ í¬ì¸íŠ¸ ì‚ì œ" #: editor/plugins/abstract_polygon_2d_editor.cpp -#: editor/plugins/light_occluder_2d_editor_plugin.cpp -msgid "Create a new polygon from scratch." +#, fuzzy +msgid "Create a new polygon from scratch" msgstr "처ìŒë¶€í„° 새로운 í´ë¦¬ê³¤ 만들기." #: editor/plugins/abstract_polygon_2d_editor.cpp @@ -2701,6 +2848,11 @@ msgid "" "RMB: Erase Point." msgstr "" +#: editor/plugins/abstract_polygon_2d_editor.cpp +#, fuzzy +msgid "Delete points" +msgstr "í¬ì¸íŠ¸ ì‚ì œ" + #: editor/plugins/animation_player_editor_plugin.cpp msgid "Toggle Autoplay" msgstr "ìžë™ ìž¬ìƒ ì „í™˜" @@ -3035,18 +3187,10 @@ msgid "Can't resolve hostname:" msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Can't resolve." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Connection error, please try again." msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Can't connect." -msgstr "ì—°ê²°í• ìˆ˜ ì—†ìŒ." - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Can't connect to host:" msgstr "í˜¸ìŠ¤íŠ¸ì— ì—°ê²°í• ìˆ˜ ì—†ìŒ:" @@ -3055,30 +3199,14 @@ msgid "No response from host:" msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "No response." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Request failed, return code:" msgstr "ìš”ì² ì‹¤íŒ¨, 리턴 코드:" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Req. Failed." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Request failed, too many redirects" msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Redirect Loop." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp -msgid "Failed:" -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Bad download hash, assuming file has been tampered with." msgstr "" @@ -3107,14 +3235,6 @@ msgid "Resolving.." msgstr "í•´ê²° 중.." #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Connecting.." -msgstr "연결중.." - -#: editor/plugins/asset_library_editor_plugin.cpp -msgid "Requesting.." -msgstr "ìš”ì²ì¤‘.." - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Error making request" msgstr "ìš”ì² ì—러" @@ -3227,6 +3347,39 @@ msgid "Move Action" msgstr "ì´ë™ ì•¡ì…˜" #: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Move vertical guide" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Create new vertical guide" +msgstr "새 스í¬ë¦½íŠ¸ íŒŒì¼ ë§Œë“¤ê¸°" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Remove vertical guide" +msgstr "변수 ì œê±°" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Move horizontal guide" +msgstr "ì»¤ë¸Œì˜ í¬ì¸íŠ¸ ì´ë™" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Create new horizontal guide" +msgstr "새 스í¬ë¦½íŠ¸ íŒŒì¼ ë§Œë“¤ê¸°" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Remove horizontal guide" +msgstr "ìœ íš¨í•˜ì§€ ì•Šì€ í‚¤ ì‚ì œ" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Create new horizontal and vertical guides" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp msgid "Edit IK Chain" msgstr "IK ì²´ì¸ íŽ¸ì§‘" @@ -3349,10 +3502,17 @@ msgid "Snap to other nodes" msgstr "" #: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Snap to guides" +msgstr "ê·¸ë¦¬ë“œì— ë§žì¶¤" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Lock the selected object in place (can't be moved)." msgstr "ì„ íƒëœ 오브ì 트를 ìž ê¸‰ë‹ˆë‹¤ (ì´ë™ë¶ˆê°€)." #: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Unlock the selected object (can be moved)." msgstr "ì„ íƒëœ 오브ì 트를 ìž ê¸ˆ í•´ì œí•©ë‹ˆë‹¤ (ì´ë™ê°€ëŠ¥)." @@ -3403,6 +3563,11 @@ msgid "Show rulers" msgstr "ìž ë³´ê¸°" #: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Show guides" +msgstr "ìž ë³´ê¸°" + +#: editor/plugins/canvas_item_editor_plugin.cpp msgid "Center Selection" msgstr "ì„ íƒí•ëª© 화면 ì¤‘ì•™ì— í‘œì‹œ" @@ -3589,6 +3754,10 @@ msgstr "" msgid "Hold Shift to edit tangents individually" msgstr "" +#: editor/plugins/gi_probe_editor_plugin.cpp +msgid "Bake GI Probe" +msgstr "" + #: editor/plugins/gradient_editor_plugin.cpp msgid "Add/Remove Color Ramp Point" msgstr "ì¹¼ë¼ ëž¨í”„ í¬ì¸íŠ¸ 추가/ì‚ì œ" @@ -3621,6 +3790,10 @@ msgid "Create Occluder Polygon" msgstr "Occluder í´ë¦¬ê³¤ 만들기" #: editor/plugins/light_occluder_2d_editor_plugin.cpp +msgid "Create a new polygon from scratch." +msgstr "처ìŒë¶€í„° 새로운 í´ë¦¬ê³¤ 만들기." + +#: editor/plugins/light_occluder_2d_editor_plugin.cpp msgid "Edit existing polygon:" msgstr "기존 í´ë¦¬ê³¤ 편집:" @@ -3636,58 +3809,6 @@ msgstr "컨트롤+좌í´ë¦: 세그먼트 ë¶„í• ." msgid "RMB: Erase Point." msgstr "ìš°í´ë¦: í¬ì¸íŠ¸ ì‚ì œ." -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Remove Point from Line2D" -msgstr "Line2Dì—ì„œ í¬ì¸íŠ¸ ì‚ì œ" - -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Add Point to Line2D" -msgstr "Line2Dì— í¬ì¸íŠ¸ 추가" - -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Move Point in Line2D" -msgstr "Line2Dì˜ í¬ì¸íŠ¸ ì´ë™" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Select Points" -msgstr "í¬ì¸íŠ¸ ì„ íƒ" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Shift+Drag: Select Control Points" -msgstr "쉬푸트+드래그: 컨트롤 í¬ì¸íŠ¸ ì„ íƒ" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Click: Add Point" -msgstr "í´ë¦: í¬ì¸íŠ¸ 추가" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Right Click: Delete Point" -msgstr "ìš°í´ë¦: í¬ì¸íŠ¸ ì‚ì œ" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Add Point (in empty space)" -msgstr "í¬ì¸íŠ¸ 추가 (빈 공간)" - -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Split Segment (in line)" -msgstr "세그먼트 ë¶„í• (ë¼ì¸)" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Delete Point" -msgstr "í¬ì¸íŠ¸ ì‚ì œ" - #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Mesh is empty!" msgstr "메쉬가 비었습니다!" @@ -3901,7 +4022,6 @@ msgid "Eroding walkable area..." msgstr "" #: editor/plugins/navigation_mesh_generator.cpp -#, fuzzy msgid "Partitioning..." msgstr "ë¶„í• ì¤‘..." @@ -4053,9 +4173,8 @@ msgid "Emission Source: " msgstr "ì—미션 소스: " #: editor/plugins/particles_editor_plugin.cpp -#, fuzzy msgid "Generate Visibility AABB" -msgstr "AABB ìƒì„±" +msgstr "가시성 AABB ìƒì„±" #: editor/plugins/path_2d_editor_plugin.cpp msgid "Remove Point from Curve" @@ -4087,16 +4206,46 @@ msgid "Move Out-Control in Curve" msgstr "ì»¤ë¸Œì˜ ì•„ì›ƒ-컨트롤 ì´ë™" #: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Select Points" +msgstr "í¬ì¸íŠ¸ ì„ íƒ" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Shift+Drag: Select Control Points" +msgstr "쉬푸트+드래그: 컨트롤 í¬ì¸íŠ¸ ì„ íƒ" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Click: Add Point" +msgstr "í´ë¦: í¬ì¸íŠ¸ 추가" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Right Click: Delete Point" +msgstr "ìš°í´ë¦: í¬ì¸íŠ¸ ì‚ì œ" + +#: editor/plugins/path_2d_editor_plugin.cpp msgid "Select Control Points (Shift+Drag)" msgstr "컨트롤 í¬ì¸íŠ¸ ì„ íƒ (쉬프트+드래그)" #: editor/plugins/path_2d_editor_plugin.cpp #: editor/plugins/path_editor_plugin.cpp +msgid "Add Point (in empty space)" +msgstr "í¬ì¸íŠ¸ 추가 (빈 공간)" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp msgid "Split Segment (in curve)" msgstr "세그먼트 ë¶„í• (커브)" #: editor/plugins/path_2d_editor_plugin.cpp #: editor/plugins/path_editor_plugin.cpp +msgid "Delete Point" +msgstr "í¬ì¸íŠ¸ ì‚ì œ" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp msgid "Close Curve" msgstr "커브 닫기" @@ -4233,7 +4382,6 @@ msgstr "리소스 로드" #: editor/plugins/resource_preloader_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp #: editor/plugins/sprite_frames_editor_plugin.cpp editor/property_editor.cpp #: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Paste" @@ -4280,6 +4428,21 @@ msgid " Class Reference" msgstr "" #: editor/plugins/script_editor_plugin.cpp +#, fuzzy +msgid "Sort" +msgstr "ì •ë ¬:" + +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp +msgid "Move Up" +msgstr "위로 ì´ë™" + +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp +msgid "Move Down" +msgstr "아래로 ì´ë™" + +#: editor/plugins/script_editor_plugin.cpp msgid "Next script" msgstr "ë‹¤ìŒ ìŠ¤í¬ë¦½íŠ¸" @@ -4331,6 +4494,10 @@ msgstr "문서 닫기" msgid "Close All" msgstr "ëª¨ë‘ ë‹«ê¸°" +#: editor/plugins/script_editor_plugin.cpp +msgid "Close Other Tabs" +msgstr "" + #: editor/plugins/script_editor_plugin.cpp editor/project_manager.cpp msgid "Run" msgstr "실행" @@ -4341,13 +4508,11 @@ msgstr "스í¬ë¦½íŠ¸ íŒ¨ë„ í† ê¸€" #: editor/plugins/script_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Find.." msgstr "찾기.." #: editor/plugins/script_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Find Next" msgstr "ë‹¤ìŒ ì°¾ê¸°" @@ -4453,33 +4618,22 @@ msgstr "" msgid "Capitalize" msgstr "" -#: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp scene/gui/line_edit.cpp +#: editor/plugins/script_text_editor.cpp scene/gui/line_edit.cpp #: scene/gui/text_edit.cpp msgid "Cut" msgstr "잘ë¼ë‚´ê¸°" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp #: editor/plugins/sprite_frames_editor_plugin.cpp editor/property_editor.cpp #: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Copy" msgstr "복사하기" -#: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp scene/gui/line_edit.cpp +#: editor/plugins/script_text_editor.cpp scene/gui/line_edit.cpp #: scene/gui/text_edit.cpp msgid "Select All" msgstr "ì „ì²´ì„ íƒ" -#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp -msgid "Move Up" -msgstr "위로 ì´ë™" - -#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp -msgid "Move Down" -msgstr "아래로 ì´ë™" - #: editor/plugins/script_text_editor.cpp msgid "Delete Line" msgstr "ë¼ì¸ ì‚ì œ" @@ -4501,6 +4655,23 @@ msgid "Clone Down" msgstr "아래로 ë³µì œ" #: editor/plugins/script_text_editor.cpp +#, fuzzy +msgid "Fold Line" +msgstr "ë¼ì¸ìœ¼ë¡œ ì´ë™" + +#: editor/plugins/script_text_editor.cpp +msgid "Unfold Line" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Fold All Lines" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Unfold All Lines" +msgstr "" + +#: editor/plugins/script_text_editor.cpp msgid "Complete Symbol" msgstr "ìžë™ 완성" @@ -4546,12 +4717,10 @@ msgid "Convert To Lowercase" msgstr "소문ìžë¡œ 변환" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Find Previous" msgstr "ì´ì „ 찾기" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Replace.." msgstr "변경.." @@ -4560,7 +4729,6 @@ msgid "Goto Function.." msgstr "함수로 ì´ë™.." #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Goto Line.." msgstr "ë¼ì¸ìœ¼ë¡œ ì´ë™.." @@ -4725,6 +4893,16 @@ msgid "View Plane Transform." msgstr "ë·° í‰ë©´ 변형." #: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Scaling: " +msgstr "í¬ê¸°:" + +#: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Translating: " +msgstr "번ì—:" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Rotating %s degrees." msgstr "%së„ë¡œ íšŒì „." @@ -4805,6 +4983,10 @@ msgid "Vertices" msgstr "버틱스" #: editor/plugins/spatial_editor_plugin.cpp +msgid "FPS" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Align with view" msgstr "ë·°ì— ì •ë ¬" @@ -4837,6 +5019,16 @@ msgid "View Information" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "View FPS" +msgstr "íŒŒì¼ ë³´ê¸°" + +#: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Half Resolution" +msgstr "ì„ íƒí‚¤ ìŠ¤ì¼€ì¼ ì¡°ì ˆ" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Audio Listener" msgstr "오디오 리스너" @@ -4967,6 +5159,11 @@ msgid "Tool Scale" msgstr "í¬ê¸°ì¡°ì ˆ 툴" #: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Toggle Freelook" +msgstr "ì „ì²´í™”ë©´ í† ê¸€" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Transform" msgstr "변환" @@ -5241,6 +5438,11 @@ msgid "Create Empty Editor Template" msgstr "빈 ì—디터 템플릿 만들기" #: editor/plugins/theme_editor_plugin.cpp +#, fuzzy +msgid "Create From Current Editor Theme" +msgstr "빈 ì—디터 템플릿 만들기" + +#: editor/plugins/theme_editor_plugin.cpp msgid "CheckBox Radio1" msgstr "CheckBox Radio1" @@ -5322,16 +5524,14 @@ msgid "Paint TileMap" msgstr "타ì¼ë§µ ì¹ í•˜ê¸°" #: editor/plugins/tile_map_editor_plugin.cpp -#, fuzzy msgid "Line Draw" -msgstr "ì§ì„ 형" +msgstr "ì§ì„ 그리기" #: editor/plugins/tile_map_editor_plugin.cpp msgid "Rectangle Paint" msgstr "" #: editor/plugins/tile_map_editor_plugin.cpp -#, fuzzy msgid "Bucket Fill" msgstr "채우기" @@ -5360,9 +5560,8 @@ msgid "Mirror Y" msgstr "Y축 뒤집기" #: editor/plugins/tile_map_editor_plugin.cpp -#, fuzzy msgid "Paint Tile" -msgstr "타ì¼ë§µ ì¹ í•˜ê¸°" +msgstr "íƒ€ì¼ ì¹ í•˜ê¸°" #: editor/plugins/tile_map_editor_plugin.cpp msgid "Pick Tile" @@ -5413,28 +5612,25 @@ msgid "Error" msgstr "ì—러" #: editor/project_export.cpp -#, fuzzy msgid "Runnable" -msgstr "활성화" +msgstr "실행가능" #: editor/project_export.cpp #, fuzzy -msgid "Delete patch '" +msgid "Delete patch '%s' from list?" msgstr "ìž…ë ¥ ì‚ì œ" #: editor/project_export.cpp -#, fuzzy msgid "Delete preset '%s'?" -msgstr "ì„ íƒëœ 파ì¼ë“¤ì„ ì‚ì œí•˜ì‹œê² ìŠµë‹ˆê¹Œ?" +msgstr "'%s' í”„ë¦¬ì…‹ì„ ì‚ì œí•˜ì‹œê² ìŠµë‹ˆê¹Œ?" #: editor/project_export.cpp msgid "Export templates for this platform are missing/corrupted: " msgstr "" #: editor/project_export.cpp -#, fuzzy msgid "Presets" -msgstr "프리셋.." +msgstr "프리셋" #: editor/project_export.cpp editor/project_settings_editor.cpp msgid "Add.." @@ -5445,64 +5641,54 @@ msgid "Resources" msgstr "리소스" #: editor/project_export.cpp -#, fuzzy msgid "Export all resources in the project" -msgstr "프로ì íŠ¸ì˜ ëª¨ë“ ë¦¬ì†ŒìŠ¤ 내보내기." +msgstr "프로ì íŠ¸ì˜ ëª¨ë“ ë¦¬ì†ŒìŠ¤ 내보내기" #: editor/project_export.cpp -#, fuzzy msgid "Export selected scenes (and dependencies)" -msgstr "ì„ íƒëœ 리소스 내보내기 (종ì†ëœ 리소스 í¬í•¨)." +msgstr "ì„ íƒëœ 리소스 내보내기 (종ì†ëœ 리소스 í¬í•¨)" #: editor/project_export.cpp -#, fuzzy msgid "Export selected resources (and dependencies)" -msgstr "ì„ íƒëœ 리소스 내보내기 (종ì†ëœ 리소스 í¬í•¨)." +msgstr "ì„ íƒëœ 리소스 내보내기 (종ì†ëœ 리소스 í¬í•¨)" #: editor/project_export.cpp msgid "Export Mode:" msgstr "내보내기 모드:" #: editor/project_export.cpp -#, fuzzy msgid "Resources to export:" msgstr "내보낼 리소스:" #: editor/project_export.cpp -#, fuzzy msgid "" "Filters to export non-resource files (comma separated, e.g: *.json, *.txt)" -msgstr "내보내기 ì‹œ, í¬í•¨ì‹œí‚¬ íŒŒì¼ (콤마로 구분, 예: *.json, *.txt):" +msgstr "리소스가 ì•„ë‹Œ íŒŒì¼ ë‚´ë³´ë‚´ê¸° í•„í„° (콤마로 구분, 예: *.json, *.txt)" #: editor/project_export.cpp -#, fuzzy msgid "" "Filters to exclude files from project (comma separated, e.g: *.json, *.txt)" -msgstr "내보내기 ì‹œ, ì œì™¸ì‹œí‚¬ íŒŒì¼ (콤마로 구분, 예: *.json, *.txt):" +msgstr "프로ì 트ì—ì„œ ì œì™¸ì‹œí‚¬ íŒŒì¼ í•„í„° (콤마로 구분, 예: *.json, *.txt)" #: editor/project_export.cpp -#, fuzzy msgid "Patches" -msgstr "ì¼ì¹˜:" +msgstr "패치" #: editor/project_export.cpp -#, fuzzy msgid "Make Patch" -msgstr "ëŒ€ìƒ ê²½ë¡œ:" +msgstr "패치 만들기" #: editor/project_export.cpp -#, fuzzy msgid "Features" -msgstr "í…스ì³" +msgstr "기능" #: editor/project_export.cpp msgid "Custom (comma-separated):" msgstr "" #: editor/project_export.cpp -#, fuzzy msgid "Feature List:" -msgstr "함수 목ë¡:" +msgstr "기능 목ë¡:" #: editor/project_export.cpp msgid "Export PCK/Zip" @@ -5517,19 +5703,17 @@ msgid "Export templates for this platform are missing/corrupted:" msgstr "" #: editor/project_export.cpp -#, fuzzy msgid "Export With Debug" -msgstr "íƒ€ì¼ ì…‹ 내보내기" +msgstr "디버그와 함께 내보내기" #: editor/project_manager.cpp #, fuzzy msgid "The path does not exist." -msgstr "파ì¼ì´ 존재하지 않습니다." +msgstr "경로가 존재하지 않습니다." #: editor/project_manager.cpp -#, fuzzy msgid "Please choose a 'project.godot' file." -msgstr "프로ì 트 í´ë” ë°”ê¹¥ì— ë‚´ë³´ë‚´ê¸°ë¥¼ 하세요!" +msgstr "'project.godot' 파ì¼ì„ ì„ íƒí•˜ì„¸ìš”." #: editor/project_manager.cpp msgid "" @@ -5558,33 +5742,28 @@ msgid "Invalid project path (changed anything?)." msgstr "ìœ íš¨í•˜ì§€ ì•Šì€ í”„ë¡œì 트 경로 (ë”ê°€ ë³€ê²½í•˜ì‹ ê±°ë¼ë„?)." #: editor/project_manager.cpp -#, fuzzy msgid "Couldn't get project.godot in project path." -msgstr "프로ì 트 ê²½ë¡œì— engine.cfg를 ìƒì„±í• 수 없습니다." +msgstr "프로ì 트 ê²½ë¡œì— project.godot 파ì¼ì„ ì°¾ì„ ìˆ˜ 없습니다." #: editor/project_manager.cpp -#, fuzzy msgid "Couldn't edit project.godot in project path." -msgstr "프로ì 트 ê²½ë¡œì— engine.cfg를 ìƒì„±í• 수 없습니다." +msgstr "프로ì 트 ê²½ë¡œì— project.godot 파ì¼ì„ íŽ¸ì§‘í• ìˆ˜ 없습니다." #: editor/project_manager.cpp -#, fuzzy msgid "Couldn't create project.godot in project path." -msgstr "프로ì 트 ê²½ë¡œì— engine.cfg를 ìƒì„±í• 수 없습니다." +msgstr "프로ì 트 ê²½ë¡œì— project.godot 파ì¼ì„ ìƒì„±í• 수 없습니다." #: editor/project_manager.cpp msgid "The following files failed extraction from package:" msgstr "다ìŒì˜ 파ì¼ë“¤ì„ 패키지로부터 ì¶”ì¶œí•˜ëŠ”ë° ì‹¤íŒ¨í–ˆìŠµë‹ˆë‹¤:" #: editor/project_manager.cpp -#, fuzzy msgid "Rename Project" -msgstr "ì´ë¦„없는 프로ì 트" +msgstr "프로ì 트 ì´ë¦„ 변경" #: editor/project_manager.cpp -#, fuzzy msgid "Couldn't get project.godot in the project path." -msgstr "프로ì 트 ê²½ë¡œì— engine.cfg를 ìƒì„±í• 수 없습니다." +msgstr "프로ì 트 ê²½ë¡œì— project.godot 파ì¼ì„ ì°¾ì„ ìˆ˜ 없습니다." #: editor/project_manager.cpp msgid "New Game Project" @@ -5607,7 +5786,6 @@ msgid "Project Name:" msgstr "프로ì 트 명:" #: editor/project_manager.cpp -#, fuzzy msgid "Create folder" msgstr "í´ë” ìƒì„±" @@ -5628,23 +5806,22 @@ msgid "Unnamed Project" msgstr "ì´ë¦„없는 프로ì 트" #: editor/project_manager.cpp -#, fuzzy msgid "Can't open project" -msgstr "연결하기.." +msgstr "프로ì 트를 ì—´ 수 ì—†ìŒ" #: editor/project_manager.cpp msgid "Are you sure to open more than one project?" msgstr "ë‘ê°œ ì´ìƒì˜ 프로ì 트를 ì—´ë ¤ëŠ” ê²ƒì´ í™•ì‹¤í•©ë‹ˆê¹Œ?" #: editor/project_manager.cpp -#, fuzzy msgid "" "Can't run project: no main scene defined.\n" "Please edit the project and set the main scene in \"Project Settings\" under " "the \"Application\" category." msgstr "" -"ë©”ì¸ ì”¬ì´ ì§€ì •ë˜ì§€ 않았습니다. ì„ íƒí•˜ì‹œê² 습니까?\n" -"ë‚˜ì¤‘ì— \"프로ì 트 ì„¤ì •\"ì˜ 'Application' í•ëª©ì—ì„œ ë³€ê²½í• ìˆ˜ 있습니다." +"프로ì 트를 ì‹¤í–‰í• ìˆ˜ 없습니다: ë©”ì¸ì”¬ì´ ì§€ì •ë˜ì§€ 않았습니다.\n" +"프로ì 트 ì„¤ì •ì„ ìˆ˜ì •í•˜ì—¬ \"Application\" ì¹´í…Œê³ ë¦¬ì— \"Project Settings\"ì—ì„œ " +"ë©”ì¸ì”¬ì„ ì„¤ì •í•˜ì„¸ìš”." #: editor/project_manager.cpp msgid "" @@ -5690,23 +5867,20 @@ msgid "New Project" msgstr "새 프로ì 트" #: editor/project_manager.cpp -#, fuzzy msgid "Templates" -msgstr "ì•„ì´í…œ ì‚ì œ" +msgstr "템플릿" #: editor/project_manager.cpp msgid "Exit" msgstr "종료" #: editor/project_manager.cpp -#, fuzzy msgid "Restart Now" -msgstr "재시작 (ì´ˆ):" +msgstr "지금 재시작" #: editor/project_manager.cpp -#, fuzzy msgid "Can't run project" -msgstr "연결하기.." +msgstr "프로ì 트를 ì‹¤í–‰í• ìˆ˜ ì—†ìŒ" #: editor/project_settings_editor.cpp msgid "Key " @@ -5741,10 +5915,6 @@ msgid "Add Input Action Event" msgstr "ìž…ë ¥ ì•¡ì…˜ ì´ë²¤íŠ¸ 추가" #: editor/project_settings_editor.cpp editor/settings_config_dialog.cpp -msgid "Meta+" -msgstr "메타+" - -#: editor/project_settings_editor.cpp editor/settings_config_dialog.cpp msgid "Shift+" msgstr "쉬프트+" @@ -5806,18 +5976,16 @@ msgid "Change" msgstr "변경" #: editor/project_settings_editor.cpp -#, fuzzy msgid "Joypad Axis Index:" -msgstr "ì¡°ì´ìŠ¤í‹± 축 ì¸ë±ìŠ¤:" +msgstr "ì¡°ì´íŒ¨ë“œ 축 ì¸ë±ìŠ¤:" #: editor/project_settings_editor.cpp msgid "Axis" msgstr "축" #: editor/project_settings_editor.cpp -#, fuzzy msgid "Joypad Button Index:" -msgstr "ì¡°ì´ìŠ¤í‹± 버튼 ì¸ë±ìŠ¤:" +msgstr "ì¡°ì´íŒ¨ë“œ 버튼 ì¸ë±ìŠ¤:" #: editor/project_settings_editor.cpp msgid "Add Input Action" @@ -5828,9 +5996,8 @@ msgid "Erase Input Action Event" msgstr "ìž…ë ¥ ì•¡ì…˜ ì´ë²¤íŠ¸ ì‚ì œ" #: editor/project_settings_editor.cpp -#, fuzzy msgid "Add Event" -msgstr "빈 í”„ë ˆìž„ 추가" +msgstr "ì´ë²¤íŠ¸ 추가" #: editor/project_settings_editor.cpp msgid "Device" @@ -5870,28 +6037,24 @@ msgstr "" #: editor/project_settings_editor.cpp #, fuzzy -msgid "No property '" +msgid "No property '%s' exists." msgstr "ì†ì„±:" #: editor/project_settings_editor.cpp -#, fuzzy -msgid "Setting '" -msgstr "ì„¤ì •" +msgid "Setting '%s' is internal, and it can't be deleted." +msgstr "" #: editor/project_settings_editor.cpp -#, fuzzy msgid "Delete Item" -msgstr "ìž…ë ¥ ì‚ì œ" +msgstr "ì•„ì´í…œ ì‚ì œ" #: editor/project_settings_editor.cpp -#, fuzzy msgid "Can't contain '/' or ':'" -msgstr "í˜¸ìŠ¤íŠ¸ì— ì—°ê²°í• ìˆ˜ ì—†ìŒ:" +msgstr "'/' ë˜ëŠ” ':' 문ìžë¥¼ í¬í•¨í• 수 ì—†ìŒ" #: editor/project_settings_editor.cpp -#, fuzzy msgid "Already existing" -msgstr "ì§€ì† ì „í™˜" +msgstr "ì´ë¯¸ 존재함" #: editor/project_settings_editor.cpp msgid "Error saving settings." @@ -5934,18 +6097,16 @@ msgid "Remove Resource Remap Option" msgstr "리소스 리맵핑 옵션 ì œê±°" #: editor/project_settings_editor.cpp -#, fuzzy msgid "Changed Locale Filter" -msgstr "ì—°ê²° 시간 변경" +msgstr "ë¡œì¼€ì¼ í•„í„° 변경ë¨" #: editor/project_settings_editor.cpp msgid "Changed Locale Filter Mode" msgstr "" #: editor/project_settings_editor.cpp -#, fuzzy msgid "Project Settings (project.godot)" -msgstr "프로ì 트 ì„¤ì • (engine.cfg)" +msgstr "프로ì 트 ì„¤ì • (project.godot)" #: editor/project_settings_editor.cpp editor/settings_config_dialog.cpp msgid "General" @@ -6004,37 +6165,32 @@ msgid "Locale" msgstr "지ì—" #: editor/project_settings_editor.cpp -#, fuzzy msgid "Locales Filter" -msgstr "ì´ë¯¸ì§€ í•„í„°:" +msgstr "ë¡œì¼€ì¼ í•„í„°" #: editor/project_settings_editor.cpp -#, fuzzy msgid "Show all locales" -msgstr "뼈대 보기" +msgstr "ëª¨ë“ ë¡œì¼€ì¼ ë³´ê¸°" #: editor/project_settings_editor.cpp msgid "Show only selected locales" msgstr "" #: editor/project_settings_editor.cpp -#, fuzzy msgid "Filter mode:" -msgstr "í•„í„°" +msgstr "í•„í„° 모드:" #: editor/project_settings_editor.cpp -#, fuzzy msgid "Locales:" -msgstr "지ì—" +msgstr "로케ì¼:" #: editor/project_settings_editor.cpp msgid "AutoLoad" msgstr "ìžë™ 로드" #: editor/property_editor.cpp -#, fuzzy msgid "Pick a Viewport" -msgstr "1ê°œ ë·°í¬íŠ¸" +msgstr "ë·°í¬íŠ¸ ì„ íƒ" #: editor/property_editor.cpp msgid "Ease In" @@ -6069,7 +6225,6 @@ msgid "Assign" msgstr "í• ë‹¹" #: editor/property_editor.cpp -#, fuzzy msgid "Select Node" msgstr "노드 ì„ íƒ" @@ -6078,31 +6233,26 @@ msgid "New Script" msgstr "새 스í¬ë¦½íŠ¸" #: editor/property_editor.cpp -#, fuzzy msgid "Make Unique" -msgstr "Bones 만들기" +msgstr "ê³ ìœ í•˜ê²Œ 만들기" #: editor/property_editor.cpp -#, fuzzy msgid "Show in File System" -msgstr "íŒŒì¼ ì‹œìŠ¤í…œ" +msgstr "íŒŒì¼ ì‹œìŠ¤í…œì—ì„œ 보기" #: editor/property_editor.cpp -#, fuzzy msgid "Convert To %s" -msgstr "변환.." +msgstr "%së¡œ 변환" #: editor/property_editor.cpp msgid "Error loading file: Not a resource!" msgstr "íŒŒì¼ ë¡œë“œ ì—러: 리소스가 아닙니다!" #: editor/property_editor.cpp -#, fuzzy msgid "Selected node is not a Viewport!" -msgstr "ê°€ì ¸ì˜¬ 노드들 ì„ íƒ" +msgstr "ì„ íƒëœ 노드는 Viewportê°€ 아닙니다!" #: editor/property_editor.cpp -#, fuzzy msgid "Pick a Node" msgstr "노드 ì„ íƒ" @@ -6131,9 +6281,8 @@ msgid "Select Property" msgstr "ì†ì„± ì„ íƒ" #: editor/property_selector.cpp -#, fuzzy msgid "Select Virtual Method" -msgstr "메소드 ì„ íƒ" +msgstr "ê°€ìƒ ë©”ì†Œë“œ ì„ íƒ" #: editor/property_selector.cpp msgid "Select Method" @@ -6286,9 +6435,8 @@ msgid "Error duplicating scene to save it." msgstr "ì €ìž¥í•˜ê¸° 위해 ì”¬ì„ ë³µì œí•˜ëŠ” ì¤‘ì— ì—러가 ë°œìƒí–ˆìŠµë‹ˆë‹¤." #: editor/scene_tree_dock.cpp -#, fuzzy msgid "Sub-Resources:" -msgstr "리소스:" +msgstr "서브-리소스:" #: editor/scene_tree_dock.cpp msgid "Clear Inheritance" @@ -6331,9 +6479,8 @@ msgid "Save Branch as Scene" msgstr "ì„ íƒ ë…¸ë“œë¥¼ 다른 씬으로 ì €ìž¥" #: editor/scene_tree_dock.cpp -#, fuzzy msgid "Copy Node Path" -msgstr "경로 복사" +msgstr "노드 경로 복사" #: editor/scene_tree_dock.cpp msgid "Delete (No Confirm)" @@ -6351,9 +6498,8 @@ msgstr "" "씬 파ì¼ì„ 노드로 추가합니다. 루트 노드가 ì—†ì„ ê²½ìš°, ìƒì†ì”¬ìœ¼ë¡œ 만들어집니다." #: editor/scene_tree_dock.cpp -#, fuzzy msgid "Filter nodes" -msgstr "í•„í„°" +msgstr "노드 í•„í„°" #: editor/scene_tree_dock.cpp msgid "Attach a new or existing script for the selected node." @@ -6364,6 +6510,16 @@ msgid "Clear a script for the selected node." msgstr "ì„ íƒëœ ë…¸ë“œì˜ ìŠ¤í¬ë¦½íŠ¸ë¥¼ ì œê±°í•©ë‹ˆë‹¤." #: editor/scene_tree_dock.cpp +#, fuzzy +msgid "Remote" +msgstr "ì‚ì œ" + +#: editor/scene_tree_dock.cpp +#, fuzzy +msgid "Local" +msgstr "지ì—" + +#: editor/scene_tree_dock.cpp msgid "Clear Inheritance? (No Undo!)" msgstr "ìƒì†ì„ ì—†ì• ì‹œê² ìŠµë‹ˆê¹Œ? (ë˜ëŒë¦¬ê¸° 불가!)" @@ -6406,9 +6562,8 @@ msgid "Instance:" msgstr "ì¸ìŠ¤í„´ìŠ¤:" #: editor/scene_tree_editor.cpp -#, fuzzy msgid "Open script" -msgstr "ë‹¤ìŒ ìŠ¤í¬ë¦½íŠ¸" +msgstr "스í¬ë¦½íŠ¸ 열기" #: editor/scene_tree_editor.cpp msgid "" @@ -6423,9 +6578,8 @@ msgid "" msgstr "" #: editor/scene_tree_editor.cpp -#, fuzzy msgid "Toggle Visibility" -msgstr "Spatial ë³´ì´ê¸° í† ê¸€" +msgstr "ë³´ì´ê¸° í† ê¸€" #: editor/scene_tree_editor.cpp msgid "Invalid node name, the following characters are not allowed:" @@ -6448,14 +6602,12 @@ msgid "Select a Node" msgstr "노드 ì„ íƒ" #: editor/script_create_dialog.cpp -#, fuzzy msgid "Error loading template '%s'" -msgstr "ì´ë¯¸ì§€ 로드 ì—러:" +msgstr "'%s' 템플릿 로드 ì—러" #: editor/script_create_dialog.cpp -#, fuzzy msgid "Error - Could not create script in filesystem." -msgstr "íŒŒì¼ ì‹œìŠ¤í…œì— ìŠ¤í¬ë¦½íŠ¸ë¥¼ ìƒì„±í• 수 없습니다." +msgstr "ì—러 - íŒŒì¼ ì‹œìŠ¤í…œì— ìŠ¤í¬ë¦½íŠ¸ë¥¼ ìƒì„±í• 수 없습니다." #: editor/script_create_dialog.cpp msgid "Error loading script from %s" @@ -6482,9 +6634,8 @@ msgid "Directory of the same name exists" msgstr "" #: editor/script_create_dialog.cpp -#, fuzzy msgid "File exists, will be reused" -msgstr "파ì¼ì´ 존재합니다. ë®ì–´ì“°ì‹œê² 습니까?" +msgstr "파ì¼ì´ 존재하여, 재사용합니다" #: editor/script_create_dialog.cpp msgid "Invalid extension" @@ -6495,23 +6646,20 @@ msgid "Wrong extension chosen" msgstr "" #: editor/script_create_dialog.cpp -#, fuzzy msgid "Invalid Path" -msgstr "ìœ íš¨í•˜ì§€ ì•Šì€ ê²½ë¡œ." +msgstr "ìœ íš¨í•˜ì§€ ì•Šì€ ê²½ë¡œ" #: editor/script_create_dialog.cpp msgid "Invalid class name" msgstr "ìœ ìš”í•˜ì§€ ì•Šì€ í´ëž˜ìŠ¤ëª…" #: editor/script_create_dialog.cpp -#, fuzzy msgid "Invalid inherited parent name or path" -msgstr "ìœ ìš”í•˜ì§€ ì•Šì€ ì¸ë±ìŠ¤ ì†ì„±ëª…." +msgstr "ìœ ìš”í•˜ì§€ ì•Šì€ ìƒì†ëœ 부모 ì´ë¦„ ë˜ëŠ” 경로" #: editor/script_create_dialog.cpp -#, fuzzy msgid "Script valid" -msgstr "스í¬ë¦½íŠ¸" +msgstr "ìœ íš¨í•œ 스í¬ë¦½íŠ¸" #: editor/script_create_dialog.cpp msgid "Allowed: a-z, A-Z, 0-9 and _" @@ -6522,36 +6670,30 @@ msgid "Built-in script (into scene file)" msgstr "" #: editor/script_create_dialog.cpp -#, fuzzy msgid "Create new script file" -msgstr "새 스í¬ë¦½íŠ¸ 만들기" +msgstr "새 스í¬ë¦½íŠ¸ íŒŒì¼ ë§Œë“¤ê¸°" #: editor/script_create_dialog.cpp -#, fuzzy msgid "Load existing script file" -msgstr "기존 스í¬ë¦½íŠ¸ 로드하기" +msgstr "기존 스í¬ë¦½íŠ¸ íŒŒì¼ ë¡œë“œí•˜ê¸°" #: editor/script_create_dialog.cpp msgid "Language" msgstr "언어" #: editor/script_create_dialog.cpp -#, fuzzy msgid "Inherits" -msgstr "ìƒì†:" +msgstr "ìƒì†" #: editor/script_create_dialog.cpp -#, fuzzy msgid "Class Name" -msgstr "í´ëž˜ìŠ¤ëª…:" +msgstr "í´ëž˜ìŠ¤ëª…" #: editor/script_create_dialog.cpp -#, fuzzy msgid "Template" -msgstr "ì•„ì´í…œ ì‚ì œ" +msgstr "템플릿" #: editor/script_create_dialog.cpp -#, fuzzy msgid "Built-in Script" msgstr "내장 스í¬ë¦½íŠ¸" @@ -6560,6 +6702,11 @@ msgid "Attach Node Script" msgstr "노드 스í¬ë¦½íŠ¸ 붙ì´ê¸°" #: editor/script_editor_debugger.cpp +#, fuzzy +msgid "Remote " +msgstr "ì‚ì œ" + +#: editor/script_editor_debugger.cpp msgid "Bytes:" msgstr "ë°”ì´íŠ¸:" @@ -6616,18 +6763,6 @@ msgid "Stack Trace (if applicable):" msgstr "ìŠ¤íƒ ì¶”ì (해당ë˜ëŠ” 경우):" #: editor/script_editor_debugger.cpp -msgid "Remote Inspector" -msgstr "ì›ê²© ì¸ìŠ¤íŽ™í„°" - -#: editor/script_editor_debugger.cpp -msgid "Live Scene Tree:" -msgstr "실시간 씬 트리:" - -#: editor/script_editor_debugger.cpp -msgid "Remote Object Properties: " -msgstr "ì›ê²© 오브ì 트 ì†ì„±: " - -#: editor/script_editor_debugger.cpp msgid "Profiler" msgstr "프로파ì¼ëŸ¬" @@ -6744,14 +6879,12 @@ msgid "Change Probe Extents" msgstr "프로브 범위 변경" #: modules/gdnative/gd_native_library_editor.cpp -#, fuzzy msgid "Library" -msgstr "메쉬 ë¼ì´ë¸ŒëŸ¬ë¦¬.." +msgstr "ë¼ì´ë¸ŒëŸ¬ë¦¬" #: modules/gdnative/gd_native_library_editor.cpp -#, fuzzy msgid "Status" -msgstr "ìƒíƒœ:" +msgstr "ìƒíƒœ" #: modules/gdnative/gd_native_library_editor.cpp msgid "Libraries: " @@ -6761,52 +6894,52 @@ msgstr "" msgid "GDNative" msgstr "" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp #: modules/visual_script/visual_script_builtin_funcs.cpp msgid "Invalid type argument to convert(), use TYPE_* constants." msgstr "" "convert()하기 위한 ì¸ìž íƒ€ìž…ì´ ìœ íš¨í•˜ì§€ 않습니다, TYPE_* ìƒìˆ˜ë¥¼ 사용하세요." -#: modules/gdscript/gd_functions.cpp modules/mono/glue/glue_header.h +#: modules/gdscript/gdscript_functions.cpp modules/mono/glue/glue_header.h #: modules/visual_script/visual_script_builtin_funcs.cpp msgid "Not enough bytes for decoding bytes, or invalid format." msgstr "ë””ì½”ë”©í• ë°”ì´íŠ¸ê°€ 모ìžë¼ê±°ë‚˜, ìœ íš¨í•˜ì§€ ì•Šì€ í˜•ì‹ìž…니다." -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "step argument is zero!" msgstr "ìŠ¤í… ì¸ìžê°€ ì œë¡œìž…ë‹ˆë‹¤!" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Not a script with an instance" msgstr "스í¬ë¦½íŠ¸ì˜ ì¸ìŠ¤í„´ìŠ¤ê°€ 아님" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Not based on a script" msgstr "스í¬ë¦½íŠ¸ì— 기반하지 ì•ŠìŒ" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Not based on a resource file" msgstr "리소스 파ì¼ì— 기반하지 ì•ŠìŒ" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary format (missing @path)" msgstr "ìœ íš¨í•˜ì§€ ì•Šì€ ì¸ìŠ¤í„´ìŠ¤ Dictionary í˜•ì‹ (@path ì—†ìŒ)" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary format (can't load script at @path)" msgstr "" "ìœ íš¨í•˜ì§€ ì•Šì€ ì¸ìŠ¤í„´ìŠ¤ Dictionary í˜•ì‹ (@path ì—ì„œ 스í¬ë¦½íŠ¸ë¥¼ ë¡œë“œí• ìˆ˜ ì—†ìŒ)" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary format (invalid script at @path)" msgstr "" "ìœ íš¨í•˜ì§€ ì•Šì€ ì¸ìŠ¤í„´ìŠ¤ Dictionary í˜•ì‹ (@pathì˜ ìŠ¤í¬ë¦½íŠ¸ê°€ ìœ íš¨í•˜ì§€ ì•ŠìŒ)" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary (invalid subclasses)" msgstr "ìœ íš¨í•˜ì§€ ì•Šì€ ì¸ìŠ¤í„´ìŠ¤ Dictionary (서브í´ëž˜ìŠ¤ê°€ ìœ íš¨í•˜ì§€ ì•ŠìŒ)" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Object can't provide a length." msgstr "" @@ -6821,16 +6954,26 @@ msgid "GridMap Duplicate Selection" msgstr "ì„ íƒí‚¤ ë³µì œ" #: modules/gridmap/grid_map_editor_plugin.cpp +msgid "Floor:" +msgstr "" + +#: modules/gridmap/grid_map_editor_plugin.cpp +#, fuzzy +msgid "Grid Map" +msgstr "그리드 스냅" + +#: modules/gridmap/grid_map_editor_plugin.cpp #, fuzzy msgid "Snap View" msgstr "ìƒë‹¨ ë·°" #: modules/gridmap/grid_map_editor_plugin.cpp -msgid "Prev Level (%sDown Wheel)" -msgstr "" +#, fuzzy +msgid "Previous Floor" +msgstr "ì´ì „ íƒ" #: modules/gridmap/grid_map_editor_plugin.cpp -msgid "Next Level (%sUp Wheel)" +msgid "Next Floor" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp @@ -6906,13 +7049,8 @@ msgstr "타ì¼ë§µ 지우기" #: modules/gridmap/grid_map_editor_plugin.cpp #, fuzzy -msgid "Selection -> Duplicate" -msgstr "ì„ íƒì˜ì—만" - -#: modules/gridmap/grid_map_editor_plugin.cpp -#, fuzzy -msgid "Selection -> Clear" -msgstr "ì„ íƒì˜ì—만" +msgid "Clear Selection" +msgstr "ì„ íƒí•ëª© 화면 ì¤‘ì•™ì— í‘œì‹œ" #: modules/gridmap/grid_map_editor_plugin.cpp #, fuzzy @@ -7042,7 +7180,7 @@ msgid "Duplicate VisualScript Nodes" msgstr "그래프 노드 ë³µì œ" #: modules/visual_script/visual_script_editor.cpp -msgid "Hold Meta to drop a Getter. Hold Shift to drop a generic signature." +msgid "Hold %s to drop a Getter. Hold Shift to drop a generic signature." msgstr "" #: modules/visual_script/visual_script_editor.cpp @@ -7050,7 +7188,7 @@ msgid "Hold Ctrl to drop a Getter. Hold Shift to drop a generic signature." msgstr "" #: modules/visual_script/visual_script_editor.cpp -msgid "Hold Meta to drop a simple reference to the node." +msgid "Hold %s to drop a simple reference to the node." msgstr "" #: modules/visual_script/visual_script_editor.cpp @@ -7058,7 +7196,7 @@ msgid "Hold Ctrl to drop a simple reference to the node." msgstr "" #: modules/visual_script/visual_script_editor.cpp -msgid "Hold Meta to drop a Variable Setter." +msgid "Hold %s to drop a Variable Setter." msgstr "" #: modules/visual_script/visual_script_editor.cpp @@ -7297,13 +7435,23 @@ msgstr "타ì¼ì„ ì°¾ì„ ìˆ˜ ì—†ìŒ:" #: platform/javascript/export/export.cpp #, fuzzy -msgid "Could not read file:\n" +msgid "Could not open template for export:\n" +msgstr "í´ë”를 만들 수 없습니다." + +#: platform/javascript/export/export.cpp +#, fuzzy +msgid "Invalid export template:\n" +msgstr "내보내기 템플릿 설치" + +#: platform/javascript/export/export.cpp +#, fuzzy +msgid "Could not read custom HTML shell:\n" msgstr "타ì¼ì„ ì°¾ì„ ìˆ˜ ì—†ìŒ:" #: platform/javascript/export/export.cpp #, fuzzy -msgid "Could not open template for export:\n" -msgstr "í´ë”를 만들 수 없습니다." +msgid "Could not read boot splash image file:\n" +msgstr "타ì¼ì„ ì°¾ì„ ìˆ˜ ì—†ìŒ:" #: scene/2d/animated_sprite.cpp msgid "" @@ -7412,22 +7560,6 @@ msgstr "" msgid "Path property must point to a valid Node2D node to work." msgstr "Path ì†ì„±ì€ ìœ íš¨í•œ Node2D 노드를 가리켜야 합니다." -#: scene/2d/sprite.cpp -msgid "" -"Path property must point to a valid Viewport node to work. Such Viewport " -"must be set to 'render target' mode." -msgstr "" -"Path ì†ì„±ì€ ìœ íš¨í•œ Viewport 노드를 가리켜야 합니다. 가리킨 Viewport는 ë˜í•œ " -"'render target' 모드로 ì„¤ì •ë˜ì–´ì•¼ 합니다." - -#: scene/2d/sprite.cpp -msgid "" -"The Viewport set in the path property must be set as 'render target' in " -"order for this sprite to work." -msgstr "" -"ì´ Spriteê°€ ë™ìž‘하기 위해서는 Path ì†ì„±ì— ì§€ì •ëœ Viewportê°€ 'render target'으" -"ë¡œ ì„¤ì •ë˜ì–´ì•¼ 합니다." - #: scene/2d/visibility_notifier_2d.cpp msgid "" "VisibilityEnable2D works best when used with the edited scene root directly " @@ -7496,6 +7628,15 @@ msgstr "" "CollisionShapeì´ ê¸°ëŠ¥ì„ í•˜ê¸° 위해서는 ëª¨ì–‘ì´ ì œê³µë˜ì–´ì•¼ 합니다. 모양 리소스" "를 만드세요!" +#: scene/3d/gi_probe.cpp +#, fuzzy +msgid "Plotting Meshes" +msgstr "ì´ë¯¸ì§€ 병합 중" + +#: scene/3d/gi_probe.cpp +msgid "Finishing Plot" +msgstr "" + #: scene/3d/navigation_mesh.cpp msgid "A NavigationMesh resource must be set or created for this node to work." msgstr "" @@ -7582,6 +7723,10 @@ msgid "" "minimum size manually." msgstr "" +#: scene/gui/tree.cpp +msgid "(Other)" +msgstr "" + #: scene/main/scene_tree.cpp msgid "" "Default Environment as specified in Project Setings (Rendering -> Viewport -" @@ -7616,6 +7761,63 @@ msgstr "í°íŠ¸ 로딩 ì—러." msgid "Invalid font size." msgstr "ìœ ìš”í•˜ì§€ ì•Šì€ í°íŠ¸ 사ì´ì¦ˆ." +#~ msgid "" +#~ "\n" +#~ "Source: " +#~ msgstr "" +#~ "\n" +#~ "소스: " + +#~ msgid "Remove Point from Line2D" +#~ msgstr "Line2Dì—ì„œ í¬ì¸íŠ¸ ì‚ì œ" + +#~ msgid "Add Point to Line2D" +#~ msgstr "Line2Dì— í¬ì¸íŠ¸ 추가" + +#~ msgid "Move Point in Line2D" +#~ msgstr "Line2Dì˜ í¬ì¸íŠ¸ ì´ë™" + +#~ msgid "Split Segment (in line)" +#~ msgstr "세그먼트 ë¶„í• (ë¼ì¸)" + +#~ msgid "Meta+" +#~ msgstr "메타+" + +#, fuzzy +#~ msgid "Setting '" +#~ msgstr "ì„¤ì •" + +#~ msgid "Remote Inspector" +#~ msgstr "ì›ê²© ì¸ìŠ¤íŽ™í„°" + +#~ msgid "Live Scene Tree:" +#~ msgstr "실시간 씬 트리:" + +#~ msgid "Remote Object Properties: " +#~ msgstr "ì›ê²© 오브ì 트 ì†ì„±: " + +#, fuzzy +#~ msgid "Selection -> Duplicate" +#~ msgstr "ì„ íƒì˜ì—만" + +#, fuzzy +#~ msgid "Selection -> Clear" +#~ msgstr "ì„ íƒì˜ì—만" + +#~ msgid "" +#~ "Path property must point to a valid Viewport node to work. Such Viewport " +#~ "must be set to 'render target' mode." +#~ msgstr "" +#~ "Path ì†ì„±ì€ ìœ íš¨í•œ Viewport 노드를 가리켜야 합니다. 가리킨 Viewport는 ë˜" +#~ "í•œ 'render target' 모드로 ì„¤ì •ë˜ì–´ì•¼ 합니다." + +#~ msgid "" +#~ "The Viewport set in the path property must be set as 'render target' in " +#~ "order for this sprite to work." +#~ msgstr "" +#~ "ì´ Spriteê°€ ë™ìž‘하기 위해서는 Path ì†ì„±ì— ì§€ì •ëœ Viewportê°€ 'render " +#~ "target'으로 ì„¤ì •ë˜ì–´ì•¼ 합니다." + #~ msgid "Filter:" #~ msgstr "í•„í„°:" @@ -7637,9 +7839,6 @@ msgstr "ìœ ìš”í•˜ì§€ ì•Šì€ í°íŠ¸ 사ì´ì¦ˆ." #~ msgid "Removed:" #~ msgstr "ì œê±°ë¨:" -#~ msgid "Error saving atlas:" -#~ msgstr "ì•„í‹€ë¼ìŠ¤ ì €ìž¥ 중 ì—러:" - #~ msgid "Could not save atlas subtexture:" #~ msgstr "ì•„í‹€ë¼ìŠ¤ 서브 í…스ì³ë¥¼ ì €ìž¥í• ìˆ˜ 없습니다:" @@ -8019,9 +8218,6 @@ msgstr "ìœ ìš”í•˜ì§€ ì•Šì€ í°íŠ¸ 사ì´ì¦ˆ." #~ msgid "Cropping Images" #~ msgstr "ì´ë¯¸ì§€ ìžë¥´ëŠ” 중" -#~ msgid "Blitting Images" -#~ msgstr "ì´ë¯¸ì§€ 병합 중" - #~ msgid "Couldn't save atlas image:" #~ msgstr "ì•„í‹€ë¼ìŠ¤ ì´ë¯¸ì§€ë¥¼ ì €ìž¥í• ìˆ˜ ì—†ìŒ:" @@ -8382,9 +8578,6 @@ msgstr "ìœ ìš”í•˜ì§€ ì•Šì€ í°íŠ¸ 사ì´ì¦ˆ." #~ msgid "Save Translatable Strings" #~ msgstr "번ì—가능한 문ìžì—´ ì €ìž¥" -#~ msgid "Install Export Templates" -#~ msgstr "내보내기 템플릿 설치" - #~ msgid "Edit Script Options" #~ msgstr "스í¬ë¦½íŠ¸ 옵션 편집" diff --git a/editor/translations/lt.po b/editor/translations/lt.po index b85e8e01aa..f899a0f7f7 100644 --- a/editor/translations/lt.po +++ b/editor/translations/lt.po @@ -100,6 +100,7 @@ msgid "Anim Delete Keys" msgstr "" #: editor/animation_editor.cpp editor/plugins/tile_map_editor_plugin.cpp +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Duplicate Selection" msgstr "" @@ -629,6 +630,13 @@ msgstr "" msgid "Search Replacement Resource:" msgstr "" +#: editor/dependency_editor.cpp editor/editor_file_dialog.cpp +#: editor/editor_help.cpp editor/editor_node.cpp editor/filesystem_dock.cpp +#: editor/plugins/script_editor_plugin.cpp editor/property_selector.cpp +#: editor/quick_open.cpp scene/gui/file_dialog.cpp +msgid "Open" +msgstr "" + #: editor/dependency_editor.cpp msgid "Owners Of:" msgstr "" @@ -699,6 +707,14 @@ msgstr "" msgid "Delete" msgstr "" +#: editor/dictionary_property_edit.cpp +msgid "Change Dictionary Key" +msgstr "" + +#: editor/dictionary_property_edit.cpp +msgid "Change Dictionary Value" +msgstr "" + #: editor/editor_about.cpp msgid "Thanks from the Godot community!" msgstr "" @@ -1114,12 +1130,6 @@ msgstr "" msgid "All Files (*)" msgstr "" -#: editor/editor_file_dialog.cpp editor/editor_help.cpp editor/editor_node.cpp -#: editor/filesystem_dock.cpp editor/plugins/script_editor_plugin.cpp -#: editor/property_selector.cpp editor/quick_open.cpp scene/gui/file_dialog.cpp -msgid "Open" -msgstr "" - #: editor/editor_file_dialog.cpp scene/gui/file_dialog.cpp msgid "Open a File" msgstr "" @@ -1472,6 +1482,13 @@ msgid "" msgstr "" #: editor/editor_node.cpp +msgid "" +"This is a remote object so changes to it will not be kept.\n" +"Please read the documentation relevant to debugging to better understand " +"this workflow." +msgstr "" + +#: editor/editor_node.cpp msgid "Copy Params" msgstr "" @@ -1581,6 +1598,10 @@ msgid "Export Mesh Library" msgstr "" #: editor/editor_node.cpp +msgid "This operation can't be done without a root node." +msgstr "" + +#: editor/editor_node.cpp msgid "Export Tile Set" msgstr "" @@ -1706,11 +1727,19 @@ msgid "Switch Scene Tab" msgstr "" #: editor/editor_node.cpp -msgid "%d more file(s)" +msgid "%d more files or folders" +msgstr "" + +#: editor/editor_node.cpp +msgid "%d more folders" +msgstr "" + +#: editor/editor_node.cpp +msgid "%d more files" msgstr "" #: editor/editor_node.cpp -msgid "%d more file(s) or folder(s)" +msgid "Dock Position" msgstr "" #: editor/editor_node.cpp @@ -1722,6 +1751,10 @@ msgid "Toggle distraction-free mode." msgstr "" #: editor/editor_node.cpp +msgid "Add a new scene." +msgstr "" + +#: editor/editor_node.cpp msgid "Scene" msgstr "" @@ -1786,13 +1819,12 @@ msgid "TileSet.." msgstr "" #: editor/editor_node.cpp editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp scene/gui/line_edit.cpp -#: scene/gui/text_edit.cpp +#: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Undo" msgstr "" #: editor/editor_node.cpp editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp +#: scene/gui/line_edit.cpp msgid "Redo" msgstr "" @@ -2273,6 +2305,10 @@ msgid "(Current)" msgstr "" #: editor/export_template_manager.cpp +msgid "Retrieving mirrors, please wait.." +msgstr "" + +#: editor/export_template_manager.cpp msgid "Remove template version '%s'?" msgstr "" @@ -2307,6 +2343,100 @@ msgid "Importing:" msgstr "" #: editor/export_template_manager.cpp +msgid "" +"No download links found for this version. Direct download is only available " +"for official releases." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Can't resolve." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Can't connect." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "No response." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Req. Failed." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Redirect Loop." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Failed:" +msgstr "" + +#: editor/export_template_manager.cpp +msgid "Can't write file." +msgstr "" + +#: editor/export_template_manager.cpp +msgid "Download Complete." +msgstr "" + +#: editor/export_template_manager.cpp +msgid "Error requesting url: " +msgstr "" + +#: editor/export_template_manager.cpp +msgid "Connecting to Mirror.." +msgstr "" + +#: editor/export_template_manager.cpp +msgid "Disconnected" +msgstr "" + +#: editor/export_template_manager.cpp +msgid "Resolving" +msgstr "" + +#: editor/export_template_manager.cpp +msgid "Can't Resolve" +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Connecting.." +msgstr "" + +#: editor/export_template_manager.cpp +msgid "Can't Conect" +msgstr "" + +#: editor/export_template_manager.cpp +msgid "Connected" +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Requesting.." +msgstr "" + +#: editor/export_template_manager.cpp +msgid "Downloading" +msgstr "" + +#: editor/export_template_manager.cpp +msgid "Connection Error" +msgstr "" + +#: editor/export_template_manager.cpp +msgid "SSL Handshake Error" +msgstr "" + +#: editor/export_template_manager.cpp msgid "Current Version:" msgstr "" @@ -2330,12 +2460,20 @@ msgstr "" msgid "Export Template Manager" msgstr "" +#: editor/export_template_manager.cpp +msgid "Download Templates" +msgstr "" + +#: editor/export_template_manager.cpp +msgid "Select mirror from list: " +msgstr "" + #: editor/file_type_cache.cpp msgid "Can't open file_type_cache.cch for writing, not saving file type cache!" msgstr "" #: editor/filesystem_dock.cpp -msgid "Cannot navigate to '" +msgid "Cannot navigate to '%s' as it has not been found in the file system!" msgstr "" #: editor/filesystem_dock.cpp @@ -2353,12 +2491,6 @@ msgid "" msgstr "" #: editor/filesystem_dock.cpp -msgid "" -"\n" -"Source: " -msgstr "" - -#: editor/filesystem_dock.cpp msgid "Cannot move/rename resources root." msgstr "" @@ -2616,8 +2748,7 @@ msgid "Remove Poly And Point" msgstr "" #: editor/plugins/abstract_polygon_2d_editor.cpp -#: editor/plugins/light_occluder_2d_editor_plugin.cpp -msgid "Create a new polygon from scratch." +msgid "Create a new polygon from scratch" msgstr "" #: editor/plugins/abstract_polygon_2d_editor.cpp @@ -2628,6 +2759,10 @@ msgid "" "RMB: Erase Point." msgstr "" +#: editor/plugins/abstract_polygon_2d_editor.cpp +msgid "Delete points" +msgstr "" + #: editor/plugins/animation_player_editor_plugin.cpp msgid "Toggle Autoplay" msgstr "" @@ -2962,18 +3097,10 @@ msgid "Can't resolve hostname:" msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Can't resolve." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Connection error, please try again." msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Can't connect." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Can't connect to host:" msgstr "" @@ -2982,30 +3109,14 @@ msgid "No response from host:" msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "No response." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Request failed, return code:" msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Req. Failed." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Request failed, too many redirects" msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Redirect Loop." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp -msgid "Failed:" -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Bad download hash, assuming file has been tampered with." msgstr "" @@ -3034,14 +3145,6 @@ msgid "Resolving.." msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Connecting.." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp -msgid "Requesting.." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Error making request" msgstr "" @@ -3154,6 +3257,34 @@ msgid "Move Action" msgstr "" #: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Move vertical guide" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Create new vertical guide" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Remove vertical guide" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Move horizontal guide" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Create new horizontal guide" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Remove horizontal guide" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Create new horizontal and vertical guides" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp msgid "Edit IK Chain" msgstr "" @@ -3274,10 +3405,16 @@ msgid "Snap to other nodes" msgstr "" #: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Snap to guides" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Lock the selected object in place (can't be moved)." msgstr "" #: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Unlock the selected object (can be moved)." msgstr "" @@ -3328,6 +3465,10 @@ msgid "Show rulers" msgstr "" #: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Show guides" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp msgid "Center Selection" msgstr "" @@ -3512,6 +3653,10 @@ msgstr "" msgid "Hold Shift to edit tangents individually" msgstr "" +#: editor/plugins/gi_probe_editor_plugin.cpp +msgid "Bake GI Probe" +msgstr "" + #: editor/plugins/gradient_editor_plugin.cpp msgid "Add/Remove Color Ramp Point" msgstr "" @@ -3544,6 +3689,10 @@ msgid "Create Occluder Polygon" msgstr "" #: editor/plugins/light_occluder_2d_editor_plugin.cpp +msgid "Create a new polygon from scratch." +msgstr "" + +#: editor/plugins/light_occluder_2d_editor_plugin.cpp msgid "Edit existing polygon:" msgstr "" @@ -3559,58 +3708,6 @@ msgstr "" msgid "RMB: Erase Point." msgstr "" -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Remove Point from Line2D" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Add Point to Line2D" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Move Point in Line2D" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Select Points" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Shift+Drag: Select Control Points" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Click: Add Point" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Right Click: Delete Point" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Add Point (in empty space)" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Split Segment (in line)" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Delete Point" -msgstr "" - #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Mesh is empty!" msgstr "" @@ -4008,16 +4105,46 @@ msgid "Move Out-Control in Curve" msgstr "" #: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Select Points" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Shift+Drag: Select Control Points" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Click: Add Point" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Right Click: Delete Point" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp msgid "Select Control Points (Shift+Drag)" msgstr "" #: editor/plugins/path_2d_editor_plugin.cpp #: editor/plugins/path_editor_plugin.cpp +msgid "Add Point (in empty space)" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp msgid "Split Segment (in curve)" msgstr "" #: editor/plugins/path_2d_editor_plugin.cpp #: editor/plugins/path_editor_plugin.cpp +msgid "Delete Point" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp msgid "Close Curve" msgstr "" @@ -4154,7 +4281,6 @@ msgstr "" #: editor/plugins/resource_preloader_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp #: editor/plugins/sprite_frames_editor_plugin.cpp editor/property_editor.cpp #: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Paste" @@ -4199,6 +4325,20 @@ msgid " Class Reference" msgstr "" #: editor/plugins/script_editor_plugin.cpp +msgid "Sort" +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp +msgid "Move Up" +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp +msgid "Move Down" +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp msgid "Next script" msgstr "" @@ -4250,6 +4390,10 @@ msgstr "" msgid "Close All" msgstr "" +#: editor/plugins/script_editor_plugin.cpp +msgid "Close Other Tabs" +msgstr "" + #: editor/plugins/script_editor_plugin.cpp editor/project_manager.cpp msgid "Run" msgstr "" @@ -4260,13 +4404,11 @@ msgstr "" #: editor/plugins/script_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Find.." msgstr "" #: editor/plugins/script_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Find Next" msgstr "" @@ -4370,33 +4512,22 @@ msgstr "" msgid "Capitalize" msgstr "" -#: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp scene/gui/line_edit.cpp +#: editor/plugins/script_text_editor.cpp scene/gui/line_edit.cpp #: scene/gui/text_edit.cpp msgid "Cut" msgstr "" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp #: editor/plugins/sprite_frames_editor_plugin.cpp editor/property_editor.cpp #: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Copy" msgstr "" -#: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp scene/gui/line_edit.cpp +#: editor/plugins/script_text_editor.cpp scene/gui/line_edit.cpp #: scene/gui/text_edit.cpp msgid "Select All" msgstr "" -#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp -msgid "Move Up" -msgstr "" - -#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp -msgid "Move Down" -msgstr "" - #: editor/plugins/script_text_editor.cpp msgid "Delete Line" msgstr "" @@ -4418,6 +4549,22 @@ msgid "Clone Down" msgstr "" #: editor/plugins/script_text_editor.cpp +msgid "Fold Line" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Unfold Line" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Fold All Lines" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Unfold All Lines" +msgstr "" + +#: editor/plugins/script_text_editor.cpp msgid "Complete Symbol" msgstr "" @@ -4463,12 +4610,10 @@ msgid "Convert To Lowercase" msgstr "" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Find Previous" msgstr "" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Replace.." msgstr "" @@ -4477,7 +4622,6 @@ msgid "Goto Function.." msgstr "" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Goto Line.." msgstr "" @@ -4642,6 +4786,14 @@ msgid "View Plane Transform." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "Scaling: " +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Translating: " +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Rotating %s degrees." msgstr "" @@ -4722,6 +4874,10 @@ msgid "Vertices" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "FPS" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Align with view" msgstr "" @@ -4754,6 +4910,14 @@ msgid "View Information" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "View FPS" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Half Resolution" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Audio Listener" msgstr "" @@ -4881,6 +5045,10 @@ msgid "Tool Scale" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "Toggle Freelook" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Transform" msgstr "" @@ -5155,6 +5323,10 @@ msgid "Create Empty Editor Template" msgstr "" #: editor/plugins/theme_editor_plugin.cpp +msgid "Create From Current Editor Theme" +msgstr "" + +#: editor/plugins/theme_editor_plugin.cpp msgid "CheckBox Radio1" msgstr "" @@ -5328,7 +5500,7 @@ msgid "Runnable" msgstr "" #: editor/project_export.cpp -msgid "Delete patch '" +msgid "Delete patch '%s' from list?" msgstr "" #: editor/project_export.cpp @@ -5621,10 +5793,6 @@ msgid "Add Input Action Event" msgstr "" #: editor/project_settings_editor.cpp editor/settings_config_dialog.cpp -msgid "Meta+" -msgstr "" - -#: editor/project_settings_editor.cpp editor/settings_config_dialog.cpp msgid "Shift+" msgstr "" @@ -5746,11 +5914,11 @@ msgid "Select a setting item first!" msgstr "" #: editor/project_settings_editor.cpp -msgid "No property '" +msgid "No property '%s' exists." msgstr "" #: editor/project_settings_editor.cpp -msgid "Setting '" +msgid "Setting '%s' is internal, and it can't be deleted." msgstr "" #: editor/project_settings_editor.cpp @@ -6217,6 +6385,14 @@ msgid "Clear a script for the selected node." msgstr "" #: editor/scene_tree_dock.cpp +msgid "Remote" +msgstr "" + +#: editor/scene_tree_dock.cpp +msgid "Local" +msgstr "" + +#: editor/scene_tree_dock.cpp msgid "Clear Inheritance? (No Undo!)" msgstr "" @@ -6399,6 +6575,10 @@ msgid "Attach Node Script" msgstr "" #: editor/script_editor_debugger.cpp +msgid "Remote " +msgstr "" + +#: editor/script_editor_debugger.cpp msgid "Bytes:" msgstr "" @@ -6455,18 +6635,6 @@ msgid "Stack Trace (if applicable):" msgstr "" #: editor/script_editor_debugger.cpp -msgid "Remote Inspector" -msgstr "" - -#: editor/script_editor_debugger.cpp -msgid "Live Scene Tree:" -msgstr "" - -#: editor/script_editor_debugger.cpp -msgid "Remote Object Properties: " -msgstr "" - -#: editor/script_editor_debugger.cpp msgid "Profiler" msgstr "" @@ -6598,49 +6766,49 @@ msgstr "" msgid "GDNative" msgstr "" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp #: modules/visual_script/visual_script_builtin_funcs.cpp msgid "Invalid type argument to convert(), use TYPE_* constants." msgstr "" -#: modules/gdscript/gd_functions.cpp modules/mono/glue/glue_header.h +#: modules/gdscript/gdscript_functions.cpp modules/mono/glue/glue_header.h #: modules/visual_script/visual_script_builtin_funcs.cpp msgid "Not enough bytes for decoding bytes, or invalid format." msgstr "" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "step argument is zero!" msgstr "" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Not a script with an instance" msgstr "" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Not based on a script" msgstr "" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Not based on a resource file" msgstr "" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary format (missing @path)" msgstr "" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary format (can't load script at @path)" msgstr "" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary format (invalid script at @path)" msgstr "" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary (invalid subclasses)" msgstr "" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Object can't provide a length." msgstr "" @@ -6653,15 +6821,23 @@ msgid "GridMap Duplicate Selection" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp +msgid "Floor:" +msgstr "" + +#: modules/gridmap/grid_map_editor_plugin.cpp +msgid "Grid Map" +msgstr "" + +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Snap View" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp -msgid "Prev Level (%sDown Wheel)" +msgid "Previous Floor" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp -msgid "Next Level (%sUp Wheel)" +msgid "Next Floor" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp @@ -6729,12 +6905,9 @@ msgid "Erase Area" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp -msgid "Selection -> Duplicate" -msgstr "" - -#: modules/gridmap/grid_map_editor_plugin.cpp -msgid "Selection -> Clear" -msgstr "" +#, fuzzy +msgid "Clear Selection" +msgstr "Panaikinti pasirinkimÄ…" #: modules/gridmap/grid_map_editor_plugin.cpp msgid "GridMap Settings" @@ -6855,7 +7028,7 @@ msgid "Duplicate VisualScript Nodes" msgstr "" #: modules/visual_script/visual_script_editor.cpp -msgid "Hold Meta to drop a Getter. Hold Shift to drop a generic signature." +msgid "Hold %s to drop a Getter. Hold Shift to drop a generic signature." msgstr "" #: modules/visual_script/visual_script_editor.cpp @@ -6863,7 +7036,7 @@ msgid "Hold Ctrl to drop a Getter. Hold Shift to drop a generic signature." msgstr "" #: modules/visual_script/visual_script_editor.cpp -msgid "Hold Meta to drop a simple reference to the node." +msgid "Hold %s to drop a simple reference to the node." msgstr "" #: modules/visual_script/visual_script_editor.cpp @@ -6871,7 +7044,7 @@ msgid "Hold Ctrl to drop a simple reference to the node." msgstr "" #: modules/visual_script/visual_script_editor.cpp -msgid "Hold Meta to drop a Variable Setter." +msgid "Hold %s to drop a Variable Setter." msgstr "" #: modules/visual_script/visual_script_editor.cpp @@ -7097,11 +7270,19 @@ msgid "Could not write file:\n" msgstr "" #: platform/javascript/export/export.cpp -msgid "Could not read file:\n" +msgid "Could not open template for export:\n" msgstr "" #: platform/javascript/export/export.cpp -msgid "Could not open template for export:\n" +msgid "Invalid export template:\n" +msgstr "" + +#: platform/javascript/export/export.cpp +msgid "Could not read custom HTML shell:\n" +msgstr "" + +#: platform/javascript/export/export.cpp +msgid "Could not read boot splash image file:\n" msgstr "" #: scene/2d/animated_sprite.cpp @@ -7193,18 +7374,6 @@ msgstr "" msgid "Path property must point to a valid Node2D node to work." msgstr "" -#: scene/2d/sprite.cpp -msgid "" -"Path property must point to a valid Viewport node to work. Such Viewport " -"must be set to 'render target' mode." -msgstr "" - -#: scene/2d/sprite.cpp -msgid "" -"The Viewport set in the path property must be set as 'render target' in " -"order for this sprite to work." -msgstr "" - #: scene/2d/visibility_notifier_2d.cpp msgid "" "VisibilityEnable2D works best when used with the edited scene root directly " @@ -7263,6 +7432,14 @@ msgid "" "shape resource for it!" msgstr "" +#: scene/3d/gi_probe.cpp +msgid "Plotting Meshes" +msgstr "" + +#: scene/3d/gi_probe.cpp +msgid "Finishing Plot" +msgstr "" + #: scene/3d/navigation_mesh.cpp msgid "A NavigationMesh resource must be set or created for this node to work." msgstr "" @@ -7340,6 +7517,10 @@ msgid "" "minimum size manually." msgstr "" +#: scene/gui/tree.cpp +msgid "(Other)" +msgstr "" + #: scene/main/scene_tree.cpp msgid "" "Default Environment as specified in Project Setings (Rendering -> Viewport -" diff --git a/editor/translations/nb.po b/editor/translations/nb.po index b4c3df0fb9..fd6c626512 100644 --- a/editor/translations/nb.po +++ b/editor/translations/nb.po @@ -100,6 +100,7 @@ msgid "Anim Delete Keys" msgstr "Anim Fjern Nøkler" #: editor/animation_editor.cpp editor/plugins/tile_map_editor_plugin.cpp +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Duplicate Selection" msgstr "Dupliser Utvalg" @@ -629,6 +630,13 @@ msgstr "" msgid "Search Replacement Resource:" msgstr "" +#: editor/dependency_editor.cpp editor/editor_file_dialog.cpp +#: editor/editor_help.cpp editor/editor_node.cpp editor/filesystem_dock.cpp +#: editor/plugins/script_editor_plugin.cpp editor/property_selector.cpp +#: editor/quick_open.cpp scene/gui/file_dialog.cpp +msgid "Open" +msgstr "" + #: editor/dependency_editor.cpp msgid "Owners Of:" msgstr "" @@ -699,6 +707,15 @@ msgstr "" msgid "Delete" msgstr "" +#: editor/dictionary_property_edit.cpp +msgid "Change Dictionary Key" +msgstr "" + +#: editor/dictionary_property_edit.cpp +#, fuzzy +msgid "Change Dictionary Value" +msgstr "Anim Forandre Verdi" + #: editor/editor_about.cpp msgid "Thanks from the Godot community!" msgstr "" @@ -1120,12 +1137,6 @@ msgstr "" msgid "All Files (*)" msgstr "" -#: editor/editor_file_dialog.cpp editor/editor_help.cpp editor/editor_node.cpp -#: editor/filesystem_dock.cpp editor/plugins/script_editor_plugin.cpp -#: editor/property_selector.cpp editor/quick_open.cpp scene/gui/file_dialog.cpp -msgid "Open" -msgstr "" - #: editor/editor_file_dialog.cpp scene/gui/file_dialog.cpp msgid "Open a File" msgstr "" @@ -1481,6 +1492,13 @@ msgid "" msgstr "" #: editor/editor_node.cpp +msgid "" +"This is a remote object so changes to it will not be kept.\n" +"Please read the documentation relevant to debugging to better understand " +"this workflow." +msgstr "" + +#: editor/editor_node.cpp msgid "Copy Params" msgstr "" @@ -1590,6 +1608,10 @@ msgid "Export Mesh Library" msgstr "" #: editor/editor_node.cpp +msgid "This operation can't be done without a root node." +msgstr "" + +#: editor/editor_node.cpp msgid "Export Tile Set" msgstr "" @@ -1715,11 +1737,19 @@ msgid "Switch Scene Tab" msgstr "" #: editor/editor_node.cpp -msgid "%d more file(s)" +msgid "%d more files or folders" +msgstr "" + +#: editor/editor_node.cpp +msgid "%d more folders" +msgstr "" + +#: editor/editor_node.cpp +msgid "%d more files" msgstr "" #: editor/editor_node.cpp -msgid "%d more file(s) or folder(s)" +msgid "Dock Position" msgstr "" #: editor/editor_node.cpp @@ -1731,6 +1761,10 @@ msgid "Toggle distraction-free mode." msgstr "" #: editor/editor_node.cpp +msgid "Add a new scene." +msgstr "" + +#: editor/editor_node.cpp msgid "Scene" msgstr "" @@ -1795,13 +1829,12 @@ msgid "TileSet.." msgstr "" #: editor/editor_node.cpp editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp scene/gui/line_edit.cpp -#: scene/gui/text_edit.cpp +#: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Undo" msgstr "" #: editor/editor_node.cpp editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp +#: scene/gui/line_edit.cpp msgid "Redo" msgstr "" @@ -2283,6 +2316,10 @@ msgid "(Current)" msgstr "" #: editor/export_template_manager.cpp +msgid "Retrieving mirrors, please wait.." +msgstr "" + +#: editor/export_template_manager.cpp msgid "Remove template version '%s'?" msgstr "" @@ -2317,6 +2354,103 @@ msgid "Importing:" msgstr "" #: editor/export_template_manager.cpp +msgid "" +"No download links found for this version. Direct download is only available " +"for official releases." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Can't resolve." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Can't connect." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "No response." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Req. Failed." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Redirect Loop." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Failed:" +msgstr "" + +#: editor/export_template_manager.cpp +msgid "Can't write file." +msgstr "" + +#: editor/export_template_manager.cpp +msgid "Download Complete." +msgstr "" + +#: editor/export_template_manager.cpp +msgid "Error requesting url: " +msgstr "" + +#: editor/export_template_manager.cpp +msgid "Connecting to Mirror.." +msgstr "" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Disconnected" +msgstr "Diskret" + +#: editor/export_template_manager.cpp +msgid "Resolving" +msgstr "" + +#: editor/export_template_manager.cpp +msgid "Can't Resolve" +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Connecting.." +msgstr "" + +#: editor/export_template_manager.cpp +msgid "Can't Conect" +msgstr "" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Connected" +msgstr "Kutt Noder" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Requesting.." +msgstr "" + +#: editor/export_template_manager.cpp +msgid "Downloading" +msgstr "" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Connection Error" +msgstr "Kutt Noder" + +#: editor/export_template_manager.cpp +msgid "SSL Handshake Error" +msgstr "" + +#: editor/export_template_manager.cpp msgid "Current Version:" msgstr "" @@ -2340,12 +2474,20 @@ msgstr "" msgid "Export Template Manager" msgstr "" +#: editor/export_template_manager.cpp +msgid "Download Templates" +msgstr "" + +#: editor/export_template_manager.cpp +msgid "Select mirror from list: " +msgstr "" + #: editor/file_type_cache.cpp msgid "Can't open file_type_cache.cch for writing, not saving file type cache!" msgstr "" #: editor/filesystem_dock.cpp -msgid "Cannot navigate to '" +msgid "Cannot navigate to '%s' as it has not been found in the file system!" msgstr "" #: editor/filesystem_dock.cpp @@ -2363,12 +2505,6 @@ msgid "" msgstr "" #: editor/filesystem_dock.cpp -msgid "" -"\n" -"Source: " -msgstr "" - -#: editor/filesystem_dock.cpp msgid "Cannot move/rename resources root." msgstr "" @@ -2626,8 +2762,7 @@ msgid "Remove Poly And Point" msgstr "" #: editor/plugins/abstract_polygon_2d_editor.cpp -#: editor/plugins/light_occluder_2d_editor_plugin.cpp -msgid "Create a new polygon from scratch." +msgid "Create a new polygon from scratch" msgstr "" #: editor/plugins/abstract_polygon_2d_editor.cpp @@ -2638,6 +2773,11 @@ msgid "" "RMB: Erase Point." msgstr "" +#: editor/plugins/abstract_polygon_2d_editor.cpp +#, fuzzy +msgid "Delete points" +msgstr "Slett Valgte" + #: editor/plugins/animation_player_editor_plugin.cpp msgid "Toggle Autoplay" msgstr "" @@ -2974,18 +3114,10 @@ msgid "Can't resolve hostname:" msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Can't resolve." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Connection error, please try again." msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Can't connect." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Can't connect to host:" msgstr "" @@ -2994,30 +3126,14 @@ msgid "No response from host:" msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "No response." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Request failed, return code:" msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Req. Failed." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Request failed, too many redirects" msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Redirect Loop." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp -msgid "Failed:" -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Bad download hash, assuming file has been tampered with." msgstr "" @@ -3046,14 +3162,6 @@ msgid "Resolving.." msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Connecting.." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp -msgid "Requesting.." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Error making request" msgstr "" @@ -3166,6 +3274,35 @@ msgid "Move Action" msgstr "" #: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Move vertical guide" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Create new vertical guide" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Remove vertical guide" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Move horizontal guide" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Create new horizontal guide" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Remove horizontal guide" +msgstr "Fjern Funksjon" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Create new horizontal and vertical guides" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp msgid "Edit IK Chain" msgstr "" @@ -3286,10 +3423,16 @@ msgid "Snap to other nodes" msgstr "" #: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Snap to guides" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Lock the selected object in place (can't be moved)." msgstr "" #: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Unlock the selected object (can be moved)." msgstr "" @@ -3340,6 +3483,10 @@ msgid "Show rulers" msgstr "" #: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Show guides" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp msgid "Center Selection" msgstr "" @@ -3528,6 +3675,10 @@ msgstr "" msgid "Hold Shift to edit tangents individually" msgstr "" +#: editor/plugins/gi_probe_editor_plugin.cpp +msgid "Bake GI Probe" +msgstr "" + #: editor/plugins/gradient_editor_plugin.cpp msgid "Add/Remove Color Ramp Point" msgstr "" @@ -3560,6 +3711,10 @@ msgid "Create Occluder Polygon" msgstr "" #: editor/plugins/light_occluder_2d_editor_plugin.cpp +msgid "Create a new polygon from scratch." +msgstr "" + +#: editor/plugins/light_occluder_2d_editor_plugin.cpp msgid "Edit existing polygon:" msgstr "" @@ -3575,58 +3730,6 @@ msgstr "" msgid "RMB: Erase Point." msgstr "" -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Remove Point from Line2D" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Add Point to Line2D" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Move Point in Line2D" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Select Points" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Shift+Drag: Select Control Points" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Click: Add Point" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Right Click: Delete Point" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Add Point (in empty space)" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Split Segment (in line)" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Delete Point" -msgstr "" - #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Mesh is empty!" msgstr "" @@ -4024,16 +4127,46 @@ msgid "Move Out-Control in Curve" msgstr "" #: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Select Points" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Shift+Drag: Select Control Points" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Click: Add Point" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Right Click: Delete Point" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp msgid "Select Control Points (Shift+Drag)" msgstr "" #: editor/plugins/path_2d_editor_plugin.cpp #: editor/plugins/path_editor_plugin.cpp +msgid "Add Point (in empty space)" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp msgid "Split Segment (in curve)" msgstr "" #: editor/plugins/path_2d_editor_plugin.cpp #: editor/plugins/path_editor_plugin.cpp +msgid "Delete Point" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp msgid "Close Curve" msgstr "" @@ -4174,7 +4307,6 @@ msgstr "" #: editor/plugins/resource_preloader_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp #: editor/plugins/sprite_frames_editor_plugin.cpp editor/property_editor.cpp #: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Paste" @@ -4219,6 +4351,20 @@ msgid " Class Reference" msgstr "" #: editor/plugins/script_editor_plugin.cpp +msgid "Sort" +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp +msgid "Move Up" +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp +msgid "Move Down" +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp msgid "Next script" msgstr "" @@ -4270,6 +4416,10 @@ msgstr "" msgid "Close All" msgstr "" +#: editor/plugins/script_editor_plugin.cpp +msgid "Close Other Tabs" +msgstr "" + #: editor/plugins/script_editor_plugin.cpp editor/project_manager.cpp msgid "Run" msgstr "" @@ -4280,13 +4430,11 @@ msgstr "" #: editor/plugins/script_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Find.." msgstr "" #: editor/plugins/script_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Find Next" msgstr "" @@ -4390,33 +4538,22 @@ msgstr "" msgid "Capitalize" msgstr "" -#: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp scene/gui/line_edit.cpp +#: editor/plugins/script_text_editor.cpp scene/gui/line_edit.cpp #: scene/gui/text_edit.cpp msgid "Cut" msgstr "" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp #: editor/plugins/sprite_frames_editor_plugin.cpp editor/property_editor.cpp #: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Copy" msgstr "" -#: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp scene/gui/line_edit.cpp +#: editor/plugins/script_text_editor.cpp scene/gui/line_edit.cpp #: scene/gui/text_edit.cpp msgid "Select All" msgstr "" -#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp -msgid "Move Up" -msgstr "" - -#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp -msgid "Move Down" -msgstr "" - #: editor/plugins/script_text_editor.cpp #, fuzzy msgid "Delete Line" @@ -4439,6 +4576,23 @@ msgid "Clone Down" msgstr "" #: editor/plugins/script_text_editor.cpp +#, fuzzy +msgid "Fold Line" +msgstr "Slett Valgte" + +#: editor/plugins/script_text_editor.cpp +msgid "Unfold Line" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Fold All Lines" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Unfold All Lines" +msgstr "" + +#: editor/plugins/script_text_editor.cpp msgid "Complete Symbol" msgstr "" @@ -4484,12 +4638,10 @@ msgid "Convert To Lowercase" msgstr "" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Find Previous" msgstr "" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Replace.." msgstr "" @@ -4498,7 +4650,6 @@ msgid "Goto Function.." msgstr "" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Goto Line.." msgstr "" @@ -4663,6 +4814,14 @@ msgid "View Plane Transform." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "Scaling: " +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Translating: " +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Rotating %s degrees." msgstr "" @@ -4744,6 +4903,10 @@ msgid "Vertices" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "FPS" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Align with view" msgstr "" @@ -4776,6 +4939,14 @@ msgid "View Information" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "View FPS" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Half Resolution" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Audio Listener" msgstr "" @@ -4904,6 +5075,10 @@ msgid "Tool Scale" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "Toggle Freelook" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Transform" msgstr "" @@ -5180,6 +5355,10 @@ msgid "Create Empty Editor Template" msgstr "" #: editor/plugins/theme_editor_plugin.cpp +msgid "Create From Current Editor Theme" +msgstr "" + +#: editor/plugins/theme_editor_plugin.cpp msgid "CheckBox Radio1" msgstr "" @@ -5354,7 +5533,7 @@ msgid "Runnable" msgstr "" #: editor/project_export.cpp -msgid "Delete patch '" +msgid "Delete patch '%s' from list?" msgstr "" #: editor/project_export.cpp @@ -5647,10 +5826,6 @@ msgid "Add Input Action Event" msgstr "" #: editor/project_settings_editor.cpp editor/settings_config_dialog.cpp -msgid "Meta+" -msgstr "" - -#: editor/project_settings_editor.cpp editor/settings_config_dialog.cpp msgid "Shift+" msgstr "" @@ -5772,11 +5947,11 @@ msgid "Select a setting item first!" msgstr "" #: editor/project_settings_editor.cpp -msgid "No property '" +msgid "No property '%s' exists." msgstr "" #: editor/project_settings_editor.cpp -msgid "Setting '" +msgid "Setting '%s' is internal, and it can't be deleted." msgstr "" #: editor/project_settings_editor.cpp @@ -6249,6 +6424,15 @@ msgid "Clear a script for the selected node." msgstr "" #: editor/scene_tree_dock.cpp +#, fuzzy +msgid "Remote" +msgstr "Fjern Funksjon" + +#: editor/scene_tree_dock.cpp +msgid "Local" +msgstr "" + +#: editor/scene_tree_dock.cpp msgid "Clear Inheritance? (No Undo!)" msgstr "" @@ -6432,6 +6616,11 @@ msgid "Attach Node Script" msgstr "" #: editor/script_editor_debugger.cpp +#, fuzzy +msgid "Remote " +msgstr "Fjern Funksjon" + +#: editor/script_editor_debugger.cpp msgid "Bytes:" msgstr "" @@ -6488,18 +6677,6 @@ msgid "Stack Trace (if applicable):" msgstr "" #: editor/script_editor_debugger.cpp -msgid "Remote Inspector" -msgstr "" - -#: editor/script_editor_debugger.cpp -msgid "Live Scene Tree:" -msgstr "" - -#: editor/script_editor_debugger.cpp -msgid "Remote Object Properties: " -msgstr "" - -#: editor/script_editor_debugger.cpp msgid "Profiler" msgstr "" @@ -6631,49 +6808,49 @@ msgstr "" msgid "GDNative" msgstr "" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp #: modules/visual_script/visual_script_builtin_funcs.cpp msgid "Invalid type argument to convert(), use TYPE_* constants." msgstr "Ugyldig argument til convert(), bruk TYPE_*-konstantene." -#: modules/gdscript/gd_functions.cpp modules/mono/glue/glue_header.h +#: modules/gdscript/gdscript_functions.cpp modules/mono/glue/glue_header.h #: modules/visual_script/visual_script_builtin_funcs.cpp msgid "Not enough bytes for decoding bytes, or invalid format." msgstr "" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "step argument is zero!" msgstr "" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Not a script with an instance" msgstr "" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Not based on a script" msgstr "Ikke basert pÃ¥ et skript" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Not based on a resource file" msgstr "Ikke basert pÃ¥ en ressursfil" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary format (missing @path)" msgstr "" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary format (can't load script at @path)" msgstr "" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary format (invalid script at @path)" msgstr "" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary (invalid subclasses)" msgstr "" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Object can't provide a length." msgstr "" @@ -6688,15 +6865,23 @@ msgid "GridMap Duplicate Selection" msgstr "Dupliser Utvalg" #: modules/gridmap/grid_map_editor_plugin.cpp +msgid "Floor:" +msgstr "" + +#: modules/gridmap/grid_map_editor_plugin.cpp +msgid "Grid Map" +msgstr "" + +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Snap View" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp -msgid "Prev Level (%sDown Wheel)" +msgid "Previous Floor" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp -msgid "Next Level (%sUp Wheel)" +msgid "Next Floor" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp @@ -6765,13 +6950,9 @@ msgid "Erase Area" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp -msgid "Selection -> Duplicate" -msgstr "" - -#: modules/gridmap/grid_map_editor_plugin.cpp #, fuzzy -msgid "Selection -> Clear" -msgstr "Forandre Utvalgskurve" +msgid "Clear Selection" +msgstr "Fjern Utvalg" #: modules/gridmap/grid_map_editor_plugin.cpp msgid "GridMap Settings" @@ -6896,7 +7077,8 @@ msgid "Duplicate VisualScript Nodes" msgstr "" #: modules/visual_script/visual_script_editor.cpp -msgid "Hold Meta to drop a Getter. Hold Shift to drop a generic signature." +#, fuzzy +msgid "Hold %s to drop a Getter. Hold Shift to drop a generic signature." msgstr "" "Hold Meta for Ã¥ slippe en Getter. Hold Skift for Ã¥ slippe en generisk " "signatur." @@ -6906,7 +7088,8 @@ msgid "Hold Ctrl to drop a Getter. Hold Shift to drop a generic signature." msgstr "" #: modules/visual_script/visual_script_editor.cpp -msgid "Hold Meta to drop a simple reference to the node." +#, fuzzy +msgid "Hold %s to drop a simple reference to the node." msgstr "Hold Meta for Ã¥ slippe en enkel referanse til noden." #: modules/visual_script/visual_script_editor.cpp @@ -6914,8 +7097,9 @@ msgid "Hold Ctrl to drop a simple reference to the node." msgstr "Hold Ctrl for Ã¥ slippe en simpel referanse til noden." #: modules/visual_script/visual_script_editor.cpp -msgid "Hold Meta to drop a Variable Setter." -msgstr "" +#, fuzzy +msgid "Hold %s to drop a Variable Setter." +msgstr "Hold Meta for Ã¥ slippe en enkel referanse til noden." #: modules/visual_script/visual_script_editor.cpp msgid "Hold Ctrl to drop a Variable Setter." @@ -7147,11 +7331,19 @@ msgid "Could not write file:\n" msgstr "" #: platform/javascript/export/export.cpp -msgid "Could not read file:\n" +msgid "Could not open template for export:\n" msgstr "" #: platform/javascript/export/export.cpp -msgid "Could not open template for export:\n" +msgid "Invalid export template:\n" +msgstr "" + +#: platform/javascript/export/export.cpp +msgid "Could not read custom HTML shell:\n" +msgstr "" + +#: platform/javascript/export/export.cpp +msgid "Could not read boot splash image file:\n" msgstr "" #: scene/2d/animated_sprite.cpp @@ -7243,18 +7435,6 @@ msgstr "" msgid "Path property must point to a valid Node2D node to work." msgstr "" -#: scene/2d/sprite.cpp -msgid "" -"Path property must point to a valid Viewport node to work. Such Viewport " -"must be set to 'render target' mode." -msgstr "" - -#: scene/2d/sprite.cpp -msgid "" -"The Viewport set in the path property must be set as 'render target' in " -"order for this sprite to work." -msgstr "" - #: scene/2d/visibility_notifier_2d.cpp msgid "" "VisibilityEnable2D works best when used with the edited scene root directly " @@ -7313,6 +7493,14 @@ msgid "" "shape resource for it!" msgstr "" +#: scene/3d/gi_probe.cpp +msgid "Plotting Meshes" +msgstr "" + +#: scene/3d/gi_probe.cpp +msgid "Finishing Plot" +msgstr "" + #: scene/3d/navigation_mesh.cpp msgid "A NavigationMesh resource must be set or created for this node to work." msgstr "" @@ -7390,6 +7578,10 @@ msgid "" "minimum size manually." msgstr "" +#: scene/gui/tree.cpp +msgid "(Other)" +msgstr "" + #: scene/main/scene_tree.cpp msgid "" "Default Environment as specified in Project Setings (Rendering -> Viewport -" @@ -7419,3 +7611,7 @@ msgstr "" #: scene/resources/dynamic_font.cpp msgid "Invalid font size." msgstr "" + +#, fuzzy +#~ msgid "Selection -> Clear" +#~ msgstr "Forandre Utvalgskurve" diff --git a/editor/translations/nl.po b/editor/translations/nl.po index a9ed678eac..a9af1fcc53 100644 --- a/editor/translations/nl.po +++ b/editor/translations/nl.po @@ -102,6 +102,7 @@ msgid "Anim Delete Keys" msgstr "Anim Verwijder Keys" #: editor/animation_editor.cpp editor/plugins/tile_map_editor_plugin.cpp +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Duplicate Selection" msgstr "Dupliceer Selectie" @@ -640,6 +641,13 @@ msgstr "Afhankelijkheden Editor" msgid "Search Replacement Resource:" msgstr "Zoek Vervangende Resource:" +#: editor/dependency_editor.cpp editor/editor_file_dialog.cpp +#: editor/editor_help.cpp editor/editor_node.cpp editor/filesystem_dock.cpp +#: editor/plugins/script_editor_plugin.cpp editor/property_selector.cpp +#: editor/quick_open.cpp scene/gui/file_dialog.cpp +msgid "Open" +msgstr "Openen" + #: editor/dependency_editor.cpp msgid "Owners Of:" msgstr "Eigenaren Van:" @@ -715,6 +723,15 @@ msgstr "Verwijder geselecteerde bestanden?" msgid "Delete" msgstr "Verwijder" +#: editor/dictionary_property_edit.cpp +msgid "Change Dictionary Key" +msgstr "" + +#: editor/dictionary_property_edit.cpp +#, fuzzy +msgid "Change Dictionary Value" +msgstr "Wijzig Array Waarde" + #: editor/editor_about.cpp msgid "Thanks from the Godot community!" msgstr "Bedankt van de Godot gemeenschap!" @@ -1138,12 +1155,6 @@ msgstr "Alles Herkend" msgid "All Files (*)" msgstr "Alle Bestanden (*)" -#: editor/editor_file_dialog.cpp editor/editor_help.cpp editor/editor_node.cpp -#: editor/filesystem_dock.cpp editor/plugins/script_editor_plugin.cpp -#: editor/property_selector.cpp editor/quick_open.cpp scene/gui/file_dialog.cpp -msgid "Open" -msgstr "Openen" - #: editor/editor_file_dialog.cpp scene/gui/file_dialog.cpp msgid "Open a File" msgstr "Open een Bestand" @@ -1518,6 +1529,18 @@ msgstr "" "begrijpen." #: editor/editor_node.cpp +#, fuzzy +msgid "" +"This is a remote object so changes to it will not be kept.\n" +"Please read the documentation relevant to debugging to better understand " +"this workflow." +msgstr "" +"Dit bestand hoort bij een scene die geïmporteerd werd, dus het is niet " +"bewerkbaar.\n" +"Lees de documentatie over scenes importeren om deze workflow beter te " +"begrijpen." + +#: editor/editor_node.cpp msgid "Copy Params" msgstr "Kopieer Parameters" @@ -1636,6 +1659,12 @@ msgid "Export Mesh Library" msgstr "Exporteer Mesh Library" #: editor/editor_node.cpp +#, fuzzy +msgid "This operation can't be done without a root node." +msgstr "" +"Deze operatie kan niet uitgevoerd worden zonder een geselecteerde knoop." + +#: editor/editor_node.cpp msgid "Export Tile Set" msgstr "Exporteer Tile Set" @@ -1777,12 +1806,23 @@ msgid "Switch Scene Tab" msgstr "Scenetab Wisselen" #: editor/editor_node.cpp -msgid "%d more file(s)" +#, fuzzy +msgid "%d more files or folders" +msgstr "nog %d bestand(en) of folder(s)" + +#: editor/editor_node.cpp +#, fuzzy +msgid "%d more folders" msgstr "nog %d bestand(en)" #: editor/editor_node.cpp -msgid "%d more file(s) or folder(s)" -msgstr "nog %d bestand(en) of folder(s)" +#, fuzzy +msgid "%d more files" +msgstr "nog %d bestand(en)" + +#: editor/editor_node.cpp +msgid "Dock Position" +msgstr "" #: editor/editor_node.cpp msgid "Distraction Free Mode" @@ -1793,6 +1833,11 @@ msgid "Toggle distraction-free mode." msgstr "Afleidingsvrije modus veranderen." #: editor/editor_node.cpp +#, fuzzy +msgid "Add a new scene." +msgstr "Nieuwe tracks toevoegen." + +#: editor/editor_node.cpp msgid "Scene" msgstr "Scène" @@ -1857,13 +1902,12 @@ msgid "TileSet.." msgstr "TileSet..." #: editor/editor_node.cpp editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp scene/gui/line_edit.cpp -#: scene/gui/text_edit.cpp +#: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Undo" msgstr "Ongedaan Maken" #: editor/editor_node.cpp editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp +#: scene/gui/line_edit.cpp msgid "Redo" msgstr "Opnieuw" @@ -2352,6 +2396,11 @@ msgid "(Current)" msgstr "" #: editor/export_template_manager.cpp +#, fuzzy +msgid "Retrieving mirrors, please wait.." +msgstr "Verbindingsfout, probeer het nog eens." + +#: editor/export_template_manager.cpp msgid "Remove template version '%s'?" msgstr "" @@ -2387,6 +2436,108 @@ msgid "Importing:" msgstr "Aan Het Importeren:" #: editor/export_template_manager.cpp +msgid "" +"No download links found for this version. Direct download is only available " +"for official releases." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Can't resolve." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Can't connect." +msgstr "Kan niet verbinden." + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "No response." +msgstr "Geen antwoord." + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Req. Failed." +msgstr "Aanv. Mislukt." + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Redirect Loop." +msgstr "Redirectlus." + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Failed:" +msgstr "Mislukt:" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Can't write file." +msgstr "Map kon niet gemaakt worden." + +#: editor/export_template_manager.cpp +msgid "Download Complete." +msgstr "" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Error requesting url: " +msgstr "Error bij het opslaan van atlas:" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Connecting to Mirror.." +msgstr "Verbinden.." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Disconnected" +msgstr "Losmaken" + +#: editor/export_template_manager.cpp +msgid "Resolving" +msgstr "" + +#: editor/export_template_manager.cpp +msgid "Can't Resolve" +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Connecting.." +msgstr "Verbinden.." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Can't Conect" +msgstr "Kan niet verbinden." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Connected" +msgstr "Verbinden" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Requesting.." +msgstr "Opvragen..." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Downloading" +msgstr "Error bij het laden van:" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Connection Error" +msgstr "Verbinden.." + +#: editor/export_template_manager.cpp +msgid "SSL Handshake Error" +msgstr "" + +#: editor/export_template_manager.cpp msgid "Current Version:" msgstr "" @@ -2412,12 +2563,21 @@ msgstr "Verwijder geselecteerde bestanden?" msgid "Export Template Manager" msgstr "" +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Download Templates" +msgstr "Verwijder Selectie" + +#: editor/export_template_manager.cpp +msgid "Select mirror from list: " +msgstr "" + #: editor/file_type_cache.cpp msgid "Can't open file_type_cache.cch for writing, not saving file type cache!" msgstr "" #: editor/filesystem_dock.cpp -msgid "Cannot navigate to '" +msgid "Cannot navigate to '%s' as it has not been found in the file system!" msgstr "" #: editor/filesystem_dock.cpp @@ -2435,13 +2595,6 @@ msgid "" msgstr "" #: editor/filesystem_dock.cpp -#, fuzzy -msgid "" -"\n" -"Source: " -msgstr "Resource" - -#: editor/filesystem_dock.cpp msgid "Cannot move/rename resources root." msgstr "" @@ -2708,8 +2861,7 @@ msgid "Remove Poly And Point" msgstr "" #: editor/plugins/abstract_polygon_2d_editor.cpp -#: editor/plugins/light_occluder_2d_editor_plugin.cpp -msgid "Create a new polygon from scratch." +msgid "Create a new polygon from scratch" msgstr "" #: editor/plugins/abstract_polygon_2d_editor.cpp @@ -2720,6 +2872,11 @@ msgid "" "RMB: Erase Point." msgstr "" +#: editor/plugins/abstract_polygon_2d_editor.cpp +#, fuzzy +msgid "Delete points" +msgstr "Verwijder" + #: editor/plugins/animation_player_editor_plugin.cpp msgid "Toggle Autoplay" msgstr "" @@ -3056,18 +3213,10 @@ msgid "Can't resolve hostname:" msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Can't resolve." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Connection error, please try again." msgstr "Verbindingsfout, probeer het nog eens." #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Can't connect." -msgstr "Kan niet verbinden." - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Can't connect to host:" msgstr "Kan niet verbinden met host:" @@ -3076,30 +3225,14 @@ msgid "No response from host:" msgstr "Geen antwoord van host:" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "No response." -msgstr "Geen antwoord." - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Request failed, return code:" msgstr "Aanvraag mislukt, retourcode:" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Req. Failed." -msgstr "Aanv. Mislukt." - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Request failed, too many redirects" msgstr "Aanvraag mislukt, te veel redirects" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Redirect Loop." -msgstr "Redirectlus." - -#: editor/plugins/asset_library_editor_plugin.cpp -msgid "Failed:" -msgstr "Mislukt:" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Bad download hash, assuming file has been tampered with." msgstr "" @@ -3128,14 +3261,6 @@ msgid "Resolving.." msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Connecting.." -msgstr "Verbinden.." - -#: editor/plugins/asset_library_editor_plugin.cpp -msgid "Requesting.." -msgstr "Opvragen..." - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Error making request" msgstr "Fout bij opvragen" @@ -3249,6 +3374,38 @@ msgid "Move Action" msgstr "" #: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Move vertical guide" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Create new vertical guide" +msgstr "Subscriptie Maken" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Remove vertical guide" +msgstr "Verwijder Variabele" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Move horizontal guide" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Create new horizontal guide" +msgstr "Subscriptie Maken" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Remove horizontal guide" +msgstr "Verwijder ongeldige keys" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Create new horizontal and vertical guides" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp msgid "Edit IK Chain" msgstr "" @@ -3370,10 +3527,16 @@ msgid "Snap to other nodes" msgstr "" #: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Snap to guides" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Lock the selected object in place (can't be moved)." msgstr "" #: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Unlock the selected object (can be moved)." msgstr "" @@ -3424,6 +3587,10 @@ msgid "Show rulers" msgstr "" #: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Show guides" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp msgid "Center Selection" msgstr "" @@ -3614,6 +3781,10 @@ msgstr "" msgid "Hold Shift to edit tangents individually" msgstr "" +#: editor/plugins/gi_probe_editor_plugin.cpp +msgid "Bake GI Probe" +msgstr "" + #: editor/plugins/gradient_editor_plugin.cpp msgid "Add/Remove Color Ramp Point" msgstr "" @@ -3646,6 +3817,10 @@ msgid "Create Occluder Polygon" msgstr "" #: editor/plugins/light_occluder_2d_editor_plugin.cpp +msgid "Create a new polygon from scratch." +msgstr "" + +#: editor/plugins/light_occluder_2d_editor_plugin.cpp msgid "Edit existing polygon:" msgstr "" @@ -3661,59 +3836,6 @@ msgstr "" msgid "RMB: Erase Point." msgstr "" -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Remove Point from Line2D" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#, fuzzy -msgid "Add Point to Line2D" -msgstr "Ga naar Regel" - -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Move Point in Line2D" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Select Points" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Shift+Drag: Select Control Points" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Click: Add Point" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Right Click: Delete Point" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Add Point (in empty space)" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Split Segment (in line)" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Delete Point" -msgstr "" - #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Mesh is empty!" msgstr "" @@ -4112,16 +4234,46 @@ msgid "Move Out-Control in Curve" msgstr "" #: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Select Points" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Shift+Drag: Select Control Points" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Click: Add Point" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Right Click: Delete Point" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp msgid "Select Control Points (Shift+Drag)" msgstr "" #: editor/plugins/path_2d_editor_plugin.cpp #: editor/plugins/path_editor_plugin.cpp +msgid "Add Point (in empty space)" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp msgid "Split Segment (in curve)" msgstr "" #: editor/plugins/path_2d_editor_plugin.cpp #: editor/plugins/path_editor_plugin.cpp +msgid "Delete Point" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp msgid "Close Curve" msgstr "" @@ -4262,7 +4414,6 @@ msgstr "" #: editor/plugins/resource_preloader_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp #: editor/plugins/sprite_frames_editor_plugin.cpp editor/property_editor.cpp #: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Paste" @@ -4307,6 +4458,21 @@ msgid " Class Reference" msgstr "" #: editor/plugins/script_editor_plugin.cpp +#, fuzzy +msgid "Sort" +msgstr "Sorteren:" + +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp +msgid "Move Up" +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp +msgid "Move Down" +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp msgid "Next script" msgstr "" @@ -4358,6 +4524,10 @@ msgstr "" msgid "Close All" msgstr "" +#: editor/plugins/script_editor_plugin.cpp +msgid "Close Other Tabs" +msgstr "" + #: editor/plugins/script_editor_plugin.cpp editor/project_manager.cpp msgid "Run" msgstr "" @@ -4369,13 +4539,11 @@ msgstr "Toggle Favoriet" #: editor/plugins/script_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Find.." msgstr "" #: editor/plugins/script_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Find Next" msgstr "" @@ -4481,33 +4649,22 @@ msgstr "" msgid "Capitalize" msgstr "" -#: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp scene/gui/line_edit.cpp +#: editor/plugins/script_text_editor.cpp scene/gui/line_edit.cpp #: scene/gui/text_edit.cpp msgid "Cut" msgstr "Knippen" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp #: editor/plugins/sprite_frames_editor_plugin.cpp editor/property_editor.cpp #: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Copy" msgstr "Kopiëren" -#: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp scene/gui/line_edit.cpp +#: editor/plugins/script_text_editor.cpp scene/gui/line_edit.cpp #: scene/gui/text_edit.cpp msgid "Select All" msgstr "Alles Selecteren" -#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp -msgid "Move Up" -msgstr "" - -#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp -msgid "Move Down" -msgstr "" - #: editor/plugins/script_text_editor.cpp #, fuzzy msgid "Delete Line" @@ -4530,6 +4687,23 @@ msgid "Clone Down" msgstr "" #: editor/plugins/script_text_editor.cpp +#, fuzzy +msgid "Fold Line" +msgstr "Ga naar Regel" + +#: editor/plugins/script_text_editor.cpp +msgid "Unfold Line" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Fold All Lines" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Unfold All Lines" +msgstr "" + +#: editor/plugins/script_text_editor.cpp msgid "Complete Symbol" msgstr "" @@ -4576,12 +4750,10 @@ msgid "Convert To Lowercase" msgstr "Verbind Aan Node:" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Find Previous" msgstr "" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Replace.." msgstr "" @@ -4590,7 +4762,6 @@ msgid "Goto Function.." msgstr "" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Goto Line.." msgstr "" @@ -4755,6 +4926,15 @@ msgid "View Plane Transform." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "Scaling: " +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Translating: " +msgstr "Transitie" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Rotating %s degrees." msgstr "" @@ -4837,6 +5017,10 @@ msgid "Vertices" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "FPS" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Align with view" msgstr "" @@ -4869,6 +5053,16 @@ msgid "View Information" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "View FPS" +msgstr "Bekijk Bestanden" + +#: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Half Resolution" +msgstr "Schaal Selectie" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Audio Listener" msgstr "" @@ -5002,6 +5196,11 @@ msgid "Tool Scale" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Toggle Freelook" +msgstr "Toggle Favoriet" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Transform" msgstr "" @@ -5279,6 +5478,10 @@ msgid "Create Empty Editor Template" msgstr "" #: editor/plugins/theme_editor_plugin.cpp +msgid "Create From Current Editor Theme" +msgstr "" + +#: editor/plugins/theme_editor_plugin.cpp msgid "CheckBox Radio1" msgstr "" @@ -5456,7 +5659,7 @@ msgstr "Inschakelen" #: editor/project_export.cpp #, fuzzy -msgid "Delete patch '" +msgid "Delete patch '%s' from list?" msgstr "Verwijder" #: editor/project_export.cpp @@ -5758,10 +5961,6 @@ msgid "Add Input Action Event" msgstr "" #: editor/project_settings_editor.cpp editor/settings_config_dialog.cpp -msgid "Meta+" -msgstr "Meta+" - -#: editor/project_settings_editor.cpp editor/settings_config_dialog.cpp msgid "Shift+" msgstr "Shift+" @@ -5884,13 +6083,12 @@ msgid "Select a setting item first!" msgstr "" #: editor/project_settings_editor.cpp -msgid "No property '" +msgid "No property '%s' exists." msgstr "" #: editor/project_settings_editor.cpp -#, fuzzy -msgid "Setting '" -msgstr "Aan Het Opzetten.." +msgid "Setting '%s' is internal, and it can't be deleted." +msgstr "" #: editor/project_settings_editor.cpp #, fuzzy @@ -6365,6 +6563,15 @@ msgid "Clear a script for the selected node." msgstr "" #: editor/scene_tree_dock.cpp +#, fuzzy +msgid "Remote" +msgstr "Verwijderen" + +#: editor/scene_tree_dock.cpp +msgid "Local" +msgstr "" + +#: editor/scene_tree_dock.cpp msgid "Clear Inheritance? (No Undo!)" msgstr "" @@ -6557,6 +6764,11 @@ msgid "Attach Node Script" msgstr "" #: editor/script_editor_debugger.cpp +#, fuzzy +msgid "Remote " +msgstr "Verwijderen" + +#: editor/script_editor_debugger.cpp msgid "Bytes:" msgstr "" @@ -6613,18 +6825,6 @@ msgid "Stack Trace (if applicable):" msgstr "" #: editor/script_editor_debugger.cpp -msgid "Remote Inspector" -msgstr "" - -#: editor/script_editor_debugger.cpp -msgid "Live Scene Tree:" -msgstr "" - -#: editor/script_editor_debugger.cpp -msgid "Remote Object Properties: " -msgstr "" - -#: editor/script_editor_debugger.cpp msgid "Profiler" msgstr "" @@ -6756,50 +6956,50 @@ msgstr "" msgid "GDNative" msgstr "" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp #: modules/visual_script/visual_script_builtin_funcs.cpp msgid "Invalid type argument to convert(), use TYPE_* constants." msgstr "Ongeldige type argument voor convert(), gebruik TYPE_* constanten." -#: modules/gdscript/gd_functions.cpp modules/mono/glue/glue_header.h +#: modules/gdscript/gdscript_functions.cpp modules/mono/glue/glue_header.h #: modules/visual_script/visual_script_builtin_funcs.cpp msgid "Not enough bytes for decoding bytes, or invalid format." msgstr "Niet genoeg bytes om bytes te decoderen, of ongeldig formaat." -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "step argument is zero!" msgstr "step argument is nul!" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Not a script with an instance" msgstr "Niet een script met een instantie" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Not based on a script" msgstr "Niet gebaseerd op een script" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Not based on a resource file" msgstr "Niet gebaseerd op een resource bestand" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary format (missing @path)" msgstr "Ongeldige dictionary formaat van instantie (mist @path)" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary format (can't load script at @path)" msgstr "" "Ongeldige dictionary formaat van instantie (kan script niet laden uit @path)" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary format (invalid script at @path)" msgstr "Ongeldige dictionary formaat van instantie (ongeldige script op @path)" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary (invalid subclasses)" msgstr "Ongeldige dictionary van instantie (ongeldige subklassen)" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Object can't provide a length." msgstr "" @@ -6814,15 +7014,24 @@ msgid "GridMap Duplicate Selection" msgstr "Dupliceer Selectie" #: modules/gridmap/grid_map_editor_plugin.cpp -msgid "Snap View" +msgid "Floor:" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp -msgid "Prev Level (%sDown Wheel)" +msgid "Grid Map" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp -msgid "Next Level (%sUp Wheel)" +msgid "Snap View" +msgstr "" + +#: modules/gridmap/grid_map_editor_plugin.cpp +#, fuzzy +msgid "Previous Floor" +msgstr "Vorig tabblad" + +#: modules/gridmap/grid_map_editor_plugin.cpp +msgid "Next Floor" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp @@ -6893,13 +7102,8 @@ msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp #, fuzzy -msgid "Selection -> Duplicate" -msgstr "Alleen Selectie" - -#: modules/gridmap/grid_map_editor_plugin.cpp -#, fuzzy -msgid "Selection -> Clear" -msgstr "Alleen Selectie" +msgid "Clear Selection" +msgstr "Schaal Selectie" #: modules/gridmap/grid_map_editor_plugin.cpp msgid "GridMap Settings" @@ -7033,7 +7237,8 @@ msgid "Duplicate VisualScript Nodes" msgstr "" #: modules/visual_script/visual_script_editor.cpp -msgid "Hold Meta to drop a Getter. Hold Shift to drop a generic signature." +#, fuzzy +msgid "Hold %s to drop a Getter. Hold Shift to drop a generic signature." msgstr "" "Houdt Meta ingedrukt om een Getter te plaatsen. Houdt Shift ingedrukt om een " "generiek signatuur te plaatsen." @@ -7045,7 +7250,8 @@ msgstr "" "generiek signatuur te plaatsen." #: modules/visual_script/visual_script_editor.cpp -msgid "Hold Meta to drop a simple reference to the node." +#, fuzzy +msgid "Hold %s to drop a simple reference to the node." msgstr "" "Houdt Meta ingedrukt om een simpele referentie naar de node te plaatsen." @@ -7055,7 +7261,8 @@ msgstr "" "Houdt Ctrl ingedrukt om een simpele referentie naar de node te plaatsen." #: modules/visual_script/visual_script_editor.cpp -msgid "Hold Meta to drop a Variable Setter." +#, fuzzy +msgid "Hold %s to drop a Variable Setter." msgstr "Houdt Meta ingedrukt om een Variable Setter te plaatsen." #: modules/visual_script/visual_script_editor.cpp @@ -7294,12 +7501,22 @@ msgstr "Map kon niet gemaakt worden." #: platform/javascript/export/export.cpp #, fuzzy -msgid "Could not read file:\n" +msgid "Could not open template for export:\n" msgstr "Map kon niet gemaakt worden." #: platform/javascript/export/export.cpp #, fuzzy -msgid "Could not open template for export:\n" +msgid "Invalid export template:\n" +msgstr "Ongeldige index eigenschap naam." + +#: platform/javascript/export/export.cpp +#, fuzzy +msgid "Could not read custom HTML shell:\n" +msgstr "Map kon niet gemaakt worden." + +#: platform/javascript/export/export.cpp +#, fuzzy +msgid "Could not read boot splash image file:\n" msgstr "Map kon niet gemaakt worden." #: scene/2d/animated_sprite.cpp @@ -7419,22 +7636,6 @@ msgid "Path property must point to a valid Node2D node to work." msgstr "" "Path eigenschap moet verwijzen naar een geldige Node2D node om te werken." -#: scene/2d/sprite.cpp -msgid "" -"Path property must point to a valid Viewport node to work. Such Viewport " -"must be set to 'render target' mode." -msgstr "" -"Path eigenschap moet verwijzen naar een geldige Viewport node om te werken. " -"Zo een Viewport moet in 'render target' modus gezet worden." - -#: scene/2d/sprite.cpp -msgid "" -"The Viewport set in the path property must be set as 'render target' in " -"order for this sprite to work." -msgstr "" -"De Viewport gegeven in de pad eigenschap moet als 'render target' ingesteld " -"zijn om deze sprite te laten werken." - #: scene/2d/visibility_notifier_2d.cpp msgid "" "VisibilityEnable2D works best when used with the edited scene root directly " @@ -7503,6 +7704,14 @@ msgstr "" "Een vorm moet gegeven worden om CollisionShape te laten werken. Maak " "alsjeblieft een vorm resource voor deze!" +#: scene/3d/gi_probe.cpp +msgid "Plotting Meshes" +msgstr "" + +#: scene/3d/gi_probe.cpp +msgid "Finishing Plot" +msgstr "" + #: scene/3d/navigation_mesh.cpp msgid "A NavigationMesh resource must be set or created for this node to work." msgstr "" @@ -7592,6 +7801,10 @@ msgid "" "minimum size manually." msgstr "" +#: scene/gui/tree.cpp +msgid "(Other)" +msgstr "" + #: scene/main/scene_tree.cpp msgid "" "Default Environment as specified in Project Setings (Rendering -> Viewport -" @@ -7626,6 +7839,45 @@ msgstr "Error bij het laden van lettertype." msgid "Invalid font size." msgstr "Ongeldige lettertype grootte." +#, fuzzy +#~ msgid "" +#~ "\n" +#~ "Source: " +#~ msgstr "Resource" + +#, fuzzy +#~ msgid "Add Point to Line2D" +#~ msgstr "Ga naar Regel" + +#~ msgid "Meta+" +#~ msgstr "Meta+" + +#, fuzzy +#~ msgid "Setting '" +#~ msgstr "Aan Het Opzetten.." + +#, fuzzy +#~ msgid "Selection -> Duplicate" +#~ msgstr "Alleen Selectie" + +#, fuzzy +#~ msgid "Selection -> Clear" +#~ msgstr "Alleen Selectie" + +#~ msgid "" +#~ "Path property must point to a valid Viewport node to work. Such Viewport " +#~ "must be set to 'render target' mode." +#~ msgstr "" +#~ "Path eigenschap moet verwijzen naar een geldige Viewport node om te " +#~ "werken. Zo een Viewport moet in 'render target' modus gezet worden." + +#~ msgid "" +#~ "The Viewport set in the path property must be set as 'render target' in " +#~ "order for this sprite to work." +#~ msgstr "" +#~ "De Viewport gegeven in de pad eigenschap moet als 'render target' " +#~ "ingesteld zijn om deze sprite te laten werken." + #~ msgid "Filter:" #~ msgstr "Filter:" @@ -7647,9 +7899,6 @@ msgstr "Ongeldige lettertype grootte." #~ msgid "Removed:" #~ msgstr "Verwijderd:" -#~ msgid "Error saving atlas:" -#~ msgstr "Error bij het opslaan van atlas:" - #~ msgid "Could not save atlas subtexture:" #~ msgstr "Kon atlas subtexture niet opslaan:" diff --git a/editor/translations/pl.po b/editor/translations/pl.po index 1d14c94e1f..eea9aeb15d 100644 --- a/editor/translations/pl.po +++ b/editor/translations/pl.po @@ -18,8 +18,8 @@ msgid "" msgstr "" "Project-Id-Version: Godot Engine editor\n" -"PO-Revision-Date: 2017-10-23 16:47+0000\n" -"Last-Translator: Sebastian Krzyszkowiak <dos@dosowisko.net>\n" +"PO-Revision-Date: 2017-11-07 01:47+0000\n" +"Last-Translator: Maksymilian Åšwiąć <maksymilian.swiac@gmail.com>\n" "Language-Team: Polish <https://hosted.weblate.org/projects/godot-engine/" "godot/pl/>\n" "Language: pl\n" @@ -27,7 +27,7 @@ msgstr "" "Content-Transfer-Encoding: 8-bit\n" "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2;\n" -"X-Generator: Weblate 2.17\n" +"X-Generator: Weblate 2.18-dev\n" #: editor/animation_editor.cpp msgid "Disabled" @@ -115,6 +115,7 @@ msgid "Anim Delete Keys" msgstr "UsuÅ„ klucze animacji" #: editor/animation_editor.cpp editor/plugins/tile_map_editor_plugin.cpp +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Duplicate Selection" msgstr "Duplikuj zaznaczone" @@ -662,6 +663,13 @@ msgstr "Edytor zależnośći" msgid "Search Replacement Resource:" msgstr "Szukaj zastÄ™pczego zasobu:" +#: editor/dependency_editor.cpp editor/editor_file_dialog.cpp +#: editor/editor_help.cpp editor/editor_node.cpp editor/filesystem_dock.cpp +#: editor/plugins/script_editor_plugin.cpp editor/property_selector.cpp +#: editor/quick_open.cpp scene/gui/file_dialog.cpp +msgid "Open" +msgstr "Otwórz" + #: editor/dependency_editor.cpp msgid "Owners Of:" msgstr "WÅ‚aÅ›ciciele:" @@ -734,6 +742,16 @@ msgstr "Usunąć zaznaczone pliki?" msgid "Delete" msgstr "UsuÅ„" +#: editor/dictionary_property_edit.cpp +#, fuzzy +msgid "Change Dictionary Key" +msgstr "ZmieÅ„ nazwÄ™ animacji:" + +#: editor/dictionary_property_edit.cpp +#, fuzzy +msgid "Change Dictionary Value" +msgstr "ZmieÅ„ Wartość Tablicy" + #: editor/editor_about.cpp msgid "Thanks from the Godot community!" msgstr "PodziÄ™kowania od spoÅ‚ecznoÅ›ci Godota!" @@ -1179,12 +1197,6 @@ msgstr "Wszystkie rozpoznane" msgid "All Files (*)" msgstr "Wszystkie pliki (*)" -#: editor/editor_file_dialog.cpp editor/editor_help.cpp editor/editor_node.cpp -#: editor/filesystem_dock.cpp editor/plugins/script_editor_plugin.cpp -#: editor/property_selector.cpp editor/quick_open.cpp scene/gui/file_dialog.cpp -msgid "Open" -msgstr "Otwórz" - #: editor/editor_file_dialog.cpp scene/gui/file_dialog.cpp msgid "Open a File" msgstr "Otwórz plik" @@ -1557,6 +1569,13 @@ msgid "" msgstr "" #: editor/editor_node.cpp +msgid "" +"This is a remote object so changes to it will not be kept.\n" +"Please read the documentation relevant to debugging to better understand " +"this workflow." +msgstr "" + +#: editor/editor_node.cpp msgid "Copy Params" msgstr "Kopiuj parametry" @@ -1677,6 +1696,11 @@ msgid "Export Mesh Library" msgstr "Eksportuj bibliotekÄ™ Meshów" #: editor/editor_node.cpp +#, fuzzy +msgid "This operation can't be done without a root node." +msgstr "Ta operacja nie może zostać wykonana bez sceny." + +#: editor/editor_node.cpp msgid "Export Tile Set" msgstr "Eksportuj TileSet" @@ -1815,12 +1839,23 @@ msgid "Switch Scene Tab" msgstr "PrzeÅ‚Ä…cz ZakÅ‚adkÄ™ Sceny" #: editor/editor_node.cpp -msgid "%d more file(s)" +#, fuzzy +msgid "%d more files or folders" +msgstr "PozostaÅ‚o %d plików lub folderów" + +#: editor/editor_node.cpp +#, fuzzy +msgid "%d more folders" msgstr "PozostaÅ‚o %d plików" #: editor/editor_node.cpp -msgid "%d more file(s) or folder(s)" -msgstr "PozostaÅ‚o %d plików lub folderów" +#, fuzzy +msgid "%d more files" +msgstr "PozostaÅ‚o %d plików" + +#: editor/editor_node.cpp +msgid "Dock Position" +msgstr "" #: editor/editor_node.cpp msgid "Distraction Free Mode" @@ -1832,6 +1867,11 @@ msgid "Toggle distraction-free mode." msgstr "Tryb bez rozproszeÅ„" #: editor/editor_node.cpp +#, fuzzy +msgid "Add a new scene." +msgstr "Dodaj nowe Å›cieżki." + +#: editor/editor_node.cpp msgid "Scene" msgstr "Scena" @@ -1897,13 +1937,12 @@ msgid "TileSet.." msgstr "TileSet..." #: editor/editor_node.cpp editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp scene/gui/line_edit.cpp -#: scene/gui/text_edit.cpp +#: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Undo" msgstr "Cofnij" #: editor/editor_node.cpp editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp +#: scene/gui/line_edit.cpp msgid "Redo" msgstr "Ponów" @@ -1942,7 +1981,7 @@ msgstr "Wyjdź do Listy Projektów" #: editor/editor_node.cpp editor/plugins/script_editor_plugin.cpp msgid "Debug" -msgstr "Debug" +msgstr "Debuguj" #: editor/editor_node.cpp msgid "Deploy with Remote Debug" @@ -1953,8 +1992,8 @@ msgid "" "When exporting or deploying, the resulting executable will attempt to " "connect to the IP of this computer in order to be debugged." msgstr "" -"Podczas eksportu lub uruchomienia aplikacja wynikowa spróbuje poÅ‚Ä…czyć siÄ™ z " -"adresem IP tego komputera w celu debugowania." +"Podczas eksportu lub uruchomienia, aplikacja wynikowa spróbuje poÅ‚Ä…czyć siÄ™ " +"z adresem IP tego komputera w celu debugowania." #: editor/editor_node.cpp msgid "Small Deploy with Network FS" @@ -2419,6 +2458,10 @@ msgid "(Current)" msgstr "Bieżący:" #: editor/export_template_manager.cpp +msgid "Retrieving mirrors, please wait.." +msgstr "" + +#: editor/export_template_manager.cpp msgid "Remove template version '%s'?" msgstr "Usunąć wersjÄ™ '%s' szablonu?" @@ -2457,6 +2500,114 @@ msgid "Importing:" msgstr "Importowanie:" #: editor/export_template_manager.cpp +msgid "" +"No download links found for this version. Direct download is only available " +"for official releases." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Can't resolve." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Can't connect." +msgstr "PoÅ‚Ä…cz.." + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "No response." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Req. Failed." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Redirect Loop." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Failed:" +msgstr "" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Can't write file." +msgstr "Nie można utworzyć katalogu." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Download Complete." +msgstr "Pobierz" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Error requesting url: " +msgstr "BÅ‚Ä…d podczas zapisywania atlasu:" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Connecting to Mirror.." +msgstr "PoÅ‚Ä…cz.." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Disconnected" +msgstr "RozÅ‚Ä…cz" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Resolving" +msgstr "Zapisywanie.." + +#: editor/export_template_manager.cpp +msgid "Can't Resolve" +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Connecting.." +msgstr "PoÅ‚Ä…cz.." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Can't Conect" +msgstr "PoÅ‚Ä…cz.." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Connected" +msgstr "PoÅ‚Ä…cz" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Requesting.." +msgstr "Testowanie" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Downloading" +msgstr "Pobierz" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Connection Error" +msgstr "PoÅ‚Ä…cz.." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "SSL Handshake Error" +msgstr "Wczytaj bÅ‚Ä™dy" + +#: editor/export_template_manager.cpp #, fuzzy msgid "Current Version:" msgstr "Aktualna scena" @@ -2483,6 +2634,15 @@ msgstr "Usunąć zaznaczone pliki?" msgid "Export Template Manager" msgstr "Menedżer szablonów eksportu" +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Download Templates" +msgstr "Szablony" + +#: editor/export_template_manager.cpp +msgid "Select mirror from list: " +msgstr "" + #: editor/file_type_cache.cpp msgid "Can't open file_type_cache.cch for writing, not saving file type cache!" msgstr "" @@ -2490,8 +2650,8 @@ msgstr "" "typu plików nie bÄ™dzie zapisana!" #: editor/filesystem_dock.cpp -msgid "Cannot navigate to '" -msgstr "Nie można przejść do '" +msgid "Cannot navigate to '%s' as it has not been found in the file system!" +msgstr "" #: editor/filesystem_dock.cpp msgid "View items as a grid of thumbnails" @@ -2509,13 +2669,6 @@ msgstr "" #: editor/filesystem_dock.cpp #, fuzzy -msgid "" -"\n" -"Source: " -msgstr "ŹródÅ‚o:" - -#: editor/filesystem_dock.cpp -#, fuzzy msgid "Cannot move/rename resources root." msgstr "Nie można wczytać/przetworzyć źródÅ‚owego fontu." @@ -2791,8 +2944,8 @@ msgid "Remove Poly And Point" msgstr "" #: editor/plugins/abstract_polygon_2d_editor.cpp -#: editor/plugins/light_occluder_2d_editor_plugin.cpp -msgid "Create a new polygon from scratch." +#, fuzzy +msgid "Create a new polygon from scratch" msgstr "Utwórz nowy wielokÄ…t." #: editor/plugins/abstract_polygon_2d_editor.cpp @@ -2803,6 +2956,11 @@ msgid "" "RMB: Erase Point." msgstr "" +#: editor/plugins/abstract_polygon_2d_editor.cpp +#, fuzzy +msgid "Delete points" +msgstr "UsuÅ„ Punkt" + #: editor/plugins/animation_player_editor_plugin.cpp msgid "Toggle Autoplay" msgstr "Ustaw automatycznie" @@ -3141,20 +3299,11 @@ msgid "Can't resolve hostname:" msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Can't resolve." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Connection error, please try again." msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp #, fuzzy -msgid "Can't connect." -msgstr "PoÅ‚Ä…cz.." - -#: editor/plugins/asset_library_editor_plugin.cpp -#, fuzzy msgid "Can't connect to host:" msgstr "PodÅ‚Ä…cz do wÄ™zÅ‚a:" @@ -3163,31 +3312,15 @@ msgid "No response from host:" msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "No response." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp #, fuzzy msgid "Request failed, return code:" msgstr "Nieznany format pliku:" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Req. Failed." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Request failed, too many redirects" msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Redirect Loop." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp -msgid "Failed:" -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Bad download hash, assuming file has been tampered with." msgstr "" @@ -3218,16 +3351,6 @@ msgstr "Zapisywanie.." #: editor/plugins/asset_library_editor_plugin.cpp #, fuzzy -msgid "Connecting.." -msgstr "PoÅ‚Ä…cz.." - -#: editor/plugins/asset_library_editor_plugin.cpp -#, fuzzy -msgid "Requesting.." -msgstr "Testowanie" - -#: editor/plugins/asset_library_editor_plugin.cpp -#, fuzzy msgid "Error making request" msgstr "BÅ‚Ä…d podczas zapisu zasobu!" @@ -3342,6 +3465,39 @@ msgid "Move Action" msgstr "" #: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Move vertical guide" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Create new vertical guide" +msgstr "Utwórz Skrypt" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Remove vertical guide" +msgstr "UsuÅ„ zmiennÄ…" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Move horizontal guide" +msgstr "PrzenieÅ› punkt krzywej" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Create new horizontal guide" +msgstr "Utwórz Skrypt" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Remove horizontal guide" +msgstr "UsuÅ„ wadliwe klatki kluczowe" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Create new horizontal and vertical guides" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp msgid "Edit IK Chain" msgstr "Edytuj Å‚aÅ„cuch IK" @@ -3472,10 +3628,17 @@ msgid "Snap to other nodes" msgstr "" #: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Snap to guides" +msgstr "Tryb przyciÄ…gania:" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Lock the selected object in place (can't be moved)." msgstr "Zablokuj wybrany obiekt w miejscu (nie można go przesuwać)." #: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Unlock the selected object (can be moved)." msgstr "Odblokuj wybrany obiekt (można go przesuwać)." @@ -3529,6 +3692,11 @@ msgid "Show rulers" msgstr "Utwórz KoÅ›ci" #: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Show guides" +msgstr "Utwórz KoÅ›ci" + +#: editor/plugins/canvas_item_editor_plugin.cpp msgid "Center Selection" msgstr "WyÅ›rodkowywanie na zaznaczeniu" @@ -3730,6 +3898,10 @@ msgstr "" msgid "Hold Shift to edit tangents individually" msgstr "" +#: editor/plugins/gi_probe_editor_plugin.cpp +msgid "Bake GI Probe" +msgstr "" + #: editor/plugins/gradient_editor_plugin.cpp msgid "Add/Remove Color Ramp Point" msgstr "Dodaj/UsuÅ„ punkty w Color Ramp" @@ -3762,6 +3934,10 @@ msgid "Create Occluder Polygon" msgstr "Stwórz Occluder Polygon" #: editor/plugins/light_occluder_2d_editor_plugin.cpp +msgid "Create a new polygon from scratch." +msgstr "Utwórz nowy wielokÄ…t." + +#: editor/plugins/light_occluder_2d_editor_plugin.cpp msgid "Edit existing polygon:" msgstr "Edytuj istniejÄ…cy polygon:" @@ -3777,62 +3953,6 @@ msgstr "Ctrl + LPM: PodziaÅ‚u segmentu." msgid "RMB: Erase Point." msgstr "RMB: Wymaż Punkt." -#: editor/plugins/line_2d_editor_plugin.cpp -#, fuzzy -msgid "Remove Point from Line2D" -msgstr "UsuÅ„ punkt Å›cieżki" - -#: editor/plugins/line_2d_editor_plugin.cpp -#, fuzzy -msgid "Add Point to Line2D" -msgstr "Idź do lini" - -#: editor/plugins/line_2d_editor_plugin.cpp -#, fuzzy -msgid "Move Point in Line2D" -msgstr "PrzesuÅ„ Punkt" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Select Points" -msgstr "Zaznacz Punkty" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Shift+Drag: Select Control Points" -msgstr "Shift+Drag: Zaznacz Punkty Kontrolne" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Click: Add Point" -msgstr "Klik: Dodaj Punkt" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Right Click: Delete Point" -msgstr "Prawy Klik: UsuÅ„ Punkt" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Add Point (in empty space)" -msgstr "Dodaj Punkt (w pustym miejscu)" - -#: editor/plugins/line_2d_editor_plugin.cpp -#, fuzzy -msgid "Split Segment (in line)" -msgstr "Podziel Segment (na krzywej)" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Delete Point" -msgstr "UsuÅ„ Punkt" - #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Mesh is empty!" msgstr "Siatka jest pusta!" @@ -4243,16 +4363,46 @@ msgid "Move Out-Control in Curve" msgstr "" #: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Select Points" +msgstr "Zaznacz Punkty" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Shift+Drag: Select Control Points" +msgstr "Shift+Drag: Zaznacz Punkty Kontrolne" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Click: Add Point" +msgstr "Klik: Dodaj Punkt" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Right Click: Delete Point" +msgstr "Prawy Klik: UsuÅ„ Punkt" + +#: editor/plugins/path_2d_editor_plugin.cpp msgid "Select Control Points (Shift+Drag)" msgstr "Zaznacz Punkty Kontrolne (Shift+Drag)" #: editor/plugins/path_2d_editor_plugin.cpp #: editor/plugins/path_editor_plugin.cpp +msgid "Add Point (in empty space)" +msgstr "Dodaj Punkt (w pustym miejscu)" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp msgid "Split Segment (in curve)" msgstr "Podziel Segment (na krzywej)" #: editor/plugins/path_2d_editor_plugin.cpp #: editor/plugins/path_editor_plugin.cpp +msgid "Delete Point" +msgstr "UsuÅ„ Punkt" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp msgid "Close Curve" msgstr "Zamknij krzywÄ…" @@ -4394,7 +4544,6 @@ msgstr "Wczytaj Zasób" #: editor/plugins/resource_preloader_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp #: editor/plugins/sprite_frames_editor_plugin.cpp editor/property_editor.cpp #: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Paste" @@ -4440,6 +4589,21 @@ msgid " Class Reference" msgstr "" #: editor/plugins/script_editor_plugin.cpp +#, fuzzy +msgid "Sort" +msgstr "Sortuj:" + +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp +msgid "Move Up" +msgstr "PrzesuÅ„ w górÄ™" + +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp +msgid "Move Down" +msgstr "PrzesuÅ„ w dół" + +#: editor/plugins/script_editor_plugin.cpp msgid "Next script" msgstr "NastÄ™pny skrypt" @@ -4492,6 +4656,10 @@ msgstr "Zamknij pliki pomocy" msgid "Close All" msgstr "Zamknij" +#: editor/plugins/script_editor_plugin.cpp +msgid "Close Other Tabs" +msgstr "" + #: editor/plugins/script_editor_plugin.cpp editor/project_manager.cpp msgid "Run" msgstr "Uruchom" @@ -4503,13 +4671,11 @@ msgstr "Ustaw jako ulubione" #: editor/plugins/script_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Find.." msgstr "Znajdź.." #: editor/plugins/script_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Find Next" msgstr "Znajdź nastÄ™pny" @@ -4625,33 +4791,22 @@ msgstr "" msgid "Capitalize" msgstr "" -#: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp scene/gui/line_edit.cpp +#: editor/plugins/script_text_editor.cpp scene/gui/line_edit.cpp #: scene/gui/text_edit.cpp msgid "Cut" msgstr "Wytnij" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp #: editor/plugins/sprite_frames_editor_plugin.cpp editor/property_editor.cpp #: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Copy" msgstr "Kopiuj" -#: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp scene/gui/line_edit.cpp +#: editor/plugins/script_text_editor.cpp scene/gui/line_edit.cpp #: scene/gui/text_edit.cpp msgid "Select All" msgstr "Zaznacz wszystko" -#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp -msgid "Move Up" -msgstr "PrzesuÅ„ w górÄ™" - -#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp -msgid "Move Down" -msgstr "PrzesuÅ„ w dół" - #: editor/plugins/script_text_editor.cpp #, fuzzy msgid "Delete Line" @@ -4674,6 +4829,23 @@ msgid "Clone Down" msgstr "Duplikuj liniÄ™" #: editor/plugins/script_text_editor.cpp +#, fuzzy +msgid "Fold Line" +msgstr "Idź do lini" + +#: editor/plugins/script_text_editor.cpp +msgid "Unfold Line" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Fold All Lines" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Unfold All Lines" +msgstr "" + +#: editor/plugins/script_text_editor.cpp msgid "Complete Symbol" msgstr "UzupeÅ‚nij symbol" @@ -4721,12 +4893,10 @@ msgid "Convert To Lowercase" msgstr "Konwertuje na.." #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Find Previous" msgstr "Znajdź poprzedni" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Replace.." msgstr "ZamieÅ„.." @@ -4735,7 +4905,6 @@ msgid "Goto Function.." msgstr "Przejdź do funkcji.." #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Goto Line.." msgstr "Przejdź do linii.." @@ -4900,6 +5069,16 @@ msgid "View Plane Transform." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Scaling: " +msgstr "Skala:" + +#: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Translating: " +msgstr "TÅ‚umaczenia:" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Rotating %s degrees." msgstr "Obracanie o %s stopni." @@ -4984,6 +5163,10 @@ msgid "Vertices" msgstr "WierzchoÅ‚ek" #: editor/plugins/spatial_editor_plugin.cpp +msgid "FPS" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Align with view" msgstr "Wyrównaj z widokiem" @@ -5019,6 +5202,16 @@ msgid "View Information" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "View FPS" +msgstr "Plik" + +#: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Half Resolution" +msgstr "Skaluj zaznaczone" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Audio Listener" msgstr "" @@ -5156,6 +5349,11 @@ msgid "Tool Scale" msgstr "Skala:" #: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Toggle Freelook" +msgstr "PeÅ‚ny ekran" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Transform" msgstr "PrzeksztaÅ‚canie" @@ -5435,6 +5633,11 @@ msgid "Create Empty Editor Template" msgstr "Utworzyć pusty szablon edytora" #: editor/plugins/theme_editor_plugin.cpp +#, fuzzy +msgid "Create From Current Editor Theme" +msgstr "Utworzyć pusty szablon edytora" + +#: editor/plugins/theme_editor_plugin.cpp msgid "CheckBox Radio1" msgstr "CheckBox Radio1" @@ -5615,7 +5818,7 @@ msgstr "WÅ‚Ä…cz" #: editor/project_export.cpp #, fuzzy -msgid "Delete patch '" +msgid "Delete patch '%s' from list?" msgstr "UsuÅ„ layout" #: editor/project_export.cpp @@ -5940,10 +6143,6 @@ msgid "Add Input Action Event" msgstr "Dodaj zdarzenie akcji wejÅ›cia" #: editor/project_settings_editor.cpp editor/settings_config_dialog.cpp -msgid "Meta+" -msgstr "Meta+" - -#: editor/project_settings_editor.cpp editor/settings_config_dialog.cpp msgid "Shift+" msgstr "Shift+" @@ -6069,13 +6268,12 @@ msgstr "" #: editor/project_settings_editor.cpp #, fuzzy -msgid "No property '" +msgid "No property '%s' exists." msgstr "WÅ‚aÅ›ciwość:" #: editor/project_settings_editor.cpp -#, fuzzy -msgid "Setting '" -msgstr "Ustawienia" +msgid "Setting '%s' is internal, and it can't be deleted." +msgstr "" #: editor/project_settings_editor.cpp #, fuzzy @@ -6575,6 +6773,16 @@ msgid "Clear a script for the selected node." msgstr "Utwórz nowy skrypt dla zaznaczonego wÄ™zÅ‚a." #: editor/scene_tree_dock.cpp +#, fuzzy +msgid "Remote" +msgstr "UsuÅ„" + +#: editor/scene_tree_dock.cpp +#, fuzzy +msgid "Local" +msgstr "Lokalizacja" + +#: editor/scene_tree_dock.cpp msgid "Clear Inheritance? (No Undo!)" msgstr "WyczyÅ›cić dziedziczenie? (Nie można cofnąć!)" @@ -6773,6 +6981,11 @@ msgid "Attach Node Script" msgstr "Utwórz skrypt dla wÄ™zÅ‚a" #: editor/script_editor_debugger.cpp +#, fuzzy +msgid "Remote " +msgstr "UsuÅ„" + +#: editor/script_editor_debugger.cpp msgid "Bytes:" msgstr "Bajty:" @@ -6829,18 +7042,6 @@ msgid "Stack Trace (if applicable):" msgstr "Åšledzenie stosu (jeÅ›li dotyczy):" #: editor/script_editor_debugger.cpp -msgid "Remote Inspector" -msgstr "Zdalny inspektor" - -#: editor/script_editor_debugger.cpp -msgid "Live Scene Tree:" -msgstr "" - -#: editor/script_editor_debugger.cpp -msgid "Remote Object Properties: " -msgstr "WÅ‚aÅ›ciwoÅ›ci zdalnego obiektu: " - -#: editor/script_editor_debugger.cpp msgid "Profiler" msgstr "Profiler" @@ -6975,51 +7176,51 @@ msgstr "" msgid "GDNative" msgstr "" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp #: modules/visual_script/visual_script_builtin_funcs.cpp msgid "Invalid type argument to convert(), use TYPE_* constants." msgstr "Niepoprawny typ argumentu funkcji convert(), użyj staÅ‚ych TYPE_*." -#: modules/gdscript/gd_functions.cpp modules/mono/glue/glue_header.h +#: modules/gdscript/gdscript_functions.cpp modules/mono/glue/glue_header.h #: modules/visual_script/visual_script_builtin_funcs.cpp msgid "Not enough bytes for decoding bytes, or invalid format." msgstr "" "NiewystarczajÄ…ca ilość bajtów dla bajtów dekodujÄ…cych, albo zÅ‚y format." -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "step argument is zero!" msgstr "argument kroku wynosi zero!" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Not a script with an instance" msgstr "To nie jest skrypt z instancjÄ…" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Not based on a script" msgstr "Nie bazuje na skrypcie" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Not based on a resource file" msgstr "Nie bazuje na pliku zasobów" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary format (missing @path)" msgstr "Niepoprawna instancja formatu sÅ‚ownika (brak @path)" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary format (can't load script at @path)" msgstr "" "Niepoprawna instancja formatu sÅ‚ownika (nie można wczytać skryptu w @path)" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary format (invalid script at @path)" msgstr "Niepoprawna instancja formatu sÅ‚ownika (niepoprawny skrypt w @path)" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary (invalid subclasses)" msgstr "Niepoprawna instancja sÅ‚ownika (niepoprawne podklasy)" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Object can't provide a length." msgstr "" @@ -7034,16 +7235,26 @@ msgid "GridMap Duplicate Selection" msgstr "Duplikuj zaznaczone" #: modules/gridmap/grid_map_editor_plugin.cpp +msgid "Floor:" +msgstr "" + +#: modules/gridmap/grid_map_editor_plugin.cpp +#, fuzzy +msgid "Grid Map" +msgstr "PrzyciÄ…gaj do siatki" + +#: modules/gridmap/grid_map_editor_plugin.cpp #, fuzzy msgid "Snap View" msgstr "Widok z góry" #: modules/gridmap/grid_map_editor_plugin.cpp -msgid "Prev Level (%sDown Wheel)" -msgstr "" +#, fuzzy +msgid "Previous Floor" +msgstr "Poprzednia zakÅ‚adka" #: modules/gridmap/grid_map_editor_plugin.cpp -msgid "Next Level (%sUp Wheel)" +msgid "Next Floor" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp @@ -7119,13 +7330,8 @@ msgstr "Wyczyść TileMap" #: modules/gridmap/grid_map_editor_plugin.cpp #, fuzzy -msgid "Selection -> Duplicate" -msgstr "Tylko zaznaczenie" - -#: modules/gridmap/grid_map_editor_plugin.cpp -#, fuzzy -msgid "Selection -> Clear" -msgstr "Tylko zaznaczenie" +msgid "Clear Selection" +msgstr "WyÅ›rodkowywanie na zaznaczeniu" #: modules/gridmap/grid_map_editor_plugin.cpp #, fuzzy @@ -7258,7 +7464,7 @@ msgid "Duplicate VisualScript Nodes" msgstr "Duplikuj wÄ™zeÅ‚(y)" #: modules/visual_script/visual_script_editor.cpp -msgid "Hold Meta to drop a Getter. Hold Shift to drop a generic signature." +msgid "Hold %s to drop a Getter. Hold Shift to drop a generic signature." msgstr "" #: modules/visual_script/visual_script_editor.cpp @@ -7266,7 +7472,7 @@ msgid "Hold Ctrl to drop a Getter. Hold Shift to drop a generic signature." msgstr "" #: modules/visual_script/visual_script_editor.cpp -msgid "Hold Meta to drop a simple reference to the node." +msgid "Hold %s to drop a simple reference to the node." msgstr "" #: modules/visual_script/visual_script_editor.cpp @@ -7274,7 +7480,7 @@ msgid "Hold Ctrl to drop a simple reference to the node." msgstr "" #: modules/visual_script/visual_script_editor.cpp -msgid "Hold Meta to drop a Variable Setter." +msgid "Hold %s to drop a Variable Setter." msgstr "" #: modules/visual_script/visual_script_editor.cpp @@ -7523,12 +7729,22 @@ msgstr "Nie można utworzyć katalogu." #: platform/javascript/export/export.cpp #, fuzzy -msgid "Could not read file:\n" +msgid "Could not open template for export:\n" msgstr "Nie można utworzyć katalogu." #: platform/javascript/export/export.cpp #, fuzzy -msgid "Could not open template for export:\n" +msgid "Invalid export template:\n" +msgstr "Zainstaluj Szablony Eksportu" + +#: platform/javascript/export/export.cpp +#, fuzzy +msgid "Could not read custom HTML shell:\n" +msgstr "Nie można utworzyć katalogu." + +#: platform/javascript/export/export.cpp +#, fuzzy +msgid "Could not read boot splash image file:\n" msgstr "Nie można utworzyć katalogu." #: scene/2d/animated_sprite.cpp @@ -7641,23 +7857,6 @@ msgstr "" msgid "Path property must point to a valid Node2D node to work." msgstr "Å»eby zadziaÅ‚aÅ‚o, pole Path musi wskazywać na istniejÄ…cy wÄ™zeÅ‚ Node2D." -#: scene/2d/sprite.cpp -#, fuzzy -msgid "" -"Path property must point to a valid Viewport node to work. Such Viewport " -"must be set to 'render target' mode." -msgstr "" -"Aby zadziaÅ‚aÅ‚o, pole Path musi wskazywać na obiekt Viewport, który ma " -"zaznaczonÄ… opcjÄ™ trybu Render Target." - -#: scene/2d/sprite.cpp -msgid "" -"The Viewport set in the path property must be set as 'render target' in " -"order for this sprite to work." -msgstr "" -"Pole trybu Render Target musi być ustawione w Viewport wskazywanym przez " -"pole Path, aby ten Sprite mógÅ‚ zadziaÅ‚ać." - #: scene/2d/visibility_notifier_2d.cpp msgid "" "VisibilityEnable2D works best when used with the edited scene root directly " @@ -7726,6 +7925,14 @@ msgstr "" "KsztaÅ‚t musi być okreÅ›lony dla CollisionShape, aby speÅ‚niaÅ‚ swoje zadanie. " "Utwórz zasób typu CollisionShape w odpowiednim polu obiektu!" +#: scene/3d/gi_probe.cpp +msgid "Plotting Meshes" +msgstr "" + +#: scene/3d/gi_probe.cpp +msgid "Finishing Plot" +msgstr "" + #: scene/3d/navigation_mesh.cpp msgid "A NavigationMesh resource must be set or created for this node to work." msgstr "" @@ -7821,6 +8028,10 @@ msgstr "" "Użyj kontenera jako dziecko (VBox,HBox,etc), lub wÄ™zÅ‚a klasy Control i ustaw " "rÄ™cznie minimalny rozmiar." +#: scene/gui/tree.cpp +msgid "(Other)" +msgstr "" + #: scene/main/scene_tree.cpp msgid "" "Default Environment as specified in Project Setings (Rendering -> Viewport -" @@ -7855,6 +8066,67 @@ msgstr "BÅ‚Ä…d Å‚adowania fonta." msgid "Invalid font size." msgstr "Niepoprawny rozmiar fonta." +#~ msgid "Cannot navigate to '" +#~ msgstr "Nie można przejść do '" + +#, fuzzy +#~ msgid "" +#~ "\n" +#~ "Source: " +#~ msgstr "ŹródÅ‚o:" + +#, fuzzy +#~ msgid "Remove Point from Line2D" +#~ msgstr "UsuÅ„ punkt Å›cieżki" + +#, fuzzy +#~ msgid "Add Point to Line2D" +#~ msgstr "Idź do lini" + +#, fuzzy +#~ msgid "Move Point in Line2D" +#~ msgstr "PrzesuÅ„ Punkt" + +#, fuzzy +#~ msgid "Split Segment (in line)" +#~ msgstr "Podziel Segment (na krzywej)" + +#~ msgid "Meta+" +#~ msgstr "Meta+" + +#, fuzzy +#~ msgid "Setting '" +#~ msgstr "Ustawienia" + +#~ msgid "Remote Inspector" +#~ msgstr "Zdalny inspektor" + +#~ msgid "Remote Object Properties: " +#~ msgstr "WÅ‚aÅ›ciwoÅ›ci zdalnego obiektu: " + +#, fuzzy +#~ msgid "Selection -> Duplicate" +#~ msgstr "Tylko zaznaczenie" + +#, fuzzy +#~ msgid "Selection -> Clear" +#~ msgstr "Tylko zaznaczenie" + +#, fuzzy +#~ msgid "" +#~ "Path property must point to a valid Viewport node to work. Such Viewport " +#~ "must be set to 'render target' mode." +#~ msgstr "" +#~ "Aby zadziaÅ‚aÅ‚o, pole Path musi wskazywać na obiekt Viewport, który ma " +#~ "zaznaczonÄ… opcjÄ™ trybu Render Target." + +#~ msgid "" +#~ "The Viewport set in the path property must be set as 'render target' in " +#~ "order for this sprite to work." +#~ msgstr "" +#~ "Pole trybu Render Target musi być ustawione w Viewport wskazywanym przez " +#~ "pole Path, aby ten Sprite mógÅ‚ zadziaÅ‚ać." + #~ msgid "Filter:" #~ msgstr "Filtr:" @@ -7877,9 +8149,6 @@ msgstr "Niepoprawny rozmiar fonta." #~ msgid "Removed:" #~ msgstr "UsuniÄ™te:" -#~ msgid "Error saving atlas:" -#~ msgstr "BÅ‚Ä…d podczas zapisywania atlasu:" - #~ msgid "Could not save atlas subtexture:" #~ msgstr "Nie udaÅ‚o siÄ™ zapisać tekstury atlasu:" @@ -8559,9 +8828,6 @@ msgstr "Niepoprawny rozmiar fonta." #~ msgid "Replaced %d Ocurrence(s)." #~ msgstr "ZastÄ…piono %d wystÄ…pieÅ„." -#~ msgid "Install Export Templates" -#~ msgstr "Zainstaluj Szablony Eksportu" - #~ msgid "Error exporting project!" #~ msgstr "BÅ‚Ä…d przy eksporcie projektu!" diff --git a/editor/translations/pr.po b/editor/translations/pr.po index 6f42056ecf..aa54c675e8 100644 --- a/editor/translations/pr.po +++ b/editor/translations/pr.po @@ -99,6 +99,7 @@ msgid "Anim Delete Keys" msgstr "" #: editor/animation_editor.cpp editor/plugins/tile_map_editor_plugin.cpp +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Duplicate Selection" msgstr "" @@ -628,6 +629,13 @@ msgstr "" msgid "Search Replacement Resource:" msgstr "" +#: editor/dependency_editor.cpp editor/editor_file_dialog.cpp +#: editor/editor_help.cpp editor/editor_node.cpp editor/filesystem_dock.cpp +#: editor/plugins/script_editor_plugin.cpp editor/property_selector.cpp +#: editor/quick_open.cpp scene/gui/file_dialog.cpp +msgid "Open" +msgstr "" + #: editor/dependency_editor.cpp msgid "Owners Of:" msgstr "" @@ -698,6 +706,14 @@ msgstr "" msgid "Delete" msgstr "" +#: editor/dictionary_property_edit.cpp +msgid "Change Dictionary Key" +msgstr "" + +#: editor/dictionary_property_edit.cpp +msgid "Change Dictionary Value" +msgstr "" + #: editor/editor_about.cpp msgid "Thanks from the Godot community!" msgstr "" @@ -1116,12 +1132,6 @@ msgstr "" msgid "All Files (*)" msgstr "" -#: editor/editor_file_dialog.cpp editor/editor_help.cpp editor/editor_node.cpp -#: editor/filesystem_dock.cpp editor/plugins/script_editor_plugin.cpp -#: editor/property_selector.cpp editor/quick_open.cpp scene/gui/file_dialog.cpp -msgid "Open" -msgstr "" - #: editor/editor_file_dialog.cpp scene/gui/file_dialog.cpp msgid "Open a File" msgstr "" @@ -1479,6 +1489,13 @@ msgid "" msgstr "" #: editor/editor_node.cpp +msgid "" +"This is a remote object so changes to it will not be kept.\n" +"Please read the documentation relevant to debugging to better understand " +"this workflow." +msgstr "" + +#: editor/editor_node.cpp msgid "Copy Params" msgstr "" @@ -1588,6 +1605,10 @@ msgid "Export Mesh Library" msgstr "" #: editor/editor_node.cpp +msgid "This operation can't be done without a root node." +msgstr "" + +#: editor/editor_node.cpp msgid "Export Tile Set" msgstr "" @@ -1713,11 +1734,19 @@ msgid "Switch Scene Tab" msgstr "" #: editor/editor_node.cpp -msgid "%d more file(s)" +msgid "%d more files or folders" +msgstr "" + +#: editor/editor_node.cpp +msgid "%d more folders" +msgstr "" + +#: editor/editor_node.cpp +msgid "%d more files" msgstr "" #: editor/editor_node.cpp -msgid "%d more file(s) or folder(s)" +msgid "Dock Position" msgstr "" #: editor/editor_node.cpp @@ -1729,6 +1758,10 @@ msgid "Toggle distraction-free mode." msgstr "" #: editor/editor_node.cpp +msgid "Add a new scene." +msgstr "" + +#: editor/editor_node.cpp msgid "Scene" msgstr "" @@ -1793,13 +1826,12 @@ msgid "TileSet.." msgstr "" #: editor/editor_node.cpp editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp scene/gui/line_edit.cpp -#: scene/gui/text_edit.cpp +#: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Undo" msgstr "" #: editor/editor_node.cpp editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp +#: scene/gui/line_edit.cpp msgid "Redo" msgstr "" @@ -2281,6 +2313,10 @@ msgid "(Current)" msgstr "" #: editor/export_template_manager.cpp +msgid "Retrieving mirrors, please wait.." +msgstr "" + +#: editor/export_template_manager.cpp msgid "Remove template version '%s'?" msgstr "" @@ -2316,6 +2352,102 @@ msgid "Importing:" msgstr "" #: editor/export_template_manager.cpp +msgid "" +"No download links found for this version. Direct download is only available " +"for official releases." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Can't resolve." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Can't connect." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "No response." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Req. Failed." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Redirect Loop." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Failed:" +msgstr "" + +#: editor/export_template_manager.cpp +msgid "Can't write file." +msgstr "" + +#: editor/export_template_manager.cpp +msgid "Download Complete." +msgstr "" + +#: editor/export_template_manager.cpp +msgid "Error requesting url: " +msgstr "" + +#: editor/export_template_manager.cpp +msgid "Connecting to Mirror.." +msgstr "" + +#: editor/export_template_manager.cpp +msgid "Disconnected" +msgstr "" + +#: editor/export_template_manager.cpp +msgid "Resolving" +msgstr "" + +#: editor/export_template_manager.cpp +msgid "Can't Resolve" +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Connecting.." +msgstr "" + +#: editor/export_template_manager.cpp +msgid "Can't Conect" +msgstr "" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Connected" +msgstr "Slit th' Node" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Requesting.." +msgstr "" + +#: editor/export_template_manager.cpp +msgid "Downloading" +msgstr "" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Connection Error" +msgstr "Slit th' Node" + +#: editor/export_template_manager.cpp +msgid "SSL Handshake Error" +msgstr "" + +#: editor/export_template_manager.cpp msgid "Current Version:" msgstr "" @@ -2340,12 +2472,21 @@ msgstr "" msgid "Export Template Manager" msgstr "" +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Download Templates" +msgstr "Discharge ye' Variable" + +#: editor/export_template_manager.cpp +msgid "Select mirror from list: " +msgstr "" + #: editor/file_type_cache.cpp msgid "Can't open file_type_cache.cch for writing, not saving file type cache!" msgstr "" #: editor/filesystem_dock.cpp -msgid "Cannot navigate to '" +msgid "Cannot navigate to '%s' as it has not been found in the file system!" msgstr "" #: editor/filesystem_dock.cpp @@ -2363,12 +2504,6 @@ msgid "" msgstr "" #: editor/filesystem_dock.cpp -msgid "" -"\n" -"Source: " -msgstr "" - -#: editor/filesystem_dock.cpp msgid "Cannot move/rename resources root." msgstr "" @@ -2627,8 +2762,7 @@ msgid "Remove Poly And Point" msgstr "" #: editor/plugins/abstract_polygon_2d_editor.cpp -#: editor/plugins/light_occluder_2d_editor_plugin.cpp -msgid "Create a new polygon from scratch." +msgid "Create a new polygon from scratch" msgstr "" #: editor/plugins/abstract_polygon_2d_editor.cpp @@ -2639,6 +2773,11 @@ msgid "" "RMB: Erase Point." msgstr "" +#: editor/plugins/abstract_polygon_2d_editor.cpp +#, fuzzy +msgid "Delete points" +msgstr "Yar, Blow th' Selected Down!" + #: editor/plugins/animation_player_editor_plugin.cpp msgid "Toggle Autoplay" msgstr "" @@ -2974,18 +3113,10 @@ msgid "Can't resolve hostname:" msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Can't resolve." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Connection error, please try again." msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Can't connect." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Can't connect to host:" msgstr "" @@ -2994,30 +3125,14 @@ msgid "No response from host:" msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "No response." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Request failed, return code:" msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Req. Failed." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Request failed, too many redirects" msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Redirect Loop." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp -msgid "Failed:" -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Bad download hash, assuming file has been tampered with." msgstr "" @@ -3046,14 +3161,6 @@ msgid "Resolving.." msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Connecting.." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp -msgid "Requesting.." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Error making request" msgstr "" @@ -3166,6 +3273,36 @@ msgid "Move Action" msgstr "" #: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Move vertical guide" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Create new vertical guide" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Remove vertical guide" +msgstr "Discharge ye' Variable" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Move horizontal guide" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Create new horizontal guide" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Remove horizontal guide" +msgstr "Discharge ye' Variable" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Create new horizontal and vertical guides" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp msgid "Edit IK Chain" msgstr "" @@ -3287,10 +3424,16 @@ msgid "Snap to other nodes" msgstr "" #: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Snap to guides" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Lock the selected object in place (can't be moved)." msgstr "" #: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Unlock the selected object (can be moved)." msgstr "" @@ -3341,6 +3484,10 @@ msgid "Show rulers" msgstr "" #: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Show guides" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp msgid "Center Selection" msgstr "" @@ -3529,6 +3676,10 @@ msgstr "" msgid "Hold Shift to edit tangents individually" msgstr "" +#: editor/plugins/gi_probe_editor_plugin.cpp +msgid "Bake GI Probe" +msgstr "" + #: editor/plugins/gradient_editor_plugin.cpp msgid "Add/Remove Color Ramp Point" msgstr "" @@ -3561,6 +3712,10 @@ msgid "Create Occluder Polygon" msgstr "" #: editor/plugins/light_occluder_2d_editor_plugin.cpp +msgid "Create a new polygon from scratch." +msgstr "" + +#: editor/plugins/light_occluder_2d_editor_plugin.cpp msgid "Edit existing polygon:" msgstr "" @@ -3576,58 +3731,6 @@ msgstr "" msgid "RMB: Erase Point." msgstr "" -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Remove Point from Line2D" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Add Point to Line2D" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Move Point in Line2D" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Select Points" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Shift+Drag: Select Control Points" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Click: Add Point" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Right Click: Delete Point" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Add Point (in empty space)" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Split Segment (in line)" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Delete Point" -msgstr "" - #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Mesh is empty!" msgstr "" @@ -4025,16 +4128,46 @@ msgid "Move Out-Control in Curve" msgstr "" #: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Select Points" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Shift+Drag: Select Control Points" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Click: Add Point" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Right Click: Delete Point" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp msgid "Select Control Points (Shift+Drag)" msgstr "" #: editor/plugins/path_2d_editor_plugin.cpp #: editor/plugins/path_editor_plugin.cpp +msgid "Add Point (in empty space)" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp msgid "Split Segment (in curve)" msgstr "" #: editor/plugins/path_2d_editor_plugin.cpp #: editor/plugins/path_editor_plugin.cpp +msgid "Delete Point" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp msgid "Close Curve" msgstr "" @@ -4175,7 +4308,6 @@ msgstr "" #: editor/plugins/resource_preloader_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp #: editor/plugins/sprite_frames_editor_plugin.cpp editor/property_editor.cpp #: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Paste" @@ -4220,6 +4352,20 @@ msgid " Class Reference" msgstr "" #: editor/plugins/script_editor_plugin.cpp +msgid "Sort" +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp +msgid "Move Up" +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp +msgid "Move Down" +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp msgid "Next script" msgstr "" @@ -4271,6 +4417,10 @@ msgstr "" msgid "Close All" msgstr "" +#: editor/plugins/script_editor_plugin.cpp +msgid "Close Other Tabs" +msgstr "" + #: editor/plugins/script_editor_plugin.cpp editor/project_manager.cpp msgid "Run" msgstr "" @@ -4281,13 +4431,11 @@ msgstr "" #: editor/plugins/script_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Find.." msgstr "" #: editor/plugins/script_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Find Next" msgstr "" @@ -4391,33 +4539,22 @@ msgstr "" msgid "Capitalize" msgstr "" -#: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp scene/gui/line_edit.cpp +#: editor/plugins/script_text_editor.cpp scene/gui/line_edit.cpp #: scene/gui/text_edit.cpp msgid "Cut" msgstr "" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp #: editor/plugins/sprite_frames_editor_plugin.cpp editor/property_editor.cpp #: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Copy" msgstr "" -#: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp scene/gui/line_edit.cpp +#: editor/plugins/script_text_editor.cpp scene/gui/line_edit.cpp #: scene/gui/text_edit.cpp msgid "Select All" msgstr "" -#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp -msgid "Move Up" -msgstr "" - -#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp -msgid "Move Down" -msgstr "" - #: editor/plugins/script_text_editor.cpp #, fuzzy msgid "Delete Line" @@ -4440,6 +4577,23 @@ msgid "Clone Down" msgstr "" #: editor/plugins/script_text_editor.cpp +#, fuzzy +msgid "Fold Line" +msgstr "Yar, Blow th' Selected Down!" + +#: editor/plugins/script_text_editor.cpp +msgid "Unfold Line" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Fold All Lines" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Unfold All Lines" +msgstr "" + +#: editor/plugins/script_text_editor.cpp msgid "Complete Symbol" msgstr "" @@ -4485,12 +4639,10 @@ msgid "Convert To Lowercase" msgstr "" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Find Previous" msgstr "" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Replace.." msgstr "" @@ -4499,7 +4651,6 @@ msgid "Goto Function.." msgstr "" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Goto Line.." msgstr "" @@ -4664,6 +4815,14 @@ msgid "View Plane Transform." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "Scaling: " +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Translating: " +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Rotating %s degrees." msgstr "" @@ -4745,6 +4904,10 @@ msgid "Vertices" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "FPS" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Align with view" msgstr "" @@ -4777,6 +4940,14 @@ msgid "View Information" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "View FPS" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Half Resolution" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Audio Listener" msgstr "" @@ -4905,6 +5076,11 @@ msgid "Tool Scale" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Toggle Freelook" +msgstr "Toggle ye Breakpoint" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Transform" msgstr "" @@ -5182,6 +5358,10 @@ msgid "Create Empty Editor Template" msgstr "" #: editor/plugins/theme_editor_plugin.cpp +msgid "Create From Current Editor Theme" +msgstr "" + +#: editor/plugins/theme_editor_plugin.cpp msgid "CheckBox Radio1" msgstr "" @@ -5355,7 +5535,7 @@ msgid "Runnable" msgstr "" #: editor/project_export.cpp -msgid "Delete patch '" +msgid "Delete patch '%s' from list?" msgstr "" #: editor/project_export.cpp @@ -5650,10 +5830,6 @@ msgid "Add Input Action Event" msgstr "" #: editor/project_settings_editor.cpp editor/settings_config_dialog.cpp -msgid "Meta+" -msgstr "" - -#: editor/project_settings_editor.cpp editor/settings_config_dialog.cpp msgid "Shift+" msgstr "" @@ -5776,11 +5952,11 @@ msgid "Select a setting item first!" msgstr "" #: editor/project_settings_editor.cpp -msgid "No property '" +msgid "No property '%s' exists." msgstr "" #: editor/project_settings_editor.cpp -msgid "Setting '" +msgid "Setting '%s' is internal, and it can't be deleted." msgstr "" #: editor/project_settings_editor.cpp @@ -6253,6 +6429,15 @@ msgid "Clear a script for the selected node." msgstr "" #: editor/scene_tree_dock.cpp +#, fuzzy +msgid "Remote" +msgstr "Discharge ye' Signal" + +#: editor/scene_tree_dock.cpp +msgid "Local" +msgstr "" + +#: editor/scene_tree_dock.cpp msgid "Clear Inheritance? (No Undo!)" msgstr "" @@ -6439,6 +6624,11 @@ msgid "Attach Node Script" msgstr "" #: editor/script_editor_debugger.cpp +#, fuzzy +msgid "Remote " +msgstr "Discharge ye' Signal" + +#: editor/script_editor_debugger.cpp msgid "Bytes:" msgstr "" @@ -6495,18 +6685,6 @@ msgid "Stack Trace (if applicable):" msgstr "" #: editor/script_editor_debugger.cpp -msgid "Remote Inspector" -msgstr "" - -#: editor/script_editor_debugger.cpp -msgid "Live Scene Tree:" -msgstr "" - -#: editor/script_editor_debugger.cpp -msgid "Remote Object Properties: " -msgstr "" - -#: editor/script_editor_debugger.cpp msgid "Profiler" msgstr "" @@ -6638,54 +6816,54 @@ msgstr "" msgid "GDNative" msgstr "" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp #: modules/visual_script/visual_script_builtin_funcs.cpp msgid "Invalid type argument to convert(), use TYPE_* constants." msgstr "" "Shiver me timbers! ye type argument t' convert() be wrong! use yer TYPE_* " "constants!" -#: modules/gdscript/gd_functions.cpp modules/mono/glue/glue_header.h +#: modules/gdscript/gdscript_functions.cpp modules/mono/glue/glue_header.h #: modules/visual_script/visual_script_builtin_funcs.cpp msgid "Not enough bytes for decoding bytes, or invalid format." msgstr "Nah enough bytes fer decodin' bytes, or ye got th' wrong ship." -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "step argument is zero!" msgstr "Blimey! Ye step argument be marooned!" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Not a script with an instance" msgstr "Arr! Yer script is marooned!" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Not based on a script" msgstr "Ye be loaded to the gunwalls? It's anchorage be not on a script!" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Not based on a resource file" msgstr "Yer anchorage not be on a resource file, ye bilge rat!" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary format (missing @path)" msgstr "Ye got th' wrong dictionary getup! (ye be missin' yer @path!)" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary format (can't load script at @path)" msgstr "Ye got th' wrong dictionary getup! (yer script aint' at ye @path)" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary format (invalid script at @path)" msgstr "" "Ye got th' wrong dictionary getup! (ye be drinkin'? Ye got yerself a bad " "script at @path!)" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary (invalid subclasses)" msgstr "" "Ye got th' wrong dictionary getup! (yer subclasses be walkin' the plank!)" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Object can't provide a length." msgstr "" @@ -6699,15 +6877,23 @@ msgid "GridMap Duplicate Selection" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp +msgid "Floor:" +msgstr "" + +#: modules/gridmap/grid_map_editor_plugin.cpp +msgid "Grid Map" +msgstr "" + +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Snap View" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp -msgid "Prev Level (%sDown Wheel)" +msgid "Previous Floor" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp -msgid "Next Level (%sUp Wheel)" +msgid "Next Floor" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp @@ -6775,12 +6961,9 @@ msgid "Erase Area" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp -msgid "Selection -> Duplicate" -msgstr "" - -#: modules/gridmap/grid_map_editor_plugin.cpp -msgid "Selection -> Clear" -msgstr "" +#, fuzzy +msgid "Clear Selection" +msgstr "Yar, Blow th' Selected Down!" #: modules/gridmap/grid_map_editor_plugin.cpp msgid "GridMap Settings" @@ -6913,7 +7096,8 @@ msgid "Duplicate VisualScript Nodes" msgstr "" #: modules/visual_script/visual_script_editor.cpp -msgid "Hold Meta to drop a Getter. Hold Shift to drop a generic signature." +#, fuzzy +msgid "Hold %s to drop a Getter. Hold Shift to drop a generic signature." msgstr "" "Smash yer Meta key t' sink yer Getter. Smash yer Shift t' sink a generic " "signature." @@ -6925,7 +7109,8 @@ msgstr "" "signature." #: modules/visual_script/visual_script_editor.cpp -msgid "Hold Meta to drop a simple reference to the node." +#, fuzzy +msgid "Hold %s to drop a simple reference to the node." msgstr "Smash yer Meta key t' sink a naked reference t' th' node." #: modules/visual_script/visual_script_editor.cpp @@ -6933,7 +7118,8 @@ msgid "Hold Ctrl to drop a simple reference to the node." msgstr "Smash yer Ctrl key t' sink a naked reference t' th' node." #: modules/visual_script/visual_script_editor.cpp -msgid "Hold Meta to drop a Variable Setter." +#, fuzzy +msgid "Hold %s to drop a Variable Setter." msgstr "Smash yer Meta key t' sink a Variable Setter." #: modules/visual_script/visual_script_editor.cpp @@ -7168,11 +7354,20 @@ msgid "Could not write file:\n" msgstr "" #: platform/javascript/export/export.cpp -msgid "Could not read file:\n" +msgid "Could not open template for export:\n" msgstr "" #: platform/javascript/export/export.cpp -msgid "Could not open template for export:\n" +#, fuzzy +msgid "Invalid export template:\n" +msgstr "Yer index property name be thrown overboard!" + +#: platform/javascript/export/export.cpp +msgid "Could not read custom HTML shell:\n" +msgstr "" + +#: platform/javascript/export/export.cpp +msgid "Could not read boot splash image file:\n" msgstr "" #: scene/2d/animated_sprite.cpp @@ -7264,18 +7459,6 @@ msgstr "" msgid "Path property must point to a valid Node2D node to work." msgstr "" -#: scene/2d/sprite.cpp -msgid "" -"Path property must point to a valid Viewport node to work. Such Viewport " -"must be set to 'render target' mode." -msgstr "" - -#: scene/2d/sprite.cpp -msgid "" -"The Viewport set in the path property must be set as 'render target' in " -"order for this sprite to work." -msgstr "" - #: scene/2d/visibility_notifier_2d.cpp msgid "" "VisibilityEnable2D works best when used with the edited scene root directly " @@ -7334,6 +7517,14 @@ msgid "" "shape resource for it!" msgstr "" +#: scene/3d/gi_probe.cpp +msgid "Plotting Meshes" +msgstr "" + +#: scene/3d/gi_probe.cpp +msgid "Finishing Plot" +msgstr "" + #: scene/3d/navigation_mesh.cpp msgid "A NavigationMesh resource must be set or created for this node to work." msgstr "" @@ -7411,6 +7602,10 @@ msgid "" "minimum size manually." msgstr "" +#: scene/gui/tree.cpp +msgid "(Other)" +msgstr "" + #: scene/main/scene_tree.cpp msgid "" "Default Environment as specified in Project Setings (Rendering -> Viewport -" diff --git a/editor/translations/pt_BR.po b/editor/translations/pt_BR.po index 490ad2accc..9ad005a4ad 100644 --- a/editor/translations/pt_BR.po +++ b/editor/translations/pt_BR.po @@ -11,14 +11,15 @@ # jonathan railarem <railarem@gmail.com>, 2017. # Mailson Silva Marins <mailsons335@gmail.com>, 2016. # Marcus Correia <marknokalt@live.com>, 2017. -# Michael Alexsander Silva Dias <michael.a.s.dias@gmail.com>, 2017. +# Michael Alexsander Silva Dias <michaelalexsander@protonmail.com>, 2017. # msgid "" msgstr "" "Project-Id-Version: Godot Engine editor\n" "POT-Creation-Date: 2016-05-30\n" -"PO-Revision-Date: 2017-10-22 02:54+0000\n" -"Last-Translator: Marcus Correia <marknokalt@live.com>\n" +"PO-Revision-Date: 2017-11-20 20:49+0000\n" +"Last-Translator: Michael Alexsander Silva Dias <michaelalexsander@protonmail." +"com>\n" "Language-Team: Portuguese (Brazil) <https://hosted.weblate.org/projects/" "godot-engine/godot/pt_BR/>\n" "Language: pt_BR\n" @@ -26,7 +27,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n > 1;\n" -"X-Generator: Weblate 2.17\n" +"X-Generator: Weblate 2.18-dev\n" #: editor/animation_editor.cpp msgid "Disabled" @@ -109,6 +110,7 @@ msgid "Anim Delete Keys" msgstr "Excluir Chaves da Anim" #: editor/animation_editor.cpp editor/plugins/tile_map_editor_plugin.cpp +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Duplicate Selection" msgstr "Duplicar Seleção" @@ -644,6 +646,13 @@ msgstr "Editor de Dependências" msgid "Search Replacement Resource:" msgstr "Buscar Recurso para Substituição:" +#: editor/dependency_editor.cpp editor/editor_file_dialog.cpp +#: editor/editor_help.cpp editor/editor_node.cpp editor/filesystem_dock.cpp +#: editor/plugins/script_editor_plugin.cpp editor/property_selector.cpp +#: editor/quick_open.cpp scene/gui/file_dialog.cpp +msgid "Open" +msgstr "Abrir" + #: editor/dependency_editor.cpp msgid "Owners Of:" msgstr "Donos De:" @@ -717,6 +726,16 @@ msgstr "Excluir os arquivos selecionados?" msgid "Delete" msgstr "Excluir" +#: editor/dictionary_property_edit.cpp +#, fuzzy +msgid "Change Dictionary Key" +msgstr "Alterar Nome da Animação:" + +#: editor/dictionary_property_edit.cpp +#, fuzzy +msgid "Change Dictionary Value" +msgstr "Alterar Valor do Vetor" + #: editor/editor_about.cpp msgid "Thanks from the Godot community!" msgstr "Agradecimentos da comunidade Godot!" @@ -1139,12 +1158,6 @@ msgstr "Todas Reconhecidas" msgid "All Files (*)" msgstr "Todos os Arquivos (*)" -#: editor/editor_file_dialog.cpp editor/editor_help.cpp editor/editor_node.cpp -#: editor/filesystem_dock.cpp editor/plugins/script_editor_plugin.cpp -#: editor/property_selector.cpp editor/quick_open.cpp scene/gui/file_dialog.cpp -msgid "Open" -msgstr "Abrir" - #: editor/editor_file_dialog.cpp scene/gui/file_dialog.cpp msgid "Open a File" msgstr "Abrir um Arquivo" @@ -1514,6 +1527,17 @@ msgstr "" "melhor esse procedimento." #: editor/editor_node.cpp +#, fuzzy +msgid "" +"This is a remote object so changes to it will not be kept.\n" +"Please read the documentation relevant to debugging to better understand " +"this workflow." +msgstr "" +"Este recurso pertence a uma cena que foi importada, mas não é editável.\n" +"Por favor, leia a documentação referente a importação de cenas para entender " +"melhor esse procedimento." + +#: editor/editor_node.cpp msgid "Copy Params" msgstr "Copiar Parâmetros" @@ -1632,6 +1656,11 @@ msgid "Export Mesh Library" msgstr "Exportar MeshLibrary" #: editor/editor_node.cpp +#, fuzzy +msgid "This operation can't be done without a root node." +msgstr "Esta operação não pode ser feita sem um nó selecionado." + +#: editor/editor_node.cpp msgid "Export Tile Set" msgstr "Exportar Tile Set" @@ -1698,31 +1727,33 @@ msgid "Pick a Main Scene" msgstr "Escolha uma Cena Principal" #: editor/editor_node.cpp -#, fuzzy msgid "Unable to enable addon plugin at: '%s' parsing of config failed." -msgstr "Não foi possÃvel ativar o plugin em: '" +msgstr "" +"Não foi possÃvel ativar o plugin em: '%s' processamento da configuração " +"falhou." #: editor/editor_node.cpp -#, fuzzy msgid "Unable to find script field for addon plugin at: 'res://addons/%s'." msgstr "" "Não foi possÃvel encontrar o campo de script para o plugin em: 'res://addons/" +"%s'." #: editor/editor_node.cpp -#, fuzzy msgid "Unable to load addon script from path: '%s'." -msgstr "Não foi possÃvel carregar o script de extensão no caminho: '" +msgstr "Não foi possÃvel carregar o script complementar do caminho: '%s'." #: editor/editor_node.cpp -#, fuzzy msgid "" "Unable to load addon script from path: '%s' Base type is not EditorPlugin." -msgstr "Não foi possÃvel carregar o script de extensão no caminho: '" +msgstr "" +"Não foi possÃvel carregar o script complementar do caminho: '%s' Tipo base " +"não é EditorPlugin." #: editor/editor_node.cpp -#, fuzzy msgid "Unable to load addon script from path: '%s' Script is not in tool mode." -msgstr "Não foi possÃvel carregar o script de extensão no caminho: '" +msgstr "" +"Não foi possÃvel carregar o script complementar do caminho: '%s' Script não " +"está em modo ferramenta." #: editor/editor_node.cpp msgid "" @@ -1771,12 +1802,23 @@ msgid "Switch Scene Tab" msgstr "Trocar Guia de Cena" #: editor/editor_node.cpp -msgid "%d more file(s)" +#, fuzzy +msgid "%d more files or folders" +msgstr "Mais %d arquivo(s) ou pasta(s)" + +#: editor/editor_node.cpp +#, fuzzy +msgid "%d more folders" +msgstr "Mais %d arquivo(s)" + +#: editor/editor_node.cpp +#, fuzzy +msgid "%d more files" msgstr "Mais %d arquivo(s)" #: editor/editor_node.cpp -msgid "%d more file(s) or folder(s)" -msgstr "Mais %d arquivo(s) ou pasta(s)" +msgid "Dock Position" +msgstr "" #: editor/editor_node.cpp msgid "Distraction Free Mode" @@ -1787,6 +1829,11 @@ msgid "Toggle distraction-free mode." msgstr "Alternar modo sem-distrações." #: editor/editor_node.cpp +#, fuzzy +msgid "Add a new scene." +msgstr "Adicionar novas trilhas." + +#: editor/editor_node.cpp msgid "Scene" msgstr "Cena" @@ -1851,13 +1898,12 @@ msgid "TileSet.." msgstr "TileSet..." #: editor/editor_node.cpp editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp scene/gui/line_edit.cpp -#: scene/gui/text_edit.cpp +#: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Undo" msgstr "Desfazer" #: editor/editor_node.cpp editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp +#: scene/gui/line_edit.cpp msgid "Redo" msgstr "Refazer" @@ -2014,7 +2060,7 @@ msgstr "Classes" #: editor/editor_node.cpp editor/plugins/script_editor_plugin.cpp msgid "Online Docs" -msgstr "Docs Online" +msgstr "Documentação Online" #: editor/editor_node.cpp msgid "Q&A" @@ -2263,9 +2309,8 @@ msgid "Frame %" msgstr "% de Quadro" #: editor/editor_profiler.cpp -#, fuzzy msgid "Physics Frame %" -msgstr "% de Quadro Fixo" +msgstr "Quadro FÃsico %" #: editor/editor_profiler.cpp editor/script_editor_debugger.cpp msgid "Time:" @@ -2361,6 +2406,11 @@ msgid "(Current)" msgstr "(Atual)" #: editor/export_template_manager.cpp +#, fuzzy +msgid "Retrieving mirrors, please wait.." +msgstr "Erro na conexão, por favor tente novamente." + +#: editor/export_template_manager.cpp msgid "Remove template version '%s'?" msgstr "Remover versão '%s' do modelo?" @@ -2397,6 +2447,112 @@ msgid "Importing:" msgstr "Importando:" #: editor/export_template_manager.cpp +msgid "" +"No download links found for this version. Direct download is only available " +"for official releases." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Can't resolve." +msgstr "Não foi possÃvel resolver." + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Can't connect." +msgstr "Não foi possÃvel conectar." + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "No response." +msgstr "Sem resposta." + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Req. Failed." +msgstr "Sol. Falhou." + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Redirect Loop." +msgstr "Loop de Redirecionamento." + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Failed:" +msgstr "Falhou:" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Can't write file." +msgstr "Não foi possÃvel escrever o arquivo:\n" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Download Complete." +msgstr "Erro no Download" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Error requesting url: " +msgstr "Erro ao salvar atlas:" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Connecting to Mirror.." +msgstr "Conectando.." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Disconnected" +msgstr "Disconectar" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Resolving" +msgstr "Resolvendo..." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Can't Resolve" +msgstr "Não foi possÃvel resolver." + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Connecting.." +msgstr "Conectando.." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Can't Conect" +msgstr "Não foi possÃvel conectar." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Connected" +msgstr "Conectar" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Requesting.." +msgstr "Solicitando.." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Downloading" +msgstr "Download" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Connection Error" +msgstr "Conectando.." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "SSL Handshake Error" +msgstr "Erros de Carregamento" + +#: editor/export_template_manager.cpp msgid "Current Version:" msgstr "Versão Atual:" @@ -2420,6 +2576,16 @@ msgstr "Selecione o arquivo de modelo" msgid "Export Template Manager" msgstr "Gerenciador de Modelos de Exportação" +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Download Templates" +msgstr "Modelos" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Select mirror from list: " +msgstr "Selecione um dispositivo da lista" + #: editor/file_type_cache.cpp msgid "Can't open file_type_cache.cch for writing, not saving file type cache!" msgstr "" @@ -2427,8 +2593,8 @@ msgstr "" "não salvo!" #: editor/filesystem_dock.cpp -msgid "Cannot navigate to '" -msgstr "Não é possÃvel navegar para '" +msgid "Cannot navigate to '%s' as it has not been found in the file system!" +msgstr "" #: editor/filesystem_dock.cpp msgid "View items as a grid of thumbnails" @@ -2448,14 +2614,6 @@ msgstr "" "importe manualmente." #: editor/filesystem_dock.cpp -msgid "" -"\n" -"Source: " -msgstr "" -"\n" -"Origem: " - -#: editor/filesystem_dock.cpp msgid "Cannot move/rename resources root." msgstr "Não foi possÃvel mover/renomear raiz dos recurso." @@ -2715,8 +2873,8 @@ msgid "Remove Poly And Point" msgstr "Remover PolÃgono e Ponto" #: editor/plugins/abstract_polygon_2d_editor.cpp -#: editor/plugins/light_occluder_2d_editor_plugin.cpp -msgid "Create a new polygon from scratch." +#, fuzzy +msgid "Create a new polygon from scratch" msgstr "Criar um novo polÃgono do zero." #: editor/plugins/abstract_polygon_2d_editor.cpp @@ -2731,6 +2889,11 @@ msgstr "" "Ctrl+LMB: Soltar Segmento.\n" "RMB: Apagar Ponto." +#: editor/plugins/abstract_polygon_2d_editor.cpp +#, fuzzy +msgid "Delete points" +msgstr "Excluir Ponto" + #: editor/plugins/animation_player_editor_plugin.cpp msgid "Toggle Autoplay" msgstr "Alternar Inicio automático" @@ -3068,18 +3231,10 @@ msgid "Can't resolve hostname:" msgstr "Não foi possÃvel resolver o hostname:" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Can't resolve." -msgstr "Não foi possÃvel resolver." - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Connection error, please try again." msgstr "Erro na conexão, por favor tente novamente." #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Can't connect." -msgstr "Não foi possÃvel conectar." - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Can't connect to host:" msgstr "Não foi possÃvel conectar ao host:" @@ -3088,30 +3243,14 @@ msgid "No response from host:" msgstr "Sem resposta do host:" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "No response." -msgstr "Sem resposta." - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Request failed, return code:" msgstr "Solicitação falhou, código de retorno:" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Req. Failed." -msgstr "Sol. Falhou." - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Request failed, too many redirects" msgstr "Solicitação falhou, redirecionamentos demais" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Redirect Loop." -msgstr "Loop de Redirecionamento." - -#: editor/plugins/asset_library_editor_plugin.cpp -msgid "Failed:" -msgstr "Falhou:" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Bad download hash, assuming file has been tampered with." msgstr "Hash de download ruim, assumindo que o arquivo foi adulterado." @@ -3137,15 +3276,7 @@ msgstr "Procurando:" #: editor/plugins/asset_library_editor_plugin.cpp msgid "Resolving.." -msgstr "Resolvendo.." - -#: editor/plugins/asset_library_editor_plugin.cpp -msgid "Connecting.." -msgstr "Conectando.." - -#: editor/plugins/asset_library_editor_plugin.cpp -msgid "Requesting.." -msgstr "Solicitando.." +msgstr "Resolvendo..." #: editor/plugins/asset_library_editor_plugin.cpp msgid "Error making request" @@ -3260,6 +3391,39 @@ msgid "Move Action" msgstr "Ação de Mover" #: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Move vertical guide" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Create new vertical guide" +msgstr "Criar novo arquivo de script" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Remove vertical guide" +msgstr "Remover Variável" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Move horizontal guide" +msgstr "Mover Ponto na Curva" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Create new horizontal guide" +msgstr "Criar novo arquivo de script" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Remove horizontal guide" +msgstr "Remover Chaves Invalidas" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Create new horizontal and vertical guides" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp msgid "Edit IK Chain" msgstr "Editar Cadeia de IK" @@ -3384,10 +3548,17 @@ msgid "Snap to other nodes" msgstr "Encaixar em outros nós" #: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Snap to guides" +msgstr "Encaixar na grade" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Lock the selected object in place (can't be moved)." msgstr "Travar o objeto selecionado no local (não pode ser movido)." #: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Unlock the selected object (can be moved)." msgstr "Destravar o objeto selecionado (pode ser movido)." @@ -3438,6 +3609,11 @@ msgid "Show rulers" msgstr "Mostrar réguas" #: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Show guides" +msgstr "Mostrar réguas" + +#: editor/plugins/canvas_item_editor_plugin.cpp msgid "Center Selection" msgstr "Centralizar Seleção" @@ -3624,6 +3800,10 @@ msgstr "Alternar Curva Targente Linear" msgid "Hold Shift to edit tangents individually" msgstr "Segure Shift para editar tangentes individualmente" +#: editor/plugins/gi_probe_editor_plugin.cpp +msgid "Bake GI Probe" +msgstr "" + #: editor/plugins/gradient_editor_plugin.cpp msgid "Add/Remove Color Ramp Point" msgstr "Adicionar/Remover Ponto na Curva de Cor" @@ -3658,6 +3838,10 @@ msgid "Create Occluder Polygon" msgstr "Criar PolÃgono de Oclusão" #: editor/plugins/light_occluder_2d_editor_plugin.cpp +msgid "Create a new polygon from scratch." +msgstr "Criar um novo polÃgono do zero." + +#: editor/plugins/light_occluder_2d_editor_plugin.cpp msgid "Edit existing polygon:" msgstr "Editar polÃgono existente:" @@ -3673,58 +3857,6 @@ msgstr "Ctrl+LMB: Dividir Segmento." msgid "RMB: Erase Point." msgstr "RMB: Apagar Ponto." -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Remove Point from Line2D" -msgstr "Remover Ponto de Line2D" - -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Add Point to Line2D" -msgstr "Adicionar Ponto ao Line2D" - -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Move Point in Line2D" -msgstr "Mover Ponto em Line2D" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Select Points" -msgstr "Selecionar Pontos" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Shift+Drag: Select Control Points" -msgstr "Shift+Arrastar: Selecionar Pontos de Controle" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Click: Add Point" -msgstr "Clique: Adicionar Ponto" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Right Click: Delete Point" -msgstr "Clique Direito: Excluir Ponto" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Add Point (in empty space)" -msgstr "Adicionar Ponto (em espaço vazio)" - -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Split Segment (in line)" -msgstr "Dividir Segmento (em linha)" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Delete Point" -msgstr "Excluir Ponto" - #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Mesh is empty!" msgstr "Mesh está vazia!" @@ -3939,7 +4071,6 @@ msgid "Eroding walkable area..." msgstr "Erodindo área caminhável..." #: editor/plugins/navigation_mesh_generator.cpp -#, fuzzy msgid "Partitioning..." msgstr "Particionando..." @@ -4125,16 +4256,46 @@ msgid "Move Out-Control in Curve" msgstr "Mover Controle de SaÃda na Curva" #: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Select Points" +msgstr "Selecionar Pontos" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Shift+Drag: Select Control Points" +msgstr "Shift+Arrastar: Selecionar Pontos de Controle" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Click: Add Point" +msgstr "Clique: Adicionar Ponto" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Right Click: Delete Point" +msgstr "Clique Direito: Excluir Ponto" + +#: editor/plugins/path_2d_editor_plugin.cpp msgid "Select Control Points (Shift+Drag)" msgstr "Selecionar Pontos de Controle (Shift+Arrastar)" #: editor/plugins/path_2d_editor_plugin.cpp #: editor/plugins/path_editor_plugin.cpp +msgid "Add Point (in empty space)" +msgstr "Adicionar Ponto (em espaço vazio)" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp msgid "Split Segment (in curve)" msgstr "Dividir Segmentos (na curva)" #: editor/plugins/path_2d_editor_plugin.cpp #: editor/plugins/path_editor_plugin.cpp +msgid "Delete Point" +msgstr "Excluir Ponto" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp msgid "Close Curve" msgstr "Fechar Curva" @@ -4271,7 +4432,6 @@ msgstr "Carregar Recurso" #: editor/plugins/resource_preloader_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp #: editor/plugins/sprite_frames_editor_plugin.cpp editor/property_editor.cpp #: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Paste" @@ -4318,6 +4478,21 @@ msgid " Class Reference" msgstr " Referência de Classes" #: editor/plugins/script_editor_plugin.cpp +#, fuzzy +msgid "Sort" +msgstr "Ordenar:" + +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp +msgid "Move Up" +msgstr "Mover para Cima" + +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp +msgid "Move Down" +msgstr "Mover para Baixo" + +#: editor/plugins/script_editor_plugin.cpp msgid "Next script" msgstr "Próximo Script" @@ -4369,6 +4544,10 @@ msgstr "Fechar Docs" msgid "Close All" msgstr "Fechar Tudo" +#: editor/plugins/script_editor_plugin.cpp +msgid "Close Other Tabs" +msgstr "" + #: editor/plugins/script_editor_plugin.cpp editor/project_manager.cpp msgid "Run" msgstr "Rodar" @@ -4379,13 +4558,11 @@ msgstr "Alternar Painel de Scripts" #: editor/plugins/script_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Find.." msgstr "Localizar..." #: editor/plugins/script_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Find Next" msgstr "Localizar próximo" @@ -4493,33 +4670,22 @@ msgstr "Minúscula" msgid "Capitalize" msgstr "Capitalizar" -#: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp scene/gui/line_edit.cpp +#: editor/plugins/script_text_editor.cpp scene/gui/line_edit.cpp #: scene/gui/text_edit.cpp msgid "Cut" msgstr "Recortar" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp #: editor/plugins/sprite_frames_editor_plugin.cpp editor/property_editor.cpp #: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Copy" msgstr "Copiar" -#: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp scene/gui/line_edit.cpp +#: editor/plugins/script_text_editor.cpp scene/gui/line_edit.cpp #: scene/gui/text_edit.cpp msgid "Select All" msgstr "Selecionar Tudo" -#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp -msgid "Move Up" -msgstr "Mover para Cima" - -#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp -msgid "Move Down" -msgstr "Mover para Baixo" - #: editor/plugins/script_text_editor.cpp msgid "Delete Line" msgstr "Excluir Linha" @@ -4541,6 +4707,23 @@ msgid "Clone Down" msgstr "Clonar Abaixo" #: editor/plugins/script_text_editor.cpp +#, fuzzy +msgid "Fold Line" +msgstr "Ir para Linha" + +#: editor/plugins/script_text_editor.cpp +msgid "Unfold Line" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Fold All Lines" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Unfold All Lines" +msgstr "" + +#: editor/plugins/script_text_editor.cpp msgid "Complete Symbol" msgstr "Completar SÃmbolo" @@ -4586,12 +4769,10 @@ msgid "Convert To Lowercase" msgstr "Converter Para Minúsculo" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Find Previous" msgstr "Encontrar Anterior" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Replace.." msgstr "Substituir..." @@ -4600,7 +4781,6 @@ msgid "Goto Function.." msgstr "Ir para Função..." #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Goto Line.." msgstr "Ir para linha..." @@ -4765,6 +4945,16 @@ msgid "View Plane Transform." msgstr "Visualizar Transformação do Plano." #: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Scaling: " +msgstr "Escala:" + +#: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Translating: " +msgstr "Traduções:" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Rotating %s degrees." msgstr "Rotacionando %s degraus." @@ -4845,6 +5035,10 @@ msgid "Vertices" msgstr "Vértices" #: editor/plugins/spatial_editor_plugin.cpp +msgid "FPS" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Align with view" msgstr "Alinhar com Visão" @@ -4877,6 +5071,16 @@ msgid "View Information" msgstr "VIsualizar Informação" #: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "View FPS" +msgstr "Ver Arquivos" + +#: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Half Resolution" +msgstr "Mudar Escala da Seleção" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Audio Listener" msgstr "Ouvinte de Ãudio" @@ -5007,6 +5211,11 @@ msgid "Tool Scale" msgstr "Ferramenta Escalar" #: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Toggle Freelook" +msgstr "Alternar Tela-Cheia" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Transform" msgstr "Transformação" @@ -5258,11 +5467,11 @@ msgstr "Remover Tudo" #: editor/plugins/theme_editor_plugin.cpp msgid "Edit theme.." -msgstr "" +msgstr "Editar tema.." #: editor/plugins/theme_editor_plugin.cpp msgid "Theme editing menu." -msgstr "" +msgstr "Menu de edição de tema." #: editor/plugins/theme_editor_plugin.cpp msgid "Add Class Items" @@ -5281,6 +5490,11 @@ msgid "Create Empty Editor Template" msgstr "Criar Modelo de Editor Vazio" #: editor/plugins/theme_editor_plugin.cpp +#, fuzzy +msgid "Create From Current Editor Theme" +msgstr "Criar Modelo de Editor Vazio" + +#: editor/plugins/theme_editor_plugin.cpp msgid "CheckBox Radio1" msgstr "Rádio Checkbox 1" @@ -5454,7 +5668,8 @@ msgid "Runnable" msgstr "Executável" #: editor/project_export.cpp -msgid "Delete patch '" +#, fuzzy +msgid "Delete patch '%s' from list?" msgstr "Deletar alteração '" #: editor/project_export.cpp @@ -5552,6 +5767,7 @@ msgid "Export With Debug" msgstr "Exportar Com Depuração" #: editor/project_manager.cpp +#, fuzzy msgid "The path does not exist." msgstr "O caminho não existe." @@ -5691,6 +5907,9 @@ msgid "" "Language changed.\n" "The UI will update next time the editor or project manager starts." msgstr "" +"Linguagem alterada.\n" +"A interface será atualizada na próxima vez que o editor ou o gerenciador de " +"projetos iniciar." #: editor/project_manager.cpp msgid "" @@ -5725,9 +5944,8 @@ msgid "Exit" msgstr "Sair" #: editor/project_manager.cpp -#, fuzzy msgid "Restart Now" -msgstr "ReinÃcio (s):" +msgstr "Reiniciar Agora" #: editor/project_manager.cpp msgid "Can't run project" @@ -5766,10 +5984,6 @@ msgid "Add Input Action Event" msgstr "Adicionar Evento Ação de Entrada" #: editor/project_settings_editor.cpp editor/settings_config_dialog.cpp -msgid "Meta+" -msgstr "Meta+" - -#: editor/project_settings_editor.cpp editor/settings_config_dialog.cpp msgid "Shift+" msgstr "Shift+" @@ -5891,12 +6105,13 @@ msgid "Select a setting item first!" msgstr "Selecione um item de configuração primeiro!" #: editor/project_settings_editor.cpp -msgid "No property '" +#, fuzzy +msgid "No property '%s' exists." msgstr "Não existe a propriedade '" #: editor/project_settings_editor.cpp -msgid "Setting '" -msgstr "Configuração '" +msgid "Setting '%s' is internal, and it can't be deleted." +msgstr "" #: editor/project_settings_editor.cpp msgid "Delete Item" @@ -5951,13 +6166,12 @@ msgid "Remove Resource Remap Option" msgstr "Remover Opção de Remapeamento de Recurso" #: editor/project_settings_editor.cpp -#, fuzzy msgid "Changed Locale Filter" -msgstr "Mudar Tempo de Mistura" +msgstr "FIltro de Idiomas Alterado" #: editor/project_settings_editor.cpp msgid "Changed Locale Filter Mode" -msgstr "" +msgstr "Modo do Filtro de Idiomas Alterado" #: editor/project_settings_editor.cpp msgid "Project Settings (project.godot)" @@ -6020,28 +6234,24 @@ msgid "Locale" msgstr "Localidade" #: editor/project_settings_editor.cpp -#, fuzzy msgid "Locales Filter" -msgstr "Filtrar Imagens:" +msgstr "Filtro de Idiomas" #: editor/project_settings_editor.cpp -#, fuzzy msgid "Show all locales" -msgstr "Mostrar Ossos" +msgstr "Mostrar todos os idiomas" #: editor/project_settings_editor.cpp msgid "Show only selected locales" -msgstr "" +msgstr "Mostrar apenas os idiomas selecionados" #: editor/project_settings_editor.cpp -#, fuzzy msgid "Filter mode:" -msgstr "Filtrar nós" +msgstr "Modo de filtragem:" #: editor/project_settings_editor.cpp -#, fuzzy msgid "Locales:" -msgstr "Localidade" +msgstr "Idiomas:" #: editor/project_settings_editor.cpp msgid "AutoLoad" @@ -6373,6 +6583,16 @@ msgid "Clear a script for the selected node." msgstr "Remove um script do nó selecionado." #: editor/scene_tree_dock.cpp +#, fuzzy +msgid "Remote" +msgstr "Remover" + +#: editor/scene_tree_dock.cpp +#, fuzzy +msgid "Local" +msgstr "Localidade" + +#: editor/scene_tree_dock.cpp msgid "Clear Inheritance? (No Undo!)" msgstr "Limpar Herança? (IrreversÃvel!)" @@ -6397,7 +6617,7 @@ msgid "" "Node has connection(s) and group(s)\n" "Click to show signals dock." msgstr "" -"O nó tem conexões e grupos\n" +"O nó tem conexão(ões) e grupo(s)\n" "Clique para mostrar o painel de sinais." #: editor/scene_tree_editor.cpp @@ -6413,7 +6633,7 @@ msgid "" "Node is in group(s).\n" "Click to show groups dock." msgstr "" -"O nó tem grupos.\n" +"O nó está em grupo(s).\n" "Clique para mostrar o painel de grupos." #: editor/scene_tree_editor.cpp @@ -6565,6 +6785,11 @@ msgid "Attach Node Script" msgstr "Adicionar Script ao Nó" #: editor/script_editor_debugger.cpp +#, fuzzy +msgid "Remote " +msgstr "Remover" + +#: editor/script_editor_debugger.cpp msgid "Bytes:" msgstr "Bytes:" @@ -6621,18 +6846,6 @@ msgid "Stack Trace (if applicable):" msgstr "Pilha de Rastreamento (se aplicável):" #: editor/script_editor_debugger.cpp -msgid "Remote Inspector" -msgstr "Inspetor Remoto" - -#: editor/script_editor_debugger.cpp -msgid "Live Scene Tree:" -msgstr "Ãrvore de Cena ao vivo:" - -#: editor/script_editor_debugger.cpp -msgid "Remote Object Properties: " -msgstr "Propriedades do Objeto Remoto: " - -#: editor/script_editor_debugger.cpp msgid "Profiler" msgstr "Profiler" @@ -6764,51 +6977,51 @@ msgstr "Bibliotecas: " msgid "GDNative" msgstr "GDNative" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp #: modules/visual_script/visual_script_builtin_funcs.cpp msgid "Invalid type argument to convert(), use TYPE_* constants." msgstr "Argumento de tipo inválido para convert(), use constantes TYPE_*." -#: modules/gdscript/gd_functions.cpp modules/mono/glue/glue_header.h +#: modules/gdscript/gdscript_functions.cpp modules/mono/glue/glue_header.h #: modules/visual_script/visual_script_builtin_funcs.cpp msgid "Not enough bytes for decoding bytes, or invalid format." msgstr "Não há bytes suficientes para decodificar, ou o formato é inválido." -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "step argument is zero!" msgstr "o argumento step é zero!" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Not a script with an instance" msgstr "Não é um script com uma instância" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Not based on a script" msgstr "Não é baseado em um script" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Not based on a resource file" msgstr "Não é baseado em um arquivo de recurso" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary format (missing @path)" msgstr "Formato de dicionário de instância inválido (faltando @path)" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary format (can't load script at @path)" msgstr "" "Formato de dicionário de instância inválido (não foi possÃvel carregar o " "script em @path)" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary format (invalid script at @path)" msgstr "Formato de dicionário de instância inválido (script inválido em @path)" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary (invalid subclasses)" msgstr "Dicionário de instância inválido (subclasses inválidas)" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Object can't provide a length." msgstr "Objeto não pôde fornecer um comprimento." @@ -6821,16 +7034,26 @@ msgid "GridMap Duplicate Selection" msgstr "Duplicar Seleção do GridMap" #: modules/gridmap/grid_map_editor_plugin.cpp +msgid "Floor:" +msgstr "" + +#: modules/gridmap/grid_map_editor_plugin.cpp +#, fuzzy +msgid "Grid Map" +msgstr "Snap de Grade" + +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Snap View" msgstr "Ancorar Vista" #: modules/gridmap/grid_map_editor_plugin.cpp -msgid "Prev Level (%sDown Wheel)" -msgstr "NÃvel anterior (" +#, fuzzy +msgid "Previous Floor" +msgstr "Guia anterior" #: modules/gridmap/grid_map_editor_plugin.cpp -msgid "Next Level (%sUp Wheel)" -msgstr "NÃvel seguinte (" +msgid "Next Floor" +msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp msgid "Clip Disabled" @@ -6897,12 +7120,9 @@ msgid "Erase Area" msgstr "Apagar Ãrea" #: modules/gridmap/grid_map_editor_plugin.cpp -msgid "Selection -> Duplicate" -msgstr "Seleção -> Duplicar" - -#: modules/gridmap/grid_map_editor_plugin.cpp -msgid "Selection -> Clear" -msgstr "Seleção -> Limpar" +#, fuzzy +msgid "Clear Selection" +msgstr "Centralizar Seleção" #: modules/gridmap/grid_map_editor_plugin.cpp msgid "GridMap Settings" @@ -7029,7 +7249,8 @@ msgid "Duplicate VisualScript Nodes" msgstr "Duplicar Nós VisualScript" #: modules/visual_script/visual_script_editor.cpp -msgid "Hold Meta to drop a Getter. Hold Shift to drop a generic signature." +#, fuzzy +msgid "Hold %s to drop a Getter. Hold Shift to drop a generic signature." msgstr "" "Segure Meta para aplicar um Getter. Segure Shift para aplicar uma assinatura " "genérica." @@ -7041,7 +7262,8 @@ msgstr "" "genérica." #: modules/visual_script/visual_script_editor.cpp -msgid "Hold Meta to drop a simple reference to the node." +#, fuzzy +msgid "Hold %s to drop a simple reference to the node." msgstr "Segure Meta para aplicar uma referência simples ao nó." #: modules/visual_script/visual_script_editor.cpp @@ -7049,7 +7271,8 @@ msgid "Hold Ctrl to drop a simple reference to the node." msgstr "Segure Ctrl para aplicar uma referência ao nó." #: modules/visual_script/visual_script_editor.cpp -msgid "Hold Meta to drop a Variable Setter." +#, fuzzy +msgid "Hold %s to drop a Variable Setter." msgstr "Segure Meta para aplicar um Setter de Variável." #: modules/visual_script/visual_script_editor.cpp @@ -7279,12 +7502,23 @@ msgid "Could not write file:\n" msgstr "Não foi possÃvel escrever o arquivo:\n" #: platform/javascript/export/export.cpp -msgid "Could not read file:\n" +msgid "Could not open template for export:\n" +msgstr "Não foi possÃvel abrir o modelo para exportar:\n" + +#: platform/javascript/export/export.cpp +#, fuzzy +msgid "Invalid export template:\n" +msgstr "Instalar Models de Exportação" + +#: platform/javascript/export/export.cpp +#, fuzzy +msgid "Could not read custom HTML shell:\n" msgstr "Não foi possÃvel ler o arquivo:\n" #: platform/javascript/export/export.cpp -msgid "Could not open template for export:\n" -msgstr "Não foi possÃvel abrir o modelo para exportar:\n" +#, fuzzy +msgid "Could not read boot splash image file:\n" +msgstr "Não foi possÃvel ler o arquivo:\n" #: scene/2d/animated_sprite.cpp msgid "" @@ -7406,22 +7640,6 @@ msgstr "" "A propriedade \"Caminho\" deve apontar para um nó Node2D válido para " "funcionar." -#: scene/2d/sprite.cpp -msgid "" -"Path property must point to a valid Viewport node to work. Such Viewport " -"must be set to 'render target' mode." -msgstr "" -"A propriedade \"Caminho\" deve apontar a um nó Viewport para funcionar. Tal " -"Viewport deve estar no modo \"Destino de Render\"." - -#: scene/2d/sprite.cpp -msgid "" -"The Viewport set in the path property must be set as 'render target' in " -"order for this sprite to work." -msgstr "" -"O nó Viewport definido na propriedade \"Caminho\" deve ser marcado como " -"\"destino de render\" para que este sprite funcione." - #: scene/2d/visibility_notifier_2d.cpp msgid "" "VisibilityEnable2D works best when used with the edited scene root directly " @@ -7494,6 +7712,15 @@ msgstr "" "Uma forma deve ser fornecida para que o nó CollisionShape fucione. Por " "favor, crie um recurso de forma a ele!" +#: scene/3d/gi_probe.cpp +#, fuzzy +msgid "Plotting Meshes" +msgstr "Fazendo Blitting das Imagens" + +#: scene/3d/gi_probe.cpp +msgid "Finishing Plot" +msgstr "" + #: scene/3d/navigation_mesh.cpp msgid "A NavigationMesh resource must be set or created for this node to work." msgstr "" @@ -7591,6 +7818,10 @@ msgstr "" "Use um container como filho (VBox, HBox, etc) ou um Control e defina o " "tamanho mÃnimo manualmente." +#: scene/gui/tree.cpp +msgid "(Other)" +msgstr "" + #: scene/main/scene_tree.cpp msgid "" "Default Environment as specified in Project Setings (Rendering -> Viewport -" @@ -7627,6 +7858,69 @@ msgstr "Erro ao carregar fonte." msgid "Invalid font size." msgstr "Tamanho de fonte inválido." +#~ msgid "Cannot navigate to '" +#~ msgstr "Não é possÃvel navegar para '" + +#~ msgid "" +#~ "\n" +#~ "Source: " +#~ msgstr "" +#~ "\n" +#~ "Origem: " + +#~ msgid "Remove Point from Line2D" +#~ msgstr "Remover Ponto de Line2D" + +#~ msgid "Add Point to Line2D" +#~ msgstr "Adicionar Ponto ao Line2D" + +#~ msgid "Move Point in Line2D" +#~ msgstr "Mover Ponto em Line2D" + +#~ msgid "Split Segment (in line)" +#~ msgstr "Dividir Segmento (em linha)" + +#~ msgid "Meta+" +#~ msgstr "Meta+" + +#~ msgid "Setting '" +#~ msgstr "Configuração '" + +#~ msgid "Remote Inspector" +#~ msgstr "Inspetor Remoto" + +#~ msgid "Live Scene Tree:" +#~ msgstr "Ãrvore de Cena ao vivo:" + +#~ msgid "Remote Object Properties: " +#~ msgstr "Propriedades do Objeto Remoto: " + +#~ msgid "Prev Level (%sDown Wheel)" +#~ msgstr "NÃvel anterior (" + +#~ msgid "Next Level (%sUp Wheel)" +#~ msgstr "NÃvel seguinte (" + +#~ msgid "Selection -> Duplicate" +#~ msgstr "Seleção -> Duplicar" + +#~ msgid "Selection -> Clear" +#~ msgstr "Seleção -> Limpar" + +#~ msgid "" +#~ "Path property must point to a valid Viewport node to work. Such Viewport " +#~ "must be set to 'render target' mode." +#~ msgstr "" +#~ "A propriedade \"Caminho\" deve apontar a um nó Viewport para funcionar. " +#~ "Tal Viewport deve estar no modo \"Destino de Render\"." + +#~ msgid "" +#~ "The Viewport set in the path property must be set as 'render target' in " +#~ "order for this sprite to work." +#~ msgstr "" +#~ "O nó Viewport definido na propriedade \"Caminho\" deve ser marcado como " +#~ "\"destino de render\" para que este sprite funcione." + #~ msgid "Filter:" #~ msgstr "Filtro:" @@ -7651,9 +7945,6 @@ msgstr "Tamanho de fonte inválido." #~ msgid "Removed:" #~ msgstr "Removido:" -#~ msgid "Error saving atlas:" -#~ msgstr "Erro ao salvar atlas:" - #~ msgid "Could not save atlas subtexture:" #~ msgstr "Não foi possÃvel salvar Subtextura do Atlas:" @@ -8042,9 +8333,6 @@ msgstr "Tamanho de fonte inválido." #~ msgid "Cropping Images" #~ msgstr "Aparando Imagens" -#~ msgid "Blitting Images" -#~ msgstr "Fazendo Blitting das Imagens" - #~ msgid "Couldn't save atlas image:" #~ msgstr "Não se pôde salva imagem de atlas:" @@ -8386,9 +8674,6 @@ msgstr "Tamanho de fonte inválido." #~ msgid "Save Translatable Strings" #~ msgstr "Salvar Strings TraduzÃveis" -#~ msgid "Install Export Templates" -#~ msgstr "Instalar Models de Exportação" - #~ msgid "Edit Script Options" #~ msgstr "Editar Opções de Script" diff --git a/editor/translations/pt_PT.po b/editor/translations/pt_PT.po index 4b4a98857c..e59a516556 100644 --- a/editor/translations/pt_PT.po +++ b/editor/translations/pt_PT.po @@ -6,19 +6,20 @@ # António Sarmento <antonio.luis.sarmento@gmail.com>, 2016. # João Graça <jgraca95@gmail.com>, 2017. # Rueben Stevens <supercell03@gmail.com>, 2017. +# Vinicius Gonçalves <viniciusgoncalves21@gmail.com>, 2017. # msgid "" msgstr "" "Project-Id-Version: Godot Engine editor\n" -"PO-Revision-Date: 2017-10-25 01:48+0000\n" -"Last-Translator: Rueben Stevens <supercell03@gmail.com>\n" +"PO-Revision-Date: 2017-11-10 17:48+0000\n" +"Last-Translator: Vinicius Gonçalves <viniciusgoncalves21@gmail.com>\n" "Language-Team: Portuguese (Portugal) <https://hosted.weblate.org/projects/" "godot-engine/godot/pt_PT/>\n" "Language: pt_PT\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8-bit\n" "Plural-Forms: nplurals=2; plural=n > 1;\n" -"X-Generator: Weblate 2.17\n" +"X-Generator: Weblate 2.18-dev\n" #: editor/animation_editor.cpp msgid "Disabled" @@ -35,7 +36,7 @@ msgstr "Mover Chave Adcionada" #: editor/animation_editor.cpp msgid "Anim Change Transition" -msgstr "" +msgstr "Mudar Transição da Animação" #: editor/animation_editor.cpp msgid "Anim Change Transform" @@ -43,19 +44,19 @@ msgstr "" #: editor/animation_editor.cpp msgid "Anim Change Value" -msgstr "" +msgstr "Anim Muda Valor" #: editor/animation_editor.cpp msgid "Anim Change Call" -msgstr "" +msgstr "Chama Mudança Animação" #: editor/animation_editor.cpp msgid "Anim Add Track" -msgstr "" +msgstr "Anim Adiciona Track" #: editor/animation_editor.cpp msgid "Anim Duplicate Keys" -msgstr "" +msgstr "Anim Duplica Chaves" #: editor/animation_editor.cpp msgid "Move Anim Track Up" @@ -103,6 +104,7 @@ msgid "Anim Delete Keys" msgstr "" #: editor/animation_editor.cpp editor/plugins/tile_map_editor_plugin.cpp +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Duplicate Selection" msgstr "Duplicar Selecção" @@ -632,6 +634,13 @@ msgstr "" msgid "Search Replacement Resource:" msgstr "" +#: editor/dependency_editor.cpp editor/editor_file_dialog.cpp +#: editor/editor_help.cpp editor/editor_node.cpp editor/filesystem_dock.cpp +#: editor/plugins/script_editor_plugin.cpp editor/property_selector.cpp +#: editor/quick_open.cpp scene/gui/file_dialog.cpp +msgid "Open" +msgstr "" + #: editor/dependency_editor.cpp msgid "Owners Of:" msgstr "" @@ -702,6 +711,15 @@ msgstr "" msgid "Delete" msgstr "" +#: editor/dictionary_property_edit.cpp +msgid "Change Dictionary Key" +msgstr "" + +#: editor/dictionary_property_edit.cpp +#, fuzzy +msgid "Change Dictionary Value" +msgstr "Anim Muda Valor" + #: editor/editor_about.cpp msgid "Thanks from the Godot community!" msgstr "" @@ -1120,12 +1138,6 @@ msgstr "" msgid "All Files (*)" msgstr "" -#: editor/editor_file_dialog.cpp editor/editor_help.cpp editor/editor_node.cpp -#: editor/filesystem_dock.cpp editor/plugins/script_editor_plugin.cpp -#: editor/property_selector.cpp editor/quick_open.cpp scene/gui/file_dialog.cpp -msgid "Open" -msgstr "" - #: editor/editor_file_dialog.cpp scene/gui/file_dialog.cpp msgid "Open a File" msgstr "" @@ -1481,6 +1493,13 @@ msgid "" msgstr "" #: editor/editor_node.cpp +msgid "" +"This is a remote object so changes to it will not be kept.\n" +"Please read the documentation relevant to debugging to better understand " +"this workflow." +msgstr "" + +#: editor/editor_node.cpp msgid "Copy Params" msgstr "" @@ -1590,6 +1609,10 @@ msgid "Export Mesh Library" msgstr "" #: editor/editor_node.cpp +msgid "This operation can't be done without a root node." +msgstr "" + +#: editor/editor_node.cpp msgid "Export Tile Set" msgstr "" @@ -1715,11 +1738,19 @@ msgid "Switch Scene Tab" msgstr "" #: editor/editor_node.cpp -msgid "%d more file(s)" +msgid "%d more files or folders" msgstr "" #: editor/editor_node.cpp -msgid "%d more file(s) or folder(s)" +msgid "%d more folders" +msgstr "" + +#: editor/editor_node.cpp +msgid "%d more files" +msgstr "" + +#: editor/editor_node.cpp +msgid "Dock Position" msgstr "" #: editor/editor_node.cpp @@ -1731,6 +1762,11 @@ msgid "Toggle distraction-free mode." msgstr "" #: editor/editor_node.cpp +#, fuzzy +msgid "Add a new scene." +msgstr "Adicionar novas bandas." + +#: editor/editor_node.cpp msgid "Scene" msgstr "" @@ -1795,13 +1831,12 @@ msgid "TileSet.." msgstr "" #: editor/editor_node.cpp editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp scene/gui/line_edit.cpp -#: scene/gui/text_edit.cpp +#: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Undo" msgstr "" #: editor/editor_node.cpp editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp +#: scene/gui/line_edit.cpp msgid "Redo" msgstr "" @@ -2283,6 +2318,10 @@ msgid "(Current)" msgstr "" #: editor/export_template_manager.cpp +msgid "Retrieving mirrors, please wait.." +msgstr "" + +#: editor/export_template_manager.cpp msgid "Remove template version '%s'?" msgstr "" @@ -2317,6 +2356,101 @@ msgid "Importing:" msgstr "" #: editor/export_template_manager.cpp +msgid "" +"No download links found for this version. Direct download is only available " +"for official releases." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Can't resolve." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Can't connect." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "No response." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Req. Failed." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Redirect Loop." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Failed:" +msgstr "" + +#: editor/export_template_manager.cpp +msgid "Can't write file." +msgstr "" + +#: editor/export_template_manager.cpp +msgid "Download Complete." +msgstr "" + +#: editor/export_template_manager.cpp +msgid "Error requesting url: " +msgstr "" + +#: editor/export_template_manager.cpp +msgid "Connecting to Mirror.." +msgstr "" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Disconnected" +msgstr "Discreto" + +#: editor/export_template_manager.cpp +msgid "Resolving" +msgstr "" + +#: editor/export_template_manager.cpp +msgid "Can't Resolve" +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Connecting.." +msgstr "" + +#: editor/export_template_manager.cpp +msgid "Can't Conect" +msgstr "" + +#: editor/export_template_manager.cpp +msgid "Connected" +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Requesting.." +msgstr "" + +#: editor/export_template_manager.cpp +msgid "Downloading" +msgstr "" + +#: editor/export_template_manager.cpp +msgid "Connection Error" +msgstr "" + +#: editor/export_template_manager.cpp +msgid "SSL Handshake Error" +msgstr "" + +#: editor/export_template_manager.cpp msgid "Current Version:" msgstr "" @@ -2341,12 +2475,21 @@ msgstr "" msgid "Export Template Manager" msgstr "" +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Download Templates" +msgstr "Remover Variável" + +#: editor/export_template_manager.cpp +msgid "Select mirror from list: " +msgstr "" + #: editor/file_type_cache.cpp msgid "Can't open file_type_cache.cch for writing, not saving file type cache!" msgstr "" #: editor/filesystem_dock.cpp -msgid "Cannot navigate to '" +msgid "Cannot navigate to '%s' as it has not been found in the file system!" msgstr "" #: editor/filesystem_dock.cpp @@ -2364,12 +2507,6 @@ msgid "" msgstr "" #: editor/filesystem_dock.cpp -msgid "" -"\n" -"Source: " -msgstr "" - -#: editor/filesystem_dock.cpp msgid "Cannot move/rename resources root." msgstr "" @@ -2628,8 +2765,7 @@ msgid "Remove Poly And Point" msgstr "" #: editor/plugins/abstract_polygon_2d_editor.cpp -#: editor/plugins/light_occluder_2d_editor_plugin.cpp -msgid "Create a new polygon from scratch." +msgid "Create a new polygon from scratch" msgstr "" #: editor/plugins/abstract_polygon_2d_editor.cpp @@ -2640,6 +2776,11 @@ msgid "" "RMB: Erase Point." msgstr "" +#: editor/plugins/abstract_polygon_2d_editor.cpp +#, fuzzy +msgid "Delete points" +msgstr "Apagar Seleccionados" + #: editor/plugins/animation_player_editor_plugin.cpp msgid "Toggle Autoplay" msgstr "" @@ -2975,18 +3116,10 @@ msgid "Can't resolve hostname:" msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Can't resolve." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Connection error, please try again." msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Can't connect." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Can't connect to host:" msgstr "" @@ -2995,30 +3128,14 @@ msgid "No response from host:" msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "No response." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Request failed, return code:" msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Req. Failed." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Request failed, too many redirects" msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Redirect Loop." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp -msgid "Failed:" -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Bad download hash, assuming file has been tampered with." msgstr "" @@ -3047,14 +3164,6 @@ msgid "Resolving.." msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Connecting.." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp -msgid "Requesting.." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Error making request" msgstr "" @@ -3167,6 +3276,36 @@ msgid "Move Action" msgstr "" #: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Move vertical guide" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Create new vertical guide" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Remove vertical guide" +msgstr "Remover Variável" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Move horizontal guide" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Create new horizontal guide" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Remove horizontal guide" +msgstr "Remover Variável" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Create new horizontal and vertical guides" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp msgid "Edit IK Chain" msgstr "" @@ -3288,10 +3427,16 @@ msgid "Snap to other nodes" msgstr "" #: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Snap to guides" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Lock the selected object in place (can't be moved)." msgstr "" #: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Unlock the selected object (can be moved)." msgstr "" @@ -3342,6 +3487,10 @@ msgid "Show rulers" msgstr "" #: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Show guides" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp msgid "Center Selection" msgstr "" @@ -3530,6 +3679,10 @@ msgstr "" msgid "Hold Shift to edit tangents individually" msgstr "" +#: editor/plugins/gi_probe_editor_plugin.cpp +msgid "Bake GI Probe" +msgstr "" + #: editor/plugins/gradient_editor_plugin.cpp msgid "Add/Remove Color Ramp Point" msgstr "" @@ -3562,6 +3715,10 @@ msgid "Create Occluder Polygon" msgstr "" #: editor/plugins/light_occluder_2d_editor_plugin.cpp +msgid "Create a new polygon from scratch." +msgstr "" + +#: editor/plugins/light_occluder_2d_editor_plugin.cpp msgid "Edit existing polygon:" msgstr "" @@ -3577,58 +3734,6 @@ msgstr "" msgid "RMB: Erase Point." msgstr "" -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Remove Point from Line2D" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Add Point to Line2D" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Move Point in Line2D" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Select Points" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Shift+Drag: Select Control Points" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Click: Add Point" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Right Click: Delete Point" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Add Point (in empty space)" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Split Segment (in line)" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Delete Point" -msgstr "" - #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Mesh is empty!" msgstr "" @@ -4026,16 +4131,46 @@ msgid "Move Out-Control in Curve" msgstr "" #: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Select Points" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Shift+Drag: Select Control Points" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Click: Add Point" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Right Click: Delete Point" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp msgid "Select Control Points (Shift+Drag)" msgstr "" #: editor/plugins/path_2d_editor_plugin.cpp #: editor/plugins/path_editor_plugin.cpp +msgid "Add Point (in empty space)" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp msgid "Split Segment (in curve)" msgstr "" #: editor/plugins/path_2d_editor_plugin.cpp #: editor/plugins/path_editor_plugin.cpp +msgid "Delete Point" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp msgid "Close Curve" msgstr "" @@ -4176,7 +4311,6 @@ msgstr "" #: editor/plugins/resource_preloader_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp #: editor/plugins/sprite_frames_editor_plugin.cpp editor/property_editor.cpp #: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Paste" @@ -4221,6 +4355,20 @@ msgid " Class Reference" msgstr "" #: editor/plugins/script_editor_plugin.cpp +msgid "Sort" +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp +msgid "Move Up" +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp +msgid "Move Down" +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp msgid "Next script" msgstr "" @@ -4273,6 +4421,10 @@ msgstr "" msgid "Close All" msgstr "Fechar" +#: editor/plugins/script_editor_plugin.cpp +msgid "Close Other Tabs" +msgstr "" + #: editor/plugins/script_editor_plugin.cpp editor/project_manager.cpp msgid "Run" msgstr "" @@ -4283,13 +4435,11 @@ msgstr "" #: editor/plugins/script_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Find.." msgstr "" #: editor/plugins/script_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Find Next" msgstr "" @@ -4393,33 +4543,22 @@ msgstr "" msgid "Capitalize" msgstr "" -#: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp scene/gui/line_edit.cpp +#: editor/plugins/script_text_editor.cpp scene/gui/line_edit.cpp #: scene/gui/text_edit.cpp msgid "Cut" msgstr "" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp #: editor/plugins/sprite_frames_editor_plugin.cpp editor/property_editor.cpp #: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Copy" msgstr "" -#: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp scene/gui/line_edit.cpp +#: editor/plugins/script_text_editor.cpp scene/gui/line_edit.cpp #: scene/gui/text_edit.cpp msgid "Select All" msgstr "" -#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp -msgid "Move Up" -msgstr "" - -#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp -msgid "Move Down" -msgstr "" - #: editor/plugins/script_text_editor.cpp #, fuzzy msgid "Delete Line" @@ -4442,6 +4581,23 @@ msgid "Clone Down" msgstr "" #: editor/plugins/script_text_editor.cpp +#, fuzzy +msgid "Fold Line" +msgstr "Apagar Seleccionados" + +#: editor/plugins/script_text_editor.cpp +msgid "Unfold Line" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Fold All Lines" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Unfold All Lines" +msgstr "" + +#: editor/plugins/script_text_editor.cpp msgid "Complete Symbol" msgstr "" @@ -4487,12 +4643,10 @@ msgid "Convert To Lowercase" msgstr "" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Find Previous" msgstr "" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Replace.." msgstr "" @@ -4501,7 +4655,6 @@ msgid "Goto Function.." msgstr "" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Goto Line.." msgstr "" @@ -4666,6 +4819,15 @@ msgid "View Plane Transform." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "Scaling: " +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Translating: " +msgstr "Transições" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Rotating %s degrees." msgstr "" @@ -4747,6 +4909,10 @@ msgid "Vertices" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "FPS" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Align with view" msgstr "" @@ -4779,6 +4945,15 @@ msgid "View Information" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "View FPS" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Half Resolution" +msgstr "Escalar Selecção" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Audio Listener" msgstr "" @@ -4907,6 +5082,11 @@ msgid "Tool Scale" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Toggle Freelook" +msgstr "Accionar Breakpoint" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Transform" msgstr "" @@ -5183,6 +5363,10 @@ msgid "Create Empty Editor Template" msgstr "" #: editor/plugins/theme_editor_plugin.cpp +msgid "Create From Current Editor Theme" +msgstr "" + +#: editor/plugins/theme_editor_plugin.cpp msgid "CheckBox Radio1" msgstr "" @@ -5356,7 +5540,7 @@ msgid "Runnable" msgstr "" #: editor/project_export.cpp -msgid "Delete patch '" +msgid "Delete patch '%s' from list?" msgstr "" #: editor/project_export.cpp @@ -5651,10 +5835,6 @@ msgid "Add Input Action Event" msgstr "" #: editor/project_settings_editor.cpp editor/settings_config_dialog.cpp -msgid "Meta+" -msgstr "" - -#: editor/project_settings_editor.cpp editor/settings_config_dialog.cpp msgid "Shift+" msgstr "" @@ -5777,11 +5957,11 @@ msgid "Select a setting item first!" msgstr "" #: editor/project_settings_editor.cpp -msgid "No property '" +msgid "No property '%s' exists." msgstr "" #: editor/project_settings_editor.cpp -msgid "Setting '" +msgid "Setting '%s' is internal, and it can't be deleted." msgstr "" #: editor/project_settings_editor.cpp @@ -6251,6 +6431,15 @@ msgid "Clear a script for the selected node." msgstr "" #: editor/scene_tree_dock.cpp +#, fuzzy +msgid "Remote" +msgstr "Remover Sinal" + +#: editor/scene_tree_dock.cpp +msgid "Local" +msgstr "" + +#: editor/scene_tree_dock.cpp msgid "Clear Inheritance? (No Undo!)" msgstr "" @@ -6436,6 +6625,11 @@ msgid "Attach Node Script" msgstr "" #: editor/script_editor_debugger.cpp +#, fuzzy +msgid "Remote " +msgstr "Remover Sinal" + +#: editor/script_editor_debugger.cpp msgid "Bytes:" msgstr "" @@ -6492,18 +6686,6 @@ msgid "Stack Trace (if applicable):" msgstr "" #: editor/script_editor_debugger.cpp -msgid "Remote Inspector" -msgstr "" - -#: editor/script_editor_debugger.cpp -msgid "Live Scene Tree:" -msgstr "" - -#: editor/script_editor_debugger.cpp -msgid "Remote Object Properties: " -msgstr "" - -#: editor/script_editor_debugger.cpp msgid "Profiler" msgstr "" @@ -6635,52 +6817,52 @@ msgstr "" msgid "GDNative" msgstr "" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp #: modules/visual_script/visual_script_builtin_funcs.cpp msgid "Invalid type argument to convert(), use TYPE_* constants." msgstr "Tipo de argumento inválido para convert(), use constantes TYPE_*." -#: modules/gdscript/gd_functions.cpp modules/mono/glue/glue_header.h +#: modules/gdscript/gdscript_functions.cpp modules/mono/glue/glue_header.h #: modules/visual_script/visual_script_builtin_funcs.cpp msgid "Not enough bytes for decoding bytes, or invalid format." msgstr "" "Número de bytes insuficientes para descodificar, ou o formato é inválido." -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "step argument is zero!" msgstr "o argumento \"step\" é zero!" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Not a script with an instance" msgstr "Não é um script com uma instância" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Not based on a script" msgstr "Não é baseado num script" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Not based on a resource file" msgstr "Não é baseado num ficheiro de recurso" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary format (missing @path)" msgstr "Formato de dicionário de instância inválido (falta @path)" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary format (can't load script at @path)" msgstr "" "Formato de dicionário de instância inválido (não foi possÃvel carregar o " "script em @path)" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary format (invalid script at @path)" msgstr "Formato de dicionário de instância inválido (script inválido em @path)" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary (invalid subclasses)" msgstr "Dicionário de instância inválido (subclasses inválidas)" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Object can't provide a length." msgstr "" @@ -6694,15 +6876,23 @@ msgid "GridMap Duplicate Selection" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp +msgid "Floor:" +msgstr "" + +#: modules/gridmap/grid_map_editor_plugin.cpp +msgid "Grid Map" +msgstr "" + +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Snap View" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp -msgid "Prev Level (%sDown Wheel)" +msgid "Previous Floor" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp -msgid "Next Level (%sUp Wheel)" +msgid "Next Floor" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp @@ -6770,12 +6960,9 @@ msgid "Erase Area" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp -msgid "Selection -> Duplicate" -msgstr "" - -#: modules/gridmap/grid_map_editor_plugin.cpp -msgid "Selection -> Clear" -msgstr "" +#, fuzzy +msgid "Clear Selection" +msgstr "Escalar Selecção" #: modules/gridmap/grid_map_editor_plugin.cpp msgid "GridMap Settings" @@ -6906,7 +7093,7 @@ msgid "Duplicate VisualScript Nodes" msgstr "" #: modules/visual_script/visual_script_editor.cpp -msgid "Hold Meta to drop a Getter. Hold Shift to drop a generic signature." +msgid "Hold %s to drop a Getter. Hold Shift to drop a generic signature." msgstr "" #: modules/visual_script/visual_script_editor.cpp @@ -6914,7 +7101,7 @@ msgid "Hold Ctrl to drop a Getter. Hold Shift to drop a generic signature." msgstr "" #: modules/visual_script/visual_script_editor.cpp -msgid "Hold Meta to drop a simple reference to the node." +msgid "Hold %s to drop a simple reference to the node." msgstr "" #: modules/visual_script/visual_script_editor.cpp @@ -6922,7 +7109,7 @@ msgid "Hold Ctrl to drop a simple reference to the node." msgstr "" #: modules/visual_script/visual_script_editor.cpp -msgid "Hold Meta to drop a Variable Setter." +msgid "Hold %s to drop a Variable Setter." msgstr "" #: modules/visual_script/visual_script_editor.cpp @@ -7154,11 +7341,20 @@ msgid "Could not write file:\n" msgstr "" #: platform/javascript/export/export.cpp -msgid "Could not read file:\n" +msgid "Could not open template for export:\n" msgstr "" #: platform/javascript/export/export.cpp -msgid "Could not open template for export:\n" +#, fuzzy +msgid "Invalid export template:\n" +msgstr "Nome de Ãndice propriedade inválido." + +#: platform/javascript/export/export.cpp +msgid "Could not read custom HTML shell:\n" +msgstr "" + +#: platform/javascript/export/export.cpp +msgid "Could not read boot splash image file:\n" msgstr "" #: scene/2d/animated_sprite.cpp @@ -7250,18 +7446,6 @@ msgstr "" msgid "Path property must point to a valid Node2D node to work." msgstr "" -#: scene/2d/sprite.cpp -msgid "" -"Path property must point to a valid Viewport node to work. Such Viewport " -"must be set to 'render target' mode." -msgstr "" - -#: scene/2d/sprite.cpp -msgid "" -"The Viewport set in the path property must be set as 'render target' in " -"order for this sprite to work." -msgstr "" - #: scene/2d/visibility_notifier_2d.cpp msgid "" "VisibilityEnable2D works best when used with the edited scene root directly " @@ -7320,6 +7504,14 @@ msgid "" "shape resource for it!" msgstr "" +#: scene/3d/gi_probe.cpp +msgid "Plotting Meshes" +msgstr "" + +#: scene/3d/gi_probe.cpp +msgid "Finishing Plot" +msgstr "" + #: scene/3d/navigation_mesh.cpp msgid "A NavigationMesh resource must be set or created for this node to work." msgstr "" @@ -7397,6 +7589,10 @@ msgid "" "minimum size manually." msgstr "" +#: scene/gui/tree.cpp +msgid "(Other)" +msgstr "" + #: scene/main/scene_tree.cpp msgid "" "Default Environment as specified in Project Setings (Rendering -> Viewport -" diff --git a/editor/translations/ru.po b/editor/translations/ru.po index 05c164c3ee..d45f31ee8d 100644 --- a/editor/translations/ru.po +++ b/editor/translations/ru.po @@ -5,6 +5,7 @@ # # B10nicMachine <shumik1337@gmail.com>, 2017. # DimOkGamer <dimokgamer@gmail.com>, 2016-2017. +# Igor S <scorched@bk.ru>, 2017. # ijet <my-ijet@mail.ru>, 2017. # Maxim Kim <habamax@gmail.com>, 2016. # Maxim toby3d Lebedev <mail@toby3d.ru>, 2016. @@ -14,8 +15,8 @@ msgid "" msgstr "" "Project-Id-Version: Godot Engine editor\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2017-10-26 14:49+0000\n" -"Last-Translator: ijet <my-ijet@mail.ru>\n" +"PO-Revision-Date: 2017-11-19 21:48+0000\n" +"Last-Translator: anonymous <>\n" "Language-Team: Russian <https://hosted.weblate.org/projects/godot-engine/" "godot/ru/>\n" "Language: ru\n" @@ -24,7 +25,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Generator: Weblate 2.17\n" +"X-Generator: Weblate 2.18-dev\n" #: editor/animation_editor.cpp msgid "Disabled" @@ -84,7 +85,7 @@ msgstr "Переименовать дорожку" #: editor/animation_editor.cpp msgid "Anim Track Change Interpolation" -msgstr "Изменить интреполÑцию" +msgstr "Изменить интерполÑцию" #: editor/animation_editor.cpp msgid "Anim Track Change Value Mode" @@ -107,6 +108,7 @@ msgid "Anim Delete Keys" msgstr "Удалить ключи" #: editor/animation_editor.cpp editor/plugins/tile_map_editor_plugin.cpp +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Duplicate Selection" msgstr "Дублировать выделенное" @@ -250,11 +252,11 @@ msgstr "МаÑштаб анимации." #: editor/animation_editor.cpp msgid "Length (s):" -msgstr "Длинна (Ñек.):" +msgstr "Длина (Ñек.):" #: editor/animation_editor.cpp msgid "Animation length (in seconds)." -msgstr "Длинна анимации (в Ñекундах)." +msgstr "Длина анимации (в Ñекундах)." #: editor/animation_editor.cpp msgid "Step (s):" @@ -338,7 +340,7 @@ msgstr "Удалить недопуÑтимые ключи" #: editor/animation_editor.cpp msgid "Remove unresolved and empty tracks" -msgstr "Удалить не разрешенные и пуÑтые дорожки" +msgstr "Удалить неразрешённые и пуÑтые дорожки" #: editor/animation_editor.cpp msgid "Clean-up all animations" @@ -358,7 +360,7 @@ msgstr "Изменить размер МаÑÑива" #: editor/array_property_edit.cpp msgid "Change Array Value Type" -msgstr "Изменение типа Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ð¼Ð°ÑÑива" +msgstr "Изменить тип Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ð¼Ð°ÑÑива" #: editor/array_property_edit.cpp msgid "Change Array Value" @@ -642,6 +644,13 @@ msgstr "Редактор завиÑимоÑтей" msgid "Search Replacement Resource:" msgstr "Ðайти заменÑемый реÑурÑ:" +#: editor/dependency_editor.cpp editor/editor_file_dialog.cpp +#: editor/editor_help.cpp editor/editor_node.cpp editor/filesystem_dock.cpp +#: editor/plugins/script_editor_plugin.cpp editor/property_selector.cpp +#: editor/quick_open.cpp scene/gui/file_dialog.cpp +msgid "Open" +msgstr "Открыть" + #: editor/dependency_editor.cpp msgid "Owners Of:" msgstr "Владельцы:" @@ -661,7 +670,7 @@ msgstr "" #: editor/dependency_editor.cpp msgid "Cannot remove:\n" -msgstr "Ðе удаетÑÑ ÑƒÐ´Ð°Ð»Ð¸Ñ‚ÑŒ:\n" +msgstr "Ðе удаётÑÑ ÑƒÐ´Ð°Ð»Ð¸Ñ‚ÑŒ:\n" #: editor/dependency_editor.cpp msgid "Error loading:" @@ -714,6 +723,16 @@ msgstr "Удалить выбранные файлы?" msgid "Delete" msgstr "Удалить" +#: editor/dictionary_property_edit.cpp +#, fuzzy +msgid "Change Dictionary Key" +msgstr "Изменить Ð¸Ð¼Ñ Ð°Ð½Ð¸Ð¼Ð°Ñ†Ð¸Ð¸:" + +#: editor/dictionary_property_edit.cpp +#, fuzzy +msgid "Change Dictionary Value" +msgstr "Изменить значение маÑÑива" + #: editor/editor_about.cpp msgid "Thanks from the Godot community!" msgstr "СпаÑибо от ÑообщеÑтва Godot!" @@ -789,7 +808,7 @@ msgid "" "is an exhaustive list of all such thirdparty components with their " "respective copyright statements and license terms." msgstr "" -"Движок godot опираетÑÑ Ð½Ð° Ñ€Ñд Ñторонних беÑплатных и открытых библиотек, " +"Движок Godot опираетÑÑ Ð½Ð° Ñ€Ñд Ñторонних беÑплатных и открытых библиотек, " "ÑовмеÑтимых Ñ ÑƒÑловиÑми лицензии MIT. Ðиже приводитÑÑ Ð¸Ñчерпывающий ÑпиÑок " "вÑех Ñторонних компонентов вмеÑте Ñ Ð¸Ñ… авторÑкими правами и уÑловиÑми " "лицензионного ÑоглашениÑ." @@ -808,7 +827,7 @@ msgstr "Лицензии" #: editor/editor_asset_installer.cpp editor/project_manager.cpp msgid "Error opening package file, not in zip format." -msgstr "Ошибка при открытии файла, не в формате zip." +msgstr "Ошибка при открытии файла пакета, не в формате zip." #: editor/editor_asset_installer.cpp msgid "Uncompressing Assets" @@ -911,7 +930,7 @@ msgstr "Добавить аудио шину" #: editor/editor_audio_buses.cpp msgid "Master bus can't be deleted!" -msgstr "МаÑтер шина не может быть удалена!" +msgstr "Шина Master не может быть удалена!" #: editor/editor_audio_buses.cpp msgid "Delete Audio Bus" @@ -1139,12 +1158,6 @@ msgstr "Ð’Ñе разрешённые" msgid "All Files (*)" msgstr "Ð’Ñе файлы (*)" -#: editor/editor_file_dialog.cpp editor/editor_help.cpp editor/editor_node.cpp -#: editor/filesystem_dock.cpp editor/plugins/script_editor_plugin.cpp -#: editor/property_selector.cpp editor/quick_open.cpp scene/gui/file_dialog.cpp -msgid "Open" -msgstr "Открыть" - #: editor/editor_file_dialog.cpp scene/gui/file_dialog.cpp msgid "Open a File" msgstr "Открыть файл" @@ -1398,7 +1411,7 @@ msgstr "Ошибка при Ñохранении." #: editor/editor_node.cpp msgid "Can't open '%s'." -msgstr "Ðе удаетÑÑ Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚ÑŒ '%s'." +msgstr "Ðе удаётÑÑ Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚ÑŒ '%s'." #: editor/editor_node.cpp msgid "Error while parsing '%s'." @@ -1465,7 +1478,7 @@ msgstr "Ошибка при попытке Ñохранить макет!" #: editor/editor_node.cpp msgid "Default editor layout overridden." -msgstr "Переопределить макет по-умолчанию." +msgstr "Переопределить макет по умолчанию." #: editor/editor_node.cpp msgid "Layout name not found!" @@ -1473,7 +1486,7 @@ msgstr "Ðазвание макета не найдено!" #: editor/editor_node.cpp msgid "Restored default layout to base settings." -msgstr "Вернуть макет по-умолчанию к Ñтандартному." +msgstr "Вернуть макет по умолчанию к Ñтандартному." #: editor/editor_node.cpp msgid "" @@ -1487,7 +1500,6 @@ msgstr "" "чтобы лучше понÑÑ‚ÑŒ Ñтот процеÑÑ." #: editor/editor_node.cpp -#, fuzzy msgid "" "This resource belongs to a scene that was instanced or inherited.\n" "Changes to it will not be kept when saving the current scene." @@ -1496,16 +1508,14 @@ msgstr "" "Ð˜Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð½Ðµ будут Ñохранены при Ñохранении текущей Ñцены." #: editor/editor_node.cpp -#, fuzzy msgid "" "This resource was imported, so it's not editable. Change its settings in the " "import panel and then re-import." msgstr "" -"Ðтот реÑÑƒÑ€Ñ Ð±Ñ‹Ð» импортирован, поÑтому он не редактируетÑÑ. Измени наÑтройки " -"в панеле импорта, а затем повторно импортируйте." +"Ðтот реÑÑƒÑ€Ñ Ð±Ñ‹Ð» импортирован, поÑтому он не редактируетÑÑ. Измените " +"наÑтройки в панеле импорта, а затем повторно импортируйте." #: editor/editor_node.cpp -#, fuzzy msgid "" "This scene was imported, so changes to it will not be kept.\n" "Instancing it or inheriting will allow making changes to it.\n" @@ -1518,6 +1528,18 @@ msgstr "" "чтобы лучше понÑÑ‚ÑŒ Ñтот процеÑÑ." #: editor/editor_node.cpp +#, fuzzy +msgid "" +"This is a remote object so changes to it will not be kept.\n" +"Please read the documentation relevant to debugging to better understand " +"this workflow." +msgstr "" +"Ðтот реÑÑƒÑ€Ñ Ð¿Ñ€Ð¸Ð½Ð°Ð´Ð»ÐµÐ¶Ð¸Ñ‚ Ñцене, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ Ð±Ñ‹Ð»Ð° импортирована, поÑтому он не " +"редактируетÑÑ.\n" +"ПожалуйÑта, прочитайте документацию, имеющую отношение к импорту Ñцены, " +"чтобы лучше понÑÑ‚ÑŒ Ñтот процеÑÑ." + +#: editor/editor_node.cpp msgid "Copy Params" msgstr "Копировать параметры" @@ -1636,6 +1658,11 @@ msgid "Export Mesh Library" msgstr "ÐкÑпортировать библиотеку полиÑеток" #: editor/editor_node.cpp +#, fuzzy +msgid "This operation can't be done without a root node." +msgstr "Ðта Ð¾Ð¿ÐµÑ€Ð°Ñ†Ð¸Ñ Ð½Ðµ может быть выполнена без выбранного узла." + +#: editor/editor_node.cpp msgid "Export Tile Set" msgstr "ÐкÑпортировать набор тайлов" @@ -1653,7 +1680,7 @@ msgstr "Ðе возможно загрузить Ñцену, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ Ð½Ðµ #: editor/editor_node.cpp msgid "Revert" -msgstr "Откатить" +msgstr "ВоÑÑтановить" #: editor/editor_node.cpp msgid "This action cannot be undone. Revert anyway?" @@ -1701,30 +1728,28 @@ msgid "Pick a Main Scene" msgstr "Выберите главную Ñцену" #: editor/editor_node.cpp -#, fuzzy msgid "Unable to enable addon plugin at: '%s' parsing of config failed." -msgstr "Ðе удаетÑÑ Ð²ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ плагин: '" +msgstr "Ðе удаётÑÑ Ð²ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒ плагин: '%s' ошибка конфигурации." #: editor/editor_node.cpp -#, fuzzy msgid "Unable to find script field for addon plugin at: 'res://addons/%s'." -msgstr "Ðе удаетÑÑ Ð½Ð°Ð¹Ñ‚Ð¸ поле script Ð´Ð»Ñ Ð¿Ð»Ð°Ð³Ð¸Ð½Ð°: ' res://addons/" +msgstr "Ðе удаётÑÑ Ð½Ð°Ð¹Ñ‚Ð¸ поле script Ð´Ð»Ñ Ð¿Ð»Ð°Ð³Ð¸Ð½Ð°: ' res://addons/%s'." #: editor/editor_node.cpp -#, fuzzy msgid "Unable to load addon script from path: '%s'." -msgstr "Ðе удалоÑÑŒ загрузить Ñкрипт из иÑточника: '" +msgstr "Ðе удалоÑÑŒ загрузить Ñкрипт из иÑточника: '%s'." #: editor/editor_node.cpp -#, fuzzy msgid "" "Unable to load addon script from path: '%s' Base type is not EditorPlugin." -msgstr "Ðе удалоÑÑŒ загрузить Ñкрипт из иÑточника: '" +msgstr "" +"Ðе удалоÑÑŒ загрузить Ñкрипт из иÑточника: '%s' базовый тип не EditorPlugin." #: editor/editor_node.cpp -#, fuzzy msgid "Unable to load addon script from path: '%s' Script is not in tool mode." -msgstr "Ðе удалоÑÑŒ загрузить Ñкрипт из иÑточника: '" +msgstr "" +"Ðе удалоÑÑŒ загрузить Ñкрипт из иÑточника: '%s' Ñкрипт не в режиме " +"инÑтрумента." #: editor/editor_node.cpp msgid "" @@ -1768,29 +1793,45 @@ msgstr "Удалить макет" #: editor/editor_node.cpp editor/import_dock.cpp #: editor/script_create_dialog.cpp msgid "Default" -msgstr "По-умолчанию" +msgstr "По умолчанию" #: editor/editor_node.cpp msgid "Switch Scene Tab" msgstr "Переключить вкладку Ñцены" #: editor/editor_node.cpp -msgid "%d more file(s)" +#, fuzzy +msgid "%d more files or folders" +msgstr "Ещё %d файла(ов) или папка(ок)" + +#: editor/editor_node.cpp +#, fuzzy +msgid "%d more folders" msgstr "Ещё %d файла(ов)" #: editor/editor_node.cpp -msgid "%d more file(s) or folder(s)" -msgstr "Ещё %d файла(ов) или папка(ок)" +#, fuzzy +msgid "%d more files" +msgstr "Ещё %d файла(ов)" + +#: editor/editor_node.cpp +msgid "Dock Position" +msgstr "" #: editor/editor_node.cpp msgid "Distraction Free Mode" -msgstr "Свободный режим" +msgstr "Режим без отвлечениÑ" #: editor/editor_node.cpp msgid "Toggle distraction-free mode." msgstr "Переключить режим без отвлечениÑ." #: editor/editor_node.cpp +#, fuzzy +msgid "Add a new scene." +msgstr "Добавить новые дорожки." + +#: editor/editor_node.cpp msgid "Scene" msgstr "Сцена" @@ -1855,13 +1896,12 @@ msgid "TileSet.." msgstr "Ðабор тайлов.." #: editor/editor_node.cpp editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp scene/gui/line_edit.cpp -#: scene/gui/text_edit.cpp +#: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Undo" msgstr "Отменить" #: editor/editor_node.cpp editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp +#: scene/gui/line_edit.cpp msgid "Redo" msgstr "Повторить" @@ -2267,9 +2307,8 @@ msgid "Frame %" msgstr "Кадр %" #: editor/editor_profiler.cpp -#, fuzzy msgid "Physics Frame %" -msgstr "ФикÑированный кадр %" +msgstr "ФизичеÑкий шаг %" #: editor/editor_profiler.cpp editor/script_editor_debugger.cpp msgid "Time:" @@ -2325,7 +2364,7 @@ msgstr "Быть может вы забыли метод _run()?" #: editor/editor_settings.cpp msgid "Default (Same as Editor)" -msgstr "По-умолчанию (как редактор)" +msgstr "По умолчанию (как редактор)" #: editor/editor_sub_scene.cpp msgid "Select Node(s) to Import" @@ -2364,6 +2403,11 @@ msgid "(Current)" msgstr "(Текущий)" #: editor/export_template_manager.cpp +#, fuzzy +msgid "Retrieving mirrors, please wait.." +msgstr "Ошибка подключениÑ, попробуйте ещё раз." + +#: editor/export_template_manager.cpp msgid "Remove template version '%s'?" msgstr "Удалить верÑию шаблона '%s'?" @@ -2400,6 +2444,112 @@ msgid "Importing:" msgstr "ИмпортируетÑÑ:" #: editor/export_template_manager.cpp +msgid "" +"No download links found for this version. Direct download is only available " +"for official releases." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Can't resolve." +msgstr "Ðе удаётÑÑ Ñ€Ð°Ð·Ñ€ÐµÑˆÐ¸Ñ‚ÑŒ." + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Can't connect." +msgstr "Ðе удаётÑÑ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒÑÑ." + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "No response." +msgstr "Ðет ответа." + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Req. Failed." +msgstr "Ð—Ð°Ð¿Ñ€Ð¾Ñ Ð½Ðµ прошёл." + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Redirect Loop." +msgstr "ЦикличеÑкое перенаправление." + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Failed:" +msgstr "Ðе удалоÑÑŒ:" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Can't write file." +msgstr "Ðе удалоÑÑŒ запиÑать файл:\n" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Download Complete." +msgstr "Ошибка Загрузки" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Error requesting url: " +msgstr "Ошибка ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ð°Ñ‚Ð»Ð°Ñа:" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Connecting to Mirror.." +msgstr "Подключение.." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Disconnected" +msgstr "ОтÑоединить" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Resolving" +msgstr "ИнициализациÑ..." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Can't Resolve" +msgstr "Ðе удаётÑÑ Ñ€Ð°Ð·Ñ€ÐµÑˆÐ¸Ñ‚ÑŒ." + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Connecting.." +msgstr "Подключение.." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Can't Conect" +msgstr "Ðе удаётÑÑ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒÑÑ." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Connected" +msgstr "ПриÑоединить" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Requesting.." +msgstr "Запрашиваю.." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Downloading" +msgstr "Загрузка" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Connection Error" +msgstr "Подключение.." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "SSL Handshake Error" +msgstr "Ошибки загрузки" + +#: editor/export_template_manager.cpp msgid "Current Version:" msgstr "Ð¢ÐµÐºÑƒÑ‰Ð°Ñ Ð²ÐµÑ€ÑиÑ:" @@ -2423,6 +2573,16 @@ msgstr "Выбрать файл шаблона" msgid "Export Template Manager" msgstr "Менеджер шаблонов ÑкÑпорта" +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Download Templates" +msgstr "Шаблоны" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Select mirror from list: " +msgstr "Выберите уÑтройÑтво из ÑпиÑка" + #: editor/file_type_cache.cpp msgid "Can't open file_type_cache.cch for writing, not saving file type cache!" msgstr "" @@ -2430,8 +2590,8 @@ msgstr "" "типов файлов!" #: editor/filesystem_dock.cpp -msgid "Cannot navigate to '" -msgstr "Ðе удалоÑÑŒ перейти к '" +msgid "Cannot navigate to '%s' as it has not been found in the file system!" +msgstr "" #: editor/filesystem_dock.cpp msgid "View items as a grid of thumbnails" @@ -2451,14 +2611,6 @@ msgstr "" "переимпортируйте вручную." #: editor/filesystem_dock.cpp -msgid "" -"\n" -"Source: " -msgstr "" -"\n" -"ИÑточник: " - -#: editor/filesystem_dock.cpp msgid "Cannot move/rename resources root." msgstr "ÐÐµÐ»ÑŒÐ·Ñ Ð¿ÐµÑ€ÐµÐ¼ÐµÑтить/переименовать корень." @@ -2472,7 +2624,7 @@ msgstr "Ошибка перемещениÑ:\n" #: editor/filesystem_dock.cpp msgid "Unable to update dependencies:\n" -msgstr "Ðе удаетÑÑ Ð¾Ð±Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ завиÑимоÑти:\n" +msgstr "Ðе удаётÑÑ Ð¾Ð±Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ завиÑимоÑти:\n" #: editor/filesystem_dock.cpp msgid "No name provided" @@ -2593,31 +2745,31 @@ msgstr "Импорт в виде единой Ñцены" #: editor/import/resource_importer_scene.cpp msgid "Import with Separate Animations" -msgstr "Импортировать Ñ Ð¾Ñ‚Ð´ÐµÐ»ÐµÐ½Ð½Ñ‹Ð¼Ð¸ анимациÑми" +msgstr "Импортировать Ñ Ð¾Ñ‚Ð´ÐµÐ»Ñ‘Ð½Ð½Ñ‹Ð¼Ð¸ анимациÑми" #: editor/import/resource_importer_scene.cpp msgid "Import with Separate Materials" -msgstr "Импортировать Ñ Ð¾Ñ‚Ð´ÐµÐ»ÐµÐ½Ð½Ñ‹Ð¼Ð¸ материалами" +msgstr "Импортировать Ñ Ð¾Ñ‚Ð´ÐµÐ»Ñ‘Ð½Ð½Ñ‹Ð¼Ð¸ материалами" #: editor/import/resource_importer_scene.cpp msgid "Import with Separate Objects" -msgstr "Импортировать Ñ Ñ€Ð°Ð·Ð´ÐµÐ»ÐµÐ½Ð½Ñ‹Ð¼Ð¸ объектами" +msgstr "Импортировать Ñ Ð¾Ñ‚Ð´ÐµÐ»Ñ‘Ð½Ð½Ñ‹Ð¼Ð¸ объектами" #: editor/import/resource_importer_scene.cpp msgid "Import with Separate Objects+Materials" -msgstr "Импортировать Ñ Ñ€Ð°Ð·Ð´ÐµÐ»ÐµÐ½Ð½Ñ‹Ð¼Ð¸ объектами и материалами" +msgstr "Импортировать Ñ Ð¾Ñ‚Ð´ÐµÐ»Ñ‘Ð½Ð½Ñ‹Ð¼Ð¸ объектами и материалами" #: editor/import/resource_importer_scene.cpp msgid "Import with Separate Objects+Animations" -msgstr "Импортировать Ñ Ñ€Ð°Ð·Ð´ÐµÐ»ÐµÐ½Ð½Ñ‹Ð¼Ð¸ объектами и анимациÑми" +msgstr "Импортировать Ñ Ð¾Ñ‚Ð´ÐµÐ»Ñ‘Ð½Ð½Ñ‹Ð¼Ð¸ объектами и анимациÑми" #: editor/import/resource_importer_scene.cpp msgid "Import with Separate Materials+Animations" -msgstr "Импортировать Ñ Ð¾Ñ‚Ð´ÐµÐ»ÐµÐ½Ð½Ñ‹Ð¼Ð¸ материалами и анимациÑми" +msgstr "Импортировать Ñ Ð¾Ñ‚Ð´ÐµÐ»Ñ‘Ð½Ð½Ñ‹Ð¼Ð¸ материалами и анимациÑми" #: editor/import/resource_importer_scene.cpp msgid "Import with Separate Objects+Materials+Animations" -msgstr "Импортировать Ñ Ñ€Ð°Ð·Ð´ÐµÐ»ÐµÐ½Ð½Ñ‹Ð¼Ð¸ объектами, материалами и анимациÑми" +msgstr "Импортировать Ñ Ð¾Ñ‚Ð´ÐµÐ»Ñ‘Ð½Ð½Ñ‹Ð¼Ð¸ объектами, материалами и анимациÑми" #: editor/import/resource_importer_scene.cpp msgid "Import as Multiple Scenes" @@ -2701,7 +2853,7 @@ msgstr "Создан полигон" #: editor/plugins/collision_polygon_editor_plugin.cpp #: editor/plugins/light_occluder_2d_editor_plugin.cpp msgid "Edit Poly" -msgstr "Изменён полигон" +msgstr "Редактировать полигон" #: editor/plugins/abstract_polygon_2d_editor.cpp msgid "Insert Point" @@ -2711,15 +2863,15 @@ msgstr "Ð’Ñтавить точку" #: editor/plugins/collision_polygon_editor_plugin.cpp #: editor/plugins/light_occluder_2d_editor_plugin.cpp msgid "Edit Poly (Remove Point)" -msgstr "Удалена точка полигона" +msgstr "Редактировать полигон (удалить точку)" #: editor/plugins/abstract_polygon_2d_editor.cpp msgid "Remove Poly And Point" msgstr "Удалить полигон и точку" #: editor/plugins/abstract_polygon_2d_editor.cpp -#: editor/plugins/light_occluder_2d_editor_plugin.cpp -msgid "Create a new polygon from scratch." +#, fuzzy +msgid "Create a new polygon from scratch" msgstr "Создать новый полигон Ñ Ð½ÑƒÐ»Ñ." #: editor/plugins/abstract_polygon_2d_editor.cpp @@ -2734,9 +2886,14 @@ msgstr "" "Ctrl+ЛКМ: разделить Ñегмент.\n" "ПКМ: удалить точку." +#: editor/plugins/abstract_polygon_2d_editor.cpp +#, fuzzy +msgid "Delete points" +msgstr "Удалить точку" + #: editor/plugins/animation_player_editor_plugin.cpp msgid "Toggle Autoplay" -msgstr "Переключено автовоÑпроизведение" +msgstr "Переключить автовоÑпроизведение" #: editor/plugins/animation_player_editor_plugin.cpp msgid "New Animation Name:" @@ -2783,7 +2940,7 @@ msgstr "Изменена поÑÐ»ÐµÐ´ÑƒÑŽÑ‰Ð°Ñ Ð°Ð½Ð¸Ð¼Ð°Ñ†Ð¸Ñ" #: editor/plugins/animation_player_editor_plugin.cpp msgid "Change Blend Time" -msgstr "Изменено Ð²Ñ€ÐµÐ¼Ñ \"ÑмешиваниÑ\"" +msgstr "Изменить Ð²Ñ€ÐµÐ¼Ñ \"ÑмешиваниÑ\"" #: editor/plugins/animation_player_editor_plugin.cpp msgid "Load Animation" @@ -2943,7 +3100,7 @@ msgstr "Сочетание" #: editor/plugins/animation_tree_editor_plugin.cpp msgid "Auto Restart:" -msgstr "Ðвто перезапуÑк:" +msgstr "ÐвтоперезапуÑк:" #: editor/plugins/animation_tree_editor_plugin.cpp msgid "Restart (s):" @@ -3071,52 +3228,28 @@ msgid "Can't resolve hostname:" msgstr "Ðевозможно определить Ð¸Ð¼Ñ Ñ…Ð¾Ñта:" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Can't resolve." -msgstr "Ðе удаетÑÑ Ñ€Ð°Ð·Ñ€ÐµÑˆÐ¸Ñ‚ÑŒ." - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Connection error, please try again." -msgstr "Ошибка подключениÑ, попробуйте еще раз." - -#: editor/plugins/asset_library_editor_plugin.cpp -msgid "Can't connect." -msgstr "Ðе удаетÑÑ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒÑÑ." +msgstr "Ошибка подключениÑ, попробуйте ещё раз." #: editor/plugins/asset_library_editor_plugin.cpp msgid "Can't connect to host:" -msgstr "Ðе удаетÑÑ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒÑÑ Ðº хоÑту:" +msgstr "Ðе удаётÑÑ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒÑÑ Ðº хоÑту:" #: editor/plugins/asset_library_editor_plugin.cpp msgid "No response from host:" msgstr "Ðет ответа от хоÑта:" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "No response." -msgstr "Ðет ответа." - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Request failed, return code:" msgstr "Ð—Ð°Ð¿Ñ€Ð¾Ñ Ð½Ðµ удалÑÑ, код:" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Req. Failed." -msgstr "Ð—Ð°Ð¿Ñ€Ð¾Ñ Ð½Ðµ прошел." - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Request failed, too many redirects" -msgstr "Ð—Ð°Ð¿Ñ€Ð¾Ñ Ð½Ðµ прошел, Ñлишком много перенаправлений" - -#: editor/plugins/asset_library_editor_plugin.cpp -msgid "Redirect Loop." -msgstr "ЦикличеÑкое перенаправление." - -#: editor/plugins/asset_library_editor_plugin.cpp -msgid "Failed:" -msgstr "Ðе удалоÑÑŒ:" +msgstr "Ð—Ð°Ð¿Ñ€Ð¾Ñ Ð½Ðµ прошёл, Ñлишком много перенаправлений" #: editor/plugins/asset_library_editor_plugin.cpp msgid "Bad download hash, assuming file has been tampered with." -msgstr "ÐеÑовпадение Ñ…Ñша загрузки, возможно файл был изменен." +msgstr "ÐеÑовпадение Ñ…Ñша загрузки, возможно файл был изменён." #: editor/plugins/asset_library_editor_plugin.cpp msgid "Expected:" @@ -3143,14 +3276,6 @@ msgid "Resolving.." msgstr "ИнициализациÑ..." #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Connecting.." -msgstr "Подключение.." - -#: editor/plugins/asset_library_editor_plugin.cpp -msgid "Requesting.." -msgstr "Запрашиваю.." - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Error making request" msgstr "Ошибка во Ð²Ñ€ÐµÐ¼Ñ Ð·Ð°Ð¿Ñ€Ð¾Ñа" @@ -3168,7 +3293,7 @@ msgstr "Ошибка Загрузки" #: editor/plugins/asset_library_editor_plugin.cpp msgid "Download for this asset is already in progress!" -msgstr "Загрузка Ñтого шаблона уже идет!" +msgstr "Загрузка Ñтого шаблона уже идёт!" #: editor/plugins/asset_library_editor_plugin.cpp msgid "first" @@ -3239,7 +3364,7 @@ msgstr "ÐаÑтроить привÑзку" #: editor/plugins/canvas_item_editor_plugin.cpp #: editor/plugins/polygon_2d_editor_plugin.cpp msgid "Grid Offset:" -msgstr "ОтÑтуп Ñетку:" +msgstr "ОтÑтуп Ñетки:" #: editor/plugins/canvas_item_editor_plugin.cpp #: editor/plugins/polygon_2d_editor_plugin.cpp @@ -3263,6 +3388,39 @@ msgid "Move Action" msgstr "ПеремеÑтить дейÑтвие" #: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Move vertical guide" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Create new vertical guide" +msgstr "Создать новый Ñкрипт" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Remove vertical guide" +msgstr "Удалить переменную" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Move horizontal guide" +msgstr "Точка кривой передвинута" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Create new horizontal guide" +msgstr "Создать новый Ñкрипт" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Remove horizontal guide" +msgstr "Удалить недопуÑтимые ключи" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Create new horizontal and vertical guides" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp msgid "Edit IK Chain" msgstr "Редактировать цепь ИК" @@ -3387,10 +3545,17 @@ msgid "Snap to other nodes" msgstr "ПривÑзка к другим узлам" #: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Snap to guides" +msgstr "Прилипание к Ñетке" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Lock the selected object in place (can't be moved)." msgstr "ЗафикÑировать выбранный объект." #: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Unlock the selected object (can be moved)." msgstr "Разблокировать выбранный объект." @@ -3441,6 +3606,11 @@ msgid "Show rulers" msgstr "Показывать линейки" #: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Show guides" +msgstr "Показывать линейки" + +#: editor/plugins/canvas_item_editor_plugin.cpp msgid "Center Selection" msgstr "Центрировать на выбранном" @@ -3530,7 +3700,7 @@ msgid "" "Drag & drop + Shift : Add node as sibling\n" "Drag & drop + Alt : Change node type" msgstr "" -"Drag & drop + Shift : Добавить узел к выделению\n" +"Drag & drop + Shift : Добавить узел того же уровнÑ\n" "Drag & drop + Alt : Изменить тип узла" #: editor/plugins/collision_polygon_editor_plugin.cpp @@ -3572,12 +3742,10 @@ msgid "Flat1" msgstr "ПлоÑкий1" #: editor/plugins/curve_editor_plugin.cpp -#, fuzzy msgid "Ease in" msgstr "Переход Ð’" #: editor/plugins/curve_editor_plugin.cpp -#, fuzzy msgid "Ease out" msgstr "Переход ИЗ" @@ -3629,6 +3797,10 @@ msgstr "Переключить кривую линейный тангенÑ" msgid "Hold Shift to edit tangents individually" msgstr "Удерживайте Shift, чтобы изменить каÑательные индивидуально" +#: editor/plugins/gi_probe_editor_plugin.cpp +msgid "Bake GI Probe" +msgstr "" + #: editor/plugins/gradient_editor_plugin.cpp msgid "Add/Remove Color Ramp Point" msgstr "Добавить/Удалить точку Color Ramp" @@ -3636,7 +3808,7 @@ msgstr "Добавить/Удалить точку Color Ramp" #: editor/plugins/gradient_editor_plugin.cpp #: editor/plugins/shader_graph_editor_plugin.cpp msgid "Modify Color Ramp" -msgstr "Изменена Color Ramp" +msgstr "Редактировать Color Ramp" #: editor/plugins/item_list_editor_plugin.cpp msgid "Item %d" @@ -3663,6 +3835,10 @@ msgid "Create Occluder Polygon" msgstr "Создан затенÑющий полигон" #: editor/plugins/light_occluder_2d_editor_plugin.cpp +msgid "Create a new polygon from scratch." +msgstr "Создать новый полигон Ñ Ð½ÑƒÐ»Ñ." + +#: editor/plugins/light_occluder_2d_editor_plugin.cpp msgid "Edit existing polygon:" msgstr "Редактировать ÑущеÑтвующий полигон:" @@ -3678,69 +3854,17 @@ msgstr "Ctrl+ЛКМ: Разделить Ñегмент." msgid "RMB: Erase Point." msgstr "ПКМ: Удалить точку." -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Remove Point from Line2D" -msgstr "Удалить точку Ñ ÐºÑ€Ð¸Ð²Ð¾Ð¹" - -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Add Point to Line2D" -msgstr "Добавить точку к кривой" - -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Move Point in Line2D" -msgstr "Двигать точку в кривой" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Select Points" -msgstr "Выбрать точки" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Shift+Drag: Select Control Points" -msgstr "Shift+Drag: Выбрать точки управлениÑ" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Click: Add Point" -msgstr "ЛКМ: Добавить точку" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Right Click: Delete Point" -msgstr "ПКМ: Удалить точку" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Add Point (in empty space)" -msgstr "Добавить точку (в пуÑтом проÑтранÑтрве)" - -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Split Segment (in line)" -msgstr "Разделить Ñегмент (в кривой)" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Delete Point" -msgstr "Удалить точку" - #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Mesh is empty!" msgstr "ПолиÑетка пуÑта!" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Create Static Trimesh Body" -msgstr "Создано вогнутое Ñтатичное тело" +msgstr "Создать вогнутое Ñтатичное тело" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Create Static Convex Body" -msgstr "Создано выпуклое Ñтатичное тело" +msgstr "Создать выпуклое Ñтатичное тело" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "This doesn't work on scene root!" @@ -3748,11 +3872,11 @@ msgstr "Ðто не работает на корне Ñцены!" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Create Trimesh Shape" -msgstr "Создана Ð²Ð¾Ð³Ð½ÑƒÑ‚Ð°Ñ Ñ„Ð¾Ñ€Ð¼Ð°" +msgstr "Создать вогнутую форму" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Create Convex Shape" -msgstr "Создана Ð²Ñ‹Ð³Ð½ÑƒÑ‚Ð°Ñ Ñ„Ð¾Ñ€Ð¼Ð°" +msgstr "Создать выгнутую форму" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Create Navigation Mesh" @@ -3924,7 +4048,7 @@ msgstr "ÐаÑтройка конфигурации..." #: editor/plugins/navigation_mesh_generator.cpp msgid "Calculating grid size..." -msgstr "РаÑчет размера Ñетки..." +msgstr "РаÑчёт размера Ñетки..." #: editor/plugins/navigation_mesh_generator.cpp msgid "Creating heightfield..." @@ -3939,14 +4063,12 @@ msgid "Constructing compact heightfield..." msgstr "ПоÑтроение компактной карты выÑот..." #: editor/plugins/navigation_mesh_generator.cpp -#, fuzzy msgid "Eroding walkable area..." msgstr "Размытие проходимого района..." #: editor/plugins/navigation_mesh_generator.cpp -#, fuzzy msgid "Partitioning..." -msgstr "Разметка..." +msgstr "Разбиение..." #: editor/plugins/navigation_mesh_generator.cpp msgid "Creating contours..." @@ -4101,7 +4223,7 @@ msgstr "Генерировать AABB" #: editor/plugins/path_2d_editor_plugin.cpp msgid "Remove Point from Curve" -msgstr "Удалена точка Ñ ÐºÑ€Ð¸Ð²Ð¾Ð¹" +msgstr "Удалить точку Ñ ÐºÑ€Ð¸Ð²Ð¾Ð¹" #: editor/plugins/path_2d_editor_plugin.cpp msgid "Remove Out-Control from Curve" @@ -4129,16 +4251,46 @@ msgid "Move Out-Control in Curve" msgstr "Передвинут выходной луч у кривой" #: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Select Points" +msgstr "Выбрать точки" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Shift+Drag: Select Control Points" +msgstr "Shift+Drag: Выбрать точки управлениÑ" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Click: Add Point" +msgstr "ЛКМ: Добавить точку" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Right Click: Delete Point" +msgstr "ПКМ: Удалить точку" + +#: editor/plugins/path_2d_editor_plugin.cpp msgid "Select Control Points (Shift+Drag)" msgstr "Выбор точек ÑƒÐ¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ (Shift+Тащить)" #: editor/plugins/path_2d_editor_plugin.cpp #: editor/plugins/path_editor_plugin.cpp +msgid "Add Point (in empty space)" +msgstr "Добавить точку (в пуÑтом проÑтранÑтрве)" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp msgid "Split Segment (in curve)" msgstr "Разделить Ñегмент (в кривой)" #: editor/plugins/path_2d_editor_plugin.cpp #: editor/plugins/path_editor_plugin.cpp +msgid "Delete Point" +msgstr "Удалить точку" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp msgid "Close Curve" msgstr "Сомкнуть кривую" @@ -4151,12 +4303,10 @@ msgid "Set Curve Point Position" msgstr "УÑтановить положение точки кривой" #: editor/plugins/path_editor_plugin.cpp -#, fuzzy msgid "Set Curve In Position" msgstr "УÑтановить позицию входа кривой" #: editor/plugins/path_editor_plugin.cpp -#, fuzzy msgid "Set Curve Out Position" msgstr "УÑтановить позицию выхода кривой" @@ -4277,7 +4427,6 @@ msgstr "Загрузить реÑурÑ" #: editor/plugins/resource_preloader_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp #: editor/plugins/sprite_frames_editor_plugin.cpp editor/property_editor.cpp #: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Paste" @@ -4324,12 +4473,27 @@ msgid " Class Reference" msgstr " СÑылка на КлаÑÑ" #: editor/plugins/script_editor_plugin.cpp +#, fuzzy +msgid "Sort" +msgstr "Сортировать:" + +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp +msgid "Move Up" +msgstr "ПеремеÑтить вверх" + +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp +msgid "Move Down" +msgstr "ПеремеÑтить вниз" + +#: editor/plugins/script_editor_plugin.cpp msgid "Next script" msgstr "Следующий Ñкрипт" #: editor/plugins/script_editor_plugin.cpp msgid "Previous script" -msgstr "Предыдущий Ñценарий" +msgstr "Предыдущий Ñкрипт" #: editor/plugins/script_editor_plugin.cpp msgid "File" @@ -4375,6 +4539,10 @@ msgstr "Закрыть документацию" msgid "Close All" msgstr "Закрыть вÑÑ‘" +#: editor/plugins/script_editor_plugin.cpp +msgid "Close Other Tabs" +msgstr "" + #: editor/plugins/script_editor_plugin.cpp editor/project_manager.cpp msgid "Run" msgstr "ЗапуÑтить" @@ -4385,13 +4553,11 @@ msgstr "Переключить панель Ñкриптов" #: editor/plugins/script_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Find.." msgstr "Ðайти.." #: editor/plugins/script_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Find Next" msgstr "Ðайти Ñледующее" @@ -4499,33 +4665,22 @@ msgstr "нижний региÑÑ‚Ñ€" msgid "Capitalize" msgstr "С ПропиÑной" -#: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp scene/gui/line_edit.cpp +#: editor/plugins/script_text_editor.cpp scene/gui/line_edit.cpp #: scene/gui/text_edit.cpp msgid "Cut" msgstr "Вырезать" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp #: editor/plugins/sprite_frames_editor_plugin.cpp editor/property_editor.cpp #: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Copy" msgstr "Копировать" -#: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp scene/gui/line_edit.cpp +#: editor/plugins/script_text_editor.cpp scene/gui/line_edit.cpp #: scene/gui/text_edit.cpp msgid "Select All" msgstr "Выбрать вÑе" -#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp -msgid "Move Up" -msgstr "ПеремеÑтить вверх" - -#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp -msgid "Move Down" -msgstr "ПеремеÑтить вниз" - #: editor/plugins/script_text_editor.cpp msgid "Delete Line" msgstr "Удалить Ñтроку" @@ -4547,6 +4702,23 @@ msgid "Clone Down" msgstr "Копировать вниз" #: editor/plugins/script_text_editor.cpp +#, fuzzy +msgid "Fold Line" +msgstr "Перейти к Ñтроке" + +#: editor/plugins/script_text_editor.cpp +msgid "Unfold Line" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Fold All Lines" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Unfold All Lines" +msgstr "" + +#: editor/plugins/script_text_editor.cpp msgid "Complete Symbol" msgstr "СпиÑок автозавершениÑ" @@ -4564,7 +4736,7 @@ msgstr "Преобразовать отÑтуп в табулÑцию" #: editor/plugins/script_text_editor.cpp msgid "Auto Indent" -msgstr "Ðвто отÑтуп" +msgstr "ÐвтоотÑтуп" #: editor/plugins/script_text_editor.cpp #: modules/visual_script/visual_script_editor.cpp @@ -4592,12 +4764,10 @@ msgid "Convert To Lowercase" msgstr "Конвертировать в нижний региÑÑ‚Ñ€" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Find Previous" msgstr "Ðайти предыдущее" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Replace.." msgstr "Заменить.." @@ -4606,7 +4776,6 @@ msgid "Goto Function.." msgstr "Перейти к функции.." #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Goto Line.." msgstr "Перейти к Ñтроке.." @@ -4620,119 +4789,119 @@ msgstr "Шейдер" #: editor/plugins/shader_graph_editor_plugin.cpp msgid "Change Scalar Constant" -msgstr "Изменена чиÑÐ»Ð¾Ð²Ð°Ñ ÐºÐ¾Ð½Ñтанта" +msgstr "Изменить чиÑловую конÑтанту" #: editor/plugins/shader_graph_editor_plugin.cpp msgid "Change Vec Constant" -msgstr "Изменена Ð²ÐµÐºÑ‚Ð¾Ñ€Ð½Ð°Ñ ÐºÐ¾Ð½Ñтанта" +msgstr "Изменить векторную конÑтанту" #: editor/plugins/shader_graph_editor_plugin.cpp msgid "Change RGB Constant" -msgstr "Изменён RGB" +msgstr "Изменить RGB конÑтанту" #: editor/plugins/shader_graph_editor_plugin.cpp msgid "Change Scalar Operator" -msgstr "Изменён чиÑловой оператор" +msgstr "Изменить чиÑловой оператор" #: editor/plugins/shader_graph_editor_plugin.cpp msgid "Change Vec Operator" -msgstr "Изменён векторный оператор" +msgstr "Изменить векторный оператор" #: editor/plugins/shader_graph_editor_plugin.cpp msgid "Change Vec Scalar Operator" -msgstr "Изменён векторно чиÑловой оператор" +msgstr "Изменить векторно-чиÑловой оператор" #: editor/plugins/shader_graph_editor_plugin.cpp msgid "Change RGB Operator" -msgstr "Изменён RGB оператор" +msgstr "Изменить RGB оператор" #: editor/plugins/shader_graph_editor_plugin.cpp msgid "Toggle Rot Only" -msgstr "Переключён - только поворот" +msgstr "Переключить - только поворот" #: editor/plugins/shader_graph_editor_plugin.cpp msgid "Change Scalar Function" -msgstr "Изменена чиÑÐ»Ð¾Ð²Ð°Ñ Ñ„ÑƒÐ½ÐºÑ†Ð¸Ñ" +msgstr "Изменить чиÑловую функцию" #: editor/plugins/shader_graph_editor_plugin.cpp msgid "Change Vec Function" -msgstr "Изменена Ð²ÐµÐºÑ‚Ð¾Ñ€Ð½Ð°Ñ Ñ„ÑƒÐ½ÐºÑ†Ð¸Ñ" +msgstr "Изменить векторную функцию" #: editor/plugins/shader_graph_editor_plugin.cpp msgid "Change Scalar Uniform" -msgstr "Изменена чиÑÐ»Ð¾Ð²Ð°Ñ ÐµÐ´Ð¸Ð½Ð¸Ñ†Ð°" +msgstr "Изменить чиÑловую единицу" #: editor/plugins/shader_graph_editor_plugin.cpp msgid "Change Vec Uniform" -msgstr "Изменена Ð²ÐµÐºÑ‚Ð¾Ñ€Ð½Ð°Ñ ÐµÐ´Ð¸Ð½Ð¸Ñ†Ð°" +msgstr "Изменить векторную единицу" #: editor/plugins/shader_graph_editor_plugin.cpp msgid "Change RGB Uniform" -msgstr "Изменена RGB единица" +msgstr "Изменить RGB единицу" #: editor/plugins/shader_graph_editor_plugin.cpp msgid "Change Default Value" -msgstr "Изменено Ñтандартное значение" +msgstr "Изменить значение по умолчанию" #: editor/plugins/shader_graph_editor_plugin.cpp msgid "Change XForm Uniform" -msgstr "Изменена XForm единица" +msgstr "Изменить XForm единицу" #: editor/plugins/shader_graph_editor_plugin.cpp msgid "Change Texture Uniform" -msgstr "Изменена Ñ‚ÐµÐºÑ‚ÑƒÑ€Ð½Ð°Ñ ÐµÐ´Ð¸Ð½Ð¸Ñ†Ð°" +msgstr "Изменить текÑтурную единицу" #: editor/plugins/shader_graph_editor_plugin.cpp msgid "Change Cubemap Uniform" -msgstr "Изменена единица кубичеÑкой карты" +msgstr "Изменить единицу кубичеÑкой карты" #: editor/plugins/shader_graph_editor_plugin.cpp msgid "Change Comment" -msgstr "Изменён комментарий" +msgstr "Изменить комментарий" #: editor/plugins/shader_graph_editor_plugin.cpp msgid "Add/Remove to Color Ramp" -msgstr "Добавлено/удалено Ñ Color Ramp" +msgstr "Добавить/Удалить в Color Ramp" #: editor/plugins/shader_graph_editor_plugin.cpp msgid "Add/Remove to Curve Map" -msgstr "Добавлено/удалено Ñ Curve Map" +msgstr "Добавить/Удалить в Curve Map" #: editor/plugins/shader_graph_editor_plugin.cpp msgid "Modify Curve Map" -msgstr "Изменена карта кривой" +msgstr "Редактировать карту кривой" #: editor/plugins/shader_graph_editor_plugin.cpp msgid "Change Input Name" -msgstr "Изменено входное имÑ" +msgstr "Изменить Ð¸Ð¼Ñ Ð²Ñ…Ð¾Ð´Ð°" #: editor/plugins/shader_graph_editor_plugin.cpp msgid "Connect Graph Nodes" -msgstr "Изменено Ð¸Ð¼Ñ Ð³Ñ€Ð°Ñ„Ð°" +msgstr "Соединить узлы графа" #: editor/plugins/shader_graph_editor_plugin.cpp msgid "Disconnect Graph Nodes" -msgstr "Графы разъединены" +msgstr "Разъединить узлы графа" #: editor/plugins/shader_graph_editor_plugin.cpp msgid "Remove Shader Graph Node" -msgstr "Удалён граф шейдера" +msgstr "Удалить узел графа шейдера" #: editor/plugins/shader_graph_editor_plugin.cpp msgid "Move Shader Graph Node" -msgstr "Передвинут граф шейдера" +msgstr "Передвинуть узел графа шейдера" #: editor/plugins/shader_graph_editor_plugin.cpp msgid "Duplicate Graph Node(s)" -msgstr "Граф(Ñ‹) дублированы" +msgstr "Дублировать узел(Ñ‹) графа" #: editor/plugins/shader_graph_editor_plugin.cpp msgid "Delete Shader Graph Node(s)" -msgstr "Удалён(Ñ‹) графы шейдера" +msgstr "Удалить узел(Ñ‹) графа шейдера" #: editor/plugins/shader_graph_editor_plugin.cpp msgid "Error: Cyclic Connection Link" -msgstr "Ошибка: ЦикличеÑÐºÐ°Ñ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ðµ" +msgstr "Ошибка: ЦикличеÑкое подключение" #: editor/plugins/shader_graph_editor_plugin.cpp msgid "Error: Missing Input Connections" @@ -4740,19 +4909,19 @@ msgstr "Ошибка: ОтÑутÑтвует входное подключени #: editor/plugins/shader_graph_editor_plugin.cpp msgid "Add Shader Graph Node" -msgstr "Добавлен граф шейдера" +msgstr "Добавить узел графа шейдера" #: editor/plugins/spatial_editor_plugin.cpp msgid "Orthogonal" -msgstr "ОртогональноÑÑ‚ÑŒ" +msgstr "Ортогональный" #: editor/plugins/spatial_editor_plugin.cpp msgid "Perspective" -msgstr "ПерÑпектива" +msgstr "ПерÑпективный" #: editor/plugins/spatial_editor_plugin.cpp msgid "Transform Aborted." -msgstr "ÐŸÑ€ÐµÐ¾Ð±Ñ€Ð°Ð·Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¿Ñ€ÐµÑ€Ñ‹Ð²Ð°ÐµÑ‚ÑÑ." +msgstr "Преобразование прервано." #: editor/plugins/spatial_editor_plugin.cpp msgid "X-Axis Transform." @@ -4771,6 +4940,16 @@ msgid "View Plane Transform." msgstr "Вид Ð¿Ñ€ÐµÐ¾Ð±Ñ€Ð°Ð·Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¿Ð»Ð¾ÑкоÑти." #: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Scaling: " +msgstr "МаÑштаб:" + +#: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Translating: " +msgstr "Переводы:" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Rotating %s degrees." msgstr "Поворот на %s градуÑов." @@ -4836,7 +5015,7 @@ msgstr "Ð˜Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¼Ð°Ñ‚ÐµÑ€Ð¸Ð°Ð»Ð°" #: editor/plugins/spatial_editor_plugin.cpp msgid "Shader Changes" -msgstr "Ð˜Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ ÑˆÑйдеров" +msgstr "Ð˜Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ ÑˆÐµÐ¹Ð´ÐµÑ€Ð¾Ð²" #: editor/plugins/spatial_editor_plugin.cpp msgid "Surface Changes" @@ -4851,6 +5030,10 @@ msgid "Vertices" msgstr "Вершины" #: editor/plugins/spatial_editor_plugin.cpp +msgid "FPS" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Align with view" msgstr "СовмеÑтить Ñ Ð²Ð¸Ð´Ð¾Ð¼" @@ -4883,6 +5066,16 @@ msgid "View Information" msgstr "ИнформациÑ" #: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "View FPS" +msgstr "ПроÑмотр Файлов" + +#: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Half Resolution" +msgstr "МаÑштабировать выбранное" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Audio Listener" msgstr "ПроÑлушиватель звука" @@ -4938,7 +5131,7 @@ msgid "" msgstr "" "ТÑнуть: Вращение\n" "Alt+ТÑнуть: Перемещение\n" -"Ðльт+ПКМ: Выбор по ÑпиÑку" +"Alt+ПКМ: Выбор по ÑпиÑку" #: editor/plugins/spatial_editor_plugin.cpp msgid "Move Mode (W)" @@ -5013,6 +5206,11 @@ msgid "Tool Scale" msgstr "ИнÑтрумент маÑштаб" #: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Toggle Freelook" +msgstr "Переключить полноÑкранный режим" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Transform" msgstr "Преобразование" @@ -5103,7 +5301,7 @@ msgstr "Изменение преобразованиÑ" #: editor/plugins/spatial_editor_plugin.cpp msgid "Translate:" -msgstr "ПреобразованиÑ:" +msgstr "Смещение:" #: editor/plugins/spatial_editor_plugin.cpp msgid "Rotate (deg.):" @@ -5264,11 +5462,11 @@ msgstr "Удалить вÑе" #: editor/plugins/theme_editor_plugin.cpp msgid "Edit theme.." -msgstr "" +msgstr "Редактировать тему.." #: editor/plugins/theme_editor_plugin.cpp msgid "Theme editing menu." -msgstr "" +msgstr "Меню Ñ€ÐµÐ´Ð°ÐºÑ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ñ‚ÐµÐ¼." #: editor/plugins/theme_editor_plugin.cpp msgid "Add Class Items" @@ -5284,7 +5482,12 @@ msgstr "Создать пуÑтой шаблон" #: editor/plugins/theme_editor_plugin.cpp msgid "Create Empty Editor Template" -msgstr "Создать пуÑтой образец редактора" +msgstr "Создать пуÑтой шаблон редактора" + +#: editor/plugins/theme_editor_plugin.cpp +#, fuzzy +msgid "Create From Current Editor Theme" +msgstr "Создать пуÑтой шаблон редактора" #: editor/plugins/theme_editor_plugin.cpp msgid "CheckBox Radio1" @@ -5300,11 +5503,11 @@ msgstr "Ðлемент" #: editor/plugins/theme_editor_plugin.cpp msgid "Check Item" -msgstr "Проверить пункт" +msgstr "Отметить Ñлемент" #: editor/plugins/theme_editor_plugin.cpp msgid "Checked Item" -msgstr "Проверенный пункт" +msgstr "Отмеченный Ñлемент" #: editor/plugins/theme_editor_plugin.cpp msgid "Has" @@ -5381,7 +5584,7 @@ msgstr "Заливка" #: editor/plugins/tile_map_editor_plugin.cpp msgid "Erase TileMap" -msgstr "Стирать карту тайлов" +msgstr "ОчиÑтить карту тайлов" #: editor/plugins/tile_map_editor_plugin.cpp msgid "Erase selection" @@ -5460,7 +5663,8 @@ msgid "Runnable" msgstr "Ðктивный" #: editor/project_export.cpp -msgid "Delete patch '" +#, fuzzy +msgid "Delete patch '%s' from list?" msgstr "Удалить заплатку '" #: editor/project_export.cpp @@ -5552,6 +5756,7 @@ msgid "Export With Debug" msgstr "ÐкÑпорт в режиме отладки" #: editor/project_manager.cpp +#, fuzzy msgid "The path does not exist." msgstr "Путь не ÑущеÑтвует." @@ -5599,7 +5804,7 @@ msgstr "Ðе удалоÑÑŒ Ñоздать project.godot в папке проеР#: editor/project_manager.cpp msgid "The following files failed extraction from package:" -msgstr "Следующие файлы не удалоÑÑŒ Ð¸Ð·Ð²Ð»ÐµÑ‡ÐµÐ½Ð¸Ñ Ð¸Ð· пакета:" +msgstr "Следующие файлы не удалоÑÑŒ извлечь из пакета:" #: editor/project_manager.cpp msgid "Rename Project" @@ -5651,7 +5856,7 @@ msgstr "БезымÑнный проект" #: editor/project_manager.cpp msgid "Can't open project" -msgstr "Ðе удаетÑÑ Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚ÑŒ проект" +msgstr "Ðе удаётÑÑ Ð¾Ñ‚ÐºÑ€Ñ‹Ñ‚ÑŒ проект" #: editor/project_manager.cpp msgid "Are you sure to open more than one project?" @@ -5688,6 +5893,8 @@ msgid "" "Language changed.\n" "The UI will update next time the editor or project manager starts." msgstr "" +"Язык изменилÑÑ.\n" +"ПользовательÑкий Ð¸Ð½Ñ‚ÐµÑ€Ñ„ÐµÐ¹Ñ Ð±ÑƒÐ´ÐµÑ‚ обновлен при Ñледующем запуÑке редактора." #: editor/project_manager.cpp msgid "" @@ -5722,13 +5929,12 @@ msgid "Exit" msgstr "Выход" #: editor/project_manager.cpp -#, fuzzy msgid "Restart Now" -msgstr "ПерезапуÑк (Ñек.):" +msgstr "ПерезапуÑтить ÑейчаÑ" #: editor/project_manager.cpp msgid "Can't run project" -msgstr "Ðе удаетÑÑ Ð·Ð°Ð¿ÑƒÑтить проект" +msgstr "Ðе удаётÑÑ Ð·Ð°Ð¿ÑƒÑтить проект" #: editor/project_settings_editor.cpp msgid "Key " @@ -5763,10 +5969,6 @@ msgid "Add Input Action Event" msgstr "Добавить дейÑтвие" #: editor/project_settings_editor.cpp editor/settings_config_dialog.cpp -msgid "Meta+" -msgstr "Meta+" - -#: editor/project_settings_editor.cpp editor/settings_config_dialog.cpp msgid "Shift+" msgstr "Shift+" @@ -5888,12 +6090,13 @@ msgid "Select a setting item first!" msgstr "Сначала выберите Ñлемент наÑтроек!" #: editor/project_settings_editor.cpp -msgid "No property '" +#, fuzzy +msgid "No property '%s' exists." msgstr "Ðет ÑвойÑтва '" #: editor/project_settings_editor.cpp -msgid "Setting '" -msgstr "ÐаÑтройки '" +msgid "Setting '%s' is internal, and it can't be deleted." +msgstr "" #: editor/project_settings_editor.cpp msgid "Delete Item" @@ -5921,15 +6124,15 @@ msgstr "Переопределение СвойÑтва" #: editor/project_settings_editor.cpp msgid "Add Translation" -msgstr "Добавлен перевод" +msgstr "Добавить перевод" #: editor/project_settings_editor.cpp msgid "Remove Translation" -msgstr "Перевод удалён" +msgstr "Удалить перевод" #: editor/project_settings_editor.cpp msgid "Add Remapped Path" -msgstr "Добавлен путь перенаправлениÑ" +msgstr "Добавить путь перенаправлениÑ" #: editor/project_settings_editor.cpp msgid "Resource Remap Add Remap" @@ -5937,24 +6140,23 @@ msgstr "Перенаправлен реÑÑƒÑ€Ñ Ð¿ÐµÑ€ÐµÐ½Ð°Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ" #: editor/project_settings_editor.cpp msgid "Change Resource Remap Language" -msgstr "Изменён Ñзык перенаправлениÑ" +msgstr "Изменить Ñзык Ð¿ÐµÑ€ÐµÐ½Ð°Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ñ€ÐµÑурÑов" #: editor/project_settings_editor.cpp msgid "Remove Resource Remap" -msgstr "Удалён реÑÑƒÑ€Ñ Ð¿ÐµÑ€ÐµÐ½Ð°Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ" +msgstr "Удалить реÑÑƒÑ€Ñ Ð¿ÐµÑ€ÐµÐ½Ð°Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ" #: editor/project_settings_editor.cpp msgid "Remove Resource Remap Option" -msgstr "Удалён параметр реÑурÑа перенаправлениÑ" +msgstr "Удалить параметр Ð¿ÐµÑ€ÐµÐ½Ð°Ð¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ñ€ÐµÑурÑа" #: editor/project_settings_editor.cpp -#, fuzzy msgid "Changed Locale Filter" -msgstr "Изменено Ð²Ñ€ÐµÐ¼Ñ \"ÑмешиваниÑ\"" +msgstr "Изменен фильтр Ñзыков" #: editor/project_settings_editor.cpp msgid "Changed Locale Filter Mode" -msgstr "" +msgstr "Изменен режим фильтрации Ñзыков" #: editor/project_settings_editor.cpp msgid "Project Settings (project.godot)" @@ -5982,7 +6184,7 @@ msgstr "ДейÑтвие:" #: editor/project_settings_editor.cpp msgid "Device:" -msgstr "ДевайÑ:" +msgstr "УÑтройÑтво:" #: editor/project_settings_editor.cpp msgid "Index:" @@ -6017,28 +6219,24 @@ msgid "Locale" msgstr "Язык" #: editor/project_settings_editor.cpp -#, fuzzy msgid "Locales Filter" -msgstr "Фильтр:" +msgstr "Фильтры локализации" #: editor/project_settings_editor.cpp -#, fuzzy msgid "Show all locales" -msgstr "Показать коÑти" +msgstr "Показать вÑе Ñзыки" #: editor/project_settings_editor.cpp msgid "Show only selected locales" -msgstr "" +msgstr "Показать только выбранные Ñзыки" #: editor/project_settings_editor.cpp -#, fuzzy msgid "Filter mode:" -msgstr "Ð¤Ð¸Ð»ÑŒÑ‚Ñ€Ð°Ñ†Ð¸Ñ ÑƒÐ·Ð»Ð¾Ð²" +msgstr "Режим фильтра:" #: editor/project_settings_editor.cpp -#, fuzzy msgid "Locales:" -msgstr "Язык" +msgstr "Языки:" #: editor/project_settings_editor.cpp msgid "AutoLoad" @@ -6372,6 +6570,16 @@ msgid "Clear a script for the selected node." msgstr "Убрать Ñкрипт у выбранного узла." #: editor/scene_tree_dock.cpp +#, fuzzy +msgid "Remote" +msgstr "Удалить" + +#: editor/scene_tree_dock.cpp +#, fuzzy +msgid "Local" +msgstr "Язык" + +#: editor/scene_tree_dock.cpp msgid "Clear Inheritance? (No Undo!)" msgstr "ОчиÑтить наÑледование? (ÐÐµÐ»ÑŒÐ·Ñ Ð¾Ñ‚Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ!)" @@ -6381,11 +6589,11 @@ msgstr "ОчиÑтить!" #: editor/scene_tree_editor.cpp msgid "Toggle Spatial Visible" -msgstr "Переключена видимоÑÑ‚ÑŒ Spatial" +msgstr "Переключить видимоÑÑ‚ÑŒ Spatial" #: editor/scene_tree_editor.cpp msgid "Toggle CanvasItem Visible" -msgstr "Переключена видимоÑÑ‚ÑŒ CanvasItem" +msgstr "Переключить видимоÑÑ‚ÑŒ CanvasItem" #: editor/scene_tree_editor.cpp msgid "Node configuration warning:" @@ -6441,7 +6649,7 @@ msgstr "" #: editor/scene_tree_editor.cpp msgid "Toggle Visibility" -msgstr "Переключение видимоÑти" +msgstr "Переключить видимоÑÑ‚ÑŒ" #: editor/scene_tree_editor.cpp msgid "Invalid node name, the following characters are not allowed:" @@ -6564,6 +6772,11 @@ msgid "Attach Node Script" msgstr "Добавление Ñкрипта" #: editor/script_editor_debugger.cpp +#, fuzzy +msgid "Remote " +msgstr "Удалить" + +#: editor/script_editor_debugger.cpp msgid "Bytes:" msgstr "Байты:" @@ -6621,18 +6834,6 @@ msgid "Stack Trace (if applicable):" msgstr "ТраÑÑировка Ñтека (еÑли применимо):" #: editor/script_editor_debugger.cpp -msgid "Remote Inspector" -msgstr "Удалённый отладчик" - -#: editor/script_editor_debugger.cpp -msgid "Live Scene Tree:" -msgstr "Дерево Ñцены в реальном времени:" - -#: editor/script_editor_debugger.cpp -msgid "Remote Object Properties: " -msgstr "Параметры объекта: " - -#: editor/script_editor_debugger.cpp msgid "Profiler" msgstr "Профайлер" @@ -6702,7 +6903,7 @@ msgstr "ГорÑчие клавиши" #: editor/spatial_editor_gizmos.cpp msgid "Change Light Radius" -msgstr "Изменён Ñ€Ð°Ð´Ð¸ÑƒÑ Ñвета" +msgstr "Изменить Ñ€Ð°Ð´Ð¸ÑƒÑ Ñвета" #: editor/spatial_editor_gizmos.cpp msgid "Change AudioStreamPlayer3D Emission Angle" @@ -6710,35 +6911,35 @@ msgstr "Изменить угол AudioStreamPlayer3D" #: editor/spatial_editor_gizmos.cpp msgid "Change Camera FOV" -msgstr "Изменён FOV камеры" +msgstr "Изменить FOV камеры" #: editor/spatial_editor_gizmos.cpp msgid "Change Camera Size" -msgstr "Изменён размер камеры" +msgstr "Изменить размер камеры" #: editor/spatial_editor_gizmos.cpp msgid "Change Sphere Shape Radius" -msgstr "Изменён Ñ€Ð°Ð´Ð¸ÑƒÑ Ñферы" +msgstr "Изменить Ñ€Ð°Ð´Ð¸ÑƒÑ Ñферы" #: editor/spatial_editor_gizmos.cpp msgid "Change Box Shape Extents" -msgstr "Изменены границы прÑмоугольника" +msgstr "Изменить границы прÑмоугольника" #: editor/spatial_editor_gizmos.cpp msgid "Change Capsule Shape Radius" -msgstr "Изменён Ñ€Ð°Ð´Ð¸ÑƒÑ ÐºÐ°Ð¿Ñулы" +msgstr "Изменить Ñ€Ð°Ð´Ð¸ÑƒÑ ÐºÐ°Ð¿Ñулы" #: editor/spatial_editor_gizmos.cpp msgid "Change Capsule Shape Height" -msgstr "Изменена выÑота капуÑлы" +msgstr "Изменить выÑоту капÑулы" #: editor/spatial_editor_gizmos.cpp msgid "Change Ray Shape Length" -msgstr "Изменена длинна луча" +msgstr "Изменить длину луча" #: editor/spatial_editor_gizmos.cpp msgid "Change Notifier Extents" -msgstr "Изменены границы уведомителÑ" +msgstr "Изменить границы уведомителÑ" #: editor/spatial_editor_gizmos.cpp msgid "Change Particles AABB" @@ -6746,7 +6947,7 @@ msgstr "Изменить AABB чаÑтиц" #: editor/spatial_editor_gizmos.cpp msgid "Change Probe Extents" -msgstr "Изменены Probe Extents" +msgstr "Изменить Probe Extents" #: modules/gdnative/gd_native_library_editor.cpp msgid "Library" @@ -6761,54 +6962,53 @@ msgid "Libraries: " msgstr "Библиотеки: " #: modules/gdnative/register_types.cpp -#, fuzzy msgid "GDNative" msgstr "GDNative" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp #: modules/visual_script/visual_script_builtin_funcs.cpp msgid "Invalid type argument to convert(), use TYPE_* constants." msgstr "Ðеверный тип аргумента Ð´Ð»Ñ convert(), иÑпользуйте TYPE_* конÑтанты." -#: modules/gdscript/gd_functions.cpp modules/mono/glue/glue_header.h +#: modules/gdscript/gdscript_functions.cpp modules/mono/glue/glue_header.h #: modules/visual_script/visual_script_builtin_funcs.cpp msgid "Not enough bytes for decoding bytes, or invalid format." msgstr "Ðе хватает байтов Ð´Ð»Ñ Ð´ÐµÐºÐ¾Ð´Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð±Ð°Ð¹Ñ‚Ð¾Ð², или неверный формат." -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "step argument is zero!" msgstr "Ðргумент шага равен нулю!" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Not a script with an instance" msgstr "Скрипт без ÑкземплÑра" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Not based on a script" msgstr "ОÑнован не на Ñкрипте" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Not based on a resource file" msgstr "ОÑнован не на файле реÑурÑов" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary format (missing @path)" msgstr "ÐедопуÑтимый формат ÑкземплÑра ÑÐ»Ð¾Ð²Ð°Ñ€Ñ (отÑутÑтвует @path)" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary format (can't load script at @path)" msgstr "" "ÐедопуÑтимый формат ÑкземплÑра ÑÐ»Ð¾Ð²Ð°Ñ€Ñ (невозможно загрузить Ñкрипт из @path)" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary format (invalid script at @path)" msgstr "ÐедопуÑтимый формат ÑкземплÑра ÑÐ»Ð¾Ð²Ð°Ñ€Ñ (неверный Ñкрипт в @path)" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary (invalid subclasses)" msgstr "ÐедопуÑтимый ÑкземплÑÑ€ ÑÐ»Ð¾Ð²Ð°Ñ€Ñ (неверные подклаÑÑÑ‹)" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Object can't provide a length." msgstr "Объект не может предоÑтавить длину." @@ -6821,16 +7021,26 @@ msgid "GridMap Duplicate Selection" msgstr "Дублировать выделенную Ñетку" #: modules/gridmap/grid_map_editor_plugin.cpp +msgid "Floor:" +msgstr "" + +#: modules/gridmap/grid_map_editor_plugin.cpp +#, fuzzy +msgid "Grid Map" +msgstr "ПривÑзка по Ñетке" + +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Snap View" msgstr "ПривÑзать вид" #: modules/gridmap/grid_map_editor_plugin.cpp -msgid "Prev Level (%sDown Wheel)" -msgstr "Пред уровень (%sКолеÑико вниз)" +#, fuzzy +msgid "Previous Floor" +msgstr "ÐŸÑ€ÐµÐ´Ñ‹Ð´ÑƒÑ‰Ð°Ñ Ð²ÐºÐ»Ð°Ð´ÐºÐ°" #: modules/gridmap/grid_map_editor_plugin.cpp -msgid "Next Level (%sUp Wheel)" -msgstr "Следующий уровень (%sКолеÑико вверх)" +msgid "Next Floor" +msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp msgid "Clip Disabled" @@ -6897,12 +7107,9 @@ msgid "Erase Area" msgstr "Стереть облаÑÑ‚ÑŒ" #: modules/gridmap/grid_map_editor_plugin.cpp -msgid "Selection -> Duplicate" -msgstr "Выбор -> Дублировать" - -#: modules/gridmap/grid_map_editor_plugin.cpp -msgid "Selection -> Clear" -msgstr "Выбор -> ОчиÑтить" +#, fuzzy +msgid "Clear Selection" +msgstr "Центрировать на выбранном" #: modules/gridmap/grid_map_editor_plugin.cpp msgid "GridMap Settings" @@ -7029,7 +7236,8 @@ msgid "Duplicate VisualScript Nodes" msgstr "Дублировать узлы VisualScript" #: modules/visual_script/visual_script_editor.cpp -msgid "Hold Meta to drop a Getter. Hold Shift to drop a generic signature." +#, fuzzy +msgid "Hold %s to drop a Getter. Hold Shift to drop a generic signature." msgstr "" "Зажмите Meta, чтобы добавить Getter. Зажмите Shift, чтобы добавить " "универÑальную подпиÑÑŒ." @@ -7041,7 +7249,8 @@ msgstr "" "универÑальную подпиÑÑŒ." #: modules/visual_script/visual_script_editor.cpp -msgid "Hold Meta to drop a simple reference to the node." +#, fuzzy +msgid "Hold %s to drop a simple reference to the node." msgstr "Зажмите Meta, чтобы добавить проÑтую ÑÑылку на узел." #: modules/visual_script/visual_script_editor.cpp @@ -7049,7 +7258,8 @@ msgid "Hold Ctrl to drop a simple reference to the node." msgstr "Зажмите Ctrl, чтобы добавить проÑтую ÑÑылку на узел." #: modules/visual_script/visual_script_editor.cpp -msgid "Hold Meta to drop a Variable Setter." +#, fuzzy +msgid "Hold %s to drop a Variable Setter." msgstr "Зажмите Meta, чтобы добавить Variable Setter." #: modules/visual_script/visual_script_editor.cpp @@ -7130,7 +7340,7 @@ msgstr "Изменить входное значение" #: modules/visual_script/visual_script_editor.cpp msgid "Can't copy the function node." -msgstr "Ðе удаетÑÑ Ñкопировать узел функцию." +msgstr "Ðе удаётÑÑ Ñкопировать узел функцию." #: modules/visual_script/visual_script_editor.cpp msgid "Clipboard is empty!" @@ -7278,12 +7488,23 @@ msgid "Could not write file:\n" msgstr "Ðе удалоÑÑŒ запиÑать файл:\n" #: platform/javascript/export/export.cpp -msgid "Could not read file:\n" +msgid "Could not open template for export:\n" +msgstr "Ðе удалоÑÑŒ открыть шаблон Ð´Ð»Ñ ÑкÑпорта:\n" + +#: platform/javascript/export/export.cpp +#, fuzzy +msgid "Invalid export template:\n" +msgstr "УÑтановить шаблоны ÑкÑпорта" + +#: platform/javascript/export/export.cpp +#, fuzzy +msgid "Could not read custom HTML shell:\n" msgstr "Ðе удалоÑÑŒ прочитать файл:\n" #: platform/javascript/export/export.cpp -msgid "Could not open template for export:\n" -msgstr "Ðе удалоÑÑŒ открыть шаблон Ð´Ð»Ñ ÑкÑпорта:\n" +#, fuzzy +msgid "Could not read boot splash image file:\n" +msgstr "Ðе удалоÑÑŒ прочитать файл:\n" #: scene/2d/animated_sprite.cpp msgid "" @@ -7406,22 +7627,6 @@ msgstr "" "Ð”Ð»Ñ ÐºÐ¾Ñ€Ñ€ÐµÐºÑ‚Ð½Ð¾Ð¹ работы ÑвойÑтво Path должно указывать на дейÑтвующий узел " "Node2D." -#: scene/2d/sprite.cpp -msgid "" -"Path property must point to a valid Viewport node to work. Such Viewport " -"must be set to 'render target' mode." -msgstr "" -"Ð”Ð»Ñ ÐºÐ¾Ñ€Ñ€ÐµÐºÑ‚Ð½Ð¾Ð¹ работы ÑвойÑтво Path должно указывать на дейÑтвующий узел " -"Viewport. Такой Viewport должен быть уÑтановлен в режим 'цель рендеринга'." - -#: scene/2d/sprite.cpp -msgid "" -"The Viewport set in the path property must be set as 'render target' in " -"order for this sprite to work." -msgstr "" -"ОблаÑти проÑмотра уÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ð°Ñ Ð² ÑвойÑтве path должна быть назначена " -"\"целью визуализации\" Ð´Ð»Ñ Ñ‚Ð¾Ð³Ð¾, чтобы Ñтот Ñпрайт работал." - #: scene/2d/visibility_notifier_2d.cpp msgid "" "VisibilityEnable2D works best when used with the edited scene root directly " @@ -7494,6 +7699,15 @@ msgstr "" "Shape должен быть предуÑмотрен Ð´Ð»Ñ Ñ„ÑƒÐ½ÐºÑ†Ð¸Ð¹ CollisionShape. ПожалуйÑта, " "Ñоздайте shape-реÑÑƒÑ€Ñ Ð´Ð»Ñ Ñтого!" +#: scene/3d/gi_probe.cpp +#, fuzzy +msgid "Plotting Meshes" +msgstr "Блитирование Изображений" + +#: scene/3d/gi_probe.cpp +msgid "Finishing Plot" +msgstr "" + #: scene/3d/navigation_mesh.cpp msgid "A NavigationMesh resource must be set or created for this node to work." msgstr "" @@ -7542,7 +7756,6 @@ msgstr "" "реÑÑƒÑ€Ñ SpriteFrames в параметре 'Frames'." #: scene/3d/vehicle_body.cpp -#, fuzzy msgid "" "VehicleWheel serves to provide a wheel system to a VehicleBody. Please use " "it as a child of a VehicleBody." @@ -7576,7 +7789,7 @@ msgid "" "functions. Making them visible for editing is fine though, but they will " "hide upon running." msgstr "" -"ПоÑле запуÑка вÑплывающие окна по-умолчанию Ñкрыты, Ð´Ð»Ñ Ð¸Ñ… Ð¾Ñ‚Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ " +"ПоÑле запуÑка вÑплывающие окна по умолчанию Ñкрыты, Ð´Ð»Ñ Ð¸Ñ… Ð¾Ñ‚Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ " "иÑпользуйте функцию popup() или любую из popup_*()." #: scene/gui/scroll_container.cpp @@ -7591,6 +7804,10 @@ msgstr "" "уÑтановите\n" "минимальный размер вручную." +#: scene/gui/tree.cpp +msgid "(Other)" +msgstr "" + #: scene/main/scene_tree.cpp msgid "" "Default Environment as specified in Project Setings (Rendering -> Viewport -" @@ -7607,10 +7824,10 @@ msgid "" "texture to some node for display." msgstr "" "Ðта облаÑÑ‚ÑŒ не уÑтановлена в качеÑтве цели рендеринга. ЕÑли вы ÑобираетеÑÑŒ " -"иÑпользовать его, чтобы отобразить его Ñодержимое прÑмо на Ñкране, Ñделать " -"его потомком Control'а, чтобы он мог получить размер. Ð’ противном Ñлучае, " -"Ñделайте его целью рендеринга и передайте его внутренние текÑтуры какому-то " -"другому узлу Ð´Ð»Ñ Ð¾Ñ‚Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ." +"иÑпользовать её Ð´Ð»Ñ Ð¾Ñ‚Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ Ñодержимого прÑмо на Ñкран, то Ñделайте её " +"потомком Control'а, чтобы она могла получить размер. Ð’ противном Ñлучае, " +"Ñделайте её целью рендеринга и назначьте её внутреннюю текÑтуру какому-либо " +"узлу Ð´Ð»Ñ Ð¾Ñ‚Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ." #: scene/resources/dynamic_font.cpp msgid "Error initializing FreeType." @@ -7628,6 +7845,69 @@ msgstr "Ошибка загрузки шрифта." msgid "Invalid font size." msgstr "ÐедопуÑтимый размер шрифта." +#~ msgid "Cannot navigate to '" +#~ msgstr "Ðе удалоÑÑŒ перейти к '" + +#~ msgid "" +#~ "\n" +#~ "Source: " +#~ msgstr "" +#~ "\n" +#~ "ИÑточник: " + +#~ msgid "Remove Point from Line2D" +#~ msgstr "Удалить точку Ñ ÐºÑ€Ð¸Ð²Ð¾Ð¹" + +#~ msgid "Add Point to Line2D" +#~ msgstr "Добавить точку к кривой" + +#~ msgid "Move Point in Line2D" +#~ msgstr "Двигать точку в кривой" + +#~ msgid "Split Segment (in line)" +#~ msgstr "Разделить Ñегмент (в кривой)" + +#~ msgid "Meta+" +#~ msgstr "Meta+" + +#~ msgid "Setting '" +#~ msgstr "ÐаÑтройки '" + +#~ msgid "Remote Inspector" +#~ msgstr "Удалённый отладчик" + +#~ msgid "Live Scene Tree:" +#~ msgstr "Дерево Ñцены в реальном времени:" + +#~ msgid "Remote Object Properties: " +#~ msgstr "Параметры объекта: " + +#~ msgid "Prev Level (%sDown Wheel)" +#~ msgstr "Пред уровень (%sКолеÑико вниз)" + +#~ msgid "Next Level (%sUp Wheel)" +#~ msgstr "Следующий уровень (%sКолеÑико вверх)" + +#~ msgid "Selection -> Duplicate" +#~ msgstr "Выбор -> Дублировать" + +#~ msgid "Selection -> Clear" +#~ msgstr "Выбор -> ОчиÑтить" + +#~ msgid "" +#~ "Path property must point to a valid Viewport node to work. Such Viewport " +#~ "must be set to 'render target' mode." +#~ msgstr "" +#~ "Ð”Ð»Ñ ÐºÐ¾Ñ€Ñ€ÐµÐºÑ‚Ð½Ð¾Ð¹ работы ÑвойÑтво Path должно указывать на дейÑтвующий узел " +#~ "Viewport. Такой Viewport должен быть уÑтановлен в режим 'цель рендеринга'." + +#~ msgid "" +#~ "The Viewport set in the path property must be set as 'render target' in " +#~ "order for this sprite to work." +#~ msgstr "" +#~ "ОблаÑти проÑмотра уÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ð°Ñ Ð² ÑвойÑтве path должна быть назначена " +#~ "\"целью визуализации\" Ð´Ð»Ñ Ñ‚Ð¾Ð³Ð¾, чтобы Ñтот Ñпрайт работал." + #~ msgid "Filter:" #~ msgstr "Фильтр:" @@ -7652,9 +7932,6 @@ msgstr "ÐедопуÑтимый размер шрифта." #~ msgid "Removed:" #~ msgstr "Удалено:" -#~ msgid "Error saving atlas:" -#~ msgstr "Ошибка ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ð°Ñ‚Ð»Ð°Ñа:" - #~ msgid "Could not save atlas subtexture:" #~ msgstr "Ðевозможно Ñохранить текÑтуру атлаÑа:" @@ -8044,9 +8321,6 @@ msgstr "ÐедопуÑтимый размер шрифта." #~ msgid "Cropping Images" #~ msgstr "Обрезка изображений" -#~ msgid "Blitting Images" -#~ msgstr "Блитирование Изображений" - #~ msgid "Couldn't save atlas image:" #~ msgstr "Ðевозможно Ñохранить изображение атлаÑа:" @@ -8424,9 +8698,6 @@ msgstr "ÐедопуÑтимый размер шрифта." #~ msgid "Save Translatable Strings" #~ msgstr "Сохранить переводимые Ñтроки" -#~ msgid "Install Export Templates" -#~ msgstr "УÑтановить шаблоны ÑкÑпорта" - #~ msgid "Edit Script Options" #~ msgstr "Редактировать параметры Ñкрипта" diff --git a/editor/translations/sk.po b/editor/translations/sk.po index e5ec2ed8d0..2af3977ed1 100644 --- a/editor/translations/sk.po +++ b/editor/translations/sk.po @@ -99,6 +99,7 @@ msgid "Anim Delete Keys" msgstr "" #: editor/animation_editor.cpp editor/plugins/tile_map_editor_plugin.cpp +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Duplicate Selection" msgstr "" @@ -629,6 +630,13 @@ msgstr "" msgid "Search Replacement Resource:" msgstr "" +#: editor/dependency_editor.cpp editor/editor_file_dialog.cpp +#: editor/editor_help.cpp editor/editor_node.cpp editor/filesystem_dock.cpp +#: editor/plugins/script_editor_plugin.cpp editor/property_selector.cpp +#: editor/quick_open.cpp scene/gui/file_dialog.cpp +msgid "Open" +msgstr "OtvoriÅ¥" + #: editor/dependency_editor.cpp msgid "Owners Of:" msgstr "" @@ -699,6 +707,14 @@ msgstr "" msgid "Delete" msgstr "" +#: editor/dictionary_property_edit.cpp +msgid "Change Dictionary Key" +msgstr "" + +#: editor/dictionary_property_edit.cpp +msgid "Change Dictionary Value" +msgstr "" + #: editor/editor_about.cpp msgid "Thanks from the Godot community!" msgstr "" @@ -1118,12 +1134,6 @@ msgstr "VÅ¡etko rozpoznané" msgid "All Files (*)" msgstr "" -#: editor/editor_file_dialog.cpp editor/editor_help.cpp editor/editor_node.cpp -#: editor/filesystem_dock.cpp editor/plugins/script_editor_plugin.cpp -#: editor/property_selector.cpp editor/quick_open.cpp scene/gui/file_dialog.cpp -msgid "Open" -msgstr "OtvoriÅ¥" - #: editor/editor_file_dialog.cpp scene/gui/file_dialog.cpp msgid "Open a File" msgstr "OtvoriÅ¥ súbor" @@ -1481,6 +1491,13 @@ msgid "" msgstr "" #: editor/editor_node.cpp +msgid "" +"This is a remote object so changes to it will not be kept.\n" +"Please read the documentation relevant to debugging to better understand " +"this workflow." +msgstr "" + +#: editor/editor_node.cpp msgid "Copy Params" msgstr "" @@ -1591,6 +1608,10 @@ msgid "Export Mesh Library" msgstr "" #: editor/editor_node.cpp +msgid "This operation can't be done without a root node." +msgstr "" + +#: editor/editor_node.cpp msgid "Export Tile Set" msgstr "" @@ -1717,11 +1738,20 @@ msgid "Switch Scene Tab" msgstr "" #: editor/editor_node.cpp -msgid "%d more file(s)" +msgid "%d more files or folders" +msgstr "" + +#: editor/editor_node.cpp +#, fuzzy +msgid "%d more folders" +msgstr "VytvoriÅ¥ adresár" + +#: editor/editor_node.cpp +msgid "%d more files" msgstr "" #: editor/editor_node.cpp -msgid "%d more file(s) or folder(s)" +msgid "Dock Position" msgstr "" #: editor/editor_node.cpp @@ -1733,6 +1763,10 @@ msgid "Toggle distraction-free mode." msgstr "" #: editor/editor_node.cpp +msgid "Add a new scene." +msgstr "" + +#: editor/editor_node.cpp msgid "Scene" msgstr "" @@ -1798,13 +1832,12 @@ msgid "TileSet.." msgstr "" #: editor/editor_node.cpp editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp scene/gui/line_edit.cpp -#: scene/gui/text_edit.cpp +#: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Undo" msgstr "Späť" #: editor/editor_node.cpp editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp +#: scene/gui/line_edit.cpp msgid "Redo" msgstr "" @@ -2288,6 +2321,10 @@ msgid "(Current)" msgstr "" #: editor/export_template_manager.cpp +msgid "Retrieving mirrors, please wait.." +msgstr "" + +#: editor/export_template_manager.cpp msgid "Remove template version '%s'?" msgstr "" @@ -2322,6 +2359,101 @@ msgid "Importing:" msgstr "" #: editor/export_template_manager.cpp +msgid "" +"No download links found for this version. Direct download is only available " +"for official releases." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Can't resolve." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Can't connect." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "No response." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Req. Failed." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Redirect Loop." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Failed:" +msgstr "" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Can't write file." +msgstr "Popis:" + +#: editor/export_template_manager.cpp +msgid "Download Complete." +msgstr "" + +#: editor/export_template_manager.cpp +msgid "Error requesting url: " +msgstr "" + +#: editor/export_template_manager.cpp +msgid "Connecting to Mirror.." +msgstr "" + +#: editor/export_template_manager.cpp +msgid "Disconnected" +msgstr "" + +#: editor/export_template_manager.cpp +msgid "Resolving" +msgstr "" + +#: editor/export_template_manager.cpp +msgid "Can't Resolve" +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Connecting.." +msgstr "" + +#: editor/export_template_manager.cpp +msgid "Can't Conect" +msgstr "" + +#: editor/export_template_manager.cpp +msgid "Connected" +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Requesting.." +msgstr "" + +#: editor/export_template_manager.cpp +msgid "Downloading" +msgstr "" + +#: editor/export_template_manager.cpp +msgid "Connection Error" +msgstr "" + +#: editor/export_template_manager.cpp +msgid "SSL Handshake Error" +msgstr "" + +#: editor/export_template_manager.cpp msgid "Current Version:" msgstr "" @@ -2346,12 +2478,21 @@ msgstr "" msgid "Export Template Manager" msgstr "" +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Download Templates" +msgstr "VÅ¡etky vybrané" + +#: editor/export_template_manager.cpp +msgid "Select mirror from list: " +msgstr "" + #: editor/file_type_cache.cpp msgid "Can't open file_type_cache.cch for writing, not saving file type cache!" msgstr "" #: editor/filesystem_dock.cpp -msgid "Cannot navigate to '" +msgid "Cannot navigate to '%s' as it has not been found in the file system!" msgstr "" #: editor/filesystem_dock.cpp @@ -2369,12 +2510,6 @@ msgid "" msgstr "" #: editor/filesystem_dock.cpp -msgid "" -"\n" -"Source: " -msgstr "" - -#: editor/filesystem_dock.cpp msgid "Cannot move/rename resources root." msgstr "" @@ -2634,8 +2769,7 @@ msgid "Remove Poly And Point" msgstr "" #: editor/plugins/abstract_polygon_2d_editor.cpp -#: editor/plugins/light_occluder_2d_editor_plugin.cpp -msgid "Create a new polygon from scratch." +msgid "Create a new polygon from scratch" msgstr "" #: editor/plugins/abstract_polygon_2d_editor.cpp @@ -2646,6 +2780,11 @@ msgid "" "RMB: Erase Point." msgstr "" +#: editor/plugins/abstract_polygon_2d_editor.cpp +#, fuzzy +msgid "Delete points" +msgstr "VÅ¡etky vybrané" + #: editor/plugins/animation_player_editor_plugin.cpp msgid "Toggle Autoplay" msgstr "" @@ -2983,18 +3122,10 @@ msgid "Can't resolve hostname:" msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Can't resolve." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Connection error, please try again." msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Can't connect." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Can't connect to host:" msgstr "" @@ -3003,30 +3134,14 @@ msgid "No response from host:" msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "No response." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Request failed, return code:" msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Req. Failed." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Request failed, too many redirects" msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Redirect Loop." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp -msgid "Failed:" -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Bad download hash, assuming file has been tampered with." msgstr "" @@ -3055,14 +3170,6 @@ msgid "Resolving.." msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Connecting.." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp -msgid "Requesting.." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Error making request" msgstr "" @@ -3175,6 +3282,37 @@ msgid "Move Action" msgstr "" #: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Move vertical guide" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Create new vertical guide" +msgstr "Popis:" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Remove vertical guide" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Move horizontal guide" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Create new horizontal guide" +msgstr "Popis:" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Remove horizontal guide" +msgstr "VÅ¡etky vybrané" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Create new horizontal and vertical guides" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp msgid "Edit IK Chain" msgstr "" @@ -3295,10 +3433,16 @@ msgid "Snap to other nodes" msgstr "" #: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Snap to guides" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Lock the selected object in place (can't be moved)." msgstr "" #: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Unlock the selected object (can be moved)." msgstr "" @@ -3349,6 +3493,10 @@ msgid "Show rulers" msgstr "" #: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Show guides" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp msgid "Center Selection" msgstr "" @@ -3538,6 +3686,10 @@ msgstr "" msgid "Hold Shift to edit tangents individually" msgstr "" +#: editor/plugins/gi_probe_editor_plugin.cpp +msgid "Bake GI Probe" +msgstr "" + #: editor/plugins/gradient_editor_plugin.cpp msgid "Add/Remove Color Ramp Point" msgstr "" @@ -3570,6 +3722,10 @@ msgid "Create Occluder Polygon" msgstr "" #: editor/plugins/light_occluder_2d_editor_plugin.cpp +msgid "Create a new polygon from scratch." +msgstr "" + +#: editor/plugins/light_occluder_2d_editor_plugin.cpp msgid "Edit existing polygon:" msgstr "" @@ -3585,58 +3741,6 @@ msgstr "" msgid "RMB: Erase Point." msgstr "" -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Remove Point from Line2D" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Add Point to Line2D" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Move Point in Line2D" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Select Points" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Shift+Drag: Select Control Points" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Click: Add Point" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Right Click: Delete Point" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Add Point (in empty space)" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Split Segment (in line)" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Delete Point" -msgstr "" - #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Mesh is empty!" msgstr "" @@ -4034,16 +4138,46 @@ msgid "Move Out-Control in Curve" msgstr "" #: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Select Points" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Shift+Drag: Select Control Points" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Click: Add Point" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Right Click: Delete Point" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp msgid "Select Control Points (Shift+Drag)" msgstr "" #: editor/plugins/path_2d_editor_plugin.cpp #: editor/plugins/path_editor_plugin.cpp +msgid "Add Point (in empty space)" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp msgid "Split Segment (in curve)" msgstr "" #: editor/plugins/path_2d_editor_plugin.cpp #: editor/plugins/path_editor_plugin.cpp +msgid "Delete Point" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp msgid "Close Curve" msgstr "" @@ -4184,7 +4318,6 @@ msgstr "" #: editor/plugins/resource_preloader_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp #: editor/plugins/sprite_frames_editor_plugin.cpp editor/property_editor.cpp #: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Paste" @@ -4229,6 +4362,20 @@ msgid " Class Reference" msgstr "" #: editor/plugins/script_editor_plugin.cpp +msgid "Sort" +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp +msgid "Move Up" +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp +msgid "Move Down" +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp #, fuzzy msgid "Next script" msgstr "Popis:" @@ -4281,6 +4428,10 @@ msgstr "" msgid "Close All" msgstr "" +#: editor/plugins/script_editor_plugin.cpp +msgid "Close Other Tabs" +msgstr "" + #: editor/plugins/script_editor_plugin.cpp editor/project_manager.cpp msgid "Run" msgstr "" @@ -4291,13 +4442,11 @@ msgstr "" #: editor/plugins/script_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Find.." msgstr "" #: editor/plugins/script_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Find Next" msgstr "" @@ -4401,33 +4550,22 @@ msgstr "" msgid "Capitalize" msgstr "" -#: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp scene/gui/line_edit.cpp +#: editor/plugins/script_text_editor.cpp scene/gui/line_edit.cpp #: scene/gui/text_edit.cpp msgid "Cut" msgstr "" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp #: editor/plugins/sprite_frames_editor_plugin.cpp editor/property_editor.cpp #: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Copy" msgstr "KopÃrovaÅ¥" -#: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp scene/gui/line_edit.cpp +#: editor/plugins/script_text_editor.cpp scene/gui/line_edit.cpp #: scene/gui/text_edit.cpp msgid "Select All" msgstr "" -#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp -msgid "Move Up" -msgstr "" - -#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp -msgid "Move Down" -msgstr "" - #: editor/plugins/script_text_editor.cpp msgid "Delete Line" msgstr "" @@ -4449,6 +4587,22 @@ msgid "Clone Down" msgstr "" #: editor/plugins/script_text_editor.cpp +msgid "Fold Line" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Unfold Line" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Fold All Lines" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Unfold All Lines" +msgstr "" + +#: editor/plugins/script_text_editor.cpp msgid "Complete Symbol" msgstr "" @@ -4494,12 +4648,10 @@ msgid "Convert To Lowercase" msgstr "" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Find Previous" msgstr "" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Replace.." msgstr "" @@ -4508,7 +4660,6 @@ msgid "Goto Function.." msgstr "" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Goto Line.." msgstr "" @@ -4673,6 +4824,14 @@ msgid "View Plane Transform." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "Scaling: " +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Translating: " +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Rotating %s degrees." msgstr "" @@ -4753,6 +4912,10 @@ msgid "Vertices" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "FPS" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Align with view" msgstr "" @@ -4785,6 +4948,15 @@ msgid "View Information" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "View FPS" +msgstr "Súbor:" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Half Resolution" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Audio Listener" msgstr "" @@ -4915,6 +5087,10 @@ msgid "Tool Scale" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "Toggle Freelook" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Transform" msgstr "" @@ -5193,6 +5369,10 @@ msgid "Create Empty Editor Template" msgstr "" #: editor/plugins/theme_editor_plugin.cpp +msgid "Create From Current Editor Theme" +msgstr "" + +#: editor/plugins/theme_editor_plugin.cpp msgid "CheckBox Radio1" msgstr "" @@ -5367,7 +5547,7 @@ msgid "Runnable" msgstr "" #: editor/project_export.cpp -msgid "Delete patch '" +msgid "Delete patch '%s' from list?" msgstr "" #: editor/project_export.cpp @@ -5663,10 +5843,6 @@ msgid "Add Input Action Event" msgstr "" #: editor/project_settings_editor.cpp editor/settings_config_dialog.cpp -msgid "Meta+" -msgstr "Meta+" - -#: editor/project_settings_editor.cpp editor/settings_config_dialog.cpp msgid "Shift+" msgstr "Shift+" @@ -5788,11 +5964,11 @@ msgid "Select a setting item first!" msgstr "" #: editor/project_settings_editor.cpp -msgid "No property '" +msgid "No property '%s' exists." msgstr "" #: editor/project_settings_editor.cpp -msgid "Setting '" +msgid "Setting '%s' is internal, and it can't be deleted." msgstr "" #: editor/project_settings_editor.cpp @@ -6265,6 +6441,15 @@ msgid "Clear a script for the selected node." msgstr "" #: editor/scene_tree_dock.cpp +#, fuzzy +msgid "Remote" +msgstr "VÅ¡etky vybrané" + +#: editor/scene_tree_dock.cpp +msgid "Local" +msgstr "" + +#: editor/scene_tree_dock.cpp msgid "Clear Inheritance? (No Undo!)" msgstr "" @@ -6453,6 +6638,11 @@ msgid "Attach Node Script" msgstr "Popis:" #: editor/script_editor_debugger.cpp +#, fuzzy +msgid "Remote " +msgstr "VÅ¡etky vybrané" + +#: editor/script_editor_debugger.cpp msgid "Bytes:" msgstr "" @@ -6509,18 +6699,6 @@ msgid "Stack Trace (if applicable):" msgstr "" #: editor/script_editor_debugger.cpp -msgid "Remote Inspector" -msgstr "" - -#: editor/script_editor_debugger.cpp -msgid "Live Scene Tree:" -msgstr "" - -#: editor/script_editor_debugger.cpp -msgid "Remote Object Properties: " -msgstr "" - -#: editor/script_editor_debugger.cpp msgid "Profiler" msgstr "" @@ -6652,49 +6830,49 @@ msgstr "" msgid "GDNative" msgstr "" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp #: modules/visual_script/visual_script_builtin_funcs.cpp msgid "Invalid type argument to convert(), use TYPE_* constants." msgstr "Chybný argument convert(), použite TYPE_* konÅ¡tanty." -#: modules/gdscript/gd_functions.cpp modules/mono/glue/glue_header.h +#: modules/gdscript/gdscript_functions.cpp modules/mono/glue/glue_header.h #: modules/visual_script/visual_script_builtin_funcs.cpp msgid "Not enough bytes for decoding bytes, or invalid format." msgstr "Nedostatok bajtov na dekódovanie, možný chybný formát." -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "step argument is zero!" msgstr "argument \"step\"/krok je nulový!" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Not a script with an instance" msgstr "" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Not based on a script" msgstr "" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Not based on a resource file" msgstr "" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary format (missing @path)" msgstr "" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary format (can't load script at @path)" msgstr "" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary format (invalid script at @path)" msgstr "" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary (invalid subclasses)" msgstr "" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Object can't provide a length." msgstr "" @@ -6708,15 +6886,23 @@ msgid "GridMap Duplicate Selection" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp +msgid "Floor:" +msgstr "" + +#: modules/gridmap/grid_map_editor_plugin.cpp +msgid "Grid Map" +msgstr "" + +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Snap View" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp -msgid "Prev Level (%sDown Wheel)" +msgid "Previous Floor" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp -msgid "Next Level (%sUp Wheel)" +msgid "Next Floor" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp @@ -6785,12 +6971,9 @@ msgid "Erase Area" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp -msgid "Selection -> Duplicate" -msgstr "" - -#: modules/gridmap/grid_map_editor_plugin.cpp -msgid "Selection -> Clear" -msgstr "" +#, fuzzy +msgid "Clear Selection" +msgstr "VÅ¡etky vybrané" #: modules/gridmap/grid_map_editor_plugin.cpp msgid "GridMap Settings" @@ -6913,7 +7096,7 @@ msgid "Duplicate VisualScript Nodes" msgstr "" #: modules/visual_script/visual_script_editor.cpp -msgid "Hold Meta to drop a Getter. Hold Shift to drop a generic signature." +msgid "Hold %s to drop a Getter. Hold Shift to drop a generic signature." msgstr "" #: modules/visual_script/visual_script_editor.cpp @@ -6921,7 +7104,7 @@ msgid "Hold Ctrl to drop a Getter. Hold Shift to drop a generic signature." msgstr "" #: modules/visual_script/visual_script_editor.cpp -msgid "Hold Meta to drop a simple reference to the node." +msgid "Hold %s to drop a simple reference to the node." msgstr "" #: modules/visual_script/visual_script_editor.cpp @@ -6929,7 +7112,7 @@ msgid "Hold Ctrl to drop a simple reference to the node." msgstr "" #: modules/visual_script/visual_script_editor.cpp -msgid "Hold Meta to drop a Variable Setter." +msgid "Hold %s to drop a Variable Setter." msgstr "" #: modules/visual_script/visual_script_editor.cpp @@ -7162,11 +7345,19 @@ msgid "Could not write file:\n" msgstr "" #: platform/javascript/export/export.cpp -msgid "Could not read file:\n" +msgid "Could not open template for export:\n" msgstr "" #: platform/javascript/export/export.cpp -msgid "Could not open template for export:\n" +msgid "Invalid export template:\n" +msgstr "" + +#: platform/javascript/export/export.cpp +msgid "Could not read custom HTML shell:\n" +msgstr "" + +#: platform/javascript/export/export.cpp +msgid "Could not read boot splash image file:\n" msgstr "" #: scene/2d/animated_sprite.cpp @@ -7265,18 +7456,6 @@ msgstr "" msgid "Path property must point to a valid Node2D node to work." msgstr "" -#: scene/2d/sprite.cpp -msgid "" -"Path property must point to a valid Viewport node to work. Such Viewport " -"must be set to 'render target' mode." -msgstr "" - -#: scene/2d/sprite.cpp -msgid "" -"The Viewport set in the path property must be set as 'render target' in " -"order for this sprite to work." -msgstr "" - #: scene/2d/visibility_notifier_2d.cpp msgid "" "VisibilityEnable2D works best when used with the edited scene root directly " @@ -7335,6 +7514,14 @@ msgid "" "shape resource for it!" msgstr "" +#: scene/3d/gi_probe.cpp +msgid "Plotting Meshes" +msgstr "" + +#: scene/3d/gi_probe.cpp +msgid "Finishing Plot" +msgstr "" + #: scene/3d/navigation_mesh.cpp msgid "A NavigationMesh resource must be set or created for this node to work." msgstr "" @@ -7412,6 +7599,10 @@ msgid "" "minimum size manually." msgstr "" +#: scene/gui/tree.cpp +msgid "(Other)" +msgstr "" + #: scene/main/scene_tree.cpp msgid "" "Default Environment as specified in Project Setings (Rendering -> Viewport -" @@ -7442,6 +7633,9 @@ msgstr "" msgid "Invalid font size." msgstr "" +#~ msgid "Meta+" +#~ msgstr "Meta+" + #~ msgid "Filter:" #~ msgstr "Filter:" diff --git a/editor/translations/sl.po b/editor/translations/sl.po index 4a82428565..30041b0349 100644 --- a/editor/translations/sl.po +++ b/editor/translations/sl.po @@ -100,6 +100,7 @@ msgid "Anim Delete Keys" msgstr "" #: editor/animation_editor.cpp editor/plugins/tile_map_editor_plugin.cpp +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Duplicate Selection" msgstr "" @@ -629,6 +630,13 @@ msgstr "" msgid "Search Replacement Resource:" msgstr "" +#: editor/dependency_editor.cpp editor/editor_file_dialog.cpp +#: editor/editor_help.cpp editor/editor_node.cpp editor/filesystem_dock.cpp +#: editor/plugins/script_editor_plugin.cpp editor/property_selector.cpp +#: editor/quick_open.cpp scene/gui/file_dialog.cpp +msgid "Open" +msgstr "" + #: editor/dependency_editor.cpp msgid "Owners Of:" msgstr "" @@ -699,6 +707,14 @@ msgstr "" msgid "Delete" msgstr "" +#: editor/dictionary_property_edit.cpp +msgid "Change Dictionary Key" +msgstr "" + +#: editor/dictionary_property_edit.cpp +msgid "Change Dictionary Value" +msgstr "" + #: editor/editor_about.cpp msgid "Thanks from the Godot community!" msgstr "" @@ -1117,12 +1133,6 @@ msgstr "" msgid "All Files (*)" msgstr "" -#: editor/editor_file_dialog.cpp editor/editor_help.cpp editor/editor_node.cpp -#: editor/filesystem_dock.cpp editor/plugins/script_editor_plugin.cpp -#: editor/property_selector.cpp editor/quick_open.cpp scene/gui/file_dialog.cpp -msgid "Open" -msgstr "" - #: editor/editor_file_dialog.cpp scene/gui/file_dialog.cpp msgid "Open a File" msgstr "" @@ -1478,6 +1488,13 @@ msgid "" msgstr "" #: editor/editor_node.cpp +msgid "" +"This is a remote object so changes to it will not be kept.\n" +"Please read the documentation relevant to debugging to better understand " +"this workflow." +msgstr "" + +#: editor/editor_node.cpp msgid "Copy Params" msgstr "" @@ -1587,6 +1604,10 @@ msgid "Export Mesh Library" msgstr "" #: editor/editor_node.cpp +msgid "This operation can't be done without a root node." +msgstr "" + +#: editor/editor_node.cpp msgid "Export Tile Set" msgstr "" @@ -1712,11 +1733,19 @@ msgid "Switch Scene Tab" msgstr "" #: editor/editor_node.cpp -msgid "%d more file(s)" +msgid "%d more files or folders" +msgstr "" + +#: editor/editor_node.cpp +msgid "%d more folders" +msgstr "" + +#: editor/editor_node.cpp +msgid "%d more files" msgstr "" #: editor/editor_node.cpp -msgid "%d more file(s) or folder(s)" +msgid "Dock Position" msgstr "" #: editor/editor_node.cpp @@ -1728,6 +1757,10 @@ msgid "Toggle distraction-free mode." msgstr "" #: editor/editor_node.cpp +msgid "Add a new scene." +msgstr "" + +#: editor/editor_node.cpp msgid "Scene" msgstr "" @@ -1792,13 +1825,12 @@ msgid "TileSet.." msgstr "" #: editor/editor_node.cpp editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp scene/gui/line_edit.cpp -#: scene/gui/text_edit.cpp +#: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Undo" msgstr "" #: editor/editor_node.cpp editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp +#: scene/gui/line_edit.cpp msgid "Redo" msgstr "" @@ -2280,6 +2312,10 @@ msgid "(Current)" msgstr "" #: editor/export_template_manager.cpp +msgid "Retrieving mirrors, please wait.." +msgstr "" + +#: editor/export_template_manager.cpp msgid "Remove template version '%s'?" msgstr "" @@ -2314,6 +2350,100 @@ msgid "Importing:" msgstr "" #: editor/export_template_manager.cpp +msgid "" +"No download links found for this version. Direct download is only available " +"for official releases." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Can't resolve." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Can't connect." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "No response." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Req. Failed." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Redirect Loop." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Failed:" +msgstr "" + +#: editor/export_template_manager.cpp +msgid "Can't write file." +msgstr "" + +#: editor/export_template_manager.cpp +msgid "Download Complete." +msgstr "" + +#: editor/export_template_manager.cpp +msgid "Error requesting url: " +msgstr "" + +#: editor/export_template_manager.cpp +msgid "Connecting to Mirror.." +msgstr "" + +#: editor/export_template_manager.cpp +msgid "Disconnected" +msgstr "" + +#: editor/export_template_manager.cpp +msgid "Resolving" +msgstr "" + +#: editor/export_template_manager.cpp +msgid "Can't Resolve" +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Connecting.." +msgstr "" + +#: editor/export_template_manager.cpp +msgid "Can't Conect" +msgstr "" + +#: editor/export_template_manager.cpp +msgid "Connected" +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Requesting.." +msgstr "" + +#: editor/export_template_manager.cpp +msgid "Downloading" +msgstr "" + +#: editor/export_template_manager.cpp +msgid "Connection Error" +msgstr "" + +#: editor/export_template_manager.cpp +msgid "SSL Handshake Error" +msgstr "" + +#: editor/export_template_manager.cpp msgid "Current Version:" msgstr "" @@ -2338,12 +2468,21 @@ msgstr "" msgid "Export Template Manager" msgstr "" +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Download Templates" +msgstr "Odstrani Spremenljivko" + +#: editor/export_template_manager.cpp +msgid "Select mirror from list: " +msgstr "" + #: editor/file_type_cache.cpp msgid "Can't open file_type_cache.cch for writing, not saving file type cache!" msgstr "" #: editor/filesystem_dock.cpp -msgid "Cannot navigate to '" +msgid "Cannot navigate to '%s' as it has not been found in the file system!" msgstr "" #: editor/filesystem_dock.cpp @@ -2361,12 +2500,6 @@ msgid "" msgstr "" #: editor/filesystem_dock.cpp -msgid "" -"\n" -"Source: " -msgstr "" - -#: editor/filesystem_dock.cpp msgid "Cannot move/rename resources root." msgstr "" @@ -2625,8 +2758,7 @@ msgid "Remove Poly And Point" msgstr "" #: editor/plugins/abstract_polygon_2d_editor.cpp -#: editor/plugins/light_occluder_2d_editor_plugin.cpp -msgid "Create a new polygon from scratch." +msgid "Create a new polygon from scratch" msgstr "" #: editor/plugins/abstract_polygon_2d_editor.cpp @@ -2637,6 +2769,11 @@ msgid "" "RMB: Erase Point." msgstr "" +#: editor/plugins/abstract_polygon_2d_editor.cpp +#, fuzzy +msgid "Delete points" +msgstr "IzbriÅ¡i Izbrano" + #: editor/plugins/animation_player_editor_plugin.cpp msgid "Toggle Autoplay" msgstr "" @@ -2972,18 +3109,10 @@ msgid "Can't resolve hostname:" msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Can't resolve." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Connection error, please try again." msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Can't connect." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Can't connect to host:" msgstr "" @@ -2992,30 +3121,14 @@ msgid "No response from host:" msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "No response." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Request failed, return code:" msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Req. Failed." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Request failed, too many redirects" msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Redirect Loop." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp -msgid "Failed:" -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Bad download hash, assuming file has been tampered with." msgstr "" @@ -3044,14 +3157,6 @@ msgid "Resolving.." msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Connecting.." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp -msgid "Requesting.." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Error making request" msgstr "" @@ -3164,6 +3269,36 @@ msgid "Move Action" msgstr "" #: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Move vertical guide" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Create new vertical guide" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Remove vertical guide" +msgstr "Odstrani Spremenljivko" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Move horizontal guide" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Create new horizontal guide" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Remove horizontal guide" +msgstr "Odstrani Spremenljivko" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Create new horizontal and vertical guides" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp msgid "Edit IK Chain" msgstr "" @@ -3285,10 +3420,16 @@ msgid "Snap to other nodes" msgstr "" #: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Snap to guides" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Lock the selected object in place (can't be moved)." msgstr "" #: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Unlock the selected object (can be moved)." msgstr "" @@ -3339,6 +3480,10 @@ msgid "Show rulers" msgstr "" #: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Show guides" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp msgid "Center Selection" msgstr "" @@ -3527,6 +3672,10 @@ msgstr "" msgid "Hold Shift to edit tangents individually" msgstr "" +#: editor/plugins/gi_probe_editor_plugin.cpp +msgid "Bake GI Probe" +msgstr "" + #: editor/plugins/gradient_editor_plugin.cpp msgid "Add/Remove Color Ramp Point" msgstr "" @@ -3559,6 +3708,10 @@ msgid "Create Occluder Polygon" msgstr "" #: editor/plugins/light_occluder_2d_editor_plugin.cpp +msgid "Create a new polygon from scratch." +msgstr "" + +#: editor/plugins/light_occluder_2d_editor_plugin.cpp msgid "Edit existing polygon:" msgstr "" @@ -3574,58 +3727,6 @@ msgstr "" msgid "RMB: Erase Point." msgstr "" -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Remove Point from Line2D" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Add Point to Line2D" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Move Point in Line2D" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Select Points" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Shift+Drag: Select Control Points" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Click: Add Point" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Right Click: Delete Point" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Add Point (in empty space)" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Split Segment (in line)" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Delete Point" -msgstr "" - #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Mesh is empty!" msgstr "" @@ -4023,16 +4124,46 @@ msgid "Move Out-Control in Curve" msgstr "" #: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Select Points" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Shift+Drag: Select Control Points" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Click: Add Point" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Right Click: Delete Point" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp msgid "Select Control Points (Shift+Drag)" msgstr "" #: editor/plugins/path_2d_editor_plugin.cpp #: editor/plugins/path_editor_plugin.cpp +msgid "Add Point (in empty space)" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp msgid "Split Segment (in curve)" msgstr "" #: editor/plugins/path_2d_editor_plugin.cpp #: editor/plugins/path_editor_plugin.cpp +msgid "Delete Point" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp msgid "Close Curve" msgstr "" @@ -4173,7 +4304,6 @@ msgstr "" #: editor/plugins/resource_preloader_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp #: editor/plugins/sprite_frames_editor_plugin.cpp editor/property_editor.cpp #: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Paste" @@ -4218,6 +4348,20 @@ msgid " Class Reference" msgstr "" #: editor/plugins/script_editor_plugin.cpp +msgid "Sort" +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp +msgid "Move Up" +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp +msgid "Move Down" +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp msgid "Next script" msgstr "" @@ -4270,6 +4414,10 @@ msgstr "" msgid "Close All" msgstr "Zapri" +#: editor/plugins/script_editor_plugin.cpp +msgid "Close Other Tabs" +msgstr "" + #: editor/plugins/script_editor_plugin.cpp editor/project_manager.cpp msgid "Run" msgstr "" @@ -4280,13 +4428,11 @@ msgstr "" #: editor/plugins/script_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Find.." msgstr "" #: editor/plugins/script_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Find Next" msgstr "" @@ -4390,33 +4536,22 @@ msgstr "" msgid "Capitalize" msgstr "" -#: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp scene/gui/line_edit.cpp +#: editor/plugins/script_text_editor.cpp scene/gui/line_edit.cpp #: scene/gui/text_edit.cpp msgid "Cut" msgstr "" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp #: editor/plugins/sprite_frames_editor_plugin.cpp editor/property_editor.cpp #: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Copy" msgstr "" -#: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp scene/gui/line_edit.cpp +#: editor/plugins/script_text_editor.cpp scene/gui/line_edit.cpp #: scene/gui/text_edit.cpp msgid "Select All" msgstr "" -#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp -msgid "Move Up" -msgstr "" - -#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp -msgid "Move Down" -msgstr "" - #: editor/plugins/script_text_editor.cpp #, fuzzy msgid "Delete Line" @@ -4439,6 +4574,23 @@ msgid "Clone Down" msgstr "" #: editor/plugins/script_text_editor.cpp +#, fuzzy +msgid "Fold Line" +msgstr "IzbriÅ¡i Izbrano" + +#: editor/plugins/script_text_editor.cpp +msgid "Unfold Line" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Fold All Lines" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Unfold All Lines" +msgstr "" + +#: editor/plugins/script_text_editor.cpp msgid "Complete Symbol" msgstr "" @@ -4484,12 +4636,10 @@ msgid "Convert To Lowercase" msgstr "" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Find Previous" msgstr "" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Replace.." msgstr "" @@ -4498,7 +4648,6 @@ msgid "Goto Function.." msgstr "" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Goto Line.." msgstr "" @@ -4663,6 +4812,14 @@ msgid "View Plane Transform." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "Scaling: " +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Translating: " +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Rotating %s degrees." msgstr "" @@ -4744,6 +4901,10 @@ msgid "Vertices" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "FPS" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Align with view" msgstr "" @@ -4776,6 +4937,14 @@ msgid "View Information" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "View FPS" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Half Resolution" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Audio Listener" msgstr "" @@ -4904,6 +5073,11 @@ msgid "Tool Scale" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Toggle Freelook" +msgstr "Preklopi na Zaustavitev" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Transform" msgstr "" @@ -5180,6 +5354,10 @@ msgid "Create Empty Editor Template" msgstr "" #: editor/plugins/theme_editor_plugin.cpp +msgid "Create From Current Editor Theme" +msgstr "" + +#: editor/plugins/theme_editor_plugin.cpp msgid "CheckBox Radio1" msgstr "" @@ -5353,7 +5531,7 @@ msgid "Runnable" msgstr "" #: editor/project_export.cpp -msgid "Delete patch '" +msgid "Delete patch '%s' from list?" msgstr "" #: editor/project_export.cpp @@ -5648,10 +5826,6 @@ msgid "Add Input Action Event" msgstr "" #: editor/project_settings_editor.cpp editor/settings_config_dialog.cpp -msgid "Meta+" -msgstr "" - -#: editor/project_settings_editor.cpp editor/settings_config_dialog.cpp msgid "Shift+" msgstr "" @@ -5774,11 +5948,11 @@ msgid "Select a setting item first!" msgstr "" #: editor/project_settings_editor.cpp -msgid "No property '" +msgid "No property '%s' exists." msgstr "" #: editor/project_settings_editor.cpp -msgid "Setting '" +msgid "Setting '%s' is internal, and it can't be deleted." msgstr "" #: editor/project_settings_editor.cpp @@ -6248,6 +6422,15 @@ msgid "Clear a script for the selected node." msgstr "" #: editor/scene_tree_dock.cpp +#, fuzzy +msgid "Remote" +msgstr "Odstrani Signal" + +#: editor/scene_tree_dock.cpp +msgid "Local" +msgstr "" + +#: editor/scene_tree_dock.cpp msgid "Clear Inheritance? (No Undo!)" msgstr "" @@ -6433,6 +6616,11 @@ msgid "Attach Node Script" msgstr "" #: editor/script_editor_debugger.cpp +#, fuzzy +msgid "Remote " +msgstr "Odstrani Signal" + +#: editor/script_editor_debugger.cpp msgid "Bytes:" msgstr "" @@ -6489,18 +6677,6 @@ msgid "Stack Trace (if applicable):" msgstr "" #: editor/script_editor_debugger.cpp -msgid "Remote Inspector" -msgstr "" - -#: editor/script_editor_debugger.cpp -msgid "Live Scene Tree:" -msgstr "" - -#: editor/script_editor_debugger.cpp -msgid "Remote Object Properties: " -msgstr "" - -#: editor/script_editor_debugger.cpp msgid "Profiler" msgstr "" @@ -6632,50 +6808,50 @@ msgstr "" msgid "GDNative" msgstr "" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp #: modules/visual_script/visual_script_builtin_funcs.cpp msgid "Invalid type argument to convert(), use TYPE_* constants." msgstr "Neveljavena vrsta argumenta za convert(), uporabite TYPE_* konstanto." -#: modules/gdscript/gd_functions.cpp modules/mono/glue/glue_header.h +#: modules/gdscript/gdscript_functions.cpp modules/mono/glue/glue_header.h #: modules/visual_script/visual_script_builtin_funcs.cpp msgid "Not enough bytes for decoding bytes, or invalid format." msgstr "Ni dovolj pomnilnika za dekodiranje bajtov, ali neveljaven format." -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "step argument is zero!" msgstr "stopnja argumenta je niÄ!" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Not a script with an instance" msgstr "To ni skripta z instanco" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Not based on a script" msgstr "Ne temelji na skripti" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Not based on a resource file" msgstr "Ne temelji na datoteki virov" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary format (missing @path)" msgstr "Neveljaven primer formata slovarja (manjka @path)" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary format (can't load script at @path)" msgstr "" "Neveljaven primer formata slovarja (ni mogoÄe naložiti skripte iz @path)" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary format (invalid script at @path)" msgstr "Neveljaven primer formata slovarja (neveljavna skripta v @path)" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary (invalid subclasses)" msgstr "Neveljaven primer slovarja (neveljavni podrazredi)" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Object can't provide a length." msgstr "" @@ -6689,15 +6865,23 @@ msgid "GridMap Duplicate Selection" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp +msgid "Floor:" +msgstr "" + +#: modules/gridmap/grid_map_editor_plugin.cpp +msgid "Grid Map" +msgstr "" + +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Snap View" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp -msgid "Prev Level (%sDown Wheel)" +msgid "Previous Floor" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp -msgid "Next Level (%sUp Wheel)" +msgid "Next Floor" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp @@ -6765,12 +6949,9 @@ msgid "Erase Area" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp -msgid "Selection -> Duplicate" -msgstr "" - -#: modules/gridmap/grid_map_editor_plugin.cpp -msgid "Selection -> Clear" -msgstr "" +#, fuzzy +msgid "Clear Selection" +msgstr "IzbriÅ¡i Izbrano" #: modules/gridmap/grid_map_editor_plugin.cpp msgid "GridMap Settings" @@ -6900,7 +7081,7 @@ msgid "Duplicate VisualScript Nodes" msgstr "" #: modules/visual_script/visual_script_editor.cpp -msgid "Hold Meta to drop a Getter. Hold Shift to drop a generic signature." +msgid "Hold %s to drop a Getter. Hold Shift to drop a generic signature." msgstr "" #: modules/visual_script/visual_script_editor.cpp @@ -6908,7 +7089,7 @@ msgid "Hold Ctrl to drop a Getter. Hold Shift to drop a generic signature." msgstr "" #: modules/visual_script/visual_script_editor.cpp -msgid "Hold Meta to drop a simple reference to the node." +msgid "Hold %s to drop a simple reference to the node." msgstr "" #: modules/visual_script/visual_script_editor.cpp @@ -6916,7 +7097,7 @@ msgid "Hold Ctrl to drop a simple reference to the node." msgstr "" #: modules/visual_script/visual_script_editor.cpp -msgid "Hold Meta to drop a Variable Setter." +msgid "Hold %s to drop a Variable Setter." msgstr "" #: modules/visual_script/visual_script_editor.cpp @@ -7150,11 +7331,20 @@ msgid "Could not write file:\n" msgstr "" #: platform/javascript/export/export.cpp -msgid "Could not read file:\n" +msgid "Could not open template for export:\n" msgstr "" #: platform/javascript/export/export.cpp -msgid "Could not open template for export:\n" +#, fuzzy +msgid "Invalid export template:\n" +msgstr "Neveljaven indeks lastnosti imena." + +#: platform/javascript/export/export.cpp +msgid "Could not read custom HTML shell:\n" +msgstr "" + +#: platform/javascript/export/export.cpp +msgid "Could not read boot splash image file:\n" msgstr "" #: scene/2d/animated_sprite.cpp @@ -7258,18 +7448,6 @@ msgstr "" msgid "Path property must point to a valid Node2D node to work." msgstr "" -#: scene/2d/sprite.cpp -msgid "" -"Path property must point to a valid Viewport node to work. Such Viewport " -"must be set to 'render target' mode." -msgstr "" - -#: scene/2d/sprite.cpp -msgid "" -"The Viewport set in the path property must be set as 'render target' in " -"order for this sprite to work." -msgstr "" - #: scene/2d/visibility_notifier_2d.cpp msgid "" "VisibilityEnable2D works best when used with the edited scene root directly " @@ -7328,6 +7506,14 @@ msgid "" "shape resource for it!" msgstr "" +#: scene/3d/gi_probe.cpp +msgid "Plotting Meshes" +msgstr "" + +#: scene/3d/gi_probe.cpp +msgid "Finishing Plot" +msgstr "" + #: scene/3d/navigation_mesh.cpp msgid "A NavigationMesh resource must be set or created for this node to work." msgstr "" @@ -7405,6 +7591,10 @@ msgid "" "minimum size manually." msgstr "" +#: scene/gui/tree.cpp +msgid "(Other)" +msgstr "" + #: scene/main/scene_tree.cpp msgid "" "Default Environment as specified in Project Setings (Rendering -> Viewport -" diff --git a/editor/translations/sr_Cyrl.po b/editor/translations/sr_Cyrl.po new file mode 100644 index 0000000000..5577bc2098 --- /dev/null +++ b/editor/translations/sr_Cyrl.po @@ -0,0 +1,7707 @@ +# Serbian (cyrillic) translation of the Godot Engine editor +# Copyright (C) 2007-2017 Juan Linietsky, Ariel Manzur +# Copyright (C) 2014-2017 Godot Engine contributors (cf. AUTHORS.md) +# This file is distributed under the same license as the Godot source code. +# +# ÐлекÑандар Урошевић <nicecubedude@gmail.com>, 2017. +# +msgid "" +msgstr "" +"Project-Id-Version: Godot Engine editor\n" +"PO-Revision-Date: 2017-11-19 13:49+0000\n" +"Last-Translator: ÐлекÑандар Урошевић <nicecubedude@gmail.com>\n" +"Language-Team: Serbian (cyrillic) <https://hosted.weblate.org/projects/godot-" +"engine/godot/sr_Cyrl/>\n" +"Language: sr_Cyrl\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8-bit\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 2.18-dev\n" + +#: editor/animation_editor.cpp +msgid "Disabled" +msgstr "Онемогућено" + +#: editor/animation_editor.cpp +msgid "All Selection" +msgstr "Све одабрано" + +#: editor/animation_editor.cpp +msgid "Move Add Key" +msgstr "" + +#: editor/animation_editor.cpp +msgid "Anim Change Transition" +msgstr "Промените прелаз" + +#: editor/animation_editor.cpp +msgid "Anim Change Transform" +msgstr "Промените положај" + +#: editor/animation_editor.cpp +msgid "Anim Change Value" +msgstr "Промените вредноÑÑ‚" + +#: editor/animation_editor.cpp +msgid "Anim Change Call" +msgstr "Промените позив анимације" + +#: editor/animation_editor.cpp +msgid "Anim Add Track" +msgstr "Додајте нову траку" + +#: editor/animation_editor.cpp +msgid "Anim Duplicate Keys" +msgstr "Дуплирајте кључеве" + +#: editor/animation_editor.cpp +msgid "Move Anim Track Up" +msgstr "Померите траку горе" + +#: editor/animation_editor.cpp +msgid "Move Anim Track Down" +msgstr "Померите траку доле" + +#: editor/animation_editor.cpp +msgid "Remove Anim Track" +msgstr "Обришите траку анимације" + +#: editor/animation_editor.cpp +msgid "Set Transitions to:" +msgstr "ПоÑтавите прелаз на:" + +#: editor/animation_editor.cpp +msgid "Anim Track Rename" +msgstr "Измените име анимације" + +#: editor/animation_editor.cpp +msgid "Anim Track Change Interpolation" +msgstr "Измените интерполацију" + +#: editor/animation_editor.cpp +msgid "Anim Track Change Value Mode" +msgstr "Измените режим вредноÑти" + +#: editor/animation_editor.cpp +msgid "Anim Track Change Wrap Mode" +msgstr "Измените режим цикла" + +#: editor/animation_editor.cpp +msgid "Edit Node Curve" +msgstr "Измените криву чвора" + +#: editor/animation_editor.cpp +msgid "Edit Selection Curve" +msgstr "Измените одабрану криву" + +#: editor/animation_editor.cpp +msgid "Anim Delete Keys" +msgstr "Уколните кључеве" + +#: editor/animation_editor.cpp editor/plugins/tile_map_editor_plugin.cpp +#: modules/gridmap/grid_map_editor_plugin.cpp +msgid "Duplicate Selection" +msgstr "Дуплирајте одабрано" + +#: editor/animation_editor.cpp +msgid "Duplicate Transposed" +msgstr "Дуплирај транÑпоновану" + +#: editor/animation_editor.cpp +msgid "Remove Selection" +msgstr "Обришите одабрано" + +#: editor/animation_editor.cpp +msgid "Continuous" +msgstr "Трајан" + +#: editor/animation_editor.cpp +msgid "Discrete" +msgstr "Одвојен" + +#: editor/animation_editor.cpp +msgid "Trigger" +msgstr "Окидач" + +#: editor/animation_editor.cpp +msgid "Anim Add Key" +msgstr "Уметни кључ" + +#: editor/animation_editor.cpp +msgid "Anim Move Keys" +msgstr "Помери кључеве" + +#: editor/animation_editor.cpp +msgid "Scale Selection" +msgstr "Увећај одабрано" + +#: editor/animation_editor.cpp +msgid "Scale From Cursor" +msgstr "Увећај од курÑора" + +#: editor/animation_editor.cpp +msgid "Goto Next Step" +msgstr "Идите на Ñледећи корак" + +#: editor/animation_editor.cpp +msgid "Goto Prev Step" +msgstr "Идите на претходни корак" + +#: editor/animation_editor.cpp editor/plugins/curve_editor_plugin.cpp +#: editor/property_editor.cpp +msgid "Linear" +msgstr "Линеаран" + +#: editor/animation_editor.cpp editor/plugins/theme_editor_plugin.cpp +msgid "Constant" +msgstr "КонÑтантан" + +#: editor/animation_editor.cpp +msgid "In" +msgstr "У" + +#: editor/animation_editor.cpp +msgid "Out" +msgstr "Из" + +#: editor/animation_editor.cpp +msgid "In-Out" +msgstr "У-Из" + +#: editor/animation_editor.cpp +msgid "Out-In" +msgstr "Из-У" + +#: editor/animation_editor.cpp +msgid "Transitions" +msgstr "Прелази" + +#: editor/animation_editor.cpp +msgid "Optimize Animation" +msgstr "Оптимизуј анимацију" + +#: editor/animation_editor.cpp +msgid "Clean-Up Animation" +msgstr "ОчиÑтите анимацију" + +#: editor/animation_editor.cpp +msgid "Create NEW track for %s and insert key?" +msgstr "Ðаправите нову траку за %s и убаците кључ?" + +#: editor/animation_editor.cpp +msgid "Create %d NEW tracks and insert keys?" +msgstr "Ðаправите %d нових трака и убаците кључеве?" + +#: editor/animation_editor.cpp editor/create_dialog.cpp +#: editor/editor_audio_buses.cpp editor/plugins/abstract_polygon_2d_editor.cpp +#: editor/plugins/light_occluder_2d_editor_plugin.cpp +#: editor/plugins/mesh_instance_editor_plugin.cpp +#: editor/plugins/particles_editor_plugin.cpp editor/project_manager.cpp +#: editor/script_create_dialog.cpp +msgid "Create" +msgstr "Ðаправи" + +#: editor/animation_editor.cpp +msgid "Anim Create & Insert" +msgstr "Ðаправи анимацију и убаци" + +#: editor/animation_editor.cpp +msgid "Anim Insert Track & Key" +msgstr "Уметни траку и кључ" + +#: editor/animation_editor.cpp +msgid "Anim Insert Key" +msgstr "Уметни кључ" + +#: editor/animation_editor.cpp +msgid "Change Anim Len" +msgstr "Измени дужину анимације" + +#: editor/animation_editor.cpp +msgid "Change Anim Loop" +msgstr "Измени лупинг анимације" + +#: editor/animation_editor.cpp +msgid "Anim Create Typed Value Key" +msgstr "" + +#: editor/animation_editor.cpp +msgid "Anim Insert" +msgstr "Ðалепи" + +#: editor/animation_editor.cpp +msgid "Anim Scale Keys" +msgstr "Увећај кључеве" + +#: editor/animation_editor.cpp +msgid "Anim Add Call Track" +msgstr "" + +#: editor/animation_editor.cpp +msgid "Animation zoom." +msgstr "Скала анимације." + +#: editor/animation_editor.cpp +msgid "Length (s):" +msgstr "Дужина (Ñек.):" + +#: editor/animation_editor.cpp +msgid "Animation length (in seconds)." +msgstr "Дужина анимације (у Ñекундама)." + +#: editor/animation_editor.cpp +msgid "Step (s):" +msgstr "Један корак (Ñек.):" + +#: editor/animation_editor.cpp +msgid "Cursor step snap (in seconds)." +msgstr "Поравнавање корака курÑора (у Ñекундама)." + +#: editor/animation_editor.cpp +msgid "Enable/Disable looping in animation." +msgstr "Укључи/иÑкључи понављање анимације." + +#: editor/animation_editor.cpp +msgid "Add new tracks." +msgstr "Додај нове траке." + +#: editor/animation_editor.cpp +msgid "Move current track up." +msgstr "Помери траку горе." + +#: editor/animation_editor.cpp +msgid "Move current track down." +msgstr "Помери траку доле." + +#: editor/animation_editor.cpp +msgid "Remove selected track." +msgstr "Обриши одабрану траку." + +#: editor/animation_editor.cpp +msgid "Track tools" +msgstr "Ðлатке за траке" + +#: editor/animation_editor.cpp +msgid "Enable editing of individual keys by clicking them." +msgstr "Омогућите уређивање индивидуалних кључева кликом на њих." + +#: editor/animation_editor.cpp +msgid "Anim. Optimizer" +msgstr "Оптимизатор анимација" + +#: editor/animation_editor.cpp +msgid "Max. Linear Error:" +msgstr "МакÑимална линеарна грешка:" + +#: editor/animation_editor.cpp +msgid "Max. Angular Error:" +msgstr "МакÑимална угаона грешка:" + +#: editor/animation_editor.cpp +msgid "Max Optimizable Angle:" +msgstr "МакÑимални оптимизован угао:" + +#: editor/animation_editor.cpp +msgid "Optimize" +msgstr "Оптимизуј" + +#: editor/animation_editor.cpp +msgid "Select an AnimationPlayer from the Scene Tree to edit animations." +msgstr "Одабери AnimationPlayer из дрвета Ñцене за уређивање анимација." + +#: editor/animation_editor.cpp +msgid "Key" +msgstr "Кључ" + +#: editor/animation_editor.cpp +msgid "Transition" +msgstr "Померај" + +#: editor/animation_editor.cpp +msgid "Scale Ratio:" +msgstr "Размера Ñкале:" + +#: editor/animation_editor.cpp +msgid "Call Functions in Which Node?" +msgstr "Позови функције у којем чвору?" + +#: editor/animation_editor.cpp +msgid "Remove invalid keys" +msgstr "Обриши неважеће кључеве" + +#: editor/animation_editor.cpp +msgid "Remove unresolved and empty tracks" +msgstr "Обриши необјашњене и празне траке" + +#: editor/animation_editor.cpp +msgid "Clean-up all animations" +msgstr "ОчиÑти Ñве анимације" + +#: editor/animation_editor.cpp +msgid "Clean-Up Animation(s) (NO UNDO!)" +msgstr "ОчиÑти анимацију(е) (ÐЕМРОПОЗИВÐЊÐ!)" + +#: editor/animation_editor.cpp +msgid "Clean-Up" +msgstr "ОчиÑти" + +#: editor/array_property_edit.cpp +msgid "Resize Array" +msgstr "Промени величину низа" + +#: editor/array_property_edit.cpp +msgid "Change Array Value Type" +msgstr "Промени тип вредноÑти низа" + +#: editor/array_property_edit.cpp +msgid "Change Array Value" +msgstr "Промени вредноÑÑ‚ низа" + +#: editor/code_editor.cpp +msgid "Go to Line" +msgstr "Иди на линију" + +#: editor/code_editor.cpp +msgid "Line Number:" +msgstr "Број линије:" + +#: editor/code_editor.cpp +msgid "No Matches" +msgstr "Ðема подудара" + +#: editor/code_editor.cpp +msgid "Replaced %d occurrence(s)." +msgstr "Замени %d појаве/а." + +#: editor/code_editor.cpp +msgid "Replace" +msgstr "Замени" + +#: editor/code_editor.cpp +msgid "Replace All" +msgstr "Замени Ñве" + +#: editor/code_editor.cpp +msgid "Match Case" +msgstr "Подударање великих и малих Ñлова" + +#: editor/code_editor.cpp +msgid "Whole Words" +msgstr "Целе речи" + +#: editor/code_editor.cpp +msgid "Selection Only" +msgstr "Само одабрано" + +#: editor/code_editor.cpp editor/editor_node.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp +#: editor/plugins/shader_editor_plugin.cpp editor/project_settings_editor.cpp +msgid "Search" +msgstr "Тражи" + +#: editor/code_editor.cpp editor/editor_help.cpp +msgid "Find" +msgstr "Ðађи" + +#: editor/code_editor.cpp +msgid "Next" +msgstr "Следеће" + +#: editor/code_editor.cpp +msgid "Not found!" +msgstr "Ðије пронађено!" + +#: editor/code_editor.cpp +msgid "Replace By" +msgstr "Заменити Ñа" + +#: editor/code_editor.cpp +msgid "Case Sensitive" +msgstr "Разликовање великих и малих Ñлова" + +#: editor/code_editor.cpp +msgid "Backwards" +msgstr "Ðатраг" + +#: editor/code_editor.cpp +msgid "Prompt On Replace" +msgstr "Питај за замену" + +#: editor/code_editor.cpp +msgid "Skip" +msgstr "ПреÑкочи" + +#: editor/code_editor.cpp +msgid "Zoom In" +msgstr "Увеличај" + +#: editor/code_editor.cpp +msgid "Zoom Out" +msgstr "Умањи" + +#: editor/code_editor.cpp +msgid "Reset Zoom" +msgstr "РеÑетуј увеличање" + +#: editor/code_editor.cpp editor/script_editor_debugger.cpp +msgid "Line:" +msgstr "Линија:" + +#: editor/code_editor.cpp +msgid "Col:" +msgstr "Колона:" + +#: editor/connections_dialog.cpp +msgid "Method in target Node must be specified!" +msgstr "Метода у циљаном чвору мора бити наведена!" + +#: editor/connections_dialog.cpp +msgid "" +"Target method not found! Specify a valid method or attach a script to target " +"Node." +msgstr "" +"Циљана метода није пронађена! Ðаведите валидну методу или прикачите " +"Ñкриптицу на циљани чвор." + +#: editor/connections_dialog.cpp +msgid "Connect To Node:" +msgstr "Повежи Ñа чвором:" + +#: editor/connections_dialog.cpp editor/editor_autoload_settings.cpp +#: editor/groups_editor.cpp editor/plugins/item_list_editor_plugin.cpp +#: editor/plugins/theme_editor_plugin.cpp editor/project_settings_editor.cpp +msgid "Add" +msgstr "Додај" + +#: editor/connections_dialog.cpp editor/dependency_editor.cpp +#: editor/plugins/animation_tree_editor_plugin.cpp +#: editor/plugins/theme_editor_plugin.cpp editor/project_manager.cpp +#: editor/project_settings_editor.cpp +msgid "Remove" +msgstr "Обриши" + +#: editor/connections_dialog.cpp +msgid "Add Extra Call Argument:" +msgstr "Додај додатан аргумент позива:" + +#: editor/connections_dialog.cpp +msgid "Extra Call Arguments:" +msgstr "Додатни аргументи позива:" + +#: editor/connections_dialog.cpp +msgid "Path to Node:" +msgstr "Пут ка чвору:" + +#: editor/connections_dialog.cpp +msgid "Make Function" +msgstr "Ðаправи функцију" + +#: editor/connections_dialog.cpp +msgid "Deferred" +msgstr "Одложен" + +#: editor/connections_dialog.cpp +msgid "Oneshot" +msgstr "" + +#: editor/connections_dialog.cpp editor/dependency_editor.cpp +#: editor/export_template_manager.cpp +#: editor/plugins/animation_player_editor_plugin.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +#: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/resource_preloader_editor_plugin.cpp +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/sprite_frames_editor_plugin.cpp editor/project_export.cpp +#: editor/project_settings_editor.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/connections_dialog.cpp +msgid "Connect" +msgstr "Повежи" + +#: editor/connections_dialog.cpp +msgid "Connect '%s' to '%s'" +msgstr "Повежи '%s' Ñа '%s'" + +#: editor/connections_dialog.cpp +msgid "Connecting Signal:" +msgstr "Везујући Ñигнал:" + +#: editor/connections_dialog.cpp +msgid "Create Subscription" +msgstr "Ðаправи претплату" + +#: editor/connections_dialog.cpp +msgid "Connect.." +msgstr "Повежи..." + +#: editor/connections_dialog.cpp +#: editor/plugins/animation_tree_editor_plugin.cpp +msgid "Disconnect" +msgstr "ИÑкопчати" + +#: editor/connections_dialog.cpp editor/editor_help.cpp editor/node_dock.cpp +msgid "Signals" +msgstr "Сигнали" + +#: editor/create_dialog.cpp +msgid "Create New" +msgstr "Ðаправи нов" + +#: editor/create_dialog.cpp editor/editor_file_dialog.cpp +#: editor/filesystem_dock.cpp +msgid "Favorites:" +msgstr "Омиљене:" + +#: editor/create_dialog.cpp editor/editor_file_dialog.cpp +msgid "Recent:" +msgstr "ЧеÑте:" + +#: editor/create_dialog.cpp editor/editor_node.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +#: editor/plugins/script_editor_plugin.cpp editor/property_selector.cpp +#: editor/quick_open.cpp editor/settings_config_dialog.cpp +msgid "Search:" +msgstr "Тражи:" + +#: editor/create_dialog.cpp editor/editor_help.cpp +#: editor/plugins/script_editor_plugin.cpp editor/property_selector.cpp +#: editor/quick_open.cpp +msgid "Matches:" +msgstr "Подударање:" + +#: editor/create_dialog.cpp editor/editor_help.cpp +#: editor/plugins/asset_library_editor_plugin.cpp editor/property_selector.cpp +#: editor/script_editor_debugger.cpp +msgid "Description:" +msgstr "ОпиÑ:" + +#: editor/dependency_editor.cpp +msgid "Search Replacement For:" +msgstr "Тражи замену за:" + +#: editor/dependency_editor.cpp +msgid "Dependencies For:" +msgstr "ЗавиÑноÑти за:" + +#: editor/dependency_editor.cpp +msgid "" +"Scene '%s' is currently being edited.\n" +"Changes will not take effect unless reloaded." +msgstr "" +"Ðа Ñцени '%s' Ñе тренутно ради.\n" +"Промене неће бити у ефекту док Ñе не поново отвори." + +#: editor/dependency_editor.cpp +msgid "" +"Resource '%s' is in use.\n" +"Changes will take effect when reloaded." +msgstr "" +"РеÑÑƒÑ€Ñ '%s' Ñе тренутно кориÑти.\n" +"Промене неће бити у ефекту док Ñе поново не отворе." + +#: editor/dependency_editor.cpp +msgid "Dependencies" +msgstr "ЗавиÑноÑти" + +#: editor/dependency_editor.cpp +msgid "Resource" +msgstr "РеÑурÑ" + +#: editor/dependency_editor.cpp editor/editor_autoload_settings.cpp +#: editor/project_manager.cpp editor/project_settings_editor.cpp +#: editor/script_create_dialog.cpp +msgid "Path" +msgstr "Пут" + +#: editor/dependency_editor.cpp +msgid "Dependencies:" +msgstr "ЗавиÑноÑти:" + +#: editor/dependency_editor.cpp +msgid "Fix Broken" +msgstr "Поправи покварене" + +#: editor/dependency_editor.cpp +msgid "Dependency Editor" +msgstr "Уредник завиÑноÑти" + +#: editor/dependency_editor.cpp +msgid "Search Replacement Resource:" +msgstr "Потражи замену за реÑурÑ:" + +#: editor/dependency_editor.cpp editor/editor_file_dialog.cpp +#: editor/editor_help.cpp editor/editor_node.cpp editor/filesystem_dock.cpp +#: editor/plugins/script_editor_plugin.cpp editor/property_selector.cpp +#: editor/quick_open.cpp scene/gui/file_dialog.cpp +msgid "Open" +msgstr "Отвори" + +#: editor/dependency_editor.cpp +msgid "Owners Of:" +msgstr "ВлаÑници:" + +#: editor/dependency_editor.cpp +msgid "Remove selected files from the project? (no undo)" +msgstr "Обриши одабране датотеке из пројекта? (ÐЕМРОПОЗИВÐЊÐ)" + +#: editor/dependency_editor.cpp +msgid "" +"The files being removed are required by other resources in order for them to " +"work.\n" +"Remove them anyway? (no undo)" +msgstr "" +"Жељене датотеке за бриÑање Ñу потребне за рад других реÑурÑа.\n" +"Ипак их обриши? (ÐЕМРОПОЗИВÐЊÐ)" + +#: editor/dependency_editor.cpp +msgid "Cannot remove:\n" +msgstr "Ðе може Ñе обриÑати:\n" + +#: editor/dependency_editor.cpp +msgid "Error loading:" +msgstr "Грешка при учитавању:" + +#: editor/dependency_editor.cpp +msgid "Scene failed to load due to missing dependencies:" +msgstr "Сцена је неуÑпешно очитана због недоÑтајућих завиÑноÑти:" + +#: editor/dependency_editor.cpp editor/editor_node.cpp +msgid "Open Anyway" +msgstr "Ипак отвори" + +#: editor/dependency_editor.cpp +msgid "Which action should be taken?" +msgstr "Која акција Ñе треба предузети?" + +#: editor/dependency_editor.cpp +msgid "Fix Dependencies" +msgstr "Поправи завиÑноÑти" + +#: editor/dependency_editor.cpp +msgid "Errors loading!" +msgstr "Грешка при учитавању!" + +#: editor/dependency_editor.cpp +msgid "Permanently delete %d item(s)? (No undo!)" +msgstr "Трајно обриши %d Ñтавка(и)? (ÐЕМРОПОЗИВÐЊÐ)" + +#: editor/dependency_editor.cpp +msgid "Owns" +msgstr "" + +#: editor/dependency_editor.cpp +msgid "Resources Without Explicit Ownership:" +msgstr "РеÑурÑи без одређеног влаÑника:" + +#: editor/dependency_editor.cpp editor/editor_node.cpp +msgid "Orphan Resource Explorer" +msgstr "" + +#: editor/dependency_editor.cpp +msgid "Delete selected files?" +msgstr "Обриши одабране датотеке?" + +#: editor/dependency_editor.cpp editor/editor_audio_buses.cpp +#: editor/editor_node.cpp editor/filesystem_dock.cpp +#: editor/plugins/item_list_editor_plugin.cpp editor/project_export.cpp +#: editor/project_settings_editor.cpp editor/scene_tree_dock.cpp +msgid "Delete" +msgstr "Обриши" + +#: editor/dictionary_property_edit.cpp +#, fuzzy +msgid "Change Dictionary Key" +msgstr "Измени име анимације:" + +#: editor/dictionary_property_edit.cpp +#, fuzzy +msgid "Change Dictionary Value" +msgstr "Промени вредноÑÑ‚ низа" + +#: editor/editor_about.cpp +msgid "Thanks from the Godot community!" +msgstr "Хвала од Godot заједнице!" + +#: editor/editor_about.cpp +msgid "Thanks!" +msgstr "Хвала!" + +#: editor/editor_about.cpp +msgid "Godot Engine contributors" +msgstr "Godot Engine Ñарадници" + +#: editor/editor_about.cpp +msgid "Project Founders" +msgstr "ОÑнивачи пројекта" + +#: editor/editor_about.cpp +msgid "Lead Developer" +msgstr "" + +#: editor/editor_about.cpp editor/project_manager.cpp +msgid "Project Manager" +msgstr "Менаџер пројекта" + +#: editor/editor_about.cpp +msgid "Developers" +msgstr "" + +#: editor/editor_about.cpp +msgid "Authors" +msgstr "Ðутори" + +#: editor/editor_about.cpp +msgid "Platinum Sponsors" +msgstr "ПлатинумÑки Ñпонзори" + +#: editor/editor_about.cpp +msgid "Gold Sponsors" +msgstr "Златни Ñпонзори" + +#: editor/editor_about.cpp +msgid "Mini Sponsors" +msgstr "Мали Ñпонзори" + +#: editor/editor_about.cpp +msgid "Gold Donors" +msgstr "Златни донатори" + +#: editor/editor_about.cpp +msgid "Silver Donors" +msgstr "Сребрни донатори" + +#: editor/editor_about.cpp +msgid "Bronze Donors" +msgstr "Бронзани донатори" + +#: editor/editor_about.cpp +msgid "Donors" +msgstr "Донатори" + +#: editor/editor_about.cpp +msgid "License" +msgstr "ЛиценÑа" + +#: editor/editor_about.cpp +msgid "Thirdparty License" +msgstr "ЛиценÑа трећег лица" + +#: editor/editor_about.cpp +msgid "" +"Godot Engine relies on a number of thirdparty free and open source " +"libraries, all compatible with the terms of its MIT license. The following " +"is an exhaustive list of all such thirdparty components with their " +"respective copyright statements and license terms." +msgstr "" +"Godot Engine Ñе оÑлања на бројне Ñлободне и отворене библиотеке трећег лица " +"компатибилне Ñа уÑловима MIT лиценÑе. Следи иÑцрпна лиÑта Ñвих тих " +"компонената трећих лица Ñа њиховим одговарајућим изјавама о ауторÑким " +"правима и уÑловима лиценÑе." + +#: editor/editor_about.cpp +msgid "All Components" +msgstr "Све компоненте" + +#: editor/editor_about.cpp +msgid "Components" +msgstr "Компоненте" + +#: editor/editor_about.cpp +msgid "Licenses" +msgstr "ЛиценÑе" + +#: editor/editor_asset_installer.cpp editor/project_manager.cpp +msgid "Error opening package file, not in zip format." +msgstr "Грешка при отварању датотеку пакета. Датотека није zip формата." + +#: editor/editor_asset_installer.cpp +msgid "Uncompressing Assets" +msgstr "ДекомпреÑија ÑредÑтва" + +#: editor/editor_asset_installer.cpp editor/project_manager.cpp +msgid "Package Installed Successfully!" +msgstr "Пакет је инÑталиран уÑпешно!" + +#: editor/editor_asset_installer.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Success!" +msgstr "УÑпех!" + +#: editor/editor_asset_installer.cpp +#: editor/plugins/asset_library_editor_plugin.cpp editor/project_manager.cpp +msgid "Install" +msgstr "ИнÑталирај" + +#: editor/editor_asset_installer.cpp +msgid "Package Installer" +msgstr "ИнÑталер пакета" + +#: editor/editor_audio_buses.cpp +msgid "Speakers" +msgstr "Звучници" + +#: editor/editor_audio_buses.cpp +msgid "Add Effect" +msgstr "Додај ефекат" + +#: editor/editor_audio_buses.cpp +msgid "Rename Audio Bus" +msgstr "Преименуј звучни баÑ(контролер)" + +#: editor/editor_audio_buses.cpp +msgid "Toggle Audio Bus Solo" +msgstr "" + +#: editor/editor_audio_buses.cpp +msgid "Toggle Audio Bus Mute" +msgstr "" + +#: editor/editor_audio_buses.cpp +msgid "Toggle Audio Bus Bypass Effects" +msgstr "" + +#: editor/editor_audio_buses.cpp +msgid "Select Audio Bus Send" +msgstr "" + +#: editor/editor_audio_buses.cpp +msgid "Add Audio Bus Effect" +msgstr "Додај ефекат звучном баÑу" + +#: editor/editor_audio_buses.cpp +msgid "Move Bus Effect" +msgstr "Помери звучни ефекат" + +#: editor/editor_audio_buses.cpp +msgid "Delete Bus Effect" +msgstr "Обриши звучни ефекат" + +#: editor/editor_audio_buses.cpp +msgid "Audio Bus, Drag and Drop to rearrange." +msgstr "Звучни баÑ, превуците и иÑпуÑтите за преуређивање." + +#: editor/editor_audio_buses.cpp +msgid "Solo" +msgstr "Ñоло" + +#: editor/editor_audio_buses.cpp +msgid "Mute" +msgstr "Пригуши" + +#: editor/editor_audio_buses.cpp +msgid "Bypass" +msgstr "Заобиђи" + +#: editor/editor_audio_buses.cpp +msgid "Bus options" +msgstr "ПоÑтавке баÑа" + +#: editor/editor_audio_buses.cpp editor/plugins/tile_map_editor_plugin.cpp +#: editor/scene_tree_dock.cpp +msgid "Duplicate" +msgstr "Дуплирај" + +#: editor/editor_audio_buses.cpp +msgid "Reset Volume" +msgstr "РеÑетуј јачину" + +#: editor/editor_audio_buses.cpp +msgid "Delete Effect" +msgstr "Обриши ефекат" + +#: editor/editor_audio_buses.cpp +msgid "Add Audio Bus" +msgstr "Додај звучни баÑ" + +#: editor/editor_audio_buses.cpp +msgid "Master bus can't be deleted!" +msgstr "Главни Ð±Ð°Ñ Ñе не може обриÑати!" + +#: editor/editor_audio_buses.cpp +msgid "Delete Audio Bus" +msgstr "Обриши звучни баÑ" + +#: editor/editor_audio_buses.cpp +msgid "Duplicate Audio Bus" +msgstr "Дуплирај аудио баÑ" + +#: editor/editor_audio_buses.cpp +msgid "Reset Bus Volume" +msgstr "РеÑетуј јачину баÑа" + +#: editor/editor_audio_buses.cpp +msgid "Move Audio Bus" +msgstr "Помери звучни баÑ" + +#: editor/editor_audio_buses.cpp +msgid "Save Audio Bus Layout As.." +msgstr "Сачувај раÑпоред звучног баÑа као..." + +#: editor/editor_audio_buses.cpp +msgid "Location for New Layout.." +msgstr "Локација за нови раÑпоред..." + +#: editor/editor_audio_buses.cpp +msgid "Open Audio Bus Layout" +msgstr "Отвори раÑпоред звучног баÑа" + +#: editor/editor_audio_buses.cpp +msgid "There is no 'res://default_bus_layout.tres' file." +msgstr "Датотека „res://default_bus_layout.tres“ не поÑтоји." + +#: editor/editor_audio_buses.cpp +msgid "Invalid file, not an audio bus layout." +msgstr "Датотека не Ñадржи раÑпоред звучног баÑа." + +#: editor/editor_audio_buses.cpp +msgid "Add Bus" +msgstr "Додај баÑ" + +#: editor/editor_audio_buses.cpp +msgid "Create a new Bus Layout." +msgstr "Ðаправи нови Ð±Ð°Ñ Ñ€Ð°Ñпоред." + +#: editor/editor_audio_buses.cpp editor/property_editor.cpp +#: editor/script_create_dialog.cpp +msgid "Load" +msgstr "Учитај" + +#: editor/editor_audio_buses.cpp +msgid "Load an existing Bus Layout." +msgstr "Учитај поÑтојећи Ð±Ð°Ñ Ñ€Ð°Ñпоред." + +#: editor/editor_audio_buses.cpp +#: editor/plugins/animation_player_editor_plugin.cpp +msgid "Save As" +msgstr "Сачувај као" + +#: editor/editor_audio_buses.cpp +msgid "Save this Bus Layout to a file." +msgstr "Сачувај овај Ð±Ð°Ñ Ñ€Ð°Ñпоред у датотеци." + +#: editor/editor_audio_buses.cpp editor/import_dock.cpp +msgid "Load Default" +msgstr "Учитај уобичајено" + +#: editor/editor_audio_buses.cpp +msgid "Load the default Bus Layout." +msgstr "Учитај уобичајен Ð±Ð°Ñ Ñ€Ð°Ñпоред." + +#: editor/editor_autoload_settings.cpp +msgid "Invalid name." +msgstr "Ðеважеће име." + +#: editor/editor_autoload_settings.cpp +msgid "Valid characters:" +msgstr "Важећа Ñлова:" + +#: editor/editor_autoload_settings.cpp +msgid "Invalid name. Must not collide with an existing engine class name." +msgstr "Ðеважеће име. Име је резервиÑано за поÑтојећу клаÑу." + +#: editor/editor_autoload_settings.cpp +msgid "Invalid name. Must not collide with an existing buit-in type name." +msgstr "Ðеважеће име. Име је резервиÑано за поÑтојећи уграђени тип." + +#: editor/editor_autoload_settings.cpp +msgid "Invalid name. Must not collide with an existing global constant name." +msgstr "Ðеважеће име. Име је резервиÑано за поÑтојећу глобалну конÑтанту." + +#: editor/editor_autoload_settings.cpp +msgid "Invalid Path." +msgstr "Ðеважећи пут." + +#: editor/editor_autoload_settings.cpp +msgid "File does not exist." +msgstr "Датотека не поÑтоји." + +#: editor/editor_autoload_settings.cpp +msgid "Not in resource path." +msgstr "Ðије на пут реÑурÑа." + +#: editor/editor_autoload_settings.cpp +msgid "Add AutoLoad" +msgstr "Додај аутоматÑко учитавање" + +#: editor/editor_autoload_settings.cpp +msgid "Autoload '%s' already exists!" +msgstr "ÐутоматÑко учитавање '%s' већ поÑтоји!" + +#: editor/editor_autoload_settings.cpp +msgid "Rename Autoload" +msgstr "Преименуј аутоматÑко учитавање" + +#: editor/editor_autoload_settings.cpp +msgid "Toggle AutoLoad Globals" +msgstr "Укљ./ИÑкљ. глобале аутоматÑког учитавања" + +#: editor/editor_autoload_settings.cpp +msgid "Move Autoload" +msgstr "Помери аутоматÑко учитавање" + +#: editor/editor_autoload_settings.cpp +msgid "Remove Autoload" +msgstr "Обриши аутоматÑко учитавање" + +#: editor/editor_autoload_settings.cpp +msgid "Enable" +msgstr "Укључи" + +#: editor/editor_autoload_settings.cpp +msgid "Rearrange Autoloads" +msgstr "Преуреди аутоматÑка учитавања" + +#: editor/editor_autoload_settings.cpp editor/editor_file_dialog.cpp +#: scene/gui/file_dialog.cpp +msgid "Path:" +msgstr "Пут:" + +#: editor/editor_autoload_settings.cpp +msgid "Node Name:" +msgstr "Име чвора:" + +#: editor/editor_autoload_settings.cpp editor/project_manager.cpp +msgid "Name" +msgstr "Име" + +#: editor/editor_autoload_settings.cpp +msgid "Singleton" +msgstr "Синглетон" + +#: editor/editor_autoload_settings.cpp +msgid "List:" +msgstr "ЛиÑта:" + +#: editor/editor_data.cpp +msgid "Updating Scene" +msgstr "Ðжурирање Ñцене" + +#: editor/editor_data.cpp +msgid "Storing local changes.." +msgstr "Чувам локалне промене..." + +#: editor/editor_data.cpp +msgid "Updating scene.." +msgstr "Ðжурирам Ñцену..." + +#: editor/editor_dir_dialog.cpp +msgid "Please select a base directory first" +msgstr "Молим, одаберите базни директоријум" + +#: editor/editor_dir_dialog.cpp +msgid "Choose a Directory" +msgstr "Одабери директоријум" + +#: editor/editor_dir_dialog.cpp editor/editor_file_dialog.cpp +#: editor/filesystem_dock.cpp scene/gui/file_dialog.cpp +msgid "Create Folder" +msgstr "Ðаправи директоријум" + +#: editor/editor_dir_dialog.cpp editor/editor_file_dialog.cpp +#: editor/editor_plugin_settings.cpp editor/filesystem_dock.cpp +#: editor/plugins/theme_editor_plugin.cpp editor/project_export.cpp +#: scene/gui/file_dialog.cpp +msgid "Name:" +msgstr "Име:" + +#: editor/editor_dir_dialog.cpp editor/editor_file_dialog.cpp +#: editor/filesystem_dock.cpp scene/gui/file_dialog.cpp +msgid "Could not create folder." +msgstr "ÐеуÑпех при прављењу директоријума." + +#: editor/editor_dir_dialog.cpp +msgid "Choose" +msgstr "Одабери" + +#: editor/editor_export.cpp +msgid "Storing File:" +msgstr "" + +#: editor/editor_export.cpp +msgid "Packing" +msgstr "Паковање" + +#: editor/editor_export.cpp platform/javascript/export/export.cpp +msgid "Template file not found:\n" +msgstr "ШаблонÑка датотека није пронађена:\n" + +#: editor/editor_file_dialog.cpp scene/gui/file_dialog.cpp +msgid "File Exists, Overwrite?" +msgstr "Датотека поÑтоји, препиши?" + +#: editor/editor_file_dialog.cpp scene/gui/file_dialog.cpp +msgid "All Recognized" +msgstr "Сви препознати" + +#: editor/editor_file_dialog.cpp scene/gui/file_dialog.cpp +msgid "All Files (*)" +msgstr "Све датотеке (*)" + +#: editor/editor_file_dialog.cpp scene/gui/file_dialog.cpp +msgid "Open a File" +msgstr "Отвори датотеку" + +#: editor/editor_file_dialog.cpp scene/gui/file_dialog.cpp +msgid "Open File(s)" +msgstr "Отвори датотеку/е" + +#: editor/editor_file_dialog.cpp scene/gui/file_dialog.cpp +msgid "Open a Directory" +msgstr "Отвори директоријум" + +#: editor/editor_file_dialog.cpp scene/gui/file_dialog.cpp +msgid "Open a File or Directory" +msgstr "Отвори датотеку или директоријум" + +#: editor/editor_file_dialog.cpp editor/editor_node.cpp +#: editor/plugins/animation_player_editor_plugin.cpp +#: editor/plugins/script_editor_plugin.cpp scene/gui/file_dialog.cpp +msgid "Save" +msgstr "Сачувај" + +#: editor/editor_file_dialog.cpp scene/gui/file_dialog.cpp +msgid "Save a File" +msgstr "Сачувај датотеку" + +#: editor/editor_file_dialog.cpp +msgid "Go Back" +msgstr "Ðатраг" + +#: editor/editor_file_dialog.cpp +msgid "Go Forward" +msgstr "Ðапред" + +#: editor/editor_file_dialog.cpp +msgid "Go Up" +msgstr "" + +#: editor/editor_file_dialog.cpp +msgid "Refresh" +msgstr "ОÑвежи" + +#: editor/editor_file_dialog.cpp +msgid "Toggle Hidden Files" +msgstr "Прикажи Ñакривене датотеке" + +#: editor/editor_file_dialog.cpp +msgid "Toggle Favorite" +msgstr "Прикажи омиљене" + +#: editor/editor_file_dialog.cpp +msgid "Toggle Mode" +msgstr "Промени режим" + +#: editor/editor_file_dialog.cpp +msgid "Focus Path" +msgstr "" + +#: editor/editor_file_dialog.cpp +msgid "Move Favorite Up" +msgstr "Помери нагоре омиљену" + +#: editor/editor_file_dialog.cpp +msgid "Move Favorite Down" +msgstr "Помери надоле омиљену" + +#: editor/editor_file_dialog.cpp +msgid "Go to parent folder" +msgstr "Иди у родитељÑки директоријум" + +#: editor/editor_file_dialog.cpp scene/gui/file_dialog.cpp +msgid "Directories & Files:" +msgstr "Директоријуми и датотеке:" + +#: editor/editor_file_dialog.cpp +msgid "Preview:" +msgstr "Преглед:" + +#: editor/editor_file_dialog.cpp editor/script_editor_debugger.cpp +#: scene/gui/file_dialog.cpp +msgid "File:" +msgstr "Датотека:" + +#: editor/editor_file_dialog.cpp scene/gui/file_dialog.cpp +msgid "Must use a valid extension." +msgstr "Мора Ñе кориÑтити важећа екÑтензија." + +#: editor/editor_file_system.cpp +msgid "ScanSources" +msgstr "" + +#: editor/editor_file_system.cpp +msgid "(Re)Importing Assets" +msgstr "(Поновно) Увожење ÑредÑтава" + +#: editor/editor_help.cpp editor/editor_node.cpp +#: editor/plugins/script_editor_plugin.cpp +msgid "Search Help" +msgstr "Потражи помоћ" + +#: editor/editor_help.cpp +msgid "Class List:" +msgstr "ЛиÑта клаÑа:" + +#: editor/editor_help.cpp +msgid "Search Classes" +msgstr "Потражи клаÑе" + +#: editor/editor_help.cpp editor/plugins/spatial_editor_plugin.cpp +msgid "Top" +msgstr "" + +#: editor/editor_help.cpp editor/property_editor.cpp +msgid "Class:" +msgstr "КлаÑа:" + +#: editor/editor_help.cpp editor/scene_tree_editor.cpp +msgid "Inherits:" +msgstr "ÐаÑлеђује:" + +#: editor/editor_help.cpp +msgid "Inherited by:" +msgstr "ÐаÑлеђено од:" + +#: editor/editor_help.cpp +msgid "Brief Description:" +msgstr "Кратак опиÑ:" + +#: editor/editor_help.cpp +msgid "Members" +msgstr "Чланови" + +#: editor/editor_help.cpp modules/visual_script/visual_script_editor.cpp +msgid "Members:" +msgstr "Чланови:" + +#: editor/editor_help.cpp +msgid "Public Methods" +msgstr "Јавне методе" + +#: editor/editor_help.cpp +msgid "Public Methods:" +msgstr "Јавне методе:" + +#: editor/editor_help.cpp +msgid "GUI Theme Items" +msgstr "Ставке теме графичког интерфејÑа" + +#: editor/editor_help.cpp +msgid "GUI Theme Items:" +msgstr "Ставке теме графичког интерфејÑа:" + +#: editor/editor_help.cpp modules/visual_script/visual_script_editor.cpp +msgid "Signals:" +msgstr "Сигнали:" + +#: editor/editor_help.cpp +msgid "Enumerations" +msgstr "Енумерације" + +#: editor/editor_help.cpp +msgid "Enumerations:" +msgstr "Енумерације:" + +#: editor/editor_help.cpp +msgid "enum " +msgstr "enum " + +#: editor/editor_help.cpp +msgid "Constants" +msgstr "КонÑтанте" + +#: editor/editor_help.cpp +msgid "Constants:" +msgstr "КонÑтанте:" + +#: editor/editor_help.cpp +msgid "Description" +msgstr "ОпиÑ" + +#: editor/editor_help.cpp +msgid "Properties" +msgstr "ОÑобине" + +#: editor/editor_help.cpp +msgid "Property Description:" +msgstr "ÐžÐ¿Ð¸Ñ Ð¾Ñобине:" + +#: editor/editor_help.cpp +msgid "" +"There is currently no description for this property. Please help us by " +"[color=$color][url=$url]contributing one[/url][/color]!" +msgstr "" +"Тренутно нема опиÑа ове оÑобине. Молимо помозите нама тако што ћете [color=" +"$color][url=$url]напиÑати једну[/url][/color]!" + +#: editor/editor_help.cpp +msgid "Methods" +msgstr "Методе" + +#: editor/editor_help.cpp +msgid "Method Description:" +msgstr "ÐžÐ¿Ð¸Ñ Ð¼ÐµÑ‚Ð¾Ð´Ðµ:" + +#: editor/editor_help.cpp +msgid "" +"There is currently no description for this method. Please help us by [color=" +"$color][url=$url]contributing one[/url][/color]!" +msgstr "" +"Тренутно нема опиÑа ове методе. Молимо помозите нама тако што ћете [color=" +"$color][url=$url]напиÑати једну[/url][/color]!" + +#: editor/editor_help.cpp +msgid "Search Text" +msgstr "Потражи текÑÑ‚" + +#: editor/editor_log.cpp +msgid "Output:" +msgstr "Излаз:" + +#: editor/editor_log.cpp editor/plugins/animation_tree_editor_plugin.cpp +#: editor/property_editor.cpp editor/script_editor_debugger.cpp +#: scene/gui/line_edit.cpp scene/gui/text_edit.cpp +msgid "Clear" +msgstr "Обриши" + +#: editor/editor_node.cpp editor/plugins/animation_player_editor_plugin.cpp +msgid "Error saving resource!" +msgstr "Грешка при чувању реÑурÑа!" + +#: editor/editor_node.cpp editor/plugins/animation_player_editor_plugin.cpp +msgid "Save Resource As.." +msgstr "Сачувај реÑÑƒÑ€Ñ ÐºÐ°Ð¾..." + +#: editor/editor_node.cpp editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp editor/scene_tree_dock.cpp +msgid "I see.." +msgstr "Разумем..." + +#: editor/editor_node.cpp +msgid "Can't open file for writing:" +msgstr "Ðе могу отворити датотеку за пиÑање:" + +#: editor/editor_node.cpp +msgid "Requested file format unknown:" +msgstr "Тражени формат датотеке је непознат:" + +#: editor/editor_node.cpp +msgid "Error while saving." +msgstr "Грешка при чувању." + +#: editor/editor_node.cpp +msgid "Can't open '%s'." +msgstr "Ðе могу отворити '%s'." + +#: editor/editor_node.cpp +msgid "Error while parsing '%s'." +msgstr "Грешка при анализирању '%s'." + +#: editor/editor_node.cpp +msgid "Unexpected end of file '%s'." +msgstr "Ðеочекивани крај датотеке '%s'." + +#: editor/editor_node.cpp +msgid "Missing '%s' or its dependencies." +msgstr "ÐедоÑтаје '%s' или његове завиÑноÑти." + +#: editor/editor_node.cpp +msgid "Error while loading '%s'." +msgstr "Грешка при учитавању '%s'." + +#: editor/editor_node.cpp +msgid "Saving Scene" +msgstr "Чување Ñцене" + +#: editor/editor_node.cpp +msgid "Analyzing" +msgstr "Ðнализирање" + +#: editor/editor_node.cpp +msgid "Creating Thumbnail" +msgstr "Прављење приказа" + +#: editor/editor_node.cpp +msgid "This operation can't be done without a tree root." +msgstr "Ова операција Ñе не може обавити без корена дрвета." + +#: editor/editor_node.cpp +msgid "" +"Couldn't save scene. Likely dependencies (instances) couldn't be satisfied." +msgstr "Ðе могу Ñачувати Ñцену. Вероватно завиÑноÑти ниÑу задовољене." + +#: editor/editor_node.cpp +msgid "Failed to load resource." +msgstr "Грешка при учитавању реÑурÑа." + +#: editor/editor_node.cpp +msgid "Can't load MeshLibrary for merging!" +msgstr "Ðе могу учитати MeshLibrary за Ñпајање!" + +#: editor/editor_node.cpp +msgid "Error saving MeshLibrary!" +msgstr "Грешка при чувању MeshLibrary!" + +#: editor/editor_node.cpp +msgid "Can't load TileSet for merging!" +msgstr "Ðе могу учитати TileSet за Ñпајање!" + +#: editor/editor_node.cpp +msgid "Error saving TileSet!" +msgstr "Грешка при чувању TileSet!" + +#: editor/editor_node.cpp +msgid "Error trying to save layout!" +msgstr "Грешка при чувању раÑпореда!" + +#: editor/editor_node.cpp +msgid "Default editor layout overridden." +msgstr "Уобичајен раÑпоред је преуређен." + +#: editor/editor_node.cpp +msgid "Layout name not found!" +msgstr "Име раÑпореда није пронађен!" + +#: editor/editor_node.cpp +msgid "Restored default layout to base settings." +msgstr "" + +#: editor/editor_node.cpp +msgid "" +"This resource belongs to a scene that was imported, so it's not editable.\n" +"Please read the documentation relevant to importing scenes to better " +"understand this workflow." +msgstr "" +"Овај реÑÑƒÑ€Ñ Ð¿Ñ€Ð¸Ð¿Ð°Ð´Ð° Ñцени која је увезена, тако да Ñе не може мењати.\n" +"Молим, прочитајте документацију за увожење Ñцена како би боље разумели овај " +"начин рада." + +#: editor/editor_node.cpp +msgid "" +"This resource belongs to a scene that was instanced or inherited.\n" +"Changes to it will not be kept when saving the current scene." +msgstr "" +"Овај реÑÑƒÑ€Ñ Ð¿Ñ€Ð¸Ð¿Ð°Ð´Ð° Ñцени која је или коришћена или наÑлеђена.\n" +"Промене нећу бити задржане при чувању тренутне Ñцене." + +#: editor/editor_node.cpp +msgid "" +"This resource was imported, so it's not editable. Change its settings in the " +"import panel and then re-import." +msgstr "" +"Овај реÑÑƒÑ€Ñ Ñ˜Ðµ увезен, тако да га није могуће изменити. Промените његове " +"поÑтавке у прозору за увоз и онда га поново унеÑите." + +#: editor/editor_node.cpp +msgid "" +"This scene was imported, so changes to it will not be kept.\n" +"Instancing it or inheriting will allow making changes to it.\n" +"Please read the documentation relevant to importing scenes to better " +"understand this workflow." +msgstr "" +"Ова Ñцена је увезена, тако да њене промене Ñе нећу задржати.\n" +"Њено коришћење или наÑлеђивање ће омогућити прављење промена над њом.\n" +"Молим, прочитајте документацију за увоз Ñцена како би боље размели овај " +"начин рада." + +#: editor/editor_node.cpp +#, fuzzy +msgid "" +"This is a remote object so changes to it will not be kept.\n" +"Please read the documentation relevant to debugging to better understand " +"this workflow." +msgstr "" +"Овај реÑÑƒÑ€Ñ Ð¿Ñ€Ð¸Ð¿Ð°Ð´Ð° Ñцени која је увезена, тако да Ñе не може мењати.\n" +"Молим, прочитајте документацију за увожење Ñцена како би боље разумели овај " +"начин рада." + +#: editor/editor_node.cpp +msgid "Copy Params" +msgstr "Копирај параметре" + +#: editor/editor_node.cpp +msgid "Paste Params" +msgstr "Ðалепи параметре" + +#: editor/editor_node.cpp editor/plugins/resource_preloader_editor_plugin.cpp +msgid "Paste Resource" +msgstr "Ðалепи реÑурÑе" + +#: editor/editor_node.cpp +msgid "Copy Resource" +msgstr "Копирај реÑурÑе" + +#: editor/editor_node.cpp +msgid "Make Built-In" +msgstr "Ðаправи уграђеним" + +#: editor/editor_node.cpp +msgid "Make Sub-Resources Unique" +msgstr "Ðаправи под-реÑÑƒÑ€Ñ Ñ˜ÐµÐ´Ð¸Ð½Ñтвеним" + +#: editor/editor_node.cpp +msgid "Open in Help" +msgstr "Отвори у прозору за помоћ" + +#: editor/editor_node.cpp +msgid "There is no defined scene to run." +msgstr "Ðе поÑтоји дефиниÑана Ñцена за покретање." + +#: editor/editor_node.cpp +msgid "" +"No main scene has ever been defined, select one?\n" +"You can change it later in \"Project Settings\" under the 'application' " +"category." +msgstr "" +"Главна Ñцена није дефиниÑана, одаберите једну?\n" +"Можете је променити каÑније у „ПоÑтавке пројекта“ иÑпод категорије " +"„апликација“." + +#: editor/editor_node.cpp +msgid "" +"Selected scene '%s' does not exist, select a valid one?\n" +"You can change it later in \"Project Settings\" under the 'application' " +"category." +msgstr "" +"Одабрана Ñцена '%s' не поÑтоји, одаберите важећу?\n" +"Можете је променити каÑније у „ПоÑтавке пројекта“ иÑпод категорије " +"„апликација“." + +#: editor/editor_node.cpp +msgid "" +"Selected scene '%s' is not a scene file, select a valid one?\n" +"You can change it later in \"Project Settings\" under the 'application' " +"category." +msgstr "" +"Одабрана Ñцена '%s' није датотека Ñцене, одаберите бажећу?\n" +"Можете је променити каÑније у „ПоÑтавке пројекта“ иÑпод категорије " +"„апликација“." + +#: editor/editor_node.cpp +msgid "Current scene was never saved, please save it prior to running." +msgstr "Тренутна Ñцена није Ñачувана, молим Ñачувајте је пре покретања." + +#: editor/editor_node.cpp +msgid "Could not start subprocess!" +msgstr "Ðе могу покренути подпроцеÑ!" + +#: editor/editor_node.cpp +msgid "Open Scene" +msgstr "Отвори Ñцену" + +#: editor/editor_node.cpp +msgid "Open Base Scene" +msgstr "Отвори базну Ñцену" + +#: editor/editor_node.cpp +msgid "Quick Open Scene.." +msgstr "Брзо отварање Ñцене..." + +#: editor/editor_node.cpp +msgid "Quick Open Script.." +msgstr "Брзо отварање Ñкриптице..." + +#: editor/editor_node.cpp +msgid "Save & Close" +msgstr "Сачувај и затвори" + +#: editor/editor_node.cpp +msgid "Save changes to '%s' before closing?" +msgstr "Сачувај промене '%s' пре излаÑка?" + +#: editor/editor_node.cpp +msgid "Save Scene As.." +msgstr "Сачувај Ñцену као..." + +#: editor/editor_node.cpp +msgid "No" +msgstr "Ðе" + +#: editor/editor_node.cpp +msgid "Yes" +msgstr "Да" + +#: editor/editor_node.cpp +msgid "This scene has never been saved. Save before running?" +msgstr "Ова Ñцена није Ñачувана. Сачувај пре покретања?" + +#: editor/editor_node.cpp editor/scene_tree_dock.cpp +msgid "This operation can't be done without a scene." +msgstr "Ова операција Ñе не може обавити без Ñцене." + +#: editor/editor_node.cpp +msgid "Export Mesh Library" +msgstr "Извези Mesh Library" + +#: editor/editor_node.cpp +#, fuzzy +msgid "This operation can't be done without a root node." +msgstr "Ова операција Ñе не може обавити без одабраног чвора." + +#: editor/editor_node.cpp +msgid "Export Tile Set" +msgstr "Извези Tile Set" + +#: editor/editor_node.cpp +msgid "This operation can't be done without a selected node." +msgstr "Ова операција Ñе не може обавити без одабраног чвора." + +#: editor/editor_node.cpp +msgid "Current scene not saved. Open anyway?" +msgstr "Тренутна Ñцена није Ñачувана. Ипак отвори?" + +#: editor/editor_node.cpp +msgid "Can't reload a scene that was never saved." +msgstr "Ðе могу поново учитати Ñцену која није Ñачувана." + +#: editor/editor_node.cpp +msgid "Revert" +msgstr "Врати" + +#: editor/editor_node.cpp +msgid "This action cannot be undone. Revert anyway?" +msgstr "Ова акција Ñе не може опозвати. ÐаÑтави?" + +#: editor/editor_node.cpp +msgid "Quick Run Scene.." +msgstr "Брзо покретање Ñцене..." + +#: editor/editor_node.cpp +msgid "Quit" +msgstr "Изађи" + +#: editor/editor_node.cpp +msgid "Exit the editor?" +msgstr "Изађи из уредника?" + +#: editor/editor_node.cpp +msgid "Open Project Manager?" +msgstr "Отвори менаџер пројекта?" + +#: editor/editor_node.cpp +msgid "Save & Quit" +msgstr "Сачувај и изађи" + +#: editor/editor_node.cpp +msgid "Save changes to the following scene(s) before quitting?" +msgstr "Сачувај промене тренутне Ñцене/а пре излазка?" + +#: editor/editor_node.cpp +msgid "Save changes the following scene(s) before opening Project Manager?" +msgstr "Сачувај промене тренутне Ñцене/а пре отварање менаџера пројекта?" + +#: editor/editor_node.cpp +msgid "" +"This option is deprecated. Situations where refresh must be forced are now " +"considered a bug. Please report." +msgstr "" +"Ова опција је заÑтарела. Ситуације код којих оÑвежавање је неопходно Ñу Ñада " +"грешке. Молимо пријавите ову грешку." + +#: editor/editor_node.cpp +msgid "Pick a Main Scene" +msgstr "Одабери главну Ñцену" + +#: editor/editor_node.cpp +msgid "Unable to enable addon plugin at: '%s' parsing of config failed." +msgstr "ÐеуÑпех при прикључивању додатка због конфигурационе датотеке: '%s'." + +#: editor/editor_node.cpp +msgid "Unable to find script field for addon plugin at: 'res://addons/%s'." +msgstr "ÐеуÑпех при налажењу поља за Ñкриптицу у додатку „res://addons/%s“." + +#: editor/editor_node.cpp +msgid "Unable to load addon script from path: '%s'." +msgstr "ÐеуÑпех при учитавању Ñкриптице додатка Ñа путем „%s“." + +#: editor/editor_node.cpp +msgid "" +"Unable to load addon script from path: '%s' Base type is not EditorPlugin." +msgstr "" +"ÐеуÑпех при учитавању Ñкриптице додатка Ñа путем „%s“. Базни тип није " +"EditorPlugin." + +#: editor/editor_node.cpp +msgid "Unable to load addon script from path: '%s' Script is not in tool mode." +msgstr "" +"ÐеуÑпех при учитавању Ñкриптице додатка Ñа путем „%s“. Скриптица није у " +"режиму алатке." + +#: editor/editor_node.cpp +msgid "" +"Scene '%s' was automatically imported, so it can't be modified.\n" +"To make changes to it, a new inherited scene can be created." +msgstr "" +"Сцена „%s“ је аутоматÑки увезена, тако да Ñе не може мењати.\n" +"За извршавања измена, направите нову наÑлеђену Ñцену." + +#: editor/editor_node.cpp editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp editor/scene_tree_dock.cpp +msgid "Ugh" +msgstr "Уф" + +#: editor/editor_node.cpp +msgid "" +"Error loading scene, it must be inside the project path. Use 'Import' to " +"open the scene, then save it inside the project path." +msgstr "" +"Грешка при учитавању Ñцене. Сцена мора бити унутар директоријума пројекта. " +"КориÑтите „Увоз“ за отварање Ñцене, онда је Ñачувајте у директоријуму " +"пројекта." + +#: editor/editor_node.cpp +msgid "Scene '%s' has broken dependencies:" +msgstr "Сцена „%s“ има покварене завиÑноÑти:" + +#: editor/editor_node.cpp +msgid "Clear Recent Scenes" +msgstr "ОчиÑти недавне Ñцене" + +#: editor/editor_node.cpp +msgid "Save Layout" +msgstr "Сачувај раÑпоред" + +#: editor/editor_node.cpp +msgid "Delete Layout" +msgstr "Обирши раÑпоред" + +#: editor/editor_node.cpp editor/import_dock.cpp +#: editor/script_create_dialog.cpp +msgid "Default" +msgstr "Уобичајено" + +#: editor/editor_node.cpp +msgid "Switch Scene Tab" +msgstr "" + +#: editor/editor_node.cpp +#, fuzzy +msgid "%d more files or folders" +msgstr "још %d датотека/е или директоријум/а" + +#: editor/editor_node.cpp +#, fuzzy +msgid "%d more folders" +msgstr "још %d датотека/е" + +#: editor/editor_node.cpp +#, fuzzy +msgid "%d more files" +msgstr "још %d датотека/е" + +#: editor/editor_node.cpp +msgid "Dock Position" +msgstr "" + +#: editor/editor_node.cpp +msgid "Distraction Free Mode" +msgstr "Режим без Ñметње" + +#: editor/editor_node.cpp +msgid "Toggle distraction-free mode." +msgstr "Укљ./ИÑкљ. режим без Ñметње." + +#: editor/editor_node.cpp +#, fuzzy +msgid "Add a new scene." +msgstr "Додај нове траке." + +#: editor/editor_node.cpp +msgid "Scene" +msgstr "Сцена" + +#: editor/editor_node.cpp +msgid "Go to previously opened scene." +msgstr "Отвори претходну Ñцену." + +#: editor/editor_node.cpp +msgid "Next tab" +msgstr "" + +#: editor/editor_node.cpp +msgid "Previous tab" +msgstr "" + +#: editor/editor_node.cpp +msgid "Filter Files.." +msgstr "Филтрирај датотеке..." + +#: editor/editor_node.cpp +msgid "Operations with scene files." +msgstr "Операције Ñа датотекама Ñцена." + +#: editor/editor_node.cpp +msgid "New Scene" +msgstr "Ðова Ñцена" + +#: editor/editor_node.cpp +msgid "New Inherited Scene.." +msgstr "Ðова наÑлеђена Ñцена..." + +#: editor/editor_node.cpp +msgid "Open Scene.." +msgstr "Отвори Ñцену..." + +#: editor/editor_node.cpp +msgid "Save Scene" +msgstr "Сачувај Ñцену" + +#: editor/editor_node.cpp +msgid "Save all Scenes" +msgstr "Сачувај Ñве Ñцене" + +#: editor/editor_node.cpp +msgid "Close Scene" +msgstr "Затвори Ñцену" + +#: editor/editor_node.cpp editor/plugins/script_editor_plugin.cpp +msgid "Open Recent" +msgstr "Отвори недавно коришћено" + +#: editor/editor_node.cpp +msgid "Convert To.." +msgstr "Конвертуј у..." + +#: editor/editor_node.cpp +msgid "MeshLibrary.." +msgstr "MeshLibrary..." + +#: editor/editor_node.cpp +msgid "TileSet.." +msgstr "TileSet..." + +#: editor/editor_node.cpp editor/plugins/script_text_editor.cpp +#: scene/gui/line_edit.cpp scene/gui/text_edit.cpp +msgid "Undo" +msgstr "Опозови" + +#: editor/editor_node.cpp editor/plugins/script_text_editor.cpp +#: scene/gui/line_edit.cpp +msgid "Redo" +msgstr "Поново уради" + +#: editor/editor_node.cpp +msgid "Revert Scene" +msgstr "Поврати Ñцену" + +#: editor/editor_node.cpp +msgid "Miscellaneous project or scene-wide tools." +msgstr "Разни алати за пројекат или Ñцену." + +#: editor/editor_node.cpp +msgid "Project" +msgstr "Пројекат" + +#: editor/editor_node.cpp +msgid "Project Settings" +msgstr "ПоÑтавке пројекта" + +#: editor/editor_node.cpp +msgid "Run Script" +msgstr "Покрени Ñкриптицу" + +#: editor/editor_node.cpp editor/project_export.cpp +msgid "Export" +msgstr "Извоз" + +#: editor/editor_node.cpp +msgid "Tools" +msgstr "Ðлати" + +#: editor/editor_node.cpp +msgid "Quit to Project List" +msgstr "Изађи у лиÑту пројекта" + +#: editor/editor_node.cpp editor/plugins/script_editor_plugin.cpp +msgid "Debug" +msgstr "Дебаг" + +#: editor/editor_node.cpp +msgid "Deploy with Remote Debug" +msgstr "Извршити Ñа удаљеним дебагом" + +#: editor/editor_node.cpp +msgid "" +"When exporting or deploying, the resulting executable will attempt to " +"connect to the IP of this computer in order to be debugged." +msgstr "" +"При извозу или извршавању, крајља датотека ће покушати да Ñе повеже Ñа " +"адреÑом овог рачунара како би Ñе могла дебаговати." + +#: editor/editor_node.cpp +msgid "Small Deploy with Network FS" +msgstr "" + +#: editor/editor_node.cpp +msgid "" +"When this option is enabled, export or deploy will produce a minimal " +"executable.\n" +"The filesystem will be provided from the project by the editor over the " +"network.\n" +"On Android, deploy will use the USB cable for faster performance. This " +"option speeds up testing for games with a large footprint." +msgstr "" +"Када је ова опција укључена, извоз ће правити датотеку најмање могуће " +"величине.\n" +"Датотечни ÑиÑтем ће бити обезбеђен од Ñтране пројекта преко мреже.\n" +"Ðа Android, извршавање ће кориÑтити USB кабл за бржу перфоманцу. Ова опција " +"убрзава теÑтирање великих игра." + +#: editor/editor_node.cpp +msgid "Visible Collision Shapes" +msgstr "Видљиви облици Ñудара" + +#: editor/editor_node.cpp +msgid "" +"Collision shapes and raycast nodes (for 2D and 3D) will be visible on the " +"running game if this option is turned on." +msgstr "" +"Облици Ñудара и чворова зракова (за 2Д и 3Д) ћу бити видљиви током игре ако " +"је ова опција укључена." + +#: editor/editor_node.cpp +msgid "Visible Navigation" +msgstr "Видљива навигација" + +#: editor/editor_node.cpp +msgid "" +"Navigation meshes and polygons will be visible on the running game if this " +"option is turned on." +msgstr "" +"Ðавигационе мреже и полигони ће бити видљиви током игре ако је ова опција " +"укључена." + +#: editor/editor_node.cpp +msgid "Sync Scene Changes" +msgstr "Синхронизуј промене Ñцене" + +#: editor/editor_node.cpp +msgid "" +"When this option is turned on, any changes made to the scene in the editor " +"will be replicated in the running game.\n" +"When used remotely on a device, this is more efficient with network " +"filesystem." +msgstr "" +"Када је ова опција укључена, Ñве промене Ñцене ће бити приказане у " +"покренутој игри.\n" +"Када је ово коришћено на удаљеном уређају, ово је много ефикаÑније Ñа " +"мрежним датотечним ÑиÑтемом." + +#: editor/editor_node.cpp +msgid "Sync Script Changes" +msgstr "Синхронизуј промене Ñкриптица" + +#: editor/editor_node.cpp +msgid "" +"When this option is turned on, any script that is saved will be reloaded on " +"the running game.\n" +"When used remotely on a device, this is more efficient with network " +"filesystem." +msgstr "" +"Када је ова опција укључена, Ñве Ñкриптице које Ñе Ñачувају ће бити поново " +"учитане у покренутој игри.\n" +"Када је ово коришћено на удаљеном уређају, ово је много ефикаÑније Ñа " +"мрежним датотечним ÑиÑтемом." + +#: editor/editor_node.cpp +msgid "Editor" +msgstr "Уредник" + +#: editor/editor_node.cpp editor/settings_config_dialog.cpp +msgid "Editor Settings" +msgstr "ПоÑтавке уредника" + +#: editor/editor_node.cpp +msgid "Editor Layout" +msgstr "РаÑпоред уредника" + +#: editor/editor_node.cpp +msgid "Toggle Fullscreen" +msgstr "Укљ./ИÑкљ. режим целог екрана" + +#: editor/editor_node.cpp editor/project_export.cpp +msgid "Manage Export Templates" +msgstr "Управљај извозним шаблонима" + +#: editor/editor_node.cpp +msgid "Help" +msgstr "Помоћ" + +#: editor/editor_node.cpp editor/plugins/script_editor_plugin.cpp +msgid "Classes" +msgstr "КлаÑе" + +#: editor/editor_node.cpp editor/plugins/script_editor_plugin.cpp +msgid "Online Docs" +msgstr "Онлајн документација" + +#: editor/editor_node.cpp +msgid "Q&A" +msgstr "Питања и одговори" + +#: editor/editor_node.cpp +msgid "Issue Tracker" +msgstr "Пратилац грешака" + +#: editor/editor_node.cpp editor/plugins/asset_library_editor_plugin.cpp +msgid "Community" +msgstr "Заједница" + +#: editor/editor_node.cpp +msgid "About" +msgstr "О програму" + +#: editor/editor_node.cpp +msgid "Play the project." +msgstr "Покрени пројекат." + +#: editor/editor_node.cpp +msgid "Play" +msgstr "Покрени" + +#: editor/editor_node.cpp +msgid "Pause the scene" +msgstr "Паузирај Ñцену" + +#: editor/editor_node.cpp +msgid "Pause Scene" +msgstr "Паузирај Ñцену" + +#: editor/editor_node.cpp +msgid "Stop the scene." +msgstr "ЗауÑави Ñцену." + +#: editor/editor_node.cpp +msgid "Stop" +msgstr "ЗауÑтави" + +#: editor/editor_node.cpp +msgid "Play the edited scene." +msgstr "Покрени промењену Ñцену." + +#: editor/editor_node.cpp +msgid "Play Scene" +msgstr "Покрени Ñцену" + +#: editor/editor_node.cpp +msgid "Play custom scene" +msgstr "Покрени Ñпецифичну Ñцену" + +#: editor/editor_node.cpp +msgid "Play Custom Scene" +msgstr "Покрени Ñпецифичну Ñцену" + +#: editor/editor_node.cpp +msgid "Spins when the editor window repaints!" +msgstr "" + +#: editor/editor_node.cpp +msgid "Update Always" +msgstr "Увек ажурирај" + +#: editor/editor_node.cpp +msgid "Update Changes" +msgstr "Ðжурирај промене" + +#: editor/editor_node.cpp +msgid "Disable Update Spinner" +msgstr "ИÑкључи индикатор ажурирања" + +#: editor/editor_node.cpp +msgid "Inspector" +msgstr "ИнÑпектор" + +#: editor/editor_node.cpp +msgid "Create a new resource in memory and edit it." +msgstr "Ðаправи нови реÑÑƒÑ€Ñ Ñƒ меморији и измени га." + +#: editor/editor_node.cpp +msgid "Load an existing resource from disk and edit it." +msgstr "Учитај поÑтојећи реÑÑƒÑ€Ñ Ñа диÑка и измени га." + +#: editor/editor_node.cpp +msgid "Save the currently edited resource." +msgstr "Сачувај тренутно измењени реÑурÑ." + +#: editor/editor_node.cpp editor/plugins/script_editor_plugin.cpp +msgid "Save As.." +msgstr "Сачувај као..." + +#: editor/editor_node.cpp +msgid "Go to the previous edited object in history." +msgstr "Иди на претходно измењен објекат у иÑторијату." + +#: editor/editor_node.cpp +msgid "Go to the next edited object in history." +msgstr "Иди на Ñледећи измењени објекат у иÑторијату." + +#: editor/editor_node.cpp +msgid "History of recently edited objects." +msgstr "ИÑторијат недавно измењених објеката." + +#: editor/editor_node.cpp +msgid "Object properties." +msgstr "ПоÑтавке објекта." + +#: editor/editor_node.cpp +msgid "Changes may be lost!" +msgstr "Промене Ñе могу изгубити!" + +#: editor/editor_node.cpp editor/plugins/asset_library_editor_plugin.cpp +#: editor/project_manager.cpp +msgid "Import" +msgstr "Увоз" + +#: editor/editor_node.cpp +msgid "FileSystem" +msgstr "Датотечни ÑиÑтем" + +#: editor/editor_node.cpp editor/node_dock.cpp +msgid "Node" +msgstr "Чвор" + +#: editor/editor_node.cpp +msgid "Output" +msgstr "Излаз" + +#: editor/editor_node.cpp +msgid "Don't Save" +msgstr "Ðемој Ñачувати" + +#: editor/editor_node.cpp +msgid "Import Templates From ZIP File" +msgstr "Увези шаблоне из ZIP датотеке" + +#: editor/editor_node.cpp editor/project_export.cpp +msgid "Export Project" +msgstr "Извези пројекат" + +#: editor/editor_node.cpp +msgid "Export Library" +msgstr "Извези библиотеку" + +#: editor/editor_node.cpp +msgid "Merge With Existing" +msgstr "Споји Ñа поÑтојећим" + +#: editor/editor_node.cpp +msgid "Password:" +msgstr "Лозинка:" + +#: editor/editor_node.cpp +msgid "Open & Run a Script" +msgstr "Отвори и покрени Ñкриптицу" + +#: editor/editor_node.cpp +msgid "New Inherited" +msgstr "Ðова наÑлеђена" + +#: editor/editor_node.cpp +msgid "Load Errors" +msgstr "Учитај грешке" + +#: editor/editor_node.cpp editor/plugins/tile_map_editor_plugin.cpp +msgid "Select" +msgstr "Одабери" + +#: editor/editor_node.cpp +msgid "Open 2D Editor" +msgstr "Отвори 2Д уредник" + +#: editor/editor_node.cpp +msgid "Open 3D Editor" +msgstr "Отвори 3Д уредник" + +#: editor/editor_node.cpp +msgid "Open Script Editor" +msgstr "Отвори уредник Ñкриптица" + +#: editor/editor_node.cpp +msgid "Open Asset Library" +msgstr "Отвори библиотеку ÑредÑтва" + +#: editor/editor_node.cpp +msgid "Open the next Editor" +msgstr "Отвори Ñледећи уредник" + +#: editor/editor_node.cpp +msgid "Open the previous Editor" +msgstr "Отвори претходни уредник" + +#: editor/editor_plugin.cpp +msgid "Creating Mesh Previews" +msgstr "Ðаправи приказ мрежа" + +#: editor/editor_plugin.cpp +msgid "Thumbnail.." +msgstr "Сличица..." + +#: editor/editor_plugin_settings.cpp +msgid "Installed Plugins:" +msgstr "ИнÑталирани прикључци:" + +#: editor/editor_plugin_settings.cpp +msgid "Update" +msgstr "Ðжурирај" + +#: editor/editor_plugin_settings.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Version:" +msgstr "Верзија:" + +#: editor/editor_plugin_settings.cpp +msgid "Author:" +msgstr "Ðутор:" + +#: editor/editor_plugin_settings.cpp +msgid "Status:" +msgstr "СтатуÑ:" + +#: editor/editor_profiler.cpp +msgid "Stop Profiling" +msgstr "ЗауÑтави профилирање" + +#: editor/editor_profiler.cpp +msgid "Start Profiling" +msgstr "Покрени профилирање" + +#: editor/editor_profiler.cpp +msgid "Measure:" +msgstr "Мера:" + +#: editor/editor_profiler.cpp +msgid "Frame Time (sec)" +msgstr "Време Ñлике (Ñек.)" + +#: editor/editor_profiler.cpp +msgid "Average Time (sec)" +msgstr "Средње време (Ñек.)" + +#: editor/editor_profiler.cpp +msgid "Frame %" +msgstr "Слика %" + +#: editor/editor_profiler.cpp +msgid "Physics Frame %" +msgstr "Слика физике %" + +#: editor/editor_profiler.cpp editor/script_editor_debugger.cpp +msgid "Time:" +msgstr "Време:" + +#: editor/editor_profiler.cpp +msgid "Inclusive" +msgstr "Закључно" + +#: editor/editor_profiler.cpp +msgid "Self" +msgstr "Сам" + +#: editor/editor_profiler.cpp +msgid "Frame #:" +msgstr "Слика број:" + +#: editor/editor_run_native.cpp +msgid "Select device from the list" +msgstr "Одабери уређај Ñа лиÑте" + +#: editor/editor_run_native.cpp +msgid "" +"No runnable export preset found for this platform.\n" +"Please add a runnable preset in the export menu." +msgstr "" +"ÐиÑу пронађене поÑтавке извоза за ову платформу.\n" +"Молим, додајте поÑтавке у менију за извоз." + +#: editor/editor_run_script.cpp +msgid "Write your logic in the _run() method." +msgstr "Пиши логику у _run() методи." + +#: editor/editor_run_script.cpp +msgid "There is an edited scene already." +msgstr "Већ поÑтоји уређена Ñцена." + +#: editor/editor_run_script.cpp +msgid "Couldn't instance script:" +msgstr "ÐеуÑпех при прављењу Ñкриптице:" + +#: editor/editor_run_script.cpp +msgid "Did you forget the 'tool' keyword?" +msgstr "Да ли Ñте заборавили кључну реч „tool“?" + +#: editor/editor_run_script.cpp +msgid "Couldn't run script:" +msgstr "ÐеуÑпех при покретању Ñкриптице:" + +#: editor/editor_run_script.cpp +msgid "Did you forget the '_run' method?" +msgstr "Да ли Ñте заборавили методу „_run“?" + +#: editor/editor_settings.cpp +msgid "Default (Same as Editor)" +msgstr "Уобичајено (као и уредник)" + +#: editor/editor_sub_scene.cpp +msgid "Select Node(s) to Import" +msgstr "Одабери чвор/ове за увоз" + +#: editor/editor_sub_scene.cpp +msgid "Scene Path:" +msgstr "Пут Ñцене:" + +#: editor/editor_sub_scene.cpp +msgid "Import From Node:" +msgstr "Увоз преко чвора:" + +#: editor/export_template_manager.cpp +msgid "Re-Download" +msgstr "Поновно преузимање" + +#: editor/export_template_manager.cpp +msgid "Uninstall" +msgstr "ДеинÑталирај" + +#: editor/export_template_manager.cpp +msgid "(Installed)" +msgstr "(инÑталирано)" + +#: editor/export_template_manager.cpp +msgid "Download" +msgstr "Преучми" + +#: editor/export_template_manager.cpp +msgid "(Missing)" +msgstr "(ÐедоÑтаје)" + +#: editor/export_template_manager.cpp +msgid "(Current)" +msgstr "(Тренутно)" + +#: editor/export_template_manager.cpp +msgid "Retrieving mirrors, please wait.." +msgstr "" + +#: editor/export_template_manager.cpp +msgid "Remove template version '%s'?" +msgstr "Обриши шаблон верзије „%s“?" + +#: editor/export_template_manager.cpp +msgid "Can't open export templates zip." +msgstr "Ðе могу отворити ZIP датотеку Ñа извозним шаблонима." + +#: editor/export_template_manager.cpp +msgid "Invalid version.txt format inside templates." +msgstr "Ðеважећи формат датотеке version.txt унутар шаблона." + +#: editor/export_template_manager.cpp +msgid "" +"Invalid version.txt format inside templates. Revision is not a valid " +"identifier." +msgstr "" +"Ðеважећи формат датотеке „version.txt“ унутар шаблона. „Revision“ није " +"важећи идентификатор." + +#: editor/export_template_manager.cpp +msgid "No version.txt found inside templates." +msgstr "„version.txt“ није пронаћен у шаблону." + +#: editor/export_template_manager.cpp +msgid "Error creating path for templates:\n" +msgstr "Грешка при прављењу пута за шаблоне:\n" + +#: editor/export_template_manager.cpp +msgid "Extracting Export Templates" +msgstr "Отпакивање извозних шаблона" + +#: editor/export_template_manager.cpp +msgid "Importing:" +msgstr "Увожење:" + +#: editor/export_template_manager.cpp +msgid "" +"No download links found for this version. Direct download is only available " +"for official releases." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Can't resolve." +msgstr "Ðе могу решити." + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Can't connect." +msgstr "Ðе могу Ñе повезати." + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "No response." +msgstr "Ðема одговора." + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Req. Failed." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Redirect Loop." +msgstr "Петља преуÑмерења." + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Failed:" +msgstr "ÐеуÑпех:" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Can't write file." +msgstr "Ðе могу решити." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Download Complete." +msgstr "Грешка при преузимању" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Error requesting url: " +msgstr "Грешка при захтеву" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Connecting to Mirror.." +msgstr "Повезивање..." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Disconnected" +msgstr "ИÑкопчати" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Resolving" +msgstr "Решавање..." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Can't Resolve" +msgstr "Ðе могу решити." + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Connecting.." +msgstr "Повезивање..." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Can't Conect" +msgstr "Ðе могу Ñе повезати." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Connected" +msgstr "Повежи" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Requesting.." +msgstr "Захтевање..." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Downloading" +msgstr "Преучми" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Connection Error" +msgstr "Повезивање..." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "SSL Handshake Error" +msgstr "Учитај грешке" + +#: editor/export_template_manager.cpp +msgid "Current Version:" +msgstr "Тренутна верзија:" + +#: editor/export_template_manager.cpp +msgid "Installed Versions:" +msgstr "ИнÑталиране верзије:" + +#: editor/export_template_manager.cpp +msgid "Install From File" +msgstr "ИнÑталирај Ñа датотеком" + +#: editor/export_template_manager.cpp +msgid "Remove Template" +msgstr "Обриши шаблон" + +#: editor/export_template_manager.cpp +msgid "Select template file" +msgstr "Одабери шаблонÑку датотеку" + +#: editor/export_template_manager.cpp +msgid "Export Template Manager" +msgstr "Менаџер извозних шаблона" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Download Templates" +msgstr "Преучми" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Select mirror from list: " +msgstr "Одабери уређај Ñа лиÑте" + +#: editor/file_type_cache.cpp +msgid "Can't open file_type_cache.cch for writing, not saving file type cache!" +msgstr "" +"Ðе могу отворити „file_type_cache.cch“ за пиÑање! Ðе чувам датотеке " +"кеш(cache) типа!" + +#: editor/filesystem_dock.cpp +msgid "Cannot navigate to '%s' as it has not been found in the file system!" +msgstr "" + +#: editor/filesystem_dock.cpp +msgid "View items as a grid of thumbnails" +msgstr "Прикажи Ñтвари као мрежа Ñличица" + +#: editor/filesystem_dock.cpp +msgid "View items as a list" +msgstr "Прикажи Ñтвари као лиÑта" + +#: editor/filesystem_dock.cpp +msgid "" +"\n" +"Status: Import of file failed. Please fix file and reimport manually." +msgstr "" +"\n" +"СтатуÑ: Увоз датотеке неуÑпео. Молим, иÑправите датотеку и поново је увезите " +"Ñами." + +#: editor/filesystem_dock.cpp +msgid "Cannot move/rename resources root." +msgstr "Ðе могу померити/преименовати корен реÑурÑа." + +#: editor/filesystem_dock.cpp +msgid "Cannot move a folder into itself.\n" +msgstr "Ðе могу померити директоријум у њену Ñаму.\n" + +#: editor/filesystem_dock.cpp +msgid "Error moving:\n" +msgstr "Грешка при померању:\n" + +#: editor/filesystem_dock.cpp +msgid "Unable to update dependencies:\n" +msgstr "Ðије могуће ажурирати завиÑноÑти:\n" + +#: editor/filesystem_dock.cpp +msgid "No name provided" +msgstr "Име није дато" + +#: editor/filesystem_dock.cpp +msgid "Provided name contains invalid characters" +msgstr "Дато име Ñадржи неважећа Ñлова" + +#: editor/filesystem_dock.cpp +msgid "No name provided." +msgstr "Име није дато." + +#: editor/filesystem_dock.cpp +msgid "Name contains invalid characters." +msgstr "Дато име Ñадржи неважећа Ñлова." + +#: editor/filesystem_dock.cpp +msgid "A file or folder with this name already exists." +msgstr "Датотека или директоријум Ñа овим именом већ поÑтоји." + +#: editor/filesystem_dock.cpp +msgid "Renaming file:" +msgstr "Преименовање датотеке:" + +#: editor/filesystem_dock.cpp +msgid "Renaming folder:" +msgstr "Преименовање директоријума:" + +#: editor/filesystem_dock.cpp +msgid "Expand all" +msgstr "Прошири Ñве" + +#: editor/filesystem_dock.cpp +msgid "Collapse all" +msgstr "Умањи Ñве" + +#: editor/filesystem_dock.cpp +msgid "Copy Path" +msgstr "Копирај пут" + +#: editor/filesystem_dock.cpp +msgid "Rename.." +msgstr "Преименуј..." + +#: editor/filesystem_dock.cpp +msgid "Move To.." +msgstr "Помери у..." + +#: editor/filesystem_dock.cpp +msgid "New Folder.." +msgstr "Ðови директоријум..." + +#: editor/filesystem_dock.cpp +msgid "Show In File Manager" +msgstr "Покажи у менаџеру датотека" + +#: editor/filesystem_dock.cpp +msgid "Instance" +msgstr "" + +#: editor/filesystem_dock.cpp +msgid "Edit Dependencies.." +msgstr "Измени завиÑноÑти..." + +#: editor/filesystem_dock.cpp +msgid "View Owners.." +msgstr "Погледај влаÑнике..." + +#: editor/filesystem_dock.cpp +msgid "Previous Directory" +msgstr "Претодни директоријум" + +#: editor/filesystem_dock.cpp +msgid "Next Directory" +msgstr "Следећи директоријум" + +#: editor/filesystem_dock.cpp +msgid "Re-Scan Filesystem" +msgstr "Поново Ñкенирај датотеке" + +#: editor/filesystem_dock.cpp +msgid "Toggle folder status as Favorite" +msgstr "Директоријум као омиљени" + +#: editor/filesystem_dock.cpp +msgid "Instance the selected scene(s) as child of the selected node." +msgstr "Ðаправи Ñледећу Ñцену/е као дете одабраног чвора." + +#: editor/filesystem_dock.cpp +msgid "" +"Scanning Files,\n" +"Please Wait.." +msgstr "" +"Скенирање датотека,\n" +"Молим Ñачекајте..." + +#: editor/filesystem_dock.cpp +msgid "Move" +msgstr "Помери" + +#: editor/filesystem_dock.cpp editor/plugins/animation_tree_editor_plugin.cpp +#: editor/project_manager.cpp +msgid "Rename" +msgstr "Преименуј" + +#: editor/groups_editor.cpp +msgid "Add to Group" +msgstr "Додај у групу" + +#: editor/groups_editor.cpp +msgid "Remove from Group" +msgstr "Обриши из групе" + +#: editor/import/resource_importer_scene.cpp +msgid "Import as Single Scene" +msgstr "Увези као једна Ñцена" + +#: editor/import/resource_importer_scene.cpp +msgid "Import with Separate Animations" +msgstr "Увези Ñа одвојеним анимацијама" + +#: editor/import/resource_importer_scene.cpp +msgid "Import with Separate Materials" +msgstr "Увези Ñа одвојеним материјалима" + +#: editor/import/resource_importer_scene.cpp +msgid "Import with Separate Objects" +msgstr "Увези Ñа одвојеним објектима" + +#: editor/import/resource_importer_scene.cpp +msgid "Import with Separate Objects+Materials" +msgstr "Увези Ñа одвојеним објектима и материјалима" + +#: editor/import/resource_importer_scene.cpp +msgid "Import with Separate Objects+Animations" +msgstr "Увези Ñа одвојеним објектима и анимацијама" + +#: editor/import/resource_importer_scene.cpp +msgid "Import with Separate Materials+Animations" +msgstr "Увези Ñа одвојеним материјалима и анимацијама" + +#: editor/import/resource_importer_scene.cpp +msgid "Import with Separate Objects+Materials+Animations" +msgstr "Увези Ñа одвојеним објектима, материјалима и анимацијама" + +#: editor/import/resource_importer_scene.cpp +msgid "Import as Multiple Scenes" +msgstr "Увези као више Ñцена" + +#: editor/import/resource_importer_scene.cpp +msgid "Import as Multiple Scenes+Materials" +msgstr "Увези као више Ñцена и материјала" + +#: editor/import/resource_importer_scene.cpp +#: editor/plugins/cube_grid_theme_editor_plugin.cpp +msgid "Import Scene" +msgstr "Увези Ñцену" + +#: editor/import/resource_importer_scene.cpp +msgid "Importing Scene.." +msgstr "Увожење Ñцеене..." + +#: editor/import/resource_importer_scene.cpp +msgid "Running Custom Script.." +msgstr "Обрађивање Ñкриптице..." + +#: editor/import/resource_importer_scene.cpp +msgid "Couldn't load post-import script:" +msgstr "ÐеуÑпех при учитавању поÑтувозне Ñкриптице:" + +#: editor/import/resource_importer_scene.cpp +msgid "Invalid/broken script for post-import (check console):" +msgstr "Ðеважећа/покварена Ñкриптица за поÑÑ‚-увозну фазу (проверите конзолу):" + +#: editor/import/resource_importer_scene.cpp +msgid "Error running post-import script:" +msgstr "Грешка при обрађивању поÑÑ‚-увозне Ñкриптице:" + +#: editor/import/resource_importer_scene.cpp +msgid "Saving.." +msgstr "Чување..." + +#: editor/import_dock.cpp +msgid "Set as Default for '%s'" +msgstr "ПоÑтави као уобичајено за „%s“" + +#: editor/import_dock.cpp +msgid "Clear Default for '%s'" +msgstr "Обриши уобичајено за „%s“" + +#: editor/import_dock.cpp +msgid " Files" +msgstr " Датотеке" + +#: editor/import_dock.cpp +msgid "Import As:" +msgstr "Увези као:" + +#: editor/import_dock.cpp editor/property_editor.cpp +msgid "Preset.." +msgstr "ПоÑтавке..." + +#: editor/import_dock.cpp +msgid "Reimport" +msgstr "Поново увези" + +#: editor/multi_node_edit.cpp +msgid "MultiNode Set" +msgstr "" + +#: editor/node_dock.cpp +msgid "Groups" +msgstr "Групе" + +#: editor/node_dock.cpp +msgid "Select a Node to edit Signals and Groups." +msgstr "Одабери чвор за мењање Ñигнала и група." + +#: editor/plugins/abstract_polygon_2d_editor.cpp +#: editor/plugins/light_occluder_2d_editor_plugin.cpp +msgid "Create Poly" +msgstr "" + +#: editor/plugins/abstract_polygon_2d_editor.cpp +#: editor/plugins/collision_polygon_editor_plugin.cpp +#: editor/plugins/light_occluder_2d_editor_plugin.cpp +msgid "Edit Poly" +msgstr "" + +#: editor/plugins/abstract_polygon_2d_editor.cpp +msgid "Insert Point" +msgstr "Уметни тачку" + +#: editor/plugins/abstract_polygon_2d_editor.cpp +#: editor/plugins/collision_polygon_editor_plugin.cpp +#: editor/plugins/light_occluder_2d_editor_plugin.cpp +msgid "Edit Poly (Remove Point)" +msgstr "Уреди полигон (обриши тачку)" + +#: editor/plugins/abstract_polygon_2d_editor.cpp +msgid "Remove Poly And Point" +msgstr "Обриши полигон и тачку" + +#: editor/plugins/abstract_polygon_2d_editor.cpp +#, fuzzy +msgid "Create a new polygon from scratch" +msgstr "Ðаправи нови полигон од почетка." + +#: editor/plugins/abstract_polygon_2d_editor.cpp +msgid "" +"Edit existing polygon:\n" +"LMB: Move Point.\n" +"Ctrl+LMB: Split Segment.\n" +"RMB: Erase Point." +msgstr "" +"Измени поÑтојећи полигон:\n" +"Леви таÑтер миша: помери тачку.\n" +"ctrl-леви таÑтер миша: преÑечи дуж.\n" +"ДеÑни таÑтер миша: обриши тачку." + +#: editor/plugins/abstract_polygon_2d_editor.cpp +#, fuzzy +msgid "Delete points" +msgstr "Обриши тачку" + +#: editor/plugins/animation_player_editor_plugin.cpp +msgid "Toggle Autoplay" +msgstr "Укљ./ИÑкљ. аутоматÑко покретање" + +#: editor/plugins/animation_player_editor_plugin.cpp +msgid "New Animation Name:" +msgstr "Име нове анимације:" + +#: editor/plugins/animation_player_editor_plugin.cpp +msgid "New Anim" +msgstr "Ðова анимација" + +#: editor/plugins/animation_player_editor_plugin.cpp +msgid "Change Animation Name:" +msgstr "Измени име анимације:" + +#: editor/plugins/animation_player_editor_plugin.cpp +msgid "Delete Animation?" +msgstr "Обриши анимацију?" + +#: editor/plugins/animation_player_editor_plugin.cpp +#: editor/plugins/sprite_frames_editor_plugin.cpp +msgid "Remove Animation" +msgstr "Обриши анимацију" + +#: editor/plugins/animation_player_editor_plugin.cpp +msgid "ERROR: Invalid animation name!" +msgstr "Грешка: неважеће име анимације!" + +#: editor/plugins/animation_player_editor_plugin.cpp +msgid "ERROR: Animation name already exists!" +msgstr "Грешка: име анимације већ поÑтоји!" + +#: editor/plugins/animation_player_editor_plugin.cpp +#: editor/plugins/sprite_frames_editor_plugin.cpp +msgid "Rename Animation" +msgstr "Преименуј анимацију" + +#: editor/plugins/animation_player_editor_plugin.cpp +#: editor/plugins/sprite_frames_editor_plugin.cpp +msgid "Add Animation" +msgstr "Додај анимацију" + +#: editor/plugins/animation_player_editor_plugin.cpp +msgid "Blend Next Changed" +msgstr "" + +#: editor/plugins/animation_player_editor_plugin.cpp +msgid "Change Blend Time" +msgstr "Промени време мешања" + +#: editor/plugins/animation_player_editor_plugin.cpp +msgid "Load Animation" +msgstr "Учитај анимацију" + +#: editor/plugins/animation_player_editor_plugin.cpp +msgid "Duplicate Animation" +msgstr "Дуплирај анимацију" + +#: editor/plugins/animation_player_editor_plugin.cpp +msgid "ERROR: No animation to copy!" +msgstr "Грешка: нема анимације за копирање!" + +#: editor/plugins/animation_player_editor_plugin.cpp +msgid "ERROR: No animation resource on clipboard!" +msgstr "Грешка: нема анимације у таблици за копирање!" + +#: editor/plugins/animation_player_editor_plugin.cpp +msgid "Pasted Animation" +msgstr "Ðалепљена анимација" + +#: editor/plugins/animation_player_editor_plugin.cpp +msgid "Paste Animation" +msgstr "Ðалепи анимацију" + +#: editor/plugins/animation_player_editor_plugin.cpp +msgid "ERROR: No animation to edit!" +msgstr "Грешка: нема анимације за измену!" + +#: editor/plugins/animation_player_editor_plugin.cpp +msgid "Play selected animation backwards from current pos. (A)" +msgstr "ПуÑти одабрану анимацију у назад од тренутне позиције. (Ð)" + +#: editor/plugins/animation_player_editor_plugin.cpp +msgid "Play selected animation backwards from end. (Shift+A)" +msgstr "ПуÑти одабрану анимацију у назад од краја. (Shift+Ð)" + +#: editor/plugins/animation_player_editor_plugin.cpp +msgid "Stop animation playback. (S)" +msgstr "ЗауÑтави анимацију. (S)" + +#: editor/plugins/animation_player_editor_plugin.cpp +msgid "Play selected animation from start. (Shift+D)" +msgstr "ПуÑти одабрану анимацију од почетка. (Shift+D)" + +#: editor/plugins/animation_player_editor_plugin.cpp +msgid "Play selected animation from current pos. (D)" +msgstr "ПуÑти одабрану анимацију од тренутне позиције. (D)" + +#: editor/plugins/animation_player_editor_plugin.cpp +msgid "Animation position (in seconds)." +msgstr "Позиција анимације (у Ñекундама)." + +#: editor/plugins/animation_player_editor_plugin.cpp +msgid "Scale animation playback globally for the node." +msgstr "Глобално убрзај анимацију за чвор." + +#: editor/plugins/animation_player_editor_plugin.cpp +msgid "Create new animation in player." +msgstr "" + +#: editor/plugins/animation_player_editor_plugin.cpp +msgid "Load animation from disk." +msgstr "Учитај анимацију Ñа диÑка." + +#: editor/plugins/animation_player_editor_plugin.cpp +msgid "Load an animation from disk." +msgstr "Учитај анимацију Ñа диÑка." + +#: editor/plugins/animation_player_editor_plugin.cpp +msgid "Save the current animation" +msgstr "Сачувај тренутну анимацију" + +#: editor/plugins/animation_player_editor_plugin.cpp +msgid "Display list of animations in player." +msgstr "Прикажи лиÑту анимација у плејеру." + +#: editor/plugins/animation_player_editor_plugin.cpp +msgid "Autoplay on Load" +msgstr "ÐутоматÑко пуштање након учитавања" + +#: editor/plugins/animation_player_editor_plugin.cpp +msgid "Edit Target Blend Times" +msgstr "Уреди времена циљаног мешања" + +#: editor/plugins/animation_player_editor_plugin.cpp +msgid "Animation Tools" +msgstr "Ðнимационе алатке" + +#: editor/plugins/animation_player_editor_plugin.cpp +msgid "Copy Animation" +msgstr "Копирај анимацију" + +#: editor/plugins/animation_player_editor_plugin.cpp +msgid "Create New Animation" +msgstr "Ðаправи нову анимацију" + +#: editor/plugins/animation_player_editor_plugin.cpp +msgid "Animation Name:" +msgstr "Име анимације:" + +#: editor/plugins/animation_player_editor_plugin.cpp +#: editor/plugins/resource_preloader_editor_plugin.cpp +#: editor/plugins/sprite_frames_editor_plugin.cpp editor/property_editor.cpp +#: editor/script_create_dialog.cpp +msgid "Error!" +msgstr "Грешка!" + +#: editor/plugins/animation_player_editor_plugin.cpp +msgid "Blend Times:" +msgstr "Времена мешања:" + +#: editor/plugins/animation_player_editor_plugin.cpp +msgid "Next (Auto Queue):" +msgstr "Следећа (Ðутоматки ред):" + +#: editor/plugins/animation_player_editor_plugin.cpp +msgid "Cross-Animation Blend Times" +msgstr "" + +#: editor/plugins/animation_player_editor_plugin.cpp +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Animation" +msgstr "Ðнимација" + +#: editor/plugins/animation_tree_editor_plugin.cpp +msgid "New name:" +msgstr "Ðово име:" + +#: editor/plugins/animation_tree_editor_plugin.cpp +msgid "Edit Filters" +msgstr "Уреди филтере" + +#: editor/plugins/animation_tree_editor_plugin.cpp +#: editor/plugins/multimesh_editor_plugin.cpp +msgid "Scale:" +msgstr "Скала:" + +#: editor/plugins/animation_tree_editor_plugin.cpp +msgid "Fade In (s):" +msgstr "Појављивање (Ñек.):" + +#: editor/plugins/animation_tree_editor_plugin.cpp +msgid "Fade Out (s):" +msgstr "ÐеÑтанак (Ñек.):" + +#: editor/plugins/animation_tree_editor_plugin.cpp +msgid "Blend" +msgstr "Мешање" + +#: editor/plugins/animation_tree_editor_plugin.cpp +msgid "Mix" +msgstr "МикÑ" + +#: editor/plugins/animation_tree_editor_plugin.cpp +msgid "Auto Restart:" +msgstr "ÐутоматÑко реÑтартовање:" + +#: editor/plugins/animation_tree_editor_plugin.cpp +msgid "Restart (s):" +msgstr "РеÑтартовање (Ñек.):" + +#: editor/plugins/animation_tree_editor_plugin.cpp +msgid "Random Restart (s):" +msgstr "ÐаÑумично реÑтартовање (Ñек.):" + +#: editor/plugins/animation_tree_editor_plugin.cpp +msgid "Start!" +msgstr "Започни!" + +#: editor/plugins/animation_tree_editor_plugin.cpp +#: editor/plugins/multimesh_editor_plugin.cpp +msgid "Amount:" +msgstr "Количина:" + +#: editor/plugins/animation_tree_editor_plugin.cpp +msgid "Blend:" +msgstr "Мешавина:" + +#: editor/plugins/animation_tree_editor_plugin.cpp +msgid "Blend 0:" +msgstr "Мешавина 0:" + +#: editor/plugins/animation_tree_editor_plugin.cpp +msgid "Blend 1:" +msgstr "Мешавина 1:" + +#: editor/plugins/animation_tree_editor_plugin.cpp +msgid "X-Fade Time (s):" +msgstr "" + +#: editor/plugins/animation_tree_editor_plugin.cpp +msgid "Current:" +msgstr "Тренутно:" + +#: editor/plugins/animation_tree_editor_plugin.cpp +msgid "Add Input" +msgstr "Додај улаз" + +#: editor/plugins/animation_tree_editor_plugin.cpp +msgid "Clear Auto-Advance" +msgstr "Обриши аутоматÑки напредак" + +#: editor/plugins/animation_tree_editor_plugin.cpp +msgid "Set Auto-Advance" +msgstr "ПоÑтави аутоматÑки напредак" + +#: editor/plugins/animation_tree_editor_plugin.cpp +msgid "Delete Input" +msgstr "Обриши улаз" + +#: editor/plugins/animation_tree_editor_plugin.cpp +msgid "Animation tree is valid." +msgstr "Ðнимационо дрво је важеће." + +#: editor/plugins/animation_tree_editor_plugin.cpp +msgid "Animation tree is invalid." +msgstr "Ðнимационо дрво није важеће." + +#: editor/plugins/animation_tree_editor_plugin.cpp +msgid "Animation Node" +msgstr "Ðнимациони чвор" + +#: editor/plugins/animation_tree_editor_plugin.cpp +msgid "OneShot Node" +msgstr "" + +#: editor/plugins/animation_tree_editor_plugin.cpp +msgid "Mix Node" +msgstr "ÐœÐ¸ÐºÑ Ñ‡Ð²Ð¾Ñ€" + +#: editor/plugins/animation_tree_editor_plugin.cpp +msgid "Blend2 Node" +msgstr "Мешање2 чвор" + +#: editor/plugins/animation_tree_editor_plugin.cpp +msgid "Blend3 Node" +msgstr "Мешање3 чвор" + +#: editor/plugins/animation_tree_editor_plugin.cpp +msgid "Blend4 Node" +msgstr "Мешање4 чвор" + +#: editor/plugins/animation_tree_editor_plugin.cpp +msgid "TimeScale Node" +msgstr "" + +#: editor/plugins/animation_tree_editor_plugin.cpp +msgid "TimeSeek Node" +msgstr "" + +#: editor/plugins/animation_tree_editor_plugin.cpp +msgid "Transition Node" +msgstr "" + +#: editor/plugins/animation_tree_editor_plugin.cpp +msgid "Import Animations.." +msgstr "Увези анимације..." + +#: editor/plugins/animation_tree_editor_plugin.cpp +msgid "Edit Node Filters" +msgstr "" + +#: editor/plugins/animation_tree_editor_plugin.cpp +msgid "Filters.." +msgstr "Филтери..." + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Free" +msgstr "Слободно" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Contents:" +msgstr "Садржај:" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "View Files" +msgstr "Погледај датотеке" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Can't resolve hostname:" +msgstr "Ðе могу решити име хоÑта:" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Connection error, please try again." +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Can't connect to host:" +msgstr "Ðе могу Ñе повезати Ñа хоÑтом:" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "No response from host:" +msgstr "Ðема одговора од хоÑта:" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Request failed, return code:" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Request failed, too many redirects" +msgstr "Захтев неуÑпео, превише преуÑмерења" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Bad download hash, assuming file has been tampered with." +msgstr "Лоша хеш Ñума, претпоÑтавља Ñе да је датотека измењена." + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Expected:" +msgstr "Очекивано:" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Got:" +msgstr "Добијено:" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Failed sha256 hash check" +msgstr "ÐеуÑпела провера sha256 Ñуме" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Asset Download Error:" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Fetching:" +msgstr "Преузимање:" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Resolving.." +msgstr "Решавање..." + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Error making request" +msgstr "Грешка при захтеву" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Idle" +msgstr "Ðеактиван" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Retry" +msgstr "Покушај поново" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Download Error" +msgstr "Грешка при преузимању" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Download for this asset is already in progress!" +msgstr "" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "first" +msgstr "први" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "prev" +msgstr "претходни" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "next" +msgstr "Ñледећи" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "last" +msgstr "задњи" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "All" +msgstr "Ñви" + +#: editor/plugins/asset_library_editor_plugin.cpp +#: editor/project_settings_editor.cpp +msgid "Plugins" +msgstr "Прикључци" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Sort:" +msgstr "Сортирање:" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Reverse" +msgstr "Обрнут" + +#: editor/plugins/asset_library_editor_plugin.cpp +#: editor/project_settings_editor.cpp +msgid "Category:" +msgstr "Категорија:" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Site:" +msgstr "Веб Ñтраница:" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Support.." +msgstr "Подршка..." + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Official" +msgstr "Званично" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Testing" +msgstr "ТеÑтирање" + +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Assets ZIP File" +msgstr "" + +#: editor/plugins/camera_editor_plugin.cpp +msgid "Preview" +msgstr "Преглед" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Configure Snap" +msgstr "Конфигурација лепљења" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/polygon_2d_editor_plugin.cpp +msgid "Grid Offset:" +msgstr "ОфÑет мреже:" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/polygon_2d_editor_plugin.cpp +msgid "Grid Step:" +msgstr "Корак мреже:" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Rotation Offset:" +msgstr "Ротација офÑета:" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Rotation Step:" +msgstr "Ротације корака:" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Move Pivot" +msgstr "Помери пивот" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Move Action" +msgstr "Помери акцију" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Move vertical guide" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Create new vertical guide" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Remove vertical guide" +msgstr "Обриши неважеће кључеве" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Move horizontal guide" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Create new horizontal guide" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Remove horizontal guide" +msgstr "Обриши неважеће кључеве" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Create new horizontal and vertical guides" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Edit IK Chain" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Edit CanvasItem" +msgstr "Уреди CanvasItem" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Anchors only" +msgstr "Само Ñидра" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Change Anchors and Margins" +msgstr "Промени Ñидра и ивице" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Change Anchors" +msgstr "Промени Ñидра" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Paste Pose" +msgstr "Ðалепи позу" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Select Mode" +msgstr "Одабери режим" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Drag: Rotate" +msgstr "Вучење: ротација" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Alt+Drag: Move" +msgstr "Alt+вучење: померање" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Press 'v' to Change Pivot, 'Shift+v' to Drag Pivot (while moving)." +msgstr "" +"ПритиÑни „v“ за измену пивота, „Shift+v“ за вучење пивота (без померања)." + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Alt+RMB: Depth list selection" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Move Mode" +msgstr "Режим померања" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Rotate Mode" +msgstr "Режим ротације" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp +msgid "" +"Show a list of all objects at the position clicked\n" +"(same as Alt+RMB in select mode)." +msgstr "" +"Прикажи лиÑту Ñвих објеката на одабраној позицију\n" +"(иÑто као Alt+ДеÑни таÑтер миша у режиму Ñелекције)" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Click to change object's rotation pivot." +msgstr "Кликни за промену пивота ротације објекта." + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Pan Mode" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Toggles snapping" +msgstr "Укљ./ИÑкљ. лепљења" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Use Snap" +msgstr "КориÑти лепљење" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Snapping options" +msgstr "ПоÑтавке залепљавања" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Snap to grid" +msgstr "Залепи за мрежу" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Use Rotation Snap" +msgstr "КориÑти лепљење ротације" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Configure Snap..." +msgstr "ПоÑтавке лепљења..." + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Snap Relative" +msgstr "Залепи релативно" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Use Pixel Snap" +msgstr "КориÑти лепљење за пикÑеле" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Smart snapping" +msgstr "Паметно лепљење" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Snap to parent" +msgstr "Лепи за родитеља" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Snap to node anchor" +msgstr "Лепи за Ñидро чвора" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Snap to node sides" +msgstr "Лепи за Ñтране чвора" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Snap to other nodes" +msgstr "Лепи за оÑтале чворове" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Snap to guides" +msgstr "Залепи за мрежу" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Lock the selected object in place (can't be moved)." +msgstr "Закључај одабрани објекат на меÑту (немогуће померање)." + +#: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Unlock the selected object (can be moved)." +msgstr "Откључај одабрани објекат (могуће померање)." + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Makes sure the object's children are not selectable." +msgstr "Уверава Ñе да деца објекта не могу бити изабрана." + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Restores the object's children's ability to be selected." +msgstr "Врати могућноÑÑ‚ бирања деце објекта." + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Make Bones" +msgstr "Ðаправи коÑти" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Clear Bones" +msgstr "Обриши коÑти" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Show Bones" +msgstr "Покажи коÑти" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Make IK Chain" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Clear IK Chain" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp +msgid "View" +msgstr "Поглед" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/polygon_2d_editor_plugin.cpp +msgid "Show Grid" +msgstr "Покажи мрежу" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Show helpers" +msgstr "Покажи помагаче" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Show rulers" +msgstr "Покажи лељире" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Show guides" +msgstr "Покажи лељире" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Center Selection" +msgstr "Центрирај одабрано" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Frame Selection" +msgstr "Ибор рама" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Layout" +msgstr "РаÑпоред" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Insert Keys" +msgstr "Убаци кључеве" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Insert Key" +msgstr "Убаци кључеве" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Insert Key (Existing Tracks)" +msgstr "Убаци кључ (поÑтојеће траке)" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Copy Pose" +msgstr "Копирај позу" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Clear Pose" +msgstr "Обриши позу" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Drag pivot from mouse position" +msgstr "Превуци пивот Ñа позицијом миша" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Set pivot at mouse position" +msgstr "ПоÑтави пивот на позицију миша" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Multiply grid step by 2" +msgstr "Помножи корак мреже Ñа 2" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Divide grid step by 2" +msgstr "Подели корак мреже Ñа 2" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Add %s" +msgstr "Додај %s" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Adding %s..." +msgstr "Додавање %s..." + +#: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp editor/scene_tree_dock.cpp +msgid "Create Node" +msgstr "Ðаправи чвор" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp editor/scene_tree_dock.cpp +msgid "Error instancing scene from %s" +msgstr "Грешка при прављењу Ñцене од %s" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp editor/scene_tree_dock.cpp +msgid "OK :(" +msgstr "ОК :(" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp editor/scene_tree_dock.cpp +msgid "No parent to instance a child at." +msgstr "Ðема родитеља за прављење Ñина." + +#: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp editor/scene_tree_dock.cpp +msgid "This operation requires a single selected node." +msgstr "Она операција захтева један изабран чвор." + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Change default type" +msgstr "Измени уобичајен тип" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "" +"Drag & drop + Shift : Add node as sibling\n" +"Drag & drop + Alt : Change node type" +msgstr "" +"Превуците и иÑпуÑтите + Shift: додај чвор као брата\n" +"Превуците и иÑпуÑтите + Alt: Промени тип чвора" + +#: editor/plugins/collision_polygon_editor_plugin.cpp +msgid "Create Poly3D" +msgstr "Ðаправи Poly3D" + +#: editor/plugins/collision_shape_2d_editor_plugin.cpp +msgid "Set Handle" +msgstr "" + +#: editor/plugins/cube_grid_theme_editor_plugin.cpp +msgid "Remove item %d?" +msgstr "Обриши Ñтвар %d?" + +#: editor/plugins/cube_grid_theme_editor_plugin.cpp +#: editor/plugins/theme_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "Add Item" +msgstr "Додај Ñтвар" + +#: editor/plugins/cube_grid_theme_editor_plugin.cpp +msgid "Remove Selected Item" +msgstr "Обриши одабрану Ñтвар" + +#: editor/plugins/cube_grid_theme_editor_plugin.cpp +msgid "Import from Scene" +msgstr "Увези из Ñцене" + +#: editor/plugins/cube_grid_theme_editor_plugin.cpp +msgid "Update from Scene" +msgstr "Ðжурирај из Ñцене" + +#: editor/plugins/curve_editor_plugin.cpp +msgid "Flat0" +msgstr "" + +#: editor/plugins/curve_editor_plugin.cpp +msgid "Flat1" +msgstr "" + +#: editor/plugins/curve_editor_plugin.cpp +msgid "Ease in" +msgstr "" + +#: editor/plugins/curve_editor_plugin.cpp +msgid "Ease out" +msgstr "" + +#: editor/plugins/curve_editor_plugin.cpp +msgid "Smoothstep" +msgstr "" + +#: editor/plugins/curve_editor_plugin.cpp +msgid "Modify Curve Point" +msgstr "" + +#: editor/plugins/curve_editor_plugin.cpp +msgid "Modify Curve Tangent" +msgstr "" + +#: editor/plugins/curve_editor_plugin.cpp +msgid "Load Curve Preset" +msgstr "" + +#: editor/plugins/curve_editor_plugin.cpp +msgid "Add point" +msgstr "Додај тачку" + +#: editor/plugins/curve_editor_plugin.cpp +msgid "Remove point" +msgstr "Обриши тачку" + +#: editor/plugins/curve_editor_plugin.cpp +msgid "Left linear" +msgstr "Леви линеарни" + +#: editor/plugins/curve_editor_plugin.cpp +msgid "Right linear" +msgstr "ДеÑни линеарни" + +#: editor/plugins/curve_editor_plugin.cpp +msgid "Load preset" +msgstr "Учитај подешавања" + +#: editor/plugins/curve_editor_plugin.cpp +msgid "Remove Curve Point" +msgstr "Обриши тачку криве" + +#: editor/plugins/curve_editor_plugin.cpp +msgid "Toggle Curve Linear Tangent" +msgstr "" + +#: editor/plugins/curve_editor_plugin.cpp +msgid "Hold Shift to edit tangents individually" +msgstr "" + +#: editor/plugins/gi_probe_editor_plugin.cpp +msgid "Bake GI Probe" +msgstr "" + +#: editor/plugins/gradient_editor_plugin.cpp +msgid "Add/Remove Color Ramp Point" +msgstr "" + +#: editor/plugins/gradient_editor_plugin.cpp +#: editor/plugins/shader_graph_editor_plugin.cpp +msgid "Modify Color Ramp" +msgstr "Измени рампу боје" + +#: editor/plugins/item_list_editor_plugin.cpp +msgid "Item %d" +msgstr "Ствар %d" + +#: editor/plugins/item_list_editor_plugin.cpp +msgid "Items" +msgstr "Ствари" + +#: editor/plugins/item_list_editor_plugin.cpp +msgid "Item List Editor" +msgstr "Уредник Ñтвари лиÑте" + +#: editor/plugins/light_occluder_2d_editor_plugin.cpp +msgid "" +"No OccluderPolygon2D resource on this node.\n" +"Create and assign one?" +msgstr "" +"OccluderPolygon2D не поÑтоји на овом чвору.\n" +"Ðаправи и додели један?" + +#: editor/plugins/light_occluder_2d_editor_plugin.cpp +msgid "Create Occluder Polygon" +msgstr "" + +#: editor/plugins/light_occluder_2d_editor_plugin.cpp +msgid "Create a new polygon from scratch." +msgstr "Ðаправи нови полигон од почетка." + +#: editor/plugins/light_occluder_2d_editor_plugin.cpp +msgid "Edit existing polygon:" +msgstr "Измени поÑтојећи полигон:" + +#: editor/plugins/light_occluder_2d_editor_plugin.cpp +msgid "LMB: Move Point." +msgstr "Леви таÑтер миша: помери тачку." + +#: editor/plugins/light_occluder_2d_editor_plugin.cpp +msgid "Ctrl+LMB: Split Segment." +msgstr "Ctrl+леви таÑтер миша: одÑеци дуж." + +#: editor/plugins/light_occluder_2d_editor_plugin.cpp +msgid "RMB: Erase Point." +msgstr "ДеÑни таÑтер миша: обриши тачку." + +#: editor/plugins/mesh_instance_editor_plugin.cpp +msgid "Mesh is empty!" +msgstr "Мрежа је празна!" + +#: editor/plugins/mesh_instance_editor_plugin.cpp +msgid "Create Static Trimesh Body" +msgstr "Ðаправи Ñтатичо тело од троуглова" + +#: editor/plugins/mesh_instance_editor_plugin.cpp +msgid "Create Static Convex Body" +msgstr "Ðаправи конвекÑно Ñтатичко тело" + +#: editor/plugins/mesh_instance_editor_plugin.cpp +msgid "This doesn't work on scene root!" +msgstr "Ово не ради на корену Ñцене!" + +#: editor/plugins/mesh_instance_editor_plugin.cpp +msgid "Create Trimesh Shape" +msgstr "Ðаправи фигуру од троуглова" + +#: editor/plugins/mesh_instance_editor_plugin.cpp +msgid "Create Convex Shape" +msgstr "Ðаправи конвекÑну фигуру" + +#: editor/plugins/mesh_instance_editor_plugin.cpp +msgid "Create Navigation Mesh" +msgstr "Ðаправи навигациону мрежу" + +#: editor/plugins/mesh_instance_editor_plugin.cpp +msgid "MeshInstance lacks a Mesh!" +msgstr "MeshInstance нема мрежу!" + +#: editor/plugins/mesh_instance_editor_plugin.cpp +msgid "Mesh has not surface to create outlines from!" +msgstr "" + +#: editor/plugins/mesh_instance_editor_plugin.cpp +msgid "Could not create outline!" +msgstr "" + +#: editor/plugins/mesh_instance_editor_plugin.cpp +msgid "Create Outline" +msgstr "" + +#: editor/plugins/mesh_instance_editor_plugin.cpp +msgid "Mesh" +msgstr "" + +#: editor/plugins/mesh_instance_editor_plugin.cpp +msgid "Create Trimesh Static Body" +msgstr "" + +#: editor/plugins/mesh_instance_editor_plugin.cpp +msgid "Create Convex Static Body" +msgstr "" + +#: editor/plugins/mesh_instance_editor_plugin.cpp +msgid "Create Trimesh Collision Sibling" +msgstr "" + +#: editor/plugins/mesh_instance_editor_plugin.cpp +msgid "Create Convex Collision Sibling" +msgstr "" + +#: editor/plugins/mesh_instance_editor_plugin.cpp +msgid "Create Outline Mesh.." +msgstr "" + +#: editor/plugins/mesh_instance_editor_plugin.cpp +msgid "Create Outline Mesh" +msgstr "" + +#: editor/plugins/mesh_instance_editor_plugin.cpp +msgid "Outline Size:" +msgstr "" + +#: editor/plugins/multimesh_editor_plugin.cpp +msgid "No mesh source specified (and no MultiMesh set in node)." +msgstr "" + +#: editor/plugins/multimesh_editor_plugin.cpp +msgid "No mesh source specified (and MultiMesh contains no Mesh)." +msgstr "" + +#: editor/plugins/multimesh_editor_plugin.cpp +msgid "Mesh source is invalid (invalid path)." +msgstr "" + +#: editor/plugins/multimesh_editor_plugin.cpp +msgid "Mesh source is invalid (not a MeshInstance)." +msgstr "" + +#: editor/plugins/multimesh_editor_plugin.cpp +msgid "Mesh source is invalid (contains no Mesh resource)." +msgstr "" + +#: editor/plugins/multimesh_editor_plugin.cpp +msgid "No surface source specified." +msgstr "" + +#: editor/plugins/multimesh_editor_plugin.cpp +msgid "Surface source is invalid (invalid path)." +msgstr "" + +#: editor/plugins/multimesh_editor_plugin.cpp +msgid "Surface source is invalid (no geometry)." +msgstr "" + +#: editor/plugins/multimesh_editor_plugin.cpp +msgid "Surface source is invalid (no faces)." +msgstr "" + +#: editor/plugins/multimesh_editor_plugin.cpp +msgid "Parent has no solid faces to populate." +msgstr "" + +#: editor/plugins/multimesh_editor_plugin.cpp +msgid "Couldn't map area." +msgstr "" + +#: editor/plugins/multimesh_editor_plugin.cpp +msgid "Select a Source Mesh:" +msgstr "" + +#: editor/plugins/multimesh_editor_plugin.cpp +msgid "Select a Target Surface:" +msgstr "" + +#: editor/plugins/multimesh_editor_plugin.cpp +msgid "Populate Surface" +msgstr "" + +#: editor/plugins/multimesh_editor_plugin.cpp +msgid "Populate MultiMesh" +msgstr "" + +#: editor/plugins/multimesh_editor_plugin.cpp +msgid "Target Surface:" +msgstr "" + +#: editor/plugins/multimesh_editor_plugin.cpp +msgid "Source Mesh:" +msgstr "" + +#: editor/plugins/multimesh_editor_plugin.cpp +msgid "X-Axis" +msgstr "" + +#: editor/plugins/multimesh_editor_plugin.cpp +msgid "Y-Axis" +msgstr "" + +#: editor/plugins/multimesh_editor_plugin.cpp +msgid "Z-Axis" +msgstr "" + +#: editor/plugins/multimesh_editor_plugin.cpp +msgid "Mesh Up Axis:" +msgstr "" + +#: editor/plugins/multimesh_editor_plugin.cpp +msgid "Random Rotation:" +msgstr "" + +#: editor/plugins/multimesh_editor_plugin.cpp +msgid "Random Tilt:" +msgstr "" + +#: editor/plugins/multimesh_editor_plugin.cpp +msgid "Random Scale:" +msgstr "" + +#: editor/plugins/multimesh_editor_plugin.cpp +msgid "Populate" +msgstr "" + +#: editor/plugins/navigation_mesh_editor_plugin.cpp +msgid "Bake!" +msgstr "" + +#: editor/plugins/navigation_mesh_editor_plugin.cpp +msgid "Bake the navigation mesh.\n" +msgstr "" + +#: editor/plugins/navigation_mesh_editor_plugin.cpp +msgid "Clear the navigation mesh." +msgstr "" + +#: editor/plugins/navigation_mesh_generator.cpp +msgid "Setting up Configuration..." +msgstr "" + +#: editor/plugins/navigation_mesh_generator.cpp +msgid "Calculating grid size..." +msgstr "" + +#: editor/plugins/navigation_mesh_generator.cpp +msgid "Creating heightfield..." +msgstr "" + +#: editor/plugins/navigation_mesh_generator.cpp +msgid "Marking walkable triangles..." +msgstr "" + +#: editor/plugins/navigation_mesh_generator.cpp +msgid "Constructing compact heightfield..." +msgstr "" + +#: editor/plugins/navigation_mesh_generator.cpp +msgid "Eroding walkable area..." +msgstr "" + +#: editor/plugins/navigation_mesh_generator.cpp +msgid "Partitioning..." +msgstr "" + +#: editor/plugins/navigation_mesh_generator.cpp +msgid "Creating contours..." +msgstr "" + +#: editor/plugins/navigation_mesh_generator.cpp +msgid "Creating polymesh..." +msgstr "" + +#: editor/plugins/navigation_mesh_generator.cpp +msgid "Converting to native navigation mesh..." +msgstr "" + +#: editor/plugins/navigation_mesh_generator.cpp +msgid "Navigation Mesh Generator Setup:" +msgstr "" + +#: editor/plugins/navigation_mesh_generator.cpp +msgid "Parsing Geometry..." +msgstr "" + +#: editor/plugins/navigation_mesh_generator.cpp +msgid "Done!" +msgstr "" + +#: editor/plugins/navigation_polygon_editor_plugin.cpp +msgid "Create Navigation Polygon" +msgstr "" + +#: editor/plugins/particles_2d_editor_plugin.cpp +msgid "Clear Emission Mask" +msgstr "" + +#: editor/plugins/particles_2d_editor_plugin.cpp +#: editor/plugins/particles_editor_plugin.cpp +msgid "Generating AABB" +msgstr "" + +#: editor/plugins/particles_2d_editor_plugin.cpp +msgid "Can only set point into a ParticlesMaterial process material" +msgstr "" + +#: editor/plugins/particles_2d_editor_plugin.cpp +msgid "Error loading image:" +msgstr "" + +#: editor/plugins/particles_2d_editor_plugin.cpp +msgid "No pixels with transparency > 128 in image.." +msgstr "" + +#: editor/plugins/particles_2d_editor_plugin.cpp +msgid "Set Emission Mask" +msgstr "" + +#: editor/plugins/particles_2d_editor_plugin.cpp +msgid "Generate Visibility Rect" +msgstr "" + +#: editor/plugins/particles_2d_editor_plugin.cpp +msgid "Load Emission Mask" +msgstr "" + +#: editor/plugins/particles_2d_editor_plugin.cpp +#: editor/plugins/particles_editor_plugin.cpp +msgid "Particles" +msgstr "" + +#: editor/plugins/particles_2d_editor_plugin.cpp +msgid "Generated Point Count:" +msgstr "" + +#: editor/plugins/particles_2d_editor_plugin.cpp +#: editor/plugins/particles_editor_plugin.cpp +msgid "Generation Time (sec):" +msgstr "" + +#: editor/plugins/particles_2d_editor_plugin.cpp +msgid "Emission Mask" +msgstr "" + +#: editor/plugins/particles_2d_editor_plugin.cpp +msgid "Capture from Pixel" +msgstr "" + +#: editor/plugins/particles_2d_editor_plugin.cpp +msgid "Emission Colors" +msgstr "" + +#: editor/plugins/particles_editor_plugin.cpp +msgid "Node does not contain geometry." +msgstr "" + +#: editor/plugins/particles_editor_plugin.cpp +msgid "Node does not contain geometry (faces)." +msgstr "" + +#: editor/plugins/particles_editor_plugin.cpp +msgid "A processor material of type 'ParticlesMaterial' is required." +msgstr "" + +#: editor/plugins/particles_editor_plugin.cpp +msgid "Faces contain no area!" +msgstr "" + +#: editor/plugins/particles_editor_plugin.cpp +msgid "No faces!" +msgstr "" + +#: editor/plugins/particles_editor_plugin.cpp +msgid "Generate AABB" +msgstr "" + +#: editor/plugins/particles_editor_plugin.cpp +msgid "Create Emission Points From Mesh" +msgstr "" + +#: editor/plugins/particles_editor_plugin.cpp +msgid "Create Emission Points From Node" +msgstr "" + +#: editor/plugins/particles_editor_plugin.cpp +msgid "Clear Emitter" +msgstr "" + +#: editor/plugins/particles_editor_plugin.cpp +msgid "Create Emitter" +msgstr "" + +#: editor/plugins/particles_editor_plugin.cpp +msgid "Emission Points:" +msgstr "" + +#: editor/plugins/particles_editor_plugin.cpp +msgid "Surface Points" +msgstr "" + +#: editor/plugins/particles_editor_plugin.cpp +msgid "Surface Points+Normal (Directed)" +msgstr "" + +#: editor/plugins/particles_editor_plugin.cpp +msgid "Volume" +msgstr "" + +#: editor/plugins/particles_editor_plugin.cpp +msgid "Emission Source: " +msgstr "" + +#: editor/plugins/particles_editor_plugin.cpp +msgid "Generate Visibility AABB" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp +msgid "Remove Point from Curve" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp +msgid "Remove Out-Control from Curve" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp +msgid "Remove In-Control from Curve" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Add Point to Curve" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp +msgid "Move Point in Curve" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp +msgid "Move In-Control in Curve" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp +msgid "Move Out-Control in Curve" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Select Points" +msgstr "Одабери тачке" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Shift+Drag: Select Control Points" +msgstr "Shift+повуците: бирање контролних тачака" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Click: Add Point" +msgstr "Клик: уметни тачку" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Right Click: Delete Point" +msgstr "ДеÑни клик: обриши тачку" + +#: editor/plugins/path_2d_editor_plugin.cpp +msgid "Select Control Points (Shift+Drag)" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Add Point (in empty space)" +msgstr "Додај тачку (у празном проÑтору)" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Split Segment (in curve)" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Delete Point" +msgstr "Обриши тачку" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Close Curve" +msgstr "" + +#: editor/plugins/path_editor_plugin.cpp +msgid "Curve Point #" +msgstr "" + +#: editor/plugins/path_editor_plugin.cpp +msgid "Set Curve Point Position" +msgstr "" + +#: editor/plugins/path_editor_plugin.cpp +msgid "Set Curve In Position" +msgstr "" + +#: editor/plugins/path_editor_plugin.cpp +msgid "Set Curve Out Position" +msgstr "" + +#: editor/plugins/path_editor_plugin.cpp +msgid "Split Path" +msgstr "" + +#: editor/plugins/path_editor_plugin.cpp +msgid "Remove Path Point" +msgstr "" + +#: editor/plugins/path_editor_plugin.cpp +msgid "Remove Out-Control Point" +msgstr "" + +#: editor/plugins/path_editor_plugin.cpp +msgid "Remove In-Control Point" +msgstr "" + +#: editor/plugins/polygon_2d_editor_plugin.cpp +msgid "Create UV Map" +msgstr "" + +#: editor/plugins/polygon_2d_editor_plugin.cpp +msgid "Transform UV Map" +msgstr "" + +#: editor/plugins/polygon_2d_editor_plugin.cpp +msgid "Polygon 2D UV Editor" +msgstr "" + +#: editor/plugins/polygon_2d_editor_plugin.cpp +msgid "Move Point" +msgstr "" + +#: editor/plugins/polygon_2d_editor_plugin.cpp +msgid "Ctrl: Rotate" +msgstr "" + +#: editor/plugins/polygon_2d_editor_plugin.cpp +msgid "Shift: Move All" +msgstr "" + +#: editor/plugins/polygon_2d_editor_plugin.cpp +msgid "Shift+Ctrl: Scale" +msgstr "" + +#: editor/plugins/polygon_2d_editor_plugin.cpp +msgid "Move Polygon" +msgstr "" + +#: editor/plugins/polygon_2d_editor_plugin.cpp +msgid "Rotate Polygon" +msgstr "" + +#: editor/plugins/polygon_2d_editor_plugin.cpp +msgid "Scale Polygon" +msgstr "" + +#: editor/plugins/polygon_2d_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp +#: editor/plugins/shader_editor_plugin.cpp editor/project_manager.cpp +#: editor/project_settings_editor.cpp editor/property_editor.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Edit" +msgstr "" + +#: editor/plugins/polygon_2d_editor_plugin.cpp +msgid "Polygon->UV" +msgstr "" + +#: editor/plugins/polygon_2d_editor_plugin.cpp +msgid "UV->Polygon" +msgstr "" + +#: editor/plugins/polygon_2d_editor_plugin.cpp +msgid "Clear UV" +msgstr "" + +#: editor/plugins/polygon_2d_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Snap" +msgstr "" + +#: editor/plugins/polygon_2d_editor_plugin.cpp +msgid "Enable Snap" +msgstr "" + +#: editor/plugins/polygon_2d_editor_plugin.cpp +msgid "Grid" +msgstr "" + +#: editor/plugins/resource_preloader_editor_plugin.cpp +msgid "ERROR: Couldn't load resource!" +msgstr "" + +#: editor/plugins/resource_preloader_editor_plugin.cpp +msgid "Add Resource" +msgstr "" + +#: editor/plugins/resource_preloader_editor_plugin.cpp +msgid "Rename Resource" +msgstr "" + +#: editor/plugins/resource_preloader_editor_plugin.cpp +#: editor/plugins/sprite_frames_editor_plugin.cpp +msgid "Delete Resource" +msgstr "" + +#: editor/plugins/resource_preloader_editor_plugin.cpp +msgid "Resource clipboard is empty!" +msgstr "" + +#: editor/plugins/resource_preloader_editor_plugin.cpp +#: editor/plugins/sprite_frames_editor_plugin.cpp +msgid "Load Resource" +msgstr "" + +#: editor/plugins/resource_preloader_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp +#: editor/plugins/sprite_frames_editor_plugin.cpp editor/property_editor.cpp +#: scene/gui/line_edit.cpp scene/gui/text_edit.cpp +msgid "Paste" +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp +msgid "Clear Recent Files" +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp +msgid "" +"Close and save changes?\n" +"\"" +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp +msgid "Error while saving theme" +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp +msgid "Error saving" +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp +msgid "Error importing theme" +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp +msgid "Error importing" +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp +msgid "Import Theme" +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp +msgid "Save Theme As.." +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp +msgid " Class Reference" +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp +#, fuzzy +msgid "Sort" +msgstr "Сортирање:" + +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp +msgid "Move Up" +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp +msgid "Move Down" +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp +msgid "Next script" +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp +msgid "Previous script" +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp +msgid "File" +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp editor/property_editor.cpp +msgid "New" +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp +msgid "Save All" +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp +msgid "Soft Reload Script" +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp +msgid "History Prev" +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp +msgid "History Next" +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp +msgid "Reload Theme" +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp +msgid "Save Theme" +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp +msgid "Save Theme As" +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp +msgid "Close Docs" +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp +msgid "Close All" +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp +msgid "Close Other Tabs" +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp editor/project_manager.cpp +msgid "Run" +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp +msgid "Toggle Scripts Panel" +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp +msgid "Find.." +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp +msgid "Find Next" +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp editor/script_editor_debugger.cpp +msgid "Step Over" +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp editor/script_editor_debugger.cpp +msgid "Step Into" +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp editor/script_editor_debugger.cpp +msgid "Break" +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp editor/project_manager.cpp +#: editor/script_editor_debugger.cpp +msgid "Continue" +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp +msgid "Keep Debugger Open" +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp +msgid "Debug with external editor" +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp +msgid "Open Godot online documentation" +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp +msgid "Search the class hierarchy." +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp +msgid "Search the reference documentation." +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp +msgid "Go to previous edited document." +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp +msgid "Go to next edited document." +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp +msgid "Discard" +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp +msgid "Create Script" +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp +msgid "" +"The following files are newer on disk.\n" +"What action should be taken?:" +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp +msgid "Reload" +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp +msgid "Resave" +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp editor/script_editor_debugger.cpp +msgid "Debugger" +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp +msgid "" +"Built-in scripts can only be edited when the scene they belong to is loaded" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Only resources from filesystem can be dropped." +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Pick Color" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Convert Case" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Uppercase" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Lowercase" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Capitalize" +msgstr "" + +#: editor/plugins/script_text_editor.cpp scene/gui/line_edit.cpp +#: scene/gui/text_edit.cpp +msgid "Cut" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +#: editor/plugins/sprite_frames_editor_plugin.cpp editor/property_editor.cpp +#: scene/gui/line_edit.cpp scene/gui/text_edit.cpp +msgid "Copy" +msgstr "" + +#: editor/plugins/script_text_editor.cpp scene/gui/line_edit.cpp +#: scene/gui/text_edit.cpp +msgid "Select All" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Delete Line" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Indent Left" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Indent Right" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Toggle Comment" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Clone Down" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +#, fuzzy +msgid "Fold Line" +msgstr "Иди на линију" + +#: editor/plugins/script_text_editor.cpp +msgid "Unfold Line" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Fold All Lines" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Unfold All Lines" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Complete Symbol" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +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 "" + +#: editor/plugins/script_text_editor.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Toggle Breakpoint" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Remove All Breakpoints" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Goto Next Breakpoint" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Goto Previous Breakpoint" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Convert To Uppercase" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Convert To Lowercase" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Find Previous" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Replace.." +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Goto Function.." +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Goto Line.." +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Contextual Help" +msgstr "" + +#: editor/plugins/shader_editor_plugin.cpp +msgid "Shader" +msgstr "" + +#: editor/plugins/shader_graph_editor_plugin.cpp +msgid "Change Scalar Constant" +msgstr "" + +#: editor/plugins/shader_graph_editor_plugin.cpp +msgid "Change Vec Constant" +msgstr "" + +#: editor/plugins/shader_graph_editor_plugin.cpp +msgid "Change RGB Constant" +msgstr "" + +#: editor/plugins/shader_graph_editor_plugin.cpp +msgid "Change Scalar Operator" +msgstr "" + +#: editor/plugins/shader_graph_editor_plugin.cpp +msgid "Change Vec Operator" +msgstr "" + +#: editor/plugins/shader_graph_editor_plugin.cpp +msgid "Change Vec Scalar Operator" +msgstr "" + +#: editor/plugins/shader_graph_editor_plugin.cpp +msgid "Change RGB Operator" +msgstr "" + +#: editor/plugins/shader_graph_editor_plugin.cpp +msgid "Toggle Rot Only" +msgstr "" + +#: editor/plugins/shader_graph_editor_plugin.cpp +msgid "Change Scalar Function" +msgstr "" + +#: editor/plugins/shader_graph_editor_plugin.cpp +msgid "Change Vec Function" +msgstr "" + +#: editor/plugins/shader_graph_editor_plugin.cpp +msgid "Change Scalar Uniform" +msgstr "" + +#: editor/plugins/shader_graph_editor_plugin.cpp +msgid "Change Vec Uniform" +msgstr "" + +#: editor/plugins/shader_graph_editor_plugin.cpp +msgid "Change RGB Uniform" +msgstr "" + +#: editor/plugins/shader_graph_editor_plugin.cpp +msgid "Change Default Value" +msgstr "" + +#: editor/plugins/shader_graph_editor_plugin.cpp +msgid "Change XForm Uniform" +msgstr "" + +#: editor/plugins/shader_graph_editor_plugin.cpp +msgid "Change Texture Uniform" +msgstr "" + +#: editor/plugins/shader_graph_editor_plugin.cpp +msgid "Change Cubemap Uniform" +msgstr "" + +#: editor/plugins/shader_graph_editor_plugin.cpp +msgid "Change Comment" +msgstr "" + +#: editor/plugins/shader_graph_editor_plugin.cpp +msgid "Add/Remove to Color Ramp" +msgstr "" + +#: editor/plugins/shader_graph_editor_plugin.cpp +msgid "Add/Remove to Curve Map" +msgstr "" + +#: editor/plugins/shader_graph_editor_plugin.cpp +msgid "Modify Curve Map" +msgstr "" + +#: editor/plugins/shader_graph_editor_plugin.cpp +msgid "Change Input Name" +msgstr "" + +#: editor/plugins/shader_graph_editor_plugin.cpp +msgid "Connect Graph Nodes" +msgstr "" + +#: editor/plugins/shader_graph_editor_plugin.cpp +msgid "Disconnect Graph Nodes" +msgstr "" + +#: editor/plugins/shader_graph_editor_plugin.cpp +msgid "Remove Shader Graph Node" +msgstr "" + +#: editor/plugins/shader_graph_editor_plugin.cpp +msgid "Move Shader Graph Node" +msgstr "" + +#: editor/plugins/shader_graph_editor_plugin.cpp +msgid "Duplicate Graph Node(s)" +msgstr "" + +#: editor/plugins/shader_graph_editor_plugin.cpp +msgid "Delete Shader Graph Node(s)" +msgstr "" + +#: editor/plugins/shader_graph_editor_plugin.cpp +msgid "Error: Cyclic Connection Link" +msgstr "" + +#: editor/plugins/shader_graph_editor_plugin.cpp +msgid "Error: Missing Input Connections" +msgstr "" + +#: editor/plugins/shader_graph_editor_plugin.cpp +msgid "Add Shader Graph Node" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Orthogonal" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Perspective" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Transform Aborted." +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "X-Axis Transform." +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Y-Axis Transform." +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Z-Axis Transform." +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "View Plane Transform." +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Scaling: " +msgstr "Скала:" + +#: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Translating: " +msgstr "Померај" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Rotating %s degrees." +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Bottom View." +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Bottom" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Top View." +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Rear View." +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Rear" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Front View." +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Front" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Left View." +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Left" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Right View." +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Right" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Keying is disabled (no key inserted)." +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Animation Key Inserted." +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Objects Drawn" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Material Changes" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Shader Changes" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Surface Changes" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Draw Calls" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Vertices" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "FPS" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Align with view" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Display Normal" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Display Wireframe" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Display Overdraw" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Display Unshaded" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "View Environment" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "View Gizmos" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "View Information" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "View FPS" +msgstr "Погледај датотеке" + +#: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Half Resolution" +msgstr "Увећај одабрано" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Audio Listener" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Doppler Enable" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Freelook Left" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Freelook Right" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Freelook Forward" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Freelook Backwards" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Freelook Up" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Freelook Down" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Freelook Speed Modifier" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "preview" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "XForm Dialog" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Select Mode (Q)\n" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "" +"Drag: Rotate\n" +"Alt+Drag: Move\n" +"Alt+RMB: Depth list selection" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Move Mode (W)" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Rotate Mode (E)" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Scale Mode (R)" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Bottom View" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Top View" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Rear View" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Front View" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Left View" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Right View" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Switch Perspective/Orthogonal view" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Insert Animation Key" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Focus Origin" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Focus Selection" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Align Selection With View" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Tool Select" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Tool Move" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Tool Rotate" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Tool Scale" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Toggle Freelook" +msgstr "Укљ./ИÑкљ. режим целог екрана" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Transform" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Configure Snap.." +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Local Coords" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Transform Dialog.." +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "1 Viewport" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "2 Viewports" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "2 Viewports (Alt)" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "3 Viewports" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "3 Viewports (Alt)" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "4 Viewports" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "View Origin" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "View Grid" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +#: modules/gridmap/grid_map_editor_plugin.cpp +msgid "Settings" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Snap Settings" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Translate Snap:" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Rotate Snap (deg.):" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Scale Snap (%):" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Viewport Settings" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Perspective FOV (deg.):" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "View Z-Near:" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "View Z-Far:" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Transform Change" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Translate:" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Rotate (deg.):" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Scale (ratio):" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Transform Type" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Pre" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Post" +msgstr "" + +#: editor/plugins/sprite_frames_editor_plugin.cpp +msgid "ERROR: Couldn't load frame resource!" +msgstr "" + +#: editor/plugins/sprite_frames_editor_plugin.cpp +msgid "Add Frame" +msgstr "" + +#: editor/plugins/sprite_frames_editor_plugin.cpp +msgid "Resource clipboard is empty or not a texture!" +msgstr "" + +#: editor/plugins/sprite_frames_editor_plugin.cpp +msgid "Paste Frame" +msgstr "" + +#: editor/plugins/sprite_frames_editor_plugin.cpp +msgid "Add Empty" +msgstr "" + +#: editor/plugins/sprite_frames_editor_plugin.cpp +msgid "Change Animation Loop" +msgstr "" + +#: editor/plugins/sprite_frames_editor_plugin.cpp +msgid "Change Animation FPS" +msgstr "" + +#: editor/plugins/sprite_frames_editor_plugin.cpp +msgid "(empty)" +msgstr "" + +#: editor/plugins/sprite_frames_editor_plugin.cpp +msgid "Animations" +msgstr "" + +#: editor/plugins/sprite_frames_editor_plugin.cpp +msgid "Speed (FPS):" +msgstr "" + +#: editor/plugins/sprite_frames_editor_plugin.cpp +msgid "Loop" +msgstr "" + +#: editor/plugins/sprite_frames_editor_plugin.cpp +msgid "Animation Frames" +msgstr "" + +#: editor/plugins/sprite_frames_editor_plugin.cpp +msgid "Insert Empty (Before)" +msgstr "" + +#: editor/plugins/sprite_frames_editor_plugin.cpp +msgid "Insert Empty (After)" +msgstr "" + +#: editor/plugins/sprite_frames_editor_plugin.cpp +msgid "Move (Before)" +msgstr "" + +#: editor/plugins/sprite_frames_editor_plugin.cpp +msgid "Move (After)" +msgstr "" + +#: editor/plugins/style_box_editor_plugin.cpp +msgid "StyleBox Preview:" +msgstr "" + +#: editor/plugins/texture_region_editor_plugin.cpp +msgid "Set Region Rect" +msgstr "" + +#: editor/plugins/texture_region_editor_plugin.cpp +msgid "Snap Mode:" +msgstr "" + +#: editor/plugins/texture_region_editor_plugin.cpp +msgid "<None>" +msgstr "" + +#: editor/plugins/texture_region_editor_plugin.cpp +msgid "Pixel Snap" +msgstr "" + +#: editor/plugins/texture_region_editor_plugin.cpp +msgid "Grid Snap" +msgstr "" + +#: editor/plugins/texture_region_editor_plugin.cpp +msgid "Auto Slice" +msgstr "" + +#: editor/plugins/texture_region_editor_plugin.cpp +msgid "Offset:" +msgstr "" + +#: editor/plugins/texture_region_editor_plugin.cpp +msgid "Step:" +msgstr "" + +#: editor/plugins/texture_region_editor_plugin.cpp +msgid "Separation:" +msgstr "" + +#: editor/plugins/texture_region_editor_plugin.cpp +msgid "Texture Region" +msgstr "" + +#: editor/plugins/texture_region_editor_plugin.cpp +msgid "Texture Region Editor" +msgstr "" + +#: editor/plugins/theme_editor_plugin.cpp +msgid "Can't save theme to file:" +msgstr "" + +#: editor/plugins/theme_editor_plugin.cpp +msgid "Add All Items" +msgstr "" + +#: editor/plugins/theme_editor_plugin.cpp +msgid "Add All" +msgstr "" + +#: editor/plugins/theme_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "Remove Item" +msgstr "" + +#: editor/plugins/theme_editor_plugin.cpp +msgid "Remove All Items" +msgstr "" + +#: editor/plugins/theme_editor_plugin.cpp +msgid "Remove All" +msgstr "" + +#: editor/plugins/theme_editor_plugin.cpp +msgid "Edit theme.." +msgstr "" + +#: editor/plugins/theme_editor_plugin.cpp +msgid "Theme editing menu." +msgstr "" + +#: editor/plugins/theme_editor_plugin.cpp +msgid "Add Class Items" +msgstr "" + +#: editor/plugins/theme_editor_plugin.cpp +msgid "Remove Class Items" +msgstr "" + +#: editor/plugins/theme_editor_plugin.cpp +msgid "Create Empty Template" +msgstr "" + +#: editor/plugins/theme_editor_plugin.cpp +msgid "Create Empty Editor Template" +msgstr "" + +#: editor/plugins/theme_editor_plugin.cpp +msgid "Create From Current Editor Theme" +msgstr "" + +#: editor/plugins/theme_editor_plugin.cpp +msgid "CheckBox Radio1" +msgstr "" + +#: editor/plugins/theme_editor_plugin.cpp +msgid "CheckBox Radio2" +msgstr "" + +#: editor/plugins/theme_editor_plugin.cpp +msgid "Item" +msgstr "" + +#: editor/plugins/theme_editor_plugin.cpp +msgid "Check Item" +msgstr "" + +#: editor/plugins/theme_editor_plugin.cpp +msgid "Checked Item" +msgstr "" + +#: editor/plugins/theme_editor_plugin.cpp +msgid "Has" +msgstr "" + +#: editor/plugins/theme_editor_plugin.cpp +msgid "Many" +msgstr "" + +#: editor/plugins/theme_editor_plugin.cpp editor/project_export.cpp +msgid "Options" +msgstr "" + +#: editor/plugins/theme_editor_plugin.cpp +msgid "Have,Many,Several,Options!" +msgstr "" + +#: editor/plugins/theme_editor_plugin.cpp +msgid "Tab 1" +msgstr "" + +#: editor/plugins/theme_editor_plugin.cpp +msgid "Tab 2" +msgstr "" + +#: editor/plugins/theme_editor_plugin.cpp +msgid "Tab 3" +msgstr "" + +#: editor/plugins/theme_editor_plugin.cpp editor/project_settings_editor.cpp +#: editor/scene_tree_editor.cpp editor/script_editor_debugger.cpp +msgid "Type:" +msgstr "" + +#: editor/plugins/theme_editor_plugin.cpp +msgid "Data Type:" +msgstr "" + +#: editor/plugins/theme_editor_plugin.cpp +msgid "Icon" +msgstr "" + +#: editor/plugins/theme_editor_plugin.cpp +msgid "Style" +msgstr "" + +#: editor/plugins/theme_editor_plugin.cpp +msgid "Font" +msgstr "" + +#: editor/plugins/theme_editor_plugin.cpp +msgid "Color" +msgstr "" + +#: editor/plugins/tile_map_editor_plugin.cpp +msgid "Erase Selection" +msgstr "" + +#: editor/plugins/tile_map_editor_plugin.cpp +msgid "Paint TileMap" +msgstr "" + +#: editor/plugins/tile_map_editor_plugin.cpp +msgid "Line Draw" +msgstr "" + +#: editor/plugins/tile_map_editor_plugin.cpp +msgid "Rectangle Paint" +msgstr "" + +#: editor/plugins/tile_map_editor_plugin.cpp +msgid "Bucket Fill" +msgstr "" + +#: editor/plugins/tile_map_editor_plugin.cpp +msgid "Erase TileMap" +msgstr "" + +#: editor/plugins/tile_map_editor_plugin.cpp +msgid "Erase selection" +msgstr "" + +#: editor/plugins/tile_map_editor_plugin.cpp +msgid "Find tile" +msgstr "" + +#: editor/plugins/tile_map_editor_plugin.cpp +msgid "Transpose" +msgstr "" + +#: editor/plugins/tile_map_editor_plugin.cpp +msgid "Mirror X" +msgstr "" + +#: editor/plugins/tile_map_editor_plugin.cpp +msgid "Mirror Y" +msgstr "" + +#: editor/plugins/tile_map_editor_plugin.cpp +msgid "Paint Tile" +msgstr "" + +#: editor/plugins/tile_map_editor_plugin.cpp +msgid "Pick Tile" +msgstr "" + +#: editor/plugins/tile_map_editor_plugin.cpp +msgid "Rotate 0 degrees" +msgstr "" + +#: editor/plugins/tile_map_editor_plugin.cpp +msgid "Rotate 90 degrees" +msgstr "" + +#: editor/plugins/tile_map_editor_plugin.cpp +msgid "Rotate 180 degrees" +msgstr "" + +#: editor/plugins/tile_map_editor_plugin.cpp +msgid "Rotate 270 degrees" +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "Could not find tile:" +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "Item name or ID:" +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "Create from scene?" +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "Merge from scene?" +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "Create from Scene" +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "Merge from Scene" +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp editor/script_editor_debugger.cpp +msgid "Error" +msgstr "" + +#: editor/project_export.cpp +msgid "Runnable" +msgstr "" + +#: editor/project_export.cpp +msgid "Delete patch '%s' from list?" +msgstr "" + +#: editor/project_export.cpp +msgid "Delete preset '%s'?" +msgstr "" + +#: editor/project_export.cpp +msgid "Export templates for this platform are missing/corrupted: " +msgstr "" + +#: editor/project_export.cpp +msgid "Presets" +msgstr "" + +#: editor/project_export.cpp editor/project_settings_editor.cpp +msgid "Add.." +msgstr "" + +#: editor/project_export.cpp +msgid "Resources" +msgstr "" + +#: editor/project_export.cpp +msgid "Export all resources in the project" +msgstr "" + +#: editor/project_export.cpp +msgid "Export selected scenes (and dependencies)" +msgstr "" + +#: editor/project_export.cpp +msgid "Export selected resources (and dependencies)" +msgstr "" + +#: editor/project_export.cpp +msgid "Export Mode:" +msgstr "" + +#: editor/project_export.cpp +msgid "Resources to export:" +msgstr "" + +#: editor/project_export.cpp +msgid "" +"Filters to export non-resource files (comma separated, e.g: *.json, *.txt)" +msgstr "" + +#: editor/project_export.cpp +msgid "" +"Filters to exclude files from project (comma separated, e.g: *.json, *.txt)" +msgstr "" + +#: editor/project_export.cpp +msgid "Patches" +msgstr "" + +#: editor/project_export.cpp +msgid "Make Patch" +msgstr "" + +#: editor/project_export.cpp +msgid "Features" +msgstr "" + +#: editor/project_export.cpp +msgid "Custom (comma-separated):" +msgstr "" + +#: editor/project_export.cpp +msgid "Feature List:" +msgstr "" + +#: editor/project_export.cpp +msgid "Export PCK/Zip" +msgstr "" + +#: editor/project_export.cpp +msgid "Export templates for this platform are missing:" +msgstr "" + +#: editor/project_export.cpp +msgid "Export templates for this platform are missing/corrupted:" +msgstr "" + +#: editor/project_export.cpp +msgid "Export With Debug" +msgstr "" + +#: editor/project_manager.cpp +#, fuzzy +msgid "The path does not exist." +msgstr "Датотека не поÑтоји." + +#: editor/project_manager.cpp +msgid "Please choose a 'project.godot' file." +msgstr "" + +#: editor/project_manager.cpp +msgid "" +"Your project will be created in a non empty folder (you might want to create " +"a new folder)." +msgstr "" + +#: editor/project_manager.cpp +msgid "Please choose a folder that does not contain a 'project.godot' file." +msgstr "" + +#: editor/project_manager.cpp +msgid "Imported Project" +msgstr "" + +#: editor/project_manager.cpp +msgid " " +msgstr "" + +#: editor/project_manager.cpp +msgid "It would be a good idea to name your project." +msgstr "" + +#: editor/project_manager.cpp +msgid "Invalid project path (changed anything?)." +msgstr "" + +#: editor/project_manager.cpp +msgid "Couldn't get project.godot in project path." +msgstr "" + +#: editor/project_manager.cpp +msgid "Couldn't edit project.godot in project path." +msgstr "" + +#: editor/project_manager.cpp +msgid "Couldn't create project.godot in project path." +msgstr "" + +#: editor/project_manager.cpp +msgid "The following files failed extraction from package:" +msgstr "" + +#: editor/project_manager.cpp +msgid "Rename Project" +msgstr "" + +#: editor/project_manager.cpp +msgid "Couldn't get project.godot in the project path." +msgstr "" + +#: editor/project_manager.cpp +msgid "New Game Project" +msgstr "" + +#: editor/project_manager.cpp +msgid "Import Existing Project" +msgstr "" + +#: editor/project_manager.cpp +msgid "Create New Project" +msgstr "" + +#: editor/project_manager.cpp +msgid "Install Project:" +msgstr "" + +#: editor/project_manager.cpp +msgid "Project Name:" +msgstr "" + +#: editor/project_manager.cpp +msgid "Create folder" +msgstr "" + +#: editor/project_manager.cpp +msgid "Project Path:" +msgstr "" + +#: editor/project_manager.cpp +msgid "Browse" +msgstr "" + +#: editor/project_manager.cpp +msgid "That's a BINGO!" +msgstr "" + +#: editor/project_manager.cpp +msgid "Unnamed Project" +msgstr "" + +#: editor/project_manager.cpp +msgid "Can't open project" +msgstr "" + +#: editor/project_manager.cpp +msgid "Are you sure to open more than one project?" +msgstr "" + +#: editor/project_manager.cpp +msgid "" +"Can't run project: no main scene defined.\n" +"Please edit the project and set the main scene in \"Project Settings\" under " +"the \"Application\" category." +msgstr "" + +#: editor/project_manager.cpp +msgid "" +"Can't run project: Assets need to be imported.\n" +"Please edit the project to trigger the initial import." +msgstr "" + +#: editor/project_manager.cpp +msgid "Are you sure to run more than one project?" +msgstr "" + +#: editor/project_manager.cpp +msgid "Remove project from the list? (Folder contents will not be modified)" +msgstr "" + +#: editor/project_manager.cpp +msgid "" +"Language changed.\n" +"The UI will update next time the editor or project manager starts." +msgstr "" + +#: editor/project_manager.cpp +msgid "" +"You are about the scan %s folders for existing Godot projects. Do you " +"confirm?" +msgstr "" + +#: editor/project_manager.cpp +msgid "Project List" +msgstr "" + +#: editor/project_manager.cpp +msgid "Scan" +msgstr "" + +#: editor/project_manager.cpp +msgid "Select a Folder to Scan" +msgstr "" + +#: editor/project_manager.cpp +msgid "New Project" +msgstr "" + +#: editor/project_manager.cpp +msgid "Templates" +msgstr "" + +#: editor/project_manager.cpp +msgid "Exit" +msgstr "" + +#: editor/project_manager.cpp +msgid "Restart Now" +msgstr "" + +#: editor/project_manager.cpp +msgid "Can't run project" +msgstr "" + +#: editor/project_settings_editor.cpp +msgid "Key " +msgstr "" + +#: editor/project_settings_editor.cpp +msgid "Joy Button" +msgstr "" + +#: editor/project_settings_editor.cpp +msgid "Joy Axis" +msgstr "" + +#: editor/project_settings_editor.cpp +msgid "Mouse Button" +msgstr "" + +#: editor/project_settings_editor.cpp +msgid "Invalid action (anything goes but '/' or ':')." +msgstr "" + +#: editor/project_settings_editor.cpp +msgid "Action '%s' already exists!" +msgstr "" + +#: editor/project_settings_editor.cpp +msgid "Rename Input Action Event" +msgstr "" + +#: editor/project_settings_editor.cpp +msgid "Add Input Action Event" +msgstr "" + +#: editor/project_settings_editor.cpp editor/settings_config_dialog.cpp +msgid "Shift+" +msgstr "" + +#: editor/project_settings_editor.cpp editor/settings_config_dialog.cpp +msgid "Alt+" +msgstr "" + +#: editor/project_settings_editor.cpp editor/settings_config_dialog.cpp +msgid "Control+" +msgstr "" + +#: editor/project_settings_editor.cpp editor/settings_config_dialog.cpp +msgid "Press a Key.." +msgstr "" + +#: editor/project_settings_editor.cpp +msgid "Mouse Button Index:" +msgstr "" + +#: editor/project_settings_editor.cpp +msgid "Left Button" +msgstr "" + +#: editor/project_settings_editor.cpp +msgid "Right Button" +msgstr "" + +#: editor/project_settings_editor.cpp +msgid "Middle Button" +msgstr "" + +#: editor/project_settings_editor.cpp +msgid "Wheel Up Button" +msgstr "" + +#: editor/project_settings_editor.cpp +msgid "Wheel Down Button" +msgstr "" + +#: editor/project_settings_editor.cpp +msgid "Button 6" +msgstr "" + +#: editor/project_settings_editor.cpp +msgid "Button 7" +msgstr "" + +#: editor/project_settings_editor.cpp +msgid "Button 8" +msgstr "" + +#: editor/project_settings_editor.cpp +msgid "Button 9" +msgstr "" + +#: editor/project_settings_editor.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Change" +msgstr "" + +#: editor/project_settings_editor.cpp +msgid "Joypad Axis Index:" +msgstr "" + +#: editor/project_settings_editor.cpp +msgid "Axis" +msgstr "" + +#: editor/project_settings_editor.cpp +msgid "Joypad Button Index:" +msgstr "" + +#: editor/project_settings_editor.cpp +msgid "Add Input Action" +msgstr "" + +#: editor/project_settings_editor.cpp +msgid "Erase Input Action Event" +msgstr "" + +#: editor/project_settings_editor.cpp +msgid "Add Event" +msgstr "" + +#: editor/project_settings_editor.cpp +msgid "Device" +msgstr "" + +#: editor/project_settings_editor.cpp +msgid "Button" +msgstr "" + +#: editor/project_settings_editor.cpp +msgid "Left Button." +msgstr "" + +#: editor/project_settings_editor.cpp +msgid "Right Button." +msgstr "" + +#: editor/project_settings_editor.cpp +msgid "Middle Button." +msgstr "" + +#: editor/project_settings_editor.cpp +msgid "Wheel Up." +msgstr "" + +#: editor/project_settings_editor.cpp +msgid "Wheel Down." +msgstr "" + +#: editor/project_settings_editor.cpp +msgid "Add Global Property" +msgstr "" + +#: editor/project_settings_editor.cpp +msgid "Select a setting item first!" +msgstr "" + +#: editor/project_settings_editor.cpp +msgid "No property '%s' exists." +msgstr "" + +#: editor/project_settings_editor.cpp +msgid "Setting '%s' is internal, and it can't be deleted." +msgstr "" + +#: editor/project_settings_editor.cpp +msgid "Delete Item" +msgstr "" + +#: editor/project_settings_editor.cpp +msgid "Can't contain '/' or ':'" +msgstr "" + +#: editor/project_settings_editor.cpp +msgid "Already existing" +msgstr "" + +#: editor/project_settings_editor.cpp +msgid "Error saving settings." +msgstr "" + +#: editor/project_settings_editor.cpp +msgid "Settings saved OK." +msgstr "" + +#: editor/project_settings_editor.cpp +msgid "Override for Feature" +msgstr "" + +#: editor/project_settings_editor.cpp +msgid "Add Translation" +msgstr "" + +#: editor/project_settings_editor.cpp +msgid "Remove Translation" +msgstr "" + +#: editor/project_settings_editor.cpp +msgid "Add Remapped Path" +msgstr "" + +#: editor/project_settings_editor.cpp +msgid "Resource Remap Add Remap" +msgstr "" + +#: editor/project_settings_editor.cpp +msgid "Change Resource Remap Language" +msgstr "" + +#: editor/project_settings_editor.cpp +msgid "Remove Resource Remap" +msgstr "" + +#: editor/project_settings_editor.cpp +msgid "Remove Resource Remap Option" +msgstr "" + +#: editor/project_settings_editor.cpp +msgid "Changed Locale Filter" +msgstr "" + +#: editor/project_settings_editor.cpp +msgid "Changed Locale Filter Mode" +msgstr "" + +#: editor/project_settings_editor.cpp +msgid "Project Settings (project.godot)" +msgstr "" + +#: editor/project_settings_editor.cpp editor/settings_config_dialog.cpp +msgid "General" +msgstr "" + +#: editor/project_settings_editor.cpp editor/property_editor.cpp +msgid "Property:" +msgstr "" + +#: editor/project_settings_editor.cpp +msgid "Override For.." +msgstr "" + +#: editor/project_settings_editor.cpp +msgid "Input Map" +msgstr "" + +#: editor/project_settings_editor.cpp +msgid "Action:" +msgstr "" + +#: editor/project_settings_editor.cpp +msgid "Device:" +msgstr "" + +#: editor/project_settings_editor.cpp +msgid "Index:" +msgstr "" + +#: editor/project_settings_editor.cpp +msgid "Localization" +msgstr "" + +#: editor/project_settings_editor.cpp +msgid "Translations" +msgstr "" + +#: editor/project_settings_editor.cpp +msgid "Translations:" +msgstr "" + +#: editor/project_settings_editor.cpp +msgid "Remaps" +msgstr "" + +#: editor/project_settings_editor.cpp +msgid "Resources:" +msgstr "" + +#: editor/project_settings_editor.cpp +msgid "Remaps by Locale:" +msgstr "" + +#: editor/project_settings_editor.cpp +msgid "Locale" +msgstr "" + +#: editor/project_settings_editor.cpp +msgid "Locales Filter" +msgstr "" + +#: editor/project_settings_editor.cpp +msgid "Show all locales" +msgstr "" + +#: editor/project_settings_editor.cpp +msgid "Show only selected locales" +msgstr "" + +#: editor/project_settings_editor.cpp +msgid "Filter mode:" +msgstr "" + +#: editor/project_settings_editor.cpp +msgid "Locales:" +msgstr "" + +#: editor/project_settings_editor.cpp +msgid "AutoLoad" +msgstr "" + +#: editor/property_editor.cpp +msgid "Pick a Viewport" +msgstr "" + +#: editor/property_editor.cpp +msgid "Ease In" +msgstr "" + +#: editor/property_editor.cpp +msgid "Ease Out" +msgstr "" + +#: editor/property_editor.cpp +msgid "Zero" +msgstr "" + +#: editor/property_editor.cpp +msgid "Easing In-Out" +msgstr "" + +#: editor/property_editor.cpp +msgid "Easing Out-In" +msgstr "" + +#: editor/property_editor.cpp +msgid "File.." +msgstr "" + +#: editor/property_editor.cpp +msgid "Dir.." +msgstr "" + +#: editor/property_editor.cpp +msgid "Assign" +msgstr "" + +#: editor/property_editor.cpp +msgid "Select Node" +msgstr "" + +#: editor/property_editor.cpp +msgid "New Script" +msgstr "" + +#: editor/property_editor.cpp +msgid "Make Unique" +msgstr "" + +#: editor/property_editor.cpp +msgid "Show in File System" +msgstr "" + +#: editor/property_editor.cpp +msgid "Convert To %s" +msgstr "" + +#: editor/property_editor.cpp +msgid "Error loading file: Not a resource!" +msgstr "" + +#: editor/property_editor.cpp +msgid "Selected node is not a Viewport!" +msgstr "" + +#: editor/property_editor.cpp +msgid "Pick a Node" +msgstr "" + +#: editor/property_editor.cpp +msgid "Bit %d, val %d." +msgstr "" + +#: editor/property_editor.cpp +msgid "On" +msgstr "" + +#: editor/property_editor.cpp modules/visual_script/visual_script_editor.cpp +msgid "Set" +msgstr "" + +#: editor/property_editor.cpp +msgid "Properties:" +msgstr "" + +#: editor/property_editor.cpp +msgid "Sections:" +msgstr "" + +#: editor/property_selector.cpp +msgid "Select Property" +msgstr "" + +#: editor/property_selector.cpp +msgid "Select Virtual Method" +msgstr "" + +#: editor/property_selector.cpp +msgid "Select Method" +msgstr "" + +#: editor/pvrtc_compress.cpp +msgid "Could not execute PVRTC tool:" +msgstr "" + +#: editor/pvrtc_compress.cpp +msgid "Can't load back converted image using PVRTC tool:" +msgstr "" + +#: editor/reparent_dialog.cpp editor/scene_tree_dock.cpp +msgid "Reparent Node" +msgstr "" + +#: editor/reparent_dialog.cpp +msgid "Reparent Location (Select new Parent):" +msgstr "" + +#: editor/reparent_dialog.cpp +msgid "Keep Global Transform" +msgstr "" + +#: editor/reparent_dialog.cpp editor/scene_tree_dock.cpp +msgid "Reparent" +msgstr "" + +#: editor/run_settings_dialog.cpp +msgid "Run Mode:" +msgstr "" + +#: editor/run_settings_dialog.cpp +msgid "Current Scene" +msgstr "" + +#: editor/run_settings_dialog.cpp +msgid "Main Scene" +msgstr "" + +#: editor/run_settings_dialog.cpp +msgid "Main Scene Arguments:" +msgstr "" + +#: editor/run_settings_dialog.cpp +msgid "Scene Run Settings" +msgstr "" + +#: editor/scene_tree_dock.cpp editor/script_create_dialog.cpp +#: scene/gui/dialogs.cpp +msgid "OK" +msgstr "" + +#: editor/scene_tree_dock.cpp +msgid "No parent to instance the scenes at." +msgstr "" + +#: editor/scene_tree_dock.cpp +msgid "Error loading scene from %s" +msgstr "" + +#: editor/scene_tree_dock.cpp +msgid "Ok" +msgstr "" + +#: editor/scene_tree_dock.cpp +msgid "" +"Cannot instance the scene '%s' because the current scene exists within one " +"of its nodes." +msgstr "" + +#: editor/scene_tree_dock.cpp +msgid "Instance Scene(s)" +msgstr "" + +#: editor/scene_tree_dock.cpp +msgid "This operation can't be done on the tree root." +msgstr "" + +#: editor/scene_tree_dock.cpp +msgid "Move Node In Parent" +msgstr "" + +#: editor/scene_tree_dock.cpp +msgid "Move Nodes In Parent" +msgstr "" + +#: editor/scene_tree_dock.cpp +msgid "Duplicate Node(s)" +msgstr "" + +#: editor/scene_tree_dock.cpp +msgid "Delete Node(s)?" +msgstr "" + +#: editor/scene_tree_dock.cpp +msgid "Can not perform with the root node." +msgstr "" + +#: editor/scene_tree_dock.cpp +msgid "This operation can't be done on instanced scenes." +msgstr "" + +#: editor/scene_tree_dock.cpp +msgid "Save New Scene As.." +msgstr "" + +#: editor/scene_tree_dock.cpp +msgid "Editable Children" +msgstr "" + +#: editor/scene_tree_dock.cpp +msgid "Load As Placeholder" +msgstr "" + +#: editor/scene_tree_dock.cpp +msgid "Discard Instancing" +msgstr "" + +#: editor/scene_tree_dock.cpp +msgid "Makes Sense!" +msgstr "" + +#: editor/scene_tree_dock.cpp +msgid "Can't operate on nodes from a foreign scene!" +msgstr "" + +#: editor/scene_tree_dock.cpp +msgid "Can't operate on nodes the current scene inherits from!" +msgstr "" + +#: editor/scene_tree_dock.cpp +msgid "Remove Node(s)" +msgstr "" + +#: editor/scene_tree_dock.cpp +msgid "" +"Couldn't save new scene. Likely dependencies (instances) couldn't be " +"satisfied." +msgstr "" + +#: editor/scene_tree_dock.cpp +msgid "Error saving scene." +msgstr "" + +#: editor/scene_tree_dock.cpp +msgid "Error duplicating scene to save it." +msgstr "" + +#: editor/scene_tree_dock.cpp +msgid "Sub-Resources:" +msgstr "" + +#: editor/scene_tree_dock.cpp +msgid "Clear Inheritance" +msgstr "" + +#: editor/scene_tree_dock.cpp editor/scene_tree_editor.cpp +msgid "Open in Editor" +msgstr "" + +#: editor/scene_tree_dock.cpp +msgid "Delete Node(s)" +msgstr "" + +#: editor/scene_tree_dock.cpp +msgid "Add Child Node" +msgstr "" + +#: editor/scene_tree_dock.cpp +msgid "Instance Child Scene" +msgstr "" + +#: editor/scene_tree_dock.cpp +msgid "Change Type" +msgstr "" + +#: editor/scene_tree_dock.cpp +msgid "Attach Script" +msgstr "" + +#: editor/scene_tree_dock.cpp +msgid "Clear Script" +msgstr "" + +#: editor/scene_tree_dock.cpp +msgid "Merge From Scene" +msgstr "" + +#: editor/scene_tree_dock.cpp +msgid "Save Branch as Scene" +msgstr "" + +#: editor/scene_tree_dock.cpp +msgid "Copy Node Path" +msgstr "" + +#: editor/scene_tree_dock.cpp +msgid "Delete (No Confirm)" +msgstr "" + +#: editor/scene_tree_dock.cpp +msgid "Add/Create a New Node" +msgstr "" + +#: editor/scene_tree_dock.cpp +msgid "" +"Instance a scene file as a Node. Creates an inherited scene if no root node " +"exists." +msgstr "" + +#: editor/scene_tree_dock.cpp +msgid "Filter nodes" +msgstr "" + +#: editor/scene_tree_dock.cpp +msgid "Attach a new or existing script for the selected node." +msgstr "" + +#: editor/scene_tree_dock.cpp +msgid "Clear a script for the selected node." +msgstr "" + +#: editor/scene_tree_dock.cpp +#, fuzzy +msgid "Remote" +msgstr "Обриши" + +#: editor/scene_tree_dock.cpp +msgid "Local" +msgstr "" + +#: editor/scene_tree_dock.cpp +msgid "Clear Inheritance? (No Undo!)" +msgstr "" + +#: editor/scene_tree_dock.cpp +msgid "Clear!" +msgstr "" + +#: editor/scene_tree_editor.cpp +msgid "Toggle Spatial Visible" +msgstr "" + +#: editor/scene_tree_editor.cpp +msgid "Toggle CanvasItem Visible" +msgstr "" + +#: editor/scene_tree_editor.cpp +msgid "Node configuration warning:" +msgstr "" + +#: editor/scene_tree_editor.cpp +msgid "" +"Node has connection(s) and group(s)\n" +"Click to show signals dock." +msgstr "" + +#: editor/scene_tree_editor.cpp +msgid "" +"Node has connections.\n" +"Click to show signals dock." +msgstr "" + +#: editor/scene_tree_editor.cpp +msgid "" +"Node is in group(s).\n" +"Click to show groups dock." +msgstr "" + +#: editor/scene_tree_editor.cpp +msgid "Instance:" +msgstr "" + +#: editor/scene_tree_editor.cpp +msgid "Open script" +msgstr "" + +#: editor/scene_tree_editor.cpp +msgid "" +"Node is locked.\n" +"Click to unlock" +msgstr "" + +#: editor/scene_tree_editor.cpp +msgid "" +"Children are not selectable.\n" +"Click to make selectable" +msgstr "" + +#: editor/scene_tree_editor.cpp +msgid "Toggle Visibility" +msgstr "" + +#: editor/scene_tree_editor.cpp +msgid "Invalid node name, the following characters are not allowed:" +msgstr "" + +#: editor/scene_tree_editor.cpp +msgid "Rename Node" +msgstr "" + +#: editor/scene_tree_editor.cpp +msgid "Scene Tree (Nodes):" +msgstr "" + +#: editor/scene_tree_editor.cpp +msgid "Node Configuration Warning!" +msgstr "" + +#: editor/scene_tree_editor.cpp +msgid "Select a Node" +msgstr "" + +#: editor/script_create_dialog.cpp +msgid "Error loading template '%s'" +msgstr "" + +#: editor/script_create_dialog.cpp +msgid "Error - Could not create script in filesystem." +msgstr "" + +#: editor/script_create_dialog.cpp +msgid "Error loading script from %s" +msgstr "" + +#: editor/script_create_dialog.cpp +msgid "N/A" +msgstr "" + +#: editor/script_create_dialog.cpp +msgid "Path is empty" +msgstr "" + +#: editor/script_create_dialog.cpp +msgid "Path is not local" +msgstr "" + +#: editor/script_create_dialog.cpp +msgid "Invalid base path" +msgstr "" + +#: editor/script_create_dialog.cpp +msgid "Directory of the same name exists" +msgstr "" + +#: editor/script_create_dialog.cpp +msgid "File exists, will be reused" +msgstr "" + +#: editor/script_create_dialog.cpp +msgid "Invalid extension" +msgstr "" + +#: editor/script_create_dialog.cpp +msgid "Wrong extension chosen" +msgstr "" + +#: editor/script_create_dialog.cpp +msgid "Invalid Path" +msgstr "" + +#: editor/script_create_dialog.cpp +msgid "Invalid class name" +msgstr "" + +#: editor/script_create_dialog.cpp +msgid "Invalid inherited parent name or path" +msgstr "" + +#: editor/script_create_dialog.cpp +msgid "Script valid" +msgstr "" + +#: editor/script_create_dialog.cpp +msgid "Allowed: a-z, A-Z, 0-9 and _" +msgstr "" + +#: editor/script_create_dialog.cpp +msgid "Built-in script (into scene file)" +msgstr "" + +#: editor/script_create_dialog.cpp +msgid "Create new script file" +msgstr "" + +#: editor/script_create_dialog.cpp +msgid "Load existing script file" +msgstr "" + +#: editor/script_create_dialog.cpp +msgid "Language" +msgstr "" + +#: editor/script_create_dialog.cpp +msgid "Inherits" +msgstr "" + +#: editor/script_create_dialog.cpp +msgid "Class Name" +msgstr "" + +#: editor/script_create_dialog.cpp +msgid "Template" +msgstr "" + +#: editor/script_create_dialog.cpp +msgid "Built-in Script" +msgstr "" + +#: editor/script_create_dialog.cpp +msgid "Attach Node Script" +msgstr "" + +#: editor/script_editor_debugger.cpp +#, fuzzy +msgid "Remote " +msgstr "Обриши" + +#: editor/script_editor_debugger.cpp +msgid "Bytes:" +msgstr "" + +#: editor/script_editor_debugger.cpp +msgid "Warning" +msgstr "" + +#: editor/script_editor_debugger.cpp +msgid "Error:" +msgstr "" + +#: editor/script_editor_debugger.cpp +msgid "Source:" +msgstr "" + +#: editor/script_editor_debugger.cpp +msgid "Function:" +msgstr "" + +#: editor/script_editor_debugger.cpp +msgid "Pick one or more items from the list to display the graph." +msgstr "" + +#: editor/script_editor_debugger.cpp +msgid "Errors" +msgstr "" + +#: editor/script_editor_debugger.cpp +msgid "Child Process Connected" +msgstr "" + +#: editor/script_editor_debugger.cpp +msgid "Inspect Previous Instance" +msgstr "" + +#: editor/script_editor_debugger.cpp +msgid "Inspect Next Instance" +msgstr "" + +#: editor/script_editor_debugger.cpp +msgid "Stack Frames" +msgstr "" + +#: editor/script_editor_debugger.cpp +msgid "Variable" +msgstr "" + +#: editor/script_editor_debugger.cpp +msgid "Errors:" +msgstr "" + +#: editor/script_editor_debugger.cpp +msgid "Stack Trace (if applicable):" +msgstr "" + +#: editor/script_editor_debugger.cpp +msgid "Profiler" +msgstr "" + +#: editor/script_editor_debugger.cpp +msgid "Monitor" +msgstr "" + +#: editor/script_editor_debugger.cpp +msgid "Value" +msgstr "" + +#: editor/script_editor_debugger.cpp +msgid "Monitors" +msgstr "" + +#: editor/script_editor_debugger.cpp +msgid "List of Video Memory Usage by Resource:" +msgstr "" + +#: editor/script_editor_debugger.cpp +msgid "Total:" +msgstr "" + +#: editor/script_editor_debugger.cpp +msgid "Video Mem" +msgstr "" + +#: editor/script_editor_debugger.cpp +msgid "Resource Path" +msgstr "" + +#: editor/script_editor_debugger.cpp +msgid "Type" +msgstr "" + +#: editor/script_editor_debugger.cpp +msgid "Format" +msgstr "" + +#: editor/script_editor_debugger.cpp +msgid "Usage" +msgstr "" + +#: editor/script_editor_debugger.cpp +msgid "Misc" +msgstr "" + +#: editor/script_editor_debugger.cpp +msgid "Clicked Control:" +msgstr "" + +#: editor/script_editor_debugger.cpp +msgid "Clicked Control Type:" +msgstr "" + +#: editor/script_editor_debugger.cpp +msgid "Live Edit Root:" +msgstr "" + +#: editor/script_editor_debugger.cpp +msgid "Set From Tree" +msgstr "" + +#: editor/settings_config_dialog.cpp +msgid "Shortcuts" +msgstr "" + +#: editor/spatial_editor_gizmos.cpp +msgid "Change Light Radius" +msgstr "" + +#: editor/spatial_editor_gizmos.cpp +msgid "Change AudioStreamPlayer3D Emission Angle" +msgstr "" + +#: editor/spatial_editor_gizmos.cpp +msgid "Change Camera FOV" +msgstr "" + +#: editor/spatial_editor_gizmos.cpp +msgid "Change Camera Size" +msgstr "" + +#: editor/spatial_editor_gizmos.cpp +msgid "Change Sphere Shape Radius" +msgstr "" + +#: editor/spatial_editor_gizmos.cpp +msgid "Change Box Shape Extents" +msgstr "" + +#: editor/spatial_editor_gizmos.cpp +msgid "Change Capsule Shape Radius" +msgstr "" + +#: editor/spatial_editor_gizmos.cpp +msgid "Change Capsule Shape Height" +msgstr "" + +#: editor/spatial_editor_gizmos.cpp +msgid "Change Ray Shape Length" +msgstr "" + +#: editor/spatial_editor_gizmos.cpp +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 "" + +#: modules/gdnative/gd_native_library_editor.cpp +msgid "Library" +msgstr "" + +#: modules/gdnative/gd_native_library_editor.cpp +msgid "Status" +msgstr "" + +#: modules/gdnative/gd_native_library_editor.cpp +msgid "Libraries: " +msgstr "" + +#: modules/gdnative/register_types.cpp +msgid "GDNative" +msgstr "" + +#: modules/gdscript/gdscript_functions.cpp +#: modules/visual_script/visual_script_builtin_funcs.cpp +msgid "Invalid type argument to convert(), use TYPE_* constants." +msgstr "" + +#: modules/gdscript/gdscript_functions.cpp modules/mono/glue/glue_header.h +#: modules/visual_script/visual_script_builtin_funcs.cpp +msgid "Not enough bytes for decoding bytes, or invalid format." +msgstr "" + +#: modules/gdscript/gdscript_functions.cpp +msgid "step argument is zero!" +msgstr "" + +#: modules/gdscript/gdscript_functions.cpp +msgid "Not a script with an instance" +msgstr "" + +#: modules/gdscript/gdscript_functions.cpp +msgid "Not based on a script" +msgstr "" + +#: modules/gdscript/gdscript_functions.cpp +msgid "Not based on a resource file" +msgstr "" + +#: modules/gdscript/gdscript_functions.cpp +msgid "Invalid instance dictionary format (missing @path)" +msgstr "" + +#: modules/gdscript/gdscript_functions.cpp +msgid "Invalid instance dictionary format (can't load script at @path)" +msgstr "" + +#: modules/gdscript/gdscript_functions.cpp +msgid "Invalid instance dictionary format (invalid script at @path)" +msgstr "" + +#: modules/gdscript/gdscript_functions.cpp +msgid "Invalid instance dictionary (invalid subclasses)" +msgstr "" + +#: modules/gdscript/gdscript_functions.cpp +msgid "Object can't provide a length." +msgstr "" + +#: modules/gridmap/grid_map_editor_plugin.cpp +msgid "GridMap Delete Selection" +msgstr "" + +#: modules/gridmap/grid_map_editor_plugin.cpp +msgid "GridMap Duplicate Selection" +msgstr "" + +#: modules/gridmap/grid_map_editor_plugin.cpp +msgid "Floor:" +msgstr "" + +#: modules/gridmap/grid_map_editor_plugin.cpp +#, fuzzy +msgid "Grid Map" +msgstr "Корак мреже:" + +#: modules/gridmap/grid_map_editor_plugin.cpp +msgid "Snap View" +msgstr "" + +#: modules/gridmap/grid_map_editor_plugin.cpp +#, fuzzy +msgid "Previous Floor" +msgstr "Претодни директоријум" + +#: modules/gridmap/grid_map_editor_plugin.cpp +msgid "Next Floor" +msgstr "" + +#: modules/gridmap/grid_map_editor_plugin.cpp +msgid "Clip Disabled" +msgstr "" + +#: modules/gridmap/grid_map_editor_plugin.cpp +msgid "Clip Above" +msgstr "" + +#: modules/gridmap/grid_map_editor_plugin.cpp +msgid "Clip Below" +msgstr "" + +#: modules/gridmap/grid_map_editor_plugin.cpp +msgid "Edit X Axis" +msgstr "" + +#: modules/gridmap/grid_map_editor_plugin.cpp +msgid "Edit Y Axis" +msgstr "" + +#: modules/gridmap/grid_map_editor_plugin.cpp +msgid "Edit Z Axis" +msgstr "" + +#: modules/gridmap/grid_map_editor_plugin.cpp +msgid "Cursor Rotate X" +msgstr "" + +#: modules/gridmap/grid_map_editor_plugin.cpp +msgid "Cursor Rotate Y" +msgstr "" + +#: modules/gridmap/grid_map_editor_plugin.cpp +msgid "Cursor Rotate Z" +msgstr "" + +#: modules/gridmap/grid_map_editor_plugin.cpp +msgid "Cursor Back Rotate X" +msgstr "" + +#: modules/gridmap/grid_map_editor_plugin.cpp +msgid "Cursor Back Rotate Y" +msgstr "" + +#: modules/gridmap/grid_map_editor_plugin.cpp +msgid "Cursor Back Rotate Z" +msgstr "" + +#: modules/gridmap/grid_map_editor_plugin.cpp +msgid "Cursor Clear Rotation" +msgstr "" + +#: modules/gridmap/grid_map_editor_plugin.cpp +msgid "Create Area" +msgstr "" + +#: modules/gridmap/grid_map_editor_plugin.cpp +msgid "Create Exterior Connector" +msgstr "" + +#: modules/gridmap/grid_map_editor_plugin.cpp +msgid "Erase Area" +msgstr "" + +#: modules/gridmap/grid_map_editor_plugin.cpp +#, fuzzy +msgid "Clear Selection" +msgstr "Центрирај одабрано" + +#: modules/gridmap/grid_map_editor_plugin.cpp +msgid "GridMap Settings" +msgstr "" + +#: modules/gridmap/grid_map_editor_plugin.cpp +msgid "Pick Distance:" +msgstr "" + +#: modules/mono/editor/mono_bottom_panel.cpp +msgid "Builds" +msgstr "" + +#: modules/visual_script/visual_script.cpp +msgid "" +"A node yielded without working memory, please read the docs on how to yield " +"properly!" +msgstr "" + +#: modules/visual_script/visual_script.cpp +msgid "" +"Node yielded, but did not return a function state in the first working " +"memory." +msgstr "" + +#: modules/visual_script/visual_script.cpp +msgid "" +"Return value must be assigned to first element of node working memory! Fix " +"your node please." +msgstr "" + +#: modules/visual_script/visual_script.cpp +msgid "Node returned an invalid sequence output: " +msgstr "" + +#: modules/visual_script/visual_script.cpp +msgid "Found sequence bit but not the node in the stack, report bug!" +msgstr "" + +#: modules/visual_script/visual_script.cpp +msgid "Stack overflow with stack depth: " +msgstr "" + +#: modules/visual_script/visual_script_editor.cpp +msgid "Change Signal Arguments" +msgstr "" + +#: modules/visual_script/visual_script_editor.cpp +msgid "Change Argument Type" +msgstr "" + +#: modules/visual_script/visual_script_editor.cpp +msgid "Change Argument name" +msgstr "" + +#: modules/visual_script/visual_script_editor.cpp +msgid "Set Variable Default Value" +msgstr "" + +#: modules/visual_script/visual_script_editor.cpp +msgid "Set Variable Type" +msgstr "" + +#: modules/visual_script/visual_script_editor.cpp +msgid "Functions:" +msgstr "" + +#: modules/visual_script/visual_script_editor.cpp +msgid "Variables:" +msgstr "" + +#: modules/visual_script/visual_script_editor.cpp +msgid "Name is not a valid identifier:" +msgstr "" + +#: modules/visual_script/visual_script_editor.cpp +msgid "Name already in use by another func/var/signal:" +msgstr "" + +#: modules/visual_script/visual_script_editor.cpp +msgid "Rename Function" +msgstr "" + +#: modules/visual_script/visual_script_editor.cpp +msgid "Rename Variable" +msgstr "" + +#: modules/visual_script/visual_script_editor.cpp +msgid "Rename Signal" +msgstr "" + +#: modules/visual_script/visual_script_editor.cpp +msgid "Add Function" +msgstr "" + +#: modules/visual_script/visual_script_editor.cpp +msgid "Add Variable" +msgstr "" + +#: modules/visual_script/visual_script_editor.cpp +msgid "Add Signal" +msgstr "" + +#: modules/visual_script/visual_script_editor.cpp +msgid "Change Expression" +msgstr "" + +#: modules/visual_script/visual_script_editor.cpp +msgid "Add Node" +msgstr "" + +#: modules/visual_script/visual_script_editor.cpp +msgid "Remove VisualScript Nodes" +msgstr "" + +#: modules/visual_script/visual_script_editor.cpp +msgid "Duplicate VisualScript Nodes" +msgstr "" + +#: modules/visual_script/visual_script_editor.cpp +msgid "Hold %s to drop a Getter. Hold Shift to drop a generic signature." +msgstr "" + +#: modules/visual_script/visual_script_editor.cpp +msgid "Hold Ctrl to drop a Getter. Hold Shift to drop a generic signature." +msgstr "" + +#: modules/visual_script/visual_script_editor.cpp +msgid "Hold %s to drop a simple reference to the node." +msgstr "" + +#: modules/visual_script/visual_script_editor.cpp +msgid "Hold Ctrl to drop a simple reference to the node." +msgstr "" + +#: modules/visual_script/visual_script_editor.cpp +msgid "Hold %s to drop a Variable Setter." +msgstr "" + +#: modules/visual_script/visual_script_editor.cpp +msgid "Hold Ctrl to drop a Variable Setter." +msgstr "" + +#: modules/visual_script/visual_script_editor.cpp +msgid "Add Preload Node" +msgstr "" + +#: modules/visual_script/visual_script_editor.cpp +msgid "Add Node(s) From Tree" +msgstr "" + +#: modules/visual_script/visual_script_editor.cpp +msgid "Add Getter Property" +msgstr "" + +#: modules/visual_script/visual_script_editor.cpp +msgid "Add Setter Property" +msgstr "" + +#: modules/visual_script/visual_script_editor.cpp +msgid "Change Base Type" +msgstr "" + +#: modules/visual_script/visual_script_editor.cpp +msgid "Move Node(s)" +msgstr "" + +#: modules/visual_script/visual_script_editor.cpp +msgid "Remove VisualScript Node" +msgstr "" + +#: modules/visual_script/visual_script_editor.cpp +msgid "Connect Nodes" +msgstr "" + +#: modules/visual_script/visual_script_editor.cpp +msgid "Condition" +msgstr "" + +#: modules/visual_script/visual_script_editor.cpp +msgid "Sequence" +msgstr "" + +#: modules/visual_script/visual_script_editor.cpp +msgid "Switch" +msgstr "" + +#: modules/visual_script/visual_script_editor.cpp +msgid "Iterator" +msgstr "" + +#: modules/visual_script/visual_script_editor.cpp +msgid "While" +msgstr "" + +#: modules/visual_script/visual_script_editor.cpp +msgid "Return" +msgstr "" + +#: modules/visual_script/visual_script_editor.cpp +msgid "Call" +msgstr "" + +#: modules/visual_script/visual_script_editor.cpp +msgid "Get" +msgstr "" + +#: modules/visual_script/visual_script_editor.cpp +msgid "Script already has function '%s'" +msgstr "" + +#: modules/visual_script/visual_script_editor.cpp +msgid "Change Input Value" +msgstr "" + +#: modules/visual_script/visual_script_editor.cpp +msgid "Can't copy the function node." +msgstr "" + +#: modules/visual_script/visual_script_editor.cpp +msgid "Clipboard is empty!" +msgstr "" + +#: modules/visual_script/visual_script_editor.cpp +msgid "Paste VisualScript Nodes" +msgstr "" + +#: modules/visual_script/visual_script_editor.cpp +msgid "Remove Function" +msgstr "" + +#: modules/visual_script/visual_script_editor.cpp +msgid "Edit Variable" +msgstr "" + +#: modules/visual_script/visual_script_editor.cpp +msgid "Remove Variable" +msgstr "" + +#: modules/visual_script/visual_script_editor.cpp +msgid "Edit Signal" +msgstr "" + +#: modules/visual_script/visual_script_editor.cpp +msgid "Remove Signal" +msgstr "" + +#: modules/visual_script/visual_script_editor.cpp +msgid "Editing Variable:" +msgstr "" + +#: modules/visual_script/visual_script_editor.cpp +msgid "Editing Signal:" +msgstr "" + +#: modules/visual_script/visual_script_editor.cpp +msgid "Base Type:" +msgstr "" + +#: modules/visual_script/visual_script_editor.cpp +msgid "Available Nodes:" +msgstr "" + +#: modules/visual_script/visual_script_editor.cpp +msgid "Select or create a function to edit graph" +msgstr "" + +#: modules/visual_script/visual_script_editor.cpp +msgid "Edit Signal Arguments:" +msgstr "" + +#: modules/visual_script/visual_script_editor.cpp +msgid "Edit Variable:" +msgstr "" + +#: modules/visual_script/visual_script_editor.cpp +msgid "Delete Selected" +msgstr "" + +#: modules/visual_script/visual_script_editor.cpp +msgid "Find Node Type" +msgstr "" + +#: modules/visual_script/visual_script_editor.cpp +msgid "Copy Nodes" +msgstr "" + +#: modules/visual_script/visual_script_editor.cpp +msgid "Cut Nodes" +msgstr "" + +#: modules/visual_script/visual_script_editor.cpp +msgid "Paste Nodes" +msgstr "" + +#: modules/visual_script/visual_script_flow_control.cpp +msgid "Input type not iterable: " +msgstr "" + +#: modules/visual_script/visual_script_flow_control.cpp +msgid "Iterator became invalid" +msgstr "" + +#: modules/visual_script/visual_script_flow_control.cpp +msgid "Iterator became invalid: " +msgstr "" + +#: modules/visual_script/visual_script_func_nodes.cpp +msgid "Invalid index property name." +msgstr "" + +#: modules/visual_script/visual_script_func_nodes.cpp +msgid "Base object is not a Node!" +msgstr "" + +#: modules/visual_script/visual_script_func_nodes.cpp +msgid "Path does not lead Node!" +msgstr "" + +#: modules/visual_script/visual_script_func_nodes.cpp +msgid "Invalid index property name '%s' in node %s." +msgstr "" + +#: modules/visual_script/visual_script_nodes.cpp +msgid ": Invalid argument of type: " +msgstr "" + +#: modules/visual_script/visual_script_nodes.cpp +msgid ": Invalid arguments: " +msgstr "" + +#: modules/visual_script/visual_script_nodes.cpp +msgid "VariableGet not found in script: " +msgstr "" + +#: modules/visual_script/visual_script_nodes.cpp +msgid "VariableSet not found in script: " +msgstr "" + +#: modules/visual_script/visual_script_nodes.cpp +msgid "Custom node has no _step() method, can't process graph." +msgstr "" + +#: modules/visual_script/visual_script_nodes.cpp +msgid "" +"Invalid return value from _step(), must be integer (seq out), or string " +"(error)." +msgstr "" + +#: platform/javascript/export/export.cpp +msgid "Run in Browser" +msgstr "" + +#: platform/javascript/export/export.cpp +msgid "Run exported HTML in the system's default browser." +msgstr "" + +#: platform/javascript/export/export.cpp +msgid "Could not write file:\n" +msgstr "" + +#: platform/javascript/export/export.cpp +msgid "Could not open template for export:\n" +msgstr "" + +#: platform/javascript/export/export.cpp +#, fuzzy +msgid "Invalid export template:\n" +msgstr "Управљај извозним шаблонима" + +#: platform/javascript/export/export.cpp +msgid "Could not read custom HTML shell:\n" +msgstr "" + +#: platform/javascript/export/export.cpp +#, fuzzy +msgid "Could not read boot splash image file:\n" +msgstr "ÐеуÑпех при прављењу директоријума." + +#: scene/2d/animated_sprite.cpp +msgid "" +"A SpriteFrames resource must be created or set in the 'Frames' property in " +"order for AnimatedSprite to display frames." +msgstr "" + +#: scene/2d/canvas_modulate.cpp +msgid "" +"Only one visible CanvasModulate is allowed per scene (or set of instanced " +"scenes). The first created one will work, while the rest will be ignored." +msgstr "" + +#: scene/2d/collision_polygon_2d.cpp +msgid "" +"CollisionPolygon2D only serves to provide a collision shape to a " +"CollisionObject2D derived node. Please only use it as a child of Area2D, " +"StaticBody2D, RigidBody2D, KinematicBody2D, etc. to give them a shape." +msgstr "" + +#: scene/2d/collision_polygon_2d.cpp +msgid "An empty CollisionPolygon2D has no effect on collision." +msgstr "" + +#: scene/2d/collision_shape_2d.cpp +msgid "" +"CollisionShape2D only serves to provide a collision shape to a " +"CollisionObject2D derived node. Please only use it as a child of Area2D, " +"StaticBody2D, RigidBody2D, KinematicBody2D, etc. to give them a shape." +msgstr "" + +#: scene/2d/collision_shape_2d.cpp +msgid "" +"A shape must be provided for CollisionShape2D to function. Please create a " +"shape resource for it!" +msgstr "" + +#: scene/2d/light_2d.cpp +msgid "" +"A texture with the shape of the light must be supplied to the 'texture' " +"property." +msgstr "" + +#: scene/2d/light_occluder_2d.cpp +msgid "" +"An occluder polygon must be set (or drawn) for this occluder to take effect." +msgstr "" + +#: scene/2d/light_occluder_2d.cpp +msgid "The occluder polygon for this occluder is empty. Please draw a polygon!" +msgstr "" + +#: scene/2d/navigation_polygon.cpp +msgid "" +"A NavigationPolygon resource must be set or created for this node to work. " +"Please set a property or draw a polygon." +msgstr "" + +#: scene/2d/navigation_polygon.cpp +msgid "" +"NavigationPolygonInstance must be a child or grandchild to a Navigation2D " +"node. It only provides navigation data." +msgstr "" + +#: scene/2d/parallax_layer.cpp +msgid "" +"ParallaxLayer node only works when set as child of a ParallaxBackground node." +msgstr "" + +#: scene/2d/particles_2d.cpp scene/3d/particles.cpp +msgid "" +"A material to process the particles is not assigned, so no behavior is " +"imprinted." +msgstr "" + +#: scene/2d/path_2d.cpp +msgid "PathFollow2D only works when set as a child of a Path2D node." +msgstr "" + +#: scene/2d/physics_body_2d.cpp +msgid "" +"Size changes to RigidBody2D (in character or rigid modes) will be overriden " +"by the physics engine when running.\n" +"Change the size in children collision shapes instead." +msgstr "" + +#: scene/2d/remote_transform_2d.cpp +msgid "Path property must point to a valid Node2D node to work." +msgstr "" + +#: scene/2d/visibility_notifier_2d.cpp +msgid "" +"VisibilityEnable2D works best when used with the edited scene root directly " +"as parent." +msgstr "" + +#: scene/3d/arvr_nodes.cpp +msgid "ARVRCamera must have an ARVROrigin node as its parent" +msgstr "" + +#: scene/3d/arvr_nodes.cpp +msgid "ARVRController must have an ARVROrigin node as its parent" +msgstr "" + +#: scene/3d/arvr_nodes.cpp +msgid "" +"The controller id must not be 0 or this controller will not be bound to an " +"actual controller" +msgstr "" + +#: scene/3d/arvr_nodes.cpp +msgid "ARVRAnchor must have an ARVROrigin node as its parent" +msgstr "" + +#: scene/3d/arvr_nodes.cpp +msgid "" +"The anchor id must not be 0 or this anchor will not be bound to an actual " +"anchor" +msgstr "" + +#: scene/3d/arvr_nodes.cpp +msgid "ARVROrigin requires an ARVRCamera child node" +msgstr "" + +#: scene/3d/collision_polygon.cpp +msgid "" +"CollisionPolygon only serves to provide a collision shape to a " +"CollisionObject derived node. Please only use it as a child of Area, " +"StaticBody, RigidBody, KinematicBody, etc. to give them a shape." +msgstr "" + +#: scene/3d/collision_polygon.cpp +msgid "An empty CollisionPolygon has no effect on collision." +msgstr "" + +#: scene/3d/collision_shape.cpp +msgid "" +"CollisionShape only serves to provide a collision shape to a CollisionObject " +"derived node. Please only use it as a child of Area, StaticBody, RigidBody, " +"KinematicBody, etc. to give them a shape." +msgstr "" + +#: scene/3d/collision_shape.cpp +msgid "" +"A shape must be provided for CollisionShape to function. Please create a " +"shape resource for it!" +msgstr "" + +#: scene/3d/gi_probe.cpp +msgid "Plotting Meshes" +msgstr "" + +#: scene/3d/gi_probe.cpp +msgid "Finishing Plot" +msgstr "" + +#: scene/3d/navigation_mesh.cpp +msgid "A NavigationMesh resource must be set or created for this node to work." +msgstr "" + +#: scene/3d/navigation_mesh.cpp +msgid "" +"NavigationMeshInstance must be a child or grandchild to a Navigation node. " +"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/physics_body.cpp +msgid "" +"Size changes to RigidBody (in character or rigid modes) will be overriden by " +"the physics engine when running.\n" +"Change the size in children collision shapes instead." +msgstr "" + +#: scene/3d/remote_transform.cpp +msgid "Path property must point to a valid Spatial node to work." +msgstr "" + +#: scene/3d/scenario_fx.cpp +msgid "" +"Only one WorldEnvironment is allowed per scene (or set of instanced scenes)." +msgstr "" + +#: scene/3d/sprite_3d.cpp +msgid "" +"A SpriteFrames resource must be created or set in the 'Frames' property in " +"order for AnimatedSprite3D to display frames." +msgstr "" + +#: scene/3d/vehicle_body.cpp +msgid "" +"VehicleWheel serves to provide a wheel system to a VehicleBody. Please use " +"it as a child of a VehicleBody." +msgstr "" + +#: scene/gui/color_picker.cpp +msgid "Raw Mode" +msgstr "" + +#: scene/gui/color_picker.cpp +msgid "Add current color as a preset" +msgstr "" + +#: scene/gui/dialogs.cpp +msgid "Cancel" +msgstr "" + +#: scene/gui/dialogs.cpp +msgid "Alert!" +msgstr "" + +#: scene/gui/dialogs.cpp +msgid "Please Confirm..." +msgstr "" + +#: scene/gui/popup.cpp +msgid "" +"Popups will hide by default unless you call popup() or any of the popup*() " +"functions. Making them visible for editing is fine though, but they will " +"hide upon running." +msgstr "" + +#: scene/gui/scroll_container.cpp +msgid "" +"ScrollContainer is intended to work with a single child control.\n" +"Use a container as child (VBox,HBox,etc), or a Control and set the custom " +"minimum size manually." +msgstr "" + +#: scene/gui/tree.cpp +msgid "(Other)" +msgstr "" + +#: scene/main/scene_tree.cpp +msgid "" +"Default Environment as specified in Project Setings (Rendering -> Viewport -" +"> Default Environment) could not be loaded." +msgstr "" + +#: scene/main/viewport.cpp +msgid "" +"This viewport is not set as render target. If you intend for it to display " +"its contents directly to the screen, make it a child of a Control so it can " +"obtain a size. Otherwise, make it a RenderTarget and assign its internal " +"texture to some node for display." +msgstr "" + +#: scene/resources/dynamic_font.cpp +msgid "Error initializing FreeType." +msgstr "" + +#: scene/resources/dynamic_font.cpp +msgid "Unknown font format." +msgstr "" + +#: scene/resources/dynamic_font.cpp +msgid "Error loading font." +msgstr "" + +#: scene/resources/dynamic_font.cpp +msgid "Invalid font size." +msgstr "Ðеважећа величина фонта." + +#~ msgid "Cannot navigate to '" +#~ msgstr "Ðе могу прећи у '" + +#~ msgid "" +#~ "\n" +#~ "Source: " +#~ msgstr "" +#~ "\n" +#~ "Извор: " + +#~ msgid "Remove Point from Line2D" +#~ msgstr "Обриши тачку Ñа Line2D" + +#~ msgid "Add Point to Line2D" +#~ msgstr "Уметни тачку Line2D" + +#~ msgid "Move Point in Line2D" +#~ msgstr "Помери тачку Line2D" + +#~ msgid "Split Segment (in line)" +#~ msgstr "Подели Ñегмент (у линији)" diff --git a/editor/translations/th.po b/editor/translations/th.po index 65bbafebb6..8332da93c9 100644 --- a/editor/translations/th.po +++ b/editor/translations/th.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: Godot Engine editor\n" -"PO-Revision-Date: 2017-10-23 02:49+0000\n" +"PO-Revision-Date: 2017-11-08 07:49+0000\n" "Last-Translator: Poommetee Ketson <poommetee@protonmail.com>\n" "Language-Team: Thai <https://hosted.weblate.org/projects/godot-engine/godot/" "th/>\n" @@ -17,7 +17,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8-bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Weblate 2.17\n" +"X-Generator: Weblate 2.18-dev\n" #: editor/animation_editor.cpp msgid "Disabled" @@ -101,6 +101,7 @@ msgid "Anim Delete Keys" msgstr "ลบคีย์à¹à¸à¸™à¸´à¹€à¸¡à¸Šà¸±à¸™" #: editor/animation_editor.cpp editor/plugins/tile_map_editor_plugin.cpp +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Duplicate Selection" msgstr "ทำซ้ำในà¹à¸—ร็à¸à¹€à¸”ิม" @@ -634,6 +635,13 @@ msgstr "à¹à¸à¹‰à¹„ขà¸à¸²à¸£à¸à¹‰à¸²à¸‡à¸à¸´à¸‡" msgid "Search Replacement Resource:" msgstr "ค้นหารีซà¸à¸£à¹Œà¸ªà¸¡à¸²à¹à¸—นที่:" +#: editor/dependency_editor.cpp editor/editor_file_dialog.cpp +#: editor/editor_help.cpp editor/editor_node.cpp editor/filesystem_dock.cpp +#: editor/plugins/script_editor_plugin.cpp editor/property_selector.cpp +#: editor/quick_open.cpp scene/gui/file_dialog.cpp +msgid "Open" +msgstr "เปิด" + #: editor/dependency_editor.cpp msgid "Owners Of:" msgstr "เจ้าขà¸à¸‡à¸‚à¸à¸‡:" @@ -706,6 +714,16 @@ msgstr "ลบไฟล์ที่เลืà¸à¸?" msgid "Delete" msgstr "ลบ" +#: editor/dictionary_property_edit.cpp +#, fuzzy +msgid "Change Dictionary Key" +msgstr "เปลี่ยนชื่à¸à¹à¸à¸™à¸´à¹€à¸¡à¸Šà¸±à¸™:" + +#: editor/dictionary_property_edit.cpp +#, fuzzy +msgid "Change Dictionary Value" +msgstr "เปลี่ยนค่าในà¸à¸²à¸£à¹Œà¹€à¸£à¸¢à¹Œ" + #: editor/editor_about.cpp msgid "Thanks from the Godot community!" msgstr "ขà¸à¸‚à¸à¸šà¸„ุณจาà¸à¸Šà¸¸à¸¡à¸Šà¸™à¸œà¸¹à¹‰à¹ƒà¸Šà¹‰ Godot!" @@ -1124,12 +1142,6 @@ msgstr "ทุà¸à¸™à¸²à¸¡à¸ªà¸¸à¸à¸¥à¸—ี่รู้จัà¸" msgid "All Files (*)" msgstr "ทุà¸à¹„ฟล์ (*)" -#: editor/editor_file_dialog.cpp editor/editor_help.cpp editor/editor_node.cpp -#: editor/filesystem_dock.cpp editor/plugins/script_editor_plugin.cpp -#: editor/property_selector.cpp editor/quick_open.cpp scene/gui/file_dialog.cpp -msgid "Open" -msgstr "เปิด" - #: editor/editor_file_dialog.cpp scene/gui/file_dialog.cpp msgid "Open a File" msgstr "เปิดไฟล์" @@ -1387,7 +1399,7 @@ msgstr "ผิดพลาดขณะà¸à¹ˆà¸²à¸™à¹„ฟล์ '%s'" #: editor/editor_node.cpp msgid "Unexpected end of file '%s'." -msgstr "" +msgstr "ไฟล์ '%s' ไม่สมบูรณ์" #: editor/editor_node.cpp msgid "Missing '%s' or its dependencies." @@ -1489,6 +1501,16 @@ msgstr "" "à¸à¹ˆà¸²à¸™à¸£à¸²à¸¢à¸¥à¸°à¹€à¸à¸µà¸¢à¸”เพิ่มเติมได้จาà¸à¸„ู่มืà¸à¹ƒà¸™à¸ªà¹ˆà¸§à¸™à¸‚à¸à¸‡à¸à¸²à¸£à¸™à¸³à¹€à¸‚้าฉาà¸" #: editor/editor_node.cpp +#, fuzzy +msgid "" +"This is a remote object so changes to it will not be kept.\n" +"Please read the documentation relevant to debugging to better understand " +"this workflow." +msgstr "" +"รีซà¸à¸£à¹Œà¸ªà¸™à¸µà¹‰à¹€à¸›à¹‡à¸™à¸‚à¸à¸‡à¸‰à¸²à¸à¸—ี่ถูà¸à¸™à¸³à¹€à¸‚้า จึงไม่สามารถà¹à¸à¹‰à¹„ขได้\n" +"à¸à¹ˆà¸²à¸™à¸£à¸²à¸¢à¸¥à¸°à¹€à¸à¸µà¸¢à¸”เพิ่มเติมได้จาà¸à¸„ู่มืà¸à¹ƒà¸™à¸ªà¹ˆà¸§à¸™à¸‚à¸à¸‡à¸à¸²à¸£à¸™à¸³à¹€à¸‚้าฉาà¸" + +#: editor/editor_node.cpp msgid "Copy Params" msgstr "คัดลà¸à¸à¸•à¸±à¸§à¹à¸›à¸£" @@ -1604,6 +1626,11 @@ msgid "Export Mesh Library" msgstr "ส่งà¸à¸à¸ Mesh Library" #: editor/editor_node.cpp +#, fuzzy +msgid "This operation can't be done without a root node." +msgstr "ทำไม่ได้ถ้าไม่ได้เลืà¸à¸à¹‚หนด" + +#: editor/editor_node.cpp msgid "Export Tile Set" msgstr "ส่งà¸à¸à¸ Tile Set" @@ -1667,30 +1694,25 @@ msgid "Pick a Main Scene" msgstr "เลืà¸à¸à¸‰à¸²à¸à¹€à¸£à¸´à¹ˆà¸¡à¸•à¹‰à¸™" #: editor/editor_node.cpp -#, fuzzy msgid "Unable to enable addon plugin at: '%s' parsing of config failed." -msgstr "ไม่สามารถเปิดใช้งานปลั๊à¸à¸à¸´à¸™: '" +msgstr "ไม่สามารถเปิดใช้งานปลั๊à¸à¸à¸´à¸™: '%s'" #: editor/editor_node.cpp -#, fuzzy msgid "Unable to find script field for addon plugin at: 'res://addons/%s'." -msgstr "ไม่พบชื่à¸à¸ªà¸„ริปต์ใน: 'res://addons/" +msgstr "ไม่พบชื่à¸à¸ªà¸„ริปต์ในปลั๊à¸à¸à¸´à¸™: 'res://addons/%s'" #: editor/editor_node.cpp -#, fuzzy msgid "Unable to load addon script from path: '%s'." -msgstr "ไม่สามารถโหลดสคริปต์จาà¸: '" +msgstr "ไม่สามารถโหลดสคริปต์จาà¸: '%s'" #: editor/editor_node.cpp -#, fuzzy msgid "" "Unable to load addon script from path: '%s' Base type is not EditorPlugin." -msgstr "ไม่สามารถโหลดสคริปต์จาà¸: '" +msgstr "ไม่สามารถโหลดสคริปต์จาà¸: '%s' ไม่ได้สืบทà¸à¸”จาภEditorPlugin" #: editor/editor_node.cpp -#, fuzzy msgid "Unable to load addon script from path: '%s' Script is not in tool mode." -msgstr "ไม่สามารถโหลดสคริปต์จาà¸: '" +msgstr "ไม่สามารถโหลดสคริปต์จาà¸: '%s' ไม่ใช่สคริปต์ tool" #: editor/editor_node.cpp msgid "" @@ -1739,12 +1761,23 @@ msgid "Switch Scene Tab" msgstr "สลับฉาà¸" #: editor/editor_node.cpp -msgid "%d more file(s)" +#, fuzzy +msgid "%d more files or folders" +msgstr "à¹à¸¥à¸°à¸à¸µà¸ %d ไฟล์หรืà¸à¹‚ฟลเดà¸à¸£à¹Œ" + +#: editor/editor_node.cpp +#, fuzzy +msgid "%d more folders" msgstr "à¹à¸¥à¸°à¸à¸µà¸ %d ไฟล์" #: editor/editor_node.cpp -msgid "%d more file(s) or folder(s)" -msgstr "à¹à¸¥à¸°à¸à¸µà¸ %d ไฟล์หรืà¸à¹‚ฟลเดà¸à¸£à¹Œ" +#, fuzzy +msgid "%d more files" +msgstr "à¹à¸¥à¸°à¸à¸µà¸ %d ไฟล์" + +#: editor/editor_node.cpp +msgid "Dock Position" +msgstr "" #: editor/editor_node.cpp msgid "Distraction Free Mode" @@ -1755,6 +1788,11 @@ msgid "Toggle distraction-free mode." msgstr "โหมดไร้สิ่งรบà¸à¸§à¸™" #: editor/editor_node.cpp +#, fuzzy +msgid "Add a new scene." +msgstr "เพิ่มà¹à¸—ร็à¸à¹ƒà¸«à¸¡à¹ˆ" + +#: editor/editor_node.cpp msgid "Scene" msgstr "ฉาà¸" @@ -1819,13 +1857,12 @@ msgid "TileSet.." msgstr "TileSet.." #: editor/editor_node.cpp editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp scene/gui/line_edit.cpp -#: scene/gui/text_edit.cpp +#: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Undo" msgstr "เลิà¸à¸—ำ" #: editor/editor_node.cpp editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp +#: scene/gui/line_edit.cpp msgid "Redo" msgstr "ทำซ้ำ" @@ -1863,17 +1900,17 @@ msgstr "ปิดà¹à¸¥à¸°à¸à¸¥à¸±à¸šà¸ªà¸¹à¹ˆà¸£à¸²à¸¢à¸Šà¸·à¹ˆà¸à¹‚ปรเ #: editor/editor_node.cpp editor/plugins/script_editor_plugin.cpp msgid "Debug" -msgstr "ดีบัค" +msgstr "à¹à¸à¹‰à¸ˆà¸¸à¸”บà¸à¸žà¸£à¹ˆà¸à¸‡" #: editor/editor_node.cpp msgid "Deploy with Remote Debug" -msgstr "ส่งà¸à¸à¸à¸”้วยรีโมทดีบัค" +msgstr "ส่งà¸à¸à¸à¸žà¸£à¹‰à¸à¸¡à¸à¸²à¸£à¹à¸à¹‰à¹„ขจุดบà¸à¸žà¸£à¹ˆà¸à¸‡à¸œà¹ˆà¸²à¸™à¹€à¸„รืà¸à¸‚่าย" #: editor/editor_node.cpp msgid "" "When exporting or deploying, the resulting executable will attempt to " "connect to the IP of this computer in order to be debugged." -msgstr "เมื่à¸à¸ªà¹ˆà¸‡à¸à¸à¸ โปรà¹à¸à¸£à¸¡à¸ˆà¸°à¸žà¸¢à¸²à¸¢à¸²à¸¡à¹€à¸Šà¸·à¹ˆà¸à¸¡à¸•à¹ˆà¸à¸¡à¸²à¸¢à¸±à¸‡à¸„à¸à¸¡à¸žà¸´à¸§à¹€à¸•à¸à¸£à¹Œà¹€à¸„รื่à¸à¸‡à¸™à¸µà¹‰à¹€à¸žà¸·à¹ˆà¸à¸—ำà¸à¸²à¸£à¸”ีบัค" +msgstr "เมื่à¸à¸ªà¹ˆà¸‡à¸à¸à¸ โปรà¹à¸à¸£à¸¡à¸ˆà¸°à¸žà¸¢à¸²à¸¢à¸²à¸¡à¹€à¸Šà¸·à¹ˆà¸à¸¡à¸•à¹ˆà¸à¸¡à¸²à¸¢à¸±à¸‡à¸„à¸à¸¡à¸žà¸´à¸§à¹€à¸•à¸à¸£à¹Œà¹€à¸„รื่à¸à¸‡à¸™à¸µà¹‰à¹€à¸žà¸·à¹ˆà¸à¸—ำà¸à¸²à¸£à¹à¸à¹‰à¹„ขจุดบà¸à¸žà¸£à¹ˆà¸à¸‡" #: editor/editor_node.cpp msgid "Small Deploy with Network FS" @@ -2217,12 +2254,11 @@ msgstr "เวลาเฉลี่ย (วินาที)" #: editor/editor_profiler.cpp msgid "Frame %" -msgstr "เฟรม %" +msgstr "% ขà¸à¸‡à¹€à¸Ÿà¸£à¸¡" #: editor/editor_profiler.cpp -#, fuzzy msgid "Physics Frame %" -msgstr "เฟรมคงที่ %" +msgstr "% ขà¸à¸‡à¹€à¸Ÿà¸£à¸¡à¸Ÿà¸´à¸ªà¸´à¸à¸ªà¹Œ" #: editor/editor_profiler.cpp editor/script_editor_debugger.cpp msgid "Time:" @@ -2317,6 +2353,11 @@ msgid "(Current)" msgstr "(ปัจจุบัน)" #: editor/export_template_manager.cpp +#, fuzzy +msgid "Retrieving mirrors, please wait.." +msgstr "เชื่à¸à¸¡à¸•à¹ˆà¸à¹„ม่ได้ à¸à¸£à¸¸à¸“าลà¸à¸‡à¹ƒà¸«à¸¡à¹ˆ" + +#: editor/export_template_manager.cpp msgid "Remove template version '%s'?" msgstr "ลบà¹à¸¡à¹ˆà¹à¸šà¸šà¸£à¸¸à¹ˆà¸™ '%s'?" @@ -2351,6 +2392,112 @@ msgid "Importing:" msgstr "นำเข้า:" #: editor/export_template_manager.cpp +msgid "" +"No download links found for this version. Direct download is only available " +"for official releases." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Can't resolve." +msgstr "ค้นหาไม่สำเร็จ" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Can't connect." +msgstr "เชื่à¸à¸¡à¸•à¹ˆà¸à¹„ม่ได้" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "No response." +msgstr "ไม่มีà¸à¸²à¸£à¸•à¸à¸šà¸à¸¥à¸±à¸š" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Req. Failed." +msgstr "ร้à¸à¸‡à¸‚à¸à¸œà¸´à¸”พลาด" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Redirect Loop." +msgstr "เปลี่ยนทางมาà¸à¹€à¸à¸´à¸™à¹„ป" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Failed:" +msgstr "ผิดพลาด:" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Can't write file." +msgstr "เขียนไฟล์ไม่ได้:\n" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Download Complete." +msgstr "ดาวน์โหลดผิดพลาด" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Error requesting url: " +msgstr "ผิดพลาดขณะบันทึภatlas:" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Connecting to Mirror.." +msgstr "à¸à¸³à¸¥à¸±à¸‡à¹€à¸Šà¸·à¹ˆà¸à¸¡à¸•à¹ˆà¸.." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Disconnected" +msgstr "ลบà¸à¸²à¸£à¹€à¸Šà¸·à¹ˆà¸à¸¡à¹‚ยง" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Resolving" +msgstr "à¸à¸³à¸¥à¸±à¸‡à¸„้นหา.." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Can't Resolve" +msgstr "ค้นหาไม่สำเร็จ" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Connecting.." +msgstr "à¸à¸³à¸¥à¸±à¸‡à¹€à¸Šà¸·à¹ˆà¸à¸¡à¸•à¹ˆà¸.." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Can't Conect" +msgstr "เชื่à¸à¸¡à¸•à¹ˆà¸à¹„ม่ได้" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Connected" +msgstr "เชื่à¸à¸¡" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Requesting.." +msgstr "à¸à¸³à¸¥à¸±à¸‡à¸£à¹‰à¸à¸‡à¸‚à¸.." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Downloading" +msgstr "ดาวน์โหลด" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Connection Error" +msgstr "à¸à¸³à¸¥à¸±à¸‡à¹€à¸Šà¸·à¹ˆà¸à¸¡à¸•à¹ˆà¸.." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "SSL Handshake Error" +msgstr "โหลดผิดพลาด" + +#: editor/export_template_manager.cpp msgid "Current Version:" msgstr "รุ่นปัจจุบัน:" @@ -2374,21 +2521,31 @@ msgstr "เลืà¸à¸à¹„ฟล์à¹à¸¡à¹ˆà¹à¸šà¸š" msgid "Export Template Manager" msgstr "จัดà¸à¸²à¸£à¹à¸¡à¹ˆà¹à¸šà¸šà¸ªà¹ˆà¸‡à¸à¸à¸" +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Download Templates" +msgstr "à¹à¸¡à¹ˆà¹à¸šà¸š" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Select mirror from list: " +msgstr "เลืà¸à¸à¸à¸¸à¸›à¸à¸£à¸“์จาà¸à¸£à¸²à¸¢à¸Šà¸·à¹ˆà¸" + #: editor/file_type_cache.cpp msgid "Can't open file_type_cache.cch for writing, not saving file type cache!" msgstr "เปิดไฟล์ file_type_cache.cch เพื่à¸à¹€à¸‚ียนไม่ได้ จะไม่บันทึà¸à¹à¸„ชขà¸à¸‡à¸Šà¸™à¸´à¸”ไฟล์!" #: editor/filesystem_dock.cpp -msgid "Cannot navigate to '" -msgstr "ไม่สามารถไปยัง '" +msgid "Cannot navigate to '%s' as it has not been found in the file system!" +msgstr "" #: editor/filesystem_dock.cpp msgid "View items as a grid of thumbnails" -msgstr "" +msgstr "à¹à¸ªà¸”งเป็นภาพตัวà¸à¸¢à¹ˆà¸²à¸‡" #: editor/filesystem_dock.cpp msgid "View items as a list" -msgstr "" +msgstr "à¹à¸ªà¸”งเป็นรายชื่à¸à¹„ฟล์" #: editor/filesystem_dock.cpp msgid "" @@ -2399,15 +2556,6 @@ msgstr "" "สถานะ: นำเข้าไฟล์ล้มเหลว à¸à¸£à¸¸à¸“าà¹à¸à¹‰à¹„ขไฟล์à¹à¸¥à¸°à¸™à¸³à¹€à¸‚้าใหม่" #: editor/filesystem_dock.cpp -#, fuzzy -msgid "" -"\n" -"Source: " -msgstr "" -"\n" -"ต้นฉบับ: " - -#: editor/filesystem_dock.cpp msgid "Cannot move/rename resources root." msgstr "ไม่สามารถย้าย/เปลี่ยนชื่à¸à¹‚ฟลเดà¸à¸£à¹Œà¸£à¸²à¸" @@ -2667,8 +2815,8 @@ msgid "Remove Poly And Point" msgstr "ลบรูปหลายเหลี่ยมà¹à¸¥à¸°à¸ˆà¸¸à¸”" #: editor/plugins/abstract_polygon_2d_editor.cpp -#: editor/plugins/light_occluder_2d_editor_plugin.cpp -msgid "Create a new polygon from scratch." +#, fuzzy +msgid "Create a new polygon from scratch" msgstr "สร้างรูปหลายเหลี่ยมจาà¸à¸„วามว่างเปล่า" #: editor/plugins/abstract_polygon_2d_editor.cpp @@ -2683,6 +2831,11 @@ msgstr "" "Ctrl+เมาส์ซ้าย: à¹à¸¢à¸à¸ªà¹ˆà¸§à¸™\n" "เมาส์ขวา: ลบจุด" +#: editor/plugins/abstract_polygon_2d_editor.cpp +#, fuzzy +msgid "Delete points" +msgstr "ลบจุด" + #: editor/plugins/animation_player_editor_plugin.cpp msgid "Toggle Autoplay" msgstr "เปิดปิดà¸à¸²à¸£à¹€à¸¥à¹ˆà¸™à¸à¸±à¸•à¹‚นมัติ" @@ -3018,18 +3171,10 @@ msgid "Can't resolve hostname:" msgstr "ไม่พบตำà¹à¸«à¸™à¹ˆà¸‡à¸™à¸µà¹‰:" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Can't resolve." -msgstr "ค้นหาไม่สำเร็จ" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Connection error, please try again." msgstr "เชื่à¸à¸¡à¸•à¹ˆà¸à¹„ม่ได้ à¸à¸£à¸¸à¸“าลà¸à¸‡à¹ƒà¸«à¸¡à¹ˆ" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Can't connect." -msgstr "เชื่à¸à¸¡à¸•à¹ˆà¸à¹„ม่ได้" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Can't connect to host:" msgstr "ไม่สามารถเชื่à¸à¸¡à¸•à¹ˆà¸à¸à¸±à¸šà¹‚ฮสต์:" @@ -3038,30 +3183,14 @@ msgid "No response from host:" msgstr "ไม่มีà¸à¸²à¸£à¸•à¸à¸šà¸à¸¥à¸±à¸šà¸ˆà¸²à¸à¹‚ฮสต์:" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "No response." -msgstr "ไม่มีà¸à¸²à¸£à¸•à¸à¸šà¸à¸¥à¸±à¸š" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Request failed, return code:" msgstr "à¸à¸²à¸£à¸£à¹‰à¸à¸‡à¸‚à¸à¸œà¸´à¸”พลาด รหัส:" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Req. Failed." -msgstr "ร้à¸à¸‡à¸‚à¸à¸œà¸´à¸”พลาด" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Request failed, too many redirects" msgstr "à¸à¸²à¸£à¸£à¹‰à¸à¸‡à¸‚à¸à¸œà¸´à¸”พลาด เปลี่ยนทางมาà¸à¹€à¸à¸´à¸™à¹„ป" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Redirect Loop." -msgstr "เปลี่ยนทางมาà¸à¹€à¸à¸´à¸™à¹„ป" - -#: editor/plugins/asset_library_editor_plugin.cpp -msgid "Failed:" -msgstr "ผิดพลาด:" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Bad download hash, assuming file has been tampered with." msgstr "à¹à¸®à¸Šà¸œà¸´à¸”พลาด ไฟล์ดาวน์โหลดà¸à¸²à¸ˆà¹€à¸ªà¸µà¸¢à¸«à¸²à¸¢" @@ -3090,14 +3219,6 @@ msgid "Resolving.." msgstr "à¸à¸³à¸¥à¸±à¸‡à¸„้นหา.." #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Connecting.." -msgstr "à¸à¸³à¸¥à¸±à¸‡à¹€à¸Šà¸·à¹ˆà¸à¸¡à¸•à¹ˆà¸.." - -#: editor/plugins/asset_library_editor_plugin.cpp -msgid "Requesting.." -msgstr "à¸à¸³à¸¥à¸±à¸‡à¸£à¹‰à¸à¸‡à¸‚à¸.." - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Error making request" msgstr "à¸à¸²à¸£à¸£à¹‰à¸à¸‡à¸‚à¸à¸œà¸´à¸”พลาด" @@ -3210,6 +3331,39 @@ msgid "Move Action" msgstr "" #: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Move vertical guide" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Create new vertical guide" +msgstr "สร้างสคริปต์ใหม่" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Remove vertical guide" +msgstr "ลบตัวà¹à¸›à¸£" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Move horizontal guide" +msgstr "ย้ายจุดในเส้นโค้ง" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Create new horizontal guide" +msgstr "สร้างสคริปต์ใหม่" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Remove horizontal guide" +msgstr "ลบคีย์ที่ผิดพลาด" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Create new horizontal and vertical guides" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp msgid "Edit IK Chain" msgstr "à¹à¸à¹‰à¹„ข IK Chain" @@ -3218,9 +3372,8 @@ msgid "Edit CanvasItem" msgstr "à¹à¸à¹‰à¹„ข CanvasItem" #: editor/plugins/canvas_item_editor_plugin.cpp -#, fuzzy msgid "Anchors only" -msgstr "ตรึง" +msgstr "ปรับหมุดเท่านั้น" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Change Anchors and Margins" @@ -3280,9 +3433,8 @@ msgid "Pan Mode" msgstr "โหมดมุมมà¸à¸‡" #: editor/plugins/canvas_item_editor_plugin.cpp -#, fuzzy msgid "Toggles snapping" -msgstr "เปิด/ปิด จุดพัà¸à¹‚ปรà¹à¸à¸£à¸¡" +msgstr "เปิด/ปิด à¸à¸²à¸£à¸ˆà¸³à¸à¸±à¸”" #: editor/plugins/canvas_item_editor_plugin.cpp #: editor/plugins/spatial_editor_plugin.cpp @@ -3290,23 +3442,20 @@ msgid "Use Snap" msgstr "จำà¸à¸±à¸”à¸à¸²à¸£à¹€à¸„ลื่à¸à¸™à¸¢à¹‰à¸²à¸¢" #: editor/plugins/canvas_item_editor_plugin.cpp -#, fuzzy msgid "Snapping options" -msgstr "ตัวเลืà¸à¸à¹à¸à¸™à¸´à¹€à¸¡à¸Šà¸±à¸™" +msgstr "ตัวเลืà¸à¸à¸à¸²à¸£à¸ˆà¸³à¸à¸±à¸”" #: editor/plugins/canvas_item_editor_plugin.cpp -#, fuzzy msgid "Snap to grid" -msgstr "โหมดà¸à¸²à¸£à¸ˆà¸³à¸à¸±à¸”:" +msgstr "จำà¸à¸±à¸”ด้วยเส้นตาราง" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Use Rotation Snap" msgstr "จำà¸à¸±à¸”à¸à¸²à¸£à¸«à¸¡à¸¸à¸™" #: editor/plugins/canvas_item_editor_plugin.cpp -#, fuzzy msgid "Configure Snap..." -msgstr "ตั้งค่าà¸à¸²à¸£à¸ˆà¸³à¸à¸±à¸”.." +msgstr "ตั้งค่าà¸à¸²à¸£à¸ˆà¸³à¸à¸±à¸”..." #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Snap Relative" @@ -3318,30 +3467,36 @@ msgstr "จำà¸à¸±à¸”ให้ย้ายเป็นพิà¸à¹€à¸‹à¸¥" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Smart snapping" -msgstr "" +msgstr "จำà¸à¸±à¸”à¸à¸±à¸•à¹‚นมัติ" #: editor/plugins/canvas_item_editor_plugin.cpp -#, fuzzy msgid "Snap to parent" -msgstr "ขยายให้เต็มโหนดà¹à¸¡à¹ˆ" +msgstr "จำà¸à¸±à¸”ด้วยโหนดà¹à¸¡à¹ˆ" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Snap to node anchor" -msgstr "" +msgstr "จำà¸à¸±à¸”ด้วยจุดหมุนขà¸à¸‡à¹‚หนด" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Snap to node sides" -msgstr "" +msgstr "จำà¸à¸±à¸”ด้วยเส้นขà¸à¸šà¸‚à¸à¸‡à¹‚หนด" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Snap to other nodes" -msgstr "" +msgstr "จำà¸à¸±à¸”ด้วยโหนดà¸à¸·à¹ˆà¸™" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Snap to guides" +msgstr "จำà¸à¸±à¸”ด้วยเส้นตาราง" #: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Lock the selected object in place (can't be moved)." msgstr "ล็à¸à¸„ไม่ให้วัตถุที่เลืà¸à¸à¸¢à¹‰à¸²à¸¢à¸•à¸³à¹à¸«à¸™à¹ˆà¸‡" #: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Unlock the selected object (can be moved)." msgstr "ปลดล็à¸à¸„วัตถุที่เลืà¸à¸" @@ -3392,6 +3547,11 @@ msgid "Show rulers" msgstr "à¹à¸ªà¸”งไม้บรรทัด" #: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Show guides" +msgstr "à¹à¸ªà¸”งไม้บรรทัด" + +#: editor/plugins/canvas_item_editor_plugin.cpp msgid "Center Selection" msgstr "ให้สิ่งที่เลืà¸à¸à¸à¸¢à¸¹à¹ˆà¸à¸¥à¸²à¸‡à¸ˆà¸" @@ -3578,6 +3738,10 @@ msgstr "" msgid "Hold Shift to edit tangents individually" msgstr "à¸à¸” Shift ค้างเพื่à¸à¸›à¸£à¸±à¸šà¹€à¸ªà¹‰à¸™à¸ªà¸±à¸¡à¸œà¸±à¸ªà¹à¸¢à¸à¸à¸±à¸™" +#: editor/plugins/gi_probe_editor_plugin.cpp +msgid "Bake GI Probe" +msgstr "" + #: editor/plugins/gradient_editor_plugin.cpp msgid "Add/Remove Color Ramp Point" msgstr "เพิ่ม/ลบตำà¹à¸«à¸™à¹ˆà¸‡à¸ªà¸µ" @@ -3612,6 +3776,10 @@ msgid "Create Occluder Polygon" msgstr "สร้างรูปหลายเหลี่ยมà¸à¸±à¹‰à¸™à¹à¸ªà¸‡" #: editor/plugins/light_occluder_2d_editor_plugin.cpp +msgid "Create a new polygon from scratch." +msgstr "สร้างรูปหลายเหลี่ยมจาà¸à¸„วามว่างเปล่า" + +#: editor/plugins/light_occluder_2d_editor_plugin.cpp msgid "Edit existing polygon:" msgstr "à¹à¸à¹‰à¹„ขรูปหลายเหลี่ยมเดิม:" @@ -3627,58 +3795,6 @@ msgstr "Ctrl+คลิà¸à¸‹à¹‰à¸²à¸¢: à¹à¸¢à¸à¸ªà¹ˆà¸§à¸™" msgid "RMB: Erase Point." msgstr "คลิà¸à¸‚วา: ลบจุด" -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Remove Point from Line2D" -msgstr "ลบจุดจาà¸à¹€à¸ªà¹‰à¸™" - -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Add Point to Line2D" -msgstr "เพิ่มจุดในเส้น" - -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Move Point in Line2D" -msgstr "ย้ายจุดในเส้น" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Select Points" -msgstr "เลืà¸à¸à¸ˆà¸¸à¸”" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Shift+Drag: Select Control Points" -msgstr "Shift+ลาà¸: เลืà¸à¸à¹€à¸ªà¹‰à¸™à¸ªà¸±à¸¡à¸œà¸±à¸ª" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Click: Add Point" -msgstr "คลิà¸: เพิ่มจุด" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Right Click: Delete Point" -msgstr "คลิà¸à¸‚วา: ลบจุด" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Add Point (in empty space)" -msgstr "เพิ่มจุด (ในที่ว่าง)" - -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Split Segment (in line)" -msgstr "à¹à¸¢à¸à¸ªà¹ˆà¸§à¸™ (ในเส้น)" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Delete Point" -msgstr "ลบจุด" - #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Mesh is empty!" msgstr "Mesh ว่างเปล่า!" @@ -3892,7 +4008,6 @@ msgid "Eroding walkable area..." msgstr "บีบà¹à¸„บส่วนที่เดินผ่านได้..." #: editor/plugins/navigation_mesh_generator.cpp -#, fuzzy msgid "Partitioning..." msgstr "à¸à¸³à¸¥à¸±à¸‡à¹à¸šà¹ˆà¸‡à¸ªà¹ˆà¸§à¸™..." @@ -4080,16 +4195,46 @@ msgid "Move Out-Control in Curve" msgstr "ย้ายจุดควบคุมขาà¸à¸à¸à¸‚à¸à¸‡à¹€à¸ªà¹‰à¸™à¹‚ค้ง" #: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Select Points" +msgstr "เลืà¸à¸à¸ˆà¸¸à¸”" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Shift+Drag: Select Control Points" +msgstr "Shift+ลาà¸: เลืà¸à¸à¹€à¸ªà¹‰à¸™à¸ªà¸±à¸¡à¸œà¸±à¸ª" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Click: Add Point" +msgstr "คลิà¸: เพิ่มจุด" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Right Click: Delete Point" +msgstr "คลิà¸à¸‚วา: ลบจุด" + +#: editor/plugins/path_2d_editor_plugin.cpp msgid "Select Control Points (Shift+Drag)" msgstr "เลืà¸à¸à¹€à¸ªà¹‰à¸™à¸ªà¸±à¸¡à¸œà¸±à¸ª (Shift+ลาà¸)" #: editor/plugins/path_2d_editor_plugin.cpp #: editor/plugins/path_editor_plugin.cpp +msgid "Add Point (in empty space)" +msgstr "เพิ่มจุด (ในที่ว่าง)" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp msgid "Split Segment (in curve)" msgstr "à¹à¸¢à¸à¸ªà¹ˆà¸§à¸™ (ในเส้นโค้ง)" #: editor/plugins/path_2d_editor_plugin.cpp #: editor/plugins/path_editor_plugin.cpp +msgid "Delete Point" +msgstr "ลบจุด" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp msgid "Close Curve" msgstr "ปิดเส้นโค้ง" @@ -4229,7 +4374,6 @@ msgstr "โหลดรีซà¸à¸£à¹Œà¸ª" #: editor/plugins/resource_preloader_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp #: editor/plugins/sprite_frames_editor_plugin.cpp editor/property_editor.cpp #: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Paste" @@ -4276,6 +4420,21 @@ msgid " Class Reference" msgstr " ตำราà¸à¹‰à¸²à¸‡à¸à¸´à¸‡à¸„ลาส" #: editor/plugins/script_editor_plugin.cpp +#, fuzzy +msgid "Sort" +msgstr "เรียงตาม:" + +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp +msgid "Move Up" +msgstr "ย้ายขึ้น" + +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp +msgid "Move Down" +msgstr "ย้ายลง" + +#: editor/plugins/script_editor_plugin.cpp msgid "Next script" msgstr "สคริปต์ถัดไป" @@ -4327,6 +4486,10 @@ msgstr "ปิดคู่มืà¸" msgid "Close All" msgstr "ปิดทั้งหมด" +#: editor/plugins/script_editor_plugin.cpp +msgid "Close Other Tabs" +msgstr "" + #: editor/plugins/script_editor_plugin.cpp editor/project_manager.cpp msgid "Run" msgstr "รัน" @@ -4337,13 +4500,11 @@ msgstr "เปิด/ปิดà¹à¸œà¸‡à¸ªà¸„ริปต์" #: editor/plugins/script_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Find.." msgstr "ค้นหา.." #: editor/plugins/script_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Find Next" msgstr "ค้นหาต่à¸à¹„ป" @@ -4366,11 +4527,11 @@ msgstr "ทำต่à¸à¹„ป" #: editor/plugins/script_editor_plugin.cpp msgid "Keep Debugger Open" -msgstr "เปิดตัวดีบัคค้างไว้" +msgstr "เปิดตัวà¹à¸à¹‰à¹„ขจุดบà¸à¸žà¸£à¹ˆà¸à¸‡à¸„้างไว้" #: editor/plugins/script_editor_plugin.cpp msgid "Debug with external editor" -msgstr "ดีบัคด้วยโปรà¹à¸à¸£à¸¡à¸à¸·à¹ˆà¸™" +msgstr "à¹à¸à¹‰à¸ˆà¸¸à¸”บà¸à¸žà¸£à¹ˆà¸à¸‡à¸”้วยโปรà¹à¸à¸£à¸¡à¸à¸·à¹ˆà¸™" #: editor/plugins/script_editor_plugin.cpp msgid "Open Godot online documentation" @@ -4418,7 +4579,7 @@ msgstr "บันทึà¸à¸à¸µà¸à¸„รั้ง" #: editor/plugins/script_editor_plugin.cpp editor/script_editor_debugger.cpp msgid "Debugger" -msgstr "ตัวดีบัค" +msgstr "ตัวà¹à¸à¹‰à¹„ขจุดบà¸à¸žà¸£à¹ˆà¸à¸‡" #: editor/plugins/script_editor_plugin.cpp msgid "" @@ -4449,36 +4610,25 @@ msgstr "ตัวพิมพ์เล็à¸" msgid "Capitalize" msgstr "à¸à¸±à¸à¸©à¸£à¹à¸£à¸à¸žà¸´à¸¡à¸žà¹Œà¹ƒà¸«à¸à¹ˆ" -#: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp scene/gui/line_edit.cpp +#: editor/plugins/script_text_editor.cpp scene/gui/line_edit.cpp #: scene/gui/text_edit.cpp msgid "Cut" msgstr "ตัด" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp #: editor/plugins/sprite_frames_editor_plugin.cpp editor/property_editor.cpp #: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Copy" msgstr "คัดลà¸à¸" -#: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp scene/gui/line_edit.cpp +#: editor/plugins/script_text_editor.cpp scene/gui/line_edit.cpp #: scene/gui/text_edit.cpp msgid "Select All" msgstr "เลืà¸à¸à¸—ั้งหมด" -#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp -msgid "Move Up" -msgstr "ย้ายขึ้น" - -#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp -msgid "Move Down" -msgstr "ย้ายลง" - #: editor/plugins/script_text_editor.cpp msgid "Delete Line" -msgstr "ลบเส้น" +msgstr "ลบบรรทัด" #: editor/plugins/script_text_editor.cpp msgid "Indent Left" @@ -4497,6 +4647,23 @@ msgid "Clone Down" msgstr "คัดลà¸à¸à¸šà¸£à¸£à¸—ัดลงมา" #: editor/plugins/script_text_editor.cpp +#, fuzzy +msgid "Fold Line" +msgstr "ไปยังบรรทัด" + +#: editor/plugins/script_text_editor.cpp +msgid "Unfold Line" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Fold All Lines" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Unfold All Lines" +msgstr "" + +#: editor/plugins/script_text_editor.cpp msgid "Complete Symbol" msgstr "เสนà¸à¹à¸™à¸°à¸„ำเต็ม" @@ -4542,12 +4709,10 @@ msgid "Convert To Lowercase" msgstr "à¹à¸›à¸¥à¸‡à¹€à¸›à¹‡à¸™à¸•à¸±à¸§à¸žà¸´à¸¡à¸žà¹Œà¹€à¸¥à¹‡à¸" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Find Previous" msgstr "ค้นหาà¸à¹ˆà¸à¸™à¸«à¸™à¹‰à¸²" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Replace.." msgstr "à¹à¸—นที่.." @@ -4556,7 +4721,6 @@ msgid "Goto Function.." msgstr "ไปยังฟังà¸à¹Œà¸Šà¸±à¸™.." #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Goto Line.." msgstr "ไปยังบรรทัด.." @@ -4723,6 +4887,16 @@ msgid "View Plane Transform." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Scaling: " +msgstr "à¸à¸±à¸•à¸£à¸²à¸ªà¹ˆà¸§à¸™:" + +#: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Translating: " +msgstr "à¸à¸²à¸£à¹à¸›à¸¥:" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Rotating %s degrees." msgstr "หมุน %s à¸à¸‡à¸¨à¸²" @@ -4803,6 +4977,10 @@ msgid "Vertices" msgstr "มุมรูปทรง" #: editor/plugins/spatial_editor_plugin.cpp +msgid "FPS" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Align with view" msgstr "ย้ายมาที่à¸à¸¥à¹‰à¸à¸‡" @@ -4835,6 +5013,16 @@ msgid "View Information" msgstr "à¹à¸ªà¸”งข้à¸à¸¡à¸¹à¸¥" #: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "View FPS" +msgstr "ดูไฟล์" + +#: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Half Resolution" +msgstr "ปรับà¸à¸±à¸•à¸£à¸²à¸ªà¹ˆà¸§à¸™à¹€à¸§à¸¥à¸²à¸„ีย์ที่เลืà¸à¸" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Audio Listener" msgstr "ตัวรับเสียง" @@ -4965,6 +5153,11 @@ msgid "Tool Scale" msgstr "เครื่à¸à¸‡à¸¡à¸·à¸à¸›à¸£à¸±à¸šà¸‚นาด" #: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Toggle Freelook" +msgstr "สลับเต็มจà¸" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Transform" msgstr "เคลื่à¸à¸™à¸¢à¹‰à¸²à¸¢" @@ -5217,11 +5410,11 @@ msgstr "ลบทั้งหมด" #: editor/plugins/theme_editor_plugin.cpp msgid "Edit theme.." -msgstr "" +msgstr "à¹à¸à¹‰à¹„ขธีม.." #: editor/plugins/theme_editor_plugin.cpp msgid "Theme editing menu." -msgstr "" +msgstr "เมนูà¹à¸à¹‰à¹„ขธีม" #: editor/plugins/theme_editor_plugin.cpp msgid "Add Class Items" @@ -5240,6 +5433,11 @@ msgid "Create Empty Editor Template" msgstr "สร้างà¹à¸¡à¹ˆà¹à¸šà¸šà¹€à¸›à¸¥à¹ˆà¸²" #: editor/plugins/theme_editor_plugin.cpp +#, fuzzy +msgid "Create From Current Editor Theme" +msgstr "สร้างà¹à¸¡à¹ˆà¹à¸šà¸šà¹€à¸›à¸¥à¹ˆà¸²" + +#: editor/plugins/theme_editor_plugin.cpp msgid "CheckBox Radio1" msgstr "ปุ่มเรดิโภ1" @@ -5413,7 +5611,8 @@ msgid "Runnable" msgstr "รันได้" #: editor/project_export.cpp -msgid "Delete patch '" +#, fuzzy +msgid "Delete patch '%s' from list?" msgstr "ลบà¹à¸žà¸•à¸Šà¹Œ '" #: editor/project_export.cpp @@ -5500,7 +5699,7 @@ msgstr "à¹à¸¡à¹ˆà¹à¸šà¸šà¸ªà¹ˆà¸‡à¸à¸à¸à¸ªà¸³à¸«à¸£à¸±à¸šà¹à¸žà¸¥à¸•à¸Ÿà¸ #: editor/project_export.cpp msgid "Export With Debug" -msgstr "ส่งà¸à¸à¸à¸žà¸£à¹‰à¸à¸¡à¸•à¸±à¸§à¸”ีบัค" +msgstr "ส่งà¸à¸à¸à¸žà¸£à¹‰à¸à¸¡à¸à¸²à¸£à¹à¸à¹‰à¹„ขจุดบà¸à¸žà¸£à¹ˆà¸à¸‡" #: editor/project_manager.cpp #, fuzzy @@ -5515,11 +5714,11 @@ msgstr "à¸à¸£à¸¸à¸“าเลืà¸à¸à¹„ฟล์ 'project.godot'" msgid "" "Your project will be created in a non empty folder (you might want to create " "a new folder)." -msgstr "" +msgstr "จะสร้างโปรเจà¸à¸•à¹Œà¹ƒà¸™à¹‚ฟลเดà¸à¸£à¹Œà¸—ี่มีไฟล์à¸à¸¢à¸¹à¹ˆà¹à¸¥à¹‰à¸§ (ท่านà¸à¸²à¸ˆà¸•à¹‰à¸à¸‡à¸à¸²à¸£à¸ªà¸£à¹‰à¸²à¸‡à¹‚ฟลเดà¸à¸£à¹Œà¹ƒà¸«à¸¡à¹ˆ)" #: editor/project_manager.cpp msgid "Please choose a folder that does not contain a 'project.godot' file." -msgstr "" +msgstr "à¸à¸£à¸¸à¸“าเลืà¸à¸à¹‚ฟลเดà¸à¸£à¹Œà¸—ี่ไม่มีไฟล์ 'project.godot'" #: editor/project_manager.cpp msgid "Imported Project" @@ -5527,11 +5726,11 @@ msgstr "นำเข้าโปรเจà¸à¸•à¹Œà¹à¸¥à¹‰à¸§" #: editor/project_manager.cpp msgid " " -msgstr "" +msgstr " " #: editor/project_manager.cpp msgid "It would be a good idea to name your project." -msgstr "" +msgstr "ควรตั้งชื่à¸à¹‚ปรเจà¸à¸•à¹Œ" #: editor/project_manager.cpp msgid "Invalid project path (changed anything?)." @@ -5639,6 +5838,8 @@ msgid "" "Language changed.\n" "The UI will update next time the editor or project manager starts." msgstr "" +"เปลี่ยนภาษาà¹à¸¥à¹‰à¸§\n" +"à¸à¸²à¸£à¹€à¸›à¸¥à¸µà¹ˆà¸¢à¸™à¹à¸›à¸¥à¸‡à¸ˆà¸°à¸¡à¸µà¸œà¸¥à¹€à¸¡à¸·à¹ˆà¸à¹€à¸›à¸´à¸”โปรà¹à¸à¸£à¸¡à¹à¸à¹‰à¹„ขหรืà¸à¸•à¸±à¸§à¸ˆà¸±à¸”à¸à¸²à¸£à¹‚ปรเจà¸à¸•à¹Œà¹ƒà¸«à¸¡à¹ˆ" #: editor/project_manager.cpp msgid "" @@ -5671,9 +5872,8 @@ msgid "Exit" msgstr "à¸à¸à¸" #: editor/project_manager.cpp -#, fuzzy msgid "Restart Now" -msgstr "หาโหนดà¹à¸¡à¹ˆà¹ƒà¸«à¸¡à¹ˆ" +msgstr "เริ่มใหม่ทันที" #: editor/project_manager.cpp msgid "Can't run project" @@ -5712,10 +5912,6 @@ msgid "Add Input Action Event" msgstr "เพิ่มà¸à¸²à¸£à¸à¸£à¸°à¸—ำ" #: editor/project_settings_editor.cpp editor/settings_config_dialog.cpp -msgid "Meta+" -msgstr "Meta+" - -#: editor/project_settings_editor.cpp editor/settings_config_dialog.cpp msgid "Shift+" msgstr "Shift+" @@ -5837,12 +6033,13 @@ msgid "Select a setting item first!" msgstr "à¸à¸£à¸¸à¸“าเลืà¸à¸à¸•à¸±à¸§à¹€à¸¥à¸·à¸à¸à¸à¹ˆà¸à¸™!" #: editor/project_settings_editor.cpp -msgid "No property '" +#, fuzzy +msgid "No property '%s' exists." msgstr "ไม่พบคุณสมบัติ '" #: editor/project_settings_editor.cpp -msgid "Setting '" -msgstr "ตัวเลืà¸à¸ '" +msgid "Setting '%s' is internal, and it can't be deleted." +msgstr "" #: editor/project_settings_editor.cpp msgid "Delete Item" @@ -5897,13 +6094,12 @@ msgid "Remove Resource Remap Option" msgstr "ลบà¸à¸²à¸£à¹à¸—นที่" #: editor/project_settings_editor.cpp -#, fuzzy msgid "Changed Locale Filter" -msgstr "ปรับขนาดà¸à¸¥à¹‰à¸à¸‡" +msgstr "à¹à¸à¹‰à¹„ขตัวà¸à¸£à¸à¸‡à¸ ูมิภาค" #: editor/project_settings_editor.cpp msgid "Changed Locale Filter Mode" -msgstr "" +msgstr "à¹à¸à¹‰à¹„ขโหมดà¸à¸²à¸£à¸à¸£à¸à¸‡à¸ ูมิภาค" #: editor/project_settings_editor.cpp msgid "Project Settings (project.godot)" @@ -5966,28 +6162,24 @@ msgid "Locale" msgstr "ท้à¸à¸‡à¸–ิ่น" #: editor/project_settings_editor.cpp -#, fuzzy msgid "Locales Filter" -msgstr "ท้à¸à¸‡à¸–ิ่น" +msgstr "ตัวà¸à¸£à¸à¸‡à¸ ูมิภาค" #: editor/project_settings_editor.cpp -#, fuzzy msgid "Show all locales" -msgstr "à¹à¸ªà¸”งà¸à¸£à¸°à¸”ูà¸" +msgstr "à¹à¸ªà¸”งทุà¸à¸ ูมิภาค" #: editor/project_settings_editor.cpp msgid "Show only selected locales" -msgstr "" +msgstr "à¹à¸ªà¸”งเฉพาะภูมิภาคที่เลืà¸à¸" #: editor/project_settings_editor.cpp -#, fuzzy msgid "Filter mode:" -msgstr "ตัวà¸à¸£à¸à¸‡" +msgstr "โหมดà¸à¸²à¸£à¸à¸£à¸à¸‡:" #: editor/project_settings_editor.cpp -#, fuzzy msgid "Locales:" -msgstr "ท้à¸à¸‡à¸–ิ่น" +msgstr "ภูมิภาค:" #: editor/project_settings_editor.cpp msgid "AutoLoad" @@ -6313,6 +6505,16 @@ msgid "Clear a script for the selected node." msgstr "ลบสคริปต์ขà¸à¸‡à¹‚หนดที่เลืà¸à¸" #: editor/scene_tree_dock.cpp +#, fuzzy +msgid "Remote" +msgstr "ลบ" + +#: editor/scene_tree_dock.cpp +#, fuzzy +msgid "Local" +msgstr "ท้à¸à¸‡à¸–ิ่น" + +#: editor/scene_tree_dock.cpp msgid "Clear Inheritance? (No Undo!)" msgstr "ลบà¸à¸²à¸£à¸ªà¸·à¸šà¸—à¸à¸”? (ย้à¸à¸™à¸à¸¥à¸±à¸šà¹„ม่ได้!)" @@ -6434,7 +6636,7 @@ msgstr "ตำà¹à¸«à¸™à¹ˆà¸‡à¹€à¸£à¸´à¹ˆà¸¡à¸•à¹‰à¸™à¹„ม่ถูà¸à¸•à¹‰à¸ #: editor/script_create_dialog.cpp msgid "Directory of the same name exists" -msgstr "" +msgstr "มีโฟลเดà¸à¸£à¹Œà¸Šà¸·à¹ˆà¸à¸™à¸µà¹‰à¸à¸¢à¸¹à¹ˆà¹à¸¥à¹‰à¸§" #: editor/script_create_dialog.cpp msgid "File exists, will be reused" @@ -6506,6 +6708,11 @@ msgid "Attach Node Script" msgstr "เชื่à¸à¸¡à¸ªà¸„ริปต์ให้โหนด" #: editor/script_editor_debugger.cpp +#, fuzzy +msgid "Remote " +msgstr "ลบ" + +#: editor/script_editor_debugger.cpp msgid "Bytes:" msgstr "ไบต์:" @@ -6527,7 +6734,7 @@ msgstr "ฟังà¸à¹Œà¸Šà¸±à¸™:" #: editor/script_editor_debugger.cpp msgid "Pick one or more items from the list to display the graph." -msgstr "" +msgstr "เลืà¸à¸à¸‚้à¸à¸¡à¸¹à¸¥à¸ˆà¸²à¸à¸£à¸²à¸¢à¸Šà¸·à¹ˆà¸à¹€à¸žà¸·à¹ˆà¸à¹à¸ªà¸”งà¸à¸£à¸²à¸Ÿ" #: editor/script_editor_debugger.cpp msgid "Errors" @@ -6562,18 +6769,6 @@ msgid "Stack Trace (if applicable):" msgstr "สà¹à¸•à¸„ (ถ้ามี):" #: editor/script_editor_debugger.cpp -msgid "Remote Inspector" -msgstr "คุณสมบัติ" - -#: editor/script_editor_debugger.cpp -msgid "Live Scene Tree:" -msgstr "ผังฉาà¸à¸›à¸±à¸ˆà¸ˆà¸¸à¸šà¸±à¸™:" - -#: editor/script_editor_debugger.cpp -msgid "Remote Object Properties: " -msgstr "คุณสมบัติ: " - -#: editor/script_editor_debugger.cpp msgid "Profiler" msgstr "ประสิทธิภาพ" @@ -6647,7 +6842,7 @@ msgstr "ปรับรัศมีà¹à¸ªà¸‡" #: editor/spatial_editor_gizmos.cpp msgid "Change AudioStreamPlayer3D Emission Angle" -msgstr "" +msgstr "à¹à¸à¹‰à¹„ขà¸à¸‡à¸¨à¸²à¸à¸²à¸£à¹€à¸›à¸¥à¹ˆà¸‡à¹€à¸ªà¸µà¸¢à¸‡à¸‚à¸à¸‡ AudioStreamPlayer3D" #: editor/spatial_editor_gizmos.cpp msgid "Change Camera FOV" @@ -6695,61 +6890,60 @@ msgid "Library" msgstr "ไลบรารี" #: modules/gdnative/gd_native_library_editor.cpp -#, fuzzy msgid "Status" -msgstr "สถานะ:" +msgstr "สถานะ" #: modules/gdnative/gd_native_library_editor.cpp msgid "Libraries: " -msgstr "" +msgstr "ไลบรารี: " #: modules/gdnative/register_types.cpp msgid "GDNative" -msgstr "" +msgstr "GDNative" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp #: modules/visual_script/visual_script_builtin_funcs.cpp msgid "Invalid type argument to convert(), use TYPE_* constants." msgstr "ตัวà¹à¸›à¸£à¹ƒà¸™ convert() ผิดพลาด ใช้ค่าคงที่ TYPE_* เท่านั้น" -#: modules/gdscript/gd_functions.cpp modules/mono/glue/glue_header.h +#: modules/gdscript/gdscript_functions.cpp modules/mono/glue/glue_header.h #: modules/visual_script/visual_script_builtin_funcs.cpp msgid "Not enough bytes for decoding bytes, or invalid format." msgstr "ไบต์ไม่ครบหรืà¸à¸œà¸´à¸”รูปà¹à¸šà¸š ไม่สามารถà¹à¸›à¸¥à¸‡à¸„่าได้" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "step argument is zero!" msgstr "ตัวà¹à¸›à¸£ step เป็นศูนย์!" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Not a script with an instance" msgstr "ไม่ใช่สคริปต์ที่มีà¸à¸´à¸™à¸ªà¹à¸•à¸™à¸‹à¹Œ" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Not based on a script" msgstr "ไม่ได้มีต้นà¸à¸³à¹€à¸™à¸´à¸”จาà¸à¸ªà¸„ริปต์" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Not based on a resource file" msgstr "ไม่ได้มีต้นà¸à¸³à¹€à¸™à¸´à¸”มาจาà¸à¹„ฟล์รีซà¸à¸£à¹Œà¸ª" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary format (missing @path)" msgstr "รูปà¹à¸šà¸šà¸”ิà¸à¸Šà¸±à¸™à¸™à¸²à¸£à¸µà¸—ี่เà¸à¹‡à¸šà¸à¸´à¸™à¸ªà¹à¸•à¸™à¸‹à¹Œà¹„ม่ถูà¸à¸•à¹‰à¸à¸‡ (ไม่มี @path)" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary format (can't load script at @path)" msgstr "รูปà¹à¸šà¸šà¸”ิà¸à¸Šà¸±à¸™à¸™à¸²à¸£à¸µà¸—ี่เà¸à¹‡à¸šà¸à¸´à¸™à¸ªà¹à¸•à¸™à¸‹à¹Œà¹„ม่ถูà¸à¸•à¹‰à¸à¸‡ (โหลดสคริปต์ที่ @path ไม่ได้)" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary format (invalid script at @path)" msgstr "รูปà¹à¸šà¸šà¸”ิà¸à¸Šà¸±à¸™à¸™à¸²à¸£à¸µà¸—ี่เà¸à¹‡à¸šà¸à¸´à¸™à¸ªà¹à¸•à¸™à¸‹à¹Œà¹„ม่ถูà¸à¸•à¹‰à¸à¸‡ (สคริปต์ที่ @path ผิดพลาด)" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary (invalid subclasses)" msgstr "ดิà¸à¸Šà¸±à¸™à¸™à¸²à¸£à¸µà¸—ี่เà¸à¹‡à¸šà¸à¸´à¸™à¸ªà¹à¸•à¸™à¸‹à¹Œà¸œà¸´à¸”พลาด (คลาสย่à¸à¸¢à¸œà¸´à¸”พลาด)" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Object can't provide a length." msgstr "ไม่สามารถบà¸à¸à¸„วามยาวขà¸à¸‡à¸§à¸±à¸•à¸–ุได้" @@ -6762,16 +6956,26 @@ msgid "GridMap Duplicate Selection" msgstr "ทำซ้ำใน GridMap" #: modules/gridmap/grid_map_editor_plugin.cpp +msgid "Floor:" +msgstr "" + +#: modules/gridmap/grid_map_editor_plugin.cpp +#, fuzzy +msgid "Grid Map" +msgstr "จำà¸à¸±à¸”ด้วยเส้นตาราง" + +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Snap View" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp -msgid "Prev Level (%sDown Wheel)" -msgstr "ชั้นà¸à¹ˆà¸à¸™à¸«à¸™à¹‰à¸² (%sล้à¸à¹€à¸¡à¸²à¸ªà¹Œà¸¥à¸‡)" +#, fuzzy +msgid "Previous Floor" +msgstr "à¹à¸—็บà¸à¹ˆà¸à¸™à¸«à¸™à¹‰à¸²" #: modules/gridmap/grid_map_editor_plugin.cpp -msgid "Next Level (%sUp Wheel)" -msgstr "ชั้นถัดไป (%sล้à¸à¹€à¸¡à¸²à¸ªà¹Œà¸‚ึ้น)" +msgid "Next Floor" +msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp #, fuzzy @@ -6839,12 +7043,9 @@ msgid "Erase Area" msgstr "ลบพื้นที่" #: modules/gridmap/grid_map_editor_plugin.cpp -msgid "Selection -> Duplicate" -msgstr "ทำซ้ำที่เลืà¸à¸" - -#: modules/gridmap/grid_map_editor_plugin.cpp -msgid "Selection -> Clear" -msgstr "ลบที่เลืà¸à¸" +#, fuzzy +msgid "Clear Selection" +msgstr "ให้สิ่งที่เลืà¸à¸à¸à¸¢à¸¹à¹ˆà¸à¸¥à¸²à¸‡à¸ˆà¸" #: modules/gridmap/grid_map_editor_plugin.cpp msgid "GridMap Settings" @@ -6967,7 +7168,8 @@ msgid "Duplicate VisualScript Nodes" msgstr "ทำซ้ำโหนด" #: modules/visual_script/visual_script_editor.cpp -msgid "Hold Meta to drop a Getter. Hold Shift to drop a generic signature." +#, fuzzy +msgid "Hold %s to drop a Getter. Hold Shift to drop a generic signature." msgstr "à¸à¸”ปุ่ม Meta ค้างเพื่à¸à¸§à¸²à¸‡ Getter à¸à¸” Shift ค้างเพื่à¸à¸§à¸²à¸‡ generic signature" #: modules/visual_script/visual_script_editor.cpp @@ -6975,7 +7177,8 @@ msgid "Hold Ctrl to drop a Getter. Hold Shift to drop a generic signature." msgstr "à¸à¸” Ctrl ค้างเพื่à¸à¸§à¸²à¸‡ Getter à¸à¸” Shift ค้างเพื่à¸à¸§à¸²à¸‡ generic signature" #: modules/visual_script/visual_script_editor.cpp -msgid "Hold Meta to drop a simple reference to the node." +#, fuzzy +msgid "Hold %s to drop a simple reference to the node." msgstr "à¸à¸”ปุ่ม Meta เพื่à¸à¸§à¸²à¸‡à¸à¸²à¸£à¸à¹‰à¸²à¸‡à¸à¸´à¸‡à¹„ปยังโหนดà¸à¸¢à¹ˆà¸²à¸‡à¸‡à¹ˆà¸²à¸¢" #: modules/visual_script/visual_script_editor.cpp @@ -6983,7 +7186,8 @@ msgid "Hold Ctrl to drop a simple reference to the node." msgstr "à¸à¸” Ctrl เพื่à¸à¸§à¸²à¸‡à¸à¸²à¸£à¸à¹‰à¸²à¸‡à¸à¸´à¸‡à¹„ปยังโหนดà¸à¸¢à¹ˆà¸²à¸‡à¸‡à¹ˆà¸²à¸¢" #: modules/visual_script/visual_script_editor.cpp -msgid "Hold Meta to drop a Variable Setter." +#, fuzzy +msgid "Hold %s to drop a Variable Setter." msgstr "à¸à¸”ปุ่ม Meta ค้างเพื่à¸à¸§à¸²à¸‡ Setter ขà¸à¸‡à¸•à¸±à¸§à¹à¸›à¸£" #: modules/visual_script/visual_script_editor.cpp @@ -7056,7 +7260,7 @@ msgstr "รับ" #: modules/visual_script/visual_script_editor.cpp msgid "Script already has function '%s'" -msgstr "" +msgstr "สคริปต์มีฟังà¸à¹Œà¸Šà¸±à¸™ '%s' à¸à¸¢à¸¹à¹ˆà¹à¸¥à¹‰à¸§" #: modules/visual_script/visual_script_editor.cpp msgid "Change Input Value" @@ -7209,12 +7413,23 @@ msgid "Could not write file:\n" msgstr "เขียนไฟล์ไม่ได้:\n" #: platform/javascript/export/export.cpp -msgid "Could not read file:\n" +msgid "Could not open template for export:\n" +msgstr "เปิดà¹à¸¡à¹ˆà¹à¸šà¸šà¹€à¸žà¸·à¹ˆà¸à¸ªà¹ˆà¸‡à¸à¸à¸à¹„ม่ได้:\n" + +#: platform/javascript/export/export.cpp +#, fuzzy +msgid "Invalid export template:\n" +msgstr "ติดตั้งà¹à¸¡à¹ˆà¹à¸šà¸šà¸ªà¹ˆà¸‡à¸à¸à¸" + +#: platform/javascript/export/export.cpp +#, fuzzy +msgid "Could not read custom HTML shell:\n" msgstr "à¸à¹ˆà¸²à¸™à¹„ฟล์ไม่ได้:\n" #: platform/javascript/export/export.cpp -msgid "Could not open template for export:\n" -msgstr "เปิดà¹à¸¡à¹ˆà¹à¸šà¸šà¹€à¸žà¸·à¹ˆà¸à¸ªà¹ˆà¸‡à¸à¸à¸à¹„ม่ได้:\n" +#, fuzzy +msgid "Could not read boot splash image file:\n" +msgstr "à¸à¹ˆà¸²à¸™à¹„ฟล์ไม่ได้:\n" #: scene/2d/animated_sprite.cpp msgid "" @@ -7318,20 +7533,6 @@ msgstr "" msgid "Path property must point to a valid Node2D node to work." msgstr "ต้à¸à¸‡à¹à¸à¹‰à¹„ข Path ให้ชี้ไปยังโหนด Node2D จึงจะทำงานได้" -#: scene/2d/sprite.cpp -msgid "" -"Path property must point to a valid Viewport node to work. Such Viewport " -"must be set to 'render target' mode." -msgstr "" -"ต้à¸à¸‡à¹à¸à¹‰à¹„ข Path ให้ชี้ไปยังโหนด Viewport จึงจะทำงานได้ à¹à¸¥à¸° Viewport นั้นต้à¸à¸‡à¸›à¸£à¸±à¸šà¹‚หมดเป็น " -"'render target'" - -#: scene/2d/sprite.cpp -msgid "" -"The Viewport set in the path property must be set as 'render target' in " -"order for this sprite to work." -msgstr "Viewport ใน path จะต้à¸à¸‡à¸›à¸£à¸±à¸šà¹‚หมดเป็น 'render target' จึงจะทำงานได้" - #: scene/2d/visibility_notifier_2d.cpp msgid "" "VisibilityEnable2D works best when used with the edited scene root directly " @@ -7394,6 +7595,15 @@ msgid "" "shape resource for it!" msgstr "ต้à¸à¸‡à¸¡à¸µà¸£à¸¹à¸›à¸—รงเพื่à¸à¹ƒà¸«à¹‰ CollisionShape ทำงานได้ à¸à¸£à¸¸à¸“าสร้างรูปทรง!" +#: scene/3d/gi_probe.cpp +#, fuzzy +msgid "Plotting Meshes" +msgstr "คัดลà¸à¸à¸£à¸¹à¸›" + +#: scene/3d/gi_probe.cpp +msgid "Finishing Plot" +msgstr "" + #: scene/3d/navigation_mesh.cpp msgid "A NavigationMesh resource must be set or created for this node to work." msgstr "ต้à¸à¸‡à¸¡à¸µ NavigationMesh เพื่à¸à¹ƒà¸«à¹‰à¹‚หนดนี้ทำงานได้" @@ -7439,7 +7649,7 @@ msgstr "ต้à¸à¸‡à¸¡à¸µ SpriteFrames ใน 'Frames' เพื่à¸à¹ƒà¸«à¹‰ msgid "" "VehicleWheel serves to provide a wheel system to a VehicleBody. Please use " "it as a child of a VehicleBody." -msgstr "" +msgstr "VehicleWheel เป็นระบบล้à¸à¸‚à¸à¸‡ VehicleBody à¸à¸£à¸¸à¸“าใช้เป็นโหนดลูà¸à¸‚à¸à¸‡ VehicleBody" #: scene/gui/color_picker.cpp msgid "Raw Mode" @@ -7480,6 +7690,10 @@ msgstr "" "ใช้ container เป็นโหนดลูภ(VBox,HBox,ฯลฯ) หรืà¸à¹‚หนดà¸à¸¥à¸¸à¹ˆà¸¡ Control " "à¹à¸¥à¸°à¸›à¸£à¸±à¸šà¸‚นาดเล็à¸à¸ªà¸¸à¸”ด้วยตนเà¸à¸‡" +#: scene/gui/tree.cpp +msgid "(Other)" +msgstr "" + #: scene/main/scene_tree.cpp msgid "" "Default Environment as specified in Project Setings (Rendering -> Viewport -" @@ -7515,6 +7729,68 @@ msgstr "ผิดพลาดขณะโหลดฟà¸à¸™à¸•à¹Œ" msgid "Invalid font size." msgstr "ขนาดฟà¸à¸™à¸•à¹Œà¸œà¸´à¸”พลาด" +#~ msgid "Cannot navigate to '" +#~ msgstr "ไม่สามารถไปยัง '" + +#, fuzzy +#~ msgid "" +#~ "\n" +#~ "Source: " +#~ msgstr "" +#~ "\n" +#~ "ต้นฉบับ: " + +#~ msgid "Remove Point from Line2D" +#~ msgstr "ลบจุดจาà¸à¹€à¸ªà¹‰à¸™" + +#~ msgid "Add Point to Line2D" +#~ msgstr "เพิ่มจุดในเส้น" + +#~ msgid "Move Point in Line2D" +#~ msgstr "ย้ายจุดในเส้น" + +#~ msgid "Split Segment (in line)" +#~ msgstr "à¹à¸¢à¸à¸ªà¹ˆà¸§à¸™ (ในเส้น)" + +#~ msgid "Meta+" +#~ msgstr "Meta+" + +#~ msgid "Setting '" +#~ msgstr "ตัวเลืà¸à¸ '" + +#~ msgid "Remote Inspector" +#~ msgstr "คุณสมบัติ" + +#~ msgid "Live Scene Tree:" +#~ msgstr "ผังฉาà¸à¸›à¸±à¸ˆà¸ˆà¸¸à¸šà¸±à¸™:" + +#~ msgid "Remote Object Properties: " +#~ msgstr "คุณสมบัติ: " + +#~ msgid "Prev Level (%sDown Wheel)" +#~ msgstr "ชั้นà¸à¹ˆà¸à¸™à¸«à¸™à¹‰à¸² (%sล้à¸à¹€à¸¡à¸²à¸ªà¹Œà¸¥à¸‡)" + +#~ msgid "Next Level (%sUp Wheel)" +#~ msgstr "ชั้นถัดไป (%sล้à¸à¹€à¸¡à¸²à¸ªà¹Œà¸‚ึ้น)" + +#~ msgid "Selection -> Duplicate" +#~ msgstr "ทำซ้ำที่เลืà¸à¸" + +#~ msgid "Selection -> Clear" +#~ msgstr "ลบที่เลืà¸à¸" + +#~ msgid "" +#~ "Path property must point to a valid Viewport node to work. Such Viewport " +#~ "must be set to 'render target' mode." +#~ msgstr "" +#~ "ต้à¸à¸‡à¹à¸à¹‰à¹„ข Path ให้ชี้ไปยังโหนด Viewport จึงจะทำงานได้ à¹à¸¥à¸° Viewport " +#~ "นั้นต้à¸à¸‡à¸›à¸£à¸±à¸šà¹‚หมดเป็น 'render target'" + +#~ msgid "" +#~ "The Viewport set in the path property must be set as 'render target' in " +#~ "order for this sprite to work." +#~ msgstr "Viewport ใน path จะต้à¸à¸‡à¸›à¸£à¸±à¸šà¹‚หมดเป็น 'render target' จึงจะทำงานได้" + #~ msgid "Filter:" #~ msgstr "ตัวà¸à¸£à¸à¸‡:" @@ -7539,9 +7815,6 @@ msgstr "ขนาดฟà¸à¸™à¸•à¹Œà¸œà¸´à¸”พลาด" #~ msgid "Removed:" #~ msgstr "ลบ:" -#~ msgid "Error saving atlas:" -#~ msgstr "ผิดพลาดขณะบันทึภatlas:" - #~ msgid "Could not save atlas subtexture:" #~ msgstr "บันทึภtexture ย่à¸à¸¢à¸‚à¸à¸‡ atlas ไม่ได้:" @@ -7915,9 +8188,6 @@ msgstr "ขนาดฟà¸à¸™à¸•à¹Œà¸œà¸´à¸”พลาด" #~ msgid "Cropping Images" #~ msgstr "ครà¸à¸šà¸•à¸±à¸”รูป" -#~ msgid "Blitting Images" -#~ msgstr "คัดลà¸à¸à¸£à¸¹à¸›" - #~ msgid "Couldn't save atlas image:" #~ msgstr "บันทึภAtlas ไม่ได้:" @@ -8275,9 +8545,6 @@ msgstr "ขนาดฟà¸à¸™à¸•à¹Œà¸œà¸´à¸”พลาด" #~ msgid "Save Translatable Strings" #~ msgstr "บันทึà¸à¸ªà¸•à¸£à¸´à¸‡à¸«à¸¥à¸²à¸¢à¸ าษา" -#~ msgid "Install Export Templates" -#~ msgstr "ติดตั้งà¹à¸¡à¹ˆà¹à¸šà¸šà¸ªà¹ˆà¸‡à¸à¸à¸" - #~ msgid "Edit Script Options" #~ msgstr "à¹à¸à¹‰à¹„ขตัวเลืà¸à¸à¸ªà¸„ริปต์" diff --git a/editor/translations/tr.po b/editor/translations/tr.po index afb2c82be1..b31b828b85 100644 --- a/editor/translations/tr.po +++ b/editor/translations/tr.po @@ -104,6 +104,7 @@ msgid "Anim Delete Keys" msgstr "Canln Açarları Sil" #: editor/animation_editor.cpp editor/plugins/tile_map_editor_plugin.cpp +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Duplicate Selection" msgstr "Seçimi Ä°kile" @@ -642,6 +643,13 @@ msgstr "Bağımlılık Düzenleyicisi" msgid "Search Replacement Resource:" msgstr "DeÄŸiÅŸim Kaynağını Ara:" +#: editor/dependency_editor.cpp editor/editor_file_dialog.cpp +#: editor/editor_help.cpp editor/editor_node.cpp editor/filesystem_dock.cpp +#: editor/plugins/script_editor_plugin.cpp editor/property_selector.cpp +#: editor/quick_open.cpp scene/gui/file_dialog.cpp +msgid "Open" +msgstr "Aç" + #: editor/dependency_editor.cpp msgid "Owners Of:" msgstr "Bunun Sahibi:" @@ -715,6 +723,16 @@ msgstr "Seçili dizeçleri sil?" msgid "Delete" msgstr "Sil" +#: editor/dictionary_property_edit.cpp +#, fuzzy +msgid "Change Dictionary Key" +msgstr "Canlandırmanın Adını DeÄŸiÅŸtir:" + +#: editor/dictionary_property_edit.cpp +#, fuzzy +msgid "Change Dictionary Value" +msgstr "Dizi DeÄŸerini DeÄŸiÅŸtir" + #: editor/editor_about.cpp msgid "Thanks from the Godot community!" msgstr "Godot TopluluÄŸu SaÄŸ Olmanızı Diliyor!" @@ -1157,12 +1175,6 @@ msgstr "Tümü Onaylandı" msgid "All Files (*)" msgstr "Tüm Dizeçler (*)" -#: editor/editor_file_dialog.cpp editor/editor_help.cpp editor/editor_node.cpp -#: editor/filesystem_dock.cpp editor/plugins/script_editor_plugin.cpp -#: editor/property_selector.cpp editor/quick_open.cpp scene/gui/file_dialog.cpp -msgid "Open" -msgstr "Aç" - #: editor/editor_file_dialog.cpp scene/gui/file_dialog.cpp msgid "Open a File" msgstr "Bir Dizeç Aç" @@ -1532,6 +1544,13 @@ msgid "" msgstr "" #: editor/editor_node.cpp +msgid "" +"This is a remote object so changes to it will not be kept.\n" +"Please read the documentation relevant to debugging to better understand " +"this workflow." +msgstr "" + +#: editor/editor_node.cpp msgid "Copy Params" msgstr "DeÄŸiÅŸkenleri Tıpkıla" @@ -1653,6 +1672,11 @@ msgid "Export Mesh Library" msgstr "Örüntü Betikevini Dışa Aktar" #: editor/editor_node.cpp +#, fuzzy +msgid "This operation can't be done without a root node." +msgstr "Bu iÅŸlem bir sahne olmadan yapılamaz." + +#: editor/editor_node.cpp msgid "Export Tile Set" msgstr "Döşenti Dizi Dışa Aktar" @@ -1786,12 +1810,23 @@ msgid "Switch Scene Tab" msgstr "Sahne Sekmesine Geç" #: editor/editor_node.cpp -msgid "%d more file(s)" +#, fuzzy +msgid "%d more files or folders" +msgstr "%d daha çok dizeç(ler) veya dizin(ler)" + +#: editor/editor_node.cpp +#, fuzzy +msgid "%d more folders" msgstr "%d daha çok dizeç(ler)" #: editor/editor_node.cpp -msgid "%d more file(s) or folder(s)" -msgstr "%d daha çok dizeç(ler) veya dizin(ler)" +#, fuzzy +msgid "%d more files" +msgstr "%d daha çok dizeç(ler)" + +#: editor/editor_node.cpp +msgid "Dock Position" +msgstr "" #: editor/editor_node.cpp msgid "Distraction Free Mode" @@ -1803,6 +1838,11 @@ msgid "Toggle distraction-free mode." msgstr "Dikkat Dağıtmayan Biçim" #: editor/editor_node.cpp +#, fuzzy +msgid "Add a new scene." +msgstr "Yeni izler ekle." + +#: editor/editor_node.cpp msgid "Scene" msgstr "Sahne" @@ -1868,13 +1908,12 @@ msgid "TileSet.." msgstr "TileSet .." #: editor/editor_node.cpp editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp scene/gui/line_edit.cpp -#: scene/gui/text_edit.cpp +#: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Undo" msgstr "Geri" #: editor/editor_node.cpp editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp +#: scene/gui/line_edit.cpp msgid "Redo" msgstr "Geri" @@ -2393,6 +2432,11 @@ msgid "(Current)" msgstr "Geçerli:" #: editor/export_template_manager.cpp +#, fuzzy +msgid "Retrieving mirrors, please wait.." +msgstr "BaÄŸlantı hatası, lütfen tekrar deneyiniz." + +#: editor/export_template_manager.cpp msgid "Remove template version '%s'?" msgstr "" @@ -2429,6 +2473,114 @@ msgid "Importing:" msgstr "İçe Aktarım:" #: editor/export_template_manager.cpp +msgid "" +"No download links found for this version. Direct download is only available " +"for official releases." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Can't resolve." +msgstr "Çözümlenemedi." + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Can't connect." +msgstr "BaÄŸlanamadı." + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "No response." +msgstr "Cevap yok." + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Req. Failed." +msgstr "Ä°stem BaÅŸarısız." + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Redirect Loop." +msgstr "Yönlendirme Döngüsü." + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Failed:" +msgstr "BaÅŸarısız:" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Can't write file." +msgstr "Karo Bulunamadı:" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Download Complete." +msgstr "Ä°ndirme Hatası" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Error requesting url: " +msgstr "Atlas kaydedilirken sorun oluÅŸtu:" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Connecting to Mirror.." +msgstr "BaÄŸlan..." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Disconnected" +msgstr "BaÄŸlantıyı kes" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Resolving" +msgstr "Kaydediliyor..." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Can't Resolve" +msgstr "Çözümlenemedi." + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Connecting.." +msgstr "BaÄŸlan..." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Can't Conect" +msgstr "BaÄŸlanamadı." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Connected" +msgstr "BaÄŸla" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Requesting.." +msgstr "Deneme" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Downloading" +msgstr "AÅŸağı" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Connection Error" +msgstr "BaÄŸlan..." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "SSL Handshake Error" +msgstr "Sorunları Yükle" + +#: editor/export_template_manager.cpp #, fuzzy msgid "Current Version:" msgstr "Åžu anki Sahne" @@ -2458,6 +2610,15 @@ msgstr "Seçili dizeçleri sil?" msgid "Export Template Manager" msgstr "Dışa Aktarım Kalıpları Yükleniyor" +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Download Templates" +msgstr "Öğeyi Kaldır" + +#: editor/export_template_manager.cpp +msgid "Select mirror from list: " +msgstr "" + #: editor/file_type_cache.cpp msgid "Can't open file_type_cache.cch for writing, not saving file type cache!" msgstr "" @@ -2465,7 +2626,7 @@ msgstr "" "kaydedilmiyor!" #: editor/filesystem_dock.cpp -msgid "Cannot navigate to '" +msgid "Cannot navigate to '%s' as it has not been found in the file system!" msgstr "" #: editor/filesystem_dock.cpp @@ -2484,13 +2645,6 @@ msgstr "" #: editor/filesystem_dock.cpp #, fuzzy -msgid "" -"\n" -"Source: " -msgstr "Kaynak:" - -#: editor/filesystem_dock.cpp -#, fuzzy msgid "Cannot move/rename resources root." msgstr "Kaynak yazı tipi yüklenemiyor / iÅŸlenemiyor." @@ -2768,8 +2922,8 @@ msgid "Remove Poly And Point" msgstr "Çokluyu ve Noktayı Kaldır" #: editor/plugins/abstract_polygon_2d_editor.cpp -#: editor/plugins/light_occluder_2d_editor_plugin.cpp -msgid "Create a new polygon from scratch." +#, fuzzy +msgid "Create a new polygon from scratch" msgstr "Sıfırdan yeni bir çokgen oluÅŸturun." #: editor/plugins/abstract_polygon_2d_editor.cpp @@ -2780,6 +2934,11 @@ msgid "" "RMB: Erase Point." msgstr "" +#: editor/plugins/abstract_polygon_2d_editor.cpp +#, fuzzy +msgid "Delete points" +msgstr "Noktayı Sil" + #: editor/plugins/animation_player_editor_plugin.cpp msgid "Toggle Autoplay" msgstr "KendindenOynatmayı Aç/Kapat" @@ -3116,18 +3275,10 @@ msgid "Can't resolve hostname:" msgstr "Ana makine adı çözümlenemedi:" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Can't resolve." -msgstr "Çözümlenemedi." - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Connection error, please try again." msgstr "BaÄŸlantı hatası, lütfen tekrar deneyiniz." #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Can't connect." -msgstr "BaÄŸlanamadı." - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Can't connect to host:" msgstr "Ana makineye baÄŸlanılamadı:" @@ -3136,30 +3287,14 @@ msgid "No response from host:" msgstr "Ana makineden cevap yok:" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "No response." -msgstr "Cevap yok." - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Request failed, return code:" msgstr "Ä°stem baÅŸarısız, dönen kod:" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Req. Failed." -msgstr "Ä°stem BaÅŸarısız." - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Request failed, too many redirects" msgstr "Ä°stem BaÅŸarısız, çok fazla yönlendirme" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Redirect Loop." -msgstr "Yönlendirme Döngüsü." - -#: editor/plugins/asset_library_editor_plugin.cpp -msgid "Failed:" -msgstr "BaÅŸarısız:" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Bad download hash, assuming file has been tampered with." msgstr "" @@ -3190,16 +3325,6 @@ msgstr "Kaydediliyor..." #: editor/plugins/asset_library_editor_plugin.cpp #, fuzzy -msgid "Connecting.." -msgstr "BaÄŸlan..." - -#: editor/plugins/asset_library_editor_plugin.cpp -#, fuzzy -msgid "Requesting.." -msgstr "Deneme" - -#: editor/plugins/asset_library_editor_plugin.cpp -#, fuzzy msgid "Error making request" msgstr "Kaynak kaydedilirken sorun!" @@ -3312,6 +3437,39 @@ msgid "Move Action" msgstr "Eylemi Taşı" #: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Move vertical guide" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Create new vertical guide" +msgstr "Yeni Betik OluÅŸtur" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Remove vertical guide" +msgstr "DeÄŸiÅŸkeni Kaldır" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Move horizontal guide" +msgstr "Noktayı EÄŸriye Taşı" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Create new horizontal guide" +msgstr "Yeni Betik OluÅŸtur" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Remove horizontal guide" +msgstr "Geçersiz açarları kaldır" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Create new horizontal and vertical guides" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp msgid "Edit IK Chain" msgstr "IK Zincirini Düzenle" @@ -3443,10 +3601,17 @@ msgid "Snap to other nodes" msgstr "" #: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Snap to guides" +msgstr "Yapışma Biçimi:" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Lock the selected object in place (can't be moved)." msgstr "Seçilen nesneyi yerine kilitleyin (taşınamaz)." #: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Unlock the selected object (can be moved)." msgstr "Seçilen nesnenin kilidini açın (taşınabilir)." @@ -3499,6 +3664,11 @@ msgid "Show rulers" msgstr "Kemikleri Göster" #: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Show guides" +msgstr "Kemikleri Göster" + +#: editor/plugins/canvas_item_editor_plugin.cpp msgid "Center Selection" msgstr "İçre Seçimi" @@ -3698,6 +3868,10 @@ msgstr "" msgid "Hold Shift to edit tangents individually" msgstr "" +#: editor/plugins/gi_probe_editor_plugin.cpp +msgid "Bake GI Probe" +msgstr "" + #: editor/plugins/gradient_editor_plugin.cpp msgid "Add/Remove Color Ramp Point" msgstr "Renk YokuÅŸu Noktası Ekle / Kaldır" @@ -3730,6 +3904,10 @@ msgid "Create Occluder Polygon" msgstr "Engelleyici Çokgeni OluÅŸtur" #: editor/plugins/light_occluder_2d_editor_plugin.cpp +msgid "Create a new polygon from scratch." +msgstr "Sıfırdan yeni bir çokgen oluÅŸturun." + +#: editor/plugins/light_occluder_2d_editor_plugin.cpp msgid "Edit existing polygon:" msgstr "Var olan çokgeni düzenleyin:" @@ -3745,62 +3923,6 @@ msgstr "Ctrl + LMB: Parçayı Böl." msgid "RMB: Erase Point." msgstr "RMB: Noktayı Sil." -#: editor/plugins/line_2d_editor_plugin.cpp -#, fuzzy -msgid "Remove Point from Line2D" -msgstr "Noktayı EÄŸriden Kaldır" - -#: editor/plugins/line_2d_editor_plugin.cpp -#, fuzzy -msgid "Add Point to Line2D" -msgstr "Noktayı EÄŸriye Ekle" - -#: editor/plugins/line_2d_editor_plugin.cpp -#, fuzzy -msgid "Move Point in Line2D" -msgstr "Noktayı EÄŸriye Taşı" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Select Points" -msgstr "Noktaları Seç" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Shift+Drag: Select Control Points" -msgstr "Shift + Sürükle: Denetim Noktalarını Seç" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Click: Add Point" -msgstr "Tıkla: Nokta Ekle" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Right Click: Delete Point" -msgstr "SaÄŸ tıkla: Nokta Sil" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Add Point (in empty space)" -msgstr "Nokta Ekle (boÅŸlukta)" - -#: editor/plugins/line_2d_editor_plugin.cpp -#, fuzzy -msgid "Split Segment (in line)" -msgstr "Parçayı Ayır (eÄŸriye göre)" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Delete Point" -msgstr "Noktayı Sil" - #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Mesh is empty!" msgstr "Örüntü boÅŸ!" @@ -4221,16 +4343,46 @@ msgid "Move Out-Control in Curve" msgstr "EÄŸriye Denetimsiz Taşı" #: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Select Points" +msgstr "Noktaları Seç" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Shift+Drag: Select Control Points" +msgstr "Shift + Sürükle: Denetim Noktalarını Seç" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Click: Add Point" +msgstr "Tıkla: Nokta Ekle" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Right Click: Delete Point" +msgstr "SaÄŸ tıkla: Nokta Sil" + +#: editor/plugins/path_2d_editor_plugin.cpp msgid "Select Control Points (Shift+Drag)" msgstr "Denetim Noktalarını Seç (Shift + Sürükle)" #: editor/plugins/path_2d_editor_plugin.cpp #: editor/plugins/path_editor_plugin.cpp +msgid "Add Point (in empty space)" +msgstr "Nokta Ekle (boÅŸlukta)" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp msgid "Split Segment (in curve)" msgstr "Parçayı Ayır (eÄŸriye göre)" #: editor/plugins/path_2d_editor_plugin.cpp #: editor/plugins/path_editor_plugin.cpp +msgid "Delete Point" +msgstr "Noktayı Sil" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp msgid "Close Curve" msgstr "EÄŸriyi Kapat" @@ -4372,7 +4524,6 @@ msgstr "Kaynak Yükle" #: editor/plugins/resource_preloader_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp #: editor/plugins/sprite_frames_editor_plugin.cpp editor/property_editor.cpp #: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Paste" @@ -4418,6 +4569,21 @@ msgid " Class Reference" msgstr "" #: editor/plugins/script_editor_plugin.cpp +#, fuzzy +msgid "Sort" +msgstr "Sırala:" + +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp +msgid "Move Up" +msgstr "Yukarı Taşı" + +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp +msgid "Move Down" +msgstr "AÅŸağı Taşı" + +#: editor/plugins/script_editor_plugin.cpp msgid "Next script" msgstr "Sonraki betik" @@ -4469,6 +4635,10 @@ msgstr "Belgeleri Kapat" msgid "Close All" msgstr "Tümünü Kapat" +#: editor/plugins/script_editor_plugin.cpp +msgid "Close Other Tabs" +msgstr "" + #: editor/plugins/script_editor_plugin.cpp editor/project_manager.cpp msgid "Run" msgstr "Çalıştır" @@ -4480,13 +4650,11 @@ msgstr "BeÄŸenileni Aç / Kapat" #: editor/plugins/script_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Find.." msgstr "Bul.." #: editor/plugins/script_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Find Next" msgstr "Sonraki Bul" @@ -4598,33 +4766,22 @@ msgstr "" msgid "Capitalize" msgstr "" -#: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp scene/gui/line_edit.cpp +#: editor/plugins/script_text_editor.cpp scene/gui/line_edit.cpp #: scene/gui/text_edit.cpp msgid "Cut" msgstr "Kes" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp #: editor/plugins/sprite_frames_editor_plugin.cpp editor/property_editor.cpp #: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Copy" msgstr "Tıpkıla" -#: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp scene/gui/line_edit.cpp +#: editor/plugins/script_text_editor.cpp scene/gui/line_edit.cpp #: scene/gui/text_edit.cpp msgid "Select All" msgstr "Hepsini seç" -#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp -msgid "Move Up" -msgstr "Yukarı Taşı" - -#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp -msgid "Move Down" -msgstr "AÅŸağı Taşı" - #: editor/plugins/script_text_editor.cpp #, fuzzy msgid "Delete Line" @@ -4647,6 +4804,23 @@ msgid "Clone Down" msgstr "AÅŸağıya EÅŸle" #: editor/plugins/script_text_editor.cpp +#, fuzzy +msgid "Fold Line" +msgstr "Dizeye Git" + +#: editor/plugins/script_text_editor.cpp +msgid "Unfold Line" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Fold All Lines" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Unfold All Lines" +msgstr "" + +#: editor/plugins/script_text_editor.cpp msgid "Complete Symbol" msgstr "Simgeyi Tamamla" @@ -4694,12 +4868,10 @@ msgid "Convert To Lowercase" msgstr "Åžuna Dönüştür.." #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Find Previous" msgstr "Öncekini Bul" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Replace.." msgstr "DeÄŸiÅŸtir.." @@ -4708,7 +4880,6 @@ msgid "Goto Function.." msgstr "Ä°ÅŸleve Git.." #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Goto Line.." msgstr "Dizeye Git.." @@ -4873,6 +5044,16 @@ msgid "View Plane Transform." msgstr "Düzlem Dönüşümünü Görüntüle." #: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Scaling: " +msgstr "Ölçekle:" + +#: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Translating: " +msgstr "Çeviriler:" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Rotating %s degrees." msgstr "%s Düzey Dönüyor." @@ -4957,6 +5138,10 @@ msgid "Vertices" msgstr "BaÅŸucu" #: editor/plugins/spatial_editor_plugin.cpp +msgid "FPS" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Align with view" msgstr "Görünüme Ayarla" @@ -4992,6 +5177,16 @@ msgid "View Information" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "View FPS" +msgstr "Dosyaları Görüntüle" + +#: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Half Resolution" +msgstr "Seçimi Ölçekle" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Audio Listener" msgstr "Ses Dinleyici" @@ -5130,6 +5325,11 @@ msgid "Tool Scale" msgstr "Ölçekle:" #: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Toggle Freelook" +msgstr "Tam Ekran Aç / Kapat" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Transform" msgstr "Dönüşüm" @@ -5409,6 +5609,11 @@ msgid "Create Empty Editor Template" msgstr "BoÅŸ Düzenleyici Kalıbı OluÅŸtur" #: editor/plugins/theme_editor_plugin.cpp +#, fuzzy +msgid "Create From Current Editor Theme" +msgstr "BoÅŸ Düzenleyici Kalıbı OluÅŸtur" + +#: editor/plugins/theme_editor_plugin.cpp msgid "CheckBox Radio1" msgstr "OnayKutusu Radyo1" @@ -5588,7 +5793,7 @@ msgstr "Etkin" #: editor/project_export.cpp #, fuzzy -msgid "Delete patch '" +msgid "Delete patch '%s' from list?" msgstr "GiriÅŸi Sil" #: editor/project_export.cpp @@ -5917,10 +6122,6 @@ msgid "Add Input Action Event" msgstr "GiriÅŸ Ä°ÅŸlem Olayı Ekle" #: editor/project_settings_editor.cpp editor/settings_config_dialog.cpp -msgid "Meta+" -msgstr "Meta+" - -#: editor/project_settings_editor.cpp editor/settings_config_dialog.cpp msgid "Shift+" msgstr "Shift+" @@ -6047,13 +6248,12 @@ msgstr "" #: editor/project_settings_editor.cpp #, fuzzy -msgid "No property '" +msgid "No property '%s' exists." msgstr "Özellik:" #: editor/project_settings_editor.cpp -#, fuzzy -msgid "Setting '" -msgstr "Ayarlar" +msgid "Setting '%s' is internal, and it can't be deleted." +msgstr "" #: editor/project_settings_editor.cpp #, fuzzy @@ -6544,6 +6744,16 @@ msgid "Clear a script for the selected node." msgstr "Seçilen düğüm için betik temizle." #: editor/scene_tree_dock.cpp +#, fuzzy +msgid "Remote" +msgstr "Kaldır" + +#: editor/scene_tree_dock.cpp +#, fuzzy +msgid "Local" +msgstr "Yerel" + +#: editor/scene_tree_dock.cpp msgid "Clear Inheritance? (No Undo!)" msgstr "Kalıt Silinsin mi? (Geri Alınamaz!)" @@ -6740,6 +6950,11 @@ msgid "Attach Node Script" msgstr "Düğüm BetiÄŸi Ä°liÅŸtir" #: editor/script_editor_debugger.cpp +#, fuzzy +msgid "Remote " +msgstr "Kaldır" + +#: editor/script_editor_debugger.cpp msgid "Bytes:" msgstr "Baytlar:" @@ -6796,18 +7011,6 @@ msgid "Stack Trace (if applicable):" msgstr "Ä°zi Yığ (uygulanabilirse):" #: editor/script_editor_debugger.cpp -msgid "Remote Inspector" -msgstr "Dolaylı Denetçi" - -#: editor/script_editor_debugger.cpp -msgid "Live Scene Tree:" -msgstr "Canlı Sahne AÄŸacı:" - -#: editor/script_editor_debugger.cpp -msgid "Remote Object Properties: " -msgstr "Dolaylı Nesne Özellikleri: " - -#: editor/script_editor_debugger.cpp msgid "Profiler" msgstr "Kesitçi" @@ -6941,50 +7144,50 @@ msgstr "" msgid "GDNative" msgstr "" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp #: modules/visual_script/visual_script_builtin_funcs.cpp msgid "Invalid type argument to convert(), use TYPE_* constants." msgstr "" "convert() için geçersiz türde deÄŸiÅŸtirgen, TYPE_* sabitlerini kullanın." -#: modules/gdscript/gd_functions.cpp modules/mono/glue/glue_header.h +#: modules/gdscript/gdscript_functions.cpp modules/mono/glue/glue_header.h #: modules/visual_script/visual_script_builtin_funcs.cpp msgid "Not enough bytes for decoding bytes, or invalid format." msgstr "Geçersiz biçem ya da kod çözmek için yetersiz byte sayısı." -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "step argument is zero!" msgstr "adım deÄŸiÅŸtirgeni sıfır!" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Not a script with an instance" msgstr "ÖrneÄŸi bulunan bir betik deÄŸil" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Not based on a script" msgstr "Bir betiÄŸe baÄŸlı deÄŸil" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Not based on a resource file" msgstr "Bir kaynak dizecine baÄŸlı deÄŸil" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary format (missing @path)" msgstr "Geçersiz örnek sözlük biçemi (@path eksik)" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary format (can't load script at @path)" msgstr "Geçersiz örnek sözlük biçemi (betik @path 'tan yüklenemiyor)" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary format (invalid script at @path)" msgstr "Geçersiz örnek sözlük biçemi (@path 'taki kod geçersiz)" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary (invalid subclasses)" msgstr "Geçersiz örnek sözlüğü (geçersiz altbölütler)" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Object can't provide a length." msgstr "" @@ -6999,16 +7202,26 @@ msgid "GridMap Duplicate Selection" msgstr "Seçimi Ä°kile" #: modules/gridmap/grid_map_editor_plugin.cpp +msgid "Floor:" +msgstr "" + +#: modules/gridmap/grid_map_editor_plugin.cpp +#, fuzzy +msgid "Grid Map" +msgstr "Izgara Yapışması" + +#: modules/gridmap/grid_map_editor_plugin.cpp #, fuzzy msgid "Snap View" msgstr "Ãœstten Görünüm" #: modules/gridmap/grid_map_editor_plugin.cpp -msgid "Prev Level (%sDown Wheel)" -msgstr "" +#, fuzzy +msgid "Previous Floor" +msgstr "Önceki sekme" #: modules/gridmap/grid_map_editor_plugin.cpp -msgid "Next Level (%sUp Wheel)" +msgid "Next Floor" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp @@ -7084,13 +7297,8 @@ msgstr "TileMap'i Sil" #: modules/gridmap/grid_map_editor_plugin.cpp #, fuzzy -msgid "Selection -> Duplicate" -msgstr "Yalnızca Seçim" - -#: modules/gridmap/grid_map_editor_plugin.cpp -#, fuzzy -msgid "Selection -> Clear" -msgstr "Yalnızca Seçim" +msgid "Clear Selection" +msgstr "İçre Seçimi" #: modules/gridmap/grid_map_editor_plugin.cpp #, fuzzy @@ -7226,7 +7434,8 @@ msgid "Duplicate VisualScript Nodes" msgstr "Çizge Düğüm(lerini) Ä°kile" #: modules/visual_script/visual_script_editor.cpp -msgid "Hold Meta to drop a Getter. Hold Shift to drop a generic signature." +#, fuzzy +msgid "Hold %s to drop a Getter. Hold Shift to drop a generic signature." msgstr "" "Alıcı iÅŸlevini bırakmak için Alt'a basılı tutun. Genelgeçer imzayı bırakmak " "için Shift'e basılı tutun." @@ -7238,7 +7447,8 @@ msgstr "" "için Shift'e basılı tutun." #: modules/visual_script/visual_script_editor.cpp -msgid "Hold Meta to drop a simple reference to the node." +#, fuzzy +msgid "Hold %s to drop a simple reference to the node." msgstr "Bir düğüme basit bir baÅŸvuru bırakmak için Alt'a basılı tutun." #: modules/visual_script/visual_script_editor.cpp @@ -7246,7 +7456,8 @@ msgid "Hold Ctrl to drop a simple reference to the node." msgstr "Bir düğüme basit bir baÅŸvuru bırakmak için Ctrl'e basılı tutun." #: modules/visual_script/visual_script_editor.cpp -msgid "Hold Meta to drop a Variable Setter." +#, fuzzy +msgid "Hold %s to drop a Variable Setter." msgstr "Bir DeÄŸiÅŸken Atayıcı bırakmak için Alt'a basılı tutun." #: modules/visual_script/visual_script_editor.cpp @@ -7487,13 +7698,23 @@ msgstr "Karo Bulunamadı:" #: platform/javascript/export/export.cpp #, fuzzy -msgid "Could not read file:\n" +msgid "Could not open template for export:\n" +msgstr "Dizin oluÅŸturulamadı." + +#: platform/javascript/export/export.cpp +#, fuzzy +msgid "Invalid export template:\n" +msgstr "Dışa Aktarım Kalıplarını Yükle" + +#: platform/javascript/export/export.cpp +#, fuzzy +msgid "Could not read custom HTML shell:\n" msgstr "Karo Bulunamadı:" #: platform/javascript/export/export.cpp #, fuzzy -msgid "Could not open template for export:\n" -msgstr "Dizin oluÅŸturulamadı." +msgid "Could not read boot splash image file:\n" +msgstr "Karo Bulunamadı:" #: scene/2d/animated_sprite.cpp msgid "" @@ -7610,22 +7831,6 @@ msgid "Path property must point to a valid Node2D node to work." msgstr "" "Yol niteliÄŸi çalışması için geçerli bir Node2D düğümüne iÅŸaret etmelidir." -#: scene/2d/sprite.cpp -msgid "" -"Path property must point to a valid Viewport node to work. Such Viewport " -"must be set to 'render target' mode." -msgstr "" -"Yol niteliÄŸi çalışması için geçerli bir Viewport düğümüne iÅŸaret etmelidir. " -"Bu tür Viewport 'iÅŸleyici amacı' biçimine ayarlanmalıdır." - -#: scene/2d/sprite.cpp -msgid "" -"The Viewport set in the path property must be set as 'render target' in " -"order for this sprite to work." -msgstr "" -"Bu sprite'ın çalışması için yol niteliÄŸinde ayarlanan Viewport durumu " -"'iÅŸleyici amacı' olarak ayarlanmalıdır." - #: scene/2d/visibility_notifier_2d.cpp msgid "" "VisibilityEnable2D works best when used with the edited scene root directly " @@ -7695,6 +7900,15 @@ msgstr "" "CollisionShape'in çalışması için bir ÅŸekil verilmelidir. Lütfen bunun için " "bir ÅŸekil kaynağı oluÅŸturun!" +#: scene/3d/gi_probe.cpp +#, fuzzy +msgid "Plotting Meshes" +msgstr "Bedizleri Blitle" + +#: scene/3d/gi_probe.cpp +msgid "Finishing Plot" +msgstr "" + #: scene/3d/navigation_mesh.cpp msgid "A NavigationMesh resource must be set or created for this node to work." msgstr "" @@ -7785,6 +7999,10 @@ msgid "" "minimum size manually." msgstr "" +#: scene/gui/tree.cpp +msgid "(Other)" +msgstr "" + #: scene/main/scene_tree.cpp msgid "" "Default Environment as specified in Project Setings (Rendering -> Viewport -" @@ -7819,6 +8037,66 @@ msgstr "Yazı türü yüklerken sorun oluÅŸtu." msgid "Invalid font size." msgstr "Geçersiz yazı türü boyutu." +#, fuzzy +#~ msgid "" +#~ "\n" +#~ "Source: " +#~ msgstr "Kaynak:" + +#, fuzzy +#~ msgid "Remove Point from Line2D" +#~ msgstr "Noktayı EÄŸriden Kaldır" + +#, fuzzy +#~ msgid "Add Point to Line2D" +#~ msgstr "Noktayı EÄŸriye Ekle" + +#, fuzzy +#~ msgid "Move Point in Line2D" +#~ msgstr "Noktayı EÄŸriye Taşı" + +#, fuzzy +#~ msgid "Split Segment (in line)" +#~ msgstr "Parçayı Ayır (eÄŸriye göre)" + +#~ msgid "Meta+" +#~ msgstr "Meta+" + +#, fuzzy +#~ msgid "Setting '" +#~ msgstr "Ayarlar" + +#~ msgid "Remote Inspector" +#~ msgstr "Dolaylı Denetçi" + +#~ msgid "Live Scene Tree:" +#~ msgstr "Canlı Sahne AÄŸacı:" + +#~ msgid "Remote Object Properties: " +#~ msgstr "Dolaylı Nesne Özellikleri: " + +#, fuzzy +#~ msgid "Selection -> Duplicate" +#~ msgstr "Yalnızca Seçim" + +#, fuzzy +#~ msgid "Selection -> Clear" +#~ msgstr "Yalnızca Seçim" + +#~ msgid "" +#~ "Path property must point to a valid Viewport node to work. Such Viewport " +#~ "must be set to 'render target' mode." +#~ msgstr "" +#~ "Yol niteliÄŸi çalışması için geçerli bir Viewport düğümüne iÅŸaret " +#~ "etmelidir. Bu tür Viewport 'iÅŸleyici amacı' biçimine ayarlanmalıdır." + +#~ msgid "" +#~ "The Viewport set in the path property must be set as 'render target' in " +#~ "order for this sprite to work." +#~ msgstr "" +#~ "Bu sprite'ın çalışması için yol niteliÄŸinde ayarlanan Viewport durumu " +#~ "'iÅŸleyici amacı' olarak ayarlanmalıdır." + #~ msgid "Filter:" #~ msgstr "Süzgeç:" @@ -7840,9 +8118,6 @@ msgstr "Geçersiz yazı türü boyutu." #~ msgid "Removed:" #~ msgstr "Silinen:" -#~ msgid "Error saving atlas:" -#~ msgstr "Atlas kaydedilirken sorun oluÅŸtu:" - #~ msgid "Could not save atlas subtexture:" #~ msgstr "Atlas alt dokusu kaydedilemedi:" @@ -8224,9 +8499,6 @@ msgstr "Geçersiz yazı türü boyutu." #~ msgid "Cropping Images" #~ msgstr "Bedizleri Kırpıyor" -#~ msgid "Blitting Images" -#~ msgstr "Bedizleri Blitle" - #~ msgid "Couldn't save atlas image:" #~ msgstr "Atlas bedizi kaydedilemedi:" @@ -8597,9 +8869,6 @@ msgstr "Geçersiz yazı türü boyutu." #~ msgid "Save Translatable Strings" #~ msgstr "Çevirilebilir Metinleri Kaydet" -#~ msgid "Install Export Templates" -#~ msgstr "Dışa Aktarım Kalıplarını Yükle" - #~ msgid "Edit Script Options" #~ msgstr "Betik Seçeneklerini Düzenle" diff --git a/editor/translations/ur_PK.po b/editor/translations/ur_PK.po index 3b624f4c8c..cf8e83faff 100644 --- a/editor/translations/ur_PK.po +++ b/editor/translations/ur_PK.po @@ -99,6 +99,7 @@ msgid "Anim Delete Keys" msgstr ".اینیمیشن Ú©ÛŒ کیز Ú©Ùˆ ڈیلیٹ کرو" #: editor/animation_editor.cpp editor/plugins/tile_map_editor_plugin.cpp +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Duplicate Selection" msgstr "" @@ -629,6 +630,13 @@ msgstr "" msgid "Search Replacement Resource:" msgstr "" +#: editor/dependency_editor.cpp editor/editor_file_dialog.cpp +#: editor/editor_help.cpp editor/editor_node.cpp editor/filesystem_dock.cpp +#: editor/plugins/script_editor_plugin.cpp editor/property_selector.cpp +#: editor/quick_open.cpp scene/gui/file_dialog.cpp +msgid "Open" +msgstr "" + #: editor/dependency_editor.cpp msgid "Owners Of:" msgstr "" @@ -699,6 +707,14 @@ msgstr "" msgid "Delete" msgstr "" +#: editor/dictionary_property_edit.cpp +msgid "Change Dictionary Key" +msgstr "" + +#: editor/dictionary_property_edit.cpp +msgid "Change Dictionary Value" +msgstr "" + #: editor/editor_about.cpp msgid "Thanks from the Godot community!" msgstr "" @@ -1118,12 +1134,6 @@ msgstr ".سب Ú©Ú†Ú¾ تسلیم Ûوچکا ÛÛ’" msgid "All Files (*)" msgstr "" -#: editor/editor_file_dialog.cpp editor/editor_help.cpp editor/editor_node.cpp -#: editor/filesystem_dock.cpp editor/plugins/script_editor_plugin.cpp -#: editor/property_selector.cpp editor/quick_open.cpp scene/gui/file_dialog.cpp -msgid "Open" -msgstr "" - #: editor/editor_file_dialog.cpp scene/gui/file_dialog.cpp msgid "Open a File" msgstr "" @@ -1480,6 +1490,13 @@ msgid "" msgstr "" #: editor/editor_node.cpp +msgid "" +"This is a remote object so changes to it will not be kept.\n" +"Please read the documentation relevant to debugging to better understand " +"this workflow." +msgstr "" + +#: editor/editor_node.cpp msgid "Copy Params" msgstr "" @@ -1589,6 +1606,10 @@ msgid "Export Mesh Library" msgstr "" #: editor/editor_node.cpp +msgid "This operation can't be done without a root node." +msgstr "" + +#: editor/editor_node.cpp msgid "Export Tile Set" msgstr "" @@ -1715,11 +1736,19 @@ msgid "Switch Scene Tab" msgstr "" #: editor/editor_node.cpp -msgid "%d more file(s)" +msgid "%d more files or folders" +msgstr "" + +#: editor/editor_node.cpp +msgid "%d more folders" +msgstr "" + +#: editor/editor_node.cpp +msgid "%d more files" msgstr "" #: editor/editor_node.cpp -msgid "%d more file(s) or folder(s)" +msgid "Dock Position" msgstr "" #: editor/editor_node.cpp @@ -1731,6 +1760,10 @@ msgid "Toggle distraction-free mode." msgstr "" #: editor/editor_node.cpp +msgid "Add a new scene." +msgstr "" + +#: editor/editor_node.cpp msgid "Scene" msgstr "" @@ -1795,13 +1828,12 @@ msgid "TileSet.." msgstr "" #: editor/editor_node.cpp editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp scene/gui/line_edit.cpp -#: scene/gui/text_edit.cpp +#: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Undo" msgstr "" #: editor/editor_node.cpp editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp +#: scene/gui/line_edit.cpp msgid "Redo" msgstr "" @@ -2283,6 +2315,10 @@ msgid "(Current)" msgstr "" #: editor/export_template_manager.cpp +msgid "Retrieving mirrors, please wait.." +msgstr "" + +#: editor/export_template_manager.cpp msgid "Remove template version '%s'?" msgstr "" @@ -2317,6 +2353,101 @@ msgid "Importing:" msgstr "" #: editor/export_template_manager.cpp +msgid "" +"No download links found for this version. Direct download is only available " +"for official releases." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Can't resolve." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Can't connect." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "No response." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Req. Failed." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Redirect Loop." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Failed:" +msgstr "" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Can't write file." +msgstr "سب سکریپشن بنائیں" + +#: editor/export_template_manager.cpp +msgid "Download Complete." +msgstr "" + +#: editor/export_template_manager.cpp +msgid "Error requesting url: " +msgstr "" + +#: editor/export_template_manager.cpp +msgid "Connecting to Mirror.." +msgstr "" + +#: editor/export_template_manager.cpp +msgid "Disconnected" +msgstr "" + +#: editor/export_template_manager.cpp +msgid "Resolving" +msgstr "" + +#: editor/export_template_manager.cpp +msgid "Can't Resolve" +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Connecting.." +msgstr "" + +#: editor/export_template_manager.cpp +msgid "Can't Conect" +msgstr "" + +#: editor/export_template_manager.cpp +msgid "Connected" +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Requesting.." +msgstr "" + +#: editor/export_template_manager.cpp +msgid "Downloading" +msgstr "" + +#: editor/export_template_manager.cpp +msgid "Connection Error" +msgstr "" + +#: editor/export_template_manager.cpp +msgid "SSL Handshake Error" +msgstr "" + +#: editor/export_template_manager.cpp msgid "Current Version:" msgstr "" @@ -2341,12 +2472,21 @@ msgstr "" msgid "Export Template Manager" msgstr "" +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Download Templates" +msgstr ".تمام کا انتخاب" + +#: editor/export_template_manager.cpp +msgid "Select mirror from list: " +msgstr "" + #: editor/file_type_cache.cpp msgid "Can't open file_type_cache.cch for writing, not saving file type cache!" msgstr "" #: editor/filesystem_dock.cpp -msgid "Cannot navigate to '" +msgid "Cannot navigate to '%s' as it has not been found in the file system!" msgstr "" #: editor/filesystem_dock.cpp @@ -2364,12 +2504,6 @@ msgid "" msgstr "" #: editor/filesystem_dock.cpp -msgid "" -"\n" -"Source: " -msgstr "" - -#: editor/filesystem_dock.cpp msgid "Cannot move/rename resources root." msgstr "" @@ -2627,8 +2761,7 @@ msgid "Remove Poly And Point" msgstr "" #: editor/plugins/abstract_polygon_2d_editor.cpp -#: editor/plugins/light_occluder_2d_editor_plugin.cpp -msgid "Create a new polygon from scratch." +msgid "Create a new polygon from scratch" msgstr "" #: editor/plugins/abstract_polygon_2d_editor.cpp @@ -2639,6 +2772,11 @@ msgid "" "RMB: Erase Point." msgstr "" +#: editor/plugins/abstract_polygon_2d_editor.cpp +#, fuzzy +msgid "Delete points" +msgstr ".تمام کا انتخاب" + #: editor/plugins/animation_player_editor_plugin.cpp msgid "Toggle Autoplay" msgstr "" @@ -2973,18 +3111,10 @@ msgid "Can't resolve hostname:" msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Can't resolve." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Connection error, please try again." msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Can't connect." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Can't connect to host:" msgstr "" @@ -2993,30 +3123,14 @@ msgid "No response from host:" msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "No response." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Request failed, return code:" msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Req. Failed." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Request failed, too many redirects" msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Redirect Loop." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp -msgid "Failed:" -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Bad download hash, assuming file has been tampered with." msgstr "" @@ -3045,14 +3159,6 @@ msgid "Resolving.." msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Connecting.." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp -msgid "Requesting.." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Error making request" msgstr "" @@ -3165,6 +3271,37 @@ msgid "Move Action" msgstr "ایکشن منتقل کریں" #: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Move vertical guide" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Create new vertical guide" +msgstr "سب سکریپشن بنائیں" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Remove vertical guide" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Move horizontal guide" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Create new horizontal guide" +msgstr "سب سکریپشن بنائیں" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Remove horizontal guide" +msgstr ".تمام کا انتخاب" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Create new horizontal and vertical guides" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp msgid "Edit IK Chain" msgstr "" @@ -3286,10 +3423,16 @@ msgid "Snap to other nodes" msgstr "" #: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Snap to guides" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Lock the selected object in place (can't be moved)." msgstr "" #: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Unlock the selected object (can be moved)." msgstr "" @@ -3340,6 +3483,10 @@ msgid "Show rulers" msgstr "" #: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Show guides" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp msgid "Center Selection" msgstr "" @@ -3528,6 +3675,10 @@ msgstr "" msgid "Hold Shift to edit tangents individually" msgstr "" +#: editor/plugins/gi_probe_editor_plugin.cpp +msgid "Bake GI Probe" +msgstr "" + #: editor/plugins/gradient_editor_plugin.cpp msgid "Add/Remove Color Ramp Point" msgstr "" @@ -3560,6 +3711,10 @@ msgid "Create Occluder Polygon" msgstr "" #: editor/plugins/light_occluder_2d_editor_plugin.cpp +msgid "Create a new polygon from scratch." +msgstr "" + +#: editor/plugins/light_occluder_2d_editor_plugin.cpp msgid "Edit existing polygon:" msgstr "" @@ -3575,58 +3730,6 @@ msgstr "" msgid "RMB: Erase Point." msgstr "" -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Remove Point from Line2D" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Add Point to Line2D" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Move Point in Line2D" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Select Points" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Shift+Drag: Select Control Points" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Click: Add Point" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Right Click: Delete Point" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Add Point (in empty space)" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Split Segment (in line)" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Delete Point" -msgstr "" - #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Mesh is empty!" msgstr "" @@ -4024,16 +4127,46 @@ msgid "Move Out-Control in Curve" msgstr "" #: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Select Points" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Shift+Drag: Select Control Points" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Click: Add Point" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Right Click: Delete Point" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp msgid "Select Control Points (Shift+Drag)" msgstr "" #: editor/plugins/path_2d_editor_plugin.cpp #: editor/plugins/path_editor_plugin.cpp +msgid "Add Point (in empty space)" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp msgid "Split Segment (in curve)" msgstr "" #: editor/plugins/path_2d_editor_plugin.cpp #: editor/plugins/path_editor_plugin.cpp +msgid "Delete Point" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp msgid "Close Curve" msgstr "" @@ -4174,7 +4307,6 @@ msgstr "" #: editor/plugins/resource_preloader_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp #: editor/plugins/sprite_frames_editor_plugin.cpp editor/property_editor.cpp #: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Paste" @@ -4219,6 +4351,20 @@ msgid " Class Reference" msgstr "" #: editor/plugins/script_editor_plugin.cpp +msgid "Sort" +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp +msgid "Move Up" +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp +msgid "Move Down" +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp #, fuzzy msgid "Next script" msgstr "سب سکریپشن بنائیں" @@ -4271,6 +4417,10 @@ msgstr "" msgid "Close All" msgstr "" +#: editor/plugins/script_editor_plugin.cpp +msgid "Close Other Tabs" +msgstr "" + #: editor/plugins/script_editor_plugin.cpp editor/project_manager.cpp msgid "Run" msgstr "" @@ -4281,13 +4431,11 @@ msgstr "" #: editor/plugins/script_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Find.." msgstr "" #: editor/plugins/script_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Find Next" msgstr "" @@ -4391,33 +4539,22 @@ msgstr "" msgid "Capitalize" msgstr "" -#: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp scene/gui/line_edit.cpp +#: editor/plugins/script_text_editor.cpp scene/gui/line_edit.cpp #: scene/gui/text_edit.cpp msgid "Cut" msgstr "" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp #: editor/plugins/sprite_frames_editor_plugin.cpp editor/property_editor.cpp #: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Copy" msgstr "" -#: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp scene/gui/line_edit.cpp +#: editor/plugins/script_text_editor.cpp scene/gui/line_edit.cpp #: scene/gui/text_edit.cpp msgid "Select All" msgstr "" -#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp -msgid "Move Up" -msgstr "" - -#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp -msgid "Move Down" -msgstr "" - #: editor/plugins/script_text_editor.cpp msgid "Delete Line" msgstr "" @@ -4439,6 +4576,22 @@ msgid "Clone Down" msgstr "" #: editor/plugins/script_text_editor.cpp +msgid "Fold Line" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Unfold Line" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Fold All Lines" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Unfold All Lines" +msgstr "" + +#: editor/plugins/script_text_editor.cpp msgid "Complete Symbol" msgstr "" @@ -4484,12 +4637,10 @@ msgid "Convert To Lowercase" msgstr "" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Find Previous" msgstr "" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Replace.." msgstr "" @@ -4498,7 +4649,6 @@ msgid "Goto Function.." msgstr "" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Goto Line.." msgstr "" @@ -4663,6 +4813,14 @@ msgid "View Plane Transform." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "Scaling: " +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Translating: " +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Rotating %s degrees." msgstr "" @@ -4743,6 +4901,10 @@ msgid "Vertices" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "FPS" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Align with view" msgstr "" @@ -4775,6 +4937,14 @@ msgid "View Information" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "View FPS" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Half Resolution" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Audio Listener" msgstr "" @@ -4905,6 +5075,10 @@ msgid "Tool Scale" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "Toggle Freelook" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Transform" msgstr "" @@ -5183,6 +5357,10 @@ msgid "Create Empty Editor Template" msgstr "" #: editor/plugins/theme_editor_plugin.cpp +msgid "Create From Current Editor Theme" +msgstr "" + +#: editor/plugins/theme_editor_plugin.cpp msgid "CheckBox Radio1" msgstr "" @@ -5357,7 +5535,7 @@ msgid "Runnable" msgstr "" #: editor/project_export.cpp -msgid "Delete patch '" +msgid "Delete patch '%s' from list?" msgstr "" #: editor/project_export.cpp @@ -5652,10 +5830,6 @@ msgid "Add Input Action Event" msgstr "" #: editor/project_settings_editor.cpp editor/settings_config_dialog.cpp -msgid "Meta+" -msgstr "" - -#: editor/project_settings_editor.cpp editor/settings_config_dialog.cpp msgid "Shift+" msgstr "" @@ -5777,11 +5951,11 @@ msgid "Select a setting item first!" msgstr "" #: editor/project_settings_editor.cpp -msgid "No property '" +msgid "No property '%s' exists." msgstr "" #: editor/project_settings_editor.cpp -msgid "Setting '" +msgid "Setting '%s' is internal, and it can't be deleted." msgstr "" #: editor/project_settings_editor.cpp @@ -6251,6 +6425,15 @@ msgid "Clear a script for the selected node." msgstr "" #: editor/scene_tree_dock.cpp +#, fuzzy +msgid "Remote" +msgstr ".تمام کا انتخاب" + +#: editor/scene_tree_dock.cpp +msgid "Local" +msgstr "" + +#: editor/scene_tree_dock.cpp msgid "Clear Inheritance? (No Undo!)" msgstr "" @@ -6438,6 +6621,11 @@ msgid "Attach Node Script" msgstr "سب سکریپشن بنائیں" #: editor/script_editor_debugger.cpp +#, fuzzy +msgid "Remote " +msgstr ".تمام کا انتخاب" + +#: editor/script_editor_debugger.cpp msgid "Bytes:" msgstr "" @@ -6494,18 +6682,6 @@ msgid "Stack Trace (if applicable):" msgstr "" #: editor/script_editor_debugger.cpp -msgid "Remote Inspector" -msgstr "" - -#: editor/script_editor_debugger.cpp -msgid "Live Scene Tree:" -msgstr "" - -#: editor/script_editor_debugger.cpp -msgid "Remote Object Properties: " -msgstr "" - -#: editor/script_editor_debugger.cpp msgid "Profiler" msgstr "" @@ -6638,50 +6814,50 @@ msgstr "" msgid "GDNative" msgstr "" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp #: modules/visual_script/visual_script_builtin_funcs.cpp msgid "Invalid type argument to convert(), use TYPE_* constants." msgstr "" ".استمال کیجۓ TYPE_* constants .Ú©Û’ لیے غلط Ûیں convert() دیے گئے ارگمنٹس." -#: modules/gdscript/gd_functions.cpp modules/mono/glue/glue_header.h +#: modules/gdscript/gdscript_functions.cpp modules/mono/glue/glue_header.h #: modules/visual_script/visual_script_builtin_funcs.cpp msgid "Not enough bytes for decoding bytes, or invalid format." msgstr "یا تو ڈیکوڈ کرنے Ú©Û’ لئے بائیٹس Ú©Ù… Ûیں یا پھر ناقص Ùارمیٹ Ú¾Û’." -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "step argument is zero!" msgstr "سٹیپ Ú©Û’ ارگمنٹس سÙر Ûیں!" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Not a script with an instance" msgstr ".ÛŒÛ Ø§Ù†Ø³Ù¹ÛŒÙ†Ø³ Ú©Û’ بغیر سکرپٹ Ù†ÛÛŒ Ûوتی" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Not based on a script" msgstr ".ÛŒÛ Ø³Ú©Ø±Ù¾Ù¹ پر مبنی Ù†ÛÛŒ ÛÛ’" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Not based on a resource file" msgstr ".ÛŒÛ Ø±ÛŒØ³ÙˆØ±Ø³ Ùائل پر مبنی Ù†ÛÛŒ ÛÛ’" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary format (missing @path)" msgstr "" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary format (can't load script at @path)" msgstr "" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary format (invalid script at @path)" msgstr "" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary (invalid subclasses)" msgstr "" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Object can't provide a length." msgstr "" @@ -6695,15 +6871,23 @@ msgid "GridMap Duplicate Selection" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp +msgid "Floor:" +msgstr "" + +#: modules/gridmap/grid_map_editor_plugin.cpp +msgid "Grid Map" +msgstr "" + +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Snap View" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp -msgid "Prev Level (%sDown Wheel)" +msgid "Previous Floor" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp -msgid "Next Level (%sUp Wheel)" +msgid "Next Floor" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp @@ -6771,12 +6955,9 @@ msgid "Erase Area" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp -msgid "Selection -> Duplicate" -msgstr "" - -#: modules/gridmap/grid_map_editor_plugin.cpp -msgid "Selection -> Clear" -msgstr "" +#, fuzzy +msgid "Clear Selection" +msgstr ".تمام کا انتخاب" #: modules/gridmap/grid_map_editor_plugin.cpp msgid "GridMap Settings" @@ -6898,7 +7079,7 @@ msgid "Duplicate VisualScript Nodes" msgstr "" #: modules/visual_script/visual_script_editor.cpp -msgid "Hold Meta to drop a Getter. Hold Shift to drop a generic signature." +msgid "Hold %s to drop a Getter. Hold Shift to drop a generic signature." msgstr "" #: modules/visual_script/visual_script_editor.cpp @@ -6906,7 +7087,7 @@ msgid "Hold Ctrl to drop a Getter. Hold Shift to drop a generic signature." msgstr "" #: modules/visual_script/visual_script_editor.cpp -msgid "Hold Meta to drop a simple reference to the node." +msgid "Hold %s to drop a simple reference to the node." msgstr "" #: modules/visual_script/visual_script_editor.cpp @@ -6914,7 +7095,7 @@ msgid "Hold Ctrl to drop a simple reference to the node." msgstr "" #: modules/visual_script/visual_script_editor.cpp -msgid "Hold Meta to drop a Variable Setter." +msgid "Hold %s to drop a Variable Setter." msgstr "" #: modules/visual_script/visual_script_editor.cpp @@ -7143,11 +7324,19 @@ msgid "Could not write file:\n" msgstr "" #: platform/javascript/export/export.cpp -msgid "Could not read file:\n" +msgid "Could not open template for export:\n" msgstr "" #: platform/javascript/export/export.cpp -msgid "Could not open template for export:\n" +msgid "Invalid export template:\n" +msgstr "" + +#: platform/javascript/export/export.cpp +msgid "Could not read custom HTML shell:\n" +msgstr "" + +#: platform/javascript/export/export.cpp +msgid "Could not read boot splash image file:\n" msgstr "" #: scene/2d/animated_sprite.cpp @@ -7239,18 +7428,6 @@ msgstr "" msgid "Path property must point to a valid Node2D node to work." msgstr "" -#: scene/2d/sprite.cpp -msgid "" -"Path property must point to a valid Viewport node to work. Such Viewport " -"must be set to 'render target' mode." -msgstr "" - -#: scene/2d/sprite.cpp -msgid "" -"The Viewport set in the path property must be set as 'render target' in " -"order for this sprite to work." -msgstr "" - #: scene/2d/visibility_notifier_2d.cpp msgid "" "VisibilityEnable2D works best when used with the edited scene root directly " @@ -7309,6 +7486,14 @@ msgid "" "shape resource for it!" msgstr "" +#: scene/3d/gi_probe.cpp +msgid "Plotting Meshes" +msgstr "" + +#: scene/3d/gi_probe.cpp +msgid "Finishing Plot" +msgstr "" + #: scene/3d/navigation_mesh.cpp msgid "A NavigationMesh resource must be set or created for this node to work." msgstr "" @@ -7386,6 +7571,10 @@ msgid "" "minimum size manually." msgstr "" +#: scene/gui/tree.cpp +msgid "(Other)" +msgstr "" + #: scene/main/scene_tree.cpp msgid "" "Default Environment as specified in Project Setings (Rendering -> Viewport -" diff --git a/editor/translations/zh_CN.po b/editor/translations/zh_CN.po index 3a67defced..f02b4f2260 100644 --- a/editor/translations/zh_CN.po +++ b/editor/translations/zh_CN.po @@ -13,14 +13,15 @@ # oberon-tonya <360119124@qq.com>, 2016. # sersoong <seraphim945@qq.com>, 2017. # wanfang liu <wanfang.liu@gmail.com>, 2016. +# WeiXiong Huang <wx_Huang@sina.com>, 2017. # Youmu <konpaku.w@gmail.com>, 2017. # msgid "" msgstr "" "Project-Id-Version: Godot Engine editor\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2017-09-15 08:55+0000\n" -"Last-Translator: sersoong <seraphim945@qq.com>\n" +"PO-Revision-Date: 2017-11-13 02:50+0000\n" +"Last-Translator: WeiXiong Huang <wx_Huang@sina.com>\n" "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/" "godot-engine/godot/zh_Hans/>\n" "Language: zh_CN\n" @@ -28,7 +29,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Weblate 2.17-dev\n" +"X-Generator: Weblate 2.18-dev\n" #: editor/animation_editor.cpp msgid "Disabled" @@ -111,6 +112,7 @@ msgid "Anim Delete Keys" msgstr "åˆ é™¤å…³é”®å¸§" #: editor/animation_editor.cpp editor/plugins/tile_map_editor_plugin.cpp +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Duplicate Selection" msgstr "å¤åˆ¶é€‰ä¸é¡¹" @@ -640,6 +642,13 @@ msgstr "ä¾èµ–编辑器" msgid "Search Replacement Resource:" msgstr "查找替æ¢èµ„æº:" +#: editor/dependency_editor.cpp editor/editor_file_dialog.cpp +#: editor/editor_help.cpp editor/editor_node.cpp editor/filesystem_dock.cpp +#: editor/plugins/script_editor_plugin.cpp editor/property_selector.cpp +#: editor/quick_open.cpp scene/gui/file_dialog.cpp +msgid "Open" +msgstr "打开" + #: editor/dependency_editor.cpp msgid "Owners Of:" msgstr "拥有者:" @@ -656,9 +665,8 @@ msgid "" msgstr "è¦åˆ 除的文件被其他资æºæ‰€ä¾èµ–，ä»ç„¶è¦åˆ 除å—ï¼Ÿï¼ˆæ— æ³•æ’¤é”€ï¼‰" #: editor/dependency_editor.cpp -#, fuzzy msgid "Cannot remove:\n" -msgstr "æ— æ³•è§£æž." +msgstr "æ— æ³•ç§»é™¤:\n" #: editor/dependency_editor.cpp msgid "Error loading:" @@ -711,6 +719,16 @@ msgstr "åˆ é™¤é€‰ä¸çš„文件？" msgid "Delete" msgstr "åˆ é™¤" +#: editor/dictionary_property_edit.cpp +#, fuzzy +msgid "Change Dictionary Key" +msgstr "é‡å‘½å动画:" + +#: editor/dictionary_property_edit.cpp +#, fuzzy +msgid "Change Dictionary Value" +msgstr "修改数组值" + #: editor/editor_about.cpp msgid "Thanks from the Godot community!" msgstr "æ„Ÿè°¢Godot社区!" @@ -745,32 +763,31 @@ msgstr "作者" #: editor/editor_about.cpp msgid "Platinum Sponsors" -msgstr "" +msgstr "白金赞助商" #: editor/editor_about.cpp msgid "Gold Sponsors" -msgstr "" +msgstr "金牌赞助商" #: editor/editor_about.cpp msgid "Mini Sponsors" -msgstr "" +msgstr "è¿·ä½ èµžåŠ©å•†" #: editor/editor_about.cpp msgid "Gold Donors" -msgstr "" +msgstr "黄金æèµ è€…" #: editor/editor_about.cpp msgid "Silver Donors" -msgstr "" +msgstr "白银æèµ è€…" #: editor/editor_about.cpp -#, fuzzy msgid "Bronze Donors" -msgstr "æ‹·è´åˆ°ä¸‹ä¸€è¡Œ" +msgstr "é’é“œæèµ è€…" #: editor/editor_about.cpp msgid "Donors" -msgstr "" +msgstr "æ助" #: editor/editor_about.cpp msgid "License" @@ -894,9 +911,8 @@ msgid "Duplicate" msgstr "æ‹·è´" #: editor/editor_audio_buses.cpp -#, fuzzy msgid "Reset Volume" -msgstr "é‡ç½®ç¼©æ”¾" +msgstr "é‡ç½®éŸ³é‡" #: editor/editor_audio_buses.cpp msgid "Delete Effect" @@ -919,9 +935,8 @@ msgid "Duplicate Audio Bus" msgstr "å¤åˆ¶éŸ³é¢‘总线" #: editor/editor_audio_buses.cpp -#, fuzzy msgid "Reset Bus Volume" -msgstr "é‡ç½®ç¼©æ”¾" +msgstr "é‡ç½®æ€»çº¿éŸ³é‡" #: editor/editor_audio_buses.cpp msgid "Move Audio Bus" @@ -1131,12 +1146,6 @@ msgstr "所有å¯ç”¨ç±»åž‹" msgid "All Files (*)" msgstr "所有文件(*)" -#: editor/editor_file_dialog.cpp editor/editor_help.cpp editor/editor_node.cpp -#: editor/filesystem_dock.cpp editor/plugins/script_editor_plugin.cpp -#: editor/property_selector.cpp editor/quick_open.cpp scene/gui/file_dialog.cpp -msgid "Open" -msgstr "打开" - #: editor/editor_file_dialog.cpp scene/gui/file_dialog.cpp msgid "Open a File" msgstr "打开文件" @@ -1204,9 +1213,8 @@ msgid "Move Favorite Down" msgstr "å‘下移动收è—" #: editor/editor_file_dialog.cpp -#, fuzzy msgid "Go to parent folder" -msgstr "æ— æ³•åˆ›å»ºç›®å½•ã€‚" +msgstr "转到上层文件夹" #: editor/editor_file_dialog.cpp scene/gui/file_dialog.cpp msgid "Directories & Files:" @@ -1267,27 +1275,24 @@ msgid "Brief Description:" msgstr "简介:" #: editor/editor_help.cpp -#, fuzzy msgid "Members" -msgstr "æˆå‘˜ï¼š" +msgstr "æˆå‘˜" #: editor/editor_help.cpp modules/visual_script/visual_script_editor.cpp msgid "Members:" msgstr "æˆå‘˜ï¼š" #: editor/editor_help.cpp -#, fuzzy msgid "Public Methods" -msgstr "公共方法:" +msgstr "公共方法" #: editor/editor_help.cpp msgid "Public Methods:" msgstr "公共方法:" #: editor/editor_help.cpp -#, fuzzy msgid "GUI Theme Items" -msgstr "GUI主题:" +msgstr "GUI主题项目" #: editor/editor_help.cpp msgid "GUI Theme Items:" @@ -1298,9 +1303,8 @@ msgid "Signals:" msgstr "事件:" #: editor/editor_help.cpp -#, fuzzy msgid "Enumerations" -msgstr "枚举：" +msgstr "枚举" #: editor/editor_help.cpp msgid "Enumerations:" @@ -1311,23 +1315,20 @@ msgid "enum " msgstr "枚举 " #: editor/editor_help.cpp -#, fuzzy msgid "Constants" -msgstr "常é‡:" +msgstr "常é‡" #: editor/editor_help.cpp msgid "Constants:" msgstr "常é‡:" #: editor/editor_help.cpp -#, fuzzy msgid "Description" -msgstr "æè¿°:" +msgstr "æè¿°" #: editor/editor_help.cpp -#, fuzzy msgid "Properties" -msgstr "属性:" +msgstr "属性" #: editor/editor_help.cpp msgid "Property Description:" @@ -1338,11 +1339,12 @@ msgid "" "There is currently no description for this property. Please help us by " "[color=$color][url=$url]contributing one[/url][/color]!" msgstr "" +"当å‰æ²¡æœ‰æ¤å±žæ€§çš„说明。请帮助我们通过 [color=$color][url=$url] 贡献一个 [/url]" +"[/color]!" #: editor/editor_help.cpp -#, fuzzy msgid "Methods" -msgstr "方法列表:" +msgstr "方法" #: editor/editor_help.cpp msgid "Method Description:" @@ -1353,6 +1355,8 @@ msgid "" "There is currently no description for this method. Please help us by [color=" "$color][url=$url]contributing one[/url][/color]!" msgstr "" +"当å‰æ²¡æœ‰æ¤æ–¹æ³•çš„说明。请帮助我们通过 [color=$color] [url=$url] 贡献一个 [/" +"url][/color]!" #: editor/editor_help.cpp msgid "Search Text" @@ -1394,28 +1398,24 @@ msgid "Error while saving." msgstr "ä¿å˜å‡ºé”™ã€‚" #: editor/editor_node.cpp -#, fuzzy msgid "Can't open '%s'." -msgstr "æ— æ³•å¯¹'..'引用æ“作" +msgstr "æ— æ³•æ‰“å¼€ \"%s\"。" #: editor/editor_node.cpp -#, fuzzy msgid "Error while parsing '%s'." -msgstr "ä¿å˜å‡ºé”™ã€‚" +msgstr "åˆ†æž \"%s\" 时出错。" #: editor/editor_node.cpp msgid "Unexpected end of file '%s'." -msgstr "" +msgstr "文件 \"%s\" çš„æ„外结æŸã€‚" #: editor/editor_node.cpp -#, fuzzy msgid "Missing '%s' or its dependencies." -msgstr "场景'%s'çš„ä¾èµ–å·²è¢«ç ´å:" +msgstr "缺少 \"%s\" 或其ä¾èµ–项。" #: editor/editor_node.cpp -#, fuzzy msgid "Error while loading '%s'." -msgstr "ä¿å˜å‡ºé”™ã€‚" +msgstr "åŠ è½½ \"%s\" 时出错。" #: editor/editor_node.cpp msgid "Saving Scene" @@ -1480,18 +1480,23 @@ msgid "" "Please read the documentation relevant to importing scenes to better " "understand this workflow." msgstr "" +"æ¤èµ„æºå±žäºŽå·²å¯¼å…¥çš„场景, å› æ¤å®ƒä¸å¯ç¼–辑。\n" +"请阅读与导入场景相关的文档, 以便更好地ç†è§£æ¤å·¥ä½œæµã€‚" #: editor/editor_node.cpp msgid "" "This resource belongs to a scene that was instanced or inherited.\n" "Changes to it will not be kept when saving the current scene." msgstr "" +"æ¤èµ„æºå±žäºŽå®žä¾‹æˆ–继承的场景。\n" +"ä¿å˜å½“å‰åœºæ™¯æ—¶ä¸ä¼šä¿ç•™å¯¹å®ƒçš„更改。" #: editor/editor_node.cpp msgid "" "This resource was imported, so it's not editable. Change its settings in the " "import panel and then re-import." msgstr "" +"æ¤èµ„æºå·²å¯¼å…¥, å› æ¤æ— 法编辑。在 \"导入\" é¢æ¿ä¸æ›´æ”¹å…¶è®¾ç½®, 然åŽé‡æ–°å¯¼å…¥ã€‚" #: editor/editor_node.cpp msgid "" @@ -1500,6 +1505,19 @@ msgid "" "Please read the documentation relevant to importing scenes to better " "understand this workflow." msgstr "" +"场景已被导入, 对它的更改将ä¸ä¼šä¿ç•™ã€‚\n" +"å…许对它的实例或继承进行更改。\n" +"请阅读与导入场景相关的文档, 以便更好地ç†è§£æ¤å·¥ä½œæµã€‚" + +#: editor/editor_node.cpp +#, fuzzy +msgid "" +"This is a remote object so changes to it will not be kept.\n" +"Please read the documentation relevant to debugging to better understand " +"this workflow." +msgstr "" +"æ¤èµ„æºå±žäºŽå·²å¯¼å…¥çš„场景, å› æ¤å®ƒä¸å¯ç¼–辑。\n" +"请阅读与导入场景相关的文档, 以便更好地ç†è§£æ¤å·¥ä½œæµã€‚" #: editor/editor_node.cpp msgid "Copy Params" @@ -1617,6 +1635,11 @@ msgid "Export Mesh Library" msgstr "å¯¼å‡ºç½‘æ ¼åº“(Mesh Library)" #: editor/editor_node.cpp +#, fuzzy +msgid "This operation can't be done without a root node." +msgstr "æ¤æ“作必须先选择一个nodeæ‰èƒ½æ‰§è¡Œã€‚" + +#: editor/editor_node.cpp msgid "Export Tile Set" msgstr "å¯¼å‡ºç –å—集(Tile Set)" @@ -1672,37 +1695,32 @@ msgstr "在打开项目管ç†å™¨ä¹‹å‰ä¿å˜æ›´æ”¹å—？" msgid "" "This option is deprecated. Situations where refresh must be forced are now " "considered a bug. Please report." -msgstr "" +msgstr "æ¤é€‰é¡¹å·²å¼ƒç”¨ã€‚必须强制刷新的情况现在被视为 bug。请报告。" #: editor/editor_node.cpp msgid "Pick a Main Scene" msgstr "选择主场景" #: editor/editor_node.cpp -#, fuzzy msgid "Unable to enable addon plugin at: '%s' parsing of config failed." -msgstr "æ— æ³•å¯ç”¨æ’件: '" +msgstr "æ— æ³•åœ¨: \"%s\" 上å¯ç”¨åŠ 载项æ’件, é…置解æžå¤±è´¥ã€‚" #: editor/editor_node.cpp -#, fuzzy msgid "Unable to find script field for addon plugin at: 'res://addons/%s'." -msgstr "在æ’件目录ä¸æ²¡æœ‰æ‰¾åˆ°è„šæœ¬: 'res://addons/" +msgstr "在æ’件目录ä¸æ²¡æœ‰æ‰¾åˆ°è„šæœ¬: 'res://addons/%s'。" #: editor/editor_node.cpp -#, fuzzy msgid "Unable to load addon script from path: '%s'." -msgstr "æ— æ³•ä»Žè·¯å¾„åŠ è½½æ’件脚本: '" +msgstr "æ— æ³•ä»Žè·¯å¾„ä¸åŠ è½½æ’件脚本: \"%s\"。" #: editor/editor_node.cpp -#, fuzzy msgid "" "Unable to load addon script from path: '%s' Base type is not EditorPlugin." -msgstr "æ— æ³•ä»Žè·¯å¾„åŠ è½½æ’件脚本: '" +msgstr "æ— æ³•ä»Žè·¯å¾„åŠ è½½æ’件脚本: \"%s\" 基类型ä¸æ˜¯ EditorPlugin 的。" #: editor/editor_node.cpp -#, fuzzy msgid "Unable to load addon script from path: '%s' Script is not in tool mode." -msgstr "æ— æ³•ä»Žè·¯å¾„åŠ è½½æ’件脚本: '" +msgstr "æ— æ³•ä»Žè·¯å¾„åŠ è½½æ’件脚本: \"%s\" 脚本ä¸åœ¨å·¥å…·æ¨¡å¼ä¸‹ã€‚" #: editor/editor_node.cpp msgid "" @@ -1729,9 +1747,8 @@ msgid "Scene '%s' has broken dependencies:" msgstr "场景'%s'çš„ä¾èµ–å·²è¢«ç ´å:" #: editor/editor_node.cpp -#, fuzzy msgid "Clear Recent Scenes" -msgstr "清ç†å½“å‰æ–‡ä»¶" +msgstr "清除近期的场景" #: editor/editor_node.cpp msgid "Save Layout" @@ -1751,12 +1768,23 @@ msgid "Switch Scene Tab" msgstr "切æ¢åœºæ™¯æ ‡ç¾é¡µ" #: editor/editor_node.cpp -msgid "%d more file(s)" +#, fuzzy +msgid "%d more files or folders" +msgstr "更多的%d个文件或目录" + +#: editor/editor_node.cpp +#, fuzzy +msgid "%d more folders" msgstr "更多的%d个文件" #: editor/editor_node.cpp -msgid "%d more file(s) or folder(s)" -msgstr "更多的%d个文件或目录" +#, fuzzy +msgid "%d more files" +msgstr "更多的%d个文件" + +#: editor/editor_node.cpp +msgid "Dock Position" +msgstr "" #: editor/editor_node.cpp msgid "Distraction Free Mode" @@ -1767,6 +1795,11 @@ msgid "Toggle distraction-free mode." msgstr "切æ¢æ— 干扰模å¼ã€‚" #: editor/editor_node.cpp +#, fuzzy +msgid "Add a new scene." +msgstr "新建轨é“。" + +#: editor/editor_node.cpp msgid "Scene" msgstr "场景" @@ -1831,13 +1864,12 @@ msgid "TileSet.." msgstr "ç –å—集.." #: editor/editor_node.cpp editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp scene/gui/line_edit.cpp -#: scene/gui/text_edit.cpp +#: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Undo" msgstr "撤销" #: editor/editor_node.cpp editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp +#: scene/gui/line_edit.cpp msgid "Redo" msgstr "é‡åš" @@ -2095,9 +2127,8 @@ msgid "Object properties." msgstr "对象属性。" #: editor/editor_node.cpp -#, fuzzy msgid "Changes may be lost!" -msgstr "修改图片分组" +msgstr "更改å¯èƒ½ä¼šä¸¢å¤±!" #: editor/editor_node.cpp editor/plugins/asset_library_editor_plugin.cpp #: editor/project_manager.cpp @@ -2181,9 +2212,8 @@ msgid "Open the previous Editor" msgstr "打开上一个编辑器" #: editor/editor_plugin.cpp -#, fuzzy msgid "Creating Mesh Previews" -msgstr "创建 Mesh(ç½‘æ ¼) 库" +msgstr "åˆ›å»ºç½‘æ ¼é¢„è§ˆ" #: editor/editor_plugin.cpp msgid "Thumbnail.." @@ -2235,9 +2265,8 @@ msgid "Frame %" msgstr "渲染速度" #: editor/editor_profiler.cpp -#, fuzzy msgid "Physics Frame %" -msgstr "固定帧速率 %" +msgstr "物ç†å¸§é€ŸçŽ‡ %" #: editor/editor_profiler.cpp editor/script_editor_debugger.cpp msgid "Time:" @@ -2332,6 +2361,11 @@ msgid "(Current)" msgstr "(当å‰)" #: editor/export_template_manager.cpp +#, fuzzy +msgid "Retrieving mirrors, please wait.." +msgstr "连接错误，请é‡è¯•ã€‚" + +#: editor/export_template_manager.cpp msgid "Remove template version '%s'?" msgstr "移除版本为 '%s' 的模æ¿?" @@ -2366,6 +2400,112 @@ msgid "Importing:" msgstr "导入:" #: editor/export_template_manager.cpp +msgid "" +"No download links found for this version. Direct download is only available " +"for official releases." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Can't resolve." +msgstr "æ— æ³•è§£æž." + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Can't connect." +msgstr "æ— æ³•è¿žæŽ¥ã€‚" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "No response." +msgstr "æ— å“应。" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Req. Failed." +msgstr "请求失败." + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Redirect Loop." +msgstr "循环é‡å®šå‘。" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Failed:" +msgstr "失败:" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Can't write file." +msgstr "æ— æ³•å†™å…¥æ–‡ä»¶:\n" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Download Complete." +msgstr "下载错误" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Error requesting url: " +msgstr "ä¿å˜è´´å›¾é›†å‡ºé”™:" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Connecting to Mirror.." +msgstr "连接ä¸.." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Disconnected" +msgstr "åˆ é™¤äº‹ä»¶è¿žæŽ¥" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Resolving" +msgstr "解æžä¸.." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Can't Resolve" +msgstr "æ— æ³•è§£æž." + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Connecting.." +msgstr "连接ä¸.." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Can't Conect" +msgstr "æ— æ³•è¿žæŽ¥ã€‚" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Connected" +msgstr "连接" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Requesting.." +msgstr "æ£åœ¨è¯·æ±‚.." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Downloading" +msgstr "下载" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Connection Error" +msgstr "连接ä¸.." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "SSL Handshake Error" +msgstr "åŠ è½½é”™è¯¯" + +#: editor/export_template_manager.cpp msgid "Current Version:" msgstr "当å‰ç‰ˆæœ¬:" @@ -2389,88 +2529,83 @@ msgstr "åˆ é™¤é€‰ä¸æ¨¡æ¿æ–‡ä»¶" msgid "Export Template Manager" msgstr "模æ¿å¯¼å‡ºå·¥å…·" +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Download Templates" +msgstr "模æ¿" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Select mirror from list: " +msgstr "从列表ä¸é€‰æ‹©è®¾å¤‡" + #: editor/file_type_cache.cpp msgid "Can't open file_type_cache.cch for writing, not saving file type cache!" msgstr "æ— æ³•ä»¥å¯å†™æ–¹å¼æ‰“å¼€file_type_cache.cchï¼" #: editor/filesystem_dock.cpp -msgid "Cannot navigate to '" -msgstr "æ— æ³•å¯¼èˆªåˆ° '" +msgid "Cannot navigate to '%s' as it has not been found in the file system!" +msgstr "" #: editor/filesystem_dock.cpp msgid "View items as a grid of thumbnails" -msgstr "" +msgstr "å°†é¡¹ç›®ä½œä¸ºç¼©ç•¥å›¾çš„ç½‘æ ¼æŸ¥çœ‹" #: editor/filesystem_dock.cpp msgid "View items as a list" -msgstr "" +msgstr "将项目作为列表查看" #: editor/filesystem_dock.cpp msgid "" "\n" "Status: Import of file failed. Please fix file and reimport manually." msgstr "" - -#: editor/filesystem_dock.cpp -msgid "" -"\n" -"Source: " -msgstr "" "\n" -"æº: " +"状æ€: 导入文件失败。请手动修å¤æ–‡ä»¶å’Œå¯¼å…¥ã€‚" #: editor/filesystem_dock.cpp -#, fuzzy msgid "Cannot move/rename resources root." -msgstr "æ— æ³•åŠ è½½/处ç†æºå—体。" +msgstr "æ— æ³•ç§»åŠ¨/é‡å‘½åæ ¹èµ„æºã€‚" #: editor/filesystem_dock.cpp -#, fuzzy msgid "Cannot move a folder into itself.\n" -msgstr "ä¸å…许导入文件本身:" +msgstr "æ— æ³•å°†æ–‡ä»¶å¤¹ç§»åŠ¨åˆ°å…¶è‡ªèº«ã€‚\n" #: editor/filesystem_dock.cpp -#, fuzzy msgid "Error moving:\n" -msgstr "移动目录出错:\n" +msgstr "移动时出错:\n" #: editor/filesystem_dock.cpp -#, fuzzy msgid "Unable to update dependencies:\n" -msgstr "场景'%s'çš„ä¾èµ–å·²è¢«ç ´å:" +msgstr "æ— æ³•æ›´æ–°ä¾èµ–关系:\n" #: editor/filesystem_dock.cpp msgid "No name provided" -msgstr "" +msgstr "未æä¾›å称" #: editor/filesystem_dock.cpp msgid "Provided name contains invalid characters" -msgstr "" +msgstr "æ供的å称包å«æ— 效å—符" #: editor/filesystem_dock.cpp -#, fuzzy msgid "No name provided." -msgstr "移动或é‡å‘½å.." +msgstr "没有æ供任何å称。" #: editor/filesystem_dock.cpp -#, fuzzy msgid "Name contains invalid characters." -msgstr "å—符åˆæ³•:" +msgstr "å称包å«æ— 效å—符。" #: editor/filesystem_dock.cpp -#, fuzzy msgid "A file or folder with this name already exists." -msgstr "分组å称已å˜åœ¨ï¼" +msgstr "åŒå的文件夹已ç»å˜åœ¨ã€‚" #: editor/filesystem_dock.cpp -#, fuzzy msgid "Renaming file:" -msgstr "é‡å‘½åå˜é‡" +msgstr "é‡å‘½å文件:" #: editor/filesystem_dock.cpp -#, fuzzy msgid "Renaming folder:" -msgstr "é‡å‘½å节点" +msgstr "é‡å‘½å文件夹:" #: editor/filesystem_dock.cpp msgid "Expand all" @@ -2485,18 +2620,16 @@ msgid "Copy Path" msgstr "æ‹·è´è·¯å¾„" #: editor/filesystem_dock.cpp -#, fuzzy msgid "Rename.." -msgstr "é‡å‘½å" +msgstr "é‡å‘½å为..." #: editor/filesystem_dock.cpp msgid "Move To.." msgstr "移动.." #: editor/filesystem_dock.cpp -#, fuzzy msgid "New Folder.." -msgstr "新建目录" +msgstr "新建文件夹 .." #: editor/filesystem_dock.cpp msgid "Show In File Manager" @@ -2566,7 +2699,7 @@ msgstr "导入为独立场景" #: editor/import/resource_importer_scene.cpp #, fuzzy msgid "Import with Separate Animations" -msgstr "导入独立æè´¨" +msgstr "导入独立动画" #: editor/import/resource_importer_scene.cpp msgid "Import with Separate Materials" @@ -2583,17 +2716,17 @@ msgstr "导入独立物体 + æè´¨" #: editor/import/resource_importer_scene.cpp #, fuzzy msgid "Import with Separate Objects+Animations" -msgstr "导入独立物体 + æè´¨" +msgstr "导入独立物体 + 动画" #: editor/import/resource_importer_scene.cpp #, fuzzy msgid "Import with Separate Materials+Animations" -msgstr "导入独立æè´¨" +msgstr "导入独立æè´¨ + 动画" #: editor/import/resource_importer_scene.cpp #, fuzzy msgid "Import with Separate Objects+Materials+Animations" -msgstr "导入独立物体 + æè´¨" +msgstr "导入独立物体 + æè´¨ + 动画" #: editor/import/resource_importer_scene.cpp msgid "Import as Multiple Scenes" @@ -2680,9 +2813,8 @@ msgid "Edit Poly" msgstr "编辑多边形" #: editor/plugins/abstract_polygon_2d_editor.cpp -#, fuzzy msgid "Insert Point" -msgstr "æ’å…¥ä¸" +msgstr "æ’入点" #: editor/plugins/abstract_polygon_2d_editor.cpp #: editor/plugins/collision_polygon_editor_plugin.cpp @@ -2695,8 +2827,8 @@ msgid "Remove Poly And Point" msgstr "移除多边形åŠé¡¶ç‚¹" #: editor/plugins/abstract_polygon_2d_editor.cpp -#: editor/plugins/light_occluder_2d_editor_plugin.cpp -msgid "Create a new polygon from scratch." +#, fuzzy +msgid "Create a new polygon from scratch" msgstr "从头开始创建一个新的多边形。" #: editor/plugins/abstract_polygon_2d_editor.cpp @@ -2711,6 +2843,11 @@ msgstr "" "Ctrl + LMB： 分离片段。\n" "人民å¸ï¼š 擦除点。" +#: editor/plugins/abstract_polygon_2d_editor.cpp +#, fuzzy +msgid "Delete points" +msgstr "åˆ é™¤é¡¶ç‚¹" + #: editor/plugins/animation_player_editor_plugin.cpp msgid "Toggle Autoplay" msgstr "切æ¢AutoPlay" @@ -3045,18 +3182,10 @@ msgid "Can't resolve hostname:" msgstr "æ— æ³•è§£æžä¸»æœºå：" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Can't resolve." -msgstr "æ— æ³•è§£æž." - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Connection error, please try again." msgstr "连接错误，请é‡è¯•ã€‚" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Can't connect." -msgstr "æ— æ³•è¿žæŽ¥ã€‚" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Can't connect to host:" msgstr "æ— æ³•è¿žæŽ¥åˆ°æœåŠ¡å™¨:" @@ -3065,30 +3194,14 @@ msgid "No response from host:" msgstr "æœåŠ¡å™¨æ— å“应:" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "No response." -msgstr "æ— å“应。" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Request failed, return code:" msgstr "请求失败，错误代ç :" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Req. Failed." -msgstr "请求失败." - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Request failed, too many redirects" msgstr "请求失败，é‡å®šå‘次数过多" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Redirect Loop." -msgstr "循环é‡å®šå‘。" - -#: editor/plugins/asset_library_editor_plugin.cpp -msgid "Failed:" -msgstr "失败:" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Bad download hash, assuming file has been tampered with." msgstr "文件hash值错误，该文件å¯èƒ½è¢«ç¯¡æ”¹ã€‚" @@ -3117,14 +3230,6 @@ msgid "Resolving.." msgstr "解æžä¸.." #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Connecting.." -msgstr "连接ä¸.." - -#: editor/plugins/asset_library_editor_plugin.cpp -msgid "Requesting.." -msgstr "æ£åœ¨è¯·æ±‚.." - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Error making request" msgstr "请求错误" @@ -3237,6 +3342,39 @@ msgid "Move Action" msgstr "移动动作" #: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Move vertical guide" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Create new vertical guide" +msgstr "创建新脚本" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Remove vertical guide" +msgstr "åˆ é™¤å˜é‡" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Move horizontal guide" +msgstr "在曲线ä¸ç§»åŠ¨é¡¶ç‚¹" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Create new horizontal guide" +msgstr "创建新脚本" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Remove horizontal guide" +msgstr "ç§»é™¤æ— æ•ˆé”®" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Create new horizontal and vertical guides" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp msgid "Edit IK Chain" msgstr "编辑IK链" @@ -3245,14 +3383,12 @@ msgid "Edit CanvasItem" msgstr "编辑CanvasItem" #: editor/plugins/canvas_item_editor_plugin.cpp -#, fuzzy msgid "Anchors only" -msgstr "锚点" +msgstr "仅锚点" #: editor/plugins/canvas_item_editor_plugin.cpp -#, fuzzy msgid "Change Anchors and Margins" -msgstr "编辑锚点" +msgstr "更改锚点和边è·" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Change Anchors" @@ -3306,9 +3442,8 @@ msgid "Pan Mode" msgstr "移动画布" #: editor/plugins/canvas_item_editor_plugin.cpp -#, fuzzy msgid "Toggles snapping" -msgstr "设置æ–点" +msgstr "切æ¢å¸é™„" #: editor/plugins/canvas_item_editor_plugin.cpp #: editor/plugins/spatial_editor_plugin.cpp @@ -3316,21 +3451,18 @@ msgid "Use Snap" msgstr "使用å¸é™„" #: editor/plugins/canvas_item_editor_plugin.cpp -#, fuzzy msgid "Snapping options" -msgstr "动画选项" +msgstr "å¸é™„选项" #: editor/plugins/canvas_item_editor_plugin.cpp -#, fuzzy msgid "Snap to grid" -msgstr "å¸é™„模å¼:" +msgstr "å¸é™„åˆ°ç½‘æ ¼" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Use Rotation Snap" msgstr "使用旋转å¸é™„" #: editor/plugins/canvas_item_editor_plugin.cpp -#, fuzzy msgid "Configure Snap..." msgstr "设置å¸é™„.." @@ -3344,30 +3476,36 @@ msgstr "使用åƒç´ å¸é™„" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Smart snapping" -msgstr "" +msgstr "智能å¸é™„" #: editor/plugins/canvas_item_editor_plugin.cpp -#, fuzzy msgid "Snap to parent" -msgstr "展开父节点" +msgstr "å¸é™„到父节点" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Snap to node anchor" -msgstr "" +msgstr "å¸é™„到node锚点" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Snap to node sides" -msgstr "" +msgstr "å¸é™„到nodeè¾¹" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Snap to other nodes" -msgstr "" +msgstr "å¸é™„到其他node节点" #: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Snap to guides" +msgstr "å¸é™„åˆ°ç½‘æ ¼" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Lock the selected object in place (can't be moved)." msgstr "é”定选ä¸å¯¹è±¡çš„ä½ç½®ã€‚" #: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Unlock the selected object (can be moved)." msgstr "解é”选ä¸å¯¹è±¡çš„ä½ç½®ã€‚" @@ -3412,12 +3550,16 @@ msgstr "æ˜¾ç¤ºç½‘æ ¼" #: editor/plugins/canvas_item_editor_plugin.cpp #, fuzzy msgid "Show helpers" -msgstr "显示骨骼" +msgstr "显示辅助线" #: editor/plugins/canvas_item_editor_plugin.cpp -#, fuzzy msgid "Show rulers" -msgstr "显示骨骼" +msgstr "æ˜¾ç¤ºæ ‡å°º" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Show guides" +msgstr "æ˜¾ç¤ºæ ‡å°º" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Center Selection" @@ -3428,9 +3570,8 @@ msgid "Frame Selection" msgstr "最大化显示选ä¸èŠ‚点" #: editor/plugins/canvas_item_editor_plugin.cpp -#, fuzzy msgid "Layout" -msgstr "ä¿å˜å¸ƒå±€" +msgstr "布局" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Insert Keys" @@ -3454,12 +3595,11 @@ msgstr "清除姿势" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Drag pivot from mouse position" -msgstr "" +msgstr "ä»Žé¼ æ ‡ä½ç½®æ‹–动轴心" #: editor/plugins/canvas_item_editor_plugin.cpp -#, fuzzy msgid "Set pivot at mouse position" -msgstr "设置曲线输出ä½ç½®ï¼ˆPos）" +msgstr "åœ¨é¼ æ ‡ä½ç½®è®¾ç½®è½´å¿ƒ" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Multiply grid step by 2" @@ -3545,26 +3685,27 @@ msgid "Update from Scene" msgstr "从场景ä¸æ›´æ–°" #: editor/plugins/curve_editor_plugin.cpp +#, fuzzy msgid "Flat0" -msgstr "" +msgstr "Flat0" #: editor/plugins/curve_editor_plugin.cpp +#, fuzzy msgid "Flat1" -msgstr "" +msgstr "Flat1" #: editor/plugins/curve_editor_plugin.cpp -#, fuzzy msgid "Ease in" -msgstr "缓入" +msgstr "æ¸å…¥" #: editor/plugins/curve_editor_plugin.cpp -#, fuzzy msgid "Ease out" -msgstr "缓出" +msgstr "æ¸å‡º" #: editor/plugins/curve_editor_plugin.cpp +#, fuzzy msgid "Smoothstep" -msgstr "" +msgstr "圆滑次数" #: editor/plugins/curve_editor_plugin.cpp msgid "Modify Curve Point" @@ -3610,6 +3751,10 @@ msgstr "切æ¢æ›²çº¿çº¿æ€§Tangent" msgid "Hold Shift to edit tangents individually" msgstr "æŒ‰ä½ Shift å¯å•ç‹¬ç¼–辑切线" +#: editor/plugins/gi_probe_editor_plugin.cpp +msgid "Bake GI Probe" +msgstr "" + #: editor/plugins/gradient_editor_plugin.cpp msgid "Add/Remove Color Ramp Point" msgstr "æ·»åŠ /åˆ é™¤è‰²å½©æ¸å˜ç‚¹" @@ -3644,6 +3789,10 @@ msgid "Create Occluder Polygon" msgstr "æ·»åŠ é®å…‰å¤šè¾¹å½¢" #: editor/plugins/light_occluder_2d_editor_plugin.cpp +msgid "Create a new polygon from scratch." +msgstr "从头开始创建一个新的多边形。" + +#: editor/plugins/light_occluder_2d_editor_plugin.cpp msgid "Edit existing polygon:" msgstr "编辑已å˜åœ¨çš„多边形:" @@ -3659,58 +3808,6 @@ msgstr "Ctrl+é¼ æ ‡å·¦é”®:分割视图å—。" msgid "RMB: Erase Point." msgstr "é¼ æ ‡å³é”®:移除点。" -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Remove Point from Line2D" -msgstr "从Line2Dä¸ç§»é™¤é¡¶ç‚¹" - -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Add Point to Line2D" -msgstr "å‘Line2Dæ·»åŠ é¡¶ç‚¹" - -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Move Point in Line2D" -msgstr "在Line2Dä¸ç§»åŠ¨é¡¶ç‚¹" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Select Points" -msgstr "选择顶点" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Shift+Drag: Select Control Points" -msgstr "Shift+拖拽:选择控制点" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Click: Add Point" -msgstr "é¼ æ ‡å·¦é”®:æ·»åŠ ç‚¹" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Right Click: Delete Point" -msgstr "é¼ æ ‡å³é”®:åˆ é™¤ç‚¹" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Add Point (in empty space)" -msgstr "æ·»åŠ ç‚¹ï¼ˆåœ¨ç©ºç™½å¤„ï¼‰" - -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Split Segment (in line)" -msgstr "拆分片段（使用线段）" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Delete Point" -msgstr "åˆ é™¤é¡¶ç‚¹" - #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Mesh is empty!" msgstr "Mesh为空ï¼" @@ -3892,36 +3989,35 @@ msgid "Bake!" msgstr "烘培ï¼" #: editor/plugins/navigation_mesh_editor_plugin.cpp -#, fuzzy msgid "Bake the navigation mesh.\n" -msgstr "创建导航Mesh(ç½‘æ ¼)" +msgstr "çƒ˜ç„™å¯¼èˆªç½‘æ ¼(mesh).\n" #: editor/plugins/navigation_mesh_editor_plugin.cpp -#, fuzzy msgid "Clear the navigation mesh." -msgstr "创建导航Mesh(ç½‘æ ¼)" +msgstr "æ¸…é™¤å¯¼èˆªç½‘æ ¼(mesh)。" #: editor/plugins/navigation_mesh_generator.cpp msgid "Setting up Configuration..." -msgstr "" +msgstr "æ£åœ¨è®¾ç½®é…ç½®..。" #: editor/plugins/navigation_mesh_generator.cpp msgid "Calculating grid size..." -msgstr "" +msgstr "æ£åœ¨è®¡ç®—ç½‘æ ¼å¤§å°..." #: editor/plugins/navigation_mesh_generator.cpp #, fuzzy msgid "Creating heightfield..." -msgstr "创建光的 Octree(å…«å‰æ ‘)" +msgstr "创建高度图..." #: editor/plugins/navigation_mesh_generator.cpp #, fuzzy msgid "Marking walkable triangles..." -msgstr "å¯ç¿»è¯‘å—符串.." +msgstr "æ ‡è®°å¯ç§»åŠ¨ä¸‰è§’å½¢..." #: editor/plugins/navigation_mesh_generator.cpp +#, fuzzy msgid "Constructing compact heightfield..." -msgstr "" +msgstr "构建紧凑高度图..." #: editor/plugins/navigation_mesh_generator.cpp msgid "Eroding walkable area..." @@ -3930,35 +4026,35 @@ msgstr "" #: editor/plugins/navigation_mesh_generator.cpp #, fuzzy msgid "Partitioning..." -msgstr "è¦å‘Š" +msgstr "分区ä¸..." #: editor/plugins/navigation_mesh_generator.cpp #, fuzzy msgid "Creating contours..." -msgstr "创建 Octree (å…«å‰æ ‘) 纹ç†" +msgstr "æ£åœ¨åˆ›å»ºè½®å»“..." #: editor/plugins/navigation_mesh_generator.cpp -#, fuzzy msgid "Creating polymesh..." -msgstr "åˆ›å»ºè½®å»“ç½‘æ ¼(Outline Mesh).." +msgstr "åˆ›å»ºå¤šè¾¹å½¢ç½‘æ ¼..." #: editor/plugins/navigation_mesh_generator.cpp #, fuzzy msgid "Converting to native navigation mesh..." -msgstr "创建导航Mesh(ç½‘æ ¼)" +msgstr "转æ¢ä¸ºå¯¼èˆªç½‘æ ¼(mesh)..." #: editor/plugins/navigation_mesh_generator.cpp +#, fuzzy msgid "Navigation Mesh Generator Setup:" -msgstr "" +msgstr "å¯¼èˆªç½‘æ ¼ç”Ÿæˆè®¾ç½®:" #: editor/plugins/navigation_mesh_generator.cpp #, fuzzy msgid "Parsing Geometry..." -msgstr "解æžå¤šè¾¹å½¢ä¸" +msgstr "解æžå¤šè¾¹å½¢ä¸..." #: editor/plugins/navigation_mesh_generator.cpp msgid "Done!" -msgstr "" +msgstr "å®Œæˆ !" #: editor/plugins/navigation_polygon_editor_plugin.cpp msgid "Create Navigation Polygon" @@ -4117,16 +4213,46 @@ msgid "Move Out-Control in Curve" msgstr "移动曲线外控制点" #: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Select Points" +msgstr "选择顶点" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Shift+Drag: Select Control Points" +msgstr "Shift+拖拽:选择控制点" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Click: Add Point" +msgstr "é¼ æ ‡å·¦é”®:æ·»åŠ ç‚¹" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Right Click: Delete Point" +msgstr "é¼ æ ‡å³é”®:åˆ é™¤ç‚¹" + +#: editor/plugins/path_2d_editor_plugin.cpp msgid "Select Control Points (Shift+Drag)" msgstr "选择控制点(Shift+拖动)" #: editor/plugins/path_2d_editor_plugin.cpp #: editor/plugins/path_editor_plugin.cpp +msgid "Add Point (in empty space)" +msgstr "æ·»åŠ ç‚¹ï¼ˆåœ¨ç©ºç™½å¤„ï¼‰" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp msgid "Split Segment (in curve)" msgstr "拆分（曲线）" #: editor/plugins/path_2d_editor_plugin.cpp #: editor/plugins/path_editor_plugin.cpp +msgid "Delete Point" +msgstr "åˆ é™¤é¡¶ç‚¹" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp msgid "Close Curve" msgstr "å…³é—曲线" @@ -4142,12 +4268,12 @@ msgstr "设置曲线顶点åæ ‡" #: editor/plugins/path_editor_plugin.cpp #, fuzzy msgid "Set Curve In Position" -msgstr "设置的曲线输入ä½ç½®ï¼ˆPos）" +msgstr "设置的曲线开始ä½ç½®ï¼ˆPos）" #: editor/plugins/path_editor_plugin.cpp #, fuzzy msgid "Set Curve Out Position" -msgstr "设置曲线输出ä½ç½®ï¼ˆPos）" +msgstr "设置曲线结æŸä½ç½®ï¼ˆPos）" #: editor/plugins/path_editor_plugin.cpp msgid "Split Path" @@ -4266,7 +4392,6 @@ msgstr "åŠ è½½èµ„æº" #: editor/plugins/resource_preloader_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp #: editor/plugins/sprite_frames_editor_plugin.cpp editor/property_editor.cpp #: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Paste" @@ -4313,6 +4438,21 @@ msgid " Class Reference" msgstr " 类引用" #: editor/plugins/script_editor_plugin.cpp +#, fuzzy +msgid "Sort" +msgstr "排åº:" + +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp +msgid "Move Up" +msgstr "å‘上移动" + +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp +msgid "Move Down" +msgstr "å‘下移动" + +#: editor/plugins/script_editor_plugin.cpp msgid "Next script" msgstr "下一个脚本" @@ -4364,6 +4504,10 @@ msgstr "å…³é—文档" msgid "Close All" msgstr "å…³é—全部" +#: editor/plugins/script_editor_plugin.cpp +msgid "Close Other Tabs" +msgstr "" + #: editor/plugins/script_editor_plugin.cpp editor/project_manager.cpp msgid "Run" msgstr "è¿è¡Œ" @@ -4374,13 +4518,11 @@ msgstr "切æ¢è„šæœ¬é¢æ¿" #: editor/plugins/script_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Find.." msgstr "查找.." #: editor/plugins/script_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Find Next" msgstr "查找下一项" @@ -4486,33 +4628,22 @@ msgstr "å°å†™" msgid "Capitalize" msgstr "首å—æ¯å¤§å†™" -#: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp scene/gui/line_edit.cpp +#: editor/plugins/script_text_editor.cpp scene/gui/line_edit.cpp #: scene/gui/text_edit.cpp msgid "Cut" msgstr "剪切" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp #: editor/plugins/sprite_frames_editor_plugin.cpp editor/property_editor.cpp #: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Copy" msgstr "å¤åˆ¶" -#: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp scene/gui/line_edit.cpp +#: editor/plugins/script_text_editor.cpp scene/gui/line_edit.cpp #: scene/gui/text_edit.cpp msgid "Select All" msgstr "全选" -#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp -msgid "Move Up" -msgstr "å‘上移动" - -#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp -msgid "Move Down" -msgstr "å‘下移动" - #: editor/plugins/script_text_editor.cpp msgid "Delete Line" msgstr "åˆ é™¤çº¿" @@ -4534,6 +4665,23 @@ msgid "Clone Down" msgstr "æ‹·è´åˆ°ä¸‹ä¸€è¡Œ" #: editor/plugins/script_text_editor.cpp +#, fuzzy +msgid "Fold Line" +msgstr "转到行" + +#: editor/plugins/script_text_editor.cpp +msgid "Unfold Line" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Fold All Lines" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Unfold All Lines" +msgstr "" + +#: editor/plugins/script_text_editor.cpp msgid "Complete Symbol" msgstr "代ç 补全" @@ -4579,12 +4727,10 @@ msgid "Convert To Lowercase" msgstr "转æ¢ä¸ºå°å†™" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Find Previous" msgstr "查找上一项" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Replace.." msgstr "替æ¢.." @@ -4593,7 +4739,6 @@ msgid "Goto Function.." msgstr "å‰å¾€å‡½æ•°.." #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Goto Line.." msgstr "å‰å¾€è¡Œ.." @@ -4758,6 +4903,16 @@ msgid "View Plane Transform." msgstr "视图平é¢å˜æ¢ã€‚" #: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Scaling: " +msgstr "缩放：" + +#: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Translating: " +msgstr "è¯è¨€:" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Rotating %s degrees." msgstr "旋转%s度。" @@ -4838,6 +4993,10 @@ msgid "Vertices" msgstr "顶点" #: editor/plugins/spatial_editor_plugin.cpp +msgid "FPS" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Align with view" msgstr "与视图对é½" @@ -4870,6 +5029,16 @@ msgid "View Information" msgstr "查看信æ¯" #: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "View FPS" +msgstr "查看文件" + +#: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Half Resolution" +msgstr "缩放选ä¸é¡¹" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Audio Listener" msgstr "音频监å¬å™¨" @@ -5000,6 +5169,11 @@ msgid "Tool Scale" msgstr "缩放工具" #: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Toggle Freelook" +msgstr "å…¨å±æ¨¡å¼" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Transform" msgstr "å˜æ¢" @@ -5169,14 +5343,12 @@ msgid "Insert Empty (After)" msgstr "æ’入空白帧（之åŽï¼‰" #: editor/plugins/sprite_frames_editor_plugin.cpp -#, fuzzy msgid "Move (Before)" -msgstr "移动节点" +msgstr "å¾€å‰ç§»åŠ¨" #: editor/plugins/sprite_frames_editor_plugin.cpp -#, fuzzy msgid "Move (After)" -msgstr "å‘左移动" +msgstr "å¾€åŽç§»åŠ¨" #: editor/plugins/style_box_editor_plugin.cpp msgid "StyleBox Preview:" @@ -5253,11 +5425,11 @@ msgstr "移除全部" #: editor/plugins/theme_editor_plugin.cpp msgid "Edit theme.." -msgstr "" +msgstr "编辑主题.." #: editor/plugins/theme_editor_plugin.cpp msgid "Theme editing menu." -msgstr "" +msgstr "主题编辑èœå•ã€‚" #: editor/plugins/theme_editor_plugin.cpp msgid "Add Class Items" @@ -5276,6 +5448,11 @@ msgid "Create Empty Editor Template" msgstr "创建编辑器主题模æ¿" #: editor/plugins/theme_editor_plugin.cpp +#, fuzzy +msgid "Create From Current Editor Theme" +msgstr "创建编辑器主题模æ¿" + +#: editor/plugins/theme_editor_plugin.cpp msgid "CheckBox Radio1" msgstr "å¤é€‰æ¡† 选项1" @@ -5393,7 +5570,6 @@ msgid "Mirror Y" msgstr "沿Y轴翻转" #: editor/plugins/tile_map_editor_plugin.cpp -#, fuzzy msgid "Paint Tile" msgstr "ç»˜åˆ¶ç –å—地图" @@ -5450,7 +5626,8 @@ msgid "Runnable" msgstr "å¯ç”¨" #: editor/project_export.cpp -msgid "Delete patch '" +#, fuzzy +msgid "Delete patch '%s' from list?" msgstr "åˆ é™¤Patch" #: editor/project_export.cpp @@ -5458,9 +5635,8 @@ msgid "Delete preset '%s'?" msgstr "åˆ é™¤é€‰ä¸çš„ '%s'?" #: editor/project_export.cpp -#, fuzzy msgid "Export templates for this platform are missing/corrupted: " -msgstr "没有下列平å°çš„导出模æ¿:" +msgstr "没有下列平å°çš„导出模æ¿: " #: editor/project_export.cpp msgid "Presets" @@ -5533,9 +5709,8 @@ msgid "Export templates for this platform are missing:" msgstr "没有下列平å°çš„导出模æ¿:" #: editor/project_export.cpp -#, fuzzy msgid "Export templates for this platform are missing/corrupted:" -msgstr "没有下列平å°çš„导出模æ¿:" +msgstr "没有æ¤å¹³å°çš„导出模æ¿:" #: editor/project_export.cpp msgid "Export With Debug" @@ -5544,22 +5719,21 @@ msgstr "导出为调试" #: editor/project_manager.cpp #, fuzzy msgid "The path does not exist." -msgstr "文件ä¸å˜åœ¨ã€‚" +msgstr "路径ä¸å˜åœ¨ã€‚" #: editor/project_manager.cpp -#, fuzzy msgid "Please choose a 'project.godot' file." -msgstr "请导出到项目目录之外ï¼" +msgstr "请选择一个'project.godot'文件。" #: editor/project_manager.cpp msgid "" "Your project will be created in a non empty folder (you might want to create " "a new folder)." -msgstr "" +msgstr "您的工程在éžç©ºæ–‡ä»¶å¤¹ä¸åˆ›å»º (您å¯èƒ½éœ€è¦å»ºç«‹ä¸€ä¸ªæ–°æ–‡ä»¶å¤¹)。" #: editor/project_manager.cpp msgid "Please choose a folder that does not contain a 'project.godot' file." -msgstr "" +msgstr "请选择一个ä¸åŒ…å«'project.godot'文件的文件夹。" #: editor/project_manager.cpp msgid "Imported Project" @@ -5571,21 +5745,19 @@ msgstr "" #: editor/project_manager.cpp msgid "It would be a good idea to name your project." -msgstr "" +msgstr "为项目命å是一个好主æ„。" #: editor/project_manager.cpp msgid "Invalid project path (changed anything?)." msgstr "项目路径éžæ³•ï¼ˆè¢«å¤–部修改？）。" #: editor/project_manager.cpp -#, fuzzy msgid "Couldn't get project.godot in project path." -msgstr "æ— æ³•åœ¨é¡¹ç›®ç›®å½•ä¸‹åˆ›å»ºproject.godot文件。" +msgstr "æ— æ³•åœ¨é¡¹ç›®ç›®å½•ä¸‹æ‰¾åˆ°project.godot文件。" #: editor/project_manager.cpp -#, fuzzy msgid "Couldn't edit project.godot in project path." -msgstr "æ— æ³•åœ¨é¡¹ç›®ç›®å½•ä¸‹åˆ›å»ºproject.godot文件。" +msgstr "æ— æ³•åœ¨é¡¹ç›®ç›®å½•ä¸‹ç¼–è¾‘project.godot文件。" #: editor/project_manager.cpp msgid "Couldn't create project.godot in project path." @@ -5596,14 +5768,12 @@ msgid "The following files failed extraction from package:" msgstr "æå–以下文件失败:" #: editor/project_manager.cpp -#, fuzzy msgid "Rename Project" -msgstr "未命å项目" +msgstr "é‡å‘½å项目" #: editor/project_manager.cpp -#, fuzzy msgid "Couldn't get project.godot in the project path." -msgstr "æ— æ³•åœ¨é¡¹ç›®ç›®å½•ä¸‹åˆ›å»ºproject.godot文件。" +msgstr "æ— æ³•åœ¨é¡¹ç›®ç›®å½•ä¸‹æ‰¾åˆ°project.godot文件。" #: editor/project_manager.cpp msgid "New Game Project" @@ -5626,7 +5796,6 @@ msgid "Project Name:" msgstr "项目å称:" #: editor/project_manager.cpp -#, fuzzy msgid "Create folder" msgstr "新建目录" @@ -5647,9 +5816,8 @@ msgid "Unnamed Project" msgstr "未命å项目" #: editor/project_manager.cpp -#, fuzzy msgid "Can't open project" -msgstr "æ— æ³•è¿è¡Œé¡¹ç›®" +msgstr "æ— æ³•æ‰“å¼€é¡¹ç›®" #: editor/project_manager.cpp msgid "Are you sure to open more than one project?" @@ -5685,6 +5853,8 @@ msgid "" "Language changed.\n" "The UI will update next time the editor or project manager starts." msgstr "" +"è¯è¨€å·²æ›´æ”¹ã€‚\n" +"用户界é¢å°†åœ¨ä¸‹æ¬¡ç¼–辑器或项目管ç†å™¨å¯åŠ¨æ—¶æ›´æ–°ã€‚" #: editor/project_manager.cpp msgid "" @@ -5717,9 +5887,8 @@ msgid "Exit" msgstr "退出" #: editor/project_manager.cpp -#, fuzzy msgid "Restart Now" -msgstr "é‡æ–°å¼€å§‹ï¼ˆç§’）:" +msgstr "ç«‹å³é‡æ–°å¯åŠ¨" #: editor/project_manager.cpp msgid "Can't run project" @@ -5758,10 +5927,6 @@ msgid "Add Input Action Event" msgstr "æ·»åŠ è¾“å…¥äº‹ä»¶" #: editor/project_settings_editor.cpp editor/settings_config_dialog.cpp -msgid "Meta+" -msgstr "Meta+" - -#: editor/project_settings_editor.cpp editor/settings_config_dialog.cpp msgid "Shift+" msgstr "Shift+" @@ -5879,31 +6044,29 @@ msgid "Add Global Property" msgstr "æ·»åŠ Getter属性" #: editor/project_settings_editor.cpp -#, fuzzy msgid "Select a setting item first!" -msgstr "首先选择一个设置项目 ï¼" +msgstr "请先选择一个设置项目 ï¼" #: editor/project_settings_editor.cpp -msgid "No property '" +#, fuzzy +msgid "No property '%s' exists." msgstr "没有属性 '" #: editor/project_settings_editor.cpp -msgid "Setting '" -msgstr "设置 '" +msgid "Setting '%s' is internal, and it can't be deleted." +msgstr "" #: editor/project_settings_editor.cpp msgid "Delete Item" msgstr "åˆ é™¤è¾“å…¥äº‹ä»¶" #: editor/project_settings_editor.cpp -#, fuzzy msgid "Can't contain '/' or ':'" -msgstr "æ— æ³•è¿žæŽ¥åˆ°æœåŠ¡å™¨:" +msgstr "ä¸èƒ½åŒ…å« \"/\" 或 \":\"" #: editor/project_settings_editor.cpp -#, fuzzy msgid "Already existing" -msgstr "动作%så·²å˜åœ¨ï¼" +msgstr "å·²ç»å˜åœ¨" #: editor/project_settings_editor.cpp msgid "Error saving settings." @@ -5948,11 +6111,11 @@ msgstr "移除资æºé‡å®šå‘选项" #: editor/project_settings_editor.cpp #, fuzzy msgid "Changed Locale Filter" -msgstr "更改混åˆæ—¶é—´" +msgstr "更改区域设置ç›é€‰æ¨¡å¼" #: editor/project_settings_editor.cpp msgid "Changed Locale Filter Mode" -msgstr "" +msgstr "更改了区域设置ç›é€‰æ¨¡å¼" #: editor/project_settings_editor.cpp msgid "Project Settings (project.godot)" @@ -6017,26 +6180,24 @@ msgstr "地区" #: editor/project_settings_editor.cpp #, fuzzy msgid "Locales Filter" -msgstr "纹ç†è¿‡æ»¤:" +msgstr "区域ç›é€‰å™¨" #: editor/project_settings_editor.cpp #, fuzzy msgid "Show all locales" -msgstr "显示骨骼" +msgstr "显示所有区域设置" #: editor/project_settings_editor.cpp msgid "Show only selected locales" -msgstr "" +msgstr "仅显示选定的区域设置" #: editor/project_settings_editor.cpp -#, fuzzy msgid "Filter mode:" -msgstr "ç›é€‰èŠ‚点" +msgstr "ç›é€‰æ¨¡å¼ï¼š" #: editor/project_settings_editor.cpp -#, fuzzy msgid "Locales:" -msgstr "地区" +msgstr "区域:" #: editor/project_settings_editor.cpp msgid "AutoLoad" @@ -6087,18 +6248,16 @@ msgid "New Script" msgstr "新建脚本" #: editor/property_editor.cpp -#, fuzzy msgid "Make Unique" -msgstr "æ·»åŠ éª¨éª¼" +msgstr "转æ¢ä¸ºç‹¬ç«‹èµ„æº" #: editor/property_editor.cpp msgid "Show in File System" msgstr "在资æºç®¡ç†å™¨ä¸å±•ç¤º" #: editor/property_editor.cpp -#, fuzzy msgid "Convert To %s" -msgstr "转æ¢ä¸º.." +msgstr "转æ¢ä¸º%s" #: editor/property_editor.cpp msgid "Error loading file: Not a resource!" @@ -6139,7 +6298,7 @@ msgstr "选择属性" #: editor/property_selector.cpp #, fuzzy msgid "Select Virtual Method" -msgstr "选择方å¼" +msgstr "选择虚拟方法" #: editor/property_selector.cpp msgid "Select Method" @@ -6262,7 +6421,7 @@ msgstr "废弃实例化" #: editor/scene_tree_dock.cpp msgid "Makes Sense!" -msgstr "有é“ç†ï¼" +msgstr "好的ï¼" #: editor/scene_tree_dock.cpp msgid "Can't operate on nodes from a foreign scene!" @@ -6365,6 +6524,16 @@ msgid "Clear a script for the selected node." msgstr "清除选ä¸èŠ‚点的脚本。" #: editor/scene_tree_dock.cpp +#, fuzzy +msgid "Remote" +msgstr "移除" + +#: editor/scene_tree_dock.cpp +#, fuzzy +msgid "Local" +msgstr "地区" + +#: editor/scene_tree_dock.cpp msgid "Clear Inheritance? (No Undo!)" msgstr "确定è¦æ¸…除继承å—ï¼Ÿï¼ˆæ— æ³•æ’¤é”€ï¼ï¼‰" @@ -6486,12 +6655,12 @@ msgstr "父路径éžæ³•" #: editor/script_create_dialog.cpp msgid "Directory of the same name exists" -msgstr "" +msgstr "å˜åœ¨åŒå目录" #: editor/script_create_dialog.cpp #, fuzzy msgid "File exists, will be reused" -msgstr "文件已å˜åœ¨ï¼Œç¡®å®šè¦è¦†ç›–它å—？" +msgstr "文件å˜åœ¨, 将被é‡ç”¨" #: editor/script_create_dialog.cpp msgid "Invalid extension" @@ -6558,6 +6727,11 @@ msgid "Attach Node Script" msgstr "设置节点的脚本" #: editor/script_editor_debugger.cpp +#, fuzzy +msgid "Remote " +msgstr "移除" + +#: editor/script_editor_debugger.cpp msgid "Bytes:" msgstr "å—节:" @@ -6579,7 +6753,7 @@ msgstr "函数:" #: editor/script_editor_debugger.cpp msgid "Pick one or more items from the list to display the graph." -msgstr "" +msgstr "从列表ä¸é€‰å–一个或多个项目以显示图形。" #: editor/script_editor_debugger.cpp msgid "Errors" @@ -6614,18 +6788,6 @@ msgid "Stack Trace (if applicable):" msgstr "è°ƒç”¨å †æ ˆ:" #: editor/script_editor_debugger.cpp -msgid "Remote Inspector" -msgstr "远程属性é¢æ¿" - -#: editor/script_editor_debugger.cpp -msgid "Live Scene Tree:" -msgstr "å³æ—¶åœºæ™¯æ ‘:" - -#: editor/script_editor_debugger.cpp -msgid "Remote Object Properties: " -msgstr "远程对象属性: " - -#: editor/script_editor_debugger.cpp msgid "Profiler" msgstr "性能分æž" @@ -6744,64 +6906,63 @@ msgstr "更改探针(Probe)范围" #: modules/gdnative/gd_native_library_editor.cpp #, fuzzy msgid "Library" -msgstr "MeshLibrary(ç½‘æ ¼åº“).." +msgstr "库" #: modules/gdnative/gd_native_library_editor.cpp -#, fuzzy msgid "Status" -msgstr "状æ€ï¼š" +msgstr "状æ€" #: modules/gdnative/gd_native_library_editor.cpp msgid "Libraries: " -msgstr "" +msgstr "库: " #: modules/gdnative/register_types.cpp msgid "GDNative" -msgstr "" +msgstr "GDNative" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp #: modules/visual_script/visual_script_builtin_funcs.cpp msgid "Invalid type argument to convert(), use TYPE_* constants." msgstr "convert函数å‚数类型éžæ³•ï¼Œè¯·ä¼ 入以“TYPE_â€æ‰“头的常é‡ã€‚" -#: modules/gdscript/gd_functions.cpp modules/mono/glue/glue_header.h +#: modules/gdscript/gdscript_functions.cpp modules/mono/glue/glue_header.h #: modules/visual_script/visual_script_builtin_funcs.cpp msgid "Not enough bytes for decoding bytes, or invalid format." msgstr "没有足够的å—节æ¥è§£ç æˆ–æ ¼å¼ä¸æ£ç¡®ã€‚" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "step argument is zero!" msgstr "stepå‚数为0ï¼" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Not a script with an instance" msgstr "脚本没有实例化" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Not based on a script" msgstr "没有基于脚本" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Not based on a resource file" msgstr "没有基于一个资æºæ–‡ä»¶" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary format (missing @path)" msgstr "实例å—å…¸æ ¼å¼ä¸æ£ç¡®ï¼ˆç¼ºå°‘@path）" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary format (can't load script at @path)" msgstr "实例å—å…¸æ ¼å¼ä¸æ£ç¡®ï¼ˆæ— æ³•åŠ è½½è„šæœ¬@path）" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary format (invalid script at @path)" msgstr "实例å—å…¸æ ¼å¼ä¸æ£ç¡®ï¼ˆæ— 效脚本@path）" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary (invalid subclasses)" msgstr "éžæ³•çš„å—典实例（派生类éžæ³•ï¼‰" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Object can't provide a length." msgstr "对象ä¸èƒ½æ供长度。" @@ -6814,18 +6975,26 @@ msgid "GridMap Duplicate Selection" msgstr "å¤åˆ¶é€‰ä¸é¡¹" #: modules/gridmap/grid_map_editor_plugin.cpp +msgid "Floor:" +msgstr "" + +#: modules/gridmap/grid_map_editor_plugin.cpp +#, fuzzy +msgid "Grid Map" +msgstr "ç½‘æ ¼å¸é™„" + +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Snap View" msgstr "æ•æ‰è§†å›¾" #: modules/gridmap/grid_map_editor_plugin.cpp #, fuzzy -msgid "Prev Level (%sDown Wheel)" -msgstr "上一级" +msgid "Previous Floor" +msgstr "上一个目录" #: modules/gridmap/grid_map_editor_plugin.cpp -#, fuzzy -msgid "Next Level (%sUp Wheel)" -msgstr "下一级" +msgid "Next Floor" +msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp msgid "Clip Disabled" @@ -6892,12 +7061,9 @@ msgid "Erase Area" msgstr "擦除区域" #: modules/gridmap/grid_map_editor_plugin.cpp -msgid "Selection -> Duplicate" -msgstr "选择->å¤åˆ¶" - -#: modules/gridmap/grid_map_editor_plugin.cpp -msgid "Selection -> Clear" -msgstr "选择->清空" +#, fuzzy +msgid "Clear Selection" +msgstr "å±…ä¸æ˜¾ç¤ºé€‰ä¸èŠ‚点" #: modules/gridmap/grid_map_editor_plugin.cpp msgid "GridMap Settings" @@ -6909,7 +7075,7 @@ msgstr "拾å–è·ç¦»:" #: modules/mono/editor/mono_bottom_panel.cpp msgid "Builds" -msgstr "" +msgstr "构建" #: modules/visual_script/visual_script.cpp msgid "" @@ -7019,7 +7185,8 @@ msgid "Duplicate VisualScript Nodes" msgstr "å¤åˆ¶ VisualScript 节点" #: modules/visual_script/visual_script_editor.cpp -msgid "Hold Meta to drop a Getter. Hold Shift to drop a generic signature." +#, fuzzy +msgid "Hold %s to drop a Getter. Hold Shift to drop a generic signature." msgstr "按ä½Meta键放置一个Getter节点，按ä½Shift键放置一个通用ç¾å。" #: modules/visual_script/visual_script_editor.cpp @@ -7027,7 +7194,8 @@ msgid "Hold Ctrl to drop a Getter. Hold Shift to drop a generic signature." msgstr "按ä½Ctrl键放置一个Getter节点。按ä½Shift键放置一个通用ç¾å。" #: modules/visual_script/visual_script_editor.cpp -msgid "Hold Meta to drop a simple reference to the node." +#, fuzzy +msgid "Hold %s to drop a simple reference to the node." msgstr "按ä½Meta键放置一个场景节点的引用节点。" #: modules/visual_script/visual_script_editor.cpp @@ -7035,7 +7203,8 @@ msgid "Hold Ctrl to drop a simple reference to the node." msgstr "按ä½Ctrl键放置一个场景节点的引用节点。" #: modules/visual_script/visual_script_editor.cpp -msgid "Hold Meta to drop a Variable Setter." +#, fuzzy +msgid "Hold %s to drop a Variable Setter." msgstr "按ä½Meta键放置å˜é‡çš„Setter节点。" #: modules/visual_script/visual_script_editor.cpp @@ -7108,7 +7277,7 @@ msgstr "获å–" #: modules/visual_script/visual_script_editor.cpp msgid "Script already has function '%s'" -msgstr "" +msgstr "脚本已å˜åœ¨å‡½æ•° '%s'" #: modules/visual_script/visual_script_editor.cpp msgid "Change Input Value" @@ -7261,12 +7430,23 @@ msgid "Could not write file:\n" msgstr "æ— æ³•å†™å…¥æ–‡ä»¶:\n" #: platform/javascript/export/export.cpp -msgid "Could not read file:\n" +msgid "Could not open template for export:\n" +msgstr "æ— æ³•æ‰“å¼€å¯¼å‡ºæ¨¡æ¿ï¼š\n" + +#: platform/javascript/export/export.cpp +#, fuzzy +msgid "Invalid export template:\n" +msgstr "安装导出模æ¿" + +#: platform/javascript/export/export.cpp +#, fuzzy +msgid "Could not read custom HTML shell:\n" msgstr "æ— æ³•è¯»å–文件:\n" #: platform/javascript/export/export.cpp -msgid "Could not open template for export:\n" -msgstr "æ— æ³•æ‰“å¼€å¯¼å‡ºæ¨¡æ¿ï¼š\n" +#, fuzzy +msgid "Could not read boot splash image file:\n" +msgstr "æ— æ³•è¯»å–文件:\n" #: scene/2d/animated_sprite.cpp msgid "" @@ -7372,21 +7552,6 @@ msgstr "" msgid "Path property must point to a valid Node2D node to work." msgstr "path属性必须指å‘一个åˆæ³•çš„Node2D节点æ‰èƒ½æ£å¸¸å·¥ä½œã€‚" -#: scene/2d/sprite.cpp -msgid "" -"Path property must point to a valid Viewport node to work. Such Viewport " -"must be set to 'render target' mode." -msgstr "" -"Path属性必须指å‘一个åˆæ³•çš„Viewport节点æ‰èƒ½å·¥ä½œï¼ŒåŒæ—¶æ¤Viewport还需è¦å¯" -"用'render target'。" - -#: scene/2d/sprite.cpp -msgid "" -"The Viewport set in the path property must be set as 'render target' in " -"order for this sprite to work." -msgstr "" -"为了让æ¤ç²¾çµæ£å¸¸å·¥ä½œï¼Œå®ƒçš„path属性所指å‘çš„Viewport需è¦å¼€å¯'render target'。" - #: scene/2d/visibility_notifier_2d.cpp msgid "" "VisibilityEnable2D works best when used with the edited scene root directly " @@ -7451,6 +7616,15 @@ msgstr "" "CollisionShape节点必须拥有一个形状æ‰èƒ½è¿›è¡Œç¢°æ’žæ£€æµ‹å·¥ä½œï¼Œè¯·ä¸ºå®ƒåˆ›å»ºä¸€ä¸ªå½¢çŠ¶èµ„" "æºï¼" +#: scene/3d/gi_probe.cpp +#, fuzzy +msgid "Plotting Meshes" +msgstr "Blitting 图片" + +#: scene/3d/gi_probe.cpp +msgid "Finishing Plot" +msgstr "" + #: scene/3d/navigation_mesh.cpp msgid "A NavigationMesh resource must be set or created for this node to work." msgstr "æ¤èŠ‚点需è¦è®¾ç½®NavigationMesh资æºæ‰èƒ½å·¥ä½œã€‚" @@ -7499,6 +7673,7 @@ msgid "" "VehicleWheel serves to provide a wheel system to a VehicleBody. Please use " "it as a child of a VehicleBody." msgstr "" +"VehicleWheel 为 VehicleBody æ供一个车轮系统。请将它作为VehicleBodyçš„å节点。" #: scene/gui/color_picker.cpp msgid "Raw Mode" @@ -7539,6 +7714,10 @@ msgstr "" "使用Container（VBox，HBoxç‰ï¼‰ä½œä¸ºå…¶å控件并手动或设置Control的自定义最å°å°º" "寸。" +#: scene/gui/tree.cpp +msgid "(Other)" +msgstr "" + #: scene/main/scene_tree.cpp msgid "" "Default Environment as specified in Project Setings (Rendering -> Viewport -" @@ -7572,6 +7751,71 @@ msgstr "åŠ è½½å—体出错。" msgid "Invalid font size." msgstr "å—体大å°éžæ³•ã€‚" +#~ msgid "Cannot navigate to '" +#~ msgstr "æ— æ³•å¯¼èˆªåˆ° '" + +#~ msgid "" +#~ "\n" +#~ "Source: " +#~ msgstr "" +#~ "\n" +#~ "æº: " + +#~ msgid "Remove Point from Line2D" +#~ msgstr "从Line2Dä¸ç§»é™¤é¡¶ç‚¹" + +#~ msgid "Add Point to Line2D" +#~ msgstr "å‘Line2Dæ·»åŠ é¡¶ç‚¹" + +#~ msgid "Move Point in Line2D" +#~ msgstr "在Line2Dä¸ç§»åŠ¨é¡¶ç‚¹" + +#~ msgid "Split Segment (in line)" +#~ msgstr "拆分片段（使用线段）" + +#~ msgid "Meta+" +#~ msgstr "Meta+" + +#~ msgid "Setting '" +#~ msgstr "设置 '" + +#~ msgid "Remote Inspector" +#~ msgstr "远程属性é¢æ¿" + +#~ msgid "Live Scene Tree:" +#~ msgstr "å³æ—¶åœºæ™¯æ ‘:" + +#~ msgid "Remote Object Properties: " +#~ msgstr "远程对象属性: " + +#, fuzzy +#~ msgid "Prev Level (%sDown Wheel)" +#~ msgstr "上一级" + +#, fuzzy +#~ msgid "Next Level (%sUp Wheel)" +#~ msgstr "下一级" + +#~ msgid "Selection -> Duplicate" +#~ msgstr "选择->å¤åˆ¶" + +#~ msgid "Selection -> Clear" +#~ msgstr "选择->清空" + +#~ msgid "" +#~ "Path property must point to a valid Viewport node to work. Such Viewport " +#~ "must be set to 'render target' mode." +#~ msgstr "" +#~ "Path属性必须指å‘一个åˆæ³•çš„Viewport节点æ‰èƒ½å·¥ä½œï¼ŒåŒæ—¶æ¤Viewport还需è¦å¯" +#~ "用'render target'。" + +#~ msgid "" +#~ "The Viewport set in the path property must be set as 'render target' in " +#~ "order for this sprite to work." +#~ msgstr "" +#~ "为了让æ¤ç²¾çµæ£å¸¸å·¥ä½œï¼Œå®ƒçš„path属性所指å‘çš„Viewport需è¦å¼€å¯'render " +#~ "target'。" + #~ msgid "Filter:" #~ msgstr "ç›é€‰:" @@ -7596,9 +7840,6 @@ msgstr "å—体大å°éžæ³•ã€‚" #~ msgid "Removed:" #~ msgstr "已移除:" -#~ msgid "Error saving atlas:" -#~ msgstr "ä¿å˜è´´å›¾é›†å‡ºé”™:" - #~ msgid "Could not save atlas subtexture:" #~ msgstr "æ— æ³•ä¿å˜ç²¾çµé›†å贴图:" @@ -7983,9 +8224,6 @@ msgstr "å—体大å°éžæ³•ã€‚" #~ msgid "Cropping Images" #~ msgstr "剪è£å›¾ç‰‡" -#~ msgid "Blitting Images" -#~ msgstr "Blitting 图片" - #~ msgid "Couldn't save atlas image:" #~ msgstr "æ— æ³•ä¿å˜ç²¾çµé›†å›¾ç‰‡:" @@ -8358,9 +8596,6 @@ msgstr "å—体大å°éžæ³•ã€‚" #~ msgid "Save Translatable Strings" #~ msgstr "ä¿å˜å¯ç¿»è¯‘å—符串" -#~ msgid "Install Export Templates" -#~ msgstr "安装导出模æ¿" - #~ msgid "Edit Script Options" #~ msgstr "脚本编辑器选项" diff --git a/editor/translations/zh_HK.po b/editor/translations/zh_HK.po index 3828ea059c..f7275ad4ad 100644 --- a/editor/translations/zh_HK.po +++ b/editor/translations/zh_HK.po @@ -101,6 +101,7 @@ msgid "Anim Delete Keys" msgstr "移除動畫幀" #: editor/animation_editor.cpp editor/plugins/tile_map_editor_plugin.cpp +#: modules/gridmap/grid_map_editor_plugin.cpp #, fuzzy msgid "Duplicate Selection" msgstr "複製 Selection" @@ -634,6 +635,13 @@ msgstr "" msgid "Search Replacement Resource:" msgstr "" +#: editor/dependency_editor.cpp editor/editor_file_dialog.cpp +#: editor/editor_help.cpp editor/editor_node.cpp editor/filesystem_dock.cpp +#: editor/plugins/script_editor_plugin.cpp editor/property_selector.cpp +#: editor/quick_open.cpp scene/gui/file_dialog.cpp +msgid "Open" +msgstr "é–‹å•Ÿ" + #: editor/dependency_editor.cpp msgid "Owners Of:" msgstr "" @@ -704,6 +712,15 @@ msgstr "è¦åˆªé™¤é¸ä¸æª”案?" msgid "Delete" msgstr "刪除" +#: editor/dictionary_property_edit.cpp +msgid "Change Dictionary Key" +msgstr "" + +#: editor/dictionary_property_edit.cpp +#, fuzzy +msgid "Change Dictionary Value" +msgstr "動畫變化數值" + #: editor/editor_about.cpp msgid "Thanks from the Godot community!" msgstr "" @@ -1148,12 +1165,6 @@ msgstr "所有類型" msgid "All Files (*)" msgstr "所有檔案(*)" -#: editor/editor_file_dialog.cpp editor/editor_help.cpp editor/editor_node.cpp -#: editor/filesystem_dock.cpp editor/plugins/script_editor_plugin.cpp -#: editor/property_selector.cpp editor/quick_open.cpp scene/gui/file_dialog.cpp -msgid "Open" -msgstr "é–‹å•Ÿ" - #: editor/editor_file_dialog.cpp scene/gui/file_dialog.cpp msgid "Open a File" msgstr "開啟檔案" @@ -1524,6 +1535,13 @@ msgid "" msgstr "" #: editor/editor_node.cpp +msgid "" +"This is a remote object so changes to it will not be kept.\n" +"Please read the documentation relevant to debugging to better understand " +"this workflow." +msgstr "" + +#: editor/editor_node.cpp #, fuzzy msgid "Copy Params" msgstr "複製åƒæ•¸" @@ -1637,6 +1655,10 @@ msgid "Export Mesh Library" msgstr "匯出Mesh Library" #: editor/editor_node.cpp +msgid "This operation can't be done without a root node." +msgstr "" + +#: editor/editor_node.cpp msgid "Export Tile Set" msgstr "匯出Tile Set" @@ -1765,11 +1787,20 @@ msgid "Switch Scene Tab" msgstr "" #: editor/editor_node.cpp -msgid "%d more file(s)" +msgid "%d more files or folders" +msgstr "" + +#: editor/editor_node.cpp +#, fuzzy +msgid "%d more folders" +msgstr "無法新增資料夾" + +#: editor/editor_node.cpp +msgid "%d more files" msgstr "" #: editor/editor_node.cpp -msgid "%d more file(s) or folder(s)" +msgid "Dock Position" msgstr "" #: editor/editor_node.cpp @@ -1781,6 +1812,11 @@ msgid "Toggle distraction-free mode." msgstr "" #: editor/editor_node.cpp +#, fuzzy +msgid "Add a new scene." +msgstr "新增軌迹" + +#: editor/editor_node.cpp msgid "Scene" msgstr "å ´æ™¯" @@ -1846,13 +1882,12 @@ msgid "TileSet.." msgstr "TileSet.." #: editor/editor_node.cpp editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp scene/gui/line_edit.cpp -#: scene/gui/text_edit.cpp +#: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Undo" msgstr "復原" #: editor/editor_node.cpp editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp +#: scene/gui/line_edit.cpp msgid "Redo" msgstr "é‡è£½" @@ -2340,6 +2375,10 @@ msgid "(Current)" msgstr "" #: editor/export_template_manager.cpp +msgid "Retrieving mirrors, please wait.." +msgstr "" + +#: editor/export_template_manager.cpp msgid "Remove template version '%s'?" msgstr "" @@ -2374,6 +2413,110 @@ msgid "Importing:" msgstr "å°Žå…¥ä¸:" #: editor/export_template_manager.cpp +msgid "" +"No download links found for this version. Direct download is only available " +"for official releases." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Can't resolve." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Can't connect." +msgstr "ä¸èƒ½é€£æŽ¥ã€‚" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "No response." +msgstr "沒有回應。" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Req. Failed." +msgstr "請求失敗。" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Redirect Loop." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Failed:" +msgstr "失敗：" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Can't write file." +msgstr "無法新增資料夾" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Download Complete." +msgstr "下載出ç¾éŒ¯èª¤" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Error requesting url: " +msgstr "請求時出ç¾éŒ¯èª¤" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Connecting to Mirror.." +msgstr "連到..." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Disconnected" +msgstr "ä¸æ–·" + +#: editor/export_template_manager.cpp +msgid "Resolving" +msgstr "" + +#: editor/export_template_manager.cpp +msgid "Can't Resolve" +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Connecting.." +msgstr "連到..." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Can't Conect" +msgstr "ä¸èƒ½é€£æŽ¥ã€‚" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Connected" +msgstr "連到" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Requesting.." +msgstr "請求ä¸..." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Downloading" +msgstr "下載出ç¾éŒ¯èª¤" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Connection Error" +msgstr "連到..." + +#: editor/export_template_manager.cpp +msgid "SSL Handshake Error" +msgstr "" + +#: editor/export_template_manager.cpp msgid "Current Version:" msgstr "" @@ -2400,12 +2543,21 @@ msgstr "è¦åˆªé™¤é¸ä¸æª”案?" msgid "Export Template Manager" msgstr "" +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Download Templates" +msgstr "移除é¸é …" + +#: editor/export_template_manager.cpp +msgid "Select mirror from list: " +msgstr "" + #: editor/file_type_cache.cpp msgid "Can't open file_type_cache.cch for writing, not saving file type cache!" msgstr "" #: editor/filesystem_dock.cpp -msgid "Cannot navigate to '" +msgid "Cannot navigate to '%s' as it has not been found in the file system!" msgstr "" #: editor/filesystem_dock.cpp @@ -2423,13 +2575,6 @@ msgid "" msgstr "" #: editor/filesystem_dock.cpp -#, fuzzy -msgid "" -"\n" -"Source: " -msgstr "來æº:" - -#: editor/filesystem_dock.cpp msgid "Cannot move/rename resources root." msgstr "" @@ -2695,8 +2840,7 @@ msgid "Remove Poly And Point" msgstr "" #: editor/plugins/abstract_polygon_2d_editor.cpp -#: editor/plugins/light_occluder_2d_editor_plugin.cpp -msgid "Create a new polygon from scratch." +msgid "Create a new polygon from scratch" msgstr "" #: editor/plugins/abstract_polygon_2d_editor.cpp @@ -2707,6 +2851,11 @@ msgid "" "RMB: Erase Point." msgstr "" +#: editor/plugins/abstract_polygon_2d_editor.cpp +#, fuzzy +msgid "Delete points" +msgstr "刪除" + #: editor/plugins/animation_player_editor_plugin.cpp msgid "Toggle Autoplay" msgstr "" @@ -3043,18 +3192,10 @@ msgid "Can't resolve hostname:" msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Can't resolve." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Connection error, please try again." msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Can't connect." -msgstr "ä¸èƒ½é€£æŽ¥ã€‚" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Can't connect to host:" msgstr "ä¸èƒ½é€£åˆ°ä¸»æ©Ÿï¼š" @@ -3063,31 +3204,15 @@ msgid "No response from host:" msgstr "主機沒有回應：" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "No response." -msgstr "沒有回應。" - -#: editor/plugins/asset_library_editor_plugin.cpp #, fuzzy msgid "Request failed, return code:" msgstr "請求失敗，" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Req. Failed." -msgstr "請求失敗。" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Request failed, too many redirects" msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Redirect Loop." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp -msgid "Failed:" -msgstr "失敗：" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Bad download hash, assuming file has been tampered with." msgstr "" @@ -3117,15 +3242,6 @@ msgid "Resolving.." msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp -#, fuzzy -msgid "Connecting.." -msgstr "連到..." - -#: editor/plugins/asset_library_editor_plugin.cpp -msgid "Requesting.." -msgstr "請求ä¸..." - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Error making request" msgstr "請求時出ç¾éŒ¯èª¤" @@ -3238,6 +3354,37 @@ msgid "Move Action" msgstr "" #: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Move vertical guide" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Create new vertical guide" +msgstr "新增" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Remove vertical guide" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Move horizontal guide" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Create new horizontal guide" +msgstr "新增" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Remove horizontal guide" +msgstr "åªé™é¸ä¸" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Create new horizontal and vertical guides" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp msgid "Edit IK Chain" msgstr "" @@ -3358,10 +3505,16 @@ msgid "Snap to other nodes" msgstr "" #: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Snap to guides" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Lock the selected object in place (can't be moved)." msgstr "" #: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Unlock the selected object (can be moved)." msgstr "" @@ -3412,6 +3565,10 @@ msgid "Show rulers" msgstr "" #: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Show guides" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp msgid "Center Selection" msgstr "" @@ -3603,6 +3760,10 @@ msgstr "" msgid "Hold Shift to edit tangents individually" msgstr "" +#: editor/plugins/gi_probe_editor_plugin.cpp +msgid "Bake GI Probe" +msgstr "" + #: editor/plugins/gradient_editor_plugin.cpp msgid "Add/Remove Color Ramp Point" msgstr "" @@ -3635,6 +3796,10 @@ msgid "Create Occluder Polygon" msgstr "" #: editor/plugins/light_occluder_2d_editor_plugin.cpp +msgid "Create a new polygon from scratch." +msgstr "" + +#: editor/plugins/light_occluder_2d_editor_plugin.cpp msgid "Edit existing polygon:" msgstr "" @@ -3650,58 +3815,6 @@ msgstr "" msgid "RMB: Erase Point." msgstr "" -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Remove Point from Line2D" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Add Point to Line2D" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Move Point in Line2D" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Select Points" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Shift+Drag: Select Control Points" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Click: Add Point" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Right Click: Delete Point" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Add Point (in empty space)" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Split Segment (in line)" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Delete Point" -msgstr "" - #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Mesh is empty!" msgstr "" @@ -4100,16 +4213,46 @@ msgid "Move Out-Control in Curve" msgstr "" #: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Select Points" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Shift+Drag: Select Control Points" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Click: Add Point" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Right Click: Delete Point" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp msgid "Select Control Points (Shift+Drag)" msgstr "" #: editor/plugins/path_2d_editor_plugin.cpp #: editor/plugins/path_editor_plugin.cpp +msgid "Add Point (in empty space)" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp msgid "Split Segment (in curve)" msgstr "" #: editor/plugins/path_2d_editor_plugin.cpp #: editor/plugins/path_editor_plugin.cpp +msgid "Delete Point" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp msgid "Close Curve" msgstr "" @@ -4250,7 +4393,6 @@ msgstr "" #: editor/plugins/resource_preloader_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp #: editor/plugins/sprite_frames_editor_plugin.cpp editor/property_editor.cpp #: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Paste" @@ -4295,6 +4437,21 @@ msgid " Class Reference" msgstr "" #: editor/plugins/script_editor_plugin.cpp +#, fuzzy +msgid "Sort" +msgstr "排åºï¼š" + +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp +msgid "Move Up" +msgstr "上移" + +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp +msgid "Move Down" +msgstr "下移" + +#: editor/plugins/script_editor_plugin.cpp msgid "Next script" msgstr "下一個腳本" @@ -4348,6 +4505,10 @@ msgstr "é—œé–‰å ´æ™¯" msgid "Close All" msgstr "關閉" +#: editor/plugins/script_editor_plugin.cpp +msgid "Close Other Tabs" +msgstr "" + #: editor/plugins/script_editor_plugin.cpp editor/project_manager.cpp msgid "Run" msgstr "é‹è¡Œ" @@ -4358,13 +4519,11 @@ msgstr "" #: editor/plugins/script_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Find.." msgstr "" #: editor/plugins/script_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Find Next" msgstr "" @@ -4471,33 +4630,22 @@ msgstr "" msgid "Capitalize" msgstr "" -#: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp scene/gui/line_edit.cpp +#: editor/plugins/script_text_editor.cpp scene/gui/line_edit.cpp #: scene/gui/text_edit.cpp msgid "Cut" msgstr "剪下" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp #: editor/plugins/sprite_frames_editor_plugin.cpp editor/property_editor.cpp #: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Copy" msgstr "複製" -#: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp scene/gui/line_edit.cpp +#: editor/plugins/script_text_editor.cpp scene/gui/line_edit.cpp #: scene/gui/text_edit.cpp msgid "Select All" msgstr "å…¨é¸" -#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp -msgid "Move Up" -msgstr "上移" - -#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp -msgid "Move Down" -msgstr "下移" - #: editor/plugins/script_text_editor.cpp #, fuzzy msgid "Delete Line" @@ -4520,6 +4668,23 @@ msgid "Clone Down" msgstr "" #: editor/plugins/script_text_editor.cpp +#, fuzzy +msgid "Fold Line" +msgstr "跳到行" + +#: editor/plugins/script_text_editor.cpp +msgid "Unfold Line" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Fold All Lines" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Unfold All Lines" +msgstr "" + +#: editor/plugins/script_text_editor.cpp msgid "Complete Symbol" msgstr "" @@ -4567,12 +4732,10 @@ msgid "Convert To Lowercase" msgstr "轉為..." #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Find Previous" msgstr "" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Replace.." msgstr "" @@ -4581,7 +4744,6 @@ msgid "Goto Function.." msgstr "" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Goto Line.." msgstr "" @@ -4746,6 +4908,15 @@ msgid "View Plane Transform." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "Scaling: " +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Translating: " +msgstr "ç¿»è¯:" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Rotating %s degrees." msgstr "" @@ -4829,6 +5000,10 @@ msgid "Vertices" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "FPS" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Align with view" msgstr "" @@ -4861,6 +5036,16 @@ msgid "View Information" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "View FPS" +msgstr "檔案" + +#: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Half Resolution" +msgstr "縮放selection" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Audio Listener" msgstr "" @@ -4994,6 +5179,11 @@ msgid "Tool Scale" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "Toggle Freelook" +msgstr "全螢幕" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Transform" msgstr "" @@ -5271,6 +5461,10 @@ msgid "Create Empty Editor Template" msgstr "" #: editor/plugins/theme_editor_plugin.cpp +msgid "Create From Current Editor Theme" +msgstr "" + +#: editor/plugins/theme_editor_plugin.cpp msgid "CheckBox Radio1" msgstr "" @@ -5448,7 +5642,7 @@ msgstr "啟用" #: editor/project_export.cpp #, fuzzy -msgid "Delete patch '" +msgid "Delete patch '%s' from list?" msgstr "刪除" #: editor/project_export.cpp @@ -5751,10 +5945,6 @@ msgid "Add Input Action Event" msgstr "" #: editor/project_settings_editor.cpp editor/settings_config_dialog.cpp -msgid "Meta+" -msgstr "Meta+" - -#: editor/project_settings_editor.cpp editor/settings_config_dialog.cpp msgid "Shift+" msgstr "Shift+" @@ -5878,13 +6068,12 @@ msgid "Select a setting item first!" msgstr "" #: editor/project_settings_editor.cpp -msgid "No property '" +msgid "No property '%s' exists." msgstr "" #: editor/project_settings_editor.cpp -#, fuzzy -msgid "Setting '" -msgstr "è¨å®š" +msgid "Setting '%s' is internal, and it can't be deleted." +msgstr "" #: editor/project_settings_editor.cpp #, fuzzy @@ -6365,6 +6554,15 @@ msgid "Clear a script for the selected node." msgstr "" #: editor/scene_tree_dock.cpp +#, fuzzy +msgid "Remote" +msgstr "移除" + +#: editor/scene_tree_dock.cpp +msgid "Local" +msgstr "" + +#: editor/scene_tree_dock.cpp msgid "Clear Inheritance? (No Undo!)" msgstr "" @@ -6559,6 +6757,11 @@ msgid "Attach Node Script" msgstr "下一個腳本" #: editor/script_editor_debugger.cpp +#, fuzzy +msgid "Remote " +msgstr "移除" + +#: editor/script_editor_debugger.cpp msgid "Bytes:" msgstr "" @@ -6615,19 +6818,6 @@ msgid "Stack Trace (if applicable):" msgstr "" #: editor/script_editor_debugger.cpp -msgid "Remote Inspector" -msgstr "" - -#: editor/script_editor_debugger.cpp -#, fuzzy -msgid "Live Scene Tree:" -msgstr "儲å˜å ´æ™¯" - -#: editor/script_editor_debugger.cpp -msgid "Remote Object Properties: " -msgstr "" - -#: editor/script_editor_debugger.cpp msgid "Profiler" msgstr "" @@ -6760,49 +6950,49 @@ msgstr "" msgid "GDNative" msgstr "" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp #: modules/visual_script/visual_script_builtin_funcs.cpp msgid "Invalid type argument to convert(), use TYPE_* constants." msgstr "" -#: modules/gdscript/gd_functions.cpp modules/mono/glue/glue_header.h +#: modules/gdscript/gdscript_functions.cpp modules/mono/glue/glue_header.h #: modules/visual_script/visual_script_builtin_funcs.cpp msgid "Not enough bytes for decoding bytes, or invalid format." msgstr "" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "step argument is zero!" msgstr "" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Not a script with an instance" msgstr "" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Not based on a script" msgstr "" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Not based on a resource file" msgstr "" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary format (missing @path)" msgstr "" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary format (can't load script at @path)" msgstr "" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary format (invalid script at @path)" msgstr "" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary (invalid subclasses)" msgstr "" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Object can't provide a length." msgstr "" @@ -6817,15 +7007,23 @@ msgid "GridMap Duplicate Selection" msgstr "複製 Selection" #: modules/gridmap/grid_map_editor_plugin.cpp +msgid "Floor:" +msgstr "" + +#: modules/gridmap/grid_map_editor_plugin.cpp +msgid "Grid Map" +msgstr "" + +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Snap View" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp -msgid "Prev Level (%sDown Wheel)" +msgid "Previous Floor" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp -msgid "Next Level (%sUp Wheel)" +msgid "Next Floor" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp @@ -6896,13 +7094,8 @@ msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp #, fuzzy -msgid "Selection -> Duplicate" -msgstr "åªé™é¸ä¸" - -#: modules/gridmap/grid_map_editor_plugin.cpp -#, fuzzy -msgid "Selection -> Clear" -msgstr "åªé™é¸ä¸" +msgid "Clear Selection" +msgstr "縮放selection" #: modules/gridmap/grid_map_editor_plugin.cpp #, fuzzy @@ -7028,7 +7221,7 @@ msgid "Duplicate VisualScript Nodes" msgstr "" #: modules/visual_script/visual_script_editor.cpp -msgid "Hold Meta to drop a Getter. Hold Shift to drop a generic signature." +msgid "Hold %s to drop a Getter. Hold Shift to drop a generic signature." msgstr "" #: modules/visual_script/visual_script_editor.cpp @@ -7036,7 +7229,7 @@ msgid "Hold Ctrl to drop a Getter. Hold Shift to drop a generic signature." msgstr "" #: modules/visual_script/visual_script_editor.cpp -msgid "Hold Meta to drop a simple reference to the node." +msgid "Hold %s to drop a simple reference to the node." msgstr "" #: modules/visual_script/visual_script_editor.cpp @@ -7044,7 +7237,7 @@ msgid "Hold Ctrl to drop a simple reference to the node." msgstr "" #: modules/visual_script/visual_script_editor.cpp -msgid "Hold Meta to drop a Variable Setter." +msgid "Hold %s to drop a Variable Setter." msgstr "" #: modules/visual_script/visual_script_editor.cpp @@ -7284,12 +7477,22 @@ msgstr "無法新增資料夾" #: platform/javascript/export/export.cpp #, fuzzy -msgid "Could not read file:\n" +msgid "Could not open template for export:\n" msgstr "無法新增資料夾" #: platform/javascript/export/export.cpp #, fuzzy -msgid "Could not open template for export:\n" +msgid "Invalid export template:\n" +msgstr "管ç†è¼¸å‡ºç¯„本" + +#: platform/javascript/export/export.cpp +#, fuzzy +msgid "Could not read custom HTML shell:\n" +msgstr "無法新增資料夾" + +#: platform/javascript/export/export.cpp +#, fuzzy +msgid "Could not read boot splash image file:\n" msgstr "無法新增資料夾" #: scene/2d/animated_sprite.cpp @@ -7381,18 +7584,6 @@ msgstr "" msgid "Path property must point to a valid Node2D node to work." msgstr "" -#: scene/2d/sprite.cpp -msgid "" -"Path property must point to a valid Viewport node to work. Such Viewport " -"must be set to 'render target' mode." -msgstr "" - -#: scene/2d/sprite.cpp -msgid "" -"The Viewport set in the path property must be set as 'render target' in " -"order for this sprite to work." -msgstr "" - #: scene/2d/visibility_notifier_2d.cpp msgid "" "VisibilityEnable2D works best when used with the edited scene root directly " @@ -7451,6 +7642,14 @@ msgid "" "shape resource for it!" msgstr "" +#: scene/3d/gi_probe.cpp +msgid "Plotting Meshes" +msgstr "" + +#: scene/3d/gi_probe.cpp +msgid "Finishing Plot" +msgstr "" + #: scene/3d/navigation_mesh.cpp msgid "A NavigationMesh resource must be set or created for this node to work." msgstr "" @@ -7528,6 +7727,10 @@ msgid "" "minimum size manually." msgstr "" +#: scene/gui/tree.cpp +msgid "(Other)" +msgstr "" + #: scene/main/scene_tree.cpp msgid "" "Default Environment as specified in Project Setings (Rendering -> Viewport -" @@ -7558,6 +7761,31 @@ msgstr "載入å—形出ç¾éŒ¯èª¤" msgid "Invalid font size." msgstr "無效å—åž‹" +#, fuzzy +#~ msgid "" +#~ "\n" +#~ "Source: " +#~ msgstr "來æº:" + +#~ msgid "Meta+" +#~ msgstr "Meta+" + +#, fuzzy +#~ msgid "Setting '" +#~ msgstr "è¨å®š" + +#, fuzzy +#~ msgid "Live Scene Tree:" +#~ msgstr "儲å˜å ´æ™¯" + +#, fuzzy +#~ msgid "Selection -> Duplicate" +#~ msgstr "åªé™é¸ä¸" + +#, fuzzy +#~ msgid "Selection -> Clear" +#~ msgstr "åªé™é¸ä¸" + #~ msgid "Filter:" #~ msgstr "篩é¸:" diff --git a/editor/translations/zh_TW.po b/editor/translations/zh_TW.po index 7a392613d2..3104aa9371 100644 --- a/editor/translations/zh_TW.po +++ b/editor/translations/zh_TW.po @@ -5,21 +5,22 @@ # # Allen H <w84miracle@gmail.com>, 2017. # Chao Yu <casd82@gmail.com>, 2017. +# Cliffs Dover <bottle@dancingbottle.com>, 2017. # popcade <popcade@gmail.com>, 2016. # Sam Pan <sampan66@gmail.com>, 2016. # msgid "" msgstr "" "Project-Id-Version: Godot Engine editor\n" -"PO-Revision-Date: 2017-07-31 15:51+0000\n" -"Last-Translator: Chao Yu <casd82@gmail.com>\n" +"PO-Revision-Date: 2017-11-13 02:50+0000\n" +"Last-Translator: Cliffs Dover <bottle@dancingbottle.com>\n" "Language-Team: Chinese (Traditional) <https://hosted.weblate.org/projects/" "godot-engine/godot/zh_Hant/>\n" "Language: zh_TW\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8-bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Weblate 2.16-dev\n" +"X-Generator: Weblate 2.18-dev\n" #: editor/animation_editor.cpp msgid "Disabled" @@ -102,6 +103,7 @@ msgid "Anim Delete Keys" msgstr "" #: editor/animation_editor.cpp editor/plugins/tile_map_editor_plugin.cpp +#: modules/gridmap/grid_map_editor_plugin.cpp msgid "Duplicate Selection" msgstr "複製所é¸" @@ -634,6 +636,13 @@ msgstr "" msgid "Search Replacement Resource:" msgstr "" +#: editor/dependency_editor.cpp editor/editor_file_dialog.cpp +#: editor/editor_help.cpp editor/editor_node.cpp editor/filesystem_dock.cpp +#: editor/plugins/script_editor_plugin.cpp editor/property_selector.cpp +#: editor/quick_open.cpp scene/gui/file_dialog.cpp +msgid "Open" +msgstr "é–‹å•Ÿ" + #: editor/dependency_editor.cpp msgid "Owners Of:" msgstr "" @@ -656,7 +665,6 @@ msgid "Cannot remove:\n" msgstr "" #: editor/dependency_editor.cpp -#, fuzzy msgid "Error loading:" msgstr "載入時發生錯誤:" @@ -707,6 +715,14 @@ msgstr "確定刪除所é¸æ“‡çš„檔案嗎?" msgid "Delete" msgstr "刪除" +#: editor/dictionary_property_edit.cpp +msgid "Change Dictionary Key" +msgstr "" + +#: editor/dictionary_property_edit.cpp +msgid "Change Dictionary Value" +msgstr "" + #: editor/editor_about.cpp msgid "Thanks from the Godot community!" msgstr "" @@ -720,9 +736,8 @@ msgid "Godot Engine contributors" msgstr "" #: editor/editor_about.cpp -#, fuzzy msgid "Project Founders" -msgstr "專案è¨å®š" +msgstr "專案創始人" #: editor/editor_about.cpp msgid "Lead Developer" @@ -972,9 +987,8 @@ msgid "Save this Bus Layout to a file." msgstr "" #: editor/editor_audio_buses.cpp editor/import_dock.cpp -#, fuzzy msgid "Load Default" -msgstr "é è¨" +msgstr "載入é è¨å€¼" #: editor/editor_audio_buses.cpp msgid "Load the default Bus Layout." @@ -1066,7 +1080,6 @@ msgid "List:" msgstr "列表:" #: editor/editor_data.cpp -#, fuzzy msgid "Updating Scene" msgstr "æ›´æ–°å ´æ™¯" @@ -1131,12 +1144,6 @@ msgstr "" msgid "All Files (*)" msgstr "所有類型檔案" -#: editor/editor_file_dialog.cpp editor/editor_help.cpp editor/editor_node.cpp -#: editor/filesystem_dock.cpp editor/plugins/script_editor_plugin.cpp -#: editor/property_selector.cpp editor/quick_open.cpp scene/gui/file_dialog.cpp -msgid "Open" -msgstr "é–‹å•Ÿ" - #: editor/editor_file_dialog.cpp scene/gui/file_dialog.cpp msgid "Open a File" msgstr "" @@ -1315,7 +1322,6 @@ msgid "Constants:" msgstr "" #: editor/editor_help.cpp -#, fuzzy msgid "Description" msgstr "æè¿°:" @@ -1334,9 +1340,8 @@ msgid "" msgstr "" #: editor/editor_help.cpp -#, fuzzy msgid "Methods" -msgstr "方法:" +msgstr "方法" #: editor/editor_help.cpp msgid "Method Description:" @@ -1353,9 +1358,8 @@ msgid "Search Text" msgstr "æœå°‹è©žå½™" #: editor/editor_log.cpp -#, fuzzy msgid "Output:" -msgstr " 輸出:" +msgstr "輸出:" #: editor/editor_log.cpp editor/plugins/animation_tree_editor_plugin.cpp #: editor/property_editor.cpp editor/script_editor_debugger.cpp @@ -1389,14 +1393,12 @@ msgid "Error while saving." msgstr "" #: editor/editor_node.cpp -#, fuzzy msgid "Can't open '%s'." -msgstr "連接..." +msgstr "無法開啟 \"%s\"。" #: editor/editor_node.cpp -#, fuzzy msgid "Error while parsing '%s'." -msgstr "è¼‰å…¥å ´æ™¯æ™‚ç™¼ç”ŸéŒ¯èª¤" +msgstr "åˆ†æž \"%s\" 時發生錯誤。" #: editor/editor_node.cpp msgid "Unexpected end of file '%s'." @@ -1407,9 +1409,8 @@ msgid "Missing '%s' or its dependencies." msgstr "" #: editor/editor_node.cpp -#, fuzzy msgid "Error while loading '%s'." -msgstr "è¼‰å…¥å ´æ™¯æ™‚ç™¼ç”ŸéŒ¯èª¤" +msgstr "載入 \"%s\" 時發生錯誤。" #: editor/editor_node.cpp msgid "Saving Scene" @@ -1497,6 +1498,13 @@ msgid "" msgstr "" #: editor/editor_node.cpp +msgid "" +"This is a remote object so changes to it will not be kept.\n" +"Please read the documentation relevant to debugging to better understand " +"this workflow." +msgstr "" + +#: editor/editor_node.cpp msgid "Copy Params" msgstr "複製åƒæ•¸" @@ -1607,6 +1615,11 @@ msgid "Export Mesh Library" msgstr "" #: editor/editor_node.cpp +#, fuzzy +msgid "This operation can't be done without a root node." +msgstr "æ¤æ“作無法復原, 確定è¦é‚„原嗎?" + +#: editor/editor_node.cpp msgid "Export Tile Set" msgstr "" @@ -1733,12 +1746,23 @@ msgid "Switch Scene Tab" msgstr "切æ›å ´æ™¯åˆ†é " #: editor/editor_node.cpp -msgid "%d more file(s)" +#, fuzzy +msgid "%d more files or folders" +msgstr "還有 %d 個檔案或資料夾" + +#: editor/editor_node.cpp +#, fuzzy +msgid "%d more folders" msgstr "還有 %d 個檔案" #: editor/editor_node.cpp -msgid "%d more file(s) or folder(s)" -msgstr "還有 %d 個檔案或資料夾" +#, fuzzy +msgid "%d more files" +msgstr "還有 %d 個檔案" + +#: editor/editor_node.cpp +msgid "Dock Position" +msgstr "" #: editor/editor_node.cpp msgid "Distraction Free Mode" @@ -1750,6 +1774,11 @@ msgstr "" #: editor/editor_node.cpp #, fuzzy +msgid "Add a new scene." +msgstr "æ›´æ–°å ´æ™¯ä¸.." + +#: editor/editor_node.cpp +#, fuzzy msgid "Scene" msgstr "å ´æ™¯" @@ -1814,13 +1843,12 @@ msgid "TileSet.." msgstr "" #: editor/editor_node.cpp editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp scene/gui/line_edit.cpp -#: scene/gui/text_edit.cpp +#: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Undo" msgstr "復原" #: editor/editor_node.cpp editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp +#: scene/gui/line_edit.cpp msgid "Redo" msgstr "å–消「復原ã€" @@ -2303,6 +2331,10 @@ msgid "(Current)" msgstr "" #: editor/export_template_manager.cpp +msgid "Retrieving mirrors, please wait.." +msgstr "" + +#: editor/export_template_manager.cpp msgid "Remove template version '%s'?" msgstr "" @@ -2337,6 +2369,109 @@ msgid "Importing:" msgstr "" #: editor/export_template_manager.cpp +msgid "" +"No download links found for this version. Direct download is only available " +"for official releases." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Can't resolve." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Can't connect." +msgstr "連接..." + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "No response." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Req. Failed." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Redirect Loop." +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Failed:" +msgstr "" + +#: editor/export_template_manager.cpp +msgid "Can't write file." +msgstr "" + +#: editor/export_template_manager.cpp +msgid "Download Complete." +msgstr "" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Error requesting url: " +msgstr "è¼‰å…¥å ´æ™¯æ™‚ç™¼ç”ŸéŒ¯èª¤" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Connecting to Mirror.." +msgstr "連接..." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Disconnected" +msgstr "æ–·ç·š" + +#: editor/export_template_manager.cpp +msgid "Resolving" +msgstr "" + +#: editor/export_template_manager.cpp +msgid "Can't Resolve" +msgstr "" + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +#, fuzzy +msgid "Connecting.." +msgstr "連接..." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Can't Conect" +msgstr "連接..." + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Connected" +msgstr "連接..." + +#: editor/export_template_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp +msgid "Requesting.." +msgstr "" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Downloading" +msgstr "載入時發生錯誤:" + +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Connection Error" +msgstr "連接..." + +#: editor/export_template_manager.cpp +msgid "SSL Handshake Error" +msgstr "" + +#: editor/export_template_manager.cpp msgid "Current Version:" msgstr "" @@ -2360,12 +2495,21 @@ msgstr "" msgid "Export Template Manager" msgstr "" +#: editor/export_template_manager.cpp +#, fuzzy +msgid "Download Templates" +msgstr "è¼‰å…¥å ´æ™¯æ™‚ç™¼ç”ŸéŒ¯èª¤" + +#: editor/export_template_manager.cpp +msgid "Select mirror from list: " +msgstr "" + #: editor/file_type_cache.cpp msgid "Can't open file_type_cache.cch for writing, not saving file type cache!" msgstr "" #: editor/filesystem_dock.cpp -msgid "Cannot navigate to '" +msgid "Cannot navigate to '%s' as it has not been found in the file system!" msgstr "" #: editor/filesystem_dock.cpp @@ -2383,12 +2527,6 @@ msgid "" msgstr "" #: editor/filesystem_dock.cpp -msgid "" -"\n" -"Source: " -msgstr "" - -#: editor/filesystem_dock.cpp msgid "Cannot move/rename resources root." msgstr "" @@ -2651,8 +2789,7 @@ msgid "Remove Poly And Point" msgstr "" #: editor/plugins/abstract_polygon_2d_editor.cpp -#: editor/plugins/light_occluder_2d_editor_plugin.cpp -msgid "Create a new polygon from scratch." +msgid "Create a new polygon from scratch" msgstr "" #: editor/plugins/abstract_polygon_2d_editor.cpp @@ -2663,6 +2800,11 @@ msgid "" "RMB: Erase Point." msgstr "" +#: editor/plugins/abstract_polygon_2d_editor.cpp +#, fuzzy +msgid "Delete points" +msgstr "刪除" + #: editor/plugins/animation_player_editor_plugin.cpp msgid "Toggle Autoplay" msgstr "" @@ -2999,19 +3141,10 @@ msgid "Can't resolve hostname:" msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Can't resolve." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Connection error, please try again." msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp -#, fuzzy -msgid "Can't connect." -msgstr "連接..." - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Can't connect to host:" msgstr "" @@ -3020,30 +3153,14 @@ msgid "No response from host:" msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "No response." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Request failed, return code:" msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Req. Failed." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Request failed, too many redirects" msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp -msgid "Redirect Loop." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp -msgid "Failed:" -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp msgid "Bad download hash, assuming file has been tampered with." msgstr "" @@ -3073,15 +3190,6 @@ msgstr "" #: editor/plugins/asset_library_editor_plugin.cpp #, fuzzy -msgid "Connecting.." -msgstr "連接..." - -#: editor/plugins/asset_library_editor_plugin.cpp -msgid "Requesting.." -msgstr "" - -#: editor/plugins/asset_library_editor_plugin.cpp -#, fuzzy msgid "Error making request" msgstr "è¼‰å…¥å ´æ™¯æ™‚ç™¼ç”ŸéŒ¯èª¤" @@ -3194,6 +3302,35 @@ msgid "Move Action" msgstr "" #: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Move vertical guide" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Create new vertical guide" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Remove vertical guide" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Move horizontal guide" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Create new horizontal guide" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#, fuzzy +msgid "Remove horizontal guide" +msgstr "移除" + +#: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Create new horizontal and vertical guides" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp msgid "Edit IK Chain" msgstr "" @@ -3314,10 +3451,16 @@ msgid "Snap to other nodes" msgstr "" #: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Snap to guides" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Lock the selected object in place (can't be moved)." msgstr "" #: editor/plugins/canvas_item_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Unlock the selected object (can be moved)." msgstr "" @@ -3368,6 +3511,10 @@ msgid "Show rulers" msgstr "" #: editor/plugins/canvas_item_editor_plugin.cpp +msgid "Show guides" +msgstr "" + +#: editor/plugins/canvas_item_editor_plugin.cpp msgid "Center Selection" msgstr "" @@ -3557,6 +3704,10 @@ msgstr "" msgid "Hold Shift to edit tangents individually" msgstr "" +#: editor/plugins/gi_probe_editor_plugin.cpp +msgid "Bake GI Probe" +msgstr "" + #: editor/plugins/gradient_editor_plugin.cpp msgid "Add/Remove Color Ramp Point" msgstr "" @@ -3589,6 +3740,10 @@ msgid "Create Occluder Polygon" msgstr "" #: editor/plugins/light_occluder_2d_editor_plugin.cpp +msgid "Create a new polygon from scratch." +msgstr "" + +#: editor/plugins/light_occluder_2d_editor_plugin.cpp msgid "Edit existing polygon:" msgstr "" @@ -3604,58 +3759,6 @@ msgstr "" msgid "RMB: Erase Point." msgstr "" -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Remove Point from Line2D" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Add Point to Line2D" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Move Point in Line2D" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Select Points" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Shift+Drag: Select Control Points" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Click: Add Point" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Right Click: Delete Point" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Add Point (in empty space)" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -msgid "Split Segment (in line)" -msgstr "" - -#: editor/plugins/line_2d_editor_plugin.cpp -#: editor/plugins/path_2d_editor_plugin.cpp -#: editor/plugins/path_editor_plugin.cpp -msgid "Delete Point" -msgstr "" - #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Mesh is empty!" msgstr "" @@ -4054,16 +4157,46 @@ msgid "Move Out-Control in Curve" msgstr "" #: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Select Points" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Shift+Drag: Select Control Points" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Click: Add Point" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp +msgid "Right Click: Delete Point" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp msgid "Select Control Points (Shift+Drag)" msgstr "" #: editor/plugins/path_2d_editor_plugin.cpp #: editor/plugins/path_editor_plugin.cpp +msgid "Add Point (in empty space)" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp msgid "Split Segment (in curve)" msgstr "" #: editor/plugins/path_2d_editor_plugin.cpp #: editor/plugins/path_editor_plugin.cpp +msgid "Delete Point" +msgstr "" + +#: editor/plugins/path_2d_editor_plugin.cpp +#: editor/plugins/path_editor_plugin.cpp msgid "Close Curve" msgstr "" @@ -4203,7 +4336,6 @@ msgstr "" #: editor/plugins/resource_preloader_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp #: editor/plugins/sprite_frames_editor_plugin.cpp editor/property_editor.cpp #: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Paste" @@ -4248,6 +4380,21 @@ msgid " Class Reference" msgstr "" #: editor/plugins/script_editor_plugin.cpp +#, fuzzy +msgid "Sort" +msgstr "排åº:" + +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp +msgid "Move Up" +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp +#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp +msgid "Move Down" +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp msgid "Next script" msgstr "" @@ -4299,6 +4446,10 @@ msgstr "" msgid "Close All" msgstr "" +#: editor/plugins/script_editor_plugin.cpp +msgid "Close Other Tabs" +msgstr "" + #: editor/plugins/script_editor_plugin.cpp editor/project_manager.cpp msgid "Run" msgstr "" @@ -4309,13 +4460,11 @@ msgstr "" #: editor/plugins/script_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Find.." msgstr "" #: editor/plugins/script_editor_plugin.cpp #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Find Next" msgstr "" @@ -4421,33 +4570,22 @@ msgstr "" msgid "Capitalize" msgstr "" -#: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp scene/gui/line_edit.cpp +#: editor/plugins/script_text_editor.cpp scene/gui/line_edit.cpp #: scene/gui/text_edit.cpp msgid "Cut" msgstr "" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp #: editor/plugins/sprite_frames_editor_plugin.cpp editor/property_editor.cpp #: scene/gui/line_edit.cpp scene/gui/text_edit.cpp msgid "Copy" msgstr "" -#: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp scene/gui/line_edit.cpp +#: editor/plugins/script_text_editor.cpp scene/gui/line_edit.cpp #: scene/gui/text_edit.cpp msgid "Select All" msgstr "" -#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp -msgid "Move Up" -msgstr "" - -#: editor/plugins/script_text_editor.cpp editor/scene_tree_dock.cpp -msgid "Move Down" -msgstr "" - #: editor/plugins/script_text_editor.cpp #, fuzzy msgid "Delete Line" @@ -4470,6 +4608,23 @@ msgid "Clone Down" msgstr "" #: editor/plugins/script_text_editor.cpp +#, fuzzy +msgid "Fold Line" +msgstr "å‰å¾€ç¬¬...è¡Œ" + +#: editor/plugins/script_text_editor.cpp +msgid "Unfold Line" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Fold All Lines" +msgstr "" + +#: editor/plugins/script_text_editor.cpp +msgid "Unfold All Lines" +msgstr "" + +#: editor/plugins/script_text_editor.cpp msgid "Complete Symbol" msgstr "" @@ -4517,12 +4672,10 @@ msgid "Convert To Lowercase" msgstr "轉æ›æˆ.." #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Find Previous" msgstr "" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Replace.." msgstr "" @@ -4531,7 +4684,6 @@ msgid "Goto Function.." msgstr "" #: editor/plugins/script_text_editor.cpp -#: editor/plugins/shader_editor_plugin.cpp msgid "Goto Line.." msgstr "" @@ -4696,6 +4848,14 @@ msgid "View Plane Transform." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "Scaling: " +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Translating: " +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Rotating %s degrees." msgstr "" @@ -4777,6 +4937,10 @@ msgid "Vertices" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "FPS" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Align with view" msgstr "" @@ -4809,6 +4973,15 @@ msgid "View Information" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +#, fuzzy +msgid "View FPS" +msgstr "éŽæ¿¾æª”案.." + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Half Resolution" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Audio Listener" msgstr "" @@ -4940,6 +5113,10 @@ msgid "Tool Scale" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp +msgid "Toggle Freelook" +msgstr "" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Transform" msgstr "" @@ -5215,6 +5392,10 @@ msgid "Create Empty Editor Template" msgstr "" #: editor/plugins/theme_editor_plugin.cpp +msgid "Create From Current Editor Theme" +msgstr "" + +#: editor/plugins/theme_editor_plugin.cpp msgid "CheckBox Radio1" msgstr "" @@ -5390,7 +5571,7 @@ msgid "Runnable" msgstr "" #: editor/project_export.cpp -msgid "Delete patch '" +msgid "Delete patch '%s' from list?" msgstr "" #: editor/project_export.cpp @@ -5690,10 +5871,6 @@ msgid "Add Input Action Event" msgstr "" #: editor/project_settings_editor.cpp editor/settings_config_dialog.cpp -msgid "Meta+" -msgstr "" - -#: editor/project_settings_editor.cpp editor/settings_config_dialog.cpp msgid "Shift+" msgstr "" @@ -5815,11 +5992,11 @@ msgid "Select a setting item first!" msgstr "" #: editor/project_settings_editor.cpp -msgid "No property '" +msgid "No property '%s' exists." msgstr "" #: editor/project_settings_editor.cpp -msgid "Setting '" +msgid "Setting '%s' is internal, and it can't be deleted." msgstr "" #: editor/project_settings_editor.cpp @@ -6292,6 +6469,15 @@ msgid "Clear a script for the selected node." msgstr "" #: editor/scene_tree_dock.cpp +#, fuzzy +msgid "Remote" +msgstr "移除" + +#: editor/scene_tree_dock.cpp +msgid "Local" +msgstr "" + +#: editor/scene_tree_dock.cpp msgid "Clear Inheritance? (No Undo!)" msgstr "" @@ -6479,6 +6665,11 @@ msgid "Attach Node Script" msgstr "" #: editor/script_editor_debugger.cpp +#, fuzzy +msgid "Remote " +msgstr "移除" + +#: editor/script_editor_debugger.cpp msgid "Bytes:" msgstr "" @@ -6535,18 +6726,6 @@ msgid "Stack Trace (if applicable):" msgstr "" #: editor/script_editor_debugger.cpp -msgid "Remote Inspector" -msgstr "" - -#: editor/script_editor_debugger.cpp -msgid "Live Scene Tree:" -msgstr "" - -#: editor/script_editor_debugger.cpp -msgid "Remote Object Properties: " -msgstr "" - -#: editor/script_editor_debugger.cpp msgid "Profiler" msgstr "" @@ -6683,54 +6862,54 @@ msgstr "" msgid "GDNative" msgstr "" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp #: modules/visual_script/visual_script_builtin_funcs.cpp msgid "Invalid type argument to convert(), use TYPE_* constants." msgstr "" -#: modules/gdscript/gd_functions.cpp modules/mono/glue/glue_header.h +#: modules/gdscript/gdscript_functions.cpp modules/mono/glue/glue_header.h #: modules/visual_script/visual_script_builtin_funcs.cpp msgid "Not enough bytes for decoding bytes, or invalid format." msgstr "解碼å—節ä½å…ƒä¸è¶³ï¼Œæˆ–ç‚ºç„¡æ•ˆæ ¼å¼ã€‚" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "step argument is zero!" msgstr "step引數為0!" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Not a script with an instance" msgstr "éžç‚ºå–®ä¸€äº‹ä»¶è…³æœ¬" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp #, fuzzy msgid "Not based on a script" msgstr "未ä¾æ“šè…³æœ¬" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp #, fuzzy msgid "Not based on a resource file" msgstr "未ä¾æ“šè³‡æºæª”案" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp #, fuzzy msgid "Invalid instance dictionary format (missing @path)" msgstr "ç„¡æ•ˆçš„äº‹ä»¶è©žå…¸æ ¼å¼(éºå¤± @path)" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp #, fuzzy msgid "Invalid instance dictionary format (can't load script at @path)" msgstr "ç„¡æ•ˆçš„äº‹ä»¶è©žå…¸æ ¼å¼(無法載入腳本 @path)" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp #, fuzzy msgid "Invalid instance dictionary format (invalid script at @path)" msgstr "ç„¡æ•ˆçš„äº‹ä»¶è©žå…¸æ ¼å¼(無效的腳本 @path)" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Invalid instance dictionary (invalid subclasses)" msgstr "" -#: modules/gdscript/gd_functions.cpp +#: modules/gdscript/gdscript_functions.cpp msgid "Object can't provide a length." msgstr "" @@ -6745,15 +6924,24 @@ msgid "GridMap Duplicate Selection" msgstr "複製所é¸" #: modules/gridmap/grid_map_editor_plugin.cpp -msgid "Snap View" +msgid "Floor:" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp -msgid "Prev Level (%sDown Wheel)" +msgid "Grid Map" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp -msgid "Next Level (%sUp Wheel)" +msgid "Snap View" +msgstr "" + +#: modules/gridmap/grid_map_editor_plugin.cpp +#, fuzzy +msgid "Previous Floor" +msgstr "上個分é " + +#: modules/gridmap/grid_map_editor_plugin.cpp +msgid "Next Floor" msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp @@ -6824,13 +7012,8 @@ msgstr "" #: modules/gridmap/grid_map_editor_plugin.cpp #, fuzzy -msgid "Selection -> Duplicate" -msgstr "僅é¸æ“‡å€åŸŸ" - -#: modules/gridmap/grid_map_editor_plugin.cpp -#, fuzzy -msgid "Selection -> Clear" -msgstr "僅é¸æ“‡å€åŸŸ" +msgid "Clear Selection" +msgstr "所有的é¸æ“‡" #: modules/gridmap/grid_map_editor_plugin.cpp #, fuzzy @@ -6954,7 +7137,7 @@ msgid "Duplicate VisualScript Nodes" msgstr "" #: modules/visual_script/visual_script_editor.cpp -msgid "Hold Meta to drop a Getter. Hold Shift to drop a generic signature." +msgid "Hold %s to drop a Getter. Hold Shift to drop a generic signature." msgstr "" #: modules/visual_script/visual_script_editor.cpp @@ -6962,7 +7145,7 @@ msgid "Hold Ctrl to drop a Getter. Hold Shift to drop a generic signature." msgstr "" #: modules/visual_script/visual_script_editor.cpp -msgid "Hold Meta to drop a simple reference to the node." +msgid "Hold %s to drop a simple reference to the node." msgstr "" #: modules/visual_script/visual_script_editor.cpp @@ -6970,7 +7153,7 @@ msgid "Hold Ctrl to drop a simple reference to the node." msgstr "" #: modules/visual_script/visual_script_editor.cpp -msgid "Hold Meta to drop a Variable Setter." +msgid "Hold %s to drop a Variable Setter." msgstr "" #: modules/visual_script/visual_script_editor.cpp @@ -7198,13 +7381,22 @@ msgid "Could not write file:\n" msgstr "" #: platform/javascript/export/export.cpp -msgid "Could not read file:\n" +msgid "Could not open template for export:\n" msgstr "" #: platform/javascript/export/export.cpp -msgid "Could not open template for export:\n" +msgid "Invalid export template:\n" +msgstr "" + +#: platform/javascript/export/export.cpp +msgid "Could not read custom HTML shell:\n" msgstr "" +#: platform/javascript/export/export.cpp +#, fuzzy +msgid "Could not read boot splash image file:\n" +msgstr "無法新增資料夾" + #: scene/2d/animated_sprite.cpp msgid "" "A SpriteFrames resource must be created or set in the 'Frames' property in " @@ -7300,18 +7492,6 @@ msgstr "" msgid "Path property must point to a valid Node2D node to work." msgstr "" -#: scene/2d/sprite.cpp -msgid "" -"Path property must point to a valid Viewport node to work. Such Viewport " -"must be set to 'render target' mode." -msgstr "" - -#: scene/2d/sprite.cpp -msgid "" -"The Viewport set in the path property must be set as 'render target' in " -"order for this sprite to work." -msgstr "" - #: scene/2d/visibility_notifier_2d.cpp msgid "" "VisibilityEnable2D works best when used with the edited scene root directly " @@ -7370,6 +7550,14 @@ msgid "" "shape resource for it!" msgstr "" +#: scene/3d/gi_probe.cpp +msgid "Plotting Meshes" +msgstr "" + +#: scene/3d/gi_probe.cpp +msgid "Finishing Plot" +msgstr "" + #: scene/3d/navigation_mesh.cpp msgid "A NavigationMesh resource must be set or created for this node to work." msgstr "" @@ -7447,6 +7635,10 @@ msgid "" "minimum size manually." msgstr "" +#: scene/gui/tree.cpp +msgid "(Other)" +msgstr "" + #: scene/main/scene_tree.cpp msgid "" "Default Environment as specified in Project Setings (Rendering -> Viewport -" @@ -7477,6 +7669,14 @@ msgstr "" msgid "Invalid font size." msgstr "" +#, fuzzy +#~ msgid "Selection -> Duplicate" +#~ msgstr "僅é¸æ“‡å€åŸŸ" + +#, fuzzy +#~ msgid "Selection -> Clear" +#~ msgstr "僅é¸æ“‡å€åŸŸ" + #~ msgid "Filter:" #~ msgstr "éŽæ¿¾å™¨:" diff --git a/main/input_default.cpp b/main/input_default.cpp index 2940f432d5..7cc7521686 100644 --- a/main/input_default.cpp +++ b/main/input_default.cpp @@ -319,6 +319,15 @@ void InputDefault::parse_input_event(const Ref<InputEvent> &p_event) { set_joy_axis(jm->get_device(), jm->get_axis(), jm->get_axis_value()); } + Ref<InputEventGesture> ge = p_event; + + if (ge.is_valid()) { + + if (main_loop) { + main_loop->input_event(ge); + } + } + if (!p_event->is_echo()) { for (const Map<StringName, InputMap::Action>::Element *E = InputMap::get_singleton()->get_action_map().front(); E; E = E->next()) { diff --git a/main/main.cpp b/main/main.cpp index cc6e66d352..8b866e160f 100644..100755 --- a/main/main.cpp +++ b/main/main.cpp @@ -35,6 +35,7 @@ #include "message_queue.h" #include "modules/register_module_types.h" #include "os/os.h" +#include "platform/register_platform_apis.h" #include "project_settings.h" #include "scene/register_scene_types.h" #include "script_debugger_local.h" @@ -176,7 +177,7 @@ static String get_full_version_string() { void Main::print_help(const char *p_binary) { - print_line(String(_MKSTR(VERSION_NAME)) + " v" + get_full_version_string() + " - https://godotengine.org"); + print_line(String(VERSION_NAME) + " v" + get_full_version_string() + " - https://godotengine.org"); OS::get_singleton()->print("(c) 2007-2017 Juan Linietsky, Ariel Manzur.\n"); OS::get_singleton()->print("(c) 2014-2017 Godot Engine contributors.\n"); OS::get_singleton()->print("\n"); @@ -289,8 +290,6 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph register_core_settings(); //here globals is present - OS::get_singleton()->initialize_logger(); - translation_server = memnew(TranslationServer); performance = memnew(Performance); ClassDB::register_class<Performance>(); @@ -426,6 +425,7 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph } else if (I->get() == "-m" || I->get() == "--maximized") { // force maximized window init_maximized = true; + video_mode.maximized = true; } else if (I->get() == "-w" || I->get() == "--windowed") { // force windowed window init_windowed = true; @@ -743,10 +743,20 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph #endif } + GLOBAL_DEF("logging/file_logging/enable_file_logging", true); + GLOBAL_DEF("logging/file_logging/log_path", "user://logs/log.txt"); + GLOBAL_DEF("logging/file_logging/max_log_files", 10); + if (FileAccess::get_create_func(FileAccess::ACCESS_USERDATA) && GLOBAL_GET("logging/file_logging/enable_file_logging")) { + String base_path = GLOBAL_GET("logging/file_logging/log_path"); + int max_files = GLOBAL_GET("logging/file_logging/max_log_files"); + OS::get_singleton()->add_logger(memnew(RotatedFileLogger(base_path, max_files))); + } + if (editor) { Engine::get_singleton()->set_editor_hint(true); main_args.push_back("--editor"); init_maximized = true; + video_mode.maximized = true; use_custom_res = false; } @@ -822,8 +832,6 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph OS::get_singleton()->_keep_screen_on = GLOBAL_DEF("display/window/energy_saving/keep_screen_on", true); if (rtm == -1) { rtm = GLOBAL_DEF("rendering/threads/thread_model", OS::RENDER_THREAD_SAFE); - if (rtm >= 1) //hack for now - rtm = 1; } if (rtm >= 0 && rtm < 3) { @@ -1108,6 +1116,7 @@ Error Main::setup2(Thread::ID p_main_tid_override) { MAIN_PRINT("Main: Load Modules, Physics, Drivers, Scripts"); + register_platform_apis(); register_module_types(); initialize_physics(); @@ -1825,6 +1834,7 @@ void Main::cleanup() { unregister_driver_types(); unregister_module_types(); + unregister_platform_apis(); unregister_scene_types(); unregister_server_types(); diff --git a/methods.py b/methods.py index 6e4fecd67e..2be73f02d2 100644 --- a/methods.py +++ b/methods.py @@ -1150,26 +1150,26 @@ def build_gles3_headers(target, source, env): def add_module_version_string(self,s): - self.module_version_string+="."+s + self.module_version_string += "." + s def update_version(module_version_string=""): - rev = "custom_build" + build_name = "custom_build" + if (os.getenv("BUILD_NAME") != None): + build_name = os.getenv("BUILD_NAME") + print("Using custom build name: " + build_name) - if (os.getenv("BUILD_REVISION") != None): - rev = os.getenv("BUILD_REVISION") - print("Using custom revision: " + rev) import version f = open("core/version_generated.gen.h", "w") - f.write("#define VERSION_SHORT_NAME " + str(version.short_name) + "\n") - f.write("#define VERSION_NAME " + str(version.name) + "\n") + 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") f.write("#define VERSION_MINOR " + str(version.minor) + "\n") if (hasattr(version, 'patch')): f.write("#define VERSION_PATCH " + str(version.patch) + "\n") - f.write("#define VERSION_REVISION " + str(rev) + "\n") - f.write("#define VERSION_STATUS " + str(version.status) + "\n") + f.write("#define VERSION_STATUS \"" + str(version.status) + "\"\n") + f.write("#define VERSION_BUILD \"" + str(build_name) + "\"\n") f.write("#define VERSION_MODULE_CONFIG \"" + str(version.module_config) + module_version_string + "\"\n") import datetime f.write("#define VERSION_YEAR " + str(datetime.datetime.now().year) + "\n") @@ -1686,6 +1686,17 @@ def find_visual_c_batch_file(env): (host_platform, target_platform,req_target_platform) = get_host_target(env) return find_batch_file(env, version, host_platform, target_platform)[0] +def generate_cpp_hint_file(filename): + import os.path + if os.path.isfile(filename): + # Don't overwrite an existing hint file since the user may have customized it. + pass + else: + try: + fd = open(filename, "w") + fd.write("#define GDCLASS(m_class, m_inherits)\n") + except IOError: + print("Could not write cpp.hint file.") def generate_vs_project(env, num_jobs): batch_file = find_visual_c_batch_file(env) @@ -1712,9 +1723,9 @@ def generate_vs_project(env, num_jobs): # to double quote off the directory. However, the path ends # in a backslash, so we need to remove this, lest it escape the # last double quote off, confusing MSBuild - env['MSVSBUILDCOM'] = build_commandline('scons --directory="$(ProjectDir.TrimEnd(\'\\\'))" platform=windows target=$(Configuration) tools=!tools! -j' + str(num_jobs)) - env['MSVSREBUILDCOM'] = build_commandline('scons --directory="$(ProjectDir.TrimEnd(\'\\\'))" platform=windows target=$(Configuration) tools=!tools! vsproj=yes -j' + str(num_jobs)) - env['MSVSCLEANCOM'] = build_commandline('scons --directory="$(ProjectDir.TrimEnd(\'\\\'))" --clean platform=windows target=$(Configuration) tools=!tools! -j' + str(num_jobs)) + env['MSVSBUILDCOM'] = build_commandline('scons --directory="$(ProjectDir.TrimEnd(\'\\\'))" platform=windows progress=no target=$(Configuration) tools=!tools! -j' + str(num_jobs)) + env['MSVSREBUILDCOM'] = build_commandline('scons --directory="$(ProjectDir.TrimEnd(\'\\\'))" platform=windows progress=no target=$(Configuration) tools=!tools! vsproj=yes -j' + str(num_jobs)) + env['MSVSCLEANCOM'] = build_commandline('scons --directory="$(ProjectDir.TrimEnd(\'\\\'))" --clean platform=windows progress=no target=$(Configuration) tools=!tools! -j' + str(num_jobs)) # This version information (Win32, x64, Debug, Release, Release_Debug seems to be # required for Visual Studio to understand that it needs to generate an NMAKE diff --git a/misc/dist/html/default.html b/misc/dist/html/default.html index 9fae34f97e..0f78fc640e 100644 --- a/misc/dist/html/default.html +++ b/misc/dist/html/default.html @@ -225,12 +225,11 @@ $GODOT_HEAD_INCLUDE <script type="text/javascript" src="$GODOT_BASENAME.js"></script> <script type="text/javascript">//<![CDATA[ - var game = new Engine; + var engine = new Engine; (function() { const BASENAME = '$GODOT_BASENAME'; - const MEMORY_SIZE = $GODOT_TOTAL_MEMORY; const DEBUG_ENABLED = $GODOT_DEBUG_ENABLED; const INDETERMINATE_STATUS_STEP_MS = 100; @@ -246,8 +245,7 @@ $GODOT_HEAD_INCLUDE var indeterminiateStatusAnimationId = 0; setStatusMode('indeterminate'); - game.setCanvas(canvas); - game.setAsmjsMemorySize(MEMORY_SIZE); + engine.setCanvas(canvas); function setStatusMode(mode) { @@ -302,7 +300,7 @@ $GODOT_HEAD_INCLUDE }); }; - game.setProgressFunc((current, total) => { + engine.setProgressFunc((current, total) => { if (total > 0) { statusProgressInner.style.width = current/total * 100 + '%'; @@ -332,10 +330,6 @@ $GODOT_HEAD_INCLUDE outputRoot.style.display = 'block'; function print(text) { - if (arguments.length > 1) { - text = Array.prototype.slice.call(arguments).join(" "); - } - if (text.length <= 0) return; while (outputScroll.childElementCount >= OUTPUT_MSG_COUNT_MAX) { outputScroll.firstChild.remove(); } @@ -356,26 +350,31 @@ $GODOT_HEAD_INCLUDE }; function printError(text) { - print('**ERROR**' + ":", text); + if (!text.startsWith('**ERROR**: ')) { + text = '**ERROR**: ' + text; + } + print(text); } - game.setStdoutFunc(text => { + engine.setStdoutFunc(text => { print(text); console.log(text); }); - game.setStderrFunc(text => { + engine.setStderrFunc(text => { printError(text); console.warn(text); }); } - game.start(BASENAME + '.pck').then(() => { + engine.startGame(BASENAME + '.pck').then(() => { setStatusMode('hidden'); initializing = false; }, err => { - if (DEBUG_ENABLED) + if (DEBUG_ENABLED) { printError(err.message); + console.warn(err); + } setStatusNotice(err.message); setStatusMode('notice'); initializing = false; diff --git a/misc/dist/ios_xcode/godot.iphone.debug.fat b/misc/dist/ios_xcode/godot.iphone.debug.fat deleted file mode 100755 index e69de29bb2..0000000000 --- a/misc/dist/ios_xcode/godot.iphone.debug.fat +++ /dev/null diff --git a/misc/dist/ios_xcode/godot.iphone.release.arm b/misc/dist/ios_xcode/godot.iphone.release.arm deleted file mode 100755 index e69de29bb2..0000000000 --- a/misc/dist/ios_xcode/godot.iphone.release.arm +++ /dev/null diff --git a/misc/dist/ios_xcode/godot.iphone.release.arm64 b/misc/dist/ios_xcode/godot.iphone.release.arm64 deleted file mode 100755 index e69de29bb2..0000000000 --- a/misc/dist/ios_xcode/godot.iphone.release.arm64 +++ /dev/null diff --git a/misc/dist/ios_xcode/godot.iphone.release.fat b/misc/dist/ios_xcode/godot.iphone.release.fat deleted file mode 100755 index e69de29bb2..0000000000 --- a/misc/dist/ios_xcode/godot.iphone.release.fat +++ /dev/null diff --git a/misc/dist/ios_xcode/godot_ios.xcodeproj/project.pbxproj b/misc/dist/ios_xcode/godot_ios.xcodeproj/project.pbxproj index 3f2db94193..ab15e35f63 100644 --- a/misc/dist/ios_xcode/godot_ios.xcodeproj/project.pbxproj +++ b/misc/dist/ios_xcode/godot_ios.xcodeproj/project.pbxproj @@ -8,8 +8,20 @@ /* Begin PBXBuildFile section */ 1F1575721F582BE20003B888 /* dylibs in Resources */ = {isa = PBXBuildFile; fileRef = 1F1575711F582BE20003B888 /* dylibs */; }; + 1FE926991FBBF85400F53A6F /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1FE926961FBBF7D400F53A6F /* SystemConfiguration.framework */; }; + 1FE9269A1FBBF85F00F53A6F /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1FE926951FBBF7C400F53A6F /* Security.framework */; }; + 1FE9269B1FBBF86200F53A6F /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1FE926941FBBF7BD00F53A6F /* QuartzCore.framework */; }; + 1FE9269C1FBBF86500F53A6F /* MediaPlayer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1FE926931FBBF7AD00F53A6F /* MediaPlayer.framework */; }; + 1FE9269D1FBBF86600F53A6F /* GameController.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1FE926921FBBF7A000F53A6F /* GameController.framework */; }; + 1FE9269E1FBBF86900F53A6F /* CoreMotion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1FE926911FBBF79500F53A6F /* CoreMotion.framework */; }; + 1FE9269F1FBBF86B00F53A6F /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1FE926901FBBF78E00F53A6F /* CoreMedia.framework */; }; + 1FE926A01FBBF86D00F53A6F /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1FE9268E1FBBF77300F53A6F /* AudioToolbox.framework */; }; + 1FE926A11FBBF86D00F53A6F /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1FE9268F1FBBF77F00F53A6F /* CoreAudio.framework */; }; + DEADBEEF2F582BE20003B888 /* $binary.a in Frameworks */ = {isa = PBXBuildFile; fileRef = DEADBEEF1F582BE20003B888 /* $binary.a */; }; + 1FF8DBB11FBA9DE1009DE660 /* dummy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1FF8DBB01FBA9DE1009DE660 /* dummy.cpp */; }; 1FF4C1851F584E3F00A41E41 /* GameKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1FF4C1841F584E3F00A41E41 /* GameKit.framework */; }; 1FF4C1871F584E5600A41E41 /* StoreKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1FF4C1861F584E5600A41E41 /* StoreKit.framework */; }; + 1FF4C1871F584E7600A41E41 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1FF4C1881F584E7600A41E41 /* StoreKit.framework */; }; D07CD43F1C5D573600B7FB28 /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D07CD4331C5D573600B7FB28 /* Default-568h@2x.png */; }; D07CD4411C5D573600B7FB28 /* Default-667h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = D07CD4351C5D573600B7FB28 /* Default-667h@2x.png */; }; D07CD4421C5D573600B7FB28 /* Default-Portrait-736h@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = D07CD4361C5D573600B7FB28 /* Default-Portrait-736h@3x.png */; }; @@ -26,14 +38,25 @@ D0BCFE4018AEBDA2004A7AAE /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D0BCFE3F18AEBDA2004A7AAE /* OpenGLES.framework */; }; D0BCFE4618AEBDA2004A7AAE /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = D0BCFE4418AEBDA2004A7AAE /* InfoPlist.strings */; }; D0BCFE7818AEBFEB004A7AAE /* $binary.pck in Resources */ = {isa = PBXBuildFile; fileRef = D0BCFE7718AEBFEB004A7AAE /* $binary.pck */; }; - D0BCFE7A18AEC06A004A7AAE /* $binary.iphone in Resources */ = {isa = PBXBuildFile; fileRef = D0BCFE7918AEC06A004A7AAE /* $binary.iphone */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ - 1F1575711F582BE20003B888 /* dylibs */ = {isa = PBXFileReference; lastKnownFileType = folder; name = dylibs; path = dylibs; sourceTree = "<group>"; }; + 1F1575711F582BE20003B888 /* dylibs */ = {isa = PBXFileReference; lastKnownFileType = folder; name = dylibs; path = "$binary/dylibs"; sourceTree = "<group>"; }; + 1FE9268E1FBBF77300F53A6F /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; }; + 1FE9268F1FBBF77F00F53A6F /* CoreAudio.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = System/Library/Frameworks/CoreAudio.framework; sourceTree = SDKROOT; }; + 1FE926901FBBF78E00F53A6F /* CoreMedia.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMedia.framework; path = System/Library/Frameworks/CoreMedia.framework; sourceTree = SDKROOT; }; + 1FE926911FBBF79500F53A6F /* CoreMotion.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMotion.framework; path = System/Library/Frameworks/CoreMotion.framework; sourceTree = SDKROOT; }; + 1FE926921FBBF7A000F53A6F /* GameController.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GameController.framework; path = System/Library/Frameworks/GameController.framework; sourceTree = SDKROOT; }; + 1FE926931FBBF7AD00F53A6F /* MediaPlayer.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MediaPlayer.framework; path = System/Library/Frameworks/MediaPlayer.framework; sourceTree = SDKROOT; }; + 1FE926941FBBF7BD00F53A6F /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; }; + 1FE926951FBBF7C400F53A6F /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; }; + 1FE926961FBBF7D400F53A6F /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; }; + DEADBEEF1F582BE20003B888 /* $binary.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = godot; path = "$binary.a"; sourceTree = "<group>"; }; 1FF4C1841F584E3F00A41E41 /* GameKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GameKit.framework; path = System/Library/Frameworks/GameKit.framework; sourceTree = SDKROOT; }; 1FF4C1861F584E5600A41E41 /* StoreKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = StoreKit.framework; path = System/Library/Frameworks/StoreKit.framework; sourceTree = SDKROOT; }; + 1FF4C1881F584E7600A41E41 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; }; 1FF4C1881F584E6300A41E41 /* $binary.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = $binary.entitlements; sourceTree = "<group>"; }; + 1FF8DBB01FBA9DE1009DE660 /* dummy.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = dummy.cpp; sourceTree = "<group>"; }; D07CD4331C5D573600B7FB28 /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = "<group>"; }; D07CD4351C5D573600B7FB28 /* Default-667h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-667h@2x.png"; sourceTree = "<group>"; }; D07CD4361C5D573600B7FB28 /* Default-Portrait-736h@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-Portrait-736h@3x.png"; sourceTree = "<group>"; }; @@ -51,24 +74,35 @@ D0BCFE3F18AEBDA2004A7AAE /* OpenGLES.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGLES.framework; path = System/Library/Frameworks/OpenGLES.framework; sourceTree = SDKROOT; }; D0BCFE4318AEBDA2004A7AAE /* $binary-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "$binary-Info.plist"; sourceTree = "<group>"; }; D0BCFE4518AEBDA2004A7AAE /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; }; - D0BCFE4918AEBDA2004A7AAE /* $binary-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "$binary-Prefix.pch"; sourceTree = "<group>"; }; - D0BCFE6118AEBDA3004A7AAE /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; }; D0BCFE7718AEBFEB004A7AAE /* $binary.pck */ = {isa = PBXFileReference; lastKnownFileType = file; path = $binary.pck; sourceTree = "<group>"; }; - D0BCFE7918AEC06A004A7AAE /* $binary.iphone */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; path = $binary.iphone; sourceTree = "<group>"; }; /* End PBXFileReference section */ + $additional_pbx_files + /* Begin PBXFrameworksBuildPhase section */ D0BCFE3118AEBDA2004A7AAE /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + D0BCFE3A18AEBDA2004A7AAE /* CoreGraphics.framework in Frameworks */, + 1FE926991FBBF85400F53A6F /* SystemConfiguration.framework in Frameworks */, + 1FE9269A1FBBF85F00F53A6F /* Security.framework in Frameworks */, + 1FE9269B1FBBF86200F53A6F /* QuartzCore.framework in Frameworks */, + 1FE9269C1FBBF86500F53A6F /* MediaPlayer.framework in Frameworks */, + 1FE9269D1FBBF86600F53A6F /* GameController.framework in Frameworks */, + 1FE9269E1FBBF86900F53A6F /* CoreMotion.framework in Frameworks */, + 1FE9269F1FBBF86B00F53A6F /* CoreMedia.framework in Frameworks */, + 1FE926A11FBBF86D00F53A6F /* CoreAudio.framework in Frameworks */, + 1FE926A01FBBF86D00F53A6F /* AudioToolbox.framework in Frameworks */, D0BCFE4018AEBDA2004A7AAE /* OpenGLES.framework in Frameworks */, 1FF4C1871F584E5600A41E41 /* StoreKit.framework in Frameworks */, - D0BCFE3A18AEBDA2004A7AAE /* CoreGraphics.framework in Frameworks */, + 1FF4C1871F584E7600A41E41 /* AVFoundation.framework in Frameworks */, D0BCFE3C18AEBDA2004A7AAE /* UIKit.framework in Frameworks */, 1FF4C1851F584E3F00A41E41 /* GameKit.framework in Frameworks */, D0BCFE3E18AEBDA2004A7AAE /* GLKit.framework in Frameworks */, D0BCFE3818AEBDA2004A7AAE /* Foundation.framework in Frameworks */, + DEADBEEF2F582BE20003B888 /* $binary.a */, + $additional_pbx_frameworks_build ); runOnlyForDeploymentPostprocessing = 0; }; @@ -79,11 +113,11 @@ isa = PBXGroup; children = ( 1F1575711F582BE20003B888 /* dylibs */, - D0BCFE7918AEC06A004A7AAE /* $binary.iphone */, D0BCFE7718AEBFEB004A7AAE /* $binary.pck */, D0BCFE4118AEBDA2004A7AAE /* $binary */, D0BCFE3618AEBDA2004A7AAE /* Frameworks */, D0BCFE3518AEBDA2004A7AAE /* Products */, + $additional_pbx_resources_refs ); sourceTree = "<group>"; }; @@ -98,14 +132,25 @@ D0BCFE3618AEBDA2004A7AAE /* Frameworks */ = { isa = PBXGroup; children = ( + 1FE926961FBBF7D400F53A6F /* SystemConfiguration.framework */, + 1FE926951FBBF7C400F53A6F /* Security.framework */, + 1FE926941FBBF7BD00F53A6F /* QuartzCore.framework */, + 1FE926931FBBF7AD00F53A6F /* MediaPlayer.framework */, + 1FE926921FBBF7A000F53A6F /* GameController.framework */, + 1FE926911FBBF79500F53A6F /* CoreMotion.framework */, + 1FE926901FBBF78E00F53A6F /* CoreMedia.framework */, + 1FE9268F1FBBF77F00F53A6F /* CoreAudio.framework */, + 1FE9268E1FBBF77300F53A6F /* AudioToolbox.framework */, 1FF4C1861F584E5600A41E41 /* StoreKit.framework */, 1FF4C1841F584E3F00A41E41 /* GameKit.framework */, + 1FF4C1881F584E7600A41E41 /* AVFoundation.framework */, D0BCFE3718AEBDA2004A7AAE /* Foundation.framework */, D0BCFE3918AEBDA2004A7AAE /* CoreGraphics.framework */, D0BCFE3B18AEBDA2004A7AAE /* UIKit.framework */, D0BCFE3D18AEBDA2004A7AAE /* GLKit.framework */, D0BCFE3F18AEBDA2004A7AAE /* OpenGLES.framework */, - D0BCFE6118AEBDA3004A7AAE /* XCTest.framework */, + DEADBEEF1F582BE20003B888 /* $binary.a */, + $additional_pbx_frameworks_refs ); name = Frameworks; sourceTree = "<group>"; @@ -124,6 +169,7 @@ D07CD43C1C5D573600B7FB28 /* Default-Portrait-1366h@2x.png */, D07CD44D1C5D589C00B7FB28 /* Images.xcassets */, D0BCFE4218AEBDA2004A7AAE /* Supporting Files */, + 1FF8DBB01FBA9DE1009DE660 /* dummy.cpp */, ); path = $binary; sourceTree = "<group>"; @@ -133,7 +179,6 @@ children = ( D0BCFE4318AEBDA2004A7AAE /* $binary-Info.plist */, D0BCFE4418AEBDA2004A7AAE /* InfoPlist.strings */, - D0BCFE4918AEBDA2004A7AAE /* $binary-Prefix.pch */, ); name = "Supporting Files"; sourceTree = "<group>"; @@ -218,7 +263,7 @@ D07CD4421C5D573600B7FB28 /* Default-Portrait-736h@3x.png in Resources */, D07CD4481C5D573600B7FB28 /* Default-Portrait-1366h@2x.png in Resources */, D0BCFE4618AEBDA2004A7AAE /* InfoPlist.strings in Resources */, - D0BCFE7A18AEC06A004A7AAE /* $binary.iphone in Resources */, + $additional_pbx_resources_build ); runOnlyForDeploymentPostprocessing = 0; }; @@ -229,6 +274,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + 1FF8DBB11FBA9DE1009DE660 /* dummy.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -250,7 +296,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)"; + ARCHS = "$godot_archs"; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; @@ -265,6 +311,8 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "$code_sign_identity_debug"; COPY_PHASE_STRIP = NO; + ENABLE_BITCODE = NO; + "FRAMEWORK_SEARCH_PATHS[arch=*]" = "$binary"; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; GCC_OPTIMIZATION_LEVEL = 0; @@ -280,7 +328,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; IPHONEOS_DEPLOYMENT_TARGET = 9.0; - ONLY_ACTIVE_ARCH = YES; + OTHER_LDFLAGS = "$linker_flags"; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; }; @@ -290,7 +338,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)"; + ARCHS = "$godot_archs"; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; @@ -306,6 +354,8 @@ CODE_SIGN_IDENTITY = "$code_sign_identity_release"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "$code_sign_identity_release"; COPY_PHASE_STRIP = YES; + ENABLE_BITCODE = NO; + "FRAMEWORK_SEARCH_PATHS[arch=*]" = "$binary"; ENABLE_NS_ASSERTIONS = NO; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; @@ -315,6 +365,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; IPHONEOS_DEPLOYMENT_TARGET = 9.0; + OTHER_LDFLAGS = "$linker_flags"; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; @@ -324,26 +375,23 @@ D0BCFE7218AEBDA3004A7AAE /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD)"; + ARCHS = "$godot_archs"; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_ENTITLEMENTS = $binary/$binary.entitlements; CODE_SIGN_IDENTITY = "$code_sign_identity_debug"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "$code_sign_identity_debug"; CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)"; DEVELOPMENT_TEAM = $team_id; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "$binary/$binary-Prefix.pch"; INFOPLIST_FILE = "$binary/$binary-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 9.0; LIBRARY_SEARCH_PATHS = ( "$(inherited)", - "$(PROJECT_DIR)/dylibs", ); PRODUCT_BUNDLE_IDENTIFIER = $identifier; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = "$provisioning_profile_uuid_debug"; TARGETED_DEVICE_FAMILY = "1,2"; - VALID_ARCHS = "armv7 armv7s"; + VALID_ARCHS = "armv7 armv7s arm64 i386 x86_64"; WRAPPER_EXTENSION = app; }; name = Debug; @@ -351,26 +399,23 @@ D0BCFE7318AEBDA3004A7AAE /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD)"; + ARCHS = "$godot_archs"; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_ENTITLEMENTS = $binary/$binary.entitlements; CODE_SIGN_IDENTITY = "$code_sign_identity_release"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "$code_sign_identity_release"; CONFIGURATION_BUILD_DIR = "$(BUILD_DIR)/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)"; DEVELOPMENT_TEAM = $team_id; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = "$binary/$binary-Prefix.pch"; INFOPLIST_FILE = "$binary/$binary-Info.plist"; IPHONEOS_DEPLOYMENT_TARGET = 9.0; LIBRARY_SEARCH_PATHS = ( "$(inherited)", - "$(PROJECT_DIR)/dylibs", ); PRODUCT_BUNDLE_IDENTIFIER = $identifier; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = "$provisioning_profile_uuid_release"; TARGETED_DEVICE_FAMILY = "1,2"; - VALID_ARCHS = "armv7 armv7s"; + VALID_ARCHS = "armv7 armv7s arm64 i386 x86_64"; WRAPPER_EXTENSION = app; }; name = Release; diff --git a/misc/dist/ios_xcode/godot_ios/dummy.cpp b/misc/dist/ios_xcode/godot_ios/dummy.cpp new file mode 100644 index 0000000000..78ec87fc10 --- /dev/null +++ b/misc/dist/ios_xcode/godot_ios/dummy.cpp @@ -0,0 +1 @@ +$cpp_code
\ No newline at end of file diff --git a/misc/dist/ios_xcode/godot_ios/dylibs/empty b/misc/dist/ios_xcode/godot_ios/dylibs/empty new file mode 100644 index 0000000000..4b5614362b --- /dev/null +++ b/misc/dist/ios_xcode/godot_ios/dylibs/empty @@ -0,0 +1 @@ +Dummy file to make dylibs folder exported
\ No newline at end of file diff --git a/misc/dist/ios_xcode/export_options.plist b/misc/dist/ios_xcode/godot_ios/export_options.plist index 86d89a6e42..3878a4dbe6 100644 --- a/misc/dist/ios_xcode/export_options.plist +++ b/misc/dist/ios_xcode/godot_ios/export_options.plist @@ -4,7 +4,17 @@ <dict> <key>method</key> <string>$export_method</string> + <key>teamID</key> <string>$team_id</string> + + <key>provisioningProfiles</key> + <dict> + <key>$identifier</key> + <string>$provisioning_profile_uuid</string> + </dict> + + <key>compileBitcode</key> + <false/> </dict> </plist>
\ No newline at end of file diff --git a/misc/dist/ios_xcode/godot_ios/godot_ios-Info.plist b/misc/dist/ios_xcode/godot_ios/godot_ios-Info.plist index 1531a41bd0..70932c1943 100644 --- a/misc/dist/ios_xcode/godot_ios/godot_ios-Info.plist +++ b/misc/dist/ios_xcode/godot_ios/godot_ios-Info.plist @@ -7,7 +7,7 @@ <key>CFBundleDisplayName</key> <string>$name</string> <key>CFBundleExecutable</key> - <string>$binary.iphone</string> + <string>$binary</string> <key>CFBundleIcons</key> <dict/> <key>CFBundleIcons~ipad</key> @@ -47,5 +47,6 @@ <string>UIInterfaceOrientationLandscapeLeft</string> <string>UIInterfaceOrientationLandscapeRight</string> </array> + $additional_plist_content </dict> </plist> diff --git a/misc/dist/ios_xcode/godot.iphone.debug.arm b/misc/dist/ios_xcode/libgodot.iphone.debug.fat.a index e69de29bb2..e69de29bb2 100755..100644 --- a/misc/dist/ios_xcode/godot.iphone.debug.arm +++ b/misc/dist/ios_xcode/libgodot.iphone.debug.fat.a diff --git a/misc/dist/ios_xcode/godot.iphone.debug.arm64 b/misc/dist/ios_xcode/libgodot.iphone.release.fat.a index e69de29bb2..e69de29bb2 100755..100644 --- a/misc/dist/ios_xcode/godot.iphone.debug.arm64 +++ b/misc/dist/ios_xcode/libgodot.iphone.release.fat.a diff --git a/modules/bullet/godot_result_callbacks.cpp b/modules/bullet/godot_result_callbacks.cpp index bc60c9cb6b..cbf30c8a2e 100644 --- a/modules/bullet/godot_result_callbacks.cpp +++ b/modules/bullet/godot_result_callbacks.cpp @@ -77,7 +77,7 @@ btScalar GodotAllConvexResultCallback::addSingleResult(btCollisionWorld::LocalCo PhysicsDirectSpaceState::ShapeResult &result = m_results[count]; - result.shape = convexResult.m_localShapeInfo->m_shapePart; + result.shape = convexResult.m_localShapeInfo->m_triangleIndex; // "m_triangleIndex" Is a odd name but contains the compound shape ID result.rid = gObj->get_self(); result.collider_id = gObj->get_instance_id(); result.collider = 0 == result.collider_id ? NULL : ObjectDB::get_instance(result.collider_id); @@ -122,7 +122,7 @@ bool GodotClosestConvexResultCallback::needsCollision(btBroadphaseProxy *proxy0) btScalar GodotClosestConvexResultCallback::addSingleResult(btCollisionWorld::LocalConvexResult &convexResult, bool normalInWorldSpace) { btScalar res = btCollisionWorld::ClosestConvexResultCallback::addSingleResult(convexResult, normalInWorldSpace); - m_shapePart = convexResult.m_localShapeInfo->m_shapePart; + m_shapeId = convexResult.m_localShapeInfo->m_triangleIndex; // "m_triangleIndex" Is a odd name but contains the compound shape ID return res; } @@ -242,3 +242,21 @@ btScalar GodotRestInfoContactResultCallback::addSingleResult(btManifoldPoint &cp return cp.getDistance(); } + +void GodotDeepPenetrationContactResultCallback::addContactPoint(const btVector3 &normalOnBInWorld, const btVector3 &pointInWorldOnB, btScalar depth) { + + if (depth < 0) { + // Has penetration + if (m_most_penetrated_distance > depth) { + + bool isSwapped = m_manifoldPtr->getBody0() != m_body0Wrap->getCollisionObject(); + + m_most_penetrated_distance = depth; + m_pointCollisionObject = (isSwapped ? m_body0Wrap : m_body1Wrap)->getCollisionObject(); + m_other_compound_shape_index = isSwapped ? m_index1 : m_index0; + m_pointNormalWorld = isSwapped ? normalOnBInWorld * -1 : normalOnBInWorld; + m_pointWorld = isSwapped ? (pointInWorldOnB + normalOnBInWorld * depth) : pointInWorldOnB; + m_penetration_distance = depth; + } + } +} diff --git a/modules/bullet/godot_result_callbacks.h b/modules/bullet/godot_result_callbacks.h index 68dff5b12a..ba5142676b 100644 --- a/modules/bullet/godot_result_callbacks.h +++ b/modules/bullet/godot_result_callbacks.h @@ -88,7 +88,7 @@ public: struct GodotClosestConvexResultCallback : public btCollisionWorld::ClosestConvexResultCallback { public: const Set<RID> *m_exclude; - int m_shapePart; + int m_shapeId; GodotClosestConvexResultCallback(const btVector3 &convexFromWorld, const btVector3 &convexToWorld, const Set<RID> *p_exclude) : btCollisionWorld::ClosestConvexResultCallback(convexFromWorld, convexToWorld), m_exclude(p_exclude) {} @@ -149,4 +149,31 @@ public: virtual btScalar addSingleResult(btManifoldPoint &cp, const btCollisionObjectWrapper *colObj0Wrap, int partId0, int index0, const btCollisionObjectWrapper *colObj1Wrap, int partId1, int index1); }; +struct GodotDeepPenetrationContactResultCallback : public btManifoldResult { + btVector3 m_pointNormalWorld; + btVector3 m_pointWorld; + btScalar m_penetration_distance; + int m_other_compound_shape_index; + const btCollisionObject *m_pointCollisionObject; + + btScalar m_most_penetrated_distance; + + GodotDeepPenetrationContactResultCallback(const btCollisionObjectWrapper *body0Wrap, const btCollisionObjectWrapper *body1Wrap) + : btManifoldResult(body0Wrap, body1Wrap), + m_pointCollisionObject(NULL), + m_penetration_distance(0), + m_other_compound_shape_index(0), + m_most_penetrated_distance(1e20) {} + + void reset() { + m_pointCollisionObject = NULL; + m_most_penetrated_distance = 1e20; + } + + bool hasHit() { + return m_pointCollisionObject; + } + + virtual void addContactPoint(const btVector3 &normalOnBInWorld, const btVector3 &pointInWorld, btScalar depth); +}; #endif // GODOT_RESULT_CALLBACKS_H diff --git a/modules/bullet/rigid_body_bullet.cpp b/modules/bullet/rigid_body_bullet.cpp index 98ae82bc5f..f5ab8221e3 100644 --- a/modules/bullet/rigid_body_bullet.cpp +++ b/modules/bullet/rigid_body_bullet.cpp @@ -511,12 +511,14 @@ void RigidBodyBullet::set_mode(PhysicsServer::BodyMode p_mode) { mode = PhysicsServer::BODY_MODE_RIGID; set_axis_lock(axis_lock); // Reload axis lock _internal_set_mass(0 == mass ? 1 : mass); + scratch_space_override_modificator(); break; } case PhysicsServer::BODY_MODE_CHARACTER: { mode = PhysicsServer::BODY_MODE_CHARACTER; set_axis_lock(axis_lock); // Reload axis lock _internal_set_mass(0 == mass ? 1 : mass); + scratch_space_override_modificator(); break; } } diff --git a/modules/bullet/space_bullet.cpp b/modules/bullet/space_bullet.cpp index 9df01aee3e..c82a1d1668 100644 --- a/modules/bullet/space_bullet.cpp +++ b/modules/bullet/space_bullet.cpp @@ -53,7 +53,7 @@ BulletPhysicsDirectSpaceState::BulletPhysicsDirectSpaceState(SpaceBullet *p_space) : PhysicsDirectSpaceState(), space(p_space) {} -int BulletPhysicsDirectSpaceState::intersect_point(const Vector3 &p_point, ShapeResult *r_results, int p_result_max, const Set<RID> &p_exclude, uint32_t p_collision_layer, uint32_t p_object_type_mask) { +int BulletPhysicsDirectSpaceState::intersect_point(const Vector3 &p_point, ShapeResult *r_results, int p_result_max, const Set<RID> &p_exclude, uint32_t p_collision_mask) { if (p_result_max <= 0) return 0; @@ -68,15 +68,15 @@ int BulletPhysicsDirectSpaceState::intersect_point(const Vector3 &p_point, Shape // Setup query GodotAllContactResultCallback btResult(&collision_object_point, r_results, p_result_max, &p_exclude); - btResult.m_collisionFilterGroup = p_collision_layer; - btResult.m_collisionFilterMask = p_object_type_mask; + btResult.m_collisionFilterGroup = 0; + btResult.m_collisionFilterMask = p_collision_mask; space->dynamicsWorld->contactTest(&collision_object_point, btResult); // The results is already populated by GodotAllConvexResultCallback return btResult.m_count; } -bool BulletPhysicsDirectSpaceState::intersect_ray(const Vector3 &p_from, const Vector3 &p_to, RayResult &r_result, const Set<RID> &p_exclude, uint32_t p_collision_layer, uint32_t p_object_type_mask, bool p_pick_ray) { +bool BulletPhysicsDirectSpaceState::intersect_ray(const Vector3 &p_from, const Vector3 &p_to, RayResult &r_result, const Set<RID> &p_exclude, uint32_t p_collision_mask, bool p_pick_ray) { btVector3 btVec_from; btVector3 btVec_to; @@ -86,8 +86,8 @@ bool BulletPhysicsDirectSpaceState::intersect_ray(const Vector3 &p_from, const V // setup query GodotClosestRayResultCallback btResult(btVec_from, btVec_to, &p_exclude); - btResult.m_collisionFilterGroup = p_collision_layer; - btResult.m_collisionFilterMask = p_object_type_mask; + btResult.m_collisionFilterGroup = 0; + btResult.m_collisionFilterMask = p_collision_mask; btResult.m_pickRay = p_pick_ray; space->dynamicsWorld->rayTest(btVec_from, btVec_to, btResult); @@ -109,18 +109,19 @@ bool BulletPhysicsDirectSpaceState::intersect_ray(const Vector3 &p_from, const V } } -int BulletPhysicsDirectSpaceState::intersect_shape(const RID &p_shape, const Transform &p_xform, float p_margin, ShapeResult *p_results, int p_result_max, const Set<RID> &p_exclude, uint32_t p_collision_layer, uint32_t p_object_type_mask) { +int BulletPhysicsDirectSpaceState::intersect_shape(const RID &p_shape, const Transform &p_xform, float p_margin, ShapeResult *p_results, int p_result_max, const Set<RID> &p_exclude, uint32_t p_collision_mask) { if (p_result_max <= 0) return 0; ShapeBullet *shape = space->get_physics_server()->get_shape_owner()->get(p_shape); - btConvexShape *btConvex = dynamic_cast<btConvexShape *>(shape->create_bt_shape()); - if (!btConvex) { - bulletdelete(btConvex); + btCollisionShape *btShape = shape->create_bt_shape(); + if (!btShape->isConvex()) { + bulletdelete(btShape); ERR_PRINTS("The shape is not a convex shape, then is not supported: shape type: " + itos(shape->get_type())); return 0; } + btConvexShape *btConvex = static_cast<btConvexShape *>(btShape); btVector3 scale_with_margin; G_TO_B(p_xform.basis.get_scale(), scale_with_margin); @@ -134,8 +135,8 @@ int BulletPhysicsDirectSpaceState::intersect_shape(const RID &p_shape, const Tra collision_object.setWorldTransform(bt_xform); GodotAllContactResultCallback btQuery(&collision_object, p_results, p_result_max, &p_exclude); - btQuery.m_collisionFilterGroup = p_collision_layer; - btQuery.m_collisionFilterMask = p_object_type_mask; + btQuery.m_collisionFilterGroup = 0; + btQuery.m_collisionFilterMask = p_collision_mask; btQuery.m_closestDistanceThreshold = p_margin; space->dynamicsWorld->contactTest(&collision_object, btQuery); @@ -144,15 +145,16 @@ int BulletPhysicsDirectSpaceState::intersect_shape(const RID &p_shape, const Tra return btQuery.m_count; } -bool BulletPhysicsDirectSpaceState::cast_motion(const RID &p_shape, const Transform &p_xform, const Vector3 &p_motion, float p_margin, float &p_closest_safe, float &p_closest_unsafe, const Set<RID> &p_exclude, uint32_t p_collision_layer, uint32_t p_object_type_mask, ShapeRestInfo *r_info) { +bool BulletPhysicsDirectSpaceState::cast_motion(const RID &p_shape, const Transform &p_xform, const Vector3 &p_motion, float p_margin, float &p_closest_safe, float &p_closest_unsafe, const Set<RID> &p_exclude, uint32_t p_collision_mask, ShapeRestInfo *r_info) { ShapeBullet *shape = space->get_physics_server()->get_shape_owner()->get(p_shape); - btConvexShape *bt_convex_shape = dynamic_cast<btConvexShape *>(shape->create_bt_shape()); - if (!bt_convex_shape) { - bulletdelete(bt_convex_shape); + btCollisionShape *btShape = shape->create_bt_shape(); + if (!btShape->isConvex()) { + bulletdelete(btShape); ERR_PRINTS("The shape is not a convex shape, then is not supported: shape type: " + itos(shape->get_type())); return 0; } + btConvexShape *bt_convex_shape = static_cast<btConvexShape *>(btShape); btVector3 bt_motion; G_TO_B(p_motion, bt_motion); @@ -168,22 +170,24 @@ bool BulletPhysicsDirectSpaceState::cast_motion(const RID &p_shape, const Transf bt_xform_to.getOrigin() += bt_motion; GodotClosestConvexResultCallback btResult(bt_xform_from.getOrigin(), bt_xform_to.getOrigin(), &p_exclude); - btResult.m_collisionFilterGroup = p_collision_layer; - btResult.m_collisionFilterMask = p_object_type_mask; + btResult.m_collisionFilterGroup = 0; + btResult.m_collisionFilterMask = p_collision_mask; space->dynamicsWorld->convexSweepTest(bt_convex_shape, bt_xform_from, bt_xform_to, btResult, 0.002); if (btResult.hasHit()) { - if (btCollisionObject::CO_RIGID_BODY == btResult.m_hitCollisionObject->getInternalType()) { - B_TO_G(static_cast<const btRigidBody *>(btResult.m_hitCollisionObject)->getVelocityInLocalPoint(btResult.m_hitPointWorld), r_info->linear_velocity); - } - CollisionObjectBullet *collision_object = static_cast<CollisionObjectBullet *>(btResult.m_hitCollisionObject->getUserPointer()); p_closest_safe = p_closest_unsafe = btResult.m_closestHitFraction; - B_TO_G(btResult.m_hitPointWorld, r_info->point); - B_TO_G(btResult.m_hitNormalWorld, r_info->normal); - r_info->rid = collision_object->get_self(); - r_info->collider_id = collision_object->get_instance_id(); - r_info->shape = btResult.m_shapePart; + if (r_info) { + if (btCollisionObject::CO_RIGID_BODY == btResult.m_hitCollisionObject->getInternalType()) { + B_TO_G(static_cast<const btRigidBody *>(btResult.m_hitCollisionObject)->getVelocityInLocalPoint(btResult.m_hitPointWorld), r_info->linear_velocity); + } + CollisionObjectBullet *collision_object = static_cast<CollisionObjectBullet *>(btResult.m_hitCollisionObject->getUserPointer()); + B_TO_G(btResult.m_hitPointWorld, r_info->point); + B_TO_G(btResult.m_hitNormalWorld, r_info->normal); + r_info->rid = collision_object->get_self(); + r_info->collider_id = collision_object->get_instance_id(); + r_info->shape = btResult.m_shapeId; + } } bulletdelete(bt_convex_shape); @@ -191,18 +195,19 @@ bool BulletPhysicsDirectSpaceState::cast_motion(const RID &p_shape, const Transf } /// Returns the list of contacts pairs in this order: Local contact, other body contact -bool BulletPhysicsDirectSpaceState::collide_shape(RID p_shape, const Transform &p_shape_xform, float p_margin, Vector3 *r_results, int p_result_max, int &r_result_count, const Set<RID> &p_exclude, uint32_t p_collision_layer, uint32_t p_object_type_mask) { +bool BulletPhysicsDirectSpaceState::collide_shape(RID p_shape, const Transform &p_shape_xform, float p_margin, Vector3 *r_results, int p_result_max, int &r_result_count, const Set<RID> &p_exclude, uint32_t p_collision_mask) { if (p_result_max <= 0) return 0; ShapeBullet *shape = space->get_physics_server()->get_shape_owner()->get(p_shape); - btConvexShape *btConvex = dynamic_cast<btConvexShape *>(shape->create_bt_shape()); - if (!btConvex) { - bulletdelete(btConvex); + btCollisionShape *btShape = shape->create_bt_shape(); + if (!btShape->isConvex()) { + bulletdelete(btShape); ERR_PRINTS("The shape is not a convex shape, then is not supported: shape type: " + itos(shape->get_type())); return 0; } + btConvexShape *btConvex = static_cast<btConvexShape *>(btShape); btVector3 scale_with_margin; G_TO_B(p_shape_xform.basis.get_scale(), scale_with_margin); @@ -216,8 +221,8 @@ bool BulletPhysicsDirectSpaceState::collide_shape(RID p_shape, const Transform & collision_object.setWorldTransform(bt_xform); GodotContactPairContactResultCallback btQuery(&collision_object, r_results, p_result_max, &p_exclude); - btQuery.m_collisionFilterGroup = p_collision_layer; - btQuery.m_collisionFilterMask = p_object_type_mask; + btQuery.m_collisionFilterGroup = 0; + btQuery.m_collisionFilterMask = p_collision_mask; btQuery.m_closestDistanceThreshold = p_margin; space->dynamicsWorld->contactTest(&collision_object, btQuery); @@ -227,16 +232,17 @@ bool BulletPhysicsDirectSpaceState::collide_shape(RID p_shape, const Transform & return btQuery.m_count; } -bool BulletPhysicsDirectSpaceState::rest_info(RID p_shape, const Transform &p_shape_xform, float p_margin, ShapeRestInfo *r_info, const Set<RID> &p_exclude, uint32_t p_collision_layer, uint32_t p_object_type_mask) { +bool BulletPhysicsDirectSpaceState::rest_info(RID p_shape, const Transform &p_shape_xform, float p_margin, ShapeRestInfo *r_info, const Set<RID> &p_exclude, uint32_t p_collision_mask) { ShapeBullet *shape = space->get_physics_server()->get_shape_owner()->get(p_shape); - btConvexShape *btConvex = dynamic_cast<btConvexShape *>(shape->create_bt_shape()); - if (!btConvex) { - bulletdelete(btConvex); + btCollisionShape *btShape = shape->create_bt_shape(); + if (!btShape->isConvex()) { + bulletdelete(btShape); ERR_PRINTS("The shape is not a convex shape, then is not supported: shape type: " + itos(shape->get_type())); return 0; } + btConvexShape *btConvex = static_cast<btConvexShape *>(btShape); btVector3 scale_with_margin; G_TO_B(p_shape_xform.basis.get_scale() + Vector3(p_margin, p_margin, p_margin), scale_with_margin); @@ -250,8 +256,8 @@ bool BulletPhysicsDirectSpaceState::rest_info(RID p_shape, const Transform &p_sh collision_object.setWorldTransform(bt_xform); GodotRestInfoContactResultCallback btQuery(&collision_object, r_info, &p_exclude); - btQuery.m_collisionFilterGroup = p_collision_layer; - btQuery.m_collisionFilterMask = p_object_type_mask; + btQuery.m_collisionFilterGroup = 0; + btQuery.m_collisionFilterMask = p_collision_mask; btQuery.m_closestDistanceThreshold = p_margin; space->dynamicsWorld->contactTest(&collision_object, btQuery); @@ -777,7 +783,8 @@ void SpaceBullet::check_body_collision() { void SpaceBullet::update_gravity() { btVector3 btGravity; G_TO_B(gravityDirection * gravityMagnitude, btGravity); - dynamicsWorld->setGravity(btGravity); + //dynamicsWorld->setGravity(btGravity); + dynamicsWorld->setGravity(btVector3(0, 0, 0)); if (soft_body_world_info) { soft_body_world_info->m_gravity = btGravity; } @@ -877,11 +884,11 @@ bool SpaceBullet::test_body_motion(RigidBodyBullet *p_body, const Transform &p_f continue; } - btConvexShape *convex_shape_test(dynamic_cast<btConvexShape *>(p_body->get_bt_shape(shIndex))); - if (!convex_shape_test) { + if (!p_body->get_bt_shape(shIndex)->isConvex()) { // Skip no convex shape continue; } + btConvexShape *convex_shape_test(static_cast<btConvexShape *>(p_body->get_bt_shape(shIndex))); btTransform shape_world_from; G_TO_B(p_body->get_shape_transform(shIndex), shape_world_from); @@ -910,26 +917,26 @@ bool SpaceBullet::test_body_motion(RigidBodyBullet *p_body, const Transform &p_f { /// Phase three - Recover + contact test with margin - RecoverResult recover_result; + RecoverResult r_recover_result; - hasPenetration = recover_from_penetration(p_body, body_safe_position, recovered_motion, &recover_result); + hasPenetration = recover_from_penetration(p_body, body_safe_position, recovered_motion, &r_recover_result); if (r_result) { B_TO_G(recovered_motion + recover_initial_position, r_result->motion); if (hasPenetration) { - const btRigidBody *btRigid = static_cast<const btRigidBody *>(recover_result.other_collision_object); + const btRigidBody *btRigid = static_cast<const btRigidBody *>(r_recover_result.other_collision_object); CollisionObjectBullet *collisionObject = static_cast<CollisionObjectBullet *>(btRigid->getUserPointer()); r_result->remainder = p_motion - r_result->motion; // is the remaining movements - B_TO_G(recover_result.pointWorld, r_result->collision_point); - B_TO_G(recover_result.pointNormalWorld, r_result->collision_normal); - B_TO_G(btRigid->getVelocityInLocalPoint(recover_result.pointWorld - btRigid->getWorldTransform().getOrigin()), r_result->collider_velocity); // It calculates velocity at point and assign it using special function Bullet_to_Godot + B_TO_G(r_recover_result.pointWorld, r_result->collision_point); + B_TO_G(r_recover_result.pointNormalWorld, r_result->collision_normal); + B_TO_G(btRigid->getVelocityInLocalPoint(r_recover_result.pointWorld - btRigid->getWorldTransform().getOrigin()), r_result->collider_velocity); // It calculates velocity at point and assign it using special function Bullet_to_Godot r_result->collider = collisionObject->get_self(); r_result->collider_id = collisionObject->get_instance_id(); - r_result->collider_shape = recover_result.other_compound_shape_index; - r_result->collision_local_shape = recover_result.local_shape_most_recovered; + r_result->collider_shape = r_recover_result.other_compound_shape_index; + r_result->collision_local_shape = r_recover_result.local_shape_most_recovered; //{ /// Add manifold point to manage collisions // btPersistentManifold* manifold = dynamicsWorld->getDispatcher()->getNewManifold(p_body->getBtBody(), btRigid); @@ -995,7 +1002,7 @@ public: } }; -bool SpaceBullet::recover_from_penetration(RigidBodyBullet *p_body, const btTransform &p_body_position, btVector3 &out_recover_position, RecoverResult *recover_result) { +bool SpaceBullet::recover_from_penetration(RigidBodyBullet *p_body, const btTransform &p_body_position, btVector3 &r_recover_position, RecoverResult *r_recover_result) { RecoverPenetrationBroadPhaseCallback recover_broad_result(p_body->get_bt_collision_object(), p_body->get_collision_layer(), p_body->get_collision_mask()); @@ -1005,9 +1012,6 @@ bool SpaceBullet::recover_from_penetration(RigidBodyBullet *p_body, const btTran // Broad phase support btVector3 minAabb, maxAabb; - // GJK support - btGjkPairDetector::ClosestPointInput gjk_input; - bool penetration = false; // For each shape @@ -1022,7 +1026,7 @@ bool SpaceBullet::recover_from_penetration(RigidBodyBullet *p_body, const btTran body_shape_position = p_body_position * kin_shape.transform; body_shape_position_recovered = body_shape_position; - body_shape_position_recovered.getOrigin() += out_recover_position; + body_shape_position_recovered.getOrigin() += r_recover_position; kin_shape.shape->getAabb(body_shape_position_recovered, minAabb, maxAabb); dynamicsWorld->getBroadphase()->aabbTest(minAabb, maxAabb, recover_broad_result); @@ -1032,66 +1036,33 @@ bool SpaceBullet::recover_from_penetration(RigidBodyBullet *p_body, const btTran if (!p_body->get_bt_collision_object()->checkCollideWith(otherObject) || !otherObject->checkCollideWith(p_body->get_bt_collision_object())) continue; - if (otherObject->getCollisionShape()->isCompound()) { /// Execute GJK test against all shapes + if (otherObject->getCollisionShape()->isCompound()) { // Each convex shape btCompoundShape *cs = static_cast<btCompoundShape *>(otherObject->getCollisionShape()); for (int x = cs->getNumChildShapes() - 1; 0 <= x; --x) { - if (!cs->getChildShape(x)->isConvex()) - continue; + if (cs->getChildShape(x)->isConvex()) { + if (RFP_convex_convex_test(kin_shape.shape, static_cast<const btConvexShape *>(cs->getChildShape(x)), otherObject, x, body_shape_position, otherObject->getWorldTransform() * cs->getChildTransform(x), r_recover_position, r_recover_result)) { - // Initialize GJK input - gjk_input.m_transformA = body_shape_position; - gjk_input.m_transformA.getOrigin() += out_recover_position; - gjk_input.m_transformB = otherObject->getWorldTransform() * cs->getChildTransform(x); + penetration = true; + } + } else { + if (RFP_convex_world_test(kin_shape.shape, cs->getChildShape(x), p_body->get_bt_collision_object(), otherObject, kinIndex, x, body_shape_position, otherObject->getWorldTransform() * cs->getChildTransform(x), r_recover_position, r_recover_result)) { - // Perform GJK test - btPointCollector result; - btGjkPairDetector gjk_pair_detector(kin_shape.shape, static_cast<const btConvexShape *>(cs->getChildShape(x)), gjk_simplex_solver, gjk_epa_pen_solver); - gjk_pair_detector.getClosestPoints(gjk_input, result, 0); - if (0 > result.m_distance) { - // Has penetration - out_recover_position += result.m_normalOnBInWorld * (result.m_distance * -1); - penetration = true; - - if (recover_result) { - - recover_result->hasPenetration = true; - recover_result->other_collision_object = otherObject; - recover_result->other_compound_shape_index = x; - recover_result->penetration_distance = result.m_distance; - recover_result->pointNormalWorld = result.m_normalOnBInWorld; - recover_result->pointWorld = result.m_pointInWorld; + penetration = true; } } } - } else if (otherObject->getCollisionShape()->isConvex()) { /// Execute GJK test against object shape + if (RFP_convex_convex_test(kin_shape.shape, static_cast<const btConvexShape *>(otherObject->getCollisionShape()), otherObject, 0, body_shape_position, otherObject->getWorldTransform(), r_recover_position, r_recover_result)) { - // Initialize GJK input - gjk_input.m_transformA = body_shape_position; - gjk_input.m_transformA.getOrigin() += out_recover_position; - gjk_input.m_transformB = otherObject->getWorldTransform(); - - // Perform GJK test - btPointCollector result; - btGjkPairDetector gjk_pair_detector(kin_shape.shape, static_cast<const btConvexShape *>(otherObject->getCollisionShape()), gjk_simplex_solver, gjk_epa_pen_solver); - gjk_pair_detector.getClosestPoints(gjk_input, result, 0); - if (0 > result.m_distance) { - // Has penetration - out_recover_position += result.m_normalOnBInWorld * (result.m_distance * -1); penetration = true; + } + } else { + if (RFP_convex_world_test(kin_shape.shape, otherObject->getCollisionShape(), p_body->get_bt_collision_object(), otherObject, kinIndex, 0, body_shape_position, otherObject->getWorldTransform(), r_recover_position, r_recover_result)) { - if (recover_result) { - - recover_result->hasPenetration = true; - recover_result->other_collision_object = otherObject; - recover_result->other_compound_shape_index = 0; - recover_result->penetration_distance = result.m_distance; - recover_result->pointNormalWorld = result.m_normalOnBInWorld; - recover_result->pointWorld = result.m_pointInWorld; - } + penetration = true; } } } @@ -1099,3 +1070,70 @@ bool SpaceBullet::recover_from_penetration(RigidBodyBullet *p_body, const btTran return penetration; } + +bool SpaceBullet::RFP_convex_convex_test(const btConvexShape *p_shapeA, const btConvexShape *p_shapeB, btCollisionObject *p_objectB, int p_shapeId_B, const btTransform &p_transformA, const btTransform &p_transformB, btVector3 &r_recover_position, RecoverResult *r_recover_result) { + + // Initialize GJK input + btGjkPairDetector::ClosestPointInput gjk_input; + gjk_input.m_transformA = p_transformA; + gjk_input.m_transformA.getOrigin() += r_recover_position; + gjk_input.m_transformB = p_transformB; + + // Perform GJK test + btPointCollector result; + btGjkPairDetector gjk_pair_detector(p_shapeA, p_shapeB, gjk_simplex_solver, gjk_epa_pen_solver); + gjk_pair_detector.getClosestPoints(gjk_input, result, 0); + if (0 > result.m_distance) { + // Has penetration + r_recover_position += result.m_normalOnBInWorld * (result.m_distance * -1); + + if (r_recover_result) { + + r_recover_result->hasPenetration = true; + r_recover_result->other_collision_object = p_objectB; + r_recover_result->other_compound_shape_index = p_shapeId_B; + r_recover_result->penetration_distance = result.m_distance; + r_recover_result->pointNormalWorld = result.m_normalOnBInWorld; + r_recover_result->pointWorld = result.m_pointInWorld; + } + return true; + } + return false; +} + +bool SpaceBullet::RFP_convex_world_test(const btConvexShape *p_shapeA, const btCollisionShape *p_shapeB, btCollisionObject *p_objectA, btCollisionObject *p_objectB, int p_shapeId_A, int p_shapeId_B, const btTransform &p_transformA, const btTransform &p_transformB, btVector3 &r_recover_position, RecoverResult *r_recover_result) { + + /// Contact test + + btTransform p_recovered_transformA(p_transformA); + p_recovered_transformA.getOrigin() += r_recover_position; + + btCollisionObjectWrapper obA(NULL, p_shapeA, p_objectA, p_recovered_transformA, -1, p_shapeId_A); + btCollisionObjectWrapper obB(NULL, p_shapeB, p_objectB, p_transformB, -1, p_shapeId_B); + + btCollisionAlgorithm *algorithm = dispatcher->findAlgorithm(&obA, &obB, NULL, BT_CLOSEST_POINT_ALGORITHMS); + if (algorithm) { + GodotDeepPenetrationContactResultCallback contactPointResult(&obA, &obB); + //discrete collision detection query + algorithm->processCollision(&obA, &obB, dynamicsWorld->getDispatchInfo(), &contactPointResult); + + algorithm->~btCollisionAlgorithm(); + dispatcher->freeCollisionAlgorithm(algorithm); + + if (contactPointResult.hasHit()) { + r_recover_position += contactPointResult.m_pointNormalWorld * (contactPointResult.m_penetration_distance * -1); + + if (r_recover_result) { + + r_recover_result->hasPenetration = true; + r_recover_result->other_collision_object = p_objectB; + r_recover_result->other_compound_shape_index = p_shapeId_B; + r_recover_result->penetration_distance = contactPointResult.m_penetration_distance; + r_recover_result->pointNormalWorld = contactPointResult.m_pointNormalWorld; + r_recover_result->pointWorld = contactPointResult.m_pointWorld; + } + return true; + } + } + return false; +} diff --git a/modules/bullet/space_bullet.h b/modules/bullet/space_bullet.h index d9206f8046..99bcfb8563 100644 --- a/modules/bullet/space_bullet.h +++ b/modules/bullet/space_bullet.h @@ -69,13 +69,13 @@ private: public: BulletPhysicsDirectSpaceState(SpaceBullet *p_space); - virtual int intersect_point(const Vector3 &p_point, ShapeResult *r_results, int p_result_max, const Set<RID> &p_exclude = Set<RID>(), uint32_t p_collision_layer = 0xFFFFFFFF, uint32_t p_object_type_mask = TYPE_MASK_COLLISION); - virtual bool intersect_ray(const Vector3 &p_from, const Vector3 &p_to, RayResult &r_result, const Set<RID> &p_exclude = Set<RID>(), uint32_t p_collision_layer = 0xFFFFFFFF, uint32_t p_object_type_mask = TYPE_MASK_COLLISION, bool p_pick_ray = false); - virtual int intersect_shape(const RID &p_shape, const Transform &p_xform, float p_margin, ShapeResult *r_results, int p_result_max, const Set<RID> &p_exclude = Set<RID>(), uint32_t p_collision_layer = 0xFFFFFFFF, uint32_t p_object_type_mask = TYPE_MASK_COLLISION); - virtual bool cast_motion(const RID &p_shape, const Transform &p_xform, const Vector3 &p_motion, float p_margin, float &p_closest_safe, float &p_closest_unsafe, const Set<RID> &p_exclude = Set<RID>(), uint32_t p_collision_layer = 0xFFFFFFFF, uint32_t p_object_type_mask = TYPE_MASK_COLLISION, ShapeRestInfo *r_info = NULL); + virtual int intersect_point(const Vector3 &p_point, ShapeResult *r_results, int p_result_max, const Set<RID> &p_exclude = Set<RID>(), uint32_t p_collision_mask = 0xFFFFFFFF); + virtual bool intersect_ray(const Vector3 &p_from, const Vector3 &p_to, RayResult &r_result, const Set<RID> &p_exclude = Set<RID>(), uint32_t p_collision_mask = 0xFFFFFFFF, bool p_pick_ray = false); + virtual int intersect_shape(const RID &p_shape, const Transform &p_xform, float p_margin, ShapeResult *r_results, int p_result_max, const Set<RID> &p_exclude = Set<RID>(), uint32_t p_collision_mask = 0xFFFFFFFF); + virtual bool cast_motion(const RID &p_shape, const Transform &p_xform, const Vector3 &p_motion, float p_margin, float &p_closest_safe, float &p_closest_unsafe, const Set<RID> &p_exclude = Set<RID>(), uint32_t p_collision_mask = 0xFFFFFFFF, ShapeRestInfo *r_info = NULL); /// Returns the list of contacts pairs in this order: Local contact, other body contact - virtual bool collide_shape(RID p_shape, const Transform &p_shape_xform, float p_margin, Vector3 *r_results, int p_result_max, int &r_result_count, const Set<RID> &p_exclude = Set<RID>(), uint32_t p_collision_layer = 0xFFFFFFFF, uint32_t p_object_type_mask = TYPE_MASK_COLLISION); - virtual bool rest_info(RID p_shape, const Transform &p_shape_xform, float p_margin, ShapeRestInfo *r_info, const Set<RID> &p_exclude = Set<RID>(), uint32_t p_collision_layer = 0xFFFFFFFF, uint32_t p_object_type_mask = TYPE_MASK_COLLISION); + virtual bool collide_shape(RID p_shape, const Transform &p_shape_xform, float p_margin, Vector3 *r_results, int p_result_max, int &r_result_count, const Set<RID> &p_exclude = Set<RID>(), uint32_t p_collision_mask = 0xFFFFFFFF); + virtual bool rest_info(RID p_shape, const Transform &p_shape_xform, float p_margin, ShapeRestInfo *r_info, const Set<RID> &p_exclude = Set<RID>(), uint32_t p_collision_mask = 0xFFFFFFFF); virtual Vector3 get_closest_point_to_object_volume(RID p_object, const Vector3 p_point) const; }; @@ -189,6 +189,12 @@ private: : hasPenetration(false) {} }; - bool recover_from_penetration(RigidBodyBullet *p_body, const btTransform &p_from, btVector3 &out_recover_position, RecoverResult *recover_result = NULL); + bool recover_from_penetration(RigidBodyBullet *p_body, const btTransform &p_from, btVector3 &r_recover_position, RecoverResult *r_recover_result = NULL); + /// This is an API that recover a kinematic object from penetration + /// This allow only Convex Convex test and it always use GJK algorithm, With this API we don't benefit of Bullet special accelerated functions + bool RFP_convex_convex_test(const btConvexShape *p_shapeA, const btConvexShape *p_shapeB, btCollisionObject *p_objectB, int p_shapeId_B, const btTransform &p_transformA, const btTransform &p_transformB, btVector3 &r_recover_position, RecoverResult *r_recover_result); + /// This is an API that recover a kinematic object from penetration + /// Using this we leave Bullet to select the best algorithm, For example GJK in case we have Convex Convex, or a Bullet accelerated algorithm + bool RFP_convex_world_test(const btConvexShape *p_shapeA, const btCollisionShape *p_shapeB, btCollisionObject *p_objectA, btCollisionObject *p_objectB, int p_shapeId_A, int p_shapeId_B, const btTransform &p_transformA, const btTransform &p_transformB, btVector3 &r_recover_position, RecoverResult *r_recover_result); }; #endif diff --git a/modules/enet/networked_multiplayer_enet.cpp b/modules/enet/networked_multiplayer_enet.cpp index c50886ad3c..1e18ec0d18 100644 --- a/modules/enet/networked_multiplayer_enet.cpp +++ b/modules/enet/networked_multiplayer_enet.cpp @@ -505,7 +505,7 @@ uint32_t NetworkedMultiplayerENet::_gen_unique_id() const { hash = hash_djb2_one_32( (uint32_t)OS::get_singleton()->get_unix_time(), hash); hash = hash_djb2_one_32( - (uint32_t)OS::get_singleton()->get_data_dir().hash64(), hash); + (uint32_t)OS::get_singleton()->get_user_data_dir().hash64(), hash); /* hash = hash_djb2_one_32( (uint32_t)OS::get_singleton()->get_unique_id().hash64(), hash ); diff --git a/modules/etc/image_etc.cpp b/modules/etc/image_etc.cpp index dc7d23bbd7..941df41694 100644 --- a/modules/etc/image_etc.cpp +++ b/modules/etc/image_etc.cpp @@ -129,7 +129,7 @@ static void _compress_etc(Image *p_img, float p_lossy_quality, bool force_etc1_f PoolVector<uint8_t>::Read r = img->get_data().read(); int target_size = Image::get_image_data_size(imgw, imgh, etc_format, p_img->has_mipmaps() ? -1 : 0); - int mmc = p_img->has_mipmaps() ? Image::get_image_required_mipmaps(imgw, imgh, etc_format) : 0; + int mmc = 1 + (p_img->has_mipmaps() ? Image::get_image_required_mipmaps(imgw, imgh, etc_format) : 0); PoolVector<uint8_t> dst_data; dst_data.resize(target_size); @@ -155,7 +155,7 @@ static void _compress_etc(Image *p_img, float p_lossy_quality, bool force_etc1_f print_line("begin encoding, format: " + Image::get_format_name(etc_format)); uint64_t t = OS::get_singleton()->get_ticks_msec(); - for (int i = 0; i < mmc + 1; i++) { + for (int i = 0; i < mmc; i++) { // convert source image to internal etc2comp format (which is equivalent to Image::FORMAT_RGBAF) // NOTE: We can alternatively add a case to Image::convert to handle Image::FORMAT_RGBAF conversion. int mipmap_ofs = 0, mipmap_size = 0, mipmap_w = 0, mipmap_h = 0; @@ -163,9 +163,9 @@ static void _compress_etc(Image *p_img, float p_lossy_quality, bool force_etc1_f const uint8_t *src = &r[mipmap_ofs]; Etc::ColorFloatRGBA *src_rgba_f = new Etc::ColorFloatRGBA[mipmap_w * mipmap_h]; - for (int i = 0; i < mipmap_w * mipmap_h; i++) { - int si = i * 4; // RGBA8 - src_rgba_f[i] = Etc::ColorFloatRGBA::ConvertFromRGBA8(src[si], src[si + 1], src[si + 2], src[si + 3]); + for (int j = 0; j < mipmap_w * mipmap_h; j++) { + int si = j * 4; // RGBA8 + src_rgba_f[j] = Etc::ColorFloatRGBA::ConvertFromRGBA8(src[si], src[si + 1], src[si + 2], src[si + 3]); } unsigned char *etc_data = NULL; @@ -173,15 +173,17 @@ static void _compress_etc(Image *p_img, float p_lossy_quality, bool force_etc1_f unsigned int extended_width = 0, extended_height = 0; Etc::Encode((float *)src_rgba_f, mipmap_w, mipmap_h, etc2comp_etc_format, error_metric, effort, num_cpus, num_cpus, &etc_data, &etc_data_len, &extended_width, &extended_height, &encoding_time); + CRASH_COND(wofs + etc_data_len > target_size); memcpy(&w[wofs], etc_data, etc_data_len); wofs += etc_data_len; delete[] etc_data; delete[] src_rgba_f; } + print_line("time encoding: " + rtos(OS::get_singleton()->get_ticks_msec() - t)); - p_img->create(imgw, imgh, mmc > 1 ? true : false, etc_format, dst_data); + p_img->create(imgw, imgh, p_img->has_mipmaps(), etc_format, dst_data); } static void _compress_etc1(Image *p_img, float p_lossy_quality) { diff --git a/modules/gdnative/SCsub b/modules/gdnative/SCsub index 66b8d5cbdd..54d0672a5b 100644 --- a/modules/gdnative/SCsub +++ b/modules/gdnative/SCsub @@ -19,19 +19,27 @@ def _spaced(e): return e if e[-1] == '*' else e + ' ' def _build_gdnative_api_struct_header(api): - ext_wrappers = '' + gdnative_api_init_macro = [ + '\textern const godot_gdnative_core_api_struct *_gdnative_wrapper_api_struct;' + ] for name in api['extensions']: - ext_wrappers += ' extern const godot_gdnative_ext_' + name + '_api_struct *_gdnative_wrapper_' + name + '_api_struct;' + gdnative_api_init_macro.append( + '\textern const godot_gdnative_ext_{0}_api_struct *_gdnative_wrapper_{0}_api_struct;'.format(name)) - ext_init = 'for (int i = 0; i < _gdnative_wrapper_api_struct->num_extensions; i++) { ' - ext_init += 'switch (_gdnative_wrapper_api_struct->extensions[i]->type) {' + gdnative_api_init_macro.append('\t_gdnative_wrapper_api_struct = options->api_struct;') + gdnative_api_init_macro.append('\tfor (int i = 0; i < _gdnative_wrapper_api_struct->num_extensions; i++) { ') + gdnative_api_init_macro.append('\t\tswitch (_gdnative_wrapper_api_struct->extensions[i]->type) {') for name in api['extensions']: - ext_init += 'case GDNATIVE_EXT_' + api['extensions'][name]['type'] + ': ' - ext_init += '_gdnative_wrapper_' + name + '_api_struct = (' + 'godot_gdnative_ext_' + name + '_api_struct *) _gdnative_wrapper_api_struct->extensions[i]; break;' - - ext_init += '}' + gdnative_api_init_macro.append( + '\t\t\tcase GDNATIVE_EXT_%s:' % api['extensions'][name]['type']) + gdnative_api_init_macro.append( + '\t\t\t\t_gdnative_wrapper_{0}_api_struct = (godot_gdnative_ext_{0}_api_struct *)' + ' _gdnative_wrapper_api_struct->extensions[i];'.format(name)) + gdnative_api_init_macro.append('\t\t\t\tbreak;') + gdnative_api_init_macro.append('\t\t}') + gdnative_api_init_macro.append('\t}') out = [ '/* THIS FILE IS GENERATED DO NOT EDIT */', @@ -43,25 +51,12 @@ def _build_gdnative_api_struct_header(api): '#include <nativescript/godot_nativescript.h>', '#include <pluginscript/godot_pluginscript.h>', '', - '#define GDNATIVE_API_INIT(options) do { extern const godot_gdnative_api_struct *_gdnative_wrapper_api_struct;' + ext_wrappers + ' _gdnative_wrapper_api_struct = options->api_struct; ' + ext_init + ' } while (0)', + '#define GDNATIVE_API_INIT(options) do { \\\n' + ' \\\n'.join(gdnative_api_init_macro) + ' \\\n } while (0)', '', '#ifdef __cplusplus', 'extern "C" {', '#endif', '', - 'typedef struct godot_gdnative_api_version {', - '\tunsigned int major;', - '\tunsigned int minor;', - '} godot_gdnative_api_version;', - '', - 'typedef struct godot_gdnative_api_struct godot_gdnative_api_struct;', - '', - 'struct godot_gdnative_api_struct {', - '\tunsigned int type;', - '\tgodot_gdnative_api_version version;', - '\tconst godot_gdnative_api_struct *next;', - '};', - '', 'enum GDNATIVE_API_TYPES {', '\tGDNATIVE_' + api['core']['type'] + ',' ] @@ -192,7 +187,7 @@ def _build_gdnative_wrapper_code(api): ] for name in api['extensions']: - out.append('godot_gdnative_ext_' + name + '_api_struct *_gdnative_wrapper_' + name + '_api_struct;') + out.append('godot_gdnative_ext_' + name + '_api_struct *_gdnative_wrapper_' + name + '_api_struct = 0;') out += [''] diff --git a/modules/gdnative/gdnative.cpp b/modules/gdnative/gdnative.cpp index 44d6dffc85..0132ef3c5d 100644 --- a/modules/gdnative/gdnative.cpp +++ b/modules/gdnative/gdnative.cpp @@ -64,7 +64,6 @@ void GDNativeLibrary::_bind_methods() { ClassDB::bind_method(D_METHOD("get_current_library_path"), &GDNativeLibrary::get_current_library_path); ClassDB::bind_method(D_METHOD("get_current_dependencies"), &GDNativeLibrary::get_current_dependencies); - ClassDB::bind_method(D_METHOD("is_current_library_statically_linked"), &GDNativeLibrary::is_current_library_statically_linked); ClassDB::bind_method(D_METHOD("should_load_once"), &GDNativeLibrary::should_load_once); ClassDB::bind_method(D_METHOD("is_singleton"), &GDNativeLibrary::is_singleton); @@ -109,6 +108,9 @@ Ref<GDNativeLibrary> GDNative::get_library() { return library; } +extern "C" void _gdnative_report_version_mismatch(const godot_object *p_library, const char *p_ext, godot_gdnative_api_version p_want, godot_gdnative_api_version p_have); +extern "C" void _gdnative_report_loading_error(const godot_object *p_library, const char *p_what); + bool GDNative::initialize() { if (library.is_null()) { ERR_PRINT("No library set, can't initialize GDNative object"); @@ -116,12 +118,18 @@ bool GDNative::initialize() { } String lib_path = library->get_current_library_path(); - if (lib_path.empty() && !library->is_current_library_statically_linked()) { + if (lib_path.empty()) { ERR_PRINT("No library set for this platform"); return false; } #ifdef IPHONE_ENABLED - String path = lib_path.replace("res://", "dylibs/"); + // on iOS we use static linking + String path = ""; +#elif defined(ANDROID_ENABLED) + // On Android dynamic libraries are located separately from resource assets, + // we should pass library name to dlopen(). The library name is flattened + // during export. + String path = lib_path.get_file(); #else String path = ProjectSettings::get_singleton()->globalize_path(lib_path); #endif @@ -137,7 +145,7 @@ bool GDNative::initialize() { } Error err = OS::get_singleton()->open_dynamic_library(path, native_handle); - if (err != OK && !library->is_current_library_statically_linked()) { + if (err != OK) { return false; } @@ -146,13 +154,12 @@ bool GDNative::initialize() { // we cheat here a little bit. you saw nothing initialized = true; - err = get_symbol(library->get_symbol_prefix() + init_symbol, library_init); + err = get_symbol(library->get_symbol_prefix() + init_symbol, library_init, false); initialized = false; if (err || !library_init) { - if (!library->is_current_library_statically_linked()) - OS::get_singleton()->close_dynamic_library(native_handle); + OS::get_singleton()->close_dynamic_library(native_handle); native_handle = NULL; ERR_PRINT("Failed to obtain godot_gdnative_init symbol"); return false; @@ -168,6 +175,8 @@ bool GDNative::initialize() { 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); + options.report_version_mismatch = &_gdnative_report_version_mismatch; + options.report_loading_error = &_gdnative_report_loading_error; options.gd_native_library = (godot_object *)(get_library().ptr()); options.active_library_path = (godot_string *)&path; @@ -277,7 +286,7 @@ Variant GDNative::call_native(StringName p_native_call_type, StringName p_proced return *(Variant *)&result; } -Error GDNative::get_symbol(StringName p_procedure_name, void *&r_handle) { +Error GDNative::get_symbol(StringName p_procedure_name, void *&r_handle, bool p_optional) { if (!initialized) { ERR_PRINT("No valid library handle, can't get symbol from GDNative object"); @@ -288,7 +297,7 @@ Error GDNative::get_symbol(StringName p_procedure_name, void *&r_handle) { native_handle, p_procedure_name, r_handle, - true); + p_optional); return result; } @@ -369,40 +378,8 @@ RES GDNativeLibraryResourceLoader::load(const String &p_path, const String &p_or } } - bool is_statically_linked = false; - { - - List<String> static_linking_keys; - config->get_section_keys("static_linking", &static_linking_keys); - - for (List<String>::Element *E = static_linking_keys.front(); E; E = E->next()) { - String key = E->get(); - - Vector<String> tags = key.split("."); - - bool skip = false; - - for (int i = 0; i < tags.size(); i++) { - bool has_feature = OS::get_singleton()->has_feature(tags[i]); - - if (!has_feature) { - skip = true; - break; - } - } - - if (skip) { - continue; - } - - is_statically_linked = config->get_value("static_linking", key); - break; - } - } - lib->current_library_path = entry_lib_path; lib->current_dependencies = dependency_paths; - lib->current_library_statically_linked = is_statically_linked; return lib; } diff --git a/modules/gdnative/gdnative.h b/modules/gdnative/gdnative.h index 061dff9267..bb260bdd1b 100644 --- a/modules/gdnative/gdnative.h +++ b/modules/gdnative/gdnative.h @@ -55,7 +55,6 @@ class GDNativeLibrary : public Resource { String current_library_path; Vector<String> current_dependencies; - bool current_library_statically_linked; bool singleton; bool load_once; @@ -75,9 +74,6 @@ public: _FORCE_INLINE_ Vector<String> get_current_dependencies() const { return current_dependencies; } - _FORCE_INLINE_ bool is_current_library_statically_linked() const { - return current_library_statically_linked; - } // things that are a property of the library itself, not platform specific _FORCE_INLINE_ bool should_load_once() const { @@ -103,12 +99,10 @@ public: static void _bind_methods(); }; -typedef godot_variant (*native_call_cb)(void *, godot_array *); - struct GDNativeCallRegistry { static GDNativeCallRegistry *singleton; - inline GDNativeCallRegistry *get_singleton() { + inline static GDNativeCallRegistry *get_singleton() { return singleton; } @@ -147,7 +141,7 @@ public: Variant call_native(StringName p_native_call_type, StringName p_procedure_name, Array p_arguments = Array()); - Error get_symbol(StringName p_procedure_name, void *&r_handle); + Error get_symbol(StringName p_procedure_name, void *&r_handle, bool p_optional = true); }; class GDNativeLibraryResourceLoader : public ResourceFormatLoader { diff --git a/modules/gdnative/gdnative/aabb.cpp b/modules/gdnative/gdnative/aabb.cpp new file mode 100644 index 0000000000..6c89bcdceb --- /dev/null +++ b/modules/gdnative/gdnative/aabb.cpp @@ -0,0 +1,217 @@ +/*************************************************************************/ +/* aabb.cpp */ +/*************************************************************************/ +/* This file is part of: */ +/* GODOT ENGINE */ +/* https://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 "gdnative/aabb.h" + +#include "core/math/aabb.h" +#include "core/variant.h" + +#ifdef __cplusplus +extern "C" { +#endif + +void GDAPI godot_aabb_new(godot_aabb *r_dest, const godot_vector3 *p_pos, const godot_vector3 *p_size) { + const Vector3 *pos = (const Vector3 *)p_pos; + const Vector3 *size = (const Vector3 *)p_size; + AABB *dest = (AABB *)r_dest; + *dest = AABB(*pos, *size); +} + +godot_vector3 GDAPI godot_aabb_get_position(const godot_aabb *p_self) { + godot_vector3 raw_ret; + const AABB *self = (const AABB *)p_self; + Vector3 *ret = (Vector3 *)&raw_ret; + *ret = self->position; + return raw_ret; +} + +void GDAPI godot_aabb_set_position(const godot_aabb *p_self, const godot_vector3 *p_v) { + AABB *self = (AABB *)p_self; + const Vector3 *v = (const Vector3 *)p_v; + self->position = *v; +} + +godot_vector3 GDAPI godot_aabb_get_size(const godot_aabb *p_self) { + godot_vector3 raw_ret; + const AABB *self = (const AABB *)p_self; + Vector3 *ret = (Vector3 *)&raw_ret; + *ret = self->size; + return raw_ret; +} + +void GDAPI godot_aabb_set_size(const godot_aabb *p_self, const godot_vector3 *p_v) { + AABB *self = (AABB *)p_self; + const Vector3 *v = (const Vector3 *)p_v; + self->size = *v; +} + +godot_string GDAPI godot_aabb_as_string(const godot_aabb *p_self) { + godot_string ret; + const AABB *self = (const AABB *)p_self; + memnew_placement(&ret, String(*self)); + return ret; +} + +godot_real GDAPI godot_aabb_get_area(const godot_aabb *p_self) { + const AABB *self = (const AABB *)p_self; + return self->get_area(); +} + +godot_bool GDAPI godot_aabb_has_no_area(const godot_aabb *p_self) { + const AABB *self = (const AABB *)p_self; + return self->has_no_area(); +} + +godot_bool GDAPI godot_aabb_has_no_surface(const godot_aabb *p_self) { + const AABB *self = (const AABB *)p_self; + return self->has_no_surface(); +} + +godot_bool GDAPI godot_aabb_intersects(const godot_aabb *p_self, const godot_aabb *p_with) { + const AABB *self = (const AABB *)p_self; + const AABB *with = (const AABB *)p_with; + return self->intersects(*with); +} + +godot_bool GDAPI godot_aabb_encloses(const godot_aabb *p_self, const godot_aabb *p_with) { + const AABB *self = (const AABB *)p_self; + const AABB *with = (const AABB *)p_with; + return self->encloses(*with); +} + +godot_aabb GDAPI godot_aabb_merge(const godot_aabb *p_self, const godot_aabb *p_with) { + godot_aabb dest; + const AABB *self = (const AABB *)p_self; + const AABB *with = (const AABB *)p_with; + *((AABB *)&dest) = self->merge(*with); + return dest; +} + +godot_aabb GDAPI godot_aabb_intersection(const godot_aabb *p_self, const godot_aabb *p_with) { + godot_aabb dest; + const AABB *self = (const AABB *)p_self; + const AABB *with = (const AABB *)p_with; + *((AABB *)&dest) = self->intersection(*with); + return dest; +} + +godot_bool GDAPI godot_aabb_intersects_plane(const godot_aabb *p_self, const godot_plane *p_plane) { + const AABB *self = (const AABB *)p_self; + const Plane *plane = (const Plane *)p_plane; + return self->intersects_plane(*plane); +} + +godot_bool GDAPI godot_aabb_intersects_segment(const godot_aabb *p_self, const godot_vector3 *p_from, const godot_vector3 *p_to) { + const AABB *self = (const AABB *)p_self; + const Vector3 *from = (const Vector3 *)p_from; + const Vector3 *to = (const Vector3 *)p_to; + return self->intersects_segment(*from, *to); +} + +godot_bool GDAPI godot_aabb_has_point(const godot_aabb *p_self, const godot_vector3 *p_point) { + const AABB *self = (const AABB *)p_self; + const Vector3 *point = (const Vector3 *)p_point; + return self->has_point(*point); +} + +godot_vector3 GDAPI godot_aabb_get_support(const godot_aabb *p_self, const godot_vector3 *p_dir) { + godot_vector3 dest; + const AABB *self = (const AABB *)p_self; + const Vector3 *dir = (const Vector3 *)p_dir; + *((Vector3 *)&dest) = self->get_support(*dir); + return dest; +} + +godot_vector3 GDAPI godot_aabb_get_longest_axis(const godot_aabb *p_self) { + godot_vector3 dest; + const AABB *self = (const AABB *)p_self; + *((Vector3 *)&dest) = self->get_longest_axis(); + return dest; +} + +godot_int GDAPI godot_aabb_get_longest_axis_index(const godot_aabb *p_self) { + const AABB *self = (const AABB *)p_self; + return self->get_longest_axis_index(); +} + +godot_real GDAPI godot_aabb_get_longest_axis_size(const godot_aabb *p_self) { + const AABB *self = (const AABB *)p_self; + return self->get_longest_axis_size(); +} + +godot_vector3 GDAPI godot_aabb_get_shortest_axis(const godot_aabb *p_self) { + godot_vector3 dest; + const AABB *self = (const AABB *)p_self; + *((Vector3 *)&dest) = self->get_shortest_axis(); + return dest; +} + +godot_int GDAPI godot_aabb_get_shortest_axis_index(const godot_aabb *p_self) { + const AABB *self = (const AABB *)p_self; + return self->get_shortest_axis_index(); +} + +godot_real GDAPI godot_aabb_get_shortest_axis_size(const godot_aabb *p_self) { + const AABB *self = (const AABB *)p_self; + return self->get_shortest_axis_size(); +} + +godot_aabb GDAPI godot_aabb_expand(const godot_aabb *p_self, const godot_vector3 *p_to_point) { + godot_aabb dest; + const AABB *self = (const AABB *)p_self; + const Vector3 *to_point = (const Vector3 *)p_to_point; + *((AABB *)&dest) = self->expand(*to_point); + return dest; +} + +godot_aabb GDAPI godot_aabb_grow(const godot_aabb *p_self, const godot_real p_by) { + godot_aabb dest; + const AABB *self = (const AABB *)p_self; + + *((AABB *)&dest) = self->grow(p_by); + return dest; +} + +godot_vector3 GDAPI godot_aabb_get_endpoint(const godot_aabb *p_self, const godot_int p_idx) { + godot_vector3 dest; + const AABB *self = (const AABB *)p_self; + + *((Vector3 *)&dest) = self->get_endpoint(p_idx); + return dest; +} + +godot_bool GDAPI godot_aabb_operator_equal(const godot_aabb *p_self, const godot_aabb *p_b) { + const AABB *self = (const AABB *)p_self; + const AABB *b = (const AABB *)p_b; + return *self == *b; +} + +#ifdef __cplusplus +} +#endif diff --git a/modules/gdnative/gdnative/array.cpp b/modules/gdnative/gdnative/array.cpp index e0d9514985..8351c43574 100644 --- a/modules/gdnative/gdnative/array.cpp +++ b/modules/gdnative/gdnative/array.cpp @@ -302,6 +302,17 @@ void GDAPI godot_array_sort_custom(godot_array *p_self, godot_object *p_obj, con self->sort_custom((Object *)p_obj, *func); } +godot_int GDAPI godot_array_bsearch(godot_array *p_self, const godot_variant *p_value, const godot_bool p_before) { + Array *self = (Array *)p_self; + return self->bsearch((const Variant *)p_value, p_before); +} + +godot_int GDAPI godot_array_bsearch_custom(godot_array *p_self, const godot_variant *p_value, godot_object *p_obj, const godot_string *p_func, const godot_bool p_before) { + Array *self = (Array *)p_self; + const String *func = (const String *)p_func; + return self->bsearch_custom((const Variant *)p_value, (Object *)p_obj, *func, p_before); +} + void GDAPI godot_array_destroy(godot_array *p_self) { ((Array *)p_self)->~Array(); } diff --git a/modules/gdnative/gdnative/gdnative.cpp b/modules/gdnative/gdnative/gdnative.cpp index 6dfa7ec20b..92a88e354b 100644 --- a/modules/gdnative/gdnative/gdnative.cpp +++ b/modules/gdnative/gdnative/gdnative.cpp @@ -36,6 +36,8 @@ #include "os/os.h" #include "variant.h" +#include "modules/gdnative/gdnative.h" + #ifdef __cplusplus extern "C" { #endif @@ -113,6 +115,10 @@ godot_dictionary GDAPI godot_get_global_constants() { } // System functions +void GDAPI godot_register_native_call_type(const char *p_call_type, native_call_cb p_callback) { + GDNativeCallRegistry::get_singleton()->register_native_call_type(StringName(p_call_type), p_callback); +} + void GDAPI *godot_alloc(int p_bytes) { return memalloc(p_bytes); } @@ -137,6 +143,32 @@ void GDAPI godot_print(const godot_string *p_message) { print_line(*(String *)p_message); } +void _gdnative_report_version_mismatch(const godot_object *p_library, const char *p_ext, godot_gdnative_api_version p_want, godot_gdnative_api_version p_have) { + String message = "Error loading GDNative file "; + GDNativeLibrary *library = (GDNativeLibrary *)p_library; + + message += library->get_current_library_path() + ": Extension \"" + p_ext + "\" can't be loaded.\n"; + + Dictionary versions; + versions["have_major"] = p_have.major; + versions["have_minor"] = p_have.minor; + versions["want_major"] = p_want.major; + versions["want_minor"] = p_want.minor; + + message += String("Got version {have_major}.{have_minor} but needs {want_major}.{want_minor}!").format(versions); + + _err_print_error("gdnative_init", library->get_current_library_path().utf8().ptr(), 0, message.utf8().ptr()); +} + +void _gdnative_report_loading_error(const godot_object *p_library, const char *p_what) { + String message = "Error loading GDNative file "; + GDNativeLibrary *library = (GDNativeLibrary *)p_library; + + message += library->get_current_library_path() + ": " + p_what; + + _err_print_error("gdnative_init", library->get_current_library_path().utf8().ptr(), 0, message.utf8().ptr()); +} + #ifdef __cplusplus } #endif diff --git a/modules/gdnative/gdnative/node_path.cpp b/modules/gdnative/gdnative/node_path.cpp index 2bd278e050..8dfe151f91 100644 --- a/modules/gdnative/gdnative/node_path.cpp +++ b/modules/gdnative/gdnative/node_path.cpp @@ -91,10 +91,10 @@ godot_string GDAPI godot_node_path_get_subname(const godot_node_path *p_self, co return dest; } -godot_string GDAPI godot_node_path_get_property(const godot_node_path *p_self) { +godot_string GDAPI godot_node_path_get_concatenated_subnames(const godot_node_path *p_self) { godot_string dest; const NodePath *self = (const NodePath *)p_self; - memnew_placement(&dest, String(self->get_property())); + memnew_placement(&dest, String(self->get_concatenated_subnames())); return dest; } diff --git a/modules/gdnative/gdnative/rect3.cpp b/modules/gdnative/gdnative/rect3.cpp deleted file mode 100644 index 8e088743b4..0000000000 --- a/modules/gdnative/gdnative/rect3.cpp +++ /dev/null @@ -1,217 +0,0 @@ -/*************************************************************************/ -/* rect3.cpp */ -/*************************************************************************/ -/* This file is part of: */ -/* GODOT ENGINE */ -/* https://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 "gdnative/rect3.h" - -#include "core/math/rect3.h" -#include "core/variant.h" - -#ifdef __cplusplus -extern "C" { -#endif - -void GDAPI godot_rect3_new(godot_rect3 *r_dest, const godot_vector3 *p_pos, const godot_vector3 *p_size) { - const Vector3 *pos = (const Vector3 *)p_pos; - const Vector3 *size = (const Vector3 *)p_size; - Rect3 *dest = (Rect3 *)r_dest; - *dest = Rect3(*pos, *size); -} - -godot_vector3 GDAPI godot_rect3_get_position(const godot_rect3 *p_self) { - godot_vector3 raw_ret; - const Rect3 *self = (const Rect3 *)p_self; - Vector3 *ret = (Vector3 *)&raw_ret; - *ret = self->position; - return raw_ret; -} - -void GDAPI godot_rect3_set_position(const godot_rect3 *p_self, const godot_vector3 *p_v) { - Rect3 *self = (Rect3 *)p_self; - const Vector3 *v = (const Vector3 *)p_v; - self->position = *v; -} - -godot_vector3 GDAPI godot_rect3_get_size(const godot_rect3 *p_self) { - godot_vector3 raw_ret; - const Rect3 *self = (const Rect3 *)p_self; - Vector3 *ret = (Vector3 *)&raw_ret; - *ret = self->size; - return raw_ret; -} - -void GDAPI godot_rect3_set_size(const godot_rect3 *p_self, const godot_vector3 *p_v) { - Rect3 *self = (Rect3 *)p_self; - const Vector3 *v = (const Vector3 *)p_v; - self->size = *v; -} - -godot_string GDAPI godot_rect3_as_string(const godot_rect3 *p_self) { - godot_string ret; - const Rect3 *self = (const Rect3 *)p_self; - memnew_placement(&ret, String(*self)); - return ret; -} - -godot_real GDAPI godot_rect3_get_area(const godot_rect3 *p_self) { - const Rect3 *self = (const Rect3 *)p_self; - return self->get_area(); -} - -godot_bool GDAPI godot_rect3_has_no_area(const godot_rect3 *p_self) { - const Rect3 *self = (const Rect3 *)p_self; - return self->has_no_area(); -} - -godot_bool GDAPI godot_rect3_has_no_surface(const godot_rect3 *p_self) { - const Rect3 *self = (const Rect3 *)p_self; - return self->has_no_surface(); -} - -godot_bool GDAPI godot_rect3_intersects(const godot_rect3 *p_self, const godot_rect3 *p_with) { - const Rect3 *self = (const Rect3 *)p_self; - const Rect3 *with = (const Rect3 *)p_with; - return self->intersects(*with); -} - -godot_bool GDAPI godot_rect3_encloses(const godot_rect3 *p_self, const godot_rect3 *p_with) { - const Rect3 *self = (const Rect3 *)p_self; - const Rect3 *with = (const Rect3 *)p_with; - return self->encloses(*with); -} - -godot_rect3 GDAPI godot_rect3_merge(const godot_rect3 *p_self, const godot_rect3 *p_with) { - godot_rect3 dest; - const Rect3 *self = (const Rect3 *)p_self; - const Rect3 *with = (const Rect3 *)p_with; - *((Rect3 *)&dest) = self->merge(*with); - return dest; -} - -godot_rect3 GDAPI godot_rect3_intersection(const godot_rect3 *p_self, const godot_rect3 *p_with) { - godot_rect3 dest; - const Rect3 *self = (const Rect3 *)p_self; - const Rect3 *with = (const Rect3 *)p_with; - *((Rect3 *)&dest) = self->intersection(*with); - return dest; -} - -godot_bool GDAPI godot_rect3_intersects_plane(const godot_rect3 *p_self, const godot_plane *p_plane) { - const Rect3 *self = (const Rect3 *)p_self; - const Plane *plane = (const Plane *)p_plane; - return self->intersects_plane(*plane); -} - -godot_bool GDAPI godot_rect3_intersects_segment(const godot_rect3 *p_self, const godot_vector3 *p_from, const godot_vector3 *p_to) { - const Rect3 *self = (const Rect3 *)p_self; - const Vector3 *from = (const Vector3 *)p_from; - const Vector3 *to = (const Vector3 *)p_to; - return self->intersects_segment(*from, *to); -} - -godot_bool GDAPI godot_rect3_has_point(const godot_rect3 *p_self, const godot_vector3 *p_point) { - const Rect3 *self = (const Rect3 *)p_self; - const Vector3 *point = (const Vector3 *)p_point; - return self->has_point(*point); -} - -godot_vector3 GDAPI godot_rect3_get_support(const godot_rect3 *p_self, const godot_vector3 *p_dir) { - godot_vector3 dest; - const Rect3 *self = (const Rect3 *)p_self; - const Vector3 *dir = (const Vector3 *)p_dir; - *((Vector3 *)&dest) = self->get_support(*dir); - return dest; -} - -godot_vector3 GDAPI godot_rect3_get_longest_axis(const godot_rect3 *p_self) { - godot_vector3 dest; - const Rect3 *self = (const Rect3 *)p_self; - *((Vector3 *)&dest) = self->get_longest_axis(); - return dest; -} - -godot_int GDAPI godot_rect3_get_longest_axis_index(const godot_rect3 *p_self) { - const Rect3 *self = (const Rect3 *)p_self; - return self->get_longest_axis_index(); -} - -godot_real GDAPI godot_rect3_get_longest_axis_size(const godot_rect3 *p_self) { - const Rect3 *self = (const Rect3 *)p_self; - return self->get_longest_axis_size(); -} - -godot_vector3 GDAPI godot_rect3_get_shortest_axis(const godot_rect3 *p_self) { - godot_vector3 dest; - const Rect3 *self = (const Rect3 *)p_self; - *((Vector3 *)&dest) = self->get_shortest_axis(); - return dest; -} - -godot_int GDAPI godot_rect3_get_shortest_axis_index(const godot_rect3 *p_self) { - const Rect3 *self = (const Rect3 *)p_self; - return self->get_shortest_axis_index(); -} - -godot_real GDAPI godot_rect3_get_shortest_axis_size(const godot_rect3 *p_self) { - const Rect3 *self = (const Rect3 *)p_self; - return self->get_shortest_axis_size(); -} - -godot_rect3 GDAPI godot_rect3_expand(const godot_rect3 *p_self, const godot_vector3 *p_to_point) { - godot_rect3 dest; - const Rect3 *self = (const Rect3 *)p_self; - const Vector3 *to_point = (const Vector3 *)p_to_point; - *((Rect3 *)&dest) = self->expand(*to_point); - return dest; -} - -godot_rect3 GDAPI godot_rect3_grow(const godot_rect3 *p_self, const godot_real p_by) { - godot_rect3 dest; - const Rect3 *self = (const Rect3 *)p_self; - - *((Rect3 *)&dest) = self->grow(p_by); - return dest; -} - -godot_vector3 GDAPI godot_rect3_get_endpoint(const godot_rect3 *p_self, const godot_int p_idx) { - godot_vector3 dest; - const Rect3 *self = (const Rect3 *)p_self; - - *((Vector3 *)&dest) = self->get_endpoint(p_idx); - return dest; -} - -godot_bool GDAPI godot_rect3_operator_equal(const godot_rect3 *p_self, const godot_rect3 *p_b) { - const Rect3 *self = (const Rect3 *)p_self; - const Rect3 *b = (const Rect3 *)p_b; - return *self == *b; -} - -#ifdef __cplusplus -} -#endif diff --git a/modules/gdnative/gdnative/string.cpp b/modules/gdnative/gdnative/string.cpp index 781b8754bd..67a037736c 100644 --- a/modules/gdnative/gdnative/string.cpp +++ b/modules/gdnative/gdnative/string.cpp @@ -89,11 +89,6 @@ wchar_t GDAPI godot_string_operator_index_const(const godot_string *p_self, cons return self->operator[](p_idx); } -const char GDAPI *godot_string_c_str(const godot_string *p_self) { - const String *self = (const String *)p_self; - return self->utf8().get_data(); -} - const wchar_t GDAPI *godot_string_unicode_str(const godot_string *p_self) { const String *self = (const String *)p_self; return self->c_str(); diff --git a/modules/gdnative/gdnative/transform.cpp b/modules/gdnative/gdnative/transform.cpp index 96b2ec8a7a..b07fcffcb6 100644 --- a/modules/gdnative/gdnative/transform.cpp +++ b/modules/gdnative/gdnative/transform.cpp @@ -198,20 +198,20 @@ godot_vector3 GDAPI godot_transform_xform_inv_vector3(const godot_transform *p_s return raw_dest; } -godot_rect3 GDAPI godot_transform_xform_rect3(const godot_transform *p_self, const godot_rect3 *p_v) { - godot_rect3 raw_dest; - Rect3 *dest = (Rect3 *)&raw_dest; +godot_aabb GDAPI godot_transform_xform_aabb(const godot_transform *p_self, const godot_aabb *p_v) { + godot_aabb raw_dest; + AABB *dest = (AABB *)&raw_dest; const Transform *self = (const Transform *)p_self; - const Rect3 *v = (const Rect3 *)p_v; + const AABB *v = (const AABB *)p_v; *dest = self->xform(*v); return raw_dest; } -godot_rect3 GDAPI godot_transform_xform_inv_rect3(const godot_transform *p_self, const godot_rect3 *p_v) { - godot_rect3 raw_dest; - Rect3 *dest = (Rect3 *)&raw_dest; +godot_aabb GDAPI godot_transform_xform_inv_aabb(const godot_transform *p_self, const godot_aabb *p_v) { + godot_aabb raw_dest; + AABB *dest = (AABB *)&raw_dest; const Transform *self = (const Transform *)p_self; - const Rect3 *v = (const Rect3 *)p_v; + const AABB *v = (const AABB *)p_v; *dest = self->xform_inv(*v); return raw_dest; } diff --git a/modules/gdnative/gdnative/variant.cpp b/modules/gdnative/gdnative/variant.cpp index 0c31bc643c..6483d19d74 100644 --- a/modules/gdnative/gdnative/variant.cpp +++ b/modules/gdnative/gdnative/variant.cpp @@ -118,10 +118,10 @@ void GDAPI godot_variant_new_quat(godot_variant *r_dest, const godot_quat *p_qua memnew_placement_custom(dest, Variant, Variant(*quat)); } -void GDAPI godot_variant_new_rect3(godot_variant *r_dest, const godot_rect3 *p_rect3) { +void GDAPI godot_variant_new_aabb(godot_variant *r_dest, const godot_aabb *p_aabb) { Variant *dest = (Variant *)r_dest; - Rect3 *rect3 = (Rect3 *)p_rect3; - memnew_placement_custom(dest, Variant, Variant(*rect3)); + AABB *aabb = (AABB *)p_aabb; + memnew_placement_custom(dest, Variant, Variant(*aabb)); } void GDAPI godot_variant_new_basis(godot_variant *r_dest, const godot_basis *p_basis) { @@ -304,10 +304,10 @@ godot_quat GDAPI godot_variant_as_quat(const godot_variant *p_self) { return raw_dest; } -godot_rect3 GDAPI godot_variant_as_rect3(const godot_variant *p_self) { - godot_rect3 raw_dest; +godot_aabb GDAPI godot_variant_as_aabb(const godot_variant *p_self) { + godot_aabb raw_dest; const Variant *self = (const Variant *)p_self; - Rect3 *dest = (Rect3 *)&raw_dest; + AABB *dest = (AABB *)&raw_dest; *dest = *self; return raw_dest; } diff --git a/modules/gdnative/gdnative_api.json b/modules/gdnative/gdnative_api.json index 770fb429c7..488ed93206 100644 --- a/modules/gdnative/gdnative_api.json +++ b/modules/gdnative/gdnative_api.json @@ -2680,6 +2680,26 @@ ] }, { + "name": "godot_array_bsearch", + "return_type": "godot_int", + "arguments": [ + ["godot_array *", "p_self"], + ["const godot_variant *", "p_value"], + ["const godot_bool", "p_before"] + ] + }, + { + "name": "godot_array_bsearch_custom", + "return_type": "godot_int", + "arguments": [ + ["godot_array *", "p_self"], + ["const godot_variant *", "p_value"], + ["godot_object *", "p_obj"], + ["const godot_string *", "p_func"], + ["const godot_bool", "p_before"] + ] + }, + { "name": "godot_array_destroy", "return_type": "void", "arguments": [ @@ -2898,7 +2918,7 @@ ] }, { - "name": "godot_node_path_get_property", + "name": "godot_node_path_get_concatenated_subnames", "return_type": "godot_string", "arguments": [ ["const godot_node_path *", "p_self"] @@ -3221,209 +3241,209 @@ ] }, { - "name": "godot_rect3_new", + "name": "godot_aabb_new", "return_type": "void", "arguments": [ - ["godot_rect3 *", "r_dest"], + ["godot_aabb *", "r_dest"], ["const godot_vector3 *", "p_pos"], ["const godot_vector3 *", "p_size"] ] }, { - "name": "godot_rect3_get_position", + "name": "godot_aabb_get_position", "return_type": "godot_vector3", "arguments": [ - ["const godot_rect3 *", "p_self"] + ["const godot_aabb *", "p_self"] ] }, { - "name": "godot_rect3_set_position", + "name": "godot_aabb_set_position", "return_type": "void", "arguments": [ - ["const godot_rect3 *", "p_self"], + ["const godot_aabb *", "p_self"], ["const godot_vector3 *", "p_v"] ] }, { - "name": "godot_rect3_get_size", + "name": "godot_aabb_get_size", "return_type": "godot_vector3", "arguments": [ - ["const godot_rect3 *", "p_self"] + ["const godot_aabb *", "p_self"] ] }, { - "name": "godot_rect3_set_size", + "name": "godot_aabb_set_size", "return_type": "void", "arguments": [ - ["const godot_rect3 *", "p_self"], + ["const godot_aabb *", "p_self"], ["const godot_vector3 *", "p_v"] ] }, { - "name": "godot_rect3_as_string", + "name": "godot_aabb_as_string", "return_type": "godot_string", "arguments": [ - ["const godot_rect3 *", "p_self"] + ["const godot_aabb *", "p_self"] ] }, { - "name": "godot_rect3_get_area", + "name": "godot_aabb_get_area", "return_type": "godot_real", "arguments": [ - ["const godot_rect3 *", "p_self"] + ["const godot_aabb *", "p_self"] ] }, { - "name": "godot_rect3_has_no_area", + "name": "godot_aabb_has_no_area", "return_type": "godot_bool", "arguments": [ - ["const godot_rect3 *", "p_self"] + ["const godot_aabb *", "p_self"] ] }, { - "name": "godot_rect3_has_no_surface", + "name": "godot_aabb_has_no_surface", "return_type": "godot_bool", "arguments": [ - ["const godot_rect3 *", "p_self"] + ["const godot_aabb *", "p_self"] ] }, { - "name": "godot_rect3_intersects", + "name": "godot_aabb_intersects", "return_type": "godot_bool", "arguments": [ - ["const godot_rect3 *", "p_self"], - ["const godot_rect3 *", "p_with"] + ["const godot_aabb *", "p_self"], + ["const godot_aabb *", "p_with"] ] }, { - "name": "godot_rect3_encloses", + "name": "godot_aabb_encloses", "return_type": "godot_bool", "arguments": [ - ["const godot_rect3 *", "p_self"], - ["const godot_rect3 *", "p_with"] + ["const godot_aabb *", "p_self"], + ["const godot_aabb *", "p_with"] ] }, { - "name": "godot_rect3_merge", - "return_type": "godot_rect3", + "name": "godot_aabb_merge", + "return_type": "godot_aabb", "arguments": [ - ["const godot_rect3 *", "p_self"], - ["const godot_rect3 *", "p_with"] + ["const godot_aabb *", "p_self"], + ["const godot_aabb *", "p_with"] ] }, { - "name": "godot_rect3_intersection", - "return_type": "godot_rect3", + "name": "godot_aabb_intersection", + "return_type": "godot_aabb", "arguments": [ - ["const godot_rect3 *", "p_self"], - ["const godot_rect3 *", "p_with"] + ["const godot_aabb *", "p_self"], + ["const godot_aabb *", "p_with"] ] }, { - "name": "godot_rect3_intersects_plane", + "name": "godot_aabb_intersects_plane", "return_type": "godot_bool", "arguments": [ - ["const godot_rect3 *", "p_self"], + ["const godot_aabb *", "p_self"], ["const godot_plane *", "p_plane"] ] }, { - "name": "godot_rect3_intersects_segment", + "name": "godot_aabb_intersects_segment", "return_type": "godot_bool", "arguments": [ - ["const godot_rect3 *", "p_self"], + ["const godot_aabb *", "p_self"], ["const godot_vector3 *", "p_from"], ["const godot_vector3 *", "p_to"] ] }, { - "name": "godot_rect3_has_point", + "name": "godot_aabb_has_point", "return_type": "godot_bool", "arguments": [ - ["const godot_rect3 *", "p_self"], + ["const godot_aabb *", "p_self"], ["const godot_vector3 *", "p_point"] ] }, { - "name": "godot_rect3_get_support", + "name": "godot_aabb_get_support", "return_type": "godot_vector3", "arguments": [ - ["const godot_rect3 *", "p_self"], + ["const godot_aabb *", "p_self"], ["const godot_vector3 *", "p_dir"] ] }, { - "name": "godot_rect3_get_longest_axis", + "name": "godot_aabb_get_longest_axis", "return_type": "godot_vector3", "arguments": [ - ["const godot_rect3 *", "p_self"] + ["const godot_aabb *", "p_self"] ] }, { - "name": "godot_rect3_get_longest_axis_index", + "name": "godot_aabb_get_longest_axis_index", "return_type": "godot_int", "arguments": [ - ["const godot_rect3 *", "p_self"] + ["const godot_aabb *", "p_self"] ] }, { - "name": "godot_rect3_get_longest_axis_size", + "name": "godot_aabb_get_longest_axis_size", "return_type": "godot_real", "arguments": [ - ["const godot_rect3 *", "p_self"] + ["const godot_aabb *", "p_self"] ] }, { - "name": "godot_rect3_get_shortest_axis", + "name": "godot_aabb_get_shortest_axis", "return_type": "godot_vector3", "arguments": [ - ["const godot_rect3 *", "p_self"] + ["const godot_aabb *", "p_self"] ] }, { - "name": "godot_rect3_get_shortest_axis_index", + "name": "godot_aabb_get_shortest_axis_index", "return_type": "godot_int", "arguments": [ - ["const godot_rect3 *", "p_self"] + ["const godot_aabb *", "p_self"] ] }, { - "name": "godot_rect3_get_shortest_axis_size", + "name": "godot_aabb_get_shortest_axis_size", "return_type": "godot_real", "arguments": [ - ["const godot_rect3 *", "p_self"] + ["const godot_aabb *", "p_self"] ] }, { - "name": "godot_rect3_expand", - "return_type": "godot_rect3", + "name": "godot_aabb_expand", + "return_type": "godot_aabb", "arguments": [ - ["const godot_rect3 *", "p_self"], + ["const godot_aabb *", "p_self"], ["const godot_vector3 *", "p_to_point"] ] }, { - "name": "godot_rect3_grow", - "return_type": "godot_rect3", + "name": "godot_aabb_grow", + "return_type": "godot_aabb", "arguments": [ - ["const godot_rect3 *", "p_self"], + ["const godot_aabb *", "p_self"], ["const godot_real", "p_by"] ] }, { - "name": "godot_rect3_get_endpoint", + "name": "godot_aabb_get_endpoint", "return_type": "godot_vector3", "arguments": [ - ["const godot_rect3 *", "p_self"], + ["const godot_aabb *", "p_self"], ["const godot_int", "p_idx"] ] }, { - "name": "godot_rect3_operator_equal", + "name": "godot_aabb_operator_equal", "return_type": "godot_bool", "arguments": [ - ["const godot_rect3 *", "p_self"], - ["const godot_rect3 *", "p_b"] + ["const godot_aabb *", "p_self"], + ["const godot_aabb *", "p_b"] ] }, { @@ -3632,19 +3652,19 @@ ] }, { - "name": "godot_transform_xform_rect3", - "return_type": "godot_rect3", + "name": "godot_transform_xform_aabb", + "return_type": "godot_aabb", "arguments": [ ["const godot_transform *", "p_self"], - ["const godot_rect3 *", "p_v"] + ["const godot_aabb *", "p_v"] ] }, { - "name": "godot_transform_xform_inv_rect3", - "return_type": "godot_rect3", + "name": "godot_transform_xform_inv_aabb", + "return_type": "godot_aabb", "arguments": [ ["const godot_transform *", "p_self"], - ["const godot_rect3 *", "p_v"] + ["const godot_aabb *", "p_v"] ] }, { @@ -3930,11 +3950,11 @@ ] }, { - "name": "godot_variant_new_rect3", + "name": "godot_variant_new_aabb", "return_type": "void", "arguments": [ ["godot_variant *", "r_dest"], - ["const godot_rect3 *", "p_rect3"] + ["const godot_aabb *", "p_aabb"] ] }, { @@ -4135,8 +4155,8 @@ ] }, { - "name": "godot_variant_as_rect3", - "return_type": "godot_rect3", + "name": "godot_variant_as_aabb", + "return_type": "godot_aabb", "arguments": [ ["const godot_variant *", "p_self"] ] @@ -4362,13 +4382,6 @@ ] }, { - "name": "godot_string_c_str", - "return_type": "const char *", - "arguments": [ - ["const godot_string *", "p_self"] - ] - }, - { "name": "godot_string_unicode_str", "return_type": "const wchar_t *", "arguments": [ @@ -5556,6 +5569,14 @@ ] }, { + "name": "godot_register_native_call_type", + "return_type": "void", + "arguments": [ + ["const char *", "call_type"], + ["native_call_cb", "p_callback"] + ] + }, + { "name": "godot_alloc", "return_type": "void *", "arguments": [ diff --git a/modules/gdnative/include/gdnative/aabb.h b/modules/gdnative/include/gdnative/aabb.h new file mode 100644 index 0000000000..34339fa242 --- /dev/null +++ b/modules/gdnative/include/gdnative/aabb.h @@ -0,0 +1,117 @@ +/*************************************************************************/ +/* aabb.h */ +/*************************************************************************/ +/* This file is part of: */ +/* GODOT ENGINE */ +/* https://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 GODOT_AABB_H +#define GODOT_AABB_H + +#ifdef __cplusplus +extern "C" { +#endif + +#include <stdint.h> + +#define GODOT_AABB_SIZE 24 + +#ifndef GODOT_CORE_API_GODOT_AABB_TYPE_DEFINED +#define GODOT_CORE_API_GODOT_AABB_TYPE_DEFINED +typedef struct { + uint8_t _dont_touch_that[GODOT_AABB_SIZE]; +} godot_aabb; +#endif + +// reduce extern "C" nesting for VS2013 +#ifdef __cplusplus +} +#endif + +#include <gdnative/gdnative.h> +#include <gdnative/plane.h> +#include <gdnative/vector3.h> + +#ifdef __cplusplus +extern "C" { +#endif + +void GDAPI godot_aabb_new(godot_aabb *r_dest, const godot_vector3 *p_pos, const godot_vector3 *p_size); + +godot_vector3 GDAPI godot_aabb_get_position(const godot_aabb *p_self); +void GDAPI godot_aabb_set_position(const godot_aabb *p_self, const godot_vector3 *p_v); + +godot_vector3 GDAPI godot_aabb_get_size(const godot_aabb *p_self); +void GDAPI godot_aabb_set_size(const godot_aabb *p_self, const godot_vector3 *p_v); + +godot_string GDAPI godot_aabb_as_string(const godot_aabb *p_self); + +godot_real GDAPI godot_aabb_get_area(const godot_aabb *p_self); + +godot_bool GDAPI godot_aabb_has_no_area(const godot_aabb *p_self); + +godot_bool GDAPI godot_aabb_has_no_surface(const godot_aabb *p_self); + +godot_bool GDAPI godot_aabb_intersects(const godot_aabb *p_self, const godot_aabb *p_with); + +godot_bool GDAPI godot_aabb_encloses(const godot_aabb *p_self, const godot_aabb *p_with); + +godot_aabb GDAPI godot_aabb_merge(const godot_aabb *p_self, const godot_aabb *p_with); + +godot_aabb GDAPI godot_aabb_intersection(const godot_aabb *p_self, const godot_aabb *p_with); + +godot_bool GDAPI godot_aabb_intersects_plane(const godot_aabb *p_self, const godot_plane *p_plane); + +godot_bool GDAPI godot_aabb_intersects_segment(const godot_aabb *p_self, const godot_vector3 *p_from, const godot_vector3 *p_to); + +godot_bool GDAPI godot_aabb_has_point(const godot_aabb *p_self, const godot_vector3 *p_point); + +godot_vector3 GDAPI godot_aabb_get_support(const godot_aabb *p_self, const godot_vector3 *p_dir); + +godot_vector3 GDAPI godot_aabb_get_longest_axis(const godot_aabb *p_self); + +godot_int GDAPI godot_aabb_get_longest_axis_index(const godot_aabb *p_self); + +godot_real GDAPI godot_aabb_get_longest_axis_size(const godot_aabb *p_self); + +godot_vector3 GDAPI godot_aabb_get_shortest_axis(const godot_aabb *p_self); + +godot_int GDAPI godot_aabb_get_shortest_axis_index(const godot_aabb *p_self); + +godot_real GDAPI godot_aabb_get_shortest_axis_size(const godot_aabb *p_self); + +godot_aabb GDAPI godot_aabb_expand(const godot_aabb *p_self, const godot_vector3 *p_to_point); + +godot_aabb GDAPI godot_aabb_grow(const godot_aabb *p_self, const godot_real p_by); + +godot_vector3 GDAPI godot_aabb_get_endpoint(const godot_aabb *p_self, const godot_int p_idx); + +godot_bool GDAPI godot_aabb_operator_equal(const godot_aabb *p_self, const godot_aabb *p_b); + +#ifdef __cplusplus +} +#endif + +#endif // GODOT_AABB_H diff --git a/modules/gdnative/include/gdnative/array.h b/modules/gdnative/include/gdnative/array.h index 01ae61e280..484ffd10ba 100644 --- a/modules/gdnative/include/gdnative/array.h +++ b/modules/gdnative/include/gdnative/array.h @@ -124,6 +124,10 @@ void GDAPI godot_array_sort(godot_array *p_self); void GDAPI godot_array_sort_custom(godot_array *p_self, godot_object *p_obj, const godot_string *p_func); +godot_int GDAPI godot_array_bsearch(godot_array *p_self, const godot_variant *p_value, const godot_bool p_before); + +godot_int GDAPI godot_array_bsearch_custom(godot_array *p_self, const godot_variant *p_value, godot_object *p_obj, const godot_string *p_func, const godot_bool p_before); + void GDAPI godot_array_destroy(godot_array *p_self); #ifdef __cplusplus diff --git a/modules/gdnative/include/gdnative/gdnative.h b/modules/gdnative/include/gdnative/gdnative.h index a479eced16..6e69d43469 100644 --- a/modules/gdnative/include/gdnative/gdnative.h +++ b/modules/gdnative/include/gdnative/gdnative.h @@ -53,7 +53,7 @@ extern "C" { // This is for libraries *using* the header, NOT GODOT EXPOSING STUFF!! #ifdef _WIN32 -#define GDN_EXPORT +#define GDN_EXPORT __declspec(dllexport) #else #define GDN_EXPORT #endif @@ -169,9 +169,9 @@ typedef void godot_object; #include <gdnative/quat.h> -/////// Rect3 +/////// AABB -#include <gdnative/rect3.h> +#include <gdnative/aabb.h> /////// Basis @@ -229,13 +229,28 @@ void GDAPI godot_method_bind_ptrcall(godot_method_bind *p_method_bind, godot_obj godot_variant GDAPI godot_method_bind_call(godot_method_bind *p_method_bind, godot_object *p_instance, const godot_variant **p_args, const int p_arg_count, godot_variant_call_error *p_call_error); ////// Script API -struct godot_gdnative_api_struct; // Forward declaration +typedef struct godot_gdnative_api_version { + unsigned int major; + unsigned int minor; +} godot_gdnative_api_version; + +typedef struct godot_gdnative_api_struct godot_gdnative_api_struct; + +struct godot_gdnative_api_struct { + unsigned int type; + godot_gdnative_api_version version; + const godot_gdnative_api_struct *next; +}; + +#define GDNATIVE_VERSION_COMPATIBLE(want, have) (want.major == have.major && want.minor <= have.minor) typedef struct { godot_bool in_editor; uint64_t core_api_hash; uint64_t editor_api_hash; uint64_t no_api_hash; + void (*report_version_mismatch)(const godot_object *p_library, const char *p_what, godot_gdnative_api_version p_want, godot_gdnative_api_version p_have); + void (*report_loading_error)(const godot_object *p_library, const char *p_what); godot_object *gd_native_library; // pointer to GDNativeLibrary that is being initialized const struct godot_gdnative_core_api_struct *api_struct; const godot_string *active_library_path; @@ -259,6 +274,9 @@ typedef godot_variant (*godot_gdnative_procedure_fn)(godot_array *); ////// System Functions +typedef godot_variant (*native_call_cb)(void *, godot_array *); +void GDAPI godot_register_native_call_type(const char *p_call_type, native_call_cb p_callback); + //using these will help Godot track how much memory is in use in debug mode void GDAPI *godot_alloc(int p_bytes); void GDAPI *godot_realloc(void *p_ptr, int p_bytes); diff --git a/modules/gdnative/include/gdnative/node_path.h b/modules/gdnative/include/gdnative/node_path.h index 42446175d8..b5a59fd325 100644 --- a/modules/gdnative/include/gdnative/node_path.h +++ b/modules/gdnative/include/gdnative/node_path.h @@ -73,7 +73,7 @@ godot_int GDAPI godot_node_path_get_subname_count(const godot_node_path *p_self) godot_string GDAPI godot_node_path_get_subname(const godot_node_path *p_self, const godot_int p_idx); -godot_string GDAPI godot_node_path_get_property(const godot_node_path *p_self); +godot_string GDAPI godot_node_path_get_concatenated_subnames(const godot_node_path *p_self); godot_bool GDAPI godot_node_path_is_empty(const godot_node_path *p_self); diff --git a/modules/gdnative/include/gdnative/rect3.h b/modules/gdnative/include/gdnative/rect3.h deleted file mode 100644 index f603a9268a..0000000000 --- a/modules/gdnative/include/gdnative/rect3.h +++ /dev/null @@ -1,117 +0,0 @@ -/*************************************************************************/ -/* rect3.h */ -/*************************************************************************/ -/* This file is part of: */ -/* GODOT ENGINE */ -/* https://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 GODOT_RECT3_H -#define GODOT_RECT3_H - -#ifdef __cplusplus -extern "C" { -#endif - -#include <stdint.h> - -#define GODOT_RECT3_SIZE 24 - -#ifndef GODOT_CORE_API_GODOT_RECT3_TYPE_DEFINED -#define GODOT_CORE_API_GODOT_RECT3_TYPE_DEFINED -typedef struct { - uint8_t _dont_touch_that[GODOT_RECT3_SIZE]; -} godot_rect3; -#endif - -// reduce extern "C" nesting for VS2013 -#ifdef __cplusplus -} -#endif - -#include <gdnative/gdnative.h> -#include <gdnative/plane.h> -#include <gdnative/vector3.h> - -#ifdef __cplusplus -extern "C" { -#endif - -void GDAPI godot_rect3_new(godot_rect3 *r_dest, const godot_vector3 *p_pos, const godot_vector3 *p_size); - -godot_vector3 GDAPI godot_rect3_get_position(const godot_rect3 *p_self); -void GDAPI godot_rect3_set_position(const godot_rect3 *p_self, const godot_vector3 *p_v); - -godot_vector3 GDAPI godot_rect3_get_size(const godot_rect3 *p_self); -void GDAPI godot_rect3_set_size(const godot_rect3 *p_self, const godot_vector3 *p_v); - -godot_string GDAPI godot_rect3_as_string(const godot_rect3 *p_self); - -godot_real GDAPI godot_rect3_get_area(const godot_rect3 *p_self); - -godot_bool GDAPI godot_rect3_has_no_area(const godot_rect3 *p_self); - -godot_bool GDAPI godot_rect3_has_no_surface(const godot_rect3 *p_self); - -godot_bool GDAPI godot_rect3_intersects(const godot_rect3 *p_self, const godot_rect3 *p_with); - -godot_bool GDAPI godot_rect3_encloses(const godot_rect3 *p_self, const godot_rect3 *p_with); - -godot_rect3 GDAPI godot_rect3_merge(const godot_rect3 *p_self, const godot_rect3 *p_with); - -godot_rect3 GDAPI godot_rect3_intersection(const godot_rect3 *p_self, const godot_rect3 *p_with); - -godot_bool GDAPI godot_rect3_intersects_plane(const godot_rect3 *p_self, const godot_plane *p_plane); - -godot_bool GDAPI godot_rect3_intersects_segment(const godot_rect3 *p_self, const godot_vector3 *p_from, const godot_vector3 *p_to); - -godot_bool GDAPI godot_rect3_has_point(const godot_rect3 *p_self, const godot_vector3 *p_point); - -godot_vector3 GDAPI godot_rect3_get_support(const godot_rect3 *p_self, const godot_vector3 *p_dir); - -godot_vector3 GDAPI godot_rect3_get_longest_axis(const godot_rect3 *p_self); - -godot_int GDAPI godot_rect3_get_longest_axis_index(const godot_rect3 *p_self); - -godot_real GDAPI godot_rect3_get_longest_axis_size(const godot_rect3 *p_self); - -godot_vector3 GDAPI godot_rect3_get_shortest_axis(const godot_rect3 *p_self); - -godot_int GDAPI godot_rect3_get_shortest_axis_index(const godot_rect3 *p_self); - -godot_real GDAPI godot_rect3_get_shortest_axis_size(const godot_rect3 *p_self); - -godot_rect3 GDAPI godot_rect3_expand(const godot_rect3 *p_self, const godot_vector3 *p_to_point); - -godot_rect3 GDAPI godot_rect3_grow(const godot_rect3 *p_self, const godot_real p_by); - -godot_vector3 GDAPI godot_rect3_get_endpoint(const godot_rect3 *p_self, const godot_int p_idx); - -godot_bool GDAPI godot_rect3_operator_equal(const godot_rect3 *p_self, const godot_rect3 *p_b); - -#ifdef __cplusplus -} -#endif - -#endif // GODOT_RECT3_H diff --git a/modules/gdnative/include/gdnative/string.h b/modules/gdnative/include/gdnative/string.h index 29510313c9..10358ceade 100644 --- a/modules/gdnative/include/gdnative/string.h +++ b/modules/gdnative/include/gdnative/string.h @@ -51,6 +51,7 @@ typedef struct { } #endif +#include <gdnative/array.h> #include <gdnative/gdnative.h> #include <gdnative/variant.h> @@ -67,7 +68,6 @@ void GDAPI godot_string_get_data(const godot_string *p_self, char *p_dest, int * wchar_t GDAPI *godot_string_operator_index(godot_string *p_self, const godot_int p_idx); wchar_t GDAPI godot_string_operator_index_const(const godot_string *p_self, const godot_int p_idx); -const char GDAPI *godot_string_c_str(const godot_string *p_self); const wchar_t GDAPI *godot_string_unicode_str(const godot_string *p_self); godot_bool GDAPI godot_string_operator_equal(const godot_string *p_self, const godot_string *p_b); diff --git a/modules/gdnative/include/gdnative/transform.h b/modules/gdnative/include/gdnative/transform.h index 8f50b01fb5..3b5c189bdf 100644 --- a/modules/gdnative/include/gdnative/transform.h +++ b/modules/gdnative/include/gdnative/transform.h @@ -98,9 +98,9 @@ godot_vector3 GDAPI godot_transform_xform_vector3(const godot_transform *p_self, godot_vector3 GDAPI godot_transform_xform_inv_vector3(const godot_transform *p_self, const godot_vector3 *p_v); -godot_rect3 GDAPI godot_transform_xform_rect3(const godot_transform *p_self, const godot_rect3 *p_v); +godot_aabb GDAPI godot_transform_xform_aabb(const godot_transform *p_self, const godot_aabb *p_v); -godot_rect3 GDAPI godot_transform_xform_inv_rect3(const godot_transform *p_self, const godot_rect3 *p_v); +godot_aabb GDAPI godot_transform_xform_inv_aabb(const godot_transform *p_self, const godot_aabb *p_v); #ifdef __cplusplus } diff --git a/modules/gdnative/include/gdnative/variant.h b/modules/gdnative/include/gdnative/variant.h index 3d744ef1f2..06cafcfa63 100644 --- a/modules/gdnative/include/gdnative/variant.h +++ b/modules/gdnative/include/gdnative/variant.h @@ -62,7 +62,7 @@ typedef enum godot_variant_type { GODOT_VARIANT_TYPE_TRANSFORM2D, GODOT_VARIANT_TYPE_PLANE, GODOT_VARIANT_TYPE_QUAT, // 10 - GODOT_VARIANT_TYPE_RECT3, + GODOT_VARIANT_TYPE_AABB, GODOT_VARIANT_TYPE_BASIS, GODOT_VARIANT_TYPE_TRANSFORM, @@ -104,6 +104,7 @@ typedef struct godot_variant_call_error { } #endif +#include <gdnative/aabb.h> #include <gdnative/array.h> #include <gdnative/basis.h> #include <gdnative/color.h> @@ -113,7 +114,6 @@ typedef struct godot_variant_call_error { #include <gdnative/pool_arrays.h> #include <gdnative/quat.h> #include <gdnative/rect2.h> -#include <gdnative/rect3.h> #include <gdnative/rid.h> #include <gdnative/string.h> #include <gdnative/transform.h> @@ -145,7 +145,7 @@ void GDAPI godot_variant_new_vector3(godot_variant *r_dest, const godot_vector3 void GDAPI godot_variant_new_transform2d(godot_variant *r_dest, const godot_transform2d *p_t2d); void GDAPI godot_variant_new_plane(godot_variant *r_dest, const godot_plane *p_plane); void GDAPI godot_variant_new_quat(godot_variant *r_dest, const godot_quat *p_quat); -void GDAPI godot_variant_new_rect3(godot_variant *r_dest, const godot_rect3 *p_rect3); +void GDAPI godot_variant_new_aabb(godot_variant *r_dest, const godot_aabb *p_aabb); void GDAPI godot_variant_new_basis(godot_variant *r_dest, const godot_basis *p_basis); void GDAPI godot_variant_new_transform(godot_variant *r_dest, const godot_transform *p_trans); void GDAPI godot_variant_new_color(godot_variant *r_dest, const godot_color *p_color); @@ -173,7 +173,7 @@ godot_vector3 GDAPI godot_variant_as_vector3(const godot_variant *p_self); godot_transform2d GDAPI godot_variant_as_transform2d(const godot_variant *p_self); godot_plane GDAPI godot_variant_as_plane(const godot_variant *p_self); godot_quat GDAPI godot_variant_as_quat(const godot_variant *p_self); -godot_rect3 GDAPI godot_variant_as_rect3(const godot_variant *p_self); +godot_aabb GDAPI godot_variant_as_aabb(const godot_variant *p_self); godot_basis GDAPI godot_variant_as_basis(const godot_variant *p_self); godot_transform GDAPI godot_variant_as_transform(const godot_variant *p_self); godot_color GDAPI godot_variant_as_color(const godot_variant *p_self); diff --git a/modules/gdnative/register_types.cpp b/modules/gdnative/register_types.cpp index 29b0a6719c..34099bf528 100644 --- a/modules/gdnative/register_types.cpp +++ b/modules/gdnative/register_types.cpp @@ -123,6 +123,11 @@ protected: virtual void _export_file(const String &p_path, const String &p_type, const Set<String> &p_features); }; +struct LibrarySymbol { + char *name; + bool is_required; +}; + void GDNativeExportPlugin::_export_file(const String &p_path, const String &p_type, const Set<String> &p_features) { if (p_type != "GDNativeLibrary") { return; @@ -136,7 +141,6 @@ void GDNativeExportPlugin::_export_file(const String &p_path, const String &p_ty Ref<ConfigFile> config = lib->get_config_file(); - String entry_lib_path; { List<String> entry_keys; @@ -161,14 +165,12 @@ void GDNativeExportPlugin::_export_file(const String &p_path, const String &p_ty continue; } - entry_lib_path = config->get_value("entry", key); - break; + String entry_lib_path = config->get_value("entry", key); + add_shared_object(entry_lib_path, tags); } } - Vector<String> dependency_paths; { - List<String> dependency_keys; config->get_section_keys("dependencies", &dependency_keys); @@ -191,47 +193,54 @@ void GDNativeExportPlugin::_export_file(const String &p_path, const String &p_ty continue; } - dependency_paths = config->get_value("dependencies", key); - break; + Vector<String> dependency_paths = config->get_value("dependencies", key); + for (int i = 0; i < dependency_paths.size(); i++) { + add_shared_object(dependency_paths[i], tags); + } } } - bool is_statically_linked = false; - { - - List<String> static_linking_keys; - config->get_section_keys("static_linking", &static_linking_keys); - - for (List<String>::Element *E = static_linking_keys.front(); E; E = E->next()) { - String key = E->get(); - - Vector<String> tags = key.split("."); - - bool skip = false; - - for (int i = 0; i < tags.size(); i++) { - bool has_feature = p_features.has(tags[i]); - - if (!has_feature) { - skip = true; - break; + if (p_features.has("iOS")) { + // Register symbols in the "fake" dynamic lookup table, because dlsym does not work well on iOS. + LibrarySymbol expected_symbols[] = { + { "gdnative_init", true }, + { "gdnative_terminate", false }, + { "nativescript_init", false }, + { "nativescript_frame", false }, + { "nativescript_thread_enter", false }, + { "nativescript_thread_exit", false }, + { "gdnative_singleton", false } + }; + String declare_pattern = "extern \"C\" void $name(void)$weak;\n"; + String additional_code = "extern void register_dynamic_symbol(char *name, void *address);\n" + "extern void add_ios_init_callback(void (*cb)());\n"; + String linker_flags = ""; + for (int i = 0; i < sizeof(expected_symbols) / sizeof(expected_symbols[0]); ++i) { + String full_name = lib->get_symbol_prefix() + expected_symbols[i].name; + String code = declare_pattern.replace("$name", full_name); + code = code.replace("$weak", expected_symbols[i].is_required ? "" : " __attribute__((weak))"); + additional_code += code; + + if (!expected_symbols[i].is_required) { + if (linker_flags.length() > 0) { + linker_flags += " "; } + linker_flags += "-Wl,-U,_" + full_name; } - - if (skip) { - continue; - } - - is_statically_linked = config->get_value("static_linking", key); - break; } - } - if (!is_statically_linked) - add_shared_object(entry_lib_path); + additional_code += String("void $prefixinit() {\n").replace("$prefix", lib->get_symbol_prefix()); + String register_pattern = " if (&$name) register_dynamic_symbol((char *)\"$name\", (void *)$name);\n"; + for (int i = 0; i < sizeof(expected_symbols) / sizeof(expected_symbols[0]); ++i) { + String full_name = lib->get_symbol_prefix() + expected_symbols[i].name; + additional_code += register_pattern.replace("$name", full_name); + } + additional_code += "}\n"; + additional_code += String("struct $prefixstruct {$prefixstruct() {add_ios_init_callback($prefixinit);}};\n").replace("$prefix", lib->get_symbol_prefix()); + additional_code += String("$prefixstruct $prefixstruct_instance;\n").replace("$prefix", lib->get_symbol_prefix()); - for (int i = 0; i < dependency_paths.size(); i++) { - add_shared_object(dependency_paths[i]); + add_ios_cpp_code(additional_code); + add_ios_linker_flags(linker_flags); } } @@ -271,9 +280,7 @@ void register_gdnative_types() { #ifdef TOOLS_ENABLED - if (Engine::get_singleton()->is_editor_hint()) { - EditorNode::add_init_callback(editor_init_callback); - } + EditorNode::add_init_callback(editor_init_callback); #endif ClassDB::register_class<GDNativeLibrary>(); @@ -371,7 +378,7 @@ void unregister_gdnative_types() { print_line(String("poolarray:\t") + itos(sizeof(PoolByteArray))); print_line(String("quat:\t") + itos(sizeof(Quat))); print_line(String("rect2:\t") + itos(sizeof(Rect2))); - print_line(String("rect3:\t") + itos(sizeof(Rect3))); + print_line(String("aabb:\t") + itos(sizeof(AABB))); print_line(String("rid:\t") + itos(sizeof(RID))); print_line(String("string:\t") + itos(sizeof(String))); print_line(String("transform:\t") + itos(sizeof(Transform))); diff --git a/modules/gdscript/gdscript.cpp b/modules/gdscript/gdscript.cpp index 55ea8a5f24..41a810ff00 100644 --- a/modules/gdscript/gdscript.cpp +++ b/modules/gdscript/gdscript.cpp @@ -100,7 +100,7 @@ GDScriptInstance *GDScript::_create_instance(const Variant **p_args, int p_argco #endif instance->owner->set_script_instance(instance); -/* STEP 2, INITIALIZE AND CONSRTUCT */ + /* STEP 2, INITIALIZE AND CONSRTUCT */ #ifndef NO_THREADS GDScriptLanguage::singleton->lock->lock(); @@ -615,6 +615,23 @@ ScriptLanguage *GDScript::get_language() const { return GDScriptLanguage::get_singleton(); } +void GDScript::get_constants(Map<StringName, Variant> *p_constants) { + + if (p_constants) { + for (Map<StringName, Variant>::Element *E = constants.front(); E; E = E->next()) { + (*p_constants)[E->key()] = E->value(); + } + } +} + +void GDScript::get_members(Set<StringName> *p_members) { + if (p_members) { + for (Set<StringName>::Element *E = members.front(); E; E = E->next()) { + p_members->insert(E->get()); + } + } +} + Variant GDScript::call(const StringName &p_method, const Variant **p_args, int p_argcount, Variant::CallError &r_error) { GDScript *top = this; diff --git a/modules/gdscript/gdscript.h b/modules/gdscript/gdscript.h index 3f6f431938..6e5d59ad0e 100644 --- a/modules/gdscript/gdscript.h +++ b/modules/gdscript/gdscript.h @@ -198,6 +198,9 @@ public: return -1; } + virtual void get_constants(Map<StringName, Variant> *p_constants); + virtual void get_members(Set<StringName> *p_members); + GDScript(); ~GDScript(); }; @@ -219,7 +222,7 @@ class GDScriptInstance : public ScriptInstance { void _ml_call_reversed(GDScript *sptr, const StringName &p_method, const Variant **p_args, int p_argcount); public: - _FORCE_INLINE_ Object *get_owner() { return owner; } + virtual Object *get_owner() { return owner; } virtual bool set(const StringName &p_name, const Variant &p_value); virtual bool get(const StringName &p_name, Variant &r_ret) const; @@ -407,7 +410,8 @@ public: 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 ScriptInstance *debug_get_stack_level_instance(int p_level); + virtual void debug_get_globals(List<String> *p_globals, 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); virtual void reload_all_scripts(); diff --git a/modules/gdscript/gdscript_compiler.cpp b/modules/gdscript/gdscript_compiler.cpp index 3121a61436..4cd6472b7f 100644 --- a/modules/gdscript/gdscript_compiler.cpp +++ b/modules/gdscript/gdscript_compiler.cpp @@ -1686,21 +1686,44 @@ Error GDScriptCompiler::_parse_class(GDScript *p_script, GDScript *p_owner, cons base_class = p->subclasses[base]; break; } + + if (p->constants.has(base)) { + + base_class = p->constants[base]; + if (base_class.is_null()) { + _set_error("Constant is not a class: " + base, p_class); + return ERR_SCRIPT_FAILED; + } + break; + } + p = p->_owner; } if (base_class.is_valid()) { + String ident = base; + for (int i = 1; i < p_class->extends_class.size(); i++) { String subclass = p_class->extends_class[i]; + ident += ("." + subclass); + if (base_class->subclasses.has(subclass)) { base_class = base_class->subclasses[subclass]; + } else if (base_class->constants.has(subclass)) { + + Ref<GDScript> new_base_class = base_class->constants[subclass]; + if (new_base_class.is_null()) { + _set_error("Constant is not a class: " + ident, p_class); + return ERR_SCRIPT_FAILED; + } + base_class = new_base_class; } else { - _set_error("Could not find subclass: " + subclass, p_class); + _set_error("Could not find subclass: " + ident, p_class); return ERR_FILE_NOT_FOUND; } } diff --git a/modules/gdscript/gdscript_editor.cpp b/modules/gdscript/gdscript_editor.cpp index a74b8a8483..5a76acea6e 100644 --- a/modules/gdscript/gdscript_editor.cpp +++ b/modules/gdscript/gdscript_editor.cpp @@ -33,7 +33,7 @@ #include "gdscript_compiler.h" #include "global_constants.h" #include "os/file_access.h" -#include "project_settings.h" +#include "core/engine.h" #ifdef TOOLS_ENABLED #include "editor/editor_file_system.h" @@ -280,10 +280,62 @@ void GDScriptLanguage::debug_get_stack_level_members(int p_level, List<String> * p_values->push_back(instance->debug_get_member_by_index(E->get().index)); } } -void GDScriptLanguage::debug_get_globals(List<String> *p_locals, List<Variant> *p_values, int p_max_subitems, int p_max_depth) { - //no globals are really reachable in gdscript +ScriptInstance *GDScriptLanguage::debug_get_stack_level_instance(int p_level) { + + ERR_FAIL_COND_V(_debug_parse_err_line >= 0, NULL); + ERR_FAIL_INDEX_V(p_level, _debug_call_stack_pos, NULL); + + int l = _debug_call_stack_pos - p_level - 1; + ScriptInstance *instance = _call_stack[l].instance; + + return instance; } + +void GDScriptLanguage::debug_get_globals(List<String> *p_globals, List<Variant> *p_values, int p_max_subitems, int p_max_depth) { + + const Map<StringName, int> &name_idx = GDScriptLanguage::get_singleton()->get_global_map(); + const Variant *globals = GDScriptLanguage::get_singleton()->get_global_array(); + + List<Pair<String, Variant> > cinfo; + get_public_constants(&cinfo); + + for (const Map<StringName, int>::Element *E = name_idx.front(); E; E = E->next()) { + + if (ClassDB::class_exists(E->key()) || Engine::get_singleton()->has_singleton(E->key())) + continue; + + bool is_script_constant = false; + for (List<Pair<String, Variant> >::Element *CE = cinfo.front(); CE; CE = CE->next()) { + if (CE->get().first == E->key()) { + is_script_constant = true; + break; + } + } + if (is_script_constant) + continue; + + const Variant &var = globals[E->value()]; + if (Object *obj = var) { + if (Object::cast_to<GDScriptNativeClass>(obj)) + continue; + } + + bool skip = false; + for (int i = 0; i < GlobalConstants::get_global_constant_count(); i++) { + if (E->key() == GlobalConstants::get_global_constant_name(i)) { + skip = true; + break; + } + } + if (skip) + continue; + + p_globals->push_back(E->key()); + p_values->push_back(var); + } +} + String GDScriptLanguage::debug_parse_stack_level_expression(int p_level, const String &p_expression, int p_max_subitems, int p_max_depth) { if (_debug_parse_err_line >= 0) @@ -1743,7 +1795,7 @@ static void _find_type_arguments(GDScriptCompletionContext &context, const GDScr } } else { -//regular method + //regular method #if defined(DEBUG_METHODS_ENABLED) && defined(TOOLS_ENABLED) if (p_argidx < m->get_argument_count()) { diff --git a/modules/gdscript/gdscript_functions.cpp b/modules/gdscript/gdscript_functions.cpp index 467dbf3e56..ca0a9582a7 100644 --- a/modules/gdscript/gdscript_functions.cpp +++ b/modules/gdscript/gdscript_functions.cpp @@ -84,6 +84,8 @@ const char *GDScriptFunctions::get_func_name(Function p_func) { "rad2deg", "linear2db", "db2linear", + "polar2cartesian", + "cartesian2polar", "wrapi", "wrapf", "max", @@ -408,6 +410,22 @@ void GDScriptFunctions::call(Function p_func, const Variant **p_args, int p_arg_ VALIDATE_ARG_NUM(0); r_ret = Math::db2linear((double)*p_args[0]); } break; + case MATH_POLAR2CARTESIAN: { + VALIDATE_ARG_COUNT(2); + VALIDATE_ARG_NUM(0); + VALIDATE_ARG_NUM(1); + double r = *p_args[0]; + double th = *p_args[1]; + r_ret = Vector2(r * Math::cos(th), r * Math::sin(th)); + } break; + case MATH_CARTESIAN2POLAR: { + VALIDATE_ARG_COUNT(2); + VALIDATE_ARG_NUM(0); + VALIDATE_ARG_NUM(1); + double x = *p_args[0]; + double y = *p_args[1]; + r_ret = Vector2(Math::sqrt(x * x + y * y), Math::atan2(y, x)); + } break; case MATH_WRAP: { VALIDATE_ARG_COUNT(3); r_ret = Math::wrapi((int64_t)*p_args[0], (int64_t)*p_args[1], (int64_t)*p_args[2]); @@ -642,7 +660,7 @@ void GDScriptFunctions::call(Function p_func, const Variant **p_args, int p_arg_ } //str+="\n"; - OS::get_singleton()->printerr("%s\n", str.utf8().get_data()); + print_error(str); r_ret = Variant(); } break; @@ -1296,6 +1314,8 @@ bool GDScriptFunctions::is_deterministic(Function p_func) { case MATH_RAD2DEG: case MATH_LINEAR2DB: case MATH_DB2LINEAR: + case MATH_POLAR2CARTESIAN: + case MATH_CARTESIAN2POLAR: case MATH_WRAP: case MATH_WRAPF: case LOGIC_MAX: @@ -1526,6 +1546,16 @@ MethodInfo GDScriptFunctions::get_info(Function p_func) { mi.return_val.type = Variant::REAL; return mi; } break; + case MATH_POLAR2CARTESIAN: { + MethodInfo mi("polar2cartesian", PropertyInfo(Variant::REAL, "r"), PropertyInfo(Variant::REAL, "th")); + mi.return_val.type = Variant::VECTOR2; + return mi; + } break; + case MATH_CARTESIAN2POLAR: { + MethodInfo mi("cartesian2polar", PropertyInfo(Variant::REAL, "x"), PropertyInfo(Variant::REAL, "y")); + mi.return_val.type = Variant::VECTOR2; + return mi; + } break; case MATH_WRAP: { MethodInfo mi("wrapi", PropertyInfo(Variant::INT, "value"), PropertyInfo(Variant::INT, "min"), PropertyInfo(Variant::INT, "max")); mi.return_val.type = Variant::INT; diff --git a/modules/gdscript/gdscript_functions.h b/modules/gdscript/gdscript_functions.h index ecbede83a8..d1c5815cec 100644 --- a/modules/gdscript/gdscript_functions.h +++ b/modules/gdscript/gdscript_functions.h @@ -75,6 +75,8 @@ public: MATH_RAD2DEG, MATH_LINEAR2DB, MATH_DB2LINEAR, + MATH_POLAR2CARTESIAN, + MATH_CARTESIAN2POLAR, MATH_WRAP, MATH_WRAPF, LOGIC_MAX, diff --git a/modules/gdscript/gdscript_parser.cpp b/modules/gdscript/gdscript_parser.cpp index 29b9865b1d..bee9ef1998 100644 --- a/modules/gdscript/gdscript_parser.cpp +++ b/modules/gdscript/gdscript_parser.cpp @@ -2971,18 +2971,37 @@ void GDScriptParser::_parse_extends(ClassNode *p_class) { } while (true) { - if (tokenizer->get_token() != GDScriptTokenizer::TK_IDENTIFIER) { - _set_error("Invalid 'extends' syntax, expected string constant (path) and/or identifier (parent class)."); - return; - } + switch (tokenizer->get_token()) { + + case GDScriptTokenizer::TK_IDENTIFIER: { + + StringName identifier = tokenizer->get_token_identifier(); + p_class->extends_class.push_back(identifier); + } + break; - StringName identifier = tokenizer->get_token_identifier(); - p_class->extends_class.push_back(identifier); + case GDScriptTokenizer::TK_PERIOD: + break; + + default: { + + _set_error("Invalid 'extends' syntax, expected string constant (path) and/or identifier (parent class)."); + return; + } + } tokenizer->advance(1); - if (tokenizer->get_token() != GDScriptTokenizer::TK_PERIOD) - return; + + switch (tokenizer->get_token()) { + + case GDScriptTokenizer::TK_IDENTIFIER: + case GDScriptTokenizer::TK_PERIOD: + continue; + + default: + return; + } } } @@ -3758,22 +3777,82 @@ void GDScriptParser::_parse_class(ClassNode *p_class) { current_export.hint = PROPERTY_HINT_NONE; } - } else if (tokenizer->get_token() == GDScriptTokenizer::TK_IDENTIFIER) { + } else { - String identifier = tokenizer->get_token_identifier(); - if (!ClassDB::is_parent_class(identifier, "Resource")) { + parenthesis++; + Node *subexpr = _parse_and_reduce_expression(p_class, true, true); + if (!subexpr) { + if (_recover_from_completion()) { + break; + } + return; + } + parenthesis--; + if (subexpr->type != Node::TYPE_CONSTANT) { current_export = PropertyInfo(); - _set_error("Export hint not a type or resource."); + _set_error("Expected a constant expression."); } - current_export.type = Variant::OBJECT; - current_export.hint = PROPERTY_HINT_RESOURCE_TYPE; - current_export.usage |= PROPERTY_USAGE_SCRIPT_VARIABLE; + Variant constant = static_cast<ConstantNode *>(subexpr)->value; - current_export.hint_string = identifier; + if (constant.get_type() == Variant::OBJECT) { + GDScriptNativeClass *native_class = Object::cast_to<GDScriptNativeClass>(constant); - tokenizer->advance(); + if (native_class && ClassDB::is_parent_class(native_class->get_name(), "Resource")) { + current_export.type = Variant::OBJECT; + current_export.hint = PROPERTY_HINT_RESOURCE_TYPE; + current_export.usage |= PROPERTY_USAGE_SCRIPT_VARIABLE; + + current_export.hint_string = native_class->get_name(); + + } else { + current_export = PropertyInfo(); + _set_error("Export hint not a resource type."); + } + } else if (constant.get_type() == Variant::DICTIONARY) { + // Enumeration + bool is_flags = false; + + if (tokenizer->get_token() == GDScriptTokenizer::TK_COMMA) { + tokenizer->advance(); + + if (tokenizer->get_token() == GDScriptTokenizer::TK_IDENTIFIER && tokenizer->get_token_identifier() == "FLAGS") { + is_flags = true; + tokenizer->advance(); + } else { + current_export = PropertyInfo(); + _set_error("Expected 'FLAGS' after comma."); + } + } + + current_export.type = Variant::INT; + current_export.hint = is_flags ? PROPERTY_HINT_FLAGS : PROPERTY_HINT_ENUM; + Dictionary enum_values = constant; + + List<Variant> keys; + enum_values.get_key_list(&keys); + + bool first = true; + for (List<Variant>::Element *E = keys.front(); E; E = E->next()) { + if (enum_values[E->get()].get_type() == Variant::INT) { + if (!first) + current_export.hint_string += ","; + else + first = false; + + current_export.hint_string += E->get().operator String().camelcase_to_underscore(true).capitalize().xml_escape(); + if (!is_flags) { + current_export.hint_string += ":"; + current_export.hint_string += enum_values[E->get()].operator String().xml_escape(); + } + } + } + } else { + current_export = PropertyInfo(); + _set_error("Expected type for export."); + return; + } } if (tokenizer->get_token() != GDScriptTokenizer::TK_PARENTHESIS_CLOSE) { diff --git a/modules/gdscript/gdscript_tokenizer.cpp b/modules/gdscript/gdscript_tokenizer.cpp index 174bb02967..e3a0af8ee6 100644 --- a/modules/gdscript/gdscript_tokenizer.cpp +++ b/modules/gdscript/gdscript_tokenizer.cpp @@ -148,7 +148,7 @@ static const _bit _type_list[] = { { Variant::RECT2, "Rect2" }, { Variant::TRANSFORM2D, "Transform2D" }, { Variant::VECTOR3, "Vector3" }, - { Variant::RECT3, "Rect3" }, + { Variant::AABB, "AABB" }, { Variant::PLANE, "Plane" }, { Variant::QUAT, "Quat" }, { Variant::BASIS, "Basis" }, @@ -253,9 +253,9 @@ bool GDScriptTokenizer::is_token_literal(int p_offset, bool variable_safe) const case TK_BUILT_IN_FUNC: case TK_OP_IN: - //case TK_OP_NOT: - //case TK_OP_OR: - //case TK_OP_AND: + //case TK_OP_NOT: + //case TK_OP_OR: + //case TK_OP_AND: case TK_PR_CLASS: case TK_PR_CONST: @@ -1125,7 +1125,7 @@ void GDScriptTokenizerText::advance(int p_amount) { _advance(); } -////////////////////////////////////////////////////////////////////////////////////////////////////// + ////////////////////////////////////////////////////////////////////////////////////////////////////// #define BYTECODE_VERSION 12 diff --git a/modules/gridmap/grid_map_editor_plugin.cpp b/modules/gridmap/grid_map_editor_plugin.cpp index bceb2b7db7..3a5d0fd3fc 100644 --- a/modules/gridmap/grid_map_editor_plugin.cpp +++ b/modules/gridmap/grid_map_editor_plugin.cpp @@ -623,6 +623,16 @@ bool GridMapEditor::forward_spatial_input_event(Camera *p_camera, const Ref<Inpu return do_input_action(p_camera, mm->get_position(), false); } + Ref<InputEventPanGesture> pan_gesture = p_event; + if (pan_gesture.is_valid()) { + + if (pan_gesture->get_command() || pan_gesture->get_shift()) { + const real_t delta = pan_gesture->get_delta().y; + floor->set_value(floor->get_value() + SGN(delta)); + return true; + } + } + return false; } @@ -1137,7 +1147,7 @@ GridMapEditor::GridMapEditor(EditorNode *p_editor) { for (int i = 0; i < 12; i++) { - Rect3 base(Vector3(0, 0, 0), Vector3(1, 1, 1)); + AABB base(Vector3(0, 0, 0), Vector3(1, 1, 1)); Vector3 a, b; base.get_edge(i, a, b); lines.push_back(a); diff --git a/modules/mono/csharp_script.cpp b/modules/mono/csharp_script.cpp index 161e130a07..dfa5e720ae 100644 --- a/modules/mono/csharp_script.cpp +++ b/modules/mono/csharp_script.cpp @@ -346,7 +346,7 @@ static String variant_type_to_managed_name(const String &p_var_type_name) { Variant::TRANSFORM2D, Variant::PLANE, Variant::QUAT, - Variant::RECT3, + Variant::AABB, Variant::BASIS, Variant::TRANSFORM, Variant::COLOR, diff --git a/modules/mono/editor/bindings_generator.cpp b/modules/mono/editor/bindings_generator.cpp index a293cc2c50..59a2b73dbc 100644 --- a/modules/mono/editor/bindings_generator.cpp +++ b/modules/mono/editor/bindings_generator.cpp @@ -1721,7 +1721,7 @@ void BindingsGenerator::_default_argument_from_variant(const Variant &p_val, Arg r_iarg.def_param_mode = ArgumentInterface::NULLABLE_VAL; break; case Variant::PLANE: - case Variant::RECT3: + case Variant::AABB: case Variant::COLOR: r_iarg.default_argument = "new Color(1, 1, 1, 1)"; r_iarg.def_param_mode = ArgumentInterface::NULLABLE_VAL; @@ -1793,7 +1793,7 @@ void BindingsGenerator::_populate_builtin_type_interfaces() { INSERT_STRUCT_TYPE(Basis, "real_t*") INSERT_STRUCT_TYPE(Quat, "real_t*") INSERT_STRUCT_TYPE(Transform, "real_t*") - INSERT_STRUCT_TYPE(Rect3, "real_t*") + INSERT_STRUCT_TYPE(AABB, "real_t*") INSERT_STRUCT_TYPE(Color, "real_t*") INSERT_STRUCT_TYPE(Plane, "real_t*") diff --git a/modules/mono/glue/cs_files/Rect3.cs b/modules/mono/glue/cs_files/AABB.cs index 617d33e7fd..e6e12f7ba3 100644 --- a/modules/mono/glue/cs_files/Rect3.cs +++ b/modules/mono/glue/cs_files/AABB.cs @@ -1,15 +1,15 @@ using System; -// file: core/math/rect3.h +// file: core/math/aabb.h // commit: 7ad14e7a3e6f87ddc450f7e34621eb5200808451 -// file: core/math/rect3.cpp +// file: core/math/aabb.cpp // commit: bd282ff43f23fe845f29a3e25c8efc01bd65ffb0 // file: core/variant_call.cpp // commit: 5ad9be4c24e9d7dc5672fdc42cea896622fe5685 namespace Godot { - public struct Rect3 : IEquatable<Rect3> + public struct AABB : IEquatable<AABB> { private Vector3 position; private Vector3 size; @@ -38,7 +38,7 @@ namespace Godot } } - public bool encloses(Rect3 with) + public bool Encloses(AABB with) { Vector3 src_min = position; Vector3 src_max = position + size; @@ -53,7 +53,7 @@ namespace Godot (src_max.z > dst_max.z)); } - public Rect3 expand(Vector3 to_point) + public AABB Expand(Vector3 to_point) { Vector3 begin = position; Vector3 end = position + size; @@ -72,15 +72,15 @@ namespace Godot if (to_point.z > end.z) end.z = to_point.z; - return new Rect3(begin, end - begin); + return new AABB(begin, end - begin); } - public float get_area() + public float GetArea() { return size.x * size.y * size.z; } - public Vector3 get_endpoint(int idx) + public Vector3 GetEndpoint(int idx) { switch (idx) { @@ -105,7 +105,7 @@ namespace Godot } } - public Vector3 get_longest_axis() + public Vector3 GetLongestAxis() { Vector3 axis = new Vector3(1f, 0f, 0f); float max_size = size.x; @@ -125,7 +125,7 @@ namespace Godot return axis; } - public Vector3.Axis get_longest_axis_index() + public Vector3.Axis GetLongestAxisIndex() { Vector3.Axis axis = Vector3.Axis.X; float max_size = size.x; @@ -145,7 +145,7 @@ namespace Godot return axis; } - public float get_longest_axis_size() + public float GetLongestAxisSize() { float max_size = size.x; @@ -158,7 +158,7 @@ namespace Godot return max_size; } - public Vector3 get_shortest_axis() + public Vector3 GetShortestAxis() { Vector3 axis = new Vector3(1f, 0f, 0f); float max_size = size.x; @@ -178,7 +178,7 @@ namespace Godot return axis; } - public Vector3.Axis get_shortest_axis_index() + public Vector3.Axis GetShortestAxisIndex() { Vector3.Axis axis = Vector3.Axis.X; float max_size = size.x; @@ -198,7 +198,7 @@ namespace Godot return axis; } - public float get_shortest_axis_size() + public float GetShortestAxisSize() { float max_size = size.x; @@ -211,7 +211,7 @@ namespace Godot return max_size; } - public Vector3 get_support(Vector3 dir) + public Vector3 GetSupport(Vector3 dir) { Vector3 half_extents = size * 0.5f; Vector3 ofs = position + half_extents; @@ -222,9 +222,9 @@ namespace Godot (dir.z > 0f) ? -half_extents.z : half_extents.z); } - public Rect3 grow(float by) + public AABB Grow(float by) { - Rect3 res = this; + AABB res = this; res.position.x -= by; res.position.y -= by; @@ -236,17 +236,17 @@ namespace Godot return res; } - public bool has_no_area() + public bool HasNoArea() { return size.x <= 0f || size.y <= 0f || size.z <= 0f; } - public bool has_no_surface() + public bool HasNoSurface() { return size.x <= 0f && size.y <= 0f && size.z <= 0f; } - public bool has_point(Vector3 point) + public bool HasPoint(Vector3 point) { if (point.x < position.x) return false; @@ -264,7 +264,7 @@ namespace Godot return true; } - public Rect3 intersection(Rect3 with) + public AABB Intersection(AABB with) { Vector3 src_min = position; Vector3 src_max = position + size; @@ -275,7 +275,7 @@ namespace Godot if (src_min.x > dst_max.x || src_max.x < dst_min.x) { - return new Rect3(); + return new AABB(); } else { @@ -285,7 +285,7 @@ namespace Godot if (src_min.y > dst_max.y || src_max.y < dst_min.y) { - return new Rect3(); + return new AABB(); } else { @@ -295,7 +295,7 @@ namespace Godot if (src_min.z > dst_max.z || src_max.z < dst_min.z) { - return new Rect3(); + return new AABB(); } else { @@ -303,10 +303,10 @@ namespace Godot max.z = (src_max.z < dst_max.z) ? src_max.z : dst_max.z; } - return new Rect3(min, max - min); + return new AABB(min, max - min); } - public bool intersects(Rect3 with) + public bool Intersects(AABB with) { if (position.x >= (with.position.x + with.size.x)) return false; @@ -324,7 +324,7 @@ namespace Godot return true; } - public bool intersects_plane(Plane plane) + public bool IntersectsPlane(Plane plane) { Vector3[] points = { @@ -343,7 +343,7 @@ namespace Godot for (int i = 0; i < 8; i++) { - if (plane.distance_to(points[i]) > 0) + if (plane.DistanceTo(points[i]) > 0) over = true; else under = true; @@ -352,7 +352,7 @@ namespace Godot return under && over; } - public bool intersects_segment(Vector3 from, Vector3 to) + public bool IntersectsSegment(Vector3 from, Vector3 to) { float min = 0f; float max = 1f; @@ -398,7 +398,7 @@ namespace Godot return true; } - public Rect3 merge(Rect3 with) + public AABB Merge(AABB with) { Vector3 beg_1 = position; Vector3 beg_2 = with.position; @@ -417,36 +417,36 @@ namespace Godot (end_1.z > end_2.z) ? end_1.z : end_2.z ); - return new Rect3(min, max - min); + return new AABB(min, max - min); } - public Rect3(Vector3 position, Vector3 size) + public AABB(Vector3 position, Vector3 size) { this.position = position; this.size = size; } - public static bool operator ==(Rect3 left, Rect3 right) + public static bool operator ==(AABB left, AABB right) { return left.Equals(right); } - public static bool operator !=(Rect3 left, Rect3 right) + public static bool operator !=(AABB left, AABB right) { return !left.Equals(right); } public override bool Equals(object obj) { - if (obj is Rect3) + if (obj is AABB) { - return Equals((Rect3)obj); + return Equals((AABB)obj); } return false; } - public bool Equals(Rect3 other) + public bool Equals(AABB other) { return position == other.position && size == other.size; } diff --git a/modules/mono/glue/cs_files/Basis.cs b/modules/mono/glue/cs_files/Basis.cs index c50e783349..ea92b1641b 100644 --- a/modules/mono/glue/cs_files/Basis.cs +++ b/modules/mono/glue/cs_files/Basis.cs @@ -56,9 +56,9 @@ namespace Godot { return new Vector3 ( - new Vector3(this[0, 0], this[1, 0], this[2, 0]).length(), - new Vector3(this[0, 1], this[1, 1], this[2, 1]).length(), - new Vector3(this[0, 2], this[1, 2], this[2, 2]).length() + new Vector3(this[0, 0], this[1, 0], this[2, 0]).Length(), + new Vector3(this[0, 1], this[1, 1], this[2, 1]).Length(), + new Vector3(this[0, 2], this[1, 2], this[2, 2]).Length() ); } } @@ -133,7 +133,7 @@ namespace Godot } } - internal static Basis create_from_axes(Vector3 xAxis, Vector3 yAxis, Vector3 zAxis) + internal static Basis CreateFromAxes(Vector3 xAxis, Vector3 yAxis, Vector3 zAxis) { return new Basis ( @@ -143,21 +143,21 @@ namespace Godot ); } - public float determinant() + public float Determinant() { return this[0, 0] * (this[1, 1] * this[2, 2] - this[2, 1] * this[1, 2]) - this[1, 0] * (this[0, 1] * this[2, 2] - this[2, 1] * this[0, 2]) + this[2, 0] * (this[0, 1] * this[1, 2] - this[1, 1] * this[0, 2]); } - public Vector3 get_axis(int axis) + public Vector3 GetAxis(int axis) { return new Vector3(this[0, axis], this[1, axis], this[2, axis]); } - public Vector3 get_euler() + public Vector3 GetEuler() { - Basis m = this.orthonormalized(); + Basis m = this.Orthonormalized(); Vector3 euler; euler.z = 0.0f; @@ -169,26 +169,26 @@ namespace Godot { if (mxy > -1.0f) { - euler.x = Mathf.asin(-mxy); - euler.y = Mathf.atan2(m.x[2], m.z[2]); - euler.z = Mathf.atan2(m.y[0], m.y[1]); + euler.x = Mathf.Asin(-mxy); + euler.y = Mathf.Atan2(m.x[2], m.z[2]); + euler.z = Mathf.Atan2(m.y[0], m.y[1]); } else { euler.x = Mathf.PI * 0.5f; - euler.y = -Mathf.atan2(-m.x[1], m.x[0]); + euler.y = -Mathf.Atan2(-m.x[1], m.x[0]); } } else { euler.x = -Mathf.PI * 0.5f; - euler.y = -Mathf.atan2(m.x[1], m.x[0]); + euler.y = -Mathf.Atan2(m.x[1], m.x[0]); } return euler; } - public int get_orthogonal_index() + public int GetOrthogonalIndex() { Basis orth = this; @@ -218,7 +218,7 @@ namespace Godot return 0; } - public Basis inverse() + public Basis Inverse() { Basis inv = this; @@ -259,27 +259,27 @@ namespace Godot return inv; } - public Basis orthonormalized() + public Basis Orthonormalized() { - Vector3 xAxis = get_axis(0); - Vector3 yAxis = get_axis(1); - Vector3 zAxis = get_axis(2); + Vector3 xAxis = GetAxis(0); + Vector3 yAxis = GetAxis(1); + Vector3 zAxis = GetAxis(2); - xAxis.normalize(); - yAxis = (yAxis - xAxis * (xAxis.dot(yAxis))); - yAxis.normalize(); - zAxis = (zAxis - xAxis * (xAxis.dot(zAxis)) - yAxis * (yAxis.dot(zAxis))); - zAxis.normalize(); + xAxis.Normalize(); + yAxis = (yAxis - xAxis * (xAxis.Dot(yAxis))); + yAxis.Normalize(); + zAxis = (zAxis - xAxis * (xAxis.Dot(zAxis)) - yAxis * (yAxis.Dot(zAxis))); + zAxis.Normalize(); - return Basis.create_from_axes(xAxis, yAxis, zAxis); + return Basis.CreateFromAxes(xAxis, yAxis, zAxis); } - public Basis rotated(Vector3 axis, float phi) + public Basis Rotated(Vector3 axis, float phi) { return new Basis(axis, phi) * this; } - public Basis scaled(Vector3 scale) + public Basis Scaled(Vector3 scale) { Basis m = this; @@ -296,22 +296,22 @@ namespace Godot return m; } - public float tdotx(Vector3 with) + public float Tdotx(Vector3 with) { return this[0, 0] * with[0] + this[1, 0] * with[1] + this[2, 0] * with[2]; } - public float tdoty(Vector3 with) + public float Tdoty(Vector3 with) { return this[0, 1] * with[0] + this[1, 1] * with[1] + this[2, 1] * with[2]; } - public float tdotz(Vector3 with) + public float Tdotz(Vector3 with) { return this[0, 2] * with[0] + this[1, 2] * with[1] + this[2, 2] * with[2]; } - public Basis transposed() + public Basis Transposed() { Basis tr = this; @@ -330,17 +330,17 @@ namespace Godot return tr; } - public Vector3 xform(Vector3 v) + public Vector3 Xform(Vector3 v) { return new Vector3 ( - this[0].dot(v), - this[1].dot(v), - this[2].dot(v) + this[0].Dot(v), + this[1].Dot(v), + this[2].Dot(v) ); } - public Vector3 xform_inv(Vector3 v) + public Vector3 XformInv(Vector3 v) { return new Vector3 ( @@ -354,7 +354,7 @@ namespace Godot float trace = x[0] + y[1] + z[2]; if (trace > 0.0f) { - float s = Mathf.sqrt(trace + 1.0f) * 2f; + float s = Mathf.Sqrt(trace + 1.0f) * 2f; float inv_s = 1f / s; return new Quat( (z[1] - y[2]) * inv_s, @@ -363,7 +363,7 @@ namespace Godot s * 0.25f ); } else if (x[0] > y[1] && x[0] > z[2]) { - float s = Mathf.sqrt(x[0] - y[1] - z[2] + 1.0f) * 2f; + float s = Mathf.Sqrt(x[0] - y[1] - z[2] + 1.0f) * 2f; float inv_s = 1f / s; return new Quat( s * 0.25f, @@ -372,7 +372,7 @@ namespace Godot (z[1] - y[2]) * inv_s ); } else if (y[1] > z[2]) { - float s = Mathf.sqrt(-x[0] + y[1] - z[2] + 1.0f) * 2f; + float s = Mathf.Sqrt(-x[0] + y[1] - z[2] + 1.0f) * 2f; float inv_s = 1f / s; return new Quat( (x[1] + y[0]) * inv_s, @@ -381,7 +381,7 @@ namespace Godot (x[2] - z[0]) * inv_s ); } else { - float s = Mathf.sqrt(-x[0] - y[1] + z[2] + 1.0f) * 2f; + float s = Mathf.Sqrt(-x[0] - y[1] + z[2] + 1.0f) * 2f; float inv_s = 1f / s; return new Quat( (x[2] + z[0]) * inv_s, @@ -394,7 +394,7 @@ namespace Godot public Basis(Quat quat) { - float s = 2.0f / quat.length_squared(); + float s = 2.0f / quat.LengthSquared(); float xs = quat.x * s; float ys = quat.y * s; @@ -418,8 +418,8 @@ namespace Godot { Vector3 axis_sq = new Vector3(axis.x * axis.x, axis.y * axis.y, axis.z * axis.z); - float cosine = Mathf.cos(phi); - float sine = Mathf.sin(phi); + float cosine = Mathf.Cos(phi); + float sine = Mathf.Sin(phi); this.x = new Vector3 ( @@ -461,9 +461,9 @@ namespace Godot { return new Basis ( - right.tdotx(left[0]), right.tdoty(left[0]), right.tdotz(left[0]), - right.tdotx(left[1]), right.tdoty(left[1]), right.tdotz(left[1]), - right.tdotx(left[2]), right.tdoty(left[2]), right.tdotz(left[2]) + right.Tdotx(left[0]), right.Tdoty(left[0]), right.Tdotz(left[0]), + right.Tdotx(left[1]), right.Tdoty(left[1]), right.Tdotz(left[1]), + right.Tdotx(left[2]), right.Tdoty(left[2]), right.Tdotz(left[2]) ); } diff --git a/modules/mono/glue/cs_files/Color.cs b/modules/mono/glue/cs_files/Color.cs index 0a00f83d47..db0e1fb744 100644 --- a/modules/mono/glue/cs_files/Color.cs +++ b/modules/mono/glue/cs_files/Color.cs @@ -45,8 +45,8 @@ namespace Godot { get { - float max = Mathf.max(r, Mathf.max(g, b)); - float min = Mathf.min(r, Mathf.min(g, b)); + float max = Mathf.Max(r, Mathf.Max(g, b)); + float min = Mathf.Min(r, Mathf.Min(g, b)); float delta = max - min; @@ -71,7 +71,7 @@ namespace Godot } set { - this = from_hsv(value, s, v); + this = FromHsv(value, s, v); } } @@ -79,8 +79,8 @@ namespace Godot { get { - float max = Mathf.max(r, Mathf.max(g, b)); - float min = Mathf.min(r, Mathf.min(g, b)); + float max = Mathf.Max(r, Mathf.Max(g, b)); + float min = Mathf.Min(r, Mathf.Min(g, b)); float delta = max - min; @@ -88,7 +88,7 @@ namespace Godot } set { - this = from_hsv(h, value, v); + this = FromHsv(h, value, v); } } @@ -96,11 +96,11 @@ namespace Godot { get { - return Mathf.max(r, Mathf.max(g, b)); + return Mathf.Max(r, Mathf.Max(g, b)); } set { - this = from_hsv(h, s, value); + this = FromHsv(h, s, value); } } @@ -154,10 +154,10 @@ namespace Godot } } - public static void to_hsv(Color color, out float hue, out float saturation, out float value) + public static void ToHsv(Color color, out float hue, out float saturation, out float value) { - int max = Mathf.max(color.r8, Mathf.max(color.g8, color.b8)); - int min = Mathf.min(color.r8, Mathf.min(color.g8, color.b8)); + int max = Mathf.Max(color.r8, Mathf.Max(color.g8, color.b8)); + int min = Mathf.Min(color.r8, Mathf.Min(color.g8, color.b8)); float delta = max - min; @@ -184,7 +184,7 @@ namespace Godot value = max / 255f; } - public static Color from_hsv(float hue, float saturation, float value, float alpha = 1.0f) + public static Color FromHsv(float hue, float saturation, float value, float alpha = 1.0f) { if (saturation == 0) { @@ -221,7 +221,7 @@ namespace Godot } } - public Color blend(Color over) + public Color Blend(Color over) { Color res; @@ -242,7 +242,7 @@ namespace Godot return res; } - public Color contrasted() + public Color Contrasted() { return new Color( (r + 0.5f) % 1.0f, @@ -251,12 +251,12 @@ namespace Godot ); } - public float gray() + public float Gray() { return (r + g + b) / 3.0f; } - public Color inverted() + public Color Inverted() { return new Color( 1.0f - r, @@ -265,7 +265,7 @@ namespace Godot ); } - public Color linear_interpolate(Color b, float t) + public Color LinearInterpolate(Color b, float t) { Color res = this; @@ -277,7 +277,7 @@ namespace Godot return res; } - public int to_32() + public int To32() { int c = (byte)(a * 255); c <<= 8; @@ -290,7 +290,7 @@ namespace Godot return c; } - public int to_ARGB32() + public int ToArgb32() { int c = (byte)(a * 255); c <<= 8; @@ -303,7 +303,7 @@ namespace Godot return c; } - public string to_html(bool include_alpha = true) + public string ToHtml(bool include_alpha = true) { String txt = string.Empty; @@ -375,7 +375,7 @@ namespace Godot private String _to_hex(float val) { - int v = (int)Mathf.clamp(val * 255.0f, 0, 255); + int v = (int)Mathf.Clamp(val * 255.0f, 0, 255); string ret = string.Empty; @@ -396,7 +396,7 @@ namespace Godot return ret; } - internal static bool html_is_valid(string color) + internal static bool HtmlIsValid(string color) { if (color.Length == 0) return false; diff --git a/modules/mono/glue/cs_files/GD.cs b/modules/mono/glue/cs_files/GD.cs index 40a42d23b4..99fc289161 100644 --- a/modules/mono/glue/cs_files/GD.cs +++ b/modules/mono/glue/cs_files/GD.cs @@ -6,32 +6,32 @@ namespace Godot { /*{GodotGlobalConstants}*/ - public static object bytes2var(byte[] bytes) + public static object Bytes2Var(byte[] bytes) { return NativeCalls.godot_icall_Godot_bytes2var(bytes); } - public static object convert(object what, int type) + public static object Convert(object what, int type) { return NativeCalls.godot_icall_Godot_convert(what, type); } - public static float db2linear(float db) + public static float Db2Linear(float db) { return (float)Math.Exp(db * 0.11512925464970228420089957273422); } - public static float dectime(float value, float amount, float step) + public static float Dectime(float value, float amount, float step) { float sgn = value < 0 ? -1.0f : 1.0f; - float val = Mathf.abs(value); + float val = Mathf.Abs(value); val -= amount * step; if (val < 0.0f) val = 0.0f; return val * sgn; } - public static FuncRef funcref(Object instance, string funcname) + public static FuncRef Funcref(Object instance, string funcname) { var ret = new FuncRef(); ret.SetInstance(instance); @@ -39,57 +39,57 @@ namespace Godot return ret; } - public static int hash(object var) + public static int Hash(object var) { return NativeCalls.godot_icall_Godot_hash(var); } - public static Object instance_from_id(int instance_id) + public static Object InstanceFromId(int instanceId) { - return NativeCalls.godot_icall_Godot_instance_from_id(instance_id); + return NativeCalls.godot_icall_Godot_instance_from_id(instanceId); } - public static double linear2db(double linear) + public static double Linear2Db(double linear) { return Math.Log(linear) * 8.6858896380650365530225783783321; } - public static Resource load(string path) + public static Resource Load(string path) { return ResourceLoader.Load(path); } - public static void print(params object[] what) + public static void Print(params object[] what) { NativeCalls.godot_icall_Godot_print(what); } - public static void print_stack() + public static void PrintStack() { - print(System.Environment.StackTrace); + Print(System.Environment.StackTrace); } - public static void printerr(params object[] what) + public static void Printerr(params object[] what) { NativeCalls.godot_icall_Godot_printerr(what); } - public static void printraw(params object[] what) + public static void Printraw(params object[] what) { NativeCalls.godot_icall_Godot_printraw(what); } - public static void prints(params object[] what) + public static void Prints(params object[] what) { NativeCalls.godot_icall_Godot_prints(what); } - public static void printt(params object[] what) + public static void Printt(params object[] what) { NativeCalls.godot_icall_Godot_printt(what); } - public static int[] range(int length) + public static int[] Range(int length) { int[] ret = new int[length]; @@ -101,7 +101,7 @@ namespace Godot return ret; } - public static int[] range(int from, int to) + public static int[] Range(int from, int to) { if (to < from) return new int[0]; @@ -116,7 +116,7 @@ namespace Godot return ret; } - public static int[] range(int from, int to, int increment) + public static int[] Range(int from, int to, int increment) { if (to < from && increment > 0) return new int[0]; @@ -153,37 +153,37 @@ namespace Godot return ret; } - public static void seed(int seed) + public static void Seed(int seed) { NativeCalls.godot_icall_Godot_seed(seed); } - public static string str(params object[] what) + public static string Str(params object[] what) { return NativeCalls.godot_icall_Godot_str(what); } - public static object str2var(string str) + public static object Str2Var(string str) { return NativeCalls.godot_icall_Godot_str2var(str); } - public static bool type_exists(string type) + public static bool TypeExists(string type) { return NativeCalls.godot_icall_Godot_type_exists(type); } - public static byte[] var2bytes(object var) + public static byte[] Var2Bytes(object var) { return NativeCalls.godot_icall_Godot_var2bytes(var); } - public static string var2str(object var) + public static string Var2Str(object var) { return NativeCalls.godot_icall_Godot_var2str(var); } - public static WeakRef weakref(Object obj) + public static WeakRef Weakref(Object obj) { return NativeCalls.godot_icall_Godot_weakref(Object.GetPtr(obj)); } diff --git a/modules/mono/glue/cs_files/Mathf.cs b/modules/mono/glue/cs_files/Mathf.cs index cb0eb1acdd..6951ace4fc 100644 --- a/modules/mono/glue/cs_files/Mathf.cs +++ b/modules/mono/glue/cs_files/Mathf.cs @@ -10,37 +10,42 @@ namespace Godot private const float Deg2RadConst = 0.0174532924f; private const float Rad2DegConst = 57.29578f; - public static float abs(float s) + public static float Abs(float s) { return Math.Abs(s); } - public static float acos(float s) + public static float Acos(float s) { return (float)Math.Acos(s); } - public static float asin(float s) + public static float Asin(float s) { return (float)Math.Asin(s); } - public static float atan(float s) + public static float Atan(float s) { return (float)Math.Atan(s); } - public static float atan2(float x, float y) + public static float Atan2(float x, float y) { return (float)Math.Atan2(x, y); } - public static float ceil(float s) + public static Vector2 Cartesian2Polar(float x, float y) + { + return new Vector2(Sqrt(x * x + y * y), Atan2(y, x)); + } + + public static float Ceil(float s) { return (float)Math.Ceiling(s); } - public static float clamp(float val, float min, float max) + public static float Clamp(float val, float min, float max) { if (val < min) { @@ -54,32 +59,32 @@ namespace Godot return val; } - public static float cos(float s) + public static float Cos(float s) { return (float)Math.Cos(s); } - public static float cosh(float s) + public static float Cosh(float s) { return (float)Math.Cosh(s); } - public static int decimals(float step) + public static int Decimals(float step) { - return decimals(step); + return Decimals(step); } - public static int decimals(decimal step) + public static int Decimals(decimal step) { return BitConverter.GetBytes(decimal.GetBits(step)[3])[2]; } - public static float deg2rad(float deg) + public static float Deg2Rad(float deg) { return deg * Deg2RadConst; } - public static float ease(float s, float curve) + public static float Ease(float s, float curve) { if (s < 0f) { @@ -94,35 +99,35 @@ namespace Godot { if (curve < 1.0f) { - return 1.0f - pow(1.0f - s, 1.0f / curve); + return 1.0f - Pow(1.0f - s, 1.0f / curve); } - return pow(s, curve); + return Pow(s, curve); } else if (curve < 0f) { if (s < 0.5f) { - return pow(s * 2.0f, -curve) * 0.5f; + return Pow(s * 2.0f, -curve) * 0.5f; } - return (1.0f - pow(1.0f - (s - 0.5f) * 2.0f, -curve)) * 0.5f + 0.5f; + return (1.0f - Pow(1.0f - (s - 0.5f) * 2.0f, -curve)) * 0.5f + 0.5f; } return 0f; } - public static float exp(float s) + public static float Exp(float s) { return (float)Math.Exp(s); } - public static float floor(float s) + public static float Floor(float s) { return (float)Math.Floor(s); } - public static float fposmod(float x, float y) + public static float Fposmod(float x, float y) { if (x >= 0f) { @@ -134,37 +139,37 @@ namespace Godot } } - public static float lerp(float from, float to, float weight) + public static float Lerp(float from, float to, float weight) { - return from + (to - from) * clamp(weight, 0f, 1f); + return from + (to - from) * Clamp(weight, 0f, 1f); } - public static float log(float s) + public static float Log(float s) { return (float)Math.Log(s); } - public static int max(int a, int b) + public static int Max(int a, int b) { return (a > b) ? a : b; } - public static float max(float a, float b) + public static float Max(float a, float b) { return (a > b) ? a : b; } - public static int min(int a, int b) + public static int Min(int a, int b) { return (a < b) ? a : b; } - public static float min(float a, float b) + public static float Min(float a, float b) { return (a < b) ? a : b; } - public static int nearest_po2(int val) + public static int NearestPo2(int val) { val--; val |= val >> 1; @@ -176,57 +181,62 @@ namespace Godot return val; } - public static float pow(float x, float y) + public static Vector2 Polar2Cartesian(float r, float th) + { + return new Vector2(r * Cos(th), r * Sin(th)); + } + + public static float Pow(float x, float y) { return (float)Math.Pow(x, y); } - public static float rad2deg(float rad) + public static float Rad2Deg(float rad) { return rad * Rad2DegConst; } - public static float round(float s) + public static float Round(float s) { return (float)Math.Round(s); } - public static float sign(float s) + public static float Sign(float s) { return (s < 0f) ? -1f : 1f; } - public static float sin(float s) + public static float Sin(float s) { return (float)Math.Sin(s); } - public static float sinh(float s) + public static float Sinh(float s) { return (float)Math.Sinh(s); } - public static float sqrt(float s) + public static float Sqrt(float s) { return (float)Math.Sqrt(s); } - public static float stepify(float s, float step) + public static float Stepify(float s, float step) { if (step != 0f) { - s = floor(s / step + 0.5f) * step; + s = Floor(s / step + 0.5f) * step; } return s; } - public static float tan(float s) + public static float Tan(float s) { return (float)Math.Tan(s); } - public static float tanh(float s) + public static float Tanh(float s) { return (float)Math.Tanh(s); } diff --git a/modules/mono/glue/cs_files/Plane.cs b/modules/mono/glue/cs_files/Plane.cs index 37f70aca1e..6365e71826 100644 --- a/modules/mono/glue/cs_files/Plane.cs +++ b/modules/mono/glue/cs_files/Plane.cs @@ -52,44 +52,44 @@ namespace Godot } } - public float distance_to(Vector3 point) + public float DistanceTo(Vector3 point) { - return normal.dot(point) - d; + return normal.Dot(point) - d; } - public Vector3 get_any_point() + public Vector3 GetAnyPoint() { return normal * d; } - public bool has_point(Vector3 point, float epsilon = Mathf.Epsilon) + public bool HasPoint(Vector3 point, float epsilon = Mathf.Epsilon) { - float dist = normal.dot(point) - d; - return Mathf.abs(dist) <= epsilon; + float dist = normal.Dot(point) - d; + return Mathf.Abs(dist) <= epsilon; } - public Vector3 intersect_3(Plane b, Plane c) + public Vector3 Intersect3(Plane b, Plane c) { - float denom = normal.cross(b.normal).dot(c.normal); + float denom = normal.Cross(b.normal).Dot(c.normal); - if (Mathf.abs(denom) <= Mathf.Epsilon) + if (Mathf.Abs(denom) <= Mathf.Epsilon) return new Vector3(); - Vector3 result = (b.normal.cross(c.normal) * this.d) + - (c.normal.cross(normal) * b.d) + - (normal.cross(b.normal) * c.d); + Vector3 result = (b.normal.Cross(c.normal) * this.d) + + (c.normal.Cross(normal) * b.d) + + (normal.Cross(b.normal) * c.d); return result / denom; } - public Vector3 intersect_ray(Vector3 from, Vector3 dir) + public Vector3 IntersectRay(Vector3 from, Vector3 dir) { - float den = normal.dot(dir); + float den = normal.Dot(dir); - if (Mathf.abs(den) <= Mathf.Epsilon) + if (Mathf.Abs(den) <= Mathf.Epsilon) return new Vector3(); - float dist = (normal.dot(from) - d) / den; + float dist = (normal.Dot(from) - d) / den; // This is a ray, before the emiting pos (from) does not exist if (dist > Mathf.Epsilon) @@ -98,15 +98,15 @@ namespace Godot return from + dir * -dist; } - public Vector3 intersect_segment(Vector3 begin, Vector3 end) + public Vector3 IntersectSegment(Vector3 begin, Vector3 end) { Vector3 segment = begin - end; - float den = normal.dot(segment); + float den = normal.Dot(segment); - if (Mathf.abs(den) <= Mathf.Epsilon) + if (Mathf.Abs(den) <= Mathf.Epsilon) return new Vector3(); - float dist = (normal.dot(begin) - d) / den; + float dist = (normal.Dot(begin) - d) / den; if (dist < -Mathf.Epsilon || dist > (1.0f + Mathf.Epsilon)) return new Vector3(); @@ -114,14 +114,14 @@ namespace Godot return begin + segment * -dist; } - public bool is_point_over(Vector3 point) + public bool IsPointOver(Vector3 point) { - return normal.dot(point) > d; + return normal.Dot(point) > d; } - public Plane normalized() + public Plane Normalized() { - float len = normal.length(); + float len = normal.Length(); if (len == 0) return new Plane(0, 0, 0, 0); @@ -129,9 +129,9 @@ namespace Godot return new Plane(normal / len, d / len); } - public Vector3 project(Vector3 point) + public Vector3 Project(Vector3 point) { - return point - normal * distance_to(point); + return point - normal * DistanceTo(point); } public Plane(float a, float b, float c, float d) @@ -148,9 +148,9 @@ namespace Godot public Plane(Vector3 v1, Vector3 v2, Vector3 v3) { - normal = (v1 - v3).cross(v1 - v2); - normal.normalize(); - d = normal.dot(v1); + normal = (v1 - v3).Cross(v1 - v2); + normal.Normalize(); + d = normal.Dot(v1); } public static Plane operator -(Plane plane) diff --git a/modules/mono/glue/cs_files/Quat.cs b/modules/mono/glue/cs_files/Quat.cs index 9b4b7fb297..c0ac41c5d7 100644 --- a/modules/mono/glue/cs_files/Quat.cs +++ b/modules/mono/glue/cs_files/Quat.cs @@ -58,40 +58,40 @@ namespace Godot } } - public Quat cubic_slerp(Quat b, Quat preA, Quat postB, float t) + public Quat CubicSlerp(Quat b, Quat preA, Quat postB, float t) { float t2 = (1.0f - t) * t * 2f; - Quat sp = slerp(b, t); - Quat sq = preA.slerpni(postB, t); - return sp.slerpni(sq, t2); + Quat sp = Slerp(b, t); + Quat sq = preA.Slerpni(postB, t); + return sp.Slerpni(sq, t2); } - public float dot(Quat b) + public float Dot(Quat b) { return x * b.x + y * b.y + z * b.z + w * b.w; } - public Quat inverse() + public Quat Inverse() { return new Quat(-x, -y, -z, w); } - public float length() + public float Length() { - return Mathf.sqrt(length_squared()); + return Mathf.Sqrt(LengthSquared()); } - public float length_squared() + public float LengthSquared() { - return dot(this); + return Dot(this); } - public Quat normalized() + public Quat Normalized() { - return this / length(); + return this / Length(); } - public void set(float x, float y, float z, float w) + public void Set(float x, float y, float z, float w) { this.x = x; this.y = y; @@ -99,7 +99,7 @@ namespace Godot this.w = w; } - public Quat slerp(Quat b, float t) + public Quat Slerp(Quat b, float t) { // Calculate cosine float cosom = x * b.x + y * b.y + z * b.z + w * b.w; @@ -128,10 +128,10 @@ namespace Godot if ((1.0 - cosom) > Mathf.Epsilon) { // Standard case (Slerp) - float omega = Mathf.acos(cosom); - sinom = Mathf.sin(omega); - scale0 = Mathf.sin((1.0f - t) * omega) / sinom; - scale1 = Mathf.sin(t * omega) / sinom; + float omega = Mathf.Acos(cosom); + sinom = Mathf.Sin(omega); + scale0 = Mathf.Sin((1.0f - t) * omega) / sinom; + scale1 = Mathf.Sin(t * omega) / sinom; } else { @@ -150,19 +150,19 @@ namespace Godot ); } - public Quat slerpni(Quat b, float t) + public Quat Slerpni(Quat b, float t) { - float dot = this.dot(b); + float dot = this.Dot(b); - if (Mathf.abs(dot) > 0.9999f) + if (Mathf.Abs(dot) > 0.9999f) { return this; } - float theta = Mathf.acos(dot); - float sinT = 1.0f / Mathf.sin(theta); - float newFactor = Mathf.sin(t * theta) * sinT; - float invFactor = Mathf.sin((1.0f - t) * theta) * sinT; + float theta = Mathf.Acos(dot); + float sinT = 1.0f / Mathf.Sin(theta); + float newFactor = Mathf.Sin(t * theta) * sinT; + float invFactor = Mathf.Sin((1.0f - t) * theta) * sinT; return new Quat ( @@ -173,10 +173,10 @@ namespace Godot ); } - public Vector3 xform(Vector3 v) + public Vector3 Xform(Vector3 v) { Quat q = this * v; - q *= this.inverse(); + q *= this.Inverse(); return new Vector3(q.x, q.y, q.z); } @@ -190,7 +190,7 @@ namespace Godot public Quat(Vector3 axis, float angle) { - float d = axis.length(); + float d = axis.Length(); if (d == 0f) { @@ -201,12 +201,12 @@ namespace Godot } else { - float s = Mathf.sin(angle * 0.5f) / d; + float s = Mathf.Sin(angle * 0.5f) / d; x = axis.x * s; y = axis.y * s; z = axis.z * s; - w = Mathf.cos(angle * 0.5f); + w = Mathf.Cos(angle * 0.5f); } } diff --git a/modules/mono/glue/cs_files/Rect2.cs b/modules/mono/glue/cs_files/Rect2.cs index 019342134a..f2718d7b7a 100644 --- a/modules/mono/glue/cs_files/Rect2.cs +++ b/modules/mono/glue/cs_files/Rect2.cs @@ -28,36 +28,36 @@ namespace Godot public float Area { - get { return get_area(); } + get { return GetArea(); } } - public Rect2 clip(Rect2 b) + public Rect2 Clip(Rect2 b) { Rect2 newRect = b; - if (!intersects(newRect)) + if (!Intersects(newRect)) return new Rect2(); - newRect.position.x = Mathf.max(b.position.x, position.x); - newRect.position.y = Mathf.max(b.position.y, position.y); + newRect.position.x = Mathf.Max(b.position.x, position.x); + newRect.position.y = Mathf.Max(b.position.y, position.y); Vector2 bEnd = b.position + b.size; Vector2 end = position + size; - newRect.size.x = Mathf.min(bEnd.x, end.x) - newRect.position.x; - newRect.size.y = Mathf.min(bEnd.y, end.y) - newRect.position.y; + newRect.size.x = Mathf.Min(bEnd.x, end.x) - newRect.position.x; + newRect.size.y = Mathf.Min(bEnd.y, end.y) - newRect.position.y; return newRect; } - public bool encloses(Rect2 b) + public bool Encloses(Rect2 b) { return (b.position.x >= position.x) && (b.position.y >= position.y) && ((b.position.x + b.size.x) < (position.x + size.x)) && ((b.position.y + b.size.y) < (position.y + size.y)); } - public Rect2 expand(Vector2 to) + public Rect2 Expand(Vector2 to) { Rect2 expanded = this; @@ -80,12 +80,12 @@ namespace Godot return expanded; } - public float get_area() + public float GetArea() { return size.x * size.y; } - public Rect2 grow(float by) + public Rect2 Grow(float by) { Rect2 g = this; @@ -97,7 +97,7 @@ namespace Godot return g; } - public Rect2 grow_individual(float left, float top, float right, float bottom) + public Rect2 GrowIndividual(float left, float top, float right, float bottom) { Rect2 g = this; @@ -109,11 +109,11 @@ namespace Godot return g; } - public Rect2 grow_margin(int margin, float by) + public Rect2 GrowMargin(int margin, float by) { Rect2 g = this; - g.grow_individual((GD.MARGIN_LEFT == margin) ? by : 0, + g.GrowIndividual((GD.MARGIN_LEFT == margin) ? by : 0, (GD.MARGIN_TOP == margin) ? by : 0, (GD.MARGIN_RIGHT == margin) ? by : 0, (GD.MARGIN_BOTTOM == margin) ? by : 0); @@ -121,12 +121,12 @@ namespace Godot return g; } - public bool has_no_area() + public bool HasNoArea() { return size.x <= 0 || size.y <= 0; } - public bool has_point(Vector2 point) + public bool HasPoint(Vector2 point) { if (point.x < position.x) return false; @@ -141,7 +141,7 @@ namespace Godot return true; } - public bool intersects(Rect2 b) + public bool Intersects(Rect2 b) { if (position.x > (b.position.x + b.size.x)) return false; @@ -155,15 +155,15 @@ namespace Godot return true; } - public Rect2 merge(Rect2 b) + public Rect2 Merge(Rect2 b) { Rect2 newRect; - newRect.position.x = Mathf.min(b.position.x, position.x); - newRect.position.y = Mathf.min(b.position.y, position.y); + newRect.position.x = Mathf.Min(b.position.x, position.x); + newRect.position.y = Mathf.Min(b.position.y, position.y); - newRect.size.x = Mathf.max(b.position.x + b.size.x, position.x + size.x); - newRect.size.y = Mathf.max(b.position.y + b.size.y, position.y + size.y); + newRect.size.x = Mathf.Max(b.position.x + b.size.x, position.x + size.x); + newRect.size.y = Mathf.Max(b.position.y + b.size.y, position.y + size.y); newRect.size = newRect.size - newRect.position; // Make relative again diff --git a/modules/mono/glue/cs_files/StringExtensions.cs b/modules/mono/glue/cs_files/StringExtensions.cs index 96041827aa..5c3ceff97d 100644 --- a/modules/mono/glue/cs_files/StringExtensions.cs +++ b/modules/mono/glue/cs_files/StringExtensions.cs @@ -10,15 +10,15 @@ namespace Godot { public static class StringExtensions { - private static int get_slice_count(this string instance, string splitter) + private static int GetSliceCount(this string instance, string splitter) { - if (instance.empty() || splitter.empty()) + if (instance.Empty() || splitter.Empty()) return 0; int pos = 0; int slices = 1; - while ((pos = instance.find(splitter, pos)) >= 0) + while ((pos = instance.Find(splitter, pos)) >= 0) { slices++; pos += splitter.Length; @@ -27,9 +27,9 @@ namespace Godot return slices; } - private static string get_slicec(this string instance, char splitter, int slice) + private static string GetSlicec(this string instance, char splitter, int slice) { - if (!instance.empty() && slice >= 0) + if (!instance.Empty() && slice >= 0) { int i = 0; int prev = 0; @@ -60,7 +60,7 @@ namespace Godot // <summary> // If the string is a path to a file, return the path to the file without the extension. // </summary> - public static string basename(this string instance) + public static string Basename(this string instance) { int index = instance.LastIndexOf('.'); @@ -73,7 +73,7 @@ namespace Godot // <summary> // Return true if the strings begins with the given string. // </summary> - public static bool begins_with(this string instance, string text) + public static bool BeginsWith(this string instance, string text) { return instance.StartsWith(text); } @@ -81,7 +81,7 @@ namespace Godot // <summary> // Return the bigrams (pairs of consecutive letters) of this string. // </summary> - public static string[] bigrams(this string instance) + public static string[] Bigrams(this string instance) { string[] b = new string[instance.Length - 1]; @@ -96,7 +96,7 @@ namespace Godot // <summary> // Return a copy of the string with special characters escaped using the C language standard. // </summary> - public static string c_escape(this string instance) + public static string CEscape(this string instance) { StringBuilder sb = new StringBuilder(string.Copy(instance)); @@ -118,7 +118,7 @@ namespace Godot // <summary> // Return a copy of the string with escaped characters replaced by their meanings according to the C language standard. // </summary> - public static string c_unescape(this string instance) + public static string CUnescape(this string instance) { StringBuilder sb = new StringBuilder(string.Copy(instance)); @@ -140,14 +140,14 @@ namespace Godot // <summary> // Change the case of some letters. Replace underscores with spaces, convert all letters to lowercase then capitalize first and every letter following the space character. For [code]capitalize camelCase mixed_with_underscores[/code] it will return [code]Capitalize Camelcase Mixed With Underscores[/code]. // </summary> - public static string capitalize(this string instance) + public static string Capitalize(this string instance) { string aux = instance.Replace("_", " ").ToLower(); string cap = string.Empty; - for (int i = 0; i < aux.get_slice_count(" "); i++) + for (int i = 0; i < aux.GetSliceCount(" "); i++) { - string slice = aux.get_slicec(' ', i); + string slice = aux.GetSlicec(' ', i); if (slice.Length > 0) { slice = char.ToUpper(slice[0]) + slice.Substring(1); @@ -163,12 +163,12 @@ namespace Godot // <summary> // Perform a case-sensitive comparison to another string, return -1 if less, 0 if equal and +1 if greater. // </summary> - public static int casecmp_to(this string instance, string to) + public static int CasecmpTo(this string instance, string to) { - if (instance.empty()) - return to.empty() ? 0 : -1; + if (instance.Empty()) + return to.Empty() ? 0 : -1; - if (to.empty()) + if (to.Empty()) return 1; int instance_idx = 0; @@ -195,7 +195,7 @@ namespace Godot // <summary> // Return true if the string is empty. // </summary> - public static bool empty(this string instance) + public static bool Empty(this string instance) { return string.IsNullOrEmpty(instance); } @@ -203,7 +203,7 @@ namespace Godot // <summary> // Return true if the strings ends with the given string. // </summary> - public static bool ends_with(this string instance, string text) + public static bool EndsWith(this string instance, string text) { return instance.EndsWith(text); } @@ -211,7 +211,7 @@ namespace Godot // <summary> // Erase [code]chars[/code] characters from the string starting from [code]pos[/code]. // </summary> - public static void erase(this StringBuilder instance, int pos, int chars) + public static void Erase(this StringBuilder instance, int pos, int chars) { instance.Remove(pos, chars); } @@ -219,9 +219,9 @@ namespace Godot // <summary> // If the string is a path to a file, return the extension. // </summary> - public static string extension(this string instance) + public static string Extension(this string instance) { - int pos = instance.find_last("."); + int pos = instance.FindLast("."); if (pos < 0) return instance; @@ -232,7 +232,7 @@ namespace Godot // <summary> // Find the first occurrence of a substring, return the starting position of the substring or -1 if not found. Optionally, the initial search index can be passed. // </summary> - public static int find(this string instance, string what, int from = 0) + public static int Find(this string instance, string what, int from = 0) { return instance.IndexOf(what, StringComparison.OrdinalIgnoreCase); } @@ -240,7 +240,7 @@ namespace Godot // <summary> // Find the last occurrence of a substring, return the starting position of the substring or -1 if not found. Optionally, the initial search index can be passed. // </summary> - public static int find_last(this string instance, string what) + public static int FindLast(this string instance, string what) { return instance.LastIndexOf(what, StringComparison.OrdinalIgnoreCase); } @@ -248,7 +248,7 @@ namespace Godot // <summary> // Find the first occurrence of a substring but search as case-insensitive, return the starting position of the substring or -1 if not found. Optionally, the initial search index can be passed. // </summary> - public static int findn(this string instance, string what, int from = 0) + public static int FindN(this string instance, string what, int from = 0) { return instance.IndexOf(what, StringComparison.Ordinal); } @@ -256,9 +256,9 @@ namespace Godot // <summary> // If the string is a path to a file, return the base directory. // </summary> - public static string get_base_dir(this string instance) + public static string GetBaseDir(this string instance) { - int basepos = instance.find("://"); + int basepos = instance.Find("://"); string rs = string.Empty; string @base = string.Empty; @@ -271,7 +271,7 @@ namespace Godot } else { - if (instance.begins_with("/")) + if (instance.BeginsWith("/")) { rs = instance.Substring(1, instance.Length); @base = "/"; @@ -282,7 +282,7 @@ namespace Godot } } - int sep = Mathf.max(rs.find_last("/"), rs.find_last("\\")); + int sep = Mathf.Max(rs.FindLast("/"), rs.FindLast("\\")); if (sep == -1) return @base; @@ -293,9 +293,9 @@ namespace Godot // <summary> // If the string is a path to a file, return the file and ignore the base directory. // </summary> - public static string get_file(this string instance) + public static string GetFile(this string instance) { - int sep = Mathf.max(instance.find_last("/"), instance.find_last("\\")); + int sep = Mathf.Max(instance.FindLast("/"), instance.FindLast("\\")); if (sep == -1) return instance; @@ -306,7 +306,7 @@ namespace Godot // <summary> // Hash the string and return a 32 bits integer. // </summary> - public static int hash(this string instance) + public static int Hash(this string instance) { int index = 0; int hashv = 5381; @@ -321,7 +321,7 @@ namespace Godot // <summary> // Convert a string containing an hexadecimal number into an int. // </summary> - public static int hex_to_int(this string instance) + public static int HexToInt(this string instance) { int sign = 1; @@ -340,7 +340,7 @@ namespace Godot // <summary> // Insert a substring at a given position. // </summary> - public static string insert(this string instance, int pos, string what) + public static string Insert(this string instance, int pos, string what) { return instance.Insert(pos, what); } @@ -348,7 +348,7 @@ namespace Godot // <summary> // If the string is a path to a file or directory, return true if the path is absolute. // </summary> - public static bool is_abs_path(this string instance) + public static bool IsAbsPath(this string instance) { return System.IO.Path.IsPathRooted(instance); } @@ -356,7 +356,7 @@ namespace Godot // <summary> // If the string is a path to a file or directory, return true if the path is relative. // </summary> - public static bool is_rel_path(this string instance) + public static bool IsRelPath(this string instance) { return !System.IO.Path.IsPathRooted(instance); } @@ -364,7 +364,7 @@ namespace Godot // <summary> // Check whether this string is a subsequence of the given string. // </summary> - public static bool is_subsequence_of(this string instance, string text, bool case_insensitive) + public static bool IsSubsequenceOf(this string instance, string text, bool case_insensitive) { int len = instance.Length; @@ -407,23 +407,23 @@ namespace Godot // <summary> // Check whether this string is a subsequence of the given string, considering case. // </summary> - public static bool is_subsequence_of(this string instance, string text) + public static bool IsSubsequenceOf(this string instance, string text) { - return instance.is_subsequence_of(text, false); + return instance.IsSubsequenceOf(text, false); } // <summary> // Check whether this string is a subsequence of the given string, without considering case. // </summary> - public static bool is_subsequence_ofi(this string instance, string text) + public static bool IsSubsequenceOfI(this string instance, string text) { - return instance.is_subsequence_of(text, true); + return instance.IsSubsequenceOf(text, true); } // <summary> // Check whether the string contains a valid float. // </summary> - public static bool is_valid_float(this string instance) + public static bool IsValidFloat(this string instance) { float f; return float.TryParse(instance, out f); @@ -432,15 +432,15 @@ namespace Godot // <summary> // Check whether the string contains a valid color in HTML notation. // </summary> - public static bool is_valid_html_color(this string instance) + public static bool IsValidHtmlColor(this string instance) { - return Color.html_is_valid(instance); + return Color.HtmlIsValid(instance); } // <summary> // Check whether the string is a valid identifier. As is common in programming languages, a valid identifier may contain only letters, digits and underscores (_) and the first character may not be a digit. // </summary> - public static bool is_valid_identifier(this string instance) + public static bool IsValidIdentifier(this string instance) { int len = instance.Length; @@ -467,7 +467,7 @@ namespace Godot // <summary> // Check whether the string contains a valid integer. // </summary> - public static bool is_valid_integer(this string instance) + public static bool IsValidInteger(this string instance) { int f; return int.TryParse(instance, out f); @@ -476,7 +476,7 @@ namespace Godot // <summary> // Check whether the string contains a valid IP address. // </summary> - public static bool is_valid_ip_address(this string instance) + public static bool IsValidIpAddress(this string instance) { string[] ip = instance.split("."); @@ -486,7 +486,7 @@ namespace Godot for (int i = 0; i < ip.Length; i++) { string n = ip[i]; - if (!n.is_valid_integer()) + if (!n.IsValidInteger()) return false; int val = n.to_int(); @@ -500,7 +500,7 @@ namespace Godot // <summary> // Return a copy of the string with special characters escaped using the JSON standard. // </summary> - public static string json_escape(this string instance) + public static string JsonEscape(this string instance) { StringBuilder sb = new StringBuilder(string.Copy(instance)); @@ -519,7 +519,7 @@ namespace Godot // <summary> // Return an amount of characters from the left of the string. // </summary> - public static string left(this string instance, int pos) + public static string Left(this string instance, int pos) { if (pos <= 0) return string.Empty; @@ -533,7 +533,7 @@ namespace Godot /// <summary> /// Return the length of the string in characters. /// </summary> - public static int length(this string instance) + public static int Length(this string instance) { return instance.Length; } @@ -541,7 +541,7 @@ namespace Godot // <summary> // Do a simple expression match, where '*' matches zero or more arbitrary characters and '?' matches any single character except '.'. // </summary> - public static bool expr_match(this string instance, string expr, bool case_sensitive) + public static bool ExprMatch(this string instance, string expr, bool caseSensitive) { if (expr.Length == 0 || instance.Length == 0) return false; @@ -551,21 +551,21 @@ namespace Godot case '\0': return instance[0] == 0; case '*': - return expr_match(expr + 1, instance, case_sensitive) || (instance[0] != 0 && expr_match(expr, instance + 1, case_sensitive)); + return ExprMatch(expr + 1, instance, caseSensitive) || (instance[0] != 0 && ExprMatch(expr, instance + 1, caseSensitive)); case '?': - return instance[0] != 0 && instance[0] != '.' && expr_match(expr + 1, instance + 1, case_sensitive); + return instance[0] != 0 && instance[0] != '.' && ExprMatch(expr + 1, instance + 1, caseSensitive); default: - return (case_sensitive ? instance[0] == expr[0] : char.ToUpper(instance[0]) == char.ToUpper(expr[0])) && - expr_match(expr + 1, instance + 1, case_sensitive); + return (caseSensitive ? instance[0] == expr[0] : char.ToUpper(instance[0]) == char.ToUpper(expr[0])) && + ExprMatch(expr + 1, instance + 1, caseSensitive); } } // <summary> // Do a simple case sensitive expression match, using ? and * wildcards (see [method expr_match]). // </summary> - public static bool match(this string instance, string expr) + public static bool Match(this string instance, string expr) { - return instance.expr_match(expr, true); + return instance.ExprMatch(expr, true); } // <summary> @@ -573,13 +573,13 @@ namespace Godot // </summary> public static bool matchn(this string instance, string expr) { - return instance.expr_match(expr, false); + return instance.ExprMatch(expr, false); } // <summary> // Return the MD5 hash of the string as an array of bytes. // </summary> - public static byte[] md5_buffer(this string instance) + public static byte[] Md5Buffer(this string instance) { return NativeCalls.godot_icall_String_md5_buffer(instance); } @@ -587,7 +587,7 @@ namespace Godot // <summary> // Return the MD5 hash of the string as a string. // </summary> - public static string md5_text(this string instance) + public static string Md5Text(this string instance) { return NativeCalls.godot_icall_String_md5_text(instance); } @@ -595,12 +595,12 @@ namespace Godot // <summary> // Perform a case-insensitive comparison to another string, return -1 if less, 0 if equal and +1 if greater. // </summary> - public static int nocasecmp_to(this string instance, string to) + public static int NocasecmpTo(this string instance, string to) { - if (instance.empty()) - return to.empty() ? 0 : -1; + if (instance.Empty()) + return to.Empty() ? 0 : -1; - if (to.empty()) + if (to.Empty()) return 1; int instance_idx = 0; @@ -627,7 +627,7 @@ namespace Godot // <summary> // Return the character code at position [code]at[/code]. // </summary> - public static int ord_at(this string instance, int at) + public static int OrdAt(this string instance, int at) { return instance[at]; } @@ -635,9 +635,9 @@ namespace Godot // <summary> // Format a number to have an exact number of [code]digits[/code] after the decimal point. // </summary> - public static string pad_decimals(this string instance, int digits) + public static string PadDecimals(this string instance, int digits) { - int c = instance.find("."); + int c = instance.Find("."); if (c == -1) { @@ -671,10 +671,10 @@ namespace Godot // <summary> // Format a number to have an exact number of [code]digits[/code] before the decimal point. // </summary> - public static string pad_zeros(this string instance, int digits) + public static string PadZeros(this string instance, int digits) { string s = instance; - int end = s.find("."); + int end = s.Find("."); if (end == -1) end = s.Length; @@ -704,7 +704,7 @@ namespace Godot // <summary> // Decode a percent-encoded string. See [method percent_encode]. // </summary> - public static string percent_decode(this string instance) + public static string PercentDecode(this string instance) { return Uri.UnescapeDataString(instance); } @@ -712,7 +712,7 @@ namespace Godot // <summary> // Percent-encode a string. This is meant to encode parameters in a URL when sending a HTTP GET request and bodies of form-urlencoded POST request. // </summary> - public static string percent_encode(this string instance) + public static string PercentEncode(this string instance) { return Uri.EscapeDataString(instance); } @@ -720,7 +720,7 @@ namespace Godot // <summary> // If the string is a path, this concatenates [code]file[/code] at the end of the string as a subpath. E.g. [code]"this/is".plus_file("path") == "this/is/path"[/code]. // </summary> - public static string plus_file(this string instance, string file) + public static string PlusFile(this string instance, string file) { if (instance.Length > 0 && instance[instance.Length - 1] == '/') return instance + file; @@ -731,7 +731,7 @@ namespace Godot // <summary> // Replace occurrences of a substring for different ones inside the string. // </summary> - public static string replace(this string instance, string what, string forwhat) + public static string Replace(this string instance, string what, string forwhat) { return instance.Replace(what, forwhat); } @@ -739,7 +739,7 @@ namespace Godot // <summary> // Replace occurrences of a substring for different ones inside the string, but search case-insensitive. // </summary> - public static string replacen(this string instance, string what, string forwhat) + public static string Replacen(this string instance, string what, string forwhat) { return Regex.Replace(instance, what, forwhat, RegexOptions.IgnoreCase); } @@ -747,7 +747,7 @@ namespace Godot // <summary> // Perform a search for a substring, but start from the end of the string instead of the beginning. // </summary> - public static int rfind(this string instance, string what, int from = -1) + public static int Rfind(this string instance, string what, int from = -1) { return NativeCalls.godot_icall_String_rfind(instance, what, from); } @@ -755,7 +755,7 @@ namespace Godot // <summary> // Perform a search for a substring, but start from the end of the string instead of the beginning. Also search case-insensitive. // </summary> - public static int rfindn(this string instance, string what, int from = -1) + public static int Rfindn(this string instance, string what, int from = -1) { return NativeCalls.godot_icall_String_rfindn(instance, what, from); } @@ -763,7 +763,7 @@ namespace Godot // <summary> // Return the right side of the string from a given position. // </summary> - public static string right(this string instance, int pos) + public static string Right(this string instance, int pos) { if (pos >= instance.Length) return instance; @@ -774,7 +774,7 @@ namespace Godot return instance.Substring(pos, (instance.Length - pos)); } - public static byte[] sha256_buffer(this string instance) + public static byte[] Sha256Buffer(this string instance) { return NativeCalls.godot_icall_String_sha256_buffer(instance); } @@ -782,7 +782,7 @@ namespace Godot // <summary> // Return the SHA-256 hash of the string as a string. // </summary> - public static string sha256_text(this string instance) + public static string Sha256Text(this string instance) { return NativeCalls.godot_icall_String_sha256_text(instance); } @@ -790,7 +790,7 @@ namespace Godot // <summary> // Return the similarity index of the text compared to this string. 1 means totally similar and 0 means totally dissimilar. // </summary> - public static float similarity(this string instance, string text) + public static float Similarity(this string instance, string text) { if (instance == text) { @@ -803,11 +803,11 @@ namespace Godot return 0.0f; } - string[] src_bigrams = instance.bigrams(); - string[] tgt_bigrams = text.bigrams(); + string[] srcBigrams = instance.Bigrams(); + string[] tgtBigrams = text.Bigrams(); - int src_size = src_bigrams.Length; - int tgt_size = tgt_bigrams.Length; + int src_size = srcBigrams.Length; + int tgt_size = tgtBigrams.Length; float sum = src_size + tgt_size; float inter = 0; @@ -816,7 +816,7 @@ namespace Godot { for (int j = 0; j < tgt_size; j++) { - if (src_bigrams[i] == tgt_bigrams[j]) + if (srcBigrams[i] == tgtBigrams[j]) { inter++; break; @@ -846,7 +846,7 @@ namespace Godot while (true) { - int end = instance.find(divisor, from); + int end = instance.Find(divisor, from); if (end < 0) end = len; if (allow_empty || (end > from)) diff --git a/modules/mono/glue/cs_files/Transform.cs b/modules/mono/glue/cs_files/Transform.cs index 74271e758b..5214100d36 100644 --- a/modules/mono/glue/cs_files/Transform.cs +++ b/modules/mono/glue/cs_files/Transform.cs @@ -9,38 +9,38 @@ namespace Godot public Basis basis; public Vector3 origin; - public Transform affine_inverse() + public Transform AffineInverse() { - Basis basisInv = basis.inverse(); - return new Transform(basisInv, basisInv.xform(-origin)); + Basis basisInv = basis.Inverse(); + return new Transform(basisInv, basisInv.Xform(-origin)); } - public Transform inverse() + public Transform Inverse() { - Basis basisTr = basis.transposed(); - return new Transform(basisTr, basisTr.xform(-origin)); + Basis basisTr = basis.Transposed(); + return new Transform(basisTr, basisTr.Xform(-origin)); } - public Transform looking_at(Vector3 target, Vector3 up) + public Transform LookingAt(Vector3 target, Vector3 up) { Transform t = this; t.set_look_at(origin, target, up); return t; } - public Transform orthonormalized() + public Transform Orthonormalized() { - return new Transform(basis.orthonormalized(), origin); + return new Transform(basis.Orthonormalized(), origin); } - public Transform rotated(Vector3 axis, float phi) + public Transform Rotated(Vector3 axis, float phi) { return new Transform(new Basis(axis, phi), new Vector3()) * this; } - public Transform scaled(Vector3 scale) + public Transform Scaled(Vector3 scale) { - return new Transform(basis.scaled(scale), origin * scale); + return new Transform(basis.Scaled(scale), origin * scale); } public void set_look_at(Vector3 eye, Vector3 target, Vector3 up) @@ -49,44 +49,44 @@ namespace Godot // Z vector Vector3 zAxis = eye - target; - zAxis.normalize(); + zAxis.Normalize(); Vector3 yAxis = up; - Vector3 xAxis = yAxis.cross(zAxis); + Vector3 xAxis = yAxis.Cross(zAxis); // Recompute Y = Z cross X - yAxis = zAxis.cross(xAxis); + yAxis = zAxis.Cross(xAxis); - xAxis.normalize(); - yAxis.normalize(); + xAxis.Normalize(); + yAxis.Normalize(); - basis = Basis.create_from_axes(xAxis, yAxis, zAxis); + basis = Basis.CreateFromAxes(xAxis, yAxis, zAxis); origin = eye; } - public Transform translated(Vector3 ofs) + public Transform Translated(Vector3 ofs) { return new Transform(basis, new Vector3 ( - origin[0] += basis[0].dot(ofs), - origin[1] += basis[1].dot(ofs), - origin[2] += basis[2].dot(ofs) + origin[0] += basis[0].Dot(ofs), + origin[1] += basis[1].Dot(ofs), + origin[2] += basis[2].Dot(ofs) )); } - public Vector3 xform(Vector3 v) + public Vector3 Xform(Vector3 v) { return new Vector3 ( - basis[0].dot(v) + origin.x, - basis[1].dot(v) + origin.y, - basis[2].dot(v) + origin.z + basis[0].Dot(v) + origin.x, + basis[1].Dot(v) + origin.y, + basis[2].Dot(v) + origin.z ); } - public Vector3 xform_inv(Vector3 v) + public Vector3 XformInv(Vector3 v) { Vector3 vInv = v - origin; @@ -100,7 +100,7 @@ namespace Godot public Transform(Vector3 xAxis, Vector3 yAxis, Vector3 zAxis, Vector3 origin) { - this.basis = Basis.create_from_axes(xAxis, yAxis, zAxis); + this.basis = Basis.CreateFromAxes(xAxis, yAxis, zAxis); this.origin = origin; } @@ -118,7 +118,7 @@ namespace Godot public static Transform operator *(Transform left, Transform right) { - left.origin = left.xform(right.origin); + left.origin = left.Xform(right.origin); left.basis *= right.basis; return left; } diff --git a/modules/mono/glue/cs_files/Transform2D.cs b/modules/mono/glue/cs_files/Transform2D.cs index 526dc767c6..fe7c5b5706 100644 --- a/modules/mono/glue/cs_files/Transform2D.cs +++ b/modules/mono/glue/cs_files/Transform2D.cs @@ -29,12 +29,12 @@ namespace Godot public float Rotation { - get { return Mathf.atan2(y.x, o.y); } + get { return Mathf.Atan2(y.x, o.y); } } public Vector2 Scale { - get { return new Vector2(x.length(), y.length()); } + get { return new Vector2(x.Length(), y.Length()); } } public Vector2 this[int index] @@ -103,7 +103,7 @@ namespace Godot } } - public Transform2D affine_inverse() + public Transform2D AffineInverse() { Transform2D inv = this; @@ -128,22 +128,22 @@ namespace Godot this[0] *= new Vector2(idet, -idet); this[1] *= new Vector2(-idet, idet); - this[2] = basis_xform(-this[2]); + this[2] = BasisXform(-this[2]); return inv; } - public Vector2 basis_xform(Vector2 v) + public Vector2 BasisXform(Vector2 v) { - return new Vector2(tdotx(v), tdoty(v)); + return new Vector2(Tdotx(v), Tdoty(v)); } - public Vector2 basis_xform_inv(Vector2 v) + public Vector2 BasisXformInv(Vector2 v) { - return new Vector2(x.dot(v), y.dot(v)); + return new Vector2(x.Dot(v), y.Dot(v)); } - public Transform2D interpolate_with(Transform2D m, float c) + public Transform2D InterpolateWith(Transform2D m, float c) { float r1 = Rotation; float r2 = m.Rotation; @@ -152,10 +152,10 @@ namespace Godot Vector2 s2 = m.Scale; // Slerp rotation - Vector2 v1 = new Vector2(Mathf.cos(r1), Mathf.sin(r1)); - Vector2 v2 = new Vector2(Mathf.cos(r2), Mathf.sin(r2)); + Vector2 v1 = new Vector2(Mathf.Cos(r1), Mathf.Sin(r1)); + Vector2 v2 = new Vector2(Mathf.Cos(r2), Mathf.Sin(r2)); - float dot = v1.dot(v2); + float dot = v1.Dot(v2); // Clamp dot to [-1, 1] dot = (dot < -1.0f) ? -1.0f : ((dot > 1.0f) ? 1.0f : dot); @@ -165,13 +165,13 @@ namespace Godot if (dot > 0.9995f) { // Linearly interpolate to avoid numerical precision issues - v = v1.linear_interpolate(v2, c).normalized(); + v = v1.LinearInterpolate(v2, c).Normalized(); } else { - float angle = c * Mathf.acos(dot); - Vector2 v3 = (v2 - v1 * dot).normalized(); - v = v1 * Mathf.cos(angle) + v3 * Mathf.sin(angle); + float angle = c * Mathf.Acos(dot); + Vector2 v3 = (v2 - v1 * dot).Normalized(); + v = v1 * Mathf.Cos(angle) + v3 * Mathf.Sin(angle); } // Extract parameters @@ -179,15 +179,15 @@ namespace Godot Vector2 p2 = m.Origin; // Construct matrix - Transform2D res = new Transform2D(Mathf.atan2(v.y, v.x), p1.linear_interpolate(p2, c)); - Vector2 scale = s1.linear_interpolate(s2, c); + Transform2D res = new Transform2D(Mathf.Atan2(v.y, v.x), p1.LinearInterpolate(p2, c)); + Vector2 scale = s1.LinearInterpolate(s2, c); res.x *= scale; res.y *= scale; return res; } - public Transform2D inverse() + public Transform2D Inverse() { Transform2D inv = this; @@ -196,21 +196,21 @@ namespace Godot inv.x.y = inv.y.x; inv.y.x = temp; - inv.o = inv.basis_xform(-inv.o); + inv.o = inv.BasisXform(-inv.o); return inv; } - public Transform2D orthonormalized() + public Transform2D Orthonormalized() { Transform2D on = this; Vector2 onX = on.x; Vector2 onY = on.y; - onX.normalize(); - onY = onY - onX * (onX.dot(onY)); - onY.normalize(); + onX.Normalize(); + onY = onY - onX * (onX.Dot(onY)); + onY.Normalize(); on.x = onX; on.y = onY; @@ -218,12 +218,12 @@ namespace Godot return on; } - public Transform2D rotated(float phi) + public Transform2D Rotated(float phi) { return this * new Transform2D(phi, new Vector2()); } - public Transform2D scaled(Vector2 scale) + public Transform2D Scaled(Vector2 scale) { Transform2D copy = this; copy.x *= scale; @@ -232,32 +232,32 @@ namespace Godot return copy; } - private float tdotx(Vector2 with) + private float Tdotx(Vector2 with) { return this[0, 0] * with[0] + this[1, 0] * with[1]; } - private float tdoty(Vector2 with) + private float Tdoty(Vector2 with) { return this[0, 1] * with[0] + this[1, 1] * with[1]; } - public Transform2D translated(Vector2 offset) + public Transform2D Translated(Vector2 offset) { Transform2D copy = this; - copy.o += copy.basis_xform(offset); + copy.o += copy.BasisXform(offset); return copy; } - public Vector2 xform(Vector2 v) + public Vector2 Xform(Vector2 v) { - return new Vector2(tdotx(v), tdoty(v)) + o; + return new Vector2(Tdotx(v), Tdoty(v)) + o; } - public Vector2 xform_inv(Vector2 v) + public Vector2 XformInv(Vector2 v) { Vector2 vInv = v - o; - return new Vector2(x.dot(vInv), y.dot(vInv)); + return new Vector2(x.Dot(vInv), y.Dot(vInv)); } public Transform2D(Vector2 xAxis, Vector2 yAxis, Vector2 origin) @@ -275,8 +275,8 @@ namespace Godot public Transform2D(float rot, Vector2 pos) { - float cr = Mathf.cos(rot); - float sr = Mathf.sin(rot); + float cr = Mathf.Cos(rot); + float sr = Mathf.Sin(rot); x.x = cr; y.y = cr; x.y = -sr; @@ -286,14 +286,14 @@ namespace Godot public static Transform2D operator *(Transform2D left, Transform2D right) { - left.o = left.xform(right.o); + left.o = left.Xform(right.o); float x0, x1, y0, y1; - x0 = left.tdotx(right.x); - x1 = left.tdoty(right.x); - y0 = left.tdotx(right.y); - y1 = left.tdoty(right.y); + x0 = left.Tdotx(right.x); + x1 = left.Tdoty(right.x); + y0 = left.Tdotx(right.y); + y1 = left.Tdoty(right.y); left.x.x = x0; left.x.y = x1; diff --git a/modules/mono/glue/cs_files/Vector2.cs b/modules/mono/glue/cs_files/Vector2.cs index 28fedc365b..238775bda2 100644 --- a/modules/mono/glue/cs_files/Vector2.cs +++ b/modules/mono/glue/cs_files/Vector2.cs @@ -46,57 +46,57 @@ namespace Godot } } - internal void normalize() + internal void Normalize() { float length = x * x + y * y; if (length != 0f) { - length = Mathf.sqrt(length); + length = Mathf.Sqrt(length); x /= length; y /= length; } } - private float cross(Vector2 b) + private float Cross(Vector2 b) { return x * b.y - y * b.x; } - public Vector2 abs() + public Vector2 Abs() { - return new Vector2(Mathf.abs(x), Mathf.abs(y)); + return new Vector2(Mathf.Abs(x), Mathf.Abs(y)); } - public float angle() + public float Angle() { - return Mathf.atan2(y, x); + return Mathf.Atan2(y, x); } - public float angle_to(Vector2 to) + public float AngleTo(Vector2 to) { - return Mathf.atan2(cross(to), dot(to)); + return Mathf.Atan2(Cross(to), Dot(to)); } - public float angle_to_point(Vector2 to) + public float AngleToPoint(Vector2 to) { - return Mathf.atan2(x - to.x, y - to.y); + return Mathf.Atan2(x - to.x, y - to.y); } - public float aspect() + public float Aspect() { return x / y; } - public Vector2 bounce(Vector2 n) + public Vector2 Bounce(Vector2 n) { - return -reflect(n); + return -Reflect(n); } - public Vector2 clamped(float length) + public Vector2 Clamped(float length) { Vector2 v = this; - float l = this.length(); + float l = this.Length(); if (l > 0 && length < l) { @@ -107,7 +107,7 @@ namespace Godot return v; } - public Vector2 cubic_interpolate(Vector2 b, Vector2 preA, Vector2 postB, float t) + public Vector2 CubicInterpolate(Vector2 b, Vector2 preA, Vector2 postB, float t) { Vector2 p0 = preA; Vector2 p1 = this; @@ -123,42 +123,42 @@ namespace Godot (-p0 + 3.0f * p1 - 3.0f * p2 + p3) * t3); } - public float distance_squared_to(Vector2 to) + public float DistanceSquaredTo(Vector2 to) { return (x - to.x) * (x - to.x) + (y - to.y) * (y - to.y); } - public float distance_to(Vector2 to) + public float DistanceTo(Vector2 to) { - return Mathf.sqrt((x - to.x) * (x - to.x) + (y - to.y) * (y - to.y)); + return Mathf.Sqrt((x - to.x) * (x - to.x) + (y - to.y) * (y - to.y)); } - public float dot(Vector2 with) + public float Dot(Vector2 with) { return x * with.x + y * with.y; } - public Vector2 floor() + public Vector2 Floor() { - return new Vector2(Mathf.floor(x), Mathf.floor(y)); + return new Vector2(Mathf.Floor(x), Mathf.Floor(y)); } - public bool is_normalized() + public bool IsNormalized() { - return Mathf.abs(length_squared() - 1.0f) < Mathf.Epsilon; + return Mathf.Abs(LengthSquared() - 1.0f) < Mathf.Epsilon; } - public float length() + public float Length() { - return Mathf.sqrt(x * x + y * y); + return Mathf.Sqrt(x * x + y * y); } - public float length_squared() + public float LengthSquared() { return x * x + y * y; } - public Vector2 linear_interpolate(Vector2 b, float t) + public Vector2 LinearInterpolate(Vector2 b, float t) { Vector2 res = this; @@ -168,35 +168,35 @@ namespace Godot return res; } - public Vector2 normalized() + public Vector2 Normalized() { Vector2 result = this; - result.normalize(); + result.Normalize(); return result; } - public Vector2 reflect(Vector2 n) + public Vector2 Reflect(Vector2 n) { - return 2.0f * n * dot(n) - this; + return 2.0f * n * Dot(n) - this; } - public Vector2 rotated(float phi) + public Vector2 Rotated(float phi) { - float rads = angle() + phi; - return new Vector2(Mathf.cos(rads), Mathf.sin(rads)) * length(); + float rads = Angle() + phi; + return new Vector2(Mathf.Cos(rads), Mathf.Sin(rads)) * Length(); } - public Vector2 slide(Vector2 n) + public Vector2 Slide(Vector2 n) { - return this - n * dot(n); + return this - n * Dot(n); } - public Vector2 snapped(Vector2 by) + public Vector2 Snapped(Vector2 by) { - return new Vector2(Mathf.stepify(x, by.x), Mathf.stepify(y, by.y)); + return new Vector2(Mathf.Stepify(x, by.x), Mathf.Stepify(y, by.y)); } - public Vector2 tangent() + public Vector2 Tangent() { return new Vector2(y, -x); } diff --git a/modules/mono/glue/cs_files/Vector3.cs b/modules/mono/glue/cs_files/Vector3.cs index c023cd83cf..190caa4b53 100644 --- a/modules/mono/glue/cs_files/Vector3.cs +++ b/modules/mono/glue/cs_files/Vector3.cs @@ -59,9 +59,9 @@ namespace Godot } } - internal void normalize() + internal void Normalize() { - float length = this.length(); + float length = this.Length(); if (length == 0f) { @@ -75,27 +75,27 @@ namespace Godot } } - public Vector3 abs() + public Vector3 Abs() { - return new Vector3(Mathf.abs(x), Mathf.abs(y), Mathf.abs(z)); + return new Vector3(Mathf.Abs(x), Mathf.Abs(y), Mathf.Abs(z)); } - public float angle_to(Vector3 to) + public float AngleTo(Vector3 to) { - return Mathf.atan2(cross(to).length(), dot(to)); + return Mathf.Atan2(Cross(to).Length(), Dot(to)); } - public Vector3 bounce(Vector3 n) + public Vector3 Bounce(Vector3 n) { - return -reflect(n); + return -Reflect(n); } - public Vector3 ceil() + public Vector3 Ceil() { - return new Vector3(Mathf.ceil(x), Mathf.ceil(y), Mathf.ceil(z)); + return new Vector3(Mathf.Ceil(x), Mathf.Ceil(y), Mathf.Ceil(z)); } - public Vector3 cross(Vector3 b) + public Vector3 Cross(Vector3 b) { return new Vector3 ( @@ -105,7 +105,7 @@ namespace Godot ); } - public Vector3 cubic_interpolate(Vector3 b, Vector3 preA, Vector3 postB, float t) + public Vector3 CubicInterpolate(Vector3 b, Vector3 preA, Vector3 postB, float t) { Vector3 p0 = preA; Vector3 p1 = this; @@ -122,46 +122,46 @@ namespace Godot ); } - public float distance_squared_to(Vector3 b) + public float DistanceSquaredTo(Vector3 b) { - return (b - this).length_squared(); + return (b - this).LengthSquared(); } - public float distance_to(Vector3 b) + public float DistanceTo(Vector3 b) { - return (b - this).length(); + return (b - this).Length(); } - public float dot(Vector3 b) + public float Dot(Vector3 b) { return x * b.x + y * b.y + z * b.z; } - public Vector3 floor() + public Vector3 Floor() { - return new Vector3(Mathf.floor(x), Mathf.floor(y), Mathf.floor(z)); + return new Vector3(Mathf.Floor(x), Mathf.Floor(y), Mathf.Floor(z)); } - public Vector3 inverse() + public Vector3 Inverse() { return new Vector3(1.0f / x, 1.0f / y, 1.0f / z); } - public bool is_normalized() + public bool IsNormalized() { - return Mathf.abs(length_squared() - 1.0f) < Mathf.Epsilon; + return Mathf.Abs(LengthSquared() - 1.0f) < Mathf.Epsilon; } - public float length() + public float Length() { float x2 = x * x; float y2 = y * y; float z2 = z * z; - return Mathf.sqrt(x2 + y2 + z2); + return Mathf.Sqrt(x2 + y2 + z2); } - public float length_squared() + public float LengthSquared() { float x2 = x * x; float y2 = y * y; @@ -170,7 +170,7 @@ namespace Godot return x2 + y2 + z2; } - public Vector3 linear_interpolate(Vector3 b, float t) + public Vector3 LinearInterpolate(Vector3 b, float t) { return new Vector3 ( @@ -180,24 +180,24 @@ namespace Godot ); } - public Axis max_axis() + public Axis MaxAxis() { return x < y ? (y < z ? Axis.Z : Axis.Y) : (x < z ? Axis.Z : Axis.X); } - public Axis min_axis() + public Axis MinAxis() { return x < y ? (x < z ? Axis.X : Axis.Z) : (y < z ? Axis.Y : Axis.Z); } - public Vector3 normalized() + public Vector3 Normalized() { Vector3 v = this; - v.normalize(); + v.Normalize(); return v; } - public Basis outer(Vector3 b) + public Basis Outer(Vector3 b) { return new Basis( new Vector3(x * b.x, x * b.y, x * b.z), @@ -206,36 +206,36 @@ namespace Godot ); } - public Vector3 reflect(Vector3 n) + public Vector3 Reflect(Vector3 n) { #if DEBUG - if (!n.is_normalized()) + if (!n.IsNormalized()) throw new ArgumentException(String.Format("{0} is not normalized", n), nameof(n)); #endif - return 2.0f * n * dot(n) - this; + return 2.0f * n * Dot(n) - this; } - public Vector3 rotated(Vector3 axis, float phi) + public Vector3 Rotated(Vector3 axis, float phi) { - return new Basis(axis, phi).xform(this); + return new Basis(axis, phi).Xform(this); } - public Vector3 slide(Vector3 n) + public Vector3 Slide(Vector3 n) { - return this - n * dot(n); + return this - n * Dot(n); } - public Vector3 snapped(Vector3 by) + public Vector3 Snapped(Vector3 by) { return new Vector3 ( - Mathf.stepify(x, by.x), - Mathf.stepify(y, by.y), - Mathf.stepify(z, by.z) + Mathf.Stepify(x, by.x), + Mathf.Stepify(y, by.y), + Mathf.Stepify(z, by.z) ); } - public Basis to_diagonal_matrix() + public Basis ToDiagonalMatrix() { return new Basis( x, 0f, 0f, diff --git a/modules/mono/godotsharp_dirs.cpp b/modules/mono/godotsharp_dirs.cpp index 7cc2168b70..a0c2508b0d 100644 --- a/modules/mono/godotsharp_dirs.cpp +++ b/modules/mono/godotsharp_dirs.cpp @@ -57,7 +57,7 @@ String _get_expected_build_config() { String _get_mono_user_dir() { #ifdef TOOLS_ENABLED if (EditorSettings::get_singleton()) { - return EditorSettings::get_singleton()->get_settings_path().plus_file("mono"); + return EditorSettings::get_singleton()->get_data_dir().plus_file("mono"); } else { String settings_path; @@ -68,19 +68,13 @@ String _get_mono_user_dir() { // contain yourself settings_path = exe_dir.plus_file("editor_data"); } else { - if (OS::get_singleton()->has_environment("APPDATA")) { - String app_data = OS::get_singleton()->get_environment("APPDATA").replace("\\", "/"); - settings_path = app_data.plus_file(String(_MKSTR(VERSION_SHORT_NAME)).capitalize()); - } else if (OS::get_singleton()->has_environment("HOME")) { - String home = OS::get_singleton()->get_environment("HOME"); - settings_path = home.plus_file("." + String(_MKSTR(VERSION_SHORT_NAME)).to_lower()); - } + settings_path = OS::get_singleton()->get_data_path().plus_file(OS::get_singleton()->get_godot_dir_name()); } return settings_path.plus_file("mono"); } #else - return OS::get_singleton()->get_data_dir().plus_file("mono"); + return OS::get_singleton()->get_user_data_dir().plus_file("mono"); #endif } diff --git a/modules/mono/mono_gd/gd_mono_field.cpp b/modules/mono/mono_gd/gd_mono_field.cpp index 1643f8cfc5..eb34f9dd3f 100644 --- a/modules/mono/mono_gd/gd_mono_field.cpp +++ b/modules/mono/mono_gd/gd_mono_field.cpp @@ -41,7 +41,7 @@ void GDMonoField::set_value_raw(MonoObject *p_object, void *p_ptr) { void GDMonoField::set_value(MonoObject *p_object, const Variant &p_value) { #define SET_FROM_STRUCT_AND_BREAK(m_type) \ { \ - const m_type &val = p_value.operator m_type(); \ + const m_type &val = p_value.operator ::m_type(); \ MARSHALLED_OUT(m_type, val, raw); \ mono_field_set_value(p_object, mono_field, raw); \ break; \ @@ -129,8 +129,8 @@ void GDMonoField::set_value(MonoObject *p_object, const Variant &p_value) { if (tclass == CACHED_CLASS(Transform)) SET_FROM_STRUCT_AND_BREAK(Transform); - if (tclass == CACHED_CLASS(Rect3)) - SET_FROM_STRUCT_AND_BREAK(Rect3); + if (tclass == CACHED_CLASS(AABB)) + SET_FROM_STRUCT_AND_BREAK(AABB); if (tclass == CACHED_CLASS(Color)) SET_FROM_STRUCT_AND_BREAK(Color); @@ -229,7 +229,7 @@ void GDMonoField::set_value(MonoObject *p_object, const Variant &p_value) { case Variant::TRANSFORM2D: SET_FROM_STRUCT_AND_BREAK(Transform2D); case Variant::PLANE: SET_FROM_STRUCT_AND_BREAK(Plane); case Variant::QUAT: SET_FROM_STRUCT_AND_BREAK(Quat); - case Variant::RECT3: SET_FROM_STRUCT_AND_BREAK(Rect3); + case Variant::AABB: SET_FROM_STRUCT_AND_BREAK(AABB); case Variant::BASIS: SET_FROM_STRUCT_AND_BREAK(Basis); case Variant::TRANSFORM: SET_FROM_STRUCT_AND_BREAK(Transform); case Variant::COLOR: SET_FROM_STRUCT_AND_BREAK(Color); diff --git a/modules/mono/mono_gd/gd_mono_marshal.cpp b/modules/mono/mono_gd/gd_mono_marshal.cpp index 01392447f3..8bc2bb5096 100644 --- a/modules/mono/mono_gd/gd_mono_marshal.cpp +++ b/modules/mono/mono_gd/gd_mono_marshal.cpp @@ -36,7 +36,7 @@ namespace GDMonoMarshal { #define RETURN_BOXED_STRUCT(m_t, m_var_in) \ { \ - const m_t &m_in = m_var_in->operator m_t(); \ + const m_t &m_in = m_var_in->operator ::m_t(); \ MARSHALLED_OUT(m_t, m_in, raw); \ return mono_value_box(mono_domain_get(), CACHED_CLASS_RAW(m_t), raw); \ } @@ -104,8 +104,8 @@ Variant::Type managed_to_variant_type(const ManagedType &p_type) { if (tclass == CACHED_CLASS(Transform)) return Variant::TRANSFORM; - if (tclass == CACHED_CLASS(Rect3)) - return Variant::RECT3; + if (tclass == CACHED_CLASS(AABB)) + return Variant::AABB; if (tclass == CACHED_CLASS(Color)) return Variant::COLOR; @@ -297,8 +297,8 @@ MonoObject *variant_to_mono_object(const Variant *p_var, const ManagedType &p_ty if (tclass == CACHED_CLASS(Transform)) RETURN_BOXED_STRUCT(Transform, p_var); - if (tclass == CACHED_CLASS(Rect3)) - RETURN_BOXED_STRUCT(Rect3, p_var); + if (tclass == CACHED_CLASS(AABB)) + RETURN_BOXED_STRUCT(AABB, p_var); if (tclass == CACHED_CLASS(Color)) RETURN_BOXED_STRUCT(Color, p_var); @@ -394,8 +394,8 @@ MonoObject *variant_to_mono_object(const Variant *p_var, const ManagedType &p_ty RETURN_BOXED_STRUCT(Plane, p_var); case Variant::QUAT: RETURN_BOXED_STRUCT(Quat, p_var); - case Variant::RECT3: - RETURN_BOXED_STRUCT(Rect3, p_var); + case Variant::AABB: + RETURN_BOXED_STRUCT(AABB, p_var); case Variant::BASIS: RETURN_BOXED_STRUCT(Basis, p_var); case Variant::TRANSFORM: @@ -518,8 +518,8 @@ Variant mono_object_to_variant(MonoObject *p_obj, const ManagedType &p_type) { if (tclass == CACHED_CLASS(Transform)) RETURN_UNBOXED_STRUCT(Transform, p_obj); - if (tclass == CACHED_CLASS(Rect3)) - RETURN_UNBOXED_STRUCT(Rect3, p_obj); + if (tclass == CACHED_CLASS(AABB)) + RETURN_UNBOXED_STRUCT(AABB, p_obj); if (tclass == CACHED_CLASS(Color)) RETURN_UNBOXED_STRUCT(Color, p_obj); diff --git a/modules/mono/mono_gd/gd_mono_marshal.h b/modules/mono/mono_gd/gd_mono_marshal.h index 9f403b787f..443e947fb5 100644 --- a/modules/mono/mono_gd/gd_mono_marshal.h +++ b/modules/mono/mono_gd/gd_mono_marshal.h @@ -197,10 +197,10 @@ Dictionary mono_object_to_Dictionary(MonoObject *p_dict); Basis(m_in[0], m_in[1], m_in[2], m_in[3], m_in[4], m_in[5], m_in[6], m_in[7], m_in[8]), \ Vector3(m_in[9], m_in[10], m_in[11])); -// Rect3 +// AABB -#define MARSHALLED_OUT_Rect3(m_in, m_out) real_t m_out[6] = { m_in.position.x, m_in.position.y, m_in.position.z, m_in.size.x, m_in.size.y, m_in.size.z }; -#define MARSHALLED_IN_Rect3(m_in, m_out) Rect3 m_out(Vector3(m_in[0], m_in[1], m_in[2]), Vector3(m_in[3], m_in[4], m_in[5])); +#define MARSHALLED_OUT_AABB(m_in, m_out) real_t m_out[6] = { m_in.position.x, m_in.position.y, m_in.position.z, m_in.size.x, m_in.size.y, m_in.size.z }; +#define MARSHALLED_IN_AABB(m_in, m_out) AABB m_out(Vector3(m_in[0], m_in[1], m_in[2]), Vector3(m_in[3], m_in[4], m_in[5])); // Color @@ -214,6 +214,6 @@ Dictionary mono_object_to_Dictionary(MonoObject *p_dict); #endif -} // GDMonoMarshal +} // namespace GDMonoMarshal #endif // GDMONOMARSHAL_H diff --git a/modules/mono/mono_gd/gd_mono_utils.cpp b/modules/mono/mono_gd/gd_mono_utils.cpp index 53e45002c4..1cccd0ad9d 100644 --- a/modules/mono/mono_gd/gd_mono_utils.cpp +++ b/modules/mono/mono_gd/gd_mono_utils.cpp @@ -80,7 +80,7 @@ void MonoCache::clear_members() { class_Basis = NULL; class_Quat = NULL; class_Transform = NULL; - class_Rect3 = NULL; + class_AABB = NULL; class_Color = NULL; class_Plane = NULL; class_NodePath = NULL; @@ -147,7 +147,7 @@ void update_godot_api_cache() { CACHE_CLASS_AND_CHECK(Basis, GODOT_API_CLASS(Basis)); CACHE_CLASS_AND_CHECK(Quat, GODOT_API_CLASS(Quat)); CACHE_CLASS_AND_CHECK(Transform, GODOT_API_CLASS(Transform)); - CACHE_CLASS_AND_CHECK(Rect3, GODOT_API_CLASS(Rect3)); + CACHE_CLASS_AND_CHECK(AABB, GODOT_API_CLASS(AABB)); CACHE_CLASS_AND_CHECK(Color, GODOT_API_CLASS(Color)); CACHE_CLASS_AND_CHECK(Plane, GODOT_API_CLASS(Plane)); CACHE_CLASS_AND_CHECK(NodePath, GODOT_API_CLASS(NodePath)); @@ -364,4 +364,4 @@ String get_exception_name_and_message(MonoObject *p_ex) { return res; } -} +} // namespace GDMonoUtils diff --git a/modules/mono/mono_gd/gd_mono_utils.h b/modules/mono/mono_gd/gd_mono_utils.h index ebb5d28e4d..c38f8c5af5 100644 --- a/modules/mono/mono_gd/gd_mono_utils.h +++ b/modules/mono/mono_gd/gd_mono_utils.h @@ -82,7 +82,7 @@ struct MonoCache { GDMonoClass *class_Basis; GDMonoClass *class_Quat; GDMonoClass *class_Transform; - GDMonoClass *class_Rect3; + GDMonoClass *class_AABB; GDMonoClass *class_Color; GDMonoClass *class_Plane; GDMonoClass *class_NodePath; @@ -166,7 +166,7 @@ MonoDomain *create_domain(const String &p_friendly_name); String get_exception_name_and_message(MonoObject *p_ex); -} // GDMonoUtils +} // namespace GDMonoUtils #define NATIVE_GDMONOCLASS_NAME(m_class) (GDMonoMarshal::mono_string_to_godot((MonoString *)m_class->get_field(BINDINGS_NATIVE_NAME_FIELD)->get_value(NULL))) diff --git a/modules/regex/doc_classes/RegExMatch.xml b/modules/regex/doc_classes/RegExMatch.xml index 354febf89a..8c6951fea2 100644 --- a/modules/regex/doc_classes/RegExMatch.xml +++ b/modules/regex/doc_classes/RegExMatch.xml @@ -4,7 +4,7 @@ Contains the results of a regex search. </brief_description> <description> - Contains the results of a single regex match returned by [method RegEx.search] and [method.RegEx.search_all]. It can be used to find the position and range of the match and its capturing groups, and it can extract its sub-string for you. + Contains the results of a single regex match returned by [method RegEx.search] and [method RegEx.search_all]. It can be used to find the position and range of the match and its capturing groups, and it can extract its sub-string for you. </description> <tutorials> </tutorials> diff --git a/modules/visual_script/doc_classes/VisualScriptBuiltinFunc.xml b/modules/visual_script/doc_classes/VisualScriptBuiltinFunc.xml index 27231574d7..c45c8d2b64 100644 --- a/modules/visual_script/doc_classes/VisualScriptBuiltinFunc.xml +++ b/modules/visual_script/doc_classes/VisualScriptBuiltinFunc.xml @@ -151,68 +151,74 @@ <constant name="MATH_DB2LINEAR" value="39"> Convert the input from decibel volume to linear volume. </constant> - <constant name="MATH_WRAP" value="40"> + <constant name="MATH_POLAR2CARTESIAN" value="40"> + Converts a 2D point expressed in the polar coordinate system (a distance from the origin [code]r[/code] and an angle [code]th[/code]) to the cartesian coordinate system (x and y axis). </constant> - <constant name="MATH_WRAPF" value="41"> + <constant name="MATH_CARTESIAN2POLAR" value="41"> + Converts a 2D point expressed in the cartesian coordinate system (x and y axis) to the polar coordinate system (a distance from the origin and an angle). </constant> - <constant name="LOGIC_MAX" value="42"> + <constant name="MATH_WRAP" value="42"> + </constant> + <constant name="MATH_WRAPF" value="43"> + </constant> + <constant name="LOGIC_MAX" value="44"> Return the greater of the two numbers, also known as their maximum. </constant> - <constant name="LOGIC_MIN" value="43"> + <constant name="LOGIC_MIN" value="45"> Return the lesser of the two numbers, also known as their minimum. </constant> - <constant name="LOGIC_CLAMP" value="44"> + <constant name="LOGIC_CLAMP" value="46"> Return the input clamped inside the given range, ensuring the result is never outside it. Equivalent to `min(max(input, range_low), range_high)` </constant> - <constant name="LOGIC_NEAREST_PO2" value="45"> + <constant name="LOGIC_NEAREST_PO2" value="46"> Return the nearest power of 2 to the input. </constant> - <constant name="OBJ_WEAKREF" value="46"> + <constant name="OBJ_WEAKREF" value="47"> Create a [WeakRef] from the input. </constant> - <constant name="FUNC_FUNCREF" value="47"> + <constant name="FUNC_FUNCREF" value="48"> Create a [FuncRef] from the input. </constant> - <constant name="TYPE_CONVERT" value="48"> + <constant name="TYPE_CONVERT" value="49"> Convert between types. </constant> - <constant name="TYPE_OF" value="49"> + <constant name="TYPE_OF" value="50"> Return the type of the input as an integer. Check [enum Variant.Type] for the integers that might be returned. </constant> - <constant name="TYPE_EXISTS" value="50"> + <constant name="TYPE_EXISTS" value="51"> Checks if a type is registered in the [ClassDB]. </constant> - <constant name="TEXT_CHAR" value="51"> + <constant name="TEXT_CHAR" value="52"> Return a character with the given ascii value. </constant> - <constant name="TEXT_STR" value="52"> + <constant name="TEXT_STR" value="53"> Convert the input to a string. </constant> - <constant name="TEXT_PRINT" value="53"> + <constant name="TEXT_PRINT" value="54"> Print the given string to the output window. </constant> - <constant name="TEXT_PRINTERR" value="54"> + <constant name="TEXT_PRINTERR" value="55"> Print the given string to the standard error output. </constant> - <constant name="TEXT_PRINTRAW" value="55"> + <constant name="TEXT_PRINTRAW" value="56"> Print the given string to the standard output, without adding a newline. </constant> - <constant name="VAR_TO_STR" value="56"> + <constant name="VAR_TO_STR" value="57"> Serialize a [Variant] to a string. </constant> - <constant name="STR_TO_VAR" value="57"> + <constant name="STR_TO_VAR" value="58"> Deserialize a [Variant] from a string serialized using [VAR_TO_STR]. </constant> - <constant name="VAR_TO_BYTES" value="58"> + <constant name="VAR_TO_BYTES" value="59"> Serialize a [Variant] to a [PoolByteArray]. </constant> - <constant name="BYTES_TO_VAR" value="59"> + <constant name="BYTES_TO_VAR" value="60"> Deserialize a [Variant] from a [PoolByteArray] serialized using [VAR_TO_BYTES]. </constant> - <constant name="COLORN" value="60"> + <constant name="COLORN" value="61"> Return the [Color] with the given name and alpha ranging from 0 to 1. Note: names are defined in color_names.inc. </constant> - <constant name="FUNC_MAX" value="61"> + <constant name="FUNC_MAX" value="62"> The maximum value the [member function] property can have. </constant> </constants> diff --git a/modules/visual_script/visual_script_builtin_funcs.cpp b/modules/visual_script/visual_script_builtin_funcs.cpp index 7c9d306831..32f7519125 100644 --- a/modules/visual_script/visual_script_builtin_funcs.cpp +++ b/modules/visual_script/visual_script_builtin_funcs.cpp @@ -78,6 +78,8 @@ const char *VisualScriptBuiltinFunc::func_name[VisualScriptBuiltinFunc::FUNC_MAX "rad2deg", "linear2db", "db2linear", + "polar2cartesian", + "cartesian2polar", "wrapi", "wrapf", "max", @@ -191,6 +193,8 @@ int VisualScriptBuiltinFunc::get_func_argument_count(BuiltinFunc p_func) { case MATH_EASE: case MATH_STEPIFY: case MATH_RANDOM: + case MATH_POLAR2CARTESIAN: + case MATH_CARTESIAN2POLAR: case LOGIC_MAX: case LOGIC_MIN: case FUNC_FUNCREF: @@ -368,6 +372,18 @@ PropertyInfo VisualScriptBuiltinFunc::get_input_value_port_info(int p_idx) const case MATH_DB2LINEAR: { return PropertyInfo(Variant::REAL, "db"); } break; + case MATH_POLAR2CARTESIAN: { + if (p_idx == 0) + return PropertyInfo(Variant::REAL, "r"); + else + return PropertyInfo(Variant::REAL, "th"); + } break; + case MATH_CARTESIAN2POLAR: { + if (p_idx == 0) + return PropertyInfo(Variant::REAL, "x"); + else + return PropertyInfo(Variant::REAL, "y"); + } break; case MATH_WRAP: { if (p_idx == 0) return PropertyInfo(Variant::INT, "value"); @@ -573,6 +589,10 @@ PropertyInfo VisualScriptBuiltinFunc::get_output_value_port_info(int p_idx) cons case MATH_DB2LINEAR: { t = Variant::REAL; } break; + case MATH_POLAR2CARTESIAN: + case MATH_CARTESIAN2POLAR: { + t = Variant::VECTOR2; + } break; case MATH_WRAP: { t = Variant::INT; } break; @@ -922,6 +942,20 @@ void VisualScriptBuiltinFunc::exec_func(BuiltinFunc p_func, const Variant **p_in VALIDATE_ARG_NUM(0); *r_return = Math::db2linear((double)*p_inputs[0]); } break; + case VisualScriptBuiltinFunc::MATH_POLAR2CARTESIAN: { + VALIDATE_ARG_NUM(0); + VALIDATE_ARG_NUM(1); + double r = *p_inputs[0]; + double th = *p_inputs[1]; + *r_return = Vector2(r * Math::cos(th), r * Math::sin(th)); + } break; + case VisualScriptBuiltinFunc::MATH_CARTESIAN2POLAR: { + VALIDATE_ARG_NUM(0); + VALIDATE_ARG_NUM(1); + double x = *p_inputs[0]; + double y = *p_inputs[1]; + *r_return = Vector2(Math::sqrt(x * x + y * y), Math::atan2(y, x)); + } break; case VisualScriptBuiltinFunc::MATH_WRAP: { VALIDATE_ARG_NUM(0); VALIDATE_ARG_NUM(1); @@ -1109,7 +1143,7 @@ void VisualScriptBuiltinFunc::exec_func(BuiltinFunc p_func, const Variant **p_in String str = *p_inputs[0]; //str+="\n"; - OS::get_singleton()->printerr("%s\n", str.utf8().get_data()); + print_error(str); } break; case VisualScriptBuiltinFunc::TEXT_PRINTRAW: { @@ -1294,6 +1328,8 @@ void VisualScriptBuiltinFunc::_bind_methods() { BIND_ENUM_CONSTANT(MATH_RAD2DEG); BIND_ENUM_CONSTANT(MATH_LINEAR2DB); BIND_ENUM_CONSTANT(MATH_DB2LINEAR); + BIND_ENUM_CONSTANT(MATH_POLAR2CARTESIAN); + BIND_ENUM_CONSTANT(MATH_CARTESIAN2POLAR); BIND_ENUM_CONSTANT(MATH_WRAP); BIND_ENUM_CONSTANT(MATH_WRAPF); BIND_ENUM_CONSTANT(LOGIC_MAX); @@ -1381,6 +1417,8 @@ void register_visual_script_builtin_func_node() { VisualScriptLanguage::singleton->add_register_func("functions/built_in/rad2deg", create_builtin_func_node<VisualScriptBuiltinFunc::MATH_RAD2DEG>); VisualScriptLanguage::singleton->add_register_func("functions/built_in/linear2db", create_builtin_func_node<VisualScriptBuiltinFunc::MATH_LINEAR2DB>); VisualScriptLanguage::singleton->add_register_func("functions/built_in/db2linear", create_builtin_func_node<VisualScriptBuiltinFunc::MATH_DB2LINEAR>); + VisualScriptLanguage::singleton->add_register_func("functions/built_in/polar2cartesian", create_builtin_func_node<VisualScriptBuiltinFunc::MATH_POLAR2CARTESIAN>); + VisualScriptLanguage::singleton->add_register_func("functions/built_in/cartesian2polar", create_builtin_func_node<VisualScriptBuiltinFunc::MATH_CARTESIAN2POLAR>); VisualScriptLanguage::singleton->add_register_func("functions/built_in/wrapi", create_builtin_func_node<VisualScriptBuiltinFunc::MATH_WRAP>); VisualScriptLanguage::singleton->add_register_func("functions/built_in/wrapf", create_builtin_func_node<VisualScriptBuiltinFunc::MATH_WRAPF>); diff --git a/modules/visual_script/visual_script_builtin_funcs.h b/modules/visual_script/visual_script_builtin_funcs.h index 34a2825938..54dc997b38 100644 --- a/modules/visual_script/visual_script_builtin_funcs.h +++ b/modules/visual_script/visual_script_builtin_funcs.h @@ -77,6 +77,8 @@ public: MATH_RAD2DEG, MATH_LINEAR2DB, MATH_DB2LINEAR, + MATH_POLAR2CARTESIAN, + MATH_CARTESIAN2POLAR, MATH_WRAP, MATH_WRAPF, LOGIC_MAX, diff --git a/modules/visual_script/visual_script_editor.cpp b/modules/visual_script/visual_script_editor.cpp index 86cf5b27e6..2318149ca5 100644 --- a/modules/visual_script/visual_script_editor.cpp +++ b/modules/visual_script/visual_script_editor.cpp @@ -349,7 +349,7 @@ static Color _color_from_type(Variant::Type p_type, bool dark_theme = true) { case Variant::TRANSFORM2D: color = Color::html("#c4ec69"); break; case Variant::PLANE: color = Color::html("#f77070"); break; case Variant::QUAT: color = Color::html("#ec69a3"); break; - case Variant::RECT3: color = Color::html("#ee7991"); break; + case Variant::AABB: color = Color::html("#ee7991"); break; case Variant::BASIS: color = Color::html("#e3ec69"); break; case Variant::TRANSFORM: color = Color::html("#f6a86e"); break; @@ -386,7 +386,7 @@ static Color _color_from_type(Variant::Type p_type, bool dark_theme = true) { case Variant::TRANSFORM2D: color = Color::html("#96ce1a"); break; case Variant::PLANE: color = Color::html("#f77070"); break; case Variant::QUAT: color = Color::html("#ec69a3"); break; - case Variant::RECT3: color = Color::html("#ee7991"); break; + case Variant::AABB: color = Color::html("#ee7991"); break; case Variant::BASIS: color = Color::html("#b2bb19"); break; case Variant::TRANSFORM: color = Color::html("#f49047"); break; @@ -1389,7 +1389,7 @@ bool VisualScriptEditor::can_drop_data_fw(const Point2 &p_point, const Variant & if (String(d["type"]) == "obj_property") { #ifdef OSX_ENABLED - const_cast<VisualScriptEditor *>(this)->_show_hint(TTR("Hold Meta to drop a Getter. Hold Shift to drop a generic signature.")); + const_cast<VisualScriptEditor *>(this)->_show_hint(vformat(TTR("Hold %s to drop a Getter. Hold Shift to drop a generic signature."), find_keycode_name(KEY_META))); #else const_cast<VisualScriptEditor *>(this)->_show_hint(TTR("Hold Ctrl to drop a Getter. Hold Shift to drop a generic signature.")); #endif @@ -1398,7 +1398,7 @@ bool VisualScriptEditor::can_drop_data_fw(const Point2 &p_point, const Variant & if (String(d["type"]) == "nodes") { #ifdef OSX_ENABLED - const_cast<VisualScriptEditor *>(this)->_show_hint(TTR("Hold Meta to drop a simple reference to the node.")); + const_cast<VisualScriptEditor *>(this)->_show_hint(vformat(TTR("Hold %s to drop a simple reference to the node."), find_keycode_name(KEY_META))); #else const_cast<VisualScriptEditor *>(this)->_show_hint(TTR("Hold Ctrl to drop a simple reference to the node.")); #endif @@ -1407,7 +1407,7 @@ bool VisualScriptEditor::can_drop_data_fw(const Point2 &p_point, const Variant & if (String(d["type"]) == "visual_script_variable_drag") { #ifdef OSX_ENABLED - const_cast<VisualScriptEditor *>(this)->_show_hint(TTR("Hold Meta to drop a Variable Setter.")); + const_cast<VisualScriptEditor *>(this)->_show_hint(vformat(TTR("Hold %s to drop a Variable Setter."), find_keycode_name(KEY_META))); #else const_cast<VisualScriptEditor *>(this)->_show_hint(TTR("Hold Ctrl to drop a Variable Setter.")); #endif diff --git a/modules/webm/config.py b/modules/webm/config.py index 0374bb36f7..dcae4447d5 100644 --- a/modules/webm/config.py +++ b/modules/webm/config.py @@ -1,5 +1,5 @@ def can_build(platform): - return True + return platform != 'iphone' def configure(env): pass diff --git a/platform/SCsub b/platform/SCsub new file mode 100644 index 0000000000..4ef23ab053 --- /dev/null +++ b/platform/SCsub @@ -0,0 +1,30 @@ +#!/usr/bin/env python + +from compat import open_utf8 + +Import('env') +platform_sources = [] + +# Register platform-exclusive APIs +reg_apis_inc = '#include "register_platform_apis.h"\n' +reg_apis = 'void register_platform_apis() {\n' +unreg_apis = 'void unregister_platform_apis() {\n' +for platform in env.platform_apis: + platform_dir = env.Dir(platform) + platform_sources.append(platform_dir.File('api/api.cpp')) + reg_apis += '\tregister_' + platform + '_api();\n' + unreg_apis += '\tunregister_' + platform + '_api();\n' + reg_apis_inc += '#include "' + platform + '/api/api.h"\n' +reg_apis_inc += '\n' +reg_apis += '}\n\n' +unreg_apis += '}\n' +f = open_utf8('register_platform_apis.gen.cpp', 'w') +f.write(reg_apis_inc) +f.write(reg_apis) +f.write(unreg_apis) +f.close() +platform_sources.append('register_platform_apis.gen.cpp') + +env.Prepend(LIBS=env.Library('platform', platform_sources)) + +Export('env') diff --git a/platform/android/build.gradle.template b/platform/android/build.gradle.template index 7cb6cf860a..11c49fbb50 100644 --- a/platform/android/build.gradle.template +++ b/platform/android/build.gradle.template @@ -31,7 +31,7 @@ android { disable 'MissingTranslation' } - compileSdkVersion 23 + compileSdkVersion 24 buildToolsVersion "26.0.1" useLibrary 'org.apache.http.legacy' diff --git a/platform/android/detect.py b/platform/android/detect.py index a3ada5cf51..bc67f6e6dc 100644 --- a/platform/android/detect.py +++ b/platform/android/detect.py @@ -205,7 +205,7 @@ def configure(env): env.Append(CPPFLAGS=["-isystem", lib_sysroot + "/usr/include"]) env.Append(CPPFLAGS='-fpic -ffunction-sections -funwind-tables -fstack-protector-strong -fvisibility=hidden -fno-strict-aliasing'.split()) - env.Append(CPPFLAGS='-DNO_STATVFS -DGLES2_ENABLED'.split()) + env.Append(CPPFLAGS='-DNO_STATVFS -DGLES_ENABLED'.split()) env['neon_enabled'] = False if env['android_arch'] == 'x86': diff --git a/platform/android/export/export.cpp b/platform/android/export/export.cpp index 79be1501a7..8776e6081e 100644 --- a/platform/android/export/export.cpp +++ b/platform/android/export/export.cpp @@ -370,7 +370,7 @@ class EditorExportAndroid : public EditorExportPlatform { } if (aname == "") { - aname = _MKSTR(VERSION_NAME); + aname = VERSION_NAME; } return aname; @@ -467,52 +467,72 @@ class EditorExportAndroid : public EditorExportPlatform { return zipfi; } - static Set<String> get_abis() { - Set<String> abis; - abis.insert("armeabi"); - abis.insert("armeabi-v7a"); - abis.insert("arm64-v8a"); - abis.insert("x86"); - abis.insert("x86_64"); - abis.insert("mips"); - abis.insert("mips64"); + static Vector<String> get_abis() { + // mips and armv6 are dead (especially for games), so not including them + Vector<String> abis; + abis.push_back("armeabi-v7a"); + abis.push_back("arm64-v8a"); + abis.push_back("x86"); + abis.push_back("x86_64"); return abis; } - static Error save_apk_file(void *p_userdata, const String &p_path, const Vector<uint8_t> &p_data, int p_file, int p_total) { - APKExportData *ed = (APKExportData *)p_userdata; - String dst_path = p_path; - static Set<String> android_abis = get_abis(); - - if (dst_path.ends_with(".so")) { - String abi = dst_path.get_base_dir().get_file().strip_edges(); // parent dir name - if (android_abis.has(abi)) { - dst_path = "lib/" + abi + "/" + dst_path.get_file(); - } else { - String err = "Dynamic libraries must be located in the folder named after Android ABI they were compiled for. " + - p_path + " does not follow this convention."; - ERR_PRINT(err.utf8().get_data()); - return ERR_FILE_BAD_PATH; - } - } else { - dst_path = dst_path.replace_first("res://", "assets/"); - } - + static Error store_in_apk(APKExportData *ed, const String &p_path, const Vector<uint8_t> &p_data, int compression_method = Z_DEFLATED) { zip_fileinfo zipfi = get_zip_fileinfo(); - zipOpenNewFileInZip(ed->apk, - dst_path.utf8().get_data(), + p_path.utf8().get_data(), &zipfi, NULL, 0, NULL, 0, NULL, - _should_compress_asset(p_path, p_data) ? Z_DEFLATED : 0, + compression_method, Z_DEFAULT_COMPRESSION); zipWriteInFileInZip(ed->apk, p_data.ptr(), p_data.size()); zipCloseFileInZip(ed->apk); + + return OK; + } + + static Error save_apk_so(void *p_userdata, const SharedObject &p_so) { + if (!p_so.path.get_file().begins_with("lib")) { + String err = "Android .so file names must start with \"lib\", but got: " + p_so.path; + ERR_PRINT(err.utf8().get_data()); + return FAILED; + } + APKExportData *ed = (APKExportData *)p_userdata; + Vector<String> abis = get_abis(); + bool exported = false; + for (int i = 0; i < p_so.tags.size(); ++i) { + // shared objects can be fat (compatible with multiple ABIs) + int start_pos = 0; + int abi_index = abis.find(p_so.tags[i]); + if (abi_index != -1) { + exported = true; + start_pos = abi_index + 1; + String abi = abis[abi_index]; + String dst_path = "lib/" + abi + "/" + p_so.path.get_file(); + Vector<uint8_t> array = FileAccess::get_file_as_array(p_so.path); + Error store_err = store_in_apk(ed, dst_path, array); + ERR_FAIL_COND_V(store_err, store_err); + } + } + if (!exported) { + String abis_string = String(" ").join(abis); + String err = "Cannot determine ABI for library \"" + p_so.path + "\". One of the supported ABIs must be used as a tag: " + abis_string; + ERR_PRINT(err.utf8().get_data()); + return FAILED; + } + return OK; + } + + static Error save_apk_file(void *p_userdata, const String &p_path, const Vector<uint8_t> &p_data, int p_file, int p_total) { + APKExportData *ed = (APKExportData *)p_userdata; + String dst_path = p_path.replace_first("res://", "assets/"); + + store_in_apk(ed, dst_path, p_data, _should_compress_asset(p_path, p_data) ? Z_DEFLATED : 0); ed->ep->step("File: " + p_path, 3 + p_file * 100 / p_total); return OK; } @@ -935,6 +955,18 @@ class EditorExportAndroid : public EditorExportPlatform { //printf("end\n"); } + static Vector<String> get_enabled_abis(const Ref<EditorExportPreset> &p_preset) { + Vector<String> abis = get_abis(); + Vector<String> enabled_abis; + for (int i = 0; i < abis.size(); ++i) { + bool is_enabled = p_preset->get("architectures/" + abis[i]); + if (is_enabled) { + enabled_abis.push_back(abis[i]); + } + } + return enabled_abis; + } + public: enum { MAX_USER_PERMISSIONS = 20 @@ -945,16 +977,22 @@ public: public: virtual void get_preset_features(const Ref<EditorExportPreset> &p_preset, List<String> *r_features) { - int api = p_preset->get("graphics/api"); + // Reenable when a GLES 2.0 backend is readded + /*int api = p_preset->get("graphics/api"); if (api == 0) r_features->push_back("etc"); - else - r_features->push_back("etc2"); + else*/ + r_features->push_back("etc2"); + + Vector<String> abis = get_enabled_abis(p_preset); + for (int i = 0; i < abis.size(); ++i) { + r_features->push_back(abis[i]); + } } virtual void get_export_options(List<ExportOption> *r_options) { - r_options->push_back(ExportOption(PropertyInfo(Variant::INT, "graphics/api", PROPERTY_HINT_ENUM, "OpenGL ES 2.0,OpenGL ES 3.0"), 1)); + /*r_options->push_back(ExportOption(PropertyInfo(Variant::INT, "graphics/api", PROPERTY_HINT_ENUM, "OpenGL ES 2.0,OpenGL ES 3.0"), 1));*/ r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "graphics/32_bits_framebuffer"), true)); r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "one_click_deploy/clear_previous_install"), true)); r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "custom_package/debug", PROPERTY_HINT_GLOBAL_FILE, "apk"), "")); @@ -966,8 +1004,6 @@ public: r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "package/name"), "")); r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "package/icon", PROPERTY_HINT_FILE, "png"), "")); r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "package/signed"), true)); - r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "architecture/arm"), true)); - r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "architecture/x86"), false)); r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "screen/immersive_mode"), true)); r_options->push_back(ExportOption(PropertyInfo(Variant::INT, "screen/orientation", PROPERTY_HINT_ENUM, "Landscape,Portrait"), 0)); r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "screen/support_small"), true)); @@ -981,6 +1017,13 @@ public: r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "apk_expansion/SALT"), "")); r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "apk_expansion/public_key", PROPERTY_HINT_MULTILINE_TEXT), "")); + Vector<String> abis = get_abis(); + for (int i = 0; i < abis.size(); ++i) { + String abi = abis[i]; + bool is_default = (abi == "armeabi-v7a"); + r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "architectures/" + abi), is_default)); + } + const char **perms = android_perms; while (*perms) { @@ -1066,7 +1109,7 @@ public: if (use_reverse) p_debug_flags |= DEBUG_FLAG_REMOTE_DEBUG_LOCALHOST; - String export_to = EditorSettings::get_singleton()->get_settings_path() + "/tmp/tmpexport.apk"; + String export_to = EditorSettings::get_singleton()->get_cache_dir().plus_file("tmpexport.apk"); Error err = export_project(p_preset, true, export_to, p_debug_flags); if (err) { device_lock->unlock(); @@ -1291,13 +1334,9 @@ public: zlib_filefunc_def io2 = io; FileAccess *dst_f = NULL; io2.opaque = &dst_f; - String unaligned_path = EditorSettings::get_singleton()->get_settings_path() + "/tmp/tmpexport-unaligned.apk"; + String unaligned_path = EditorSettings::get_singleton()->get_cache_dir().plus_file("tmpexport-unaligned.apk"); zipFile unaligned_apk = zipOpen2(unaligned_path.utf8().get_data(), APPEND_STATUS_CREATE, NULL, &io2); - bool export_x86 = p_preset->get("architecture/x86"); - bool export_arm = p_preset->get("architecture/arm"); - bool export_arm64 = p_preset->get("architecture/arm64"); - bool use_32_fb = p_preset->get("graphics/32_bits_framebuffer"); bool immersive = p_preset->get("screen/immersive_mode"); @@ -1317,6 +1356,8 @@ public: String release_username = p_preset->get("keystore/release_user"); String release_password = p_preset->get("keystore/release_password"); + Vector<String> enabled_abis = get_enabled_abis(p_preset); + while (ret == UNZ_OK) { //get filename @@ -1380,25 +1421,25 @@ public: } } - if (file == "lib/x86/*.so" && !export_x86) { - skip = true; - } - - if (file.match("lib/armeabi*/*.so") && !export_arm) { - skip = true; - } - - if (file.match("lib/arm64*/*.so") && !export_arm64) { - skip = true; + if (file.ends_with(".so")) { + bool enabled = false; + for (int i = 0; i < enabled_abis.size(); ++i) { + if (file.begins_with("lib/" + enabled_abis[i] + "/")) { + enabled = true; + break; + } + } + if (!enabled) { + skip = true; + } } if (file.begins_with("META-INF") && _signed) { skip = true; } - print_line("ADDING: " + file); - if (!skip) { + print_line("ADDING: " + file); // Respect decision on compression made by AAPT for the export template const bool uncompressed = info.compression_method == 0; @@ -1472,7 +1513,7 @@ public: ed.ep = &ep; ed.apk = unaligned_apk; - err = export_project_files(p_preset, save_apk_file, &ed); + err = export_project_files(p_preset, save_apk_file, &ed, save_apk_so); } } diff --git a/platform/android/globals/global_defaults.cpp b/platform/android/globals/global_defaults.cpp index c73b578154..0e1c17e9c8 100644 --- a/platform/android/globals/global_defaults.cpp +++ b/platform/android/globals/global_defaults.cpp @@ -31,12 +31,4 @@ #include "project_settings.h" void register_android_global_defaults() { - - /* GLOBAL_DEF("rasterizer.Android/use_fragment_lighting",false); - GLOBAL_DEF("rasterizer.Android/fp16_framebuffer",false); - GLOBAL_DEF("display.Android/driver","GLES2"); - //GLOBAL_DEF("rasterizer.Android/trilinear_mipmap_filter",false); - - ProjectSettings::get_singleton()->set_custom_property_info("display.Android/driver",PropertyInfo(Variant::STRING,"display.Android/driver",PROPERTY_HINT_ENUM,"GLES2")); - */ } diff --git a/platform/android/godot_android.cpp b/platform/android/godot_android.cpp index 9d056bca7c..f9bcbadc24 100644 --- a/platform/android/godot_android.cpp +++ b/platform/android/godot_android.cpp @@ -29,24 +29,23 @@ /*************************************************************************/ #ifdef ANDROID_NATIVE_ACTIVITY -#include <errno.h> -#include <jni.h> - -#include <EGL/egl.h> -#include <GLES2/gl2.h> - #include "engine.h" #include "file_access_android.h" #include "main/main.h" #include "os_android.h" #include "project_settings.h" + +#include <EGL/egl.h> #include <android/log.h> #include <android/sensor.h> #include <android/window.h> #include <android_native_app_glue.h> +#include <errno.h> +#include <jni.h> #include <stdlib.h> #include <string.h> #include <unistd.h> + #define LOGI(...) ((void)__android_log_print(ANDROID_LOG_INFO, "godot", __VA_ARGS__)) #define LOGW(...) ((void)__android_log_print(ANDROID_LOG_WARN, "godot", __VA_ARGS__)) diff --git a/platform/android/java_glue.cpp b/platform/android/java_glue.cpp index 90144d9b4d..40dfe6d909 100644 --- a/platform/android/java_glue.cpp +++ b/platform/android/java_glue.cpp @@ -647,7 +647,7 @@ static int _open_uri(const String &p_uri) { return env->CallIntMethod(godot_io, _openURI, jStr); } -static String _get_data_dir() { +static String _get_user_data_dir() { JNIEnv *env = ThreadAndroid::get_env(); jstring s = (jstring)env->CallObjectMethod(godot_io, _getDataDir); @@ -825,7 +825,7 @@ JNIEXPORT void JNICALL Java_org_godotengine_godot_GodotLib_initialize(JNIEnv *en AudioDriverAndroid::setup(gob); } - os_android = new OS_Android(_gfx_init_func, env, _open_uri, _get_data_dir, _get_locale, _get_model, _get_screen_dpi, _show_vk, _hide_vk, _get_vk_height, _set_screen_orient, _get_unique_id, _get_system_dir, _play_video, _is_video_playing, _pause_video, _stop_video, _set_keep_screen_on, _alert, p_use_apk_expansion); + os_android = new OS_Android(_gfx_init_func, env, _open_uri, _get_user_data_dir, _get_locale, _get_model, _get_screen_dpi, _show_vk, _hide_vk, _get_vk_height, _set_screen_orient, _get_unique_id, _get_system_dir, _play_video, _is_video_playing, _pause_video, _stop_video, _set_keep_screen_on, _alert, p_use_apk_expansion); os_android->set_need_reload_hooks(p_need_reload_hook); char wd[500]; diff --git a/platform/android/os_android.cpp b/platform/android/os_android.cpp index 2578bd6d96..b575f15559 100644 --- a/platform/android/os_android.cpp +++ b/platform/android/os_android.cpp @@ -114,15 +114,6 @@ void OS_Android::initialize_core() { #endif } -void OS_Android::initialize_logger() { - Vector<Logger *> loggers; - loggers.push_back(memnew(AndroidLogger)); - // FIXME: Reenable once we figure out how to get this properly in user:// - // instead of littering the user's working dirs (res:// + pwd) with log files (GH-12277) - //loggers.push_back(memnew(RotatedFileLogger("user://logs/log.txt"))); - _set_logger(memnew(CompositeLogger(loggers))); -} - void OS_Android::set_opengl_extensions(const char *p_gl_extensions) { ERR_FAIL_COND(!p_gl_extensions); @@ -612,13 +603,13 @@ void OS_Android::set_need_reload_hooks(bool p_needs_them) { use_reload_hooks = p_needs_them; } -String OS_Android::get_data_dir() const { +String OS_Android::get_user_data_dir() const { if (data_dir_cache != String()) return data_dir_cache; - if (get_data_dir_func) { - String data_dir = get_data_dir_func(); + if (get_user_data_dir_func) { + String data_dir = get_user_data_dir_func(); //store current dir char real_current_dir_name[2048]; @@ -641,7 +632,6 @@ String OS_Android::get_data_dir() const { } return "."; - //return Engine::get_singleton()->get_singleton_object("GodotOS")->call("get_data_dir"); } void OS_Android::set_screen_orientation(ScreenOrientation p_orientation) { @@ -706,10 +696,27 @@ String OS_Android::get_joy_guid(int p_device) const { } bool OS_Android::_check_internal_feature_support(const String &p_feature) { - return p_feature == "mobile" || p_feature == "etc" || p_feature == "etc2"; //TODO support etc2 only if GLES3 driver is selected + if (p_feature == "mobile" || p_feature == "etc" || p_feature == "etc2") { + //TODO support etc2 only if GLES3 driver is selected + return true; + } +#if defined(__aarch64__) + if (p_feature == "arm64-v8a") { + return true; + } +#elif defined(__ARM_ARCH_7A__) + if (p_feature == "armeabi-v7a" || p_feature == "armeabi") { + return true; + } +#elif defined(__arm__) + if (p_feature == "armeabi") { + return true; + } +#endif + return false; } -OS_Android::OS_Android(GFXInitFunc p_gfx_init_func, void *p_gfx_init_ud, OpenURIFunc p_open_uri_func, GetDataDirFunc p_get_data_dir_func, GetLocaleFunc p_get_locale_func, GetModelFunc p_get_model_func, GetScreenDPIFunc p_get_screen_dpi_func, ShowVirtualKeyboardFunc p_show_vk, HideVirtualKeyboardFunc p_hide_vk, VirtualKeyboardHeightFunc p_vk_height_func, SetScreenOrientationFunc p_screen_orient, GetUniqueIDFunc p_get_unique_id, GetSystemDirFunc p_get_sdir_func, VideoPlayFunc p_video_play_func, VideoIsPlayingFunc p_video_is_playing_func, VideoPauseFunc p_video_pause_func, VideoStopFunc p_video_stop_func, SetKeepScreenOnFunc p_set_keep_screen_on_func, AlertFunc p_alert_func, bool p_use_apk_expansion) { +OS_Android::OS_Android(GFXInitFunc p_gfx_init_func, void *p_gfx_init_ud, OpenURIFunc p_open_uri_func, GetUserDataDirFunc p_get_user_data_dir_func, GetLocaleFunc p_get_locale_func, GetModelFunc p_get_model_func, GetScreenDPIFunc p_get_screen_dpi_func, ShowVirtualKeyboardFunc p_show_vk, HideVirtualKeyboardFunc p_hide_vk, VirtualKeyboardHeightFunc p_vk_height_func, SetScreenOrientationFunc p_screen_orient, GetUniqueIDFunc p_get_unique_id, GetSystemDirFunc p_get_sdir_func, VideoPlayFunc p_video_play_func, VideoIsPlayingFunc p_video_is_playing_func, VideoPauseFunc p_video_pause_func, VideoStopFunc p_video_stop_func, SetKeepScreenOnFunc p_set_keep_screen_on_func, AlertFunc p_alert_func, bool p_use_apk_expansion) { use_apk_expansion = p_use_apk_expansion; default_videomode.width = 800; @@ -725,7 +732,7 @@ OS_Android::OS_Android(GFXInitFunc p_gfx_init_func, void *p_gfx_init_ud, OpenURI use_gl2 = false; open_uri_func = p_open_uri_func; - get_data_dir_func = p_get_data_dir_func; + get_user_data_dir_func = p_get_user_data_dir_func; get_locale_func = p_get_locale_func; get_model_func = p_get_model_func; get_screen_dpi_func = p_get_screen_dpi_func; @@ -746,7 +753,9 @@ OS_Android::OS_Android(GFXInitFunc p_gfx_init_func, void *p_gfx_init_ud, OpenURI alert_func = p_alert_func; use_reload_hooks = false; - _set_logger(memnew(AndroidLogger)); + Vector<Logger *> loggers; + loggers.push_back(memnew(AndroidLogger)); + _set_logger(memnew(CompositeLogger(loggers))); } OS_Android::~OS_Android() { diff --git a/platform/android/os_android.h b/platform/android/os_android.h index 750afa7a14..3b7f55096e 100644 --- a/platform/android/os_android.h +++ b/platform/android/os_android.h @@ -48,7 +48,7 @@ typedef void (*GFXInitFunc)(void *ud, bool gl2); typedef int (*OpenURIFunc)(const String &); -typedef String (*GetDataDirFunc)(); +typedef String (*GetUserDataDirFunc)(); typedef String (*GetLocaleFunc)(); typedef String (*GetModelFunc)(); typedef int (*GetScreenDPIFunc)(); @@ -116,7 +116,7 @@ private: MainLoop *main_loop; OpenURIFunc open_uri_func; - GetDataDirFunc get_data_dir_func; + GetUserDataDirFunc get_user_data_dir_func; GetLocaleFunc get_locale_func; GetModelFunc get_model_func; GetScreenDPIFunc get_screen_dpi_func; @@ -144,7 +144,6 @@ public: virtual int get_audio_driver_count() const; virtual const char *get_audio_driver_name(int p_driver) const; - virtual void initialize_logger(); virtual void initialize_core(); virtual void initialize(const VideoMode &p_desired, int p_video_driver, int p_audio_driver); @@ -208,7 +207,7 @@ public: virtual void set_screen_orientation(ScreenOrientation p_orientation); virtual Error shell_open(String p_uri); - virtual String get_data_dir() const; + virtual String get_user_data_dir() const; virtual String get_resource_dir() const; virtual String get_locale() const; virtual String get_model_name() const; @@ -237,7 +236,7 @@ public: void joy_connection_changed(int p_device, bool p_connected, String p_name); virtual bool _check_internal_feature_support(const String &p_feature); - OS_Android(GFXInitFunc p_gfx_init_func, void *p_gfx_init_ud, OpenURIFunc p_open_uri_func, GetDataDirFunc p_get_data_dir_func, GetLocaleFunc p_get_locale_func, GetModelFunc p_get_model_func, GetScreenDPIFunc p_get_screen_dpi_func, ShowVirtualKeyboardFunc p_show_vk, HideVirtualKeyboardFunc p_hide_vk, VirtualKeyboardHeightFunc p_vk_height_func, SetScreenOrientationFunc p_screen_orient, GetUniqueIDFunc p_get_unique_id, GetSystemDirFunc p_get_sdir_func, VideoPlayFunc p_video_play_func, VideoIsPlayingFunc p_video_is_playing_func, VideoPauseFunc p_video_pause_func, VideoStopFunc p_video_stop_func, SetKeepScreenOnFunc p_set_keep_screen_on_func, AlertFunc p_alert_func, bool p_use_apk_expansion); + OS_Android(GFXInitFunc p_gfx_init_func, void *p_gfx_init_ud, OpenURIFunc p_open_uri_func, GetUserDataDirFunc p_get_user_data_dir_func, GetLocaleFunc p_get_locale_func, GetModelFunc p_get_model_func, GetScreenDPIFunc p_get_screen_dpi_func, ShowVirtualKeyboardFunc p_show_vk, HideVirtualKeyboardFunc p_hide_vk, VirtualKeyboardHeightFunc p_vk_height_func, SetScreenOrientationFunc p_screen_orient, GetUniqueIDFunc p_get_unique_id, GetSystemDirFunc p_get_sdir_func, VideoPlayFunc p_video_play_func, VideoIsPlayingFunc p_video_is_playing_func, VideoPauseFunc p_video_pause_func, VideoStopFunc p_video_stop_func, SetKeepScreenOnFunc p_set_keep_screen_on_func, AlertFunc p_alert_func, bool p_use_apk_expansion); ~OS_Android(); }; diff --git a/platform/haiku/detect.py b/platform/haiku/detect.py index 50f9783dd2..7c62654ef6 100644 --- a/platform/haiku/detect.py +++ b/platform/haiku/detect.py @@ -67,7 +67,7 @@ def configure(env): ## Flags env.Append(CPPPATH=['#platform/haiku']) - env.Append(CPPFLAGS=['-DUNIX_ENABLED', '-DOPENGL_ENABLED', '-DGLES2_ENABLED', '-DGLES_OVER_GL']) + env.Append(CPPFLAGS=['-DUNIX_ENABLED', '-DOPENGL_ENABLED', '-DGLES_ENABLED', '-DGLES_OVER_GL']) env.Append(CPPFLAGS=['-DMEDIA_KIT_ENABLED']) # env.Append(CCFLAGS=['-DFREETYPE_ENABLED']) env.Append(CPPFLAGS=['-DPTHREAD_NO_RENAME']) # TODO: enable when we have pthread_setname_np diff --git a/platform/haiku/os_haiku.cpp b/platform/haiku/os_haiku.cpp index 0c34e39655..ef5a065107 100644 --- a/platform/haiku/os_haiku.cpp +++ b/platform/haiku/os_haiku.cpp @@ -76,7 +76,7 @@ int OS_Haiku::get_video_driver_count() const { } const char *OS_Haiku::get_video_driver_name(int p_driver) const { - return "GLES2"; + return "GLES3"; } void OS_Haiku::initialize(const VideoMode &p_desired, int p_video_driver, int p_audio_driver) { @@ -106,7 +106,9 @@ void OS_Haiku::initialize(const VideoMode &p_desired, int p_video_driver, int p_ context_gl->initialize(); context_gl->make_current(); - rasterizer = memnew(RasterizerGLES2); + /* Port to GLES 3 rasterizer */ + //rasterizer = memnew(RasterizerGLES2); + #endif visual_server = memnew(VisualServerRaster(rasterizer)); @@ -314,3 +316,36 @@ bool OS_Haiku::_check_internal_feature_support(const String &p_feature) { return p_feature == "pc" || p_feature == "s3tc"; } + +String OS_Haiku::get_config_path() const { + + if (has_environment("XDG_CONFIG_HOME")) { + return get_environment("XDG_CONFIG_HOME"); + } else if (has_environment("HOME")) { + return get_environment("HOME").plus_file(".config"); + } else { + return "."; + } +} + +String OS_Haiku::get_data_path() const { + + if (has_environment("XDG_DATA_HOME")) { + return get_environment("XDG_DATA_HOME"); + } else if (has_environment("HOME")) { + return get_environment("HOME").plus_file(".local/share"); + } else { + return get_config_path(); + } +} + +String OS_Haiku::get_cache_path() const { + + if (has_environment("XDG_CACHE_HOME")) { + return get_environment("XDG_CACHE_HOME"); + } else if (has_environment("HOME")) { + return get_environment("HOME").plus_file(".cache"); + } else { + return get_config_path(); + } +} diff --git a/platform/haiku/os_haiku.h b/platform/haiku/os_haiku.h index 86148f1fb4..4ee54fb48d 100644 --- a/platform/haiku/os_haiku.h +++ b/platform/haiku/os_haiku.h @@ -117,6 +117,10 @@ public: virtual int get_power_percent_left(); virtual bool _check_internal_feature_support(const String &p_feature); + + virtual String get_config_path() const; + virtual String get_data_path() const; + virtual String get_cache_path() const; }; #endif diff --git a/platform/iphone/SCsub b/platform/iphone/SCsub index 61798c5f87..550dfdd7d6 100644 --- a/platform/iphone/SCsub +++ b/platform/iphone/SCsub @@ -3,7 +3,7 @@ Import('env') iphone_lib = [ - + 'godot_iphone.cpp', 'os_iphone.cpp', 'sem_iphone.cpp', 'gl_view.mm', @@ -17,10 +17,10 @@ iphone_lib = [ ] env_ios = env.Clone() +ios_lib = env_ios.Library('iphone', iphone_lib) -obj = env_ios.Object('godot_iphone.cpp') +def combine_libs(target=None, source=None, env=None): + lib_path = target[0].srcnode().abspath + env.Execute('$IPHONEPATH/usr/bin/libtool -static -o "' + lib_path + '" ' + ' '.join([('"' + lib.srcnode().abspath + '"') for lib in source])) -prog = None -prog = env_ios.Program('#bin/godot', [obj] + iphone_lib) -action = "$IPHONEPATH/usr/bin/dsymutil " + File(prog)[0].path + " -o " + File(prog)[0].path + ".dSYM" -env.AddPostAction(prog, action) +combine_command = env_ios.Command('#bin/libgodot' + env_ios['LIBSUFFIX'], [ios_lib] + env_ios['LIBS'], combine_libs) diff --git a/platform/iphone/detect.py b/platform/iphone/detect.py index d426b478bf..25674c2b47 100644 --- a/platform/iphone/detect.py +++ b/platform/iphone/detect.py @@ -61,10 +61,13 @@ def configure(env): env.Append(LINKFLAGS=['-flto']) ## Architecture + if env["ios_sim"] and not ("arch" in env): + env["arch"] = "x86" - if env["ios_sim"] or env["arch"] == "x86": # i386, simulator - env["arch"] = "x86" + if env["arch"] == "x86": # i386, simulator env["bits"] = "32" + elif env["arch"] == "x86_64": + env["bits"] = "64" elif (env["arch"] == "arm" or env["arch"] == "arm32" or env["arch"] == "armv7" or env["bits"] == "32"): # arm env["arch"] = "arm" env["bits"] = "32" @@ -95,10 +98,11 @@ def configure(env): ## Compile flags - if (env["arch"] == "x86"): + if (env["arch"] == "x86" or env["arch"] == "x86_64"): env['IPHONEPLATFORM'] = 'iPhoneSimulator' - env['ENV']['MACOSX_DEPLOYMENT_TARGET'] = '10.6' - env.Append(CCFLAGS='-arch i386 -fobjc-abi-version=2 -fobjc-legacy-dispatch -fmessage-length=0 -fpascal-strings -fblocks -fasm-blocks -D__IPHONE_OS_VERSION_MIN_REQUIRED=40100 -isysroot $IPHONESDK -mios-simulator-version-min=4.3 -DCUSTOM_MATRIX_TRANSFORM_H=\\\"build/iphone/matrix4_iphone.h\\\" -DCUSTOM_VECTOR3_TRANSFORM_H=\\\"build/iphone/vector3_iphone.h\\\"'.split()) + env['ENV']['MACOSX_DEPLOYMENT_TARGET'] = '10.9' + arch_flag = "i386" if env["arch"] == "x86" else env["arch"] + env.Append(CCFLAGS=('-arch ' + arch_flag + ' -fobjc-abi-version=2 -fobjc-legacy-dispatch -fmessage-length=0 -fpascal-strings -fblocks -fasm-blocks -isysroot $IPHONESDK -mios-simulator-version-min=9.0 -DCUSTOM_MATRIX_TRANSFORM_H=\\\"build/iphone/matrix4_iphone.h\\\" -DCUSTOM_VECTOR3_TRANSFORM_H=\\\"build/iphone/vector3_iphone.h\\\"').split()) elif (env["arch"] == "arm"): env.Append(CCFLAGS='-fno-objc-arc -arch armv7 -fmessage-length=0 -fno-strict-aliasing -fdiagnostics-print-source-range-info -fdiagnostics-show-category=id -fdiagnostics-parseable-fixits -fpascal-strings -fblocks -isysroot $IPHONESDK -fvisibility=hidden -mthumb "-DIBOutlet=__attribute__((iboutlet))" "-DIBOutletCollection(ClassName)=__attribute__((iboutletcollection(ClassName)))" "-DIBAction=void)__attribute__((ibaction)" -miphoneos-version-min=9.0 -MMD -MT dependencies'.split()) elif (env["arch"] == "arm64"): @@ -113,8 +117,9 @@ def configure(env): ## Link flags - if (env["arch"] == "x86"): - env.Append(LINKFLAGS=['-arch', 'i386', '-mios-simulator-version-min=4.3', + if (env["arch"] == "x86" or env["arch"] == "x86_64"): + arch_flag = "i386" if env["arch"] == "x86" else env["arch"] + env.Append(LINKFLAGS=['-arch', arch_flag, '-mios-simulator-version-min=9.0', '-isysroot', '$IPHONESDK', '-Xlinker', '-objc_abi_version', @@ -163,7 +168,7 @@ def configure(env): env['ENV']['CODESIGN_ALLOCATE'] = '/Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/codesign_allocate' env.Append(CPPPATH=['#platform/iphone']) - env.Append(CPPFLAGS=['-DIPHONE_ENABLED', '-DUNIX_ENABLED', '-DGLES2_ENABLED', '-DMPC_FIXED_POINT', '-DCOREAUDIO_ENABLED']) + env.Append(CPPFLAGS=['-DIPHONE_ENABLED', '-DUNIX_ENABLED', '-DGLES_ENABLED', '-DMPC_FIXED_POINT', '-DCOREAUDIO_ENABLED']) # TODO: Move that to opus module's config if 'module_opus_enabled' in env and env['module_opus_enabled']: diff --git a/platform/iphone/export/export.cpp b/platform/iphone/export/export.cpp index 0507ef19d6..6aa1ed9f8d 100644 --- a/platform/iphone/export/export.cpp +++ b/platform/iphone/export/export.cpp @@ -56,11 +56,48 @@ class EditorExportPlatformIOS : public EditorExportPlatform { static Error _walk_dir_recursive(DirAccess *p_da, FileHandler p_handler, void *p_userdata); static Error _codesign(String p_file, void *p_userdata); - void _fix_config_file(const Ref<EditorExportPreset> &p_preset, Vector<uint8_t> &pfile, const String &p_name, const String &p_binary, bool p_debug); - static Error _export_dylibs(void *p_userdata, const String &p_path, const Vector<uint8_t> &p_data, int p_file, int p_total); + struct IOSConfigData { + String pkg_name; + String binary_name; + String plist_content; + String architectures; + String linker_flags; + String cpp_code; + }; + + struct ExportArchitecture { + String name; + bool is_default; + + ExportArchitecture() + : name(""), is_default(false) { + } + + ExportArchitecture(String p_name, bool p_is_default) { + name = p_name; + is_default = p_is_default; + } + }; + + struct IOSExportAsset { + String exported_path; + bool is_framework; // framework is anything linked to the binary, otherwise it's a resource + }; + + String _get_additional_plist_content(); + String _get_linker_flags(); + String _get_cpp_code(); + void _fix_config_file(const Ref<EditorExportPreset> &p_preset, Vector<uint8_t> &pfile, const IOSConfigData &p_config, bool p_debug); Error _export_loading_screens(const Ref<EditorExportPreset> &p_preset, const String &p_dest_dir); Error _export_icons(const Ref<EditorExportPreset> &p_preset, const String &p_iconset_dir); + Vector<ExportArchitecture> _get_supported_architectures(); + Vector<String> _get_preset_architectures(const Ref<EditorExportPreset> &p_preset); + + void _add_assets_to_project(Vector<uint8_t> &p_project_data, const Vector<IOSExportAsset> &p_additional_assets); + Error _export_additional_assets(const String &p_out_dir, const Vector<String> &p_assets, bool p_is_framework, Vector<IOSExportAsset> &r_exported_assets); + Error _export_additional_assets(const String &p_out_dir, const Vector<SharedObject> &p_libraries, Vector<IOSExportAsset> &r_exported_assets); + protected: virtual void get_preset_features(const Ref<EditorExportPreset> &p_preset, List<String> *r_features); virtual void get_export_options(List<ExportOption> *r_options); @@ -96,6 +133,17 @@ void EditorExportPlatformIOS::get_preset_features(const Ref<EditorExportPreset> if (p_preset->get("texture_format/etc2")) { r_features->push_back("etc2"); } + Vector<String> architectures = _get_preset_architectures(p_preset); + for (int i = 0; i < architectures.size(); ++i) { + r_features->push_back(architectures[i]); + } +} + +Vector<EditorExportPlatformIOS::ExportArchitecture> EditorExportPlatformIOS::_get_supported_architectures() { + Vector<ExportArchitecture> archs; + archs.push_back(ExportArchitecture("armv7", true)); + archs.push_back(ExportArchitecture("arm64", true)); + return archs; } void EditorExportPlatformIOS::get_export_options(List<ExportOption> *r_options) { @@ -120,7 +168,6 @@ void EditorExportPlatformIOS::get_export_options(List<ExportOption> *r_options) r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "application/short_version"), "1.0")); r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "application/version"), "1.0")); r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "application/copyright"), "")); - r_options->push_back(ExportOption(PropertyInfo(Variant::INT, "application/bits_mode", PROPERTY_HINT_ENUM, "Fat (32 & 64 bits),64 bits,32 bits"), 1)); r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "required_icons/iphone_120x120", PROPERTY_HINT_FILE, "png"), "")); // Home screen on iPhone/iPod Touch with retina display r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "required_icons/ipad_76x76", PROPERTY_HINT_FILE, "png"), "")); // Home screen on iPad @@ -145,10 +192,13 @@ void EditorExportPlatformIOS::get_export_options(List<ExportOption> *r_options) r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "texture_format/etc"), false)); r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "texture_format/etc2"), true)); - /* probably need some more info */ + Vector<ExportArchitecture> architectures = _get_supported_architectures(); + for (int i = 0; i < architectures.size(); ++i) { + r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "architectures/" + architectures[i].name), architectures[i].is_default)); + } } -void EditorExportPlatformIOS::_fix_config_file(const Ref<EditorExportPreset> &p_preset, Vector<uint8_t> &pfile, const String &p_name, const String &p_binary, bool p_debug) { +void EditorExportPlatformIOS::_fix_config_file(const Ref<EditorExportPreset> &p_preset, Vector<uint8_t> &pfile, const IOSConfigData &p_config, bool p_debug) { static const String export_method_string[] = { "app-store", "development", @@ -158,13 +208,12 @@ void EditorExportPlatformIOS::_fix_config_file(const Ref<EditorExportPreset> &p_ String str; String strnew; str.parse_utf8((const char *)pfile.ptr(), pfile.size()); - print_line(str); Vector<String> lines = str.split("\n"); for (int i = 0; i < lines.size(); i++) { if (lines[i].find("$binary") != -1) { - strnew += lines[i].replace("$binary", p_binary) + "\n"; + strnew += lines[i].replace("$binary", p_config.binary_name) + "\n"; } else if (lines[i].find("$name") != -1) { - strnew += lines[i].replace("$name", p_name) + "\n"; + strnew += lines[i].replace("$name", p_config.pkg_name) + "\n"; } else if (lines[i].find("$info") != -1) { strnew += lines[i].replace("$info", p_preset->get("application/info")) + "\n"; } else if (lines[i].find("$identifier") != -1) { @@ -186,10 +235,21 @@ void EditorExportPlatformIOS::_fix_config_file(const Ref<EditorExportPreset> &p_ strnew += lines[i].replace("$provisioning_profile_uuid_release", p_preset->get("application/provisioning_profile_uuid_release")) + "\n"; } else if (lines[i].find("$provisioning_profile_uuid_debug") != -1) { strnew += lines[i].replace("$provisioning_profile_uuid_debug", p_preset->get("application/provisioning_profile_uuid_debug")) + "\n"; + } else if (lines[i].find("$provisioning_profile_uuid") != -1) { + String uuid = p_debug ? p_preset->get("application/provisioning_profile_uuid_debug") : p_preset->get("application/provisioning_profile_uuid_release"); + strnew += lines[i].replace("$provisioning_profile_uuid", uuid) + "\n"; } else if (lines[i].find("$code_sign_identity_debug") != -1) { strnew += lines[i].replace("$code_sign_identity_debug", p_preset->get("application/code_sign_identity_debug")) + "\n"; } else if (lines[i].find("$code_sign_identity_release") != -1) { strnew += lines[i].replace("$code_sign_identity_release", p_preset->get("application/code_sign_identity_release")) + "\n"; + } else if (lines[i].find("$additional_plist_content") != -1) { + strnew += lines[i].replace("$additional_plist_content", p_config.plist_content) + "\n"; + } else if (lines[i].find("$godot_archs") != -1) { + strnew += lines[i].replace("$godot_archs", p_config.architectures) + "\n"; + } else if (lines[i].find("$linker_flags") != -1) { + strnew += lines[i].replace("$linker_flags", p_config.linker_flags) + "\n"; + } else if (lines[i].find("$cpp_code") != -1) { + strnew += lines[i].replace("$cpp_code", p_config.cpp_code) + "\n"; } else { strnew += lines[i] + "\n"; } @@ -204,27 +264,37 @@ void EditorExportPlatformIOS::_fix_config_file(const Ref<EditorExportPreset> &p_ } } -Error EditorExportPlatformIOS::_export_dylibs(void *p_userdata, const String &p_path, const Vector<uint8_t> &p_data, int p_file, int p_total) { - if (!p_path.ends_with(".dylib")) return OK; - const String &dest_dir = *(String *)p_userdata; - String rel_path = p_path.replace_first("res://", "dylibs/"); - DirAccess *dest_dir_access = DirAccess::open(dest_dir); - ERR_FAIL_COND_V(!dest_dir_access, ERR_CANT_OPEN); - - String base_dir = rel_path.get_base_dir(); - Error make_dir_err = OK; - if (!dest_dir_access->dir_exists(base_dir)) { - make_dir_err = dest_dir_access->make_dir_recursive(base_dir); - } - if (make_dir_err != OK) { - memdelete(dest_dir_access); - return make_dir_err; +String EditorExportPlatformIOS::_get_additional_plist_content() { + Vector<Ref<EditorExportPlugin> > export_plugins = EditorExport::get_singleton()->get_export_plugins(); + String result; + for (int i = 0; i < export_plugins.size(); ++i) { + result += export_plugins[i]->get_ios_plist_content(); } + return result; +} - Error copy_err = dest_dir_access->copy(p_path, dest_dir + rel_path); - memdelete(dest_dir_access); +String EditorExportPlatformIOS::_get_linker_flags() { + Vector<Ref<EditorExportPlugin> > export_plugins = EditorExport::get_singleton()->get_export_plugins(); + String result; + for (int i = 0; i < export_plugins.size(); ++i) { + String flags = export_plugins[i]->get_ios_linker_flags(); + if (flags.length() == 0) continue; + if (result.length() > 0) { + result += ' '; + } + result += flags; + } + // the flags will be enclosed in quotes, so need to escape them + return result.replace("\"", "\\\""); +} - return copy_err; +String EditorExportPlatformIOS::_get_cpp_code() { + Vector<Ref<EditorExportPlugin> > export_plugins = EditorExport::get_singleton()->get_export_plugins(); + String result; + for (int i = 0; i < export_plugins.size(); ++i) { + result += export_plugins[i]->get_ios_cpp_code(); + } + return result; } struct IconInfo { @@ -402,7 +472,207 @@ Error EditorExportPlatformIOS::_codesign(String p_file, void *p_userdata) { return OK; } +struct PbxId { +private: + static char _hex_char(uint8_t four_bits) { + if (four_bits < 10) { + return ('0' + four_bits); + } + return 'A' + (four_bits - 10); + } + + static String _hex_pad(uint32_t num) { + Vector<char> ret; + ret.resize(sizeof(num) * 2); + for (int i = 0; i < sizeof(num) * 2; ++i) { + uint8_t four_bits = (num >> (sizeof(num) * 8 - (i + 1) * 4)) & 0xF; + ret[i] = _hex_char(four_bits); + } + return String::utf8(ret.ptr(), ret.size()); + } + +public: + uint32_t high_bits; + uint32_t mid_bits; + uint32_t low_bits; + + String str() const { + return _hex_pad(high_bits) + _hex_pad(mid_bits) + _hex_pad(low_bits); + } + + PbxId &operator++() { + low_bits++; + if (!low_bits) { + mid_bits++; + if (!mid_bits) { + high_bits++; + } + } + + return *this; + } +}; + +struct ExportLibsData { + Vector<String> lib_paths; + String dest_dir; +}; + +void EditorExportPlatformIOS::_add_assets_to_project(Vector<uint8_t> &p_project_data, const Vector<IOSExportAsset> &p_additional_assets) { + Vector<Ref<EditorExportPlugin> > export_plugins = EditorExport::get_singleton()->get_export_plugins(); + Vector<String> frameworks; + for (int i = 0; i < export_plugins.size(); ++i) { + Vector<String> plugin_frameworks = export_plugins[i]->get_ios_frameworks(); + for (int j = 0; j < plugin_frameworks.size(); ++j) { + frameworks.push_back(plugin_frameworks[j]); + } + } + + // that is just a random number, we just need Godot IDs not to clash with + // existing IDs in the project. + PbxId current_id = { 0x58938401, 0, 0 }; + String pbx_files; + String pbx_frameworks_build; + String pbx_frameworks_refs; + String pbx_resources_build; + String pbx_resources_refs; + + const String file_info_format = String("$build_id = {isa = PBXBuildFile; fileRef = $ref_id; };\n") + + "$ref_id = {isa = PBXFileReference; lastKnownFileType = $file_type; name = $name; path = \"$file_path\"; sourceTree = \"<group>\"; };\n"; + for (int i = 0; i < p_additional_assets.size(); ++i) { + String build_id = (++current_id).str(); + String ref_id = (++current_id).str(); + const IOSExportAsset &asset = p_additional_assets[i]; + + String type; + if (asset.exported_path.ends_with(".framework")) { + type = "wrapper.framework"; + } else if (asset.exported_path.ends_with(".dylib")) { + type = "compiled.mach-o.dylib"; + } else if (asset.exported_path.ends_with(".a")) { + type = "archive.ar"; + } else { + type = "file"; + } + + String &pbx_build = asset.is_framework ? pbx_frameworks_build : pbx_resources_build; + String &pbx_refs = asset.is_framework ? pbx_frameworks_refs : pbx_resources_refs; + + if (pbx_build.length() > 0) { + pbx_build += ",\n"; + pbx_refs += ",\n"; + } + pbx_build += build_id; + pbx_refs += ref_id; + + Dictionary format_dict; + format_dict["build_id"] = build_id; + format_dict["ref_id"] = ref_id; + format_dict["name"] = asset.exported_path.get_file(); + format_dict["file_path"] = asset.exported_path; + format_dict["file_type"] = type; + pbx_files += file_info_format.format(format_dict, "$_"); + } + + String str = String::utf8((const char *)p_project_data.ptr(), p_project_data.size()); + str = str.replace("$additional_pbx_files", pbx_files); + str = str.replace("$additional_pbx_frameworks_build", pbx_frameworks_build); + str = str.replace("$additional_pbx_frameworks_refs", pbx_frameworks_refs); + str = str.replace("$additional_pbx_resources_build", pbx_resources_build); + str = str.replace("$additional_pbx_resources_refs", pbx_resources_refs); + + CharString cs = str.utf8(); + p_project_data.resize(cs.size() - 1); + for (int i = 0; i < cs.size() - 1; i++) { + p_project_data[i] = cs[i]; + } +} + +Error EditorExportPlatformIOS::_export_additional_assets(const String &p_out_dir, const Vector<String> &p_assets, bool p_is_framework, Vector<IOSExportAsset> &r_exported_assets) { + DirAccess *filesystem_da = DirAccess::create(DirAccess::ACCESS_FILESYSTEM); + ERR_FAIL_COND_V(!filesystem_da, ERR_CANT_CREATE); + for (int f_idx = 0; f_idx < p_assets.size(); ++f_idx) { + String asset = p_assets[f_idx]; + if (!asset.begins_with("res://")) { + // either SDK-builtin or already a part of the export template + IOSExportAsset exported_asset = { asset, p_is_framework }; + r_exported_assets.push_back(exported_asset); + } else { + DirAccess *da = DirAccess::create_for_path(asset); + if (!da) { + memdelete(filesystem_da); + ERR_FAIL_COND_V(!da, ERR_CANT_CREATE); + } + bool file_exists = da->file_exists(asset); + bool dir_exists = da->dir_exists(asset); + if (!file_exists && !dir_exists) { + memdelete(da); + memdelete(filesystem_da); + return ERR_FILE_NOT_FOUND; + } + String additional_dir = p_is_framework && asset.ends_with(".dylib") ? "/dylibs/" : "/"; + String destination_dir = p_out_dir + additional_dir + asset.get_base_dir().replace("res://", ""); + if (!filesystem_da->dir_exists(destination_dir)) { + Error make_dir_err = filesystem_da->make_dir_recursive(destination_dir); + if (make_dir_err) { + memdelete(da); + memdelete(filesystem_da); + return make_dir_err; + } + } + + String destination = destination_dir + "/" + asset.get_file(); + Error err = dir_exists ? da->copy_dir(asset, destination) : da->copy(asset, destination); + memdelete(da); + if (err) { + memdelete(filesystem_da); + return err; + } + IOSExportAsset exported_asset = { destination, p_is_framework }; + r_exported_assets.push_back(exported_asset); + } + } + memdelete(filesystem_da); + + return OK; +} + +Error EditorExportPlatformIOS::_export_additional_assets(const String &p_out_dir, const Vector<SharedObject> &p_libraries, Vector<IOSExportAsset> &r_exported_assets) { + Vector<Ref<EditorExportPlugin> > export_plugins = EditorExport::get_singleton()->get_export_plugins(); + for (int i = 0; i < export_plugins.size(); i++) { + Vector<String> frameworks = export_plugins[i]->get_ios_frameworks(); + Error err = _export_additional_assets(p_out_dir, frameworks, true, r_exported_assets); + ERR_FAIL_COND_V(err, err); + Vector<String> ios_bundle_files = export_plugins[i]->get_ios_bundle_files(); + err = _export_additional_assets(p_out_dir, ios_bundle_files, false, r_exported_assets); + ERR_FAIL_COND_V(err, err); + } + + Vector<String> library_paths; + for (int i = 0; i < p_libraries.size(); ++i) { + library_paths.push_back(p_libraries[i].path); + } + Error err = _export_additional_assets(p_out_dir, library_paths, true, r_exported_assets); + ERR_FAIL_COND_V(err, err); + + return OK; +} + +Vector<String> EditorExportPlatformIOS::_get_preset_architectures(const Ref<EditorExportPreset> &p_preset) { + Vector<ExportArchitecture> all_archs = _get_supported_architectures(); + Vector<String> enabled_archs; + for (int i = 0; i < all_archs.size(); ++i) { + bool is_enabled = p_preset->get("architectures/" + all_archs[i].name); + if (is_enabled) { + enabled_archs.push_back(all_archs[i].name); + } + } + return enabled_archs; +} + Error EditorExportPlatformIOS::export_project(const Ref<EditorExportPreset> &p_preset, bool p_debug, const String &p_path, int p_flags) { + ExportNotifier notifier(*this, p_preset, p_debug, p_path, p_flags); + String src_pkg_name; String dest_dir = p_path.get_base_dir() + "/"; String binary_name = p_path.get_file().get_basename(); @@ -427,26 +697,43 @@ Error EditorExportPlatformIOS::export_project(const Ref<EditorExportPreset> &p_p } } - FileAccess *src_f = NULL; - zlib_filefunc_def io = zipio_create_io_from_file(&src_f); + DirAccess *da = DirAccess::create(DirAccess::ACCESS_FILESYSTEM); + if (da) { + String current_dir = da->get_current_dir(); - ep.step("Creating app", 0); + // remove leftovers from last export so they don't interfere + // in case some files are no longer needed + if (da->change_dir(dest_dir + binary_name + ".xcodeproj") == OK) { + da->erase_contents_recursive(); + } + if (da->change_dir(dest_dir + binary_name) == OK) { + da->erase_contents_recursive(); + } - unzFile src_pkg_zip = unzOpen2(src_pkg_name.utf8().get_data(), &io); - if (!src_pkg_zip) { + da->change_dir(current_dir); - EditorNode::add_io_error("Could not find template app to export:\n" + src_pkg_name); - return ERR_FILE_NOT_FOUND; + if (!da->dir_exists(dest_dir + binary_name)) { + Error err = da->make_dir(dest_dir + binary_name); + if (err) { + memdelete(da); + return err; + } + } + memdelete(da); } - ERR_FAIL_COND_V(!src_pkg_zip, ERR_CANT_OPEN); - int ret = unzGoToFirstFile(src_pkg_zip); + ep.step("Making .pck", 0); + String pack_path = dest_dir + binary_name + ".pck"; + Vector<SharedObject> libraries; + Error err = save_pack(p_preset, pack_path, &libraries); + if (err) + return err; + + ep.step("Extracting and configuring Xcode project", 1); - String binary_to_use = "godot.iphone." + String(p_debug ? "debug" : "release") + "."; - int bits_mode = p_preset->get("application/bits_mode"); - binary_to_use += String(bits_mode == 0 ? "fat" : bits_mode == 1 ? "arm64" : "armv7"); + String library_to_use = "libgodot.iphone." + String(p_debug ? "debug" : "release") + ".fat.a"; - print_line("binary: " + binary_to_use); + print_line("static library: " + library_to_use); String pkg_name; if (p_preset->get("application/name") != "") pkg_name = p_preset->get("application/name"); // app_name @@ -455,22 +742,41 @@ Error EditorExportPlatformIOS::export_project(const Ref<EditorExportPreset> &p_p else pkg_name = "Unnamed"; - DirAccess *tmp_app_path = DirAccess::create_for_path(dest_dir); - ERR_FAIL_COND_V(!tmp_app_path, ERR_CANT_CREATE) - - /* Now process our template */ - bool found_binary = false; + bool found_library = false; int total_size = 0; + const String project_file = "godot_ios.xcodeproj/project.pbxproj"; Set<String> files_to_parse; files_to_parse.insert("godot_ios/godot_ios-Info.plist"); - files_to_parse.insert("godot_ios.xcodeproj/project.pbxproj"); - files_to_parse.insert("export_options.plist"); + files_to_parse.insert(project_file); + files_to_parse.insert("godot_ios/export_options.plist"); + files_to_parse.insert("godot_ios/dummy.cpp"); files_to_parse.insert("godot_ios.xcodeproj/project.xcworkspace/contents.xcworkspacedata"); files_to_parse.insert("godot_ios.xcodeproj/xcshareddata/xcschemes/godot_ios.xcscheme"); - print_line("Unzipping..."); + IOSConfigData config_data = { + pkg_name, + binary_name, + _get_additional_plist_content(), + String(" ").join(_get_preset_architectures(p_preset)), + _get_linker_flags(), + _get_cpp_code() + }; + + DirAccess *tmp_app_path = DirAccess::create_for_path(dest_dir); + ERR_FAIL_COND_V(!tmp_app_path, ERR_CANT_CREATE) + print_line("Unzipping..."); + FileAccess *src_f = NULL; + zlib_filefunc_def io = zipio_create_io_from_file(&src_f); + unzFile src_pkg_zip = unzOpen2(src_pkg_name.utf8().get_data(), &io); + if (!src_pkg_zip) { + EditorNode::add_io_error("Could not open export template (not a zip file?):\n" + src_pkg_name); + return ERR_CANT_OPEN; + } + ERR_FAIL_COND_V(!src_pkg_zip, ERR_CANT_OPEN); + int ret = unzGoToFirstFile(src_pkg_zip); + Vector<uint8_t> project_file_data; while (ret == UNZ_OK) { bool is_execute = false; @@ -496,15 +802,18 @@ Error EditorExportPlatformIOS::export_project(const Ref<EditorExportPreset> &p_p if (files_to_parse.has(file)) { print_line(String("parse ") + file); - _fix_config_file(p_preset, data, pkg_name, binary_name, p_debug); - } else if (file.begins_with("godot.iphone")) { - if (file != binary_to_use) { + _fix_config_file(p_preset, data, config_data, p_debug); + } else if (file.begins_with("libgodot.iphone")) { + if (file != library_to_use) { ret = unzGoToNextFile(src_pkg_zip); continue; //ignore! } - found_binary = true; + found_library = true; is_execute = true; - file = "godot_ios.iphone"; + file = "godot_ios.a"; + } + if (file == project_file) { + project_file_data = data; } ///@TODO need to parse logo files @@ -557,16 +866,16 @@ Error EditorExportPlatformIOS::export_project(const Ref<EditorExportPreset> &p_p /* we're done with our source zip */ unzClose(src_pkg_zip); - if (!found_binary) { - ERR_PRINTS("Requested template binary '" + binary_to_use + "' not found. It might be missing from your template archive."); + if (!found_library) { + ERR_PRINTS("Requested template library '" + library_to_use + "' not found. It might be missing from your template archive."); memdelete(tmp_app_path); return ERR_FILE_NOT_FOUND; } String iconset_dir = dest_dir + binary_name + "/Images.xcassets/AppIcon.appiconset/"; - Error err = OK; + err = OK; if (!tmp_app_path->dir_exists(iconset_dir)) { - Error err = tmp_app_path->make_dir_recursive(iconset_dir); + err = tmp_app_path->make_dir_recursive(iconset_dir); } memdelete(tmp_app_path); if (err) @@ -580,20 +889,23 @@ Error EditorExportPlatformIOS::export_project(const Ref<EditorExportPreset> &p_p if (err) return err; - ep.step("Making .pck", 1); - - String pack_path = dest_dir + binary_name + ".pck"; - err = save_pack(p_preset, pack_path); - if (err) - return err; - - err = export_project_files(p_preset, _export_dylibs, &dest_dir); - if (err) - return err; + print_line("Exporting additional assets"); + Vector<IOSExportAsset> assets; + _export_additional_assets(dest_dir + binary_name, libraries, assets); + _add_assets_to_project(project_file_data, assets); + String project_file_name = dest_dir + binary_name + ".xcodeproj/project.pbxproj"; + FileAccess *f = FileAccess::open(project_file_name, FileAccess::WRITE); + if (!f) { + ERR_PRINTS("Can't write '" + project_file_name + "'."); + return ERR_CANT_CREATE; + }; + f->store_buffer(project_file_data.ptr(), project_file_data.size()); + f->close(); + memdelete(f); #ifdef OSX_ENABLED ep.step("Code-signing dylibs", 2); - DirAccess *dylibs_dir = DirAccess::open(dest_dir + "dylibs"); + DirAccess *dylibs_dir = DirAccess::open(dest_dir + binary_name + "/dylibs"); ERR_FAIL_COND_V(!dylibs_dir, ERR_CANT_OPEN); CodesignData codesign_data(p_preset, p_debug); err = _walk_dir_recursive(dylibs_dir, _codesign, &codesign_data); @@ -625,13 +937,14 @@ Error EditorExportPlatformIOS::export_project(const Ref<EditorExportPreset> &p_p export_args.push_back("-archivePath"); export_args.push_back(archive_path); export_args.push_back("-exportOptionsPlist"); - export_args.push_back(dest_dir + "export_options.plist"); + export_args.push_back(dest_dir + binary_name + "/export_options.plist"); + export_args.push_back("-allowProvisioningUpdates"); export_args.push_back("-exportPath"); export_args.push_back(dest_dir); err = OS::get_singleton()->execute("xcodebuild", export_args, true); ERR_FAIL_COND_V(err, err); #else - print_line(".ipa can only be built on macOS. Leaving XCode project without building the package."); + print_line(".ipa can only be built on macOS. Leaving Xcode project without building the package."); #endif return OK; diff --git a/platform/iphone/game_center.mm b/platform/iphone/game_center.mm index 531b80eee3..d2104ae765 100644 --- a/platform/iphone/game_center.mm +++ b/platform/iphone/game_center.mm @@ -109,7 +109,7 @@ void GameCenter::connect() { GameCenter::get_singleton()->authenticated = true; } else { ret["result"] = "error"; - ret["error_code"] = error.code; + ret["error_code"] = (int64_t)error.code; ret["error_description"] = [error.localizedDescription UTF8String]; GameCenter::get_singleton()->authenticated = false; }; @@ -145,7 +145,7 @@ Error GameCenter::post_score(Variant p_score) { ret["result"] = "ok"; } else { ret["result"] = "error"; - ret["error_code"] = error.code; + ret["error_code"] = (int64_t)error.code; ret["error_description"] = [error.localizedDescription UTF8String]; }; @@ -183,7 +183,7 @@ Error GameCenter::award_achievement(Variant p_params) { ret["result"] = "ok"; } else { ret["result"] = "error"; - ret["error_code"] = error.code; + ret["error_code"] = (int64_t)error.code; }; pending_events.push_back(ret); @@ -241,7 +241,7 @@ void GameCenter::request_achievement_descriptions() { } else { ret["result"] = "error"; - ret["error_code"] = error.code; + ret["error_code"] = (int64_t)error.code; }; pending_events.push_back(ret); @@ -273,7 +273,7 @@ void GameCenter::request_achievements() { } else { ret["result"] = "error"; - ret["error_code"] = error.code; + ret["error_code"] = (int64_t)error.code; }; pending_events.push_back(ret); @@ -289,7 +289,7 @@ void GameCenter::reset_achievements() { ret["result"] = "ok"; } else { ret["result"] = "error"; - ret["error_code"] = error.code; + ret["error_code"] = (int64_t)error.code; }; pending_events.push_back(ret); @@ -358,7 +358,7 @@ Error GameCenter::request_identity_verification_signature() { ret["player_id"] = [player.playerID UTF8String]; } else { ret["result"] = "error"; - ret["error_code"] = error.code; + ret["error_code"] = (int64_t)error.code; ret["error_description"] = [error.localizedDescription UTF8String]; }; diff --git a/platform/iphone/globals/global_defaults.cpp b/platform/iphone/globals/global_defaults.cpp index 4bdc716d6e..b81e6def3b 100644 --- a/platform/iphone/globals/global_defaults.cpp +++ b/platform/iphone/globals/global_defaults.cpp @@ -31,11 +31,4 @@ #include "project_settings.h" void register_iphone_global_defaults() { - - /*GLOBAL_DEF("rasterizer.iOS/use_fragment_lighting",false); - GLOBAL_DEF("rasterizer.iOS/fp16_framebuffer",false); - GLOBAL_DEF("display.iOS/driver","GLES2"); - ProjectSettings::get_singleton()->set_custom_property_info("display.iOS/driver",PropertyInfo(Variant::STRING,"display.iOS/driver",PROPERTY_HINT_ENUM,"GLES1,GLES2")); - GLOBAL_DEF("display.iOS/use_cadisplaylink",true); - */ } diff --git a/platform/iphone/in_app_store.mm b/platform/iphone/in_app_store.mm index 9efd4b9891..25f4e1e166 100644 --- a/platform/iphone/in_app_store.mm +++ b/platform/iphone/in_app_store.mm @@ -92,6 +92,7 @@ void InAppStore::_bind_methods() { PoolRealArray prices; PoolStringArray ids; PoolStringArray localized_prices; + PoolStringArray currency_codes; for (int i = 0; i < [products count]; i++) { @@ -105,12 +106,14 @@ void InAppStore::_bind_methods() { prices.push_back([product.price doubleValue]); ids.push_back(String::utf8([product.productIdentifier UTF8String])); localized_prices.push_back(String::utf8([product.localizedPrice UTF8String])); + currency_codes.push_back(String::utf8([[[product priceLocale] objectForKey:NSLocaleCurrencyCode] UTF8String])); }; ret["titles"] = titles; ret["descriptions"] = descriptions; ret["prices"] = prices; ret["ids"] = ids; ret["localized_prices"] = localized_prices; + ret["currency_codes"] = currency_codes; PoolStringArray invalid_ids; diff --git a/platform/iphone/os_iphone.cpp b/platform/iphone/os_iphone.cpp index d0865a35b9..fbe3bd310d 100644 --- a/platform/iphone/os_iphone.cpp +++ b/platform/iphone/os_iphone.cpp @@ -46,6 +46,7 @@ #include "sem_iphone.h" #include "ios.h" +#include <dlfcn.h> int OSIPhone::get_video_driver_count() const { @@ -54,7 +55,7 @@ int OSIPhone::get_video_driver_count() const { const char *OSIPhone::get_video_driver_name(int p_driver) const { - return "GLES2"; + return "GLES3"; }; OSIPhone *OSIPhone::get_singleton() { @@ -96,15 +97,6 @@ void OSIPhone::initialize_core() { set_data_dir(data_dir); }; -void OSIPhone::initialize_logger() { - Vector<Logger *> loggers; - loggers.push_back(memnew(SyslogLogger)); - // FIXME: Reenable once we figure out how to get this properly in user:// - // instead of littering the user's working dirs (res:// + pwd) with log files (GH-12277) - //loggers.push_back(memnew(RotatedFileLogger("user://logs/log.txt"))); - _set_logger(memnew(CompositeLogger(loggers))); -} - void OSIPhone::initialize(const VideoMode &p_desired, int p_video_driver, int p_audio_driver) { supported_orientations = 0; @@ -402,6 +394,37 @@ void OSIPhone::alert(const String &p_alert, const String &p_title) { iOS::alert(utf8_alert.get_data(), utf8_title.get_data()); } +Error OSIPhone::open_dynamic_library(const String p_path, void *&p_library_handle) { + if (p_path.length() == 0) { + p_library_handle = RTLD_SELF; + return OK; + } + return OS_Unix::open_dynamic_library(p_path, p_library_handle); +} + +Error OSIPhone::close_dynamic_library(void *p_library_handle) { + if (p_library_handle == RTLD_SELF) { + return OK; + } + return OS_Unix::close_dynamic_library(p_library_handle); +} + +HashMap<String, void *> OSIPhone::dynamic_symbol_lookup_table; +void register_dynamic_symbol(char *name, void *address) { + OSIPhone::dynamic_symbol_lookup_table[String(name)] = address; +} + +Error OSIPhone::get_dynamic_library_symbol_handle(void *p_library_handle, const String p_name, void *&p_symbol_handle, bool p_optional) { + if (p_library_handle == RTLD_SELF) { + void **ptr = OSIPhone::dynamic_symbol_lookup_table.getptr(p_name); + if (ptr) { + p_symbol_handle = *ptr; + return OK; + } + } + return OS_Unix::get_dynamic_library_symbol_handle(p_library_handle, p_name, p_symbol_handle, p_optional); +} + void OSIPhone::set_video_mode(const VideoMode &p_video_mode, int p_screen) { video_mode = p_video_mode; @@ -470,7 +493,7 @@ void OSIPhone::set_cursor_shape(CursorShape p_shape){ }; -String OSIPhone::get_data_dir() const { +String OSIPhone::get_user_data_dir() const { return data_dir; }; @@ -509,7 +532,7 @@ Error OSIPhone::native_video_play(String p_path, float p_volume, String p_audio_ FileAccess *f = FileAccess::open(p_path, FileAccess::READ); bool exists = f && f->is_open(); - String tempFile = get_data_dir(); + String tempFile = get_user_data_dir(); if (!exists) return FAILED; @@ -521,7 +544,7 @@ Error OSIPhone::native_video_play(String p_path, float p_volume, String p_audio_ p_path = p_path.replace("res:/", ProjectSettings::get_singleton()->get_resource_path()); } } else if (p_path.begins_with("user://")) - p_path = p_path.replace("user:/", get_data_dir()); + p_path = p_path.replace("user:/", get_user_data_dir()); memdelete(f); @@ -558,7 +581,36 @@ bool OSIPhone::_check_internal_feature_support(const String &p_feature) { return p_feature == "mobile" || p_feature == "etc" || p_feature == "pvrtc" || p_feature == "etc2"; } +// Initialization order between compilation units is not guaranteed, +// so we use this as a hack to ensure certain code is called before +// everything else, but after all units are initialized. +typedef void (*init_callback)(); +static init_callback *ios_init_callbacks = NULL; +static int ios_init_callbacks_count = 0; +static int ios_init_callbacks_capacity = 0; + +void add_ios_init_callback(init_callback cb) { + if (ios_init_callbacks_count == ios_init_callbacks_capacity) { + void *new_ptr = realloc(ios_init_callbacks, sizeof(cb) * 32); + if (new_ptr) { + ios_init_callbacks = (init_callback *)(new_ptr); + ios_init_callbacks_capacity += 32; + } + } + if (ios_init_callbacks_capacity > ios_init_callbacks_count) { + ios_init_callbacks[ios_init_callbacks_count] = cb; + ++ios_init_callbacks_count; + } +} + OSIPhone::OSIPhone(int width, int height, String p_data_dir) { + for (int i = 0; i < ios_init_callbacks_count; ++i) { + ios_init_callbacks[i](); + } + free(ios_init_callbacks); + ios_init_callbacks = NULL; + ios_init_callbacks_count = 0; + ios_init_callbacks_capacity = 0; main_loop = NULL; visual_server = NULL; @@ -576,7 +628,13 @@ OSIPhone::OSIPhone(int width, int height, String p_data_dir) { // which is initialized in initialize_core data_dir = p_data_dir; - _set_logger(memnew(SyslogLogger)); + Vector<Logger *> loggers; + loggers.push_back(memnew(SyslogLogger)); +#ifdef DEBUG_ENABLED + // it seems iOS app's stdout/stderr is only obtainable if you launch it from Xcode + loggers.push_back(memnew(StdLogger)); +#endif + _set_logger(memnew(CompositeLogger(loggers))); }; OSIPhone::~OSIPhone() { diff --git a/platform/iphone/os_iphone.h b/platform/iphone/os_iphone.h index 6627fddf08..1ef673765a 100644 --- a/platform/iphone/os_iphone.h +++ b/platform/iphone/os_iphone.h @@ -60,6 +60,9 @@ private: MAX_EVENTS = 64, }; + static HashMap<String, void *> dynamic_symbol_lookup_table; + friend void register_dynamic_symbol(char *name, void *address); + uint8_t supported_orientations; VisualServer *visual_server; @@ -83,7 +86,6 @@ private: virtual int get_video_driver_count() const; virtual const char *get_video_driver_name(int p_driver) const; - virtual void initialize_logger(); virtual void initialize_core(); virtual void initialize(const VideoMode &p_desired, int p_video_driver, int p_audio_driver); @@ -153,6 +155,10 @@ public: virtual void alert(const String &p_alert, const String &p_title = "ALERT!"); + virtual Error open_dynamic_library(const String p_path, void *&p_library_handle); + virtual Error close_dynamic_library(void *p_library_handle); + virtual Error get_dynamic_library_symbol_handle(void *p_library_handle, const String p_name, void *&p_symbol_handle, bool p_optional = false); + virtual void set_video_mode(const VideoMode &p_video_mode, int p_screen = 0); virtual VideoMode get_video_mode(int p_screen = 0) const; virtual void get_fullscreen_mode_list(List<VideoMode> *p_list, int p_screen = 0) const; @@ -178,7 +184,7 @@ public: Error shell_open(String p_uri); - String get_data_dir() const; + String get_user_data_dir() const; void set_locale(String p_locale); String get_locale() const; diff --git a/platform/iphone/platform_config.h b/platform/iphone/platform_config.h index 54de66082e..7ff6e7a9a9 100644 --- a/platform/iphone/platform_config.h +++ b/platform/iphone/platform_config.h @@ -28,7 +28,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ #include <alloca.h> -// #define GLES2_INCLUDE_H <ES2/gl.h> + #define GLES3_INCLUDE_H <ES3/gl.h> #define PLATFORM_REFCOUNT diff --git a/platform/javascript/SCsub b/platform/javascript/SCsub index e3015d87b9..8d505a5829 100644 --- a/platform/javascript/SCsub +++ b/platform/javascript/SCsub @@ -21,37 +21,21 @@ for x in javascript_files: env.Append(LINKFLAGS=["-s", "EXPORTED_FUNCTIONS=\"['_main','_main_after_fs_sync','_send_notification']\""]) -# output file name without file extension -basename = "godot" + env["PROGSUFFIX"] target_dir = env.Dir("#bin") - -zip_dir = target_dir.Dir('.javascript_zip') -zip_files = env.InstallAs(zip_dir.File('godot.html'), '#misc/dist/html/default.html') - -implicit_targets = [] -if env['wasm']: - wasm = target_dir.File(basename + '.wasm') - implicit_targets.append(wasm) - zip_files.append(InstallAs(zip_dir.File('godot.wasm'), wasm)) - prejs = env.File('pre_wasm.js') -else: - asmjs_files = [target_dir.File(basename + '.asm.js'), target_dir.File(basename + '.js.mem')] - implicit_targets.extend(asmjs_files) - zip_files.append(InstallAs([zip_dir.File('godot.asm.js'), zip_dir.File('godot.mem')], asmjs_files)) - prejs = env.File('pre_asmjs.js') - -js = env.Program(['#bin/godot'] + implicit_targets, javascript_objects, PROGSUFFIX=env['PROGSUFFIX'] + '.js')[0]; -zip_files.append(InstallAs(zip_dir.File('godot.js'), js)) +build = env.Program(['#bin/godot', target_dir.File('godot' + env['PROGSUFFIX'] + '.wasm')], javascript_objects, PROGSUFFIX=env['PROGSUFFIX'] + '.js'); js_libraries = [] js_libraries.append(env.File('http_request.js')) for lib in js_libraries: env.Append(LINKFLAGS=['--js-library', lib.path]) -env.Depends(js, js_libraries) +env.Depends(build, js_libraries) +prejs = env.File('pre.js') postjs = env.File('engine.js') -env.Depends(js, [prejs, postjs]) env.Append(LINKFLAGS=['--pre-js', prejs.path]) env.Append(LINKFLAGS=['--post-js', postjs.path]) +env.Depends(build, [prejs, postjs]) +zip_dir = target_dir.Dir('.javascript_zip') +zip_files = env.InstallAs([zip_dir.File('godot.js'), zip_dir.File('godot.wasm'), zip_dir.File('godot.html')], build + ['#misc/dist/html/default.html']) Zip('#bin/godot', zip_files, ZIPSUFFIX=env['PROGSUFFIX'] + env['ZIPSUFFIX'], ZIPROOT=zip_dir, ZIPCOMSTR="Archving $SOURCES as $TARGET") diff --git a/platform/javascript/api/api.cpp b/platform/javascript/api/api.cpp new file mode 100644 index 0000000000..f2b2ca40bf --- /dev/null +++ b/platform/javascript/api/api.cpp @@ -0,0 +1,73 @@ +/*************************************************************************/ +/* api.cpp */ +/*************************************************************************/ +/* This file is part of: */ +/* GODOT ENGINE */ +/* https://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 "api.h" +#include "engine.h" +#include "javascript_eval.h" + +static JavaScript *javascript_eval; + +void register_javascript_api() { + + ClassDB::register_virtual_class<JavaScript>(); + javascript_eval = memnew(JavaScript); + Engine::get_singleton()->add_singleton(Engine::Singleton("JavaScript", javascript_eval)); +} + +void unregister_javascript_api() { + + memdelete(javascript_eval); +} + +JavaScript *JavaScript::singleton = NULL; + +JavaScript *JavaScript::get_singleton() { + + return singleton; +} + +JavaScript::JavaScript() { + + ERR_FAIL_COND(singleton != NULL); + singleton = this; +} + +JavaScript::~JavaScript() {} + +void JavaScript::_bind_methods() { + + ClassDB::bind_method(D_METHOD("eval", "code", "use_global_execution_context"), &JavaScript::eval, DEFVAL(false)); +} + +#if !defined(JAVASCRIPT_ENABLED) || !defined(JAVASCRIPT_EVAL_ENABLED) +Variant JavaScript::eval(const String &p_code, bool p_use_global_exec_context) { + + return Variant(); +} +#endif diff --git a/platform/javascript/api/api.h b/platform/javascript/api/api.h new file mode 100644 index 0000000000..53cd9239fc --- /dev/null +++ b/platform/javascript/api/api.h @@ -0,0 +1,31 @@ +/*************************************************************************/ +/* api.h */ +/*************************************************************************/ +/* This file is part of: */ +/* GODOT ENGINE */ +/* https://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_javascript_api(); +void unregister_javascript_api(); diff --git a/platform/javascript/javascript_eval.h b/platform/javascript/api/javascript_eval.h index ed7cf383da..4d0b0b21ff 100644 --- a/platform/javascript/javascript_eval.h +++ b/platform/javascript/api/javascript_eval.h @@ -27,8 +27,6 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifdef JAVASCRIPT_EVAL_ENABLED - #ifndef JAVASCRIPT_EVAL_H #define JAVASCRIPT_EVAL_H @@ -52,4 +50,3 @@ public: }; #endif // JAVASCRIPT_EVAL_H -#endif // JAVASCRIPT_EVAL_ENABLED diff --git a/platform/javascript/detect.py b/platform/javascript/detect.py index a2988d9c60..8472c3ccab 100644 --- a/platform/javascript/detect.py +++ b/platform/javascript/detect.py @@ -19,7 +19,6 @@ def can_build(): def get_opts(): from SCons.Variables import BoolVariable return [ - BoolVariable('wasm', 'Compile to WebAssembly', False), BoolVariable('javascript_eval', 'Enable JavaScript eval interface', True), ] @@ -103,20 +102,13 @@ def configure(env): ## Link flags - env.Append(LINKFLAGS=['-s', 'EXTRA_EXPORTED_RUNTIME_METHODS="[\'FS\']"']) + env.Append(LINKFLAGS=['-s', 'BINARYEN=1']) + env.Append(LINKFLAGS=['-s', 'ALLOW_MEMORY_GROWTH=1']) env.Append(LINKFLAGS=['-s', 'USE_WEBGL2=1']) + env.Append(LINKFLAGS=['-s', 'EXTRA_EXPORTED_RUNTIME_METHODS="[\'FS\']"']) - if env['wasm']: - env.Append(LINKFLAGS=['-s', 'BINARYEN=1']) - # In contrast to asm.js, enabling memory growth on WebAssembly has no - # major performance impact, and causes only a negligible increase in - # memory size. - env.Append(LINKFLAGS=['-s', 'ALLOW_MEMORY_GROWTH=1']) - env.extra_suffix = '.webassembly' + env.extra_suffix - else: - env.Append(LINKFLAGS=['-s', 'ASM_JS=1']) - env.Append(LINKFLAGS=['--separate-asm']) - env.Append(LINKFLAGS=['--memory-init-file', '1']) + env.Append(LINKFLAGS=['-s', 'INVOKE_RUN=0']) + env.Append(LINKFLAGS=['-s', 'NO_EXIT_RUNTIME=1']) # TODO: Move that to opus module's config if 'module_opus_enabled' in env and env['module_opus_enabled']: diff --git a/platform/javascript/engine.js b/platform/javascript/engine.js index 99d1c20bbd..dc4bdc7efb 100644 --- a/platform/javascript/engine.js +++ b/platform/javascript/engine.js @@ -5,7 +5,6 @@ (function() { var engine = Engine; - var USING_WASM = engine.USING_WASM; var DOWNLOAD_ATTEMPTS_MAX = 4; var basePath = null; @@ -32,87 +31,101 @@ this.rtenv = null; - var gameInitPromise = null; + var initPromise = null; var unloadAfterInit = true; - var memorySize = 268435456; + var preloadedFiles = []; + + var resizeCanvasOnStart = true; var progressFunc = null; - var pckProgressTracker = {}; + var preloadProgressTracker = {}; var lastProgress = { loaded: 0, total: 0 }; var canvas = null; + var executableName = null; + var locale = null; var stdout = null; var stderr = null; - this.initGame = function(mainPack) { - - if (!gameInitPromise) { + this.init = function(newBasePath) { - if (mainPack === undefined) { - if (basePath !== null) { - mainPack = basePath + '.pck'; - } else { - return Promise.reject(new Error("No main pack to load specified")); - } - } - if (basePath === null) - basePath = getBasePath(mainPack); - - gameInitPromise = Engine.initEngine().then( + if (!initPromise) { + initPromise = Engine.load(newBasePath).then( instantiate.bind(this) ); - var gameLoadPromise = loadPromise(mainPack, pckProgressTracker).then(function(xhr) { return xhr.response; }); - gameInitPromise = Promise.all([gameLoadPromise, gameInitPromise]).then(function(values) { - // resolve with pck - return new Uint8Array(values[0]); - }); - if (unloadAfterInit) - gameInitPromise.then(Engine.unloadEngine); requestAnimationFrame(animateProgress); + if (unloadAfterInit) + initPromise.then(Engine.unloadEngine); } - return gameInitPromise; + return initPromise; }; - function instantiate(initializer) { + function instantiate(wasmBuf) { - var rtenvOpts = { - noInitialRun: true, - thisProgram: getBaseName(basePath), + var rtenvProps = { engine: this, + ENV: {}, }; if (typeof stdout === 'function') - rtenvOpts.print = stdout; + rtenvProps.print = stdout; if (typeof stderr === 'function') - rtenvOpts.printErr = stderr; - if (typeof WebAssembly === 'object' && initializer instanceof ArrayBuffer) { - rtenvOpts.instantiateWasm = function(imports, onSuccess) { - WebAssembly.instantiate(initializer, imports).then(function(result) { - onSuccess(result.instance); - }); - return {}; - }; - } else if (initializer.asm && initializer.mem) { - rtenvOpts.asm = initializer.asm; - rtenvOpts.memoryInitializerRequest = initializer.mem; - rtenvOpts.TOTAL_MEMORY = memorySize; - } else { - throw new Error("Invalid initializer"); - } + rtenvProps.printErr = stderr; + rtenvProps.instantiateWasm = function(imports, onSuccess) { + WebAssembly.instantiate(wasmBuf, imports).then(function(result) { + onSuccess(result.instance); + }); + return {}; + }; return new Promise(function(resolve, reject) { - rtenvOpts.onRuntimeInitialized = resolve; - rtenvOpts.onAbort = reject; - rtenvOpts.engine.rtenv = Engine.RuntimeEnvironment(rtenvOpts); + rtenvProps.onRuntimeInitialized = resolve; + rtenvProps.onAbort = reject; + rtenvProps.engine.rtenv = Engine.RuntimeEnvironment(rtenvProps); }); } - this.start = function(mainPack) { + this.preloadFile = function(pathOrBuffer, bufferFilename) { + + if (pathOrBuffer instanceof ArrayBuffer) { + pathOrBuffer = new Uint8Array(pathOrBuffer); + } else if (ArrayBuffer.isView(pathOrBuffer)) { + pathOrBuffer = new Uint8Array(pathOrBuffer.buffer); + } + if (pathOrBuffer instanceof Uint8Array) { + preloadedFiles.push({ + name: bufferFilename, + buffer: pathOrBuffer + }); + return Promise.resolve(); + } else if (typeof pathOrBuffer === 'string') { + return loadPromise(pathOrBuffer, preloadProgressTracker).then(function(xhr) { + preloadedFiles.push({ + name: pathOrBuffer, + buffer: xhr.response + }); + }); + } else { + throw Promise.reject("Invalid object for preloading"); + } + }; + + this.start = function() { + + return this.init().then( + Function.prototype.apply.bind(synchronousStart, this, arguments) + ); + }; + + this.startGame = function(mainPack) { - return this.initGame(mainPack).then(synchronousStart.bind(this)); + executableName = getBaseName(mainPack); + return Promise.all([this.init(getBasePath(mainPack)), this.preloadFile(mainPack)]).then( + Function.prototype.apply.bind(synchronousStart, this, []) + ); }; - function synchronousStart(pckView) { - // TODO don't expect canvas when runninng as cli tool + function synchronousStart() { + if (canvas instanceof HTMLCanvasElement) { this.rtenv.canvas = canvas; } else { @@ -147,15 +160,33 @@ ev.preventDefault(); }, false); - this.rtenv.FS.createDataFile('/', this.rtenv.thisProgram + '.pck', pckView, true, true, true); - gameInitPromise = null; - this.rtenv.callMain(); + if (locale) { + this.rtenv.locale = locale; + } else { + this.rtenv.locale = navigator.languages ? navigator.languages[0] : navigator.language; + } + this.rtenv.locale = this.rtenv.locale.split('.')[0]; + this.rtenv.resizeCanvasOnStart = resizeCanvasOnStart; + + this.rtenv.thisProgram = executableName || getBaseName(basePath); + + preloadedFiles.forEach(function(file) { + this.rtenv.FS.createDataFile('/', file.name, new Uint8Array(file.buffer), true, true, true); + }, this); + + preloadedFiles = null; + initPromise = null; + this.rtenv.callMain(arguments); } this.setProgressFunc = function(func) { progressFunc = func; }; + this.setResizeCanvasOnStart = function(enabled) { + resizeCanvasOnStart = enabled; + }; + function animateProgress() { var loaded = 0; @@ -163,7 +194,7 @@ var totalIsValid = true; var progressIsFinal = true; - [loadingFiles, pckProgressTracker].forEach(function(tracker) { + [loadingFiles, preloadProgressTracker].forEach(function(tracker) { Object.keys(tracker).forEach(function(file) { if (!tracker[file].final) progressIsFinal = false; @@ -190,14 +221,20 @@ canvas = elem; }; - this.setAsmjsMemorySize = function(size) { - memorySize = size; + this.setExecutableName = function(newName) { + + executableName = newName; + }; + + this.setLocale = function(newLocale) { + + locale = newLocale; }; this.setUnloadAfterInit = function(enabled) { - if (enabled && !unloadAfterInit && gameInitPromise) { - gameInitPromise.then(Engine.unloadEngine); + if (enabled && !unloadAfterInit && initPromise) { + initPromise.then(Engine.unloadEngine); } unloadAfterInit = enabled; }; @@ -232,26 +269,16 @@ Engine.RuntimeEnvironment = engine.RuntimeEnvironment; - Engine.initEngine = function(newBasePath) { + Engine.load = function(newBasePath) { if (newBasePath !== undefined) basePath = getBasePath(newBasePath); if (engineLoadPromise === null) { - if (USING_WASM) { - if (typeof WebAssembly !== 'object') - return Promise.reject(new Error("Browser doesn't support WebAssembly")); - // TODO cache/retrieve module to/from idb - engineLoadPromise = loadPromise(basePath + '.wasm').then(function(xhr) { - return xhr.response; - }); - } else { - var asmjsPromise = loadPromise(basePath + '.asm.js').then(function(xhr) { - return asmjsModulePromise(xhr.response); - }); - var memPromise = loadPromise(basePath + '.mem'); - engineLoadPromise = Promise.all([asmjsPromise, memPromise]).then(function(values) { - return { asm: values[0], mem: values[1] }; - }); - } + if (typeof WebAssembly !== 'object') + return Promise.reject(new Error("Browser doesn't support WebAssembly")); + // TODO cache/retrieve module to/from idb + engineLoadPromise = loadPromise(basePath + '.wasm').then(function(xhr) { + return xhr.response; + }); engineLoadPromise = engineLoadPromise.catch(function(err) { engineLoadPromise = null; throw err; @@ -260,34 +287,7 @@ return engineLoadPromise; }; - function asmjsModulePromise(module) { - var elem = document.createElement('script'); - var script = new Blob([ - 'Engine.asm = (function() { var Module = {};', - module, - 'return Module.asm; })();' - ]); - var url = URL.createObjectURL(script); - elem.src = url; - return new Promise(function(resolve, reject) { - elem.addEventListener('load', function() { - URL.revokeObjectURL(url); - var asm = Engine.asm; - Engine.asm = undefined; - setTimeout(function() { - // delay to reclaim compilation memory - resolve(asm); - }, 1); - }); - elem.addEventListener('error', function() { - URL.revokeObjectURL(url); - reject("asm.js faiilure"); - }); - document.body.appendChild(elem); - }); - } - - Engine.unloadEngine = function() { + Engine.unload = function() { engineLoadPromise = null; }; @@ -306,7 +306,7 @@ if (!file.endsWith('.js')) { xhr.responseType = 'arraybuffer'; } - ['loadstart', 'progress', 'load', 'error', 'timeout', 'abort'].forEach(function(ev) { + ['loadstart', 'progress', 'load', 'error', 'abort'].forEach(function(ev) { xhr.addEventListener(ev, onXHREvent.bind(xhr, resolve, reject, file, tracker)); }); xhr.send(); @@ -321,7 +321,7 @@ this.abort(); return; } else { - loadXHR(resolve, reject, file); + setTimeout(loadXHR.bind(null, resolve, reject, file, tracker), 1000); } } @@ -348,12 +348,11 @@ break; case 'error': - case 'timeout': if (++tracker[file].attempts >= DOWNLOAD_ATTEMPTS_MAX) { tracker[file].final = true; reject(new Error("Failed loading file '" + file + "'")); } else { - loadXHR(resolve, reject, file); + setTimeout(loadXHR.bind(null, resolve, reject, file, tracker), 1000); } break; diff --git a/platform/javascript/export/export.cpp b/platform/javascript/export/export.cpp index 4a97bf4c32..05b0fb3fbc 100644 --- a/platform/javascript/export/export.cpp +++ b/platform/javascript/export/export.cpp @@ -30,13 +30,12 @@ #include "editor/editor_node.h" #include "editor_export.h" #include "io/zip_io.h" +#include "main/splash.gen.h" #include "platform/javascript/logo.gen.h" #include "platform/javascript/run_icon.gen.h" #define EXPORT_TEMPLATE_WEBASSEMBLY_RELEASE "webassembly_release.zip" #define EXPORT_TEMPLATE_WEBASSEMBLY_DEBUG "webassembly_debug.zip" -#define EXPORT_TEMPLATE_ASMJS_RELEASE "javascript_release.zip" -#define EXPORT_TEMPLATE_ASMJS_DEBUG "javascript_debug.zip" class EditorExportPlatformJavaScript : public EditorExportPlatform { @@ -47,18 +46,11 @@ class EditorExportPlatformJavaScript : public EditorExportPlatform { bool runnable_when_last_polled; void _fix_html(Vector<uint8_t> &p_html, const Ref<EditorExportPreset> &p_preset, const String &p_name, bool p_debug); - void _fix_fsloader_js(Vector<uint8_t> &p_js, const String &p_pack_name, uint64_t p_pack_size); public: - enum Target { - TARGET_WEBASSEMBLY, - TARGET_ASMJS - }; - virtual void get_preset_features(const Ref<EditorExportPreset> &p_preset, List<String> *r_features); virtual void get_export_options(List<ExportOption> *r_options); - virtual bool get_option_visibility(const String &p_option, const Map<StringName, Variant> &p_options) const; virtual String get_name() const; virtual String get_os_name() const; @@ -90,17 +82,9 @@ void EditorExportPlatformJavaScript::_fix_html(Vector<uint8_t> &p_html, const Re String str_export; Vector<String> lines = str_template.split("\n"); - int memory_mb; - if (p_preset->get("options/target").operator int() != TARGET_ASMJS) - // WebAssembly allows memory growth, so start with a reasonable default - memory_mb = 1 << 4; - else - memory_mb = 1 << (p_preset->get("options/memory_size").operator int() + 5); - for (int i = 0; i < lines.size(); i++) { String current_line = lines[i]; - current_line = current_line.replace("$GODOT_TOTAL_MEMORY", itos(memory_mb * 1024 * 1024)); current_line = current_line.replace("$GODOT_BASENAME", p_name); current_line = current_line.replace("$GODOT_HEAD_INCLUDE", p_preset->get("html/head_include")); current_line = current_line.replace("$GODOT_DEBUG_ENABLED", p_debug ? "true" : "false"); @@ -129,24 +113,15 @@ void EditorExportPlatformJavaScript::get_preset_features(const Ref<EditorExportP void EditorExportPlatformJavaScript::get_export_options(List<ExportOption> *r_options) { - r_options->push_back(ExportOption(PropertyInfo(Variant::INT, "options/target", PROPERTY_HINT_ENUM, "WebAssembly,asm.js"), TARGET_WEBASSEMBLY)); - r_options->push_back(ExportOption(PropertyInfo(Variant::INT, "options/memory_size", PROPERTY_HINT_ENUM, "32 MB,64 MB,128 MB,256 MB,512 MB,1 GB"), 3)); r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "texture_format/s3tc"), false)); r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "texture_format/etc"), true)); r_options->push_back(ExportOption(PropertyInfo(Variant::BOOL, "texture_format/etc2"), false)); + r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "html/custom_html_shell", PROPERTY_HINT_GLOBAL_FILE, "html"), "")); r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "html/head_include", PROPERTY_HINT_MULTILINE_TEXT), "")); r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "custom_template/release", PROPERTY_HINT_GLOBAL_FILE, "zip"), "")); r_options->push_back(ExportOption(PropertyInfo(Variant::STRING, "custom_template/debug", PROPERTY_HINT_GLOBAL_FILE, "zip"), "")); } -bool EditorExportPlatformJavaScript::get_option_visibility(const String &p_option, const Map<StringName, Variant> &p_options) const { - - if (p_option == "options/memory_size") { - return p_options["options/target"].operator int() == TARGET_ASMJS; - } - return true; -} - String EditorExportPlatformJavaScript::get_name() const { return "HTML5"; @@ -166,17 +141,10 @@ bool EditorExportPlatformJavaScript::can_export(const Ref<EditorExportPreset> &p r_missing_templates = false; - if (p_preset->get("options/target").operator int() == TARGET_WEBASSEMBLY) { - if (find_export_template(EXPORT_TEMPLATE_WEBASSEMBLY_RELEASE) == String()) - r_missing_templates = true; - else if (find_export_template(EXPORT_TEMPLATE_WEBASSEMBLY_DEBUG) == String()) - r_missing_templates = true; - } else { - if (find_export_template(EXPORT_TEMPLATE_ASMJS_RELEASE) == String()) - r_missing_templates = true; - else if (find_export_template(EXPORT_TEMPLATE_ASMJS_DEBUG) == String()) - r_missing_templates = true; - } + if (find_export_template(EXPORT_TEMPLATE_WEBASSEMBLY_RELEASE) == String()) + r_missing_templates = true; + else if (find_export_template(EXPORT_TEMPLATE_WEBASSEMBLY_DEBUG) == String()) + r_missing_templates = true; return !r_missing_templates; } @@ -187,9 +155,11 @@ String EditorExportPlatformJavaScript::get_binary_extension() const { } Error EditorExportPlatformJavaScript::export_project(const Ref<EditorExportPreset> &p_preset, bool p_debug, const String &p_path, int p_flags) { + ExportNotifier notifier(*this, p_preset, p_debug, p_path, p_flags); String custom_debug = p_preset->get("custom_template/debug"); String custom_release = p_preset->get("custom_template/release"); + String custom_html = p_preset->get("html/custom_html_shell"); String template_path = p_debug ? custom_debug : custom_release; @@ -197,17 +167,10 @@ Error EditorExportPlatformJavaScript::export_project(const Ref<EditorExportPrese if (template_path == String()) { - if (p_preset->get("options/target").operator int() == TARGET_WEBASSEMBLY) { - if (p_debug) - template_path = find_export_template(EXPORT_TEMPLATE_WEBASSEMBLY_DEBUG); - else - template_path = find_export_template(EXPORT_TEMPLATE_WEBASSEMBLY_RELEASE); - } else { - if (p_debug) - template_path = find_export_template(EXPORT_TEMPLATE_ASMJS_DEBUG); - else - template_path = find_export_template(EXPORT_TEMPLATE_ASMJS_RELEASE); - } + if (p_debug) + template_path = find_export_template(EXPORT_TEMPLATE_WEBASSEMBLY_DEBUG); + else + template_path = find_export_template(EXPORT_TEMPLATE_WEBASSEMBLY_RELEASE); } if (template_path != String() && !FileAccess::exists(template_path)) { @@ -222,14 +185,6 @@ Error EditorExportPlatformJavaScript::export_project(const Ref<EditorExportPrese return error; } - FileAccess *f = FileAccess::open(pck_path, FileAccess::READ); - if (!f) { - EditorNode::get_singleton()->show_warning(TTR("Could not read file:\n") + pck_path); - return ERR_FILE_CANT_READ; - } - size_t pack_size = f->get_len(); - memdelete(f); - FileAccess *src_f = NULL; zlib_filefunc_def io = zipio_create_io_from_file(&src_f); unzFile pkg = unzOpen2(template_path.utf8().get_data(), &io); @@ -240,13 +195,17 @@ Error EditorExportPlatformJavaScript::export_project(const Ref<EditorExportPrese return ERR_FILE_NOT_FOUND; } - int ret = unzGoToFirstFile(pkg); - while (ret == UNZ_OK) { + if (unzGoToFirstFile(pkg) != UNZ_OK) { + EditorNode::get_singleton()->show_warning(TTR("Invalid export template:\n") + template_path); + unzClose(pkg); + return ERR_FILE_CORRUPT; + } + do { //get filename unz_file_info info; char fname[16384]; - ret = unzGetCurrentFileInfo(pkg, &info, fname, 16384, NULL, 0, NULL, 0); + unzGetCurrentFileInfo(pkg, &info, fname, 16384, NULL, 0, NULL, 0); String file = fname; @@ -262,20 +221,18 @@ Error EditorExportPlatformJavaScript::export_project(const Ref<EditorExportPrese if (file == "godot.html") { + if (!custom_html.empty()) { + continue; + } _fix_html(data, p_preset, p_path.get_file().get_basename(), p_debug); file = p_path.get_file(); + } else if (file == "godot.js") { file = p_path.get_file().get_basename() + ".js"; } else if (file == "godot.wasm") { file = p_path.get_file().get_basename() + ".wasm"; - } else if (file == "godot.asm.js") { - - file = p_path.get_file().get_basename() + ".asm.js"; - } else if (file == "godot.mem") { - - file = p_path.get_file().get_basename() + ".mem"; } String dst = p_path.get_base_dir().plus_file(file); @@ -288,9 +245,50 @@ Error EditorExportPlatformJavaScript::export_project(const Ref<EditorExportPrese f->store_buffer(data.ptr(), data.size()); memdelete(f); - ret = unzGoToNextFile(pkg); + } while (unzGoToNextFile(pkg) == UNZ_OK); + unzClose(pkg); + + if (!custom_html.empty()) { + + FileAccess *f = FileAccess::open(custom_html, FileAccess::READ); + if (!f) { + EditorNode::get_singleton()->show_warning(TTR("Could not read custom HTML shell:\n") + custom_html); + return ERR_FILE_CANT_READ; + } + Vector<uint8_t> buf; + buf.resize(f->get_len()); + f->get_buffer(buf.ptr(), buf.size()); + memdelete(f); + _fix_html(buf, p_preset, p_path.get_file().get_basename(), p_debug); + + f = FileAccess::open(p_path, FileAccess::WRITE); + if (!f) { + EditorNode::get_singleton()->show_warning(TTR("Could not write file:\n") + p_path); + return ERR_FILE_CANT_WRITE; + } + f->store_buffer(buf.ptr(), buf.size()); + memdelete(f); } + Ref<Image> splash; + String splash_path = GLOBAL_GET("application/boot_splash/image"); + splash_path = splash_path.strip_edges(); + if (!splash_path.empty()) { + splash.instance(); + Error err = splash->load(splash_path); + if (err) { + EditorNode::get_singleton()->show_warning(TTR("Could not read boot splash image file:\n") + splash_path + "\nUsing default boot splash image"); + splash.unref(); + } + } + if (splash.is_null()) { + splash = Ref<Image>(memnew(Image(boot_splash_png))); + } + String png_path = p_path.get_base_dir().plus_file(p_path.get_file().get_basename() + ".png"); + if (splash->save_png(png_path) != OK) { + EditorNode::get_singleton()->show_warning(TTR("Could not write file:\n") + png_path); + return ERR_FILE_CANT_WRITE; + } return OK; } @@ -319,7 +317,7 @@ int EditorExportPlatformJavaScript::get_device_count() const { Error EditorExportPlatformJavaScript::run(const Ref<EditorExportPreset> &p_preset, int p_device, int p_debug_flags) { - String path = EditorSettings::get_singleton()->get_settings_path() + "/tmp/tmp_export.html"; + String path = EditorSettings::get_singleton()->get_cache_dir().plus_file("tmp_export.html"); Error err = export_project(p_preset, true, path, p_debug_flags); if (err) { return err; diff --git a/platform/javascript/javascript_eval.cpp b/platform/javascript/javascript_eval.cpp index 1d737879f6..a755dcb5c4 100644 --- a/platform/javascript/javascript_eval.cpp +++ b/platform/javascript/javascript_eval.cpp @@ -29,16 +29,9 @@ /*************************************************************************/ #ifdef JAVASCRIPT_EVAL_ENABLED -#include "javascript_eval.h" +#include "api/javascript_eval.h" #include "emscripten.h" -JavaScript *JavaScript::singleton = NULL; - -JavaScript *JavaScript::get_singleton() { - - return singleton; -} - extern "C" EMSCRIPTEN_KEEPALIVE uint8_t *resize_poolbytearray_and_open_write(PoolByteArray *p_arr, PoolByteArray::Write *r_write, int p_len) { p_arr->resize(p_len); @@ -182,18 +175,4 @@ Variant JavaScript::eval(const String &p_code, bool p_use_global_exec_context) { return Variant(); } -void JavaScript::_bind_methods() { - - ClassDB::bind_method(D_METHOD("eval", "code", "use_global_execution_context"), &JavaScript::eval, false); -} - -JavaScript::JavaScript() { - - ERR_FAIL_COND(singleton != NULL); - singleton = this; -} - -JavaScript::~JavaScript() { -} - #endif // JAVASCRIPT_EVAL_ENABLED diff --git a/platform/javascript/javascript_main.cpp b/platform/javascript/javascript_main.cpp index ed4f416cfd..5c5d608524 100644 --- a/platform/javascript/javascript_main.cpp +++ b/platform/javascript/javascript_main.cpp @@ -61,7 +61,6 @@ int main(int argc, char *argv[]) { // run the 'main_after_fs_sync' function /* clang-format off */ EM_ASM( - Module.noExitRuntime = true; FS.mkdir('/userfs'); FS.mount(IDBFS, {}, '/userfs'); FS.syncfs(true, function(err) { diff --git a/platform/javascript/os_javascript.cpp b/platform/javascript/os_javascript.cpp index 77d81aec5d..d5c675d9e0 100644 --- a/platform/javascript/os_javascript.cpp +++ b/platform/javascript/os_javascript.cpp @@ -80,10 +80,6 @@ void OS_JavaScript::initialize_core() { FileAccess::make_default<FileAccessBufferedFA<FileAccessUnix> >(FileAccess::ACCESS_RESOURCES); } -void OS_JavaScript::initialize_logger() { - _set_logger(memnew(StdLogger)); -} - void OS_JavaScript::set_opengl_extensions(const char *p_gl_extensions) { ERR_FAIL_COND(!p_gl_extensions); @@ -438,25 +434,23 @@ void OS_JavaScript::initialize(const VideoMode &p_desired, int p_video_driver, i video_mode = p_desired; // can't fulfil fullscreen request due to browser security video_mode.fullscreen = false; - set_window_size(Size2(p_desired.width, p_desired.height)); + /* clang-format off */ + bool resize_canvas_on_start = EM_ASM_INT_V( + return Module.resizeCanvasOnStart; + ); + /* clang-format on */ + if (resize_canvas_on_start) { + set_window_size(Size2(video_mode.width, video_mode.height)); + } else { + Size2 canvas_size = get_window_size(); + video_mode.width = canvas_size.width; + video_mode.height = canvas_size.height; + } - // find locale, emscripten only sets "C" char locale_ptr[16]; /* clang-format off */ - EM_ASM_({ - var locale = ""; - if (Module.locale) { - // best case: server-side script reads Accept-Language early and - // defines the locale to be read here - locale = Module.locale; - } else { - // no luck, use what the JS engine can tell us - // if this turns out not compatible enough, add tests for - // browserLanguage, systemLanguage and userLanguage - locale = navigator.languages ? navigator.languages[0] : navigator.language; - } - locale = locale.split('.')[0]; - stringToUTF8(locale, $0, 16); + EM_ASM_ARGS({ + stringToUTF8(Module.locale, $0, 16); }, locale_ptr); /* clang-format on */ setenv("LANG", locale_ptr, true); @@ -512,11 +506,6 @@ void OS_JavaScript::initialize(const VideoMode &p_desired, int p_video_driver, i #undef SET_EM_CALLBACK #undef EM_CHECK -#ifdef JAVASCRIPT_EVAL_ENABLED - javascript_eval = memnew(JavaScript); - Engine::get_singleton()->add_singleton(Engine::Singleton("JavaScript", javascript_eval)); -#endif - visual_server->init(); } @@ -889,11 +878,11 @@ String OS_JavaScript::get_resource_dir() const { return "/"; //javascript has it's own filesystem for resources inside the APK } -String OS_JavaScript::get_data_dir() const { +String OS_JavaScript::get_user_data_dir() const { /* - if (get_data_dir_func) - return get_data_dir_func(); + if (get_user_data_dir_func) + return get_user_data_dir_func(); */ return "/userfs"; }; @@ -993,7 +982,7 @@ bool OS_JavaScript::is_userfs_persistent() const { return idbfs_available; } -OS_JavaScript::OS_JavaScript(const char *p_execpath, GetDataDirFunc p_get_data_dir_func) { +OS_JavaScript::OS_JavaScript(const char *p_execpath, GetUserDataDirFunc p_get_user_data_dir_func) { set_cmdline(p_execpath, get_cmdline_args()); main_loop = NULL; gl_extensions = NULL; @@ -1001,7 +990,7 @@ OS_JavaScript::OS_JavaScript(const char *p_execpath, GetDataDirFunc p_get_data_d soft_fs_enabled = false; canvas_size_adjustment_requested = false; - get_data_dir_func = p_get_data_dir_func; + get_user_data_dir_func = p_get_user_data_dir_func; FileAccessUnix::close_notification_func = _close_notification_funcs; idbfs_available = false; diff --git a/platform/javascript/os_javascript.h b/platform/javascript/os_javascript.h index f478f95dd2..a95b069d03 100644 --- a/platform/javascript/os_javascript.h +++ b/platform/javascript/os_javascript.h @@ -32,7 +32,6 @@ #include "audio_driver_javascript.h" #include "drivers/unix/os_unix.h" -#include "javascript_eval.h" #include "main/input_default.h" #include "os/input.h" #include "os/main_loop.h" @@ -42,7 +41,7 @@ #include <emscripten/html5.h> -typedef String (*GetDataDirFunc)(); +typedef String (*GetUserDataDirFunc)(); class OS_JavaScript : public OS_Unix { @@ -63,14 +62,10 @@ class OS_JavaScript : public OS_Unix { CursorShape cursor_shape; MainLoop *main_loop; - GetDataDirFunc get_data_dir_func; + GetUserDataDirFunc get_user_data_dir_func; PowerJavascript *power_manager; -#ifdef JAVASCRIPT_EVAL_ENABLED - JavaScript *javascript_eval; -#endif - static void _close_notification_funcs(const String &p_file, int p_flags); void process_joypads(); @@ -86,7 +81,6 @@ public: virtual int get_audio_driver_count() const; virtual const char *get_audio_driver_name(int p_driver) const; - virtual void initialize_logger(); virtual void initialize_core(); virtual void initialize(const VideoMode &p_desired, int p_video_driver, int p_audio_driver); @@ -146,7 +140,7 @@ public: void set_opengl_extensions(const char *p_gl_extensions); virtual Error shell_open(String p_uri); - virtual String get_data_dir() const; + virtual String get_user_data_dir() const; String get_executable_path() const; virtual String get_resource_dir() const; @@ -165,7 +159,7 @@ public: void set_idbfs_available(bool p_idbfs_available); - OS_JavaScript(const char *p_execpath, GetDataDirFunc p_get_data_dir_func); + OS_JavaScript(const char *p_execpath, GetUserDataDirFunc p_get_user_data_dir_func); ~OS_JavaScript(); }; diff --git a/platform/javascript/pre_wasm.js b/platform/javascript/pre.js index be4383c8c9..311aa44fda 100644 --- a/platform/javascript/pre_wasm.js +++ b/platform/javascript/pre.js @@ -1,3 +1,2 @@ var Engine = { - USING_WASM: true, RuntimeEnvironment: function(Module) { diff --git a/platform/javascript/pre_asmjs.js b/platform/javascript/pre_asmjs.js deleted file mode 100644 index 3c497721b6..0000000000 --- a/platform/javascript/pre_asmjs.js +++ /dev/null @@ -1,3 +0,0 @@ -var Engine = { - USING_WASM: false, - RuntimeEnvironment: function(Module) { diff --git a/platform/osx/detect.py b/platform/osx/detect.py index c24bd98bf6..ff7cf2ad2f 100644 --- a/platform/osx/detect.py +++ b/platform/osx/detect.py @@ -110,7 +110,7 @@ def configure(env): ## Flags env.Append(CPPPATH=['#platform/osx']) - env.Append(CPPFLAGS=['-DOSX_ENABLED', '-DUNIX_ENABLED', '-DGLES2_ENABLED', '-DAPPLE_STYLE_KEYS', '-DCOREAUDIO_ENABLED']) + env.Append(CPPFLAGS=['-DOSX_ENABLED', '-DUNIX_ENABLED', '-DGLES_ENABLED', '-DAPPLE_STYLE_KEYS', '-DCOREAUDIO_ENABLED']) env.Append(LINKFLAGS=['-framework', 'Cocoa', '-framework', 'Carbon', '-framework', 'OpenGL', '-framework', 'AGL', '-framework', 'AudioUnit', '-framework', 'CoreAudio', '-lz', '-framework', 'IOKit', '-framework', 'ForceFeedback']) env.Append(LIBS=['pthread']) diff --git a/platform/osx/export/export.cpp b/platform/osx/export/export.cpp index 8a6f1dc04c..689b79b826 100644 --- a/platform/osx/export/export.cpp +++ b/platform/osx/export/export.cpp @@ -160,7 +160,7 @@ void EditorExportPlatformOSX::_make_icon(const Ref<Image> &p_icon, Vector<uint8_ copy->convert(Image::FORMAT_RGBA8); copy->resize(size, size); it->create_from_image(copy); - String path = EditorSettings::get_singleton()->get_settings_path() + "/tmp/icon.png"; + String path = EditorSettings::get_singleton()->get_cache_dir().plus_file("icon.png"); ResourceSaver::save(path, it); FileAccess *f = FileAccess::open(path, FileAccess::READ); @@ -288,6 +288,7 @@ Error EditorExportPlatformOSX::_create_dmg(const String &p_dmg_path, const Strin } Error EditorExportPlatformOSX::export_project(const Ref<EditorExportPreset> &p_preset, bool p_debug, const String &p_path, int p_flags) { + ExportNotifier notifier(*this, p_preset, p_debug, p_path, p_flags); String src_pkg_name; @@ -344,7 +345,7 @@ Error EditorExportPlatformOSX::export_project(const Ref<EditorExportPreset> &p_p if (use_dmg()) { // We're on OSX so we can export to DMG, but first we create our application bundle - tmp_app_path_name = EditorSettings::get_singleton()->get_settings_path() + "/tmp/" + pkg_name + ".app"; + tmp_app_path_name = EditorSettings::get_singleton()->get_cache_dir().plus_file(pkg_name + ".app"); print_line("Exporting to " + tmp_app_path_name); DirAccess *tmp_app_path = DirAccess::create_for_path(tmp_app_path_name); if (!tmp_app_path) { @@ -539,7 +540,7 @@ Error EditorExportPlatformOSX::export_project(const Ref<EditorExportPreset> &p_p OS::get_singleton()->move_to_trash(tmp_app_path_name); } else { - String pack_path = EditorSettings::get_singleton()->get_settings_path() + "/tmp/" + pkg_name + ".pck"; + String pack_path = EditorSettings::get_singleton()->get_cache_dir().plus_file(pkg_name + ".pck"); Error err = save_pack(p_preset, pack_path); if (err == OK) { diff --git a/platform/osx/os_osx.h b/platform/osx/os_osx.h index 1df847eb79..9a740a7bea 100644 --- a/platform/osx/os_osx.h +++ b/platform/osx/os_osx.h @@ -121,7 +121,6 @@ protected: virtual int get_video_driver_count() const; virtual const char *get_video_driver_name(int p_driver) const; - virtual void initialize_logger(); virtual void initialize_core(); virtual void initialize(const VideoMode &p_desired, int p_video_driver, int p_audio_driver); virtual void finalize(); @@ -154,6 +153,11 @@ public: virtual MainLoop *get_main_loop() const; + virtual String get_config_path() const; + virtual String get_data_path() const; + virtual String get_cache_path() const; + virtual String get_godot_dir_name() const; + virtual String get_system_dir(SystemDir p_dir) const; virtual bool can_draw() const; diff --git a/platform/osx/os_osx.mm b/platform/osx/os_osx.mm index 2e0e2620be..781e8de1ab 100644 --- a/platform/osx/os_osx.mm +++ b/platform/osx/os_osx.mm @@ -36,6 +36,7 @@ #include "print_string.h" #include "sem_osx.h" #include "servers/visual/visual_server_raster.h" +#include "version_generated.gen.h" #include <Carbon/Carbon.h> #import <Cocoa/Cocoa.h> @@ -84,6 +85,15 @@ static int prev_mouse_y = 0; static int button_mask = 0; static bool mouse_down_control = false; +static Vector2 get_mouse_pos(NSEvent *event) { + + const NSRect contentRect = [OS_OSX::singleton->window_view frame]; + const NSPoint p = [event locationInWindow]; + mouse_x = p.x * OS_OSX::singleton->_mouse_scale([[event window] backingScaleFactor]); + mouse_y = (contentRect.size.height - p.y) * OS_OSX::singleton->_mouse_scale([[event window] backingScaleFactor]); + return Vector2(mouse_x, mouse_y); +} + @interface GodotApplication : NSApplication @end @@ -507,12 +517,9 @@ static void _mouseDownEvent(NSEvent *event, int index, int mask, bool pressed) { mm->set_button_mask(button_mask); prev_mouse_x = mouse_x; prev_mouse_y = mouse_y; - const NSRect contentRect = [OS_OSX::singleton->window_view frame]; - const NSPoint p = [event locationInWindow]; - mouse_x = p.x * OS_OSX::singleton->_mouse_scale([[event window] backingScaleFactor]); - mouse_y = (contentRect.size.height - p.y) * OS_OSX::singleton->_mouse_scale([[event window] backingScaleFactor]); - mm->set_position(Vector2(mouse_x, mouse_y)); - mm->set_global_position(Vector2(mouse_x, mouse_y)); + const Vector2 pos = get_mouse_pos(event); + mm->set_position(pos); + mm->set_global_position(pos); Vector2 relativeMotion = Vector2(); relativeMotion.x = [event deltaX] * OS_OSX::singleton->_mouse_scale([[event window] backingScaleFactor]); relativeMotion.y = [event deltaY] * OS_OSX::singleton->_mouse_scale([[event window] backingScaleFactor]); @@ -574,6 +581,15 @@ static void _mouseDownEvent(NSEvent *event, int index, int mask, bool pressed) { OS_OSX::singleton->input->set_mouse_in_window(true); } +- (void)magnifyWithEvent:(NSEvent *)event { + Ref<InputEventMagnifyGesture> ev; + ev.instance(); + get_key_modifier_state([event modifierFlags], ev); + ev->set_position(get_mouse_pos(event)); + ev->set_factor([event magnification] + 1.0); + OS_OSX::singleton->push_input(ev); +} + - (void)viewDidChangeBackingProperties { // nothing left to do here } @@ -837,6 +853,18 @@ inline void sendScrollEvent(int button, double factor, int modifierFlags) { OS_OSX::singleton->push_input(sc); } +inline void sendPanEvent(double dx, double dy, int modifierFlags) { + + Ref<InputEventPanGesture> pg; + pg.instance(); + + get_key_modifier_state(modifierFlags, pg); + Vector2 mouse_pos = Vector2(mouse_x, mouse_y); + pg->set_position(mouse_pos); + pg->set_delta(Vector2(-dx, -dy)); + OS_OSX::singleton->push_input(pg); +} + - (void)scrollWheel:(NSEvent *)event { double deltaX, deltaY; @@ -855,11 +883,16 @@ inline void sendScrollEvent(int button, double factor, int modifierFlags) { deltaX = [event deltaX]; deltaY = [event deltaY]; } - if (fabs(deltaX)) { - sendScrollEvent(0 > deltaX ? BUTTON_WHEEL_RIGHT : BUTTON_WHEEL_LEFT, fabs(deltaX * 0.3), [event modifierFlags]); - } - if (fabs(deltaY)) { - sendScrollEvent(0 < deltaY ? BUTTON_WHEEL_UP : BUTTON_WHEEL_DOWN, fabs(deltaY * 0.3), [event modifierFlags]); + + if ([event phase] != NSEventPhaseNone || [event momentumPhase] != NSEventPhaseNone) { + sendPanEvent(deltaX, deltaY, [event modifierFlags]); + } else { + if (fabs(deltaX)) { + sendScrollEvent(0 > deltaX ? BUTTON_WHEEL_RIGHT : BUTTON_WHEEL_LEFT, fabs(deltaX * 0.3), [event modifierFlags]); + } + if (fabs(deltaY)) { + sendScrollEvent(0 < deltaY ? BUTTON_WHEEL_UP : BUTTON_WHEEL_DOWN, fabs(deltaY * 0.3), [event modifierFlags]); + } } } @@ -896,7 +929,7 @@ int OS_OSX::get_video_driver_count() const { const char *OS_OSX::get_video_driver_name(int p_driver) const { - return "GLES2"; + return "GLES3"; } void OS_OSX::initialize_core() { @@ -1066,8 +1099,6 @@ void OS_OSX::initialize(const VideoMode &p_desired, int p_video_driver, int p_au zoomed = true; /*** END OSX INITIALIZATION ***/ - /*** END OSX INITIALIZATION ***/ - /*** END OSX INITIALIZATION ***/ bool use_gl2 = p_video_driver != 1; @@ -1077,16 +1108,12 @@ void OS_OSX::initialize(const VideoMode &p_desired, int p_video_driver, int p_au RasterizerGLES3::register_config(); RasterizerGLES3::make_current(); - //rasterizer = instance_RasterizerGLES2(); - //visual_server = memnew( VisualServerRaster(rasterizer) ); - visual_server = memnew(VisualServerRaster); if (get_render_thread_mode() != RENDER_THREAD_UNSAFE) { visual_server = memnew(VisualServerWrapMT(visual_server, get_render_thread_mode() == RENDER_SEPARATE_THREAD)); } visual_server->init(); - // visual_server->cursor_set_visible(false, 0); AudioDriverManager::initialize(p_audio_driver); @@ -1095,7 +1122,7 @@ void OS_OSX::initialize(const VideoMode &p_desired, int p_video_driver, int p_au power_manager = memnew(power_osx); - _ensure_data_dir(); + _ensure_user_data_dir(); restore_rect = Rect2(get_window_position(), get_window_size()); } @@ -1190,15 +1217,6 @@ public: typedef UnixTerminalLogger OSXTerminalLogger; #endif -void OS_OSX::initialize_logger() { - Vector<Logger *> loggers; - loggers.push_back(memnew(OSXTerminalLogger)); - // FIXME: Reenable once we figure out how to get this properly in user:// - // instead of littering the user's working dirs (res:// + pwd) with log files (GH-12277) - //loggers.push_back(memnew(RotatedFileLogger("user://logs/log.txt"))); - _set_logger(memnew(CompositeLogger(loggers))); -} - void OS_OSX::alert(const String &p_alert, const String &p_title) { // Set OS X-compliant variables NSAlert *window = [[NSAlert alloc] init]; @@ -1340,6 +1358,43 @@ MainLoop *OS_OSX::get_main_loop() const { return main_loop; } +String OS_OSX::get_config_path() const { + + if (has_environment("XDG_CONFIG_HOME")) { + return get_environment("XDG_CONFIG_HOME"); + } else if (has_environment("HOME")) { + return get_environment("HOME").plus_file("Library/Application Support"); + } else { + return "."; + } +} + +String OS_OSX::get_data_path() const { + + if (has_environment("XDG_DATA_HOME")) { + return get_environment("XDG_DATA_HOME"); + } else { + return get_config_path(); + } +} + +String OS_OSX::get_cache_path() const { + + if (has_environment("XDG_CACHE_HOME")) { + return get_environment("XDG_CACHE_HOME"); + } else if (has_environment("HOME")) { + return get_environment("HOME").plus_file("Library/Caches"); + } else { + return get_config_path(); + } +} + +// Get properly capitalized engine name for system paths +String OS_OSX::get_godot_dir_name() const { + + return String(VERSION_SHORT_NAME).capitalize(); +} + String OS_OSX::get_system_dir(SystemDir p_dir) const { NSSearchPathDirectory id = 0; @@ -2110,7 +2165,9 @@ OS_OSX::OS_OSX() { window_size = Vector2(1024, 600); zoomed = false; - _set_logger(memnew(OSXTerminalLogger)); + Vector<Logger *> loggers; + loggers.push_back(memnew(OSXTerminalLogger)); + _set_logger(memnew(CompositeLogger(loggers))); } bool OS_OSX::_check_internal_feature_support(const String &p_feature) { diff --git a/misc/dist/ios_xcode/godot_ios/main.m b/platform/register_platform_apis.h index bb63364d8f..37f98f6cd3 100644 --- a/misc/dist/ios_xcode/godot_ios/main.m +++ b/platform/register_platform_apis.h @@ -1,5 +1,5 @@ /*************************************************************************/ -/* main.m */ +/* register_platform_apis.h */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ @@ -27,13 +27,10 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ +#ifndef REGISTER_APIS_H +#define REGISTER_APIS_H -#import <UIKit/UIKit.h> +void register_platform_apis(); +void unregister_platform_apis(); -#import "AppDelegate.h" - -int main(int argc, char *argv[]) { - @autoreleasepool { - return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class])); - } -} +#endif diff --git a/platform/server/os_server.cpp b/platform/server/os_server.cpp index ca73f610e4..5b852af738 100644 --- a/platform/server/os_server.cpp +++ b/platform/server/os_server.cpp @@ -73,7 +73,7 @@ void OS_Server::initialize(const VideoMode &p_desired, int p_video_driver, int p input = memnew(InputDefault); - _ensure_data_dir(); + _ensure_user_data_dir(); } void OS_Server::finalize() { diff --git a/platform/uwp/app.h b/platform/uwp/app.h index e079fa9c9d..b812512a98 100644 --- a/platform/uwp/app.h +++ b/platform/uwp/app.h @@ -33,6 +33,7 @@ #include <wrl.h> +// ANGLE doesn't provide a specific lib for GLES3, so we keep using GLES2 #include "GLES2/gl2.h" #include "os_uwp.h" diff --git a/platform/uwp/detect.py b/platform/uwp/detect.py index 434c597449..7cc8afff06 100644 --- a/platform/uwp/detect.py +++ b/platform/uwp/detect.py @@ -136,7 +136,7 @@ def configure(env): env.Append(CPPPATH=['#platform/uwp', '#drivers/windows']) env.Append(CCFLAGS=['/DUWP_ENABLED', '/DWINDOWS_ENABLED', '/DTYPED_METHOD_BIND']) - env.Append(CCFLAGS=['/DGLES2_ENABLED', '/DGL_GLEXT_PROTOTYPES', '/DEGL_EGLEXT_PROTOTYPES', '/DANGLE_ENABLED']) + env.Append(CCFLAGS=['/DGLES_ENABLED', '/DGL_GLEXT_PROTOTYPES', '/DEGL_EGLEXT_PROTOTYPES', '/DANGLE_ENABLED']) winver = "0x0602" # Windows 8 is the minimum target for UWP build env.Append(CCFLAGS=['/DWINVER=%s' % winver, '/D_WIN32_WINNT=%s' % winver]) diff --git a/platform/uwp/export/export.cpp b/platform/uwp/export/export.cpp index d66bcaa91c..120df9bc3f 100644 --- a/platform/uwp/export/export.cpp +++ b/platform/uwp/export/export.cpp @@ -456,8 +456,8 @@ void AppxPackager::init(FileAccess *p_fa) { package = p_fa; central_dir_offset = 0; end_of_central_dir_offset = 0; - tmp_blockmap_file_path = EditorSettings::get_singleton()->get_settings_path() + "/tmp/tmpblockmap.xml"; - tmp_content_types_file_path = EditorSettings::get_singleton()->get_settings_path() + "/tmp/tmpcontenttypes.xml"; + tmp_blockmap_file_path = EditorSettings::get_singleton()->get_cache_dir().plus_file("tmpblockmap.xml"); + tmp_content_types_file_path = EditorSettings::get_singleton()->get_cache_dir().plus_file("tmpcontenttypes.xml"); } void AppxPackager::add_file(String p_file_name, const uint8_t *p_buffer, size_t p_len, int p_file_no, int p_total_files, bool p_compress) { @@ -886,7 +886,7 @@ class EditorExportUWP : public EditorExportPlatform { if (!image) return data; - String tmp_path = EditorSettings::get_singleton()->get_settings_path().plus_file("tmp/uwp_tmp_logo.png"); + String tmp_path = EditorSettings::get_singleton()->get_cache_dir().plus_file("uwp_tmp_logo.png"); Error err = image->get_data()->save_png(tmp_path); diff --git a/platform/uwp/os_uwp.cpp b/platform/uwp/os_uwp.cpp index acb0ba4bca..1655caf04b 100644 --- a/platform/uwp/os_uwp.cpp +++ b/platform/uwp/os_uwp.cpp @@ -28,6 +28,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ #include "os_uwp.h" + #include "drivers/gles3/rasterizer_gles3.h" #include "drivers/unix/ip_unix.h" #include "drivers/windows/dir_access_windows.h" @@ -69,7 +70,7 @@ int OSUWP::get_video_driver_count() const { } const char *OSUWP::get_video_driver_name(int p_driver) const { - return "GLES2"; + return "GLES3"; } Size2 OSUWP::get_window_size() const { @@ -178,15 +179,6 @@ void OSUWP::initialize_core() { cursor_shape = CURSOR_ARROW; } -void OSUWP::initialize_logger() { - Vector<Logger *> loggers; - loggers.push_back(memnew(WindowsTerminalLogger)); - // FIXME: Reenable once we figure out how to get this properly in user:// - // instead of littering the user's working dirs (res:// + pwd) with log files (GH-12277) - //loggers.push_back(memnew(RotatedFileLogger("user://logs/log.txt"))); - _set_logger(memnew(CompositeLogger(loggers))); -} - bool OSUWP::can_draw() const { return !minimized; @@ -298,7 +290,7 @@ void OSUWP::initialize(const VideoMode &p_desired, int p_video_driver, int p_aud ref new TypedEventHandler<Gyrometer ^, GyrometerReadingChangedEventArgs ^>(managed_object, &ManagedType::on_gyroscope_reading_changed); } - _ensure_data_dir(); + _ensure_user_data_dir(); if (is_keep_screen_on()) display_request->RequestActive(); @@ -781,7 +773,7 @@ MainLoop *OSUWP::get_main_loop() const { return main_loop; } -String OSUWP::get_data_dir() const { +String OSUWP::get_user_data_dir() const { Windows::Storage::StorageFolder ^ data_folder = Windows::Storage::ApplicationData::Current->LocalFolder; @@ -833,7 +825,9 @@ OSUWP::OSUWP() { AudioDriverManager::add_driver(&audio_driver); - _set_logger(memnew(WindowsTerminalLogger)); + Vector<Logger *> loggers; + loggers.push_back(memnew(WindowsTerminalLogger)); + _set_logger(memnew(CompositeLogger(loggers))); } OSUWP::~OSUWP() { diff --git a/platform/uwp/os_uwp.h b/platform/uwp/os_uwp.h index 2931e9b07d..8d69cd53fd 100644 --- a/platform/uwp/os_uwp.h +++ b/platform/uwp/os_uwp.h @@ -157,7 +157,6 @@ protected: virtual int get_audio_driver_count() const; virtual const char *get_audio_driver_name(int p_driver) const; - virtual void initialize_logger(); virtual void initialize_core(); virtual void initialize(const VideoMode &p_desired, int p_video_driver, int p_audio_driver); @@ -226,7 +225,7 @@ public: virtual String get_locale() const; virtual void move_window_to_foreground(); - virtual String get_data_dir() const; + virtual String get_user_data_dir() const; virtual bool _check_internal_feature_support(const String &p_feature); diff --git a/platform/windows/context_gl_win.cpp b/platform/windows/context_gl_win.cpp index 8571f0dc65..81aa18dd23 100644 --- a/platform/windows/context_gl_win.cpp +++ b/platform/windows/context_gl_win.cpp @@ -27,25 +27,12 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#if defined(OPENGL_ENABLED) || defined(GLES2_ENABLED) - -// -// C++ Implementation: context_gl_x11 -// -// Description: -// -// +#if defined(OPENGL_ENABLED) || defined(GLES_ENABLED) + // Author: Juan Linietsky <reduzio@gmail.com>, (C) 2008 -// -// Copyright: See COPYING file that comes with this distribution -// -// #include "context_gl_win.h" -//#include "drivers/opengl/glwrapper.h" -//#include "ctxgl_procaddr.h" - #define WGL_CONTEXT_MAJOR_VERSION_ARB 0x2091 #define WGL_CONTEXT_MINOR_VERSION_ARB 0x2092 #define WGL_CONTEXT_FLAGS_ARB 0x2094 diff --git a/platform/windows/context_gl_win.h b/platform/windows/context_gl_win.h index 0059cbc311..5a280b0d08 100644 --- a/platform/windows/context_gl_win.h +++ b/platform/windows/context_gl_win.h @@ -27,18 +27,9 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#if defined(OPENGL_ENABLED) || defined(GLES2_ENABLED) -// -// C++ Interface: context_gl_x11 -// -// Description: -// -// +#if defined(OPENGL_ENABLED) || defined(GLES_ENABLED) + // Author: Juan Linietsky <reduzio@gmail.com>, (C) 2008 -// -// Copyright: See COPYING file that comes with this distribution -// -// #ifndef CONTEXT_GL_WIN_H #define CONTEXT_GL_WIN_H diff --git a/platform/windows/godot_res.rc b/platform/windows/godot_res.rc index b86869d316..c535a749c0 100644 --- a/platform/windows/godot_res.rc +++ b/platform/windows/godot_res.rc @@ -23,13 +23,13 @@ BEGIN BLOCK "040904b0" BEGIN VALUE "CompanyName", "Godot Engine" - VALUE "FileDescription", _MKSTR(VERSION_NAME) " Editor" + VALUE "FileDescription", VERSION_NAME " Editor" VALUE "FileVersion", _MKSTR(VERSION_MAJOR) "." _MKSTR(VERSION_MINOR) "." _MKSTR(VERSION_PATCH) - VALUE "ProductName", _MKSTR(VERSION_NAME) + VALUE "ProductName", VERSION_NAME VALUE "Licence", "MIT" VALUE "LegalCopyright", "Copyright (c) 2007-" _MKSTR(VERSION_YEAR) " Juan Linietsky, Ariel Manzur" - VALUE "Info", "http://www.godotengine.org" - VALUE "ProductVersion", _MKSTR(VERSION_MAJOR) "." _MKSTR(VERSION_MINOR) PATCH_STRING "." _MKSTR(VERSION_REVISION) + VALUE "Info", "https://godotengine.org" + VALUE "ProductVersion", _MKSTR(VERSION_MAJOR) "." _MKSTR(VERSION_MINOR) PATCH_STRING "." VERSION_BUILD END END BLOCK "VarFileInfo" diff --git a/platform/windows/os_windows.cpp b/platform/windows/os_windows.cpp index 0f62dbb9e8..c189b3b744 100644 --- a/platform/windows/os_windows.cpp +++ b/platform/windows/os_windows.cpp @@ -47,6 +47,7 @@ #include "servers/visual/visual_server_wrap_mt.h" #include "stream_peer_winsock.h" #include "tcp_server_winsock.h" +#include "version_generated.gen.h" #include "windows_terminal_logger.h" #include <process.h> @@ -143,7 +144,7 @@ int OS_Windows::get_video_driver_count() const { } const char *OS_Windows::get_video_driver_name(int p_driver) const { - return "GLES2"; + return "GLES3"; } int OS_Windows::get_audio_driver_count() const { @@ -200,15 +201,6 @@ void OS_Windows::initialize_core() { cursor_shape = CURSOR_ARROW; } -void OS_Windows::initialize_logger() { - Vector<Logger *> loggers; - loggers.push_back(memnew(WindowsTerminalLogger)); - // FIXME: Reenable once we figure out how to get this properly in user:// - // instead of littering the user's working dirs (res:// + pwd) with log files (GH-12277) - //loggers.push_back(memnew(RotatedFileLogger("user://logs/log.txt"))); - _set_logger(memnew(CompositeLogger(loggers))); -} - bool OS_Windows::can_draw() const { return !minimized; @@ -1090,7 +1082,7 @@ void OS_Windows::initialize(const VideoMode &p_desired, int p_video_driver, int //RegisterTouchWindow(hWnd, 0); // Windows 7 - _ensure_data_dir(); + _ensure_user_data_dir(); DragAcceptFiles(hWnd, true); @@ -2131,6 +2123,43 @@ MainLoop *OS_Windows::get_main_loop() const { return main_loop; } +String OS_Windows::get_config_path() const { + + if (has_environment("XDG_CONFIG_HOME")) { // unlikely, but after all why not? + return get_environment("XDG_CONFIG_HOME"); + } else if (has_environment("APPDATA")) { + return get_environment("APPDATA"); + } else { + return "."; + } +} + +String OS_Windows::get_data_path() const { + + if (has_environment("XDG_DATA_HOME")) { + return get_environment("XDG_DATA_HOME"); + } else { + return get_config_path(); + } +} + +String OS_Windows::get_cache_path() const { + + if (has_environment("XDG_CACHE_HOME")) { + return get_environment("XDG_CACHE_HOME"); + } else if (has_environment("TEMP")) { + return get_environment("TEMP"); + } else { + return get_config_path(); + } +} + +// Get properly capitalized engine name for system paths +String OS_Windows::get_godot_dir_name() const { + + return String(VERSION_SHORT_NAME).capitalize(); +} + String OS_Windows::get_system_dir(SystemDir p_dir) const { int id; @@ -2167,18 +2196,17 @@ String OS_Windows::get_system_dir(SystemDir p_dir) const { ERR_FAIL_COND_V(res != S_OK, String()); return String(szPath); } -String OS_Windows::get_data_dir() const { - String an = get_safe_application_name(); - if (an != "") { +String OS_Windows::get_user_data_dir() const { - if (has_environment("APPDATA")) { + String appname = get_safe_application_name(); + if (appname != "") { - bool use_godot = ProjectSettings::get_singleton()->get("application/config/use_shared_user_dir"); - if (!use_godot) - return (OS::get_singleton()->get_environment("APPDATA") + "/" + an).replace("\\", "/"); - else - return (OS::get_singleton()->get_environment("APPDATA") + "/Godot/app_userdata/" + an).replace("\\", "/"); + bool use_godot_dir = ProjectSettings::get_singleton()->get("application/config/use_shared_user_dir"); + if (use_godot_dir) { + return get_data_path().plus_file(get_godot_dir_name()).plus_file("app_userdata").plus_file(appname).replace("\\", "/"); + } else { + return get_data_path().plus_file(appname).replace("\\", "/"); } } @@ -2289,7 +2317,9 @@ OS_Windows::OS_Windows(HINSTANCE _hInstance) { AudioDriverManager::add_driver(&driver_xaudio2); #endif - _set_logger(memnew(WindowsTerminalLogger)); + Vector<Logger *> loggers; + loggers.push_back(memnew(WindowsTerminalLogger)); + _set_logger(memnew(CompositeLogger(loggers))); } OS_Windows::~OS_Windows() { diff --git a/platform/windows/os_windows.h b/platform/windows/os_windows.h index fbd60e5f0d..4367297262 100644 --- a/platform/windows/os_windows.h +++ b/platform/windows/os_windows.h @@ -145,7 +145,6 @@ protected: virtual int get_audio_driver_count() const; virtual const char *get_audio_driver_name(int p_driver) const; - virtual void initialize_logger(); virtual void initialize_core(); virtual void initialize(const VideoMode &p_desired, int p_video_driver, int p_audio_driver); @@ -253,8 +252,14 @@ public: virtual void enable_for_stealing_focus(ProcessID pid); virtual void move_window_to_foreground(); - virtual String get_data_dir() const; + + virtual String get_config_path() const; + virtual String get_data_path() const; + virtual String get_cache_path() const; + virtual String get_godot_dir_name() const; + virtual String get_system_dir(SystemDir p_dir) const; + virtual String get_user_data_dir() const; virtual void release_rendering_thread(); virtual void make_rendering_thread(); diff --git a/platform/x11/detect.py b/platform/x11/detect.py index 6bd0ac8317..3d07851c4f 100644 --- a/platform/x11/detect.py +++ b/platform/x11/detect.py @@ -236,7 +236,7 @@ def configure(env): env.ParseConfig('pkg-config zlib --cflags --libs') env.Append(CPPPATH=['#platform/x11']) - env.Append(CPPFLAGS=['-DX11_ENABLED', '-DUNIX_ENABLED', '-DOPENGL_ENABLED', '-DGLES2_ENABLED', '-DGLES_OVER_GL']) + env.Append(CPPFLAGS=['-DX11_ENABLED', '-DUNIX_ENABLED', '-DOPENGL_ENABLED', '-DGLES_ENABLED', '-DGLES_OVER_GL']) env.Append(LIBS=['GL', 'pthread']) if (platform.system() == "Linux"): diff --git a/platform/x11/os_x11.cpp b/platform/x11/os_x11.cpp index f018145d82..d1aa129e77 100644 --- a/platform/x11/os_x11.cpp +++ b/platform/x11/os_x11.cpp @@ -250,41 +250,13 @@ void OS_X11::initialize(const VideoMode &p_desired, int p_video_driver, int p_au visual_server = memnew(VisualServerWrapMT(visual_server, get_render_thread_mode() == RENDER_SEPARATE_THREAD)); } - - // borderless fullscreen window mode - if (current_videomode.fullscreen) { - // set bypass compositor hint - Atom bypass_compositor = XInternAtom(x11_display, "_NET_WM_BYPASS_COMPOSITOR", False); - unsigned long compositing_disable_on = 1; - XChangeProperty(x11_display, x11_window, bypass_compositor, XA_CARDINAL, 32, PropModeReplace, (unsigned char *)&compositing_disable_on, 1); - - // needed for lxde/openbox, possibly others - Hints hints; - Atom property; - hints.flags = 2; - hints.decorations = 0; - property = XInternAtom(x11_display, "_MOTIF_WM_HINTS", True); - XChangeProperty(x11_display, x11_window, property, property, 32, PropModeReplace, (unsigned char *)&hints, 5); - XMapRaised(x11_display, x11_window); - XWindowAttributes xwa; - XGetWindowAttributes(x11_display, DefaultRootWindow(x11_display), &xwa); - XMoveResizeWindow(x11_display, x11_window, 0, 0, xwa.width, xwa.height); - - // code for netwm-compliants - XEvent xev; - Atom wm_state = XInternAtom(x11_display, "_NET_WM_STATE", False); - Atom fullscreen = XInternAtom(x11_display, "_NET_WM_STATE_FULLSCREEN", False); - - memset(&xev, 0, sizeof(xev)); - xev.type = ClientMessage; - xev.xclient.window = x11_window; - xev.xclient.message_type = wm_state; - xev.xclient.format = 32; - xev.xclient.data.l[0] = 1; - xev.xclient.data.l[1] = fullscreen; - xev.xclient.data.l[2] = 0; - - XSendEvent(x11_display, DefaultRootWindow(x11_display), False, SubstructureNotifyMask, &xev); + if (current_videomode.maximized) { + current_videomode.maximized = false; + set_window_maximized(true); + // borderless fullscreen window mode + } else if (current_videomode.fullscreen) { + current_videomode.fullscreen = false; + set_window_fullscreen(true); } else if (current_videomode.borderless_window) { Hints hints; Atom property; @@ -464,11 +436,20 @@ void OS_X11::initialize(const VideoMode &p_desired, int p_video_driver, int p_au #ifdef JOYDEV_ENABLED joypad = memnew(JoypadLinux(input)); #endif - _ensure_data_dir(); + _ensure_user_data_dir(); power_manager = memnew(PowerX11); + + XEvent xevent; + while (XCheckIfEvent(x11_display, &xevent, _check_window_events, NULL)) { + _window_changed(&xevent); + } } +int OS_X11::_check_window_events(Display *display, XEvent *event, char *arg) { + if (event->type == ConfigureNotify) return 1; + return 0; +} void OS_X11::xim_destroy_callback(::XIM im, ::XPointer client_data, ::XPointer call_data) { @@ -648,6 +629,9 @@ void OS_X11::get_fullscreen_mode_list(List<VideoMode> *p_list, int p_screen) con } void OS_X11::set_wm_fullscreen(bool p_enabled) { + if (current_videomode.fullscreen == p_enabled) + return; + if (p_enabled && !is_window_resizable()) { // Set the window as resizable to prevent window managers to ignore the fullscreen state flag. XSizeHints *xsh; @@ -971,6 +955,9 @@ bool OS_X11::is_window_minimized() const { } void OS_X11::set_window_maximized(bool p_enabled) { + if (is_window_maximized() == p_enabled) + return; + // Using EWMH -- Extended Window Manager Hints XEvent xev; Atom wm_state = XInternAtom(x11_display, "_NET_WM_STATE", False); @@ -1417,6 +1404,20 @@ static Atom pick_target_from_atoms(Display *p_disp, Atom p_t1, Atom p_t2, Atom p return None; } +void OS_X11::_window_changed(XEvent *event) { + + if (xic) { + // Not portable. + set_ime_position(Point2(0, 1)); + } + if ((event->xconfigure.width == current_videomode.width) && + (event->xconfigure.height == current_videomode.height)) + return; + + current_videomode.width = event->xconfigure.width; + current_videomode.height = event->xconfigure.height; +} + void OS_X11::process_xevents() { //printf("checking events %i\n", XPending(x11_display)); @@ -1498,18 +1499,7 @@ void OS_X11::process_xevents() { break; case ConfigureNotify: - if (xic) { - // Not portable. - set_ime_position(Point2(0, 1)); - } - /* call resizeGLScene only if our window-size changed */ - - if ((event.xconfigure.width == current_videomode.width) && - (event.xconfigure.height == current_videomode.height)) - break; - - current_videomode.width = event.xconfigure.width; - current_videomode.height = event.xconfigure.height; + _window_changed(&event); break; case ButtonPress: case ButtonRelease: { @@ -1941,6 +1931,39 @@ bool OS_X11::_check_internal_feature_support(const String &p_feature) { return p_feature == "pc" || p_feature == "s3tc"; } +String OS_X11::get_config_path() const { + + if (has_environment("XDG_CONFIG_HOME")) { + return get_environment("XDG_CONFIG_HOME"); + } else if (has_environment("HOME")) { + return get_environment("HOME").plus_file(".config"); + } else { + return "."; + } +} + +String OS_X11::get_data_path() const { + + if (has_environment("XDG_DATA_HOME")) { + return get_environment("XDG_DATA_HOME"); + } else if (has_environment("HOME")) { + return get_environment("HOME").plus_file(".local/share"); + } else { + return get_config_path(); + } +} + +String OS_X11::get_cache_path() const { + + if (has_environment("XDG_CACHE_HOME")) { + return get_environment("XDG_CACHE_HOME"); + } else if (has_environment("HOME")) { + return get_environment("HOME").plus_file(".cache"); + } else { + return get_config_path(); + } +} + String OS_X11::get_system_dir(SystemDir p_dir) const { String xdgparam; diff --git a/platform/x11/os_x11.h b/platform/x11/os_x11.h index 0ea5bbfdb6..a74e6ee5f3 100644 --- a/platform/x11/os_x11.h +++ b/platform/x11/os_x11.h @@ -187,6 +187,9 @@ protected: virtual void set_main_loop(MainLoop *p_main_loop); + void _window_changed(XEvent *xevent); + static int _check_window_events(Display *display, XEvent *xevent, char *arg); + public: virtual String get_name(); @@ -213,6 +216,10 @@ public: virtual void make_rendering_thread(); virtual void swap_buffers(); + virtual String get_config_path() const; + virtual String get_data_path() const; + virtual String get_cache_path() const; + virtual String get_system_dir(SystemDir p_dir) const; virtual Error shell_open(String p_uri); diff --git a/scene/2d/animated_sprite.cpp b/scene/2d/animated_sprite.cpp index 5982556c18..4865858b7d 100644 --- a/scene/2d/animated_sprite.cpp +++ b/scene/2d/animated_sprite.cpp @@ -247,16 +247,16 @@ SpriteFrames::SpriteFrames() { add_animation(SceneStringNames::get_singleton()->_default); } -void AnimatedSprite::edit_set_pivot(const Point2 &p_pivot) { +void AnimatedSprite::_edit_set_pivot(const Point2 &p_pivot) { set_offset(p_pivot); } -Point2 AnimatedSprite::edit_get_pivot() const { +Point2 AnimatedSprite::_edit_get_pivot() const { return get_offset(); } -bool AnimatedSprite::edit_has_pivot() const { +bool AnimatedSprite::_edit_use_pivot() const { return true; } @@ -509,17 +509,17 @@ bool AnimatedSprite::is_flipped_v() const { return vflip; } -Rect2 AnimatedSprite::get_item_rect() const { +Rect2 AnimatedSprite::_edit_get_rect() const { if (!frames.is_valid() || !frames->has_animation(animation) || frame < 0 || frame >= frames->get_frame_count(animation)) { - return Node2D::get_item_rect(); + return Node2D::_edit_get_rect(); } Ref<Texture> t; if (animation) t = frames->get_frame(animation, frame); if (t.is_null()) - return Node2D::get_item_rect(); + return Node2D::_edit_get_rect(); Size2i s = t->get_size(); Point2 ofs = offset; diff --git a/scene/2d/animated_sprite.h b/scene/2d/animated_sprite.h index 6c660d0381..a8d0db021a 100644 --- a/scene/2d/animated_sprite.h +++ b/scene/2d/animated_sprite.h @@ -149,9 +149,9 @@ protected: virtual void _validate_property(PropertyInfo &property) const; public: - virtual void edit_set_pivot(const Point2 &p_pivot); - virtual Point2 edit_get_pivot() const; - virtual bool edit_has_pivot() const; + virtual void _edit_set_pivot(const Point2 &p_pivot); + virtual Point2 _edit_get_pivot() const; + virtual bool _edit_use_pivot() const; void set_sprite_frames(const Ref<SpriteFrames> &p_frames); Ref<SpriteFrames> get_sprite_frames() const; @@ -181,7 +181,7 @@ public: void set_modulate(const Color &p_color); Color get_modulate() const; - virtual Rect2 get_item_rect() const; + virtual Rect2 _edit_get_rect() const; virtual String get_configuration_warning() const; AnimatedSprite(); diff --git a/scene/2d/audio_stream_player_2d.cpp b/scene/2d/audio_stream_player_2d.cpp index 73e633139b..7d5044d97a 100644 --- a/scene/2d/audio_stream_player_2d.cpp +++ b/scene/2d/audio_stream_player_2d.cpp @@ -134,7 +134,7 @@ void AudioStreamPlayer2D::_notification(int p_what) { Physics2DDirectSpaceState::ShapeResult sr[MAX_INTERSECT_AREAS]; - int areas = space_state->intersect_point(global_pos, sr, MAX_INTERSECT_AREAS, Set<RID>(), area_mask, Physics2DDirectSpaceState::TYPE_MASK_AREA); + int areas = space_state->intersect_point(global_pos, sr, MAX_INTERSECT_AREAS, Set<RID>(), area_mask); for (int i = 0; i < areas; i++) { diff --git a/scene/2d/back_buffer_copy.cpp b/scene/2d/back_buffer_copy.cpp index 2858ddaad5..e4f52a227a 100644 --- a/scene/2d/back_buffer_copy.cpp +++ b/scene/2d/back_buffer_copy.cpp @@ -49,7 +49,7 @@ void BackBufferCopy::_update_copy_mode() { } } -Rect2 BackBufferCopy::get_item_rect() const { +Rect2 BackBufferCopy::_edit_get_rect() const { return rect; } diff --git a/scene/2d/back_buffer_copy.h b/scene/2d/back_buffer_copy.h index 2424dd7b19..cfd632d755 100644 --- a/scene/2d/back_buffer_copy.h +++ b/scene/2d/back_buffer_copy.h @@ -52,14 +52,14 @@ protected: static void _bind_methods(); public: + Rect2 _edit_get_rect() const; + void set_rect(const Rect2 &p_rect); Rect2 get_rect() const; void set_copy_mode(CopyMode p_mode); CopyMode get_copy_mode() const; - Rect2 get_item_rect() const; - BackBufferCopy(); ~BackBufferCopy(); }; diff --git a/scene/2d/camera_2d.cpp b/scene/2d/camera_2d.cpp index d65a3bfe80..3164344d15 100644 --- a/scene/2d/camera_2d.cpp +++ b/scene/2d/camera_2d.cpp @@ -52,7 +52,11 @@ void Camera2D::_update_scroll() { if (viewport) { viewport->set_canvas_transform(xform); } - get_tree()->call_group_flags(SceneTree::GROUP_CALL_REALTIME, group_name, "_camera_moved", xform); + + Size2 screen_size = viewport->get_visible_rect().size; + Point2 screen_offset = (anchor_mode == ANCHOR_MODE_DRAG_CENTER ? (screen_size * 0.5) : Point2()); + + get_tree()->call_group_flags(SceneTree::GROUP_CALL_REALTIME, group_name, "_camera_moved", xform, screen_offset); }; } diff --git a/scene/2d/canvas_item.cpp b/scene/2d/canvas_item.cpp index fa45c61f68..66abe1baa8 100644 --- a/scene/2d/canvas_item.cpp +++ b/scene/2d/canvas_item.cpp @@ -306,22 +306,7 @@ void CanvasItem::hide() { _change_notify("visible"); } -Variant CanvasItem::edit_get_state() const { - - return Variant(); -} -void CanvasItem::edit_set_state(const Variant &p_state) { -} - -void CanvasItem::edit_set_rect(const Rect2 &p_edit_rect) { - - //used by editors, implement at will -} - -void CanvasItem::edit_rotate(float p_rot) { -} - -Size2 CanvasItem::edit_get_minimum_size() const { +Size2 CanvasItem::_edit_get_minimum_size() const { return Size2(-1, -1); //no limit } @@ -941,15 +926,22 @@ void CanvasItem::_bind_methods() { ClassDB::bind_method(D_METHOD("_toplevel_raise_self"), &CanvasItem::_toplevel_raise_self); ClassDB::bind_method(D_METHOD("_update_callback"), &CanvasItem::_update_callback); - - ClassDB::bind_method(D_METHOD("edit_set_state", "state"), &CanvasItem::edit_set_state); - ClassDB::bind_method(D_METHOD("edit_get_state"), &CanvasItem::edit_get_state); - ClassDB::bind_method(D_METHOD("edit_set_rect", "rect"), &CanvasItem::edit_set_rect); - ClassDB::bind_method(D_METHOD("edit_rotate", "degrees"), &CanvasItem::edit_rotate); - - ClassDB::bind_method(D_METHOD("get_item_rect"), &CanvasItem::get_item_rect); - ClassDB::bind_method(D_METHOD("get_item_and_children_rect"), &CanvasItem::get_item_and_children_rect); - //ClassDB::bind_method(D_METHOD("get_transform"),&CanvasItem::get_transform); + ClassDB::bind_method(D_METHOD("_edit_set_state", "state"), &CanvasItem::_edit_set_state); + ClassDB::bind_method(D_METHOD("_edit_get_state"), &CanvasItem::_edit_get_state); + + ClassDB::bind_method(D_METHOD("_edit_set_position", "position"), &CanvasItem::_edit_set_position); + ClassDB::bind_method(D_METHOD("_edit_get_position"), &CanvasItem::_edit_get_position); + ClassDB::bind_method(D_METHOD("_edit_use_position"), &CanvasItem::_edit_use_position); + ClassDB::bind_method(D_METHOD("_edit_set_rect", "rect"), &CanvasItem::_edit_set_rect); + ClassDB::bind_method(D_METHOD("_edit_get_rect"), &CanvasItem::_edit_get_rect); + ClassDB::bind_method(D_METHOD("_edit_use_rect"), &CanvasItem::_edit_use_rect); + ClassDB::bind_method(D_METHOD("_edit_get_item_and_children_rect"), &CanvasItem::_edit_get_item_and_children_rect); + ClassDB::bind_method(D_METHOD("_edit_set_rotation", "degrees"), &CanvasItem::_edit_set_rotation); + ClassDB::bind_method(D_METHOD("_edit_get_rotation"), &CanvasItem::_edit_get_rotation); + ClassDB::bind_method(D_METHOD("_edit_use_rotation"), &CanvasItem::_edit_use_rotation); + ClassDB::bind_method(D_METHOD("_edit_set_pivot", "pivot"), &CanvasItem::_edit_set_pivot); + ClassDB::bind_method(D_METHOD("_edit_get_pivot"), &CanvasItem::_edit_get_pivot); + ClassDB::bind_method(D_METHOD("_edit_use_pivot"), &CanvasItem::_edit_use_pivot); ClassDB::bind_method(D_METHOD("get_canvas_item"), &CanvasItem::get_canvas_item); @@ -1119,14 +1111,14 @@ int CanvasItem::get_canvas_layer() const { return 0; } -Rect2 CanvasItem::get_item_and_children_rect() const { +Rect2 CanvasItem::_edit_get_item_and_children_rect() const { - Rect2 rect = get_item_rect(); + Rect2 rect = _edit_get_rect(); for (int i = 0; i < get_child_count(); i++) { CanvasItem *c = Object::cast_to<CanvasItem>(get_child(i)); if (c) { - Rect2 sir = c->get_transform().xform(c->get_item_and_children_rect()); + Rect2 sir = c->get_transform().xform(c->_edit_get_item_and_children_rect()); rect = rect.merge(sir); } } diff --git a/scene/2d/canvas_item.h b/scene/2d/canvas_item.h index 1a043c204f..c877a94755 100644 --- a/scene/2d/canvas_item.h +++ b/scene/2d/canvas_item.h @@ -216,11 +216,31 @@ public: /* EDITOR */ - virtual Variant edit_get_state() const; - virtual void edit_set_state(const Variant &p_state); - virtual void edit_set_rect(const Rect2 &p_edit_rect); - virtual void edit_rotate(float p_rot); - virtual Size2 edit_get_minimum_size() const; + virtual void _edit_set_state(const Dictionary &p_state){}; + virtual Dictionary _edit_get_state() const { return Dictionary(); }; + + // Used to move/select the node + virtual void _edit_set_position(const Point2 &p_position){}; + virtual Point2 _edit_get_position() const { return Point2(); }; + virtual bool _edit_use_position() const { return false; }; + + // Used to resize/move/select the node + virtual void _edit_set_rect(const Rect2 &p_rect){}; + virtual Rect2 _edit_get_rect() const { return Rect2(-32, -32, 64, 64); }; + Rect2 _edit_get_item_and_children_rect() const; + virtual bool _edit_use_rect() const { return false; }; + + // Used to rotate the node + virtual void _edit_set_rotation(float p_rotation){}; + virtual float _edit_get_rotation() const { return 0.0; }; + virtual bool _edit_use_rotation() const { return false; }; + + // Used to set a pivot + virtual void _edit_set_pivot(const Point2 &p_pivot){}; + virtual Point2 _edit_get_pivot() const { return Point2(); }; + virtual bool _edit_use_pivot() const { return false; }; + + virtual Size2 _edit_get_minimum_size() const; /* VISIBILITY */ @@ -272,14 +292,11 @@ public: CanvasItem *get_parent_item() const; - virtual Rect2 get_item_rect() const = 0; virtual Transform2D get_transform() const = 0; virtual Transform2D get_global_transform() const; virtual Transform2D get_global_transform_with_canvas() const; - Rect2 get_item_and_children_rect() const; - CanvasItem *get_toplevel() const; _FORCE_INLINE_ RID get_canvas_item() const { return canvas_item; } diff --git a/scene/2d/collision_polygon_2d.cpp b/scene/2d/collision_polygon_2d.cpp index a840744c78..92855299ae 100644 --- a/scene/2d/collision_polygon_2d.cpp +++ b/scene/2d/collision_polygon_2d.cpp @@ -243,7 +243,7 @@ CollisionPolygon2D::BuildMode CollisionPolygon2D::get_build_mode() const { return build_mode; } -Rect2 CollisionPolygon2D::get_item_rect() const { +Rect2 CollisionPolygon2D::_edit_get_rect() const { return aabb; } diff --git a/scene/2d/collision_polygon_2d.h b/scene/2d/collision_polygon_2d.h index c9ec860e36..2fb08a4599 100644 --- a/scene/2d/collision_polygon_2d.h +++ b/scene/2d/collision_polygon_2d.h @@ -69,7 +69,7 @@ public: void set_polygon(const Vector<Point2> &p_polygon); Vector<Point2> get_polygon() const; - virtual Rect2 get_item_rect() const; + virtual Rect2 _edit_get_rect() const; virtual String get_configuration_warning() const; diff --git a/scene/2d/collision_shape_2d.cpp b/scene/2d/collision_shape_2d.cpp index 0758f4a9bf..f7cb5473e3 100644 --- a/scene/2d/collision_shape_2d.cpp +++ b/scene/2d/collision_shape_2d.cpp @@ -158,7 +158,7 @@ Ref<Shape2D> CollisionShape2D::get_shape() const { return shape; } -Rect2 CollisionShape2D::get_item_rect() const { +Rect2 CollisionShape2D::_edit_get_rect() const { return rect; } diff --git a/scene/2d/collision_shape_2d.h b/scene/2d/collision_shape_2d.h index 04203a75b4..4745c659c8 100644 --- a/scene/2d/collision_shape_2d.h +++ b/scene/2d/collision_shape_2d.h @@ -51,9 +51,10 @@ protected: static void _bind_methods(); public: + virtual Rect2 _edit_get_rect() const; + void set_shape(const Ref<Shape2D> &p_shape); Ref<Shape2D> get_shape() const; - virtual Rect2 get_item_rect() const; void set_disabled(bool p_disabled); bool is_disabled() const; diff --git a/scene/2d/light_2d.cpp b/scene/2d/light_2d.cpp index 516acefe2a..d2b987e037 100644 --- a/scene/2d/light_2d.cpp +++ b/scene/2d/light_2d.cpp @@ -32,21 +32,21 @@ #include "engine.h" #include "servers/visual_server.h" -void Light2D::edit_set_pivot(const Point2 &p_pivot) { +void Light2D::_edit_set_pivot(const Point2 &p_pivot) { set_texture_offset(p_pivot); } -Point2 Light2D::edit_get_pivot() const { +Point2 Light2D::_edit_get_pivot() const { return get_texture_offset(); } -bool Light2D::edit_has_pivot() const { +bool Light2D::_edit_use_pivot() const { return true; } -Rect2 Light2D::get_item_rect() const { +Rect2 Light2D::_edit_get_rect() const { if (texture.is_null()) return Rect2(0, 0, 1, 1); diff --git a/scene/2d/light_2d.h b/scene/2d/light_2d.h index f6bc943adb..9b9da8379f 100644 --- a/scene/2d/light_2d.h +++ b/scene/2d/light_2d.h @@ -84,9 +84,10 @@ protected: static void _bind_methods(); public: - virtual void edit_set_pivot(const Point2 &p_pivot); - virtual Point2 edit_get_pivot() const; - virtual bool edit_has_pivot() const; + virtual void _edit_set_pivot(const Point2 &p_pivot); + virtual Point2 _edit_get_pivot() const; + virtual bool _edit_use_pivot() const; + virtual Rect2 _edit_get_rect() const; void set_enabled(bool p_enabled); bool is_enabled() const; @@ -151,8 +152,6 @@ public: void set_shadow_smooth(float p_amount); float get_shadow_smooth() const; - virtual Rect2 get_item_rect() const; - String get_configuration_warning() const; Light2D(); diff --git a/scene/2d/node_2d.cpp b/scene/2d/node_2d.cpp index c562a4652d..45f780e50e 100644 --- a/scene/2d/node_2d.cpp +++ b/scene/2d/node_2d.cpp @@ -34,35 +34,22 @@ #include "scene/main/viewport.h" #include "servers/visual_server.h" -void Node2D::edit_set_pivot(const Point2 &p_pivot) { -} - -Point2 Node2D::edit_get_pivot() const { - - return Point2(); -} -bool Node2D::edit_has_pivot() const { - - return false; -} +Dictionary Node2D::_edit_get_state() const { -Variant Node2D::edit_get_state() const { - - Array state; - state.push_back(get_position()); - state.push_back(get_rotation()); - state.push_back(get_scale()); + Dictionary state; + state["position"] = get_position(); + state["rotation"] = get_rotation(); + state["scale"] = get_scale(); return state; } -void Node2D::edit_set_state(const Variant &p_state) { +void Node2D::_edit_set_state(const Dictionary &p_state) { - Array state = p_state; - ERR_FAIL_COND(state.size() != 3); + Dictionary state = p_state; + pos = state["position"]; + angle = state["rotation"]; + _scale = state["scale"]; - pos = state[0]; - angle = state[1]; - _scale = state[2]; _update_transform(); _change_notify("rotation"); _change_notify("rotation_degrees"); @@ -70,9 +57,16 @@ void Node2D::edit_set_state(const Variant &p_state) { _change_notify("position"); } -void Node2D::edit_set_rect(const Rect2 &p_edit_rect) { +void Node2D::_edit_set_position(const Point2 &p_position) { + pos = p_position; +} + +Point2 Node2D::_edit_get_position() const { + return pos; +} - Rect2 r = get_item_rect(); +void Node2D::_edit_set_rect(const Rect2 &p_edit_rect) { + Rect2 r = _edit_get_rect(); Vector2 zero_offset; if (r.size.x != 0) @@ -101,14 +95,25 @@ void Node2D::edit_set_rect(const Rect2 &p_edit_rect) { _change_notify("position"); } -void Node2D::edit_rotate(float p_rot) { +bool Node2D::_edit_use_rect() const { + return true; +} - angle += p_rot; +void Node2D::_edit_set_rotation(float p_rotation) { + angle = p_rotation; _update_transform(); _change_notify("rotation"); _change_notify("rotation_degrees"); } +float Node2D::_edit_get_rotation() const { + return angle; +} + +bool Node2D::_edit_use_rotation() const { + return true; +} + void Node2D::_update_xform_values() { pos = _mat.elements[2]; @@ -205,17 +210,6 @@ Transform2D Node2D::get_transform() const { return _mat; } -Rect2 Node2D::get_item_rect() const { - - if (get_script_instance()) { - Variant::CallError err; - Rect2 r = get_script_instance()->call("_get_item_rect", NULL, 0, err); - if (err.error == Variant::CallError::CALL_OK) - return r; - } - return Rect2(Point2(-32, -32), Size2(64, 64)); -} - void Node2D::rotate(float p_radians) { set_rotation(get_rotation() + p_radians); @@ -439,8 +433,6 @@ void Node2D::_bind_methods() { ClassDB::bind_method(D_METHOD("set_z_as_relative", "enable"), &Node2D::set_z_as_relative); ClassDB::bind_method(D_METHOD("is_z_relative"), &Node2D::is_z_relative); - ClassDB::bind_method(D_METHOD("edit_set_pivot", "pivot"), &Node2D::edit_set_pivot); - ClassDB::bind_method(D_METHOD("get_relative_transform_to_parent", "parent"), &Node2D::get_relative_transform_to_parent); ADD_GROUP("Transform", ""); diff --git a/scene/2d/node_2d.h b/scene/2d/node_2d.h index eca1e96c82..e1e07f2895 100644 --- a/scene/2d/node_2d.h +++ b/scene/2d/node_2d.h @@ -56,13 +56,16 @@ protected: static void _bind_methods(); public: - virtual Variant edit_get_state() const; - virtual void edit_set_state(const Variant &p_state); - virtual void edit_set_rect(const Rect2 &p_edit_rect); - virtual void edit_rotate(float p_rot); - virtual void edit_set_pivot(const Point2 &p_pivot); - virtual Point2 edit_get_pivot() const; - virtual bool edit_has_pivot() const; + virtual Dictionary _edit_get_state() const; + virtual void _edit_set_state(const Dictionary &p_state); + + virtual void _edit_set_position(const Point2 &p_position); + virtual Point2 _edit_get_position() const; + virtual void _edit_set_rect(const Rect2 &p_edit_rect); + virtual bool _edit_use_rect() const; + virtual void _edit_set_rotation(float p_rotation); + virtual float _edit_get_rotation() const; + virtual bool _edit_use_rotation() const; void set_position(const Point2 &p_pos); void set_rotation(float p_radians); @@ -85,7 +88,6 @@ public: float get_global_rotation() const; float get_global_rotation_degrees() const; Size2 get_global_scale() const; - virtual Rect2 get_item_rect() const; void set_transform(const Transform2D &p_transform); void set_global_transform(const Transform2D &p_transform); diff --git a/scene/2d/parallax_background.cpp b/scene/2d/parallax_background.cpp index a13ce6278e..b9012e37b2 100644 --- a/scene/2d/parallax_background.cpp +++ b/scene/2d/parallax_background.cpp @@ -47,10 +47,12 @@ void ParallaxBackground::_notification(int p_what) { } } -void ParallaxBackground::_camera_moved(const Transform2D &p_transform) { +void ParallaxBackground::_camera_moved(const Transform2D &p_transform, const Point2 &p_screen_offset) { + + screen_offset = p_screen_offset; set_scroll_scale(p_transform.get_scale().dot(Vector2(0.5, 0.5))); - set_scroll_offset(p_transform.get_origin() / p_transform.get_scale()); + set_scroll_offset(p_transform.get_origin()); } void ParallaxBackground::set_scroll_scale(float p_scale) { @@ -106,9 +108,9 @@ void ParallaxBackground::_update_scroll() { continue; if (ignore_camera_zoom) - l->set_base_offset_and_scale(ofs, 1.0); + l->set_base_offset_and_scale(ofs, 1.0, screen_offset); else - l->set_base_offset_and_scale(ofs, scale); + l->set_base_offset_and_scale(ofs, scale, screen_offset); } } diff --git a/scene/2d/parallax_background.h b/scene/2d/parallax_background.h index 0dad1daeab..e37ec0db99 100644 --- a/scene/2d/parallax_background.h +++ b/scene/2d/parallax_background.h @@ -42,6 +42,7 @@ class ParallaxBackground : public CanvasLayer { float scale; Point2 base_offset; Point2 base_scale; + Point2 screen_offset; String group_name; Point2 limit_begin; Point2 limit_end; @@ -51,7 +52,7 @@ class ParallaxBackground : public CanvasLayer { void _update_scroll(); protected: - void _camera_moved(const Transform2D &p_transform); + void _camera_moved(const Transform2D &p_transform, const Point2 &p_screen_offset); void _notification(int p_what); static void _bind_methods(); diff --git a/scene/2d/parallax_layer.cpp b/scene/2d/parallax_layer.cpp index 8fe651cb5f..4a69841975 100644 --- a/scene/2d/parallax_layer.cpp +++ b/scene/2d/parallax_layer.cpp @@ -40,7 +40,7 @@ void ParallaxLayer::set_motion_scale(const Size2 &p_scale) { if (pb && is_inside_tree()) { Vector2 ofs = pb->get_final_offset(); float scale = pb->get_scroll_scale(); - set_base_offset_and_scale(ofs, scale); + set_base_offset_and_scale(ofs, scale, screen_offset); } } @@ -57,7 +57,7 @@ void ParallaxLayer::set_motion_offset(const Size2 &p_offset) { if (pb && is_inside_tree()) { Vector2 ofs = pb->get_final_offset(); float scale = pb->get_scroll_scale(); - set_base_offset_and_scale(ofs, scale); + set_base_offset_and_scale(ofs, scale, screen_offset); } } @@ -106,26 +106,28 @@ void ParallaxLayer::_notification(int p_what) { } } -void ParallaxLayer::set_base_offset_and_scale(const Point2 &p_offset, float p_scale) { +void ParallaxLayer::set_base_offset_and_scale(const Point2 &p_offset, float p_scale, const Point2 &p_screen_offset) { + screen_offset = p_screen_offset; if (!is_inside_tree()) return; if (Engine::get_singleton()->is_editor_hint()) return; - Point2 new_ofs = ((orig_offset + p_offset) * motion_scale) * p_scale + motion_offset; + + Point2 new_ofs = (screen_offset + (p_offset - screen_offset) * motion_scale) + motion_offset * p_scale + orig_offset * p_scale; + + Vector2 mirror = Vector2(1, 1); if (mirroring.x) { - double den = mirroring.x * p_scale; - new_ofs.x -= den * ceil(new_ofs.x / den); + mirror.x = -1; } if (mirroring.y) { - double den = mirroring.y * p_scale; - new_ofs.y -= den * ceil(new_ofs.y / den); + mirror.y = -1; } set_position(new_ofs); - set_scale(Vector2(1, 1) * p_scale); + set_scale(mirror * p_scale * orig_scale); } String ParallaxLayer::get_configuration_warning() const { diff --git a/scene/2d/parallax_layer.h b/scene/2d/parallax_layer.h index 95ca27c41a..6feb1fad67 100644 --- a/scene/2d/parallax_layer.h +++ b/scene/2d/parallax_layer.h @@ -43,6 +43,8 @@ class ParallaxLayer : public Node2D { Vector2 mirroring; void _update_mirroring(); + Point2 screen_offset; + protected: void _notification(int p_what); static void _bind_methods(); @@ -57,7 +59,7 @@ public: void set_mirroring(const Size2 &p_mirroring); Size2 get_mirroring() const; - void set_base_offset_and_scale(const Point2 &p_offset, float p_scale); + void set_base_offset_and_scale(const Point2 &p_offset, float p_scale, const Point2 &p_screen_offset); virtual String get_configuration_warning() const; ParallaxLayer(); diff --git a/scene/2d/particles_2d.cpp b/scene/2d/particles_2d.cpp index c146ac08c2..aee5d89150 100644 --- a/scene/2d/particles_2d.cpp +++ b/scene/2d/particles_2d.cpp @@ -77,7 +77,7 @@ void Particles2D::set_randomness_ratio(float p_ratio) { void Particles2D::set_visibility_rect(const Rect2 &p_aabb) { visibility_rect = p_aabb; - Rect3 aabb; + AABB aabb; aabb.position.x = p_aabb.position.x; aabb.position.y = p_aabb.position.y; aabb.size.x = p_aabb.size.x; @@ -223,7 +223,7 @@ String Particles2D::get_configuration_warning() const { Rect2 Particles2D::capture_rect() const { - Rect3 aabb = VS::get_singleton()->particles_get_current_aabb(particles); + AABB aabb = VS::get_singleton()->particles_get_current_aabb(particles); Rect2 r; r.position.x = aabb.position.x; r.position.y = aabb.position.y; @@ -378,7 +378,7 @@ void Particles2D::_bind_methods() { ADD_PROPERTY(PropertyInfo(Variant::INT, "fixed_fps", PROPERTY_HINT_RANGE, "0,1000,1"), "set_fixed_fps", "get_fixed_fps"); ADD_PROPERTY(PropertyInfo(Variant::BOOL, "fract_delta"), "set_fractional_delta", "get_fractional_delta"); ADD_GROUP("Drawing", ""); - ADD_PROPERTY(PropertyInfo(Variant::RECT3, "visibility_rect"), "set_visibility_rect", "get_visibility_rect"); + ADD_PROPERTY(PropertyInfo(Variant::AABB, "visibility_rect"), "set_visibility_rect", "get_visibility_rect"); ADD_PROPERTY(PropertyInfo(Variant::BOOL, "local_coords"), "set_use_local_coordinates", "get_use_local_coordinates"); ADD_PROPERTY(PropertyInfo(Variant::INT, "draw_order", PROPERTY_HINT_ENUM, "Index,Lifetime"), "set_draw_order", "get_draw_order"); ADD_GROUP("Process Material", "process_"); diff --git a/scene/2d/path_2d.cpp b/scene/2d/path_2d.cpp index 8413be1ca9..55c055e34f 100644 --- a/scene/2d/path_2d.cpp +++ b/scene/2d/path_2d.cpp @@ -107,28 +107,39 @@ void PathFollow2D::_update_transform() { if (!c.is_valid()) return; + if (delta_offset == 0) { + return; + } + float o = offset; if (loop) o = Math::fposmod(o, c->get_baked_length()); Vector2 pos = c->interpolate_baked(o, cubic); + Vector2 offset = Vector2(h_offset, v_offset); + + Transform2D t = get_transform(); + t.set_origin(pos); + if (rotate) { - Vector2 n = (c->interpolate_baked(o + lookahead, cubic) - pos).normalized(); - Vector2 t = -n.tangent(); - pos += n * h_offset; - pos += t * v_offset; + Vector2 t_prev = (pos - c->interpolate_baked(o - delta_offset, cubic)).normalized(); + Vector2 t_cur = (c->interpolate_baked(o + delta_offset, cubic) - pos).normalized(); + + float dot = t_prev.dot(t_cur); + float angle = Math::acos(CLAMP(dot, -1, 1)); + + t.rotate(angle); - set_rotation(t.angle()); + t.translate(offset); } else { - pos.x += h_offset; - pos.y += v_offset; + t.set_origin(t.get_origin() + offset); } - set_position(pos); + set_transform(t); } void PathFollow2D::_notification(int p_what) { @@ -176,8 +187,6 @@ bool PathFollow2D::_set(const StringName &p_name, const Variant &p_value) { set_cubic_interpolation(p_value); } else if (String(p_name) == "loop") { set_loop(p_value); - } else if (String(p_name) == "lookahead") { - set_lookahead(p_value); } else return false; @@ -200,8 +209,6 @@ bool PathFollow2D::_get(const StringName &p_name, Variant &r_ret) const { r_ret = cubic; } else if (String(p_name) == "loop") { r_ret = loop; - } else if (String(p_name) == "lookahead") { - r_ret = lookahead; } else return false; @@ -219,7 +226,6 @@ void PathFollow2D::_get_property_list(List<PropertyInfo> *p_list) const { p_list->push_back(PropertyInfo(Variant::BOOL, "rotate")); p_list->push_back(PropertyInfo(Variant::BOOL, "cubic_interp")); p_list->push_back(PropertyInfo(Variant::BOOL, "loop")); - p_list->push_back(PropertyInfo(Variant::REAL, "lookahead", PROPERTY_HINT_RANGE, "0.001,1024.0,0.001")); } String PathFollow2D::get_configuration_warning() const { @@ -259,7 +265,7 @@ void PathFollow2D::_bind_methods() { } void PathFollow2D::set_offset(float p_offset) { - + delta_offset = p_offset - offset; offset = p_offset; if (path) _update_transform(); @@ -310,16 +316,6 @@ float PathFollow2D::get_unit_offset() const { return 0; } -void PathFollow2D::set_lookahead(float p_lookahead) { - - lookahead = p_lookahead; -} - -float PathFollow2D::get_lookahead() const { - - return lookahead; -} - void PathFollow2D::set_rotate(bool p_rotate) { rotate = p_rotate; @@ -344,11 +340,11 @@ bool PathFollow2D::has_loop() const { PathFollow2D::PathFollow2D() { offset = 0; + delta_offset = 0; h_offset = 0; v_offset = 0; path = NULL; rotate = true; cubic = true; loop = true; - lookahead = 4; } diff --git a/scene/2d/path_2d.h b/scene/2d/path_2d.h index 88a0abdea9..f5ba3a3d32 100644 --- a/scene/2d/path_2d.h +++ b/scene/2d/path_2d.h @@ -60,9 +60,9 @@ public: private: Path2D *path; real_t offset; + real_t delta_offset; // change in offset since last _update_transform real_t h_offset; real_t v_offset; - real_t lookahead; bool cubic; bool loop; bool rotate; @@ -90,9 +90,6 @@ public: void set_unit_offset(float p_unit_offset); float get_unit_offset() const; - void set_lookahead(float p_lookahead); - float get_lookahead() const; - void set_loop(bool p_loop); bool has_loop() const; diff --git a/scene/2d/physics_body_2d.cpp b/scene/2d/physics_body_2d.cpp index 1287a800e3..1f6127e6eb 100644 --- a/scene/2d/physics_body_2d.cpp +++ b/scene/2d/physics_body_2d.cpp @@ -1028,7 +1028,10 @@ Vector2 KinematicBody2D::move_and_slide(const Vector2 &p_linear_velocity, const on_floor = true; floor_velocity = collision.collider_vel; - if (collision.travel.length() < 1 && ABS((lv.x - floor_velocity.x)) < p_slope_stop_min_velocity) { + Vector2 rel_v = lv - floor_velocity; + Vector2 hv = rel_v - p_floor_direction * p_floor_direction.dot(rel_v); + + if (collision.travel.length() < 1 && hv.length() < p_slope_stop_min_velocity) { Transform2D gt = get_global_transform(); gt.elements[2] -= collision.travel; set_global_transform(gt); diff --git a/scene/2d/polygon_2d.cpp b/scene/2d/polygon_2d.cpp index b5b5445684..3f2ad19e51 100644 --- a/scene/2d/polygon_2d.cpp +++ b/scene/2d/polygon_2d.cpp @@ -29,7 +29,7 @@ /*************************************************************************/ #include "polygon_2d.h" -Rect2 Polygon2D::get_item_rect() const { +Rect2 Polygon2D::_edit_get_rect() const { if (rect_cache_dirty) { int l = polygon.size(); @@ -49,16 +49,16 @@ Rect2 Polygon2D::get_item_rect() const { return item_rect; } -void Polygon2D::edit_set_pivot(const Point2 &p_pivot) { +void Polygon2D::_edit_set_pivot(const Point2 &p_pivot) { set_offset(p_pivot); } -Point2 Polygon2D::edit_get_pivot() const { +Point2 Polygon2D::_edit_get_pivot() const { return get_offset(); } -bool Polygon2D::edit_has_pivot() const { +bool Polygon2D::_edit_use_pivot() const { return true; } diff --git a/scene/2d/polygon_2d.h b/scene/2d/polygon_2d.h index 0c2c049c18..d09e22f5ff 100644 --- a/scene/2d/polygon_2d.h +++ b/scene/2d/polygon_2d.h @@ -99,11 +99,11 @@ public: //editor stuff - virtual void edit_set_pivot(const Point2 &p_pivot); - virtual Point2 edit_get_pivot() const; - virtual bool edit_has_pivot() const; + virtual void _edit_set_pivot(const Point2 &p_pivot); + virtual Point2 _edit_get_pivot() const; + virtual bool _edit_use_pivot() const; - virtual Rect2 get_item_rect() const; + virtual Rect2 _edit_get_rect() const; Polygon2D(); }; diff --git a/scene/2d/position_2d.cpp b/scene/2d/position_2d.cpp index cde665d422..1e729bc179 100644 --- a/scene/2d/position_2d.cpp +++ b/scene/2d/position_2d.cpp @@ -38,7 +38,7 @@ void Position2D::_draw_cross() { draw_line(Point2(0, -10), Point2(0, +10), Color(0.5, 1, 0.5)); } -Rect2 Position2D::get_item_rect() const { +Rect2 Position2D::_edit_get_rect() const { return Rect2(Point2(-10, -10), Size2(20, 20)); } diff --git a/scene/2d/position_2d.h b/scene/2d/position_2d.h index af54fb919a..5961e447df 100644 --- a/scene/2d/position_2d.h +++ b/scene/2d/position_2d.h @@ -42,7 +42,7 @@ protected: void _notification(int p_what); public: - virtual Rect2 get_item_rect() const; + virtual Rect2 _edit_get_rect() const; Position2D(); }; diff --git a/scene/2d/ray_cast_2d.cpp b/scene/2d/ray_cast_2d.cpp index ff23b3183b..6ab20efdcc 100644 --- a/scene/2d/ray_cast_2d.cpp +++ b/scene/2d/ray_cast_2d.cpp @@ -56,11 +56,6 @@ uint32_t RayCast2D::get_collision_mask() const { return collision_mask; } -void RayCast2D::set_type_mask(uint32_t p_mask) { - - type_mask = p_mask; -} - void RayCast2D::set_collision_mask_bit(int p_bit, bool p_value) { uint32_t mask = get_collision_mask(); @@ -76,11 +71,6 @@ bool RayCast2D::get_collision_mask_bit(int p_bit) const { return get_collision_mask() & (1 << p_bit); } -uint32_t RayCast2D::get_type_mask() const { - - return type_mask; -} - bool RayCast2D::is_colliding() const { return collided; @@ -218,7 +208,7 @@ void RayCast2D::_update_raycast_state() { Physics2DDirectSpaceState::RayResult rr; - if (dss->intersect_ray(gt.get_origin(), gt.xform(to), rr, exclude, collision_mask, type_mask)) { + if (dss->intersect_ray(gt.get_origin(), gt.xform(to), rr, exclude, collision_mask)) { collided = true; against = rr.collider_id; @@ -297,9 +287,6 @@ void RayCast2D::_bind_methods() { ClassDB::bind_method(D_METHOD("set_collision_mask_bit", "bit", "value"), &RayCast2D::set_collision_mask_bit); ClassDB::bind_method(D_METHOD("get_collision_mask_bit", "bit"), &RayCast2D::get_collision_mask_bit); - ClassDB::bind_method(D_METHOD("set_type_mask", "mask"), &RayCast2D::set_type_mask); - ClassDB::bind_method(D_METHOD("get_type_mask"), &RayCast2D::get_type_mask); - ClassDB::bind_method(D_METHOD("set_exclude_parent_body", "mask"), &RayCast2D::set_exclude_parent_body); ClassDB::bind_method(D_METHOD("get_exclude_parent_body"), &RayCast2D::get_exclude_parent_body); @@ -307,7 +294,6 @@ void RayCast2D::_bind_methods() { ADD_PROPERTY(PropertyInfo(Variant::BOOL, "exclude_parent"), "set_exclude_parent_body", "get_exclude_parent_body"); ADD_PROPERTY(PropertyInfo(Variant::VECTOR2, "cast_to"), "set_cast_to", "get_cast_to"); ADD_PROPERTY(PropertyInfo(Variant::INT, "collision_mask", PROPERTY_HINT_LAYERS_2D_PHYSICS), "set_collision_mask", "get_collision_mask"); - ADD_PROPERTY(PropertyInfo(Variant::INT, "type_mask", PROPERTY_HINT_FLAGS, "Static,Kinematic,Rigid,Character,Area"), "set_type_mask", "get_type_mask"); } RayCast2D::RayCast2D() { @@ -317,7 +303,6 @@ RayCast2D::RayCast2D() { collided = false; against_shape = 0; collision_mask = 1; - type_mask = Physics2DDirectSpaceState::TYPE_MASK_COLLISION; cast_to = Vector2(0, 50); exclude_parent_body = true; } diff --git a/scene/2d/ray_cast_2d.h b/scene/2d/ray_cast_2d.h index c13ddfdc58..9d60a16c6a 100644 --- a/scene/2d/ray_cast_2d.h +++ b/scene/2d/ray_cast_2d.h @@ -44,7 +44,6 @@ class RayCast2D : public Node2D { Vector2 collision_normal; Set<RID> exclude; uint32_t collision_mask; - uint32_t type_mask; bool exclude_parent_body; Vector2 cast_to; @@ -67,9 +66,6 @@ public: void set_collision_mask_bit(int p_bit, bool p_value); bool get_collision_mask_bit(int p_bit) const; - void set_type_mask(uint32_t p_mask); - uint32_t get_type_mask() const; - void set_exclude_parent_body(bool p_exclude_parent_body); bool get_exclude_parent_body() const; diff --git a/scene/2d/screen_button.cpp b/scene/2d/screen_button.cpp index bf7c5a3ba4..d5fcda90d5 100644 --- a/scene/2d/screen_button.cpp +++ b/scene/2d/screen_button.cpp @@ -133,7 +133,7 @@ void TouchScreenButton::_notification(int p_what) { return; if (shape.is_valid()) { Color draw_col = get_tree()->get_debug_collisions_color(); - Vector2 pos = shape_centered ? get_item_rect().size * 0.5f : Vector2(); + Vector2 pos = shape_centered ? _edit_get_rect().size * 0.5f : Vector2(); draw_set_transform_matrix(get_canvas_transform().translated(pos)); shape->draw(get_canvas_item(), draw_col); } @@ -251,7 +251,7 @@ void TouchScreenButton::_input(const Ref<InputEvent> &p_event) { bool TouchScreenButton::_is_point_inside(const Point2 &p_point) { Point2 coord = (get_global_transform_with_canvas()).affine_inverse().xform(p_point); - Rect2 item_rect = get_item_rect(); + Rect2 item_rect = _edit_get_rect(); bool touched = false; bool check_rect = true; @@ -322,13 +322,13 @@ void TouchScreenButton::_release(bool p_exiting_tree) { } } -Rect2 TouchScreenButton::get_item_rect() const { +Rect2 TouchScreenButton::_edit_get_rect() const { if (texture.is_null()) return Rect2(0, 0, 1, 1); /* if (texture.is_null()) - return CanvasItem::get_item_rect(); + return CanvasItem::_edit_get_rect(); */ return Rect2(Size2(), texture->get_size()); diff --git a/scene/2d/screen_button.h b/scene/2d/screen_button.h index 7647070b26..2e674c20b4 100644 --- a/scene/2d/screen_button.h +++ b/scene/2d/screen_button.h @@ -102,7 +102,7 @@ public: bool is_pressed() const; - Rect2 get_item_rect() const; + Rect2 _edit_get_rect() const; TouchScreenButton(); }; diff --git a/scene/2d/sprite.cpp b/scene/2d/sprite.cpp index c53faab5f9..df2265aae9 100644 --- a/scene/2d/sprite.cpp +++ b/scene/2d/sprite.cpp @@ -33,16 +33,16 @@ #include "scene/main/viewport.h" #include "scene/scene_string_names.h" -void Sprite::edit_set_pivot(const Point2 &p_pivot) { +void Sprite::_edit_set_pivot(const Point2 &p_pivot) { set_offset(p_pivot); } -Point2 Sprite::edit_get_pivot() const { +Point2 Sprite::_edit_get_pivot() const { return get_offset(); } -bool Sprite::edit_has_pivot() const { +bool Sprite::_edit_use_pivot() const { return true; } @@ -257,13 +257,13 @@ int Sprite::get_hframes() const { return hframes; } -Rect2 Sprite::get_item_rect() const { +Rect2 Sprite::_edit_get_rect() const { if (texture.is_null()) return Rect2(0, 0, 1, 1); /* if (texture.is_null()) - return CanvasItem::get_item_rect(); + return CanvasItem::_edit_get_rect(); */ Size2i s; @@ -368,224 +368,3 @@ Sprite::Sprite() { vframes = 1; hframes = 1; } - -//////////////////////////// VPSPRITE -/// -/// -/// - -#if 0 -void ViewportSprite::edit_set_pivot(const Point2& p_pivot) { - - set_offset(p_pivot); -} - -Point2 ViewportSprite::edit_get_pivot() const { - - return get_offset(); -} -bool ViewportSprite::edit_has_pivot() const { - - return true; -} - -void ViewportSprite::_notification(int p_what) { - - switch(p_what) { - - case NOTIFICATION_ENTER_TREE: { - - if (!viewport_path.is_empty()) { - - Node *n = get_node(viewport_path); - ERR_FAIL_COND(!n); - Viewport *vp=Object::cast_to<Viewport>(n); - ERR_FAIL_COND(!vp); - - Ref<RenderTargetTexture> rtt = vp->get_render_target_texture(); - texture=rtt; - texture->connect("changed",this,"update"); - item_rect_changed(); - } - } break; - case NOTIFICATION_EXIT_TREE: { - - if (texture.is_valid()) { - - texture->disconnect("changed",this,"update"); - texture=Ref<Texture>(); - } - } break; - case NOTIFICATION_DRAW: { - - if (texture.is_null()) - return; - - RID ci = get_canvas_item(); - - /* - texture->draw(ci,Point2()); - break; - */ - - Size2i s; - Rect2i src_rect; - - s = texture->get_size(); - - src_rect.size=s; - - Point2 ofs=offset; - if (centered) - ofs-=s/2; - - if (OS::get_singleton()->get_use_pixel_snap()) { - ofs=ofs.floor(); - } - Rect2 dst_rect(ofs,s); - texture->draw_rect_region(ci,dst_rect,src_rect,modulate); - - } break; - } -} - -void ViewportSprite::set_viewport_path(const NodePath& p_viewport) { - - viewport_path=p_viewport; - update(); - if (!is_inside_tree()) - return; - - if (texture.is_valid()) { - texture->disconnect("changed",this,"update"); - texture=Ref<Texture>(); - } - - if (viewport_path.is_empty()) - return; - - - Node *n = get_node(viewport_path); - ERR_FAIL_COND(!n); - Viewport *vp=Object::cast_to<Viewport>(n); - ERR_FAIL_COND(!vp); - - Ref<RenderTargetTexture> rtt = vp->get_render_target_texture(); - texture=rtt; - - if (texture.is_valid()) { - texture->connect("changed",this,"update"); - } - - item_rect_changed(); - -} - -NodePath ViewportSprite::get_viewport_path() const { - - return viewport_path; -} - -void ViewportSprite::set_centered(bool p_center) { - - centered=p_center; - update(); - item_rect_changed(); -} - -bool ViewportSprite::is_centered() const { - - return centered; -} - -void ViewportSprite::set_offset(const Point2& p_offset) { - - offset=p_offset; - update(); - item_rect_changed(); -} -Point2 ViewportSprite::get_offset() const { - - return offset; -} -void ViewportSprite::set_modulate(const Color& p_color) { - - modulate=p_color; - update(); -} - -Color ViewportSprite::get_modulate() const{ - - return modulate; -} - - -Rect2 ViewportSprite::get_item_rect() const { - - if (texture.is_null()) - return Rect2(0,0,1,1); - /* - if (texture.is_null()) - return CanvasItem::get_item_rect(); - */ - - Size2i s; - - s = texture->get_size(); - Point2 ofs=offset; - if (centered) - ofs-=s/2; - - if (s==Size2(0,0)) - s=Size2(1,1); - - return Rect2(ofs,s); -} - -String ViewportSprite::get_configuration_warning() const { - - if (!has_node(viewport_path) || !Object::cast_to<Viewport>(get_node(viewport_path))) { - return TTR("Path property must point to a valid Viewport node to work. Such Viewport must be set to 'render target' mode."); - } else { - - Node *n = get_node(viewport_path); - if (n) { - Viewport *vp = Object::cast_to<Viewport>(n); - if (!vp->is_set_as_render_target()) { - - return TTR("The Viewport set in the path property must be set as 'render target' in order for this sprite to work."); - } - } - } - - return String(); - -} - -void ViewportSprite::_bind_methods() { - - ClassDB::bind_method(D_METHOD("set_viewport_path","path"),&ViewportSprite::set_viewport_path); - ClassDB::bind_method(D_METHOD("get_viewport_path"),&ViewportSprite::get_viewport_path); - - ClassDB::bind_method(D_METHOD("set_centered","centered"),&ViewportSprite::set_centered); - ClassDB::bind_method(D_METHOD("is_centered"),&ViewportSprite::is_centered); - - ClassDB::bind_method(D_METHOD("set_offset","offset"),&ViewportSprite::set_offset); - ClassDB::bind_method(D_METHOD("get_offset"),&ViewportSprite::get_offset); - - ClassDB::bind_method(D_METHOD("set_modulate","modulate"),&ViewportSprite::set_modulate); - ClassDB::bind_method(D_METHOD("get_modulate"),&ViewportSprite::get_modulate); - - ADD_PROPERTYNZ( PropertyInfo( Variant::NODE_PATH, "viewport"), "set_viewport_path","get_viewport_path"); - ADD_PROPERTYNO( PropertyInfo( Variant::BOOL, "centered"), "set_centered","is_centered"); - ADD_PROPERTYNZ( PropertyInfo( Variant::VECTOR2, "offset"), "set_offset","get_offset"); - ADD_PROPERTYNO( PropertyInfo( Variant::COLOR, "modulate"), "set_modulate","get_modulate"); - -} - -ViewportSprite::ViewportSprite() { - - centered=true; - modulate=Color(1,1,1,1); -} -#endif diff --git a/scene/2d/sprite.h b/scene/2d/sprite.h index 64d30325f2..1bef73c0a5 100644 --- a/scene/2d/sprite.h +++ b/scene/2d/sprite.h @@ -62,9 +62,10 @@ protected: virtual void _validate_property(PropertyInfo &property) const; public: - virtual void edit_set_pivot(const Point2 &p_pivot); - virtual Point2 edit_get_pivot() const; - virtual bool edit_has_pivot() const; + virtual void _edit_set_pivot(const Point2 &p_pivot); + virtual Point2 _edit_get_pivot() const; + virtual bool _edit_use_pivot() const; + virtual Rect2 _edit_get_rect() const; void set_texture(const Ref<Texture> &p_texture); Ref<Texture> get_texture() const; @@ -102,53 +103,7 @@ public: void set_hframes(int p_amount); int get_hframes() const; - virtual Rect2 get_item_rect() const; - Sprite(); }; -#if 0 -class ViewportSprite : public Node2D { - - GDCLASS( ViewportSprite, Node2D ); - - Ref<Texture> texture; - NodePath viewport_path; - - bool centered; - Point2 offset; - Color modulate; - -protected: - - void _notification(int p_what); - - static void _bind_methods(); - -public: - - virtual void edit_set_pivot(const Point2& p_pivot); - virtual Point2 edit_get_pivot() const; - virtual bool edit_has_pivot() const; - - void set_viewport_path(const NodePath& p_viewport); - NodePath get_viewport_path() const; - - void set_centered(bool p_center); - bool is_centered() const; - - void set_offset(const Point2& p_offset); - Point2 get_offset() const; - - void set_modulate(const Color& p_color); - Color get_modulate() const; - - virtual Rect2 get_item_rect() const; - - virtual String get_configuration_warning() const; - - ViewportSprite(); -}; - -#endif #endif // SPRITE_H diff --git a/scene/2d/tile_map.cpp b/scene/2d/tile_map.cpp index dd4270ab26..f8bc27ccf6 100644 --- a/scene/2d/tile_map.cpp +++ b/scene/2d/tile_map.cpp @@ -365,6 +365,11 @@ void TileMap::_update_dirty_quadrants() { } Rect2 r = tile_set->tile_get_region(c.id); + if (tile_set->tile_get_is_autotile(c.id)) { + int spacing = tile_set->autotile_get_spacing(c.id); + r.size = tile_set->autotile_get_size(c.id); + r.position += (r.size + Vector2(spacing, spacing)) * Vector2(c.autotile_coord_x, c.autotile_coord_y); + } Size2 s = tex->get_size(); if (r == Rect2()) @@ -456,21 +461,23 @@ void TileMap::_update_dirty_quadrants() { for (int i = 0; i < shapes.size(); i++) { Ref<Shape2D> shape = shapes[i].shape; if (shape.is_valid()) { - Transform2D xform; - xform.set_origin(offset.floor()); - - Vector2 shape_ofs = tile_set->tile_get_shape_offset(c.id, i); - - _fix_cell_transform(xform, c, shape_ofs + center_ofs, s); - - if (debug_canvas_item.is_valid()) { - vs->canvas_item_add_set_transform(debug_canvas_item, xform); - shape->draw(debug_canvas_item, debug_collision_color); + if (!tile_set->tile_get_is_autotile(c.id) || (shapes[i].autotile_coord.x == c.autotile_coord_x && shapes[i].autotile_coord.y == c.autotile_coord_y)) { + Transform2D xform; + xform.set_origin(offset.floor()); + + Vector2 shape_ofs = tile_set->tile_get_shape_offset(c.id, i); + + _fix_cell_transform(xform, c, shape_ofs + center_ofs, s); + + if (debug_canvas_item.is_valid()) { + vs->canvas_item_add_set_transform(debug_canvas_item, xform); + shape->draw(debug_canvas_item, debug_collision_color); + } + ps->body_add_shape(q.body, shape->get_rid(), xform); + ps->body_set_shape_metadata(q.body, shape_idx, Vector2(E->key().x, E->key().y)); + ps->body_set_shape_as_one_way_collision(q.body, shape_idx, shapes[i].one_way_collision); + shape_idx++; } - ps->body_add_shape(q.body, shape->get_rid(), xform); - ps->body_set_shape_metadata(q.body, shape_idx, Vector2(E->key().x, E->key().y)); - ps->body_set_shape_as_one_way_collision(q.body, shape_idx, shapes[i].one_way_collision); - shape_idx++; } } @@ -479,9 +486,17 @@ void TileMap::_update_dirty_quadrants() { } if (navigation) { - Ref<NavigationPolygon> navpoly = tile_set->tile_get_navigation_polygon(c.id); + Ref<NavigationPolygon> navpoly; + Vector2 npoly_ofs; + if (tile_set->tile_get_is_autotile(c.id)) { + navpoly = tile_set->autotile_get_navigation_polygon(c.id, Vector2(c.autotile_coord_x, c.autotile_coord_y)); + npoly_ofs = Vector2(); + } else { + navpoly = tile_set->tile_get_navigation_polygon(c.id); + npoly_ofs = tile_set->tile_get_navigation_polygon_offset(c.id); + } + if (navpoly.is_valid()) { - Vector2 npoly_ofs = tile_set->tile_get_navigation_polygon_offset(c.id); Transform2D xform; xform.set_origin(offset.floor() + q.pos); _fix_cell_transform(xform, c, npoly_ofs + center_ofs, s); @@ -495,10 +510,17 @@ void TileMap::_update_dirty_quadrants() { } } - Ref<OccluderPolygon2D> occluder = tile_set->tile_get_light_occluder(c.id); + Ref<OccluderPolygon2D> occluder; + Vector2 occluder_ofs; + if (tile_set->tile_get_is_autotile(c.id)) { + occluder = tile_set->autotile_get_light_occluder(c.id, Vector2(c.autotile_coord_x, c.autotile_coord_y)); + occluder_ofs = tile_set->tile_get_occluder_offset(c.id); + } else { + occluder = tile_set->tile_get_light_occluder(c.id); + occluder_ofs = Vector2(); + } if (occluder.is_valid()) { - Vector2 occluder_ofs = tile_set->tile_get_occluder_offset(c.id); Transform2D xform; xform.set_origin(offset.floor() + q.pos); _fix_cell_transform(xform, c, occluder_ofs + center_ofs, s); @@ -656,7 +678,7 @@ void TileMap::set_cellv(const Vector2 &p_pos, int p_tile, bool p_flip_x, bool p_ set_cell(p_pos.x, p_pos.y, p_tile, p_flip_x, p_flip_y, p_transpose); } -void TileMap::set_cell(int p_x, int p_y, int p_tile, bool p_flip_x, bool p_flip_y, bool p_transpose) { +void TileMap::set_cell(int p_x, int p_y, int p_tile, bool p_flip_x, bool p_flip_y, bool p_transpose, Vector2 p_autotile_coord) { PosKey pk(p_x, p_y); @@ -702,15 +724,105 @@ void TileMap::set_cell(int p_x, int p_y, int p_tile, bool p_flip_x, bool p_flip_ c.flip_h = p_flip_x; c.flip_v = p_flip_y; c.transpose = p_transpose; + c.autotile_coord_x = (uint16_t)p_autotile_coord.x; + c.autotile_coord_y = (uint16_t)p_autotile_coord.y; _make_quadrant_dirty(Q); used_size_cache_dirty = true; } int TileMap::get_cellv(const Vector2 &p_pos) const { + return get_cell(p_pos.x, p_pos.y); } +void TileMap::make_bitmask_area_dirty(const Vector2 &p_pos) { + + for (int x = p_pos.x - 1; x <= p_pos.x + 1; x++) { + for (int y = p_pos.y - 1; x <= p_pos.y + 1; y++) { + PosKey p(x, y); + if (dirty_bitmask.find(p) == NULL) { + dirty_bitmask.push_back(p); + } + } + } +} + +void TileMap::update_bitmask_area(const Vector2 &p_pos) { + + for (int x = p_pos.x - 1; x <= p_pos.x + 1; x++) { + for (int y = p_pos.y - 1; y <= p_pos.y + 1; y++) { + update_cell_bitmask(x, y); + } + } +} + +void TileMap::update_cell_bitmask(int p_x, int p_y) { + + PosKey p(p_x, p_y); + Map<PosKey, Cell>::Element *E = tile_map.find(p); + if (E != NULL) { + int id = get_cell(p_x, p_y); + if (tile_set->tile_get_is_autotile(id)) { + uint16_t mask = 0; + if (tile_set->autotile_get_bitmask_mode(id) == TileSet::BITMASK_2X2) { + if (tile_set->is_tile_bound(id, get_cell(p_x - 1, p_y - 1)) && tile_set->is_tile_bound(id, get_cell(p_x, p_y - 1)) && tile_set->is_tile_bound(id, get_cell(p_x - 1, p_y))) { + mask |= TileSet::BIND_TOPLEFT; + } + if (tile_set->is_tile_bound(id, get_cell(p_x + 1, p_y - 1)) && tile_set->is_tile_bound(id, get_cell(p_x, p_y - 1)) && tile_set->is_tile_bound(id, get_cell(p_x + 1, p_y))) { + mask |= TileSet::BIND_TOPRIGHT; + } + if (tile_set->is_tile_bound(id, get_cell(p_x - 1, p_y + 1)) && tile_set->is_tile_bound(id, get_cell(p_x, p_y + 1)) && tile_set->is_tile_bound(id, get_cell(p_x - 1, p_y))) { + mask |= TileSet::BIND_BOTTOMLEFT; + } + if (tile_set->is_tile_bound(id, get_cell(p_x + 1, p_y + 1)) && tile_set->is_tile_bound(id, get_cell(p_x, p_y + 1)) && tile_set->is_tile_bound(id, get_cell(p_x + 1, p_y))) { + mask |= TileSet::BIND_BOTTOMRIGHT; + } + } else if (tile_set->autotile_get_bitmask_mode(id) == TileSet::BITMASK_3X3) { + if (tile_set->is_tile_bound(id, get_cell(p_x - 1, p_y - 1)) && tile_set->is_tile_bound(id, get_cell(p_x, p_y - 1)) && tile_set->is_tile_bound(id, get_cell(p_x - 1, p_y))) { + mask |= TileSet::BIND_TOPLEFT; + } + if (tile_set->is_tile_bound(id, get_cell(p_x, p_y - 1))) { + mask |= TileSet::BIND_TOP; + } + if (tile_set->is_tile_bound(id, get_cell(p_x + 1, p_y - 1)) && tile_set->is_tile_bound(id, get_cell(p_x, p_y - 1)) && tile_set->is_tile_bound(id, get_cell(p_x + 1, p_y))) { + mask |= TileSet::BIND_TOPRIGHT; + } + if (tile_set->is_tile_bound(id, get_cell(p_x - 1, p_y))) { + mask |= TileSet::BIND_LEFT; + } + mask |= TileSet::BIND_CENTER; + if (tile_set->is_tile_bound(id, get_cell(p_x + 1, p_y))) { + mask |= TileSet::BIND_RIGHT; + } + if (tile_set->is_tile_bound(id, get_cell(p_x - 1, p_y + 1)) && tile_set->is_tile_bound(id, get_cell(p_x, p_y + 1)) && tile_set->is_tile_bound(id, get_cell(p_x - 1, p_y))) { + mask |= TileSet::BIND_BOTTOMLEFT; + } + if (tile_set->is_tile_bound(id, get_cell(p_x, p_y + 1))) { + mask |= TileSet::BIND_BOTTOM; + } + if (tile_set->is_tile_bound(id, get_cell(p_x + 1, p_y + 1)) && tile_set->is_tile_bound(id, get_cell(p_x, p_y + 1)) && tile_set->is_tile_bound(id, get_cell(p_x + 1, p_y))) { + mask |= TileSet::BIND_BOTTOMRIGHT; + } + } + Vector2 coord = tile_set->autotile_get_subtile_for_bitmask(id, mask, this, Vector2(p_x, p_y)); + E->get().autotile_coord_x = (int)coord.x; + E->get().autotile_coord_y = (int)coord.y; + } else { + E->get().autotile_coord_x = 0; + E->get().autotile_coord_y = 0; + } + } +} + +void TileMap::update_dirty_bitmask() { + + while (dirty_bitmask.size() > 0) { + update_cell_bitmask(dirty_bitmask[0].x, dirty_bitmask[0].y); + dirty_bitmask.pop_front(); + } +} + int TileMap::get_cell(int p_x, int p_y) const { PosKey pk(p_x, p_y); @@ -756,6 +868,30 @@ bool TileMap::is_cell_transposed(int p_x, int p_y) const { return E->get().transpose; } +int TileMap::get_cell_autotile_coord_x(int p_x, int p_y) const { + + PosKey pk(p_x, p_y); + + const Map<PosKey, Cell>::Element *E = tile_map.find(pk); + + if (!E) + return 0; + + return E->get().autotile_coord_x; +} + +int TileMap::get_cell_autotile_coord_y(int p_x, int p_y) const { + + PosKey pk(p_x, p_y); + + const Map<PosKey, Cell>::Element *E = tile_map.find(pk); + + if (!E) + return 0; + + return E->get().autotile_coord_y; +} + void TileMap::_recreate_quadrants() { _clear_quadrants(); @@ -823,11 +959,13 @@ void TileMap::_set_tile_data(const PoolVector<int> &p_data) { int c = p_data.size(); PoolVector<int>::Read r = p_data.read(); - for (int i = 0; i < c; i += 2) { + int offset = (format == FORMAT_2_1_5) ? 3 : 2; + + for (int i = 0; i < c; i += offset) { const uint8_t *ptr = (const uint8_t *)&r[i]; - uint8_t local[8]; - for (int j = 0; j < 8; j++) + uint8_t local[12]; + for (int j = 0; j < ((format == FORMAT_2_1_5) ? 12 : 8); j++) local[j] = ptr[j]; #ifdef BIG_ENDIAN_ENABLED @@ -836,6 +974,11 @@ void TileMap::_set_tile_data(const PoolVector<int> &p_data) { SWAP(local[1], local[2]); SWAP(local[4], local[7]); SWAP(local[5], local[6]); + //TODO: ask someone to check this... + if (FORMAT == FORMAT_2_1_5) { + SWAP(local[8], local[11]); + SWAP(local[9], local[10]); + } #endif int16_t x = decode_uint16(&local[0]); @@ -845,24 +988,28 @@ void TileMap::_set_tile_data(const PoolVector<int> &p_data) { bool flip_v = v & (1 << 30); bool transpose = v & (1 << 31); v &= (1 << 29) - 1; - + int16_t coord_x; + int16_t coord_y; + if (format == FORMAT_2_1_5) { + coord_x = decode_uint16(&local[8]); + coord_y = decode_uint16(&local[10]); + } /* if (x<-20 || y <-20 || x>4000 || y>4000) continue; */ - set_cell(x, y, v, flip_h, flip_v, transpose); + set_cell(x, y, v, flip_h, flip_v, transpose, Vector2(coord_x, coord_y)); } } PoolVector<int> TileMap::_get_tile_data() const { PoolVector<int> data; - data.resize(tile_map.size() * 2); + data.resize(tile_map.size() * 3); PoolVector<int>::Write w = data.write(); int idx = 0; for (const Map<PosKey, Cell>::Element *E = tile_map.front(); E; E = E->next()) { - uint8_t *ptr = (uint8_t *)&w[idx]; encode_uint16(E->key().x, &ptr[0]); encode_uint16(E->key().y, &ptr[2]); @@ -873,9 +1020,10 @@ PoolVector<int> TileMap::_get_tile_data() const { val |= (1 << 30); if (E->get().transpose) val |= (1 << 31); - encode_uint32(val, &ptr[4]); - idx += 2; + encode_uint16(E->get().autotile_coord_x, &ptr[8]); + encode_uint16(E->get().autotile_coord_y, &ptr[10]); + idx += 3; } w = PoolVector<int>::Write(); @@ -883,7 +1031,7 @@ PoolVector<int> TileMap::_get_tile_data() const { return data; } -Rect2 TileMap::get_item_rect() const { +Rect2 TileMap::_edit_get_rect() const { const_cast<TileMap *>(this)->_update_dirty_quadrants(); return rect_cache; @@ -1119,10 +1267,50 @@ Vector2 TileMap::_map_to_world(int p_x, int p_y, bool p_ignore_ofs) const { } return ret; } + +bool TileMap::_set(const StringName &p_name, const Variant &p_value) { + + if (p_name == "format") { + if (p_value.get_type() == Variant::INT) { + format = (DataFormat)(p_value.operator int64_t()); + return true; + } + } else if (p_name == "tile_data") { + if (p_value.is_array()) { + _set_tile_data(p_value); + return true; + } + return false; + } + return false; +} + +bool TileMap::_get(const StringName &p_name, Variant &r_ret) const { + + if (p_name == "format") { + r_ret = FORMAT_2_1_5; + return true; + } else if (p_name == "tile_data") { + r_ret = _get_tile_data(); + return true; + } + return false; +} + +void TileMap::_get_property_list(List<PropertyInfo> *p_list) const { + + PropertyInfo p(Variant::INT, "format", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NOEDITOR); + p_list->push_back(p); + + p = PropertyInfo(Variant::OBJECT, "tile_data", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NOEDITOR); + p_list->push_back(p); +} + Vector2 TileMap::map_to_world(const Vector2 &p_pos, bool p_ignore_ofs) const { return _map_to_world(p_pos.x, p_pos.y, p_ignore_ofs); } + Vector2 TileMap::world_to_map(const Vector2 &p_pos) const { Vector2 ret = get_cell_transform().affine_inverse().xform(p_pos); @@ -1357,8 +1545,6 @@ void TileMap::_bind_methods() { ADD_GROUP("Occluder", "occluder_"); ADD_PROPERTY(PropertyInfo(Variant::INT, "occluder_light_mask", PROPERTY_HINT_LAYERS_2D_RENDER), "set_occluder_light_mask", "get_occluder_light_mask"); - ADD_GROUP("", ""); - ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "tile_data", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NOEDITOR), "_set_tile_data", "_get_tile_data"); ADD_SIGNAL(MethodInfo("settings_changed")); @@ -1398,6 +1584,7 @@ TileMap::TileMap() { y_sort_mode = false; occluder_light_mask = 1; clip_uv = false; + format = FORMAT_2_1_4; //Always initialize with the lowest format fp_adjust = 0.00001; tile_origin = TILE_ORIGIN_TOP_LEFT; diff --git a/scene/2d/tile_map.h b/scene/2d/tile_map.h index 706b87cec3..a0ca2e6a35 100644 --- a/scene/2d/tile_map.h +++ b/scene/2d/tile_map.h @@ -60,6 +60,11 @@ public: }; private: + enum DataFormat { + FORMAT_2_1_4 = 0, + FORMAT_2_1_5 + }; + Ref<TileSet> tile_set; Size2i cell_size; int quadrant_size; @@ -81,6 +86,8 @@ private: //using a more precise comparison so the regions can be sorted later bool operator<(const PosKey &p_k) const { return (y == p_k.y) ? x < p_k.x : y < p_k.y; } + bool operator==(const PosKey &p_k) const { return (y == p_k.y && x == p_k.x); } + PosKey(int16_t p_x, int16_t p_y) { x = p_x; y = p_y; @@ -98,13 +105,17 @@ private: bool flip_h : 1; bool flip_v : 1; bool transpose : 1; + int16_t autotile_coord_x : 16; + int16_t autotile_coord_y : 16; }; - uint32_t _u32t; - Cell() { _u32t = 0; } + uint64_t _u64t; + Cell() { _u64t = 0; } }; Map<PosKey, Cell> tile_map; + List<PosKey> dirty_bitmask; + struct Quadrant { Vector2 pos; @@ -167,6 +178,7 @@ private: float bounce; uint32_t collision_layer; uint32_t collision_mask; + DataFormat format; TileOrigin tile_origin; @@ -198,6 +210,10 @@ private: _FORCE_INLINE_ Vector2 _map_to_world(int p_x, int p_y, bool p_ignore_ofs = false) const; 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; + void _notification(int p_what); static void _bind_methods(); @@ -220,16 +236,23 @@ public: void set_center_y(bool p_enable); bool get_center_y() const; - void set_cell(int p_x, int p_y, int p_tile, bool p_flip_x = false, bool p_flip_y = false, bool p_transpose = false); + void set_cell(int p_x, int p_y, int p_tile, bool p_flip_x = false, bool p_flip_y = false, bool p_transpose = false, Vector2 p_autotile_coord = Vector2()); int get_cell(int p_x, int p_y) const; bool is_cell_x_flipped(int p_x, int p_y) const; bool is_cell_y_flipped(int p_x, int p_y) const; bool is_cell_transposed(int p_x, int p_y) const; + int get_cell_autotile_coord_x(int p_x, int p_y) const; + int get_cell_autotile_coord_y(int p_x, int p_y) const; void set_cellv(const Vector2 &p_pos, int p_tile, bool p_flip_x = false, bool p_flip_y = false, bool p_transpose = false); int get_cellv(const Vector2 &p_pos) const; - Rect2 get_item_rect() const; + Rect2 _edit_get_rect() const; + + void make_bitmask_area_dirty(const Vector2 &p_pos); + void update_bitmask_area(const Vector2 &p_pos); + void update_cell_bitmask(int p_x, int p_y); + void update_dirty_bitmask(); void set_collision_layer(uint32_t p_layer); uint32_t get_collision_layer() const; diff --git a/scene/2d/visibility_notifier_2d.cpp b/scene/2d/visibility_notifier_2d.cpp index b0fd57baf5..298bc2649e 100644 --- a/scene/2d/visibility_notifier_2d.cpp +++ b/scene/2d/visibility_notifier_2d.cpp @@ -83,7 +83,7 @@ void VisibilityNotifier2D::set_rect(const Rect2 &p_rect) { _change_notify("rect"); } -Rect2 VisibilityNotifier2D::get_item_rect() const { +Rect2 VisibilityNotifier2D::_edit_get_rect() const { return rect; } diff --git a/scene/2d/visibility_notifier_2d.h b/scene/2d/visibility_notifier_2d.h index ee5152978b..6e06833912 100644 --- a/scene/2d/visibility_notifier_2d.h +++ b/scene/2d/visibility_notifier_2d.h @@ -54,13 +54,13 @@ protected: static void _bind_methods(); public: + virtual Rect2 _edit_get_rect() const; + void set_rect(const Rect2 &p_rect); Rect2 get_rect() const; bool is_on_screen() const; - virtual Rect2 get_item_rect() const; - VisibilityNotifier2D(); }; diff --git a/scene/3d/audio_stream_player_3d.cpp b/scene/3d/audio_stream_player_3d.cpp index ad1a15f363..30b7f36352 100644 --- a/scene/3d/audio_stream_player_3d.cpp +++ b/scene/3d/audio_stream_player_3d.cpp @@ -242,7 +242,7 @@ void AudioStreamPlayer3D::_notification(int p_what) { PhysicsDirectSpaceState::ShapeResult sr[MAX_INTERSECT_AREAS]; - int areas = space_state->intersect_point(global_pos, sr, MAX_INTERSECT_AREAS, Set<RID>(), area_mask, PhysicsDirectSpaceState::TYPE_MASK_AREA); + int areas = space_state->intersect_point(global_pos, sr, MAX_INTERSECT_AREAS, Set<RID>(), area_mask); Area *area = NULL; for (int i = 0; i < areas; i++) { diff --git a/scene/3d/collision_polygon.cpp b/scene/3d/collision_polygon.cpp index 382cbb8f38..a6d812efec 100644 --- a/scene/3d/collision_polygon.cpp +++ b/scene/3d/collision_polygon.cpp @@ -117,7 +117,7 @@ Vector<Point2> CollisionPolygon::get_polygon() const { return polygon; } -Rect3 CollisionPolygon::get_item_rect() const { +AABB CollisionPolygon::get_item_rect() const { return aabb; } @@ -176,7 +176,7 @@ void CollisionPolygon::_bind_methods() { CollisionPolygon::CollisionPolygon() { - aabb = Rect3(Vector3(-1, -1, -1), Vector3(2, 2, 2)); + aabb = AABB(Vector3(-1, -1, -1), Vector3(2, 2, 2)); depth = 1.0; set_notify_local_transform(true); parent = NULL; diff --git a/scene/3d/collision_polygon.h b/scene/3d/collision_polygon.h index dbed1d7154..14d8c3aba6 100644 --- a/scene/3d/collision_polygon.h +++ b/scene/3d/collision_polygon.h @@ -40,7 +40,7 @@ class CollisionPolygon : public Spatial { protected: float depth; - Rect3 aabb; + AABB aabb; Vector<Point2> polygon; uint32_t owner_id; @@ -64,7 +64,7 @@ public: void set_disabled(bool p_disabled); bool is_disabled() const; - virtual Rect3 get_item_rect() const; + virtual AABB get_item_rect() const; String get_configuration_warning() const; diff --git a/scene/3d/gi_probe.cpp b/scene/3d/gi_probe.cpp index bc70feaffb..05d5d52d28 100644 --- a/scene/3d/gi_probe.cpp +++ b/scene/3d/gi_probe.cpp @@ -31,12 +31,12 @@ #include "mesh_instance.h" -void GIProbeData::set_bounds(const Rect3 &p_bounds) { +void GIProbeData::set_bounds(const AABB &p_bounds) { VS::get_singleton()->gi_probe_set_bounds(probe, p_bounds); } -Rect3 GIProbeData::get_bounds() const { +AABB GIProbeData::get_bounds() const { return VS::get_singleton()->gi_probe_get_bounds(probe); } @@ -180,7 +180,7 @@ void GIProbeData::_bind_methods() { ClassDB::bind_method(D_METHOD("set_compress", "compress"), &GIProbeData::set_compress); ClassDB::bind_method(D_METHOD("is_compressed"), &GIProbeData::is_compressed); - ADD_PROPERTY(PropertyInfo(Variant::RECT3, "bounds", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NOEDITOR), "set_bounds", "get_bounds"); + ADD_PROPERTY(PropertyInfo(Variant::AABB, "bounds", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NOEDITOR), "set_bounds", "get_bounds"); ADD_PROPERTY(PropertyInfo(Variant::REAL, "cell_size", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NOEDITOR), "set_cell_size", "get_cell_size"); ADD_PROPERTY(PropertyInfo(Variant::TRANSFORM, "to_cell_xform", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NOEDITOR), "set_to_cell_xform", "get_to_cell_xform"); @@ -542,7 +542,7 @@ static _FORCE_INLINE_ Vector2 get_uv(const Vector3 &p_pos, const Vector3 *p_vtx, return p_uv[0] * u + p_uv[1] * v + p_uv[2] * w; } -void GIProbe::_plot_face(int p_idx, int p_level, int p_x, int p_y, int p_z, const Vector3 *p_vtx, const Vector2 *p_uv, const Baker::MaterialCache &p_material, const Rect3 &p_aabb, Baker *p_baker) { +void GIProbe::_plot_face(int p_idx, int p_level, int p_x, int p_y, int p_z, const Vector3 *p_vtx, const Vector2 *p_uv, const Baker::MaterialCache &p_material, const AABB &p_aabb, Baker *p_baker) { if (p_level == p_baker->cell_subdiv - 1) { //plot the face by guessing it's albedo and emission value @@ -702,7 +702,7 @@ void GIProbe::_plot_face(int p_idx, int p_level, int p_x, int p_y, int p_z, cons int half = (1 << (p_baker->cell_subdiv - 1)) >> (p_level + 1); for (int i = 0; i < 8; i++) { - Rect3 aabb = p_aabb; + AABB aabb = p_aabb; aabb.size *= 0.5; int nx = p_x; @@ -726,7 +726,7 @@ void GIProbe::_plot_face(int p_idx, int p_level, int p_x, int p_y, int p_z, cons continue; { - Rect3 test_aabb = aabb; + AABB test_aabb = aabb; //test_aabb.grow_by(test_aabb.get_longest_axis_size()*0.05); //grow a bit to avoid numerical error in real-time Vector3 qsize = test_aabb.size * 0.5; //quarter size, for fast aabb test @@ -1083,11 +1083,11 @@ void GIProbe::_find_meshes(Node *p_at_node, Baker *p_baker) { Ref<Mesh> mesh = mi->get_mesh(); if (mesh.is_valid()) { - Rect3 aabb = mesh->get_aabb(); + AABB aabb = mesh->get_aabb(); Transform xf = get_global_transform().affine_inverse() * mi->get_global_transform(); - if (Rect3(-extents, extents * 2).intersects(xf.xform(aabb))) { + if (AABB(-extents, extents * 2).intersects(xf.xform(aabb))) { Baker::PlotMesh pm; pm.local_xform = xf; pm.mesh = mesh; @@ -1113,11 +1113,11 @@ void GIProbe::_find_meshes(Node *p_at_node, Baker *p_baker) { if (!mesh.is_valid()) continue; - Rect3 aabb = mesh->get_aabb(); + AABB aabb = mesh->get_aabb(); Transform xf = get_global_transform().affine_inverse() * (s->get_global_transform() * mxf); - if (Rect3(-extents, extents * 2).intersects(xf.xform(aabb))) { + if (AABB(-extents, extents * 2).intersects(xf.xform(aabb))) { Baker::PlotMesh pm; pm.local_xform = xf; pm.mesh = mesh; @@ -1151,7 +1151,7 @@ void GIProbe::bake(Node *p_from_node, bool p_create_visual_debug) { baker.bake_cells.resize(1); //find out the actual real bounds, power of 2, which gets the highest subdivision - baker.po2_bounds = Rect3(-extents, extents * 2.0); + baker.po2_bounds = AABB(-extents, extents * 2.0); int longest_axis = baker.po2_bounds.get_longest_axis_index(); baker.axis_cell_size[longest_axis] = (1 << (baker.cell_subdiv - 1)); baker.leaf_voxel_count = 0; @@ -1286,7 +1286,7 @@ void GIProbe::bake(Node *p_from_node, bool p_create_visual_debug) { Ref<GIProbeData> probe_data; probe_data.instance(); - probe_data->set_bounds(Rect3(-extents, extents * 2.0)); + probe_data->set_bounds(AABB(-extents, extents * 2.0)); probe_data->set_cell_size(baker.po2_bounds.size[longest_axis] / baker.axis_cell_size[longest_axis]); probe_data->set_dynamic_data(data); probe_data->set_dynamic_range(dynamic_range); @@ -1306,7 +1306,7 @@ void GIProbe::bake(Node *p_from_node, bool p_create_visual_debug) { } } -void GIProbe::_debug_mesh(int p_idx, int p_level, const Rect3 &p_aabb, Ref<MultiMesh> &p_multimesh, int &idx, Baker *p_baker) { +void GIProbe::_debug_mesh(int p_idx, int p_level, const AABB &p_aabb, Ref<MultiMesh> &p_multimesh, int &idx, Baker *p_baker) { if (p_level == p_baker->cell_subdiv - 1) { @@ -1328,7 +1328,7 @@ void GIProbe::_debug_mesh(int p_idx, int p_level, const Rect3 &p_aabb, Ref<Multi if (p_baker->bake_cells[p_idx].childs[i] == Baker::CHILD_EMPTY) continue; - Rect3 aabb = p_aabb; + AABB aabb = p_aabb; aabb.size *= 0.5; if (i & 1) @@ -1440,9 +1440,9 @@ void GIProbe::_debug_bake() { bake(NULL, true); } -Rect3 GIProbe::get_aabb() const { +AABB GIProbe::get_aabb() const { - return Rect3(-extents, extents * 2); + return AABB(-extents, extents * 2); } PoolVector<Face3> GIProbe::get_faces(uint32_t p_usage_flags) const { diff --git a/scene/3d/gi_probe.h b/scene/3d/gi_probe.h index 8f13960b67..324ff8e917 100644 --- a/scene/3d/gi_probe.h +++ b/scene/3d/gi_probe.h @@ -43,8 +43,8 @@ protected: static void _bind_methods(); public: - void set_bounds(const Rect3 &p_bounds); - Rect3 get_bounds() const; + void set_bounds(const AABB &p_bounds); + AABB get_bounds() const; void set_cell_size(float p_size); float get_cell_size() const; @@ -146,7 +146,7 @@ private: MaterialCache _get_material_cache(Ref<Material> p_material); int leaf_voxel_count; - Rect3 po2_bounds; + AABB po2_bounds; int axis_cell_size[3]; struct PlotMesh { @@ -180,12 +180,12 @@ private: Vector<Color> _get_bake_texture(Ref<Image> p_image, const Color &p_color_mul, const Color &p_color_add); Baker::MaterialCache _get_material_cache(Ref<Material> p_material, Baker *p_baker); - void _plot_face(int p_idx, int p_level, int p_x, int p_y, int p_z, const Vector3 *p_vtx, const Vector2 *p_uv, const Baker::MaterialCache &p_material, const Rect3 &p_aabb, Baker *p_baker); + void _plot_face(int p_idx, int p_level, int p_x, int p_y, int p_z, const Vector3 *p_vtx, const Vector2 *p_uv, const Baker::MaterialCache &p_material, const AABB &p_aabb, Baker *p_baker); void _plot_mesh(const Transform &p_xform, Ref<Mesh> &p_mesh, Baker *p_baker, const Vector<Ref<Material> > &p_materials, const Ref<Material> &p_override_material); void _find_meshes(Node *p_at_node, Baker *p_baker); void _fixup_plot(int p_idx, int p_level, int p_x, int p_y, int p_z, Baker *p_baker); - void _debug_mesh(int p_idx, int p_level, const Rect3 &p_aabb, Ref<MultiMesh> &p_multimesh, int &idx, Baker *p_baker); + void _debug_mesh(int p_idx, int p_level, const AABB &p_aabb, Ref<MultiMesh> &p_multimesh, int &idx, Baker *p_baker); void _create_debug_mesh(Baker *p_baker); void _debug_bake(); @@ -230,7 +230,7 @@ public: void bake(Node *p_from_node = NULL, bool p_create_visual_debug = false); - virtual Rect3 get_aabb() const; + virtual AABB get_aabb() const; virtual PoolVector<Face3> get_faces(uint32_t p_usage_flags) const; GIProbe(); diff --git a/scene/3d/immediate_geometry.cpp b/scene/3d/immediate_geometry.cpp index 11f7efe066..092ed8f0b2 100644 --- a/scene/3d/immediate_geometry.cpp +++ b/scene/3d/immediate_geometry.cpp @@ -85,7 +85,7 @@ void ImmediateGeometry::clear() { cached_textures.clear(); } -Rect3 ImmediateGeometry::get_aabb() const { +AABB ImmediateGeometry::get_aabb() const { return aabb; } diff --git a/scene/3d/immediate_geometry.h b/scene/3d/immediate_geometry.h index 93ef726c6d..1ff4e05e82 100644 --- a/scene/3d/immediate_geometry.h +++ b/scene/3d/immediate_geometry.h @@ -42,7 +42,7 @@ class ImmediateGeometry : public GeometryInstance { // in VisualServer from becoming invalid if the texture is no longer used List<Ref<Texture> > cached_textures; bool empty; - Rect3 aabb; + AABB aabb; protected: static void _bind_methods(); @@ -62,7 +62,7 @@ public: void add_sphere(int p_lats, int p_lons, float p_radius, bool p_add_uv = true); - virtual Rect3 get_aabb() const; + virtual AABB get_aabb() const; virtual PoolVector<Face3> get_faces(uint32_t p_usage_flags) const; ImmediateGeometry(); diff --git a/scene/3d/light.cpp b/scene/3d/light.cpp index 389d87cd90..126c07f0be 100644 --- a/scene/3d/light.cpp +++ b/scene/3d/light.cpp @@ -117,24 +117,24 @@ bool Light::get_shadow_reverse_cull_face() const { return reverse_cull; } -Rect3 Light::get_aabb() const { +AABB Light::get_aabb() const { if (type == VisualServer::LIGHT_DIRECTIONAL) { - return Rect3(Vector3(-1, -1, -1), Vector3(2, 2, 2)); + return AABB(Vector3(-1, -1, -1), Vector3(2, 2, 2)); } else if (type == VisualServer::LIGHT_OMNI) { - return Rect3(Vector3(-1, -1, -1) * param[PARAM_RANGE], Vector3(2, 2, 2) * param[PARAM_RANGE]); + return AABB(Vector3(-1, -1, -1) * param[PARAM_RANGE], Vector3(2, 2, 2) * param[PARAM_RANGE]); } else if (type == VisualServer::LIGHT_SPOT) { float len = param[PARAM_RANGE]; float size = Math::tan(Math::deg2rad(param[PARAM_SPOT_ANGLE])) * len; - return Rect3(Vector3(-size, -size, -len), Vector3(size * 2, size * 2, len)); + return AABB(Vector3(-size, -size, -len), Vector3(size * 2, size * 2, len)); } - return Rect3(); + return AABB(); } PoolVector<Face3> Light::get_faces(uint32_t p_usage_flags) const { @@ -222,6 +222,7 @@ void Light::_bind_methods() { ADD_GROUP("Light", "light_"); ADD_PROPERTY(PropertyInfo(Variant::COLOR, "light_color", PROPERTY_HINT_COLOR_NO_ALPHA), "set_color", "get_color"); ADD_PROPERTYI(PropertyInfo(Variant::REAL, "light_energy", PROPERTY_HINT_RANGE, "0,16,0.01"), "set_param", "get_param", PARAM_ENERGY); + ADD_PROPERTYI(PropertyInfo(Variant::REAL, "light_indirect_energy", PROPERTY_HINT_RANGE, "0,16,0.01"), "set_param", "get_param", PARAM_INDIRECT_ENERGY); ADD_PROPERTY(PropertyInfo(Variant::BOOL, "light_negative"), "set_negative", "is_negative"); ADD_PROPERTYI(PropertyInfo(Variant::REAL, "light_specular", PROPERTY_HINT_RANGE, "0,1,0.01"), "set_param", "get_param", PARAM_SPECULAR); ADD_PROPERTY(PropertyInfo(Variant::INT, "light_cull_mask", PROPERTY_HINT_LAYERS_3D_RENDER), "set_cull_mask", "get_cull_mask"); @@ -236,6 +237,7 @@ void Light::_bind_methods() { ADD_GROUP("", ""); BIND_ENUM_CONSTANT(PARAM_ENERGY); + BIND_ENUM_CONSTANT(PARAM_INDIRECT_ENERGY); BIND_ENUM_CONSTANT(PARAM_SPECULAR); BIND_ENUM_CONSTANT(PARAM_RANGE); BIND_ENUM_CONSTANT(PARAM_ATTENUATION); @@ -273,6 +275,7 @@ Light::Light(VisualServer::LightType p_type) { set_cull_mask(0xFFFFFFFF); set_param(PARAM_ENERGY, 1); + set_param(PARAM_INDIRECT_ENERGY, 1); set_param(PARAM_SPECULAR, 0.5); set_param(PARAM_RANGE, 5); set_param(PARAM_ATTENUATION, 1); diff --git a/scene/3d/light.h b/scene/3d/light.h index 2f3ac8a5e7..8514b429ec 100644 --- a/scene/3d/light.h +++ b/scene/3d/light.h @@ -46,6 +46,7 @@ class Light : public VisualInstance { public: enum Param { PARAM_ENERGY = VS::LIGHT_PARAM_ENERGY, + PARAM_INDIRECT_ENERGY = VS::LIGHT_PARAM_INDIRECT_ENERGY, PARAM_SPECULAR = VS::LIGHT_PARAM_SPECULAR, PARAM_RANGE = VS::LIGHT_PARAM_RANGE, PARAM_ATTENUATION = VS::LIGHT_PARAM_ATTENUATION, @@ -113,7 +114,7 @@ public: void set_shadow_reverse_cull_face(bool p_enable); bool get_shadow_reverse_cull_face() const; - virtual Rect3 get_aabb() const; + virtual AABB get_aabb() const; virtual PoolVector<Face3> get_faces(uint32_t p_usage_flags) const; Light(); diff --git a/scene/3d/mesh_instance.cpp b/scene/3d/mesh_instance.cpp index c8215971c4..1e52ccc6e0 100644 --- a/scene/3d/mesh_instance.cpp +++ b/scene/3d/mesh_instance.cpp @@ -165,12 +165,12 @@ NodePath MeshInstance::get_skeleton_path() { return skeleton_path; } -Rect3 MeshInstance::get_aabb() const { +AABB MeshInstance::get_aabb() const { if (!mesh.is_null()) return mesh->get_aabb(); - return Rect3(); + return AABB(); } PoolVector<Face3> MeshInstance::get_faces(uint32_t p_usage_flags) const { diff --git a/scene/3d/mesh_instance.h b/scene/3d/mesh_instance.h index 8e8c12a592..970a10aaf3 100644 --- a/scene/3d/mesh_instance.h +++ b/scene/3d/mesh_instance.h @@ -85,7 +85,7 @@ public: void create_debug_tangents(); - virtual Rect3 get_aabb() const; + virtual AABB get_aabb() const; virtual PoolVector<Face3> get_faces(uint32_t p_usage_flags) const; MeshInstance(); diff --git a/scene/3d/multimesh_instance.cpp b/scene/3d/multimesh_instance.cpp index f90489f1f0..ce7b97be7f 100644 --- a/scene/3d/multimesh_instance.cpp +++ b/scene/3d/multimesh_instance.cpp @@ -55,10 +55,10 @@ PoolVector<Face3> MultiMeshInstance::get_faces(uint32_t p_usage_flags) const { return PoolVector<Face3>(); } -Rect3 MultiMeshInstance::get_aabb() const { +AABB MultiMeshInstance::get_aabb() const { if (multimesh.is_null()) - return Rect3(); + return AABB(); else return multimesh->get_aabb(); } diff --git a/scene/3d/multimesh_instance.h b/scene/3d/multimesh_instance.h index cd0e7b463c..9b2b1ff9a7 100644 --- a/scene/3d/multimesh_instance.h +++ b/scene/3d/multimesh_instance.h @@ -52,7 +52,7 @@ public: void set_multimesh(const Ref<MultiMesh> &p_multimesh); Ref<MultiMesh> get_multimesh() const; - virtual Rect3 get_aabb() const; + virtual AABB get_aabb() const; MultiMeshInstance(); ~MultiMeshInstance(); diff --git a/scene/3d/particles.cpp b/scene/3d/particles.cpp index 6ac6e52367..2a032f5d96 100644 --- a/scene/3d/particles.cpp +++ b/scene/3d/particles.cpp @@ -31,9 +31,9 @@ #include "scene/resources/surface_tool.h" #include "servers/visual_server.h" -Rect3 Particles::get_aabb() const { +AABB Particles::get_aabb() const { - return Rect3(); + return AABB(); } PoolVector<Face3> Particles::get_faces(uint32_t p_usage_flags) const { @@ -82,7 +82,7 @@ void Particles::set_randomness_ratio(float p_ratio) { randomness_ratio = p_ratio; VS::get_singleton()->particles_set_randomness_ratio(particles, randomness_ratio); } -void Particles::set_visibility_aabb(const Rect3 &p_aabb) { +void Particles::set_visibility_aabb(const AABB &p_aabb) { visibility_aabb = p_aabb; VS::get_singleton()->particles_set_custom_aabb(particles, visibility_aabb); @@ -140,7 +140,7 @@ float Particles::get_randomness_ratio() const { return randomness_ratio; } -Rect3 Particles::get_visibility_aabb() const { +AABB Particles::get_visibility_aabb() const { return visibility_aabb; } @@ -252,7 +252,7 @@ void Particles::restart() { VisualServer::get_singleton()->particles_restart(particles); } -Rect3 Particles::capture_aabb() const { +AABB Particles::capture_aabb() const { return VS::get_singleton()->particles_get_current_aabb(particles); } @@ -335,7 +335,7 @@ void Particles::_bind_methods() { ADD_PROPERTY(PropertyInfo(Variant::INT, "fixed_fps", PROPERTY_HINT_RANGE, "0,1000,1"), "set_fixed_fps", "get_fixed_fps"); ADD_PROPERTY(PropertyInfo(Variant::BOOL, "fract_delta"), "set_fractional_delta", "get_fractional_delta"); ADD_GROUP("Drawing", ""); - ADD_PROPERTY(PropertyInfo(Variant::RECT3, "visibility_aabb"), "set_visibility_aabb", "get_visibility_aabb"); + ADD_PROPERTY(PropertyInfo(Variant::AABB, "visibility_aabb"), "set_visibility_aabb", "get_visibility_aabb"); ADD_PROPERTY(PropertyInfo(Variant::BOOL, "local_coords"), "set_use_local_coordinates", "get_use_local_coordinates"); ADD_PROPERTY(PropertyInfo(Variant::INT, "draw_order", PROPERTY_HINT_ENUM, "Index,Lifetime,View Depth"), "set_draw_order", "get_draw_order"); ADD_GROUP("Process Material", ""); @@ -367,7 +367,7 @@ Particles::Particles() { set_pre_process_time(0); set_explosiveness_ratio(0); set_randomness_ratio(0); - set_visibility_aabb(Rect3(Vector3(-4, -4, -4), Vector3(8, 8, 8))); + set_visibility_aabb(AABB(Vector3(-4, -4, -4), Vector3(8, 8, 8))); set_use_local_coordinates(true); set_draw_passes(1); set_draw_order(DRAW_ORDER_INDEX); @@ -836,9 +836,15 @@ void ParticlesMaterial::_update_shader() { if (flags[FLAG_DISABLE_Z]) { - code += " TRANSFORM[0] = vec4(cos(CUSTOM.x),-sin(CUSTOM.x),0.0,0.0);\n"; - code += " TRANSFORM[1] = vec4(sin(CUSTOM.x),cos(CUSTOM.x),0.0,0.0);\n"; - code += " TRANSFORM[2] = vec4(0.0,0.0,1.0,0.0);\n"; + if (flags[FLAG_ALIGN_Y_TO_VELOCITY]) { + code += " if (length(VELOCITY) > 0.0) { TRANSFORM[1].xyz = normalize(VELOCITY); } else { TRANSFORM[1].xyz = normalize(TRANSFORM[1].xyz); }\n"; + code += " TRANSFORM[0].xyz = normalize(cross(TRANSFORM[1].xyz,TRANSFORM[2].xyz));\n"; + code += " TRANSFORM[2] = vec4(0.0,0.0,1.0,0.0);\n"; + } else { + code += " TRANSFORM[0] = vec4(cos(CUSTOM.x),-sin(CUSTOM.x),0.0,0.0);\n"; + code += " TRANSFORM[1] = vec4(sin(CUSTOM.x),cos(CUSTOM.x),0.0,0.0);\n"; + code += " TRANSFORM[2] = vec4(0.0,0.0,1.0,0.0);\n"; + } } else { //orient particle Y towards velocity diff --git a/scene/3d/particles.h b/scene/3d/particles.h index e3109f470f..30080360bb 100644 --- a/scene/3d/particles.h +++ b/scene/3d/particles.h @@ -65,7 +65,7 @@ private: float explosiveness_ratio; float randomness_ratio; float speed_scale; - Rect3 visibility_aabb; + AABB visibility_aabb; bool local_coords; int fixed_fps; bool fractional_delta; @@ -82,7 +82,7 @@ protected: virtual void _validate_property(PropertyInfo &property) const; public: - Rect3 get_aabb() const; + AABB get_aabb() const; PoolVector<Face3> get_faces(uint32_t p_usage_flags) const; void set_emitting(bool p_emitting); @@ -92,7 +92,7 @@ public: void set_pre_process_time(float p_time); void set_explosiveness_ratio(float p_ratio); void set_randomness_ratio(float p_ratio); - void set_visibility_aabb(const Rect3 &p_aabb); + void set_visibility_aabb(const AABB &p_aabb); void set_use_local_coordinates(bool p_enable); void set_process_material(const Ref<Material> &p_material); void set_speed_scale(float p_scale); @@ -104,7 +104,7 @@ public: float get_pre_process_time() const; float get_explosiveness_ratio() const; float get_randomness_ratio() const; - Rect3 get_visibility_aabb() const; + AABB get_visibility_aabb() const; bool get_use_local_coordinates() const; Ref<Material> get_process_material() const; float get_speed_scale() const; @@ -128,7 +128,7 @@ public: void restart(); - Rect3 capture_aabb() const; + AABB capture_aabb() const; Particles(); ~Particles(); }; diff --git a/scene/3d/portal.cpp b/scene/3d/portal.cpp index 6c14f7dbc9..4fde29aab9 100644 --- a/scene/3d/portal.cpp +++ b/scene/3d/portal.cpp @@ -98,7 +98,7 @@ void Portal::_get_property_list(List<PropertyInfo> *p_list) const { p_list->push_back(PropertyInfo(Variant::REAL, "connect_range", PROPERTY_HINT_RANGE, "0.1,4096,0.01")); } -Rect3 Portal::get_aabb() const { +AABB Portal::get_aabb() const { return aabb; } diff --git a/scene/3d/portal.h b/scene/3d/portal.h index 6de3df8553..4ea208a718 100644 --- a/scene/3d/portal.h +++ b/scene/3d/portal.h @@ -53,7 +53,7 @@ class Portal : public VisualInstance { Color disabled_color; float connect_range; - Rect3 aabb; + AABB aabb; protected: bool _set(const StringName &p_name, const Variant &p_value); @@ -63,7 +63,7 @@ protected: static void _bind_methods(); public: - virtual Rect3 get_aabb() const; + virtual AABB get_aabb() const; virtual PoolVector<Face3> get_faces(uint32_t p_usage_flags) const; void set_enabled(bool p_enabled); diff --git a/scene/3d/ray_cast.cpp b/scene/3d/ray_cast.cpp index 9f61cc64ea..aebdcaf183 100644 --- a/scene/3d/ray_cast.cpp +++ b/scene/3d/ray_cast.cpp @@ -58,11 +58,6 @@ uint32_t RayCast::get_collision_mask() const { return collision_mask; } -void RayCast::set_type_mask(uint32_t p_mask) { - - type_mask = p_mask; -} - void RayCast::set_collision_mask_bit(int p_bit, bool p_value) { uint32_t mask = get_collision_mask(); @@ -78,11 +73,6 @@ bool RayCast::get_collision_mask_bit(int p_bit) const { return get_collision_mask() & (1 << p_bit); } -uint32_t RayCast::get_type_mask() const { - - return type_mask; -} - bool RayCast::is_colliding() const { return collided; @@ -187,7 +177,7 @@ void RayCast::_update_raycast_state() { PhysicsDirectSpaceState::RayResult rr; - if (dss->intersect_ray(gt.get_origin(), gt.xform(to), rr, exclude, collision_mask, type_mask)) { + if (dss->intersect_ray(gt.get_origin(), gt.xform(to), rr, exclude, collision_mask)) { collided = true; against = rr.collider_id; @@ -266,13 +256,9 @@ void RayCast::_bind_methods() { ClassDB::bind_method(D_METHOD("set_collision_mask_bit", "bit", "value"), &RayCast::set_collision_mask_bit); ClassDB::bind_method(D_METHOD("get_collision_mask_bit", "bit"), &RayCast::get_collision_mask_bit); - ClassDB::bind_method(D_METHOD("set_type_mask", "mask"), &RayCast::set_type_mask); - ClassDB::bind_method(D_METHOD("get_type_mask"), &RayCast::get_type_mask); - ADD_PROPERTY(PropertyInfo(Variant::BOOL, "enabled"), "set_enabled", "is_enabled"); ADD_PROPERTY(PropertyInfo(Variant::VECTOR3, "cast_to"), "set_cast_to", "get_cast_to"); ADD_PROPERTY(PropertyInfo(Variant::INT, "collision_mask", PROPERTY_HINT_LAYERS_3D_PHYSICS), "set_collision_mask", "get_collision_mask"); - 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() { @@ -344,7 +330,6 @@ RayCast::RayCast() { collided = false; against_shape = 0; collision_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 cac1596264..ca94580271 100644 --- a/scene/3d/ray_cast.h +++ b/scene/3d/ray_cast.h @@ -48,7 +48,6 @@ class RayCast : public Spatial { Set<RID> exclude; uint32_t collision_mask; - uint32_t type_mask; Node *debug_shape; Ref<Material> debug_material; @@ -75,9 +74,6 @@ public: void set_collision_mask_bit(int p_bit, bool p_value); bool get_collision_mask_bit(int p_bit) const; - void set_type_mask(uint32_t p_mask); - uint32_t get_type_mask() const; - void force_raycast_update(); bool is_colliding() const; Object *get_collider() const; diff --git a/scene/3d/reflection_probe.cpp b/scene/3d/reflection_probe.cpp index 46b105cd21..0e575ec152 100644 --- a/scene/3d/reflection_probe.cpp +++ b/scene/3d/reflection_probe.cpp @@ -178,9 +178,9 @@ ReflectionProbe::UpdateMode ReflectionProbe::get_update_mode() const { return update_mode; } -Rect3 ReflectionProbe::get_aabb() const { +AABB ReflectionProbe::get_aabb() const { - Rect3 aabb; + AABB aabb; aabb.position = -origin_offset; aabb.size = origin_offset + extents; return aabb; diff --git a/scene/3d/reflection_probe.h b/scene/3d/reflection_probe.h index 7c328a8f16..26f17fdcf9 100644 --- a/scene/3d/reflection_probe.h +++ b/scene/3d/reflection_probe.h @@ -101,7 +101,7 @@ public: void set_update_mode(UpdateMode p_mode); UpdateMode get_update_mode() const; - virtual Rect3 get_aabb() const; + virtual AABB get_aabb() const; virtual PoolVector<Face3> get_faces(uint32_t p_usage_flags) const; ReflectionProbe(); diff --git a/scene/3d/room_instance.cpp b/scene/3d/room_instance.cpp index 439b6bfdf8..47a7b8bfb9 100644 --- a/scene/3d/room_instance.cpp +++ b/scene/3d/room_instance.cpp @@ -66,12 +66,12 @@ void Room::_notification(int p_what) { } } -Rect3 Room::get_aabb() const { +AABB Room::get_aabb() const { if (room.is_null()) - return Rect3(); + return AABB(); - return Rect3(); + return AABB(); } PoolVector<Face3> Room::get_faces(uint32_t p_usage_flags) const { diff --git a/scene/3d/room_instance.h b/scene/3d/room_instance.h index b9a64b6670..3069ea2eba 100644 --- a/scene/3d/room_instance.h +++ b/scene/3d/room_instance.h @@ -71,7 +71,7 @@ public: NOTIFICATION_AREA_CHANGED = 60 }; - virtual Rect3 get_aabb() const; + virtual AABB get_aabb() const; virtual PoolVector<Face3> get_faces(uint32_t p_usage_flags) const; void set_room(const Ref<RoomBounds> &p_room); diff --git a/scene/3d/sprite_3d.cpp b/scene/3d/sprite_3d.cpp index 49a3205f21..18ebc22c8b 100644 --- a/scene/3d/sprite_3d.cpp +++ b/scene/3d/sprite_3d.cpp @@ -188,7 +188,7 @@ void SpriteBase3D::_queue_update() { call_deferred(SceneStringNames::get_singleton()->_im_update); } -Rect3 SpriteBase3D::get_aabb() const { +AABB SpriteBase3D::get_aabb() const { return aabb; } @@ -407,7 +407,7 @@ void Sprite3D::_draw() { } } - Rect3 aabb; + AABB aabb; for (int i = 0; i < 4; i++) { VS::get_singleton()->immediate_normal(immediate, normal); @@ -698,7 +698,7 @@ void AnimatedSprite3D::_draw() { } } - Rect3 aabb; + AABB aabb; for (int i = 0; i < 4; i++) { VS::get_singleton()->immediate_normal(immediate, normal); diff --git a/scene/3d/sprite_3d.h b/scene/3d/sprite_3d.h index 1165392cb2..d18553a504 100644 --- a/scene/3d/sprite_3d.h +++ b/scene/3d/sprite_3d.h @@ -71,7 +71,7 @@ private: Vector3::Axis axis; float pixel_size; - Rect3 aabb; + AABB aabb; RID immediate; @@ -87,7 +87,7 @@ protected: void _notification(int p_what); static void _bind_methods(); virtual void _draw() = 0; - _FORCE_INLINE_ void set_aabb(const Rect3 &p_aabb) { aabb = p_aabb; } + _FORCE_INLINE_ void set_aabb(const AABB &p_aabb) { aabb = p_aabb; } _FORCE_INLINE_ RID &get_immediate() { return immediate; } void _queue_update(); @@ -130,7 +130,7 @@ public: virtual Rect2 get_item_rect() const = 0; - virtual Rect3 get_aabb() const; + virtual AABB get_aabb() const; virtual PoolVector<Face3> get_faces(uint32_t p_usage_flags) const; SpriteBase3D(); diff --git a/scene/3d/visibility_notifier.cpp b/scene/3d/visibility_notifier.cpp index e60b32a92a..47144c4b78 100644 --- a/scene/3d/visibility_notifier.cpp +++ b/scene/3d/visibility_notifier.cpp @@ -60,7 +60,7 @@ void VisibilityNotifier::_exit_camera(Camera *p_camera) { } } -void VisibilityNotifier::set_aabb(const Rect3 &p_aabb) { +void VisibilityNotifier::set_aabb(const AABB &p_aabb) { if (aabb == p_aabb) return; @@ -74,7 +74,7 @@ void VisibilityNotifier::set_aabb(const Rect3 &p_aabb) { update_gizmo(); } -Rect3 VisibilityNotifier::get_aabb() const { +AABB VisibilityNotifier::get_aabb() const { return aabb; } @@ -108,7 +108,7 @@ void VisibilityNotifier::_bind_methods() { ClassDB::bind_method(D_METHOD("get_aabb"), &VisibilityNotifier::get_aabb); ClassDB::bind_method(D_METHOD("is_on_screen"), &VisibilityNotifier::is_on_screen); - ADD_PROPERTY(PropertyInfo(Variant::RECT3, "aabb"), "set_aabb", "get_aabb"); + ADD_PROPERTY(PropertyInfo(Variant::AABB, "aabb"), "set_aabb", "get_aabb"); ADD_SIGNAL(MethodInfo("camera_entered", PropertyInfo(Variant::OBJECT, "camera", PROPERTY_HINT_RESOURCE_TYPE, "Camera"))); ADD_SIGNAL(MethodInfo("camera_exited", PropertyInfo(Variant::OBJECT, "camera", PROPERTY_HINT_RESOURCE_TYPE, "Camera"))); @@ -118,7 +118,7 @@ void VisibilityNotifier::_bind_methods() { VisibilityNotifier::VisibilityNotifier() { - aabb = Rect3(Vector3(-1, -1, -1), Vector3(2, 2, 2)); + aabb = AABB(Vector3(-1, -1, -1), Vector3(2, 2, 2)); set_notify_transform(true); } diff --git a/scene/3d/visibility_notifier.h b/scene/3d/visibility_notifier.h index 0b83e0534e..fc06cf5aec 100644 --- a/scene/3d/visibility_notifier.h +++ b/scene/3d/visibility_notifier.h @@ -39,7 +39,7 @@ class VisibilityNotifier : public Spatial { Set<Camera *> cameras; - Rect3 aabb; + AABB aabb; protected: virtual void _screen_enter() {} @@ -53,8 +53,8 @@ protected: void _exit_camera(Camera *p_camera); public: - void set_aabb(const Rect3 &p_aabb); - Rect3 get_aabb() const; + void set_aabb(const AABB &p_aabb); + AABB get_aabb() const; bool is_on_screen() const; VisibilityNotifier(); diff --git a/scene/3d/visual_instance.cpp b/scene/3d/visual_instance.cpp index fa35d982eb..b92e7ead04 100644 --- a/scene/3d/visual_instance.cpp +++ b/scene/3d/visual_instance.cpp @@ -33,7 +33,7 @@ #include "servers/visual_server.h" #include "skeleton.h" -Rect3 VisualInstance::get_transformed_aabb() const { +AABB VisualInstance::get_transformed_aabb() const { return get_global_transform().xform(get_aabb()); } diff --git a/scene/3d/visual_instance.h b/scene/3d/visual_instance.h index c405236d2c..5827f1e1fb 100644 --- a/scene/3d/visual_instance.h +++ b/scene/3d/visual_instance.h @@ -62,10 +62,10 @@ public: }; RID get_instance() const; - virtual Rect3 get_aabb() const = 0; + virtual AABB get_aabb() const = 0; virtual PoolVector<Face3> get_faces(uint32_t p_usage_flags) const = 0; - virtual Rect3 get_transformed_aabb() const; // helper + virtual AABB get_transformed_aabb() const; // helper void set_base(const RID &p_base); diff --git a/scene/animation/animation_cache.cpp b/scene/animation/animation_cache.cpp index b35b2568d1..fbe2593362 100644 --- a/scene/animation/animation_cache.cpp +++ b/scene/animation/animation_cache.cpp @@ -87,95 +87,90 @@ void AnimationCache::_update_cache() { Ref<Resource> res; - if (np.get_subname_count()) { - - if (animation->track_get_type(i) == Animation::TYPE_TRANSFORM) { + if (animation->track_get_type(i) == Animation::TYPE_TRANSFORM) { + if (np.get_subname_count() > 1) { path_cache.push_back(Path()); ERR_EXPLAIN("Transform tracks can't have a subpath: " + np); ERR_CONTINUE(animation->track_get_type(i) == Animation::TYPE_TRANSFORM); } - RES res; - - for (int j = 0; j < np.get_subname_count(); j++) { - res = j == 0 ? node->get(np.get_subname(j)) : res->get(np.get_subname(j)); - if (res.is_null()) - break; - } + Spatial *sp = Object::cast_to<Spatial>(node); - if (res.is_null()) { + if (!sp) { path_cache.push_back(Path()); - ERR_EXPLAIN("Invalid Track SubPath in Animation: " + np); - ERR_CONTINUE(res.is_null()); + ERR_EXPLAIN("Transform track not of type Spatial: " + np); + ERR_CONTINUE(!sp); } - path.resource = res; - path.object = res.ptr(); - - } else { - - if (animation->track_get_type(i) == Animation::TYPE_TRANSFORM) { - StringName property = np.get_property(); + if (np.get_subname_count() == 1) { + StringName property = np.get_subname(0); String ps = property; - Spatial *sp = Object::cast_to<Spatial>(node); + Skeleton *sk = Object::cast_to<Skeleton>(node); + if (!sk) { - if (!sp) { + path_cache.push_back(Path()); + ERR_EXPLAIN("Property defined in Transform track, but not a Skeleton!: " + np); + ERR_CONTINUE(!sk); + } + int idx = sk->find_bone(ps); + if (idx == -1) { path_cache.push_back(Path()); - ERR_EXPLAIN("Transform track not of type Spatial: " + np); - ERR_CONTINUE(!sp); + ERR_EXPLAIN("Property defined in Transform track, but not a Skeleton Bone!: " + np); + ERR_CONTINUE(idx == -1); } - if (ps != "") { + path.bone_idx = idx; + path.skeleton = sk; + } - Skeleton *sk = Object::cast_to<Skeleton>(node); - if (!sk) { + path.spatial = sp; - path_cache.push_back(Path()); - ERR_EXPLAIN("Property defined in Transform track, but not a Skeleton!: " + np); - ERR_CONTINUE(!sk); - } + } else { + if (np.get_subname_count() > 0) { - int idx = sk->find_bone(ps); - if (idx == -1) { + RES res; + Vector<StringName> leftover_subpath; - path_cache.push_back(Path()); - ERR_EXPLAIN("Property defined in Transform track, but not a Skeleton Bone!: " + np); - ERR_CONTINUE(idx == -1); - } + // We don't want to cache the last resource unless it is a method call + bool is_method = animation->track_get_type(i) == Animation::TYPE_METHOD; + root->get_node_and_resource(np, res, leftover_subpath, is_method); - path.bone_idx = idx; - path.skeleton = sk; + if (res.is_valid()) { + path.resource = res; + } else { + path.node = node; } + path.object = res.is_valid() ? res.ptr() : (Object *)node; + path.subpath = leftover_subpath; - path.spatial = sp; - } + } else { - path.node = node; - path.object = node; + path.node = node; + path.object = node; + path.subpath = np.get_subnames(); + } } if (animation->track_get_type(i) == Animation::TYPE_VALUE) { - if (np.get_property().operator String() == "") { + if (np.get_subname_count() == 0) { path_cache.push_back(Path()); ERR_EXPLAIN("Value Track lacks property: " + np); - ERR_CONTINUE(np.get_property().operator String() == ""); + ERR_CONTINUE(np.get_subname_count() == 0); } - path.property = np.get_property(); - } else if (animation->track_get_type(i) == Animation::TYPE_METHOD) { - if (np.get_property().operator String() != "") { + if (path.subpath.size() != 0) { // Trying to call a method of a non-resource path_cache.push_back(Path()); ERR_EXPLAIN("Method Track has property: " + np); - ERR_CONTINUE(np.get_property().operator String() != ""); + ERR_CONTINUE(path.subpath.size() != 0); } } @@ -226,7 +221,7 @@ void AnimationCache::set_track_value(int p_idx, const Variant &p_value) { return; ERR_FAIL_COND(!p.object); - p.object->set(p.property, p_value); + p.object->set_indexed(p.subpath, p_value); } void AnimationCache::call_track(int p_idx, const StringName &p_method, const Variant **p_args, int p_argcount, Variant::CallError &r_error) { diff --git a/scene/animation/animation_cache.h b/scene/animation/animation_cache.h index e593668df6..481de59730 100644 --- a/scene/animation/animation_cache.h +++ b/scene/animation/animation_cache.h @@ -46,7 +46,7 @@ class AnimationCache : public Object { Spatial *spatial; int bone_idx; - StringName property; + Vector<StringName> subpath; bool valid; Path() { object = NULL; diff --git a/scene/animation/animation_player.cpp b/scene/animation/animation_player.cpp index 6be3ff88d9..010f5a586f 100644 --- a/scene/animation/animation_player.cpp +++ b/scene/animation/animation_player.cpp @@ -242,7 +242,8 @@ void AnimationPlayer::_generate_node_caches(AnimationData *p_anim) { p_anim->node_cache[i] = NULL; RES resource; - Node *child = parent->get_node_and_resource(a->track_get_path(i), resource); + Vector<StringName> leftover_path; + Node *child = parent->get_node_and_resource(a->track_get_path(i), resource, leftover_path); if (!child) { ERR_EXPLAIN("On Animation: '" + p_anim->name + "', couldn't resolve track: '" + String(a->track_get_path(i)) + "'"); } @@ -250,9 +251,9 @@ void AnimationPlayer::_generate_node_caches(AnimationData *p_anim) { uint32_t id = resource.is_valid() ? resource->get_instance_id() : child->get_instance_id(); int bone_idx = -1; - if (a->track_get_path(i).get_property() && Object::cast_to<Skeleton>(child)) { + if (a->track_get_path(i).get_subname_count() == 1 && Object::cast_to<Skeleton>(child)) { - bone_idx = Object::cast_to<Skeleton>(child)->find_bone(a->track_get_path(i).get_property()); + bone_idx = Object::cast_to<Skeleton>(child)->find_bone(a->track_get_path(i).get_subname(0)); if (bone_idx == -1) { continue; @@ -289,8 +290,8 @@ void AnimationPlayer::_generate_node_caches(AnimationData *p_anim) { p_anim->node_cache[i]->skeleton = Object::cast_to<Skeleton>(child); if (p_anim->node_cache[i]->skeleton) { - StringName bone_name = a->track_get_path(i).get_property(); - if (bone_name.operator String() != "") { + if (a->track_get_path(i).get_subname_count() == 1) { + StringName bone_name = a->track_get_path(i).get_subname(0); p_anim->node_cache[i]->bone_idx = p_anim->node_cache[i]->skeleton->find_bone(bone_name); if (p_anim->node_cache[i]->bone_idx < 0) { @@ -311,24 +312,23 @@ void AnimationPlayer::_generate_node_caches(AnimationData *p_anim) { if (a->track_get_type(i) == Animation::TYPE_VALUE) { - StringName property = a->track_get_path(i).get_property(); - if (!p_anim->node_cache[i]->property_anim.has(property)) { + if (!p_anim->node_cache[i]->property_anim.has(a->track_get_path(i).get_concatenated_subnames())) { TrackNodeCache::PropertyAnim pa; - pa.prop = property; + pa.subpath = leftover_path; pa.object = resource.is_valid() ? (Object *)resource.ptr() : (Object *)child; pa.special = SP_NONE; pa.owner = p_anim->node_cache[i]; if (false && p_anim->node_cache[i]->node_2d) { - if (pa.prop == SceneStringNames::get_singleton()->transform_pos) + if (leftover_path.size() == 1 && leftover_path[0] == SceneStringNames::get_singleton()->transform_pos) pa.special = SP_NODE2D_POS; - else if (pa.prop == SceneStringNames::get_singleton()->transform_rot) + else if (leftover_path.size() == 1 && leftover_path[0] == SceneStringNames::get_singleton()->transform_rot) pa.special = SP_NODE2D_ROT; - else if (pa.prop == SceneStringNames::get_singleton()->transform_scale) + else if (leftover_path.size() == 1 && leftover_path[0] == SceneStringNames::get_singleton()->transform_scale) pa.special = SP_NODE2D_SCALE; } - p_anim->node_cache[i]->property_anim[property] = pa; + p_anim->node_cache[i]->property_anim[a->track_get_path(i).get_concatenated_subnames()] = pa; } } } @@ -396,7 +396,7 @@ void AnimationPlayer::_animation_process_animation(AnimationData *p_anim, float //StringName property=a->track_get_path(i).get_property(); - Map<StringName, TrackNodeCache::PropertyAnim>::Element *E = nc->property_anim.find(a->track_get_path(i).get_property()); + Map<StringName, TrackNodeCache::PropertyAnim>::Element *E = nc->property_anim.find(a->track_get_path(i).get_concatenated_subnames()); ERR_CONTINUE(!E); //should it continue, or create a new one? TrackNodeCache::PropertyAnim *pa = &E->get(); @@ -434,7 +434,7 @@ void AnimationPlayer::_animation_process_animation(AnimationData *p_anim, float case SP_NONE: { bool valid; - pa->object->set(pa->prop, value, &valid); //you are not speshul + pa->object->set_indexed(pa->subpath, value, &valid); //you are not speshul #ifdef DEBUG_ENABLED if (!valid) { ERR_PRINTS("Failed setting track value '" + String(pa->owner->path) + "'. Check if property exists or the type of key is valid. Animation '" + a->get_name() + "' at node '" + get_path() + "'."); @@ -622,7 +622,7 @@ void AnimationPlayer::_animation_update_transforms() { case SP_NONE: { bool valid; - pa->object->set(pa->prop, pa->value_accum, &valid); //you are not speshul + pa->object->set_indexed(pa->subpath, pa->value_accum, &valid); //you are not speshul #ifdef DEBUG_ENABLED if (!valid) { ERR_PRINTS("Failed setting key at time " + rtos(playback.current.pos) + " in Animation '" + get_current_animation() + "' at Node '" + get_path() + "', Track '" + String(pa->owner->path) + "'. Check if property exists or the type of key is right for the property"); diff --git a/scene/animation/animation_player.h b/scene/animation/animation_player.h index 83da3b2e5c..e4e021c7fe 100644 --- a/scene/animation/animation_player.h +++ b/scene/animation/animation_player.h @@ -83,7 +83,7 @@ private: TrackNodeCache *owner; SpecialProperty special; //small optimization - StringName prop; + Vector<StringName> subpath; Object *object; Variant value_accum; uint64_t accum_pass; diff --git a/scene/animation/animation_tree_player.cpp b/scene/animation/animation_tree_player.cpp index ad5329c94b..23eccec82f 100644 --- a/scene/animation/animation_tree_player.cpp +++ b/scene/animation/animation_tree_player.cpp @@ -811,7 +811,7 @@ void AnimationTreePlayer::_process_animation(float p_delta) { t.scale.y = 0; t.scale.z = 0; - t.value = t.object->get(t.property); + t.value = t.object->get_indexed(t.subpath); t.value.zero(); t.skip = false; @@ -890,8 +890,8 @@ void AnimationTreePlayer::_process_animation(float p_delta) { if (t.skip || !t.object) continue; - if (t.property) { // value track - t.object->set(t.property, t.value); + if (t.subpath.size()) { // value track + t.object->set_indexed(t.subpath, t.value); continue; } @@ -1475,7 +1475,8 @@ AnimationTreePlayer::Track *AnimationTreePlayer::_find_track(const NodePath &p_p ERR_FAIL_COND_V(!parent, NULL); RES resource; - Node *child = parent->get_node_and_resource(p_path, resource); + Vector<StringName> leftover_path; + Node *child = parent->get_node_and_resource(p_path, resource, leftover_path); if (!child) { String err = "Animation track references unknown Node: '" + String(p_path) + "'."; WARN_PRINT(err.ascii().get_data()); @@ -1483,21 +1484,18 @@ AnimationTreePlayer::Track *AnimationTreePlayer::_find_track(const NodePath &p_p } ObjectID id = child->get_instance_id(); - StringName property; int bone_idx = -1; - if (p_path.get_property()) { + if (p_path.get_subname_count()) { if (Object::cast_to<Skeleton>(child)) - bone_idx = Object::cast_to<Skeleton>(child)->find_bone(p_path.get_property()); - if (bone_idx == -1) - property = p_path.get_property(); + bone_idx = Object::cast_to<Skeleton>(child)->find_bone(p_path.get_subname(0)); } TrackKey key; key.id = id; key.bone_idx = bone_idx; - key.property = property; + key.subpath_concatenated = p_path.get_concatenated_subnames(); if (!track_map.has(key)) { @@ -1507,7 +1505,7 @@ AnimationTreePlayer::Track *AnimationTreePlayer::_find_track(const NodePath &p_p tr.skeleton = Object::cast_to<Skeleton>(child); tr.spatial = Object::cast_to<Spatial>(child); tr.bone_idx = bone_idx; - tr.property = property; + if (bone_idx == -1) tr.subpath = leftover_path; track_map[key] = tr; } diff --git a/scene/animation/animation_tree_player.h b/scene/animation/animation_tree_player.h index 3e2bb88198..c49b0c4d1b 100644 --- a/scene/animation/animation_tree_player.h +++ b/scene/animation/animation_tree_player.h @@ -78,14 +78,14 @@ private: struct TrackKey { uint32_t id; - StringName property; + StringName subpath_concatenated; int bone_idx; inline bool operator<(const TrackKey &p_right) const { if (id == p_right.id) { if (bone_idx == p_right.bone_idx) { - return property < p_right.property; + return subpath_concatenated < p_right.subpath_concatenated; } else return bone_idx < p_right.bone_idx; } else @@ -99,7 +99,7 @@ private: Spatial *spatial; Skeleton *skeleton; int bone_idx; - StringName property; + Vector<StringName> subpath; Vector3 loc; Quat rot; diff --git a/scene/animation/tween.cpp b/scene/animation/tween.cpp index e0508cf147..151632a0cb 100644 --- a/scene/animation/tween.cpp +++ b/scene/animation/tween.cpp @@ -264,12 +264,12 @@ Variant &Tween::_get_initial_val(InterpolateData &p_data) { if (p_data.type == TARGETING_PROPERTY) { bool valid = false; - initial_val = object->get(p_data.target_key, &valid); + initial_val = object->get_indexed(p_data.target_key, &valid); ERR_FAIL_COND_V(!valid, p_data.initial_val); } else { Variant::CallError error; - initial_val = object->call(p_data.target_key, NULL, 0, error); + initial_val = object->call(p_data.target_key[0], NULL, 0, error); ERR_FAIL_COND_V(error.error != Variant::CallError::CALL_OK, p_data.initial_val); } return initial_val; @@ -296,12 +296,12 @@ Variant &Tween::_get_delta_val(InterpolateData &p_data) { if (p_data.type == FOLLOW_PROPERTY) { bool valid = false; - final_val = target->get(p_data.target_key, &valid); + final_val = target->get_indexed(p_data.target_key, &valid); ERR_FAIL_COND_V(!valid, p_data.initial_val); } else { Variant::CallError error; - final_val = target->call(p_data.target_key, NULL, 0, error); + final_val = target->call(p_data.target_key[0], NULL, 0, error); ERR_FAIL_COND_V(error.error != Variant::CallError::CALL_OK, p_data.initial_val); } @@ -416,10 +416,10 @@ Variant Tween::_run_equation(InterpolateData &p_data) { result = r; } break; - case Variant::RECT3: { - Rect3 i = initial_val; - Rect3 d = delta_val; - Rect3 r; + case Variant::AABB: { + AABB i = initial_val; + AABB d = delta_val; + AABB r; APPLY_EQUATION(position.x); APPLY_EQUATION(position.y); @@ -462,6 +462,9 @@ Variant Tween::_run_equation(InterpolateData &p_data) { result = r; } break; + default: { + result = initial_val; + } break; }; #undef APPLY_EQUATION @@ -479,7 +482,7 @@ bool Tween::_apply_tween_value(InterpolateData &p_data, Variant &value) { case FOLLOW_PROPERTY: case TARGETING_PROPERTY: { bool valid = false; - object->set(p_data.key, value, &valid); + object->set_indexed(p_data.key, value, &valid); return valid; } @@ -489,9 +492,9 @@ bool Tween::_apply_tween_value(InterpolateData &p_data, Variant &value) { Variant::CallError error; if (value.get_type() != Variant::NIL) { Variant *arg[1] = { &value }; - object->call(p_data.key, (const Variant **)arg, 1, error); + object->call(p_data.key[0], (const Variant **)arg, 1, error); } else { - object->call(p_data.key, NULL, 0, error); + object->call(p_data.key[0], NULL, 0, error); } if (error.error == Variant::CallError::CALL_OK) @@ -548,7 +551,7 @@ void Tween::_tween_process(float p_delta) { continue; else if (prev_delaying) { - emit_signal("tween_started", object, data.key); + emit_signal("tween_started", object, NodePath(Vector<StringName>(), data.key, false)); _apply_tween_value(data, data.initial_val); } @@ -562,7 +565,7 @@ void Tween::_tween_process(float p_delta) { case INTER_PROPERTY: case INTER_METHOD: { Variant result = _run_equation(data); - emit_signal("tween_step", object, data.key, data.elapsed, result); + emit_signal("tween_step", object, NodePath(Vector<StringName>(), data.key, false), data.elapsed, result); _apply_tween_value(data, result); if (data.finish) _apply_tween_value(data, data.final_val); @@ -574,22 +577,22 @@ void Tween::_tween_process(float p_delta) { switch (data.args) { case 0: - object->call_deferred(data.key); + object->call_deferred(data.key[0]); break; case 1: - object->call_deferred(data.key, data.arg[0]); + object->call_deferred(data.key[0], data.arg[0]); break; case 2: - object->call_deferred(data.key, data.arg[0], data.arg[1]); + object->call_deferred(data.key[0], data.arg[0], data.arg[1]); break; case 3: - object->call_deferred(data.key, data.arg[0], data.arg[1], data.arg[2]); + object->call_deferred(data.key[0], data.arg[0], data.arg[1], data.arg[2]); break; case 4: - object->call_deferred(data.key, data.arg[0], data.arg[1], data.arg[2], data.arg[3]); + object->call_deferred(data.key[0], data.arg[0], data.arg[1], data.arg[2], data.arg[3]); break; case 5: - object->call_deferred(data.key, data.arg[0], data.arg[1], data.arg[2], data.arg[3], data.arg[4]); + object->call_deferred(data.key[0], data.arg[0], data.arg[1], data.arg[2], data.arg[3], data.arg[4]); break; } } else { @@ -601,17 +604,18 @@ void Tween::_tween_process(float p_delta) { &data.arg[3], &data.arg[4], }; - object->call(data.key, (const Variant **)arg, data.args, error); + object->call(data.key[0], (const Variant **)arg, data.args, error); } } break; + default: {} } if (data.finish) { - emit_signal("tween_completed", object, data.key); + emit_signal("tween_completed", object, NodePath(Vector<StringName>(), data.key, false)); // not repeat mode, remove completed action if (!repeat) - call_deferred("_remove", object, data.key, true); + call_deferred("_remove", object, NodePath(Vector<StringName>(), data.key, false), true); } } pending_update--; @@ -690,7 +694,7 @@ bool Tween::start() { return true; } -bool Tween::reset(Object *p_object, String p_key) { +bool Tween::reset(Object *p_object, StringName p_key) { pending_update++; for (List<InterpolateData>::Element *E = interpolates.front(); E; E = E->next()) { @@ -700,7 +704,7 @@ bool Tween::reset(Object *p_object, String p_key) { if (object == NULL) continue; - if (object == p_object && (data.key == p_key || p_key == "")) { + if (object == p_object && (data.concatenated_key == p_key || p_key == "")) { data.elapsed = 0; data.finish = false; @@ -727,7 +731,7 @@ bool Tween::reset_all() { return true; } -bool Tween::stop(Object *p_object, String p_key) { +bool Tween::stop(Object *p_object, StringName p_key) { pending_update++; for (List<InterpolateData>::Element *E = interpolates.front(); E; E = E->next()) { @@ -736,7 +740,7 @@ bool Tween::stop(Object *p_object, String p_key) { Object *object = ObjectDB::get_instance(data.id); if (object == NULL) continue; - if (object == p_object && (data.key == p_key || p_key == "")) + if (object == p_object && (data.concatenated_key == p_key || p_key == "")) data.active = false; } pending_update--; @@ -758,7 +762,7 @@ bool Tween::stop_all() { return true; } -bool Tween::resume(Object *p_object, String p_key) { +bool Tween::resume(Object *p_object, StringName p_key) { set_active(true); _set_process(true); @@ -770,7 +774,7 @@ bool Tween::resume(Object *p_object, String p_key) { Object *object = ObjectDB::get_instance(data.id); if (object == NULL) continue; - if (object == p_object && (data.key == p_key || p_key == "")) + if (object == p_object && (data.concatenated_key == p_key || p_key == "")) data.active = true; } pending_update--; @@ -792,12 +796,12 @@ bool Tween::resume_all() { return true; } -bool Tween::remove(Object *p_object, String p_key) { +bool Tween::remove(Object *p_object, StringName p_key) { _remove(p_object, p_key, false); return true; } -void Tween::_remove(Object *p_object, String p_key, bool first_only) { +void Tween::_remove(Object *p_object, StringName p_key, bool first_only) { if (pending_update != 0) { call_deferred("_remove", p_object, p_key, first_only); @@ -810,7 +814,7 @@ void Tween::_remove(Object *p_object, String p_key, bool first_only) { Object *object = ObjectDB::get_instance(data.id); if (object == NULL) continue; - if (object == p_object && (data.key == p_key || p_key == "")) { + if (object == p_object && (data.concatenated_key == p_key || p_key == "")) { for_removal.push_back(E); if (first_only) { break; @@ -850,8 +854,9 @@ bool Tween::seek(real_t p_time) { data.finish = true; data.elapsed = (data.delay + data.duration); - } else + } else { data.finish = false; + } switch (data.type) { case INTER_PROPERTY: @@ -956,10 +961,10 @@ bool Tween::_calc_delta_val(const Variant &p_initial_val, const Variant &p_final case Variant::QUAT: delta_val = final_val.operator Quat() - initial_val.operator Quat(); break; - case Variant::RECT3: { - Rect3 i = initial_val; - Rect3 f = final_val; - delta_val = Rect3(f.position - i.position, f.size - i.size); + case Variant::AABB: { + AABB i = initial_val; + AABB f = final_val; + delta_val = AABB(f.position - i.position, f.size - i.size); } break; case Variant::TRANSFORM: { Transform i = initial_val; @@ -993,11 +998,15 @@ bool Tween::_calc_delta_val(const Variant &p_initial_val, const Variant &p_final return true; } -bool Tween::interpolate_property(Object *p_object, String p_property, Variant p_initial_val, Variant p_final_val, real_t p_duration, TransitionType p_trans_type, EaseType p_ease_type, real_t p_delay) { +bool Tween::interpolate_property(Object *p_object, NodePath p_property, Variant p_initial_val, Variant p_final_val, real_t p_duration, TransitionType p_trans_type, EaseType p_ease_type, real_t p_delay) { if (pending_update != 0) { _add_pending_command("interpolate_property", p_object, p_property, p_initial_val, p_final_val, p_duration, p_trans_type, p_ease_type, p_delay); return true; } + p_property = p_property.get_as_property_path(); + + if (p_initial_val.get_type() == Variant::NIL) p_initial_val = p_object->get_indexed(p_property.get_subnames()); + // convert INT to REAL is better for interpolaters if (p_initial_val.get_type() == Variant::INT) p_initial_val = p_initial_val.operator real_t(); if (p_final_val.get_type() == Variant::INT) p_final_val = p_final_val.operator real_t(); @@ -1011,7 +1020,7 @@ bool Tween::interpolate_property(Object *p_object, String p_property, Variant p_ ERR_FAIL_COND_V(p_delay < 0, false); bool prop_valid = false; - p_object->get(p_property, &prop_valid); + p_object->get_indexed(p_property.get_subnames(), &prop_valid); ERR_FAIL_COND_V(!prop_valid, false); InterpolateData data; @@ -1021,7 +1030,8 @@ bool Tween::interpolate_property(Object *p_object, String p_property, Variant p_ data.elapsed = 0; data.id = p_object->get_instance_id(); - data.key = p_property; + data.key = p_property.get_subnames(); + data.concatenated_key = p_property.get_concatenated_subnames(); data.initial_val = p_initial_val; data.final_val = p_final_val; data.duration = p_duration; @@ -1036,7 +1046,7 @@ bool Tween::interpolate_property(Object *p_object, String p_property, Variant p_ return true; } -bool Tween::interpolate_method(Object *p_object, String p_method, Variant p_initial_val, Variant p_final_val, real_t p_duration, TransitionType p_trans_type, EaseType p_ease_type, real_t p_delay) { +bool Tween::interpolate_method(Object *p_object, StringName p_method, Variant p_initial_val, Variant p_final_val, real_t p_duration, TransitionType p_trans_type, EaseType p_ease_type, real_t p_delay) { if (pending_update != 0) { _add_pending_command("interpolate_method", p_object, p_method, p_initial_val, p_final_val, p_duration, p_trans_type, p_ease_type, p_delay); return true; @@ -1063,7 +1073,8 @@ bool Tween::interpolate_method(Object *p_object, String p_method, Variant p_init data.elapsed = 0; data.id = p_object->get_instance_id(); - data.key = p_method; + data.key.push_back(p_method); + data.concatenated_key = p_method; data.initial_val = p_initial_val; data.final_val = p_final_val; data.duration = p_duration; @@ -1100,7 +1111,8 @@ bool Tween::interpolate_callback(Object *p_object, real_t p_duration, String p_c data.elapsed = 0; data.id = p_object->get_instance_id(); - data.key = p_callback; + data.key.push_back(p_callback); + data.concatenated_key = p_callback; data.duration = p_duration; data.delay = 0; @@ -1152,7 +1164,8 @@ bool Tween::interpolate_deferred_callback(Object *p_object, real_t p_duration, S data.elapsed = 0; data.id = p_object->get_instance_id(); - data.key = p_callback; + data.key.push_back(p_callback); + data.concatenated_key = p_callback; data.duration = p_duration; data.delay = 0; @@ -1183,11 +1196,16 @@ bool Tween::interpolate_deferred_callback(Object *p_object, real_t p_duration, S return true; } -bool Tween::follow_property(Object *p_object, String p_property, Variant p_initial_val, Object *p_target, String p_target_property, real_t p_duration, TransitionType p_trans_type, EaseType p_ease_type, real_t p_delay) { +bool Tween::follow_property(Object *p_object, NodePath p_property, Variant p_initial_val, Object *p_target, NodePath p_target_property, real_t p_duration, TransitionType p_trans_type, EaseType p_ease_type, real_t p_delay) { if (pending_update != 0) { _add_pending_command("follow_property", p_object, p_property, p_initial_val, p_target, p_target_property, p_duration, p_trans_type, p_ease_type, p_delay); return true; } + p_property = p_property.get_as_property_path(); + p_target_property = p_target_property.get_as_property_path(); + + if (p_initial_val.get_type() == Variant::NIL) p_initial_val = p_object->get_indexed(p_property.get_subnames()); + // convert INT to REAL is better for interpolaters if (p_initial_val.get_type() == Variant::INT) p_initial_val = p_initial_val.operator real_t(); @@ -1201,11 +1219,11 @@ bool Tween::follow_property(Object *p_object, String p_property, Variant p_initi ERR_FAIL_COND_V(p_delay < 0, false); bool prop_valid = false; - p_object->get(p_property, &prop_valid); + p_object->get_indexed(p_property.get_subnames(), &prop_valid); ERR_FAIL_COND_V(!prop_valid, false); bool target_prop_valid = false; - Variant target_val = p_target->get(p_target_property, &target_prop_valid); + Variant target_val = p_target->get_indexed(p_target_property.get_subnames(), &target_prop_valid); ERR_FAIL_COND_V(!target_prop_valid, false); // convert INT to REAL is better for interpolaters @@ -1219,10 +1237,11 @@ bool Tween::follow_property(Object *p_object, String p_property, Variant p_initi data.elapsed = 0; data.id = p_object->get_instance_id(); - data.key = p_property; + data.key = p_property.get_subnames(); + data.concatenated_key = p_property.get_concatenated_subnames(); data.initial_val = p_initial_val; data.target_id = p_target->get_instance_id(); - data.target_key = p_target_property; + data.target_key = p_target_property.get_subnames(); data.duration = p_duration; data.trans_type = p_trans_type; data.ease_type = p_ease_type; @@ -1232,7 +1251,7 @@ bool Tween::follow_property(Object *p_object, String p_property, Variant p_initi return true; } -bool Tween::follow_method(Object *p_object, String p_method, Variant p_initial_val, Object *p_target, String p_target_method, real_t p_duration, TransitionType p_trans_type, EaseType p_ease_type, real_t p_delay) { +bool Tween::follow_method(Object *p_object, StringName p_method, Variant p_initial_val, Object *p_target, StringName p_target_method, real_t p_duration, TransitionType p_trans_type, EaseType p_ease_type, real_t p_delay) { if (pending_update != 0) { _add_pending_command("follow_method", p_object, p_method, p_initial_val, p_target, p_target_method, p_duration, p_trans_type, p_ease_type, p_delay); return true; @@ -1269,10 +1288,11 @@ bool Tween::follow_method(Object *p_object, String p_method, Variant p_initial_v data.elapsed = 0; data.id = p_object->get_instance_id(); - data.key = p_method; + data.key.push_back(p_method); + data.concatenated_key = p_method; data.initial_val = p_initial_val; data.target_id = p_target->get_instance_id(); - data.target_key = p_target_method; + data.target_key.push_back(p_target_method); data.duration = p_duration; data.trans_type = p_trans_type; data.ease_type = p_ease_type; @@ -1282,11 +1302,15 @@ bool Tween::follow_method(Object *p_object, String p_method, Variant p_initial_v return true; } -bool Tween::targeting_property(Object *p_object, String p_property, Object *p_initial, String p_initial_property, Variant p_final_val, real_t p_duration, TransitionType p_trans_type, EaseType p_ease_type, real_t p_delay) { +bool Tween::targeting_property(Object *p_object, NodePath p_property, Object *p_initial, NodePath p_initial_property, Variant p_final_val, real_t p_duration, TransitionType p_trans_type, EaseType p_ease_type, real_t p_delay) { + if (pending_update != 0) { _add_pending_command("targeting_property", p_object, p_property, p_initial, p_initial_property, p_final_val, p_duration, p_trans_type, p_ease_type, p_delay); return true; } + p_property = p_property.get_as_property_path(); + p_initial_property = p_initial_property.get_as_property_path(); + // convert INT to REAL is better for interpolaters if (p_final_val.get_type() == Variant::INT) p_final_val = p_final_val.operator real_t(); @@ -1300,11 +1324,11 @@ bool Tween::targeting_property(Object *p_object, String p_property, Object *p_in ERR_FAIL_COND_V(p_delay < 0, false); bool prop_valid = false; - p_object->get(p_property, &prop_valid); + p_object->get_indexed(p_property.get_subnames(), &prop_valid); ERR_FAIL_COND_V(!prop_valid, false); bool initial_prop_valid = false; - Variant initial_val = p_initial->get(p_initial_property, &initial_prop_valid); + Variant initial_val = p_initial->get_indexed(p_initial_property.get_subnames(), &initial_prop_valid); ERR_FAIL_COND_V(!initial_prop_valid, false); // convert INT to REAL is better for interpolaters @@ -1318,9 +1342,10 @@ bool Tween::targeting_property(Object *p_object, String p_property, Object *p_in data.elapsed = 0; data.id = p_object->get_instance_id(); - data.key = p_property; + data.key = p_property.get_subnames(); + data.concatenated_key = p_property.get_concatenated_subnames(); data.target_id = p_initial->get_instance_id(); - data.target_key = p_initial_property; + data.target_key = p_initial_property.get_subnames(); data.initial_val = initial_val; data.final_val = p_final_val; data.duration = p_duration; @@ -1335,7 +1360,7 @@ bool Tween::targeting_property(Object *p_object, String p_property, Object *p_in return true; } -bool Tween::targeting_method(Object *p_object, String p_method, Object *p_initial, String p_initial_method, Variant p_final_val, real_t p_duration, TransitionType p_trans_type, EaseType p_ease_type, real_t p_delay) { +bool Tween::targeting_method(Object *p_object, StringName p_method, Object *p_initial, StringName p_initial_method, Variant p_final_val, real_t p_duration, TransitionType p_trans_type, EaseType p_ease_type, real_t p_delay) { if (pending_update != 0) { _add_pending_command("targeting_method", p_object, p_method, p_initial, p_initial_method, p_final_val, p_duration, p_trans_type, p_ease_type, p_delay); return true; @@ -1372,9 +1397,10 @@ bool Tween::targeting_method(Object *p_object, String p_method, Object *p_initia data.elapsed = 0; data.id = p_object->get_instance_id(); - data.key = p_method; + data.key.push_back(p_method); + data.concatenated_key = p_method; data.target_id = p_initial->get_instance_id(); - data.target_key = p_initial_method; + data.target_key.push_back(p_initial_method); data.initial_val = initial_val; data.final_val = p_final_val; data.duration = p_duration; diff --git a/scene/animation/tween.h b/scene/animation/tween.h index fac1d346b4..44710b25f9 100644 --- a/scene/animation/tween.h +++ b/scene/animation/tween.h @@ -86,12 +86,13 @@ private: bool call_deferred; real_t elapsed; ObjectID id; - StringName key; + Vector<StringName> key; + StringName concatenated_key; Variant initial_val; Variant delta_val; Variant final_val; ObjectID target_id; - StringName target_key; + Vector<StringName> target_key; real_t duration; TransitionType trans_type; EaseType ease_type; @@ -132,7 +133,7 @@ private: void _tween_process(float p_delta); void _set_process(bool p_process, bool p_force = false); - void _remove(Object *p_object, String p_key, bool first_only); + void _remove(Object *p_object, StringName p_key, bool first_only); protected: bool _set(const StringName &p_name, const Variant &p_value); @@ -156,34 +157,34 @@ public: float get_speed_scale() const; bool start(); - bool reset(Object *p_object, String p_key); + bool reset(Object *p_object, StringName p_key); bool reset_all(); - bool stop(Object *p_object, String p_key); + bool stop(Object *p_object, StringName p_key); bool stop_all(); - bool resume(Object *p_object, String p_key); + bool resume(Object *p_object, StringName p_key); bool resume_all(); - bool remove(Object *p_object, String p_key); + bool remove(Object *p_object, StringName p_key); bool remove_all(); bool seek(real_t p_time); real_t tell() const; real_t get_runtime() const; - bool interpolate_property(Object *p_object, String p_property, Variant p_initial_val, Variant p_final_val, real_t p_duration, TransitionType p_trans_type, EaseType p_ease_type, real_t p_delay = 0); + bool interpolate_property(Object *p_object, NodePath p_property, Variant p_initial_val, Variant p_final_val, real_t p_duration, TransitionType p_trans_type, EaseType p_ease_type, real_t p_delay = 0); - bool interpolate_method(Object *p_object, String p_method, Variant p_initial_val, Variant p_final_val, real_t p_duration, TransitionType p_trans_type, EaseType p_ease_type, real_t p_delay = 0); + bool interpolate_method(Object *p_object, StringName p_method, Variant p_initial_val, Variant p_final_val, real_t p_duration, TransitionType p_trans_type, EaseType p_ease_type, real_t p_delay = 0); bool interpolate_callback(Object *p_object, real_t p_duration, String p_callback, VARIANT_ARG_DECLARE); bool interpolate_deferred_callback(Object *p_object, real_t p_duration, String p_callback, VARIANT_ARG_DECLARE); - bool follow_property(Object *p_object, String p_property, Variant p_initial_val, Object *p_target, String p_target_property, real_t p_duration, TransitionType p_trans_type, EaseType p_ease_type, real_t p_delay = 0); + bool follow_property(Object *p_object, NodePath p_property, Variant p_initial_val, Object *p_target, NodePath p_target_property, real_t p_duration, TransitionType p_trans_type, EaseType p_ease_type, real_t p_delay = 0); - bool follow_method(Object *p_object, String p_method, Variant p_initial_val, Object *p_target, String p_target_method, real_t p_duration, TransitionType p_trans_type, EaseType p_ease_type, real_t p_delay = 0); + bool follow_method(Object *p_object, StringName p_method, Variant p_initial_val, Object *p_target, StringName p_target_method, real_t p_duration, TransitionType p_trans_type, EaseType p_ease_type, real_t p_delay = 0); - bool targeting_property(Object *p_object, String p_property, Object *p_initial, String p_initial_property, Variant p_final_val, real_t p_duration, TransitionType p_trans_type, EaseType p_ease_type, real_t p_delay = 0); + bool targeting_property(Object *p_object, NodePath p_property, Object *p_initial, NodePath p_initial_property, Variant p_final_val, real_t p_duration, TransitionType p_trans_type, EaseType p_ease_type, real_t p_delay = 0); - bool targeting_method(Object *p_object, String p_method, Object *p_initial, String p_initial_method, Variant p_final_val, real_t p_duration, TransitionType p_trans_type, EaseType p_ease_type, real_t p_delay = 0); + bool targeting_method(Object *p_object, StringName p_method, Object *p_initial, StringName p_initial_method, Variant p_final_val, real_t p_duration, TransitionType p_trans_type, EaseType p_ease_type, real_t p_delay = 0); Tween(); ~Tween(); diff --git a/scene/gui/control.cpp b/scene/gui/control.cpp index e73ada9f31..adca78d1d4 100644 --- a/scene/gui/control.cpp +++ b/scene/gui/control.cpp @@ -45,7 +45,7 @@ #endif #include <stdio.h> -Variant Control::edit_get_state() const { +Dictionary Control::_edit_get_state() const { Dictionary s; s["rect"] = get_rect(); @@ -59,22 +59,78 @@ Variant Control::edit_get_state() const { s["anchors"] = anchors; return s; } -void Control::edit_set_state(const Variant &p_state) { +void Control::_edit_set_state(const Dictionary &p_state) { - Dictionary s = p_state; + Dictionary state = p_state; - Rect2 state = s["rect"]; - set_position(state.position); - set_size(state.size); - set_rotation(s["rotation"]); - set_scale(s["scale"]); - Array anchors = s["anchors"]; + Rect2 rect = state["rect"]; + set_position(rect.position); + set_size(rect.size); + set_rotation(state["rotation"]); + set_scale(state["scale"]); + Array anchors = state["anchors"]; set_anchor(MARGIN_LEFT, anchors[0]); set_anchor(MARGIN_TOP, anchors[1]); set_anchor(MARGIN_RIGHT, anchors[2]); set_anchor(MARGIN_BOTTOM, anchors[3]); } +void Control::_edit_set_position(const Point2 &p_position) { + set_position(p_position); +}; + +Point2 Control::_edit_get_position() const { + return get_position(); +}; + +void Control::_edit_set_rect(const Rect2 &p_edit_rect) { + + Transform2D xform = _get_internal_transform(); + + Vector2 new_pos = xform.basis_xform(p_edit_rect.position); + + Vector2 pos = get_position() + new_pos; + + Rect2 new_rect = get_rect(); + new_rect.position = pos.snapped(Vector2(1, 1)); + new_rect.size = p_edit_rect.size.snapped(Vector2(1, 1)); + + set_position(new_rect.position); + set_size(new_rect.size); +} + +Rect2 Control::_edit_get_rect() const { + return Rect2(Point2(), get_size()); +} + +bool Control::_edit_use_rect() const { + return true; +} + +void Control::_edit_set_rotation(float p_rotation) { + set_rotation(p_rotation); +} + +float Control::_edit_get_rotation() const { + return get_rotation(); +} + +bool Control::_edit_use_rotation() const { + return true; +} + +void Control::_edit_set_pivot(const Point2 &p_pivot) { + set_pivot_offset(p_pivot); +} + +Point2 Control::_edit_get_pivot() const { + return get_pivot_offset(); +} + +bool Control::_edit_use_pivot() const { + return true; +} + void Control::set_custom_minimum_size(const Size2 &p_custom) { if (p_custom == data.custom_minimum_size) @@ -96,7 +152,7 @@ Size2 Control::get_combined_minimum_size() const { return minsize; } -Size2 Control::edit_get_minimum_size() const { +Size2 Control::_edit_get_minimum_size() const { return get_combined_minimum_size(); } @@ -110,23 +166,6 @@ Transform2D Control::_get_internal_transform() const { return offset.affine_inverse() * (rot_scale * offset); } -void Control::edit_set_rect(const Rect2 &p_edit_rect) { - - Transform2D xform = _get_internal_transform(); - - // xform[2] += get_position(); - - Vector2 new_pos = xform.basis_xform(p_edit_rect.position); - - Vector2 pos = get_position() + new_pos; - - Rect2 new_rect = get_rect(); - new_rect.position = pos.snapped(Vector2(1, 1)); - new_rect.size = p_edit_rect.size.snapped(Vector2(1, 1)); - - set_position(new_rect.position); - set_size(new_rect.size); -} bool Control::_set(const StringName &p_name, const Variant &p_value) { @@ -1210,7 +1249,7 @@ Size2 Control::get_parent_area_size() const { if (data.parent_canvas_item) { - parent_size = data.parent_canvas_item->get_item_rect().size; + parent_size = data.parent_canvas_item->_edit_get_rect().size; } else { parent_size = get_viewport()->get_visible_rect().size; @@ -1289,7 +1328,7 @@ float Control::_get_parent_range(int p_idx) const { } if (data.parent_canvas_item) { - return data.parent_canvas_item->get_item_rect().size[p_idx & 1]; + return data.parent_canvas_item->_edit_get_rect().size[p_idx & 1]; } else { return get_viewport()->get_visible_rect().size[p_idx & 1]; } @@ -1751,11 +1790,6 @@ Rect2 Control::get_rect() const { return Rect2(get_position(), get_size()); } -Rect2 Control::get_item_rect() const { - - return Rect2(Point2(), get_size()); -} - void Control::add_icon_override(const StringName &p_name, const Ref<Texture> &p_icon) { ERR_FAIL_COND(p_icon.is_null()); @@ -1847,6 +1881,25 @@ Control *Control::find_next_valid_focus() const { while (true) { + // If the focus property is manually overwritten, attempt to use it. + + if (!data.focus_next.is_empty()) { + Node *n = get_node(data.focus_next); + if (n) { + from = Object::cast_to<Control>(n); + + if (!from) { + + ERR_EXPLAIN("Next focus node is not a control: " + n->get_name()); + ERR_FAIL_V(NULL); + } + } else { + return NULL; + } + if (from->is_visible() && from->get_focus_mode() != FOCUS_NONE) + return from; + } + // find next child Control *next_child = NULL; @@ -1926,6 +1979,25 @@ Control *Control::find_prev_valid_focus() const { while (true) { + // If the focus property is manually overwritten, attempt to use it. + + if (!data.focus_prev.is_empty()) { + Node *n = get_node(data.focus_prev); + if (n) { + from = Object::cast_to<Control>(n); + + if (!from) { + + ERR_EXPLAIN("Prev focus node is not a control: " + n->get_name()); + ERR_FAIL_V(NULL); + } + } else { + return NULL; + } + if (from->is_visible() && from->get_focus_mode() != FOCUS_NONE) + return from; + } + // find prev child Control *prev_child = NULL; @@ -2157,6 +2229,26 @@ NodePath Control::get_focus_neighbour(Margin p_margin) const { return data.focus_neighbour[p_margin]; } +void Control::set_focus_next(const NodePath &p_next) { + + data.focus_next = p_next; +} + +NodePath Control::get_focus_next() const { + + return data.focus_next; +} + +void Control::set_focus_previous(const NodePath &p_prev) { + + data.focus_prev = p_prev; +} + +NodePath Control::get_focus_previous() const { + + return data.focus_prev; +} + #define MAX_NEIGHBOUR_SEARCH_COUNT 512 Control *Control::_get_focus_neighbour(Margin p_margin, int p_count) { @@ -2172,7 +2264,7 @@ Control *Control::_get_focus_neighbour(Margin p_margin, int p_count) { if (!c) { - ERR_EXPLAIN("Next focus node is not a control: " + n->get_name()); + ERR_EXPLAIN("Neighbour focus node is not a control: " + n->get_name()); ERR_FAIL_V(NULL); } } else { @@ -2196,7 +2288,7 @@ Control *Control::_get_focus_neighbour(Margin p_margin, int p_count) { Point2 points[4]; Transform2D xform = get_global_transform(); - Rect2 rect = get_item_rect(); + Rect2 rect = _edit_get_rect(); points[0] = xform.xform(rect.position); points[1] = xform.xform(rect.position + Point2(rect.size.x, 0)); @@ -2255,7 +2347,7 @@ void Control::_window_find_focus_neighbour(const Vector2 &p_dir, Node *p_at, con Point2 points[4]; Transform2D xform = c->get_global_transform(); - Rect2 rect = c->get_item_rect(); + Rect2 rect = c->_edit_get_rect(); points[0] = xform.xform(rect.position); points[1] = xform.xform(rect.position + Point2(rect.size.x, 0)); @@ -2677,6 +2769,12 @@ void Control::_bind_methods() { ClassDB::bind_method(D_METHOD("set_focus_neighbour", "margin", "neighbour"), &Control::set_focus_neighbour); ClassDB::bind_method(D_METHOD("get_focus_neighbour", "margin"), &Control::get_focus_neighbour); + ClassDB::bind_method(D_METHOD("set_focus_next", "next"), &Control::set_focus_next); + ClassDB::bind_method(D_METHOD("get_focus_next"), &Control::get_focus_next); + + ClassDB::bind_method(D_METHOD("set_focus_previous", "previous"), &Control::set_focus_previous); + ClassDB::bind_method(D_METHOD("get_focus_previous"), &Control::get_focus_previous); + ClassDB::bind_method(D_METHOD("force_drag", "data", "preview"), &Control::force_drag); ClassDB::bind_method(D_METHOD("set_mouse_filter", "filter"), &Control::set_mouse_filter); @@ -2737,6 +2835,8 @@ void Control::_bind_methods() { ADD_PROPERTYINZ(PropertyInfo(Variant::NODE_PATH, "focus_neighbour_top"), "set_focus_neighbour", "get_focus_neighbour", MARGIN_TOP); ADD_PROPERTYINZ(PropertyInfo(Variant::NODE_PATH, "focus_neighbour_right"), "set_focus_neighbour", "get_focus_neighbour", MARGIN_RIGHT); ADD_PROPERTYINZ(PropertyInfo(Variant::NODE_PATH, "focus_neighbour_bottom"), "set_focus_neighbour", "get_focus_neighbour", MARGIN_BOTTOM); + ADD_PROPERTYNZ(PropertyInfo(Variant::NODE_PATH, "focus_next"), "set_focus_next", "get_focus_next"); + ADD_PROPERTYNZ(PropertyInfo(Variant::NODE_PATH, "focus_previous"), "set_focus_previous", "get_focus_previous"); ADD_GROUP("Mouse", "mouse_"); ADD_PROPERTY(PropertyInfo(Variant::INT, "mouse_filter", PROPERTY_HINT_ENUM, "Stop,Pass,Ignore"), "set_mouse_filter", "get_mouse_filter"); diff --git a/scene/gui/control.h b/scene/gui/control.h index 4d0e3934ad..92d1c969fc 100644 --- a/scene/gui/control.h +++ b/scene/gui/control.h @@ -191,6 +191,8 @@ private: ObjectID modal_prev_focus_owner; NodePath focus_neighbour[4]; + NodePath focus_next; + NodePath focus_prev; HashMap<StringName, Ref<Texture>, StringNameHasher> icon_override; HashMap<StringName, Ref<Shader>, StringNameHasher> shader_override; @@ -269,10 +271,25 @@ public: }; - virtual Variant edit_get_state() const; - virtual void edit_set_state(const Variant &p_state); - virtual void edit_set_rect(const Rect2 &p_edit_rect); - virtual Size2 edit_get_minimum_size() const; + virtual Dictionary _edit_get_state() const; + virtual void _edit_set_state(const Dictionary &p_state); + + virtual void _edit_set_position(const Point2 &p_position); + virtual Point2 _edit_get_position() const; + + virtual void _edit_set_rect(const Rect2 &p_edit_rect); + virtual Rect2 _edit_get_rect() const; + virtual bool _edit_use_rect() const; + + virtual void _edit_set_rotation(float p_rotation); + virtual float _edit_get_rotation() const; + virtual bool _edit_use_rotation() const; + + virtual void _edit_set_pivot(const Point2 &p_pivot); + virtual Point2 _edit_get_pivot() const; + virtual bool _edit_use_pivot() const; + + virtual Size2 _edit_get_minimum_size() const; void accept_event(); @@ -374,6 +391,11 @@ public: void set_focus_neighbour(Margin p_margin, const NodePath &p_neighbour); NodePath get_focus_neighbour(Margin p_margin) const; + void set_focus_next(const NodePath &p_next); + NodePath get_focus_next() const; + void set_focus_previous(const NodePath &p_prev); + NodePath get_focus_previous() const; + Control *get_focus_owner() const; void set_mouse_filter(MouseFilter p_filter); @@ -420,7 +442,6 @@ public: CursorShape get_default_cursor_shape() const; virtual CursorShape get_cursor_shape(const Point2 &p_pos = Point2i()) const; - virtual Rect2 get_item_rect() const; virtual Transform2D get_transform() const; bool is_toplevel_control() const; diff --git a/scene/gui/file_dialog.cpp b/scene/gui/file_dialog.cpp index 6ade4fcc38..6aba535572 100644 --- a/scene/gui/file_dialog.cpp +++ b/scene/gui/file_dialog.cpp @@ -323,6 +323,9 @@ void FileDialog::update_file_list() { while ((item = dir_access->get_next(&isdir)) != "") { + if (item == ".") + continue; + ishidden = dir_access->current_is_hidden(); if (show_hidden || !ishidden) { @@ -344,7 +347,7 @@ void FileDialog::update_file_list() { while (!dirs.empty()) { String &dir_name = dirs.front()->get(); TreeItem *ti = tree->create_item(root); - ti->set_text(0, dir_name + "/"); + ti->set_text(0, dir_name); ti->set_icon(0, folder); Dictionary d; diff --git a/scene/gui/graph_edit.cpp b/scene/gui/graph_edit.cpp index 946a8c47a3..da52fb39e0 100644 --- a/scene/gui/graph_edit.cpp +++ b/scene/gui/graph_edit.cpp @@ -964,6 +964,19 @@ void GraphEdit::_gui_input(const Ref<InputEvent> &p_ev) { emit_signal("delete_nodes_request"); accept_event(); } + + Ref<InputEventMagnifyGesture> magnify_gesture = p_ev; + if (magnify_gesture.is_valid()) { + + set_zoom_custom(zoom * magnify_gesture->get_factor(), magnify_gesture->get_position()); + } + + Ref<InputEventPanGesture> pan_gesture = p_ev; + if (pan_gesture.is_valid()) { + + h_scroll->set_value(h_scroll->get_value() + h_scroll->get_page() * pan_gesture->get_delta().x / 8); + v_scroll->set_value(v_scroll->get_value() + v_scroll->get_page() * pan_gesture->get_delta().y / 8); + } } void GraphEdit::clear_connections() { @@ -975,6 +988,11 @@ void GraphEdit::clear_connections() { void GraphEdit::set_zoom(float p_zoom) { + set_zoom_custom(p_zoom, get_size() / 2); +} + +void GraphEdit::set_zoom_custom(float p_zoom, const Vector2 &p_center) { + p_zoom = CLAMP(p_zoom, MIN_ZOOM, MAX_ZOOM); if (zoom == p_zoom) return; @@ -982,7 +1000,7 @@ void GraphEdit::set_zoom(float p_zoom) { zoom_minus->set_disabled(zoom == MIN_ZOOM); zoom_plus->set_disabled(zoom == MAX_ZOOM); - Vector2 sbofs = (Vector2(h_scroll->get_value(), v_scroll->get_value()) + get_size() / 2) / zoom; + Vector2 sbofs = (Vector2(h_scroll->get_value(), v_scroll->get_value()) + p_center) / zoom; zoom = p_zoom; top_layer->update(); @@ -992,7 +1010,7 @@ void GraphEdit::set_zoom(float p_zoom) { if (is_visible_in_tree()) { - Vector2 ofs = sbofs * zoom - get_size() / 2; + Vector2 ofs = sbofs * zoom - p_center; h_scroll->set_value(ofs.x); v_scroll->set_value(ofs.y); } diff --git a/scene/gui/graph_edit.h b/scene/gui/graph_edit.h index 4656b50133..e8e530848d 100644 --- a/scene/gui/graph_edit.h +++ b/scene/gui/graph_edit.h @@ -179,6 +179,7 @@ public: bool is_valid_connection_type(int p_type, int p_with_type) const; void set_zoom(float p_zoom); + void set_zoom_custom(float p_zoom, const Vector2 &p_center); float get_zoom() const; GraphEditFilter *get_top_layer() const { return top_layer; } diff --git a/scene/gui/item_list.cpp b/scene/gui/item_list.cpp index e9e9dcc859..51ab49e643 100644 --- a/scene/gui/item_list.cpp +++ b/scene/gui/item_list.cpp @@ -525,6 +525,11 @@ void ItemList::_gui_input(const Ref<InputEvent> &p_event) { return; } + if (mb->get_button_index() == BUTTON_RIGHT) { + emit_signal("rmb_clicked", mb->get_position()); + + return; + } } if (mb.is_valid() && mb->get_button_index() == BUTTON_WHEEL_UP && mb->is_pressed()) { @@ -708,6 +713,12 @@ void ItemList::_gui_input(const Ref<InputEvent> &p_event) { } } } + + Ref<InputEventPanGesture> pan_gesture = p_event; + if (pan_gesture.is_valid()) { + + scroll_bar->set_value(scroll_bar->get_value() + scroll_bar->get_page() * pan_gesture->get_delta().y / 8); + } } void ItemList::ensure_current_is_visible() { @@ -1397,6 +1408,7 @@ void ItemList::_bind_methods() { ADD_SIGNAL(MethodInfo("item_rmb_selected", PropertyInfo(Variant::INT, "index"), PropertyInfo(Variant::VECTOR2, "at_position"))); ADD_SIGNAL(MethodInfo("multi_selected", PropertyInfo(Variant::INT, "index"), PropertyInfo(Variant::BOOL, "selected"))); ADD_SIGNAL(MethodInfo("item_activated", PropertyInfo(Variant::INT, "index"))); + ADD_SIGNAL(MethodInfo("rmb_clicked", PropertyInfo(Variant::VECTOR2, "at_position"))); GLOBAL_DEF("gui/timers/incremental_search_max_interval_msec", 2000); } diff --git a/scene/gui/line_edit.cpp b/scene/gui/line_edit.cpp index 5d3e5ec0e8..f7bf1cd9ea 100644 --- a/scene/gui/line_edit.cpp +++ b/scene/gui/line_edit.cpp @@ -1309,6 +1309,7 @@ void LineEdit::set_expand_to_text_length(bool p_enabled) { expand_to_text_length = p_enabled; minimum_size_changed(); + set_window_pos(0); } bool LineEdit::get_expand_to_text_length() const { @@ -1428,7 +1429,7 @@ void LineEdit::_bind_methods() { ADD_PROPERTYNZ(PropertyInfo(Variant::INT, "max_length"), "set_max_length", "get_max_length"); ADD_PROPERTYNO(PropertyInfo(Variant::BOOL, "editable"), "set_editable", "is_editable"); ADD_PROPERTYNZ(PropertyInfo(Variant::BOOL, "secret"), "set_secret", "is_secret"); - ADD_PROPERTYNO(PropertyInfo(Variant::BOOL, "expand_to_len"), "set_expand_to_text_length", "get_expand_to_text_length"); + ADD_PROPERTYNZ(PropertyInfo(Variant::BOOL, "expand_to_text_length"), "set_expand_to_text_length", "get_expand_to_text_length"); ADD_PROPERTY(PropertyInfo(Variant::INT, "focus_mode", PROPERTY_HINT_ENUM, "None,Click,All"), "set_focus_mode", "get_focus_mode"); ADD_GROUP("Placeholder", "placeholder_"); ADD_PROPERTYNZ(PropertyInfo(Variant::STRING, "placeholder_text"), "set_placeholder", "get_placeholder"); diff --git a/scene/gui/rich_text_label.cpp b/scene/gui/rich_text_label.cpp index 798acb9d52..124c268c8a 100644 --- a/scene/gui/rich_text_label.cpp +++ b/scene/gui/rich_text_label.cpp @@ -817,6 +817,16 @@ void RichTextLabel::_gui_input(Ref<InputEvent> p_event) { } } + Ref<InputEventPanGesture> pan_gesture = p_event; + if (pan_gesture.is_valid()) { + + if (scroll_active) + + vscroll->set_value(vscroll->get_value() + vscroll->get_page() * pan_gesture->get_delta().y * 0.5 / 8); + + return; + } + Ref<InputEventKey> k = p_event; if (k.is_valid()) { @@ -877,11 +887,13 @@ void RichTextLabel::_gui_input(Ref<InputEvent> p_event) { if (main->first_invalid_line < main->lines.size()) return; + int line = 0; + Item *item = NULL; + bool outside; + _find_click(main, m->get_position(), &item, &line, &outside); + if (selection.click) { - int line = 0; - Item *item = NULL; - _find_click(main, m->get_position(), &item, &line); if (!item) return; // do not update @@ -912,6 +924,22 @@ void RichTextLabel::_gui_input(Ref<InputEvent> p_event) { selection.active = true; update(); } + + Variant meta; + if (item && !outside && _find_meta(item, &meta)) { + if (meta_hovering != item) { + if (meta_hovering) { + emit_signal("meta_hover_ended", current_meta); + } + meta_hovering = static_cast<ItemMeta *>(item); + current_meta = meta; + emit_signal("meta_hover_started", meta); + } + } else if (meta_hovering) { + emit_signal("meta_hover_ended", current_meta); + meta_hovering = NULL; + current_meta = false; + } } } @@ -1968,6 +1996,8 @@ void RichTextLabel::_bind_methods() { ADD_PROPERTY(PropertyInfo(Variant::BOOL, "override_selected_font_color"), "set_override_selected_font_color", "is_overriding_selected_font_color"); ADD_SIGNAL(MethodInfo("meta_clicked", PropertyInfo(Variant::NIL, "meta", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NIL_IS_VARIANT))); + ADD_SIGNAL(MethodInfo("meta_hover_started", PropertyInfo(Variant::NIL, "meta", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NIL_IS_VARIANT))); + ADD_SIGNAL(MethodInfo("meta_hover_ended", PropertyInfo(Variant::NIL, "meta", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NIL_IS_VARIANT))); BIND_ENUM_CONSTANT(ALIGN_LEFT); BIND_ENUM_CONSTANT(ALIGN_CENTER); diff --git a/scene/gui/rich_text_label.h b/scene/gui/rich_text_label.h index f9e37b1094..1096e3f650 100644 --- a/scene/gui/rich_text_label.h +++ b/scene/gui/rich_text_label.h @@ -225,6 +225,9 @@ private: Align default_align; + ItemMeta *meta_hovering; + Variant current_meta; + void _invalidate_current_line(ItemFrame *p_frame); void _validate_line_caches(ItemFrame *p_frame); diff --git a/scene/gui/scroll_container.cpp b/scene/gui/scroll_container.cpp index 9022d67a4a..a71a1c5f92 100644 --- a/scene/gui/scroll_container.cpp +++ b/scene/gui/scroll_container.cpp @@ -180,6 +180,17 @@ void ScrollContainer::_gui_input(const Ref<InputEvent> &p_gui_input) { time_since_motion = 0; } } + + Ref<InputEventPanGesture> pan_gesture = p_gui_input; + if (pan_gesture.is_valid()) { + + if (h_scroll->is_visible_in_tree()) { + h_scroll->set_value(h_scroll->get_value() + h_scroll->get_page() * pan_gesture->get_delta().x / 8); + } + if (v_scroll->is_visible_in_tree()) { + v_scroll->set_value(v_scroll->get_value() + v_scroll->get_page() * pan_gesture->get_delta().y / 8); + } + } } void ScrollContainer::_update_scrollbar_position() { diff --git a/scene/gui/tabs.cpp b/scene/gui/tabs.cpp index 49823e18fc..1fb0f84223 100644 --- a/scene/gui/tabs.cpp +++ b/scene/gui/tabs.cpp @@ -142,91 +142,107 @@ void Tabs::_gui_input(const Ref<InputEvent> &p_event) { Ref<InputEventMouseButton> mb = p_event; - if (rb_pressing && mb.is_valid() && - !mb->is_pressed() && - mb->get_button_index() == BUTTON_LEFT) { + if (mb.is_valid()) { - if (rb_hover != -1) { - //pressed - emit_signal("right_button_pressed", rb_hover); + if (mb->is_pressed() && mb->get_button_index() == BUTTON_WHEEL_UP && !mb->get_command()) { + + if (scrolling_enabled && buttons_visible) { + if (offset > 0) { + offset--; + update(); + } + } } - rb_pressing = false; - update(); - } + if (mb->is_pressed() && mb->get_button_index() == BUTTON_WHEEL_DOWN && !mb->get_command()) { + if (scrolling_enabled && buttons_visible) { + if (missing_right) { + offset++; + update(); + } + } + } + + if (rb_pressing && !mb->is_pressed() && mb->get_button_index() == BUTTON_LEFT) { - if (cb_pressing && mb.is_valid() && - !mb->is_pressed() && - mb->get_button_index() == BUTTON_LEFT) { + if (rb_hover != -1) { + //pressed + emit_signal("right_button_pressed", rb_hover); + } - if (cb_hover != -1) { - //pressed - emit_signal("tab_close", cb_hover); + rb_pressing = false; + update(); } - cb_pressing = false; - update(); - } + if (cb_pressing && !mb->is_pressed() && mb->get_button_index() == BUTTON_LEFT) { - if (mb.is_valid() && - mb->is_pressed() && - mb->get_button_index() == BUTTON_LEFT) { + if (cb_hover != -1) { + //pressed + emit_signal("tab_close", cb_hover); + } - // clicks - Point2 pos(mb->get_position().x, mb->get_position().y); + cb_pressing = false; + update(); + } - if (buttons_visible) { + if (mb->is_pressed() && mb->get_button_index() == BUTTON_LEFT) { - Ref<Texture> incr = get_icon("increment"); - Ref<Texture> decr = get_icon("decrement"); + // clicks + Point2 pos(mb->get_position().x, mb->get_position().y); - int limit = get_size().width - incr->get_width() - decr->get_width(); + if (buttons_visible) { - if (pos.x > limit + decr->get_width()) { - if (missing_right) { - offset++; - update(); - } - return; - } else if (pos.x > limit) { - if (offset > 0) { - offset--; - update(); + Ref<Texture> incr = get_icon("increment"); + Ref<Texture> decr = get_icon("decrement"); + + int limit = get_size().width - incr->get_width() - decr->get_width(); + + if (pos.x > limit + decr->get_width()) { + if (missing_right) { + offset++; + update(); + } + return; + } else if (pos.x > limit) { + if (offset > 0) { + offset--; + update(); + } + return; } - return; } - } - int found = -1; - for (int i = 0; i < tabs.size(); i++) { + int found = -1; + for (int i = 0; i < tabs.size(); i++) { - if (i < offset) - continue; + if (i < offset) + continue; - if (tabs[i].rb_rect.has_point(pos)) { - rb_pressing = true; - update(); - return; - } + if (tabs[i].rb_rect.has_point(pos)) { + rb_pressing = true; + update(); + return; + } - if (tabs[i].cb_rect.has_point(pos)) { - cb_pressing = true; - update(); - return; - } + if (tabs[i].cb_rect.has_point(pos)) { + cb_pressing = true; + update(); + return; + } - if (pos.x >= tabs[i].ofs_cache && pos.x < tabs[i].ofs_cache + tabs[i].size_cache) { - if (!tabs[i].disabled) { - found = i; + if (pos.x >= tabs[i].ofs_cache && pos.x < tabs[i].ofs_cache + tabs[i].size_cache) { + if (!tabs[i].disabled) { + found = i; + } + break; } - break; } - } - if (found != -1) { + if (found != -1) { - set_current_tab(found); - emit_signal("tab_clicked", found); + set_current_tab(found); + emit_signal("tab_clicked", found); + } } } } @@ -440,6 +456,14 @@ int Tabs::get_hovered_tab() const { return hover; } +int Tabs::get_tab_offset() const { + return offset; +} + +bool Tabs::get_offset_buttons_visible() const { + return buttons_visible; +} + void Tabs::set_tab_title(int p_tab, const String &p_title) { ERR_FAIL_INDEX(p_tab, tabs.size()); @@ -484,6 +508,7 @@ void Tabs::set_tab_right_button(int p_tab, const Ref<Texture> &p_right_button) { ERR_FAIL_INDEX(p_tab, tabs.size()); tabs[p_tab].right_button = p_right_button; + _update_cache(); update(); minimum_size_changed(); } @@ -783,6 +808,14 @@ void Tabs::set_min_width(int p_width) { min_width = p_width; } +void Tabs::set_scrolling_enabled(bool p_enabled) { + scrolling_enabled = p_enabled; +} + +bool Tabs::get_scrolling_enabled() const { + return scrolling_enabled; +} + void Tabs::_bind_methods() { ClassDB::bind_method(D_METHOD("_gui_input"), &Tabs::_gui_input); @@ -799,11 +832,15 @@ void Tabs::_bind_methods() { ClassDB::bind_method(D_METHOD("add_tab", "title", "icon"), &Tabs::add_tab, DEFVAL(""), DEFVAL(Ref<Texture>())); ClassDB::bind_method(D_METHOD("set_tab_align", "align"), &Tabs::set_tab_align); ClassDB::bind_method(D_METHOD("get_tab_align"), &Tabs::get_tab_align); + ClassDB::bind_method(D_METHOD("get_tab_offset"), &Tabs::get_tab_offset); + ClassDB::bind_method(D_METHOD("get_offset_buttons_visible"), &Tabs::get_offset_buttons_visible); ClassDB::bind_method(D_METHOD("ensure_tab_visible", "idx"), &Tabs::ensure_tab_visible); ClassDB::bind_method(D_METHOD("get_tab_rect", "tab_idx"), &Tabs::get_tab_rect); ClassDB::bind_method(D_METHOD("move_tab", "from", "to"), &Tabs::move_tab); ClassDB::bind_method(D_METHOD("set_tab_close_display_policy", "policy"), &Tabs::set_tab_close_display_policy); ClassDB::bind_method(D_METHOD("get_tab_close_display_policy"), &Tabs::get_tab_close_display_policy); + ClassDB::bind_method(D_METHOD("set_scrolling_enabled", "enabled"), &Tabs::set_scrolling_enabled); + ClassDB::bind_method(D_METHOD("get_scrolling_enabled"), &Tabs::get_scrolling_enabled); ADD_SIGNAL(MethodInfo("tab_changed", PropertyInfo(Variant::INT, "tab"))); ADD_SIGNAL(MethodInfo("right_button_pressed", PropertyInfo(Variant::INT, "tab"))); @@ -814,6 +851,7 @@ void Tabs::_bind_methods() { ADD_PROPERTY(PropertyInfo(Variant::INT, "current_tab", PROPERTY_HINT_RANGE, "-1,4096,1", PROPERTY_USAGE_EDITOR), "set_current_tab", "get_current_tab"); ADD_PROPERTYNZ(PropertyInfo(Variant::INT, "tab_close_display_policy", PROPERTY_HINT_ENUM, "Show Never,Show Active Only,Show Always"), "set_tab_close_display_policy", "get_tab_close_display_policy"); + ADD_PROPERTY(PropertyInfo(Variant::BOOL, "scrolling_enabled"), "set_scrolling_enabled", "get_scrolling_enabled"); BIND_ENUM_CONSTANT(ALIGN_LEFT); BIND_ENUM_CONSTANT(ALIGN_CENTER); @@ -841,4 +879,5 @@ Tabs::Tabs() { max_drawn_tab = 0; min_width = 0; + scrolling_enabled = true; } diff --git a/scene/gui/tabs.h b/scene/gui/tabs.h index 73fa40bbb8..4eb6be3435 100644 --- a/scene/gui/tabs.h +++ b/scene/gui/tabs.h @@ -88,6 +88,7 @@ private: int hover; // hovered tab int min_width; + bool scrolling_enabled; int get_tab_width(int p_idx) const; void _ensure_no_over_offset(); @@ -131,10 +132,16 @@ public: int get_current_tab() const; int get_hovered_tab() const; + int get_tab_offset() const; + bool get_offset_buttons_visible() const; + void remove_tab(int p_idx); void clear_tabs(); + void set_scrolling_enabled(bool p_enabled); + bool get_scrolling_enabled() const; + void ensure_tab_visible(int p_idx); void set_min_width(int p_width); diff --git a/scene/gui/text_edit.cpp b/scene/gui/text_edit.cpp index 1b87771fd4..26ac4c5a7d 100644 --- a/scene/gui/text_edit.cpp +++ b/scene/gui/text_edit.cpp @@ -274,6 +274,7 @@ void TextEdit::Text::insert(int p_at, const String &p_text) { Line line; line.marked = false; line.breakpoint = false; + line.hidden = false; line.width_cache = -1; line.data = p_text; text.insert(p_at, line); @@ -297,9 +298,13 @@ void TextEdit::_update_scrollbars() { int hscroll_rows = ((hmin.height - 1) / get_row_height()) + 1; int visible_rows = get_visible_rows(); - int total_rows = text.size(); + int num_rows = MAX(visible_rows, num_lines_from(CLAMP(cursor.line_ofs, 0, text.size() - 1), MIN(visible_rows, text.size() - 1 - cursor.line_ofs))); + + int total_rows = (is_hiding_enabled() ? get_total_unhidden_rows() : text.size()); if (scroll_past_end_of_file_enabled) { - total_rows += get_visible_rows() - 1; + total_rows += visible_rows - 1; + } else { + total_rows -= 1; } int vscroll_pixels = v_scroll->get_combined_minimum_size().width; @@ -313,6 +318,10 @@ void TextEdit::_update_scrollbars() { total_width += cache.breakpoint_gutter_width; } + if (draw_fold_gutter) { + total_width += cache.fold_gutter_width; + } + bool use_hscroll = true; bool use_vscroll = true; @@ -347,12 +356,15 @@ void TextEdit::_update_scrollbars() { v_scroll->set_step(1); } - if (fabs(v_scroll->get_value() - (double)cursor.line_ofs) >= 1) { - v_scroll->set_value(cursor.line_ofs); + update_line_scroll_pos(); + if (fabs(v_scroll->get_value() - get_line_scroll_pos()) >= 1) { + cursor.line_ofs += v_scroll->get_value() - get_line_scroll_pos(); } } else { cursor.line_ofs = 0; + line_scroll_pos = 0; + v_scroll->set_value(0); v_scroll->hide(); } @@ -551,6 +563,13 @@ void TextEdit::_notification(int p_what) { cache.breakpoint_gutter_width = 0; } + if (draw_fold_gutter) { + fold_gutter_width = (get_row_height() * 55) / 100; + cache.fold_gutter_width = fold_gutter_width; + } else { + cache.fold_gutter_width = 0; + } + int line_number_char_count = 0; { @@ -573,7 +592,7 @@ void TextEdit::_notification(int p_what) { RID ci = get_canvas_item(); VisualServer::get_singleton()->canvas_item_set_clip(get_canvas_item(), true); - int xmargin_beg = cache.style_normal->get_margin(MARGIN_LEFT) + cache.line_number_w + cache.breakpoint_gutter_width; + int xmargin_beg = cache.style_normal->get_margin(MARGIN_LEFT) + cache.line_number_w + cache.breakpoint_gutter_width + cache.fold_gutter_width; int xmargin_end = cache.size.width - cache.style_normal->get_margin(MARGIN_RIGHT); //let's do it easy for now: cache.style_normal->draw(ci, Rect2(Point2(), cache.size)); @@ -780,10 +799,24 @@ void TextEdit::_notification(int p_what) { String highlighted_text = get_selection_text(); String line_num_padding = line_numbers_zero_padded ? "0" : " "; + update_line_scroll_pos(); + + int line = cursor.line_ofs - 1; + // another row may be visible during smooth scrolling + int draw_amount = visible_rows + (smooth_scroll_enabled ? 1 : 0); + for (int i = 0; i < draw_amount; i++) { - for (int i = 0; i < visible_rows; i++) { + line++; - int line = i + cursor.line_ofs; + if (line < 0 || line >= (int)text.size()) + continue; + + while (is_line_hidden(line)) { + line++; + if (line < 0 || line >= (int)text.size()) { + break; + } + } if (line < 0 || line >= (int)text.size()) continue; @@ -794,7 +827,7 @@ void TextEdit::_notification(int p_what) { int char_ofs = 0; int ofs_y = (i * get_row_height() + cache.line_spacing / 2); if (smooth_scroll_enabled) { - ofs_y -= (v_scroll->get_value() - cursor.line_ofs) * get_row_height(); + ofs_y -= (v_scroll->get_value() - get_line_scroll_pos()) * get_row_height(); } bool prev_is_char = false; @@ -857,6 +890,21 @@ void TextEdit::_notification(int p_what) { } } + // draw fold markers + if (draw_fold_gutter) { + int horizontal_gap = (cache.fold_gutter_width * 30) / 100; + int gutter_left = cache.style_normal->get_margin(MARGIN_LEFT) + cache.breakpoint_gutter_width + cache.line_number_w; + if (is_folded(line)) { + int xofs = horizontal_gap - (cache.can_fold_icon->get_width()) / 2; + int yofs = (get_row_height() - cache.folded_icon->get_height()) / 2; + cache.folded_icon->draw(ci, Point2(gutter_left + xofs, ofs_y + yofs), Color(0.8f, 0.8f, 0.8f, 0.8f)); + } else if (can_fold(line)) { + int xofs = -cache.can_fold_icon->get_width() / 2 - horizontal_gap + 3; + int yofs = (get_row_height() - cache.can_fold_icon->get_height()) / 2; + cache.can_fold_icon->draw(ci, Point2(gutter_left + xofs, ofs_y + yofs), Color(0.8f, 0.8f, 0.8f, 0.8f)); + } + } + if (cache.line_number_w) { String fc = String::num(line + 1); while (fc.length() < line_number_char_count) { @@ -1196,6 +1244,12 @@ void TextEdit::_notification(int p_what) { } char_ofs += char_w; + + if (j == str.length() - 1 && is_folded(line)) { + int yofs = (get_row_height() - cache.folded_eol_icon->get_height()) / 2; + int xofs = cache.folded_eol_icon->get_width() / 2; + cache.folded_eol_icon->draw(ci, Point2(char_ofs + char_margin + xofs, ofs_y + yofs), Color(1, 1, 1, 1)); + } } if (cursor.column == str.length() && cursor.line == line && (char_ofs + char_margin) >= xmargin_beg) { @@ -1538,6 +1592,12 @@ void TextEdit::backspace_at_cursor() { int prev_line = cursor.column ? cursor.line : cursor.line - 1; int prev_column = cursor.column ? (cursor.column - 1) : (text[cursor.line - 1].length()); + + if (is_line_hidden(cursor.line)) + set_line_as_hidden(prev_line, true); + if (is_line_set_as_breakpoint(cursor.line)) + set_line_as_breakpoint(prev_line, true); + if (auto_brace_completion_enabled && cursor.column > 0 && _is_pair_left_symbol(text[cursor.line][cursor.column - 1])) { @@ -1577,7 +1637,7 @@ void TextEdit::backspace_at_cursor() { } } - cursor_set_line(prev_line); + cursor_set_line(prev_line, true, true); cursor_set_column(prev_column); } @@ -1651,10 +1711,18 @@ void TextEdit::_get_mouse_pos(const Point2i &p_mouse, int &r_row, int &r_col) co float rows = p_mouse.y; rows -= cache.style_normal->get_margin(MARGIN_TOP); rows /= get_row_height(); - int row = cursor.line_ofs + (rows + (v_scroll->get_value() - cursor.line_ofs)); + int lsp = get_line_scroll_pos(true); + int row = cursor.line_ofs + (rows + (v_scroll->get_value() - lsp)); + + if (is_hiding_enabled()) { + // row will be offset by the hidden rows + int f_ofs = num_lines_from(CLAMP(cursor.line_ofs, 0, text.size() - 1), MIN(rows + 1, text.size() - cursor.line_ofs)) - 1; + row = cursor.line_ofs + (f_ofs + (v_scroll->get_value() - lsp)); + row = CLAMP(row, 0, text.size() - num_lines_from(text.size() - 1, -1)); + } if (row < 0) - row = 0; + row = 0; //todo int col = 0; @@ -1664,7 +1732,7 @@ void TextEdit::_get_mouse_pos(const Point2i &p_mouse, int &r_row, int &r_col) co col = text[row].size(); } else { - col = p_mouse.x - (cache.style_normal->get_margin(MARGIN_LEFT) + cache.line_number_w + cache.breakpoint_gutter_width); + col = p_mouse.x - (cache.style_normal->get_margin(MARGIN_LEFT) + cache.line_number_w + cache.breakpoint_gutter_width + cache.fold_gutter_width); col += cursor.x_ofs; col = get_char_pos_for(col, get_line(row)); } @@ -1717,43 +1785,10 @@ void TextEdit::_gui_input(const Ref<InputEvent> &p_gui_input) { if (mb->is_pressed()) { if (mb->get_button_index() == BUTTON_WHEEL_UP && !mb->get_command()) { - if (scrolling) { - target_v_scroll = (target_v_scroll - (3 * mb->get_factor())); - } else { - target_v_scroll = (v_scroll->get_value() - (3 * mb->get_factor())); - } - - if (smooth_scroll_enabled) { - if (target_v_scroll <= 0) { - target_v_scroll = 0; - } - scrolling = true; - set_physics_process(true); - } else { - v_scroll->set_value(target_v_scroll); - } + _scroll_up(3 * mb->get_factor()); } if (mb->get_button_index() == BUTTON_WHEEL_DOWN && !mb->get_command()) { - if (scrolling) { - target_v_scroll = (target_v_scroll + (3 * mb->get_factor())); - } else { - target_v_scroll = (v_scroll->get_value() + (3 * mb->get_factor())); - } - - if (smooth_scroll_enabled) { - int max_v_scroll = get_line_count() - 1; - if (!scroll_past_end_of_file_enabled) { - max_v_scroll -= get_visible_rows() - 1; - } - - if (target_v_scroll > max_v_scroll) { - target_v_scroll = max_v_scroll; - } - scrolling = true; - set_physics_process(true); - } else { - v_scroll->set_value(target_v_scroll); - } + _scroll_down(3 * mb->get_factor()); } if (mb->get_button_index() == BUTTON_WHEEL_LEFT) { h_scroll->set_value(h_scroll->get_value() - (100 * mb->get_factor())); @@ -1766,6 +1801,7 @@ void TextEdit::_gui_input(const Ref<InputEvent> &p_gui_input) { _reset_caret_blink_timer(); int row, col; + update_line_scroll_pos(); _get_mouse_pos(Point2i(mb->get_position().x, mb->get_position().y), row, col); if (mb->get_command() && highlighted_word != String()) { @@ -1784,10 +1820,35 @@ void TextEdit::_gui_input(const Ref<InputEvent> &p_gui_input) { } } + // toggle fold on gutter click if can + if (draw_fold_gutter) { + + int left_margin = cache.style_normal->get_margin(MARGIN_LEFT); + int gutter_left = left_margin + cache.breakpoint_gutter_width + cache.line_number_w; + if (mb->get_position().x > gutter_left - 6 && mb->get_position().x <= gutter_left + cache.fold_gutter_width - 3) { + if (is_folded(row)) { + unfold_line(row); + } else if (can_fold(row)) { + fold_line(row); + } + return; + } + } + + // unfold on folded icon click + if (is_folded(row)) { + int line_width = text.get_line_width(row); + line_width += cache.style_normal->get_margin(MARGIN_LEFT) + cache.line_number_w + cache.breakpoint_gutter_width + cache.fold_gutter_width - cursor.x_ofs; + if (mb->get_position().x > line_width - 3 && mb->get_position().x <= line_width + cache.folded_eol_icon->get_width() + 3) { + unfold_line(row); + return; + } + } + int prev_col = cursor.column; int prev_line = cursor.line; - cursor_set_line(row); + cursor_set_line(row, true, false); cursor_set_column(col); if (mb->get_shift() && (cursor.column != prev_col || cursor.line != prev_line)) { @@ -1884,6 +1945,19 @@ void TextEdit::_gui_input(const Ref<InputEvent> &p_gui_input) { } } + const Ref<InputEventPanGesture> pan_gesture = p_gui_input; + if (pan_gesture.is_valid()) { + + const real_t delta = pan_gesture->get_delta().y; + if (delta < 0) { + _scroll_up(-delta); + } else { + _scroll_down(delta); + } + h_scroll->set_value(h_scroll->get_value() + pan_gesture->get_delta().x * 100); + return; + } + Ref<InputEventMouseMotion> mm = p_gui_input; if (mm.is_valid()) { @@ -2026,22 +2100,10 @@ void TextEdit::_gui_input(const Ref<InputEvent> &p_gui_input) { return; } - if (k->get_scancode() == KEY_DOWN) { - - if (completion_index < completion_options.size() - 1) { - completion_index++; - completion_current = completion_options[completion_index]; - update(); - } - accept_event(); - return; - } - if (k->get_scancode() == KEY_KP_ENTER || k->get_scancode() == KEY_ENTER || k->get_scancode() == KEY_TAB) { _confirm_completion(); accept_event(); - emit_signal("request_completion"); return; } @@ -2191,7 +2253,7 @@ void TextEdit::_gui_input(const Ref<InputEvent> &p_gui_input) { selection.active = false; update(); _remove_text(selection.from_line, selection.from_column, selection.to_line, selection.to_column); - cursor_set_line(selection.from_line); + cursor_set_line(selection.from_line, true, false); cursor_set_column(selection.from_column); update(); } @@ -2241,6 +2303,9 @@ void TextEdit::_gui_input(const Ref<InputEvent> &p_gui_input) { } } + if (is_folded(cursor.line)) + unfold_line(cursor.line); + bool brace_indent = false; // no need to indent if we are going upwards. @@ -2391,6 +2456,8 @@ void TextEdit::_gui_input(const Ref<InputEvent> &p_gui_input) { cursor_set_column(column); } else { + if (cursor.line > 0 && is_line_hidden(cursor.line - 1)) + unfold_line(cursor.line - 1); backspace_at_cursor(); } @@ -2449,7 +2516,7 @@ void TextEdit::_gui_input(const Ref<InputEvent> &p_gui_input) { } else if (cursor.column == 0) { if (cursor.line > 0) { - cursor_set_line(cursor.line - 1); + cursor_set_line(cursor.line - num_lines_from(CLAMP(cursor.line - 1, 0, text.size() - 1), -1)); cursor_set_column(text[cursor.line].length()); } } else { @@ -2512,7 +2579,7 @@ void TextEdit::_gui_input(const Ref<InputEvent> &p_gui_input) { } else if (cursor.column == text[cursor.line].length()) { if (cursor.line < text.size() - 1) { - cursor_set_line(cursor.line + 1); + cursor_set_line(cursor_get_line() + num_lines_from(CLAMP(cursor.line + 1, 0, text.size() - 1), 1), true, false); cursor_set_column(0); } } else { @@ -2553,7 +2620,7 @@ void TextEdit::_gui_input(const Ref<InputEvent> &p_gui_input) { cursor_set_line(0); else #endif - cursor_set_line(cursor_get_line() - 1); + cursor_set_line(cursor_get_line() - num_lines_from(CLAMP(cursor.line - 1, 0, text.size() - 1), -1)); if (k->get_shift()) _post_shift_selection(); @@ -2587,10 +2654,10 @@ void TextEdit::_gui_input(const Ref<InputEvent> &p_gui_input) { } if (k->get_command()) - cursor_set_line(text.size() - 1); + cursor_set_line(text.size() - 1, true, false); else #endif - cursor_set_line(cursor_get_line() + 1); + cursor_set_line(cursor_get_line() + num_lines_from(CLAMP(cursor.line + 1, 0, text.size() - 1), 1), true, false); if (k->get_shift()) _post_shift_selection(); @@ -2737,7 +2804,7 @@ void TextEdit::_gui_input(const Ref<InputEvent> &p_gui_input) { if (k->get_shift()) _pre_shift_selection(); - cursor_set_line(text.size() - 1); + cursor_set_line(text.size() - 1, true, false); if (k->get_shift()) _post_shift_selection(); @@ -2752,7 +2819,7 @@ void TextEdit::_gui_input(const Ref<InputEvent> &p_gui_input) { _pre_shift_selection(); if (k->get_command()) - cursor_set_line(text.size() - 1); + cursor_set_line(text.size() - 1, true, false); cursor_set_column(text[cursor.line].length()); if (k->get_shift()) @@ -2777,7 +2844,7 @@ void TextEdit::_gui_input(const Ref<InputEvent> &p_gui_input) { if (k->get_shift()) _pre_shift_selection(); - cursor_set_line(cursor_get_line() - get_visible_rows()); + cursor_set_line(cursor_get_line() - num_lines_from(cursor.line, -get_visible_rows()), true, false); if (k->get_shift()) _post_shift_selection(); @@ -2798,7 +2865,7 @@ void TextEdit::_gui_input(const Ref<InputEvent> &p_gui_input) { if (k->get_shift()) _pre_shift_selection(); - cursor_set_line(cursor_get_line() + get_visible_rows()); + cursor_set_line(cursor_get_line() + num_lines_from(cursor.line, get_visible_rows()), true, false); if (k->get_shift()) _post_shift_selection(); @@ -2984,6 +3051,50 @@ void TextEdit::_gui_input(const Ref<InputEvent> &p_gui_input) { } } +void TextEdit::_scroll_up(real_t p_delta) { + + if (scrolling) { + target_v_scroll = (target_v_scroll - p_delta); + } else { + target_v_scroll = (v_scroll->get_value() - p_delta); + } + + if (smooth_scroll_enabled) { + if (target_v_scroll <= 0) { + target_v_scroll = 0; + } + scrolling = true; + set_physics_process(true); + } else { + v_scroll->set_value(target_v_scroll); + } +} + +void TextEdit::_scroll_down(real_t p_delta) { + + if (scrolling) { + target_v_scroll = (target_v_scroll + p_delta); + } else { + target_v_scroll = (v_scroll->get_value() + p_delta); + } + + if (smooth_scroll_enabled) { + int max_v_scroll = get_total_unhidden_rows(); + if (!scroll_past_end_of_file_enabled) { + max_v_scroll -= get_visible_rows() + 1; + max_v_scroll = CLAMP(max_v_scroll, 0, get_total_unhidden_rows()); + } + + if (target_v_scroll > max_v_scroll) { + target_v_scroll = max_v_scroll; + } + scrolling = true; + set_physics_process(true); + } else { + v_scroll->set_value(target_v_scroll); + } +} + void TextEdit::_pre_shift_selection() { if (!selection.active || selection.selecting_mode == Selection::MODE_NONE) { @@ -3011,13 +3122,14 @@ void TextEdit::_scroll_lines_up() { scrolling = false; // adjust the vertical scroll - if (get_v_scroll() > 0) { + if (get_v_scroll() >= 0) { set_v_scroll(get_v_scroll() - 1); } // adjust the cursor - if (cursor_get_line() >= (get_visible_rows() + get_v_scroll()) && !selection.active) { - cursor_set_line((get_visible_rows() + get_v_scroll()) - 1, false); + int num_lines = num_lines_from(CLAMP(cursor.line_ofs, 0, text.size() - 1), get_visible_rows()); + if (cursor.line >= cursor.line_ofs + num_lines && !selection.active) { + cursor_set_line(cursor.line_ofs + num_lines, false, false); } } @@ -3025,9 +3137,10 @@ void TextEdit::_scroll_lines_down() { scrolling = false; // calculate the maximum vertical scroll position - int max_v_scroll = get_line_count() - 1; + int max_v_scroll = get_total_unhidden_rows(); if (!scroll_past_end_of_file_enabled) { - max_v_scroll -= get_visible_rows() - 1; + max_v_scroll -= get_visible_rows() + 1; + max_v_scroll = CLAMP(max_v_scroll, 0, get_total_unhidden_rows()); } // adjust the vertical scroll @@ -3036,8 +3149,8 @@ void TextEdit::_scroll_lines_down() { } // adjust the cursor - if ((cursor_get_line()) <= get_v_scroll() - 1 && !selection.active) { - cursor_set_line(get_v_scroll(), false); + if (cursor.line <= cursor.line_ofs - 1 && !selection.active) { + cursor_set_line(cursor.line_ofs, false, false); } } @@ -3082,6 +3195,15 @@ void TextEdit::_base_insert_text(int p_line, int p_char, const String &p_text, i } } + // if we are just making a new empty line, reset breakpoints and hidden status + if (p_char == 0 && p_text.replace("\r", "") == "\n") { + + text.set_breakpoint(p_line + 1, text.is_breakpoint(p_line)); + text.set_hidden(p_line + 1, text.is_hidden(p_line)); + text.set_breakpoint(p_line, false); + text.set_hidden(p_line, false); + } + r_end_line = p_line + substrings.size() - 1; r_end_column = text[r_end_line].length() - postinsert_text.length(); @@ -3280,6 +3402,7 @@ Size2 TextEdit::get_minimum_size() const { return cache.style_normal->get_minimum_size(); } + int TextEdit::get_visible_rows() const { int total = cache.size.height; @@ -3287,33 +3410,87 @@ int TextEdit::get_visible_rows() const { total /= get_row_height(); return total; } + +int TextEdit::get_total_unhidden_rows() const { + if (!is_hiding_enabled()) + return text.size(); + + int total_unhidden = 0; + for (int i = 0; i < text.size(); i++) { + if (!text.is_hidden(i)) + total_unhidden++; + } + return total_unhidden; +} + +double TextEdit::get_line_scroll_pos(bool p_recalculate) const { + + if (!is_hiding_enabled()) + return cursor.line_ofs; + if (!p_recalculate) + return line_scroll_pos; + + // count num unhidden lines to the cursor line ofs + double new_line_scroll_pos = 0; + int to = CLAMP(cursor.line_ofs, 0, text.size() - 1); + for (int i = 0; i < to; i++) { + if (!text.is_hidden(i)) + new_line_scroll_pos++; + } + return new_line_scroll_pos; +} + +void TextEdit::update_line_scroll_pos() { + + if (!is_hiding_enabled()) { + line_scroll_pos = cursor.line_ofs; + return; + } + + // count num unhidden lines to the cursor line ofs + double new_line_scroll_pos = 0; + int to = CLAMP(cursor.line_ofs, 0, text.size() - 1); + for (int i = 0; i < to; i++) { + if (!text.is_hidden(i)) + new_line_scroll_pos++; + } + line_scroll_pos = new_line_scroll_pos; +} + void TextEdit::adjust_viewport_to_cursor() { scrolling = false; - if (cursor.line_ofs > cursor.line) + if (cursor.line_ofs > cursor.line) { cursor.line_ofs = cursor.line; + } - int visible_width = cache.size.width - cache.style_normal->get_minimum_size().width - cache.line_number_w - cache.breakpoint_gutter_width; + int visible_width = cache.size.width - cache.style_normal->get_minimum_size().width - cache.line_number_w - cache.breakpoint_gutter_width - cache.fold_gutter_width; if (v_scroll->is_visible_in_tree()) visible_width -= v_scroll->get_combined_minimum_size().width; visible_width -= 20; // give it a little more space - //printf("rowofs %i, visrows %i, cursor.line %i\n",cursor.line_ofs,get_visible_rows(),cursor.line); - int visible_rows = get_visible_rows(); - if (h_scroll->is_visible_in_tree()) + if (h_scroll->is_visible_in_tree() && !scroll_past_end_of_file_enabled) visible_rows -= ((h_scroll->get_combined_minimum_size().height - 1) / get_row_height()); + int num_rows = num_lines_from(CLAMP(cursor.line_ofs, 0, text.size() - 1), MIN(visible_rows, text.size() - 1 - cursor.line_ofs)); - if (cursor.line >= (cursor.line_ofs + visible_rows)) - cursor.line_ofs = cursor.line - visible_rows; - if (cursor.line < cursor.line_ofs) + // make sure the cursor is on the screen + if (cursor.line > (cursor.line_ofs + MAX(num_rows, visible_rows))) { + cursor.line_ofs = cursor.line - num_lines_from(cursor.line, -visible_rows) + 1; + } + if (cursor.line < cursor.line_ofs) { cursor.line_ofs = cursor.line; - - if (cursor.line_ofs + visible_rows > text.size() && !scroll_past_end_of_file_enabled) { - cursor.line_ofs = text.size() - visible_rows; - v_scroll->set_value(text.size() - visible_rows); } + int line_ofs_max = text.size() - 1; + if (!scroll_past_end_of_file_enabled) { + line_ofs_max -= num_lines_from(text.size() - 1, -visible_rows) - 1; + line_ofs_max += (h_scroll->is_visible_in_tree() ? 1 : 0); + line_ofs_max += (cursor.line == text.size() - 1 ? 1 : 0); + } + line_ofs_max = MAX(line_ofs_max, 0); + cursor.line_ofs = CLAMP(cursor.line_ofs, 0, line_ofs_max); + // adjust x offset int cursor_x = get_column_x_offset(cursor.column, text[cursor.line]); if (cursor_x > (cursor.x_ofs + visible_width)) @@ -3322,6 +3499,9 @@ void TextEdit::adjust_viewport_to_cursor() { if (cursor_x < cursor.x_ofs) cursor.x_ofs = cursor_x; + h_scroll->set_value(cursor.x_ofs); + update_line_scroll_pos(); + v_scroll->set_value(get_line_scroll_pos()); update(); /* get_range()->set_max(text.size()); @@ -3338,7 +3518,10 @@ void TextEdit::center_viewport_to_cursor() { if (cursor.line_ofs > cursor.line) cursor.line_ofs = cursor.line; - int visible_width = cache.size.width - cache.style_normal->get_minimum_size().width - cache.line_number_w - cache.breakpoint_gutter_width; + if (is_line_hidden(cursor.line)) + unfold_line(cursor.line); + + int visible_width = cache.size.width - cache.style_normal->get_minimum_size().width - cache.line_number_w - cache.breakpoint_gutter_width - cache.fold_gutter_width; if (v_scroll->is_visible_in_tree()) visible_width -= v_scroll->get_combined_minimum_size().width; visible_width -= 20; // give it a little more space @@ -3347,9 +3530,8 @@ void TextEdit::center_viewport_to_cursor() { if (h_scroll->is_visible_in_tree()) visible_rows -= ((h_scroll->get_combined_minimum_size().height - 1) / get_row_height()); - int max_ofs = text.size() - (scroll_past_end_of_file_enabled ? 1 : visible_rows); - cursor.line_ofs = CLAMP(cursor.line - (visible_rows / 2), 0, max_ofs); - + int max_ofs = text.size() - (scroll_past_end_of_file_enabled ? 1 : num_lines_from(text.size() - 1, -visible_rows)); + cursor.line_ofs = CLAMP(cursor.line - num_lines_from(cursor.line - visible_rows / 2, -visible_rows / 2), 0, max_ofs); int cursor_x = get_column_x_offset(cursor.column, text[cursor.line]); if (cursor_x > (cursor.x_ofs + visible_width)) @@ -3358,6 +3540,10 @@ void TextEdit::center_viewport_to_cursor() { if (cursor_x < cursor.x_ofs) cursor.x_ofs = cursor_x; + h_scroll->set_value(cursor.x_ofs); + update_line_scroll_pos(); + v_scroll->set_value(get_line_scroll_pos()); + update(); } @@ -3382,7 +3568,7 @@ void TextEdit::cursor_set_column(int p_col, bool p_adjust_viewport) { } } -void TextEdit::cursor_set_line(int p_row, bool p_adjust_viewport) { +void TextEdit::cursor_set_line(int p_row, bool p_adjust_viewport, bool p_can_be_hidden) { if (setting_row) return; @@ -3394,6 +3580,21 @@ void TextEdit::cursor_set_line(int p_row, bool p_adjust_viewport) { if (p_row >= (int)text.size()) p_row = (int)text.size() - 1; + if (!p_can_be_hidden) { + if (is_line_hidden(CLAMP(p_row, 0, text.size() - 1))) { + int move_down = num_lines_from(p_row, 1) - 1; + if (p_row + move_down <= text.size() - 1 && !is_line_hidden(p_row + move_down)) { + p_row += move_down; + } else { + int move_up = num_lines_from(p_row, -1) - 1; + if (p_row - move_up > 0 && !is_line_hidden(p_row - move_up)) { + p_row -= move_up; + } else { + WARN_PRINTS(("Cursor set to hidden line " + itos(p_row) + " and there are no nonhidden lines.")); + } + } + } + } cursor.line = p_row; cursor.column = get_char_pos_for(cursor.last_fit_x, get_line(cursor.line)); @@ -3463,8 +3664,11 @@ void TextEdit::_scroll_moved(double p_to_val) { if (h_scroll->is_visible_in_tree()) cursor.x_ofs = h_scroll->get_value(); - if (v_scroll->is_visible_in_tree()) - cursor.line_ofs = v_scroll->get_value(); + if (v_scroll->is_visible_in_tree()) { + double val = v_scroll->get_value(); + cursor.line_ofs = num_lines_from(0, (int)floor(val)) - 1; + line_scroll_pos = (int)floor(val); + } update(); } @@ -3553,10 +3757,43 @@ Control::CursorShape TextEdit::get_cursor_shape(const Point2 &p_pos) const { if (highlighted_word != String()) return CURSOR_POINTING_HAND; - int gutter = cache.style_normal->get_margin(MARGIN_LEFT) + cache.line_number_w + cache.breakpoint_gutter_width; - if ((completion_active && completion_rect.has_point(p_pos)) || p_pos.x < gutter) { + int gutter = cache.style_normal->get_margin(MARGIN_LEFT) + cache.line_number_w + cache.breakpoint_gutter_width + cache.fold_gutter_width; + if ((completion_active && completion_rect.has_point(p_pos))) { + return CURSOR_ARROW; + } + if (p_pos.x < gutter) { + + int row, col; + _get_mouse_pos(p_pos, row, col); + int left_margin = cache.style_normal->get_margin(MARGIN_LEFT); + + // breakpoint icon + if (draw_breakpoint_gutter && p_pos.x > left_margin && p_pos.x <= left_margin + cache.breakpoint_gutter_width + 3) { + return CURSOR_POINTING_HAND; + } + + // fold icon + int gutter_left = left_margin + cache.breakpoint_gutter_width + cache.line_number_w; + if (draw_fold_gutter && p_pos.x > gutter_left - 6 && p_pos.x <= gutter_left + cache.fold_gutter_width - 3) { + if (is_folded(row) || can_fold(row)) + return CURSOR_POINTING_HAND; + else + return CURSOR_ARROW; + } return CURSOR_ARROW; + } else { + int row, col; + _get_mouse_pos(p_pos, row, col); + // eol fold icon + if (is_folded(row)) { + int line_width = text.get_line_width(row); + line_width += cache.style_normal->get_margin(MARGIN_LEFT) + cache.line_number_w + cache.breakpoint_gutter_width + cache.fold_gutter_width - cursor.x_ofs; + if (p_pos.x > line_width - 3 && p_pos.x <= line_width + cache.folded_eol_icon->get_width() + 3) { + return CURSOR_POINTING_HAND; + } + } } + return CURSOR_IBEAM; } @@ -3570,6 +3807,7 @@ void TextEdit::set_text(String p_text) { cursor.line = 0; cursor.x_ofs = 0; cursor.line_ofs = 0; + line_scroll_pos = 0; cursor.last_fit_x = 0; cursor_set_line(0); cursor_set_column(0); @@ -3655,6 +3893,7 @@ void TextEdit::_clear() { cursor.line = 0; cursor.x_ofs = 0; cursor.line_ofs = 0; + line_scroll_pos = 0; cursor.last_fit_x = 0; } @@ -3733,6 +3972,9 @@ void TextEdit::_update_caches() { cache.line_spacing = get_constant("line_spacing"); cache.row_height = cache.font->get_height() + cache.line_spacing; cache.tab_icon = get_icon("tab"); + cache.folded_icon = get_icon("GuiTreeArrowRight", "EditorIcons"); + cache.can_fold_icon = get_icon("GuiTreeArrowDown", "EditorIcons"); + cache.folded_eol_icon = get_icon("GuiEllipsis", "EditorIcons"); text.set_font(cache.font); } @@ -4179,6 +4421,198 @@ void TextEdit::get_breakpoints(List<int> *p_breakpoints) const { } } +void TextEdit::set_line_as_hidden(int p_line, bool p_hidden) { + + ERR_FAIL_INDEX(p_line, text.size()); + if (is_hiding_enabled() || !p_hidden) + text.set_hidden(p_line, p_hidden); + update(); +} + +bool TextEdit::is_line_hidden(int p_line) const { + + ERR_FAIL_INDEX_V(p_line, text.size(), false); + return text.is_hidden(p_line); +} + +void TextEdit::fold_all_lines() { + + for (int i = 0; i < text.size(); i++) { + fold_line(i); + } + _update_scrollbars(); + update(); +} + +void TextEdit::unhide_all_lines() { + + for (int i = 0; i < text.size(); i++) { + text.set_hidden(i, false); + } + _update_scrollbars(); + update(); +} + +int TextEdit::num_lines_from(int p_line_from, int unhidden_amount) const { + + // returns the number of hidden and unhidden lines from p_line_from to p_line_from + amount of visible lines + ERR_FAIL_INDEX_V(p_line_from, text.size(), ABS(unhidden_amount)); + + if (!is_hiding_enabled()) + return ABS(unhidden_amount); + int num_visible = 0; + int num_total = 0; + if (unhidden_amount >= 0) { + for (int i = p_line_from; i < text.size(); i++) { + num_total++; + if (!is_line_hidden(i)) + num_visible++; + if (num_visible >= unhidden_amount) + break; + } + } else { + unhidden_amount = ABS(unhidden_amount); + for (int i = p_line_from; i >= 0; i--) { + num_total++; + if (!is_line_hidden(i)) + num_visible++; + if (num_visible >= unhidden_amount) + break; + } + } + return num_total; +} + +int TextEdit::get_whitespace_level(int p_line) const { + + ERR_FAIL_INDEX_V(p_line, text.size(), 0); + + // counts number of tabs and spaces before line starts + int whitespace_count = 0; + int line_length = text[p_line].size(); + for (int i = 0; i < line_length - 1; i++) { + if (text[p_line][i] == '\t') { + whitespace_count++; + } else if (text[p_line][i] == ' ') { + whitespace_count++; + } else if (text[p_line][i] == '#') { + break; + } else { + break; + } + } + return whitespace_count; +} + +bool TextEdit::can_fold(int p_line) const { + + ERR_FAIL_INDEX_V(p_line, text.size(), false); + if (!is_hiding_enabled()) + return false; + if (p_line + 1 >= text.size()) + return false; + if (text[p_line].size() == 0) + return false; + if (is_folded(p_line)) + return false; + if (is_line_hidden(p_line)) + return false; + + int start_indent = get_whitespace_level(p_line); + + for (int i = p_line + 1; i < text.size(); i++) { + if (text[i].size() == 0) + continue; + int next_indent = get_whitespace_level(i); + if (next_indent > start_indent) + return true; + else + return false; + } + + return false; +} + +bool TextEdit::is_folded(int p_line) const { + + ERR_FAIL_INDEX_V(p_line, text.size(), false); + if (p_line + 1 >= text.size() - 1) + return false; + if (!is_line_hidden(p_line) && is_line_hidden(p_line + 1)) + return true; + return false; +} + +void TextEdit::fold_line(int p_line) { + + ERR_FAIL_INDEX(p_line, text.size()); + if (!is_hiding_enabled()) + return; + if (!can_fold(p_line)) + return; + + // hide lines below this one + int start_indent = get_whitespace_level(p_line); + for (int i = p_line + 1; i < text.size(); i++) { + int cur_indent = get_whitespace_level(i); + if (text[i].size() == 0 || cur_indent > start_indent) { + set_line_as_hidden(i, true); + } else { + // exclude trailing empty lines + for (int trail_i = i - 1; trail_i > p_line; trail_i--) { + if (text[trail_i].size() == 0) + set_line_as_hidden(trail_i, false); + else + break; + } + break; + } + } + + // fix selection + if (is_selection_active()) { + if (is_line_hidden(selection.from_line) && is_line_hidden(selection.to_line)) { + deselect(); + } else if (is_line_hidden(selection.from_line)) { + select(p_line, 9999, selection.to_line, selection.to_column); + } else if (is_line_hidden(selection.to_line)) { + select(selection.from_line, selection.from_column, p_line, 9999); + } + } + + // reset cursor + if (is_line_hidden(cursor.line)) { + cursor_set_line(p_line, false, false); + cursor_set_column(get_line(p_line).length(), false); + } + _update_scrollbars(); + update(); +} + +void TextEdit::unfold_line(int p_line) { + + ERR_FAIL_INDEX(p_line, text.size()); + + if (!is_folded(p_line) && !is_line_hidden(p_line)) + return; + int fold_start = p_line; + for (fold_start = p_line; fold_start > 0; fold_start--) { + if (is_folded(fold_start)) + break; + } + fold_start = is_folded(fold_start) ? fold_start : p_line; + + for (int i = fold_start + 1; i < text.size(); i++) { + if (is_line_hidden(i)) { + set_line_as_hidden(i, false); + } else { + break; + } + } + _update_scrollbars(); + update(); +} + int TextEdit::get_line_count() const { return text.size(); @@ -4405,12 +4839,14 @@ void TextEdit::set_v_scroll(int p_scroll) { p_scroll = 0; } if (!scroll_past_end_of_file_enabled) { - if (p_scroll + get_visible_rows() > get_line_count()) { - p_scroll = get_line_count() - get_visible_rows(); + if (p_scroll + get_visible_rows() > get_total_unhidden_rows()) { + int num_rows = num_lines_from(CLAMP(p_scroll, 0, text.size() - 1), MIN(get_visible_rows(), text.size() - 1 - p_scroll)); + p_scroll = text.size() - num_rows; } } v_scroll->set_value(p_scroll); - cursor.line_ofs = p_scroll; + cursor.line_ofs = num_lines_from(0, p_scroll); + line_scroll_pos = p_scroll; } int TextEdit::get_h_scroll() const { @@ -4772,7 +5208,7 @@ void TextEdit::set_line(int line, String new_text) { void TextEdit::insert_at(const String &p_text, int at) { cursor_set_column(0); - cursor_set_line(at); + cursor_set_line(at, false, true); _insert_text(at, 0, p_text + "\n"); } @@ -4820,6 +5256,35 @@ int TextEdit::get_breakpoint_gutter_width() const { return cache.breakpoint_gutter_width; } +void TextEdit::set_draw_fold_gutter(bool p_draw) { + draw_fold_gutter = p_draw; + update(); +} + +bool TextEdit::is_drawing_fold_gutter() const { + return draw_fold_gutter; +} + +void TextEdit::set_fold_gutter_width(int p_gutter_width) { + fold_gutter_width = p_gutter_width; + update(); +} + +int TextEdit::get_fold_gutter_width() const { + return cache.fold_gutter_width; +} + +void TextEdit::set_hiding_enabled(int p_enabled) { + if (!p_enabled) + unhide_all_lines(); + hiding_enabled = p_enabled; + update(); +} + +int TextEdit::is_hiding_enabled() const { + return hiding_enabled; +} + void TextEdit::set_highlight_current_line(bool p_enabled) { highlight_current_line = p_enabled; update(); @@ -4914,7 +5379,7 @@ void TextEdit::_bind_methods() { 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(true)); - ClassDB::bind_method(D_METHOD("cursor_set_line", "line", "adjust_viewport"), &TextEdit::cursor_set_line, DEFVAL(true)); + ClassDB::bind_method(D_METHOD("cursor_set_line", "line", "adjust_viewport", "can_be_hidden"), &TextEdit::cursor_set_line, DEFVAL(true), 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); @@ -4955,6 +5420,17 @@ void TextEdit::_bind_methods() { ClassDB::bind_method(D_METHOD("set_show_line_numbers", "enable"), &TextEdit::set_show_line_numbers); ClassDB::bind_method(D_METHOD("is_show_line_numbers_enabled"), &TextEdit::is_show_line_numbers_enabled); + ClassDB::bind_method(D_METHOD("set_hiding_enabled", "enable"), &TextEdit::set_hiding_enabled); + ClassDB::bind_method(D_METHOD("is_hiding_enabled"), &TextEdit::is_hiding_enabled); + ClassDB::bind_method(D_METHOD("set_line_as_hidden", "line", "enable"), &TextEdit::set_line_as_hidden); + ClassDB::bind_method(D_METHOD("is_line_hidden"), &TextEdit::is_line_hidden); + ClassDB::bind_method(D_METHOD("fold_all_lines"), &TextEdit::fold_all_lines); + ClassDB::bind_method(D_METHOD("unhide_all_lines"), &TextEdit::unhide_all_lines); + ClassDB::bind_method(D_METHOD("fold_line", "line"), &TextEdit::fold_line); + ClassDB::bind_method(D_METHOD("unfold_line", "line"), &TextEdit::unfold_line); + ClassDB::bind_method(D_METHOD("can_fold", "line"), &TextEdit::can_fold); + ClassDB::bind_method(D_METHOD("is_folded", "line"), &TextEdit::is_folded); + ClassDB::bind_method(D_METHOD("set_highlight_all_occurrences", "enable"), &TextEdit::set_highlight_all_occurrences); ClassDB::bind_method(D_METHOD("is_highlight_all_occurrences_enabled"), &TextEdit::is_highlight_all_occurrences_enabled); @@ -4988,6 +5464,7 @@ void TextEdit::_bind_methods() { ADD_PROPERTY(PropertyInfo(Variant::BOOL, "context_menu_enabled"), "set_context_menu_enabled", "is_context_menu_enabled"); ADD_PROPERTY(PropertyInfo(Variant::BOOL, "smooth_scrolling"), "set_smooth_scroll_enable", "is_smooth_scroll_enabled"); ADD_PROPERTY(PropertyInfo(Variant::REAL, "v_scroll_speed"), "set_v_scroll_speed", "get_v_scroll_speed"); + ADD_PROPERTY(PropertyInfo(Variant::BOOL, "hiding_enabled"), "set_hiding_enabled", "is_hiding_enabled"); ADD_GROUP("Caret", "caret_"); ADD_PROPERTY(PropertyInfo(Variant::BOOL, "caret_block_mode"), "cursor_set_block_mode", "cursor_is_block_mode"); @@ -5029,6 +5506,8 @@ TextEdit::TextEdit() { cache.line_number_w = 1; cache.breakpoint_gutter_width = 0; breakpoint_gutter_width = 0; + cache.fold_gutter_width = 0; + fold_gutter_width = 0; indent_size = 4; text.set_indent_size(indent_size); @@ -5098,6 +5577,8 @@ TextEdit::TextEdit() { line_length_guideline = false; line_length_guideline_col = 80; draw_breakpoint_gutter = false; + draw_fold_gutter = false; + hiding_enabled = false; next_operation_is_complex = false; scroll_past_end_of_file_enabled = false; auto_brace_completion_enabled = false; diff --git a/scene/gui/text_edit.h b/scene/gui/text_edit.h index 50f005ed6a..bb9ca87d06 100644 --- a/scene/gui/text_edit.h +++ b/scene/gui/text_edit.h @@ -73,6 +73,9 @@ class TextEdit : public Control { struct Cache { Ref<Texture> tab_icon; + Ref<Texture> can_fold_icon; + Ref<Texture> folded_icon; + Ref<Texture> folded_eol_icon; Ref<StyleBox> style_normal; Ref<StyleBox> style_focus; Ref<Font> font; @@ -105,6 +108,7 @@ class TextEdit : public Control { int line_spacing; int line_number_w; int breakpoint_gutter_width; + int fold_gutter_width; Size2 size; } cache; @@ -136,6 +140,7 @@ class TextEdit : public Control { int width_cache : 24; bool marked : 1; bool breakpoint : 1; + bool hidden : 1; Map<int, ColorRegionInfo> region_info; String data; }; @@ -160,6 +165,8 @@ class TextEdit : public Control { bool is_marked(int p_line) const { return text[p_line].marked; } void set_breakpoint(int p_line, bool p_breakpoint) { text[p_line].breakpoint = p_breakpoint; } bool is_breakpoint(int p_line) const { return text[p_line].breakpoint; } + void set_hidden(int p_line, bool p_hidden) { text[p_line].hidden = p_hidden; } + bool is_hidden(int p_line) const { return text[p_line].hidden; } void insert(int p_at, const String &p_text); void remove(int p_at); int size() const { return text.size(); } @@ -251,6 +258,9 @@ class TextEdit : public Control { int line_length_guideline_col; bool draw_breakpoint_gutter; int breakpoint_gutter_width; + bool draw_fold_gutter; + int fold_gutter_width; + bool hiding_enabled; bool highlight_all_occurrences; bool scroll_past_end_of_file_enabled; @@ -293,9 +303,14 @@ class TextEdit : public Control { int search_result_line; int search_result_col; + double line_scroll_pos; + bool context_menu_enabled; int get_visible_rows() const; + int get_total_unhidden_rows() const; + double get_line_scroll_pos(bool p_recalculate = false) const; + void update_line_scroll_pos(); int get_char_count(); @@ -303,6 +318,7 @@ class TextEdit : public Control { int get_column_x_offset(int p_char, String p_str); void adjust_viewport_to_cursor(); + double get_scroll_line_diff() const; void _scroll_moved(double); void _update_scrollbars(); void _v_scroll_input(); @@ -312,6 +328,9 @@ class TextEdit : public Control { void _update_selection_mode_word(); void _update_selection_mode_line(); + void _scroll_up(real_t p_delta); + void _scroll_down(real_t p_delta); + void _pre_shift_selection(); void _post_shift_selection(); @@ -405,6 +424,18 @@ public: void set_line_as_breakpoint(int p_line, bool p_breakpoint); bool is_line_set_as_breakpoint(int p_line) const; void get_breakpoints(List<int> *p_breakpoints) const; + + void set_line_as_hidden(int p_line, bool p_hidden); + bool is_line_hidden(int p_line) const; + void fold_all_lines(); + void unhide_all_lines(); + int num_lines_from(int p_line_from, int unhidden_amount) const; + int get_whitespace_level(int p_line) const; + bool can_fold(int p_line) const; + bool is_folded(int p_line) const; + void fold_line(int p_line); + void unfold_line(int p_line); + String get_text(); String get_line(int line) const; void set_line(int line, String new_text); @@ -433,7 +464,7 @@ public: void center_viewport_to_cursor(); void cursor_set_column(int p_col, bool p_adjust_viewport = true); - void cursor_set_line(int p_row, bool p_adjust_viewport = true); + void cursor_set_line(int p_row, bool p_adjust_viewport = true, bool p_can_be_hidden = true); int cursor_get_column() const; int cursor_get_line() const; @@ -538,6 +569,15 @@ public: void set_breakpoint_gutter_width(int p_gutter_width); int get_breakpoint_gutter_width() const; + void set_draw_fold_gutter(bool p_draw); + bool is_drawing_fold_gutter() const; + + void set_fold_gutter_width(int p_gutter_width); + int get_fold_gutter_width() const; + + void set_hiding_enabled(int p_enabled); + int is_hiding_enabled() const; + void set_tooltip_request_func(Object *p_obj, const StringName &p_function, const Variant &p_udata); void set_completion(bool p_enabled, const Vector<String> &p_prefixes); diff --git a/scene/gui/tree.cpp b/scene/gui/tree.cpp index f2e5919b5f..9213296c55 100644 --- a/scene/gui/tree.cpp +++ b/scene/gui/tree.cpp @@ -28,6 +28,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ #include "tree.h" +#include <limits.h> #include "os/input.h" #include "os/keyboard.h" @@ -154,8 +155,17 @@ void TreeItem::set_text(int p_column, String p_text) { if (cells[p_column].mode == TreeItem::CELL_MODE_RANGE || cells[p_column].mode == TreeItem::CELL_MODE_RANGE_EXPRESSION) { - cells[p_column].min = 0; - cells[p_column].max = p_text.get_slice_count(","); + Vector<String> strings = p_text.split(","); + cells[p_column].min = INT_MAX; + cells[p_column].max = INT_MIN; + for (int i = 0; i < strings.size(); i++) { + int value = i; + if (!strings[i].get_slicec(':', 1).empty()) { + value = strings[i].get_slicec(':', 1).to_int(); + } + cells[p_column].min = MIN(cells[p_column].min, value); + cells[p_column].max = MAX(cells[p_column].max, value); + } cells[p_column].step = 0; } _changed_notify(p_column); @@ -1231,8 +1241,18 @@ int Tree::draw_item(const Point2i &p_pos, const Point2 &p_draw_ofs, const Size2 int option = (int)p_item->cells[i].val; - String s = p_item->cells[i].text; - s = s.get_slicec(',', option); + String s = RTR("(Other)"); + Vector<String> strings = p_item->cells[i].text.split(","); + for (int i = 0; i < strings.size(); i++) { + int value = i; + if (!strings[i].get_slicec(':', 1).empty()) { + value = strings[i].get_slicec(':', 1).to_int(); + } + if (option == value) { + s = strings[i].get_slicec(':', 0); + break; + } + } if (p_item->cells[i].suffix != String()) s += " " + p_item->cells[i].suffix; @@ -1776,7 +1796,7 @@ int Tree::propagate_mouse_event(const Point2i &p_pos, int x_ofs, int y_ofs, bool for (int i = 0; i < c.text.get_slice_count(","); i++) { String s = c.text.get_slicec(',', i); - popup_menu->add_item(s, i); + popup_menu->add_item(s.get_slicec(':', 0), s.get_slicec(':', 1).empty() ? i : s.get_slicec(':', 1).to_int()); } popup_menu->set_size(Size2(col_width, 0)); @@ -2592,6 +2612,12 @@ void Tree::_gui_input(Ref<InputEvent> p_event) { } break; } } + + Ref<InputEventPanGesture> pan_gesture = p_event; + if (pan_gesture.is_valid()) { + + v_scroll->set_value(v_scroll->get_value() + v_scroll->get_page() * pan_gesture->get_delta().y / 8); + } } bool Tree::edit_selected() { @@ -2634,7 +2660,7 @@ bool Tree::edit_selected() { for (int i = 0; i < c.text.get_slice_count(","); i++) { String s = c.text.get_slicec(',', i); - popup_menu->add_item(s, i); + popup_menu->add_item(s.get_slicec(':', 0), s.get_slicec(':', 1).empty() ? i : s.get_slicec(':', 1).to_int()); } popup_menu->set_size(Size2(rect.size.width, 0)); diff --git a/scene/main/node.cpp b/scene/main/node.cpp index d38c688241..31d423c808 100755..100644 --- a/scene/main/node.cpp +++ b/scene/main/node.cpp @@ -2067,7 +2067,7 @@ int Node::get_position_in_parent() const { return data.pos; } -Node *Node::duplicate(int p_flags) const { +Node *Node::_duplicate(int p_flags, Map<const Node *, Node *> *r_duplimap) const { Node *node = NULL; @@ -2084,7 +2084,12 @@ Node *Node::duplicate(int p_flags) const { Ref<PackedScene> res = ResourceLoader::load(get_filename()); ERR_FAIL_COND_V(res.is_null(), NULL); - node = res->instance(); + PackedScene::GenEditState ges = PackedScene::GEN_EDIT_STATE_DISABLED; +#ifdef TOOLS_ENABLED + if (p_flags & DUPLICATE_FROM_EDITOR) + ges = PackedScene::GEN_EDIT_STATE_INSTANCE; +#endif + node = res->instance(ges); ERR_FAIL_COND_V(!node, NULL); instanced = true; @@ -2103,53 +2108,78 @@ Node *Node::duplicate(int p_flags) const { node->set_filename(get_filename()); } - List<PropertyInfo> plist; - - get_property_list(&plist); - StringName script_property_name = CoreStringNames::get_singleton()->_script; - if (p_flags & DUPLICATE_SCRIPTS) { - bool is_valid = false; - Variant script = get(script_property_name, &is_valid); - if (is_valid) { - node->set(script_property_name, script); + List<const Node *> node_tree; + node_tree.push_front(this); + + if (instanced) { + for (List<const Node *>::Element *N = node_tree.front(); N; N = N->next()) { + for (int i = 0; i < N->get()->get_child_count(); ++i) { + node_tree.push_back(N->get()->get_child(i)); + } } } - for (List<PropertyInfo>::Element *E = plist.front(); E; E = E->next()) { + for (List<const Node *>::Element *N = node_tree.front(); N; N = N->next()) { - if (!(E->get().usage & PROPERTY_USAGE_STORAGE)) - continue; - String name = E->get().name; - if (name == script_property_name) - continue; + Node *current_node = node->get_node(get_path_to(N->get())); - Variant value = get(name); - // Duplicate dictionaries and arrays, mainly needed for __meta__ - if (value.get_type() == Variant::DICTIONARY) { - value = Dictionary(value).copy(); - } else if (value.get_type() == Variant::ARRAY) { - value = Array(value).duplicate(); + if (p_flags & DUPLICATE_SCRIPTS) { + bool is_valid = false; + Variant script = N->get()->get(script_property_name, &is_valid); + if (is_valid) { + current_node->set(script_property_name, script); + } } - node->set(name, value); + List<PropertyInfo> plist; + N->get()->get_property_list(&plist); + + if (!current_node) + continue; + + for (List<PropertyInfo>::Element *E = plist.front(); E; E = E->next()) { + + if (!(E->get().usage & PROPERTY_USAGE_STORAGE)) + continue; + String name = E->get().name; + if (name == script_property_name) + continue; + + Variant value = N->get()->get(name); + // Duplicate dictionaries and arrays, mainly needed for __meta__ + if (value.get_type() == Variant::DICTIONARY) { + value = Dictionary(value).copy(); + } else if (value.get_type() == Variant::ARRAY) { + value = Array(value).duplicate(); + } + + current_node->set(name, value); + } } node->set_name(get_name()); +#ifdef TOOLS_ENABLED + if ((p_flags & DUPLICATE_FROM_EDITOR) && r_duplimap) + r_duplimap->insert(this, node); +#endif + if (p_flags & DUPLICATE_GROUPS) { List<GroupInfo> gi; get_groups(&gi); for (List<GroupInfo>::Element *E = gi.front(); E; E = E->next()) { +#ifdef TOOLS_ENABLED + if ((p_flags & DUPLICATE_FROM_EDITOR) && !E->get().persistent) + continue; +#endif + node->add_to_group(E->get().name, E->get().persistent); } } - if (p_flags & DUPLICATE_SIGNALS) - _duplicate_signals(this, node); - for (int i = 0; i < get_child_count(); i++) { if (get_child(i)->data.parent_owned) @@ -2157,7 +2187,7 @@ Node *Node::duplicate(int p_flags) const { if (instanced && get_child(i)->data.owner == this) continue; //part of instance - Node *dup = get_child(i)->duplicate(p_flags); + Node *dup = get_child(i)->_duplicate(p_flags, r_duplimap); if (!dup) { memdelete(node); @@ -2170,6 +2200,31 @@ Node *Node::duplicate(int p_flags) const { return node; } +Node *Node::duplicate(int p_flags) const { + + Node *dupe = _duplicate(p_flags); + + if (dupe && (p_flags & DUPLICATE_SIGNALS)) { + _duplicate_signals(this, dupe); + } + + return dupe; +} + +#ifdef TOOLS_ENABLED +Node *Node::duplicate_from_editor(Map<const Node *, Node *> &r_duplimap) const { + + Node *dupe = _duplicate(DUPLICATE_SIGNALS | DUPLICATE_GROUPS | DUPLICATE_SCRIPTS | DUPLICATE_USE_INSTANCING | DUPLICATE_FROM_EDITOR, &r_duplimap); + + // Duplication of signals must happen after all the node descendants have been copied, + // because re-targeting of connections from some descendant to another is not possible + // if the emitter node comes later in tree order than the receiver + _duplicate_signals(this, dupe); + + return dupe; +} +#endif + void Node::_duplicate_and_reown(Node *p_new_parent, const Map<Node *, Node *> &p_reown_map) const { if (get_owner() != get_parent()->get_owner()) @@ -2240,6 +2295,9 @@ void Node::_duplicate_and_reown(Node *p_new_parent, const Map<Node *, Node *> &p } } +// Duplication of signals must happen after all the node descendants have been copied, +// because re-targeting of connections from some descendant to another is not possible +// if the emitter node comes later in tree order than the receiver void Node::_duplicate_signals(const Node *p_original, Node *p_copy) const { if (this != p_original && (get_owner() != p_original && get_owner() != p_original->get_owner())) @@ -2262,8 +2320,14 @@ void Node::_duplicate_signals(const Node *p_original, Node *p_copy) const { NodePath ptarget = p_original->get_path_to(target); Node *copytarget = p_copy->get_node(ptarget); + // Cannot find a path to the duplicate target, so it seems it's not part + // of the duplicated and not yet parented hierarchy, so at least try to connect + // to the same target as the original + if (!copytarget) + copytarget = target; + if (copy && copytarget) { - copy->connect(E->get().signal, copytarget, E->get().method, E->get().binds, CONNECT_PERSIST); + copy->connect(E->get().signal, copytarget, E->get().method, E->get().binds, E->get().flags); } } } @@ -2308,6 +2372,9 @@ Node *Node::duplicate_and_reown(const Map<Node *, Node *> &p_reown_map) const { get_child(i)->_duplicate_and_reown(node, p_reown_map); } + // Duplication of signals must happen after all the node descendants have been copied, + // because re-targeting of connections from some descendant to another is not possible + // if the emitter node comes later in tree order than the receiver _duplicate_signals(this, node); return node; } @@ -2457,24 +2524,19 @@ bool Node::has_node_and_resource(const NodePath &p_path) const { return false; Node *node = get_node(p_path); - if (p_path.get_subname_count()) { + bool result = false; - RES r; - for (int j = 0; j < p_path.get_subname_count(); j++) { - r = j == 0 ? node->get(p_path.get_subname(j)) : r->get(p_path.get_subname(j)); - if (r.is_null()) - return false; - } - } + node->get_indexed(p_path.get_subnames(), &result); - return true; + return result; } Array Node::_get_node_and_resource(const NodePath &p_path) { Node *node; RES res; - node = get_node_and_resource(p_path, res); + Vector<StringName> leftover_path; + node = get_node_and_resource(p_path, res, leftover_path); Array result; if (node) @@ -2487,21 +2549,35 @@ Array Node::_get_node_and_resource(const NodePath &p_path) { else result.push_back(Variant()); + result.push_back(NodePath(Vector<StringName>(), leftover_path, false)); + return result; } -Node *Node::get_node_and_resource(const NodePath &p_path, RES &r_res) const { +Node *Node::get_node_and_resource(const NodePath &p_path, RES &r_res, Vector<StringName> &r_leftover_subpath, bool p_last_is_property) const { Node *node = get_node(p_path); r_res = RES(); + r_leftover_subpath = Vector<StringName>(); if (!node) return NULL; if (p_path.get_subname_count()) { - for (int j = 0; j < p_path.get_subname_count(); j++) { - r_res = j == 0 ? node->get(p_path.get_subname(j)) : r_res->get(p_path.get_subname(j)); - ERR_FAIL_COND_V(r_res.is_null(), node); + int j = 0; + // If not p_last_is_property, we shouldn't consider the last one as part of the resource + for (; j < p_path.get_subname_count() - p_last_is_property; j++) { + RES new_res = j == 0 ? node->get(p_path.get_subname(j)) : r_res->get(p_path.get_subname(j)); + + if (new_res.is_null()) { + break; + } + + r_res = new_res; + } + for (; j < p_path.get_subname_count(); j++) { + // Put the rest of the subpath in the leftover path + r_leftover_subpath.push_back(p_path.get_subname(j)); } } diff --git a/scene/main/node.h b/scene/main/node.h index e8901f7b6e..2b71b71c8d 100644 --- a/scene/main/node.h +++ b/scene/main/node.h @@ -58,7 +58,10 @@ public: DUPLICATE_SIGNALS = 1, DUPLICATE_GROUPS = 2, DUPLICATE_SCRIPTS = 4, - DUPLICATE_USE_INSTANCING = 8 + DUPLICATE_USE_INSTANCING = 8, +#ifdef TOOLS_ENABLED + DUPLICATE_FROM_EDITOR = 16, +#endif }; enum RPCMode { @@ -169,6 +172,7 @@ private: void _duplicate_signals(const Node *p_original, Node *p_copy) const; void _duplicate_and_reown(Node *p_new_parent, const Map<Node *, Node *> &p_reown_map) const; + Node *_duplicate(int p_flags, Map<const Node *, Node *> *r_duplimap = NULL) const; Array _get_children() const; Array _get_groups() const; @@ -241,7 +245,7 @@ public: Node *get_node(const NodePath &p_path) const; Node *find_node(const String &p_mask, bool p_recursive = true, bool p_owned = true) const; bool has_node_and_resource(const NodePath &p_path) const; - Node *get_node_and_resource(const NodePath &p_path, RES &r_res) const; + Node *get_node_and_resource(const NodePath &p_path, RES &r_res, Vector<StringName> &r_leftover_subpath, bool p_last_is_property = true) const; Node *get_parent() const; _FORCE_INLINE_ SceneTree *get_tree() const { @@ -325,6 +329,9 @@ public: Node *duplicate(int p_flags = DUPLICATE_GROUPS | DUPLICATE_SIGNALS | DUPLICATE_SCRIPTS) const; Node *duplicate_and_reown(const Map<Node *, Node *> &p_reown_map) const; +#ifdef TOOLS_ENABLED + Node *duplicate_from_editor(Map<const Node *, Node *> &r_duplimap) const; +#endif //Node *clone_tree() const; diff --git a/scene/main/viewport.cpp b/scene/main/viewport.cpp index 0a02f471c1..1fc2d4b16e 100644 --- a/scene/main/viewport.cpp +++ b/scene/main/viewport.cpp @@ -539,7 +539,7 @@ void Viewport::_notification(int p_what) { Vector2 point = get_canvas_transform().affine_inverse().xform(pos); Physics2DDirectSpaceState::ShapeResult res[64]; - int rc = ss2d->intersect_point(point, res, 64, Set<RID>(), 0xFFFFFFFF, 0xFFFFFFFF, true); + int rc = ss2d->intersect_point(point, res, 64, Set<RID>(), 0xFFFFFFFF, true); for (int i = 0; i < rc; i++) { if (res[i].collider_id && res[i].collider) { @@ -622,7 +622,7 @@ void Viewport::_notification(int p_what) { PhysicsDirectSpaceState *space = PhysicsServer::get_singleton()->space_get_direct_state(find_world()->get_space()); if (space) { - bool col = space->intersect_ray(from, from + dir * 10000, result, Set<RID>(), 0xFFFFFFFF, 0xFFFFFFFF, true); + bool col = space->intersect_ray(from, from + dir * 10000, result, Set<RID>(), 0xFFFFFFFF, true); ObjectID new_collider = 0; if (col) { @@ -658,7 +658,7 @@ void Viewport::_notification(int p_what) { PhysicsDirectSpaceState *space = PhysicsServer::get_singleton()->space_get_direct_state(find_world()->get_space()); if (space) { - bool col = space->intersect_ray(from, from + dir * 10000, result, Set<RID>(), 0xFFFFFFFF, 0xFFFFFFFF, true); + bool col = space->intersect_ray(from, from + dir * 10000, result, Set<RID>(), 0xFFFFFFFF, true); ObjectID new_collider = 0; if (col) { CollisionObject *co = Object::cast_to<CollisionObject>(result.collider); @@ -2013,6 +2013,30 @@ void Viewport::_gui_input_event(Ref<InputEvent> p_event) { } } + Ref<InputEventGesture> gesture_event = p_event; + if (gesture_event.is_valid()) { + + Size2 pos = gesture_event->get_position(); + + Control *over = _gui_find_control(pos); + if (over) { + + if (over->can_process()) { + + gesture_event = gesture_event->xformed_by(Transform2D()); //make a copy + if (over == gui.mouse_focus) { + pos = gui.focus_inv_xform.xform(pos); + } else { + pos = over->get_global_transform_with_canvas().affine_inverse().xform(pos); + } + gesture_event->set_position(pos); + _gui_call_input(over, gesture_event); + } + get_tree()->set_input_as_handled(); + return; + } + } + Ref<InputEventScreenDrag> drag_event = p_event; if (drag_event.is_valid()) { diff --git a/scene/resources/animation.cpp b/scene/resources/animation.cpp index 21e4a85cd1..8192074c17 100644 --- a/scene/resources/animation.cpp +++ b/scene/resources/animation.cpp @@ -1125,14 +1125,14 @@ Variant Animation::_cubic_interpolate(const Variant &p_pre_a, const Variant &p_a return a.cubic_slerp(b, pa, pb, p_c); } break; - case Variant::RECT3: { + case Variant::AABB: { - Rect3 a = p_a; - Rect3 b = p_b; - Rect3 pa = p_pre_a; - Rect3 pb = p_post_b; + AABB a = p_a; + AABB b = p_b; + AABB pa = p_pre_a; + AABB pb = p_post_b; - return Rect3( + return AABB( a.position.cubic_interpolate(b.position, pa.position, pb.position, p_c), a.size.cubic_interpolate(b.size, pa.size, pb.size, p_c)); } break; diff --git a/scene/resources/box_shape.cpp b/scene/resources/box_shape.cpp index bbc85ce0f6..4b9843f3f5 100644 --- a/scene/resources/box_shape.cpp +++ b/scene/resources/box_shape.cpp @@ -33,7 +33,7 @@ Vector<Vector3> BoxShape::_gen_debug_mesh_lines() { Vector<Vector3> lines; - Rect3 aabb; + AABB aabb; aabb.position = -get_extents(); aabb.size = aabb.position * -2; diff --git a/scene/resources/mesh.cpp b/scene/resources/mesh.cpp index 3e86daf3a7..0a886c25b1 100644 --- a/scene/resources/mesh.cpp +++ b/scene/resources/mesh.cpp @@ -594,9 +594,9 @@ bool ArrayMesh::_set(const StringName &p_name, const Variant &p_value) { } ERR_FAIL_COND_V(!d.has("aabb"), false); - Rect3 aabb = d["aabb"]; + AABB aabb = d["aabb"]; - Vector<Rect3> bone_aabb; + Vector<AABB> bone_aabb; if (d.has("skeleton_aabb")) { Array baabb = d["skeleton_aabb"]; bone_aabb.resize(baabb.size()); @@ -676,7 +676,7 @@ bool ArrayMesh::_get(const StringName &p_name, Variant &r_ret) const { d["format"] = VS::get_singleton()->mesh_surface_get_format(mesh, idx); d["aabb"] = VS::get_singleton()->mesh_surface_get_aabb(mesh, idx); - Vector<Rect3> skel_aabb = VS::get_singleton()->mesh_surface_get_skeleton_aabb(mesh, idx); + Vector<AABB> skel_aabb = VS::get_singleton()->mesh_surface_get_skeleton_aabb(mesh, idx); Array arr; for (int i = 0; i < skel_aabb.size(); i++) { arr[i] = skel_aabb[i]; @@ -725,13 +725,13 @@ void ArrayMesh::_get_property_list(List<PropertyInfo> *p_list) const { } } - p_list->push_back(PropertyInfo(Variant::RECT3, "custom_aabb/custom_aabb")); + p_list->push_back(PropertyInfo(Variant::AABB, "custom_aabb/custom_aabb")); } void ArrayMesh::_recompute_aabb() { // regenerate AABB - aabb = Rect3(); + aabb = AABB(); for (int i = 0; i < surfaces.size(); i++) { @@ -742,7 +742,7 @@ void ArrayMesh::_recompute_aabb() { } } -void ArrayMesh::add_surface(uint32_t p_format, PrimitiveType p_primitive, const PoolVector<uint8_t> &p_array, int p_vertex_count, const PoolVector<uint8_t> &p_index_array, int p_index_count, const Rect3 &p_aabb, const Vector<PoolVector<uint8_t> > &p_blend_shapes, const Vector<Rect3> &p_bone_aabbs) { +void ArrayMesh::add_surface(uint32_t p_format, PrimitiveType p_primitive, const PoolVector<uint8_t> &p_array, int p_vertex_count, const PoolVector<uint8_t> &p_index_array, int p_index_count, const AABB &p_aabb, const Vector<PoolVector<uint8_t> > &p_blend_shapes, const Vector<AABB> &p_bone_aabbs) { Surface s; s.aabb = p_aabb; @@ -772,7 +772,7 @@ void ArrayMesh::add_surface_from_arrays(PrimitiveType p_primitive, const Array & const Vector3 *vtx = r.ptr(); // check AABB - Rect3 aabb; + AABB aabb; for (int i = 0; i < len; i++) { if (i == 0) @@ -926,7 +926,7 @@ void ArrayMesh::surface_update_region(int p_surface, int p_offset, const PoolVec VS::get_singleton()->mesh_surface_update_region(mesh, p_surface, p_offset, p_data); } -void ArrayMesh::surface_set_custom_aabb(int p_idx, const Rect3 &p_aabb) { +void ArrayMesh::surface_set_custom_aabb(int p_idx, const AABB &p_aabb) { ERR_FAIL_INDEX(p_idx, surfaces.size()); surfaces[p_idx].aabb = p_aabb; @@ -942,7 +942,7 @@ Ref<Material> ArrayMesh::surface_get_material(int p_idx) const { void ArrayMesh::add_surface_from_mesh_data(const Geometry::MeshData &p_mesh_data) { VisualServer::get_singleton()->mesh_add_surface_from_mesh_data(mesh, p_mesh_data); - Rect3 aabb; + AABB aabb; for (int i = 0; i < p_mesh_data.vertices.size(); i++) { if (i == 0) @@ -970,18 +970,18 @@ RID ArrayMesh::get_rid() const { return mesh; } -Rect3 ArrayMesh::get_aabb() const { +AABB ArrayMesh::get_aabb() const { return aabb; } -void ArrayMesh::set_custom_aabb(const Rect3 &p_custom) { +void ArrayMesh::set_custom_aabb(const AABB &p_custom) { custom_aabb = p_custom; VS::get_singleton()->mesh_set_custom_aabb(mesh, custom_aabb); } -Rect3 ArrayMesh::get_custom_aabb() const { +AABB ArrayMesh::get_custom_aabb() const { return custom_aabb; } @@ -1097,11 +1097,13 @@ void ArrayMesh::_bind_methods() { } void ArrayMesh::reload_from_file() { - for (int i = 0; i < get_surface_count(); i++) { - surface_remove(i); - } + VisualServer::get_singleton()->mesh_clear(mesh); + surfaces.clear(); + clear_blend_shapes(); + Resource::reload_from_file(); - String path = get_path(); + + _change_notify(); } ArrayMesh::ArrayMesh() { diff --git a/scene/resources/mesh.h b/scene/resources/mesh.h index 75927079c7..b85a6a84af 100644 --- a/scene/resources/mesh.h +++ b/scene/resources/mesh.h @@ -136,7 +136,7 @@ public: Ref<Mesh> create_outline(float p_margin) const; - virtual Rect3 get_aabb() const = 0; + virtual AABB get_aabb() const = 0; Mesh(); }; @@ -149,16 +149,16 @@ class ArrayMesh : public Mesh { private: struct Surface { String name; - Rect3 aabb; + AABB aabb; Ref<Material> material; bool is_2d; }; Vector<Surface> surfaces; RID mesh; - Rect3 aabb; + AABB aabb; BlendShapeMode blend_shape_mode; Vector<StringName> blend_shapes; - Rect3 custom_aabb; + AABB custom_aabb; void _recompute_aabb(); @@ -173,7 +173,7 @@ protected: public: void add_surface_from_arrays(PrimitiveType p_primitive, const Array &p_arrays, const Array &p_blend_shapes = Array(), uint32_t p_flags = ARRAY_COMPRESS_DEFAULT); - void add_surface(uint32_t p_format, PrimitiveType p_primitive, const PoolVector<uint8_t> &p_array, int p_vertex_count, const PoolVector<uint8_t> &p_index_array, int p_index_count, const Rect3 &p_aabb, const Vector<PoolVector<uint8_t> > &p_blend_shapes = Vector<PoolVector<uint8_t> >(), const Vector<Rect3> &p_bone_aabbs = Vector<Rect3>()); + void add_surface(uint32_t p_format, PrimitiveType p_primitive, const PoolVector<uint8_t> &p_array, int p_vertex_count, const PoolVector<uint8_t> &p_index_array, int p_index_count, const AABB &p_aabb, const Vector<PoolVector<uint8_t> > &p_blend_shapes = Vector<PoolVector<uint8_t> >(), const Vector<AABB> &p_bone_aabbs = Vector<AABB>()); Array surface_get_arrays(int p_surface) const; Array surface_get_blend_shape_arrays(int p_surface) const; @@ -191,7 +191,7 @@ public: int get_surface_count() const; void surface_remove(int p_idx); - void surface_set_custom_aabb(int p_idx, const Rect3 &p_aabb); //only recognized by driver + void surface_set_custom_aabb(int p_idx, const AABB &p_aabb); //only recognized by driver int surface_get_array_len(int p_idx) const; int surface_get_array_index_len(int p_idx) const; @@ -207,10 +207,10 @@ public: void add_surface_from_mesh_data(const Geometry::MeshData &p_mesh_data); - void set_custom_aabb(const Rect3 &p_custom); - Rect3 get_custom_aabb() const; + void set_custom_aabb(const AABB &p_custom); + AABB get_custom_aabb() const; - Rect3 get_aabb() const; + AABB get_aabb() const; virtual RID get_rid() const; void center_geometry(); diff --git a/scene/resources/multimesh.cpp b/scene/resources/multimesh.cpp index 15f1e15542..ee6efa6e85 100644 --- a/scene/resources/multimesh.cpp +++ b/scene/resources/multimesh.cpp @@ -155,7 +155,7 @@ Color MultiMesh::get_instance_color(int p_instance) const { return VisualServer::get_singleton()->multimesh_instance_get_color(multimesh, p_instance); } -Rect3 MultiMesh::get_aabb() const { +AABB MultiMesh::get_aabb() const { return VisualServer::get_singleton()->multimesh_get_aabb(multimesh); } diff --git a/scene/resources/multimesh.h b/scene/resources/multimesh.h index 7ca66b0b46..0a5310f641 100644 --- a/scene/resources/multimesh.h +++ b/scene/resources/multimesh.h @@ -84,7 +84,7 @@ public: void set_instance_color(int p_instance, const Color &p_color); Color get_instance_color(int p_instance) const; - virtual Rect3 get_aabb() const; + virtual AABB get_aabb() const; virtual RID get_rid() const; diff --git a/scene/resources/primitive_meshes.cpp b/scene/resources/primitive_meshes.cpp index 8e3899315c..3b80db291c 100644 --- a/scene/resources/primitive_meshes.cpp +++ b/scene/resources/primitive_meshes.cpp @@ -42,7 +42,7 @@ void PrimitiveMesh::_update() const { PoolVector<Vector3> points = arr[VS::ARRAY_VERTEX]; - aabb = Rect3(); + aabb = AABB(); int pc = points.size(); ERR_FAIL_COND(pc == 0); @@ -141,7 +141,7 @@ StringName PrimitiveMesh::get_blend_shape_name(int p_index) const { return StringName(); } -Rect3 PrimitiveMesh::get_aabb() const { +AABB PrimitiveMesh::get_aabb() const { if (pending_request) { _update(); } diff --git a/scene/resources/primitive_meshes.h b/scene/resources/primitive_meshes.h index f0c8935261..b38c247827 100644 --- a/scene/resources/primitive_meshes.h +++ b/scene/resources/primitive_meshes.h @@ -47,7 +47,7 @@ class PrimitiveMesh : public Mesh { private: RID mesh; - mutable Rect3 aabb; + mutable AABB aabb; Ref<Material> material; @@ -73,7 +73,7 @@ public: virtual Ref<Material> surface_get_material(int p_idx) const; virtual int get_blend_shape_count() const; virtual StringName get_blend_shape_name(int p_index) const; - virtual Rect3 get_aabb() const; + virtual AABB get_aabb() const; virtual RID get_rid() const; void set_material(const Ref<Material> &p_material); diff --git a/scene/resources/scene_format_text.cpp b/scene/resources/scene_format_text.cpp index f0304bfaa5..fe23fbf6b3 100644 --- a/scene/resources/scene_format_text.cpp +++ b/scene/resources/scene_format_text.cpp @@ -33,7 +33,7 @@ #include "project_settings.h" #include "version.h" -//version 2: changed names for basis, rect3, poolvectors, etc. +//version 2: changed names for basis, aabb, poolvectors, etc. #define FORMAT_VERSION 2 #include "os/dir_access.h" diff --git a/scene/resources/tile_set.cpp b/scene/resources/tile_set.cpp index 29ac7852bf..657d5f6c80 100644 --- a/scene/resources/tile_set.cpp +++ b/scene/resources/tile_set.cpp @@ -28,6 +28,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ #include "tile_set.h" +#include "array.h" bool TileSet::_set(const StringName &p_name, const Variant &p_value) { @@ -55,7 +56,74 @@ bool TileSet::_set(const StringName &p_name, const Variant &p_value) { tile_set_modulate(id, p_value); else if (what == "region") tile_set_region(id, p_value); - else if (what == "shape") + else if (what == "is_autotile") + tile_set_is_autotile(id, p_value); + else if (what.left(9) == "autotile/") { + what = what.right(9); + if (what == "bitmask_mode") + autotile_set_bitmask_mode(id, (BitmaskMode)((int)p_value)); + else if (what == "icon_coordinate") + autotile_set_icon_coordinate(id, p_value); + else if (what == "tile_size") + autotile_set_size(id, p_value); + else if (what == "spacing") + autotile_set_spacing(id, p_value); + else if (what == "bitmask_flags") { + tile_map[id].autotile_data.flags.clear(); + if (p_value.is_array()) { + Array p = p_value; + Vector2 last_coord; + while (p.size() > 0) { + if (p[0].get_type() == Variant::VECTOR2) { + last_coord = p[0]; + } else if (p[0].get_type() == Variant::INT) { + autotile_set_bitmask(id, last_coord, p[0]); + } + p.pop_front(); + } + } + } else if (what == "occluder_map") { + tile_map[id].autotile_data.ocludder_map.clear(); + Array p = p_value; + Vector2 last_coord; + while (p.size() > 0) { + if (p[0].get_type() == Variant::VECTOR2) { + last_coord = p[0]; + } else if (p[0].get_type() == Variant::OBJECT) { + autotile_set_light_occluder(id, p[0], last_coord); + } + p.pop_front(); + } + } else if (what == "navpoly_map") { + tile_map[id].autotile_data.navpoly_map.clear(); + Array p = p_value; + Vector2 last_coord; + while (p.size() > 0) { + if (p[0].get_type() == Variant::VECTOR2) { + last_coord = p[0]; + } else if (p[0].get_type() == Variant::OBJECT) { + autotile_set_navigation_polygon(id, p[0], last_coord); + } + p.pop_front(); + } + } else if (what == "priority_map") { + tile_map[id].autotile_data.priority_map.clear(); + Array p = p_value; + Vector3 val; + Vector2 v; + int priority; + while (p.size() > 0) { + val = p[0]; + if (val.z > 1) { + v.x = val.x; + v.y = val.y; + priority = (int)val.z; + tile_map[id].autotile_data.priority_map[v] = priority; + } + p.pop_front(); + } + } + } else if (what == "shape") tile_set_shape(id, 0, p_value); else if (what == "shape_offset") tile_set_shape_offset(id, 0, p_value); @@ -105,7 +173,54 @@ bool TileSet::_get(const StringName &p_name, Variant &r_ret) const { r_ret = tile_get_modulate(id); else if (what == "region") r_ret = tile_get_region(id); - else if (what == "shape") + else if (what == "is_autotile") + r_ret = tile_get_is_autotile(id); + else if (what.left(9) == "autotile/") { + what = what.right(9); + if (what == "bitmask_mode") + r_ret = autotile_get_bitmask_mode(id); + else if (what == "icon_coordinate") + r_ret = autotile_get_icon_coordinate(id); + else if (what == "tile_size") + r_ret = autotile_get_size(id); + else if (what == "spacing") + r_ret = autotile_get_spacing(id); + else if (what == "bitmask_flags") { + Array p; + for (Map<Vector2, uint16_t>::Element *E = tile_map[id].autotile_data.flags.front(); E; E = E->next()) { + p.push_back(E->key()); + p.push_back(E->value()); + } + r_ret = p; + } else if (what == "occluder_map") { + Array p; + for (Map<Vector2, Ref<OccluderPolygon2D> >::Element *E = tile_map[id].autotile_data.ocludder_map.front(); E; E = E->next()) { + p.push_back(E->key()); + p.push_back(E->value()); + } + r_ret = p; + } else if (what == "navpoly_map") { + Array p; + for (Map<Vector2, Ref<NavigationPolygon> >::Element *E = tile_map[id].autotile_data.navpoly_map.front(); E; E = E->next()) { + p.push_back(E->key()); + p.push_back(E->value()); + } + r_ret = p; + } else if (what == "priority_map") { + Array p; + Vector3 v; + for (Map<Vector2, int>::Element *E = tile_map[id].autotile_data.priority_map.front(); E; E = E->next()) { + if (E->value() > 1) { + //Dont save default value + v.x = E->key().x; + v.y = E->key().y; + v.z = E->value(); + p.push_back(v); + } + } + r_ret = p; + } + } else if (what == "shape") r_ret = tile_get_shape(id, 0); else if (what == "shape_offset") r_ret = tile_get_shape_offset(id, 0); @@ -142,6 +257,17 @@ void TileSet::_get_property_list(List<PropertyInfo> *p_list) const { p_list->push_back(PropertyInfo(Variant::OBJECT, pre + "material", PROPERTY_HINT_RESOURCE_TYPE, "ShaderMaterial")); p_list->push_back(PropertyInfo(Variant::COLOR, pre + "modulate")); p_list->push_back(PropertyInfo(Variant::RECT2, pre + "region")); + p_list->push_back(PropertyInfo(Variant::BOOL, pre + "is_autotile", PROPERTY_HINT_NONE, "")); + if (tile_get_is_autotile(id)) { + p_list->push_back(PropertyInfo(Variant::INT, pre + "autotile/bitmask_mode", PROPERTY_HINT_ENUM, "2X2,3X3", PROPERTY_USAGE_NOEDITOR)); + p_list->push_back(PropertyInfo(Variant::VECTOR2, pre + "autotile/icon_coordinate", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NOEDITOR)); + p_list->push_back(PropertyInfo(Variant::VECTOR2, pre + "autotile/tile_size", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NOEDITOR)); + p_list->push_back(PropertyInfo(Variant::INT, pre + "autotile/spacing", PROPERTY_HINT_RANGE, "0,256,1", PROPERTY_USAGE_NOEDITOR)); + p_list->push_back(PropertyInfo(Variant::ARRAY, pre + "autotile/bitmask_flags", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NOEDITOR)); + p_list->push_back(PropertyInfo(Variant::ARRAY, pre + "autotile/occluder_map", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NOEDITOR)); + p_list->push_back(PropertyInfo(Variant::ARRAY, pre + "autotile/navpoly_map", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NOEDITOR)); + p_list->push_back(PropertyInfo(Variant::ARRAY, pre + "autotile/priority_map", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NOEDITOR)); + } p_list->push_back(PropertyInfo(Variant::VECTOR2, pre + "occluder_offset")); p_list->push_back(PropertyInfo(Variant::OBJECT, pre + "occluder", PROPERTY_HINT_RESOURCE_TYPE, "OccluderPolygon2D")); p_list->push_back(PropertyInfo(Variant::VECTOR2, pre + "navigation_offset")); @@ -158,10 +284,25 @@ void TileSet::create_tile(int p_id) { ERR_FAIL_COND(tile_map.has(p_id)); tile_map[p_id] = TileData(); + tile_map[p_id].autotile_data = AutotileData(); + _change_notify(""); + emit_changed(); +} + +void TileSet::autotile_set_bitmask_mode(int p_id, BitmaskMode p_mode) { + + ERR_FAIL_COND(!tile_map.has(p_id)); + tile_map[p_id].autotile_data.bitmask_mode = p_mode; _change_notify(""); emit_changed(); } +TileSet::BitmaskMode TileSet::autotile_get_bitmask_mode(int p_id) const { + + ERR_FAIL_COND_V(!tile_map.has(p_id), BITMASK_2X2); + return tile_map[p_id].autotile_data.bitmask_mode; +} + void TileSet::tile_set_texture(int p_id, const Ref<Texture> &p_texture) { ERR_FAIL_COND(!tile_map.has(p_id)); @@ -240,6 +381,152 @@ Rect2 TileSet::tile_get_region(int p_id) const { return tile_map[p_id].region; } +void TileSet::tile_set_is_autotile(int p_id, bool p_is_autotile) { + + ERR_FAIL_COND(!tile_map.has(p_id)); + tile_map[p_id].is_autotile = p_is_autotile; + _change_notify(""); + emit_changed(); +} + +bool TileSet::tile_get_is_autotile(int p_id) const { + + ERR_FAIL_COND_V(!tile_map.has(p_id), false); + return tile_map[p_id].is_autotile; +} + +void TileSet::autotile_set_icon_coordinate(int p_id, Vector2 coord) { + + ERR_FAIL_COND(!tile_map.has(p_id)); + tile_map[p_id].autotile_data.icon_coord = coord; + emit_changed(); +} + +Vector2 TileSet::autotile_get_icon_coordinate(int p_id) const { + + ERR_FAIL_COND_V(!tile_map.has(p_id), Vector2()); + return tile_map[p_id].autotile_data.icon_coord; +} + +void TileSet::autotile_set_spacing(int p_id, int p_spacing) { + + ERR_FAIL_COND(!tile_map.has(p_id)); + ERR_FAIL_COND(p_spacing < 0); + tile_map[p_id].autotile_data.spacing = p_spacing; + emit_changed(); +} + +int TileSet::autotile_get_spacing(int p_id) const { + + ERR_FAIL_COND_V(!tile_map.has(p_id), 0); + return tile_map[p_id].autotile_data.spacing; +} + +void TileSet::autotile_set_size(int p_id, Size2 p_size) { + + ERR_FAIL_COND(!tile_map.has(p_id)); + ERR_FAIL_COND(p_size.x <= 0 || p_size.y <= 0); + tile_map[p_id].autotile_data.size = p_size; +} + +Size2 TileSet::autotile_get_size(int p_id) const { + + ERR_FAIL_COND_V(!tile_map.has(p_id), Size2()); + return tile_map[p_id].autotile_data.size; +} + +void TileSet::autotile_clear_bitmask_map(int p_id) { + + ERR_FAIL_COND(!tile_map.has(p_id)); + tile_map[p_id].autotile_data.flags.clear(); +} + +void TileSet::autotile_set_subtile_priority(int p_id, const Vector2 &p_coord, int p_priority) { + + ERR_FAIL_COND(!tile_map.has(p_id)); + ERR_FAIL_COND(p_priority <= 0); + tile_map[p_id].autotile_data.priority_map[p_coord] = p_priority; +} + +int TileSet::autotile_get_subtile_priority(int p_id, const Vector2 &p_coord) { + + ERR_FAIL_COND_V(!tile_map.has(p_id), 1); + if (tile_map[p_id].autotile_data.priority_map.has(p_coord)) { + return tile_map[p_id].autotile_data.priority_map[p_coord]; + } + //When not custom priority set return the default value + return 1; +} + +const Map<Vector2, int> &TileSet::autotile_get_priority_map(int p_id) const { + + static Map<Vector2, int> dummy; + ERR_FAIL_COND_V(!tile_map.has(p_id), dummy); + return tile_map[p_id].autotile_data.priority_map; +} + +void TileSet::autotile_set_bitmask(int p_id, Vector2 p_coord, uint16_t p_flag) { + + ERR_FAIL_COND(!tile_map.has(p_id)); + if (p_flag == 0) { + if (tile_map[p_id].autotile_data.flags.has(p_coord)) + tile_map[p_id].autotile_data.flags.erase(p_coord); + } else { + tile_map[p_id].autotile_data.flags[p_coord] = p_flag; + } +} + +uint16_t TileSet::autotile_get_bitmask(int p_id, Vector2 p_coord) { + + ERR_FAIL_COND_V(!tile_map.has(p_id), 0); + if (!tile_map[p_id].autotile_data.flags.has(p_coord)) { + return 0; + } + return tile_map[p_id].autotile_data.flags[p_coord]; +} + +const Map<Vector2, uint16_t> &TileSet::autotile_get_bitmask_map(int p_id) { + + static Map<Vector2, uint16_t> dummy; + ERR_FAIL_COND_V(!tile_map.has(p_id), dummy); + return tile_map[p_id].autotile_data.flags; +} + +Vector2 TileSet::autotile_get_subtile_for_bitmask(int p_id, uint16_t p_bitmask, const Node *p_tilemap_node, const Vector2 &p_tile_location) { + + ERR_FAIL_COND_V(!tile_map.has(p_id), Vector2()); + //First try to forward selection to script + if (p_tilemap_node->get_class_name() == "TileMap") { + if (get_script_instance() != NULL) { + if (get_script_instance()->has_method("_forward_subtile_selection")) { + Variant ret = get_script_instance()->call("_forward_subtile_selection", p_id, p_bitmask, p_tilemap_node, p_tile_location); + if (ret.get_type() == Variant::VECTOR2) { + return ret; + } + } + } + } + + List<Vector2> coords; + uint16_t mask; + for (Map<Vector2, uint16_t>::Element *E = tile_map[p_id].autotile_data.flags.front(); E; E = E->next()) { + mask = E->get(); + if (tile_map[p_id].autotile_data.bitmask_mode == BITMASK_2X2) { + mask &= (BIND_BOTTOMLEFT | BIND_BOTTOMRIGHT | BIND_TOPLEFT | BIND_TOPRIGHT); + } + if (mask == p_bitmask) { + for (int i = 0; i < autotile_get_subtile_priority(p_id, E->key()); i++) { + coords.push_back(E->key()); + } + } + } + if (coords.size() == 0) { + return autotile_get_icon_coordinate(p_id); + } else { + return coords[Math::random(0, (int)coords.size())]; + } +} + void TileSet::tile_set_name(int p_id, const String &p_name) { ERR_FAIL_COND(!tile_map.has(p_id)); @@ -257,7 +544,7 @@ void TileSet::tile_clear_shapes(int p_id) { tile_map[p_id].shapes_data.clear(); } -void TileSet::tile_add_shape(int p_id, const Ref<Shape2D> &p_shape, const Transform2D &p_transform, bool p_one_way) { +void TileSet::tile_add_shape(int p_id, const Ref<Shape2D> &p_shape, const Transform2D &p_transform, bool p_one_way, const Vector2 &p_autotile_coord) { ERR_FAIL_COND(!tile_map.has(p_id)); @@ -265,15 +552,17 @@ void TileSet::tile_add_shape(int p_id, const Ref<Shape2D> &p_shape, const Transf new_data.shape = p_shape; new_data.shape_transform = p_transform; new_data.one_way_collision = p_one_way; + new_data.autotile_coord = p_autotile_coord; tile_map[p_id].shapes_data.push_back(new_data); -}; +} + int TileSet::tile_get_shape_count(int p_id) const { ERR_FAIL_COND_V(!tile_map.has(p_id), 0); return tile_map[p_id].shapes_data.size(); -}; +} void TileSet::tile_set_shape(int p_id, int p_shape_id, const Ref<Shape2D> &p_shape) { @@ -351,6 +640,26 @@ Ref<OccluderPolygon2D> TileSet::tile_get_light_occluder(int p_id) const { return tile_map[p_id].occluder; } +void TileSet::autotile_set_light_occluder(int p_id, const Ref<OccluderPolygon2D> &p_light_occluder, const Vector2 &p_coord) { + ERR_FAIL_COND(!tile_map.has(p_id)); + if (p_light_occluder.is_null()) { + if (tile_map[p_id].autotile_data.ocludder_map.has(p_coord)) { + tile_map[p_id].autotile_data.ocludder_map.erase(p_coord); + } + } else { + tile_map[p_id].autotile_data.ocludder_map[p_coord] = p_light_occluder; + } +} + +Ref<OccluderPolygon2D> TileSet::autotile_get_light_occluder(int p_id, const Vector2 &p_coord) const { + ERR_FAIL_COND_V(!tile_map.has(p_id), Ref<OccluderPolygon2D>()); + if (!tile_map[p_id].autotile_data.ocludder_map.has(p_coord)) { + return Ref<OccluderPolygon2D>(); + } else { + return tile_map[p_id].autotile_data.ocludder_map[p_coord]; + } +} + void TileSet::tile_set_navigation_polygon_offset(int p_id, const Vector2 &p_offset) { ERR_FAIL_COND(!tile_map.has(p_id)); @@ -358,6 +667,7 @@ void TileSet::tile_set_navigation_polygon_offset(int p_id, const Vector2 &p_offs } Vector2 TileSet::tile_get_navigation_polygon_offset(int p_id) const { + ERR_FAIL_COND_V(!tile_map.has(p_id), Vector2()); return tile_map[p_id].navigation_polygon_offset; } @@ -374,6 +684,42 @@ Ref<NavigationPolygon> TileSet::tile_get_navigation_polygon(int p_id) const { return tile_map[p_id].navigation_polygon; } +const Map<Vector2, Ref<OccluderPolygon2D> > &TileSet::autotile_get_light_oclusion_map(int p_id) const { + + static Map<Vector2, Ref<OccluderPolygon2D> > dummy; + ERR_FAIL_COND_V(!tile_map.has(p_id), dummy); + return tile_map[p_id].autotile_data.ocludder_map; +} + +void TileSet::autotile_set_navigation_polygon(int p_id, const Ref<NavigationPolygon> &p_navigation_polygon, const Vector2 &p_coord) { + + ERR_FAIL_COND(!tile_map.has(p_id)); + if (p_navigation_polygon.is_null()) { + if (tile_map[p_id].autotile_data.navpoly_map.has(p_coord)) { + tile_map[p_id].autotile_data.navpoly_map.erase(p_coord); + } + } else { + tile_map[p_id].autotile_data.navpoly_map[p_coord] = p_navigation_polygon; + } +} + +Ref<NavigationPolygon> TileSet::autotile_get_navigation_polygon(int p_id, const Vector2 &p_coord) const { + + ERR_FAIL_COND_V(!tile_map.has(p_id), Ref<NavigationPolygon>()); + if (!tile_map[p_id].autotile_data.navpoly_map.has(p_coord)) { + return Ref<NavigationPolygon>(); + } else { + return tile_map[p_id].autotile_data.navpoly_map[p_coord]; + } +} + +const Map<Vector2, Ref<NavigationPolygon> > &TileSet::autotile_get_navigation_map(int p_id) const { + + static Map<Vector2, Ref<NavigationPolygon> > dummy; + ERR_FAIL_COND_V(!tile_map.has(p_id), dummy); + return tile_map[p_id].autotile_data.navpoly_map; +} + void TileSet::tile_set_occluder_offset(int p_id, const Vector2 &p_offset) { ERR_FAIL_COND(!tile_map.has(p_id)); @@ -381,6 +727,7 @@ void TileSet::tile_set_occluder_offset(int p_id, const Vector2 &p_offset) { } Vector2 TileSet::tile_get_occluder_offset(int p_id) const { + ERR_FAIL_COND_V(!tile_map.has(p_id), Vector2()); return tile_map[p_id].occluder_offset; } @@ -405,6 +752,7 @@ void TileSet::_tile_set_shapes(int p_id, const Array &p_shapes) { Vector<ShapeData> shapes_data; Transform2D default_transform = tile_get_shape_transform(p_id, 0); bool default_one_way = tile_get_shape_one_way(p_id, 0); + Vector2 default_autotile_coord = Vector2(); for (int i = 0; i < p_shapes.size(); i++) { ShapeData s = ShapeData(); @@ -415,6 +763,7 @@ void TileSet::_tile_set_shapes(int p_id, const Array &p_shapes) { s.shape = shape; s.shape_transform = default_transform; s.one_way_collision = default_one_way; + s.autotile_coord = default_autotile_coord; } else if (p_shapes[i].get_type() == Variant::DICTIONARY) { Dictionary d = p_shapes[i]; @@ -435,6 +784,11 @@ void TileSet::_tile_set_shapes(int p_id, const Array &p_shapes) { else s.one_way_collision = default_one_way; + if (d.has("autotile_coord") && d["autotile_coord"].get_type() == Variant::VECTOR2) + s.autotile_coord = d["autotile_coord"]; + else + s.autotile_coord = default_autotile_coord; + } else { ERR_EXPLAIN("Expected an array of objects or dictionaries for tile_set_shapes"); ERR_CONTINUE(true); @@ -457,6 +811,7 @@ Array TileSet::_tile_get_shapes(int p_id) const { shape_data["shape"] = data[i].shape; shape_data["shape_transform"] = data[i].shape_transform; shape_data["one_way"] = data[i].one_way_collision; + shape_data["autotile_coord"] = data[i].autotile_coord; arr.push_back(shape_data); } @@ -487,6 +842,21 @@ bool TileSet::has_tile(int p_id) const { return tile_map.has(p_id); } +bool TileSet::is_tile_bound(int p_drawn_id, int p_neighbor_id) { + + if (p_drawn_id == p_neighbor_id) { + return true; + } else if (get_script_instance() != NULL) { + if (get_script_instance()->has_method("_is_tile_bound")) { + Variant ret = get_script_instance()->call("_is_tile_bound", p_drawn_id, p_neighbor_id); + if (ret.get_type() == Variant::BOOL) { + return ret; + } + } + } + return false; +} + void TileSet::remove_tile(int p_id) { ERR_FAIL_COND(!tile_map.has(p_id)); @@ -523,6 +893,8 @@ void TileSet::clear() { void TileSet::_bind_methods() { ClassDB::bind_method(D_METHOD("create_tile", "id"), &TileSet::create_tile); + ClassDB::bind_method(D_METHOD("autotile_set_bitmask_mode", "mode"), &TileSet::autotile_set_bitmask_mode); + ClassDB::bind_method(D_METHOD("autotile_get_bitmask_mode"), &TileSet::autotile_get_bitmask_mode); ClassDB::bind_method(D_METHOD("tile_set_name", "id", "name"), &TileSet::tile_set_name); ClassDB::bind_method(D_METHOD("tile_get_name", "id"), &TileSet::tile_get_name); ClassDB::bind_method(D_METHOD("tile_set_texture", "id", "texture"), &TileSet::tile_set_texture); @@ -559,6 +931,21 @@ void TileSet::_bind_methods() { ClassDB::bind_method(D_METHOD("get_last_unused_tile_id"), &TileSet::get_last_unused_tile_id); ClassDB::bind_method(D_METHOD("find_tile_by_name", "name"), &TileSet::find_tile_by_name); ClassDB::bind_method(D_METHOD("get_tiles_ids"), &TileSet::_get_tiles_ids); + + BIND_VMETHOD(MethodInfo("_is_tile_bound", PropertyInfo(Variant::INT, "drawn_id"), PropertyInfo(Variant::INT, "neighbor_id"))); + BIND_VMETHOD(MethodInfo("_forward_subtile_selection", PropertyInfo(Variant::INT, "autotile_id"), PropertyInfo(Variant::INT, "bitmask"), PropertyInfo(Variant::OBJECT, "tilemap", PROPERTY_HINT_NONE, "TileMap"), PropertyInfo(Variant::VECTOR2, "tile_location"))); + + BIND_ENUM_CONSTANT(BITMASK_2X2); + BIND_ENUM_CONSTANT(BITMASK_3X3); + + BIND_ENUM_CONSTANT(BIND_TOPLEFT); + BIND_ENUM_CONSTANT(BIND_TOP); + BIND_ENUM_CONSTANT(BIND_TOPRIGHT); + BIND_ENUM_CONSTANT(BIND_LEFT); + BIND_ENUM_CONSTANT(BIND_RIGHT); + BIND_ENUM_CONSTANT(BIND_BOTTOMLEFT); + BIND_ENUM_CONSTANT(BIND_BOTTOM); + BIND_ENUM_CONSTANT(BIND_BOTTOMRIGHT); } TileSet::TileSet() { diff --git a/scene/resources/tile_set.h b/scene/resources/tile_set.h index 3ef3f00cef..18b62c778d 100644 --- a/scene/resources/tile_set.h +++ b/scene/resources/tile_set.h @@ -30,6 +30,7 @@ #ifndef TILE_SET_H #define TILE_SET_H +#include "core/array.h" #include "resource.h" #include "scene/2d/light_occluder_2d.h" #include "scene/2d/navigation_polygon.h" @@ -44,6 +45,7 @@ public: struct ShapeData { Ref<Shape2D> shape; Transform2D shape_transform; + Vector2 autotile_coord; bool one_way_collision; ShapeData() { @@ -51,6 +53,40 @@ public: } }; + enum BitmaskMode { + BITMASK_2X2, + BITMASK_3X3 + }; + + enum AutotileBindings { + BIND_TOPLEFT = 1, + BIND_TOP = 2, + BIND_TOPRIGHT = 4, + BIND_LEFT = 8, + BIND_CENTER = 16, + BIND_RIGHT = 32, + BIND_BOTTOMLEFT = 64, + BIND_BOTTOM = 128, + BIND_BOTTOMRIGHT = 256 + }; + + struct AutotileData { + BitmaskMode bitmask_mode; + int spacing; + Size2 size; + Vector2 icon_coord; + Map<Vector2, uint16_t> flags; + Map<Vector2, Ref<OccluderPolygon2D> > ocludder_map; + Map<Vector2, Ref<NavigationPolygon> > navpoly_map; + Map<Vector2, int> priority_map; + + // Default size to prevent invalid value + explicit AutotileData() + : size(64, 64), icon_coord(0, 0) { + bitmask_mode = BITMASK_2X2; + } + }; + private: struct TileData { @@ -66,10 +102,12 @@ private: Ref<NavigationPolygon> navigation_polygon; Ref<ShaderMaterial> material; Color modulate; + bool is_autotile; + AutotileData autotile_data; // Default modulate for back-compat explicit TileData() - : modulate(1, 1, 1) {} + : modulate(1, 1, 1), is_autotile(false) {} }; Map<int, TileData> tile_map; @@ -87,6 +125,9 @@ protected: public: void create_tile(int p_id); + void autotile_set_bitmask_mode(int p_id, BitmaskMode p_mode); + BitmaskMode autotile_get_bitmask_mode(int p_id) const; + void tile_set_name(int p_id, const String &p_name); String tile_get_name(int p_id) const; @@ -102,6 +143,28 @@ public: void tile_set_region(int p_id, const Rect2 &p_region); Rect2 tile_get_region(int p_id) const; + void tile_set_is_autotile(int p_id, bool p_is_autotile); + bool tile_get_is_autotile(int p_id) const; + + void autotile_set_icon_coordinate(int p_id, Vector2 coord); + Vector2 autotile_get_icon_coordinate(int p_id) const; + + void autotile_set_spacing(int p_id, int p_spacing); + int autotile_get_spacing(int p_id) const; + + void autotile_set_size(int p_id, Size2 p_size); + Size2 autotile_get_size(int p_id) const; + + void autotile_clear_bitmask_map(int p_id); + void autotile_set_subtile_priority(int p_id, const Vector2 &p_coord, int p_priority); + int autotile_get_subtile_priority(int p_id, const Vector2 &p_coord); + const Map<Vector2, int> &autotile_get_priority_map(int p_id) const; + + void autotile_set_bitmask(int p_id, Vector2 p_coord, uint16_t p_flag); + uint16_t autotile_get_bitmask(int p_id, Vector2 p_coord); + const Map<Vector2, uint16_t> &autotile_get_bitmask_map(int p_id); + Vector2 autotile_get_subtile_for_bitmask(int p_id, uint16_t p_bitmask, const Node *p_tilemap_node = NULL, const Vector2 &p_tile_location = Vector2()); + void tile_set_shape(int p_id, int p_shape_id, const Ref<Shape2D> &p_shape); Ref<Shape2D> tile_get_shape(int p_id, int p_shape_id) const; @@ -115,7 +178,7 @@ public: bool tile_get_shape_one_way(int p_id, int p_shape_id) const; void tile_clear_shapes(int p_id); - void tile_add_shape(int p_id, const Ref<Shape2D> &p_shape, const Transform2D &p_transform, bool p_one_way = false); + void tile_add_shape(int p_id, const Ref<Shape2D> &p_shape, const Transform2D &p_transform, bool p_one_way = false, const Vector2 &p_autotile_coord = Vector2()); int tile_get_shape_count(int p_id) const; void tile_set_shapes(int p_id, const Vector<ShapeData> &p_shapes); @@ -133,16 +196,26 @@ public: void tile_set_light_occluder(int p_id, const Ref<OccluderPolygon2D> &p_light_occluder); Ref<OccluderPolygon2D> tile_get_light_occluder(int p_id) const; + void autotile_set_light_occluder(int p_id, const Ref<OccluderPolygon2D> &p_light_occluder, const Vector2 &p_coord); + Ref<OccluderPolygon2D> autotile_get_light_occluder(int p_id, const Vector2 &p_coord) const; + const Map<Vector2, Ref<OccluderPolygon2D> > &autotile_get_light_oclusion_map(int p_id) const; + void tile_set_navigation_polygon_offset(int p_id, const Vector2 &p_offset); Vector2 tile_get_navigation_polygon_offset(int p_id) const; void tile_set_navigation_polygon(int p_id, const Ref<NavigationPolygon> &p_navigation_polygon); Ref<NavigationPolygon> tile_get_navigation_polygon(int p_id) const; + void autotile_set_navigation_polygon(int p_id, const Ref<NavigationPolygon> &p_navigation_polygon, const Vector2 &p_coord); + Ref<NavigationPolygon> autotile_get_navigation_polygon(int p_id, const Vector2 &p_coord) const; + const Map<Vector2, Ref<NavigationPolygon> > &autotile_get_navigation_map(int p_id) const; + void remove_tile(int p_id); bool has_tile(int p_id) const; + bool is_tile_bound(int p_drawn_id, int p_neighbor_id); + int find_tile_by_name(const String &p_name) const; void get_tile_list(List<int> *p_tiles) const; @@ -153,4 +226,7 @@ public: TileSet(); }; +VARIANT_ENUM_CAST(TileSet::AutotileBindings); +VARIANT_ENUM_CAST(TileSet::BitmaskMode); + #endif // TILE_SET_H diff --git a/scene/resources/world.cpp b/scene/resources/world.cpp index af159975ca..86b32a5cdd 100644 --- a/scene/resources/world.cpp +++ b/scene/resources/world.cpp @@ -41,7 +41,7 @@ struct SpatialIndexer { struct NotifierData { - Rect3 aabb; + AABB aabb; OctreeElementID id; }; @@ -63,7 +63,7 @@ struct SpatialIndexer { uint64_t pass; uint64_t last_frame; - void _notifier_add(VisibilityNotifier *p_notifier, const Rect3 &p_rect) { + void _notifier_add(VisibilityNotifier *p_notifier, const AABB &p_rect) { ERR_FAIL_COND(notifiers.has(p_notifier)); notifiers[p_notifier].aabb = p_rect; @@ -71,7 +71,7 @@ struct SpatialIndexer { changed = true; } - void _notifier_update(VisibilityNotifier *p_notifier, const Rect3 &p_rect) { + void _notifier_update(VisibilityNotifier *p_notifier, const AABB &p_rect) { Map<VisibilityNotifier *, NotifierData>::Element *E = notifiers.find(p_notifier); ERR_FAIL_COND(!E); @@ -229,14 +229,14 @@ void World::_remove_camera(Camera *p_camera) { #endif } -void World::_register_notifier(VisibilityNotifier *p_notifier, const Rect3 &p_rect) { +void World::_register_notifier(VisibilityNotifier *p_notifier, const AABB &p_rect) { #ifndef _3D_DISABLED indexer->_notifier_add(p_notifier, p_rect); #endif } -void World::_update_notifier(VisibilityNotifier *p_notifier, const Rect3 &p_rect) { +void World::_update_notifier(VisibilityNotifier *p_notifier, const AABB &p_rect) { #ifndef _3D_DISABLED indexer->_notifier_update(p_notifier, p_rect); diff --git a/scene/resources/world.h b/scene/resources/world.h index 767d1b5b6e..e0f1de1fd0 100644 --- a/scene/resources/world.h +++ b/scene/resources/world.h @@ -60,8 +60,8 @@ protected: void _update_camera(Camera *p_camera); void _remove_camera(Camera *p_camera); - void _register_notifier(VisibilityNotifier *p_notifier, const Rect3 &p_rect); - void _update_notifier(VisibilityNotifier *p_notifier, const Rect3 &p_rect); + void _register_notifier(VisibilityNotifier *p_notifier, const AABB &p_rect); + void _update_notifier(VisibilityNotifier *p_notifier, const AABB &p_rect); void _remove_notifier(VisibilityNotifier *p_notifier); friend class Viewport; void _update(uint64_t p_frame); diff --git a/servers/physics/broad_phase_basic.cpp b/servers/physics/broad_phase_basic.cpp index c6565ac2e9..e4eae09c61 100644 --- a/servers/physics/broad_phase_basic.cpp +++ b/servers/physics/broad_phase_basic.cpp @@ -46,7 +46,7 @@ BroadPhaseSW::ID BroadPhaseBasic::create(CollisionObjectSW *p_object, int p_subi return current; } -void BroadPhaseBasic::move(ID p_id, const Rect3 &p_aabb) { +void BroadPhaseBasic::move(ID p_id, const AABB &p_aabb) { Map<ID, Element>::Element *E = element_map.find(p_id); ERR_FAIL_COND(!E); @@ -109,7 +109,7 @@ int BroadPhaseBasic::cull_point(const Vector3 &p_point, CollisionObjectSW **p_re for (Map<ID, Element>::Element *E = element_map.front(); E; E = E->next()) { - const Rect3 aabb = E->get().aabb; + const AABB aabb = E->get().aabb; if (aabb.has_point(p_point)) { p_results[rc] = E->get().owner; @@ -129,7 +129,7 @@ int BroadPhaseBasic::cull_segment(const Vector3 &p_from, const Vector3 &p_to, Co for (Map<ID, Element>::Element *E = element_map.front(); E; E = E->next()) { - const Rect3 aabb = E->get().aabb; + const AABB aabb = E->get().aabb; if (aabb.intersects_segment(p_from, p_to)) { p_results[rc] = E->get().owner; @@ -142,13 +142,13 @@ int BroadPhaseBasic::cull_segment(const Vector3 &p_from, const Vector3 &p_to, Co return rc; } -int BroadPhaseBasic::cull_aabb(const Rect3 &p_aabb, CollisionObjectSW **p_results, int p_max_results, int *p_result_indices) { +int BroadPhaseBasic::cull_aabb(const AABB &p_aabb, CollisionObjectSW **p_results, int p_max_results, int *p_result_indices) { int rc = 0; for (Map<ID, Element>::Element *E = element_map.front(); E; E = E->next()) { - const Rect3 aabb = E->get().aabb; + const AABB aabb = E->get().aabb; if (aabb.intersects(p_aabb)) { p_results[rc] = E->get().owner; diff --git a/servers/physics/broad_phase_basic.h b/servers/physics/broad_phase_basic.h index 5c124c1792..ee683ed840 100644 --- a/servers/physics/broad_phase_basic.h +++ b/servers/physics/broad_phase_basic.h @@ -39,7 +39,7 @@ class BroadPhaseBasic : public BroadPhaseSW { CollisionObjectSW *owner; bool _static; - Rect3 aabb; + AABB aabb; int subindex; }; @@ -83,7 +83,7 @@ class BroadPhaseBasic : public BroadPhaseSW { public: // 0 is an invalid ID virtual ID create(CollisionObjectSW *p_object, int p_subindex = 0); - virtual void move(ID p_id, const Rect3 &p_aabb); + virtual void move(ID p_id, const AABB &p_aabb); virtual void set_static(ID p_id, bool p_static); virtual void remove(ID p_id); @@ -93,7 +93,7 @@ public: virtual int cull_point(const Vector3 &p_point, CollisionObjectSW **p_results, int p_max_results, int *p_result_indices = NULL); virtual int cull_segment(const Vector3 &p_from, const Vector3 &p_to, CollisionObjectSW **p_results, int p_max_results, int *p_result_indices = NULL); - virtual int cull_aabb(const Rect3 &p_aabb, CollisionObjectSW **p_results, int p_max_results, int *p_result_indices = NULL); + virtual int cull_aabb(const AABB &p_aabb, CollisionObjectSW **p_results, int p_max_results, int *p_result_indices = NULL); virtual void set_pair_callback(PairCallback p_pair_callback, void *p_userdata); virtual void set_unpair_callback(UnpairCallback p_unpair_callback, void *p_userdata); diff --git a/servers/physics/broad_phase_octree.cpp b/servers/physics/broad_phase_octree.cpp index e7111d9580..3b18a270f0 100644 --- a/servers/physics/broad_phase_octree.cpp +++ b/servers/physics/broad_phase_octree.cpp @@ -32,11 +32,11 @@ BroadPhaseSW::ID BroadPhaseOctree::create(CollisionObjectSW *p_object, int p_subindex) { - ID oid = octree.create(p_object, Rect3(), p_subindex, false, 1 << p_object->get_type(), 0); + ID oid = octree.create(p_object, AABB(), p_subindex, false, 1 << p_object->get_type(), 0); return oid; } -void BroadPhaseOctree::move(ID p_id, const Rect3 &p_aabb) { +void BroadPhaseOctree::move(ID p_id, const AABB &p_aabb) { octree.move(p_id, p_aabb); } @@ -76,7 +76,7 @@ int BroadPhaseOctree::cull_segment(const Vector3 &p_from, const Vector3 &p_to, C return octree.cull_segment(p_from, p_to, p_results, p_max_results, p_result_indices); } -int BroadPhaseOctree::cull_aabb(const Rect3 &p_aabb, CollisionObjectSW **p_results, int p_max_results, int *p_result_indices) { +int BroadPhaseOctree::cull_aabb(const AABB &p_aabb, CollisionObjectSW **p_results, int p_max_results, int *p_result_indices) { return octree.cull_aabb(p_aabb, p_results, p_max_results, p_result_indices); } diff --git a/servers/physics/broad_phase_octree.h b/servers/physics/broad_phase_octree.h index d28f2da13f..f894d6ca5a 100644 --- a/servers/physics/broad_phase_octree.h +++ b/servers/physics/broad_phase_octree.h @@ -48,7 +48,7 @@ class BroadPhaseOctree : public BroadPhaseSW { public: // 0 is an invalid ID virtual ID create(CollisionObjectSW *p_object, int p_subindex = 0); - virtual void move(ID p_id, const Rect3 &p_aabb); + virtual void move(ID p_id, const AABB &p_aabb); virtual void set_static(ID p_id, bool p_static); virtual void remove(ID p_id); @@ -58,7 +58,7 @@ public: virtual int cull_point(const Vector3 &p_point, CollisionObjectSW **p_results, int p_max_results, int *p_result_indices = NULL); virtual int cull_segment(const Vector3 &p_from, const Vector3 &p_to, CollisionObjectSW **p_results, int p_max_results, int *p_result_indices = NULL); - virtual int cull_aabb(const Rect3 &p_aabb, CollisionObjectSW **p_results, int p_max_results, int *p_result_indices = NULL); + virtual int cull_aabb(const AABB &p_aabb, CollisionObjectSW **p_results, int p_max_results, int *p_result_indices = NULL); virtual void set_pair_callback(PairCallback p_pair_callback, void *p_userdata); virtual void set_unpair_callback(UnpairCallback p_unpair_callback, void *p_userdata); diff --git a/servers/physics/broad_phase_sw.h b/servers/physics/broad_phase_sw.h index 2b5ed629fe..5ad3f9a261 100644 --- a/servers/physics/broad_phase_sw.h +++ b/servers/physics/broad_phase_sw.h @@ -30,8 +30,8 @@ #ifndef BROAD_PHASE_SW_H #define BROAD_PHASE_SW_H +#include "aabb.h" #include "math_funcs.h" -#include "rect3.h" class CollisionObjectSW; @@ -49,7 +49,7 @@ public: // 0 is an invalid ID virtual ID create(CollisionObjectSW *p_object_, int p_subindex = 0) = 0; - virtual void move(ID p_id, const Rect3 &p_aabb) = 0; + virtual void move(ID p_id, const AABB &p_aabb) = 0; virtual void set_static(ID p_id, bool p_static) = 0; virtual void remove(ID p_id) = 0; @@ -59,7 +59,7 @@ public: virtual int cull_point(const Vector3 &p_point, CollisionObjectSW **p_results, int p_max_results, int *p_result_indices = NULL) = 0; virtual int cull_segment(const Vector3 &p_from, const Vector3 &p_to, CollisionObjectSW **p_results, int p_max_results, int *p_result_indices = NULL) = 0; - virtual int cull_aabb(const Rect3 &p_aabb, CollisionObjectSW **p_results, int p_max_results, int *p_result_indices = NULL) = 0; + virtual int cull_aabb(const AABB &p_aabb, CollisionObjectSW **p_results, int p_max_results, int *p_result_indices = NULL) = 0; virtual void set_pair_callback(PairCallback p_pair_callback, void *p_userdata) = 0; virtual void set_unpair_callback(UnpairCallback p_unpair_callback, void *p_userdata) = 0; diff --git a/servers/physics/collision_object_sw.cpp b/servers/physics/collision_object_sw.cpp index 3af8b542fa..126f8141ff 100644 --- a/servers/physics/collision_object_sw.cpp +++ b/servers/physics/collision_object_sw.cpp @@ -149,7 +149,7 @@ void CollisionObjectSW::_update_shapes() { } //not quite correct, should compute the next matrix.. - Rect3 shape_aabb = s.shape->get_aabb(); + AABB shape_aabb = s.shape->get_aabb(); Transform xform = transform * s.xform; shape_aabb = xform.xform(shape_aabb); s.aabb_cache = shape_aabb; @@ -176,10 +176,10 @@ void CollisionObjectSW::_update_shapes_with_motion(const Vector3 &p_motion) { } //not quite correct, should compute the next matrix.. - Rect3 shape_aabb = s.shape->get_aabb(); + AABB shape_aabb = s.shape->get_aabb(); Transform xform = transform * s.xform; shape_aabb = xform.xform(shape_aabb); - shape_aabb = shape_aabb.merge(Rect3(shape_aabb.position + p_motion, shape_aabb.size)); //use motion + shape_aabb = shape_aabb.merge(AABB(shape_aabb.position + p_motion, shape_aabb.size)); //use motion s.aabb_cache = shape_aabb; space->get_broadphase()->move(s.bpid, shape_aabb); diff --git a/servers/physics/collision_object_sw.h b/servers/physics/collision_object_sw.h index 67a8a44944..254947060b 100644 --- a/servers/physics/collision_object_sw.h +++ b/servers/physics/collision_object_sw.h @@ -61,7 +61,7 @@ private: Transform xform; Transform xform_inv; BroadPhaseSW::ID bpid; - Rect3 aabb_cache; //for rayqueries + AABB aabb_cache; //for rayqueries real_t area_cache; ShapeSW *shape; bool disabled; @@ -123,7 +123,7 @@ public: _FORCE_INLINE_ ShapeSW *get_shape(int p_index) const { return shapes[p_index].shape; } _FORCE_INLINE_ const Transform &get_shape_transform(int p_index) const { return shapes[p_index].xform; } _FORCE_INLINE_ const Transform &get_shape_inv_transform(int p_index) const { return shapes[p_index].xform_inv; } - _FORCE_INLINE_ const Rect3 &get_shape_aabb(int p_index) const { return shapes[p_index].aabb_cache; } + _FORCE_INLINE_ const AABB &get_shape_aabb(int p_index) const { return shapes[p_index].aabb_cache; } _FORCE_INLINE_ const real_t get_shape_area(int p_index) const { return shapes[p_index].area_cache; } _FORCE_INLINE_ Transform get_transform() const { return transform; } diff --git a/servers/physics/collision_solver_sw.cpp b/servers/physics/collision_solver_sw.cpp index 7bef208237..a9431dc6d8 100644 --- a/servers/physics/collision_solver_sw.cpp +++ b/servers/physics/collision_solver_sw.cpp @@ -152,7 +152,7 @@ bool CollisionSolverSW::solve_concave(const ShapeSW *p_shape_A, const Transform //quickly compute a local AABB - Rect3 local_aabb; + AABB local_aabb; for (int i = 0; i < 3; i++) { Vector3 axis(p_transform_B.basis.get_axis(i)); @@ -291,7 +291,7 @@ bool CollisionSolverSW::solve_distance_plane(const ShapeSW *p_shape_A, const Tra return collided; } -bool CollisionSolverSW::solve_distance(const ShapeSW *p_shape_A, const Transform &p_transform_A, const ShapeSW *p_shape_B, const Transform &p_transform_B, Vector3 &r_point_A, Vector3 &r_point_B, const Rect3 &p_concave_hint, Vector3 *r_sep_axis) { +bool CollisionSolverSW::solve_distance(const ShapeSW *p_shape_A, const Transform &p_transform_A, const ShapeSW *p_shape_B, const Transform &p_transform_B, Vector3 &r_point_A, Vector3 &r_point_B, const AABB &p_concave_hint, Vector3 *r_sep_axis) { if (p_shape_A->is_concave()) return false; @@ -328,14 +328,14 @@ bool CollisionSolverSW::solve_distance(const ShapeSW *p_shape_A, const Transform //quickly compute a local AABB - bool use_cc_hint = p_concave_hint != Rect3(); - Rect3 cc_hint_aabb; + bool use_cc_hint = p_concave_hint != AABB(); + AABB cc_hint_aabb; if (use_cc_hint) { cc_hint_aabb = p_concave_hint; cc_hint_aabb.position -= p_transform_B.origin; } - Rect3 local_aabb; + AABB local_aabb; for (int i = 0; i < 3; i++) { Vector3 axis(p_transform_B.basis.get_axis(i)); diff --git a/servers/physics/collision_solver_sw.h b/servers/physics/collision_solver_sw.h index 1e38b1b54e..a40b665ff0 100644 --- a/servers/physics/collision_solver_sw.h +++ b/servers/physics/collision_solver_sw.h @@ -46,7 +46,7 @@ private: public: static bool solve_static(const ShapeSW *p_shape_A, const Transform &p_transform_A, const ShapeSW *p_shape_B, const Transform &p_transform_B, CallbackResult p_result_callback, void *p_userdata, Vector3 *r_sep_axis = NULL, real_t p_margin_A = 0, real_t p_margin_B = 0); - static bool solve_distance(const ShapeSW *p_shape_A, const Transform &p_transform_A, const ShapeSW *p_shape_B, const Transform &p_transform_B, Vector3 &r_point_A, Vector3 &r_point_B, const Rect3 &p_concave_hint, Vector3 *r_sep_axis = NULL); + static bool solve_distance(const ShapeSW *p_shape_A, const Transform &p_transform_A, const ShapeSW *p_shape_B, const Transform &p_transform_B, Vector3 &r_point_A, Vector3 &r_point_B, const AABB &p_concave_hint, Vector3 *r_sep_axis = NULL); }; #endif // COLLISION_SOLVER__SW_H diff --git a/servers/physics/shape_sw.cpp b/servers/physics/shape_sw.cpp index 6dafaac115..b204ff7a33 100644 --- a/servers/physics/shape_sw.cpp +++ b/servers/physics/shape_sw.cpp @@ -37,7 +37,7 @@ #define _EDGE_IS_VALID_SUPPORT_THRESHOLD 0.0002 #define _FACE_IS_VALID_SUPPORT_THRESHOLD 0.9998 -void ShapeSW::configure(const Rect3 &p_aabb) { +void ShapeSW::configure(const AABB &p_aabb) { aabb = p_aabb; configured = true; for (Map<ShapeOwnerSW *, int>::Element *E = owners.front(); E; E = E->next()) { @@ -141,7 +141,7 @@ Vector3 PlaneShapeSW::get_moment_of_inertia(real_t p_mass) const { void PlaneShapeSW::_setup(const Plane &p_plane) { plane = p_plane; - configure(Rect3(Vector3(-1e4, -1e4, -1e4), Vector3(1e4 * 2, 1e4 * 2, 1e4 * 2))); + configure(AABB(Vector3(-1e4, -1e4, -1e4), Vector3(1e4 * 2, 1e4 * 2, 1e4 * 2))); } void PlaneShapeSW::set_data(const Variant &p_data) { @@ -223,7 +223,7 @@ Vector3 RayShapeSW::get_moment_of_inertia(real_t p_mass) const { void RayShapeSW::_setup(real_t p_length) { length = p_length; - configure(Rect3(Vector3(0, 0, 0), Vector3(0.1, 0.1, length))); + configure(AABB(Vector3(0, 0, 0), Vector3(0.1, 0.1, length))); } void RayShapeSW::set_data(const Variant &p_data) { @@ -299,7 +299,7 @@ Vector3 SphereShapeSW::get_moment_of_inertia(real_t p_mass) const { void SphereShapeSW::_setup(real_t p_radius) { radius = p_radius; - configure(Rect3(Vector3(-radius, -radius, -radius), Vector3(radius * 2.0, radius * 2.0, radius * 2.0))); + configure(AABB(Vector3(-radius, -radius, -radius), Vector3(radius * 2.0, radius * 2.0, radius * 2.0))); } void SphereShapeSW::set_data(const Variant &p_data) { @@ -430,7 +430,7 @@ void BoxShapeSW::get_supports(const Vector3 &p_normal, int p_max, Vector3 *r_sup bool BoxShapeSW::intersect_segment(const Vector3 &p_begin, const Vector3 &p_end, Vector3 &r_result, Vector3 &r_normal) const { - Rect3 aabb(-half_extents, half_extents * 2.0); + AABB aabb(-half_extents, half_extents * 2.0); return aabb.intersects_segment(p_begin, p_end, &r_result, &r_normal); } @@ -504,7 +504,7 @@ void BoxShapeSW::_setup(const Vector3 &p_half_extents) { half_extents = p_half_extents.abs(); - configure(Rect3(-half_extents, half_extents * 2)); + configure(AABB(-half_extents, half_extents * 2)); } void BoxShapeSW::set_data(const Variant &p_data) { @@ -684,7 +684,7 @@ void CapsuleShapeSW::_setup(real_t p_height, real_t p_radius) { height = p_height; radius = p_radius; - configure(Rect3(Vector3(-radius, -radius, -height * 0.5 - radius), Vector3(radius * 2, radius * 2, height + radius * 2.0))); + configure(AABB(Vector3(-radius, -radius, -height * 0.5 - radius), Vector3(radius * 2, radius * 2, height + radius * 2.0))); } void CapsuleShapeSW::set_data(const Variant &p_data) { @@ -957,7 +957,7 @@ void ConvexPolygonShapeSW::_setup(const Vector<Vector3> &p_vertices) { if (err != OK) ERR_PRINT("Failed to build QuickHull"); - Rect3 _aabb; + AABB _aabb; for (int i = 0; i < mesh.vertices.size(); i++) { @@ -1102,7 +1102,7 @@ Vector3 FaceShapeSW::get_moment_of_inertia(real_t p_mass) const { FaceShapeSW::FaceShapeSW() { - configure(Rect3()); + configure(AABB()); } PoolVector<Vector3> ConcavePolygonShapeSW::get_faces() const { @@ -1300,13 +1300,13 @@ void ConcavePolygonShapeSW::_cull(int p_idx, _CullParams *p_params) const { } } -void ConcavePolygonShapeSW::cull(const Rect3 &p_local_aabb, Callback p_callback, void *p_userdata) const { +void ConcavePolygonShapeSW::cull(const AABB &p_local_aabb, Callback p_callback, void *p_userdata) const { // make matrix local to concave if (faces.size() == 0) return; - Rect3 local_aabb = p_local_aabb; + AABB local_aabb = p_local_aabb; // unlock data PoolVector<Face>::Read fr = faces.read(); @@ -1341,7 +1341,7 @@ Vector3 ConcavePolygonShapeSW::get_moment_of_inertia(real_t p_mass) const { struct _VolumeSW_BVH_Element { - Rect3 aabb; + AABB aabb; Vector3 center; int face_index; }; @@ -1372,7 +1372,7 @@ struct _VolumeSW_BVH_CompareZ { struct _VolumeSW_BVH { - Rect3 aabb; + AABB aabb; _VolumeSW_BVH *left; _VolumeSW_BVH *right; @@ -1396,7 +1396,7 @@ _VolumeSW_BVH *_volume_sw_build_bvh(_VolumeSW_BVH_Element *p_elements, int p_siz bvh->face_index = -1; } - Rect3 aabb; + AABB aabb; for (int i = 0; i < p_size; i++) { if (i == 0) @@ -1467,7 +1467,7 @@ void ConcavePolygonShapeSW::_setup(PoolVector<Vector3> p_faces) { int src_face_count = p_faces.size(); if (src_face_count == 0) { - configure(Rect3()); + configure(AABB()); return; } ERR_FAIL_COND(src_face_count % 3); @@ -1491,7 +1491,7 @@ void ConcavePolygonShapeSW::_setup(PoolVector<Vector3> p_faces) { PoolVector<Vector3>::Write vw = vertices.write(); Vector3 *verticesw = vw.ptr(); - Rect3 _aabb; + AABB _aabb; for (int i = 0; i < src_face_count; i++) { @@ -1588,7 +1588,7 @@ Vector3 HeightMapShapeSW::get_closest_point_to(const Vector3 &p_point) const { return Vector3(); } -void HeightMapShapeSW::cull(const Rect3 &p_local_aabb, Callback p_callback, void *p_userdata) const { +void HeightMapShapeSW::cull(const AABB &p_local_aabb, Callback p_callback, void *p_userdata) const { } Vector3 HeightMapShapeSW::get_moment_of_inertia(real_t p_mass) const { @@ -1611,7 +1611,7 @@ void HeightMapShapeSW::_setup(PoolVector<real_t> p_heights, int p_width, int p_d PoolVector<real_t>::Read r = heights.read(); - Rect3 aabb; + AABB aabb; for (int i = 0; i < depth; i++) { diff --git a/servers/physics/shape_sw.h b/servers/physics/shape_sw.h index 151b84c054..48832affc9 100644 --- a/servers/physics/shape_sw.h +++ b/servers/physics/shape_sw.h @@ -58,14 +58,14 @@ public: class ShapeSW : public RID_Data { RID self; - Rect3 aabb; + AABB aabb; bool configured; real_t custom_bias; Map<ShapeOwnerSW *, int> owners; protected: - void configure(const Rect3 &p_aabb); + void configure(const AABB &p_aabb); public: enum { @@ -79,7 +79,7 @@ public: virtual PhysicsServer::ShapeType get_type() const = 0; - _FORCE_INLINE_ Rect3 get_aabb() const { return aabb; } + _FORCE_INLINE_ AABB get_aabb() const { return aabb; } _FORCE_INLINE_ bool is_configured() const { return configured; } virtual bool is_concave() const { return false; } @@ -114,7 +114,7 @@ public: typedef void (*Callback)(void *p_userdata, ShapeSW *p_convex); virtual void get_supports(const Vector3 &p_normal, int p_max, Vector3 *r_supports, int &r_amount) const { r_amount = 0; } - virtual void cull(const Rect3 &p_local_aabb, Callback p_callback, void *p_userdata) const = 0; + virtual void cull(const AABB &p_local_aabb, Callback p_callback, void *p_userdata) const = 0; ConcaveShapeSW() {} }; @@ -299,7 +299,7 @@ struct ConcavePolygonShapeSW : public ConcaveShapeSW { struct BVH { - Rect3 aabb; + AABB aabb; int left; int right; @@ -310,7 +310,7 @@ struct ConcavePolygonShapeSW : public ConcaveShapeSW { struct _CullParams { - Rect3 aabb; + AABB aabb; Callback callback; void *userdata; const Face *faces; @@ -353,7 +353,7 @@ public: virtual bool intersect_point(const Vector3 &p_point) const; virtual Vector3 get_closest_point_to(const Vector3 &p_point) const; - virtual void cull(const Rect3 &p_local_aabb, Callback p_callback, void *p_userdata) const; + virtual void cull(const AABB &p_local_aabb, Callback p_callback, void *p_userdata) const; virtual Vector3 get_moment_of_inertia(real_t p_mass) const; @@ -389,7 +389,7 @@ public: virtual bool intersect_point(const Vector3 &p_point) const; virtual Vector3 get_closest_point_to(const Vector3 &p_point) const; - virtual void cull(const Rect3 &p_local_aabb, Callback p_callback, void *p_userdata) const; + virtual void cull(const AABB &p_local_aabb, Callback p_callback, void *p_userdata) const; virtual Vector3 get_moment_of_inertia(real_t p_mass) const; @@ -462,7 +462,7 @@ struct MotionShapeSW : public ShapeSW { virtual void set_data(const Variant &p_data) {} virtual Variant get_data() const { return Variant(); } - MotionShapeSW() { configure(Rect3()); } + MotionShapeSW() { configure(AABB()); } }; struct _ShapeTestConvexBSPSW { diff --git a/servers/physics/space_sw.cpp b/servers/physics/space_sw.cpp index 7fac56f3d7..9de90fccb2 100644 --- a/servers/physics/space_sw.cpp +++ b/servers/physics/space_sw.cpp @@ -33,20 +33,12 @@ #include "physics_server_sw.h" #include "project_settings.h" -_FORCE_INLINE_ static bool _match_object_type_query(CollisionObjectSW *p_object, uint32_t p_collision_mask, uint32_t p_type_mask) { +_FORCE_INLINE_ static bool _can_collide_with(CollisionObjectSW *p_object, uint32_t p_collision_mask) { - if ((p_object->get_collision_layer() & p_collision_mask) == 0) - return false; - - if (p_object->get_type() == CollisionObjectSW::TYPE_AREA) - return p_type_mask & PhysicsDirectSpaceState::TYPE_MASK_AREA; - - BodySW *body = static_cast<BodySW *>(p_object); - - return (1 << body->get_mode()) & p_type_mask; + return p_object->get_collision_layer() & p_collision_mask; } -int PhysicsDirectSpaceStateSW::intersect_point(const Vector3 &p_point, ShapeResult *r_results, int p_result_max, const Set<RID> &p_exclude, uint32_t p_collision_mask, uint32_t p_object_type_mask) { +int PhysicsDirectSpaceStateSW::intersect_point(const Vector3 &p_point, ShapeResult *r_results, int p_result_max, const Set<RID> &p_exclude, uint32_t p_collision_mask) { ERR_FAIL_COND_V(space->locked, false); int amount = space->broadphase->cull_point(p_point, space->intersection_query_results, SpaceSW::INTERSECTION_QUERY_MAX, space->intersection_query_subindex_results); @@ -59,7 +51,7 @@ int PhysicsDirectSpaceStateSW::intersect_point(const Vector3 &p_point, ShapeResu if (cc >= p_result_max) break; - if (!_match_object_type_query(space->intersection_query_results[i], p_collision_mask, p_object_type_mask)) + if (!_can_collide_with(space->intersection_query_results[i], p_collision_mask)) continue; //area can't be picked by ray (default) @@ -90,7 +82,7 @@ int PhysicsDirectSpaceStateSW::intersect_point(const Vector3 &p_point, ShapeResu return cc; } -bool PhysicsDirectSpaceStateSW::intersect_ray(const Vector3 &p_from, const Vector3 &p_to, RayResult &r_result, const Set<RID> &p_exclude, uint32_t p_collision_mask, uint32_t p_object_type_mask, bool p_pick_ray) { +bool PhysicsDirectSpaceStateSW::intersect_ray(const Vector3 &p_from, const Vector3 &p_to, RayResult &r_result, const Set<RID> &p_exclude, uint32_t p_collision_mask, bool p_pick_ray) { ERR_FAIL_COND_V(space->locked, false); @@ -112,7 +104,7 @@ bool PhysicsDirectSpaceStateSW::intersect_ray(const Vector3 &p_from, const Vecto for (int i = 0; i < amount; i++) { - if (!_match_object_type_query(space->intersection_query_results[i], p_collision_mask, p_object_type_mask)) + if (!_can_collide_with(space->intersection_query_results[i], p_collision_mask)) continue; if (p_pick_ray && !(static_cast<CollisionObjectSW *>(space->intersection_query_results[i])->is_ray_pickable())) @@ -168,7 +160,7 @@ bool PhysicsDirectSpaceStateSW::intersect_ray(const Vector3 &p_from, const Vecto return true; } -int PhysicsDirectSpaceStateSW::intersect_shape(const RID &p_shape, const Transform &p_xform, real_t p_margin, ShapeResult *r_results, int p_result_max, const Set<RID> &p_exclude, uint32_t p_collision_mask, uint32_t p_object_type_mask) { +int PhysicsDirectSpaceStateSW::intersect_shape(const RID &p_shape, const Transform &p_xform, real_t p_margin, ShapeResult *r_results, int p_result_max, const Set<RID> &p_exclude, uint32_t p_collision_mask) { if (p_result_max <= 0) return 0; @@ -176,7 +168,7 @@ int PhysicsDirectSpaceStateSW::intersect_shape(const RID &p_shape, const Transfo ShapeSW *shape = static_cast<PhysicsServerSW *>(PhysicsServer::get_singleton())->shape_owner.get(p_shape); ERR_FAIL_COND_V(!shape, 0); - Rect3 aabb = p_xform.xform(shape->get_aabb()); + AABB aabb = p_xform.xform(shape->get_aabb()); int amount = space->broadphase->cull_aabb(aabb, space->intersection_query_results, SpaceSW::INTERSECTION_QUERY_MAX, space->intersection_query_subindex_results); @@ -189,7 +181,7 @@ int PhysicsDirectSpaceStateSW::intersect_shape(const RID &p_shape, const Transfo if (cc >= p_result_max) break; - if (!_match_object_type_query(space->intersection_query_results[i], p_collision_mask, p_object_type_mask)) + if (!_can_collide_with(space->intersection_query_results[i], p_collision_mask)) continue; //area can't be picked by ray (default) @@ -219,13 +211,13 @@ int PhysicsDirectSpaceStateSW::intersect_shape(const RID &p_shape, const Transfo return cc; } -bool PhysicsDirectSpaceStateSW::cast_motion(const RID &p_shape, const Transform &p_xform, const Vector3 &p_motion, real_t p_margin, real_t &p_closest_safe, real_t &p_closest_unsafe, const Set<RID> &p_exclude, uint32_t p_collision_mask, uint32_t p_object_type_mask, ShapeRestInfo *r_info) { +bool PhysicsDirectSpaceStateSW::cast_motion(const RID &p_shape, const Transform &p_xform, const Vector3 &p_motion, real_t p_margin, real_t &p_closest_safe, real_t &p_closest_unsafe, const Set<RID> &p_exclude, uint32_t p_collision_mask, ShapeRestInfo *r_info) { ShapeSW *shape = static_cast<PhysicsServerSW *>(PhysicsServer::get_singleton())->shape_owner.get(p_shape); ERR_FAIL_COND_V(!shape, false); - Rect3 aabb = p_xform.xform(shape->get_aabb()); - aabb = aabb.merge(Rect3(aabb.position + p_motion, aabb.size)); //motion + AABB aabb = p_xform.xform(shape->get_aabb()); + aabb = aabb.merge(AABB(aabb.position + p_motion, aabb.size)); //motion aabb = aabb.grow(p_margin); /* @@ -249,7 +241,7 @@ bool PhysicsDirectSpaceStateSW::cast_motion(const RID &p_shape, const Transform for (int i = 0; i < amount; i++) { - if (!_match_object_type_query(space->intersection_query_results[i], p_collision_mask, p_object_type_mask)) + if (!_can_collide_with(space->intersection_query_results[i], p_collision_mask)) continue; if (p_exclude.has(space->intersection_query_results[i]->get_self())) @@ -333,7 +325,7 @@ bool PhysicsDirectSpaceStateSW::cast_motion(const RID &p_shape, const Transform return true; } -bool PhysicsDirectSpaceStateSW::collide_shape(RID p_shape, const Transform &p_shape_xform, real_t p_margin, Vector3 *r_results, int p_result_max, int &r_result_count, const Set<RID> &p_exclude, uint32_t p_collision_mask, uint32_t p_object_type_mask) { +bool PhysicsDirectSpaceStateSW::collide_shape(RID p_shape, const Transform &p_shape_xform, real_t p_margin, Vector3 *r_results, int p_result_max, int &r_result_count, const Set<RID> &p_exclude, uint32_t p_collision_mask) { if (p_result_max <= 0) return 0; @@ -341,7 +333,7 @@ bool PhysicsDirectSpaceStateSW::collide_shape(RID p_shape, const Transform &p_sh ShapeSW *shape = static_cast<PhysicsServerSW *>(PhysicsServer::get_singleton())->shape_owner.get(p_shape); ERR_FAIL_COND_V(!shape, 0); - Rect3 aabb = p_shape_xform.xform(shape->get_aabb()); + AABB aabb = p_shape_xform.xform(shape->get_aabb()); aabb = aabb.grow(p_margin); int amount = space->broadphase->cull_aabb(aabb, space->intersection_query_results, SpaceSW::INTERSECTION_QUERY_MAX, space->intersection_query_subindex_results); @@ -363,7 +355,7 @@ bool PhysicsDirectSpaceStateSW::collide_shape(RID p_shape, const Transform &p_sh for (int i = 0; i < amount; i++) { - if (!_match_object_type_query(space->intersection_query_results[i], p_collision_mask, p_object_type_mask)) + if (!_can_collide_with(space->intersection_query_results[i], p_collision_mask)) continue; const CollisionObjectSW *col_obj = space->intersection_query_results[i]; @@ -412,12 +404,12 @@ static void _rest_cbk_result(const Vector3 &p_point_A, const Vector3 &p_point_B, rd->best_object = rd->object; rd->best_shape = rd->shape; } -bool PhysicsDirectSpaceStateSW::rest_info(RID p_shape, const Transform &p_shape_xform, real_t p_margin, ShapeRestInfo *r_info, const Set<RID> &p_exclude, uint32_t p_collision_mask, uint32_t p_object_type_mask) { +bool PhysicsDirectSpaceStateSW::rest_info(RID p_shape, const Transform &p_shape_xform, real_t p_margin, ShapeRestInfo *r_info, const Set<RID> &p_exclude, uint32_t p_collision_mask) { ShapeSW *shape = static_cast<PhysicsServerSW *>(PhysicsServer::get_singleton())->shape_owner.get(p_shape); ERR_FAIL_COND_V(!shape, 0); - Rect3 aabb = p_shape_xform.xform(shape->get_aabb()); + AABB aabb = p_shape_xform.xform(shape->get_aabb()); aabb = aabb.grow(p_margin); int amount = space->broadphase->cull_aabb(aabb, space->intersection_query_results, SpaceSW::INTERSECTION_QUERY_MAX, space->intersection_query_subindex_results); @@ -429,7 +421,7 @@ bool PhysicsDirectSpaceStateSW::rest_info(RID p_shape, const Transform &p_shape_ for (int i = 0; i < amount; i++) { - if (!_match_object_type_query(space->intersection_query_results[i], p_collision_mask, p_object_type_mask)) + if (!_can_collide_with(space->intersection_query_results[i], p_collision_mask)) continue; const CollisionObjectSW *col_obj = space->intersection_query_results[i]; @@ -514,7 +506,7 @@ PhysicsDirectSpaceStateSW::PhysicsDirectSpaceStateSW() { //////////////////////////////////////////////////////////////////////////////////////////////////////////// -int SpaceSW::_cull_aabb_for_body(BodySW *p_body, const Rect3 &p_aabb) { +int SpaceSW::_cull_aabb_for_body(BodySW *p_body, const AABB &p_aabb) { int amount = broadphase->cull_aabb(p_aabb, intersection_query_results, INTERSECTION_QUERY_MAX, intersection_query_subindex_results); @@ -561,7 +553,7 @@ bool SpaceSW::test_body_motion(BodySW *p_body, const Transform &p_from, const Ve r_result->collider_id = 0; r_result->collider_shape = 0; } - Rect3 body_aabb; + AABB body_aabb; for (int i = 0; i < p_body->get_shape_count(); i++) { @@ -648,7 +640,7 @@ bool SpaceSW::test_body_motion(BodySW *p_body, const Transform &p_from, const Ve { // STEP 2 ATTEMPT MOTION - Rect3 motion_aabb = body_aabb; + AABB motion_aabb = body_aabb; motion_aabb.position += p_motion; motion_aabb = motion_aabb.merge(body_aabb); diff --git a/servers/physics/space_sw.h b/servers/physics/space_sw.h index 270e4ef1bd..a7c975fbf6 100644 --- a/servers/physics/space_sw.h +++ b/servers/physics/space_sw.h @@ -47,12 +47,12 @@ class PhysicsDirectSpaceStateSW : public PhysicsDirectSpaceState { public: SpaceSW *space; - virtual int intersect_point(const Vector3 &p_point, ShapeResult *r_results, int p_result_max, const Set<RID> &p_exclude = Set<RID>(), uint32_t p_collision_mask = 0xFFFFFFFF, uint32_t p_object_type_mask = TYPE_MASK_COLLISION); - virtual bool intersect_ray(const Vector3 &p_from, const Vector3 &p_to, RayResult &r_result, const Set<RID> &p_exclude = Set<RID>(), uint32_t p_collision_mask = 0xFFFFFFFF, uint32_t p_object_type_mask = TYPE_MASK_COLLISION, bool p_pick_ray = false); - virtual int intersect_shape(const RID &p_shape, const Transform &p_xform, real_t p_margin, ShapeResult *r_results, int p_result_max, const Set<RID> &p_exclude = Set<RID>(), uint32_t p_collision_mask = 0xFFFFFFFF, uint32_t p_object_type_mask = TYPE_MASK_COLLISION); - virtual bool cast_motion(const RID &p_shape, const Transform &p_xform, const Vector3 &p_motion, real_t p_margin, real_t &p_closest_safe, real_t &p_closest_unsafe, const Set<RID> &p_exclude = Set<RID>(), uint32_t p_collision_mask = 0xFFFFFFFF, uint32_t p_object_type_mask = TYPE_MASK_COLLISION, ShapeRestInfo *r_info = NULL); - virtual bool collide_shape(RID p_shape, const Transform &p_shape_xform, real_t p_margin, Vector3 *r_results, int p_result_max, int &r_result_count, const Set<RID> &p_exclude = Set<RID>(), uint32_t p_collision_mask = 0xFFFFFFFF, uint32_t p_object_type_mask = TYPE_MASK_COLLISION); - virtual bool rest_info(RID p_shape, const Transform &p_shape_xform, real_t p_margin, ShapeRestInfo *r_info, const Set<RID> &p_exclude = Set<RID>(), uint32_t p_collision_mask = 0xFFFFFFFF, uint32_t p_object_type_mask = TYPE_MASK_COLLISION); + virtual int intersect_point(const Vector3 &p_point, ShapeResult *r_results, int p_result_max, const Set<RID> &p_exclude = Set<RID>(), uint32_t p_collision_mask = 0xFFFFFFFF); + virtual bool intersect_ray(const Vector3 &p_from, const Vector3 &p_to, RayResult &r_result, const Set<RID> &p_exclude = Set<RID>(), uint32_t p_collision_mask = 0xFFFFFFFF, bool p_pick_ray = false); + virtual int intersect_shape(const RID &p_shape, const Transform &p_xform, real_t p_margin, ShapeResult *r_results, int p_result_max, const Set<RID> &p_exclude = Set<RID>(), uint32_t p_collision_mask = 0xFFFFFFFF); + virtual bool cast_motion(const RID &p_shape, const Transform &p_xform, const Vector3 &p_motion, real_t p_margin, real_t &p_closest_safe, real_t &p_closest_unsafe, const Set<RID> &p_exclude = Set<RID>(), uint32_t p_collision_mask = 0xFFFFFFFF, ShapeRestInfo *r_info = NULL); + virtual bool collide_shape(RID p_shape, const Transform &p_shape_xform, real_t p_margin, Vector3 *r_results, int p_result_max, int &r_result_count, const Set<RID> &p_exclude = Set<RID>(), uint32_t p_collision_mask = 0xFFFFFFFF); + virtual bool rest_info(RID p_shape, const Transform &p_shape_xform, real_t p_margin, ShapeRestInfo *r_info, const Set<RID> &p_exclude = Set<RID>(), uint32_t p_collision_mask = 0xFFFFFFFF); virtual Vector3 get_closest_point_to_object_volume(RID p_object, const Vector3 p_point) const; PhysicsDirectSpaceStateSW(); @@ -122,7 +122,7 @@ private: friend class PhysicsDirectSpaceStateSW; - int _cull_aabb_for_body(BodySW *p_body, const Rect3 &p_aabb); + int _cull_aabb_for_body(BodySW *p_body, const AABB &p_aabb); public: _FORCE_INLINE_ void set_self(const RID &p_self) { self = p_self; } diff --git a/servers/physics_2d/space_2d_sw.cpp b/servers/physics_2d/space_2d_sw.cpp index 3b8eb19dd1..6de58cfbc0 100644 --- a/servers/physics_2d/space_2d_sw.cpp +++ b/servers/physics_2d/space_2d_sw.cpp @@ -32,20 +32,12 @@ #include "collision_solver_2d_sw.h" #include "pair.h" #include "physics_2d_server_sw.h" -_FORCE_INLINE_ static bool _match_object_type_query(CollisionObject2DSW *p_object, uint32_t p_collision_mask, uint32_t p_type_mask) { +_FORCE_INLINE_ static bool _can_collide_with(CollisionObject2DSW *p_object, uint32_t p_collision_mask) { - if ((p_object->get_collision_layer() & p_collision_mask) == 0) - return false; - - if (p_object->get_type() == CollisionObject2DSW::TYPE_AREA) - return p_type_mask & Physics2DDirectSpaceState::TYPE_MASK_AREA; - - Body2DSW *body = static_cast<Body2DSW *>(p_object); - - return (1 << body->get_mode()) & p_type_mask; + return p_object->get_collision_layer() & p_collision_mask; } -int Physics2DDirectSpaceStateSW::intersect_point(const Vector2 &p_point, ShapeResult *r_results, int p_result_max, const Set<RID> &p_exclude, uint32_t p_collision_mask, uint32_t p_object_type_mask, bool p_pick_point) { +int Physics2DDirectSpaceStateSW::intersect_point(const Vector2 &p_point, ShapeResult *r_results, int p_result_max, const Set<RID> &p_exclude, uint32_t p_collision_mask, bool p_pick_point) { if (p_result_max <= 0) return 0; @@ -60,7 +52,7 @@ int Physics2DDirectSpaceStateSW::intersect_point(const Vector2 &p_point, ShapeRe for (int i = 0; i < amount; i++) { - if (!_match_object_type_query(space->intersection_query_results[i], p_collision_mask, p_object_type_mask)) + if (!_can_collide_with(space->intersection_query_results[i], p_collision_mask)) continue; if (p_exclude.has(space->intersection_query_results[i]->get_self())) @@ -96,7 +88,7 @@ int Physics2DDirectSpaceStateSW::intersect_point(const Vector2 &p_point, ShapeRe return cc; } -bool Physics2DDirectSpaceStateSW::intersect_ray(const Vector2 &p_from, const Vector2 &p_to, RayResult &r_result, const Set<RID> &p_exclude, uint32_t p_collision_mask, uint32_t p_object_type_mask) { +bool Physics2DDirectSpaceStateSW::intersect_ray(const Vector2 &p_from, const Vector2 &p_to, RayResult &r_result, const Set<RID> &p_exclude, uint32_t p_collision_mask) { ERR_FAIL_COND_V(space->locked, false); @@ -118,7 +110,7 @@ bool Physics2DDirectSpaceStateSW::intersect_ray(const Vector2 &p_from, const Vec for (int i = 0; i < amount; i++) { - if (!_match_object_type_query(space->intersection_query_results[i], p_collision_mask, p_object_type_mask)) + if (!_can_collide_with(space->intersection_query_results[i], p_collision_mask)) continue; if (p_exclude.has(space->intersection_query_results[i]->get_self())) @@ -176,7 +168,7 @@ bool Physics2DDirectSpaceStateSW::intersect_ray(const Vector2 &p_from, const Vec return true; } -int Physics2DDirectSpaceStateSW::intersect_shape(const RID &p_shape, const Transform2D &p_xform, const Vector2 &p_motion, real_t p_margin, ShapeResult *r_results, int p_result_max, const Set<RID> &p_exclude, uint32_t p_collision_mask, uint32_t p_object_type_mask) { +int Physics2DDirectSpaceStateSW::intersect_shape(const RID &p_shape, const Transform2D &p_xform, const Vector2 &p_motion, real_t p_margin, ShapeResult *r_results, int p_result_max, const Set<RID> &p_exclude, uint32_t p_collision_mask) { if (p_result_max <= 0) return 0; @@ -193,7 +185,7 @@ int Physics2DDirectSpaceStateSW::intersect_shape(const RID &p_shape, const Trans for (int i = 0; i < amount; i++) { - if (!_match_object_type_query(space->intersection_query_results[i], p_collision_mask, p_object_type_mask)) + if (!_can_collide_with(space->intersection_query_results[i], p_collision_mask)) continue; if (p_exclude.has(space->intersection_query_results[i]->get_self())) @@ -218,7 +210,7 @@ int Physics2DDirectSpaceStateSW::intersect_shape(const RID &p_shape, const Trans return cc; } -bool Physics2DDirectSpaceStateSW::cast_motion(const RID &p_shape, const Transform2D &p_xform, const Vector2 &p_motion, real_t p_margin, real_t &p_closest_safe, real_t &p_closest_unsafe, const Set<RID> &p_exclude, uint32_t p_collision_mask, uint32_t p_object_type_mask) { +bool Physics2DDirectSpaceStateSW::cast_motion(const RID &p_shape, const Transform2D &p_xform, const Vector2 &p_motion, real_t p_margin, real_t &p_closest_safe, real_t &p_closest_unsafe, const Set<RID> &p_exclude, uint32_t p_collision_mask) { Shape2DSW *shape = Physics2DServerSW::singletonsw->shape_owner.get(p_shape); ERR_FAIL_COND_V(!shape, false); @@ -239,7 +231,7 @@ bool Physics2DDirectSpaceStateSW::cast_motion(const RID &p_shape, const Transfor for (int i = 0; i < amount; i++) { - if (!_match_object_type_query(space->intersection_query_results[i], p_collision_mask, p_object_type_mask)) + if (!_can_collide_with(space->intersection_query_results[i], p_collision_mask)) continue; if (p_exclude.has(space->intersection_query_results[i]->get_self())) @@ -302,7 +294,7 @@ bool Physics2DDirectSpaceStateSW::cast_motion(const RID &p_shape, const Transfor return true; } -bool Physics2DDirectSpaceStateSW::collide_shape(RID p_shape, const Transform2D &p_shape_xform, const Vector2 &p_motion, real_t p_margin, Vector2 *r_results, int p_result_max, int &r_result_count, const Set<RID> &p_exclude, uint32_t p_collision_mask, uint32_t p_object_type_mask) { +bool Physics2DDirectSpaceStateSW::collide_shape(RID p_shape, const Transform2D &p_shape_xform, const Vector2 &p_motion, real_t p_margin, Vector2 *r_results, int p_result_max, int &r_result_count, const Set<RID> &p_exclude, uint32_t p_collision_mask) { if (p_result_max <= 0) return 0; @@ -333,7 +325,7 @@ bool Physics2DDirectSpaceStateSW::collide_shape(RID p_shape, const Transform2D & for (int i = 0; i < amount; i++) { - if (!_match_object_type_query(space->intersection_query_results[i], p_collision_mask, p_object_type_mask)) + if (!_can_collide_with(space->intersection_query_results[i], p_collision_mask)) continue; const CollisionObject2DSW *col_obj = space->intersection_query_results[i]; @@ -391,7 +383,7 @@ static void _rest_cbk_result(const Vector2 &p_point_A, const Vector2 &p_point_B, rd->best_shape = rd->shape; } -bool Physics2DDirectSpaceStateSW::rest_info(RID p_shape, const Transform2D &p_shape_xform, const Vector2 &p_motion, real_t p_margin, ShapeRestInfo *r_info, const Set<RID> &p_exclude, uint32_t p_collision_mask, uint32_t p_object_type_mask) { +bool Physics2DDirectSpaceStateSW::rest_info(RID p_shape, const Transform2D &p_shape_xform, const Vector2 &p_motion, real_t p_margin, ShapeRestInfo *r_info, const Set<RID> &p_exclude, uint32_t p_collision_mask) { Shape2DSW *shape = Physics2DServerSW::singletonsw->shape_owner.get(p_shape); ERR_FAIL_COND_V(!shape, 0); @@ -409,7 +401,7 @@ bool Physics2DDirectSpaceStateSW::rest_info(RID p_shape, const Transform2D &p_sh for (int i = 0; i < amount; i++) { - if (!_match_object_type_query(space->intersection_query_results[i], p_collision_mask, p_object_type_mask)) + if (!_can_collide_with(space->intersection_query_results[i], p_collision_mask)) continue; const CollisionObject2DSW *col_obj = space->intersection_query_results[i]; diff --git a/servers/physics_2d/space_2d_sw.h b/servers/physics_2d/space_2d_sw.h index bf0796fb22..f41a0dbeb1 100644 --- a/servers/physics_2d/space_2d_sw.h +++ b/servers/physics_2d/space_2d_sw.h @@ -47,12 +47,12 @@ class Physics2DDirectSpaceStateSW : public Physics2DDirectSpaceState { public: Space2DSW *space; - virtual int intersect_point(const Vector2 &p_point, ShapeResult *r_results, int p_result_max, const Set<RID> &p_exclude = Set<RID>(), uint32_t p_collision_mask = 0xFFFFFFFF, uint32_t p_object_type_mask = TYPE_MASK_COLLISION, bool p_pick_point = false); - virtual bool intersect_ray(const Vector2 &p_from, const Vector2 &p_to, RayResult &r_result, const Set<RID> &p_exclude = Set<RID>(), uint32_t p_collision_mask = 0xFFFFFFFF, uint32_t p_object_type_mask = TYPE_MASK_COLLISION); - virtual int intersect_shape(const RID &p_shape, const Transform2D &p_xform, const Vector2 &p_motion, real_t p_margin, ShapeResult *r_results, int p_result_max, const Set<RID> &p_exclude = Set<RID>(), uint32_t p_collision_mask = 0xFFFFFFFF, uint32_t p_object_type_mask = TYPE_MASK_COLLISION); - virtual bool cast_motion(const RID &p_shape, const Transform2D &p_xform, const Vector2 &p_motion, real_t p_margin, real_t &p_closest_safe, real_t &p_closest_unsafe, const Set<RID> &p_exclude = Set<RID>(), uint32_t p_collision_mask = 0xFFFFFFFF, uint32_t p_object_type_mask = TYPE_MASK_COLLISION); - virtual bool collide_shape(RID p_shape, const Transform2D &p_shape_xform, const Vector2 &p_motion, real_t p_margin, Vector2 *r_results, int p_result_max, int &r_result_count, const Set<RID> &p_exclude = Set<RID>(), uint32_t p_collision_mask = 0xFFFFFFFF, uint32_t p_object_type_mask = TYPE_MASK_COLLISION); - virtual bool rest_info(RID p_shape, const Transform2D &p_shape_xform, const Vector2 &p_motion, real_t p_margin, ShapeRestInfo *r_info, const Set<RID> &p_exclude = Set<RID>(), uint32_t p_collision_mask = 0xFFFFFFFF, uint32_t p_object_type_mask = TYPE_MASK_COLLISION); + virtual int intersect_point(const Vector2 &p_point, ShapeResult *r_results, int p_result_max, const Set<RID> &p_exclude = Set<RID>(), uint32_t p_collision_mask = 0xFFFFFFFF, bool p_pick_point = false); + virtual bool intersect_ray(const Vector2 &p_from, const Vector2 &p_to, RayResult &r_result, const Set<RID> &p_exclude = Set<RID>(), uint32_t p_collision_mask = 0xFFFFFFFF); + virtual int intersect_shape(const RID &p_shape, const Transform2D &p_xform, const Vector2 &p_motion, real_t p_margin, ShapeResult *r_results, int p_result_max, const Set<RID> &p_exclude = Set<RID>(), uint32_t p_collision_mask = 0xFFFFFFFF); + virtual bool cast_motion(const RID &p_shape, const Transform2D &p_xform, const Vector2 &p_motion, real_t p_margin, real_t &p_closest_safe, real_t &p_closest_unsafe, const Set<RID> &p_exclude = Set<RID>(), uint32_t p_collision_mask = 0xFFFFFFFF); + virtual bool collide_shape(RID p_shape, const Transform2D &p_shape_xform, const Vector2 &p_motion, real_t p_margin, Vector2 *r_results, int p_result_max, int &r_result_count, const Set<RID> &p_exclude = Set<RID>(), uint32_t p_collision_mask = 0xFFFFFFFF); + virtual bool rest_info(RID p_shape, const Transform2D &p_shape_xform, const Vector2 &p_motion, real_t p_margin, ShapeRestInfo *r_info, const Set<RID> &p_exclude = Set<RID>(), uint32_t p_collision_mask = 0xFFFFFFFF); Physics2DDirectSpaceStateSW(); }; diff --git a/servers/physics_2d_server.cpp b/servers/physics_2d_server.cpp index 650d3d0f62..829f894b87 100644 --- a/servers/physics_2d_server.cpp +++ b/servers/physics_2d_server.cpp @@ -156,23 +156,15 @@ float Physics2DShapeQueryParameters::get_margin() const { return margin; } -void Physics2DShapeQueryParameters::set_collision_layer(int p_collision_layer) { +void Physics2DShapeQueryParameters::set_collision_mask(int p_collision_layer) { - collision_layer = p_collision_layer; + collision_mask = p_collision_layer; } -int Physics2DShapeQueryParameters::get_collision_layer() const { +int Physics2DShapeQueryParameters::get_collision_mask() const { - return collision_layer; + return collision_mask; } -void Physics2DShapeQueryParameters::set_object_type_mask(int p_object_type_mask) { - - object_type_mask = p_object_type_mask; -} -int Physics2DShapeQueryParameters::get_object_type_mask() const { - - return object_type_mask; -} void Physics2DShapeQueryParameters::set_exclude(const Vector<RID> &p_exclude) { exclude.clear(); @@ -206,11 +198,8 @@ void Physics2DShapeQueryParameters::_bind_methods() { ClassDB::bind_method(D_METHOD("set_margin", "margin"), &Physics2DShapeQueryParameters::set_margin); ClassDB::bind_method(D_METHOD("get_margin"), &Physics2DShapeQueryParameters::get_margin); - ClassDB::bind_method(D_METHOD("set_collision_layer", "collision_layer"), &Physics2DShapeQueryParameters::set_collision_layer); - ClassDB::bind_method(D_METHOD("get_collision_layer"), &Physics2DShapeQueryParameters::get_collision_layer); - - ClassDB::bind_method(D_METHOD("set_object_type_mask", "object_type_mask"), &Physics2DShapeQueryParameters::set_object_type_mask); - ClassDB::bind_method(D_METHOD("get_object_type_mask"), &Physics2DShapeQueryParameters::get_object_type_mask); + ClassDB::bind_method(D_METHOD("set_collision_layer", "collision_layer"), &Physics2DShapeQueryParameters::set_collision_mask); + ClassDB::bind_method(D_METHOD("get_collision_layer"), &Physics2DShapeQueryParameters::get_collision_mask); ClassDB::bind_method(D_METHOD("set_exclude", "exclude"), &Physics2DShapeQueryParameters::set_exclude); ClassDB::bind_method(D_METHOD("get_exclude"), &Physics2DShapeQueryParameters::get_exclude); @@ -219,18 +208,17 @@ void Physics2DShapeQueryParameters::_bind_methods() { Physics2DShapeQueryParameters::Physics2DShapeQueryParameters() { margin = 0; - collision_layer = 0x7FFFFFFF; - object_type_mask = Physics2DDirectSpaceState::TYPE_MASK_COLLISION; + collision_mask = 0x7FFFFFFF; } -Dictionary Physics2DDirectSpaceState::_intersect_ray(const Vector2 &p_from, const Vector2 &p_to, const Vector<RID> &p_exclude, uint32_t p_layers, uint32_t p_object_type_mask) { +Dictionary Physics2DDirectSpaceState::_intersect_ray(const Vector2 &p_from, const Vector2 &p_to, const Vector<RID> &p_exclude, uint32_t p_layers) { RayResult inters; Set<RID> exclude; for (int i = 0; i < p_exclude.size(); i++) exclude.insert(p_exclude[i]); - bool res = intersect_ray(p_from, p_to, inters, exclude, p_layers, p_object_type_mask); + bool res = intersect_ray(p_from, p_to, inters, exclude, p_layers); if (!res) return Dictionary(); @@ -251,7 +239,7 @@ Array Physics2DDirectSpaceState::_intersect_shape(const Ref<Physics2DShapeQueryP Vector<ShapeResult> sr; sr.resize(p_max_results); - int rc = intersect_shape(p_shape_query->shape, p_shape_query->transform, p_shape_query->motion, p_shape_query->margin, sr.ptr(), sr.size(), p_shape_query->exclude, p_shape_query->collision_layer, p_shape_query->object_type_mask); + int rc = intersect_shape(p_shape_query->shape, p_shape_query->transform, p_shape_query->motion, p_shape_query->margin, sr.ptr(), sr.size(), p_shape_query->exclude, p_shape_query->collision_mask); Array ret; ret.resize(rc); for (int i = 0; i < rc; i++) { @@ -271,7 +259,7 @@ Array Physics2DDirectSpaceState::_intersect_shape(const Ref<Physics2DShapeQueryP Array Physics2DDirectSpaceState::_cast_motion(const Ref<Physics2DShapeQueryParameters> &p_shape_query) { float closest_safe, closest_unsafe; - bool res = cast_motion(p_shape_query->shape, p_shape_query->transform, p_shape_query->motion, p_shape_query->margin, closest_safe, closest_unsafe, p_shape_query->exclude, p_shape_query->collision_layer, p_shape_query->object_type_mask); + bool res = cast_motion(p_shape_query->shape, p_shape_query->transform, p_shape_query->motion, p_shape_query->margin, closest_safe, closest_unsafe, p_shape_query->exclude, p_shape_query->collision_mask); if (!res) return Array(); Array ret; @@ -281,7 +269,7 @@ Array Physics2DDirectSpaceState::_cast_motion(const Ref<Physics2DShapeQueryParam return ret; } -Array Physics2DDirectSpaceState::_intersect_point(const Vector2 &p_point, int p_max_results, const Vector<RID> &p_exclude, uint32_t p_layers, uint32_t p_object_type_mask) { +Array Physics2DDirectSpaceState::_intersect_point(const Vector2 &p_point, int p_max_results, const Vector<RID> &p_exclude, uint32_t p_layers) { Set<RID> exclude; for (int i = 0; i < p_exclude.size(); i++) @@ -290,7 +278,7 @@ Array Physics2DDirectSpaceState::_intersect_point(const Vector2 &p_point, int p_ Vector<ShapeResult> ret; ret.resize(p_max_results); - int rc = intersect_point(p_point, ret.ptr(), ret.size(), exclude, p_layers, p_object_type_mask); + int rc = intersect_point(p_point, ret.ptr(), ret.size(), exclude, p_layers); if (rc == 0) return Array(); @@ -314,7 +302,7 @@ Array Physics2DDirectSpaceState::_collide_shape(const Ref<Physics2DShapeQueryPar Vector<Vector2> ret; ret.resize(p_max_results * 2); int rc = 0; - bool res = collide_shape(p_shape_query->shape, p_shape_query->transform, p_shape_query->motion, p_shape_query->margin, ret.ptr(), p_max_results, rc, p_shape_query->exclude, p_shape_query->collision_layer, p_shape_query->object_type_mask); + bool res = collide_shape(p_shape_query->shape, p_shape_query->transform, p_shape_query->motion, p_shape_query->margin, ret.ptr(), p_max_results, rc, p_shape_query->exclude, p_shape_query->collision_mask); if (!res) return Array(); Array r; @@ -327,7 +315,7 @@ Dictionary Physics2DDirectSpaceState::_get_rest_info(const Ref<Physics2DShapeQue ShapeRestInfo sri; - bool res = rest_info(p_shape_query->shape, p_shape_query->transform, p_shape_query->motion, p_shape_query->margin, &sri, p_shape_query->exclude, p_shape_query->collision_layer, p_shape_query->object_type_mask); + bool res = rest_info(p_shape_query->shape, p_shape_query->transform, p_shape_query->motion, p_shape_query->margin, &sri, p_shape_query->exclude, p_shape_query->collision_mask); Dictionary r; if (!res) return r; @@ -348,20 +336,13 @@ Physics2DDirectSpaceState::Physics2DDirectSpaceState() { void Physics2DDirectSpaceState::_bind_methods() { - ClassDB::bind_method(D_METHOD("intersect_point", "point", "max_results", "exclude", "collision_layer", "type_mask"), &Physics2DDirectSpaceState::_intersect_point, DEFVAL(32), DEFVAL(Array()), DEFVAL(0x7FFFFFFF), DEFVAL(TYPE_MASK_COLLISION)); - ClassDB::bind_method(D_METHOD("intersect_ray", "from", "to", "exclude", "collision_layer", "type_mask"), &Physics2DDirectSpaceState::_intersect_ray, DEFVAL(Array()), DEFVAL(0x7FFFFFFF), DEFVAL(TYPE_MASK_COLLISION)); + ClassDB::bind_method(D_METHOD("intersect_point", "point", "max_results", "exclude", "collision_layer"), &Physics2DDirectSpaceState::_intersect_point, DEFVAL(32), DEFVAL(Array()), DEFVAL(0x7FFFFFFF)); + ClassDB::bind_method(D_METHOD("intersect_ray", "from", "to", "exclude", "collision_layer"), &Physics2DDirectSpaceState::_intersect_ray, DEFVAL(Array()), DEFVAL(0x7FFFFFFF)); ClassDB::bind_method(D_METHOD("intersect_shape", "shape", "max_results"), &Physics2DDirectSpaceState::_intersect_shape, DEFVAL(32)); ClassDB::bind_method(D_METHOD("cast_motion", "shape"), &Physics2DDirectSpaceState::_cast_motion); ClassDB::bind_method(D_METHOD("collide_shape", "shape", "max_results"), &Physics2DDirectSpaceState::_collide_shape, DEFVAL(32)); ClassDB::bind_method(D_METHOD("get_rest_info", "shape"), &Physics2DDirectSpaceState::_get_rest_info); //ClassDB::bind_method(D_METHOD("cast_motion","shape","xform","motion","exclude","umask"),&Physics2DDirectSpaceState::_intersect_shape,DEFVAL(Array()),DEFVAL(0)); - - BIND_ENUM_CONSTANT(TYPE_MASK_STATIC_BODY); - BIND_ENUM_CONSTANT(TYPE_MASK_KINEMATIC_BODY); - BIND_ENUM_CONSTANT(TYPE_MASK_RIGID_BODY); - BIND_ENUM_CONSTANT(TYPE_MASK_CHARACTER_BODY); - BIND_ENUM_CONSTANT(TYPE_MASK_COLLISION); - BIND_ENUM_CONSTANT(TYPE_MASK_AREA); } int Physics2DShapeQueryResult::get_result_count() const { diff --git a/servers/physics_2d_server.h b/servers/physics_2d_server.h index 241255bdb5..d6a988f512 100644 --- a/servers/physics_2d_server.h +++ b/servers/physics_2d_server.h @@ -97,8 +97,7 @@ class Physics2DShapeQueryParameters : public Reference { Vector2 motion; float margin; Set<RID> exclude; - uint32_t collision_layer; - uint32_t object_type_mask; + uint32_t collision_mask; protected: static void _bind_methods(); @@ -117,11 +116,8 @@ public: void set_margin(float p_margin); float get_margin() const; - void set_collision_layer(int p_collision_layer); - int get_collision_layer() const; - - void set_object_type_mask(int p_object_type_mask); - int get_object_type_mask() const; + void set_collision_mask(int p_collision_mask); + int get_collision_mask() const; void set_exclude(const Vector<RID> &p_exclude); Vector<RID> get_exclude() const; @@ -133,9 +129,9 @@ class Physics2DDirectSpaceState : public Object { GDCLASS(Physics2DDirectSpaceState, Object); - Dictionary _intersect_ray(const Vector2 &p_from, const Vector2 &p_to, const Vector<RID> &p_exclude = Vector<RID>(), uint32_t p_layers = 0, uint32_t p_object_type_mask = TYPE_MASK_COLLISION); + Dictionary _intersect_ray(const Vector2 &p_from, const Vector2 &p_to, const Vector<RID> &p_exclude = Vector<RID>(), uint32_t p_layers = 0); - Array _intersect_point(const Vector2 &p_point, int p_max_results = 32, const Vector<RID> &p_exclude = Vector<RID>(), uint32_t p_layers = 0, uint32_t p_object_type_mask = TYPE_MASK_COLLISION); + Array _intersect_point(const Vector2 &p_point, int p_max_results = 32, const Vector<RID> &p_exclude = Vector<RID>(), uint32_t p_layers = 0); Array _intersect_shape(const Ref<Physics2DShapeQueryParameters> &p_shape_query, int p_max_results = 32); Array _cast_motion(const Ref<Physics2DShapeQueryParameters> &p_shape_query); Array _collide_shape(const Ref<Physics2DShapeQueryParameters> &p_shape_query, int p_max_results = 32); @@ -145,16 +141,6 @@ protected: static void _bind_methods(); public: - enum ObjectTypeMask { - TYPE_MASK_STATIC_BODY = 1 << 0, - TYPE_MASK_KINEMATIC_BODY = 1 << 1, - TYPE_MASK_RIGID_BODY = 1 << 2, - TYPE_MASK_CHARACTER_BODY = 1 << 3, - TYPE_MASK_AREA = 1 << 4, - TYPE_MASK_COLLISION = TYPE_MASK_STATIC_BODY | TYPE_MASK_CHARACTER_BODY | TYPE_MASK_KINEMATIC_BODY | TYPE_MASK_RIGID_BODY - - }; - struct RayResult { Vector2 position; @@ -166,7 +152,7 @@ public: Variant metadata; }; - virtual bool intersect_ray(const Vector2 &p_from, const Vector2 &p_to, RayResult &r_result, const Set<RID> &p_exclude = Set<RID>(), uint32_t p_collision_layer = 0xFFFFFFFF, uint32_t p_object_type_mask = TYPE_MASK_COLLISION) = 0; + virtual bool intersect_ray(const Vector2 &p_from, const Vector2 &p_to, RayResult &r_result, const Set<RID> &p_exclude = Set<RID>(), uint32_t p_collision_layer = 0xFFFFFFFF) = 0; struct ShapeResult { @@ -177,13 +163,13 @@ public: Variant metadata; }; - virtual int intersect_point(const Vector2 &p_point, ShapeResult *r_results, int p_result_max, const Set<RID> &p_exclude = Set<RID>(), uint32_t p_collision_layer = 0xFFFFFFFF, uint32_t p_object_type_mask = TYPE_MASK_COLLISION, bool p_pick_point = false) = 0; + virtual int intersect_point(const Vector2 &p_point, ShapeResult *r_results, int p_result_max, const Set<RID> &p_exclude = Set<RID>(), uint32_t p_collision_layer = 0xFFFFFFFF, bool p_pick_point = false) = 0; - virtual int intersect_shape(const RID &p_shape, const Transform2D &p_xform, const Vector2 &p_motion, float p_margin, ShapeResult *r_results, int p_result_max, const Set<RID> &p_exclude = Set<RID>(), uint32_t p_collision_layer = 0xFFFFFFFF, uint32_t p_object_type_mask = TYPE_MASK_COLLISION) = 0; + virtual int intersect_shape(const RID &p_shape, const Transform2D &p_xform, const Vector2 &p_motion, float p_margin, ShapeResult *r_results, int p_result_max, const Set<RID> &p_exclude = Set<RID>(), uint32_t p_collision_layer = 0xFFFFFFFF) = 0; - virtual bool cast_motion(const RID &p_shape, const Transform2D &p_xform, const Vector2 &p_motion, float p_margin, float &p_closest_safe, float &p_closest_unsafe, const Set<RID> &p_exclude = Set<RID>(), uint32_t p_collision_layer = 0xFFFFFFFF, uint32_t p_object_type_mask = TYPE_MASK_COLLISION) = 0; + virtual bool cast_motion(const RID &p_shape, const Transform2D &p_xform, const Vector2 &p_motion, float p_margin, float &p_closest_safe, float &p_closest_unsafe, const Set<RID> &p_exclude = Set<RID>(), uint32_t p_collision_layer = 0xFFFFFFFF) = 0; - virtual bool collide_shape(RID p_shape, const Transform2D &p_shape_xform, const Vector2 &p_motion, float p_margin, Vector2 *r_results, int p_result_max, int &r_result_count, const Set<RID> &p_exclude = Set<RID>(), uint32_t p_collision_layer = 0xFFFFFFFF, uint32_t p_object_type_mask = TYPE_MASK_COLLISION) = 0; + virtual bool collide_shape(RID p_shape, const Transform2D &p_shape_xform, const Vector2 &p_motion, float p_margin, Vector2 *r_results, int p_result_max, int &r_result_count, const Set<RID> &p_exclude = Set<RID>(), uint32_t p_collision_layer = 0xFFFFFFFF) = 0; struct ShapeRestInfo { @@ -196,13 +182,11 @@ public: Variant metadata; }; - virtual bool rest_info(RID p_shape, const Transform2D &p_shape_xform, const Vector2 &p_motion, float p_margin, ShapeRestInfo *r_info, const Set<RID> &p_exclude = Set<RID>(), uint32_t p_collision_layer = 0xFFFFFFFF, uint32_t p_object_type_mask = TYPE_MASK_COLLISION) = 0; + virtual bool rest_info(RID p_shape, const Transform2D &p_shape_xform, const Vector2 &p_motion, float p_margin, ShapeRestInfo *r_info, const Set<RID> &p_exclude = Set<RID>(), uint32_t p_collision_layer = 0xFFFFFFFF) = 0; Physics2DDirectSpaceState(); }; -VARIANT_ENUM_CAST(Physics2DDirectSpaceState::ObjectTypeMask); - class Physics2DShapeQueryResult : public Reference { GDCLASS(Physics2DShapeQueryResult, Reference); diff --git a/servers/physics_server.cpp b/servers/physics_server.cpp index 88cd728a94..5cd90be3b7 100644 --- a/servers/physics_server.cpp +++ b/servers/physics_server.cpp @@ -153,23 +153,15 @@ float PhysicsShapeQueryParameters::get_margin() const { return margin; } -void PhysicsShapeQueryParameters::set_collision_layer(int p_collision_layer) { +void PhysicsShapeQueryParameters::set_collision_mask(int p_collision_mask) { - collision_layer = p_collision_layer; + collision_mask = p_collision_mask; } -int PhysicsShapeQueryParameters::get_collision_layer() const { +int PhysicsShapeQueryParameters::get_collision_mask() const { - return collision_layer; + return collision_mask; } -void PhysicsShapeQueryParameters::set_object_type_mask(int p_object_type_mask) { - - object_type_mask = p_object_type_mask; -} -int PhysicsShapeQueryParameters::get_object_type_mask() const { - - return object_type_mask; -} void PhysicsShapeQueryParameters::set_exclude(const Vector<RID> &p_exclude) { exclude.clear(); @@ -200,11 +192,8 @@ void PhysicsShapeQueryParameters::_bind_methods() { ClassDB::bind_method(D_METHOD("set_margin", "margin"), &PhysicsShapeQueryParameters::set_margin); ClassDB::bind_method(D_METHOD("get_margin"), &PhysicsShapeQueryParameters::get_margin); - ClassDB::bind_method(D_METHOD("set_collision_layer", "collision_layer"), &PhysicsShapeQueryParameters::set_collision_layer); - ClassDB::bind_method(D_METHOD("get_collision_layer"), &PhysicsShapeQueryParameters::get_collision_layer); - - ClassDB::bind_method(D_METHOD("set_object_type_mask", "object_type_mask"), &PhysicsShapeQueryParameters::set_object_type_mask); - ClassDB::bind_method(D_METHOD("get_object_type_mask"), &PhysicsShapeQueryParameters::get_object_type_mask); + ClassDB::bind_method(D_METHOD("set_collision_mask", "collision_mask"), &PhysicsShapeQueryParameters::set_collision_mask); + ClassDB::bind_method(D_METHOD("get_collision_mask"), &PhysicsShapeQueryParameters::get_collision_mask); ClassDB::bind_method(D_METHOD("set_exclude", "exclude"), &PhysicsShapeQueryParameters::set_exclude); ClassDB::bind_method(D_METHOD("get_exclude"), &PhysicsShapeQueryParameters::get_exclude); @@ -213,8 +202,7 @@ void PhysicsShapeQueryParameters::_bind_methods() { PhysicsShapeQueryParameters::PhysicsShapeQueryParameters() { margin = 0; - collision_layer = 0x7FFFFFFF; - object_type_mask = PhysicsDirectSpaceState::TYPE_MASK_COLLISION; + collision_mask = 0x7FFFFFFF; } ///////////////////////////////////// @@ -249,14 +237,14 @@ Variant PhysicsDirectSpaceState::_intersect_shape(const RID& p_shape, const Tran } */ -Dictionary PhysicsDirectSpaceState::_intersect_ray(const Vector3 &p_from, const Vector3 &p_to, const Vector<RID> &p_exclude, uint32_t p_layers, uint32_t p_object_type_mask) { +Dictionary PhysicsDirectSpaceState::_intersect_ray(const Vector3 &p_from, const Vector3 &p_to, const Vector<RID> &p_exclude, uint32_t p_collision_mask) { RayResult inters; Set<RID> exclude; for (int i = 0; i < p_exclude.size(); i++) exclude.insert(p_exclude[i]); - bool res = intersect_ray(p_from, p_to, inters, exclude, p_layers, p_object_type_mask); + bool res = intersect_ray(p_from, p_to, inters, exclude, p_collision_mask); if (!res) return Dictionary(); @@ -276,7 +264,7 @@ Array PhysicsDirectSpaceState::_intersect_shape(const Ref<PhysicsShapeQueryParam Vector<ShapeResult> sr; sr.resize(p_max_results); - int rc = intersect_shape(p_shape_query->shape, p_shape_query->transform, p_shape_query->margin, sr.ptr(), sr.size(), p_shape_query->exclude, p_shape_query->collision_layer, p_shape_query->object_type_mask); + int rc = intersect_shape(p_shape_query->shape, p_shape_query->transform, p_shape_query->margin, sr.ptr(), sr.size(), p_shape_query->exclude, p_shape_query->collision_mask); Array ret; ret.resize(rc); for (int i = 0; i < rc; i++) { @@ -295,7 +283,7 @@ Array PhysicsDirectSpaceState::_intersect_shape(const Ref<PhysicsShapeQueryParam Array PhysicsDirectSpaceState::_cast_motion(const Ref<PhysicsShapeQueryParameters> &p_shape_query, const Vector3 &p_motion) { float closest_safe, closest_unsafe; - bool res = cast_motion(p_shape_query->shape, p_shape_query->transform, p_motion, p_shape_query->margin, closest_safe, closest_unsafe, p_shape_query->exclude, p_shape_query->collision_layer, p_shape_query->object_type_mask); + bool res = cast_motion(p_shape_query->shape, p_shape_query->transform, p_motion, p_shape_query->margin, closest_safe, closest_unsafe, p_shape_query->exclude, p_shape_query->collision_mask); if (!res) return Array(); Array ret; @@ -309,7 +297,7 @@ Array PhysicsDirectSpaceState::_collide_shape(const Ref<PhysicsShapeQueryParamet Vector<Vector3> ret; ret.resize(p_max_results * 2); int rc = 0; - bool res = collide_shape(p_shape_query->shape, p_shape_query->transform, p_shape_query->margin, ret.ptr(), p_max_results, rc, p_shape_query->exclude, p_shape_query->collision_layer, p_shape_query->object_type_mask); + bool res = collide_shape(p_shape_query->shape, p_shape_query->transform, p_shape_query->margin, ret.ptr(), p_max_results, rc, p_shape_query->exclude, p_shape_query->collision_mask); if (!res) return Array(); Array r; @@ -322,7 +310,7 @@ Dictionary PhysicsDirectSpaceState::_get_rest_info(const Ref<PhysicsShapeQueryPa ShapeRestInfo sri; - bool res = rest_info(p_shape_query->shape, p_shape_query->transform, p_shape_query->margin, &sri, p_shape_query->exclude, p_shape_query->collision_layer, p_shape_query->object_type_mask); + bool res = rest_info(p_shape_query->shape, p_shape_query->transform, p_shape_query->margin, &sri, p_shape_query->exclude, p_shape_query->collision_mask); Dictionary r; if (!res) return r; @@ -345,18 +333,11 @@ void PhysicsDirectSpaceState::_bind_methods() { //ClassDB::bind_method(D_METHOD("intersect_ray","from","to","exclude","umask"),&PhysicsDirectSpaceState::_intersect_ray,DEFVAL(Array()),DEFVAL(0)); //ClassDB::bind_method(D_METHOD("intersect_shape","shape","xform","result_max","exclude","umask"),&PhysicsDirectSpaceState::_intersect_shape,DEFVAL(Array()),DEFVAL(0)); - ClassDB::bind_method(D_METHOD("intersect_ray", "from", "to", "exclude", "collision_layer", "type_mask"), &PhysicsDirectSpaceState::_intersect_ray, DEFVAL(Array()), DEFVAL(0x7FFFFFFF), DEFVAL(TYPE_MASK_COLLISION)); + ClassDB::bind_method(D_METHOD("intersect_ray", "from", "to", "exclude", "collision_layer"), &PhysicsDirectSpaceState::_intersect_ray, DEFVAL(Array()), DEFVAL(0x7FFFFFFF)); ClassDB::bind_method(D_METHOD("intersect_shape", "shape", "max_results"), &PhysicsDirectSpaceState::_intersect_shape, DEFVAL(32)); ClassDB::bind_method(D_METHOD("cast_motion", "shape", "motion"), &PhysicsDirectSpaceState::_cast_motion); ClassDB::bind_method(D_METHOD("collide_shape", "shape", "max_results"), &PhysicsDirectSpaceState::_collide_shape, DEFVAL(32)); ClassDB::bind_method(D_METHOD("get_rest_info", "shape"), &PhysicsDirectSpaceState::_get_rest_info); - - BIND_ENUM_CONSTANT(TYPE_MASK_STATIC_BODY); - BIND_ENUM_CONSTANT(TYPE_MASK_KINEMATIC_BODY); - BIND_ENUM_CONSTANT(TYPE_MASK_RIGID_BODY); - BIND_ENUM_CONSTANT(TYPE_MASK_CHARACTER_BODY); - BIND_ENUM_CONSTANT(TYPE_MASK_COLLISION); - BIND_ENUM_CONSTANT(TYPE_MASK_AREA); } int PhysicsShapeQueryResult::get_result_count() const { diff --git a/servers/physics_server.h b/servers/physics_server.h index 64c67eae2a..9a4155dd8b 100644 --- a/servers/physics_server.h +++ b/servers/physics_server.h @@ -101,8 +101,7 @@ class PhysicsShapeQueryParameters : public Reference { Transform transform; float margin; Set<RID> exclude; - uint32_t collision_layer; - uint32_t object_type_mask; + uint32_t collision_mask; protected: static void _bind_methods(); @@ -118,11 +117,8 @@ public: void set_margin(float p_margin); float get_margin() const; - void set_collision_layer(int p_collision_layer); - int get_collision_layer() const; - - void set_object_type_mask(int p_object_type_mask); - int get_object_type_mask() const; + void set_collision_mask(int p_collision_layer); + int get_collision_mask() const; void set_exclude(const Vector<RID> &p_exclude); Vector<RID> get_exclude() const; @@ -134,18 +130,8 @@ class PhysicsDirectSpaceState : public Object { GDCLASS(PhysicsDirectSpaceState, Object); -public: - enum ObjectTypeMask { - TYPE_MASK_STATIC_BODY = 1 << 0, - TYPE_MASK_KINEMATIC_BODY = 1 << 1, - TYPE_MASK_RIGID_BODY = 1 << 2, - TYPE_MASK_CHARACTER_BODY = 1 << 3, - TYPE_MASK_AREA = 1 << 4, - TYPE_MASK_COLLISION = TYPE_MASK_STATIC_BODY | TYPE_MASK_CHARACTER_BODY | TYPE_MASK_KINEMATIC_BODY | TYPE_MASK_RIGID_BODY - }; - private: - Dictionary _intersect_ray(const Vector3 &p_from, const Vector3 &p_to, const Vector<RID> &p_exclude = Vector<RID>(), uint32_t p_layers = 0, uint32_t p_object_type_mask = TYPE_MASK_COLLISION); + Dictionary _intersect_ray(const Vector3 &p_from, const Vector3 &p_to, const Vector<RID> &p_exclude = Vector<RID>(), uint32_t p_collision_mask = 0); Array _intersect_shape(const Ref<PhysicsShapeQueryParameters> &p_shape_query, int p_max_results = 32); Array _cast_motion(const Ref<PhysicsShapeQueryParameters> &p_shape_query, const Vector3 &p_motion); Array _collide_shape(const Ref<PhysicsShapeQueryParameters> &p_shape_query, int p_max_results = 32); @@ -163,7 +149,7 @@ public: int shape; }; - virtual int intersect_point(const Vector3 &p_point, ShapeResult *r_results, int p_result_max, const Set<RID> &p_exclude = Set<RID>(), uint32_t p_collision_layer = 0xFFFFFFFF, uint32_t p_object_type_mask = TYPE_MASK_COLLISION) = 0; + virtual int intersect_point(const Vector3 &p_point, ShapeResult *r_results, int p_result_max, const Set<RID> &p_exclude = Set<RID>(), uint32_t p_collision_mask = 0xFFFFFFFF) = 0; struct RayResult { @@ -175,9 +161,9 @@ public: int shape; }; - virtual bool intersect_ray(const Vector3 &p_from, const Vector3 &p_to, RayResult &r_result, const Set<RID> &p_exclude = Set<RID>(), uint32_t p_collision_layer = 0xFFFFFFFF, uint32_t p_object_type_mask = TYPE_MASK_COLLISION, bool p_pick_ray = false) = 0; + virtual bool intersect_ray(const Vector3 &p_from, const Vector3 &p_to, RayResult &r_result, const Set<RID> &p_exclude = Set<RID>(), uint32_t p_collision_mask = 0xFFFFFFFF, bool p_pick_ray = false) = 0; - virtual int intersect_shape(const RID &p_shape, const Transform &p_xform, float p_margin, ShapeResult *r_results, int p_result_max, const Set<RID> &p_exclude = Set<RID>(), uint32_t p_collision_layer = 0xFFFFFFFF, uint32_t p_object_type_mask = TYPE_MASK_COLLISION) = 0; + virtual int intersect_shape(const RID &p_shape, const Transform &p_xform, float p_margin, ShapeResult *r_results, int p_result_max, const Set<RID> &p_exclude = Set<RID>(), uint32_t p_collision_mask = 0xFFFFFFFF) = 0; struct ShapeRestInfo { @@ -189,19 +175,17 @@ public: Vector3 linear_velocity; //velocity at contact point }; - virtual bool cast_motion(const RID &p_shape, const Transform &p_xform, const Vector3 &p_motion, float p_margin, float &p_closest_safe, float &p_closest_unsafe, const Set<RID> &p_exclude = Set<RID>(), uint32_t p_collision_layer = 0xFFFFFFFF, uint32_t p_object_type_mask = TYPE_MASK_COLLISION, ShapeRestInfo *r_info = NULL) = 0; + virtual bool cast_motion(const RID &p_shape, const Transform &p_xform, const Vector3 &p_motion, float p_margin, float &p_closest_safe, float &p_closest_unsafe, const Set<RID> &p_exclude = Set<RID>(), uint32_t p_collision_mask = 0xFFFFFFFF, ShapeRestInfo *r_info = NULL) = 0; - virtual bool collide_shape(RID p_shape, const Transform &p_shape_xform, float p_margin, Vector3 *r_results, int p_result_max, int &r_result_count, const Set<RID> &p_exclude = Set<RID>(), uint32_t p_collision_layer = 0xFFFFFFFF, uint32_t p_object_type_mask = TYPE_MASK_COLLISION) = 0; + virtual bool collide_shape(RID p_shape, const Transform &p_shape_xform, float p_margin, Vector3 *r_results, int p_result_max, int &r_result_count, const Set<RID> &p_exclude = Set<RID>(), uint32_t p_collision_mask = 0xFFFFFFFF) = 0; - virtual bool rest_info(RID p_shape, const Transform &p_shape_xform, float p_margin, ShapeRestInfo *r_info, const Set<RID> &p_exclude = Set<RID>(), uint32_t p_collision_layer = 0xFFFFFFFF, uint32_t p_object_type_mask = TYPE_MASK_COLLISION) = 0; + virtual bool rest_info(RID p_shape, const Transform &p_shape_xform, float p_margin, ShapeRestInfo *r_info, const Set<RID> &p_exclude = Set<RID>(), uint32_t p_collision_mask = 0xFFFFFFFF) = 0; virtual Vector3 get_closest_point_to_object_volume(RID p_object, const Vector3 p_point) const = 0; PhysicsDirectSpaceState(); }; -VARIANT_ENUM_CAST(PhysicsDirectSpaceState::ObjectTypeMask); - class PhysicsShapeQueryResult : public Reference { GDCLASS(PhysicsShapeQueryResult, Reference); diff --git a/servers/server_wrap_mt_common.h b/servers/server_wrap_mt_common.h index 51e7f446ea..0416dc6762 100644 --- a/servers/server_wrap_mt_common.h +++ b/servers/server_wrap_mt_common.h @@ -61,6 +61,7 @@ if (m_type##_id_pool.size() == 0) { \ int ret; \ command_queue.push_and_ret(this, &ServerNameWrapMT::m_type##allocn, &ret); \ + SYNC_DEBUG \ } \ rid = m_type##_id_pool.front()->get(); \ m_type##_id_pool.pop_front(); \ @@ -91,6 +92,7 @@ if (m_type##_id_pool.size() == 0) { \ int ret; \ command_queue.push_and_ret(this, &ServerNameWrapMT::m_type##allocn, p1, &ret); \ + SYNC_DEBUG \ } \ rid = m_type##_id_pool.front()->get(); \ m_type##_id_pool.pop_front(); \ @@ -121,6 +123,7 @@ if (m_type##_id_pool.size() == 0) { \ int ret; \ command_queue.push_and_ret(this, &ServerNameWrapMT::m_type##allocn, p1, p2, &ret); \ + SYNC_DEBUG \ } \ rid = m_type##_id_pool.front()->get(); \ m_type##_id_pool.pop_front(); \ @@ -151,6 +154,7 @@ if (m_type##_id_pool.size() == 0) { \ int ret; \ command_queue.push_and_ret(this, &ServerNameWrapMT::m_type##allocn, p1, p2, p3, &ret); \ + SYNC_DEBUG \ } \ rid = m_type##_id_pool.front()->get(); \ m_type##_id_pool.pop_front(); \ @@ -181,6 +185,7 @@ if (m_type##_id_pool.size() == 0) { \ int ret; \ command_queue.push_and_ret(this, &ServerNameWrapMT::m_type##allocn, p1, p2, p3, p4, &ret); \ + SYNC_DEBUG \ } \ rid = m_type##_id_pool.front()->get(); \ m_type##_id_pool.pop_front(); \ @@ -211,6 +216,7 @@ if (m_type##_id_pool.size() == 0) { \ int ret; \ command_queue.push_and_ret(this, &ServerNameWrapMT::m_type##allocn, p1, p2, p3, p4, p5, &ret); \ + SYNC_DEBUG \ } \ rid = m_type##_id_pool.front()->get(); \ m_type##_id_pool.pop_front(); \ @@ -255,6 +261,7 @@ virtual void m_type() { \ if (Thread::get_caller_id() != server_thread) { \ command_queue.push_and_sync(server_name, &ServerName::m_type); \ + SYNC_DEBUG \ } else { \ server_name->m_type(); \ } \ @@ -264,6 +271,7 @@ virtual void m_type() const { \ if (Thread::get_caller_id() != server_thread) { \ command_queue.push_and_sync(server_name, &ServerName::m_type); \ + SYNC_DEBUG \ } else { \ server_name->m_type(); \ } \ @@ -299,6 +307,7 @@ virtual void m_type(m_arg1 p1) { \ if (Thread::get_caller_id() != server_thread) { \ command_queue.push_and_sync(server_name, &ServerName::m_type, p1); \ + SYNC_DEBUG \ } else { \ server_name->m_type(p1); \ } \ @@ -308,6 +317,7 @@ virtual void m_type(m_arg1 p1) const { \ if (Thread::get_caller_id() != server_thread) { \ command_queue.push_and_sync(server_name, &ServerName::m_type, p1); \ + SYNC_DEBUG \ } else { \ server_name->m_type(p1); \ } \ @@ -359,6 +369,7 @@ virtual void m_type(m_arg1 p1, m_arg2 p2) { \ if (Thread::get_caller_id() != server_thread) { \ command_queue.push_and_sync(server_name, &ServerName::m_type, p1, p2); \ + SYNC_DEBUG \ } else { \ server_name->m_type(p1, p2); \ } \ @@ -368,6 +379,7 @@ virtual void m_type(m_arg1 p1, m_arg2 p2) const { \ if (Thread::get_caller_id() != server_thread) { \ command_queue.push_and_sync(server_name, &ServerName::m_type, p1, p2); \ + SYNC_DEBUG \ } else { \ server_name->m_type(p1, p2); \ } \ @@ -408,6 +420,7 @@ if (Thread::get_caller_id() != server_thread) { \ m_r ret; \ command_queue.push_and_ret(server_name, &ServerName::m_type, p1, p2, p3, &ret); \ + SYNC_DEBUG \ return ret; \ } else { \ return server_name->m_type(p1, p2, p3); \ @@ -418,6 +431,7 @@ virtual void m_type(m_arg1 p1, m_arg2 p2, m_arg3 p3) { \ if (Thread::get_caller_id() != server_thread) { \ command_queue.push_and_sync(server_name, &ServerName::m_type, p1, p2, p3); \ + SYNC_DEBUG \ } else { \ server_name->m_type(p1, p2, p3); \ } \ @@ -427,6 +441,7 @@ virtual void m_type(m_arg1 p1, m_arg2 p2, m_arg3 p3) const { \ if (Thread::get_caller_id() != server_thread) { \ command_queue.push_and_sync(server_name, &ServerName::m_type, p1, p2, p3); \ + SYNC_DEBUG \ } else { \ server_name->m_type(p1, p2, p3); \ } \ @@ -478,6 +493,7 @@ virtual void m_type(m_arg1 p1, m_arg2 p2, m_arg3 p3, m_arg4 p4) { \ if (Thread::get_caller_id() != server_thread) { \ command_queue.push_and_sync(server_name, &ServerName::m_type, p1, p2, p3, p4); \ + SYNC_DEBUG \ } else { \ server_name->m_type(p1, p2, p3, p4); \ } \ @@ -487,6 +503,7 @@ virtual void m_type(m_arg1 p1, m_arg2 p2, m_arg3 p3, m_arg4 p4) const { \ if (Thread::get_caller_id() != server_thread) { \ command_queue.push_and_sync(server_name, &ServerName::m_type, p1, p2, p3, p4); \ + SYNC_DEBUG \ } else { \ server_name->m_type(p1, p2, p3, p4); \ } \ @@ -538,6 +555,7 @@ virtual void m_type(m_arg1 p1, m_arg2 p2, m_arg3 p3, m_arg4 p4, m_arg5 p5) { \ if (Thread::get_caller_id() != server_thread) { \ command_queue.push_and_sync(server_name, &ServerName::m_type, p1, p2, p3, p4, p5); \ + SYNC_DEBUG \ } else { \ server_name->m_type(p1, p2, p3, p4, p5); \ } \ @@ -547,6 +565,7 @@ virtual void m_type(m_arg1 p1, m_arg2 p2, m_arg3 p3, m_arg4 p4, m_arg5 p5) const { \ if (Thread::get_caller_id() != server_thread) { \ command_queue.push_and_sync(server_name, &ServerName::m_type, p1, p2, p3, p4, p5); \ + SYNC_DEBUG \ } else { \ server_name->m_type(p1, p2, p3, p4, p5); \ } \ @@ -587,6 +606,7 @@ if (Thread::get_caller_id() != server_thread) { \ m_r ret; \ command_queue.push_and_ret(server_name, &ServerName::m_type, p1, p2, p3, p4, p5, p6, &ret); \ + SYNC_DEBUG \ return ret; \ } else { \ return server_name->m_type(p1, p2, p3, p4, p5, p6); \ @@ -597,6 +617,7 @@ virtual void m_type(m_arg1 p1, m_arg2 p2, m_arg3 p3, m_arg4 p4, m_arg5 p5, m_arg6 p6) { \ if (Thread::get_caller_id() != server_thread) { \ command_queue.push_and_sync(server_name, &ServerName::m_type, p1, p2, p3, p4, p5, p6); \ + SYNC_DEBUG \ } else { \ server_name->m_type(p1, p2, p3, p4, p5, p6); \ } \ @@ -606,6 +627,7 @@ virtual void m_type(m_arg1 p1, m_arg2 p2, m_arg3 p3, m_arg4 p4, m_arg5 p5, m_arg6 p6) const { \ if (Thread::get_caller_id() != server_thread) { \ command_queue.push_and_sync(server_name, &ServerName::m_type, p1, p2, p3, p4, p5, p6); \ + SYNC_DEBUG \ } else { \ server_name->m_type(p1, p2, p3, p4, p5, p6); \ } \ @@ -657,6 +679,7 @@ virtual void m_type(m_arg1 p1, m_arg2 p2, m_arg3 p3, m_arg4 p4, m_arg5 p5, m_arg6 p6, m_arg7 p7) { \ if (Thread::get_caller_id() != server_thread) { \ command_queue.push_and_sync(server_name, &ServerName::m_type, p1, p2, p3, p4, p5, p6, p7); \ + SYNC_DEBUG \ } else { \ server_name->m_type(p1, p2, p3, p4, p5, p6, p7); \ } \ @@ -666,6 +689,7 @@ virtual void m_type(m_arg1 p1, m_arg2 p2, m_arg3 p3, m_arg4 p4, m_arg5 p5, m_arg6 p6, m_arg7 p7) const { \ if (Thread::get_caller_id() != server_thread) { \ command_queue.push_and_sync(server_name, &ServerName::m_type, p1, p2, p3, p4, p5, p6, p7); \ + SYNC_DEBUG \ } else { \ server_name->m_type(p1, p2, p3, p4, p5, p6, p7); \ } \ @@ -717,6 +741,7 @@ virtual void m_type(m_arg1 p1, m_arg2 p2, m_arg3 p3, m_arg4 p4, m_arg5 p5, m_arg6 p6, m_arg7 p7, m_arg8 p8) { \ if (Thread::get_caller_id() != server_thread) { \ command_queue.push_and_sync(server_name, &ServerName::m_type, p1, p2, p3, p4, p5, p6, p7, p8); \ + SYNC_DEBUG \ } else { \ server_name->m_type(p1, p2, p3, p4, p5, p6, p7, p8); \ } \ @@ -726,6 +751,7 @@ virtual void m_type(m_arg1 p1, m_arg2 p2, m_arg3 p3, m_arg4 p4, m_arg5 p5, m_arg6 p6, m_arg7 p7, m_arg8 p8) const { \ if (Thread::get_caller_id() != server_thread) { \ command_queue.push_and_sync(server_name, &ServerName::m_type, p1, p2, p3, p4, p5, p6, p7, p8); \ + SYNC_DEBUG \ } else { \ server_name->m_type(p1, p2, p3, p4, p5, p6, p7, p8); \ } \ diff --git a/servers/visual/rasterizer.h b/servers/visual/rasterizer.h index 333fe1e72a..21d059c48e 100644 --- a/servers/visual/rasterizer.h +++ b/servers/visual/rasterizer.h @@ -234,7 +234,7 @@ public: virtual RID mesh_create() = 0; - virtual void mesh_add_surface(RID p_mesh, uint32_t p_format, VS::PrimitiveType p_primitive, const PoolVector<uint8_t> &p_array, int p_vertex_count, const PoolVector<uint8_t> &p_index_array, int p_index_count, const Rect3 &p_aabb, const Vector<PoolVector<uint8_t> > &p_blend_shapes = Vector<PoolVector<uint8_t> >(), const Vector<Rect3> &p_bone_aabbs = Vector<Rect3>()) = 0; + virtual void mesh_add_surface(RID p_mesh, uint32_t p_format, VS::PrimitiveType p_primitive, const PoolVector<uint8_t> &p_array, int p_vertex_count, const PoolVector<uint8_t> &p_index_array, int p_index_count, const AABB &p_aabb, const Vector<PoolVector<uint8_t> > &p_blend_shapes = Vector<PoolVector<uint8_t> >(), const Vector<AABB> &p_bone_aabbs = Vector<AABB>()) = 0; virtual void mesh_set_blend_shape_count(RID p_mesh, int p_amount) = 0; virtual int mesh_get_blend_shape_count(RID p_mesh) const = 0; @@ -256,17 +256,17 @@ public: virtual uint32_t mesh_surface_get_format(RID p_mesh, int p_surface) const = 0; virtual VS::PrimitiveType mesh_surface_get_primitive_type(RID p_mesh, int p_surface) const = 0; - virtual Rect3 mesh_surface_get_aabb(RID p_mesh, int p_surface) const = 0; + virtual AABB mesh_surface_get_aabb(RID p_mesh, int p_surface) const = 0; virtual Vector<PoolVector<uint8_t> > mesh_surface_get_blend_shapes(RID p_mesh, int p_surface) const = 0; - virtual Vector<Rect3> mesh_surface_get_skeleton_aabb(RID p_mesh, int p_surface) const = 0; + virtual Vector<AABB> mesh_surface_get_skeleton_aabb(RID p_mesh, int p_surface) const = 0; virtual void mesh_remove_surface(RID p_mesh, int p_index) = 0; virtual int mesh_get_surface_count(RID p_mesh) const = 0; - virtual void mesh_set_custom_aabb(RID p_mesh, const Rect3 &p_aabb) = 0; - virtual Rect3 mesh_get_custom_aabb(RID p_mesh) const = 0; + virtual void mesh_set_custom_aabb(RID p_mesh, const AABB &p_aabb) = 0; + virtual AABB mesh_get_custom_aabb(RID p_mesh) const = 0; - virtual Rect3 mesh_get_aabb(RID p_mesh, RID p_skeleton) const = 0; + virtual AABB mesh_get_aabb(RID p_mesh, RID p_skeleton) const = 0; virtual void mesh_clear(RID p_mesh) = 0; /* MULTIMESH API */ @@ -290,7 +290,7 @@ public: virtual void multimesh_set_visible_instances(RID p_multimesh, int p_visible) = 0; virtual int multimesh_get_visible_instances(RID p_multimesh) const = 0; - virtual Rect3 multimesh_get_aabb(RID p_multimesh) const = 0; + virtual AABB multimesh_get_aabb(RID p_multimesh) const = 0; /* IMMEDIATE API */ @@ -306,7 +306,7 @@ public: virtual void immediate_clear(RID p_immediate) = 0; virtual void immediate_set_material(RID p_immediate, RID p_material) = 0; virtual RID immediate_get_material(RID p_immediate) const = 0; - virtual Rect3 immediate_get_aabb(RID p_immediate) const = 0; + virtual AABB immediate_get_aabb(RID p_immediate) const = 0; /* SKELETON API */ @@ -350,7 +350,7 @@ public: virtual bool light_has_shadow(RID p_light) const = 0; virtual VS::LightType light_get_type(RID p_light) const = 0; - virtual Rect3 light_get_aabb(RID p_light) const = 0; + virtual AABB light_get_aabb(RID p_light) const = 0; virtual float light_get_param(RID p_light, VS::LightParam p_param) = 0; virtual Color light_get_color(RID p_light) = 0; virtual uint64_t light_get_version(RID p_light) const = 0; @@ -372,7 +372,7 @@ public: virtual void reflection_probe_set_enable_shadows(RID p_probe, bool p_enable) = 0; virtual void reflection_probe_set_cull_mask(RID p_probe, uint32_t p_layers) = 0; - virtual Rect3 reflection_probe_get_aabb(RID p_probe) const = 0; + virtual AABB reflection_probe_get_aabb(RID p_probe) const = 0; virtual VS::ReflectionProbeUpdateMode reflection_probe_get_update_mode(RID p_probe) const = 0; virtual uint32_t reflection_probe_get_cull_mask(RID p_probe) const = 0; virtual Vector3 reflection_probe_get_extents(RID p_probe) const = 0; @@ -390,8 +390,8 @@ public: virtual RID gi_probe_create() = 0; - virtual void gi_probe_set_bounds(RID p_probe, const Rect3 &p_bounds) = 0; - virtual Rect3 gi_probe_get_bounds(RID p_probe) const = 0; + virtual void gi_probe_set_bounds(RID p_probe, const AABB &p_bounds) = 0; + virtual AABB gi_probe_get_bounds(RID p_probe) const = 0; virtual void gi_probe_set_cell_size(RID p_probe, float p_range) = 0; virtual float gi_probe_get_cell_size(RID p_probe) const = 0; @@ -446,7 +446,7 @@ public: virtual void particles_set_pre_process_time(RID p_particles, float p_time) = 0; virtual void particles_set_explosiveness_ratio(RID p_particles, float p_ratio) = 0; virtual void particles_set_randomness_ratio(RID p_particles, float p_ratio) = 0; - virtual void particles_set_custom_aabb(RID p_particles, const Rect3 &p_aabb) = 0; + virtual void particles_set_custom_aabb(RID p_particles, const AABB &p_aabb) = 0; virtual void particles_set_speed_scale(RID p_particles, float p_scale) = 0; virtual void particles_set_use_local_coordinates(RID p_particles, bool p_enable) = 0; virtual void particles_set_process_material(RID p_particles, RID p_material) = 0; @@ -460,8 +460,8 @@ public: virtual void particles_set_draw_pass_mesh(RID p_particles, int p_pass, RID p_mesh) = 0; virtual void particles_request_process(RID p_particles) = 0; - virtual Rect3 particles_get_current_aabb(RID p_particles) = 0; - virtual Rect3 particles_get_aabb(RID p_particles) const = 0; + virtual AABB particles_get_current_aabb(RID p_particles) = 0; + virtual AABB particles_get_aabb(RID p_particles) const = 0; virtual void particles_set_emission_transform(RID p_particles, const Transform &p_transform) = 0; @@ -882,7 +882,7 @@ public: case Item::Command::TYPE_MESH: { const Item::CommandMesh *mesh = static_cast<const Item::CommandMesh *>(c); - Rect3 aabb = RasterizerStorage::base_singleton->mesh_get_aabb(mesh->mesh, mesh->skeleton); + AABB aabb = RasterizerStorage::base_singleton->mesh_get_aabb(mesh->mesh, mesh->skeleton); r = Rect2(aabb.position.x, aabb.position.y, aabb.size.x, aabb.size.y); @@ -890,7 +890,7 @@ public: case Item::Command::TYPE_MULTIMESH: { const Item::CommandMultiMesh *multimesh = static_cast<const Item::CommandMultiMesh *>(c); - Rect3 aabb = RasterizerStorage::base_singleton->multimesh_get_aabb(multimesh->multimesh); + AABB aabb = RasterizerStorage::base_singleton->multimesh_get_aabb(multimesh->multimesh); r = Rect2(aabb.position.x, aabb.position.y, aabb.size.x, aabb.size.y); @@ -899,7 +899,7 @@ public: const Item::CommandParticles *particles_cmd = static_cast<const Item::CommandParticles *>(c); if (particles_cmd->particles.is_valid()) { - Rect3 aabb = RasterizerStorage::base_singleton->particles_get_aabb(particles_cmd->particles); + AABB aabb = RasterizerStorage::base_singleton->particles_get_aabb(particles_cmd->particles); r = Rect2(aabb.position.x, aabb.position.y, aabb.size.x, aabb.size.y); } diff --git a/servers/visual/visual_server_raster.h b/servers/visual/visual_server_raster.h index 67375e81b6..7551485919 100644 --- a/servers/visual/visual_server_raster.h +++ b/servers/visual/visual_server_raster.h @@ -77,8 +77,8 @@ class VisualServerRaster : public VisualServer { static void _changes_changed() {} public: -//if editor is redrawing when it shouldn't, enable this and put a breakpoint in _changes_changed() -//#define DEBUG_CHANGES + //if editor is redrawing when it shouldn't, enable this and put a breakpoint in _changes_changed() + //#define DEBUG_CHANGES #ifdef DEBUG_CHANGES _FORCE_INLINE_ static void redraw_request() { @@ -96,7 +96,7 @@ public: #define DISPLAY_CHANGED \ changes++; #endif -// print_line(String("CHANGED: ") + __FUNCTION__); + // print_line(String("CHANGED: ") + __FUNCTION__); #define BIND0R(m_r, m_name) \ m_r m_name() { return BINDBASE->m_name(); } @@ -203,7 +203,7 @@ public: BIND0R(RID, mesh_create) - BIND10(mesh_add_surface, RID, uint32_t, PrimitiveType, const PoolVector<uint8_t> &, int, const PoolVector<uint8_t> &, int, const Rect3 &, const Vector<PoolVector<uint8_t> > &, const Vector<Rect3> &) + BIND10(mesh_add_surface, RID, uint32_t, PrimitiveType, const PoolVector<uint8_t> &, int, const PoolVector<uint8_t> &, int, const AABB &, const Vector<PoolVector<uint8_t> > &, const Vector<AABB> &) BIND2(mesh_set_blend_shape_count, RID, int) BIND1RC(int, mesh_get_blend_shape_count, RID) @@ -225,15 +225,15 @@ public: BIND2RC(uint32_t, mesh_surface_get_format, RID, int) BIND2RC(PrimitiveType, mesh_surface_get_primitive_type, RID, int) - BIND2RC(Rect3, mesh_surface_get_aabb, RID, int) + BIND2RC(AABB, mesh_surface_get_aabb, RID, int) BIND2RC(Vector<PoolVector<uint8_t> >, mesh_surface_get_blend_shapes, RID, int) - BIND2RC(Vector<Rect3>, mesh_surface_get_skeleton_aabb, RID, int) + BIND2RC(Vector<AABB>, mesh_surface_get_skeleton_aabb, RID, int) BIND2(mesh_remove_surface, RID, int) BIND1RC(int, mesh_get_surface_count, RID) - BIND2(mesh_set_custom_aabb, RID, const Rect3 &) - BIND1RC(Rect3, mesh_get_custom_aabb, RID) + BIND2(mesh_set_custom_aabb, RID, const AABB &) + BIND1RC(AABB, mesh_get_custom_aabb, RID) BIND1(mesh_clear, RID) @@ -250,7 +250,7 @@ public: BIND3(multimesh_instance_set_color, RID, int, const Color &) BIND1RC(RID, multimesh_get_mesh, RID) - BIND1RC(Rect3, multimesh_get_aabb, RID) + BIND1RC(AABB, multimesh_get_aabb, RID) BIND2RC(Transform, multimesh_instance_get_transform, RID, int) BIND2RC(Transform2D, multimesh_instance_get_transform_2d, RID, int) @@ -327,8 +327,8 @@ public: BIND0R(RID, gi_probe_create) - BIND2(gi_probe_set_bounds, RID, const Rect3 &) - BIND1RC(Rect3, gi_probe_get_bounds, RID) + BIND2(gi_probe_set_bounds, RID, const AABB &) + BIND1RC(AABB, gi_probe_get_bounds, RID) BIND2(gi_probe_set_cell_size, RID, float) BIND1RC(float, gi_probe_get_cell_size, RID) @@ -371,7 +371,7 @@ public: BIND2(particles_set_pre_process_time, RID, float) BIND2(particles_set_explosiveness_ratio, RID, float) BIND2(particles_set_randomness_ratio, RID, float) - BIND2(particles_set_custom_aabb, RID, const Rect3 &) + BIND2(particles_set_custom_aabb, RID, const AABB &) BIND2(particles_set_speed_scale, RID, float) BIND2(particles_set_use_local_coordinates, RID, bool) BIND2(particles_set_process_material, RID, RID) @@ -384,7 +384,7 @@ public: BIND2(particles_set_draw_passes, RID, int) BIND3(particles_set_draw_pass_mesh, RID, int, RID) - BIND1R(Rect3, particles_get_current_aabb, RID) + BIND1R(AABB, particles_get_current_aabb, RID) BIND2(particles_set_emission_transform, RID, const Transform &) #undef BINDBASE @@ -449,7 +449,7 @@ public: BIND2R(int, viewport_get_render_info, RID, ViewportRenderInfo) BIND2(viewport_set_debug_draw, RID, ViewportDebugDraw) -/* ENVIRONMENT API */ + /* ENVIRONMENT API */ #undef BINDBASE //from now on, calls forwarded to this singleton @@ -479,7 +479,7 @@ public: BIND6(environment_set_fog_depth, RID, bool, float, float, bool, float) BIND5(environment_set_fog_height, RID, bool, float, float, float) -/* SCENARIO API */ + /* SCENARIO API */ #undef BINDBASE #define BINDBASE VSG::scene @@ -504,13 +504,15 @@ public: BIND3(instance_set_surface_material, RID, int, RID) BIND2(instance_set_visible, RID, bool) + BIND2(instance_set_custom_aabb, RID, AABB) + BIND2(instance_attach_skeleton, RID, RID) BIND2(instance_set_exterior, RID, bool) BIND2(instance_set_extra_visibility_margin, RID, real_t) // don't use these in a game! - BIND2RC(Vector<ObjectID>, instances_cull_aabb, const Rect3 &, RID) + BIND2RC(Vector<ObjectID>, instances_cull_aabb, const AABB &, RID) BIND3RC(Vector<ObjectID>, instances_cull_ray, const Vector3 &, const Vector3 &, RID) BIND2RC(Vector<ObjectID>, instances_cull_convex, const Vector<Plane> &, RID) diff --git a/servers/visual/visual_server_scene.cpp b/servers/visual/visual_server_scene.cpp index e49baf0763..5b1eb8357d 100644 --- a/servers/visual/visual_server_scene.cpp +++ b/servers/visual/visual_server_scene.cpp @@ -587,6 +587,36 @@ void VisualServerScene::instance_set_visible(RID p_instance, bool p_visible) { } } +inline bool is_geometry_instance(VisualServer::InstanceType p_type) { + return p_type == VS::INSTANCE_MESH || p_type == VS::INSTANCE_MULTIMESH || p_type == VS::INSTANCE_PARTICLES || p_type == VS::INSTANCE_IMMEDIATE; +} + +void VisualServerScene::instance_set_custom_aabb(RID p_instance, AABB p_aabb) { + + Instance *instance = instance_owner.get(p_instance); + ERR_FAIL_COND(!instance); + ERR_FAIL_COND(!is_geometry_instance(instance->base_type)); + + if(p_aabb != AABB()) { + + // Set custom AABB + if (instance->custom_aabb == NULL) + instance->custom_aabb = memnew(AABB); + *instance->custom_aabb = p_aabb; + + } else { + + // Clear custom AABB + if (instance->custom_aabb != NULL) { + memdelete(instance->custom_aabb); + instance->custom_aabb = NULL; + } + } + + if (instance->scenario) + _instance_queue_update(instance, true, false); +} + void VisualServerScene::instance_attach_skeleton(RID p_instance, RID p_skeleton) { Instance *instance = instance_owner.get(p_instance); @@ -614,7 +644,7 @@ void VisualServerScene::instance_set_exterior(RID p_instance, bool p_enabled) { void VisualServerScene::instance_set_extra_visibility_margin(RID p_instance, real_t p_margin) { } -Vector<ObjectID> VisualServerScene::instances_cull_aabb(const Rect3 &p_aabb, RID p_scenario) const { +Vector<ObjectID> VisualServerScene::instances_cull_aabb(const AABB &p_aabb, RID p_scenario) const { Vector<ObjectID> instances; Scenario *scenario = scenario_owner.get(p_scenario); @@ -772,7 +802,7 @@ void VisualServerScene::_update_instance(Instance *p_instance) { p_instance->mirror = p_instance->transform.basis.determinant() < 0.0; - Rect3 new_aabb; + AABB new_aabb; new_aabb = p_instance->transform.xform(p_instance->aabb); @@ -817,7 +847,7 @@ void VisualServerScene::_update_instance(Instance *p_instance) { void VisualServerScene::_update_instance_aabb(Instance *p_instance) { - Rect3 new_aabb; + AABB new_aabb; ERR_FAIL_COND(p_instance->base_type != VS::INSTANCE_NONE && !p_instance->base.is_valid()); @@ -828,23 +858,35 @@ void VisualServerScene::_update_instance_aabb(Instance *p_instance) { } break; case VisualServer::INSTANCE_MESH: { - new_aabb = VSG::storage->mesh_get_aabb(p_instance->base, p_instance->skeleton); + if (p_instance->custom_aabb) + new_aabb = *p_instance->custom_aabb; + else + new_aabb = VSG::storage->mesh_get_aabb(p_instance->base, p_instance->skeleton); } break; case VisualServer::INSTANCE_MULTIMESH: { - new_aabb = VSG::storage->multimesh_get_aabb(p_instance->base); + if (p_instance->custom_aabb) + new_aabb = *p_instance->custom_aabb; + else + new_aabb = VSG::storage->multimesh_get_aabb(p_instance->base); } break; case VisualServer::INSTANCE_IMMEDIATE: { - new_aabb = VSG::storage->immediate_get_aabb(p_instance->base); + if (p_instance->custom_aabb) + new_aabb = *p_instance->custom_aabb; + else + new_aabb = VSG::storage->immediate_get_aabb(p_instance->base); } break; case VisualServer::INSTANCE_PARTICLES: { - new_aabb = VSG::storage->particles_get_aabb(p_instance->base); + if (p_instance->custom_aabb) + new_aabb = *p_instance->custom_aabb; + else + new_aabb = VSG::storage->particles_get_aabb(p_instance->base); } break; case VisualServer::INSTANCE_LIGHT: { @@ -866,6 +908,7 @@ void VisualServerScene::_update_instance_aabb(Instance *p_instance) { default: {} } + // <Zylann> This is why I didn't re-use Instance::aabb to implement custom AABBs if (p_instance->extra_margin) new_aabb.grow_by(p_instance->extra_margin); @@ -1863,7 +1906,7 @@ void VisualServerScene::_setup_gi_probe(Instance *p_instance) { probe->dynamic.enabled = true; Transform cell_to_xform = VSG::storage->gi_probe_get_to_cell_xform(p_instance->base); - Rect3 bounds = VSG::storage->gi_probe_get_bounds(p_instance->base); + AABB bounds = VSG::storage->gi_probe_get_bounds(p_instance->base); float cell_size = VSG::storage->gi_probe_get_cell_size(p_instance->base); probe->dynamic.light_to_cell_xform = cell_to_xform * p_instance->transform.affine_inverse(); @@ -2562,7 +2605,7 @@ bool VisualServerScene::_check_gi_probe(Instance *p_gi_probe) { InstanceGIProbeData::LightCache lc; lc.type = VSG::storage->light_get_type(E->get()->base); lc.color = VSG::storage->light_get_color(E->get()->base); - lc.energy = VSG::storage->light_get_param(E->get()->base, VS::LIGHT_PARAM_ENERGY); + lc.energy = VSG::storage->light_get_param(E->get()->base, VS::LIGHT_PARAM_ENERGY) * VSG::storage->light_get_param(E->get()->base, VS::LIGHT_PARAM_INDIRECT_ENERGY); lc.radius = VSG::storage->light_get_param(E->get()->base, VS::LIGHT_PARAM_RANGE); lc.attenuation = VSG::storage->light_get_param(E->get()->base, VS::LIGHT_PARAM_ATTENUATION); lc.spot_angle = VSG::storage->light_get_param(E->get()->base, VS::LIGHT_PARAM_SPOT_ANGLE); @@ -2582,7 +2625,7 @@ bool VisualServerScene::_check_gi_probe(Instance *p_gi_probe) { InstanceGIProbeData::LightCache lc; lc.type = VSG::storage->light_get_type(E->get()->base); lc.color = VSG::storage->light_get_color(E->get()->base); - lc.energy = VSG::storage->light_get_param(E->get()->base, VS::LIGHT_PARAM_ENERGY); + lc.energy = VSG::storage->light_get_param(E->get()->base, VS::LIGHT_PARAM_ENERGY) * VSG::storage->light_get_param(E->get()->base, VS::LIGHT_PARAM_INDIRECT_ENERGY); lc.radius = VSG::storage->light_get_param(E->get()->base, VS::LIGHT_PARAM_RANGE); lc.attenuation = VSG::storage->light_get_param(E->get()->base, VS::LIGHT_PARAM_ATTENUATION); lc.spot_angle = VSG::storage->light_get_param(E->get()->base, VS::LIGHT_PARAM_SPOT_ANGLE); diff --git a/servers/visual/visual_server_scene.h b/servers/visual/visual_server_scene.h index d30a2108a5..d075be76ca 100644 --- a/servers/visual/visual_server_scene.h +++ b/servers/visual/visual_server_scene.h @@ -195,8 +195,9 @@ public: SelfList<Instance> update_item; - Rect3 aabb; - Rect3 transformed_aabb; + AABB aabb; + AABB transformed_aabb; + AABB *custom_aabb; // <Zylann> would using aabb directly with a bool be better? float extra_margin; uint32_t object_ID; @@ -251,12 +252,16 @@ public: last_frame_pass = 0; version = 1; base_data = NULL; + + custom_aabb = NULL; } ~Instance() { if (base_data) memdelete(base_data); + if (custom_aabb) + memdelete(custom_aabb); } }; @@ -460,13 +465,15 @@ public: virtual void instance_set_surface_material(RID p_instance, int p_surface, RID p_material); virtual void instance_set_visible(RID p_instance, bool p_visible); + virtual void instance_set_custom_aabb(RID p_insatnce, AABB aabb); + virtual void instance_attach_skeleton(RID p_instance, RID p_skeleton); virtual void instance_set_exterior(RID p_instance, bool p_enabled); virtual void instance_set_extra_visibility_margin(RID p_instance, real_t p_margin); // don't use these in a game! - virtual Vector<ObjectID> instances_cull_aabb(const Rect3 &p_aabb, RID p_scenario = RID()) const; + virtual Vector<ObjectID> instances_cull_aabb(const AABB &p_aabb, RID p_scenario = RID()) const; virtual Vector<ObjectID> instances_cull_ray(const Vector3 &p_from, const Vector3 &p_to, RID p_scenario = RID()) const; virtual Vector<ObjectID> instances_cull_convex(const Vector<Plane> &p_convex, RID p_scenario = RID()) const; diff --git a/servers/visual/visual_server_wrap_mt.cpp b/servers/visual/visual_server_wrap_mt.cpp index 1a03c72529..a9bfef7ef3 100644 --- a/servers/visual/visual_server_wrap_mt.cpp +++ b/servers/visual/visual_server_wrap_mt.cpp @@ -37,14 +37,7 @@ void VisualServerWrapMT::thread_exit() { void VisualServerWrapMT::thread_draw() { - draw_mutex->lock(); - - draw_pending--; - bool draw = (draw_pending == 0); // only draw when no more flushes are pending - - draw_mutex->unlock(); - - if (draw) { + if (!atomic_decrement(&draw_pending)) { visual_server->draw(); } @@ -52,11 +45,7 @@ void VisualServerWrapMT::thread_draw() { void VisualServerWrapMT::thread_flush() { - draw_mutex->lock(); - - draw_pending--; - - draw_mutex->unlock(); + atomic_decrement(&draw_pending); } void VisualServerWrapMT::_thread_callback(void *_instance) { @@ -92,15 +81,8 @@ void VisualServerWrapMT::sync() { if (create_thread) { - /* TODO: sync with the thread */ - - /* - ERR_FAIL_COND(!draw_mutex); - draw_mutex->lock(); - draw_pending++; //cambiar por un saferefcount - draw_mutex->unlock(); - */ - //command_queue.push( this, &VisualServerWrapMT::thread_flush); + atomic_increment(&draw_pending); + command_queue.push_and_sync(this, &VisualServerWrapMT::thread_flush); } else { command_queue.flush_all(); //flush all pending from other threads @@ -111,14 +93,8 @@ void VisualServerWrapMT::draw() { if (create_thread) { - /* TODO: Make it draw - ERR_FAIL_COND(!draw_mutex); - draw_mutex->lock(); - draw_pending++; //cambiar por un saferefcount - draw_mutex->unlock(); - - command_queue.push( this, &VisualServerWrapMT::thread_draw); - */ + atomic_increment(&draw_pending); + command_queue.push(this, &VisualServerWrapMT::thread_draw); } else { visual_server->draw(); @@ -129,7 +105,6 @@ void VisualServerWrapMT::init() { if (create_thread) { - draw_mutex = Mutex::create(); print_line("CREATING RENDER THREAD"); OS::get_singleton()->release_rendering_thread(); if (create_thread) { @@ -181,9 +156,6 @@ void VisualServerWrapMT::finish() { canvas_item_free_cached_ids(); canvas_light_occluder_free_cached_ids(); canvas_occluder_polygon_free_cached_ids(); - - if (draw_mutex) - memdelete(draw_mutex); } VisualServerWrapMT::VisualServerWrapMT(VisualServer *p_contained, bool p_create_thread) @@ -192,7 +164,6 @@ VisualServerWrapMT::VisualServerWrapMT(VisualServer *p_contained, bool p_create_ visual_server = p_contained; create_thread = p_create_thread; thread = NULL; - draw_mutex = NULL; draw_pending = 0; draw_thread_up = false; alloc_mutex = Mutex::create(); diff --git a/servers/visual/visual_server_wrap_mt.h b/servers/visual/visual_server_wrap_mt.h index 1dddef7bd4..417e8de833 100644 --- a/servers/visual/visual_server_wrap_mt.h +++ b/servers/visual/visual_server_wrap_mt.h @@ -52,8 +52,7 @@ class VisualServerWrapMT : public VisualServer { volatile bool draw_thread_up; bool create_thread; - Mutex *draw_mutex; - int draw_pending; + uint64_t draw_pending; void thread_draw(); void thread_flush(); @@ -63,7 +62,7 @@ class VisualServerWrapMT : public VisualServer { int pool_max_size; -//#define DEBUG_SYNC + //#define DEBUG_SYNC #ifdef DEBUG_SYNC #define SYNC_DEBUG print_line("sync on: " + String(__FUNCTION__)); @@ -136,7 +135,7 @@ public: FUNCRID(mesh) - FUNC10(mesh_add_surface, RID, uint32_t, PrimitiveType, const PoolVector<uint8_t> &, int, const PoolVector<uint8_t> &, int, const Rect3 &, const Vector<PoolVector<uint8_t> > &, const Vector<Rect3> &) + FUNC10(mesh_add_surface, RID, uint32_t, PrimitiveType, const PoolVector<uint8_t> &, int, const PoolVector<uint8_t> &, int, const AABB &, const Vector<PoolVector<uint8_t> > &, const Vector<AABB> &) FUNC2(mesh_set_blend_shape_count, RID, int) FUNC1RC(int, mesh_get_blend_shape_count, RID) @@ -158,15 +157,15 @@ public: FUNC2RC(uint32_t, mesh_surface_get_format, RID, int) FUNC2RC(PrimitiveType, mesh_surface_get_primitive_type, RID, int) - FUNC2RC(Rect3, mesh_surface_get_aabb, RID, int) + FUNC2RC(AABB, mesh_surface_get_aabb, RID, int) FUNC2RC(Vector<PoolVector<uint8_t> >, mesh_surface_get_blend_shapes, RID, int) - FUNC2RC(Vector<Rect3>, mesh_surface_get_skeleton_aabb, RID, int) + FUNC2RC(Vector<AABB>, mesh_surface_get_skeleton_aabb, RID, int) FUNC2(mesh_remove_surface, RID, int) FUNC1RC(int, mesh_get_surface_count, RID) - FUNC2(mesh_set_custom_aabb, RID, const Rect3 &) - FUNC1RC(Rect3, mesh_get_custom_aabb, RID) + FUNC2(mesh_set_custom_aabb, RID, const AABB &) + FUNC1RC(AABB, mesh_get_custom_aabb, RID) FUNC1(mesh_clear, RID) @@ -183,7 +182,7 @@ public: FUNC3(multimesh_instance_set_color, RID, int, const Color &) FUNC1RC(RID, multimesh_get_mesh, RID) - FUNC1RC(Rect3, multimesh_get_aabb, RID) + FUNC1RC(AABB, multimesh_get_aabb, RID) FUNC2RC(Transform, multimesh_instance_get_transform, RID, int) FUNC2RC(Transform2D, multimesh_instance_get_transform_2d, RID, int) @@ -260,8 +259,8 @@ public: FUNCRID(gi_probe) - FUNC2(gi_probe_set_bounds, RID, const Rect3 &) - FUNC1RC(Rect3, gi_probe_get_bounds, RID) + FUNC2(gi_probe_set_bounds, RID, const AABB &) + FUNC1RC(AABB, gi_probe_get_bounds, RID) FUNC2(gi_probe_set_cell_size, RID, float) FUNC1RC(float, gi_probe_get_cell_size, RID) @@ -304,7 +303,7 @@ public: FUNC2(particles_set_pre_process_time, RID, float) FUNC2(particles_set_explosiveness_ratio, RID, float) FUNC2(particles_set_randomness_ratio, RID, float) - FUNC2(particles_set_custom_aabb, RID, const Rect3 &) + FUNC2(particles_set_custom_aabb, RID, const AABB &) FUNC2(particles_set_speed_scale, RID, float) FUNC2(particles_set_use_local_coordinates, RID, bool) FUNC2(particles_set_process_material, RID, RID) @@ -318,7 +317,7 @@ public: FUNC3(particles_set_draw_pass_mesh, RID, int, RID) FUNC2(particles_set_emission_transform, RID, const Transform &) - FUNC1R(Rect3, particles_get_current_aabb, RID) + FUNC1R(AABB, particles_get_current_aabb, RID) /* CAMERA API */ @@ -424,6 +423,7 @@ public: FUNC3(instance_set_blend_shape_weight, RID, int, float) FUNC3(instance_set_surface_material, RID, int, RID) FUNC2(instance_set_visible, RID, bool) + FUNC2(instance_set_custom_aabb, RID, AABB) FUNC2(instance_attach_skeleton, RID, RID) FUNC2(instance_set_exterior, RID, bool) @@ -431,7 +431,7 @@ public: FUNC2(instance_set_extra_visibility_margin, RID, real_t) // don't use these in a game! - FUNC2RC(Vector<ObjectID>, instances_cull_aabb, const Rect3 &, RID) + FUNC2RC(Vector<ObjectID>, instances_cull_aabb, const AABB &, RID) FUNC3RC(Vector<ObjectID>, instances_cull_ray, const Vector3 &, const Vector3 &, RID) FUNC2RC(Vector<ObjectID>, instances_cull_convex, const Vector<Plane> &, RID) diff --git a/servers/visual_server.cpp b/servers/visual_server.cpp index 039bbedbcc..10f350d667 100644 --- a/servers/visual_server.cpp +++ b/servers/visual_server.cpp @@ -308,7 +308,7 @@ RID VisualServer::get_white_texture() { #define SMALL_VEC2 Vector2(0.00001, 0.00001) #define SMALL_VEC3 Vector3(0.00001, 0.00001, 0.00001) -Error VisualServer::_surface_set_data(Array p_arrays, uint32_t p_format, uint32_t *p_offsets, uint32_t p_stride, PoolVector<uint8_t> &r_vertex_array, int p_vertex_array_len, PoolVector<uint8_t> &r_index_array, int p_index_array_len, Rect3 &r_aabb, Vector<Rect3> r_bone_aabb) { +Error VisualServer::_surface_set_data(Array p_arrays, uint32_t p_format, uint32_t *p_offsets, uint32_t p_stride, PoolVector<uint8_t> &r_vertex_array, int p_vertex_array_len, PoolVector<uint8_t> &r_index_array, int p_index_array_len, AABB &r_aabb, Vector<AABB> r_bone_aabb) { PoolVector<uint8_t>::Write vw = r_vertex_array.write(); @@ -373,7 +373,7 @@ Error VisualServer::_surface_set_data(Array p_arrays, uint32_t p_format, uint32_ } } - r_aabb = Rect3(Vector3(aabb.position.x, aabb.position.y, 0), Vector3(aabb.size.x, aabb.size.y, 0)); + r_aabb = AABB(Vector3(aabb.position.x, aabb.position.y, 0), Vector3(aabb.size.x, aabb.size.y, 0)); } else { PoolVector<Vector3> array = p_arrays[ai]; @@ -383,7 +383,7 @@ Error VisualServer::_surface_set_data(Array p_arrays, uint32_t p_format, uint32_ const Vector3 *src = read.ptr(); // setting vertices means regenerating the AABB - Rect3 aabb; + AABB aabb; if (p_format & ARRAY_COMPRESS_VERTEX) { @@ -395,7 +395,7 @@ Error VisualServer::_surface_set_data(Array p_arrays, uint32_t p_format, uint32_ if (i == 0) { - aabb = Rect3(src[i], SMALL_VEC3); + aabb = AABB(src[i], SMALL_VEC3); } else { aabb.expand_to(src[i]); @@ -411,7 +411,7 @@ Error VisualServer::_surface_set_data(Array p_arrays, uint32_t p_format, uint32_ if (i == 0) { - aabb = Rect3(src[i], SMALL_VEC3); + aabb = AABB(src[i], SMALL_VEC3); } else { aabb.expand_to(src[i]); @@ -728,7 +728,7 @@ Error VisualServer::_surface_set_data(Array p_arrays, uint32_t p_format, uint32_ PoolVector<int>::Read rb = bones.read(); PoolVector<float>::Read rw = weights.read(); - Rect3 *bptr = r_bone_aabb.ptr(); + AABB *bptr = r_bone_aabb.ptr(); for (int i = 0; i < vs; i++) { @@ -743,7 +743,7 @@ Error VisualServer::_surface_set_data(Array p_arrays, uint32_t p_format, uint32_ if (bptr->size.x < 0) { //first - bptr[idx] = Rect3(v, SMALL_VEC3); + bptr[idx] = AABB(v, SMALL_VEC3); any_valid = true; } else { bptr[idx].expand_to(v); @@ -975,8 +975,8 @@ void VisualServer::mesh_add_surface_from_arrays(RID p_mesh, PrimitiveType p_prim PoolVector<uint8_t> index_array; index_array.resize(index_array_size); - Rect3 aabb; - Vector<Rect3> bone_aabb; + AABB aabb; + Vector<AABB> bone_aabb; Error err = _surface_set_data(p_arrays, format, offsets, total_elem_size, vertex_array, array_len, index_array, index_array_len, aabb, bone_aabb); @@ -993,7 +993,7 @@ void VisualServer::mesh_add_surface_from_arrays(RID p_mesh, PrimitiveType p_prim vertex_array_shape.resize(array_size); PoolVector<uint8_t> noindex; - Rect3 laabb; + AABB laabb; Error err = _surface_set_data(p_blend_shapes[i], format & ~ARRAY_FORMAT_INDEX, offsets, total_elem_size, vertex_array_shape, array_len, noindex, 0, laabb, bone_aabb); aabb.merge_with(laabb); if (err) { @@ -1470,7 +1470,7 @@ Array VisualServer::mesh_surface_get_blend_shape_arrays(RID p_mesh, int p_surfac Array VisualServer::_mesh_surface_get_skeleton_aabb_bind(RID p_mesh, int p_surface) const { - Vector<Rect3> vec = VS::get_singleton()->mesh_surface_get_skeleton_aabb(p_mesh, p_surface); + Vector<AABB> vec = VS::get_singleton()->mesh_surface_get_skeleton_aabb(p_mesh, p_surface); Array arr; for (int i = 0; i < vec.size(); i++) { arr[i] = vec[i]; diff --git a/servers/visual_server.h b/servers/visual_server.h index a36ba4a50a..c4b1583009 100644 --- a/servers/visual_server.h +++ b/servers/visual_server.h @@ -60,7 +60,7 @@ protected: RID white_texture; RID test_material; - Error _surface_set_data(Array p_arrays, uint32_t p_format, uint32_t *p_offsets, uint32_t p_stride, PoolVector<uint8_t> &r_vertex_array, int p_vertex_array_len, PoolVector<uint8_t> &r_index_array, int p_index_array_len, Rect3 &r_aabb, Vector<Rect3> r_bone_aabb); + Error _surface_set_data(Array p_arrays, uint32_t p_format, uint32_t *p_offsets, uint32_t p_stride, PoolVector<uint8_t> &r_vertex_array, int p_vertex_array_len, PoolVector<uint8_t> &r_index_array, int p_index_array_len, AABB &r_aabb, Vector<AABB> r_bone_aabb); static VisualServer *(*create_func)(); static void _bind_methods(); @@ -247,7 +247,7 @@ public: virtual RID mesh_create() = 0; virtual void mesh_add_surface_from_arrays(RID p_mesh, PrimitiveType p_primitive, const Array &p_arrays, const Array &p_blend_shapes = Array(), uint32_t p_compress_format = ARRAY_COMPRESS_DEFAULT); - virtual void mesh_add_surface(RID p_mesh, uint32_t p_format, PrimitiveType p_primitive, const PoolVector<uint8_t> &p_array, int p_vertex_count, const PoolVector<uint8_t> &p_index_array, int p_index_count, const Rect3 &p_aabb, const Vector<PoolVector<uint8_t> > &p_blend_shapes = Vector<PoolVector<uint8_t> >(), const Vector<Rect3> &p_bone_aabbs = Vector<Rect3>()) = 0; + virtual void mesh_add_surface(RID p_mesh, uint32_t p_format, PrimitiveType p_primitive, const PoolVector<uint8_t> &p_array, int p_vertex_count, const PoolVector<uint8_t> &p_index_array, int p_index_count, const AABB &p_aabb, const Vector<PoolVector<uint8_t> > &p_blend_shapes = Vector<PoolVector<uint8_t> >(), const Vector<AABB> &p_bone_aabbs = Vector<AABB>()) = 0; virtual void mesh_set_blend_shape_count(RID p_mesh, int p_amount) = 0; virtual int mesh_get_blend_shape_count(RID p_mesh) const = 0; @@ -277,16 +277,16 @@ public: virtual uint32_t mesh_surface_get_format(RID p_mesh, int p_surface) const = 0; virtual PrimitiveType mesh_surface_get_primitive_type(RID p_mesh, int p_surface) const = 0; - virtual Rect3 mesh_surface_get_aabb(RID p_mesh, int p_surface) const = 0; + virtual AABB mesh_surface_get_aabb(RID p_mesh, int p_surface) const = 0; virtual Vector<PoolVector<uint8_t> > mesh_surface_get_blend_shapes(RID p_mesh, int p_surface) const = 0; - virtual Vector<Rect3> mesh_surface_get_skeleton_aabb(RID p_mesh, int p_surface) const = 0; + virtual Vector<AABB> mesh_surface_get_skeleton_aabb(RID p_mesh, int p_surface) const = 0; Array _mesh_surface_get_skeleton_aabb_bind(RID p_mesh, int p_surface) const; virtual void mesh_remove_surface(RID p_mesh, int p_index) = 0; virtual int mesh_get_surface_count(RID p_mesh) const = 0; - virtual void mesh_set_custom_aabb(RID p_mesh, const Rect3 &p_aabb) = 0; - virtual Rect3 mesh_get_custom_aabb(RID p_mesh) const = 0; + virtual void mesh_set_custom_aabb(RID p_mesh, const AABB &p_aabb) = 0; + virtual AABB mesh_get_custom_aabb(RID p_mesh) const = 0; virtual void mesh_clear(RID p_mesh) = 0; @@ -314,7 +314,7 @@ public: virtual void multimesh_instance_set_color(RID p_multimesh, int p_index, const Color &p_color) = 0; virtual RID multimesh_get_mesh(RID p_multimesh) const = 0; - virtual Rect3 multimesh_get_aabb(RID p_multimesh) const = 0; + virtual AABB multimesh_get_aabb(RID p_multimesh) const = 0; virtual Transform multimesh_instance_get_transform(RID p_multimesh, int p_index) const = 0; virtual Transform2D multimesh_instance_get_transform_2d(RID p_multimesh, int p_index) const = 0; @@ -360,6 +360,7 @@ public: enum LightParam { LIGHT_PARAM_ENERGY, + LIGHT_PARAM_INDIRECT_ENERGY, LIGHT_PARAM_SPECULAR, LIGHT_PARAM_RANGE, LIGHT_PARAM_ATTENUATION, @@ -449,8 +450,8 @@ public: virtual RID gi_probe_create() = 0; - virtual void gi_probe_set_bounds(RID p_probe, const Rect3 &p_bounds) = 0; - virtual Rect3 gi_probe_get_bounds(RID p_probe) const = 0; + virtual void gi_probe_set_bounds(RID p_probe, const AABB &p_bounds) = 0; + virtual AABB gi_probe_get_bounds(RID p_probe) const = 0; virtual void gi_probe_set_cell_size(RID p_probe, float p_range) = 0; virtual float gi_probe_get_cell_size(RID p_probe) const = 0; @@ -493,7 +494,7 @@ public: virtual void particles_set_pre_process_time(RID p_particles, float p_time) = 0; virtual void particles_set_explosiveness_ratio(RID p_particles, float p_ratio) = 0; virtual void particles_set_randomness_ratio(RID p_particles, float p_ratio) = 0; - virtual void particles_set_custom_aabb(RID p_particles, const Rect3 &p_aabb) = 0; + virtual void particles_set_custom_aabb(RID p_particles, const AABB &p_aabb) = 0; virtual void particles_set_speed_scale(RID p_particles, float p_scale) = 0; virtual void particles_set_use_local_coordinates(RID p_particles, bool p_enable) = 0; virtual void particles_set_process_material(RID p_particles, RID p_material) = 0; @@ -512,7 +513,7 @@ public: virtual void particles_set_draw_passes(RID p_particles, int p_count) = 0; virtual void particles_set_draw_pass_mesh(RID p_particles, int p_pass, RID p_mesh) = 0; - virtual Rect3 particles_get_current_aabb(RID p_particles) = 0; + virtual AABB particles_get_current_aabb(RID p_particles) = 0; virtual void particles_set_emission_transform(RID p_particles, const Transform &p_transform) = 0; //this is only used for 2D, in 3D it's automatic @@ -752,13 +753,15 @@ public: virtual void instance_set_surface_material(RID p_instance, int p_surface, RID p_material) = 0; virtual void instance_set_visible(RID p_instance, bool p_visible) = 0; + virtual void instance_set_custom_aabb(RID p_instance, AABB aabb) = 0; + virtual void instance_attach_skeleton(RID p_instance, RID p_skeleton) = 0; virtual void instance_set_exterior(RID p_instance, bool p_enabled) = 0; virtual void instance_set_extra_visibility_margin(RID p_instance, real_t p_margin) = 0; // don't use these in a game! - virtual Vector<ObjectID> instances_cull_aabb(const Rect3 &p_aabb, RID p_scenario = RID()) const = 0; + virtual Vector<ObjectID> instances_cull_aabb(const AABB &p_aabb, RID p_scenario = RID()) const = 0; virtual Vector<ObjectID> instances_cull_ray(const Vector3 &p_from, const Vector3 &p_to, RID p_scenario = RID()) const = 0; virtual Vector<ObjectID> instances_cull_convex(const Vector<Plane> &p_convex, RID p_scenario = RID()) const = 0; diff --git a/version.py b/version.py index 38847d68f5..cce155c9af 100644 --- a/version.py +++ b/version.py @@ -2,5 +2,5 @@ short_name = "godot" name = "Godot Engine" major = 3 minor = 0 -status = "alpha" +status = "beta" module_config = "" |
