diff options
1608 files changed, 15189 insertions, 6190 deletions
diff --git a/.appveyor.yml b/.appveyor.yml index aeee15e652..708961fd92 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -28,4 +28,4 @@ before_build: - SET "SCONS_CACHE=%SCONS_CACHE_ROOT%\master" build_script: -- scons platform=%GD_PLATFORM% target=%TARGET% tools=%TOOLS% verbose=yes progress=no +- scons platform=%GD_PLATFORM% target=%TARGET% tools=%TOOLS% verbose=yes progress=no gdnative_wrapper=yes diff --git a/.gitignore b/.gitignore index cbb0b5b133..f8296ef51e 100644 --- a/.gitignore +++ b/.gitignore @@ -51,6 +51,10 @@ gmon.out .cproject .settings/ +# Geany/geany-plugins files +*.geany +.geanyprj + # Misc .DS_Store logs/ diff --git a/.travis.yml b/.travis.yml index 0dfeaf16e1..9df2388b8e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -90,5 +90,5 @@ script: - if [ "$STATIC_CHECKS" = "yes" ]; then sh ./misc/travis/clang-format.sh; else - scons -j2 CC=$CC CXX=$CXX platform=$GODOT_TARGET TOOLS=$TOOLS verbose=yes progress=no openmp=no; + scons -j2 CC=$CC CXX=$CXX platform=$GODOT_TARGET TOOLS=$TOOLS verbose=yes progress=no openmp=no gdnative_wrapper=yes; fi @@ -35,24 +35,24 @@ generous deed immortalized in the next stable release of Godot Engine. Pascal Julien Ruslan Mustakov Slobodan Milnovic + Stephan Lanfermann + Thomas Mathews ## Gold donors 3Dexplorer Alexander Otto - Andy Meier Asdf cheese65536 Jake Bo - Javier Manuele Finocchiaro Officine Pixel S.n.c. Rémi Verschelde - Stephan Lanfermann Zaven Muradyan Andreas Schüle Austen McRae + Benjamin Botwin Bernhard Liebl Cody Brocious Gerald E Butler @@ -72,7 +72,6 @@ generous deed immortalized in the next stable release of Godot Engine. Guilherme Felipe de C. G. da Silva Henrique Alves Laurence Bannister - Leo PrzemysÅ‚aw GoÅ‚Ä…b (n-pigeon) Robert Willes Robin Arys @@ -97,11 +96,13 @@ generous deed immortalized in the next stable release of Godot Engine. François Cantin Giovanni Solimeno Jeppe Zapp + joe513 Justin Arnold Justo Delgado Baudà Leandro Voltolino Lucien Boudy - Noah + Markus Wiesner + Pablo Cholaky Patrick Schnorbus Pete Goodwin Ryan Estes @@ -112,16 +113,17 @@ generous deed immortalized in the next stable release of Godot Engine. ## Silver donors 1D_Inc - Abe Pazos Alder Stefano Alessandro Senese Alex Barsukov + Ãlvaro DomÃnguez López Andres Cuevas Anthony Bongiovanni Avencherus Bastian Böhm Ben Vercammen Blair Allen + Bryanna M Bryan Stevenson Casey Foote Christian Baune @@ -129,6 +131,7 @@ generous deed immortalized in the next stable release of Godot Engine. Collin Shooltz Daniel Egger Daniel Kaplan + Daniel Mircea David Cravens David May Diego Moreira Guimarães @@ -137,14 +140,13 @@ generous deed immortalized in the next stable release of Godot Engine. Fabian Becker fengjiongmax Francesco Lisi - Frank C. Simmons Fredy Romero Sam G3Dev sà rl Geequlim Gerrit Großkopf + Gilberto K. Otubo Guldoman HardRound - hatniX HeartBeast Heribert Hirth Hunter Jones @@ -152,13 +154,13 @@ generous deed immortalized in the next stable release of Godot Engine. Jeff Hungerford Jerry Chen Jesse Liles - joe513 Jonathon Josh 'Cheeseness' Bush Juan Negrier JuDelCo Julian Murgia Juraj Móza + Karonis KC Chan Kevin Boyer Kevin Kamper Meejach Petersen @@ -166,7 +168,6 @@ generous deed immortalized in the next stable release of Godot Engine. Linus Lind Lundgren Lisandro Lorea magodev - Markus Wiesner Martin Novák Matthew Fitzpatrick Matthias Hölzl @@ -174,9 +175,9 @@ generous deed immortalized in the next stable release of Godot Engine. memoryruins mhilbrunner Michael Gringauz - Michael Tintiuc Mikael Olsson MoM + monokrome Moritz Laass nee Neil Blakey-Milner @@ -191,16 +192,15 @@ generous deed immortalized in the next stable release of Godot Engine. PaweÅ‚ Kowal Pierre-Igor Berthet Pietro Vertechi - rayos Richman Stewart Rodolfo Baeza Roger Burgess Roger Smith Roman Tinkov - Sam Van Campenhout Sasori Olkof Scott D. Yelich Sootstone + Stephen Traskal Theo Cranmore Thomas Norman Tom Larrow diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md index ddddc3a1a9..1ca0b3694c 100644 --- a/ISSUE_TEMPLATE.md +++ b/ISSUE_TEMPLATE.md @@ -1,9 +1,13 @@ +<!-- Please search existing issues for potential duplicates before filing yours: +https://github.com/godotengine/godot/issues?q=is%3Aissue +--> + **Godot version:** -<!-- If thirdparty or self-compiled, specify the build date or commit hash. --> +<!-- Specify commit hash if non-official. --> **OS/device including version:** -<!-- If graphics related, specify also GPU model and drivers. --> +<!-- Specify GPU model and drivers if graphics-related. --> **Issue description:** @@ -14,7 +18,4 @@ **Minimal reproduction project:** -<!-- Optional but greatly speeds up debugging. You can drag and drop a zip archive to upload it. --> - - -- [ ] I searched the existing [GitHub issues](https://github.com/godotengine/godot/issues?utf8=%E2%9C%93&q=is%3Aissue+) for potential duplicates. +<!-- Recommended as it greatly speeds up debugging. Drag and drop a zip archive to upload it. --> diff --git a/SConstruct b/SConstruct index 88b29695cb..9fced81f9c 100644 --- a/SConstruct +++ b/SConstruct @@ -189,10 +189,12 @@ opts.Add(BoolVariable('builtin_zlib', "Use the builtin zlib library", True)) opts.Add(BoolVariable('builtin_zstd', "Use the builtin zstd library", True)) opts.Add(BoolVariable('no_editor_splash', "Don't use the custom splash screen for the editor", False)) -# Environment setup +# Compilation environment setup opts.Add("CXX", "C++ compiler") opts.Add("CC", "C compiler") -opts.Add("CCFLAGS", "Custom flags for the C and C++ compilers") +opts.Add("LINK", "Linker") +opts.Add("CCFLAGS", "Custom flags for both the C and C++ compilers") +opts.Add("CXXFLAGS", "Custom flags for the C++ compiler") opts.Add("CFLAGS", "Custom flags for the C compiler") opts.Add("LINKFLAGS", "Custom flags for the linker") diff --git a/core/allocators.h b/core/allocators.h index 0d5989b4ab..e17ab298d6 100644 --- a/core/allocators.h +++ b/core/allocators.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef ALLOCATORS_H #define ALLOCATORS_H diff --git a/core/array.cpp b/core/array.cpp index a333830d3a..c53fea1f28 100644 --- a/core/array.cpp +++ b/core/array.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "array.h" #include "hashfuncs.h" diff --git a/core/array.h b/core/array.h index 4aef4f49c5..7c6fc59048 100644 --- a/core/array.h +++ b/core/array.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef ARRAY_H #define ARRAY_H diff --git a/core/bind/core_bind.cpp b/core/bind/core_bind.cpp index 2601bd97a1..c7b08b8242 100644 --- a/core/bind/core_bind.cpp +++ b/core/bind/core_bind.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "core_bind.h" #include "core/project_settings.h" @@ -70,7 +71,13 @@ Ref<ResourceInteractiveLoader> _ResourceLoader::load_interactive(const String &p RES _ResourceLoader::load(const String &p_path, const String &p_type_hint, bool p_no_cache) { - RES ret = ResourceLoader::load(p_path, p_type_hint, p_no_cache); + Error err = OK; + RES ret = ResourceLoader::load(p_path, p_type_hint, p_no_cache, &err); + + if (err != OK) { + ERR_EXPLAIN("Error loading resource: '" + p_path + "'"); + ERR_FAIL_COND_V(err != OK, ret); + } return ret; } diff --git a/core/bind/core_bind.h b/core/bind/core_bind.h index ed4111fea4..bc5b8ea04c 100644 --- a/core/bind/core_bind.h +++ b/core/bind/core_bind.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef CORE_BIND_H #define CORE_BIND_H diff --git a/core/class_db.cpp b/core/class_db.cpp index 141bc1c5e2..d2cd362792 100644 --- a/core/class_db.cpp +++ b/core/class_db.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "class_db.h" #include "os/mutex.h" diff --git a/core/class_db.h b/core/class_db.h index c977068be1..14e36e459b 100644 --- a/core/class_db.h +++ b/core/class_db.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef CLASS_DB_H #define CLASS_DB_H diff --git a/core/color.cpp b/core/color.cpp index 00a31dfdd8..7278b5c4ee 100644 --- a/core/color.cpp +++ b/core/color.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "color.h" #include "color_names.inc" diff --git a/core/color.h b/core/color.h index 70b0e1fea2..0ff4fe6edd 100644 --- a/core/color.h +++ b/core/color.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef COLOR_H #define COLOR_H diff --git a/core/command_queue_mt.cpp b/core/command_queue_mt.cpp index 8ce0ba7810..6bb3135757 100644 --- a/core/command_queue_mt.cpp +++ b/core/command_queue_mt.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "command_queue_mt.h" #include "os/os.h" diff --git a/core/command_queue_mt.h b/core/command_queue_mt.h index e53ded6755..cecc9e405d 100644 --- a/core/command_queue_mt.h +++ b/core/command_queue_mt.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef COMMAND_QUEUE_MT_H #define COMMAND_QUEUE_MT_H diff --git a/core/compressed_translation.cpp b/core/compressed_translation.cpp index b393b67d50..266d793af7 100644 --- a/core/compressed_translation.cpp +++ b/core/compressed_translation.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "compressed_translation.h" #include "pair.h" diff --git a/core/compressed_translation.h b/core/compressed_translation.h index bedd38d1bc..400fa4491b 100644 --- a/core/compressed_translation.h +++ b/core/compressed_translation.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef COMPRESSED_TRANSLATION_H #define COMPRESSED_TRANSLATION_H diff --git a/core/core_string_names.cpp b/core/core_string_names.cpp index 7a9edcad46..ba596f7f16 100644 --- a/core/core_string_names.cpp +++ b/core/core_string_names.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "core_string_names.h" CoreStringNames *CoreStringNames::singleton = NULL; diff --git a/core/core_string_names.h b/core/core_string_names.h index f48692f470..dcbce14aac 100644 --- a/core/core_string_names.h +++ b/core/core_string_names.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef CORE_STRING_NAMES_H #define CORE_STRING_NAMES_H diff --git a/core/dictionary.cpp b/core/dictionary.cpp index 72893c41f6..ae1af86b77 100644 --- a/core/dictionary.cpp +++ b/core/dictionary.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "dictionary.h" #include "ordered_hash_map.h" diff --git a/core/dictionary.h b/core/dictionary.h index 86f676fc38..f001f2d5e1 100644 --- a/core/dictionary.h +++ b/core/dictionary.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef DICTIONARY_H #define DICTIONARY_H diff --git a/core/dvector.cpp b/core/dvector.cpp index 653c04b498..b679df55ad 100644 --- a/core/dvector.cpp +++ b/core/dvector.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "dvector.h" Mutex *dvector_lock = NULL; diff --git a/core/dvector.h b/core/dvector.h index 492a4e0ed9..c0190fb9e3 100644 --- a/core/dvector.h +++ b/core/dvector.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef DVECTOR_H #define DVECTOR_H diff --git a/core/engine.cpp b/core/engine.cpp index 4cadad1f6e..af9052110f 100644 --- a/core/engine.cpp +++ b/core/engine.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "engine.h" #include "version.h" diff --git a/core/engine.h b/core/engine.h index 2741d09b52..54b30ab81f 100644 --- a/core/engine.h +++ b/core/engine.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef ENGINE_H #define ENGINE_H diff --git a/core/error_list.h b/core/error_list.h index 47233e39fe..6b9cd0016b 100644 --- a/core/error_list.h +++ b/core/error_list.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef ERROR_LIST_H #define ERROR_LIST_H diff --git a/core/error_macros.cpp b/core/error_macros.cpp index 76be0756b8..5786802930 100644 --- a/core/error_macros.cpp +++ b/core/error_macros.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "error_macros.h" #include "io/logger.h" diff --git a/core/error_macros.h b/core/error_macros.h index 2bfa94b99e..1f9164a99b 100644 --- a/core/error_macros.h +++ b/core/error_macros.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef ERROR_MACROS_H #define ERROR_MACROS_H diff --git a/core/func_ref.cpp b/core/func_ref.cpp index 98053808b4..c707f1c4cb 100644 --- a/core/func_ref.cpp +++ b/core/func_ref.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "func_ref.h" Variant FuncRef::call_func(const Variant **p_args, int p_argcount, Variant::CallError &r_error) { diff --git a/core/func_ref.h b/core/func_ref.h index 9f2df8cb5d..681fe747d6 100644 --- a/core/func_ref.h +++ b/core/func_ref.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef FUNC_REF_H #define FUNC_REF_H diff --git a/core/global_constants.cpp b/core/global_constants.cpp index abe829420a..a24bf03c9a 100644 --- a/core/global_constants.cpp +++ b/core/global_constants.cpp @@ -10,7 +10,7 @@ /* */ /* 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 */ +/* "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 */ @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "global_constants.h" #include "object.h" diff --git a/core/global_constants.h b/core/global_constants.h index 09f93e34a2..76f618989c 100644 --- a/core/global_constants.h +++ b/core/global_constants.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef GLOBAL_CONSTANTS_H #define GLOBAL_CONSTANTS_H diff --git a/core/hash_map.h b/core/hash_map.h index 1a4f879fea..2df743ba7d 100644 --- a/core/hash_map.h +++ b/core/hash_map.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef HASH_MAP_H #define HASH_MAP_H diff --git a/core/hashfuncs.h b/core/hashfuncs.h index 0725a7ebf6..ae99fa39c8 100644 --- a/core/hashfuncs.h +++ b/core/hashfuncs.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef HASHFUNCS_H #define HASHFUNCS_H diff --git a/core/helper/math_fieldwise.h b/core/helper/math_fieldwise.h index c883c44f84..0e7cc3ea4a 100644 --- a/core/helper/math_fieldwise.h +++ b/core/helper/math_fieldwise.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef MATH_FIELDWISE_H #define MATH_FIELDWISE_H diff --git a/core/helper/value_evaluator.h b/core/helper/value_evaluator.h index 954d229517..39177a7820 100644 --- a/core/helper/value_evaluator.h +++ b/core/helper/value_evaluator.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef VALUE_EVALUATOR_H #define VALUE_EVALUATOR_H diff --git a/core/image.cpp b/core/image.cpp index 11429b8782..41d70e6df6 100644 --- a/core/image.cpp +++ b/core/image.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "image.h" #include "core/io/image_loader.h" @@ -446,8 +447,6 @@ void Image::convert(Format p_new_format) { Image new_img(width, height, 0, p_new_format); - //int len=data.size(); - PoolVector<uint8_t>::Read r = data.read(); PoolVector<uint8_t>::Write w = new_img.data.write(); @@ -695,6 +694,11 @@ void Image::resize_to_po2(bool p_square) { void Image::resize(int p_width, int p_height, Interpolation p_interpolation) { + if (data.size() == 0) { + ERR_EXPLAIN("Cannot resize image before creating it, use create() or create_from_data() first."); + ERR_FAIL(); + } + if (!_can_modify(format)) { ERR_EXPLAIN("Cannot resize in indexed, compressed or custom image formats."); ERR_FAIL(); diff --git a/core/image.h b/core/image.h index 767f3c6ac5..e962787ae9 100644 --- a/core/image.h +++ b/core/image.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef IMAGE_H #define IMAGE_H diff --git a/core/input_map.cpp b/core/input_map.cpp index 7833aab3f3..a9ea1d9545 100644 --- a/core/input_map.cpp +++ b/core/input_map.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "input_map.h" #include "os/keyboard.h" diff --git a/core/input_map.h b/core/input_map.h index 12ac1b339b..84d90f6f2a 100644 --- a/core/input_map.h +++ b/core/input_map.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef INPUT_MAP_H #define INPUT_MAP_H diff --git a/core/io/compression.cpp b/core/io/compression.cpp index a4dbebe9f7..bc3bfcf356 100644 --- a/core/io/compression.cpp +++ b/core/io/compression.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "compression.h" #include "os/copymem.h" #include "project_settings.h" diff --git a/core/io/compression.h b/core/io/compression.h index 034c5ab708..a0ccd539cb 100644 --- a/core/io/compression.h +++ b/core/io/compression.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef COMPRESSION_H #define COMPRESSION_H diff --git a/core/io/config_file.cpp b/core/io/config_file.cpp index 9a013cb775..aa06ae5cc0 100644 --- a/core/io/config_file.cpp +++ b/core/io/config_file.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "config_file.h" #include "os/file_access.h" #include "os/keyboard.h" diff --git a/core/io/config_file.h b/core/io/config_file.h index 2168e654dd..ac749bed76 100644 --- a/core/io/config_file.h +++ b/core/io/config_file.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef CONFIG_FILE_H #define CONFIG_FILE_H diff --git a/core/io/file_access_buffered.cpp b/core/io/file_access_buffered.cpp index 442ab2c6e4..dcaf99e24a 100644 --- a/core/io/file_access_buffered.cpp +++ b/core/io/file_access_buffered.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "file_access_buffered.h" #include <string.h> diff --git a/core/io/file_access_buffered.h b/core/io/file_access_buffered.h index 2d6df5d48a..f4ed47d6bc 100644 --- a/core/io/file_access_buffered.h +++ b/core/io/file_access_buffered.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef FILE_ACCESS_BUFFERED_H #define FILE_ACCESS_BUFFERED_H diff --git a/core/io/file_access_buffered_fa.h b/core/io/file_access_buffered_fa.h index bb3d3f33f6..493fa1c243 100644 --- a/core/io/file_access_buffered_fa.h +++ b/core/io/file_access_buffered_fa.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef FILE_ACCESS_BUFFERED_FA_H #define FILE_ACCESS_BUFFERED_FA_H diff --git a/core/io/file_access_compressed.cpp b/core/io/file_access_compressed.cpp index aabd70cc7b..d6547ba19f 100644 --- a/core/io/file_access_compressed.cpp +++ b/core/io/file_access_compressed.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "file_access_compressed.h" #include "print_string.h" void FileAccessCompressed::configure(const String &p_magic, Compression::Mode p_mode, int p_block_size) { diff --git a/core/io/file_access_compressed.h b/core/io/file_access_compressed.h index 65eefbcd97..587f58a7c6 100644 --- a/core/io/file_access_compressed.h +++ b/core/io/file_access_compressed.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef FILE_ACCESS_COMPRESSED_H #define FILE_ACCESS_COMPRESSED_H diff --git a/core/io/file_access_encrypted.cpp b/core/io/file_access_encrypted.cpp index 67151f6934..221f457b78 100644 --- a/core/io/file_access_encrypted.cpp +++ b/core/io/file_access_encrypted.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "file_access_encrypted.h" #include "core/variant.h" diff --git a/core/io/file_access_encrypted.h b/core/io/file_access_encrypted.h index 002a124e86..b9365a9fd0 100644 --- a/core/io/file_access_encrypted.h +++ b/core/io/file_access_encrypted.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef FILE_ACCESS_ENCRYPTED_H #define FILE_ACCESS_ENCRYPTED_H diff --git a/core/io/file_access_memory.cpp b/core/io/file_access_memory.cpp index 8812aa847e..1aa1e4a595 100644 --- a/core/io/file_access_memory.cpp +++ b/core/io/file_access_memory.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "file_access_memory.h" #include "map.h" diff --git a/core/io/file_access_memory.h b/core/io/file_access_memory.h index 1d438409cc..2136f4cc0c 100644 --- a/core/io/file_access_memory.h +++ b/core/io/file_access_memory.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef FILE_ACCESS_MEMORY_H #define FILE_ACCESS_MEMORY_H diff --git a/core/io/file_access_network.cpp b/core/io/file_access_network.cpp index 1aa431dcae..7b2bccdfec 100644 --- a/core/io/file_access_network.cpp +++ b/core/io/file_access_network.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "file_access_network.h" #include "io/ip.h" #include "marshalls.h" diff --git a/core/io/file_access_network.h b/core/io/file_access_network.h index 4d8e8f1a9a..be9bdb1af6 100644 --- a/core/io/file_access_network.h +++ b/core/io/file_access_network.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef FILE_ACCESS_NETWORK_H #define FILE_ACCESS_NETWORK_H diff --git a/core/io/file_access_pack.cpp b/core/io/file_access_pack.cpp index 318e3ad759..1a16d0f61c 100644 --- a/core/io/file_access_pack.cpp +++ b/core/io/file_access_pack.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "file_access_pack.h" #include "version.h" diff --git a/core/io/file_access_pack.h b/core/io/file_access_pack.h index 6c5fec1498..8a40e6d78c 100644 --- a/core/io/file_access_pack.h +++ b/core/io/file_access_pack.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef FILE_ACCESS_PACK_H #define FILE_ACCESS_PACK_H diff --git a/core/io/file_access_zip.cpp b/core/io/file_access_zip.cpp index c439ac7fa5..7b6385c3ff 100644 --- a/core/io/file_access_zip.cpp +++ b/core/io/file_access_zip.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifdef MINIZIP_ENABLED #include "file_access_zip.h" diff --git a/core/io/file_access_zip.h b/core/io/file_access_zip.h index b8f4a93e2a..df83575f6a 100644 --- a/core/io/file_access_zip.h +++ b/core/io/file_access_zip.h @@ -27,10 +27,11 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifdef MINIZIP_ENABLED -#ifndef FILE_ACCESS_Zip_H -#define FILE_ACCESS_Zip_H +#ifndef FILE_ACCESS_ZIP_H +#define FILE_ACCESS_ZIP_H #include "core/io/file_access_pack.h" #include "map.h" @@ -120,4 +121,4 @@ public: #endif // FILE_ACCESS_ZIP_H -#endif +#endif // MINIZIP_ENABLED diff --git a/core/io/http_client.cpp b/core/io/http_client.cpp index 088c05dfae..54743d37af 100644 --- a/core/io/http_client.cpp +++ b/core/io/http_client.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "http_client.h" #include "io/stream_peer_ssl.h" diff --git a/core/io/http_client.h b/core/io/http_client.h index 0fcaf26fdb..839012e701 100644 --- a/core/io/http_client.h +++ b/core/io/http_client.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef HTTP_CLIENT_H #define HTTP_CLIENT_H diff --git a/core/io/image_loader.cpp b/core/io/image_loader.cpp index c4cdb86c85..999c9a8ca2 100644 --- a/core/io/image_loader.cpp +++ b/core/io/image_loader.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "image_loader.h" #include "print_string.h" diff --git a/core/io/image_loader.h b/core/io/image_loader.h index b147566aed..052a8b8a40 100644 --- a/core/io/image_loader.h +++ b/core/io/image_loader.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef IMAGE_LOADER_H #define IMAGE_LOADER_H diff --git a/core/io/ip.cpp b/core/io/ip.cpp index 9d55c5258f..66bd96df4f 100644 --- a/core/io/ip.cpp +++ b/core/io/ip.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "ip.h" #include "hash_map.h" #include "os/semaphore.h" diff --git a/core/io/ip.h b/core/io/ip.h index 69a9b7fd67..d55b05b6fe 100644 --- a/core/io/ip.h +++ b/core/io/ip.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef IP_H #define IP_H diff --git a/core/io/ip_address.cpp b/core/io/ip_address.cpp index 6495e0503d..7261363ad6 100644 --- a/core/io/ip_address.cpp +++ b/core/io/ip_address.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "ip_address.h" /* IP_Address::operator Variant() const { diff --git a/core/io/ip_address.h b/core/io/ip_address.h index 7a1c1a17e6..d7b031b960 100644 --- a/core/io/ip_address.h +++ b/core/io/ip_address.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef IP_ADDRESS_H #define IP_ADDRESS_H diff --git a/core/io/json.cpp b/core/io/json.cpp index 1cc44f8558..7b2c5a62df 100644 --- a/core/io/json.cpp +++ b/core/io/json.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "json.h" #include "print_string.h" diff --git a/core/io/json.h b/core/io/json.h index f47e0c42c4..9c12423798 100644 --- a/core/io/json.h +++ b/core/io/json.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef JSON_H #define JSON_H diff --git a/core/io/marshalls.cpp b/core/io/marshalls.cpp index 3bdd4454e1..35b9a8610c 100644 --- a/core/io/marshalls.cpp +++ b/core/io/marshalls.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "marshalls.h" #include "os/keyboard.h" #include "print_string.h" diff --git a/core/io/marshalls.h b/core/io/marshalls.h index b7ce1d39e2..381e4e3d20 100644 --- a/core/io/marshalls.h +++ b/core/io/marshalls.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef MARSHALLS_H #define MARSHALLS_H diff --git a/core/io/networked_multiplayer_peer.cpp b/core/io/networked_multiplayer_peer.cpp index 95a2048b09..dbfb6d9a81 100644 --- a/core/io/networked_multiplayer_peer.cpp +++ b/core/io/networked_multiplayer_peer.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "networked_multiplayer_peer.h" void NetworkedMultiplayerPeer::_bind_methods() { diff --git a/core/io/networked_multiplayer_peer.h b/core/io/networked_multiplayer_peer.h index 3094aa8b99..057b933dc9 100644 --- a/core/io/networked_multiplayer_peer.h +++ b/core/io/networked_multiplayer_peer.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef NETWORKED_MULTIPLAYER_PEER_H #define NETWORKED_MULTIPLAYER_PEER_H diff --git a/core/io/packet_peer.cpp b/core/io/packet_peer.cpp index 472f6296d2..9cfa04346c 100644 --- a/core/io/packet_peer.cpp +++ b/core/io/packet_peer.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "packet_peer.h" #include "io/marshalls.h" diff --git a/core/io/packet_peer.h b/core/io/packet_peer.h index 3e9373a18d..6636d56959 100644 --- a/core/io/packet_peer.h +++ b/core/io/packet_peer.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef PACKET_PEER_H #define PACKET_PEER_H diff --git a/core/io/packet_peer_udp.cpp b/core/io/packet_peer_udp.cpp index 708c7d456c..bfbea15582 100644 --- a/core/io/packet_peer_udp.cpp +++ b/core/io/packet_peer_udp.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "packet_peer_udp.h" #include "io/ip.h" diff --git a/core/io/packet_peer_udp.h b/core/io/packet_peer_udp.h index d0a1bcf195..035f4ad1c9 100644 --- a/core/io/packet_peer_udp.h +++ b/core/io/packet_peer_udp.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef PACKET_PEER_UDP_H #define PACKET_PEER_UDP_H diff --git a/core/io/pck_packer.cpp b/core/io/pck_packer.cpp index 13a36813ca..596060221e 100644 --- a/core/io/pck_packer.cpp +++ b/core/io/pck_packer.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "pck_packer.h" #include "core/os/file_access.h" diff --git a/core/io/pck_packer.h b/core/io/pck_packer.h index e725155ed2..4fcf9a8822 100644 --- a/core/io/pck_packer.h +++ b/core/io/pck_packer.h @@ -27,6 +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 PCK_PACKER_H +#define PCK_PACKER_H + #include "core/reference.h" class FileAccess; @@ -57,3 +61,5 @@ public: PCKPacker(); ~PCKPacker(); }; + +#endif // PCK_PACKER_H diff --git a/core/io/resource_format_binary.cpp b/core/io/resource_format_binary.cpp index d652720ad0..15c4835dc6 100644 --- a/core/io/resource_format_binary.cpp +++ b/core/io/resource_format_binary.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "resource_format_binary.h" #include "core/image.h" diff --git a/core/io/resource_format_binary.h b/core/io/resource_format_binary.h index 0329d02981..021f7f6a2f 100644 --- a/core/io/resource_format_binary.h +++ b/core/io/resource_format_binary.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef RESOURCE_FORMAT_BINARY_H #define RESOURCE_FORMAT_BINARY_H diff --git a/core/io/resource_import.cpp b/core/io/resource_import.cpp index 8d21f41eab..cfe6655504 100644 --- a/core/io/resource_import.cpp +++ b/core/io/resource_import.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "resource_import.h" #include "os/os.h" @@ -137,9 +138,9 @@ void ResourceFormatImporter::get_recognized_extensions(List<String> *p_extension Set<String> found; - for (Set<Ref<ResourceImporter> >::Element *E = importers.front(); E; E = E->next()) { + for (int i = 0; i < importers.size(); i++) { List<String> local_exts; - E->get()->get_recognized_extensions(&local_exts); + importers[i]->get_recognized_extensions(&local_exts); for (List<String>::Element *F = local_exts.front(); F; F = F->next()) { if (!found.has(F->get())) { p_extensions->push_back(F->get()); @@ -157,8 +158,8 @@ void ResourceFormatImporter::get_recognized_extensions_for_type(const String &p_ Set<String> found; - for (Set<Ref<ResourceImporter> >::Element *E = importers.front(); E; E = E->next()) { - String res_type = E->get()->get_resource_type(); + for (int i = 0; i < importers.size(); i++) { + String res_type = importers[i]->get_resource_type(); if (res_type == String()) continue; @@ -166,7 +167,7 @@ void ResourceFormatImporter::get_recognized_extensions_for_type(const String &p_ continue; List<String> local_exts; - E->get()->get_recognized_extensions(&local_exts); + importers[i]->get_recognized_extensions(&local_exts); for (List<String>::Element *F = local_exts.front(); F; F = F->next()) { if (!found.has(F->get())) { p_extensions->push_back(F->get()); @@ -211,9 +212,9 @@ int ResourceFormatImporter::get_import_order(const String &p_path) const { bool ResourceFormatImporter::handles_type(const String &p_type) const { - for (Set<Ref<ResourceImporter> >::Element *E = importers.front(); E; E = E->next()) { + for (int i = 0; i < importers.size(); i++) { - String res_type = E->get()->get_resource_type(); + String res_type = importers[i]->get_resource_type(); if (res_type == String()) continue; if (ClassDB::is_parent_class(res_type, p_type)) @@ -318,9 +319,9 @@ void ResourceFormatImporter::get_dependencies(const String &p_path, List<String> Ref<ResourceImporter> ResourceFormatImporter::get_importer_by_name(const String &p_name) const { - for (Set<Ref<ResourceImporter> >::Element *E = importers.front(); E; E = E->next()) { - if (E->get()->get_importer_name() == p_name) { - return E->get(); + for (int i = 0; i < importers.size(); i++) { + if (importers[i]->get_importer_name() == p_name) { + return importers[i]; } } @@ -329,12 +330,12 @@ Ref<ResourceImporter> ResourceFormatImporter::get_importer_by_name(const String void ResourceFormatImporter::get_importers_for_extension(const String &p_extension, List<Ref<ResourceImporter> > *r_importers) { - for (Set<Ref<ResourceImporter> >::Element *E = importers.front(); E; E = E->next()) { + for (int i = 0; i < importers.size(); i++) { List<String> local_exts; - E->get()->get_recognized_extensions(&local_exts); + importers[i]->get_recognized_extensions(&local_exts); for (List<String>::Element *F = local_exts.front(); F; F = F->next()) { if (p_extension.to_lower() == F->get()) { - r_importers->push_back(E->get()); + r_importers->push_back(importers[i]); } } } @@ -345,14 +346,14 @@ Ref<ResourceImporter> ResourceFormatImporter::get_importer_by_extension(const St Ref<ResourceImporter> importer; float priority = 0; - for (Set<Ref<ResourceImporter> >::Element *E = importers.front(); E; E = E->next()) { + for (int i = 0; i < importers.size(); i++) { List<String> local_exts; - E->get()->get_recognized_extensions(&local_exts); + importers[i]->get_recognized_extensions(&local_exts); for (List<String>::Element *F = local_exts.front(); F; F = F->next()) { - if (p_extension.to_lower() == F->get() && E->get()->get_priority() > priority) { - importer = E->get(); - priority = E->get()->get_priority(); + if (p_extension.to_lower() == F->get() && importers[i]->get_priority() > priority) { + importer = importers[i]; + priority = importers[i]->get_priority(); } } } diff --git a/core/io/resource_import.h b/core/io/resource_import.h index 3583584092..80e0743eda 100644 --- a/core/io/resource_import.h +++ b/core/io/resource_import.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef RESOURCE_IMPORT_H #define RESOURCE_IMPORT_H @@ -45,7 +46,7 @@ class ResourceFormatImporter : public ResourceFormatLoader { static ResourceFormatImporter *singleton; - Set<Ref<ResourceImporter> > importers; + Vector<Ref<ResourceImporter> > importers; public: static ResourceFormatImporter *get_singleton() { return singleton; } @@ -64,7 +65,7 @@ public: String get_internal_resource_path(const String &p_path) const; void get_internal_resource_path_list(const String &p_path, List<String> *r_paths); - void add_importer(const Ref<ResourceImporter> &p_importer) { importers.insert(p_importer); } + void add_importer(const Ref<ResourceImporter> &p_importer) { importers.push_back(p_importer); } void remove_importer(const Ref<ResourceImporter> &p_importer) { importers.erase(p_importer); } Ref<ResourceImporter> get_importer_by_name(const String &p_name) const; Ref<ResourceImporter> get_importer_by_extension(const String &p_extension) const; diff --git a/core/io/resource_loader.cpp b/core/io/resource_loader.cpp index 527e6997e1..87add585eb 100644 --- a/core/io/resource_loader.cpp +++ b/core/io/resource_loader.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "resource_loader.h" #include "io/resource_import.h" #include "os/file_access.h" diff --git a/core/io/resource_loader.h b/core/io/resource_loader.h index fad768778b..9be82abb42 100644 --- a/core/io/resource_loader.h +++ b/core/io/resource_loader.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef RESOURCE_LOADER_H #define RESOURCE_LOADER_H diff --git a/core/io/resource_saver.cpp b/core/io/resource_saver.cpp index 8a0ccd90ce..609dd7e93c 100644 --- a/core/io/resource_saver.cpp +++ b/core/io/resource_saver.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "resource_saver.h" #include "os/file_access.h" #include "project_settings.h" diff --git a/core/io/resource_saver.h b/core/io/resource_saver.h index fd4d563e4a..396f37d414 100644 --- a/core/io/resource_saver.h +++ b/core/io/resource_saver.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef RESOURCE_SAVER_H #define RESOURCE_SAVER_H diff --git a/core/io/stream_peer.cpp b/core/io/stream_peer.cpp index b0fd229ac0..f142abd3a4 100644 --- a/core/io/stream_peer.cpp +++ b/core/io/stream_peer.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "stream_peer.h" #include "io/marshalls.h" diff --git a/core/io/stream_peer.h b/core/io/stream_peer.h index 212bff0e3e..ff9ae788ec 100644 --- a/core/io/stream_peer.h +++ b/core/io/stream_peer.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef STREAM_PEER_H #define STREAM_PEER_H diff --git a/core/io/stream_peer_ssl.cpp b/core/io/stream_peer_ssl.cpp index f92b57a044..633b353102 100644 --- a/core/io/stream_peer_ssl.cpp +++ b/core/io/stream_peer_ssl.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "stream_peer_ssl.h" StreamPeerSSL *(*StreamPeerSSL::_create)() = NULL; diff --git a/core/io/stream_peer_ssl.h b/core/io/stream_peer_ssl.h index bb4d2edced..e4d14ebdfd 100644 --- a/core/io/stream_peer_ssl.h +++ b/core/io/stream_peer_ssl.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef STREAM_PEER_SSL_H #define STREAM_PEER_SSL_H diff --git a/core/io/stream_peer_tcp.cpp b/core/io/stream_peer_tcp.cpp index 0524a35908..9cfa810034 100644 --- a/core/io/stream_peer_tcp.cpp +++ b/core/io/stream_peer_tcp.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "stream_peer_tcp.h" StreamPeerTCP *(*StreamPeerTCP::_create)() = NULL; diff --git a/core/io/stream_peer_tcp.h b/core/io/stream_peer_tcp.h index 9a14f57c28..fc84525c5f 100644 --- a/core/io/stream_peer_tcp.h +++ b/core/io/stream_peer_tcp.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef STREAM_PEER_TCP_H #define STREAM_PEER_TCP_H diff --git a/core/io/tcp_server.cpp b/core/io/tcp_server.cpp index 5d33cd6f15..5916d58390 100644 --- a/core/io/tcp_server.cpp +++ b/core/io/tcp_server.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "tcp_server.h" TCP_Server *(*TCP_Server::_create)() = NULL; diff --git a/core/io/tcp_server.h b/core/io/tcp_server.h index 28c80f76f7..a250e8b249 100644 --- a/core/io/tcp_server.h +++ b/core/io/tcp_server.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef TCP_SERVER_H #define TCP_SERVER_H diff --git a/core/io/translation_loader_po.cpp b/core/io/translation_loader_po.cpp index 0f62dbeb94..e01e2a84c5 100644 --- a/core/io/translation_loader_po.cpp +++ b/core/io/translation_loader_po.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "translation_loader_po.h" #include "os/file_access.h" #include "translation.h" diff --git a/core/io/translation_loader_po.h b/core/io/translation_loader_po.h index 82a2da103f..33cf9bd8b4 100644 --- a/core/io/translation_loader_po.h +++ b/core/io/translation_loader_po.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef TRANSLATION_LOADER_PO_H #define TRANSLATION_LOADER_PO_H diff --git a/core/io/xml_parser.cpp b/core/io/xml_parser.cpp index a88150fa36..33c9b56d5a 100644 --- a/core/io/xml_parser.cpp +++ b/core/io/xml_parser.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "xml_parser.h" #include "print_string.h" //#define DEBUG_XML diff --git a/core/io/xml_parser.h b/core/io/xml_parser.h index 62d2d2bc94..297b57ffdc 100644 --- a/core/io/xml_parser.h +++ b/core/io/xml_parser.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef XML_PARSER_H #define XML_PARSER_H diff --git a/core/io/zip_io.h b/core/io/zip_io.h index d3c1d1fc57..3a7fdb0302 100644 --- a/core/io/zip_io.h +++ b/core/io/zip_io.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef ZIP_IO_H #define ZIP_IO_H diff --git a/core/list.h b/core/list.h index 0c748aeb85..a00372e39f 100644 --- a/core/list.h +++ b/core/list.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef GLOBALS_LIST_H #define GLOBALS_LIST_H diff --git a/core/map.h b/core/map.h index 1e47b42625..5ff269c26b 100644 --- a/core/map.h +++ b/core/map.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef MAP_H #define MAP_H diff --git a/core/math/a_star.cpp b/core/math/a_star.cpp index cb90116d63..6908d7831d 100644 --- a/core/math/a_star.cpp +++ b/core/math/a_star.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "a_star.h" #include "geometry.h" #include "scene/scene_string_names.h" diff --git a/core/math/a_star.h b/core/math/a_star.h index 563f82826d..f89e17c7bb 100644 --- a/core/math/a_star.h +++ b/core/math/a_star.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef ASTAR_H #define ASTAR_H diff --git a/core/math/aabb.cpp b/core/math/aabb.cpp index a6e5ced296..cff19f990c 100644 --- a/core/math/aabb.cpp +++ b/core/math/aabb.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "aabb.h" #include "print_string.h" diff --git a/core/math/aabb.h b/core/math/aabb.h index ff49337204..39b8f403e7 100644 --- a/core/math/aabb.h +++ b/core/math/aabb.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef AABB_H #define AABB_H diff --git a/core/math/audio_frame.cpp b/core/math/audio_frame.cpp index d22b0f05f4..eff817bbaa 100644 --- a/core/math/audio_frame.cpp +++ b/core/math/audio_frame.cpp @@ -27,4 +27,5 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "audio_frame.h" diff --git a/core/math/audio_frame.h b/core/math/audio_frame.h index fd58848c0b..67ba025e1c 100644 --- a/core/math/audio_frame.h +++ b/core/math/audio_frame.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef AUDIOFRAME_H #define AUDIOFRAME_H diff --git a/core/math/bsp_tree.cpp b/core/math/bsp_tree.cpp index 5d8ac000ad..b1424e1d78 100644 --- a/core/math/bsp_tree.cpp +++ b/core/math/bsp_tree.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "bsp_tree.h" #include "error_macros.h" #include "print_string.h" diff --git a/core/math/bsp_tree.h b/core/math/bsp_tree.h index 6a7b577fd0..fb16818ae7 100644 --- a/core/math/bsp_tree.h +++ b/core/math/bsp_tree.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef BSP_TREE_H #define BSP_TREE_H diff --git a/core/math/camera_matrix.cpp b/core/math/camera_matrix.cpp index 8714a07336..1ab9b3532e 100644 --- a/core/math/camera_matrix.cpp +++ b/core/math/camera_matrix.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "camera_matrix.h" #include "math_funcs.h" #include "print_string.h" diff --git a/core/math/camera_matrix.h b/core/math/camera_matrix.h index 9dde244e58..226b4d572b 100644 --- a/core/math/camera_matrix.h +++ b/core/math/camera_matrix.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef CAMERA_MATRIX_H #define CAMERA_MATRIX_H diff --git a/core/math/face3.cpp b/core/math/face3.cpp index e76719f736..801f2a3b4d 100644 --- a/core/math/face3.cpp +++ b/core/math/face3.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "face3.h" #include "geometry.h" diff --git a/core/math/face3.h b/core/math/face3.h index dd4cb25c82..faed0fa8d4 100644 --- a/core/math/face3.h +++ b/core/math/face3.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef FACE3_H #define FACE3_H diff --git a/core/math/geometry.cpp b/core/math/geometry.cpp index a3b48320b1..24f077a4ca 100644 --- a/core/math/geometry.cpp +++ b/core/math/geometry.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "geometry.h" #include "print_string.h" diff --git a/core/math/geometry.h b/core/math/geometry.h index fefdd88794..ca4363e129 100644 --- a/core/math/geometry.h +++ b/core/math/geometry.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef GEOMETRY_H #define GEOMETRY_H diff --git a/core/math/math_2d.cpp b/core/math/math_2d.cpp index 2c83bc1976..d2e4101999 100644 --- a/core/math/math_2d.cpp +++ b/core/math/math_2d.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "math_2d.h" real_t Vector2::angle() const { diff --git a/core/math/math_2d.h b/core/math/math_2d.h index 32e1bb9152..8928349a44 100644 --- a/core/math/math_2d.h +++ b/core/math/math_2d.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef MATH_2D_H #define MATH_2D_H diff --git a/core/math/math_defs.h b/core/math/math_defs.h index e260bcd54f..d3484d8d02 100644 --- a/core/math/math_defs.h +++ b/core/math/math_defs.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef MATH_DEFS_H #define MATH_DEFS_H diff --git a/core/math/math_funcs.cpp b/core/math/math_funcs.cpp index 1025e8be75..f060a8e4ab 100644 --- a/core/math/math_funcs.cpp +++ b/core/math/math_funcs.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "math_funcs.h" #include "core/os/os.h" diff --git a/core/math/math_funcs.h b/core/math/math_funcs.h index d2d49d85d6..e15abc6b50 100644 --- a/core/math/math_funcs.h +++ b/core/math/math_funcs.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef MATH_FUNCS_H #define MATH_FUNCS_H diff --git a/core/math/matrix3.cpp b/core/math/matrix3.cpp index ceaff04ae8..189b1ef9b3 100644 --- a/core/math/matrix3.cpp +++ b/core/math/matrix3.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "matrix3.h" #include "math_funcs.h" #include "os/copymem.h" diff --git a/core/math/octree.h b/core/math/octree.h index c874d60894..7411e4aa52 100644 --- a/core/math/octree.h +++ b/core/math/octree.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef OCTREE_H #define OCTREE_H diff --git a/core/math/plane.cpp b/core/math/plane.cpp index c4e2f04fa6..78bb1771a4 100644 --- a/core/math/plane.cpp +++ b/core/math/plane.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "plane.h" #include "math_funcs.h" diff --git a/core/math/plane.h b/core/math/plane.h index 5497fde592..e567422dd0 100644 --- a/core/math/plane.h +++ b/core/math/plane.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef PLANE_H #define PLANE_H diff --git a/core/math/quat.cpp b/core/math/quat.cpp index 5706848b35..9aa8b537d2 100644 --- a/core/math/quat.cpp +++ b/core/math/quat.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "quat.h" #include "matrix3.h" #include "print_string.h" diff --git a/core/math/quick_hull.cpp b/core/math/quick_hull.cpp index e13f2e9c18..102e454e02 100644 --- a/core/math/quick_hull.cpp +++ b/core/math/quick_hull.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "quick_hull.h" #include "map.h" diff --git a/core/math/quick_hull.h b/core/math/quick_hull.h index 40f601536f..eef4a9adff 100644 --- a/core/math/quick_hull.h +++ b/core/math/quick_hull.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef QUICK_HULL_H #define QUICK_HULL_H diff --git a/core/math/transform.cpp b/core/math/transform.cpp index ffad8cfc41..f727d00e30 100644 --- a/core/math/transform.cpp +++ b/core/math/transform.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "transform.h" #include "math_funcs.h" #include "os/copymem.h" diff --git a/core/math/transform.h b/core/math/transform.h index e5bc7832a0..c06eaec604 100644 --- a/core/math/transform.h +++ b/core/math/transform.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef TRANSFORM_H #define TRANSFORM_H diff --git a/core/math/triangle_mesh.cpp b/core/math/triangle_mesh.cpp index 6138abc6b9..edd4ad3441 100644 --- a/core/math/triangle_mesh.cpp +++ b/core/math/triangle_mesh.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "triangle_mesh.h" #include "sort.h" diff --git a/core/math/triangle_mesh.h b/core/math/triangle_mesh.h index 4687b0e91b..9f145f2afb 100644 --- a/core/math/triangle_mesh.h +++ b/core/math/triangle_mesh.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef TRIANGLE_MESH_H #define TRIANGLE_MESH_H diff --git a/core/math/triangulate.cpp b/core/math/triangulate.cpp index ff65142341..957e16f92c 100644 --- a/core/math/triangulate.cpp +++ b/core/math/triangulate.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "triangulate.h" real_t Triangulate::get_area(const Vector<Vector2> &contour) { diff --git a/core/math/triangulate.h b/core/math/triangulate.h index 01b4a50a3e..e336dc5756 100644 --- a/core/math/triangulate.h +++ b/core/math/triangulate.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef TRIANGULATE_H #define TRIANGULATE_H diff --git a/core/math/vector3.cpp b/core/math/vector3.cpp index 02140bc337..78d52d5cd1 100644 --- a/core/math/vector3.cpp +++ b/core/math/vector3.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "vector3.h" #include "matrix3.h" diff --git a/core/math/vector3.h b/core/math/vector3.h index 17dbdafbd4..10ec4f5641 100644 --- a/core/math/vector3.h +++ b/core/math/vector3.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef VECTOR3_H #define VECTOR3_H diff --git a/core/message_queue.cpp b/core/message_queue.cpp index b7b8827f4a..3ceafe1a30 100644 --- a/core/message_queue.cpp +++ b/core/message_queue.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "message_queue.h" #include "project_settings.h" diff --git a/core/message_queue.h b/core/message_queue.h index 7312f0e1e4..be5ffe4fae 100644 --- a/core/message_queue.h +++ b/core/message_queue.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef MESSAGE_QUEUE_H #define MESSAGE_QUEUE_H diff --git a/core/method_bind.cpp b/core/method_bind.cpp index 4022b22ffe..52ee9e0848 100644 --- a/core/method_bind.cpp +++ b/core/method_bind.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + // object.h needs to be the first include *before* method_bind.h // FIXME: Find out why and fix potential cyclical dependencies. #include "object.h" diff --git a/core/method_bind.h b/core/method_bind.h index aaf3640ce9..2e5712c3fe 100644 --- a/core/method_bind.h +++ b/core/method_bind.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef METHOD_BIND_H #define METHOD_BIND_H diff --git a/core/method_ptrcall.h b/core/method_ptrcall.h index 1fe0cf0bc0..2007c3def5 100644 --- a/core/method_ptrcall.h +++ b/core/method_ptrcall.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef METHOD_PTRCALL_H #define METHOD_PTRCALL_H diff --git a/core/node_path.cpp b/core/node_path.cpp index abde887b35..cd7ad77534 100644 --- a/core/node_path.cpp +++ b/core/node_path.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "node_path.h" #include "print_string.h" diff --git a/core/node_path.h b/core/node_path.h index af134e8409..288f39721f 100644 --- a/core/node_path.h +++ b/core/node_path.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef NODE_PATH_H #define NODE_PATH_H diff --git a/core/oa_hash_map.h b/core/oa_hash_map.h index 308624dcc3..c3b32af545 100644 --- a/core/oa_hash_map.h +++ b/core/oa_hash_map.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef OA_HASH_MAP_H #define OA_HASH_MAP_H diff --git a/core/object.cpp b/core/object.cpp index 2e3196dc47..f9d733c11f 100644 --- a/core/object.cpp +++ b/core/object.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "object.h" #include "class_db.h" diff --git a/core/object.h b/core/object.h index 635c599154..5de87b8a7d 100644 --- a/core/object.h +++ b/core/object.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef OBJECT_H #define OBJECT_H diff --git a/core/ordered_hash_map.h b/core/ordered_hash_map.h index 5954952b6c..93ce9a90a7 100644 --- a/core/ordered_hash_map.h +++ b/core/ordered_hash_map.h @@ -3,7 +3,7 @@ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ -/* http://www.godotengine.org */ +/* https://godotengine.org */ /*************************************************************************/ /* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md) */ @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef ORDERED_HASH_MAP_H #define ORDERED_HASH_MAP_H diff --git a/core/os/copymem.h b/core/os/copymem.h index 998c0a8b9b..87d77bd426 100644 --- a/core/os/copymem.h +++ b/core/os/copymem.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef COPYMEM_H #define COPYMEM_H diff --git a/core/os/dir_access.cpp b/core/os/dir_access.cpp index eadb8e8546..1941b82602 100644 --- a/core/os/dir_access.cpp +++ b/core/os/dir_access.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "dir_access.h" #include "os/file_access.h" #include "os/memory.h" diff --git a/core/os/dir_access.h b/core/os/dir_access.h index c94ced657b..4df0618021 100644 --- a/core/os/dir_access.h +++ b/core/os/dir_access.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef DIR_ACCESS_H #define DIR_ACCESS_H diff --git a/core/os/file_access.cpp b/core/os/file_access.cpp index 989230b162..368b4ad09d 100644 --- a/core/os/file_access.cpp +++ b/core/os/file_access.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "file_access.h" #include "core/io/file_access_pack.h" diff --git a/core/os/file_access.h b/core/os/file_access.h index 61edc9a5db..5d10c1a9aa 100644 --- a/core/os/file_access.h +++ b/core/os/file_access.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef FILE_ACCESS_H #define FILE_ACCESS_H diff --git a/core/os/input.cpp b/core/os/input.cpp index a44adde425..3089ab2ce3 100644 --- a/core/os/input.cpp +++ b/core/os/input.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "input.h" #include "input_map.h" #include "os/os.h" diff --git a/core/os/input.h b/core/os/input.h index 140d11de4d..9c7595ff7f 100644 --- a/core/os/input.h +++ b/core/os/input.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef INPUT_H #define INPUT_H diff --git a/core/os/input_event.cpp b/core/os/input_event.cpp index 67590517fb..12060f31df 100644 --- a/core/os/input_event.cpp +++ b/core/os/input_event.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "input_event.h" #include "input_map.h" diff --git a/core/os/input_event.h b/core/os/input_event.h index 53da79f59f..72057659d2 100644 --- a/core/os/input_event.h +++ b/core/os/input_event.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef INPUT_EVENT_H #define INPUT_EVENT_H diff --git a/core/os/keyboard.cpp b/core/os/keyboard.cpp index 00d78d71f7..fa53cc85c8 100644 --- a/core/os/keyboard.cpp +++ b/core/os/keyboard.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "keyboard.h" #include "os/os.h" diff --git a/core/os/keyboard.h b/core/os/keyboard.h index f910f07f99..4c253fa4ce 100644 --- a/core/os/keyboard.h +++ b/core/os/keyboard.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef KEYBOARD_H #define KEYBOARD_H diff --git a/core/os/main_loop.cpp b/core/os/main_loop.cpp index 186acb0342..916c86613e 100644 --- a/core/os/main_loop.cpp +++ b/core/os/main_loop.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "main_loop.h" #include "script_language.h" diff --git a/core/os/main_loop.h b/core/os/main_loop.h index e5d917ec6b..546e4e280c 100644 --- a/core/os/main_loop.h +++ b/core/os/main_loop.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef MAIN_LOOP_H #define MAIN_LOOP_H diff --git a/core/os/memory.cpp b/core/os/memory.cpp index a8b49a0852..3eab4343a9 100644 --- a/core/os/memory.cpp +++ b/core/os/memory.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "memory.h" #include "copymem.h" #include "core/safe_refcount.h" diff --git a/core/os/memory.h b/core/os/memory.h index 27eb57c873..f5c6c0b38a 100644 --- a/core/os/memory.h +++ b/core/os/memory.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef MEMORY_H #define MEMORY_H diff --git a/core/os/mutex.cpp b/core/os/mutex.cpp index 21480fecee..7c4ea2323c 100644 --- a/core/os/mutex.cpp +++ b/core/os/mutex.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "mutex.h" #include "error_macros.h" #include <stddef.h> diff --git a/core/os/mutex.h b/core/os/mutex.h index ecd1f59151..9debe7f41b 100644 --- a/core/os/mutex.h +++ b/core/os/mutex.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef MUTEX_H #define MUTEX_H diff --git a/core/os/os.cpp b/core/os/os.cpp index bdcdfed060..c6e5de703c 100644 --- a/core/os/os.cpp +++ b/core/os/os.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "os.h" #include "dir_access.h" diff --git a/core/os/os.h b/core/os/os.h index a4f07df0e8..248e1dbefa 100644 --- a/core/os/os.h +++ b/core/os/os.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef OS_H #define OS_H diff --git a/core/os/rw_lock.cpp b/core/os/rw_lock.cpp index 9603ccf0bb..35489490ed 100644 --- a/core/os/rw_lock.cpp +++ b/core/os/rw_lock.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "rw_lock.h" #include "error_macros.h" diff --git a/core/os/rw_lock.h b/core/os/rw_lock.h index d0ce38f453..9053794c83 100644 --- a/core/os/rw_lock.h +++ b/core/os/rw_lock.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef RWLOCK_H #define RWLOCK_H diff --git a/core/os/semaphore.cpp b/core/os/semaphore.cpp index 9455124e48..0377aeeb29 100644 --- a/core/os/semaphore.cpp +++ b/core/os/semaphore.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "semaphore.h" #include "error_macros.h" diff --git a/core/os/semaphore.h b/core/os/semaphore.h index 8bad64ace3..f3021bf74c 100644 --- a/core/os/semaphore.h +++ b/core/os/semaphore.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef SEMAPHORE_H #define SEMAPHORE_H diff --git a/core/os/shell.cpp b/core/os/shell.cpp index 781d922d4b..32649a0667 100644 --- a/core/os/shell.cpp +++ b/core/os/shell.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "shell.h" Shell *Shell::singleton = NULL; diff --git a/core/os/shell.h b/core/os/shell.h index 84ac7eae42..d3d92028ea 100644 --- a/core/os/shell.h +++ b/core/os/shell.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef SHELL_H #define SHELL_H diff --git a/core/os/thread.cpp b/core/os/thread.cpp index 13bf147caf..250cf80a37 100644 --- a/core/os/thread.cpp +++ b/core/os/thread.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "thread.h" Thread *(*Thread::create_func)(ThreadCreateCallback, void *, const Settings &) = NULL; diff --git a/core/os/thread.h b/core/os/thread.h index 92dd00cf0d..c2947bccab 100644 --- a/core/os/thread.h +++ b/core/os/thread.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef THREAD_H #define THREAD_H diff --git a/core/os/thread_dummy.cpp b/core/os/thread_dummy.cpp index 2f8f3d4940..fa0bb3dafd 100644 --- a/core/os/thread_dummy.cpp +++ b/core/os/thread_dummy.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "thread_dummy.h" #include "memory.h" diff --git a/core/os/thread_dummy.h b/core/os/thread_dummy.h index 5681f45092..b67b52a726 100644 --- a/core/os/thread_dummy.h +++ b/core/os/thread_dummy.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef THREAD_DUMMY_H #define THREAD_DUMMY_H diff --git a/core/os/thread_safe.cpp b/core/os/thread_safe.cpp index 394876ae16..acb37df02b 100644 --- a/core/os/thread_safe.cpp +++ b/core/os/thread_safe.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "thread_safe.h" #include "error_macros.h" #include "os/memory.h" diff --git a/core/os/thread_safe.h b/core/os/thread_safe.h index 05510bcbb9..f0876f38a1 100644 --- a/core/os/thread_safe.h +++ b/core/os/thread_safe.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef THREAD_SAFE_H #define THREAD_SAFE_H diff --git a/core/os/threaded_array_processor.cpp b/core/os/threaded_array_processor.cpp deleted file mode 100644 index 8e92508ea5..0000000000 --- a/core/os/threaded_array_processor.cpp +++ /dev/null @@ -1,2 +0,0 @@ -#include "threaded_array_processor.h" - diff --git a/core/os/threaded_array_processor.h b/core/os/threaded_array_processor.h index e584fbb193..e0fb589767 100644 --- a/core/os/threaded_array_processor.h +++ b/core/os/threaded_array_processor.h @@ -1,3 +1,33 @@ +/*************************************************************************/ +/* threaded_array_processor.h */ +/*************************************************************************/ +/* This file is part of: */ +/* GODOT ENGINE */ +/* https://godotengine.org */ +/*************************************************************************/ +/* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ +/* Copyright (c) 2014-2018 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 THREADED_ARRAY_PROCESSOR_H #define THREADED_ARRAY_PROCESSOR_H diff --git a/core/packed_data_container.cpp b/core/packed_data_container.cpp index 4d5890685b..eaccdba9bf 100644 --- a/core/packed_data_container.cpp +++ b/core/packed_data_container.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "packed_data_container.h" #include "core_string_names.h" diff --git a/core/packed_data_container.h b/core/packed_data_container.h index b711d795de..fe36417000 100644 --- a/core/packed_data_container.h +++ b/core/packed_data_container.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef PACKED_DATA_CONTAINER_H #define PACKED_DATA_CONTAINER_H diff --git a/core/pair.h b/core/pair.h index 349c034ab7..1d35ae1b6c 100644 --- a/core/pair.h +++ b/core/pair.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef PAIR_H #define PAIR_H diff --git a/core/path_remap.cpp b/core/path_remap.cpp index d92d034f1a..80308d72c0 100644 --- a/core/path_remap.cpp +++ b/core/path_remap.cpp @@ -27,4 +27,5 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "path_remap.h" diff --git a/core/path_remap.h b/core/path_remap.h index 1b40c9cace..5e25628aeb 100644 --- a/core/path_remap.h +++ b/core/path_remap.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef PATH_REMAP_H #define PATH_REMAP_H diff --git a/core/pool_allocator.cpp b/core/pool_allocator.cpp index 13d5c5082f..d81e1912bf 100644 --- a/core/pool_allocator.cpp +++ b/core/pool_allocator.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "pool_allocator.h" #include "core/os/os.h" diff --git a/core/pool_allocator.h b/core/pool_allocator.h index a1cc65f1fd..d9731aa3eb 100644 --- a/core/pool_allocator.h +++ b/core/pool_allocator.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef POOL_ALLOCATOR_H #define POOL_ALLOCATOR_H diff --git a/core/print_string.cpp b/core/print_string.cpp index 2b366f8145..0355154488 100644 --- a/core/print_string.cpp +++ b/core/print_string.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "print_string.h" #include "os/os.h" diff --git a/core/print_string.h b/core/print_string.h index c3eaf3f336..3465888d4c 100644 --- a/core/print_string.h +++ b/core/print_string.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef PRINT_STRING_H #define PRINT_STRING_H diff --git a/core/project_settings.cpp b/core/project_settings.cpp index bb2408fb1f..0c19de382c 100644 --- a/core/project_settings.cpp +++ b/core/project_settings.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "project_settings.h" #include "bind/core_bind.h" diff --git a/core/project_settings.h b/core/project_settings.h index e60efea222..e85092e431 100644 --- a/core/project_settings.h +++ b/core/project_settings.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef GLOBAL_CONFIG_H #define GLOBAL_CONFIG_H diff --git a/core/ref_ptr.cpp b/core/ref_ptr.cpp index 0f5abdd455..e3ef817df1 100644 --- a/core/ref_ptr.cpp +++ b/core/ref_ptr.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "ref_ptr.h" #include "reference.h" diff --git a/core/ref_ptr.h b/core/ref_ptr.h index 27acfb7982..a074718d22 100644 --- a/core/ref_ptr.h +++ b/core/ref_ptr.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef REF_PTR_H #define REF_PTR_H /** diff --git a/core/reference.cpp b/core/reference.cpp index 3b5a9bc7cc..c33a7c683c 100644 --- a/core/reference.cpp +++ b/core/reference.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "reference.h" #include "script_language.h" diff --git a/core/reference.h b/core/reference.h index 16b912a402..a0bdb62258 100644 --- a/core/reference.h +++ b/core/reference.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef REFERENCE_H #define REFERENCE_H diff --git a/core/register_core_types.cpp b/core/register_core_types.cpp index 29c7cf4606..006459c5f6 100644 --- a/core/register_core_types.cpp +++ b/core/register_core_types.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "register_core_types.h" #include "bind/core_bind.h" diff --git a/core/register_core_types.h b/core/register_core_types.h index 4f5b7e03af..201da5cd07 100644 --- a/core/register_core_types.h +++ b/core/register_core_types.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef REGISTER_CORE_TYPES_H #define REGISTER_CORE_TYPES_H diff --git a/core/resource.cpp b/core/resource.cpp index 3e411a8753..38f938932c 100644 --- a/core/resource.cpp +++ b/core/resource.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "resource.h" #include "core_string_names.h" diff --git a/core/resource.h b/core/resource.h index 4c5a44d7fd..60c63bfe7f 100644 --- a/core/resource.h +++ b/core/resource.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef RESOURCE_H #define RESOURCE_H diff --git a/core/rid.cpp b/core/rid.cpp index 3cfb28c044..9661af9271 100644 --- a/core/rid.cpp +++ b/core/rid.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "rid.h" RID_Data::~RID_Data() { diff --git a/core/rid.h b/core/rid.h index 3768083fe3..42306aea36 100644 --- a/core/rid.h +++ b/core/rid.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef RID_H #define RID_H diff --git a/core/ring_buffer.h b/core/ring_buffer.h index c8562a0570..de4757612a 100644 --- a/core/ring_buffer.h +++ b/core/ring_buffer.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef RINGBUFFER_H #define RINGBUFFER_H diff --git a/core/safe_refcount.h b/core/safe_refcount.h index 217cf69145..eff209c2db 100644 --- a/core/safe_refcount.h +++ b/core/safe_refcount.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef SAFE_REFCOUNT_H #define SAFE_REFCOUNT_H diff --git a/core/script_debugger_local.cpp b/core/script_debugger_local.cpp index 83cdb348bd..57463a662d 100644 --- a/core/script_debugger_local.cpp +++ b/core/script_debugger_local.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "script_debugger_local.h" #include "os/os.h" diff --git a/core/script_debugger_local.h b/core/script_debugger_local.h index f1111612b3..c93120331d 100644 --- a/core/script_debugger_local.h +++ b/core/script_debugger_local.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef SCRIPT_DEBUGGER_LOCAL_H #define SCRIPT_DEBUGGER_LOCAL_H diff --git a/core/script_debugger_remote.cpp b/core/script_debugger_remote.cpp index a0a55ce86e..e3dc8eb53a 100644 --- a/core/script_debugger_remote.cpp +++ b/core/script_debugger_remote.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "script_debugger_remote.h" #include "engine.h" @@ -354,6 +355,13 @@ void ScriptDebuggerRemote::_get_output() { locking = false; } + if (n_messages_dropped > 0) { + Message msg; + msg.message = "Too many messages! " + String::num_int64(n_messages_dropped) + " messages were dropped."; + messages.push_back(msg); + n_messages_dropped = 0; + } + while (messages.size()) { locking = true; packet_peer_stream->put_var("message:" + messages.front()->get().message); @@ -365,6 +373,20 @@ void ScriptDebuggerRemote::_get_output() { locking = false; } + if (n_errors_dropped > 0) { + OutputError oe; + oe.error = "TOO_MANY_ERRORS"; + oe.error_descr = "Too many errors! " + String::num_int64(n_errors_dropped) + " errors were dropped."; + oe.warning = false; + uint64_t time = OS::get_singleton()->get_ticks_msec(); + oe.hr = time / 3600000; + oe.min = (time / 60000) % 60; + oe.sec = (time / 1000) % 60; + oe.msec = time % 1000; + errors.push_back(oe); + n_errors_dropped = 0; + } + while (errors.size()) { locking = true; packet_peer_stream->put_var("error"); @@ -452,7 +474,11 @@ void ScriptDebuggerRemote::_err_handler(void *ud, const char *p_func, const char if (!sdr->locking && sdr->tcp_client->is_connected_to_host()) { - sdr->errors.push_back(oe); + if (sdr->errors.size() >= sdr->max_errors_per_frame) { + sdr->n_errors_dropped++; + } else { + sdr->errors.push_back(oe); + } } sdr->mutex->unlock(); @@ -890,10 +916,14 @@ void ScriptDebuggerRemote::send_message(const String &p_message, const Array &p_ mutex->lock(); if (!locking && tcp_client->is_connected_to_host()) { - Message msg; - msg.message = p_message; - msg.data = p_args; - messages.push_back(msg); + if (messages.size() >= max_messages_per_frame) { + n_messages_dropped++; + } else { + Message msg; + msg.message = p_message; + msg.data = p_args; + messages.push_back(msg); + } } mutex->unlock(); } @@ -1010,7 +1040,11 @@ ScriptDebuggerRemote::ScriptDebuggerRemote() : requested_quit(false), mutex(Mutex::create()), max_cps(GLOBAL_GET("network/limits/debugger_stdout/max_chars_per_second")), + max_messages_per_frame(GLOBAL_GET("network/limits/debugger_stdout/max_messages_per_frame")), + max_errors_per_frame(GLOBAL_GET("network/limits/debugger_stdout/max_errors_per_frame")), char_count(0), + n_messages_dropped(0), + n_errors_dropped(0), last_msec(0), msec_count(0), locking(false), diff --git a/core/script_debugger_remote.h b/core/script_debugger_remote.h index 15afc866e3..924d5de2c4 100644 --- a/core/script_debugger_remote.h +++ b/core/script_debugger_remote.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef SCRIPT_DEBUGGER_REMOTE_H #define SCRIPT_DEBUGGER_REMOTE_H @@ -86,7 +87,11 @@ class ScriptDebuggerRemote : public ScriptDebugger { List<String> output_strings; List<Message> messages; + int max_messages_per_frame; + int n_messages_dropped; List<OutputError> errors; + int max_errors_per_frame; + int n_errors_dropped; int max_cps; int char_count; diff --git a/core/script_language.cpp b/core/script_language.cpp index 773eb29036..2a8c76c4b8 100644 --- a/core/script_language.cpp +++ b/core/script_language.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "script_language.h" ScriptLanguage *ScriptServer::_languages[MAX_LANGUAGES]; diff --git a/core/script_language.h b/core/script_language.h index 1a9d101ddd..6bf2129f9b 100644 --- a/core/script_language.h +++ b/core/script_language.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef SCRIPT_LANGUAGE_H #define SCRIPT_LANGUAGE_H diff --git a/core/self_list.h b/core/self_list.h index bb7f1a8a5b..e83afb66ef 100644 --- a/core/self_list.h +++ b/core/self_list.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef SELF_LIST_H #define SELF_LIST_H diff --git a/core/set.h b/core/set.h index b2a8ee1636..4f17c953b1 100644 --- a/core/set.h +++ b/core/set.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef SET_H #define SET_H diff --git a/core/simple_type.h b/core/simple_type.h index 5429719f02..a645d03181 100644 --- a/core/simple_type.h +++ b/core/simple_type.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef SIMPLE_TYPE_H #define SIMPLE_TYPE_H diff --git a/core/sort.h b/core/sort.h index 94c2c1ecdf..a6780309d8 100644 --- a/core/sort.h +++ b/core/sort.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef SORT_H #define SORT_H diff --git a/core/string_buffer.cpp b/core/string_buffer.cpp index 970477b90b..aac2090378 100644 --- a/core/string_buffer.cpp +++ b/core/string_buffer.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "string_buffer.h" #include <string.h> diff --git a/core/string_buffer.h b/core/string_buffer.h index 4b502f3d92..f0ead66bb8 100644 --- a/core/string_buffer.h +++ b/core/string_buffer.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef STRING_BUFFER_H #define STRING_BUFFER_H diff --git a/core/string_builder.cpp b/core/string_builder.cpp index f24e23c986..4d567cbc03 100644 --- a/core/string_builder.cpp +++ b/core/string_builder.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "string_builder.h" #include <string.h> diff --git a/core/string_builder.h b/core/string_builder.h index 48e3fd663f..9e2599ac32 100644 --- a/core/string_builder.h +++ b/core/string_builder.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef STRING_BUILDER_H #define STRING_BUILDER_H diff --git a/core/string_db.cpp b/core/string_db.cpp index 3d77aee0a1..6e1f887754 100644 --- a/core/string_db.cpp +++ b/core/string_db.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "string_db.h" #include "os/os.h" diff --git a/core/string_db.h b/core/string_db.h index 5e3086d4ec..28ca812a45 100644 --- a/core/string_db.h +++ b/core/string_db.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef STRING_DB_H #define STRING_DB_H diff --git a/core/translation.cpp b/core/translation.cpp index 0c9af4e624..cf947404cd 100644 --- a/core/translation.cpp +++ b/core/translation.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "translation.h" #include "io/resource_loader.h" diff --git a/core/translation.h b/core/translation.h index b8ff1722f5..e7c0dcbc07 100644 --- a/core/translation.h +++ b/core/translation.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef TRANSLATION_H #define TRANSLATION_H diff --git a/core/type_info.h b/core/type_info.h index 24d96c51e8..c1af4fac69 100644 --- a/core/type_info.h +++ b/core/type_info.h @@ -1,3 +1,33 @@ +/*************************************************************************/ +/* type_info.h */ +/*************************************************************************/ +/* This file is part of: */ +/* GODOT ENGINE */ +/* https://godotengine.org */ +/*************************************************************************/ +/* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ +/* Copyright (c) 2014-2018 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 GET_TYPE_INFO_H #define GET_TYPE_INFO_H diff --git a/core/typedefs.h b/core/typedefs.h index 9508fe28db..4758a5408d 100644 --- a/core/typedefs.h +++ b/core/typedefs.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef TYPEDEFS_H #define TYPEDEFS_H diff --git a/core/ucaps.h b/core/ucaps.h index 764350504a..95bac1aac6 100644 --- a/core/ucaps.h +++ b/core/ucaps.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef UCAPS_H #define UCAPS_H diff --git a/core/undo_redo.cpp b/core/undo_redo.cpp index 46d38b3abc..a105fba290 100644 --- a/core/undo_redo.cpp +++ b/core/undo_redo.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "undo_redo.h" #include "os/os.h" @@ -107,6 +108,7 @@ void UndoRedo::create_action(const String &p_name, MergeMode p_mode) { void UndoRedo::add_do_method(Object *p_object, const String &p_method, VARIANT_ARG_DECLARE) { VARIANT_ARGPTRS + ERR_FAIL_COND(p_object == NULL); ERR_FAIL_COND(action_level <= 0); ERR_FAIL_COND((current_action + 1) >= actions.size()); Operation do_op; @@ -126,6 +128,7 @@ void UndoRedo::add_do_method(Object *p_object, const String &p_method, VARIANT_A void UndoRedo::add_undo_method(Object *p_object, const String &p_method, VARIANT_ARG_DECLARE) { VARIANT_ARGPTRS + ERR_FAIL_COND(p_object == NULL); ERR_FAIL_COND(action_level <= 0); ERR_FAIL_COND((current_action + 1) >= actions.size()); @@ -148,6 +151,7 @@ void UndoRedo::add_undo_method(Object *p_object, const String &p_method, VARIANT } void UndoRedo::add_do_property(Object *p_object, const String &p_property, const Variant &p_value) { + ERR_FAIL_COND(p_object == NULL); ERR_FAIL_COND(action_level <= 0); ERR_FAIL_COND((current_action + 1) >= actions.size()); Operation do_op; @@ -162,6 +166,7 @@ void UndoRedo::add_do_property(Object *p_object, const String &p_property, const } void UndoRedo::add_undo_property(Object *p_object, const String &p_property, const Variant &p_value) { + ERR_FAIL_COND(p_object == NULL); ERR_FAIL_COND(action_level <= 0); ERR_FAIL_COND((current_action + 1) >= actions.size()); @@ -181,6 +186,7 @@ void UndoRedo::add_undo_property(Object *p_object, const String &p_property, con } void UndoRedo::add_do_reference(Object *p_object) { + ERR_FAIL_COND(p_object == NULL); ERR_FAIL_COND(action_level <= 0); ERR_FAIL_COND((current_action + 1) >= actions.size()); Operation do_op; @@ -193,6 +199,7 @@ void UndoRedo::add_do_reference(Object *p_object) { } void UndoRedo::add_undo_reference(Object *p_object) { + ERR_FAIL_COND(p_object == NULL); ERR_FAIL_COND(action_level <= 0); ERR_FAIL_COND((current_action + 1) >= actions.size()); diff --git a/core/undo_redo.h b/core/undo_redo.h index 27bd7c2fd0..5d7ab782d6 100644 --- a/core/undo_redo.h +++ b/core/undo_redo.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef UNDO_REDO_H #define UNDO_REDO_H diff --git a/core/ustring.cpp b/core/ustring.cpp index 11d83a5733..528ecc52db 100644 --- a/core/ustring.cpp +++ b/core/ustring.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "ustring.h" #include "color.h" diff --git a/core/ustring.h b/core/ustring.h index 8dd8b0fed3..90496b71b6 100644 --- a/core/ustring.h +++ b/core/ustring.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef RSTRING_H #define RSTRING_H diff --git a/core/variant.cpp b/core/variant.cpp index 5d4879dba7..2e26169bfe 100644 --- a/core/variant.cpp +++ b/core/variant.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "variant.h" #include "core_string_names.h" diff --git a/core/variant.h b/core/variant.h index 6c9204a18e..51ee8ea9d1 100644 --- a/core/variant.h +++ b/core/variant.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef VARIANT_H #define VARIANT_H diff --git a/core/variant_call.cpp b/core/variant_call.cpp index 81e823b5db..e9f7af3f63 100644 --- a/core/variant_call.cpp +++ b/core/variant_call.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "variant.h" #include "core_string_names.h" diff --git a/core/variant_construct_string.cpp b/core/variant_construct_string.cpp index 408e54bc99..2250c03f3d 100644 --- a/core/variant_construct_string.cpp +++ b/core/variant_construct_string.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "variant.h" class VariantConstruct { diff --git a/core/variant_op.cpp b/core/variant_op.cpp index 96b09c904d..e46fac77ee 100644 --- a/core/variant_op.cpp +++ b/core/variant_op.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "variant.h" #include "core_string_names.h" @@ -338,7 +339,7 @@ bool Variant::booleanize() const { CASE_TYPE(m_prefix, m_op_name, m_name) { \ if (p_b.type == NIL) \ _RETURN(true) \ - DEFAULT_OP_ARRAY_OP_BODY(m_prefix, m_op_name, m_name, m_type, !=, ==, true, true, false) \ + DEFAULT_OP_ARRAY_OP_BODY(m_prefix, m_op_name, m_name, m_type, !=, !=, false, true, true) \ } #define DEFAULT_OP_ARRAY_LT(m_prefix, m_op_name, m_name, m_type) \ @@ -538,12 +539,12 @@ void Variant::evaluate(const Operator &p_op, const Variant &p_a, if (arr_b->size() != l) _RETURN(true); for (int i = 0; i < l; i++) { - if (((*arr_a)[i] == (*arr_b)[i])) { - _RETURN(false); + if (((*arr_a)[i] != (*arr_b)[i])) { + _RETURN(true); } } - _RETURN(true); + _RETURN(false); } DEFAULT_OP_NUM_NULL(math, OP_NOT_EQUAL, INT, !=, _int); diff --git a/core/variant_parser.cpp b/core/variant_parser.cpp index a78e18112d..54edb02347 100644 --- a/core/variant_parser.cpp +++ b/core/variant_parser.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "variant_parser.h" #include "core/string_buffer.h" diff --git a/core/variant_parser.h b/core/variant_parser.h index 18b6998f55..8d95595234 100644 --- a/core/variant_parser.h +++ b/core/variant_parser.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef VARIANT_PARSER_H #define VARIANT_PARSER_H diff --git a/core/vector.h b/core/vector.h index 456d446a4b..f586471e27 100644 --- a/core/vector.h +++ b/core/vector.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef VECTOR_H #define VECTOR_H diff --git a/core/version.h b/core/version.h index bf2f2c9d99..7a55d69ad7 100644 --- a/core/version.h +++ b/core/version.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "version_generated.gen.h" #ifdef VERSION_PATCH diff --git a/core/vmap.h b/core/vmap.h index 341fc273d4..8636c02997 100644 --- a/core/vmap.h +++ b/core/vmap.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef VMAP_H #define VMAP_H diff --git a/core/vset.h b/core/vset.h index f4036c7c7e..449943b4a1 100644 --- a/core/vset.h +++ b/core/vset.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef VSET_H #define VSET_H diff --git a/doc/classes/@GDScript.xml b/doc/classes/@GDScript.xml index cd05c83347..c98a80ca8c 100644 --- a/doc/classes/@GDScript.xml +++ b/doc/classes/@GDScript.xml @@ -41,10 +41,12 @@ <argument index="1" name="alpha" type="float"> </argument> <description> - Returns color [code]name[/code] with [code]alpha[/code] ranging from 0 to 1. Note: [code]name[/code] is defined in color_names.inc. + Returns a color according to the standardised [code]name[/code] with [code]alpha[/code] ranging from 0 to 1. [codeblock] - red = ColorN('red') + red = ColorN("red", 1) [/codeblock] + Supported color names: + "aliceblue", "antiquewhite", "aqua", "aquamarine", "azure", "beige", "bisque", "black", "blanchedalmond", "blue", "blueviolet", "brown", "burlywood", "cadetblue", "chartreuse", "chocolate", "coral", "cornflower", "cornsilk", "crimson", "cyan", "darkblue", "darkcyan", "darkgoldenrod", "darkgray", "darkgreen", "darkkhaki", "darkmagenta", "darkolivegreen", "darkorange", "darkorchid", "darkred", "darksalmon", "darkseagreen", "darkslateblue", "darkslategray", "darkturquoise", "darkviolet", "deeppink", "deepskyblue", "dimgray", "dodgerblue", "firebrick", "floralwhite", "forestgreen", "fuchsia", "gainsboro", "ghostwhite", "gold", "goldenrod", "gray", "webgray", "green", "webgreen", "greenyellow", "honeydew", "hotpink", "indianred", "indigo", "ivory", "khaki", "lavender", "lavenderblush", "lawngreen", "lemonchiffon", "lightblue", "lightcoral", "lightcyan", "lightgoldenrod", "lightgray", "lightgreen", "lightpink", "lightsalmon", "lightseagreen", "lightskyblue", "lightslategray", "lightsteelblue", "lightyellow", "lime", "limegreen", "linen", "magenta", "maroon", "webmaroon", "mediumaquamarine", "mediumblue", "mediumorchid", "mediumpurple", "mediumseagreen", "mediumslateblue", "mediumspringgreen", "mediumturquoise", "mediumvioletred", "midnightblue", "mintcream", "mistyrose", "moccasin", "navajowhite", "navyblue", "oldlace", "olive", "olivedrab", "orange", "orangered", "orchid", "palegoldenrod", "palegreen", "paleturquoise", "palevioletred", "papayawhip", "peachpuff", "peru", "pink", "plum", "powderblue", "purple", "webpurple", "rebeccapurple", "red", "rosybrown", "royalblue", "saddlebrown", "salmon", "sandybrown", "seagreen", "seashell", "sienna", "silver", "skyblue", "slateblue", "slategray", "snow", "springgreen", "steelblue", "tan", "teal", "thistle", "tomato", "turquoise", "violet", "wheat", "white", "whitesmoke", "yellow", "yellowgreen". </description> </method> <method name="abs"> diff --git a/doc/classes/Color.xml b/doc/classes/Color.xml index 6fa7ed0a86..ef555537a1 100644 --- a/doc/classes/Color.xml +++ b/doc/classes/Color.xml @@ -5,6 +5,7 @@ </brief_description> <description> A color is represented as red, green and blue (r,g,b) components. Additionally, "a" represents the alpha component, often used for transparency. Values are in floating point and usually range from 0 to 1. Some methods (such as set_modulate(color)) may accept values > 1. + You can also create a color from standardised color names with [method @GDScript.ColorN]. </description> <tutorials> </tutorials> @@ -63,7 +64,7 @@ <argument index="0" name="from" type="String"> </argument> <description> - Constructs a color from an HTML hexadecimal color string in ARGB or RGB format. + Constructs a color from an HTML hexadecimal color string in ARGB or RGB format. See also [method @GDScript.ColorN]. The following string formats are supported: [code]"#ff00ff00"[/code] - ARGB format with '#' [code]"ff00ff00"[/code] - ARGB format diff --git a/doc/classes/Control.xml b/doc/classes/Control.xml index 6c30a92ed5..680e008ff1 100644 --- a/doc/classes/Control.xml +++ b/doc/classes/Control.xml @@ -632,6 +632,7 @@ Distance between the node's top edge and its parent container, based on [member anchor_top]. </member> <member name="mouse_filter" type="int" setter="set_mouse_filter" getter="get_mouse_filter" enum="Control.MouseFilter"> + Controls whether the control will be able to receive mouse button input events through [Control._gui_input] and how these events should be handled. Use one of the [code]MOUSE_FILTER_*[/code] constants. See the constants to learn what each does. </member> <member name="rect_clip_content" type="bool" setter="set_clip_contents" getter="is_clipping_contents"> </member> @@ -869,10 +870,13 @@ Tells the parent [Container] to align the node with its end, either the bottom or the right edge. It doesn't work with the fill or expand size flags. Use with [member size_flags_horizontal] and [member size_flags_vertical]. </constant> <constant name="MOUSE_FILTER_STOP" value="0" enum="MouseFilter"> + The control will receive mouse button input events through [method Control._gui_input] if clicked on. These events are automatically marked as handled and they will not propogate further to other controls. </constant> <constant name="MOUSE_FILTER_PASS" value="1" enum="MouseFilter"> + The control will receive mouse button input events through [method Control._gui_input] if clicked on. If this control does not handle the event, the parent control (if any) will be considered for a mouse click, and so on until there is no more parent control to potentially handle it. Even if no control handled it at all, the event will still be handled automatically. </constant> <constant name="MOUSE_FILTER_IGNORE" value="2" enum="MouseFilter"> + The control will not receive mouse button input events through [method Control._gui_input] and will not block other controls from receiving these events. These events will also not be handled automatically. </constant> <constant name="GROW_DIRECTION_BEGIN" value="0" enum="GrowDirection"> </constant> diff --git a/doc/classes/EditorInterface.xml b/doc/classes/EditorInterface.xml index 4bbbac8cf7..db715d2379 100644 --- a/doc/classes/EditorInterface.xml +++ b/doc/classes/EditorInterface.xml @@ -76,6 +76,12 @@ Returns the [ScriptEditor]. </description> </method> + <method name="get_selected_path" qualifiers="const"> + <return type="String"> + </return> + <description> + </description> + </method> <method name="get_selection"> <return type="EditorSelection"> </return> @@ -141,6 +147,14 @@ Saves the scene as a file at [code]path[/code]. </description> </method> + <method name="select_file"> + <return type="void"> + </return> + <argument index="0" name="p_file" type="String"> + </argument> + <description> + </description> + </method> </methods> <constants> </constants> diff --git a/doc/classes/EditorPlugin.xml b/doc/classes/EditorPlugin.xml index ada0ee56a8..1505845824 100644 --- a/doc/classes/EditorPlugin.xml +++ b/doc/classes/EditorPlugin.xml @@ -136,9 +136,7 @@ <method name="forward_canvas_gui_input" qualifiers="virtual"> <return type="bool"> </return> - <argument index="0" name="canvas_xform" type="Transform2D"> - </argument> - <argument index="1" name="event" type="InputEvent"> + <argument index="0" name="event" type="InputEvent"> </argument> <description> </description> diff --git a/doc/classes/Image.xml b/doc/classes/Image.xml index a01ffc99be..80bef2b385 100644 --- a/doc/classes/Image.xml +++ b/doc/classes/Image.xml @@ -395,6 +395,7 @@ Sets the [Color] of the pixel at [code](x, y)[/code] if the image is locked. Example: [codeblock] var img = Image.new() + img.create(img_width, img_height, false, Image.FORMAT_RGBA8) img.lock() img.set_pixel(x, y, color) # Works img.unlock() diff --git a/doc/classes/Vector2.xml b/doc/classes/Vector2.xml index 976cdbbd90..5c1281b628 100644 --- a/doc/classes/Vector2.xml +++ b/doc/classes/Vector2.xml @@ -92,7 +92,7 @@ <argument index="3" name="t" type="float"> </argument> <description> - Cubicly interpolates between this Vector and "b", using "pre_a" and "post_b" as handles, and returning the result at position "t". + Cubicly interpolates between this Vector and "b", using "pre_a" and "post_b" as handles, and returning the result at position "t". "t" should be a float of 0.0-1.0, a percentage of how far along the interpolation is. </description> </method> <method name="distance_squared_to"> @@ -158,7 +158,7 @@ <argument index="1" name="t" type="float"> </argument> <description> - Returns the result of the linear interpolation between this vector and "b", by amount "t". + Returns the result of the linear interpolation between this vector and "b", by amount "t". "t" should be a float of 0.0-1.0, a percentage of how far along the interpolation is. </description> </method> <method name="normalized"> diff --git a/doc/classes/Vector3.xml b/doc/classes/Vector3.xml index acb41297a7..dff3d04b0c 100644 --- a/doc/classes/Vector3.xml +++ b/doc/classes/Vector3.xml @@ -77,7 +77,7 @@ <argument index="3" name="t" type="float"> </argument> <description> - Performs a cubic interpolation between vectors [code]pre_a[/code], [code]a[/code], [code]b[/code], [code]post_b[/code] ([code]a[/code] is current), by the given amount (t). + Performs a cubic interpolation between vectors [code]pre_a[/code], [code]a[/code], [code]b[/code], [code]post_b[/code] ([code]a[/code] is current), by the given amount (t). (t) should be a float of 0.0-1.0, a percentage of how far along the interpolation is. </description> </method> <method name="distance_squared_to"> @@ -150,7 +150,7 @@ <argument index="1" name="t" type="float"> </argument> <description> - Linearly interpolates the vector to a given one (b), by the given amount (t). + Linearly interpolates the vector to a given one (b), by the given amount (t). (t) should be a float of 0.0-1.0, a percentage of how far along the interpolation is. </description> </method> <method name="max_axis"> diff --git a/drivers/alsa/audio_driver_alsa.cpp b/drivers/alsa/audio_driver_alsa.cpp index b54a1ce0fc..0bb03d23ea 100644 --- a/drivers/alsa/audio_driver_alsa.cpp +++ b/drivers/alsa/audio_driver_alsa.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "audio_driver_alsa.h" #ifdef ALSA_ENABLED diff --git a/drivers/alsa/audio_driver_alsa.h b/drivers/alsa/audio_driver_alsa.h index 8fcc368b65..8ed60dfdc7 100644 --- a/drivers/alsa/audio_driver_alsa.h +++ b/drivers/alsa/audio_driver_alsa.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "servers/audio_server.h" #ifdef ALSA_ENABLED diff --git a/drivers/convex_decomp/b2d_decompose.cpp b/drivers/convex_decomp/b2d_decompose.cpp index 07be20979d..d1f7a4d3c3 100644 --- a/drivers/convex_decomp/b2d_decompose.cpp +++ b/drivers/convex_decomp/b2d_decompose.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "b2d_decompose.h" #include "thirdparty/b2d_convexdecomp/b2Polygon.h" diff --git a/drivers/convex_decomp/b2d_decompose.h b/drivers/convex_decomp/b2d_decompose.h index 117fd2b5b0..068689d73d 100644 --- a/drivers/convex_decomp/b2d_decompose.h +++ b/drivers/convex_decomp/b2d_decompose.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef B2D_DECOMPOSE_H #define B2D_DECOMPOSE_H diff --git a/drivers/coreaudio/audio_driver_coreaudio.cpp b/drivers/coreaudio/audio_driver_coreaudio.cpp index 4e940e91c9..6db9aebeed 100644 --- a/drivers/coreaudio/audio_driver_coreaudio.cpp +++ b/drivers/coreaudio/audio_driver_coreaudio.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifdef COREAUDIO_ENABLED #include "audio_driver_coreaudio.h" diff --git a/drivers/coreaudio/audio_driver_coreaudio.h b/drivers/coreaudio/audio_driver_coreaudio.h index d04d789a70..51256085d8 100644 --- a/drivers/coreaudio/audio_driver_coreaudio.h +++ b/drivers/coreaudio/audio_driver_coreaudio.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifdef COREAUDIO_ENABLED #ifndef AUDIO_DRIVER_COREAUDIO_H diff --git a/drivers/gl_context/context_gl.cpp b/drivers/gl_context/context_gl.cpp index 8cb5c3e8c6..aa36658698 100644 --- a/drivers/gl_context/context_gl.cpp +++ b/drivers/gl_context/context_gl.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "context_gl.h" #if defined(OPENGL_ENABLED) || defined(GLES_ENABLED) diff --git a/drivers/gl_context/context_gl.h b/drivers/gl_context/context_gl.h index e6cb586bca..60781a3453 100644 --- a/drivers/gl_context/context_gl.h +++ b/drivers/gl_context/context_gl.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef CONTEXT_GL_H #define CONTEXT_GL_H diff --git a/drivers/gles3/rasterizer_canvas_gles3.cpp b/drivers/gles3/rasterizer_canvas_gles3.cpp index 52269a44fe..4dcbdf4190 100644 --- a/drivers/gles3/rasterizer_canvas_gles3.cpp +++ b/drivers/gles3/rasterizer_canvas_gles3.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "rasterizer_canvas_gles3.h" #include "os/os.h" #include "project_settings.h" diff --git a/drivers/gles3/rasterizer_canvas_gles3.h b/drivers/gles3/rasterizer_canvas_gles3.h index f4d97bd727..9f1a9466f1 100644 --- a/drivers/gles3/rasterizer_canvas_gles3.h +++ b/drivers/gles3/rasterizer_canvas_gles3.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef RASTERIZERCANVASGLES3_H #define RASTERIZERCANVASGLES3_H diff --git a/drivers/gles3/rasterizer_gles3.cpp b/drivers/gles3/rasterizer_gles3.cpp index 7ae1758643..99ba0860bd 100644 --- a/drivers/gles3/rasterizer_gles3.cpp +++ b/drivers/gles3/rasterizer_gles3.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "rasterizer_gles3.h" #include "gl_context/context_gl.h" diff --git a/drivers/gles3/rasterizer_gles3.h b/drivers/gles3/rasterizer_gles3.h index a8342104cc..5213101778 100644 --- a/drivers/gles3/rasterizer_gles3.h +++ b/drivers/gles3/rasterizer_gles3.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef RASTERIZERGLES3_H #define RASTERIZERGLES3_H diff --git a/drivers/gles3/rasterizer_scene_gles3.cpp b/drivers/gles3/rasterizer_scene_gles3.cpp index ed29cc2de6..da6df7198d 100644 --- a/drivers/gles3/rasterizer_scene_gles3.cpp +++ b/drivers/gles3/rasterizer_scene_gles3.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "rasterizer_scene_gles3.h" #include "math_funcs.h" #include "os/os.h" @@ -2229,7 +2230,7 @@ void RasterizerSceneGLES3::_add_geometry(RasterizerStorageGLES3::Geometry *p_geo void RasterizerSceneGLES3::_add_geometry_with_material(RasterizerStorageGLES3::Geometry *p_geometry, InstanceBase *p_instance, RasterizerStorageGLES3::GeometryOwner *p_owner, RasterizerStorageGLES3::Material *p_material, bool p_depth_pass, bool p_shadow_pass) { - bool has_base_alpha = (p_material->shader->spatial.uses_alpha && !p_material->shader->spatial.uses_alpha_scissor) || p_material->shader->spatial.uses_screen_texture; + bool has_base_alpha = (p_material->shader->spatial.uses_alpha && !p_material->shader->spatial.uses_alpha_scissor) || p_material->shader->spatial.uses_screen_texture || p_material->shader->spatial.uses_depth_texture; bool has_blend_alpha = p_material->shader->spatial.blend_mode != RasterizerStorageGLES3::Shader::Spatial::BLEND_MODE_MIX; bool has_alpha = has_base_alpha || has_blend_alpha; @@ -2253,7 +2254,7 @@ void RasterizerSceneGLES3::_add_geometry_with_material(RasterizerStorageGLES3::G if (p_depth_pass) { - if (has_blend_alpha || (has_base_alpha && p_material->shader->spatial.depth_draw_mode != RasterizerStorageGLES3::Shader::Spatial::DEPTH_DRAW_ALPHA_PREPASS)) + if (has_blend_alpha || p_material->shader->spatial.uses_depth_texture || (has_base_alpha && p_material->shader->spatial.depth_draw_mode != RasterizerStorageGLES3::Shader::Spatial::DEPTH_DRAW_ALPHA_PREPASS)) return; //bye if (!p_material->shader->spatial.uses_alpha_scissor && !p_material->shader->spatial.writes_modelview_or_projection && !p_material->shader->spatial.uses_vertex && !p_material->shader->spatial.uses_discard && p_material->shader->spatial.depth_draw_mode != RasterizerStorageGLES3::Shader::Spatial::DEPTH_DRAW_ALPHA_PREPASS) { diff --git a/drivers/gles3/rasterizer_scene_gles3.h b/drivers/gles3/rasterizer_scene_gles3.h index 07a58c2945..1b99e119ce 100644 --- a/drivers/gles3/rasterizer_scene_gles3.h +++ b/drivers/gles3/rasterizer_scene_gles3.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef RASTERIZERSCENEGLES3_H #define RASTERIZERSCENEGLES3_H diff --git a/drivers/gles3/rasterizer_storage_gles3.cpp b/drivers/gles3/rasterizer_storage_gles3.cpp index d35d624589..b63ebcba54 100644 --- a/drivers/gles3/rasterizer_storage_gles3.cpp +++ b/drivers/gles3/rasterizer_storage_gles3.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "rasterizer_storage_gles3.h" #include "project_settings.h" #include "rasterizer_canvas_gles3.h" @@ -1618,6 +1619,7 @@ void RasterizerStorageGLES3::_update_shader(Shader *p_shader) const { p_shader->spatial.uses_time = false; p_shader->spatial.uses_vertex_lighting = false; p_shader->spatial.uses_screen_texture = false; + p_shader->spatial.uses_depth_texture = false; p_shader->spatial.uses_vertex = false; p_shader->spatial.writes_modelview_or_projection = false; p_shader->spatial.uses_world_coordinates = false; @@ -1649,6 +1651,7 @@ void RasterizerStorageGLES3::_update_shader(Shader *p_shader) const { shaders.actions_scene.usage_flag_pointers["SSS_STRENGTH"] = &p_shader->spatial.uses_sss; shaders.actions_scene.usage_flag_pointers["DISCARD"] = &p_shader->spatial.uses_discard; shaders.actions_scene.usage_flag_pointers["SCREEN_TEXTURE"] = &p_shader->spatial.uses_screen_texture; + shaders.actions_scene.usage_flag_pointers["DEPTH_TEXTURE"] = &p_shader->spatial.uses_depth_texture; shaders.actions_scene.usage_flag_pointers["TIME"] = &p_shader->spatial.uses_time; shaders.actions_scene.write_flag_pointers["MODELVIEW_MATRIX"] = &p_shader->spatial.writes_modelview_or_projection; @@ -6903,6 +6906,7 @@ bool RasterizerStorageGLES3::free(RID p_rid) { // delete the texture GIProbe *gi_probe = gi_probe_owner.get(p_rid); + gi_probe->instance_remove_deps(); gi_probe_owner.free(p_rid); memdelete(gi_probe); @@ -6918,6 +6922,7 @@ bool RasterizerStorageGLES3::free(RID p_rid) { // delete the texture LightmapCapture *lightmap_capture = lightmap_capture_data_owner.get(p_rid); + lightmap_capture->instance_remove_deps(); gi_probe_owner.free(p_rid); memdelete(lightmap_capture); diff --git a/drivers/gles3/rasterizer_storage_gles3.h b/drivers/gles3/rasterizer_storage_gles3.h index 74bd0a3cc1..ef2b247266 100644 --- a/drivers/gles3/rasterizer_storage_gles3.h +++ b/drivers/gles3/rasterizer_storage_gles3.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef RASTERIZERSTORAGEGLES3_H #define RASTERIZERSTORAGEGLES3_H @@ -472,6 +473,7 @@ public: bool uses_discard; bool uses_sss; bool uses_screen_texture; + bool uses_depth_texture; bool uses_time; bool writes_modelview_or_projection; bool uses_vertex_lighting; diff --git a/drivers/gles3/shader_compiler_gles3.cpp b/drivers/gles3/shader_compiler_gles3.cpp index 8b8a7dd807..875946f089 100644 --- a/drivers/gles3/shader_compiler_gles3.cpp +++ b/drivers/gles3/shader_compiler_gles3.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "shader_compiler_gles3.h" #include "os/os.h" @@ -266,7 +267,7 @@ void ShaderCompilerGLES3::_dump_function_deps(SL::ShaderNode *p_node, const Stri } } -String ShaderCompilerGLES3::_dump_node_code(SL::Node *p_node, int p_level, GeneratedCode &r_gen_code, IdentifierActions &p_actions, const DefaultIdentifierActions &p_default_actions) { +String ShaderCompilerGLES3::_dump_node_code(SL::Node *p_node, int p_level, GeneratedCode &r_gen_code, IdentifierActions &p_actions, const DefaultIdentifierActions &p_default_actions, bool p_assigning) { String code; @@ -406,7 +407,7 @@ String ShaderCompilerGLES3::_dump_node_code(SL::Node *p_node, int p_level, Gener //code for functions for (int i = 0; i < pnode->functions.size(); i++) { SL::FunctionNode *fnode = pnode->functions[i].function; - function_code[fnode->name] = _dump_node_code(fnode->body, p_level + 1, r_gen_code, p_actions, p_default_actions); + function_code[fnode->name] = _dump_node_code(fnode->body, p_level + 1, r_gen_code, p_actions, p_default_actions, p_assigning); } //place functions in actual code @@ -454,7 +455,7 @@ String ShaderCompilerGLES3::_dump_node_code(SL::Node *p_node, int p_level, Gener for (int i = 0; i < bnode->statements.size(); i++) { - String scode = _dump_node_code(bnode->statements[i], p_level, r_gen_code, p_actions, p_default_actions); + String scode = _dump_node_code(bnode->statements[i], p_level, r_gen_code, p_actions, p_default_actions, p_assigning); if (bnode->statements[i]->type == SL::Node::TYPE_CONTROL_FLOW || bnode->single_statement) { code += scode; //use directly @@ -480,7 +481,7 @@ String ShaderCompilerGLES3::_dump_node_code(SL::Node *p_node, int p_level, Gener declaration += _mkid(vdnode->declarations[i].name); if (vdnode->declarations[i].initializer) { declaration += "="; - declaration += _dump_node_code(vdnode->declarations[i].initializer, p_level, r_gen_code, p_actions, p_default_actions); + declaration += _dump_node_code(vdnode->declarations[i].initializer, p_level, r_gen_code, p_actions, p_default_actions, p_assigning); } } @@ -489,6 +490,10 @@ String ShaderCompilerGLES3::_dump_node_code(SL::Node *p_node, int p_level, Gener case SL::Node::TYPE_VARIABLE: { SL::VariableNode *vnode = (SL::VariableNode *)p_node; + if (p_assigning && p_actions.write_flag_pointers.has(vnode->name)) { + *p_actions.write_flag_pointers[vnode->name] = true; + } + if (p_default_actions.usage_defines.has(vnode->name) && !used_name_defines.has(vnode->name)) { String define = p_default_actions.usage_defines[vnode->name]; if (define.begins_with("@")) { @@ -539,24 +544,18 @@ String ShaderCompilerGLES3::_dump_node_code(SL::Node *p_node, int p_level, Gener case SL::OP_ASSIGN_BIT_AND: case SL::OP_ASSIGN_BIT_OR: case SL::OP_ASSIGN_BIT_XOR: - if (onode->arguments[0]->type == SL::Node::TYPE_VARIABLE) { - SL::VariableNode *vnode = (SL::VariableNode *)onode->arguments[0]; - if (p_actions.write_flag_pointers.has(vnode->name)) { - *p_actions.write_flag_pointers[vnode->name] = true; - } - } - code = _dump_node_code(onode->arguments[0], p_level, r_gen_code, p_actions, p_default_actions) + _opstr(onode->op) + _dump_node_code(onode->arguments[1], p_level, r_gen_code, p_actions, p_default_actions); + code = _dump_node_code(onode->arguments[0], p_level, r_gen_code, p_actions, p_default_actions, true) + _opstr(onode->op) + _dump_node_code(onode->arguments[1], p_level, r_gen_code, p_actions, p_default_actions, p_assigning); break; case SL::OP_BIT_INVERT: case SL::OP_NEGATE: case SL::OP_NOT: case SL::OP_DECREMENT: case SL::OP_INCREMENT: - code = _opstr(onode->op) + _dump_node_code(onode->arguments[0], p_level, r_gen_code, p_actions, p_default_actions); + code = _opstr(onode->op) + _dump_node_code(onode->arguments[0], p_level, r_gen_code, p_actions, p_default_actions, p_assigning); break; case SL::OP_POST_DECREMENT: case SL::OP_POST_INCREMENT: - code = _dump_node_code(onode->arguments[0], p_level, r_gen_code, p_actions, p_default_actions) + _opstr(onode->op); + code = _dump_node_code(onode->arguments[0], p_level, r_gen_code, p_actions, p_default_actions, p_assigning) + _opstr(onode->op); break; case SL::OP_CALL: case SL::OP_CONSTRUCT: { @@ -583,31 +582,31 @@ String ShaderCompilerGLES3::_dump_node_code(SL::Node *p_node, int p_level, Gener for (int i = 1; i < onode->arguments.size(); i++) { if (i > 1) code += ", "; - code += _dump_node_code(onode->arguments[i], p_level, r_gen_code, p_actions, p_default_actions); + code += _dump_node_code(onode->arguments[i], p_level, r_gen_code, p_actions, p_default_actions, p_assigning); } code += ")"; } break; case SL::OP_INDEX: { - code += _dump_node_code(onode->arguments[0], p_level, r_gen_code, p_actions, p_default_actions); + code += _dump_node_code(onode->arguments[0], p_level, r_gen_code, p_actions, p_default_actions, p_assigning); code += "["; - code += _dump_node_code(onode->arguments[1], p_level, r_gen_code, p_actions, p_default_actions); + code += _dump_node_code(onode->arguments[1], p_level, r_gen_code, p_actions, p_default_actions, p_assigning); code += "]"; } break; case SL::OP_SELECT_IF: { - code += _dump_node_code(onode->arguments[0], p_level, r_gen_code, p_actions, p_default_actions); + code += _dump_node_code(onode->arguments[0], p_level, r_gen_code, p_actions, p_default_actions, p_assigning); code += "?"; - code += _dump_node_code(onode->arguments[1], p_level, r_gen_code, p_actions, p_default_actions); + code += _dump_node_code(onode->arguments[1], p_level, r_gen_code, p_actions, p_default_actions, p_assigning); code += ":"; - code += _dump_node_code(onode->arguments[2], p_level, r_gen_code, p_actions, p_default_actions); + code += _dump_node_code(onode->arguments[2], p_level, r_gen_code, p_actions, p_default_actions, p_assigning); } break; default: { - code = "(" + _dump_node_code(onode->arguments[0], p_level, r_gen_code, p_actions, p_default_actions) + _opstr(onode->op) + _dump_node_code(onode->arguments[1], p_level, r_gen_code, p_actions, p_default_actions) + ")"; + code = "(" + _dump_node_code(onode->arguments[0], p_level, r_gen_code, p_actions, p_default_actions, p_assigning) + _opstr(onode->op) + _dump_node_code(onode->arguments[1], p_level, r_gen_code, p_actions, p_default_actions, p_assigning) + ")"; break; } } @@ -617,29 +616,29 @@ String ShaderCompilerGLES3::_dump_node_code(SL::Node *p_node, int p_level, Gener SL::ControlFlowNode *cfnode = (SL::ControlFlowNode *)p_node; if (cfnode->flow_op == SL::FLOW_OP_IF) { - code += _mktab(p_level) + "if (" + _dump_node_code(cfnode->expressions[0], p_level, r_gen_code, p_actions, p_default_actions) + ")\n"; - code += _dump_node_code(cfnode->blocks[0], p_level + 1, r_gen_code, p_actions, p_default_actions); + code += _mktab(p_level) + "if (" + _dump_node_code(cfnode->expressions[0], p_level, r_gen_code, p_actions, p_default_actions, p_assigning) + ")\n"; + code += _dump_node_code(cfnode->blocks[0], p_level + 1, r_gen_code, p_actions, p_default_actions, p_assigning); if (cfnode->blocks.size() == 2) { code += _mktab(p_level) + "else\n"; - code += _dump_node_code(cfnode->blocks[1], p_level + 1, r_gen_code, p_actions, p_default_actions); + code += _dump_node_code(cfnode->blocks[1], p_level + 1, r_gen_code, p_actions, p_default_actions, p_assigning); } } else if (cfnode->flow_op == SL::FLOW_OP_WHILE) { - code += _mktab(p_level) + "while (" + _dump_node_code(cfnode->expressions[0], p_level, r_gen_code, p_actions, p_default_actions) + ")\n"; - code += _dump_node_code(cfnode->blocks[0], p_level + 1, r_gen_code, p_actions, p_default_actions); + code += _mktab(p_level) + "while (" + _dump_node_code(cfnode->expressions[0], p_level, r_gen_code, p_actions, p_default_actions, p_assigning) + ")\n"; + code += _dump_node_code(cfnode->blocks[0], p_level + 1, r_gen_code, p_actions, p_default_actions, p_assigning); } else if (cfnode->flow_op == SL::FLOW_OP_FOR) { - String left = _dump_node_code(cfnode->blocks[0], p_level, r_gen_code, p_actions, p_default_actions); - String middle = _dump_node_code(cfnode->expressions[0], p_level, r_gen_code, p_actions, p_default_actions); - String right = _dump_node_code(cfnode->expressions[1], p_level, r_gen_code, p_actions, p_default_actions); + String left = _dump_node_code(cfnode->blocks[0], p_level, r_gen_code, p_actions, p_default_actions, p_assigning); + String middle = _dump_node_code(cfnode->expressions[0], p_level, r_gen_code, p_actions, p_default_actions, p_assigning); + String right = _dump_node_code(cfnode->expressions[1], p_level, r_gen_code, p_actions, p_default_actions, p_assigning); code += _mktab(p_level) + "for (" + left + ";" + middle + ";" + right + ")\n"; - code += _dump_node_code(cfnode->blocks[1], p_level + 1, r_gen_code, p_actions, p_default_actions); + code += _dump_node_code(cfnode->blocks[1], p_level + 1, r_gen_code, p_actions, p_default_actions, p_assigning); } else if (cfnode->flow_op == SL::FLOW_OP_RETURN) { if (cfnode->expressions.size()) { - code = "return " + _dump_node_code(cfnode->expressions[0], p_level, r_gen_code, p_actions, p_default_actions) + ";"; + code = "return " + _dump_node_code(cfnode->expressions[0], p_level, r_gen_code, p_actions, p_default_actions, p_assigning) + ";"; } else { code = "return;"; } @@ -657,7 +656,7 @@ String ShaderCompilerGLES3::_dump_node_code(SL::Node *p_node, int p_level, Gener } break; case SL::Node::TYPE_MEMBER: { SL::MemberNode *mnode = (SL::MemberNode *)p_node; - code = _dump_node_code(mnode->owner, p_level, r_gen_code, p_actions, p_default_actions) + "." + mnode->name; + code = _dump_node_code(mnode->owner, p_level, r_gen_code, p_actions, p_default_actions, p_assigning) + "." + mnode->name; } break; } @@ -693,7 +692,7 @@ Error ShaderCompilerGLES3::compile(VS::ShaderMode p_mode, const String &p_code, used_rmode_defines.clear(); used_flag_pointers.clear(); - _dump_node_code(parser.get_shader(), 1, r_gen_code, *p_actions, actions[p_mode]); + _dump_node_code(parser.get_shader(), 1, r_gen_code, *p_actions, actions[p_mode], false); if (r_gen_code.uniform_total_size) { //uniforms used? int md = sizeof(float) * 4; diff --git a/drivers/gles3/shader_compiler_gles3.h b/drivers/gles3/shader_compiler_gles3.h index 0d79b0f4cc..85e8e02b8e 100644 --- a/drivers/gles3/shader_compiler_gles3.h +++ b/drivers/gles3/shader_compiler_gles3.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef SHADERCOMPILERGLES3_H #define SHADERCOMPILERGLES3_H @@ -77,7 +78,7 @@ private: }; void _dump_function_deps(ShaderLanguage::ShaderNode *p_node, const StringName &p_for_func, const Map<StringName, String> &p_func_code, String &r_to_add, Set<StringName> &added); - String _dump_node_code(ShaderLanguage::Node *p_node, int p_level, GeneratedCode &r_gen_code, IdentifierActions &p_actions, const DefaultIdentifierActions &p_default_actions); + String _dump_node_code(ShaderLanguage::Node *p_node, int p_level, GeneratedCode &r_gen_code, IdentifierActions &p_actions, const DefaultIdentifierActions &p_default_actions, bool p_assigning); StringName current_func_name; StringName vertex_name; diff --git a/drivers/gles3/shader_gles3.cpp b/drivers/gles3/shader_gles3.cpp index 6f7b58e922..08b8a1cc26 100644 --- a/drivers/gles3/shader_gles3.cpp +++ b/drivers/gles3/shader_gles3.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "shader_gles3.h" #include "print_string.h" diff --git a/drivers/gles3/shader_gles3.h b/drivers/gles3/shader_gles3.h index 95119a9718..996655615e 100644 --- a/drivers/gles3/shader_gles3.h +++ b/drivers/gles3/shader_gles3.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef SHADER_GLES3_H #define SHADER_GLES3_H diff --git a/drivers/gles3/shaders/scene.glsl b/drivers/gles3/shaders/scene.glsl index 6427e3d967..1aa28d0fd5 100644 --- a/drivers/gles3/shaders/scene.glsl +++ b/drivers/gles3/shaders/scene.glsl @@ -445,8 +445,7 @@ VERTEX_SHADER_CODE vtx.z=(distance/shadow_dual_paraboloid_render_zfar); vtx.z=vtx.z * 2.0 - 1.0; - vertex.xyz=vtx; - vertex.w=1.0; + vertex_interp = vtx; #else @@ -1476,9 +1475,9 @@ void gi_probe_compute(mediump sampler3D probe, mat4 probe_xform, vec3 bounds,vec return; } - //vec3 blendv = probe_pos/bounds * 2.0 - 1.0; - //float blend = 1.001-max(blendv.x,max(blendv.y,blendv.z)); - float blend=1.0; + vec3 blendv = abs(probe_pos/bounds * 2.0 - 1.0); + float blend = 1.001-max(blendv.x,max(blendv.y,blendv.z)); + //float blend=1.0; float max_distance = length(bounds); @@ -1649,7 +1648,7 @@ void main() { #if defined(ENABLE_NORMALMAP) - vec3 normalmap = vec3(0.0); + vec3 normalmap = vec3(0.5); #endif float normaldepth=1.0; @@ -2004,7 +2003,7 @@ FRAGMENT_SHADER_CODE } #ifndef USE_LIGHTMAP if (ambient_accum.a>0.0) { - ambient_light+=ambient_accum.rgb/ambient_accum.a; + ambient_light=ambient_accum.rgb/ambient_accum.a; } #endif diff --git a/drivers/png/image_loader_png.cpp b/drivers/png/image_loader_png.cpp index 4f43006cb0..3f512af8d5 100644 --- a/drivers/png/image_loader_png.cpp +++ b/drivers/png/image_loader_png.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "image_loader_png.h" #include "os/os.h" diff --git a/drivers/png/image_loader_png.h b/drivers/png/image_loader_png.h index 155240a048..48f48e6bea 100644 --- a/drivers/png/image_loader_png.h +++ b/drivers/png/image_loader_png.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef IMAGE_LOADER_PNG_H #define IMAGE_LOADER_PNG_H diff --git a/drivers/png/resource_saver_png.cpp b/drivers/png/resource_saver_png.cpp index 7f5300bb39..270ae36e1e 100644 --- a/drivers/png/resource_saver_png.cpp +++ b/drivers/png/resource_saver_png.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "resource_saver_png.h" #include "core/image.h" diff --git a/drivers/png/resource_saver_png.h b/drivers/png/resource_saver_png.h index c921dcf24c..109b4801da 100644 --- a/drivers/png/resource_saver_png.h +++ b/drivers/png/resource_saver_png.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef RESOURCE_SAVER_PNG_H #define RESOURCE_SAVER_PNG_H diff --git a/drivers/pulseaudio/audio_driver_pulseaudio.cpp b/drivers/pulseaudio/audio_driver_pulseaudio.cpp index 815b5b47ef..e90245b300 100644 --- a/drivers/pulseaudio/audio_driver_pulseaudio.cpp +++ b/drivers/pulseaudio/audio_driver_pulseaudio.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "audio_driver_pulseaudio.h" #ifdef PULSEAUDIO_ENABLED diff --git a/drivers/pulseaudio/audio_driver_pulseaudio.h b/drivers/pulseaudio/audio_driver_pulseaudio.h index 71d4b42dfe..3bd1146f53 100644 --- a/drivers/pulseaudio/audio_driver_pulseaudio.h +++ b/drivers/pulseaudio/audio_driver_pulseaudio.h @@ -27,12 +27,15 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "servers/audio_server.h" #ifdef PULSEAUDIO_ENABLED +#ifndef AUDIO_DRIVER_PULSEAUDIO_H +#define AUDIO_DRIVER_PULSEAUDIO_H + #include "core/os/mutex.h" #include "core/os/thread.h" +#include "servers/audio_server.h" #include <pulse/simple.h> @@ -78,4 +81,6 @@ public: ~AudioDriverPulseAudio(); }; -#endif +#endif // AUDIO_DRIVER_PULSEAUDIO_H + +#endif // PULSEAUDIO_ENABLED diff --git a/drivers/register_driver_types.cpp b/drivers/register_driver_types.cpp index 497be89614..c6d36a5749 100644 --- a/drivers/register_driver_types.cpp +++ b/drivers/register_driver_types.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "register_driver_types.h" #include "core/math/geometry.h" diff --git a/drivers/register_driver_types.h b/drivers/register_driver_types.h index 09c9dd898f..ddd1fac093 100644 --- a/drivers/register_driver_types.h +++ b/drivers/register_driver_types.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef REGISTER_DRIVER_TYPES_H #define REGISTER_DRIVER_TYPES_H diff --git a/drivers/rtaudio/audio_driver_rtaudio.cpp b/drivers/rtaudio/audio_driver_rtaudio.cpp index 2bfa62f30d..ed6f2e24ed 100644 --- a/drivers/rtaudio/audio_driver_rtaudio.cpp +++ b/drivers/rtaudio/audio_driver_rtaudio.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "audio_driver_rtaudio.h" #include "os/os.h" diff --git a/drivers/rtaudio/audio_driver_rtaudio.h b/drivers/rtaudio/audio_driver_rtaudio.h index 5fd46887c9..2a64652d5f 100644 --- a/drivers/rtaudio/audio_driver_rtaudio.h +++ b/drivers/rtaudio/audio_driver_rtaudio.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef AUDIO_DRIVER_RTAUDIO_H #define AUDIO_DRIVER_RTAUDIO_H diff --git a/drivers/unix/dir_access_unix.cpp b/drivers/unix/dir_access_unix.cpp index db398691b0..4a467293fd 100644 --- a/drivers/unix/dir_access_unix.cpp +++ b/drivers/unix/dir_access_unix.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "dir_access_unix.h" #if defined(UNIX_ENABLED) || defined(LIBC_FILEIO_ENABLED) diff --git a/drivers/unix/dir_access_unix.h b/drivers/unix/dir_access_unix.h index fdc433fe1d..a55acdbd34 100644 --- a/drivers/unix/dir_access_unix.h +++ b/drivers/unix/dir_access_unix.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef DIR_ACCESS_UNIX_H #define DIR_ACCESS_UNIX_H diff --git a/drivers/unix/file_access_unix.cpp b/drivers/unix/file_access_unix.cpp index d4b71b2c05..1ed3999e1e 100644 --- a/drivers/unix/file_access_unix.cpp +++ b/drivers/unix/file_access_unix.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "file_access_unix.h" #if defined(UNIX_ENABLED) || defined(LIBC_FILEIO_ENABLED) diff --git a/drivers/unix/file_access_unix.h b/drivers/unix/file_access_unix.h index e096feb775..6f792076b8 100644 --- a/drivers/unix/file_access_unix.h +++ b/drivers/unix/file_access_unix.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef FILE_ACCESS_UNIX_H #define FILE_ACCESS_UNIX_H diff --git a/drivers/unix/ip_unix.cpp b/drivers/unix/ip_unix.cpp index 11f44f8eb8..032d91f0dc 100644 --- a/drivers/unix/ip_unix.cpp +++ b/drivers/unix/ip_unix.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "ip_unix.h" #if defined(UNIX_ENABLED) || defined(WINDOWS_ENABLED) diff --git a/drivers/unix/ip_unix.h b/drivers/unix/ip_unix.h index 4c3d996d9b..d3d1ccfa85 100644 --- a/drivers/unix/ip_unix.h +++ b/drivers/unix/ip_unix.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef IP_UNIX_H #define IP_UNIX_H diff --git a/drivers/unix/mutex_posix.cpp b/drivers/unix/mutex_posix.cpp index ab21a66008..1f13720f1e 100644 --- a/drivers/unix/mutex_posix.cpp +++ b/drivers/unix/mutex_posix.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "mutex_posix.h" #include "os/memory.h" diff --git a/drivers/unix/mutex_posix.h b/drivers/unix/mutex_posix.h index c615a39545..a4de1603f3 100644 --- a/drivers/unix/mutex_posix.h +++ b/drivers/unix/mutex_posix.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef MUTEX_POSIX_H #define MUTEX_POSIX_H diff --git a/drivers/unix/os_unix.cpp b/drivers/unix/os_unix.cpp index fa8094f31a..5f45f06c79 100644 --- a/drivers/unix/os_unix.cpp +++ b/drivers/unix/os_unix.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "os_unix.h" #ifdef UNIX_ENABLED @@ -52,6 +53,7 @@ #if defined(__FreeBSD__) || defined(__OpenBSD__) #include <sys/param.h> +#include <sys/sysctl.h> #endif #include "project_settings.h" #include <assert.h> @@ -297,17 +299,7 @@ Error OS_Unix::execute(const String &p_path, const List<String> &p_arguments, bo args.push_back((char *)cs[i].get_data()); // shitty C cast args.push_back(0); -#ifdef __FreeBSD__ - if (p_path.find("/") != -1) { - // exec name contains path so use it - execv(p_path.utf8().get_data(), &args[0]); - } else { - // use program name and search through PATH to find it - execvp(getprogname(), &args[0]); - } -#else execvp(p_path.utf8().get_data(), &args[0]); -#endif // still alive? something failed.. fprintf(stderr, "**ERROR** OS_Unix::execute - Could not create child process while executing: %s\n", p_path.utf8().get_data()); abort(); @@ -362,7 +354,20 @@ String OS_Unix::get_locale() const { } Error OS_Unix::open_dynamic_library(const String p_path, void *&p_library_handle, bool p_also_set_library_path) { - p_library_handle = dlopen(p_path.utf8().get_data(), RTLD_NOW); + + String path = p_path; + + if (!FileAccess::exists(path)) { + //this code exists so gdnative can load .so files from within the executable path + path = get_executable_path().get_base_dir().plus_file(p_path.get_file()); + } + + if (!FileAccess::exists(path)) { + //this code exists so gdnative can load .so files from a standard unix location + path = get_executable_path().get_base_dir().plus_file("../lib").plus_file(p_path.get_file()); + } + + p_library_handle = dlopen(path.utf8().get_data(), RTLD_NOW); if (!p_library_handle) { ERR_EXPLAIN("Can't open dynamic library: " + p_path + ". Error: " + dlerror()); ERR_FAIL_V(ERR_CANT_OPEN); @@ -448,12 +453,23 @@ String OS_Unix::get_executable_path() const { return OS::get_executable_path(); } return b; -#elif defined(__FreeBSD__) || defined(__OpenBSD__) +#elif defined(__OpenBSD__) char resolved_path[MAXPATHLEN]; realpath(OS::get_executable_path().utf8().get_data(), resolved_path); return String(resolved_path); +#elif defined(__FreeBSD__) + int mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 }; + char buf[MAXPATHLEN]; + size_t len = sizeof(buf); + if (sysctl(mib, 4, buf, &len, NULL, 0) != 0) { + WARN_PRINT("Couldn't get executable path from sysctl"); + return OS::get_executable_path(); + } + String b; + b.parse_utf8(buf); + return b; #elif defined(__APPLE__) char temp_path[1]; uint32_t buff_size = 1; diff --git a/drivers/unix/os_unix.h b/drivers/unix/os_unix.h index d224a55647..a7c9015330 100644 --- a/drivers/unix/os_unix.h +++ b/drivers/unix/os_unix.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef OS_UNIX_H #define OS_UNIX_H diff --git a/drivers/unix/packet_peer_udp_posix.cpp b/drivers/unix/packet_peer_udp_posix.cpp index 2e03a106a2..1380c1d88b 100644 --- a/drivers/unix/packet_peer_udp_posix.cpp +++ b/drivers/unix/packet_peer_udp_posix.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "packet_peer_udp_posix.h" #ifdef UNIX_ENABLED diff --git a/drivers/unix/packet_peer_udp_posix.h b/drivers/unix/packet_peer_udp_posix.h index b8ea4c867a..7f72a9bfc9 100644 --- a/drivers/unix/packet_peer_udp_posix.h +++ b/drivers/unix/packet_peer_udp_posix.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef PACKET_PEER_UDP_POSIX_H #define PACKET_PEER_UDP_POSIX_H diff --git a/drivers/unix/rw_lock_posix.cpp b/drivers/unix/rw_lock_posix.cpp index 6adc2c25f3..4df965cabb 100644 --- a/drivers/unix/rw_lock_posix.cpp +++ b/drivers/unix/rw_lock_posix.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #if defined(UNIX_ENABLED) || defined(PTHREAD_ENABLED) #include "rw_lock_posix.h" diff --git a/drivers/unix/rw_lock_posix.h b/drivers/unix/rw_lock_posix.h index 3cf1b8924e..617b9705da 100644 --- a/drivers/unix/rw_lock_posix.h +++ b/drivers/unix/rw_lock_posix.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef RWLOCKPOSIX_H #define RWLOCKPOSIX_H diff --git a/drivers/unix/semaphore_posix.cpp b/drivers/unix/semaphore_posix.cpp index 18b0cd7956..5cabfe4937 100644 --- a/drivers/unix/semaphore_posix.cpp +++ b/drivers/unix/semaphore_posix.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "semaphore_posix.h" #if defined(UNIX_ENABLED) || defined(PTHREAD_ENABLED) diff --git a/drivers/unix/semaphore_posix.h b/drivers/unix/semaphore_posix.h index 719fd73880..283174bb2e 100644 --- a/drivers/unix/semaphore_posix.h +++ b/drivers/unix/semaphore_posix.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef SEMAPHORE_POSIX_H #define SEMAPHORE_POSIX_H diff --git a/drivers/unix/socket_helpers.h b/drivers/unix/socket_helpers.h index 1cdc4cc65d..5ef9ad3088 100644 --- a/drivers/unix/socket_helpers.h +++ b/drivers/unix/socket_helpers.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef SOCKET_HELPERS_H #define SOCKET_HELPERS_H diff --git a/drivers/unix/stream_peer_tcp_posix.cpp b/drivers/unix/stream_peer_tcp_posix.cpp index 959131d47a..ba9481d36b 100644 --- a/drivers/unix/stream_peer_tcp_posix.cpp +++ b/drivers/unix/stream_peer_tcp_posix.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifdef UNIX_ENABLED #include "stream_peer_tcp_posix.h" diff --git a/drivers/unix/stream_peer_tcp_posix.h b/drivers/unix/stream_peer_tcp_posix.h index bfe6d88977..5770ae48f4 100644 --- a/drivers/unix/stream_peer_tcp_posix.h +++ b/drivers/unix/stream_peer_tcp_posix.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifdef UNIX_ENABLED #ifndef STREAM_PEER_TCP_POSIX_H diff --git a/drivers/unix/tcp_server_posix.cpp b/drivers/unix/tcp_server_posix.cpp index 9f4ce51dc2..07ffe3b00a 100644 --- a/drivers/unix/tcp_server_posix.cpp +++ b/drivers/unix/tcp_server_posix.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "tcp_server_posix.h" #include "stream_peer_tcp_posix.h" diff --git a/drivers/unix/tcp_server_posix.h b/drivers/unix/tcp_server_posix.h index 3bb4a3b5bf..c749314fb3 100644 --- a/drivers/unix/tcp_server_posix.h +++ b/drivers/unix/tcp_server_posix.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef TCP_SERVER_POSIX_H #define TCP_SERVER_POSIX_H diff --git a/drivers/unix/thread_posix.cpp b/drivers/unix/thread_posix.cpp index f19932ae8e..f079ae2ae2 100644 --- a/drivers/unix/thread_posix.cpp +++ b/drivers/unix/thread_posix.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "thread_posix.h" #include "script_language.h" diff --git a/drivers/unix/thread_posix.h b/drivers/unix/thread_posix.h index c7da800d2b..15c9265e6d 100644 --- a/drivers/unix/thread_posix.h +++ b/drivers/unix/thread_posix.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef THREAD_POSIX_H #define THREAD_POSIX_H diff --git a/drivers/wasapi/audio_driver_wasapi.cpp b/drivers/wasapi/audio_driver_wasapi.cpp index cd0e56dcc5..4c80e70a95 100644 --- a/drivers/wasapi/audio_driver_wasapi.cpp +++ b/drivers/wasapi/audio_driver_wasapi.cpp @@ -3,7 +3,7 @@ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ -/* http://www.godotengine.org */ +/* https://godotengine.org */ /*************************************************************************/ /* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md) */ @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifdef WASAPI_ENABLED #include "audio_driver_wasapi.h" diff --git a/drivers/wasapi/audio_driver_wasapi.h b/drivers/wasapi/audio_driver_wasapi.h index 57efeaf1e4..2b19f0cca1 100644 --- a/drivers/wasapi/audio_driver_wasapi.h +++ b/drivers/wasapi/audio_driver_wasapi.h @@ -3,7 +3,7 @@ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ -/* http://www.godotengine.org */ +/* https://godotengine.org */ /*************************************************************************/ /* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md) */ @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef AUDIO_DRIVER_WASAPI_H #define AUDIO_DRIVER_WASAPI_H diff --git a/drivers/windows/dir_access_windows.cpp b/drivers/windows/dir_access_windows.cpp index 8a470e0717..2e64b55430 100644 --- a/drivers/windows/dir_access_windows.cpp +++ b/drivers/windows/dir_access_windows.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #if defined(WINDOWS_ENABLED) #include "dir_access_windows.h" diff --git a/drivers/windows/dir_access_windows.h b/drivers/windows/dir_access_windows.h index 845fc9941a..b18c8f5b5d 100644 --- a/drivers/windows/dir_access_windows.h +++ b/drivers/windows/dir_access_windows.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef DIR_ACCESS_WINDOWS_H #define DIR_ACCESS_WINDOWS_H diff --git a/drivers/windows/file_access_windows.cpp b/drivers/windows/file_access_windows.cpp index 5b9cc2ba09..dbffac8ebd 100644 --- a/drivers/windows/file_access_windows.cpp +++ b/drivers/windows/file_access_windows.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifdef WINDOWS_ENABLED #include "file_access_windows.h" @@ -189,6 +190,7 @@ uint8_t FileAccessWindows::get_8() const { uint8_t b; if (fread(&b, 1, 1, f) == 0) { check_errors(); + b = '\0'; }; return b; diff --git a/drivers/windows/file_access_windows.h b/drivers/windows/file_access_windows.h index b9ec9e34a3..bbdf830c96 100644 --- a/drivers/windows/file_access_windows.h +++ b/drivers/windows/file_access_windows.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef FILE_ACCESS_WINDOWS_H #define FILE_ACCESS_WINDOWS_H diff --git a/drivers/windows/mutex_windows.cpp b/drivers/windows/mutex_windows.cpp index 2d60a22a86..359a79209c 100644 --- a/drivers/windows/mutex_windows.cpp +++ b/drivers/windows/mutex_windows.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "mutex_windows.h" #include "os/memory.h" diff --git a/drivers/windows/mutex_windows.h b/drivers/windows/mutex_windows.h index d6fc85dcc3..4dff2c2456 100644 --- a/drivers/windows/mutex_windows.h +++ b/drivers/windows/mutex_windows.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef MUTEX_WINDOWS_H #define MUTEX_WINDOWS_H diff --git a/drivers/windows/packet_peer_udp_winsock.cpp b/drivers/windows/packet_peer_udp_winsock.cpp index 9901f29e19..609096d02e 100644 --- a/drivers/windows/packet_peer_udp_winsock.cpp +++ b/drivers/windows/packet_peer_udp_winsock.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifdef WINDOWS_ENABLED #include "packet_peer_udp_winsock.h" diff --git a/drivers/windows/packet_peer_udp_winsock.h b/drivers/windows/packet_peer_udp_winsock.h index 3f7d090068..8d575c2033 100644 --- a/drivers/windows/packet_peer_udp_winsock.h +++ b/drivers/windows/packet_peer_udp_winsock.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifdef WINDOWS_ENABLED #ifndef PACKET_PEER_UDP_WINSOCK_H diff --git a/drivers/windows/rw_lock_windows.cpp b/drivers/windows/rw_lock_windows.cpp index a428b7910f..29c24d3d02 100644 --- a/drivers/windows/rw_lock_windows.cpp +++ b/drivers/windows/rw_lock_windows.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #if defined(WINDOWS_ENABLED) #include "rw_lock_windows.h" diff --git a/drivers/windows/rw_lock_windows.h b/drivers/windows/rw_lock_windows.h index 1ca2095d6b..fdce28574a 100644 --- a/drivers/windows/rw_lock_windows.h +++ b/drivers/windows/rw_lock_windows.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef RWLOCKWINDOWS_H #define RWLOCKWINDOWS_H diff --git a/drivers/windows/semaphore_windows.cpp b/drivers/windows/semaphore_windows.cpp index 92daacb775..25fced93ce 100644 --- a/drivers/windows/semaphore_windows.cpp +++ b/drivers/windows/semaphore_windows.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "semaphore_windows.h" #if defined(WINDOWS_ENABLED) diff --git a/drivers/windows/semaphore_windows.h b/drivers/windows/semaphore_windows.h index da0c68f1fc..e099ee437a 100644 --- a/drivers/windows/semaphore_windows.h +++ b/drivers/windows/semaphore_windows.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef SEMAPHORE_WINDOWS_H #define SEMAPHORE_WINDOWS_H diff --git a/drivers/windows/shell_windows.cpp b/drivers/windows/shell_windows.cpp index c25df26c48..20e996d776 100644 --- a/drivers/windows/shell_windows.cpp +++ b/drivers/windows/shell_windows.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifdef WINDOWS_ENABLED #ifdef UWP_ENABLED diff --git a/drivers/windows/shell_windows.h b/drivers/windows/shell_windows.h index 18ae7828a1..41cc6b72a2 100644 --- a/drivers/windows/shell_windows.h +++ b/drivers/windows/shell_windows.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef SHELL_WINDOWS_H #define SHELL_WINDOWS_H diff --git a/drivers/windows/stream_peer_tcp_winsock.cpp b/drivers/windows/stream_peer_tcp_winsock.cpp index 6bcd5af5a1..d6a320fb5e 100644 --- a/drivers/windows/stream_peer_tcp_winsock.cpp +++ b/drivers/windows/stream_peer_tcp_winsock.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifdef WINDOWS_ENABLED #include "stream_peer_tcp_winsock.h" diff --git a/drivers/windows/stream_peer_tcp_winsock.h b/drivers/windows/stream_peer_tcp_winsock.h index 53be9d6ac5..9be8414878 100644 --- a/drivers/windows/stream_peer_tcp_winsock.h +++ b/drivers/windows/stream_peer_tcp_winsock.h @@ -1,5 +1,5 @@ /*************************************************************************/ -/* stream_peer_winsock.h */ +/* stream_peer_tcp_winsock.h */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifdef WINDOWS_ENABLED #ifndef STREAM_PEER_TCP_WINSOCK_H diff --git a/drivers/windows/tcp_server_winsock.cpp b/drivers/windows/tcp_server_winsock.cpp index 3936ee64c7..413a0d19b5 100644 --- a/drivers/windows/tcp_server_winsock.cpp +++ b/drivers/windows/tcp_server_winsock.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifdef WINDOWS_ENABLED #include "tcp_server_winsock.h" diff --git a/drivers/windows/tcp_server_winsock.h b/drivers/windows/tcp_server_winsock.h index ffd20bd6b7..a6979db42d 100644 --- a/drivers/windows/tcp_server_winsock.h +++ b/drivers/windows/tcp_server_winsock.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifdef WINDOWS_ENABLED #ifndef TCP_SERVER_WINSOCK_H diff --git a/drivers/windows/thread_windows.cpp b/drivers/windows/thread_windows.cpp index 062387e3cb..5e0b017a5c 100644 --- a/drivers/windows/thread_windows.cpp +++ b/drivers/windows/thread_windows.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "thread_windows.h" #if defined(WINDOWS_ENABLED) && !defined(UWP_ENABLED) diff --git a/drivers/windows/thread_windows.h b/drivers/windows/thread_windows.h index 5d26e8fc68..d7a8389d9e 100644 --- a/drivers/windows/thread_windows.h +++ b/drivers/windows/thread_windows.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef THREAD_WINDOWS_H #define THREAD_WINDOWS_H diff --git a/drivers/xaudio2/audio_driver_xaudio2.cpp b/drivers/xaudio2/audio_driver_xaudio2.cpp index de71b6daba..6675459313 100644 --- a/drivers/xaudio2/audio_driver_xaudio2.cpp +++ b/drivers/xaudio2/audio_driver_xaudio2.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "audio_driver_xaudio2.h" #include "os/os.h" diff --git a/drivers/xaudio2/audio_driver_xaudio2.h b/drivers/xaudio2/audio_driver_xaudio2.h index 4fac1ec2b6..42e1adb2b7 100644 --- a/drivers/xaudio2/audio_driver_xaudio2.h +++ b/drivers/xaudio2/audio_driver_xaudio2.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef AUDIO_DRIVER_XAUDIO2_H #define AUDIO_DRIVER_XAUDIO2_H diff --git a/editor/animation_editor.cpp b/editor/animation_editor.cpp index f73c81ed9c..7e49d1300c 100644 --- a/editor/animation_editor.cpp +++ b/editor/animation_editor.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "animation_editor.h" #include "editor/plugins/animation_player_editor_plugin.h" @@ -1533,7 +1534,7 @@ void AnimationKeyEditor::_track_editor_draw() { for (Map<SelectedKey, KeyInfo>::Element *E = selection.front(); E; E = E->next()) { int idx = E->key().track; - int i = idx - v_scroll->get_value(); + int i = idx - (int)v_scroll->get_value(); if (i < 0 || i >= fit) continue; int y = h + i * h + sep; diff --git a/editor/animation_editor.h b/editor/animation_editor.h index 56e3f34aac..1e593f237c 100644 --- a/editor/animation_editor.h +++ b/editor/animation_editor.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef ANIMATION_EDITOR_H #define ANIMATION_EDITOR_H diff --git a/editor/array_property_edit.cpp b/editor/array_property_edit.cpp index 3c2fc5c23f..a32a71262f 100644 --- a/editor/array_property_edit.cpp +++ b/editor/array_property_edit.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "array_property_edit.h" #include "editor_node.h" diff --git a/editor/array_property_edit.h b/editor/array_property_edit.h index 6b637f8b52..fe0c4e23ae 100644 --- a/editor/array_property_edit.h +++ b/editor/array_property_edit.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef ARRAY_PROPERTY_EDIT_H #define ARRAY_PROPERTY_EDIT_H diff --git a/editor/code_editor.cpp b/editor/code_editor.cpp index 4b59656903..3e079cb3ca 100644 --- a/editor/code_editor.cpp +++ b/editor/code_editor.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "code_editor.h" #include "editor/editor_scale.h" @@ -1033,7 +1034,7 @@ void CodeTextEditor::_reset_zoom() { Ref<DynamicFont> font = text_editor->get_font("font"); // reset source font size to default if (font.is_valid()) { - EditorSettings::get_singleton()->set("interface/editor/source_font_size", 14); + EditorSettings::get_singleton()->set("interface/editor/code_font_size", 14); font->set_size(14); } } @@ -1097,7 +1098,7 @@ bool CodeTextEditor::_add_font_size(int p_delta) { if (font.is_valid()) { 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); + EditorSettings::get_singleton()->set("interface/editor/code_font_size", new_size / EDSCALE); font->set_size(new_size); } @@ -1139,20 +1140,7 @@ void CodeTextEditor::set_error(const String &p_error) { void CodeTextEditor::_update_font() { - // FONTS - String editor_font = EDITOR_DEF("text_editor/theme/font", ""); - bool font_overridden = false; - if (editor_font != "") { - Ref<Font> fnt = ResourceLoader::load(editor_font); - if (fnt.is_valid()) { - text_editor->add_font_override("font", fnt); - font_overridden = true; - } - } - if (!font_overridden) { - - text_editor->add_font_override("font", get_font("source", "EditorFonts")); - } + text_editor->add_font_override("font", get_font("source", "EditorFonts")); } void CodeTextEditor::_on_settings_change() { diff --git a/editor/code_editor.h b/editor/code_editor.h index 6f4e45352b..f735631ef6 100644 --- a/editor/code_editor.h +++ b/editor/code_editor.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef CODE_EDITOR_H #define CODE_EDITOR_H diff --git a/editor/collada/collada.cpp b/editor/collada/collada.cpp index f7f11f40f5..1f0af55103 100644 --- a/editor/collada/collada.cpp +++ b/editor/collada/collada.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifdef TOOLS_ENABLED #include "collada.h" diff --git a/editor/collada/collada.h b/editor/collada/collada.h index 34bd93bcfe..ec3284bc5c 100644 --- a/editor/collada/collada.h +++ b/editor/collada/collada.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifdef TOOLS_ENABLED #ifndef COLLADA_H diff --git a/editor/connections_dialog.cpp b/editor/connections_dialog.cpp index 9783d0cc4e..3466d17980 100644 --- a/editor/connections_dialog.cpp +++ b/editor/connections_dialog.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "connections_dialog.h" #include "editor_node.h" diff --git a/editor/connections_dialog.h b/editor/connections_dialog.h index 59715c15c3..5e26e00f67 100644 --- a/editor/connections_dialog.h +++ b/editor/connections_dialog.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef CONNECTIONS_DIALOG_H #define CONNECTIONS_DIALOG_H diff --git a/editor/create_dialog.cpp b/editor/create_dialog.cpp index 96c3a27ea7..2dfb01826a 100644 --- a/editor/create_dialog.cpp +++ b/editor/create_dialog.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "create_dialog.h" #include "class_db.h" diff --git a/editor/create_dialog.h b/editor/create_dialog.h index ed23fb4ae8..da17dcbe89 100644 --- a/editor/create_dialog.h +++ b/editor/create_dialog.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef CREATE_DIALOG_H #define CREATE_DIALOG_H diff --git a/editor/dependency_editor.cpp b/editor/dependency_editor.cpp index f18a966151..c2bdab8b43 100644 --- a/editor/dependency_editor.cpp +++ b/editor/dependency_editor.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "dependency_editor.h" #include "editor_node.h" @@ -514,7 +515,7 @@ void DependencyRemoveDialog::ok_pressed() { print_line("Moving to trash: " + path); Error err = OS::get_singleton()->move_to_trash(path); if (err != OK) { - EditorNode::get_singleton()->add_io_error(TTR("Cannot remove:\n") + to_delete[i] + "\n"); + EditorNode::get_singleton()->add_io_error(TTR("Cannot remove:") + "\n" + to_delete[i] + "\n"); } } diff --git a/editor/dependency_editor.h b/editor/dependency_editor.h index bbe2b3494b..16135c352b 100644 --- a/editor/dependency_editor.h +++ b/editor/dependency_editor.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef DEPENDENCY_EDITOR_H #define DEPENDENCY_EDITOR_H diff --git a/editor/dictionary_property_edit.cpp b/editor/dictionary_property_edit.cpp index b1451dc378..4c0ad59385 100644 --- a/editor/dictionary_property_edit.cpp +++ b/editor/dictionary_property_edit.cpp @@ -3,7 +3,7 @@ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ -/* http://www.godotengine.org */ +/* https://godotengine.org */ /*************************************************************************/ /* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md) */ @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "dictionary_property_edit.h" #include "editor_node.h" diff --git a/editor/dictionary_property_edit.h b/editor/dictionary_property_edit.h index 8e495b31a9..83489fe7de 100644 --- a/editor/dictionary_property_edit.h +++ b/editor/dictionary_property_edit.h @@ -3,7 +3,7 @@ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ -/* http://www.godotengine.org */ +/* https://godotengine.org */ /*************************************************************************/ /* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md) */ @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef DICTIONARY_PROPERTY_EDIT_H #define DICTIONARY_PROPERTY_EDIT_H diff --git a/editor/doc/doc_data.cpp b/editor/doc/doc_data.cpp index 4a99ce8f51..58eaab78ed 100644 --- a/editor/doc/doc_data.cpp +++ b/editor/doc/doc_data.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "doc_data.h" #include "engine.h" diff --git a/editor/doc/doc_data.h b/editor/doc/doc_data.h index 53774ce1f0..0461133f9f 100644 --- a/editor/doc/doc_data.h +++ b/editor/doc/doc_data.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef DOC_DATA_H #define DOC_DATA_H diff --git a/editor/doc/doc_dump.cpp b/editor/doc/doc_dump.cpp index 8d35cad6d6..905732a43f 100644 --- a/editor/doc/doc_dump.cpp +++ b/editor/doc/doc_dump.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "doc_dump.h" #include "os/file_access.h" diff --git a/editor/doc/doc_dump.h b/editor/doc/doc_dump.h index 70280195c4..48cf1a587b 100644 --- a/editor/doc/doc_dump.h +++ b/editor/doc/doc_dump.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef DOC_DUMP_H #define DOC_DUMP_H diff --git a/editor/doc_code_font.h b/editor/doc_code_font.h deleted file mode 100644 index 41713befcb..0000000000 --- a/editor/doc_code_font.h +++ /dev/null @@ -1,33 +0,0 @@ -/*************************************************************************/ -/* doc_code_font.h */ -/*************************************************************************/ -/* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ -/*************************************************************************/ -/* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ -/* Copyright (c) 2014-2018 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. */ -/*************************************************************************/ -static const int _bi_font_doc_code_font_height = 19; -static const int _bi_font_doc_code_font_ascent = 15; -static const int _bi_font_doc_code_font_charcount = 193; -static const int _bi_font_doc_code_font_characters[] = { 0, 253, 53, 2, 2, -1, 14, 0, 13, 253, 56, 2, 2, -1, 14, 0, 32, 253, 59, 2, 2, -1, 14, 4, 33, 221, 29, 3, 12, 1, 3, 5, 34, 144, 77, 6, 5, 0, 3, 7, 35, 180, 55, 9, 11, -1, 4, 8, 36, 215, 0, 8, 15, 0, 2, 8, 37, 28, 45, 12, 11, -1, 4, 12, 38, 199, 16, 11, 12, 0, 3, 11, 39, 157, 77, 3, 5, 0, 3, 4, 40, 36, 16, 4, 15, 0, 3, 5, 41, 31, 16, 4, 15, 0, 3, 5, 42, 93, 79, 9, 7, -1, 3, 8, 43, 110, 68, 9, 9, -1, 5, 8, 44, 121, 78, 4, 6, -1, 12, 4, 45, 204, 76, 5, 3, -1, 9, 5, 46, 216, 75, 4, 3, 0, 12, 4, 47, 233, 0, 8, 15, -1, 2, 7, 48, 246, 29, 9, 11, -1, 4, 8, 49, 208, 54, 8, 11, 0, 4, 8, 50, 219, 42, 9, 11, -1, 4, 8, 51, 229, 41, 9, 11, -1, 4, 8, 52, 239, 41, 9, 11, -1, 4, 8, 53, 0, 57, 9, 11, -1, 4, 8, 54, 160, 55, 9, 11, -1, 4, 8, 55, 10, 57, 9, 11, -1, 4, 8, 56, 20, 57, 9, 11, -1, 4, 8, 57, 40, 57, 9, 11, -1, 4, 8, 58, 78, 80, 3, 8, 0, 7, 4, 59, 72, 68, 4, 11, -1, 7, 4, 60, 18, 69, 8, 11, 0, 4, 8, 61, 112, 78, 8, 7, 0, 6, 8, 62, 0, 69, 8, 11, 0, 4, 8, 63, 184, 30, 7, 12, 0, 3, 7, 64, 148, 16, 13, 13, 0, 4, 14, 65, 117, 44, 11, 11, -1, 4, 10, 66, 50, 57, 9, 11, 0, 4, 9, 67, 197, 42, 10, 11, -1, 4, 8, 68, 153, 43, 10, 11, 0, 4, 10, 69, 244, 53, 8, 11, 0, 4, 8, 70, 43, 69, 7, 11, 0, 4, 7, 71, 93, 44, 11, 11, -1, 4, 10, 72, 60, 56, 9, 11, 0, 4, 10, 73, 77, 68, 4, 11, 0, 4, 4, 74, 249, 41, 6, 11, -1, 4, 5, 75, 70, 56, 9, 11, 0, 4, 9, 76, 27, 69, 7, 11, 0, 4, 7, 77, 14, 45, 13, 11, 0, 4, 14, 78, 208, 42, 10, 11, 0, 4, 11, 79, 41, 45, 12, 11, -1, 4, 11, 80, 199, 54, 8, 11, 0, 4, 9, 81, 162, 16, 13, 13, -1, 4, 11, 82, 80, 56, 9, 11, 0, 4, 9, 83, 90, 56, 9, 11, -1, 4, 8, 84, 100, 56, 9, 11, -1, 4, 8, 85, 164, 43, 10, 11, 0, 4, 10, 86, 129, 44, 11, 11, -1, 4, 9, 87, 229, 29, 16, 11, -1, 4, 15, 88, 175, 43, 10, 11, -1, 4, 9, 89, 186, 43, 10, 11, -1, 4, 8, 90, 110, 56, 9, 11, -1, 4, 8, 91, 26, 16, 4, 15, 0, 3, 5, 92, 123, 0, 10, 15, -2, 2, 7, 93, 251, 0, 4, 15, 0, 3, 5, 94, 82, 79, 10, 7, -2, 4, 8, 95, 180, 76, 9, 3, -1, 15, 8, 96, 161, 77, 6, 4, -1, 3, 5, 97, 27, 81, 8, 8, -1, 7, 8, 98, 68, 31, 8, 12, 0, 3, 9, 99, 18, 81, 8, 8, -1, 7, 7, 100, 211, 16, 9, 12, -1, 3, 9, 101, 228, 66, 9, 8, -1, 7, 8, 102, 176, 30, 7, 12, -1, 3, 5, 103, 120, 56, 9, 11, -1, 7, 8, 104, 59, 31, 8, 12, 0, 3, 9, 105, 66, 68, 5, 11, -1, 4, 4, 106, 141, 16, 6, 14, -2, 4, 4, 107, 104, 31, 8, 12, 0, 3, 8, 108, 251, 16, 3, 12, 0, 3, 4, 109, 144, 68, 13, 8, 0, 7, 13, 110, 9, 81, 8, 8, 0, 7, 9, 111, 208, 66, 9, 8, -1, 7, 9, 112, 217, 54, 8, 11, 0, 7, 9, 113, 140, 56, 9, 11, -1, 7, 9, 114, 53, 81, 6, 8, 0, 7, 6, 115, 45, 81, 7, 8, -1, 7, 6, 116, 102, 68, 7, 10, -1, 5, 6, 117, 36, 81, 8, 8, 0, 7, 9, 118, 238, 65, 9, 8, -1, 7, 8, 119, 158, 68, 13, 8, -1, 7, 12, 120, 218, 66, 9, 8, -1, 7, 7, 121, 150, 56, 9, 11, -1, 7, 8, 122, 248, 65, 7, 8, -1, 7, 6, 123, 14, 16, 5, 15, 0, 3, 6, 124, 41, 16, 3, 15, 2, 3, 8, 125, 20, 16, 5, 15, 0, 3, 6, 126, 135, 78, 8, 5, -1, 4, 8, 160, 253, 62, 2, 2, -1, 14, 4, 161, 225, 29, 3, 12, 0, 5, 5, 162, 35, 69, 7, 11, 0, 4, 8, 163, 190, 55, 8, 11, 0, 4, 8, 164, 82, 68, 9, 10, -1, 5, 8, 165, 105, 44, 11, 11, -2, 4, 8, 166, 45, 16, 3, 15, 2, 3, 8, 167, 125, 16, 8, 14, 0, 3, 8, 168, 197, 76, 6, 3, 0, 4, 7, 169, 186, 16, 12, 12, 0, 3, 13, 170, 137, 68, 6, 9, 0, 4, 7, 171, 197, 67, 10, 8, -1, 6, 9, 172, 126, 78, 8, 5, -1, 8, 8, 173, 210, 75, 5, 3, -1, 9, 5, 174, 103, 79, 8, 7, 0, 3, 8, 175, 190, 76, 6, 3, 0, 4, 6, 176, 151, 77, 5, 5, 0, 3, 5, 177, 221, 16, 9, 12, -1, 3, 8, 178, 60, 81, 6, 8, -1, 2, 5, 179, 67, 80, 5, 8, -1, 2, 5, 180, 168, 77, 6, 4, -1, 3, 5, 181, 170, 55, 9, 11, 0, 7, 9, 182, 176, 16, 9, 13, 0, 4, 10, 183, 221, 75, 3, 3, 0, 9, 4, 184, 175, 76, 4, 4, 0, 14, 5, 185, 73, 80, 4, 8, 0, 2, 4, 186, 129, 68, 7, 9, 0, 4, 7, 187, 185, 67, 11, 8, -1, 6, 9, 188, 54, 44, 12, 11, -2, 4, 11, 189, 67, 44, 12, 11, -2, 4, 11, 190, 80, 44, 12, 11, -1, 4, 11, 191, 192, 29, 7, 12, -1, 5, 7, 192, 88, 0, 11, 15, -1, 0, 10, 193, 64, 0, 11, 15, -1, 0, 10, 194, 76, 0, 11, 15, -1, 0, 10, 195, 100, 0, 11, 15, -1, 0, 10, 196, 74, 16, 11, 14, -1, 1, 10, 197, 62, 16, 11, 14, -1, 1, 10, 198, 0, 45, 13, 11, -1, 4, 12, 199, 107, 16, 8, 14, 0, 4, 8, 200, 188, 0, 8, 15, 0, 0, 8, 201, 206, 0, 8, 15, 0, 0, 8, 202, 224, 0, 8, 15, 0, 0, 8, 203, 116, 16, 8, 14, 0, 1, 8, 204, 0, 16, 6, 15, -2, 0, 4, 205, 7, 16, 6, 15, -1, 0, 4, 206, 242, 0, 8, 15, -2, 0, 4, 207, 134, 16, 6, 14, -1, 1, 4, 208, 141, 44, 11, 11, -1, 4, 10, 209, 145, 0, 10, 15, 0, 0, 11, 210, 0, 0, 12, 15, -1, 0, 11, 211, 39, 0, 12, 15, -1, 0, 11, 212, 26, 0, 12, 15, -1, 0, 11, 213, 13, 0, 12, 15, -1, 0, 11, 214, 49, 16, 12, 14, -1, 1, 11, 215, 0, 81, 8, 8, 0, 6, 8, 216, 52, 0, 11, 15, 0, 2, 11, 217, 167, 0, 10, 15, 0, 0, 10, 218, 134, 0, 10, 15, 0, 0, 10, 219, 156, 0, 10, 15, 0, 0, 10, 220, 86, 16, 10, 14, 0, 1, 10, 221, 112, 0, 10, 15, -1, 0, 8, 222, 226, 54, 8, 11, 0, 4, 9, 223, 77, 31, 8, 12, 0, 3, 9, 224, 113, 31, 8, 12, -1, 3, 8, 225, 122, 31, 8, 12, -1, 3, 8, 226, 131, 31, 8, 12, -1, 3, 8, 227, 167, 30, 8, 12, -1, 3, 8, 228, 235, 53, 8, 11, -1, 4, 8, 229, 50, 31, 8, 12, -1, 3, 8, 230, 172, 67, 12, 8, 0, 7, 12, 231, 51, 69, 7, 11, 0, 7, 7, 232, 40, 32, 9, 12, -1, 3, 8, 233, 231, 16, 9, 12, -1, 3, 8, 234, 241, 16, 9, 12, -1, 3, 8, 235, 30, 57, 9, 11, -1, 4, 8, 236, 200, 29, 6, 12, -2, 3, 4, 237, 214, 29, 6, 12, -1, 3, 4, 238, 207, 29, 6, 12, -1, 3, 4, 239, 59, 69, 6, 11, -1, 4, 4, 240, 86, 31, 8, 12, 0, 3, 9, 241, 95, 31, 8, 12, 0, 3, 9, 242, 0, 32, 9, 12, -1, 3, 9, 243, 10, 32, 9, 12, -1, 3, 9, 244, 20, 32, 9, 12, -1, 3, 9, 245, 30, 32, 9, 12, -1, 3, 9, 246, 130, 56, 9, 11, -1, 4, 9, 247, 120, 68, 8, 9, -1, 5, 8, 248, 92, 68, 9, 10, 0, 6, 9, 249, 140, 31, 8, 12, 0, 3, 9, 250, 149, 30, 8, 12, 0, 3, 9, 251, 158, 30, 8, 12, 0, 3, 9, 252, 9, 69, 8, 11, 0, 4, 9, 253, 178, 0, 9, 15, -1, 3, 8, 254, 197, 0, 8, 15, 0, 3, 9, 255, 97, 16, 9, 14, -1, 4, 8 }; diff --git a/editor/doc_font.h b/editor/doc_font.h deleted file mode 100644 index ae80db7b1c..0000000000 --- a/editor/doc_font.h +++ /dev/null @@ -1,33 +0,0 @@ -/*************************************************************************/ -/* doc_font.h */ -/*************************************************************************/ -/* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ -/*************************************************************************/ -/* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ -/* Copyright (c) 2014-2018 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. */ -/*************************************************************************/ -static const int _bi_font_doc_font_height = 18; -static const int _bi_font_doc_font_ascent = 14; -static const int _bi_font_doc_font_charcount = 193; -static const int _bi_font_doc_font_characters[] = { 0, 253, 3, 2, 2, -1, 13, 0, 13, 253, 9, 2, 2, -1, 13, 0, 32, 253, 0, 2, 2, -1, 13, 3, 33, 220, 26, 3, 11, 1, 3, 5, 34, 187, 59, 5, 5, 0, 3, 6, 35, 88, 40, 9, 10, -1, 4, 7, 36, 50, 0, 8, 14, -1, 2, 7, 37, 175, 14, 11, 11, -1, 3, 11, 38, 187, 14, 11, 11, -1, 3, 10, 39, 198, 58, 3, 5, 0, 3, 3, 40, 98, 0, 4, 14, 0, 3, 5, 41, 103, 0, 4, 14, 0, 3, 5, 42, 146, 61, 7, 6, 0, 3, 7, 43, 246, 48, 8, 8, -1, 5, 7, 44, 193, 58, 4, 5, -1, 11, 4, 45, 13, 73, 5, 2, 0, 9, 5, 46, 241, 57, 3, 3, 0, 11, 4, 47, 84, 0, 7, 14, -1, 2, 6, 48, 246, 37, 8, 10, -1, 4, 7, 49, 33, 52, 7, 10, 0, 4, 7, 50, 237, 37, 8, 10, -1, 4, 7, 51, 219, 38, 8, 10, -1, 4, 7, 52, 128, 39, 9, 10, -1, 4, 7, 53, 41, 52, 7, 10, -1, 4, 7, 54, 9, 53, 7, 10, 0, 4, 7, 55, 228, 38, 8, 10, -1, 4, 7, 56, 57, 52, 7, 10, 0, 4, 7, 57, 65, 51, 7, 10, 0, 4, 7, 58, 98, 62, 4, 8, 0, 6, 4, 59, 162, 50, 5, 10, -1, 6, 4, 60, 174, 49, 8, 9, -1, 4, 7, 61, 179, 59, 7, 5, 0, 7, 7, 62, 228, 49, 8, 8, -1, 5, 7, 63, 89, 28, 7, 11, 0, 3, 7, 64, 54, 15, 12, 12, 0, 4, 13, 65, 36, 41, 10, 10, -1, 4, 9, 66, 97, 51, 7, 10, 0, 4, 8, 67, 174, 38, 8, 10, 0, 4, 8, 68, 156, 39, 8, 10, 0, 4, 9, 69, 105, 51, 7, 10, 0, 4, 7, 70, 121, 51, 6, 10, 0, 4, 7, 71, 0, 53, 8, 10, 0, 4, 9, 72, 192, 38, 8, 10, 0, 4, 9, 73, 251, 26, 3, 10, 0, 4, 4, 74, 156, 50, 5, 10, -1, 4, 5, 75, 147, 39, 8, 10, 0, 4, 8, 76, 135, 50, 6, 10, 0, 4, 6, 77, 13, 41, 11, 10, 0, 4, 12, 78, 210, 38, 8, 10, 0, 4, 10, 79, 68, 40, 9, 10, 0, 4, 10, 80, 113, 51, 7, 10, 0, 4, 8, 81, 199, 14, 10, 11, 0, 4, 10, 82, 183, 38, 8, 10, 0, 4, 8, 83, 128, 50, 6, 10, 0, 4, 7, 84, 108, 40, 9, 10, -1, 4, 7, 85, 165, 39, 8, 10, 0, 4, 9, 86, 25, 41, 10, 10, -1, 4, 9, 87, 236, 26, 14, 10, -1, 4, 13, 88, 98, 40, 9, 10, -1, 4, 8, 89, 118, 40, 9, 10, -1, 4, 7, 90, 138, 39, 8, 10, -1, 4, 7, 91, 49, 15, 4, 13, 0, 3, 5, 92, 76, 0, 7, 14, -1, 2, 6, 93, 43, 15, 5, 13, -1, 3, 5, 94, 137, 61, 8, 6, -1, 4, 7, 95, 245, 57, 9, 2, -1, 15, 7, 96, 230, 58, 5, 3, -1, 3, 4, 97, 57, 63, 7, 8, 0, 6, 7, 98, 81, 28, 7, 11, 0, 3, 8, 99, 79, 62, 6, 8, 0, 6, 6, 100, 33, 29, 7, 11, 0, 3, 8, 101, 9, 64, 7, 8, 0, 6, 8, 102, 200, 26, 6, 11, -1, 3, 5, 103, 153, 27, 7, 11, 0, 6, 7, 104, 121, 27, 7, 11, 0, 3, 8, 105, 224, 26, 3, 11, 0, 3, 4, 106, 92, 0, 5, 14, -2, 3, 4, 107, 25, 29, 7, 11, 0, 3, 7, 108, 228, 26, 3, 11, 0, 3, 4, 109, 204, 49, 11, 8, 0, 6, 12, 110, 17, 63, 7, 8, 0, 6, 8, 111, 33, 63, 7, 8, 0, 6, 8, 112, 17, 29, 7, 11, 0, 6, 8, 113, 9, 29, 7, 11, 0, 6, 8, 114, 86, 62, 5, 8, 0, 6, 5, 115, 92, 62, 5, 8, 0, 6, 6, 116, 168, 50, 5, 10, -1, 4, 5, 117, 49, 63, 7, 8, 0, 6, 8, 118, 0, 64, 8, 8, -1, 6, 7, 119, 216, 49, 11, 8, -1, 6, 10, 120, 41, 63, 7, 8, -1, 6, 7, 121, 0, 30, 8, 11, -1, 6, 7, 122, 72, 62, 6, 8, 0, 6, 6, 123, 8, 15, 6, 13, -1, 3, 5, 124, 0, 0, 3, 15, 1, 2, 7, 125, 15, 15, 6, 13, -1, 3, 5, 126, 202, 58, 8, 4, -1, 4, 7, 160, 253, 6, 2, 2, -1, 13, 3, 161, 232, 26, 3, 11, 0, 4, 5, 162, 149, 50, 6, 10, 0, 4, 7, 163, 17, 52, 7, 10, 0, 4, 7, 164, 183, 49, 8, 9, -1, 5, 7, 165, 47, 41, 10, 10, -2, 4, 7, 166, 4, 0, 3, 15, 2, 2, 7, 167, 122, 14, 7, 12, 0, 3, 7, 168, 0, 73, 6, 2, -1, 4, 6, 169, 162, 14, 12, 11, 0, 3, 13, 170, 65, 62, 6, 8, -1, 4, 6, 171, 112, 62, 8, 7, -1, 6, 8, 172, 211, 58, 7, 4, -1, 8, 7, 173, 19, 72, 5, 2, 0, 9, 5, 174, 103, 62, 8, 7, -1, 3, 8, 175, 7, 73, 5, 2, 0, 3, 6, 176, 171, 61, 7, 5, -1, 3, 5, 177, 58, 40, 9, 10, -1, 4, 7, 178, 154, 61, 5, 6, 0, 2, 5, 179, 160, 61, 5, 6, -1, 2, 5, 180, 224, 58, 5, 3, -1, 3, 4, 181, 241, 14, 8, 11, 0, 6, 8, 182, 97, 15, 8, 12, 0, 4, 9, 183, 236, 58, 4, 3, 0, 8, 4, 184, 219, 58, 4, 4, 0, 13, 5, 185, 166, 61, 4, 6, 0, 2, 4, 186, 25, 63, 7, 8, -1, 4, 6, 187, 129, 61, 7, 7, 0, 6, 8, 188, 221, 14, 9, 11, 0, 3, 10, 189, 231, 14, 9, 11, 0, 3, 10, 190, 210, 14, 10, 11, -1, 3, 10, 191, 41, 29, 7, 11, -1, 4, 7, 192, 141, 0, 10, 13, -1, 1, 9, 193, 130, 0, 10, 13, -1, 1, 9, 194, 119, 0, 10, 13, -1, 1, 9, 195, 20, 0, 10, 14, -1, 0, 9, 196, 67, 15, 10, 12, -1, 2, 9, 197, 108, 0, 10, 13, -1, 1, 9, 198, 0, 42, 12, 10, -1, 4, 11, 199, 228, 0, 8, 13, 0, 4, 8, 200, 245, 0, 7, 13, 0, 1, 7, 201, 237, 0, 7, 13, 0, 1, 7, 202, 0, 16, 7, 13, 0, 1, 7, 203, 130, 14, 7, 12, 0, 2, 7, 204, 36, 15, 6, 13, -2, 1, 4, 205, 22, 15, 6, 13, -1, 1, 4, 206, 29, 15, 6, 13, -1, 1, 4, 207, 154, 14, 7, 12, -2, 2, 4, 208, 78, 40, 9, 10, -1, 4, 9, 209, 59, 0, 8, 14, 0, 0, 10, 210, 172, 0, 9, 13, 0, 1, 10, 211, 152, 0, 9, 13, 0, 1, 10, 212, 182, 0, 9, 13, 0, 1, 10, 213, 31, 0, 9, 14, 0, 0, 10, 214, 78, 15, 9, 12, 0, 2, 10, 215, 121, 62, 7, 7, 0, 6, 7, 216, 8, 0, 11, 14, -1, 2, 10, 217, 192, 0, 8, 13, 0, 1, 9, 218, 210, 0, 8, 13, 0, 1, 9, 219, 201, 0, 8, 13, 0, 1, 9, 220, 88, 15, 8, 12, 0, 2, 9, 221, 162, 0, 9, 13, -1, 1, 7, 222, 81, 51, 7, 10, 0, 4, 8, 223, 49, 29, 7, 11, 0, 3, 8, 224, 57, 28, 7, 11, 0, 3, 7, 225, 65, 28, 7, 11, 0, 3, 7, 226, 73, 28, 7, 11, 0, 3, 7, 227, 138, 14, 7, 12, 0, 2, 7, 228, 25, 52, 7, 10, 0, 4, 7, 229, 146, 14, 7, 12, 0, 2, 7, 230, 192, 49, 11, 8, 0, 6, 12, 231, 207, 26, 6, 11, 0, 6, 6, 232, 97, 28, 7, 11, 0, 3, 8, 233, 105, 28, 7, 11, 0, 3, 8, 234, 113, 28, 7, 11, 0, 3, 8, 235, 73, 51, 7, 10, 0, 4, 8, 236, 214, 26, 5, 11, -2, 3, 3, 237, 250, 14, 5, 11, -1, 3, 3, 238, 193, 26, 6, 11, -2, 3, 3, 239, 142, 50, 6, 10, -2, 4, 3, 240, 185, 26, 7, 11, 0, 3, 8, 241, 106, 15, 7, 12, 0, 2, 8, 242, 129, 27, 7, 11, 0, 3, 8, 243, 137, 27, 7, 11, 0, 3, 8, 244, 145, 27, 7, 11, 0, 3, 8, 245, 114, 14, 7, 12, 0, 2, 8, 246, 49, 52, 7, 10, 0, 4, 8, 247, 237, 48, 8, 8, -1, 5, 7, 248, 201, 38, 8, 10, 0, 5, 8, 249, 161, 27, 7, 11, 0, 3, 8, 250, 169, 26, 7, 11, 0, 3, 8, 251, 177, 26, 7, 11, 0, 3, 8, 252, 89, 51, 7, 10, 0, 4, 8, 253, 41, 0, 8, 14, -1, 3, 7, 254, 68, 0, 7, 14, 0, 3, 8, 255, 219, 0, 8, 13, -1, 4, 7 }; diff --git a/editor/doc_title_font.h b/editor/doc_title_font.h deleted file mode 100644 index d190896f18..0000000000 --- a/editor/doc_title_font.h +++ /dev/null @@ -1,33 +0,0 @@ -/*************************************************************************/ -/* doc_title_font.h */ -/*************************************************************************/ -/* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ -/*************************************************************************/ -/* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ -/* Copyright (c) 2014-2018 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. */ -/*************************************************************************/ -static const int _bi_font_doc_title_font_height = 22; -static const int _bi_font_doc_title_font_ascent = 17; -static const int _bi_font_doc_title_font_charcount = 193; -static const int _bi_font_doc_title_font_characters[] = { 0, 108, 97, 2, 2, -1, 16, 0, 13, 111, 97, 2, 2, -1, 16, 0, 32, 252, 55, 2, 2, -1, 16, 4, 33, 84, 48, 3, 13, 1, 4, 6, 34, 9, 99, 6, 6, 0, 4, 8, 35, 52, 76, 9, 12, -1, 5, 9, 36, 31, 18, 9, 16, 0, 3, 9, 37, 28, 35, 13, 13, -1, 4, 13, 38, 56, 35, 12, 13, 0, 4, 13, 39, 16, 99, 3, 6, 0, 4, 4, 40, 48, 0, 5, 17, 0, 3, 6, 41, 54, 0, 5, 17, 0, 3, 6, 42, 207, 84, 9, 8, 0, 3, 9, 43, 121, 86, 9, 9, 0, 7, 9, 44, 251, 71, 4, 6, -1, 13, 5, 45, 102, 97, 5, 3, 0, 10, 6, 46, 66, 99, 4, 4, 0, 13, 5, 47, 24, 0, 9, 17, -2, 3, 8, 48, 11, 76, 10, 12, -1, 5, 9, 49, 102, 74, 9, 12, 0, 5, 9, 50, 48, 63, 10, 12, -1, 5, 9, 51, 59, 63, 10, 12, -1, 5, 9, 52, 70, 63, 10, 12, -1, 5, 9, 53, 81, 62, 10, 12, -1, 5, 9, 54, 235, 59, 10, 12, -1, 5, 9, 55, 103, 61, 10, 12, -1, 5, 9, 56, 114, 60, 10, 12, -1, 5, 9, 57, 125, 60, 10, 12, -1, 5, 9, 58, 252, 45, 3, 9, 0, 8, 5, 59, 246, 71, 4, 11, -1, 8, 5, 60, 148, 73, 8, 12, 0, 5, 9, 61, 0, 100, 8, 7, 0, 8, 9, 62, 139, 73, 8, 12, 0, 5, 9, 63, 40, 49, 8, 13, 0, 4, 8, 64, 184, 17, 15, 14, 0, 5, 16, 65, 178, 47, 12, 12, -1, 5, 11, 66, 136, 60, 10, 12, 0, 5, 10, 67, 240, 45, 11, 12, -1, 5, 10, 68, 0, 63, 11, 12, 0, 5, 11, 69, 130, 73, 8, 12, 0, 5, 9, 70, 112, 74, 8, 12, 0, 5, 8, 71, 191, 46, 12, 12, -1, 5, 11, 72, 24, 63, 11, 12, 0, 5, 11, 73, 193, 72, 4, 12, 0, 5, 5, 74, 173, 73, 6, 12, -1, 5, 6, 75, 147, 60, 10, 12, 0, 5, 10, 76, 121, 73, 8, 12, 0, 5, 8, 77, 122, 47, 15, 12, 0, 5, 16, 78, 12, 63, 11, 12, 0, 5, 12, 79, 138, 47, 13, 12, -1, 5, 12, 80, 62, 76, 9, 12, 0, 5, 10, 81, 200, 17, 14, 14, -1, 5, 12, 82, 158, 60, 10, 12, 0, 5, 10, 83, 32, 76, 9, 12, -1, 5, 9, 84, 169, 60, 10, 12, -1, 5, 9, 85, 204, 46, 11, 12, 0, 5, 12, 86, 165, 47, 12, 12, -1, 5, 11, 87, 88, 48, 17, 12, -1, 5, 16, 88, 216, 46, 11, 12, -1, 5, 10, 89, 228, 46, 11, 12, -1, 5, 9, 90, 180, 60, 10, 12, -1, 5, 9, 91, 249, 0, 5, 16, 0, 4, 6, 92, 13, 0, 10, 17, -2, 3, 8, 93, 85, 17, 5, 16, 0, 4, 6, 94, 196, 85, 10, 8, -1, 5, 9, 95, 71, 99, 10, 3, -1, 17, 9, 96, 46, 99, 6, 4, -1, 4, 5, 97, 111, 87, 9, 9, -1, 8, 9, 98, 207, 32, 9, 13, 0, 4, 10, 99, 161, 86, 8, 9, -1, 8, 8, 100, 69, 34, 10, 13, -1, 4, 10, 101, 89, 88, 10, 9, -1, 8, 9, 102, 58, 49, 7, 13, -1, 4, 6, 103, 191, 59, 10, 12, -1, 8, 9, 104, 177, 33, 9, 13, 0, 4, 10, 105, 187, 73, 5, 12, -1, 5, 4, 106, 177, 17, 6, 15, -2, 5, 5, 107, 217, 32, 9, 13, 0, 4, 9, 108, 250, 17, 4, 13, 0, 4, 4, 109, 24, 89, 14, 9, 0, 8, 15, 110, 151, 86, 9, 9, 0, 8, 10, 111, 100, 87, 10, 9, -1, 8, 10, 112, 42, 76, 9, 12, 0, 8, 10, 113, 213, 59, 10, 12, -1, 8, 10, 114, 188, 86, 7, 9, 0, 8, 6, 115, 170, 86, 8, 9, -1, 8, 7, 116, 230, 72, 7, 11, -1, 6, 6, 117, 141, 86, 9, 9, 0, 8, 10, 118, 78, 89, 10, 9, -1, 8, 9, 119, 8, 89, 15, 9, -1, 8, 13, 120, 131, 86, 9, 9, -1, 8, 8, 121, 224, 59, 10, 12, -1, 8, 9, 122, 179, 86, 8, 9, -1, 8, 7, 123, 34, 0, 6, 17, -1, 3, 6, 124, 64, 0, 3, 17, 2, 3, 9, 125, 41, 0, 6, 17, 0, 3, 6, 126, 30, 99, 9, 5, 0, 5, 9, 160, 114, 97, 2, 2, -1, 16, 4, 161, 80, 48, 3, 13, 1, 6, 6, 162, 165, 73, 7, 12, 0, 5, 9, 163, 92, 74, 9, 12, 0, 5, 9, 164, 209, 72, 10, 11, -1, 6, 9, 165, 36, 63, 11, 12, -2, 5, 9, 166, 60, 0, 3, 17, 2, 3, 9, 167, 151, 17, 8, 15, 0, 4, 9, 168, 82, 99, 6, 3, 0, 5, 7, 169, 236, 17, 13, 13, 0, 4, 15, 170, 238, 72, 7, 11, 0, 5, 7, 171, 54, 89, 11, 9, -1, 7, 10, 172, 20, 99, 9, 5, -1, 10, 9, 173, 96, 98, 5, 3, 0, 10, 6, 174, 226, 84, 8, 8, 0, 4, 9, 175, 89, 98, 6, 3, 0, 4, 7, 176, 40, 99, 5, 5, 0, 4, 6, 177, 22, 76, 9, 12, 0, 5, 9, 178, 235, 84, 6, 8, 0, 3, 6, 179, 242, 84, 6, 8, 0, 3, 6, 180, 53, 99, 6, 4, -1, 4, 5, 181, 0, 76, 10, 12, 0, 8, 10, 182, 215, 17, 10, 14, 0, 5, 11, 183, 251, 78, 3, 4, 0, 9, 5, 184, 60, 99, 5, 4, 0, 16, 5, 185, 249, 83, 5, 8, -1, 3, 5, 186, 0, 89, 7, 10, 0, 5, 8, 187, 66, 89, 11, 9, -1, 7, 10, 188, 42, 35, 13, 13, -1, 4, 12, 189, 0, 35, 13, 13, -1, 4, 12, 190, 14, 35, 13, 13, -1, 4, 13, 191, 49, 49, 8, 13, -1, 6, 8, 192, 150, 0, 12, 16, -1, 1, 11, 193, 176, 0, 12, 16, -1, 1, 11, 194, 163, 0, 12, 16, -1, 1, 11, 195, 124, 0, 12, 16, -1, 1, 11, 196, 105, 17, 12, 15, -1, 2, 11, 197, 0, 0, 12, 17, -1, 0, 11, 198, 106, 47, 15, 12, -1, 5, 14, 199, 141, 17, 9, 15, 0, 5, 10, 200, 60, 18, 8, 16, 0, 1, 9, 201, 41, 18, 9, 16, 0, 1, 9, 202, 21, 18, 9, 16, 0, 1, 9, 203, 160, 17, 8, 15, 0, 2, 9, 204, 69, 17, 7, 16, -2, 1, 5, 205, 77, 17, 7, 16, -1, 1, 5, 206, 51, 18, 8, 16, -2, 1, 5, 207, 169, 17, 7, 15, -2, 2, 5, 208, 152, 47, 12, 12, -1, 5, 12, 209, 237, 0, 11, 16, 0, 1, 12, 210, 82, 0, 13, 16, -1, 1, 12, 211, 68, 0, 13, 16, -1, 1, 12, 212, 110, 0, 13, 16, -1, 1, 12, 213, 96, 0, 13, 16, -1, 1, 12, 214, 91, 17, 13, 15, -1, 2, 12, 215, 217, 84, 8, 8, 0, 8, 9, 216, 137, 0, 12, 16, 0, 3, 12, 217, 225, 0, 11, 16, 0, 1, 12, 218, 189, 0, 11, 16, 0, 1, 12, 219, 213, 0, 11, 16, 0, 1, 12, 220, 118, 17, 11, 15, 0, 2, 12, 221, 201, 0, 11, 16, -1, 1, 9, 222, 72, 76, 9, 12, 0, 5, 10, 223, 167, 33, 9, 13, 0, 4, 10, 224, 157, 33, 9, 13, -1, 4, 9, 225, 30, 49, 9, 13, -1, 4, 9, 226, 227, 32, 9, 13, -1, 4, 9, 227, 237, 31, 9, 13, -1, 4, 9, 228, 82, 75, 9, 12, -1, 5, 9, 229, 226, 17, 9, 14, -1, 3, 9, 230, 39, 89, 14, 9, 0, 8, 14, 231, 157, 73, 7, 12, 0, 8, 8, 232, 146, 33, 10, 13, -1, 4, 9, 233, 80, 34, 10, 13, -1, 4, 9, 234, 91, 33, 10, 13, -1, 4, 9, 235, 92, 61, 10, 12, -1, 5, 9, 236, 66, 49, 6, 13, -2, 4, 4, 237, 73, 48, 6, 13, -1, 4, 4, 238, 247, 31, 8, 13, -2, 4, 4, 239, 180, 73, 6, 12, -1, 5, 4, 240, 187, 32, 9, 13, 0, 4, 10, 241, 197, 32, 9, 13, 0, 4, 10, 242, 102, 33, 10, 13, -1, 4, 10, 243, 113, 33, 10, 13, -1, 4, 10, 244, 124, 33, 10, 13, -1, 4, 10, 245, 135, 33, 10, 13, -1, 4, 10, 246, 202, 59, 10, 12, -1, 5, 10, 247, 220, 72, 9, 11, -1, 6, 9, 248, 198, 72, 10, 11, 0, 7, 10, 249, 0, 49, 9, 13, 0, 4, 10, 250, 10, 49, 9, 13, 0, 4, 10, 251, 20, 49, 9, 13, 0, 4, 10, 252, 246, 58, 9, 12, 0, 5, 10, 253, 0, 18, 10, 16, -1, 4, 9, 254, 11, 18, 9, 16, 0, 4, 10, 255, 130, 17, 10, 15, -1, 5, 9 }; diff --git a/editor/editor_about.cpp b/editor/editor_about.cpp index 7fa4776141..9ab539da07 100644 --- a/editor/editor_about.cpp +++ b/editor/editor_about.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "editor_about.h" #include "editor_node.h" diff --git a/editor/editor_about.h b/editor/editor_about.h index c573382679..b32fdf6567 100644 --- a/editor/editor_about.h +++ b/editor/editor_about.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef EDITOR_ABOUT_H #define EDITOR_ABOUT_H diff --git a/editor/editor_asset_installer.cpp b/editor/editor_asset_installer.cpp index 8a3e1e85f7..f1c8c08d08 100644 --- a/editor/editor_asset_installer.cpp +++ b/editor/editor_asset_installer.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "editor_asset_installer.h" #include "editor_node.h" diff --git a/editor/editor_asset_installer.h b/editor/editor_asset_installer.h index 09ea405c07..a80087861a 100644 --- a/editor/editor_asset_installer.h +++ b/editor/editor_asset_installer.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef EDITORASSETINSTALLER_H #define EDITORASSETINSTALLER_H diff --git a/editor/editor_audio_buses.cpp b/editor/editor_audio_buses.cpp index a64b4922f2..9d0de930f2 100644 --- a/editor/editor_audio_buses.cpp +++ b/editor/editor_audio_buses.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "editor_audio_buses.h" #include "editor_node.h" diff --git a/editor/editor_audio_buses.h b/editor/editor_audio_buses.h index 850cb0bd15..4cdcb65d7b 100644 --- a/editor/editor_audio_buses.h +++ b/editor/editor_audio_buses.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef EDITORAUDIOBUSES_H #define EDITORAUDIOBUSES_H diff --git a/editor/editor_autoload_settings.cpp b/editor/editor_autoload_settings.cpp index 960e0e0bb7..393c33c1b0 100644 --- a/editor/editor_autoload_settings.cpp +++ b/editor/editor_autoload_settings.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "editor_autoload_settings.h" #include "editor_node.h" diff --git a/editor/editor_data.cpp b/editor/editor_data.cpp index c12a112fa4..374688f2db 100644 --- a/editor/editor_data.cpp +++ b/editor/editor_data.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "editor_data.h" #include "editor_node.h" @@ -37,7 +38,7 @@ #include "project_settings.h" #include "scene/resources/packed_scene.h" -void EditorHistory::_cleanup_history() { +void EditorHistory::cleanup_history() { for (int i = 0; i < history.size(); i++) { @@ -47,8 +48,14 @@ void EditorHistory::_cleanup_history() { if (!history[i].path[j].ref.is_null()) continue; - if (ObjectDB::get_instance(history[i].path[j].object)) - continue; //has isntance, try next + Object *obj = ObjectDB::get_instance(history[i].path[j].object); + if (obj) { + Node *n = Object::cast_to<Node>(obj); + if (n && n->is_inside_tree()) + continue; + if (!n) // Possibly still alive + continue; + } if (j <= history[i].level) { //before or equal level, complete fail @@ -151,7 +158,7 @@ bool EditorHistory::is_at_end() const { bool EditorHistory::next() { - _cleanup_history(); + cleanup_history(); if ((current + 1) < history.size()) current++; @@ -163,7 +170,7 @@ bool EditorHistory::next() { bool EditorHistory::previous() { - _cleanup_history(); + cleanup_history(); if (current > 0) current--; diff --git a/editor/editor_data.h b/editor/editor_data.h index 3bc0e6e75c..844145853d 100644 --- a/editor/editor_data.h +++ b/editor/editor_data.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef EDITOR_DATA_H #define EDITOR_DATA_H @@ -69,11 +70,11 @@ class EditorHistory { Variant value; }; - void _cleanup_history(); - void _add_object(ObjectID p_object, const String &p_property, int p_level_change); public: + void cleanup_history(); + bool is_at_beginning() const; bool is_at_end() const; diff --git a/editor/editor_dir_dialog.cpp b/editor/editor_dir_dialog.cpp index bf9c1ec9c6..c094b2b559 100644 --- a/editor/editor_dir_dialog.cpp +++ b/editor/editor_dir_dialog.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "editor_dir_dialog.h" #include "editor/editor_file_system.h" diff --git a/editor/editor_dir_dialog.h b/editor/editor_dir_dialog.h index 8f585ae311..7c19e7de38 100644 --- a/editor/editor_dir_dialog.h +++ b/editor/editor_dir_dialog.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef EDITOR_DIR_DIALOG_H #define EDITOR_DIR_DIALOG_H diff --git a/editor/editor_export.cpp b/editor/editor_export.cpp index 1a10040bac..c9ac62a74d 100644 --- a/editor/editor_export.cpp +++ b/editor/editor_export.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "editor_export.h" #include "editor/editor_file_system.h" @@ -1347,7 +1348,7 @@ Error EditorExportPlatformPC::export_project(const Ref<EditorExportPreset> &p_pr } if (template_path != String() && !FileAccess::exists(template_path)) { - EditorNode::get_singleton()->show_warning(TTR("Template file not found:\n") + template_path); + EditorNode::get_singleton()->show_warning(TTR("Template file not found:") + "\n" + template_path); return ERR_FILE_NOT_FOUND; } @@ -1361,7 +1362,19 @@ Error EditorExportPlatformPC::export_project(const Ref<EditorExportPreset> &p_pr String pck_path = p_path.get_basename() + ".pck"; - return save_pack(p_preset, pck_path); + Vector<SharedObject> so_files; + + err = save_pack(p_preset, pck_path, &so_files); + + if (err != OK || so_files.empty()) + return err; + //if shared object files, copy them + da = DirAccess::create(DirAccess::ACCESS_FILESYSTEM); + for (int i = 0; i < so_files.size(); i++) { + da->copy(so_files[i].path, p_path.get_base_dir().plus_file(so_files[i].path.get_file())); + } + memdelete(da); + return OK; } void EditorExportPlatformPC::set_extension(const String &p_extension, const String &p_feature_key) { diff --git a/editor/editor_export.h b/editor/editor_export.h index aa0391c8f5..e851769279 100644 --- a/editor/editor_export.h +++ b/editor/editor_export.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef EDITOR_EXPORT_H #define EDITOR_EXPORT_H diff --git a/editor/editor_file_dialog.cpp b/editor/editor_file_dialog.cpp index 1bf4c6741d..f356c16827 100644 --- a/editor/editor_file_dialog.cpp +++ b/editor/editor_file_dialog.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "editor_file_dialog.h" #include "dependency_editor.h" #include "editor_resource_preview.h" diff --git a/editor/editor_file_dialog.h b/editor/editor_file_dialog.h index 1a7fa756cc..05f66eadbf 100644 --- a/editor/editor_file_dialog.h +++ b/editor/editor_file_dialog.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef EDITORFILEDIALOG_H #define EDITORFILEDIALOG_H diff --git a/editor/editor_file_system.cpp b/editor/editor_file_system.cpp index bff090cdbc..dca32d7492 100644 --- a/editor/editor_file_system.cpp +++ b/editor/editor_file_system.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "editor_file_system.h" #include "editor_node.h" @@ -1508,6 +1509,19 @@ void EditorFileSystem::_reimport_file(const String &p_file) { void EditorFileSystem::reimport_files(const Vector<String> &p_files) { + { //check that .import folder exists + DirAccess *da = DirAccess::open("res://"); + if (da->change_dir(".import") != OK) { + Error err = da->make_dir(".import"); + if (err) { + memdelete(da); + ERR_EXPLAIN("Failed to create 'res://.import' folder."); + ERR_FAIL_COND(err != OK); + } + } + memdelete(da); + } + importing = true; EditorProgress pr("reimport", TTR("(Re)Importing Assets"), p_files.size()); diff --git a/editor/editor_file_system.h b/editor/editor_file_system.h index 3e0325dfdc..a587d2879a 100644 --- a/editor/editor_file_system.h +++ b/editor/editor_file_system.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef EDITOR_FILE_SYSTEM_H #define EDITOR_FILE_SYSTEM_H diff --git a/editor/editor_fonts.cpp b/editor/editor_fonts.cpp index c50995fc2b..a58257962a 100644 --- a/editor/editor_fonts.cpp +++ b/editor/editor_fonts.cpp @@ -27,12 +27,10 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "editor_fonts.h" #include "builtin_fonts.gen.h" -#include "doc_code_font.h" -#include "doc_font.h" -#include "doc_title_font.h" #include "editor_scale.h" #include "editor_settings.h" #include "scene/resources/default_theme/default_theme.h" @@ -87,10 +85,24 @@ static Ref<BitmapFont> make_font(int p_height, int p_ascent, int p_valign, int p m_name->set_spacing(DynamicFont::SPACING_BOTTOM, -EDSCALE); \ MAKE_FALLBACKS(m_name); +#define MAKE_SOURCE_FONT(m_name, m_size) \ + Ref<DynamicFont> m_name; \ + m_name.instance(); \ + m_name->set_size(m_size); \ + if (CustomFontSource.is_valid()) { \ + m_name->set_font_data(CustomFontSource); \ + m_name->add_fallback(dfmono); \ + } else { \ + m_name->set_font_data(dfmono); \ + } \ + m_name->set_spacing(DynamicFont::SPACING_TOP, -EDSCALE); \ + m_name->set_spacing(DynamicFont::SPACING_BOTTOM, -EDSCALE); \ + MAKE_FALLBACKS(m_name); + void editor_register_fonts(Ref<Theme> p_theme) { /* Custom font */ - String custom_font = EditorSettings::get_singleton()->get("interface/editor/custom_font"); + String custom_font = EditorSettings::get_singleton()->get("interface/editor/main_font"); Ref<DynamicFontData> CustomFont; if (custom_font.length() > 0) { CustomFont.instance(); @@ -98,6 +110,15 @@ void editor_register_fonts(Ref<Theme> p_theme) { CustomFont->set_force_autohinter(true); //just looks better..i think? } + /* Custom source code font */ + + String custom_font_source = EditorSettings::get_singleton()->get("interface/editor/code_font"); + Ref<DynamicFontData> CustomFontSource; + if (custom_font_source.length() > 0) { + CustomFontSource.instance(); + CustomFontSource->set_font_path(custom_font_source); + } + /* Droid Sans */ Ref<DynamicFontData> DefaultFont; @@ -137,7 +158,7 @@ void editor_register_fonts(Ref<Theme> p_theme) { dfmono->set_font_ptr(_font_Hack_Regular, _font_Hack_Regular_size); //dfd->set_force_autohinter(true); //just looks better..i think? - int default_font_size = int(EditorSettings::get_singleton()->get("interface/editor/font_size")) * EDSCALE; + int default_font_size = int(EditorSettings::get_singleton()->get("interface/editor/main_font_size")) * EDSCALE; MAKE_DEFAULT_FONT(df, default_font_size); p_theme->set_default_theme_font(df); @@ -145,10 +166,6 @@ void editor_register_fonts(Ref<Theme> p_theme) { MAKE_DEFAULT_FONT(df_title, default_font_size + 2 * EDSCALE); p_theme->set_font("title", "EditorFonts", df_title); - //Ref<BitmapFont> doc_font = make_font(_bi_font_doc_font_height,_bi_font_doc_font_ascent,0,_bi_font_doc_font_charcount,_bi_font_doc_font_characters,p_theme->get_icon("DocFont","EditorIcons")); - //Ref<BitmapFont> doc_title_font = make_font(_bi_font_doc_title_font_height,_bi_font_doc_title_font_ascent,0,_bi_font_doc_title_font_charcount,_bi_font_doc_title_font_characters,p_theme->get_icon("DocTitleFont","EditorIcons")); - //Ref<BitmapFont> doc_code_font = make_font(_bi_font_doc_code_font_height,_bi_font_doc_code_font_ascent,0,_bi_font_doc_code_font_charcount,_bi_font_doc_code_font_characters,p_theme->get_icon("DocCodeFont","EditorIcons")); - MAKE_DEFAULT_FONT(df_doc_title, int(EDITOR_DEF("text_editor/help/help_title_font_size", 23)) * EDSCALE); MAKE_DEFAULT_FONT(df_doc, int(EDITOR_DEF("text_editor/help/help_font_size", 15)) * EDSCALE); @@ -159,41 +176,15 @@ void editor_register_fonts(Ref<Theme> p_theme) { MAKE_DEFAULT_FONT(df_rulers, 8 * EDSCALE); p_theme->set_font("rulers", "EditorFonts", df_rulers); - Ref<DynamicFont> df_code; - df_code.instance(); - df_code->set_size(int(EditorSettings::get_singleton()->get("interface/editor/source_font_size")) * EDSCALE); - df_code->set_font_data(dfmono); - MAKE_FALLBACKS(df_code); - + MAKE_SOURCE_FONT(df_code, int(EditorSettings::get_singleton()->get("interface/editor/code_font_size")) * EDSCALE); p_theme->set_font("source", "EditorFonts", df_code); - Ref<DynamicFont> df_doc_code; - df_doc_code.instance(); - df_doc_code->set_size(int(EDITOR_DEF("text_editor/help/help_source_font_size", 14)) * EDSCALE); - df_doc_code->set_spacing(DynamicFont::SPACING_TOP, -EDSCALE); - df_doc_code->set_spacing(DynamicFont::SPACING_BOTTOM, -EDSCALE); - df_doc_code->set_font_data(dfmono); - MAKE_FALLBACKS(df_doc_code); - + MAKE_SOURCE_FONT(df_doc_code, int(EDITOR_DEF("text_editor/help/help_source_font_size", 14)) * EDSCALE); p_theme->set_font("doc_source", "EditorFonts", df_doc_code); - Ref<DynamicFont> df_output_code; - df_output_code.instance(); - df_output_code->set_size(int(EDITOR_DEF("run/output/font_size", 13)) * EDSCALE); - df_output_code->set_spacing(DynamicFont::SPACING_TOP, -EDSCALE); - df_output_code->set_spacing(DynamicFont::SPACING_BOTTOM, -EDSCALE); - df_output_code->set_font_data(dfmono); - MAKE_FALLBACKS(df_output_code); - + MAKE_SOURCE_FONT(df_output_code, int(EDITOR_DEF("run/output/font_size", 13)) * EDSCALE); p_theme->set_font("output_source", "EditorFonts", df_output_code); - Ref<DynamicFont> df_text_editor_status_code; - df_text_editor_status_code.instance(); - df_text_editor_status_code->set_size(14 * EDSCALE); - df_text_editor_status_code->set_spacing(DynamicFont::SPACING_TOP, -EDSCALE); - df_text_editor_status_code->set_spacing(DynamicFont::SPACING_BOTTOM, -EDSCALE); - df_text_editor_status_code->set_font_data(dfmono); - MAKE_FALLBACKS(df_text_editor_status_code); - + MAKE_SOURCE_FONT(df_text_editor_status_code, 14 * EDSCALE); p_theme->set_font("status_source", "EditorFonts", df_text_editor_status_code); } diff --git a/editor/editor_fonts.h b/editor/editor_fonts.h index abbccb685d..d079b41b82 100644 --- a/editor/editor_fonts.h +++ b/editor/editor_fonts.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef EDITOR_FONTS_H #define EDITOR_FONTS_H diff --git a/editor/editor_help.cpp b/editor/editor_help.cpp index c094d4be6b..d2883cab07 100644 --- a/editor/editor_help.cpp +++ b/editor/editor_help.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "editor_help.h" #include "doc_data_compressed.gen.h" diff --git a/editor/editor_help.h b/editor/editor_help.h index adcd73471e..db4c33afb0 100644 --- a/editor/editor_help.h +++ b/editor/editor_help.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef EDITOR_HELP_H #define EDITOR_HELP_H diff --git a/editor/editor_initialize_ssl.cpp b/editor/editor_initialize_ssl.cpp index 81521bc0a5..aedbfb7bd7 100644 --- a/editor/editor_initialize_ssl.cpp +++ b/editor/editor_initialize_ssl.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "editor_initialize_ssl.h" #include "certs_compressed.gen.h" diff --git a/editor/editor_initialize_ssl.h b/editor/editor_initialize_ssl.h index 52b67dea92..71d16b8c53 100644 --- a/editor/editor_initialize_ssl.h +++ b/editor/editor_initialize_ssl.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef EDITOR_INITIALIZE_SSL_H #define EDITOR_INITIALIZE_SSL_H diff --git a/editor/editor_log.cpp b/editor/editor_log.cpp index 79542f3b5c..e301d12214 100644 --- a/editor/editor_log.cpp +++ b/editor/editor_log.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "editor_log.h" #include "core/os/keyboard.h" diff --git a/editor/editor_log.h b/editor/editor_log.h index c75dc0dd44..42137f71cc 100644 --- a/editor/editor_log.h +++ b/editor/editor_log.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef EDITOR_LOG_H #define EDITOR_LOG_H diff --git a/editor/editor_name_dialog.cpp b/editor/editor_name_dialog.cpp index 25d12a75ff..bacb288273 100644 --- a/editor/editor_name_dialog.cpp +++ b/editor/editor_name_dialog.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "editor_name_dialog.h" #include "class_db.h" diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index b52161813d..2b62faf218 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "editor_node.h" #include "core/bind/core_bind.h" @@ -59,6 +60,7 @@ #include "editor/editor_themes.h" #include "editor/import/editor_import_collada.h" #include "editor/import/editor_scene_importer_gltf.h" +#include "editor/import/resource_importer_bitmask.h" #include "editor/import/resource_importer_csv_translation.h" #include "editor/import/resource_importer_obj.h" #include "editor/import/resource_importer_scene.h" @@ -391,42 +393,6 @@ void EditorNode::_fs_changed() { E->get()->invalidate(); } - if (export_defer.preset != "") { - Ref<EditorExportPreset> preset; - for (int i = 0; i < EditorExport::get_singleton()->get_export_preset_count(); ++i) { - preset = EditorExport::get_singleton()->get_export_preset(i); - if (preset->get_name() == export_defer.preset) { - break; - } - preset.unref(); - } - if (preset.is_null()) { - String err = "Unknown export preset: " + export_defer.preset; - ERR_PRINT(err.utf8().get_data()); - } else { - Ref<EditorExportPlatform> platform = preset->get_platform(); - if (platform.is_null()) { - String err = "Preset \"" + export_defer.preset + "\" doesn't have a platform."; - ERR_PRINT(err.utf8().get_data()); - } else { - // ensures export_project does not loop infinitely, because notifications may - // come during the export - export_defer.preset = ""; - 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); - } - } - } - - get_tree()->quit(); - } - { //reload changed resources List<Ref<Resource> > changed; @@ -463,6 +429,42 @@ void EditorNode::_fs_changed() { } _mark_unsaved_scenes(); + + if (export_defer.preset != "" && !EditorFileSystem::get_singleton()->is_scanning()) { + Ref<EditorExportPreset> preset; + for (int i = 0; i < EditorExport::get_singleton()->get_export_preset_count(); ++i) { + preset = EditorExport::get_singleton()->get_export_preset(i); + if (preset->get_name() == export_defer.preset) { + break; + } + preset.unref(); + } + if (preset.is_null()) { + String err = "Unknown export preset: " + export_defer.preset; + ERR_PRINT(err.utf8().get_data()); + } else { + Ref<EditorExportPlatform> platform = preset->get_platform(); + if (platform.is_null()) { + String err = "Preset \"" + export_defer.preset + "\" doesn't have a platform."; + ERR_PRINT(err.utf8().get_data()); + } else { + // ensures export_project does not loop infinitely, because notifications may + // come during the export + export_defer.preset = ""; + 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); + } + } + } + + get_tree()->quit(); + } } void EditorNode::_resources_reimported(const Vector<String> &p_resources) { @@ -1020,7 +1022,7 @@ void EditorNode::_save_scene(String p_file, int idx) { current_option = -1; accept->get_ok()->set_text(TTR("I see..")); - accept->set_text(TTR("Couldn't save scene. Likely dependencies (instances) couldn't be satisfied.")); + accept->set_text(TTR("Couldn't save scene. Likely dependencies (instances or inheritance) couldn't be satisfied.")); accept->popup_centered_minsize(); return; } @@ -1028,6 +1030,13 @@ void EditorNode::_save_scene(String p_file, int idx) { // force creation of node path cache // (hacky but needed for the tree to update properly) Node *dummy_scene = sdata->instance(PackedScene::GEN_EDIT_STATE_INSTANCE); + if (!dummy_scene) { + current_option = -1; + accept->get_ok()->set_text(TTR("I see..")); + accept->set_text(TTR("Couldn't save scene. Likely dependencies (instances or inheritance) couldn't be satisfied.")); + accept->popup_centered_minsize(); + return; + } memdelete(dummy_scene); int flg = 0; @@ -1389,7 +1398,7 @@ void EditorNode::_property_editor_forward() { } void EditorNode::_property_editor_back() { - if (editor_history.previous()) + if (editor_history.previous() || editor_history.get_path_size() == 1) _edit_current(); } @@ -4807,6 +4816,10 @@ EditorNode::EditorNode() { import_gltf.instance(); import_scene->add_importer(import_gltf); } + + Ref<ResourceImporterBitMap> import_bitmap; + import_bitmap.instance(); + ResourceFormatImporter::get_singleton()->add_importer(import_bitmap); } _pvrtc_register_compressors(); diff --git a/editor/editor_node.h b/editor/editor_node.h index d090d83241..03102cdc81 100644 --- a/editor/editor_node.h +++ b/editor/editor_node.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef EDITOR_NODE_H #define EDITOR_NODE_H diff --git a/editor/editor_path.cpp b/editor/editor_path.cpp index c01f56581f..9506a0e951 100644 --- a/editor/editor_path.cpp +++ b/editor/editor_path.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "editor_path.h" #include "editor_node.h" diff --git a/editor/editor_path.h b/editor/editor_path.h index 597746faf4..a86e6b7b28 100644 --- a/editor/editor_path.h +++ b/editor/editor_path.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef EDITOR_PATH_H #define EDITOR_PATH_H diff --git a/editor/editor_plugin.cpp b/editor/editor_plugin.cpp index 16e60edda7..9dd8a7232f 100644 --- a/editor/editor_plugin.cpp +++ b/editor/editor_plugin.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "editor_plugin.h" #include "editor/editor_node.h" @@ -663,7 +664,7 @@ void EditorPlugin::_bind_methods() { ClassDB::bind_method(D_METHOD("get_editor_interface"), &EditorPlugin::get_editor_interface); - ClassDB::add_virtual_method(get_class_static(), MethodInfo(Variant::BOOL, "forward_canvas_gui_input", PropertyInfo(Variant::TRANSFORM2D, "canvas_xform"), PropertyInfo(Variant::OBJECT, "event", PROPERTY_HINT_RESOURCE_TYPE, "InputEvent"))); + ClassDB::add_virtual_method(get_class_static(), MethodInfo(Variant::BOOL, "forward_canvas_gui_input", PropertyInfo(Variant::OBJECT, "event", PROPERTY_HINT_RESOURCE_TYPE, "InputEvent"))); ClassDB::add_virtual_method(get_class_static(), MethodInfo("forward_draw_over_viewport", PropertyInfo(Variant::OBJECT, "overlay", PROPERTY_HINT_RESOURCE_TYPE, "Control"))); ClassDB::add_virtual_method(get_class_static(), MethodInfo("forward_force_draw_over_viewport", PropertyInfo(Variant::OBJECT, "overlay", PROPERTY_HINT_RESOURCE_TYPE, "Control"))); ClassDB::add_virtual_method(get_class_static(), MethodInfo(Variant::BOOL, "forward_spatial_gui_input", PropertyInfo(Variant::OBJECT, "camera", PROPERTY_HINT_RESOURCE_TYPE, "Camera"), PropertyInfo(Variant::OBJECT, "event", PROPERTY_HINT_RESOURCE_TYPE, "InputEvent"))); diff --git a/editor/editor_plugin.h b/editor/editor_plugin.h index 887e599208..8ed14ab847 100644 --- a/editor/editor_plugin.h +++ b/editor/editor_plugin.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef EDITOR_PLUGIN_H #define EDITOR_PLUGIN_H diff --git a/editor/editor_plugin_settings.cpp b/editor/editor_plugin_settings.cpp index 234363cdff..8803a03f2d 100644 --- a/editor/editor_plugin_settings.cpp +++ b/editor/editor_plugin_settings.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "editor_plugin_settings.h" #include "editor_node.h" diff --git a/editor/editor_plugin_settings.h b/editor/editor_plugin_settings.h index fac14fa177..aacbd05dd4 100644 --- a/editor/editor_plugin_settings.h +++ b/editor/editor_plugin_settings.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef EDITORPLUGINSETTINGS_H #define EDITORPLUGINSETTINGS_H diff --git a/editor/editor_profiler.cpp b/editor/editor_profiler.cpp index c55d62fbe5..34c9ca6630 100644 --- a/editor/editor_profiler.cpp +++ b/editor/editor_profiler.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "editor_profiler.h" #include "editor_scale.h" diff --git a/editor/editor_profiler.h b/editor/editor_profiler.h index c4543848ab..d902a97c5d 100644 --- a/editor/editor_profiler.h +++ b/editor/editor_profiler.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef EDITORPROFILER_H #define EDITORPROFILER_H diff --git a/editor/editor_resource_preview.cpp b/editor/editor_resource_preview.cpp index b981f74242..93787a7a4c 100644 --- a/editor/editor_resource_preview.cpp +++ b/editor/editor_resource_preview.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "editor_resource_preview.h" #include "editor_scale.h" diff --git a/editor/editor_resource_preview.h b/editor/editor_resource_preview.h index 6f1719e0a5..e2276aa11d 100644 --- a/editor/editor_resource_preview.h +++ b/editor/editor_resource_preview.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef EDITORRESOURCEPREVIEW_H #define EDITORRESOURCEPREVIEW_H diff --git a/editor/editor_run.cpp b/editor/editor_run.cpp index ecb4b4aa8f..749cf6aa2b 100644 --- a/editor/editor_run.cpp +++ b/editor/editor_run.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "editor_run.h" #include "editor_settings.h" diff --git a/editor/editor_run.h b/editor/editor_run.h index 9eee1122c8..8da607e6dc 100644 --- a/editor/editor_run.h +++ b/editor/editor_run.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef EDITOR_RUN_H #define EDITOR_RUN_H diff --git a/editor/editor_run_native.cpp b/editor/editor_run_native.cpp index a546f34c17..caa1d4be62 100644 --- a/editor/editor_run_native.cpp +++ b/editor/editor_run_native.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "editor_run_native.h" #include "editor_export.h" diff --git a/editor/editor_run_native.h b/editor/editor_run_native.h index d9bce34e48..5bfe600a04 100644 --- a/editor/editor_run_native.h +++ b/editor/editor_run_native.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef EDITOR_RUN_NATIVE_H #define EDITOR_RUN_NATIVE_H diff --git a/editor/editor_run_script.cpp b/editor/editor_run_script.cpp index 4ead241bbb..93d201864e 100644 --- a/editor/editor_run_script.cpp +++ b/editor/editor_run_script.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "editor_run_script.h" #include "editor_node.h" diff --git a/editor/editor_run_script.h b/editor/editor_run_script.h index c613e61feb..027fdd428d 100644 --- a/editor/editor_run_script.h +++ b/editor/editor_run_script.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef EDITOR_RUN_SCRIPT_H #define EDITOR_RUN_SCRIPT_H diff --git a/editor/editor_scale.cpp b/editor/editor_scale.cpp index d3ef5bfa32..365ea95e3e 100644 --- a/editor/editor_scale.cpp +++ b/editor/editor_scale.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "editor_scale.h" #include "os/os.h" diff --git a/editor/editor_scale.h b/editor/editor_scale.h index 9af245e8d2..87f64598e3 100644 --- a/editor/editor_scale.h +++ b/editor/editor_scale.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef EDITOR_SCALE_H #define EDITOR_SCALE_H diff --git a/editor/editor_settings.cpp b/editor/editor_settings.cpp index a5001cb1ac..7081bb925f 100644 --- a/editor/editor_settings.cpp +++ b/editor/editor_settings.cpp @@ -3,7 +3,7 @@ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ -/* http:/www.godotengine.org */ +/* https://godotengine.org */ /*************************************************************************/ /* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md) */ @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "editor_settings.h" #include "core/io/compression.h" @@ -53,7 +54,18 @@ Ref<EditorSettings> EditorSettings::singleton = NULL; // Properties -bool EditorSettings::_set(const StringName &p_name, const Variant &p_value, bool p_emit_signal) { +bool EditorSettings::_set(const StringName &p_name, const Variant &p_value) { + + _THREAD_SAFE_METHOD_ + + bool changed = _set_only(p_name, p_value); + if (changed) { + emit_signal("settings_changed"); + } + return true; +} + +bool EditorSettings::_set_only(const StringName &p_name, const Variant &p_value) { _THREAD_SAFE_METHOD_ @@ -72,7 +84,7 @@ bool EditorSettings::_set(const StringName &p_name, const Variant &p_value, bool add_shortcut(name, sc); } - return true; + return false; } bool changed = false; @@ -101,10 +113,7 @@ bool EditorSettings::_set(const StringName &p_name, const Variant &p_value, bool } } - if (changed && p_emit_signal) { - emit_signal("settings_changed"); - } - return true; + return changed; } bool EditorSettings::_get(const StringName &p_name, Variant &r_ret) const { @@ -272,12 +281,14 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) { _initial_set("interface/editor/hidpi_mode", 0); hints["interface/editor/hidpi_mode"] = PropertyInfo(Variant::INT, "interface/editor/hidpi_mode", PROPERTY_HINT_ENUM, "Auto,VeryLoDPI,LoDPI,MidDPI,HiDPI", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_RESTART_IF_CHANGED); _initial_set("interface/scene_tabs/show_script_button", false); - _initial_set("interface/editor/font_size", 14); - hints["interface/editor/font_size"] = PropertyInfo(Variant::INT, "interface/editor/font_size", PROPERTY_HINT_RANGE, "10,40,1", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_RESTART_IF_CHANGED); - _initial_set("interface/editor/source_font_size", 14); - hints["interface/editor/source_font_size"] = PropertyInfo(Variant::INT, "interface/editor/source_font_size", PROPERTY_HINT_RANGE, "8,96,1", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_RESTART_IF_CHANGED); - _initial_set("interface/editor/custom_font", ""); - hints["interface/editor/custom_font"] = PropertyInfo(Variant::STRING, "interface/editor/custom_font", PROPERTY_HINT_GLOBAL_FILE, "*.ttf,*.otf", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_RESTART_IF_CHANGED); + _initial_set("interface/editor/main_font_size", 14); + hints["interface/editor/main_font_size"] = PropertyInfo(Variant::INT, "interface/editor/main_font_size", PROPERTY_HINT_RANGE, "10,40,1", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_RESTART_IF_CHANGED); + _initial_set("interface/editor/code_font_size", 14); + hints["interface/editor/code_font_size"] = PropertyInfo(Variant::INT, "interface/editor/code_font_size", PROPERTY_HINT_RANGE, "8,96,1", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_RESTART_IF_CHANGED); + _initial_set("interface/editor/main_font", ""); + hints["interface/editor/main_font"] = PropertyInfo(Variant::STRING, "interface/editor/main_font", PROPERTY_HINT_GLOBAL_FILE, "*.ttf,*.otf", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_RESTART_IF_CHANGED); + _initial_set("interface/editor/code_font", ""); + hints["interface/editor/code_font"] = PropertyInfo(Variant::STRING, "interface/editor/code_font", PROPERTY_HINT_GLOBAL_FILE, "*.ttf,*.otf", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_RESTART_IF_CHANGED); _initial_set("interface/editor/dim_editor_on_dialog_popup", true); _initial_set("interface/editor/dim_amount", 0.6f); hints["interface/editor/dim_amount"] = PropertyInfo(Variant::REAL, "interface/editor/dim_amount", PROPERTY_HINT_RANGE, "0,1,0.01", PROPERTY_USAGE_DEFAULT); @@ -366,9 +377,9 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) { hints["text_editor/cursor/caret_blink_speed"] = PropertyInfo(Variant::REAL, "text_editor/cursor/caret_blink_speed", PROPERTY_HINT_RANGE, "0.1, 10, 0.1"); _initial_set("text_editor/cursor/right_click_moves_caret", true); - _initial_set("text_editor/theme/font", ""); - hints["text_editor/theme/font"] = PropertyInfo(Variant::STRING, "text_editor/theme/font", PROPERTY_HINT_GLOBAL_FILE, "*.font,*.tres,*.res"); _initial_set("text_editor/completion/auto_brace_complete", false); + _initial_set("text_editor/completion/put_callhint_tooltip_below_current_line", true); + _initial_set("text_editor/completion/callhint_tooltip_offset", Vector2()); _initial_set("text_editor/files/restore_scripts_on_load", true); _initial_set("text_editor/completion/complete_file_paths", true); _initial_set("text_editor/files/maximum_recent_files", 20); @@ -981,7 +992,7 @@ void EditorSettings::raise_order(const String &p_setting) { props[p_setting].order = ++last_order; } -void EditorSettings::set_initial_value(const StringName &p_setting, const Variant &p_value) { +void EditorSettings::set_initial_value(const StringName &p_setting, const Variant &p_value, bool update_current) { _THREAD_SAFE_METHOD_ @@ -989,6 +1000,9 @@ void EditorSettings::set_initial_value(const StringName &p_setting, const Varian return; props[p_setting].initial = p_value; props[p_setting].has_default_value = true; + if (update_current) { + set(p_setting, p_value); + } } Variant _EDITOR_DEF(const String &p_setting, const Variant &p_default) { @@ -1173,8 +1187,10 @@ void EditorSettings::list_text_editor_themes() { void EditorSettings::load_text_editor_theme() { if (get("text_editor/theme/color_theme") == "Default" || get("text_editor/theme/color_theme") == "Adaptive" || get("text_editor/theme/color_theme") == "Custom") { - _load_default_text_editor_theme(); // sorry for "Settings changed" console spam - return; + if (get("text_editor/theme/color_theme") == "Default") { + _load_default_text_editor_theme(); + } + return; // sorry for "Settings changed" console spam } String theme_path = get_text_editor_themes_dir().plus_file((String)get("text_editor/theme/color_theme") + ".tet"); diff --git a/editor/editor_settings.h b/editor/editor_settings.h index b079f71b6a..914316ee61 100644 --- a/editor/editor_settings.h +++ b/editor/editor_settings.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef EDITOR_SETTINGS_H #define EDITOR_SETTINGS_H @@ -110,7 +111,8 @@ private: bool save_changed_setting; bool optimize_save; //do not save stuff that came from config but was not set from engine - bool _set(const StringName &p_name, const Variant &p_value, bool p_emit_signal = true); + bool _set(const StringName &p_name, const Variant &p_value); + bool _set_only(const StringName &p_name, const Variant &p_value); bool _get(const StringName &p_name, Variant &r_ret) const; void _initial_set(const StringName &p_name, const Variant &p_value); void _get_property_list(List<PropertyInfo> *p_list) const; @@ -143,9 +145,12 @@ public: bool has_setting(const String &p_setting) const; void erase(const String &p_setting); void raise_order(const String &p_setting); - void set_initial_value(const StringName &p_setting, const Variant &p_value); + void set_initial_value(const StringName &p_setting, const Variant &p_value, bool update_current = false); void set_manually(const StringName &p_setting, const Variant &p_value, bool p_emit_signal = false) { - _set(p_setting, p_value, p_emit_signal); + if (p_emit_signal) + _set(p_setting, p_value); + else + _set_only(p_setting, p_value); } bool property_can_revert(const String &p_setting); Variant property_get_revert(const String &p_setting); diff --git a/editor/editor_sub_scene.cpp b/editor/editor_sub_scene.cpp index 0eaf475c14..7527b198b8 100644 --- a/editor/editor_sub_scene.cpp +++ b/editor/editor_sub_scene.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "editor_sub_scene.h" #include "scene/gui/margin_container.h" diff --git a/editor/editor_sub_scene.h b/editor/editor_sub_scene.h index 56c08c7532..cf4d6fd5b9 100644 --- a/editor/editor_sub_scene.h +++ b/editor/editor_sub_scene.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef EDITOR_SUB_SCENE_H #define EDITOR_SUB_SCENE_H diff --git a/editor/editor_themes.cpp b/editor/editor_themes.cpp index 8a3e7e6716..9fda9d2ff6 100644 --- a/editor/editor_themes.cpp +++ b/editor/editor_themes.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "editor_themes.h" #include "core/io/resource_loader.h" @@ -1062,67 +1063,67 @@ Ref<Theme> create_editor_theme(const Ref<Theme> p_theme) { EditorSettings *setting = EditorSettings::get_singleton(); String text_editor_color_theme = setting->get("text_editor/theme/color_theme"); if (text_editor_color_theme == "Adaptive") { - setting->set_manually("text_editor/highlighting/symbol_color", symbol_color); - setting->set_manually("text_editor/highlighting/keyword_color", keyword_color); - setting->set_manually("text_editor/highlighting/base_type_color", basetype_color); - setting->set_manually("text_editor/highlighting/engine_type_color", type_color); - setting->set_manually("text_editor/highlighting/comment_color", comment_color); - setting->set_manually("text_editor/highlighting/string_color", string_color); - setting->set_manually("text_editor/highlighting/background_color", background_color); - setting->set_manually("text_editor/highlighting/completion_background_color", completion_background_color); - setting->set_manually("text_editor/highlighting/completion_selected_color", completion_selected_color); - setting->set_manually("text_editor/highlighting/completion_existing_color", completion_existing_color); - setting->set_manually("text_editor/highlighting/completion_scroll_color", completion_scroll_color); - setting->set_manually("text_editor/highlighting/completion_font_color", completion_font_color); - setting->set_manually("text_editor/highlighting/text_color", text_color); - setting->set_manually("text_editor/highlighting/line_number_color", line_number_color); - setting->set_manually("text_editor/highlighting/caret_color", caret_color); - setting->set_manually("text_editor/highlighting/caret_background_color", caret_background_color); - setting->set_manually("text_editor/highlighting/text_selected_color", text_selected_color); - setting->set_manually("text_editor/highlighting/selection_color", selection_color); - setting->set_manually("text_editor/highlighting/brace_mismatch_color", brace_mismatch_color); - setting->set_manually("text_editor/highlighting/current_line_color", current_line_color); - setting->set_manually("text_editor/highlighting/line_length_guideline_color", line_length_guideline_color); - setting->set_manually("text_editor/highlighting/word_highlighted_color", word_highlighted_color); - setting->set_manually("text_editor/highlighting/number_color", number_color); - setting->set_manually("text_editor/highlighting/function_color", function_color); - setting->set_manually("text_editor/highlighting/member_variable_color", member_variable_color); - setting->set_manually("text_editor/highlighting/mark_color", mark_color); - setting->set_manually("text_editor/highlighting/breakpoint_color", breakpoint_color); - setting->set_manually("text_editor/highlighting/code_folding_color", code_folding_color); - setting->set_manually("text_editor/highlighting/search_result_color", search_result_color); - setting->set_manually("text_editor/highlighting/search_result_border_color", search_result_border_color); + setting->set_initial_value("text_editor/highlighting/symbol_color", symbol_color, true); + setting->set_initial_value("text_editor/highlighting/keyword_color", keyword_color, true); + setting->set_initial_value("text_editor/highlighting/base_type_color", basetype_color, true); + setting->set_initial_value("text_editor/highlighting/engine_type_color", type_color, true); + setting->set_initial_value("text_editor/highlighting/comment_color", comment_color, true); + setting->set_initial_value("text_editor/highlighting/string_color", string_color, true); + setting->set_initial_value("text_editor/highlighting/background_color", background_color, true); + setting->set_initial_value("text_editor/highlighting/completion_background_color", completion_background_color, true); + setting->set_initial_value("text_editor/highlighting/completion_selected_color", completion_selected_color, true); + setting->set_initial_value("text_editor/highlighting/completion_existing_color", completion_existing_color, true); + setting->set_initial_value("text_editor/highlighting/completion_scroll_color", completion_scroll_color, true); + setting->set_initial_value("text_editor/highlighting/completion_font_color", completion_font_color, true); + setting->set_initial_value("text_editor/highlighting/text_color", text_color, true); + setting->set_initial_value("text_editor/highlighting/line_number_color", line_number_color, true); + setting->set_initial_value("text_editor/highlighting/caret_color", caret_color, true); + setting->set_initial_value("text_editor/highlighting/caret_background_color", caret_background_color, true); + setting->set_initial_value("text_editor/highlighting/text_selected_color", text_selected_color, true); + setting->set_initial_value("text_editor/highlighting/selection_color", selection_color, true); + setting->set_initial_value("text_editor/highlighting/brace_mismatch_color", brace_mismatch_color, true); + setting->set_initial_value("text_editor/highlighting/current_line_color", current_line_color, true); + setting->set_initial_value("text_editor/highlighting/line_length_guideline_color", line_length_guideline_color, true); + setting->set_initial_value("text_editor/highlighting/word_highlighted_color", word_highlighted_color, true); + setting->set_initial_value("text_editor/highlighting/number_color", number_color, true); + setting->set_initial_value("text_editor/highlighting/function_color", function_color, true); + setting->set_initial_value("text_editor/highlighting/member_variable_color", member_variable_color, true); + setting->set_initial_value("text_editor/highlighting/mark_color", mark_color, true); + setting->set_initial_value("text_editor/highlighting/breakpoint_color", breakpoint_color, true); + setting->set_initial_value("text_editor/highlighting/code_folding_color", code_folding_color, true); + setting->set_initial_value("text_editor/highlighting/search_result_color", search_result_color, true); + setting->set_initial_value("text_editor/highlighting/search_result_border_color", search_result_border_color, true); } else if (text_editor_color_theme == "Default") { - setting->set_manually("text_editor/highlighting/symbol_color", Color::html("badfff")); - setting->set_manually("text_editor/highlighting/keyword_color", Color::html("ffffb3")); - setting->set_manually("text_editor/highlighting/base_type_color", Color::html("a4ffd4")); - setting->set_manually("text_editor/highlighting/engine_type_color", Color::html("83d3ff")); - setting->set_manually("text_editor/highlighting/comment_color", Color::html("676767")); - setting->set_manually("text_editor/highlighting/string_color", Color::html("ef6ebe")); - setting->set_manually("text_editor/highlighting/background_color", Color::html("3b000000")); - setting->set_manually("text_editor/highlighting/completion_background_color", Color::html("2C2A32")); - setting->set_manually("text_editor/highlighting/completion_selected_color", Color::html("434244")); - setting->set_manually("text_editor/highlighting/completion_existing_color", Color::html("21dfdfdf")); - setting->set_manually("text_editor/highlighting/completion_scroll_color", Color::html("ffffff")); - setting->set_manually("text_editor/highlighting/completion_font_color", Color::html("aaaaaa")); - setting->set_manually("text_editor/highlighting/text_color", Color::html("aaaaaa")); - setting->set_manually("text_editor/highlighting/line_number_color", Color::html("66aaaaaa")); - setting->set_manually("text_editor/highlighting/caret_color", Color::html("aaaaaa")); - setting->set_manually("text_editor/highlighting/caret_background_color", Color::html("000000")); - setting->set_manually("text_editor/highlighting/text_selected_color", Color::html("000000")); - setting->set_manually("text_editor/highlighting/selection_color", Color::html("6ca9c2")); - setting->set_manually("text_editor/highlighting/brace_mismatch_color", Color(1, 0.2, 0.2)); - setting->set_manually("text_editor/highlighting/current_line_color", Color(0.3, 0.5, 0.8, 0.15)); - setting->set_manually("text_editor/highlighting/line_length_guideline_color", Color(0.3, 0.5, 0.8, 0.1)); - setting->set_manually("text_editor/highlighting/word_highlighted_color", Color(0.8, 0.9, 0.9, 0.15)); - setting->set_manually("text_editor/highlighting/number_color", Color::html("EB9532")); - setting->set_manually("text_editor/highlighting/function_color", Color::html("66a2ce")); - setting->set_manually("text_editor/highlighting/member_variable_color", Color::html("e64e59")); - setting->set_manually("text_editor/highlighting/mark_color", Color(1.0, 0.4, 0.4, 0.4)); - setting->set_manually("text_editor/highlighting/breakpoint_color", Color(0.8, 0.8, 0.4, 0.2)); - setting->set_manually("text_editor/highlighting/code_folding_color", Color(0.8, 0.8, 0.8, 0.8)); - setting->set_manually("text_editor/highlighting/search_result_color", Color(0.05, 0.25, 0.05, 1)); - setting->set_manually("text_editor/highlighting/search_result_border_color", Color(0.1, 0.45, 0.1, 1)); + setting->set_initial_value("text_editor/highlighting/symbol_color", Color::html("badfff"), true); + setting->set_initial_value("text_editor/highlighting/keyword_color", Color::html("ffffb3"), true); + setting->set_initial_value("text_editor/highlighting/base_type_color", Color::html("a4ffd4"), true); + setting->set_initial_value("text_editor/highlighting/engine_type_color", Color::html("83d3ff"), true); + setting->set_initial_value("text_editor/highlighting/comment_color", Color::html("676767"), true); + setting->set_initial_value("text_editor/highlighting/string_color", Color::html("ef6ebe"), true); + setting->set_initial_value("text_editor/highlighting/background_color", Color::html("3b000000"), true); + setting->set_initial_value("text_editor/highlighting/completion_background_color", Color::html("2C2A32"), true); + setting->set_initial_value("text_editor/highlighting/completion_selected_color", Color::html("434244"), true); + setting->set_initial_value("text_editor/highlighting/completion_existing_color", Color::html("21dfdfdf"), true); + setting->set_initial_value("text_editor/highlighting/completion_scroll_color", Color::html("ffffff"), true); + setting->set_initial_value("text_editor/highlighting/completion_font_color", Color::html("aaaaaa"), true); + setting->set_initial_value("text_editor/highlighting/text_color", Color::html("aaaaaa"), true); + setting->set_initial_value("text_editor/highlighting/line_number_color", Color::html("66aaaaaa"), true); + setting->set_initial_value("text_editor/highlighting/caret_color", Color::html("aaaaaa"), true); + setting->set_initial_value("text_editor/highlighting/caret_background_color", Color::html("000000"), true); + setting->set_initial_value("text_editor/highlighting/text_selected_color", Color::html("000000"), true); + setting->set_initial_value("text_editor/highlighting/selection_color", Color::html("6ca9c2"), true); + setting->set_initial_value("text_editor/highlighting/brace_mismatch_color", Color(1, 0.2, 0.2), true); + setting->set_initial_value("text_editor/highlighting/current_line_color", Color(0.3, 0.5, 0.8, 0.15), true); + setting->set_initial_value("text_editor/highlighting/line_length_guideline_color", Color(0.3, 0.5, 0.8, 0.1), true); + setting->set_initial_value("text_editor/highlighting/word_highlighted_color", Color(0.8, 0.9, 0.9, 0.15), true); + setting->set_initial_value("text_editor/highlighting/number_color", Color::html("EB9532"), true); + setting->set_initial_value("text_editor/highlighting/function_color", Color::html("66a2ce"), true); + setting->set_initial_value("text_editor/highlighting/member_variable_color", Color::html("e64e59"), true); + setting->set_initial_value("text_editor/highlighting/mark_color", Color(1.0, 0.4, 0.4, 0.4), true); + setting->set_initial_value("text_editor/highlighting/breakpoint_color", Color(0.8, 0.8, 0.4, 0.2), true); + setting->set_initial_value("text_editor/highlighting/code_folding_color", Color(0.8, 0.8, 0.8, 0.8), true); + setting->set_initial_value("text_editor/highlighting/search_result_color", Color(0.05, 0.25, 0.05, 1), true); + setting->set_initial_value("text_editor/highlighting/search_result_border_color", Color(0.1, 0.45, 0.1, 1), true); } return theme; diff --git a/editor/editor_themes.h b/editor/editor_themes.h index 6f4e527cb2..7d8d3a5308 100644 --- a/editor/editor_themes.h +++ b/editor/editor_themes.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef EDITOR_THEMES_H #define EDITOR_THEMES_H diff --git a/editor/export_template_manager.cpp b/editor/export_template_manager.cpp index 0206e37c43..6cbca3f733 100644 --- a/editor/export_template_manager.cpp +++ b/editor/export_template_manager.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "export_template_manager.h" #include "editor_node.h" @@ -250,7 +251,7 @@ void ExportTemplateManager::_install_from_file(const String &p_file, bool p_use_ DirAccess *d = DirAccess::create(DirAccess::ACCESS_FILESYSTEM); Error err = d->make_dir_recursive(template_path); if (err != OK) { - EditorNode::get_singleton()->show_warning(TTR("Error creating path for templates:\n") + template_path); + EditorNode::get_singleton()->show_warning(TTR("Error creating path for templates:") + "\n" + template_path); unzClose(pkg); return; } diff --git a/editor/export_template_manager.h b/editor/export_template_manager.h index 413fe82593..62336162fd 100644 --- a/editor/export_template_manager.h +++ b/editor/export_template_manager.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef EXPORT_TEMPLATE_MANAGER_H #define EXPORT_TEMPLATE_MANAGER_H diff --git a/editor/file_type_cache.cpp b/editor/file_type_cache.cpp index 73adea5779..02e647b733 100644 --- a/editor/file_type_cache.cpp +++ b/editor/file_type_cache.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "file_type_cache.h" #include "os/file_access.h" diff --git a/editor/file_type_cache.h b/editor/file_type_cache.h index d3ffccc1a8..33b50cb1c4 100644 --- a/editor/file_type_cache.h +++ b/editor/file_type_cache.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef FILE_TYPE_CACHE_H #define FILE_TYPE_CACHE_H diff --git a/editor/fileserver/editor_file_server.cpp b/editor/fileserver/editor_file_server.cpp index de620070aa..56fb7633e7 100644 --- a/editor/fileserver/editor_file_server.cpp +++ b/editor/fileserver/editor_file_server.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "editor_file_server.h" #include "../editor_settings.h" diff --git a/editor/fileserver/editor_file_server.h b/editor/fileserver/editor_file_server.h index a4a7dba1d2..d73c78ee70 100644 --- a/editor/fileserver/editor_file_server.h +++ b/editor/fileserver/editor_file_server.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef EDITOR_FILE_SERVER_H #define EDITOR_FILE_SERVER_H diff --git a/editor/filesystem_dock.cpp b/editor/filesystem_dock.cpp index b18cd6b747..cc9c9a11d7 100644 --- a/editor/filesystem_dock.cpp +++ b/editor/filesystem_dock.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "filesystem_dock.h" #include "editor_node.h" @@ -548,7 +549,7 @@ void FileSystemDock::_update_files(bool p_keep_selection) { } else { type_icon = get_icon("ImportFail", ei); big_icon = file_thumbnail_broken; - tooltip += TTR("\nStatus: Import of file failed. Please fix file and reimport manually."); + tooltip += "\n" + TTR("Status: Import of file failed. Please fix file and reimport manually."); } int item_index; @@ -752,7 +753,7 @@ void FileSystemDock::_try_move_item(const FileOrFolder &p_item, const String &p_ return; } else if (!p_item.is_file && new_path.begins_with(old_path)) { //This check doesn't erroneously catch renaming to a longer name as folder paths always end with "/" - EditorNode::get_singleton()->add_io_error(TTR("Cannot move a folder into itself.\n") + old_path + "\n"); + EditorNode::get_singleton()->add_io_error(TTR("Cannot move a folder into itself.") + "\n" + old_path + "\n"); return; } @@ -772,7 +773,7 @@ void FileSystemDock::_try_move_item(const FileOrFolder &p_item, const String &p_ if (p_item.is_file && FileAccess::exists(old_path + ".import")) { err = da->rename(old_path + ".import", new_path + ".import"); if (err != OK) { - EditorNode::get_singleton()->add_io_error(TTR("Error moving:\n") + old_path + ".import\n"); + EditorNode::get_singleton()->add_io_error(TTR("Error moving:") + "\n" + old_path + ".import\n"); } } @@ -796,7 +797,7 @@ void FileSystemDock::_try_move_item(const FileOrFolder &p_item, const String &p_ print_line(" Remap: " + changed_paths[i] + " -> " + p_renames[changed_paths[i]]); } } else { - EditorNode::get_singleton()->add_io_error(TTR("Error moving:\n") + old_path + "\n"); + EditorNode::get_singleton()->add_io_error(TTR("Error moving:") + "\n" + old_path + "\n"); } memdelete(da); } @@ -813,7 +814,7 @@ void FileSystemDock::_try_duplicate_item(const FileOrFolder &p_item, const Strin return; } else if (!p_item.is_file && new_path.begins_with(old_path)) { //This check doesn't erroneously catch renaming to a longer name as folder paths always end with "/" - EditorNode::get_singleton()->add_io_error(TTR("Cannot move a folder into itself.\n") + old_path + "\n"); + EditorNode::get_singleton()->add_io_error(TTR("Cannot move a folder into itself.") + "\n" + old_path + "\n"); return; } @@ -825,11 +826,11 @@ void FileSystemDock::_try_duplicate_item(const FileOrFolder &p_item, const Strin if (p_item.is_file && FileAccess::exists(old_path + ".import")) { err = da->copy(old_path + ".import", new_path + ".import"); if (err != OK) { - EditorNode::get_singleton()->add_io_error(TTR("Error duplicating:\n") + old_path + ".import\n"); + EditorNode::get_singleton()->add_io_error(TTR("Error duplicating:") + "\n" + old_path + ".import\n"); } } } else { - EditorNode::get_singleton()->add_io_error(TTR("Error duplicating:\n") + old_path + "\n"); + EditorNode::get_singleton()->add_io_error(TTR("Error duplicating:") + "\n" + old_path + "\n"); } memdelete(da); } @@ -901,7 +902,7 @@ void FileSystemDock::_update_dependencies_after_move(const Map<String, String> & if (ResourceLoader::get_resource_type(file) == "PackedScene") editor->reload_scene(file); } else { - EditorNode::get_singleton()->add_io_error(TTR("Unable to update dependencies:\n") + remaps[i] + "\n"); + EditorNode::get_singleton()->add_io_error(TTR("Unable to update dependencies:") + "\n" + remaps[i] + "\n"); } } } diff --git a/editor/filesystem_dock.h b/editor/filesystem_dock.h index 45c0aff439..af80557465 100644 --- a/editor/filesystem_dock.h +++ b/editor/filesystem_dock.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef FILESYSTEM_DOCK_H #define FILESYSTEM_DOCK_H diff --git a/editor/groups_editor.cpp b/editor/groups_editor.cpp index 6f823534ca..bac18be4a9 100644 --- a/editor/groups_editor.cpp +++ b/editor/groups_editor.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "groups_editor.h" #include "editor_node.h" diff --git a/editor/groups_editor.h b/editor/groups_editor.h index c60ab4bc22..ad3d5cd14f 100644 --- a/editor/groups_editor.h +++ b/editor/groups_editor.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef GROUPS_EDITOR_H #define GROUPS_EDITOR_H diff --git a/editor/import/editor_import_collada.cpp b/editor/import/editor_import_collada.cpp index 52659b360f..869500a6b6 100644 --- a/editor/import/editor_import_collada.cpp +++ b/editor/import/editor_import_collada.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "editor_import_collada.h" #include "editor/collada/collada.h" diff --git a/editor/import/editor_import_collada.h b/editor/import/editor_import_collada.h index 004b07b5be..5dd3ff58fa 100644 --- a/editor/import/editor_import_collada.h +++ b/editor/import/editor_import_collada.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef EDITOR_IMPORT_COLLADA_H #define EDITOR_IMPORT_COLLADA_H diff --git a/editor/import/editor_import_plugin.cpp b/editor/import/editor_import_plugin.cpp index 6297e1eca6..07c77a9df0 100644 --- a/editor/import/editor_import_plugin.cpp +++ b/editor/import/editor_import_plugin.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "editor_import_plugin.h" #include "core/script_language.h" diff --git a/editor/import/editor_import_plugin.h b/editor/import/editor_import_plugin.h index 9f860401ed..61a0a944f5 100644 --- a/editor/import/editor_import_plugin.h +++ b/editor/import/editor_import_plugin.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef EDITOR_IMPORT_PLUGIN_H #define EDITOR_IMPORT_PLUGIN_H diff --git a/editor/import/editor_scene_importer_gltf.cpp b/editor/import/editor_scene_importer_gltf.cpp index 189e98ea68..1c4617c353 100644 --- a/editor/import/editor_scene_importer_gltf.cpp +++ b/editor/import/editor_scene_importer_gltf.cpp @@ -1,3 +1,33 @@ +/*************************************************************************/ +/* editor_scene_importer_gltf.cpp */ +/*************************************************************************/ +/* This file is part of: */ +/* GODOT ENGINE */ +/* https://godotengine.org */ +/*************************************************************************/ +/* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ +/* Copyright (c) 2014-2018 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 "editor_scene_importer_gltf.h" #include "io/json.h" #include "math_defs.h" @@ -880,18 +910,24 @@ Error EditorSceneImporterGLTF::_parse_meshes(GLTFState &state) { { //gltf does not seem to normalize the weights for some reason.. int wc = weights.size(); PoolVector<float>::Write w = weights.write(); - for (int i = 0; i < wc; i += 4) { + + //PoolVector<int> v = array[Mesh::ARRAY_BONES]; + //PoolVector<int>::Read r = v.read(); + + for (int j = 0; j < wc; j += 4) { float total = 0.0; - total += w[i + 0]; - total += w[i + 1]; - total += w[i + 2]; - total += w[i + 3]; + total += w[j + 0]; + total += w[j + 1]; + total += w[j + 2]; + total += w[j + 3]; if (total > 0.0) { - w[i + 0] /= total; - w[i + 1] /= total; - w[i + 2] /= total; - w[i + 3] /= total; + w[j + 0] /= total; + w[j + 1] /= total; + w[j + 2] /= total; + w[j + 3] /= total; } + + //print_line(itos(j / 4) + ": " + itos(r[j + 0]) + ":" + rtos(w[j + 0]) + ", " + itos(r[j + 1]) + ":" + rtos(w[j + 1]) + ", " + itos(r[j + 2]) + ":" + rtos(w[j + 2]) + ", " + itos(r[j + 3]) + ":" + rtos(w[j + 3])); } } array[Mesh::ARRAY_WEIGHTS] = weights; @@ -1338,6 +1374,10 @@ Error EditorSceneImporterGLTF::_parse_skins(GLTFState &state) { //state.nodes[skeleton]->skeleton_skin = state.skins.size(); print_line("setting skeleton skin to" + itos(skeleton)); skin.skeleton = skeleton; + if (!state.skeleton_nodes.has(skeleton)) { + state.skeleton_nodes[skeleton] = Vector<int>(); + } + state.skeleton_nodes[skeleton].push_back(i); } if (d.has("name")) { @@ -1641,7 +1681,8 @@ void EditorSceneImporterGLTF::_generate_node(GLTFState &state, int p_node, Node MeshInstance *mi = Object::cast_to<MeshInstance>(node); //move skeleton around and place it on node, as the node _is_ a skeleton. Skeleton *s = skeletons[n->skin]; - mi->set_skeleton_path(mi->get_path_to(s)); + state.paths_to_skeleton[mi] = s; + //move it later, as skeleton may be moved around first } #if 0 @@ -1655,16 +1696,27 @@ void EditorSceneImporterGLTF::_generate_node(GLTFState &state, int p_node, Node #endif for (int i = 0; i < n->children.size(); i++) { if (state.nodes[n->children[i]]->joints.size()) { - _generate_bone(state, n->children[i], skeletons, Vector<int>()); + _generate_bone(state, n->children[i], skeletons, Vector<int>(), node); } else { _generate_node(state, n->children[i], node, p_owner, skeletons); } } } -void EditorSceneImporterGLTF::_generate_bone(GLTFState &state, int p_node, Vector<Skeleton *> &skeletons, const Vector<int> &p_parent_bones) { +void EditorSceneImporterGLTF::_generate_bone(GLTFState &state, int p_node, Vector<Skeleton *> &skeletons, const Vector<int> &p_parent_bones, Node *p_parent_node) { ERR_FAIL_INDEX(p_node, state.nodes.size()); + if (state.skeleton_nodes.has(p_node)) { + //reparent skeletons to proper place + Vector<int> nodes = state.skeleton_nodes[p_node]; + for (int i = 0; i < nodes.size(); i++) { + Node *owner = skeletons[i]->get_owner(); + skeletons[i]->get_parent()->remove_child(skeletons[i]); + p_parent_node->add_child(skeletons[i]); + skeletons[i]->set_owner(owner); + } + } + GLTFNode *n = state.nodes[p_node]; Vector<int> parent_bones; @@ -1684,7 +1736,7 @@ void EditorSceneImporterGLTF::_generate_bone(GLTFState &state, int p_node, Vecto } for (int i = 0; i < n->children.size(); i++) { - _generate_bone(state, n->children[i], skeletons, parent_bones); + _generate_bone(state, n->children[i], skeletons, parent_bones, p_parent_node); } } @@ -2000,12 +2052,18 @@ Spatial *EditorSceneImporterGLTF::_generate_scene(GLTFState &state, int p_bake_f } for (int i = 0; i < state.root_nodes.size(); i++) { if (state.nodes[state.root_nodes[i]]->joints.size()) { - _generate_bone(state, state.root_nodes[i], skeletons, Vector<int>()); + _generate_bone(state, state.root_nodes[i], skeletons, Vector<int>(), root); } else { _generate_node(state, state.root_nodes[i], root, root, skeletons); } } + for (Map<Node *, Skeleton *>::Element *E = state.paths_to_skeleton.front(); E; E = E->next()) { + MeshInstance *mi = Object::cast_to<MeshInstance>(E->key()); + ERR_CONTINUE(!mi); + mi->set_skeleton_path(mi->get_path_to(E->get())); + } + for (int i = 0; i < skeletons.size(); i++) { skeletons[i]->localize_rests(); } diff --git a/editor/import/editor_scene_importer_gltf.h b/editor/import/editor_scene_importer_gltf.h index abbdfa418b..088036ce75 100644 --- a/editor/import/editor_scene_importer_gltf.h +++ b/editor/import/editor_scene_importer_gltf.h @@ -1,3 +1,33 @@ +/*************************************************************************/ +/* editor_scene_importer_gltf.h */ +/*************************************************************************/ +/* This file is part of: */ +/* GODOT ENGINE */ +/* https://godotengine.org */ +/*************************************************************************/ +/* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ +/* Copyright (c) 2014-2018 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 EDITOR_SCENE_IMPORTER_GLTF_H #define EDITOR_SCENE_IMPORTER_GLTF_H @@ -244,6 +274,9 @@ class EditorSceneImporterGLTF : public EditorSceneImporter { Vector<GLTFAnimation> animations; + Map<int, Vector<int> > skeleton_nodes; + Map<Node *, Skeleton *> paths_to_skeleton; + //Map<int, Vector<int> > skin_users; //cache skin users ~GLTFState() { @@ -278,7 +311,7 @@ class EditorSceneImporterGLTF : public EditorSceneImporter { Vector<Basis> _decode_accessor_as_basis(GLTFState &state, int p_accessor, bool p_for_vertex); Vector<Transform> _decode_accessor_as_xform(GLTFState &state, int p_accessor, bool p_for_vertex); - void _generate_bone(GLTFState &state, int p_node, Vector<Skeleton *> &skeletons, const Vector<int> &p_parent_bones); + void _generate_bone(GLTFState &state, int p_node, Vector<Skeleton *> &skeletons, const Vector<int> &p_parent_bones, Node *p_parent_node); void _generate_node(GLTFState &state, int p_node, Node *p_parent, Node *p_owner, Vector<Skeleton *> &skeletons); void _import_animation(GLTFState &state, AnimationPlayer *ap, int index, int bake_fps, Vector<Skeleton *> skeletons); diff --git a/editor/import/resource_importer_bitmask.cpp b/editor/import/resource_importer_bitmask.cpp new file mode 100644 index 0000000000..a5d3959952 --- /dev/null +++ b/editor/import/resource_importer_bitmask.cpp @@ -0,0 +1,91 @@ +#include "resource_importer_bitmask.h" +#include "core/image.h" +#include "editor/editor_file_system.h" +#include "editor/editor_node.h" +#include "io/config_file.h" +#include "io/image_loader.h" +#include "scene/resources/bit_mask.h" +#include "scene/resources/texture.h" + +String ResourceImporterBitMap::get_importer_name() const { + + return "bitmap"; +} + +String ResourceImporterBitMap::get_visible_name() const { + + return "BitMap"; +} +void ResourceImporterBitMap::get_recognized_extensions(List<String> *p_extensions) const { + + ImageLoader::get_recognized_extensions(p_extensions); +} +String ResourceImporterBitMap::get_save_extension() const { + return "res"; +} + +String ResourceImporterBitMap::get_resource_type() const { + + return "BitMap"; +} + +bool ResourceImporterBitMap::get_option_visibility(const String &p_option, const Map<StringName, Variant> &p_options) const { + + return true; +} + +int ResourceImporterBitMap::get_preset_count() const { + return 0; +} +String ResourceImporterBitMap::get_preset_name(int p_idx) const { + + return String(); +} + +void ResourceImporterBitMap::get_import_options(List<ImportOption> *r_options, int p_preset) const { + + r_options->push_back(ImportOption(PropertyInfo(Variant::INT, "create_from", PROPERTY_HINT_ENUM, "Black & White,Alpha"), 0)); + r_options->push_back(ImportOption(PropertyInfo(Variant::REAL, "threshold", PROPERTY_HINT_RANGE, "0,1,0.01"), 0.5)); +} + +Error ResourceImporterBitMap::import(const String &p_source_file, const String &p_save_path, const Map<StringName, Variant> &p_options, List<String> *r_platform_variants, List<String> *r_gen_files) { + + int create_from = p_options["create_from"]; + float threshold = p_options["threshold"]; + Ref<Image> image; + image.instance(); + Error err = ImageLoader::load_image(p_source_file, image); + if (err != OK) + return err; + + int w = image->get_width(); + int h = image->get_height(); + + Ref<BitMap> bitmap; + bitmap.instance(); + bitmap->create(Size2(w, h)); + image->lock(); + + for (int i = 0; i < h; i++) { + for (int j = 0; j < w; j++) { + + bool bit; + Color c = image->get_pixel(j, i); + if (create_from == 0) { //b&W + bit = c.get_v() > threshold; + } else { + bit = c.a > threshold; + } + + bitmap->set_bit(Vector2(j, i), bit); + } + } + + return ResourceSaver::save(p_save_path + ".res", bitmap); +} + +ResourceImporterBitMap::ResourceImporterBitMap() { +} + +ResourceImporterBitMap::~ResourceImporterBitMap() { +} diff --git a/editor/import/resource_importer_bitmask.h b/editor/import/resource_importer_bitmask.h new file mode 100644 index 0000000000..8a3cafa7ce --- /dev/null +++ b/editor/import/resource_importer_bitmask.h @@ -0,0 +1,29 @@ +#ifndef RESOURCE_IMPORTER_BITMASK_H +#define RESOURCE_IMPORTER_BITMASK_H + +#include "image.h" +#include "io/resource_import.h" + +class StreamBitMap; + +class ResourceImporterBitMap : public ResourceImporter { + GDCLASS(ResourceImporterBitMap, ResourceImporter) + +public: + virtual String get_importer_name() const; + virtual String get_visible_name() const; + virtual void get_recognized_extensions(List<String> *p_extensions) const; + virtual String get_save_extension() const; + virtual String get_resource_type() const; + + virtual int get_preset_count() const; + virtual String get_preset_name(int p_idx) const; + + virtual void get_import_options(List<ImportOption> *r_options, int p_preset = 0) const; + virtual bool get_option_visibility(const String &p_option, const Map<StringName, Variant> &p_options) const; + virtual Error import(const String &p_source_file, const String &p_save_path, const Map<StringName, Variant> &p_options, List<String> *r_platform_variants, List<String> *r_gen_files = NULL); + + ResourceImporterBitMap(); + ~ResourceImporterBitMap(); +}; +#endif // RESOURCE_IMPORTER_BITMASK_H diff --git a/editor/import/resource_importer_csv_translation.cpp b/editor/import/resource_importer_csv_translation.cpp index 70093d13a7..22c32f5fc9 100644 --- a/editor/import/resource_importer_csv_translation.cpp +++ b/editor/import/resource_importer_csv_translation.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "resource_importer_csv_translation.h" #include "compressed_translation.h" diff --git a/editor/import/resource_importer_csv_translation.h b/editor/import/resource_importer_csv_translation.h index ca6e63f8aa..f5f230c6bd 100644 --- a/editor/import/resource_importer_csv_translation.h +++ b/editor/import/resource_importer_csv_translation.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef RESOURCEIMPORTERCSVTRANSLATION_H #define RESOURCEIMPORTERCSVTRANSLATION_H diff --git a/editor/import/resource_importer_obj.cpp b/editor/import/resource_importer_obj.cpp index d2cdfb5013..78fc9ec9bd 100644 --- a/editor/import/resource_importer_obj.cpp +++ b/editor/import/resource_importer_obj.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "resource_importer_obj.h" #include "io/resource_saver.h" diff --git a/editor/import/resource_importer_obj.h b/editor/import/resource_importer_obj.h index 8710432aa1..3f6d1104d7 100644 --- a/editor/import/resource_importer_obj.h +++ b/editor/import/resource_importer_obj.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef RESOURCEIMPORTEROBJ_H #define RESOURCEIMPORTEROBJ_H diff --git a/editor/import/resource_importer_scene.cpp b/editor/import/resource_importer_scene.cpp index d36cb5cb59..060953d36a 100644 --- a/editor/import/resource_importer_scene.cpp +++ b/editor/import/resource_importer_scene.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "resource_importer_scene.h" #include "editor/editor_node.h" diff --git a/editor/import/resource_importer_scene.h b/editor/import/resource_importer_scene.h index 4d0e236cf1..d5f9d53e91 100644 --- a/editor/import/resource_importer_scene.h +++ b/editor/import/resource_importer_scene.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef RESOURCEIMPORTERSCENE_H #define RESOURCEIMPORTERSCENE_H diff --git a/editor/import/resource_importer_texture.cpp b/editor/import/resource_importer_texture.cpp index 45ce347244..8119b84b7e 100644 --- a/editor/import/resource_importer_texture.cpp +++ b/editor/import/resource_importer_texture.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "resource_importer_texture.h" #include "editor/editor_file_system.h" diff --git a/editor/import/resource_importer_texture.h b/editor/import/resource_importer_texture.h index 3d9e657017..fd6f75c3f4 100644 --- a/editor/import/resource_importer_texture.h +++ b/editor/import/resource_importer_texture.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef RESOURCEIMPORTTEXTURE_H #define RESOURCEIMPORTTEXTURE_H diff --git a/editor/import/resource_importer_wav.cpp b/editor/import/resource_importer_wav.cpp index de82c12b98..03155b3a48 100644 --- a/editor/import/resource_importer_wav.cpp +++ b/editor/import/resource_importer_wav.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "resource_importer_wav.h" #include "io/marshalls.h" @@ -267,9 +268,15 @@ Error ResourceImporterWAV::import(const String &p_source_file, const String &p_s for (int i = 0; i < 10; i++) file->get_32(); // i wish to know why should i do this... no doc! - loop = file->get_32() ? AudioStreamSample::LOOP_PING_PONG : AudioStreamSample::LOOP_FORWARD; - loop_begin = file->get_32(); - loop_end = file->get_32(); + // only read 0x00 (loop forward) and 0x01 (loop ping-pong) and skip anything else because + // it's not supported (loop backward), reserved for future uses or sampler specific + // from https://sites.google.com/site/musicgapi/technical-documents/wav-file-format#smpl (loop type values table) + int loop_type = file->get_32(); + if (loop_type == 0x00 || loop_type == 0x01) { + loop = loop_type ? AudioStreamSample::LOOP_PING_PONG : AudioStreamSample::LOOP_FORWARD; + loop_begin = file->get_32(); + loop_end = file->get_32(); + } } file->seek(file_pos + chunksize); } @@ -386,7 +393,7 @@ Error ResourceImporterWAV::import(const String &p_source_file, const String &p_s Vector<float> new_data; new_data.resize((last - first + 1) * format_channels); - for (int i = first * format_channels; i <= last * format_channels; i++) { + for (int i = first * format_channels; i < (last + 1) * format_channels; i++) { new_data[i - first * format_channels] = data[i]; } diff --git a/editor/import/resource_importer_wav.h b/editor/import/resource_importer_wav.h index 89a6bfb015..cfce5a31ee 100644 --- a/editor/import/resource_importer_wav.h +++ b/editor/import/resource_importer_wav.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef RESOURCEIMPORTWAV_H #define RESOURCEIMPORTWAV_H diff --git a/editor/import_dock.cpp b/editor/import_dock.cpp index cec7fc6a4c..ce2a4ec6d8 100644 --- a/editor/import_dock.cpp +++ b/editor/import_dock.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "import_dock.h" #include "editor_node.h" diff --git a/editor/import_dock.h b/editor/import_dock.h index d6b5c4d9b4..a7a7eda8d8 100644 --- a/editor/import_dock.h +++ b/editor/import_dock.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef IMPORTDOCK_H #define IMPORTDOCK_H diff --git a/editor/multi_node_edit.cpp b/editor/multi_node_edit.cpp index 030510feee..73e78ddf2a 100644 --- a/editor/multi_node_edit.cpp +++ b/editor/multi_node_edit.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "multi_node_edit.h" #include "core/helper/math_fieldwise.h" diff --git a/editor/multi_node_edit.h b/editor/multi_node_edit.h index c6422faaf2..614832320e 100644 --- a/editor/multi_node_edit.h +++ b/editor/multi_node_edit.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef MULTI_NODE_EDIT_H #define MULTI_NODE_EDIT_H diff --git a/editor/node_dock.cpp b/editor/node_dock.cpp index 429eb4ae34..83e09b7676 100644 --- a/editor/node_dock.cpp +++ b/editor/node_dock.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "node_dock.h" #include "editor_node.h" diff --git a/editor/node_dock.h b/editor/node_dock.h index 23bc7af90b..4b2a9d14da 100644 --- a/editor/node_dock.h +++ b/editor/node_dock.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef NODE_DOCK_H #define NODE_DOCK_H diff --git a/editor/output_strings.cpp b/editor/output_strings.cpp index 37198ef6ab..b0b72510a9 100644 --- a/editor/output_strings.cpp +++ b/editor/output_strings.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "output_strings.h" void OutputStrings::update_scrollbars() { diff --git a/editor/output_strings.h b/editor/output_strings.h index 58d966a6ee..0729971704 100644 --- a/editor/output_strings.h +++ b/editor/output_strings.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef OUTPUT_STRINGS_H #define OUTPUT_STRINGS_H diff --git a/editor/pane_drag.cpp b/editor/pane_drag.cpp index eb76a1ad00..d8c504a85d 100644 --- a/editor/pane_drag.cpp +++ b/editor/pane_drag.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "pane_drag.h" void PaneDrag::_gui_input(const Ref<InputEvent> &p_input) { diff --git a/editor/pane_drag.h b/editor/pane_drag.h index 22e46a6df7..e80664eee7 100644 --- a/editor/pane_drag.h +++ b/editor/pane_drag.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef PANE_DRAG_H #define PANE_DRAG_H diff --git a/editor/plugins/abstract_polygon_2d_editor.cpp b/editor/plugins/abstract_polygon_2d_editor.cpp index 06d07ad5e6..5052b69e24 100644 --- a/editor/plugins/abstract_polygon_2d_editor.cpp +++ b/editor/plugins/abstract_polygon_2d_editor.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "abstract_polygon_2d_editor.h" #include "canvas_item_editor_plugin.h" diff --git a/editor/plugins/abstract_polygon_2d_editor.h b/editor/plugins/abstract_polygon_2d_editor.h index 38aff47706..9ba03bcdf6 100644 --- a/editor/plugins/abstract_polygon_2d_editor.h +++ b/editor/plugins/abstract_polygon_2d_editor.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef ABSTRACT_POLYGON_2D_EDITOR_H #define ABSTRACT_POLYGON_2D_EDITOR_H diff --git a/editor/plugins/animation_player_editor_plugin.cpp b/editor/plugins/animation_player_editor_plugin.cpp index dcc766ad0d..86b085b429 100644 --- a/editor/plugins/animation_player_editor_plugin.cpp +++ b/editor/plugins/animation_player_editor_plugin.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "animation_player_editor_plugin.h" #include "editor/animation_editor.h" diff --git a/editor/plugins/animation_player_editor_plugin.h b/editor/plugins/animation_player_editor_plugin.h index 67c6aa1fd7..a7b7c6c465 100644 --- a/editor/plugins/animation_player_editor_plugin.h +++ b/editor/plugins/animation_player_editor_plugin.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef ANIMATION_PLAYER_EDITOR_PLUGIN_H #define ANIMATION_PLAYER_EDITOR_PLUGIN_H diff --git a/editor/plugins/animation_tree_editor_plugin.cpp b/editor/plugins/animation_tree_editor_plugin.cpp index 9337bd21fc..f0e186e4b0 100644 --- a/editor/plugins/animation_tree_editor_plugin.cpp +++ b/editor/plugins/animation_tree_editor_plugin.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "animation_tree_editor_plugin.h" #include "core/io/resource_loader.h" diff --git a/editor/plugins/animation_tree_editor_plugin.h b/editor/plugins/animation_tree_editor_plugin.h index c46d84893e..aeb5b1744f 100644 --- a/editor/plugins/animation_tree_editor_plugin.h +++ b/editor/plugins/animation_tree_editor_plugin.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef ANIMATION_TREE_EDITOR_PLUGIN_H #define ANIMATION_TREE_EDITOR_PLUGIN_H diff --git a/editor/plugins/asset_library_editor_plugin.cpp b/editor/plugins/asset_library_editor_plugin.cpp index 19b92a8d58..915132c75c 100644 --- a/editor/plugins/asset_library_editor_plugin.cpp +++ b/editor/plugins/asset_library_editor_plugin.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "asset_library_editor_plugin.h" #include "editor_node.h" diff --git a/editor/plugins/asset_library_editor_plugin.h b/editor/plugins/asset_library_editor_plugin.h index 8974e01448..b344716c1d 100644 --- a/editor/plugins/asset_library_editor_plugin.h +++ b/editor/plugins/asset_library_editor_plugin.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef ASSET_LIBRARY_EDITOR_PLUGIN_H #define ASSET_LIBRARY_EDITOR_PLUGIN_H diff --git a/editor/plugins/baked_lightmap_editor_plugin.cpp b/editor/plugins/baked_lightmap_editor_plugin.cpp index 6849563ae2..af175c3493 100644 --- a/editor/plugins/baked_lightmap_editor_plugin.cpp +++ b/editor/plugins/baked_lightmap_editor_plugin.cpp @@ -1,3 +1,33 @@ +/*************************************************************************/ +/* baked_lightmap_editor_plugin.cpp */ +/*************************************************************************/ +/* This file is part of: */ +/* GODOT ENGINE */ +/* https://godotengine.org */ +/*************************************************************************/ +/* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ +/* Copyright (c) 2014-2018 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 "baked_lightmap_editor_plugin.h" void BakedLightmapEditorPlugin::_bake() { diff --git a/editor/plugins/baked_lightmap_editor_plugin.h b/editor/plugins/baked_lightmap_editor_plugin.h index d64c33884a..a32b573851 100644 --- a/editor/plugins/baked_lightmap_editor_plugin.h +++ b/editor/plugins/baked_lightmap_editor_plugin.h @@ -1,3 +1,33 @@ +/*************************************************************************/ +/* baked_lightmap_editor_plugin.h */ +/*************************************************************************/ +/* This file is part of: */ +/* GODOT ENGINE */ +/* https://godotengine.org */ +/*************************************************************************/ +/* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ +/* Copyright (c) 2014-2018 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 BAKED_LIGHTMAP_EDITOR_PLUGIN_H #define BAKED_LIGHTMAP_EDITOR_PLUGIN_H diff --git a/editor/plugins/camera_editor_plugin.cpp b/editor/plugins/camera_editor_plugin.cpp index c5cdbc0ad8..37fbb54c30 100644 --- a/editor/plugins/camera_editor_plugin.cpp +++ b/editor/plugins/camera_editor_plugin.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "camera_editor_plugin.h" #include "spatial_editor_plugin.h" diff --git a/editor/plugins/camera_editor_plugin.h b/editor/plugins/camera_editor_plugin.h index 1fcdc50f68..275624beeb 100644 --- a/editor/plugins/camera_editor_plugin.h +++ b/editor/plugins/camera_editor_plugin.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef CAMERA_EDITOR_PLUGIN_H #define CAMERA_EDITOR_PLUGIN_H diff --git a/editor/plugins/canvas_item_editor_plugin.cpp b/editor/plugins/canvas_item_editor_plugin.cpp index a52c914096..2a46aba207 100644 --- a/editor/plugins/canvas_item_editor_plugin.cpp +++ b/editor/plugins/canvas_item_editor_plugin.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "canvas_item_editor_plugin.h" #include "editor/animation_editor.h" @@ -339,7 +340,7 @@ Point2 CanvasItemEditor::snap_point(Point2 p_target, unsigned int p_modes, const // Grid Point2 offset = grid_offset; if (snap_relative) { - List<Node *> &selection = editor_selection->get_selected_node_list(); + List<Node *> selection = editor_selection->get_selected_node_list(); if (selection.size() == 1 && Object::cast_to<Node2D>(selection[0])) { offset = Object::cast_to<Node2D>(selection[0])->get_global_position(); } else { @@ -381,7 +382,7 @@ void CanvasItemEditor::_unhandled_key_input(const Ref<InputEvent> &p_ev) { drag = DRAG_PIVOT; } else if (set_pivot_shortcut.is_valid() && set_pivot_shortcut->is_shortcut(p_ev) && drag == DRAG_NONE && can_move_pivot) { if (!Input::get_singleton()->is_mouse_button_pressed(0)) { - List<Node *> &selection = editor_selection->get_selected_node_list(); + List<Node *> selection = editor_selection->get_selected_node_list(); Vector2 mouse_pos = viewport->get_local_mouse_position(); if (selection.size() && viewport->get_rect().has_point(mouse_pos)) { //just in case, make it work if over viewport @@ -750,7 +751,7 @@ void CanvasItemEditor::_key_move(const Vector2 &p_dir, bool p_snap, KeyMoveMODE undo_redo->create_action(TTR("Move Action"), UndoRedo::MERGE_ENDS); - List<Node *> &selection = editor_selection->get_selected_node_list(); + List<Node *> selection = editor_selection->get_selected_node_list(); for (List<Node *>::Element *E = selection.front(); E; E = E->next()) { @@ -810,7 +811,7 @@ Point2 CanvasItemEditor::_find_topleftmost_point() { Rect2 r2; r2.position = tl; - List<Node *> &selection = editor_selection->get_selected_node_list(); + List<Node *> selection = editor_selection->get_selected_node_list(); for (List<Node *>::Element *E = selection.front(); E; E = E->next()) { @@ -834,7 +835,7 @@ Point2 CanvasItemEditor::_find_topleftmost_point() { int CanvasItemEditor::get_item_count() { - List<Node *> &selection = editor_selection->get_selected_node_list(); + List<Node *> selection = editor_selection->get_selected_node_list(); int ic = 0; for (List<Node *>::Element *E = selection.front(); E; E = E->next()) { @@ -1001,7 +1002,7 @@ CanvasItemEditor::DragType CanvasItemEditor::_get_anchor_handle_drag_type(const void CanvasItemEditor::_prepare_drag(const Point2 &p_click_pos) { - List<Node *> &selection = editor_selection->get_selected_node_list(); + List<Node *> selection = editor_selection->get_selected_node_list(); for (List<Node *>::Element *E = selection.front(); E; E = E->next()) { @@ -1526,7 +1527,7 @@ void CanvasItemEditor::_gui_input_viewport(const Ref<InputEvent> &p_event) { bone_ik_list.clear(); } else { - List<Node *> &selection = editor_selection->get_selected_node_list(); + List<Node *> selection = editor_selection->get_selected_node_list(); for (List<Node *>::Element *E = selection.front(); E; E = E->next()) { CanvasItem *canvas_item = Object::cast_to<CanvasItem>(E->get()); @@ -1607,7 +1608,7 @@ void CanvasItemEditor::_gui_input_viewport(const Ref<InputEvent> &p_event) { } else { undo_redo->create_action(TTR("Edit CanvasItem")); - List<Node *> &selection = editor_selection->get_selected_node_list(); + List<Node *> selection = editor_selection->get_selected_node_list(); for (List<Node *>::Element *E = selection.front(); E; E = E->next()) { @@ -1904,7 +1905,7 @@ void CanvasItemEditor::_gui_input_viewport(const Ref<InputEvent> &p_event) { return; } - List<Node *> &selection = editor_selection->get_selected_node_list(); + List<Node *> selection = editor_selection->get_selected_node_list(); for (List<Node *>::Element *E = selection.front(); E; E = E->next()) { CanvasItem *canvas_item = Object::cast_to<CanvasItem>(E->get()); @@ -2920,7 +2921,7 @@ void CanvasItemEditor::_draw_viewport() { // hide/show buttons depending on the selection bool all_locked = true; bool all_group = true; - List<Node *> &selection = editor_selection->get_selected_node_list(); + List<Node *> selection = editor_selection->get_selected_node_list(); if (selection.empty()) { all_locked = false; all_group = false; @@ -2975,7 +2976,7 @@ void CanvasItemEditor::_notification(int p_what) { EditorNode::get_singleton()->get_scene_root()->set_snap_controls_to_pixels(GLOBAL_GET("gui/common/snap_controls_to_pixels")); - List<Node *> &selection = editor_selection->get_selected_node_list(); + List<Node *> selection = editor_selection->get_selected_node_list(); bool all_control = true; bool has_control = false; @@ -3276,7 +3277,7 @@ void CanvasItemEditor::_update_scroll(float) { } void CanvasItemEditor::_set_anchors_and_margins_preset(Control::LayoutPreset p_preset) { - List<Node *> &selection = editor_selection->get_selected_node_list(); + List<Node *> selection = editor_selection->get_selected_node_list(); undo_redo->create_action(TTR("Change Anchors and Margins")); for (List<Node *>::Element *E = selection.front(); E; E = E->next()) { @@ -3320,7 +3321,7 @@ void CanvasItemEditor::_set_anchors_and_margins_preset(Control::LayoutPreset p_p } void CanvasItemEditor::_set_anchors_preset(Control::LayoutPreset p_preset) { - List<Node *> &selection = editor_selection->get_selected_node_list(); + List<Node *> selection = editor_selection->get_selected_node_list(); undo_redo->create_action(TTR("Change Anchors")); for (List<Node *>::Element *E = selection.front(); E; E = E->next()) { @@ -3463,7 +3464,7 @@ void CanvasItemEditor::_popup_callback(int p_op) { case LOCK_SELECTED: { - List<Node *> &selection = editor_selection->get_selected_node_list(); + List<Node *> selection = editor_selection->get_selected_node_list(); for (List<Node *>::Element *E = selection.front(); E; E = E->next()) { @@ -3481,7 +3482,7 @@ void CanvasItemEditor::_popup_callback(int p_op) { } break; case UNLOCK_SELECTED: { - List<Node *> &selection = editor_selection->get_selected_node_list(); + List<Node *> selection = editor_selection->get_selected_node_list(); for (List<Node *>::Element *E = selection.front(); E; E = E->next()) { @@ -3501,7 +3502,7 @@ void CanvasItemEditor::_popup_callback(int p_op) { } break; case GROUP_SELECTED: { - List<Node *> &selection = editor_selection->get_selected_node_list(); + List<Node *> selection = editor_selection->get_selected_node_list(); for (List<Node *>::Element *E = selection.front(); E; E = E->next()) { @@ -3519,7 +3520,7 @@ void CanvasItemEditor::_popup_callback(int p_op) { } break; case UNGROUP_SELECTED: { - List<Node *> &selection = editor_selection->get_selected_node_list(); + List<Node *> selection = editor_selection->get_selected_node_list(); for (List<Node *>::Element *E = selection.front(); E; E = E->next()) { @@ -3877,7 +3878,7 @@ void CanvasItemEditor::_popup_callback(int p_op) { } break; case SKELETON_SET_IK_CHAIN: { - List<Node *> &selection = editor_selection->get_selected_node_list(); + List<Node *> selection = editor_selection->get_selected_node_list(); for (List<Node *>::Element *E = selection.front(); E; E = E->next()) { @@ -3990,6 +3991,7 @@ void CanvasItemEditor::_bind_methods() { ClassDB::bind_method("_snap_changed", &CanvasItemEditor::_snap_changed); ClassDB::bind_method(D_METHOD("_selection_result_pressed"), &CanvasItemEditor::_selection_result_pressed); ClassDB::bind_method(D_METHOD("_selection_menu_hide"), &CanvasItemEditor::_selection_menu_hide); + ClassDB::bind_method(D_METHOD("set_state"), &CanvasItemEditor::set_state); ADD_SIGNAL(MethodInfo("item_lock_status_changed")); ADD_SIGNAL(MethodInfo("item_group_status_changed")); @@ -4348,7 +4350,7 @@ CanvasItemEditor::CanvasItemEditor(EditorNode *p_editor) { additive_selection = false; // Update the menus checkboxes - set_state(get_state()); + call_deferred("set_state", get_state()); } CanvasItemEditor *CanvasItemEditor::singleton = NULL; diff --git a/editor/plugins/canvas_item_editor_plugin.h b/editor/plugins/canvas_item_editor_plugin.h index 0866fe77aa..5be71bfc28 100644 --- a/editor/plugins/canvas_item_editor_plugin.h +++ b/editor/plugins/canvas_item_editor_plugin.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef CONTROL_EDITOR_PLUGIN_H #define CONTROL_EDITOR_PLUGIN_H diff --git a/editor/plugins/collision_polygon_2d_editor_plugin.cpp b/editor/plugins/collision_polygon_2d_editor_plugin.cpp index 53b06c17be..b624d69810 100644 --- a/editor/plugins/collision_polygon_2d_editor_plugin.cpp +++ b/editor/plugins/collision_polygon_2d_editor_plugin.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "collision_polygon_2d_editor_plugin.h" Node2D *CollisionPolygon2DEditor::_get_node() const { diff --git a/editor/plugins/collision_polygon_2d_editor_plugin.h b/editor/plugins/collision_polygon_2d_editor_plugin.h index 82a30d6b97..ba691ab76a 100644 --- a/editor/plugins/collision_polygon_2d_editor_plugin.h +++ b/editor/plugins/collision_polygon_2d_editor_plugin.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef COLLISION_POLYGON_2D_EDITOR_PLUGIN_H #define COLLISION_POLYGON_2D_EDITOR_PLUGIN_H diff --git a/editor/plugins/collision_polygon_editor_plugin.cpp b/editor/plugins/collision_polygon_editor_plugin.cpp index c95f10441b..d8d3c0cee6 100644 --- a/editor/plugins/collision_polygon_editor_plugin.cpp +++ b/editor/plugins/collision_polygon_editor_plugin.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "collision_polygon_editor_plugin.h" #include "canvas_item_editor_plugin.h" diff --git a/editor/plugins/collision_polygon_editor_plugin.h b/editor/plugins/collision_polygon_editor_plugin.h index 0ccdf0ad16..f1f215b092 100644 --- a/editor/plugins/collision_polygon_editor_plugin.h +++ b/editor/plugins/collision_polygon_editor_plugin.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef COLLISION_POLYGON_EDITOR_PLUGIN_H #define COLLISION_POLYGON_EDITOR_PLUGIN_H diff --git a/editor/plugins/collision_shape_2d_editor_plugin.cpp b/editor/plugins/collision_shape_2d_editor_plugin.cpp index 1da3d55b3d..b003664dca 100644 --- a/editor/plugins/collision_shape_2d_editor_plugin.cpp +++ b/editor/plugins/collision_shape_2d_editor_plugin.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "collision_shape_2d_editor_plugin.h" #include "canvas_item_editor_plugin.h" diff --git a/editor/plugins/collision_shape_2d_editor_plugin.h b/editor/plugins/collision_shape_2d_editor_plugin.h index 7e5dd44c5e..10784f1129 100644 --- a/editor/plugins/collision_shape_2d_editor_plugin.h +++ b/editor/plugins/collision_shape_2d_editor_plugin.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef COLLISION_SHAPE_2D_EDITOR_PLUGIN_H #define COLLISION_SHAPE_2D_EDITOR_PLUGIN_H diff --git a/editor/plugins/cube_grid_theme_editor_plugin.cpp b/editor/plugins/cube_grid_theme_editor_plugin.cpp index 416441befc..23465a654d 100644 --- a/editor/plugins/cube_grid_theme_editor_plugin.cpp +++ b/editor/plugins/cube_grid_theme_editor_plugin.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "cube_grid_theme_editor_plugin.h" #include "editor/editor_node.h" diff --git a/editor/plugins/cube_grid_theme_editor_plugin.h b/editor/plugins/cube_grid_theme_editor_plugin.h index fc5b3d8006..36a8f8f203 100644 --- a/editor/plugins/cube_grid_theme_editor_plugin.h +++ b/editor/plugins/cube_grid_theme_editor_plugin.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef CUBE_GRID_THEME_EDITOR_PLUGIN_H #define CUBE_GRID_THEME_EDITOR_PLUGIN_H diff --git a/editor/plugins/editor_preview_plugins.cpp b/editor/plugins/editor_preview_plugins.cpp index a42f5b09bb..215964235e 100644 --- a/editor/plugins/editor_preview_plugins.cpp +++ b/editor/plugins/editor_preview_plugins.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "editor_preview_plugins.h" #include "editor/editor_scale.h" diff --git a/editor/plugins/editor_preview_plugins.h b/editor/plugins/editor_preview_plugins.h index d77bf5e7bb..2e12515e30 100644 --- a/editor/plugins/editor_preview_plugins.h +++ b/editor/plugins/editor_preview_plugins.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef EDITORPREVIEWPLUGINS_H #define EDITORPREVIEWPLUGINS_H diff --git a/editor/plugins/gi_probe_editor_plugin.cpp b/editor/plugins/gi_probe_editor_plugin.cpp index 48978aeae5..42aad7a8a1 100644 --- a/editor/plugins/gi_probe_editor_plugin.cpp +++ b/editor/plugins/gi_probe_editor_plugin.cpp @@ -1,5 +1,5 @@ /*************************************************************************/ -/* gi_probe_editor_plugin.h */ +/* gi_probe_editor_plugin.cpp */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "gi_probe_editor_plugin.h" void GIProbeEditorPlugin::_bake() { diff --git a/editor/plugins/gi_probe_editor_plugin.h b/editor/plugins/gi_probe_editor_plugin.h index cf1c8b5aa3..017e9bd743 100644 --- a/editor/plugins/gi_probe_editor_plugin.h +++ b/editor/plugins/gi_probe_editor_plugin.h @@ -1,5 +1,5 @@ /*************************************************************************/ -/* gi_probe_editor_plugin.cpp */ +/* gi_probe_editor_plugin.h */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef GIPROBEEDITORPLUGIN_H #define GIPROBEEDITORPLUGIN_H diff --git a/editor/plugins/gradient_editor_plugin.cpp b/editor/plugins/gradient_editor_plugin.cpp index 738a92380c..e89cb68935 100644 --- a/editor/plugins/gradient_editor_plugin.cpp +++ b/editor/plugins/gradient_editor_plugin.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "gradient_editor_plugin.h" #include "canvas_item_editor_plugin.h" diff --git a/editor/plugins/gradient_editor_plugin.h b/editor/plugins/gradient_editor_plugin.h index 6eeb28aa81..52f4c59575 100644 --- a/editor/plugins/gradient_editor_plugin.h +++ b/editor/plugins/gradient_editor_plugin.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef TOOLS_EDITOR_PLUGINS_COLOR_RAMP_EDITOR_PLUGIN_H_ #define TOOLS_EDITOR_PLUGINS_COLOR_RAMP_EDITOR_PLUGIN_H_ diff --git a/editor/plugins/item_list_editor_plugin.cpp b/editor/plugins/item_list_editor_plugin.cpp index 436a9c6532..fd5a1f185f 100644 --- a/editor/plugins/item_list_editor_plugin.cpp +++ b/editor/plugins/item_list_editor_plugin.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "item_list_editor_plugin.h" #include "io/resource_loader.h" diff --git a/editor/plugins/item_list_editor_plugin.h b/editor/plugins/item_list_editor_plugin.h index 6dbea59585..bd7d3db10d 100644 --- a/editor/plugins/item_list_editor_plugin.h +++ b/editor/plugins/item_list_editor_plugin.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef ITEM_LIST_EDITOR_PLUGIN_H #define ITEM_LIST_EDITOR_PLUGIN_H diff --git a/editor/plugins/light_occluder_2d_editor_plugin.cpp b/editor/plugins/light_occluder_2d_editor_plugin.cpp index 31287ccdfb..a3be10dc33 100644 --- a/editor/plugins/light_occluder_2d_editor_plugin.cpp +++ b/editor/plugins/light_occluder_2d_editor_plugin.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "light_occluder_2d_editor_plugin.h" #include "canvas_item_editor_plugin.h" diff --git a/editor/plugins/light_occluder_2d_editor_plugin.h b/editor/plugins/light_occluder_2d_editor_plugin.h index a519acb601..39de8b1020 100644 --- a/editor/plugins/light_occluder_2d_editor_plugin.h +++ b/editor/plugins/light_occluder_2d_editor_plugin.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef LIGHT_OCCLUDER_2D_EDITOR_PLUGIN_H #define LIGHT_OCCLUDER_2D_EDITOR_PLUGIN_H diff --git a/editor/plugins/line_2d_editor_plugin.cpp b/editor/plugins/line_2d_editor_plugin.cpp index 5d5dc8f449..47d5a73078 100644 --- a/editor/plugins/line_2d_editor_plugin.cpp +++ b/editor/plugins/line_2d_editor_plugin.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "line_2d_editor_plugin.h" Node2D *Line2DEditor::_get_node() const { diff --git a/editor/plugins/line_2d_editor_plugin.h b/editor/plugins/line_2d_editor_plugin.h index 04272064ea..e2e42c2087 100644 --- a/editor/plugins/line_2d_editor_plugin.h +++ b/editor/plugins/line_2d_editor_plugin.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef LINE_2D_EDITOR_PLUGIN_H #define LINE_2D_EDITOR_PLUGIN_H diff --git a/editor/plugins/material_editor_plugin.h b/editor/plugins/material_editor_plugin.h index 11d707d044..80a5c535b8 100644 --- a/editor/plugins/material_editor_plugin.h +++ b/editor/plugins/material_editor_plugin.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef MATERIAL_EDITOR_PLUGIN_H #define MATERIAL_EDITOR_PLUGIN_H diff --git a/editor/plugins/mesh_editor_plugin.cpp b/editor/plugins/mesh_editor_plugin.cpp index 4c09d3b760..ea8f921034 100644 --- a/editor/plugins/mesh_editor_plugin.cpp +++ b/editor/plugins/mesh_editor_plugin.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "mesh_editor_plugin.h" void MeshEditor::_gui_input(Ref<InputEvent> p_event) { diff --git a/editor/plugins/mesh_editor_plugin.h b/editor/plugins/mesh_editor_plugin.h index b13c6524dc..cc20bfcbf3 100644 --- a/editor/plugins/mesh_editor_plugin.h +++ b/editor/plugins/mesh_editor_plugin.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef MESH_EDITOR_PLUGIN_H #define MESH_EDITOR_PLUGIN_H diff --git a/editor/plugins/mesh_instance_editor_plugin.cpp b/editor/plugins/mesh_instance_editor_plugin.cpp index 3ad8cef079..cb5f7ba76c 100644 --- a/editor/plugins/mesh_instance_editor_plugin.cpp +++ b/editor/plugins/mesh_instance_editor_plugin.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "mesh_instance_editor_plugin.h" #include "scene/3d/collision_shape.h" diff --git a/editor/plugins/mesh_instance_editor_plugin.h b/editor/plugins/mesh_instance_editor_plugin.h index a1c0d9eab0..30caeae7ec 100644 --- a/editor/plugins/mesh_instance_editor_plugin.h +++ b/editor/plugins/mesh_instance_editor_plugin.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef MESH_INSTANCE_EDITOR_PLUGIN_H #define MESH_INSTANCE_EDITOR_PLUGIN_H diff --git a/editor/plugins/multimesh_editor_plugin.cpp b/editor/plugins/multimesh_editor_plugin.cpp index 12fe25f4d7..45f8e25959 100644 --- a/editor/plugins/multimesh_editor_plugin.cpp +++ b/editor/plugins/multimesh_editor_plugin.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "multimesh_editor_plugin.h" #include "scene/3d/mesh_instance.h" diff --git a/editor/plugins/multimesh_editor_plugin.h b/editor/plugins/multimesh_editor_plugin.h index 67dd92f3a9..201e735893 100644 --- a/editor/plugins/multimesh_editor_plugin.h +++ b/editor/plugins/multimesh_editor_plugin.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef MULTIMESH_EDITOR_PLUGIN_H #define MULTIMESH_EDITOR_PLUGIN_H diff --git a/editor/plugins/navigation_mesh_editor_plugin.cpp b/editor/plugins/navigation_mesh_editor_plugin.cpp index 8c80225db6..da3c744324 100644 --- a/editor/plugins/navigation_mesh_editor_plugin.cpp +++ b/editor/plugins/navigation_mesh_editor_plugin.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "navigation_mesh_editor_plugin.h" #include "io/marshalls.h" #include "io/resource_saver.h" @@ -107,7 +108,7 @@ NavigationMeshEditor::NavigationMeshEditor() { button_bake->set_text(TTR("Bake!")); button_bake->set_toggle_mode(true); button_reset = memnew(Button); - button_bake->set_tooltip(TTR("Bake the navigation mesh.\n")); + button_bake->set_tooltip(TTR("Bake the navigation mesh.") + "\n"); bake_info = memnew(Label); bake_hbox->add_child(button_bake); diff --git a/editor/plugins/navigation_mesh_editor_plugin.h b/editor/plugins/navigation_mesh_editor_plugin.h index cecaff5648..9382467d85 100644 --- a/editor/plugins/navigation_mesh_editor_plugin.h +++ b/editor/plugins/navigation_mesh_editor_plugin.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef NAVIGATION_MESH_GENERATOR_PLUGIN_H #define NAVIGATION_MESH_GENERATOR_PLUGIN_H diff --git a/editor/plugins/navigation_mesh_generator.cpp b/editor/plugins/navigation_mesh_generator.cpp index 0bebdf3c90..214f982140 100644 --- a/editor/plugins/navigation_mesh_generator.cpp +++ b/editor/plugins/navigation_mesh_generator.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "navigation_mesh_generator.h" #ifdef RECAST_ENABLED diff --git a/editor/plugins/navigation_mesh_generator.h b/editor/plugins/navigation_mesh_generator.h index dd0c1df718..2f7bad0a82 100644 --- a/editor/plugins/navigation_mesh_generator.h +++ b/editor/plugins/navigation_mesh_generator.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef NAVIGATION_MESH_GENERATOR_H #define NAVIGATION_MESH_GENERATOR_H diff --git a/editor/plugins/navigation_polygon_editor_plugin.cpp b/editor/plugins/navigation_polygon_editor_plugin.cpp index 260cb7c45e..d1edf1ae10 100644 --- a/editor/plugins/navigation_polygon_editor_plugin.cpp +++ b/editor/plugins/navigation_polygon_editor_plugin.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "navigation_polygon_editor_plugin.h" Ref<NavigationPolygon> NavigationPolygonEditor::_ensure_navpoly() const { diff --git a/editor/plugins/navigation_polygon_editor_plugin.h b/editor/plugins/navigation_polygon_editor_plugin.h index 4652b63095..738aa9fa41 100644 --- a/editor/plugins/navigation_polygon_editor_plugin.h +++ b/editor/plugins/navigation_polygon_editor_plugin.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef NAVIGATIONPOLYGONEDITORPLUGIN_H #define NAVIGATIONPOLYGONEDITORPLUGIN_H diff --git a/editor/plugins/particles_2d_editor_plugin.cpp b/editor/plugins/particles_2d_editor_plugin.cpp index a76775700b..abee9a9893 100644 --- a/editor/plugins/particles_2d_editor_plugin.cpp +++ b/editor/plugins/particles_2d_editor_plugin.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "particles_2d_editor_plugin.h" #include "canvas_item_editor_plugin.h" diff --git a/editor/plugins/particles_2d_editor_plugin.h b/editor/plugins/particles_2d_editor_plugin.h index 86f82db84f..addf65789c 100644 --- a/editor/plugins/particles_2d_editor_plugin.h +++ b/editor/plugins/particles_2d_editor_plugin.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef PARTICLES_2D_EDITOR_PLUGIN_H #define PARTICLES_2D_EDITOR_PLUGIN_H diff --git a/editor/plugins/particles_editor_plugin.h b/editor/plugins/particles_editor_plugin.h index 23fa0d9378..013b6e7e30 100644 --- a/editor/plugins/particles_editor_plugin.h +++ b/editor/plugins/particles_editor_plugin.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef PARTICLES_EDITOR_PLUGIN_H #define PARTICLES_EDITOR_PLUGIN_H diff --git a/editor/plugins/path_2d_editor_plugin.cpp b/editor/plugins/path_2d_editor_plugin.cpp index d329d547ef..5ec42b07aa 100644 --- a/editor/plugins/path_2d_editor_plugin.cpp +++ b/editor/plugins/path_2d_editor_plugin.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "path_2d_editor_plugin.h" #include "canvas_item_editor_plugin.h" diff --git a/editor/plugins/path_2d_editor_plugin.h b/editor/plugins/path_2d_editor_plugin.h index e15ad2f541..c92a696967 100644 --- a/editor/plugins/path_2d_editor_plugin.h +++ b/editor/plugins/path_2d_editor_plugin.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef PATH_2D_EDITOR_PLUGIN_H #define PATH_2D_EDITOR_PLUGIN_H diff --git a/editor/plugins/path_editor_plugin.cpp b/editor/plugins/path_editor_plugin.cpp index 92f5025956..056219a575 100644 --- a/editor/plugins/path_editor_plugin.cpp +++ b/editor/plugins/path_editor_plugin.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "path_editor_plugin.h" #include "os/keyboard.h" diff --git a/editor/plugins/path_editor_plugin.h b/editor/plugins/path_editor_plugin.h index a61905ffe0..6d5f07f729 100644 --- a/editor/plugins/path_editor_plugin.h +++ b/editor/plugins/path_editor_plugin.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef PATH_EDITOR_PLUGIN_H #define PATH_EDITOR_PLUGIN_H diff --git a/editor/plugins/polygon_2d_editor_plugin.cpp b/editor/plugins/polygon_2d_editor_plugin.cpp index 43d4f5df18..1db6621718 100644 --- a/editor/plugins/polygon_2d_editor_plugin.cpp +++ b/editor/plugins/polygon_2d_editor_plugin.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "polygon_2d_editor_plugin.h" #include "canvas_item_editor_plugin.h" diff --git a/editor/plugins/polygon_2d_editor_plugin.h b/editor/plugins/polygon_2d_editor_plugin.h index 3721c98486..f1472e4522 100644 --- a/editor/plugins/polygon_2d_editor_plugin.h +++ b/editor/plugins/polygon_2d_editor_plugin.h @@ -1,5 +1,5 @@ /*************************************************************************/ -/* polygon_2d_editor_plugin.cpp */ +/* polygon_2d_editor_plugin.h */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef POLYGON_2D_EDITOR_PLUGIN_H #define POLYGON_2D_EDITOR_PLUGIN_H diff --git a/editor/plugins/resource_preloader_editor_plugin.cpp b/editor/plugins/resource_preloader_editor_plugin.cpp index 0db002b689..a47cb40240 100644 --- a/editor/plugins/resource_preloader_editor_plugin.cpp +++ b/editor/plugins/resource_preloader_editor_plugin.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "resource_preloader_editor_plugin.h" #include "editor/editor_settings.h" diff --git a/editor/plugins/resource_preloader_editor_plugin.h b/editor/plugins/resource_preloader_editor_plugin.h index f18e7a18ec..6e04c70741 100644 --- a/editor/plugins/resource_preloader_editor_plugin.h +++ b/editor/plugins/resource_preloader_editor_plugin.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef RESOURCE_PRELOADER_EDITOR_PLUGIN_H #define RESOURCE_PRELOADER_EDITOR_PLUGIN_H diff --git a/editor/plugins/script_editor_plugin.cpp b/editor/plugins/script_editor_plugin.cpp index bc29c92d7f..bc986cee9c 100644 --- a/editor/plugins/script_editor_plugin.cpp +++ b/editor/plugins/script_editor_plugin.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "script_editor_plugin.h" #include "core/io/resource_loader.h" @@ -635,7 +636,7 @@ void ScriptEditor::_close_all_tabs() { } void ScriptEditor::_ask_close_current_unsaved_tab(ScriptEditorBase *current) { - erase_tab_confirm->set_text(TTR("Close and save changes?\n\"") + current->get_name() + "\""); + erase_tab_confirm->set_text(TTR("Close and save changes?") + "\n\"" + current->get_name() + "\""); erase_tab_confirm->popup_centered_minsize(); } diff --git a/editor/plugins/script_editor_plugin.h b/editor/plugins/script_editor_plugin.h index d90cf7b912..e60e4cf8c0 100644 --- a/editor/plugins/script_editor_plugin.h +++ b/editor/plugins/script_editor_plugin.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef SCRIPT_EDITOR_PLUGIN_H #define SCRIPT_EDITOR_PLUGIN_H diff --git a/editor/plugins/script_text_editor.cpp b/editor/plugins/script_text_editor.cpp index 9ad4bfb037..f1ed984fee 100644 --- a/editor/plugins/script_text_editor.cpp +++ b/editor/plugins/script_text_editor.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "script_text_editor.h" #include "editor/editor_node.h" diff --git a/editor/plugins/script_text_editor.h b/editor/plugins/script_text_editor.h index 86b829495d..ebbe865cee 100644 --- a/editor/plugins/script_text_editor.h +++ b/editor/plugins/script_text_editor.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef SCRIPT_TEXT_EDITOR_H #define SCRIPT_TEXT_EDITOR_H diff --git a/editor/plugins/shader_editor_plugin.cpp b/editor/plugins/shader_editor_plugin.cpp index 4f2fbca862..9b31e1a421 100644 --- a/editor/plugins/shader_editor_plugin.cpp +++ b/editor/plugins/shader_editor_plugin.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "shader_editor_plugin.h" #include "core/io/resource_loader.h" diff --git a/editor/plugins/shader_editor_plugin.h b/editor/plugins/shader_editor_plugin.h index a446fc4134..2ea1562310 100644 --- a/editor/plugins/shader_editor_plugin.h +++ b/editor/plugins/shader_editor_plugin.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef SHADER_EDITOR_PLUGIN_H #define SHADER_EDITOR_PLUGIN_H diff --git a/editor/plugins/shader_graph_editor_plugin.h b/editor/plugins/shader_graph_editor_plugin.h index 98a9365727..f273507fcf 100644 --- a/editor/plugins/shader_graph_editor_plugin.h +++ b/editor/plugins/shader_graph_editor_plugin.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef SHADER_GRAPH_EDITOR_PLUGIN_H #define SHADER_GRAPH_EDITOR_PLUGIN_H diff --git a/editor/plugins/spatial_editor_plugin.cpp b/editor/plugins/spatial_editor_plugin.cpp index f6aef52e8b..535ce79b30 100644 --- a/editor/plugins/spatial_editor_plugin.cpp +++ b/editor/plugins/spatial_editor_plugin.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "spatial_editor_plugin.h" #include "camera_matrix.h" @@ -4947,7 +4948,7 @@ SpatialEditor::SpatialEditor(EditorNode *p_editor) { tool_button[TOOL_MODE_SELECT]->set_pressed(true); button_binds[0] = MENU_TOOL_SELECT; tool_button[TOOL_MODE_SELECT]->connect("pressed", this, "_menu_item_pressed", button_binds); - tool_button[TOOL_MODE_SELECT]->set_tooltip(TTR("Select Mode (Q)\n") + keycode_get_string(KEY_MASK_CMD) + TTR("Drag: Rotate\nAlt+Drag: Move\nAlt+RMB: Depth list selection")); + tool_button[TOOL_MODE_SELECT]->set_tooltip(TTR("Select Mode (Q)") + "\n" + keycode_get_string(KEY_MASK_CMD) + TTR("Drag: Rotate\nAlt+Drag: Move\nAlt+RMB: Depth list selection")); tool_button[TOOL_MODE_MOVE] = memnew(ToolButton); hbc_menu->add_child(tool_button[TOOL_MODE_MOVE]); diff --git a/editor/plugins/spatial_editor_plugin.h b/editor/plugins/spatial_editor_plugin.h index b1d4a03893..e12f7affb7 100644 --- a/editor/plugins/spatial_editor_plugin.h +++ b/editor/plugins/spatial_editor_plugin.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef SPATIAL_EDITOR_PLUGIN_H #define SPATIAL_EDITOR_PLUGIN_H diff --git a/editor/plugins/sprite_frames_editor_plugin.cpp b/editor/plugins/sprite_frames_editor_plugin.cpp index 35fc987e10..7a4eee0344 100644 --- a/editor/plugins/sprite_frames_editor_plugin.cpp +++ b/editor/plugins/sprite_frames_editor_plugin.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "sprite_frames_editor_plugin.h" #include "editor/editor_settings.h" diff --git a/editor/plugins/sprite_frames_editor_plugin.h b/editor/plugins/sprite_frames_editor_plugin.h index f94eb6f98c..1f45b10323 100644 --- a/editor/plugins/sprite_frames_editor_plugin.h +++ b/editor/plugins/sprite_frames_editor_plugin.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef SPRITE_FRAMES_EDITOR_PLUGIN_H #define SPRITE_FRAMES_EDITOR_PLUGIN_H diff --git a/editor/plugins/style_box_editor_plugin.cpp b/editor/plugins/style_box_editor_plugin.cpp index a0c7eb178a..f4faab69ed 100644 --- a/editor/plugins/style_box_editor_plugin.cpp +++ b/editor/plugins/style_box_editor_plugin.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "style_box_editor_plugin.h" void StyleBoxEditor::edit(const Ref<StyleBox> &p_stylebox) { diff --git a/editor/plugins/style_box_editor_plugin.h b/editor/plugins/style_box_editor_plugin.h index 7a8e5aa99b..34d8caaeb6 100644 --- a/editor/plugins/style_box_editor_plugin.h +++ b/editor/plugins/style_box_editor_plugin.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef STYLE_BOX_EDITOR_PLUGIN_H #define STYLE_BOX_EDITOR_PLUGIN_H diff --git a/editor/plugins/texture_editor_plugin.cpp b/editor/plugins/texture_editor_plugin.cpp index 572e2f9d83..36a578037e 100644 --- a/editor/plugins/texture_editor_plugin.cpp +++ b/editor/plugins/texture_editor_plugin.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "texture_editor_plugin.h" #include "editor/editor_settings.h" diff --git a/editor/plugins/texture_editor_plugin.h b/editor/plugins/texture_editor_plugin.h index 590dd6d9aa..4ca2bc641e 100644 --- a/editor/plugins/texture_editor_plugin.h +++ b/editor/plugins/texture_editor_plugin.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef TEXTURE_EDITOR_PLUGIN_H #define TEXTURE_EDITOR_PLUGIN_H diff --git a/editor/plugins/texture_region_editor_plugin.cpp b/editor/plugins/texture_region_editor_plugin.cpp index 861af05c61..e04798d6d6 100644 --- a/editor/plugins/texture_region_editor_plugin.cpp +++ b/editor/plugins/texture_region_editor_plugin.cpp @@ -8,8 +8,6 @@ /* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md) */ /* */ -/* Author: Mariano Suligoy */ -/* */ /* 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 */ @@ -29,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "texture_region_editor_plugin.h" #include "core/core_string_names.h" @@ -36,6 +35,10 @@ #include "os/keyboard.h" #include "scene/gui/check_box.h" +/** + @author Mariano Suligoy +*/ + void draw_margin_line(Control *edit_draw, Vector2 from, Vector2 to) { Vector2 line = (to - from).normalized() * 10; while ((to - from).length_squared() > 200) { diff --git a/editor/plugins/texture_region_editor_plugin.h b/editor/plugins/texture_region_editor_plugin.h index b84480d3d6..cf9396bd5b 100644 --- a/editor/plugins/texture_region_editor_plugin.h +++ b/editor/plugins/texture_region_editor_plugin.h @@ -8,8 +8,6 @@ /* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md) */ /* */ -/* Author: Mariano Suligoy */ -/* */ /* 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 */ @@ -41,6 +39,10 @@ #include "scene/resources/style_box.h" #include "scene/resources/texture.h" +/** + @author Mariano Suligoy +*/ + class TextureRegionEditor : public Control { GDCLASS(TextureRegionEditor, Control); diff --git a/editor/plugins/theme_editor_plugin.cpp b/editor/plugins/theme_editor_plugin.cpp index 5f1944fe74..f51e691be3 100644 --- a/editor/plugins/theme_editor_plugin.cpp +++ b/editor/plugins/theme_editor_plugin.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "theme_editor_plugin.h" #include "os/file_access.h" diff --git a/editor/plugins/theme_editor_plugin.h b/editor/plugins/theme_editor_plugin.h index 6484fb948d..625b35e2c1 100644 --- a/editor/plugins/theme_editor_plugin.h +++ b/editor/plugins/theme_editor_plugin.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef THEME_EDITOR_PLUGIN_H #define THEME_EDITOR_PLUGIN_H diff --git a/editor/plugins/tile_map_editor_plugin.cpp b/editor/plugins/tile_map_editor_plugin.cpp index acaf2ebcd3..a102d99d1c 100644 --- a/editor/plugins/tile_map_editor_plugin.cpp +++ b/editor/plugins/tile_map_editor_plugin.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "tile_map_editor_plugin.h" #include "canvas_item_editor_plugin.h" diff --git a/editor/plugins/tile_map_editor_plugin.h b/editor/plugins/tile_map_editor_plugin.h index 6388cfb3cc..0a937e200e 100644 --- a/editor/plugins/tile_map_editor_plugin.h +++ b/editor/plugins/tile_map_editor_plugin.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef TILE_MAP_EDITOR_PLUGIN_H #define TILE_MAP_EDITOR_PLUGIN_H diff --git a/editor/plugins/tile_set_editor_plugin.cpp b/editor/plugins/tile_set_editor_plugin.cpp index 50db80ba01..08679b781a 100644 --- a/editor/plugins/tile_set_editor_plugin.cpp +++ b/editor/plugins/tile_set_editor_plugin.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "tile_set_editor_plugin.h" #include "editor/plugins/canvas_item_editor_plugin.h" @@ -339,10 +340,11 @@ AutotileEditor::AutotileEditor(EditorNode *p_editor) { property_editor = memnew(PropertyEditor); property_editor->set_v_size_flags(SIZE_EXPAND_FILL); property_editor->set_h_size_flags(SIZE_EXPAND_FILL); + property_editor->set_custom_minimum_size(Size2(10, 70)); split->add_child(property_editor); helper = memnew(AutotileEditorHelper(this)); - property_editor->edit(helper); + property_editor->call_deferred("edit", helper); //Editor @@ -616,8 +618,10 @@ void AutotileEditor::_on_edit_mode_changed(int p_edit_mode) { tool_containers[TOOLBAR_BITMASK]->hide(); tool_containers[TOOLBAR_SHAPE]->show(); tools[TOOL_SELECT]->set_tooltip(TTR("Select current edited sub-tile.")); - current_shape = PoolVector2Array(); spin_priority->hide(); + + current_shape = PoolVector2Array(); + select_coord(edited_shape_coord); } break; default: { tool_containers[TOOLBAR_DUMMY]->show(); @@ -627,7 +631,7 @@ void AutotileEditor::_on_edit_mode_changed(int p_edit_mode) { tools[TOOL_SELECT]->set_tooltip(TTR("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(TTR("Select sub-tile to change it's priority.")); + tools[TOOL_SELECT]->set_tooltip(TTR("Select sub-tile to change its priority.")); spin_priority->show(); } } break; @@ -929,50 +933,18 @@ void AutotileEditor::_on_workspace_input(const Ref<InputEvent> &p_ie) { 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<ConvexPolygonShape2D> shape = sd[i].shape; - if (shape.is_valid()) { - - Rect2 bounding_rect; - PoolVector2Array polygon; - bounding_rect.position = shape->get_points()[0]; - for (int j = 0; j < shape->get_points().size(); j++) { - polygon.push_back(shape->get_points()[j] + shape_anchor); - bounding_rect.expand_to(shape->get_points()[j] + shape_anchor); - } - if (bounding_rect.has_point(mb->get_position())) { - current_shape = polygon; - edited_collision_shape = shape; - } - } - } + Vector<TileSet::ShapeData> sd = tile_set->tile_get_shapes(get_current_tile()); + bool found_collision_shape = false; + for (int i = 0; i < sd.size(); i++) { + if (sd[i].autotile_coord == coord) { + edited_collision_shape = sd[i].shape; + found_collision_shape = true; + break; } } + if (!found_collision_shape) + edited_collision_shape = Ref<ConvexPolygonShape2D>(NULL); + select_coord(edited_shape_coord); } workspace->update(); } else if (!mb->is_pressed() && mb->get_button_index() == BUTTON_LEFT) { @@ -1339,7 +1311,7 @@ void AutotileEditor::draw_polygon_shapes() { } Vector<Vector2> polygon; Vector<Color> colors; - if (shape == edited_collision_shape) { + if (shape == edited_collision_shape && current_shape.size() > 2) { for (int j = 0; j < current_shape.size(); j++) { polygon.push_back(current_shape[j]); colors.push_back(c_bg); @@ -1389,7 +1361,7 @@ void AutotileEditor::draw_polygon_shapes() { } Vector<Vector2> polygon; Vector<Color> colors; - if (shape == edited_occlusion_shape) { + if (shape == edited_occlusion_shape && current_shape.size() > 2) { for (int j = 0; j < current_shape.size(); j++) { polygon.push_back(current_shape[j]); colors.push_back(c_bg); @@ -1437,7 +1409,7 @@ void AutotileEditor::draw_polygon_shapes() { } Vector<Vector2> polygon; Vector<Color> colors; - if (shape == edited_navigation_shape) { + if (shape == edited_navigation_shape && current_shape.size() > 2) { for (int j = 0; j < current_shape.size(); j++) { polygon.push_back(current_shape[j]); colors.push_back(c_bg); @@ -1547,6 +1519,39 @@ void AutotileEditor::close_shape(const Vector2 &shape_anchor) { } } +void AutotileEditor::select_coord(const Vector2 &coord) { + int spacing = tile_set->autotile_get_spacing(get_current_tile()); + Vector2 size = tile_set->autotile_get_size(get_current_tile()); + Vector2 shape_anchor = coord; + shape_anchor.x *= (size.x + spacing); + shape_anchor.y *= (size.y + spacing); + if (edit_mode == EDITMODE_COLLISION) { + current_shape.resize(0); + if (edited_collision_shape.is_valid()) { + for (int j = 0; j < edited_collision_shape->get_points().size(); j++) { + current_shape.push_back(edited_collision_shape->get_points()[j] + shape_anchor); + } + } + } else 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); + } + } + } + } +} + Vector2 AutotileEditor::snap_point(const Vector2 &point) { Vector2 p = point; Vector2 coord = edited_shape_coord; diff --git a/editor/plugins/tile_set_editor_plugin.h b/editor/plugins/tile_set_editor_plugin.h index 0f66f04cb1..9bd3e23181 100644 --- a/editor/plugins/tile_set_editor_plugin.h +++ b/editor/plugins/tile_set_editor_plugin.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef TILE_SET_EDITOR_PLUGIN_H #define TILE_SET_EDITOR_PLUGIN_H @@ -143,6 +144,7 @@ private: void draw_grid_snap(); void draw_polygon_shapes(); void close_shape(const Vector2 &shape_anchor); + void select_coord(const Vector2 &coord); Vector2 snap_point(const Vector2 &point); void edit(Object *p_node); diff --git a/editor/progress_dialog.cpp b/editor/progress_dialog.cpp index 70866df8ec..5d79b8f94c 100644 --- a/editor/progress_dialog.cpp +++ b/editor/progress_dialog.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "progress_dialog.h" #include "editor_scale.h" diff --git a/editor/progress_dialog.h b/editor/progress_dialog.h index a914606e6d..bf0b3cca1c 100644 --- a/editor/progress_dialog.h +++ b/editor/progress_dialog.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef PROGRESS_DIALOG_H #define PROGRESS_DIALOG_H diff --git a/editor/project_export.cpp b/editor/project_export.cpp index dfcd3da42a..d15a37a19c 100644 --- a/editor/project_export.cpp +++ b/editor/project_export.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "project_export.h" #include "compressed_translation.h" #include "editor_data.h" diff --git a/editor/project_export.h b/editor/project_export.h index d793e21f45..6c74743769 100644 --- a/editor/project_export.h +++ b/editor/project_export.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef PROJECT_EXPORT_SETTINGS_H #define PROJECT_EXPORT_SETTINGS_H diff --git a/editor/project_manager.cpp b/editor/project_manager.cpp index 3d4ae90c89..20b94c823f 100644 --- a/editor/project_manager.cpp +++ b/editor/project_manager.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "project_manager.h" #include "editor_initialize_ssl.h" diff --git a/editor/project_manager.h b/editor/project_manager.h index 7fc938f660..6fc82bf542 100644 --- a/editor/project_manager.h +++ b/editor/project_manager.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef PROJECT_MANAGER_H #define PROJECT_MANAGER_H diff --git a/editor/project_settings_editor.cpp b/editor/project_settings_editor.cpp index 06befe8f3c..704ec40e4c 100644 --- a/editor/project_settings_editor.cpp +++ b/editor/project_settings_editor.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "project_settings_editor.h" #include "core/global_constants.h" diff --git a/editor/project_settings_editor.h b/editor/project_settings_editor.h index be5a51dd45..d6c2c0f5a8 100644 --- a/editor/project_settings_editor.h +++ b/editor/project_settings_editor.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef PROJECT_SETTINGS_H #define PROJECT_SETTINGS_H diff --git a/editor/property_editor.cpp b/editor/property_editor.cpp index 1dcc5a3231..46d52d21d4 100644 --- a/editor/property_editor.cpp +++ b/editor/property_editor.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "property_editor.h" #include "core/class_db.h" @@ -4135,6 +4136,7 @@ void PropertyEditor::_bind_methods() { ClassDB::bind_method("_resource_preview_done", &PropertyEditor::_resource_preview_done); ClassDB::bind_method("refresh", &PropertyEditor::refresh); ClassDB::bind_method("_draw_transparency", &PropertyEditor::_draw_transparency); + ClassDB::bind_method("edit", &PropertyEditor::edit); ClassDB::bind_method(D_METHOD("get_drag_data_fw"), &PropertyEditor::get_drag_data_fw); ClassDB::bind_method(D_METHOD("can_drop_data_fw"), &PropertyEditor::can_drop_data_fw); diff --git a/editor/property_editor.h b/editor/property_editor.h index bd088ad0f6..017a190adb 100644 --- a/editor/property_editor.h +++ b/editor/property_editor.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef PROPERTY_EDITOR_H #define PROPERTY_EDITOR_H diff --git a/editor/property_selector.cpp b/editor/property_selector.cpp index eac5e2efd7..3e95064ead 100644 --- a/editor/property_selector.cpp +++ b/editor/property_selector.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "property_selector.h" #include "editor_scale.h" diff --git a/editor/property_selector.h b/editor/property_selector.h index 1f6903de20..d9b1aee422 100644 --- a/editor/property_selector.h +++ b/editor/property_selector.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef PROPERTYSELECTOR_H #define PROPERTYSELECTOR_H diff --git a/editor/pvrtc_compress.cpp b/editor/pvrtc_compress.cpp index aace3e895b..57a2b0d97f 100644 --- a/editor/pvrtc_compress.cpp +++ b/editor/pvrtc_compress.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "pvrtc_compress.h" #include "editor_settings.h" diff --git a/editor/pvrtc_compress.h b/editor/pvrtc_compress.h index 2d626aa9ef..cdd2f0d242 100644 --- a/editor/pvrtc_compress.h +++ b/editor/pvrtc_compress.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef PVRTC_COMPRESS_H #define PVRTC_COMPRESS_H diff --git a/editor/quick_open.cpp b/editor/quick_open.cpp index c2a194ebaf..26dd931321 100644 --- a/editor/quick_open.cpp +++ b/editor/quick_open.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "quick_open.h" #include "os/keyboard.h" diff --git a/editor/quick_open.h b/editor/quick_open.h index 52f9c08ae6..ecc6af0c53 100644 --- a/editor/quick_open.h +++ b/editor/quick_open.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef EDITOR_QUICK_OPEN_H #define EDITOR_QUICK_OPEN_H diff --git a/editor/register_exporters.h b/editor/register_exporters.h index 9645ffddea..dc0a53a686 100644 --- a/editor/register_exporters.h +++ b/editor/register_exporters.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef REGISTER_EXPORTERS_H #define REGISTER_EXPORTERS_H diff --git a/editor/reparent_dialog.cpp b/editor/reparent_dialog.cpp index 7aa8d849e6..da8bfdbbd2 100644 --- a/editor/reparent_dialog.cpp +++ b/editor/reparent_dialog.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "reparent_dialog.h" #include "print_string.h" diff --git a/editor/reparent_dialog.h b/editor/reparent_dialog.h index 2f185b3d88..301dbe8bb5 100644 --- a/editor/reparent_dialog.h +++ b/editor/reparent_dialog.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef REPARENT_DIALOG_H #define REPARENT_DIALOG_H diff --git a/editor/run_settings_dialog.cpp b/editor/run_settings_dialog.cpp index dede4c6dc8..ea53de7e8c 100644 --- a/editor/run_settings_dialog.cpp +++ b/editor/run_settings_dialog.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "run_settings_dialog.h" void RunSettingsDialog::popup_run_settings() { diff --git a/editor/run_settings_dialog.h b/editor/run_settings_dialog.h index f9c09b06c2..9fec71a468 100644 --- a/editor/run_settings_dialog.h +++ b/editor/run_settings_dialog.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef RUN_SETTINGS_DIALOG_H #define RUN_SETTINGS_DIALOG_H diff --git a/editor/scene_tree_dock.cpp b/editor/scene_tree_dock.cpp index e7da78a35c..d8d44a635a 100644 --- a/editor/scene_tree_dock.cpp +++ b/editor/scene_tree_dock.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "scene_tree_dock.h" #include "core/io/resource_saver.h" @@ -1284,6 +1285,11 @@ void SceneTreeDock::_delete_confirm() { editor->get_viewport_control()->update(); editor->push_item(NULL); + + // Fixes the EditorHistory from still offering deleted notes + EditorHistory *editor_history = EditorNode::get_singleton()->get_editor_history(); + editor_history->cleanup_history(); + EditorNode::get_singleton()->call("_prepare_history"); } void SceneTreeDock::_selection_changed() { diff --git a/editor/scene_tree_dock.h b/editor/scene_tree_dock.h index 0a5b20ed9c..f5234fc547 100644 --- a/editor/scene_tree_dock.h +++ b/editor/scene_tree_dock.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef SCENE_TREE_DOCK_H #define SCENE_TREE_DOCK_H diff --git a/editor/scene_tree_editor.cpp b/editor/scene_tree_editor.cpp index 957f50a052..fd21b83605 100644 --- a/editor/scene_tree_editor.cpp +++ b/editor/scene_tree_editor.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "scene_tree_editor.h" #include "editor/plugins/canvas_item_editor_plugin.h" diff --git a/editor/scene_tree_editor.h b/editor/scene_tree_editor.h index 542b32d4cd..45194bb81d 100644 --- a/editor/scene_tree_editor.h +++ b/editor/scene_tree_editor.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef SCENE_TREE_EDITOR_H #define SCENE_TREE_EDITOR_H diff --git a/editor/script_create_dialog.cpp b/editor/script_create_dialog.cpp index 96863a59d2..cee356b930 100644 --- a/editor/script_create_dialog.cpp +++ b/editor/script_create_dialog.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "script_create_dialog.h" #include "editor/editor_node.h" diff --git a/editor/script_create_dialog.h b/editor/script_create_dialog.h index 882e4796f9..b5afe2e38e 100644 --- a/editor/script_create_dialog.h +++ b/editor/script_create_dialog.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef SCRIPT_CREATE_DIALOG_H #define SCRIPT_CREATE_DIALOG_H diff --git a/editor/script_editor_debugger.cpp b/editor/script_editor_debugger.cpp index f1a5aa4654..e993c2fd46 100644 --- a/editor/script_editor_debugger.cpp +++ b/editor/script_editor_debugger.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "script_editor_debugger.h" #include "editor_node.h" @@ -1165,6 +1166,7 @@ void ScriptEditorDebugger::start() { } set_process(true); + breaked = false; } void ScriptEditorDebugger::pause() { @@ -1176,6 +1178,7 @@ void ScriptEditorDebugger::unpause() { void ScriptEditorDebugger::stop() { set_process(false); + breaked = false; server->stop(); diff --git a/editor/script_editor_debugger.h b/editor/script_editor_debugger.h index 7f8348d82f..e86add940a 100644 --- a/editor/script_editor_debugger.h +++ b/editor/script_editor_debugger.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef SCRIPT_EDITOR_DEBUGGER_H #define SCRIPT_EDITOR_DEBUGGER_H diff --git a/editor/settings_config_dialog.cpp b/editor/settings_config_dialog.cpp index 1919504b5c..d75ef5df8a 100644 --- a/editor/settings_config_dialog.cpp +++ b/editor/settings_config_dialog.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "settings_config_dialog.h" #include "editor_file_system.h" diff --git a/editor/settings_config_dialog.h b/editor/settings_config_dialog.h index 6925de0777..6676e870d0 100644 --- a/editor/settings_config_dialog.h +++ b/editor/settings_config_dialog.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef SETTINGS_CONFIG_DIALOG_H #define SETTINGS_CONFIG_DIALOG_H diff --git a/editor/spatial_editor_gizmos.cpp b/editor/spatial_editor_gizmos.cpp index b06d25d8ee..72c0f050d2 100644 --- a/editor/spatial_editor_gizmos.cpp +++ b/editor/spatial_editor_gizmos.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "spatial_editor_gizmos.h" #include "geometry.h" diff --git a/editor/spatial_editor_gizmos.h b/editor/spatial_editor_gizmos.h index 240d2145c1..cb483ed653 100644 --- a/editor/spatial_editor_gizmos.h +++ b/editor/spatial_editor_gizmos.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef SPATIAL_EDITOR_GIZMOS_H #define SPATIAL_EDITOR_GIZMOS_H diff --git a/editor/translations/af.po b/editor/translations/af.po index cfe5cdc24e..e65c382344 100644 --- a/editor/translations/af.po +++ b/editor/translations/af.po @@ -198,8 +198,7 @@ msgstr "Skep %d NUWE bane en voeg sleutels by?" #: 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 +#: editor/plugins/particles_editor_plugin.cpp editor/script_create_dialog.cpp msgid "Create" msgstr "Skep" @@ -557,6 +556,16 @@ msgstr "Seine" #: editor/create_dialog.cpp #, fuzzy +msgid "Change %s Type" +msgstr "Verander Skikking Waarde-Soort" + +#: editor/create_dialog.cpp editor/project_settings_editor.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Change" +msgstr "" + +#: editor/create_dialog.cpp +#, fuzzy msgid "Create New %s" msgstr "Skep Nuwe" @@ -669,7 +678,8 @@ msgstr "" "Verwyder die lêers in elk geval? (geen ontdoen)" #: editor/dependency_editor.cpp -msgid "Cannot remove:\n" +#, fuzzy +msgid "Cannot remove:" msgstr "Kan nie verwyder nie:\n" #: editor/dependency_editor.cpp @@ -752,8 +762,9 @@ msgstr "Projek Stigters" msgid "Lead Developer" msgstr "Hoof Ontwikkelaar" -#: editor/editor_about.cpp editor/project_manager.cpp -msgid "Project Manager" +#: editor/editor_about.cpp +#, fuzzy +msgid "Project Manager " msgstr "Projek Bestuurder" #: editor/editor_about.cpp @@ -842,7 +853,7 @@ msgid "Success!" msgstr "Sukses!" #: editor/editor_asset_installer.cpp -#: editor/plugins/asset_library_editor_plugin.cpp editor/project_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp msgid "Install" msgstr "Installeer" @@ -1153,7 +1164,8 @@ msgid "Packing" msgstr "Verpak" #: editor/editor_export.cpp platform/javascript/export/export.cpp -msgid "Template file not found:\n" +#, fuzzy +msgid "Template file not found:" msgstr "Sjabloon lêer nie gevind nie:\n" #: editor/editor_file_dialog.cpp scene/gui/file_dialog.cpp @@ -1412,6 +1424,11 @@ msgstr "Afvoer:" msgid "Clear" msgstr "Vee uit" +#: editor/editor_log.cpp +#, fuzzy +msgid "Clear Output" +msgstr "Afvoer:" + #: editor/editor_node.cpp editor/plugins/animation_player_editor_plugin.cpp msgid "Error saving resource!" msgstr "Fout tydens storing van hulpbron!" @@ -1475,7 +1492,8 @@ msgstr "" #: editor/editor_node.cpp msgid "" -"Couldn't save scene. Likely dependencies (instances) couldn't be satisfied." +"Couldn't save scene. Likely dependencies (instances or inheritance) couldn't " +"be satisfied." msgstr "" #: editor/editor_node.cpp @@ -2407,7 +2425,7 @@ msgid "No version.txt found inside templates." msgstr "" #: editor/export_template_manager.cpp -msgid "Error creating path for templates:\n" +msgid "Error creating path for templates:" msgstr "" #: editor/export_template_manager.cpp @@ -2562,9 +2580,7 @@ msgid "View items as a list" msgstr "" #: editor/filesystem_dock.cpp -msgid "" -"\n" -"Status: Import of file failed. Please fix file and reimport manually." +msgid "Status: Import of file failed. Please fix file and reimport manually." msgstr "" #: editor/filesystem_dock.cpp @@ -2572,21 +2588,23 @@ msgid "Cannot move/rename resources root." msgstr "" #: editor/filesystem_dock.cpp -msgid "Cannot move a folder into itself.\n" +msgid "Cannot move a folder into itself." msgstr "" #: editor/filesystem_dock.cpp -msgid "Error moving:\n" -msgstr "" +#, fuzzy +msgid "Error moving:" +msgstr "Fout terwyl laai:" #: editor/filesystem_dock.cpp #, fuzzy -msgid "Error duplicating:\n" +msgid "Error duplicating:" msgstr "Fout terwyl laai:" #: editor/filesystem_dock.cpp -msgid "Unable to update dependencies:\n" -msgstr "" +#, fuzzy +msgid "Unable to update dependencies:" +msgstr "Toneel kon nie laai nie as gevolg van vermiste afhanklikhede:" #: editor/filesystem_dock.cpp msgid "No name provided" @@ -3227,6 +3245,11 @@ msgstr "" msgid "Filters.." msgstr "" +#: editor/plugins/animation_tree_editor_plugin.cpp +#, fuzzy +msgid "AnimationTree" +msgstr "Animasie Zoem." + #: editor/plugins/asset_library_editor_plugin.cpp msgid "Free" msgstr "" @@ -3392,6 +3415,7 @@ msgid "Bake Lightmaps" msgstr "" #: editor/plugins/camera_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Preview" msgstr "" @@ -4075,7 +4099,7 @@ msgid "Bake!" msgstr "" #: editor/plugins/navigation_mesh_editor_plugin.cpp -msgid "Bake the navigation mesh.\n" +msgid "Bake the navigation mesh." msgstr "" #: editor/plugins/navigation_mesh_editor_plugin.cpp @@ -4464,14 +4488,17 @@ msgstr "" msgid "Paste" msgstr "" +#: editor/plugins/resource_preloader_editor_plugin.cpp +#, fuzzy +msgid "ResourcePreloader" +msgstr "Hulpbron" + #: editor/plugins/script_editor_plugin.cpp msgid "Clear Recent Files" msgstr "" #: editor/plugins/script_editor_plugin.cpp -msgid "" -"Close and save changes?\n" -"\"" +msgid "Close and save changes?" msgstr "" #: editor/plugins/script_editor_plugin.cpp @@ -4547,6 +4574,10 @@ msgid "Copy Script Path" msgstr "" #: editor/plugins/script_editor_plugin.cpp +msgid "Show In File System" +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp msgid "History Prev" msgstr "" @@ -4978,83 +5009,83 @@ msgid "Rotating %s degrees." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Bottom View." +msgid "Keying is disabled (no key inserted)." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Bottom" +msgid "Animation Key Inserted." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Top View." +msgid "Objects Drawn" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Rear View." +msgid "Material Changes" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Rear" +msgid "Shader Changes" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Front View." +msgid "Surface Changes" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Front" +msgid "Draw Calls" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Left View." +msgid "Vertices" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Left" +msgid "FPS" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Right View." +msgid "Top View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Right" +msgid "Bottom View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Keying is disabled (no key inserted)." +msgid "Bottom" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Animation Key Inserted." +msgid "Left View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Objects Drawn" +msgid "Left" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Material Changes" +msgid "Right View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Shader Changes" +msgid "Right" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Surface Changes" +msgid "Front View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Draw Calls" +msgid "Front" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Vertices" +msgid "Rear View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "FPS" +msgid "Rear" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp @@ -5142,15 +5173,11 @@ 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" +msgid "Select Mode (Q)" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp @@ -5425,10 +5452,18 @@ msgstr "" msgid "Move (After)" msgstr "" +#: editor/plugins/sprite_frames_editor_plugin.cpp +msgid "SpriteFrames" +msgstr "" + #: editor/plugins/style_box_editor_plugin.cpp msgid "StyleBox Preview:" msgstr "" +#: editor/plugins/style_box_editor_plugin.cpp +msgid "StyleBox" +msgstr "" + #: editor/plugins/texture_region_editor_plugin.cpp msgid "Set Region Rect" msgstr "" @@ -5454,14 +5489,17 @@ msgid "Auto Slice" msgstr "" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Offset:" msgstr "" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Step:" msgstr "" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Separation:" msgstr "" @@ -5599,6 +5637,10 @@ msgstr "" msgid "Color" msgstr "" +#: editor/plugins/theme_editor_plugin.cpp +msgid "Theme" +msgstr "" + #: editor/plugins/tile_map_editor_plugin.cpp msgid "Erase Selection" msgstr "" @@ -5699,6 +5741,31 @@ msgstr "" msgid "Error" msgstr "" +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "Autotiles" +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "" +"Select sub-tile to use as icon, this will be also used on invalid autotile " +"bindings." +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "" +"LMB: set bit on.\n" +"RMB: set bit off." +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +#, fuzzy +msgid "Select current edited sub-tile." +msgstr "Skep Vouer" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "Select sub-tile to change it's priority." +msgstr "" + #: editor/progress_dialog.cpp scene/gui/dialogs.cpp msgid "Cancel" msgstr "" @@ -5816,10 +5883,23 @@ msgid "Please choose a folder that does not contain a 'project.godot' file." msgstr "" #: editor/project_manager.cpp +msgid "That's a BINGO!" +msgstr "" + +#: editor/project_manager.cpp msgid "Imported Project" msgstr "" #: editor/project_manager.cpp +#, fuzzy +msgid "Couldn't create folder." +msgstr "Kon nie vouer skep nie." + +#: editor/project_manager.cpp +msgid "There is already a folder in this path with the specified name." +msgstr "" + +#: editor/project_manager.cpp msgid "It would be a good idea to name your project." msgstr "" @@ -5860,14 +5940,28 @@ msgid "Import Existing Project" msgstr "" #: editor/project_manager.cpp +msgid "Import & Edit" +msgstr "" + +#: editor/project_manager.cpp msgid "Create New Project" msgstr "" #: editor/project_manager.cpp +#, fuzzy +msgid "Create & Edit" +msgstr "Skep" + +#: editor/project_manager.cpp msgid "Install Project:" msgstr "" #: editor/project_manager.cpp +#, fuzzy +msgid "Install & Edit" +msgstr "Installeer" + +#: editor/project_manager.cpp msgid "Project Name:" msgstr "" @@ -5884,10 +5978,6 @@ msgid "Browse" msgstr "" #: editor/project_manager.cpp -msgid "That's a BINGO!" -msgstr "" - -#: editor/project_manager.cpp msgid "Unnamed Project" msgstr "" @@ -5933,6 +6023,10 @@ msgid "" msgstr "" #: editor/project_manager.cpp +msgid "Project Manager" +msgstr "Projek Bestuurder" + +#: editor/project_manager.cpp msgid "Project List" msgstr "" @@ -6059,11 +6153,6 @@ 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 "" @@ -6529,8 +6618,9 @@ msgid "Error duplicating scene to save it." msgstr "" #: editor/scene_tree_dock.cpp -msgid "Sub-Resources:" -msgstr "" +#, fuzzy +msgid "Sub-Resources" +msgstr "Hulpbron" #: editor/scene_tree_dock.cpp msgid "Clear Inheritance" @@ -6820,7 +6910,7 @@ msgstr "" msgid "Pick one or more items from the list to display the graph." msgstr "" -#: editor/script_editor_debugger.cpp +#: editor/script_editor_debugger.cpp modules/mono/editor/mono_bottom_panel.cpp msgid "Errors" msgstr "" @@ -6829,6 +6919,10 @@ msgid "Child Process Connected" msgstr "" #: editor/script_editor_debugger.cpp +msgid "Copy Error" +msgstr "" + +#: editor/script_editor_debugger.cpp msgid "Inspect Previous Instance" msgstr "" @@ -7175,10 +7269,52 @@ msgstr "" msgid "Pick Distance:" msgstr "" +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Generating solution..." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Generating C# project..." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Failed to create solution." +msgstr "Kon nie vouer skep nie." + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Failed to save solution." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Done" +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Failed to create C# project." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Mono" +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Create C# solution" +msgstr "Skep Intekening" + #: modules/mono/editor/mono_bottom_panel.cpp msgid "Builds" msgstr "" +#: modules/mono/editor/mono_bottom_panel.cpp +msgid "Build Project" +msgstr "" + +#: modules/mono/editor/mono_bottom_panel.cpp +msgid "Warnings" +msgstr "" + #: modules/visual_script/visual_script.cpp msgid "" "A node yielded without working memory, please read the docs on how to yield " @@ -7524,23 +7660,30 @@ msgid "Run exported HTML in the system's default browser." msgstr "" #: platform/javascript/export/export.cpp -msgid "Could not write file:\n" -msgstr "" +#, fuzzy +msgid "Could not write file:" +msgstr "Kon nie vouer skep nie." #: platform/javascript/export/export.cpp -msgid "Could not open template for export:\n" -msgstr "" +#, fuzzy +msgid "Could not open template for export:" +msgstr "Kon nie vouer skep nie." #: platform/javascript/export/export.cpp -msgid "Invalid export template:\n" +msgid "Invalid export template:" msgstr "" #: platform/javascript/export/export.cpp -msgid "Could not read custom HTML shell:\n" +msgid "Could not read custom HTML shell:" msgstr "" #: platform/javascript/export/export.cpp -msgid "Could not read boot splash image file:\n" +#, fuzzy +msgid "Could not read boot splash image file:" +msgstr "Kon nie vouer skep nie." + +#: platform/javascript/export/export.cpp +msgid "Using default boot splash image." msgstr "" #: scene/2d/animated_sprite.cpp @@ -7793,8 +7936,8 @@ msgstr "" #: scene/main/scene_tree.cpp msgid "" -"Default Environment as specified in Project Setings (Rendering -> Viewport -" -"> Default Environment) could not be loaded." +"Default Environment as specified in Project Setings (Rendering -> " +"Environment -> Default Environment) could not be loaded." msgstr "" #: scene/main/viewport.cpp @@ -7824,9 +7967,5 @@ msgstr "" #~ msgid "Move Add Key" #~ msgstr "Skuif Byvoeg Sleutel" -#, fuzzy -#~ msgid "Create Subscription" -#~ msgstr "Skep Intekening" - #~ msgid "List:" #~ msgstr "Lys:" diff --git a/editor/translations/ar.po b/editor/translations/ar.po index 908f49ab94..ddc278bc3a 100644 --- a/editor/translations/ar.po +++ b/editor/translations/ar.po @@ -10,7 +10,7 @@ # Mohammmad Khashashneh <mohammad.rasmi@gmail.com>, 2016. # Mrwan Ashraf <mrwan.ashraf94@gmail.com>, 2017. # noureldin sharaf <sharaf.noureldin@yahoo.com>, 2017. -# omar anwar aglan <omar.aglan91@yahoo.com>, 2017. +# omar anwar aglan <omar.aglan91@yahoo.com>, 2017-2018. # OWs Tetra <owstetra@gmail.com>, 2017. # Rex_sa <asd1234567890m@gmail.com>, 2017. # Wajdi Feki <wajdi.feki@gmail.com>, 2017. @@ -18,8 +18,8 @@ msgid "" msgstr "" "Project-Id-Version: Godot Engine editor\n" -"PO-Revision-Date: 2017-12-20 15:42+0000\n" -"Last-Translator: Rex_sa <asd1234567890m@gmail.com>\n" +"PO-Revision-Date: 2018-01-06 13:19+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" @@ -27,7 +27,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.18\n" +"X-Generator: Weblate 2.19-dev\n" #: editor/animation_editor.cpp msgid "Disabled" @@ -38,9 +38,8 @@ msgid "All Selection" msgstr "ÙƒÙÙ„ المÙØدد" #: editor/animation_editor.cpp -#, fuzzy msgid "Anim Change Keyframe Time" -msgstr "قيمة تغيير التØريك" +msgstr "تغيير وقت الإطار الرئيسي للØركة" #: editor/animation_editor.cpp msgid "Anim Change Transition" @@ -51,9 +50,8 @@ msgid "Anim Change Transform" msgstr "تØويل تغيير التØريك" #: editor/animation_editor.cpp -#, fuzzy msgid "Anim Change Keyframe Value" -msgstr "قيمة تغيير التØريك" +msgstr "تغيير قيمة الإطار الأساسي للØركة" #: editor/animation_editor.cpp msgid "Anim Change Call" @@ -209,8 +207,7 @@ msgstr "أنشئ %d مسارات جديدة Ùˆ أدخل Ù…ÙاتيØØŸ" #: 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 +#: editor/plugins/particles_editor_plugin.cpp editor/script_create_dialog.cpp msgid "Create" msgstr "أنشئ" @@ -546,9 +543,8 @@ msgid "Connecting Signal:" msgstr "يوصل الإشارة:" #: editor/connections_dialog.cpp -#, fuzzy msgid "Disconnect '%s' from '%s'" -msgstr "وصل '%s' إلي '%s'" +msgstr "قطع إتصال'%s' من '%s'" #: editor/connections_dialog.cpp msgid "Connect.." @@ -565,8 +561,17 @@ msgstr "الإشارات" #: editor/create_dialog.cpp #, fuzzy +msgid "Change %s Type" +msgstr "غير النوع الإÙتراضي" + +#: editor/create_dialog.cpp editor/project_settings_editor.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Change" +msgstr "" + +#: editor/create_dialog.cpp msgid "Create New %s" -msgstr "إنشاء جديد" +msgstr "إنشاء %s جديد" #: editor/create_dialog.cpp editor/editor_file_dialog.cpp #: editor/filesystem_dock.cpp @@ -676,7 +681,8 @@ msgstr "" "Ø¥Ù…Ø³Ø Ø¹Ù„ÙŠ أية Øال؟ (لا رجعة)" #: editor/dependency_editor.cpp -msgid "Cannot remove:\n" +#, fuzzy +msgid "Cannot remove:" msgstr "لا يمكن المسØ:\n" #: editor/dependency_editor.cpp @@ -759,8 +765,9 @@ msgstr "مؤسسون المشروع" msgid "Lead Developer" msgstr "قائد المطوريين" -#: editor/editor_about.cpp editor/project_manager.cpp -msgid "Project Manager" +#: editor/editor_about.cpp +#, fuzzy +msgid "Project Manager " msgstr "مدير المشروع" #: editor/editor_about.cpp @@ -849,7 +856,7 @@ msgid "Success!" msgstr "تم بنجاØ!" #: editor/editor_asset_installer.cpp -#: editor/plugins/asset_library_editor_plugin.cpp editor/project_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp msgid "Install" msgstr "تثبيت" @@ -870,9 +877,8 @@ msgid "Rename Audio Bus" msgstr "إعادة تسمية بيوس الصوت" #: editor/editor_audio_buses.cpp -#, fuzzy msgid "Change Audio Bus Volume" -msgstr "تبديل بيوس الصوت إلي Ùردي" +msgstr "تغيير Øجم صوت البيوس" #: editor/editor_audio_buses.cpp msgid "Toggle Audio Bus Solo" @@ -1157,7 +1163,8 @@ msgid "Packing" msgstr "ÙŠÙŽØزم\"ينتج المل٠المضغوط\"" #: editor/editor_export.cpp platform/javascript/export/export.cpp -msgid "Template file not found:\n" +#, fuzzy +msgid "Template file not found:" msgstr "مل٠النموذج غير موجود:\n" #: editor/editor_file_dialog.cpp scene/gui/file_dialog.cpp @@ -1415,6 +1422,11 @@ msgstr "الخرج:" msgid "Clear" msgstr "خالي" +#: editor/editor_log.cpp +#, fuzzy +msgid "Clear Output" +msgstr "الخرج" + #: editor/editor_node.cpp editor/plugins/animation_player_editor_plugin.cpp msgid "Error saving resource!" msgstr "خطأ ÙÙŠ ØÙظ المورد!" @@ -1477,8 +1489,10 @@ msgid "This operation can't be done without a tree root." msgstr "هذه العملية لا يمكنها الإكتمال من غير جزر الشجرة." #: editor/editor_node.cpp +#, fuzzy msgid "" -"Couldn't save scene. Likely dependencies (instances) couldn't be satisfied." +"Couldn't save scene. Likely dependencies (instances or inheritance) couldn't " +"be satisfied." msgstr "لا يمكن ØÙظ المشهد. على Ø§Ù„Ø£Ø±Ø¬Ø Ù„Ø§ يمكن إستيÙاء التبعيات (مجسّدات)." #: editor/editor_node.cpp @@ -2351,14 +2365,12 @@ msgid "Frame #:" msgstr "اطار #:" #: editor/editor_profiler.cpp -#, fuzzy msgid "Time" -msgstr "الوقت:" +msgstr "الوقت" #: editor/editor_profiler.cpp -#, fuzzy msgid "Calls" -msgstr "نداء" +msgstr "ندائات" #: editor/editor_run_native.cpp msgid "Select device from the list" @@ -2463,7 +2475,8 @@ msgid "No version.txt found inside templates." msgstr "لا مل٠version.txt تم إيجاده داخل القالب." #: editor/export_template_manager.cpp -msgid "Error creating path for templates:\n" +#, fuzzy +msgid "Error creating path for templates:" msgstr "خطأ ÙÙŠ إنشاء المسار للقوالب:\n" #: editor/export_template_manager.cpp @@ -2499,7 +2512,6 @@ msgstr "لا يوجد إستجابة." #: editor/export_template_manager.cpp #: editor/plugins/asset_library_editor_plugin.cpp -#, fuzzy msgid "Request Failed." msgstr "Ùشل الطلب." @@ -2547,7 +2559,6 @@ msgid "Connecting.." msgstr "جاري الإتصال..." #: editor/export_template_manager.cpp -#, fuzzy msgid "Can't Connect" msgstr "لا يمكن الإتصال" @@ -2622,9 +2633,8 @@ msgid "View items as a list" msgstr "أظهر العناصر كقائمة" #: editor/filesystem_dock.cpp -msgid "" -"\n" -"Status: Import of file failed. Please fix file and reimport manually." +#, fuzzy +msgid "Status: Import of file failed. Please fix file and reimport manually." msgstr "" "\n" "الØالة: إستيراد المل٠Ùشل. من Ùضلك Ø£ØµÙ„Ø Ø§Ù„Ù…Ù„Ù Ùˆ أعد إستيراده يدوياً." @@ -2634,20 +2644,23 @@ msgid "Cannot move/rename resources root." msgstr "لا يمكن مسØ/إعادة تسمية جذر الموارد." #: editor/filesystem_dock.cpp -msgid "Cannot move a folder into itself.\n" +#, fuzzy +msgid "Cannot move a folder into itself." msgstr "لا يمكن تØريك مجلد إلي Ù†Ùسه.\n" #: editor/filesystem_dock.cpp -msgid "Error moving:\n" +#, fuzzy +msgid "Error moving:" msgstr "خطأ ÙÙŠ تØريك:\n" #: editor/filesystem_dock.cpp #, fuzzy -msgid "Error duplicating:\n" -msgstr "خطآ ÙÙŠ التØميل:" +msgid "Error duplicating:" +msgstr "خطآ ÙÙŠ التكرار\n" #: editor/filesystem_dock.cpp -msgid "Unable to update dependencies:\n" +#, fuzzy +msgid "Unable to update dependencies:" msgstr "غير قادر علي تØديث التبعيات:\n" #: editor/filesystem_dock.cpp @@ -2679,14 +2692,12 @@ msgid "Renaming folder:" msgstr "إعادة تسمية مجلد:" #: editor/filesystem_dock.cpp -#, fuzzy msgid "Duplicating file:" -msgstr "تكرير" +msgstr "تكرير الملÙ:" #: editor/filesystem_dock.cpp -#, fuzzy msgid "Duplicating folder:" -msgstr "إعادة تسمية مجلد:" +msgstr "تكرار مجلد:" #: editor/filesystem_dock.cpp msgid "Expand all" @@ -2705,9 +2716,8 @@ msgid "Move To.." msgstr "تØريك إلي.." #: editor/filesystem_dock.cpp -#, fuzzy msgid "Open Scene(s)" -msgstr "ÙØªØ Ù…Ø´Ù‡Ø¯" +msgstr "ÙØªØ Ù…Ø´Ù‡Ø¯ (مشاهد)" #: editor/filesystem_dock.cpp msgid "Instance" @@ -2722,9 +2732,8 @@ msgid "View Owners.." msgstr "أظهر المÙلاك.." #: editor/filesystem_dock.cpp -#, fuzzy msgid "Duplicate.." -msgstr "تكرير" +msgstr "تكرير..." #: editor/filesystem_dock.cpp msgid "Previous Directory" @@ -3110,7 +3119,7 @@ msgstr "" #: editor/plugins/animation_player_editor_plugin.cpp msgid "Differences Only" -msgstr "الاختلاÙات Ùقط" +msgstr "الإختلاÙات Ùقط" #: editor/plugins/animation_player_editor_plugin.cpp msgid "Force White Modulate" @@ -3294,6 +3303,11 @@ msgstr "تعديل مصاÙÙŠ العقد" msgid "Filters.." msgstr "الÙلترة.." +#: editor/plugins/animation_tree_editor_plugin.cpp +#, fuzzy +msgid "AnimationTree" +msgstr "Øركة" + #: editor/plugins/asset_library_editor_plugin.cpp msgid "Free" msgstr "مجاني/Ùارغ" @@ -3459,6 +3473,7 @@ msgid "Bake Lightmaps" msgstr "" #: editor/plugins/camera_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Preview" msgstr "إستعراض" @@ -3969,19 +3984,19 @@ msgstr "أنشئ ميش التنقل" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Contained Mesh is not of type ArrayMesh." -msgstr "" +msgstr "الميش المتضمن ليس من النوع الميش المتعدد." #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "UV Unwrap failed, mesh may not be manifold?" -msgstr "" +msgstr "نشر Unwrap Ùشل، الميش ربما لا يكون متعدد؟" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "No mesh to debug." -msgstr "" +msgstr "لا ميش لتصØÙŠØØ©." #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Model has no UV in this layer" -msgstr "" +msgstr "النموذج ليس لديه UV ÙÙŠ هذا الطابق" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "MeshInstance lacks a Mesh!" @@ -4005,37 +4020,35 @@ msgstr "الميش" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Create Trimesh Static Body" -msgstr "" +msgstr "إنشاء جسم تراميش ثابت" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Create Convex Static Body" -msgstr "" +msgstr "أنشئ جسم Ù…Øدب ثابت" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Create Trimesh Collision Sibling" -msgstr "" +msgstr "إنشاء متصادم تراميش قريب" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Create Convex Collision Sibling" -msgstr "" +msgstr "إنشاء متصادم Ù…Øدب قريب" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Create Outline Mesh.." msgstr "إنشاء شبكة الخطوط العريضة .." #: editor/plugins/mesh_instance_editor_plugin.cpp -#, fuzzy msgid "View UV1" -msgstr "أظهر" +msgstr "أظهر UV1" #: editor/plugins/mesh_instance_editor_plugin.cpp -#, fuzzy msgid "View UV2" -msgstr "أظهر" +msgstr "أظهر UV2" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Unwrap UV2 for Lightmap/AO" -msgstr "" +msgstr "بسط UV2 من أجل خريطة الضوء/الإطباق المØيط" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Create Outline Mesh" @@ -4047,127 +4060,128 @@ msgstr "Øجم الخطوط:" #: editor/plugins/multimesh_editor_plugin.cpp msgid "No mesh source specified (and no MultiMesh set in node)." -msgstr "" +msgstr "لا مصدر ميش تم تØديده (Ùˆ لا ميش متعدد تم تØديده ÙÙŠ العقدة)." #: editor/plugins/multimesh_editor_plugin.cpp msgid "No mesh source specified (and MultiMesh contains no Mesh)." -msgstr "" +msgstr "لا مصدر ميش تم تØديده (Ùˆ ميش المتعدد لا ÙŠØتوي علي ميش)." #: editor/plugins/multimesh_editor_plugin.cpp msgid "Mesh source is invalid (invalid path)." -msgstr "" +msgstr "مصدر الميش خاطئ (المسار خاطئ)." #: editor/plugins/multimesh_editor_plugin.cpp msgid "Mesh source is invalid (not a MeshInstance)." -msgstr "" +msgstr "مصدر الميش خاطئ (لييس ميش نموذجي)." #: editor/plugins/multimesh_editor_plugin.cpp msgid "Mesh source is invalid (contains no Mesh resource)." -msgstr "" +msgstr "مصدر الميش خاطئ (لا ÙŠØتوي علي مصادر للميش)." #: editor/plugins/multimesh_editor_plugin.cpp msgid "No surface source specified." -msgstr "" +msgstr "لا مصدر Ù„Ù„Ø³Ø·Ø ØªÙ… تØديده." #: editor/plugins/multimesh_editor_plugin.cpp msgid "Surface source is invalid (invalid path)." -msgstr "" +msgstr "مصدر Ø§Ù„Ø³Ø·Ø Ø®Ø§Ø·Ø¦ (مسار خاطئ)." #: editor/plugins/multimesh_editor_plugin.cpp msgid "Surface source is invalid (no geometry)." -msgstr "" +msgstr "مصدر Ø§Ù„Ø³Ø·Ø Ø®Ø§Ø·Ø¦ (لا شكل هندسي)." #: editor/plugins/multimesh_editor_plugin.cpp msgid "Surface source is invalid (no faces)." -msgstr "" +msgstr "مصدر Ø§Ù„Ø³Ø·Ø Ø®Ø§Ø·Ø¦ (لا وجوه)." #: editor/plugins/multimesh_editor_plugin.cpp msgid "Parent has no solid faces to populate." -msgstr "" +msgstr "الأب ليس لديه وجوه ثابته لكي تتزايد." #: editor/plugins/multimesh_editor_plugin.cpp msgid "Couldn't map area." -msgstr "" +msgstr "لا يمكنه تخطيط المنطقة." #: editor/plugins/multimesh_editor_plugin.cpp msgid "Select a Source Mesh:" -msgstr "" +msgstr "Øدد مصدر ميش:" #: editor/plugins/multimesh_editor_plugin.cpp msgid "Select a Target Surface:" -msgstr "" +msgstr "Øدد Ø§Ù„Ø³Ø·Ø Ø§Ù„Ù…Ø³ØªÙ‡Ø¯Ù:" #: editor/plugins/multimesh_editor_plugin.cpp msgid "Populate Surface" -msgstr "" +msgstr "تزويد السطØ" #: editor/plugins/multimesh_editor_plugin.cpp msgid "Populate MultiMesh" -msgstr "" +msgstr "تزويد الميش المتعدد" #: editor/plugins/multimesh_editor_plugin.cpp msgid "Target Surface:" -msgstr "" +msgstr "Ø§Ù„Ø³Ø·Ø Ø§Ù„Ù…Ø³ØªÙ‡Ø¯Ù:" #: editor/plugins/multimesh_editor_plugin.cpp msgid "Source Mesh:" -msgstr "" +msgstr "الميش المصدر:" #: editor/plugins/multimesh_editor_plugin.cpp msgid "X-Axis" -msgstr "" +msgstr "Ù…Øور-X" #: editor/plugins/multimesh_editor_plugin.cpp msgid "Y-Axis" -msgstr "" +msgstr "Ù…Øور-Y" #: editor/plugins/multimesh_editor_plugin.cpp msgid "Z-Axis" -msgstr "" +msgstr "Ù…Øور-Z" #: editor/plugins/multimesh_editor_plugin.cpp msgid "Mesh Up Axis:" -msgstr "" +msgstr "ميش المØاور:" #: editor/plugins/multimesh_editor_plugin.cpp msgid "Random Rotation:" -msgstr "" +msgstr "دوران عشوائي:" #: editor/plugins/multimesh_editor_plugin.cpp msgid "Random Tilt:" -msgstr "" +msgstr "إمالة عشوائية:" #: editor/plugins/multimesh_editor_plugin.cpp msgid "Random Scale:" -msgstr "" +msgstr "Øجم عشوائي:" #: editor/plugins/multimesh_editor_plugin.cpp msgid "Populate" -msgstr "" +msgstr "تكثير/تزويد" #: editor/plugins/navigation_mesh_editor_plugin.cpp msgid "Bake!" -msgstr "" +msgstr "طبخ!" #: editor/plugins/navigation_mesh_editor_plugin.cpp -msgid "Bake the navigation mesh.\n" -msgstr "" +#, fuzzy +msgid "Bake the navigation mesh." +msgstr "طبخ ميش المØاور.\n" #: editor/plugins/navigation_mesh_editor_plugin.cpp 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 msgid "Creating heightfield..." -msgstr "" +msgstr "إنشاء مجال الإرتÙاع..." #: editor/plugins/navigation_mesh_generator.cpp msgid "Marking walkable triangles..." @@ -4175,48 +4189,48 @@ 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 msgid "Partitioning..." -msgstr "" +msgstr "تجزئة..." #: editor/plugins/navigation_mesh_generator.cpp msgid "Creating contours..." -msgstr "" +msgstr "إنشاء المØيط..." #: editor/plugins/navigation_mesh_generator.cpp msgid "Creating polymesh..." -msgstr "" +msgstr "إنشاء نموذج الميش..." #: editor/plugins/navigation_mesh_generator.cpp 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 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" -msgstr "" +msgstr "إنشاء Ù…Ùضلع التنقل" #: editor/plugins/particles_2d_editor_plugin.cpp #: editor/plugins/particles_editor_plugin.cpp msgid "Generating AABB" -msgstr "" +msgstr "ÙŠÙنشئ AABB" #: editor/plugins/particles_2d_editor_plugin.cpp msgid "Can only set point into a ParticlesMaterial process material" @@ -4539,14 +4553,17 @@ msgstr "" msgid "Paste" msgstr "" +#: editor/plugins/resource_preloader_editor_plugin.cpp +#, fuzzy +msgid "ResourcePreloader" +msgstr "مورد" + #: editor/plugins/script_editor_plugin.cpp msgid "Clear Recent Files" msgstr "" #: editor/plugins/script_editor_plugin.cpp -msgid "" -"Close and save changes?\n" -"\"" +msgid "Close and save changes?" msgstr "" #: editor/plugins/script_editor_plugin.cpp @@ -4618,9 +4635,13 @@ msgid "Soft Reload Script" msgstr "" #: editor/plugins/script_editor_plugin.cpp -#, fuzzy msgid "Copy Script Path" -msgstr "نسخ المسار" +msgstr "نسخ مسار الكود" + +#: editor/plugins/script_editor_plugin.cpp +#, fuzzy +msgid "Show In File System" +msgstr "أظهر ÙÙŠ مدير الملÙات" #: editor/plugins/script_editor_plugin.cpp msgid "History Prev" @@ -4809,9 +4830,8 @@ msgid "Clone Down" msgstr "" #: editor/plugins/script_text_editor.cpp -#, fuzzy msgid "Fold/Unfold Line" -msgstr "خط مطوي" +msgstr "إلغاء/تÙعيل طي الخط" #: editor/plugins/script_text_editor.cpp msgid "Fold All Lines" @@ -5055,83 +5075,83 @@ msgid "Rotating %s degrees." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Bottom View." +msgid "Keying is disabled (no key inserted)." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Bottom" +msgid "Animation Key Inserted." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Top View." +msgid "Objects Drawn" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Rear View." +msgid "Material Changes" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Rear" +msgid "Shader Changes" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Front View." +msgid "Surface Changes" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Front" +msgid "Draw Calls" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Left View." +msgid "Vertices" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Left" +msgid "FPS" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Right View." +msgid "Top View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Right" +msgid "Bottom View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Keying is disabled (no key inserted)." +msgid "Bottom" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Animation Key Inserted." +msgid "Left View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Objects Drawn" +msgid "Left" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Material Changes" +msgid "Right View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Shader Changes" +msgid "Right" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Surface Changes" +msgid "Front View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Draw Calls" +msgid "Front" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Vertices" +msgid "Rear View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "FPS" +msgid "Rear" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp @@ -5219,16 +5239,13 @@ 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 "" +#, fuzzy +msgid "Select Mode (Q)" +msgstr "تØديد الوضع" #: editor/plugins/spatial_editor_plugin.cpp msgid "" @@ -5258,9 +5275,8 @@ msgid "Local Space Mode (%s)" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -#, fuzzy msgid "Snap Mode (%s)" -msgstr "أكبس إلي الموجهات" +msgstr "وضع الكبس (%s)" #: editor/plugins/spatial_editor_plugin.cpp msgid "Bottom View" @@ -5503,10 +5519,18 @@ msgstr "تØريك (للسابق)" msgid "Move (After)" msgstr "تØريك (للتالي)" +#: editor/plugins/sprite_frames_editor_plugin.cpp +msgid "SpriteFrames" +msgstr "" + #: editor/plugins/style_box_editor_plugin.cpp msgid "StyleBox Preview:" msgstr "" +#: editor/plugins/style_box_editor_plugin.cpp +msgid "StyleBox" +msgstr "" + #: editor/plugins/texture_region_editor_plugin.cpp msgid "Set Region Rect" msgstr "" @@ -5532,14 +5556,17 @@ msgid "Auto Slice" msgstr "" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Offset:" msgstr "" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Step:" msgstr "" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Separation:" msgstr "" @@ -5677,6 +5704,10 @@ msgstr "" msgid "Color" msgstr "" +#: editor/plugins/theme_editor_plugin.cpp +msgid "Theme" +msgstr "" + #: editor/plugins/tile_map_editor_plugin.cpp msgid "Erase Selection" msgstr "" @@ -5762,9 +5793,8 @@ msgid "Merge from scene?" msgstr "" #: editor/plugins/tile_set_editor_plugin.cpp -#, fuzzy msgid "Tile Set" -msgstr "مجموعة البلاط.." +msgstr "مجموعة البلاط" #: editor/plugins/tile_set_editor_plugin.cpp msgid "Create from Scene" @@ -5778,6 +5808,31 @@ msgstr "" msgid "Error" msgstr "" +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "Autotiles" +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "" +"Select sub-tile to use as icon, this will be also used on invalid autotile " +"bindings." +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "" +"LMB: set bit on.\n" +"RMB: set bit off." +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +#, fuzzy +msgid "Select current edited sub-tile." +msgstr "ØÙظ المورد الذي يتم تعديله Øاليا." + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "Select sub-tile to change it's priority." +msgstr "" + #: editor/progress_dialog.cpp scene/gui/dialogs.cpp msgid "Cancel" msgstr "إلغاء" @@ -5895,10 +5950,23 @@ msgid "Please choose a folder that does not contain a 'project.godot' file." msgstr "" #: editor/project_manager.cpp +msgid "That's a BINGO!" +msgstr "" + +#: editor/project_manager.cpp msgid "Imported Project" msgstr "" #: editor/project_manager.cpp +#, fuzzy +msgid "Couldn't create folder." +msgstr "لا يمكن إنشاء المجلد." + +#: editor/project_manager.cpp +msgid "There is already a folder in this path with the specified name." +msgstr "" + +#: editor/project_manager.cpp msgid "It would be a good idea to name your project." msgstr "" @@ -5939,14 +6007,29 @@ msgid "Import Existing Project" msgstr "" #: editor/project_manager.cpp +#, fuzzy +msgid "Import & Edit" +msgstr "إستيراد" + +#: editor/project_manager.cpp msgid "Create New Project" msgstr "" #: editor/project_manager.cpp +#, fuzzy +msgid "Create & Edit" +msgstr "إنشاء عقدة" + +#: editor/project_manager.cpp msgid "Install Project:" msgstr "" #: editor/project_manager.cpp +#, fuzzy +msgid "Install & Edit" +msgstr "تثبيت" + +#: editor/project_manager.cpp msgid "Project Name:" msgstr "" @@ -5963,10 +6046,6 @@ msgid "Browse" msgstr "" #: editor/project_manager.cpp -msgid "That's a BINGO!" -msgstr "" - -#: editor/project_manager.cpp msgid "Unnamed Project" msgstr "" @@ -6012,6 +6091,10 @@ msgid "" msgstr "" #: editor/project_manager.cpp +msgid "Project Manager" +msgstr "مدير المشروع" + +#: editor/project_manager.cpp msgid "Project List" msgstr "" @@ -6138,11 +6221,6 @@ 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 "" @@ -6608,8 +6686,9 @@ msgid "Error duplicating scene to save it." msgstr "" #: editor/scene_tree_dock.cpp -msgid "Sub-Resources:" -msgstr "" +#, fuzzy +msgid "Sub-Resources" +msgstr "مورد" #: editor/scene_tree_dock.cpp msgid "Clear Inheritance" @@ -6899,7 +6978,7 @@ msgstr "" msgid "Pick one or more items from the list to display the graph." msgstr "" -#: editor/script_editor_debugger.cpp +#: editor/script_editor_debugger.cpp modules/mono/editor/mono_bottom_panel.cpp msgid "Errors" msgstr "" @@ -6908,6 +6987,11 @@ msgid "Child Process Connected" msgstr "" #: editor/script_editor_debugger.cpp +#, fuzzy +msgid "Copy Error" +msgstr "خطأ تØميل" + +#: editor/script_editor_debugger.cpp msgid "Inspect Previous Instance" msgstr "" @@ -7060,9 +7144,8 @@ msgid "Select dependencies of the library for this entry" msgstr "" #: modules/gdnative/gdnative_library_editor_plugin.cpp -#, fuzzy msgid "Remove current entry" -msgstr "Ù…Ø³Ø Ù†Ù‚Ø·Ø© الإنØناء" +msgstr "Ù…Ø³Ø Ø§Ù„Ù…Ø¯Ø®Ù„Ø© الØالية" #: modules/gdnative/gdnative_library_editor_plugin.cpp msgid "Double click to create a new entry" @@ -7259,10 +7342,57 @@ msgstr "" msgid "Pick Distance:" msgstr "" +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Generating solution..." +msgstr "إنشاء المØيط..." + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Generating C# project..." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Failed to create solution." +msgstr "لا يمكن إنشاء الØد!" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Failed to save solution." +msgstr "Ùشل تØميل المورد." + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Done" +msgstr "تم!" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Failed to create C# project." +msgstr "Ùشل تØميل المورد." + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Mono" +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Create C# solution" +msgstr "أنشئ الØد" + #: modules/mono/editor/mono_bottom_panel.cpp msgid "Builds" msgstr "" +#: modules/mono/editor/mono_bottom_panel.cpp +#, fuzzy +msgid "Build Project" +msgstr "مشروع" + +#: modules/mono/editor/mono_bottom_panel.cpp +msgid "Warnings" +msgstr "" + #: modules/visual_script/visual_script.cpp msgid "" "A node yielded without working memory, please read the docs on how to yield " @@ -7608,23 +7738,32 @@ msgid "Run exported HTML in the system's default browser." msgstr "شغل مل٠HTML المÙصدر ÙÙŠ المتصÙØ Ø§Ù„Ø¥Ùتراضي للنظام." #: platform/javascript/export/export.cpp -msgid "Could not write file:\n" +#, fuzzy +msgid "Could not write file:" msgstr "لا يمكن كتابة الملÙ:\n" #: platform/javascript/export/export.cpp -msgid "Could not open template for export:\n" +#, fuzzy +msgid "Could not open template for export:" msgstr "لا يمكن ÙØªØ Ø§Ù„Ù‚Ø§Ù„Ø¨ من أجل التصدير.\n" #: platform/javascript/export/export.cpp -msgid "Invalid export template:\n" -msgstr "" +#, fuzzy +msgid "Invalid export template:" +msgstr "إدارة قوالب التصدير" #: platform/javascript/export/export.cpp -msgid "Could not read custom HTML shell:\n" +#, fuzzy +msgid "Could not read custom HTML shell:" msgstr "لا يمكن قراءة مل٠HTML مخصص:\n" #: platform/javascript/export/export.cpp -msgid "Could not read boot splash image file:\n" +#, fuzzy +msgid "Could not read boot splash image file:" +msgstr "لا يمكن كتابة الملÙ:\n" + +#: platform/javascript/export/export.cpp +msgid "Using default boot splash image." msgstr "" #: scene/2d/animated_sprite.cpp @@ -7881,8 +8020,8 @@ msgstr "" #: scene/main/scene_tree.cpp msgid "" -"Default Environment as specified in Project Setings (Rendering -> Viewport -" -"> Default Environment) could not be loaded." +"Default Environment as specified in Project Setings (Rendering -> " +"Environment -> Default Environment) could not be loaded." msgstr "" #: scene/main/viewport.cpp diff --git a/editor/translations/bg.po b/editor/translations/bg.po index 001ec0f321..4945d495c5 100644 --- a/editor/translations/bg.po +++ b/editor/translations/bg.po @@ -5,19 +5,20 @@ # # Bojidar Marinov <bojidar.marinov.bg@gmail.com>, 2016. # Иван Пенев (Ðдмирал ÐнимЕ) <aeternus.arcis@gmail.com>, 2016-2017. +# Любомир ВаÑилев <lyubomirv@abv.bg>, 2018. # msgid "" msgstr "" "Project-Id-Version: Godot Engine editor\n" -"PO-Revision-Date: 2017-07-27 06:33+0000\n" -"Last-Translator: Иван Пенев <aeternus.arcis@gmail.com>\n" +"PO-Revision-Date: 2018-01-06 13:19+0000\n" +"Last-Translator: Любомир ВаÑилев <lyubomirv@abv.bg>\n" "Language-Team: Bulgarian <https://hosted.weblate.org/projects/godot-engine/" "godot/bg/>\n" "Language: bg\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.16-dev\n" +"X-Generator: Weblate 2.19-dev\n" #: editor/animation_editor.cpp msgid "Disabled" @@ -197,8 +198,7 @@ msgstr "" #: 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 +#: editor/plugins/particles_editor_plugin.cpp editor/script_create_dialog.cpp msgid "Create" msgstr "Създаване" @@ -549,6 +549,15 @@ msgid "Signals" msgstr "" #: editor/create_dialog.cpp +msgid "Change %s Type" +msgstr "" + +#: editor/create_dialog.cpp editor/project_settings_editor.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Change" +msgstr "" + +#: editor/create_dialog.cpp #, fuzzy msgid "Create New %s" msgstr "Създаване на нов проект" @@ -655,7 +664,7 @@ msgid "" msgstr "" #: editor/dependency_editor.cpp -msgid "Cannot remove:\n" +msgid "Cannot remove:" msgstr "" #: editor/dependency_editor.cpp @@ -731,16 +740,16 @@ msgid "Godot Engine contributors" msgstr "" #: editor/editor_about.cpp -#, fuzzy msgid "Project Founders" -msgstr "ДиÑпечер на проектите" +msgstr "ОÑнователи на проекта" #: editor/editor_about.cpp msgid "Lead Developer" msgstr "" -#: editor/editor_about.cpp editor/project_manager.cpp -msgid "Project Manager" +#: editor/editor_about.cpp +#, fuzzy +msgid "Project Manager " msgstr "ДиÑпечер на проектите" #: editor/editor_about.cpp @@ -796,14 +805,12 @@ msgid "" msgstr "" #: editor/editor_about.cpp -#, fuzzy msgid "All Components" -msgstr "Съдържание:" +msgstr "Ð’Ñички компоненти" #: editor/editor_about.cpp -#, fuzzy msgid "Components" -msgstr "Съдържание:" +msgstr "Компоненти" #: editor/editor_about.cpp msgid "Licenses" @@ -828,7 +835,7 @@ msgid "Success!" msgstr "Готово!" #: editor/editor_asset_installer.cpp -#: editor/plugins/asset_library_editor_plugin.cpp editor/project_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp msgid "Install" msgstr "ИнÑталиране" @@ -897,9 +904,8 @@ msgid "Bypass" msgstr "" #: editor/editor_audio_buses.cpp -#, fuzzy msgid "Bus options" -msgstr "ÐаÑтройки за отÑтранÑване на грешки" +msgstr "ÐаÑтройки на шината" #: editor/editor_audio_buses.cpp editor/filesystem_dock.cpp #: editor/plugins/tile_map_editor_plugin.cpp editor/scene_tree_dock.cpp @@ -927,9 +933,8 @@ msgid "Master bus can't be deleted!" msgstr "" #: editor/editor_audio_buses.cpp -#, fuzzy msgid "Delete Audio Bus" -msgstr "Изтриване на анимациÑта?" +msgstr "Изтриване звуковата шина" #: editor/editor_audio_buses.cpp msgid "Duplicate Audio Bus" @@ -1101,9 +1106,8 @@ msgid "[unsaved]" msgstr "" #: editor/editor_dir_dialog.cpp -#, fuzzy msgid "Please select a base directory first" -msgstr "МолÑ, първо запазете Ñцената." +msgstr "МолÑ, първо изберете оÑновна папка" #: editor/editor_dir_dialog.cpp msgid "Choose a Directory" @@ -1139,7 +1143,7 @@ msgid "Packing" msgstr "" #: editor/editor_export.cpp platform/javascript/export/export.cpp -msgid "Template file not found:\n" +msgid "Template file not found:" msgstr "" #: editor/editor_file_dialog.cpp scene/gui/file_dialog.cpp @@ -1147,9 +1151,8 @@ msgid "File Exists, Overwrite?" msgstr "Файлът ÑъщеÑтвува. ИÑкате ли да го презапишете?" #: editor/editor_file_dialog.cpp scene/gui/file_dialog.cpp -#, fuzzy msgid "Select Current Folder" -msgstr "Създаване на папка" +msgstr "Избиране на текущата папка" #: editor/editor_file_dialog.cpp editor/filesystem_dock.cpp msgid "Copy Path" @@ -1160,9 +1163,8 @@ msgid "Show In File Manager" msgstr "" #: editor/editor_file_dialog.cpp editor/filesystem_dock.cpp -#, fuzzy msgid "New Folder.." -msgstr "Създаване на папка" +msgstr "Ðова папка.." #: editor/editor_file_dialog.cpp msgid "Refresh" @@ -1239,9 +1241,8 @@ msgid "Move Favorite Down" msgstr "" #: editor/editor_file_dialog.cpp scene/gui/file_dialog.cpp -#, fuzzy msgid "Go to parent folder" -msgstr "ÐеуÑпешно Ñъздаване на папка." +msgstr "Към горната папка" #: editor/editor_file_dialog.cpp scene/gui/file_dialog.cpp msgid "Directories & Files:" @@ -1310,9 +1311,8 @@ msgid "Members:" msgstr "" #: editor/editor_help.cpp -#, fuzzy msgid "Public Methods" -msgstr "Изберете метод" +msgstr "Публични методи" #: editor/editor_help.cpp msgid "Public Methods:" @@ -1331,9 +1331,8 @@ msgid "Signals:" msgstr "" #: editor/editor_help.cpp -#, fuzzy msgid "Enumerations" -msgstr "Преходи" +msgstr "Изброени типове" #: editor/editor_help.cpp msgid "Enumerations:" @@ -1344,18 +1343,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" @@ -1372,9 +1369,8 @@ msgid "" msgstr "" #: editor/editor_help.cpp -#, fuzzy msgid "Methods" -msgstr "Изберете метод" +msgstr "Методи" #: editor/editor_help.cpp msgid "Method Description:" @@ -1401,6 +1397,11 @@ msgstr "" msgid "Clear" msgstr "ИзчиÑтване" +#: editor/editor_log.cpp +#, fuzzy +msgid "Clear Output" +msgstr "Ðова Ñцена" + #: editor/editor_node.cpp editor/plugins/animation_player_editor_plugin.cpp msgid "Error saving resource!" msgstr "" @@ -1431,23 +1432,20 @@ msgid "Can't open '%s'." msgstr "" #: editor/editor_node.cpp -#, fuzzy msgid "Error while parsing '%s'." -msgstr "Имаше грешка при внаÑÑнето на Ñцената." +msgstr "Грешка при анализа на „%s“." #: editor/editor_node.cpp msgid "Unexpected end of file '%s'." msgstr "" #: 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" @@ -1467,7 +1465,8 @@ msgstr "" #: editor/editor_node.cpp msgid "" -"Couldn't save scene. Likely dependencies (instances) couldn't be satisfied." +"Couldn't save scene. Likely dependencies (instances or inheritance) couldn't " +"be satisfied." msgstr "" #: editor/editor_node.cpp @@ -1626,9 +1625,8 @@ msgid "Quick Open Script.." msgstr "" #: editor/editor_node.cpp -#, fuzzy msgid "Save & Close" -msgstr "Запазване на файл" +msgstr "Запазване и затварÑне" #: editor/editor_node.cpp msgid "Save changes to '%s' before closing?" @@ -1639,9 +1637,8 @@ msgid "Save Scene As.." msgstr "Запазване на Ñцената като.." #: editor/editor_node.cpp -#, fuzzy msgid "No" -msgstr "Възел" +msgstr "Ðе" #: editor/editor_node.cpp msgid "Yes" @@ -1705,9 +1702,8 @@ msgid "Open Project Manager?" msgstr "ДиÑпечер на проектите" #: editor/editor_node.cpp -#, fuzzy msgid "Save & Quit" -msgstr "Запазване на файл" +msgstr "Запазване и изход" #: editor/editor_node.cpp msgid "Save changes to the following scene(s) before quitting?" @@ -2410,7 +2406,7 @@ msgstr "" #: editor/export_template_manager.cpp #, fuzzy -msgid "Error creating path for templates:\n" +msgid "Error creating path for templates:" msgstr "Имаше грешка при изнаÑÑне на проекта!" #: editor/export_template_manager.cpp @@ -2574,9 +2570,7 @@ msgid "View items as a list" msgstr "" #: editor/filesystem_dock.cpp -msgid "" -"\n" -"Status: Import of file failed. Please fix file and reimport manually." +msgid "Status: Import of file failed. Please fix file and reimport manually." msgstr "" #: editor/filesystem_dock.cpp @@ -2584,22 +2578,22 @@ msgid "Cannot move/rename resources root." msgstr "" #: editor/filesystem_dock.cpp -msgid "Cannot move a folder into itself.\n" +msgid "Cannot move a folder into itself." msgstr "" #: editor/filesystem_dock.cpp #, fuzzy -msgid "Error moving:\n" +msgid "Error moving:" msgstr "Имаше грешка при внаÑÑнето:" #: editor/filesystem_dock.cpp #, fuzzy -msgid "Error duplicating:\n" +msgid "Error duplicating:" msgstr "Имаше грешка при внаÑÑнето:" #: editor/filesystem_dock.cpp #, fuzzy -msgid "Unable to update dependencies:\n" +msgid "Unable to update dependencies:" msgstr "Сцената '%s' има нарушени завиÑимоÑти:" #: editor/filesystem_dock.cpp @@ -3247,6 +3241,11 @@ msgstr "" msgid "Filters.." msgstr "" +#: editor/plugins/animation_tree_editor_plugin.cpp +#, fuzzy +msgid "AnimationTree" +msgstr "Изтриване на анимациÑта?" + #: editor/plugins/asset_library_editor_plugin.cpp msgid "Free" msgstr "" @@ -3413,6 +3412,7 @@ msgid "Bake Lightmaps" msgstr "" #: editor/plugins/camera_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Preview" msgstr "" @@ -4102,7 +4102,7 @@ msgid "Bake!" msgstr "" #: editor/plugins/navigation_mesh_editor_plugin.cpp -msgid "Bake the navigation mesh.\n" +msgid "Bake the navigation mesh." msgstr "" #: editor/plugins/navigation_mesh_editor_plugin.cpp @@ -4491,15 +4491,18 @@ msgstr "" msgid "Paste" msgstr "ПоÑтавÑне" +#: editor/plugins/resource_preloader_editor_plugin.cpp +msgid "ResourcePreloader" +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 "" +#, fuzzy +msgid "Close and save changes?" +msgstr "Да Ñе затвори ли Ñцената? (незаразените промени ще Ñе загубÑÑ‚)" #: editor/plugins/script_editor_plugin.cpp msgid "Error while saving theme" @@ -4575,6 +4578,10 @@ msgid "Copy Script Path" msgstr "" #: editor/plugins/script_editor_plugin.cpp +msgid "Show In File System" +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp msgid "History Prev" msgstr "" @@ -5009,83 +5016,83 @@ msgid "Rotating %s degrees." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Bottom View." +msgid "Keying is disabled (no key inserted)." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Bottom" +msgid "Animation Key Inserted." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Top View." +msgid "Objects Drawn" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Rear View." +msgid "Material Changes" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Rear" +msgid "Shader Changes" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Front View." +msgid "Surface Changes" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Front" +msgid "Draw Calls" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Left View." +msgid "Vertices" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Left" +msgid "FPS" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Right View." +msgid "Top View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Right" +msgid "Bottom View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Keying is disabled (no key inserted)." +msgid "Bottom" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Animation Key Inserted." +msgid "Left View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Objects Drawn" +msgid "Left" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Material Changes" +msgid "Right View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Shader Changes" +msgid "Right" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Surface Changes" +msgid "Front View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Draw Calls" +msgid "Front" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Vertices" +msgid "Rear View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "FPS" +msgid "Rear" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp @@ -5175,16 +5182,12 @@ 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 #, fuzzy -msgid "Select Mode (Q)\n" +msgid "Select Mode (Q)" msgstr "Избиране на вÑичко" #: editor/plugins/spatial_editor_plugin.cpp @@ -5461,10 +5464,18 @@ msgstr "ПоÑтавÑне на възелите" msgid "Move (After)" msgstr "" +#: editor/plugins/sprite_frames_editor_plugin.cpp +msgid "SpriteFrames" +msgstr "" + #: editor/plugins/style_box_editor_plugin.cpp msgid "StyleBox Preview:" msgstr "" +#: editor/plugins/style_box_editor_plugin.cpp +msgid "StyleBox" +msgstr "" + #: editor/plugins/texture_region_editor_plugin.cpp msgid "Set Region Rect" msgstr "" @@ -5490,14 +5501,17 @@ msgid "Auto Slice" msgstr "" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Offset:" msgstr "" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Step:" msgstr "" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Separation:" msgstr "" @@ -5636,6 +5650,10 @@ msgstr "" msgid "Color" msgstr "" +#: editor/plugins/theme_editor_plugin.cpp +msgid "Theme" +msgstr "" + #: editor/plugins/tile_map_editor_plugin.cpp msgid "Erase Selection" msgstr "" @@ -5738,6 +5756,31 @@ msgstr "" msgid "Error" msgstr "" +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "Autotiles" +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "" +"Select sub-tile to use as icon, this will be also used on invalid autotile " +"bindings." +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "" +"LMB: set bit on.\n" +"RMB: set bit off." +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +#, fuzzy +msgid "Select current edited sub-tile." +msgstr "Избиране на текущата папка" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "Select sub-tile to change it's priority." +msgstr "" + #: editor/progress_dialog.cpp scene/gui/dialogs.cpp msgid "Cancel" msgstr "Отказ" @@ -5857,10 +5900,23 @@ msgid "Please choose a folder that does not contain a 'project.godot' file." msgstr "" #: editor/project_manager.cpp +msgid "That's a BINGO!" +msgstr "" + +#: editor/project_manager.cpp msgid "Imported Project" msgstr "ВнеÑен проект" #: editor/project_manager.cpp +#, fuzzy +msgid "Couldn't create folder." +msgstr "ÐеуÑпешно Ñъздаване на папка." + +#: editor/project_manager.cpp +msgid "There is already a folder in this path with the specified name." +msgstr "" + +#: editor/project_manager.cpp msgid "It would be a good idea to name your project." msgstr "" @@ -5902,14 +5958,29 @@ msgid "Import Existing Project" msgstr "ВнаÑÑне на ÑъщеÑтвуващ проект" #: editor/project_manager.cpp +#, fuzzy +msgid "Import & Edit" +msgstr "ВнаÑÑне и отварÑне" + +#: editor/project_manager.cpp msgid "Create New Project" msgstr "Създаване на нов проект" #: editor/project_manager.cpp +#, fuzzy +msgid "Create & Edit" +msgstr "Създаване" + +#: editor/project_manager.cpp msgid "Install Project:" msgstr "" #: editor/project_manager.cpp +#, fuzzy +msgid "Install & Edit" +msgstr "ИнÑталиране" + +#: editor/project_manager.cpp msgid "Project Name:" msgstr "Име:" @@ -5927,10 +5998,6 @@ msgid "Browse" msgstr "Разглеждане" #: editor/project_manager.cpp -msgid "That's a BINGO!" -msgstr "" - -#: editor/project_manager.cpp msgid "Unnamed Project" msgstr "" @@ -5977,6 +6044,10 @@ msgid "" msgstr "" #: editor/project_manager.cpp +msgid "Project Manager" +msgstr "ДиÑпечер на проектите" + +#: editor/project_manager.cpp msgid "Project List" msgstr "СпиÑък Ñ Ð¿Ñ€Ð¾ÐµÐºÑ‚Ð¸" @@ -6104,11 +6175,6 @@ msgid "Button 9" msgstr "Копче 9" #: 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 "" @@ -6578,7 +6644,7 @@ msgid "Error duplicating scene to save it." msgstr "" #: editor/scene_tree_dock.cpp -msgid "Sub-Resources:" +msgid "Sub-Resources" msgstr "" #: editor/scene_tree_dock.cpp @@ -6881,7 +6947,7 @@ msgstr "" msgid "Pick one or more items from the list to display the graph." msgstr "" -#: editor/script_editor_debugger.cpp +#: editor/script_editor_debugger.cpp modules/mono/editor/mono_bottom_panel.cpp msgid "Errors" msgstr "Грешки" @@ -6890,6 +6956,11 @@ msgid "Child Process Connected" msgstr "" #: editor/script_editor_debugger.cpp +#, fuzzy +msgid "Copy Error" +msgstr "Грешки" + +#: editor/script_editor_debugger.cpp msgid "Inspect Previous Instance" msgstr "" @@ -7256,10 +7327,52 @@ msgstr "ÐаÑтройки" msgid "Pick Distance:" msgstr "" +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Generating solution..." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Generating C# project..." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Failed to create solution." +msgstr "ÐеуÑпешно Ñъздаване на папка." + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Failed to save solution." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Done" +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Failed to create C# project." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Mono" +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Create C# solution" +msgstr "" + #: modules/mono/editor/mono_bottom_panel.cpp msgid "Builds" msgstr "" +#: modules/mono/editor/mono_bottom_panel.cpp +#, fuzzy +msgid "Build Project" +msgstr "Проект" + +#: modules/mono/editor/mono_bottom_panel.cpp +msgid "Warnings" +msgstr "" + #: modules/visual_script/visual_script.cpp msgid "" "A node yielded without working memory, please read the docs on how to yield " @@ -7610,26 +7723,31 @@ msgstr "" #: platform/javascript/export/export.cpp #, fuzzy -msgid "Could not write file:\n" +msgid "Could not write file:" msgstr "ÐеуÑпешно Ñъздаване на папка." #: platform/javascript/export/export.cpp #, fuzzy -msgid "Could not open template for export:\n" +msgid "Could not open template for export:" msgstr "ÐеуÑпешно Ñъздаване на папка." #: platform/javascript/export/export.cpp -msgid "Invalid export template:\n" +msgid "Invalid export template:" msgstr "" #: platform/javascript/export/export.cpp #, fuzzy -msgid "Could not read custom HTML shell:\n" +msgid "Could not read custom HTML shell:" msgstr "ÐеуÑпешно Ñъздаване на папка." #: platform/javascript/export/export.cpp #, fuzzy -msgid "Could not read boot splash image file:\n" +msgid "Could not read boot splash image file:" +msgstr "ÐеуÑпешно Ñъздаване на папка." + +#: platform/javascript/export/export.cpp +#, fuzzy +msgid "Using default boot splash image." msgstr "ÐеуÑпешно Ñъздаване на папка." #: scene/2d/animated_sprite.cpp @@ -7910,8 +8028,8 @@ msgstr "" #: scene/main/scene_tree.cpp msgid "" -"Default Environment as specified in Project Setings (Rendering -> Viewport -" -"> Default Environment) could not be loaded." +"Default Environment as specified in Project Setings (Rendering -> " +"Environment -> Default Environment) could not be loaded." msgstr "" #: scene/main/viewport.cpp @@ -7985,9 +8103,6 @@ msgstr "" #~ msgid "Import Anyway" #~ msgstr "ВнаÑÑне въпреки това" -#~ msgid "Import & Open" -#~ msgstr "ВнаÑÑне и отварÑне" - #~ msgid "Import Image:" #~ msgstr "ВнаÑÑне на изображение:" @@ -8027,9 +8142,6 @@ msgstr "" #~ msgid "Invalid project path, the path must exist!" #~ msgstr "ÐедейÑтвителен път. ПътÑÑ‚ Ñ‚Ñ€Ñбва да ÑъщеÑтвува!" -#~ msgid "Close scene? (Unsaved changes will be lost)" -#~ msgstr "Да Ñе затвори ли Ñцената? (незаразените промени ще Ñе загубÑÑ‚)" - #, fuzzy #~ msgid "Error creating the signature object." #~ msgstr "Имаше грешка при изнаÑÑне на проекта!" diff --git a/editor/translations/bn.po b/editor/translations/bn.po index 63719c1a8b..3dd9818d46 100644 --- a/editor/translations/bn.po +++ b/editor/translations/bn.po @@ -200,8 +200,7 @@ msgstr "%d à¦à¦° জনà§à¦¯ নতà§à¦¨ টà§à¦°à§à¦¯à¦¾à¦•/পথ-সমà #: 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 +#: editor/plugins/particles_editor_plugin.cpp editor/script_create_dialog.cpp msgid "Create" msgstr "তৈরি করà§à¦¨" @@ -557,6 +556,16 @@ msgstr "সংকেতসমূহ" #: editor/create_dialog.cpp #, fuzzy +msgid "Change %s Type" +msgstr "ধরণ পরিবরà§à¦¤à¦¨ করà§à¦¨" + +#: editor/create_dialog.cpp editor/project_settings_editor.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Change" +msgstr "পরিবরà§à¦¤à¦¨ করà§à¦¨" + +#: editor/create_dialog.cpp +#, fuzzy msgid "Create New %s" msgstr "নতà§à¦¨ তৈরি করà§à¦¨" @@ -669,7 +678,8 @@ msgstr "" "তবà§à¦“ তাদের অপসারণ করবেন? (অফেরৎযোগà§à¦¯)" #: editor/dependency_editor.cpp -msgid "Cannot remove:\n" +#, fuzzy +msgid "Cannot remove:" msgstr "অপসারণ সমà§à¦à¦¬ নয় :\n" #: editor/dependency_editor.cpp @@ -752,8 +762,9 @@ msgstr "পà§à¦°à¦œà§‡à¦•à§à¦Ÿ ফাউনà§à¦¡à¦¾à¦°" msgid "Lead Developer" msgstr "মূল ডেà¦à§‡à¦²à¦ªà¦¾à¦°" -#: editor/editor_about.cpp editor/project_manager.cpp -msgid "Project Manager" +#: editor/editor_about.cpp +#, fuzzy +msgid "Project Manager " msgstr "পà§à¦°à¦œà§‡à¦•à§à¦Ÿ মà§à¦¯à¦¾à¦¨à§‡à¦œà¦¾à¦°" #: editor/editor_about.cpp @@ -841,7 +852,7 @@ msgid "Success!" msgstr "সমà§à¦ªà¦¨à§à¦¨ হয়েছে!" #: editor/editor_asset_installer.cpp -#: editor/plugins/asset_library_editor_plugin.cpp editor/project_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp msgid "Install" msgstr "ইনà§à¦¸à¦Ÿà¦²" @@ -1157,7 +1168,8 @@ msgid "Packing" msgstr "পà§à¦¯à¦¾à¦•/গà§à¦šà§à¦›à¦¿à¦¤ করা" #: editor/editor_export.cpp platform/javascript/export/export.cpp -msgid "Template file not found:\n" +#, fuzzy +msgid "Template file not found:" msgstr "টেমপà§à¦²à§‡à¦Ÿ ফাইল পাওয়া যায়নি:\n" #: editor/editor_file_dialog.cpp scene/gui/file_dialog.cpp @@ -1431,6 +1443,11 @@ msgstr " আউটপà§à¦Ÿ/ফলাফল:" msgid "Clear" msgstr "পরিসà§à¦•à¦¾à¦° করà§à¦¨/কà§à¦²à§€à§Ÿà¦¾à¦°" +#: editor/editor_log.cpp +#, fuzzy +msgid "Clear Output" +msgstr "আউটপà§à¦Ÿ/ফলাফল" + #: editor/editor_node.cpp editor/plugins/animation_player_editor_plugin.cpp msgid "Error saving resource!" msgstr "রিসোরà§à¦¸ সংরকà§à¦·à¦£à§‡ সমসà§à¦¯à¦¾ হয়েছে!" @@ -1498,8 +1515,10 @@ msgid "This operation can't be done without a tree root." msgstr "দৃশà§à¦¯ ছাড়া à¦à¦Ÿà¦¿ করা সমà§à¦à¦¬ হবে না।" #: editor/editor_node.cpp +#, fuzzy msgid "" -"Couldn't save scene. Likely dependencies (instances) couldn't be satisfied." +"Couldn't save scene. Likely dependencies (instances or inheritance) couldn't " +"be satisfied." msgstr "" "দৃশà§à¦¯à¦Ÿà¦¿ সংরকà§à¦·à¦£ করা সমà§à¦à¦¬ হচà§à¦›à§‡ না। সমà§à¦à¦¬à¦¤ যেসবের (ইনà§à¦¸à¦Ÿà§à¦¯à¦¾à¦¨à§à¦¸) উপর নিরà§à¦à¦° করছে তাদের " "সনà§à¦¤à§à¦·à§à¦Ÿ করা সমà§à¦à¦¬ হচà§à¦›à§‡ না।" @@ -2525,7 +2544,7 @@ msgstr "টেমপà§à¦²à§‡à¦Ÿà§‡ version.txt খà§à¦à¦œà§‡ পাওয়া #: editor/export_template_manager.cpp #, fuzzy -msgid "Error creating path for templates:\n" +msgid "Error creating path for templates:" msgstr "à¦à¦Ÿà¦²à¦¾à¦¸/মানচিতà§à¦°à¦¾à¦¬à¦²à§€ সংরকà§à¦·à¦£à§‡ সমসà§à¦¯à¦¾ হয়েছে:" #: editor/export_template_manager.cpp @@ -2706,9 +2725,8 @@ msgid "View items as a list" msgstr "লিসà§à¦Ÿ হিসেবে আইটেম দেখà§à¦¨" #: editor/filesystem_dock.cpp -msgid "" -"\n" -"Status: Import of file failed. Please fix file and reimport manually." +#, fuzzy +msgid "Status: Import of file failed. Please fix file and reimport manually." msgstr "" "\n" "সà§à¦Ÿà§à¦¯à¦¾à¦Ÿà¦¾à¦¸: ফাইল ইমà§à¦ªà§‹à¦°à§à¦Ÿ বà§à¦¯à¦°à§à¦¥ হয়েছে। অনà§à¦—à§à¦°à¦¹ করে ফাইলটি ঠিক করà§à¦¨ à¦à¦¬à¦‚ মà§à¦¯à¦¾à¦¨à§à¦¯à¦¼à¦¾à¦²à¦¿ পà§à¦¨à¦°à¦¾à§Ÿ " @@ -2721,22 +2739,22 @@ msgstr "ফনà§à¦Ÿà§‡à¦° উৎস লোড/পà§à¦°à¦¸à§‡à¦¸ করা সà #: editor/filesystem_dock.cpp #, fuzzy -msgid "Cannot move a folder into itself.\n" +msgid "Cannot move a folder into itself." msgstr "ফাইলকে তার নিজের উপরেই ইমà§à¦ªà§‹à¦°à§à¦Ÿ করা সমà§à¦à¦¬ নয়:" #: editor/filesystem_dock.cpp #, fuzzy -msgid "Error moving:\n" +msgid "Error moving:" msgstr "ইমà§à¦ªà§‹à¦°à§à¦Ÿà§‡ সমসà§à¦¯à¦¾ হয়েছে:" #: editor/filesystem_dock.cpp #, fuzzy -msgid "Error duplicating:\n" +msgid "Error duplicating:" msgstr "লোডে সমসà§à¦¯à¦¾ হয়েছে:" #: editor/filesystem_dock.cpp #, fuzzy -msgid "Unable to update dependencies:\n" +msgid "Unable to update dependencies:" msgstr "'%s' দৃশà§à¦¯à¦Ÿà¦¿à¦° অসংলগà§à¦¨ নিরà§à¦à¦°à¦¤à¦¾ রয়েছে:" #: editor/filesystem_dock.cpp @@ -3406,6 +3424,11 @@ msgstr "নোড ফিলà§à¦Ÿà¦¾à¦°à¦¸à¦®à§‚হ সমà§à¦ªà¦¾à¦¦à¦¨ কর msgid "Filters.." msgstr "ফিলà§à¦Ÿà¦¾à¦°à¦¸à¦®à§‚হ.." +#: editor/plugins/animation_tree_editor_plugin.cpp +#, fuzzy +msgid "AnimationTree" +msgstr "অà§à¦¯à¦¾à¦¨à¦¿à¦®à§‡à¦¶à¦¨" + #: editor/plugins/asset_library_editor_plugin.cpp msgid "Free" msgstr "মà§à¦•à§à¦¤ করে দিন" @@ -3579,6 +3602,7 @@ msgid "Bake Lightmaps" msgstr "লাইটà§à¦®à§à¦¯à¦¾à¦ªà§‡ হসà§à¦¤à¦¾à¦¨à§à¦¤à¦° করà§à¦¨:" #: editor/plugins/camera_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Preview" msgstr "পà§à¦°à¦¿à¦à¦¿à¦‰" @@ -4300,7 +4324,7 @@ msgstr "সিদà§à¦§/বেকà§â€Œ!" #: editor/plugins/navigation_mesh_editor_plugin.cpp #, fuzzy -msgid "Bake the navigation mesh.\n" +msgid "Bake the navigation mesh." msgstr "Navigation Mesh তৈরি করà§à¦¨" #: editor/plugins/navigation_mesh_editor_plugin.cpp @@ -4716,15 +4740,19 @@ msgstr "রিসোরà§à¦¸ লোড করà§à¦¨" msgid "Paste" msgstr "পà§à¦°à¦¤à¦¿à¦²à§‡à¦ªà¦¨/পেসà§à¦Ÿ করà§à¦¨" +#: editor/plugins/resource_preloader_editor_plugin.cpp +#, fuzzy +msgid "ResourcePreloader" +msgstr "রিসোরà§à¦¸-à¦à¦° পথ" + #: editor/plugins/script_editor_plugin.cpp #, fuzzy msgid "Clear Recent Files" msgstr "বোনà§â€Œ/হাড় পরিষà§à¦•à¦¾à¦° করà§à¦¨" #: editor/plugins/script_editor_plugin.cpp -msgid "" -"Close and save changes?\n" -"\"" +#, fuzzy +msgid "Close and save changes?" msgstr "" "বনà§à¦§ à¦à¦¬à¦‚ পরিবরà§à¦¤à¦¨ সংরকà§à¦·à¦£ করবেন?\n" "\"" @@ -4804,6 +4832,11 @@ msgid "Copy Script Path" msgstr "পথ পà§à¦°à¦¤à¦¿à¦²à¦¿à¦ªà¦¿/কপি করà§à¦¨" #: editor/plugins/script_editor_plugin.cpp +#, fuzzy +msgid "Show In File System" +msgstr "ফাইলসিসà§à¦Ÿà§‡à¦®" + +#: editor/plugins/script_editor_plugin.cpp msgid "History Prev" msgstr "পূরà§à¦¬à§‡à¦° ইতিহাস" @@ -5248,50 +5281,6 @@ msgid "Rotating %s degrees." msgstr "%s ডিগà§à¦°à¦¿ ঘূরà§à¦£à¦¿à¦¤ হচà§à¦›à§‡à¥¤" #: 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 "চাবিসংযোক নিষà§à¦•à§à¦°à¦¿à§Ÿ আছে (কোনো চাবি সংযà§à¦•à§à¦¤ হয়নি)।" @@ -5332,6 +5321,50 @@ msgid "FPS" msgstr "à¦à¦« পি à¦à¦¸" #: editor/plugins/spatial_editor_plugin.cpp +msgid "Top View." +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 "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 "Front View." +msgstr "সনà§à¦®à§à¦– দরà§à¦¶à¦¨à¥¤" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Front" +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 "Align with view" msgstr "দরà§à¦¶à¦¨à§‡à¦° সাথে সারিবদà§à¦§ করà§à¦¨" @@ -5425,17 +5458,12 @@ msgid "Freelook Speed Modifier" msgstr "ফà§à¦°à¦¿ লà§à¦• সà§à¦ªà¦¿à¦¡ মডিফায়ার" #: editor/plugins/spatial_editor_plugin.cpp -#, fuzzy -msgid "preview" -msgstr "পà§à¦°à¦¿à¦à¦¿à¦‰" - -#: editor/plugins/spatial_editor_plugin.cpp msgid "XForm Dialog" msgstr "XForm à¦à¦° সংলাপ" #: editor/plugins/spatial_editor_plugin.cpp #, fuzzy -msgid "Select Mode (Q)\n" +msgid "Select Mode (Q)" msgstr "মোড (Mode) বাছাই করà§à¦¨" #: editor/plugins/spatial_editor_plugin.cpp @@ -5720,10 +5748,20 @@ msgstr "নোড(সমূহ) অপসারণ করà§à¦¨" msgid "Move (After)" msgstr "বামে সরান" +#: editor/plugins/sprite_frames_editor_plugin.cpp +#, fuzzy +msgid "SpriteFrames" +msgstr "ফà§à¦°à§‡à¦®à¦¸à¦®à§‚হ সà§à¦¤à§‚প করà§à¦¨" + #: editor/plugins/style_box_editor_plugin.cpp msgid "StyleBox Preview:" msgstr "StyleBox পà§à¦°à¦¿à¦à¦¿à¦‰:" +#: editor/plugins/style_box_editor_plugin.cpp +#, fuzzy +msgid "StyleBox" +msgstr "সà§à¦Ÿà¦¾à¦‡à¦²" + #: editor/plugins/texture_region_editor_plugin.cpp #, fuzzy msgid "Set Region Rect" @@ -5750,14 +5788,17 @@ msgid "Auto Slice" msgstr "সà§à¦¬à§Ÿà¦‚কà§à¦°à¦¿à§Ÿ টà§à¦•à¦°à§‹" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Offset:" msgstr "অফসেট/à¦à¦¾à¦°à¦¸à¦¾à¦®à§à¦¯:" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Step:" msgstr "পদকà§à¦·à§‡à¦ª:" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Separation:" msgstr "বিচà§à¦›à§‡à¦¦:" @@ -5898,6 +5939,10 @@ msgstr "ফনà§à¦Ÿ" msgid "Color" msgstr "রঙ" +#: editor/plugins/theme_editor_plugin.cpp +msgid "Theme" +msgstr "থিম" + #: editor/plugins/tile_map_editor_plugin.cpp #, fuzzy msgid "Erase Selection" @@ -6003,6 +6048,32 @@ msgstr "দৃশà§à¦¯ হতে à¦à¦•à¦¤à§à¦°à¦¿à¦¤ করবেন" msgid "Error" msgstr "সমসà§à¦¯à¦¾/à¦à§à¦²" +#: editor/plugins/tile_set_editor_plugin.cpp +#, fuzzy +msgid "Autotiles" +msgstr "সà§à¦¬à§Ÿà¦‚কà§à¦°à¦¿à§Ÿ টà§à¦•à¦°à§‹" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "" +"Select sub-tile to use as icon, this will be also used on invalid autotile " +"bindings." +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "" +"LMB: set bit on.\n" +"RMB: set bit off." +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +#, fuzzy +msgid "Select current edited sub-tile." +msgstr "à¦à¦‡-মà§à¦¹à§‚রà§à¦¤à§‡ সমà§à¦ªà¦¾à¦¦à¦¿à¦¤ রিসোরà§à¦¸à¦Ÿà¦¿ সংরকà§à¦·à¦£ করà§à¦¨à¥¤" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "Select sub-tile to change it's priority." +msgstr "" + #: editor/progress_dialog.cpp scene/gui/dialogs.cpp msgid "Cancel" msgstr "বাতিল" @@ -6146,10 +6217,23 @@ msgid "Please choose a folder that does not contain a 'project.godot' file." msgstr "à¦à¦®à¦¨ à¦à¦•à¦Ÿà¦¿ ফোলà§à¦¡à¦¾à¦° বাছাই করà§à¦¨ যেখানে 'project.godot' নামে কোন ফাইল নেই।" #: editor/project_manager.cpp +msgid "That's a BINGO!" +msgstr "দারà§à¦£ খবর!" + +#: editor/project_manager.cpp msgid "Imported Project" msgstr "পà§à¦°à¦•à¦²à§à¦ª ইমà§à¦ªà§‹à¦°à§à¦Ÿ করা হয়েছে" #: editor/project_manager.cpp +#, fuzzy +msgid "Couldn't create folder." +msgstr "ফোলà§à¦¡à¦¾à¦° তৈরী করা সমà§à¦à¦¬ হয়নি।" + +#: editor/project_manager.cpp +msgid "There is already a folder in this path with the specified name." +msgstr "" + +#: editor/project_manager.cpp msgid "It would be a good idea to name your project." msgstr "আপনার পà§à¦°à¦œà§‡à¦•à§à¦Ÿà¦Ÿà¦¿à¦° জনà§à¦¯ à¦à¦•à¦Ÿà¦¿ নাম নিরà§à¦¦à¦¿à¦·à§à¦Ÿ করà§à¦¨à¥¤" @@ -6195,14 +6279,29 @@ msgid "Import Existing Project" msgstr "বিদà§à¦¯à¦®à¦¾à¦¨ পà§à¦°à¦•à¦²à§à¦ª ইমà§à¦ªà§‹à¦°à§à¦Ÿ করà§à¦¨" #: editor/project_manager.cpp +#, fuzzy +msgid "Import & Edit" +msgstr "ইমà§à¦ªà§‹à¦°à§à¦Ÿ করà§à¦¨ à¦à¦¬à¦‚ খà§à¦²à§à¦¨" + +#: editor/project_manager.cpp msgid "Create New Project" msgstr "নতà§à¦¨ পà§à¦°à¦•à¦²à§à¦ª তৈরি করà§à¦¨" #: editor/project_manager.cpp +#, fuzzy +msgid "Create & Edit" +msgstr "Emitter তৈরি করà§à¦¨" + +#: editor/project_manager.cpp msgid "Install Project:" msgstr "পà§à¦°à¦•à¦²à§à¦ª ইনà§à¦¸à¦Ÿà¦² করà§à¦¨:" #: editor/project_manager.cpp +#, fuzzy +msgid "Install & Edit" +msgstr "ইনà§à¦¸à¦Ÿà¦²" + +#: editor/project_manager.cpp msgid "Project Name:" msgstr "পà§à¦°à¦•à¦²à§à¦ªà§‡à¦° নাম:" @@ -6220,10 +6319,6 @@ msgid "Browse" msgstr "বà§à¦°à¦¾à¦‰à¦¸" #: editor/project_manager.cpp -msgid "That's a BINGO!" -msgstr "দারà§à¦£ খবর!" - -#: editor/project_manager.cpp msgid "Unnamed Project" msgstr "নামহীন পà§à¦°à¦•à¦²à§à¦ª" @@ -6280,6 +6375,10 @@ msgstr "" "সà§à¦¨à¦¿à¦¶à§à¦šà¦¿à¦¤?" #: editor/project_manager.cpp +msgid "Project Manager" +msgstr "পà§à¦°à¦œà§‡à¦•à§à¦Ÿ মà§à¦¯à¦¾à¦¨à§‡à¦œà¦¾à¦°" + +#: editor/project_manager.cpp msgid "Project List" msgstr "পà§à¦°à¦•à¦²à§à¦ªà§‡à¦° তালিকা" @@ -6409,11 +6508,6 @@ msgid "Button 9" msgstr "বোতাম ৯" #: editor/project_settings_editor.cpp -#: modules/visual_script/visual_script_editor.cpp -msgid "Change" -msgstr "পরিবরà§à¦¤à¦¨ করà§à¦¨" - -#: editor/project_settings_editor.cpp #, fuzzy msgid "Joypad Axis Index:" msgstr "জয়সà§à¦Ÿà¦¿à¦• অকà§à¦· ইনà§à¦¡à§‡à¦•à§à¦¸:" @@ -6908,7 +7002,7 @@ msgstr "দৃশà§à¦¯ পà§à¦°à¦¤à¦¿à¦²à¦¿à¦ªà¦¿ করে সংরকà§à¦· #: editor/scene_tree_dock.cpp #, fuzzy -msgid "Sub-Resources:" +msgid "Sub-Resources" msgstr "রিসোরà§à¦¸à¦¸à¦®à§‚হ:" #: editor/scene_tree_dock.cpp @@ -7230,7 +7324,7 @@ msgstr "ফাংশন:" msgid "Pick one or more items from the list to display the graph." msgstr "গà§à¦°à¦¾à¦« পà§à¦°à¦¦à¦°à§à¦¶à¦¨ করতে তালিকা থেকে à¦à¦• বা à¦à¦•à¦¾à¦§à¦¿à¦• আইটেম বাছাই করà§à¦¨à¥¤" -#: editor/script_editor_debugger.cpp +#: editor/script_editor_debugger.cpp modules/mono/editor/mono_bottom_panel.cpp msgid "Errors" msgstr "সমসà§à¦¯à¦¾à¦¸à¦®à§‚হ" @@ -7239,6 +7333,11 @@ msgid "Child Process Connected" msgstr "চাইলà§à¦¡ পà§à¦°à¦¸à§‡à¦¸ সংযà§à¦•à§à¦¤ হয়েছে" #: editor/script_editor_debugger.cpp +#, fuzzy +msgid "Copy Error" +msgstr "à¦à§à¦²/সমসà§à¦¯à¦¾-সমূহ লোড করà§à¦¨" + +#: editor/script_editor_debugger.cpp msgid "Inspect Previous Instance" msgstr "পূরà§à¦¬à¦¬à¦°à§à¦¤à§€ ইনà§à¦¸à¦Ÿà§à¦¯à¦¾à¦¨à§à¦¸ পরীকà§à¦·à¦¾ করà§à¦¨" @@ -7605,10 +7704,58 @@ msgstr "সà§à¦¨à§à¦¯à¦¾à¦ª সেটিংস" msgid "Pick Distance:" msgstr "ইনà§à¦¸à¦Ÿà§à¦¯à¦¾à¦¨à§à¦¸:" +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Generating solution..." +msgstr "ওকটà§à¦°à§€ (octree) গঠনবিনà§à¦¯à¦¾à¦¸ তৈরি করা হচà§à¦›à§‡" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Generating C# project..." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Failed to create solution." +msgstr "পà§à¦°à¦¾à¦¨à§à¦¤à¦°à§‡à¦–া তৈরি করা সমà§à¦à¦¬ হয়নি!" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Failed to save solution." +msgstr "রিসোরà§à¦¸ লোড বà§à¦¯à¦°à§à¦¥ হয়েছে।" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Done" +msgstr "সমà§à¦ªà¦¨à§à¦¨ হয়েছে!" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Failed to create C# project." +msgstr "রিসোরà§à¦¸ লোড বà§à¦¯à¦°à§à¦¥ হয়েছে।" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Mono" +msgstr "মনো" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Create C# solution" +msgstr "পà§à¦°à¦¾à¦¨à§à¦¤à¦°à§‡à¦–া তৈরি করà§à¦¨" + #: modules/mono/editor/mono_bottom_panel.cpp msgid "Builds" msgstr "" +#: modules/mono/editor/mono_bottom_panel.cpp +#, fuzzy +msgid "Build Project" +msgstr "নতà§à¦¨ পà§à¦°à¦•à¦²à§à¦ª" + +#: modules/mono/editor/mono_bottom_panel.cpp +#, fuzzy +msgid "Warnings" +msgstr "সতরà§à¦•à¦¤à¦¾" + #: modules/visual_script/visual_script.cpp msgid "" "A node yielded without working memory, please read the docs on how to yield " @@ -7991,27 +8138,32 @@ msgstr "" #: platform/javascript/export/export.cpp #, fuzzy -msgid "Could not write file:\n" +msgid "Could not write file:" msgstr "টাইলটি খà§à¦à¦œà§‡ পাওয়া যায়নি:" #: platform/javascript/export/export.cpp #, fuzzy -msgid "Could not open template for export:\n" +msgid "Could not open template for export:" msgstr "ফোলà§à¦¡à¦¾à¦° তৈরী করা সমà§à¦à¦¬ হয়নি।" #: platform/javascript/export/export.cpp #, fuzzy -msgid "Invalid export template:\n" +msgid "Invalid export template:" msgstr "à¦à¦•à§à¦¸à¦ªà§‹à¦°à§à¦Ÿà§‡à¦° টেমপà§à¦²à§‡à¦Ÿà¦¸à¦®à§‚হ ইনà§à¦¸à¦Ÿà¦² করà§à¦¨" #: platform/javascript/export/export.cpp #, fuzzy -msgid "Could not read custom HTML shell:\n" +msgid "Could not read custom HTML shell:" msgstr "টাইলটি খà§à¦à¦œà§‡ পাওয়া যায়নি:" #: platform/javascript/export/export.cpp #, fuzzy -msgid "Could not read boot splash image file:\n" +msgid "Could not read boot splash image file:" +msgstr "টাইলটি খà§à¦à¦œà§‡ পাওয়া যায়নি:" + +#: platform/javascript/export/export.cpp +#, fuzzy +msgid "Using default boot splash image." msgstr "টাইলটি খà§à¦à¦œà§‡ পাওয়া যায়নি:" #: scene/2d/animated_sprite.cpp @@ -8310,8 +8462,8 @@ msgstr "" #: scene/main/scene_tree.cpp msgid "" -"Default Environment as specified in Project Setings (Rendering -> Viewport -" -"> Default Environment) could not be loaded." +"Default Environment as specified in Project Setings (Rendering -> " +"Environment -> Default Environment) could not be loaded." msgstr "" #: scene/main/viewport.cpp @@ -8342,6 +8494,10 @@ msgstr "ফনà§à¦Ÿ তà§à¦²à¦¤à§‡/লোডে সমসà§à¦¯à¦¾ হয়েঠmsgid "Invalid font size." msgstr "ফনà§à¦Ÿà§‡à¦° আকার অগà§à¦°à¦¹à¦¨à¦¯à§‹à¦—à§à¦¯à¥¤" +#, fuzzy +#~ msgid "preview" +#~ msgstr "পà§à¦°à¦¿à¦à¦¿à¦‰" + #~ msgid "Move Add Key" #~ msgstr "অà§à¦¯à¦¾à¦¡ কি মà§à¦ করà§à¦¨" @@ -8430,9 +8586,6 @@ msgstr "ফনà§à¦Ÿà§‡à¦° আকার অগà§à¦°à¦¹à¦¨à¦¯à§‹à¦—à§à¦¯à¥¤" #~ msgid "Filter:" #~ msgstr "ফিলà§à¦Ÿà¦¾à¦°:" -#~ msgid "Theme" -#~ msgstr "থিম" - #~ msgid "Method List For '%s':" #~ msgstr "'%s' à¦à¦° জনà§à¦¯ মেথডের তালিকা:" @@ -8697,9 +8850,6 @@ msgstr "ফনà§à¦Ÿà§‡à¦° আকার অগà§à¦°à¦¹à¦¨à¦¯à§‹à¦—à§à¦¯à¥¤" #~ msgid "Import Anyway" #~ msgstr "যেকোনো উপায়েই ইমà§à¦ªà§‹à¦°à§à¦Ÿ করà§à¦¨" -#~ msgid "Import & Open" -#~ msgstr "ইমà§à¦ªà§‹à¦°à§à¦Ÿ করà§à¦¨ à¦à¦¬à¦‚ খà§à¦²à§à¦¨" - #~ msgid "Edited scene has not been saved, open imported scene anyway?" #~ msgstr "সমà§à¦ªà¦¾à¦¦à¦¿à¦¤ দৃশà§à¦¯ সংরকà§à¦·à¦£ করা হয়নি, তবà§à¦“ ইমà§à¦ªà§‹à¦°à§à¦Ÿ করা দৃশà§à¦¯à¦Ÿà¦¿ খà§à¦²à¦¬à§‡à¦¨?" @@ -8955,9 +9105,6 @@ msgstr "ফনà§à¦Ÿà§‡à¦° আকার অগà§à¦°à¦¹à¦¨à¦¯à§‹à¦—à§à¦¯à¥¤" #~ msgid "Stereo" #~ msgstr "সà§à¦Ÿà§‡à¦°à¦¿à¦“" -#~ msgid "Mono" -#~ msgstr "মনো" - #~ msgid "Pitch" #~ msgstr "পিচà§â€Œ" diff --git a/editor/translations/ca.po b/editor/translations/ca.po index 6c30c703c1..487355629d 100644 --- a/editor/translations/ca.po +++ b/editor/translations/ca.po @@ -199,8 +199,7 @@ msgstr "Voleu crear %d NOVES pistes i inserir-hi claus?" #: 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 +#: editor/plugins/particles_editor_plugin.cpp editor/script_create_dialog.cpp msgid "Create" msgstr "Crea" @@ -556,6 +555,16 @@ msgstr "Senyals" #: editor/create_dialog.cpp #, fuzzy +msgid "Change %s Type" +msgstr "Modifica el Tipus" + +#: editor/create_dialog.cpp editor/project_settings_editor.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Change" +msgstr "Modifica" + +#: editor/create_dialog.cpp +#, fuzzy msgid "Create New %s" msgstr "Crea Nou" @@ -668,7 +677,8 @@ msgstr "" "Voleu Eliminar-los de totes maneres? (No es pot desfer!)" #: editor/dependency_editor.cpp -msgid "Cannot remove:\n" +#, fuzzy +msgid "Cannot remove:" msgstr "No es pot eliminar:\n" #: editor/dependency_editor.cpp @@ -751,8 +761,9 @@ msgstr "Fundadors del Projecte" msgid "Lead Developer" msgstr "Desenvolupador Principal" -#: editor/editor_about.cpp editor/project_manager.cpp -msgid "Project Manager" +#: editor/editor_about.cpp +#, fuzzy +msgid "Project Manager " msgstr "Gestor del Projecte" #: editor/editor_about.cpp @@ -841,7 +852,7 @@ msgid "Success!" msgstr "Èxit!" #: editor/editor_asset_installer.cpp -#: editor/plugins/asset_library_editor_plugin.cpp editor/project_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp msgid "Install" msgstr "Instal·la" @@ -1156,7 +1167,8 @@ msgid "Packing" msgstr "Compressió" #: editor/editor_export.cpp platform/javascript/export/export.cpp -msgid "Template file not found:\n" +#, fuzzy +msgid "Template file not found:" msgstr "No s'ha trobat la Plantilla:\n" #: editor/editor_file_dialog.cpp scene/gui/file_dialog.cpp @@ -1414,6 +1426,11 @@ msgstr "Sortida:" msgid "Clear" msgstr "Neteja" +#: editor/editor_log.cpp +#, fuzzy +msgid "Clear Output" +msgstr "Sortida" + #: editor/editor_node.cpp editor/plugins/animation_player_editor_plugin.cpp msgid "Error saving resource!" msgstr "Error en desar recurs!" @@ -1476,8 +1493,10 @@ msgid "This operation can't be done without a tree root." msgstr "Aquesta operació no es pot fer sense cap arrel d'arbre." #: editor/editor_node.cpp +#, fuzzy msgid "" -"Couldn't save scene. Likely dependencies (instances) couldn't be satisfied." +"Couldn't save scene. Likely dependencies (instances or inheritance) couldn't " +"be satisfied." msgstr "" "No s'ha pogut desar l'escena. Probablement, no s'han pogut establir totes " "les dependències (instà ncies)." @@ -2477,7 +2496,8 @@ msgid "No version.txt found inside templates." msgstr "No s'ha trobat cap version.txt dins les plantilles." #: editor/export_template_manager.cpp -msgid "Error creating path for templates:\n" +#, fuzzy +msgid "Error creating path for templates:" msgstr "Error en crear el camà per a les plantilles:\n" #: editor/export_template_manager.cpp @@ -2637,9 +2657,8 @@ msgid "View items as a list" msgstr "Visualitza en una llista" #: editor/filesystem_dock.cpp -msgid "" -"\n" -"Status: Import of file failed. Please fix file and reimport manually." +#, fuzzy +msgid "Status: Import of file failed. Please fix file and reimport manually." msgstr "" "\n" "Estat: No s'ha pogut importar. Corregiu el fitxer i torneu a importar." @@ -2649,20 +2668,23 @@ msgid "Cannot move/rename resources root." msgstr "No es pot moure/reanomenar l'arrel dels recursos." #: editor/filesystem_dock.cpp -msgid "Cannot move a folder into itself.\n" +#, fuzzy +msgid "Cannot move a folder into itself." msgstr "No es pot moure un directori dins si mateix:\n" #: editor/filesystem_dock.cpp -msgid "Error moving:\n" +#, fuzzy +msgid "Error moving:" msgstr "Error en moure:\n" #: editor/filesystem_dock.cpp #, fuzzy -msgid "Error duplicating:\n" +msgid "Error duplicating:" msgstr "Error en carregar:" #: editor/filesystem_dock.cpp -msgid "Unable to update dependencies:\n" +#, fuzzy +msgid "Unable to update dependencies:" msgstr "No s'han pogut actualitzar les dependències:\n" #: editor/filesystem_dock.cpp @@ -3310,6 +3332,11 @@ msgstr "Edita els filtres de Node" msgid "Filters.." msgstr "Filtres..." +#: editor/plugins/animation_tree_editor_plugin.cpp +#, fuzzy +msgid "AnimationTree" +msgstr "Animació" + #: editor/plugins/asset_library_editor_plugin.cpp msgid "Free" msgstr "Allibera" @@ -3476,6 +3503,7 @@ msgid "Bake Lightmaps" msgstr "Modifica el Radi de Llum" #: editor/plugins/camera_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Preview" msgstr "Previsualització" @@ -4169,7 +4197,8 @@ msgid "Bake!" msgstr "Calcula!" #: editor/plugins/navigation_mesh_editor_plugin.cpp -msgid "Bake the navigation mesh.\n" +#, fuzzy +msgid "Bake the navigation mesh." msgstr "Cou la malla de navegació.\n" #: editor/plugins/navigation_mesh_editor_plugin.cpp @@ -4558,14 +4587,18 @@ msgstr "Carrega un Recurs" msgid "Paste" msgstr "Enganxa" +#: editor/plugins/resource_preloader_editor_plugin.cpp +#, fuzzy +msgid "ResourcePreloader" +msgstr "Camà de Recursos" + #: editor/plugins/script_editor_plugin.cpp msgid "Clear Recent Files" msgstr "Buida la llista de Fitxers recents" #: editor/plugins/script_editor_plugin.cpp -msgid "" -"Close and save changes?\n" -"\"" +#, fuzzy +msgid "Close and save changes?" msgstr "" "Tancar i desar els canvis?\n" "\"" @@ -4644,6 +4677,11 @@ msgid "Copy Script Path" msgstr "Copia CamÃ" #: editor/plugins/script_editor_plugin.cpp +#, fuzzy +msgid "Show In File System" +msgstr "Mostra'l en el Sistema de Fitxers" + +#: editor/plugins/script_editor_plugin.cpp msgid "History Prev" msgstr "Anterior en l'Historial" @@ -5080,84 +5118,84 @@ msgid "Rotating %s degrees." msgstr "Rotació de %s graus." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Bottom View." -msgstr "Vista inferior." +msgid "Keying is disabled (no key inserted)." +msgstr "l'Edició de Claus està inhabilitada (no s'ha inserit cap Clau)." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Bottom" -msgstr "Part inferior" +msgid "Animation Key Inserted." +msgstr "S'ha insertit una Clau d'Animació." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Top View." -msgstr "Vista superior." +msgid "Objects Drawn" +msgstr "Objectes Dibuixats" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Rear View." -msgstr "Vista Posterior." +msgid "Material Changes" +msgstr "Canvis de Material" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Rear" -msgstr "Darrere" +msgid "Shader Changes" +msgstr "Canvis de Ombreig" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Front View." -msgstr "Vista Frontal." +msgid "Surface Changes" +msgstr "Canvis de superfÃcie" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Front" -msgstr "Davant" +msgid "Draw Calls" +msgstr "Crides de Dibuix" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Left View." -msgstr "Vista esquerra." +msgid "Vertices" +msgstr "Vèrtexs" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Left" -msgstr "Esquerra" +msgid "FPS" +msgstr "FPS" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Right View." -msgstr "Vista Dreta." +msgid "Top View." +msgstr "Vista superior." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Right" -msgstr "Dreta" +msgid "Bottom View." +msgstr "Vista inferior." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Keying is disabled (no key inserted)." -msgstr "l'Edició de Claus està inhabilitada (no s'ha inserit cap Clau)." +msgid "Bottom" +msgstr "Part inferior" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Animation Key Inserted." -msgstr "S'ha insertit una Clau d'Animació." +msgid "Left View." +msgstr "Vista esquerra." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Objects Drawn" -msgstr "Objectes Dibuixats" +msgid "Left" +msgstr "Esquerra" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Material Changes" -msgstr "Canvis de Material" +msgid "Right View." +msgstr "Vista Dreta." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Shader Changes" -msgstr "Canvis de Ombreig" +msgid "Right" +msgstr "Dreta" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Surface Changes" -msgstr "Canvis de superfÃcie" +msgid "Front View." +msgstr "Vista Frontal." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Draw Calls" -msgstr "Crides de Dibuix" +msgid "Front" +msgstr "Davant" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Vertices" -msgstr "Vèrtexs" +msgid "Rear View." +msgstr "Vista Posterior." #: editor/plugins/spatial_editor_plugin.cpp -msgid "FPS" -msgstr "FPS" +msgid "Rear" +msgstr "Darrere" #: editor/plugins/spatial_editor_plugin.cpp msgid "Align with view" @@ -5244,15 +5282,12 @@ msgid "Freelook Speed Modifier" msgstr "Modificador de la Velocitat de la Vista Lliure" #: editor/plugins/spatial_editor_plugin.cpp -msgid "preview" -msgstr "Previsualització" - -#: editor/plugins/spatial_editor_plugin.cpp msgid "XForm Dialog" msgstr "Dià leg XForm" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Select Mode (Q)\n" +#, fuzzy +msgid "Select Mode (Q)" msgstr "Mode Selecció (Q)\n" #: editor/plugins/spatial_editor_plugin.cpp @@ -5532,10 +5567,20 @@ msgstr "Mou (Abans)" msgid "Move (After)" msgstr "Mou (Després)" +#: editor/plugins/sprite_frames_editor_plugin.cpp +#, fuzzy +msgid "SpriteFrames" +msgstr "Fotogrames de la Pila" + #: editor/plugins/style_box_editor_plugin.cpp msgid "StyleBox Preview:" msgstr "Previsualització del StyleBox:" +#: editor/plugins/style_box_editor_plugin.cpp +#, fuzzy +msgid "StyleBox" +msgstr "Estil" + #: editor/plugins/texture_region_editor_plugin.cpp msgid "Set Region Rect" msgstr "Defineix la Regió Rectangular" @@ -5561,14 +5606,17 @@ msgid "Auto Slice" msgstr "Auto Tall" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Offset:" msgstr "òfset:" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Step:" msgstr "Pas:" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Separation:" msgstr "Separació:" @@ -5706,6 +5754,11 @@ msgstr "Lletra" msgid "Color" msgstr "Color" +#: editor/plugins/theme_editor_plugin.cpp +#, fuzzy +msgid "Theme" +msgstr "Desa el Tema" + #: editor/plugins/tile_map_editor_plugin.cpp msgid "Erase Selection" msgstr "Elimina la Selecció" @@ -5807,6 +5860,32 @@ msgstr "Combina-ho a partir de l'Escena" msgid "Error" msgstr "Error" +#: editor/plugins/tile_set_editor_plugin.cpp +#, fuzzy +msgid "Autotiles" +msgstr "Auto Tall" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "" +"Select sub-tile to use as icon, this will be also used on invalid autotile " +"bindings." +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "" +"LMB: set bit on.\n" +"RMB: set bit off." +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +#, fuzzy +msgid "Select current edited sub-tile." +msgstr "Desa el recurs editat ara." + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "Select sub-tile to change it's priority." +msgstr "" + #: editor/progress_dialog.cpp scene/gui/dialogs.cpp msgid "Cancel" msgstr "Cancel·la" @@ -5932,10 +6011,23 @@ msgstr "" "Seleccioneu un directori que no contingui ja un fitxer 'project.godot'." #: editor/project_manager.cpp +msgid "That's a BINGO!" +msgstr "BINGO!" + +#: editor/project_manager.cpp msgid "Imported Project" msgstr "Project importat" #: editor/project_manager.cpp +#, fuzzy +msgid "Couldn't create folder." +msgstr "No s'ha pogut crear el directori." + +#: editor/project_manager.cpp +msgid "There is already a folder in this path with the specified name." +msgstr "" + +#: editor/project_manager.cpp msgid "It would be a good idea to name your project." msgstr "Fóra bo anomenar el projecte." @@ -5976,14 +6068,29 @@ msgid "Import Existing Project" msgstr "Importa un Projecte existent" #: editor/project_manager.cpp +#, fuzzy +msgid "Import & Edit" +msgstr "Importa i Obre" + +#: editor/project_manager.cpp msgid "Create New Project" msgstr "Crea un Projecte nou" #: editor/project_manager.cpp +#, fuzzy +msgid "Create & Edit" +msgstr "Crea un Emissor" + +#: editor/project_manager.cpp msgid "Install Project:" msgstr "Instal·la el Projecte:" #: editor/project_manager.cpp +#, fuzzy +msgid "Install & Edit" +msgstr "Instal·la" + +#: editor/project_manager.cpp msgid "Project Name:" msgstr "Nom del Projecte:" @@ -6000,10 +6107,6 @@ msgid "Browse" msgstr "Navega" #: editor/project_manager.cpp -msgid "That's a BINGO!" -msgstr "BINGO!" - -#: editor/project_manager.cpp msgid "Unnamed Project" msgstr "Projecte sense nom" @@ -6058,6 +6161,10 @@ msgid "" msgstr "S'examinaran %s directoris a la recerca de projectes. Ho Confirmeu?" #: editor/project_manager.cpp +msgid "Project Manager" +msgstr "Gestor del Projecte" + +#: editor/project_manager.cpp msgid "Project List" msgstr "Llista de Projectes" @@ -6186,11 +6293,6 @@ msgid "Button 9" msgstr "Botó 9" #: editor/project_settings_editor.cpp -#: modules/visual_script/visual_script_editor.cpp -msgid "Change" -msgstr "Modifica" - -#: editor/project_settings_editor.cpp msgid "Joypad Axis Index:" msgstr "Ãndex de l'eix de la maneta:" @@ -6662,7 +6764,8 @@ msgid "Error duplicating scene to save it." msgstr "Error en duplicar l'escena per desar-la." #: editor/scene_tree_dock.cpp -msgid "Sub-Resources:" +#, fuzzy +msgid "Sub-Resources" msgstr "Sub-Recursos:" #: editor/scene_tree_dock.cpp @@ -6965,7 +7068,7 @@ msgstr "Funció:" msgid "Pick one or more items from the list to display the graph." msgstr "Trieu un o més elements de la llista per mostrar el Graf." -#: editor/script_editor_debugger.cpp +#: editor/script_editor_debugger.cpp modules/mono/editor/mono_bottom_panel.cpp msgid "Errors" msgstr "Errors" @@ -6974,6 +7077,11 @@ msgid "Child Process Connected" msgstr "Procés Fill Connectat" #: editor/script_editor_debugger.cpp +#, fuzzy +msgid "Copy Error" +msgstr "Errors de Cà rrega" + +#: editor/script_editor_debugger.cpp msgid "Inspect Previous Instance" msgstr "Inspecciona la Instà ncia anterior" @@ -7326,10 +7434,58 @@ msgstr "Configuració del GridMap" msgid "Pick Distance:" msgstr "Trieu la distà ncia:" +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Generating solution..." +msgstr "Creant els contorns..." + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Generating C# project..." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Failed to create solution." +msgstr "No es pot crear el contorn!" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Failed to save solution." +msgstr "No s'ha pogut carregar el recurs." + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Done" +msgstr "Fet!" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Failed to create C# project." +msgstr "No s'ha pogut carregar el recurs." + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Mono" +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Create C# solution" +msgstr "Crea el Contorn" + #: modules/mono/editor/mono_bottom_panel.cpp msgid "Builds" msgstr "Muntatges" +#: modules/mono/editor/mono_bottom_panel.cpp +#, fuzzy +msgid "Build Project" +msgstr "Projecte" + +#: modules/mono/editor/mono_bottom_panel.cpp +#, fuzzy +msgid "Warnings" +msgstr "AvÃs" + #: modules/visual_script/visual_script.cpp msgid "" "A node yielded without working memory, please read the docs on how to yield " @@ -7690,23 +7846,33 @@ msgid "Run exported HTML in the system's default browser." msgstr "Executa l'HTML exportat en el navegador per defecte." #: platform/javascript/export/export.cpp -msgid "Could not write file:\n" +#, fuzzy +msgid "Could not write file:" msgstr "No s'ha pogut escriure el fitxer:\n" #: platform/javascript/export/export.cpp -msgid "Could not open template for export:\n" +#, fuzzy +msgid "Could not open template for export:" msgstr "No es pot obrir la plantilla d'exportació:\n" #: platform/javascript/export/export.cpp -msgid "Invalid export template:\n" +#, fuzzy +msgid "Invalid export template:" msgstr "Plantilla d'exportació no và lida:\n" #: platform/javascript/export/export.cpp -msgid "Could not read custom HTML shell:\n" +#, fuzzy +msgid "Could not read custom HTML shell:" msgstr "No es pot llegir l'intèrpret personalitzat d’ordres HTML:\n" #: platform/javascript/export/export.cpp -msgid "Could not read boot splash image file:\n" +#, fuzzy +msgid "Could not read boot splash image file:" +msgstr "No es pot llegir l'imatge per a la pantalla de presentació:\n" + +#: platform/javascript/export/export.cpp +#, fuzzy +msgid "Using default boot splash image." msgstr "No es pot llegir l'imatge per a la pantalla de presentació:\n" #: scene/2d/animated_sprite.cpp @@ -8023,9 +8189,10 @@ msgid "(Other)" msgstr "(Altres)" #: scene/main/scene_tree.cpp +#, fuzzy msgid "" -"Default Environment as specified in Project Setings (Rendering -> Viewport -" -"> Default Environment) could not be loaded." +"Default Environment as specified in Project Setings (Rendering -> " +"Environment -> Default Environment) could not be loaded." msgstr "" "No es pot carregar l'Entorn per Defecte especificat en la Configuració del " "Projecte (Renderització->Visualització->Entorn Per Defecte)." @@ -8058,6 +8225,9 @@ msgstr "Error carregant lletra." msgid "Invalid font size." msgstr "La mida de la lletra no és và lida." +#~ msgid "preview" +#~ msgstr "Previsualització" + #~ msgid "Move Add Key" #~ msgstr "Mou o Afegeix una Clau" @@ -8407,9 +8577,6 @@ msgstr "La mida de la lletra no és và lida." #~ msgid "Import Anyway" #~ msgstr "Importa Igualment" -#~ msgid "Import & Open" -#~ msgstr "Importa i Obre" - #~ msgid "Edited scene has not been saved, open imported scene anyway?" #~ msgstr "" #~ "No s'ha desat l'escena editada. Vol obrir l'escena importada igualment?" diff --git a/editor/translations/cs.po b/editor/translations/cs.po index 5cf6103dcc..9b1cc3ab9b 100644 --- a/editor/translations/cs.po +++ b/editor/translations/cs.po @@ -203,8 +203,7 @@ msgstr "VytvoÅ™it %d NOVÃCH stop a vložit klÃÄe?" #: 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 +#: editor/plugins/particles_editor_plugin.cpp editor/script_create_dialog.cpp msgid "Create" msgstr "VytvoÅ™it" @@ -559,6 +558,16 @@ msgstr "Signály" #: editor/create_dialog.cpp #, fuzzy +msgid "Change %s Type" +msgstr "ZmÄ›nit typ hodnot pole" + +#: editor/create_dialog.cpp editor/project_settings_editor.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Change" +msgstr "ZmÄ›nit" + +#: editor/create_dialog.cpp +#, fuzzy msgid "Create New %s" msgstr "VytvoÅ™it nový" @@ -670,7 +679,8 @@ msgstr "" "PÅ™esto je chcete smazat? (nelze vrátit zpÄ›t)" #: editor/dependency_editor.cpp -msgid "Cannot remove:\n" +#, fuzzy +msgid "Cannot remove:" msgstr "Nelze odstranit:\n" #: editor/dependency_editor.cpp @@ -754,8 +764,9 @@ msgstr "Nastavenà projektu" msgid "Lead Developer" msgstr "Vedoucà vývojář" -#: editor/editor_about.cpp editor/project_manager.cpp -msgid "Project Manager" +#: editor/editor_about.cpp +#, fuzzy +msgid "Project Manager " msgstr "Správce projektů" #: editor/editor_about.cpp @@ -846,7 +857,7 @@ msgid "Success!" msgstr "ÚspÄ›ch!" #: editor/editor_asset_installer.cpp -#: editor/plugins/asset_library_editor_plugin.cpp editor/project_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp msgid "Install" msgstr "Instalovat" @@ -1163,7 +1174,7 @@ msgid "Packing" msgstr "" #: editor/editor_export.cpp platform/javascript/export/export.cpp -msgid "Template file not found:\n" +msgid "Template file not found:" msgstr "" #: editor/editor_file_dialog.cpp scene/gui/file_dialog.cpp @@ -1428,6 +1439,11 @@ msgstr "Výstup:" msgid "Clear" msgstr "VyÄistit" +#: editor/editor_log.cpp +#, fuzzy +msgid "Clear Output" +msgstr "Výstup" + #: editor/editor_node.cpp editor/plugins/animation_player_editor_plugin.cpp msgid "Error saving resource!" msgstr "" @@ -1493,8 +1509,10 @@ msgid "This operation can't be done without a tree root." msgstr "" #: editor/editor_node.cpp +#, fuzzy msgid "" -"Couldn't save scene. Likely dependencies (instances) couldn't be satisfied." +"Couldn't save scene. Likely dependencies (instances or inheritance) couldn't " +"be satisfied." msgstr "" "NepodaÅ™ilo se uložit scénu. NejspÃÅ¡e se nepodaÅ™ilo uspokojit závislosti " "(instance)." @@ -2443,7 +2461,8 @@ msgid "No version.txt found inside templates." msgstr "Nenalezena version.txt uvnitÅ™ Å¡ablon." #: editor/export_template_manager.cpp -msgid "Error creating path for templates:\n" +#, fuzzy +msgid "Error creating path for templates:" msgstr "Chyba pÅ™i vytvářenà cesty pro Å¡ablony:\n" #: editor/export_template_manager.cpp @@ -2611,9 +2630,7 @@ msgid "View items as a list" msgstr "" #: editor/filesystem_dock.cpp -msgid "" -"\n" -"Status: Import of file failed. Please fix file and reimport manually." +msgid "Status: Import of file failed. Please fix file and reimport manually." msgstr "" #: editor/filesystem_dock.cpp @@ -2621,22 +2638,22 @@ msgid "Cannot move/rename resources root." msgstr "" #: editor/filesystem_dock.cpp -msgid "Cannot move a folder into itself.\n" +msgid "Cannot move a folder into itself." msgstr "" #: editor/filesystem_dock.cpp #, fuzzy -msgid "Error moving:\n" +msgid "Error moving:" msgstr "Chyba pÅ™i naÄÃtánÃ:" #: editor/filesystem_dock.cpp #, fuzzy -msgid "Error duplicating:\n" +msgid "Error duplicating:" msgstr "Chyba pÅ™i naÄÃtánÃ:" #: editor/filesystem_dock.cpp #, fuzzy -msgid "Unable to update dependencies:\n" +msgid "Unable to update dependencies:" msgstr "Scénu se nepodaÅ™ilo naÄÃst kvůli chybÄ›jÃcÃm závislostem:" #: editor/filesystem_dock.cpp @@ -3284,6 +3301,11 @@ msgstr "" msgid "Filters.." msgstr "" +#: editor/plugins/animation_tree_editor_plugin.cpp +#, fuzzy +msgid "AnimationTree" +msgstr "PÅ™iblÞenà animace." + #: editor/plugins/asset_library_editor_plugin.cpp msgid "Free" msgstr "" @@ -3453,6 +3475,7 @@ msgid "Bake Lightmaps" msgstr "" #: editor/plugins/camera_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Preview" msgstr "" @@ -4151,7 +4174,7 @@ msgid "Bake!" msgstr "" #: editor/plugins/navigation_mesh_editor_plugin.cpp -msgid "Bake the navigation mesh.\n" +msgid "Bake the navigation mesh." msgstr "" #: editor/plugins/navigation_mesh_editor_plugin.cpp @@ -4544,14 +4567,17 @@ msgstr "" msgid "Paste" msgstr "Vložit" +#: editor/plugins/resource_preloader_editor_plugin.cpp +#, fuzzy +msgid "ResourcePreloader" +msgstr "Zdroj" + #: editor/plugins/script_editor_plugin.cpp msgid "Clear Recent Files" msgstr "" #: editor/plugins/script_editor_plugin.cpp -msgid "" -"Close and save changes?\n" -"\"" +msgid "Close and save changes?" msgstr "" #: editor/plugins/script_editor_plugin.cpp @@ -4629,6 +4655,10 @@ msgid "Copy Script Path" msgstr "ZkopÃrovat uzly" #: editor/plugins/script_editor_plugin.cpp +msgid "Show In File System" +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp msgid "History Prev" msgstr "" @@ -5066,84 +5096,84 @@ msgid "Rotating %s degrees." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Bottom View." +msgid "Keying is disabled (no key inserted)." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Bottom" +msgid "Animation Key Inserted." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Top View." +msgid "Objects Drawn" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Rear View." +msgid "Material Changes" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Rear" -msgstr "" +#, fuzzy +msgid "Shader Changes" +msgstr "ZmÄ›nit" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Front View." +msgid "Surface Changes" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Front" +msgid "Draw Calls" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Left View." +msgid "Vertices" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Left" +msgid "FPS" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Right View." +msgid "Top View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Right" +msgid "Bottom View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Keying is disabled (no key inserted)." +msgid "Bottom" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Animation Key Inserted." +msgid "Left View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Objects Drawn" +msgid "Left" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Material Changes" +msgid "Right View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -#, fuzzy -msgid "Shader Changes" -msgstr "ZmÄ›nit" +msgid "Right" +msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Surface Changes" +msgid "Front View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Draw Calls" +msgid "Front" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Vertices" +msgid "Rear View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "FPS" +msgid "Rear" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp @@ -5235,16 +5265,12 @@ 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 #, fuzzy -msgid "Select Mode (Q)\n" +msgid "Select Mode (Q)" msgstr "Vybrat vÅ¡e" #: editor/plugins/spatial_editor_plugin.cpp @@ -5523,10 +5549,18 @@ msgstr "ZkopÃrovat uzly" msgid "Move (After)" msgstr "" +#: editor/plugins/sprite_frames_editor_plugin.cpp +msgid "SpriteFrames" +msgstr "" + #: editor/plugins/style_box_editor_plugin.cpp msgid "StyleBox Preview:" msgstr "" +#: editor/plugins/style_box_editor_plugin.cpp +msgid "StyleBox" +msgstr "" + #: editor/plugins/texture_region_editor_plugin.cpp msgid "Set Region Rect" msgstr "" @@ -5552,14 +5586,17 @@ msgid "Auto Slice" msgstr "" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Offset:" msgstr "" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Step:" msgstr "" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Separation:" msgstr "" @@ -5699,6 +5736,10 @@ msgstr "" msgid "Color" msgstr "" +#: editor/plugins/theme_editor_plugin.cpp +msgid "Theme" +msgstr "" + #: editor/plugins/tile_map_editor_plugin.cpp #, fuzzy msgid "Erase Selection" @@ -5802,6 +5843,31 @@ msgstr "" msgid "Error" msgstr "" +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "Autotiles" +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "" +"Select sub-tile to use as icon, this will be also used on invalid autotile " +"bindings." +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "" +"LMB: set bit on.\n" +"RMB: set bit off." +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +#, fuzzy +msgid "Select current edited sub-tile." +msgstr "VytvoÅ™it složku" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "Select sub-tile to change it's priority." +msgstr "" + #: editor/progress_dialog.cpp scene/gui/dialogs.cpp msgid "Cancel" msgstr "ZruÅ¡it" @@ -5925,10 +5991,23 @@ msgid "Please choose a folder that does not contain a 'project.godot' file." msgstr "" #: editor/project_manager.cpp +msgid "That's a BINGO!" +msgstr "" + +#: editor/project_manager.cpp msgid "Imported Project" msgstr "" #: editor/project_manager.cpp +#, fuzzy +msgid "Couldn't create folder." +msgstr "Nelze vytvoÅ™it složku." + +#: editor/project_manager.cpp +msgid "There is already a folder in this path with the specified name." +msgstr "" + +#: editor/project_manager.cpp msgid "It would be a good idea to name your project." msgstr "" @@ -5970,14 +6049,28 @@ msgid "Import Existing Project" msgstr "" #: editor/project_manager.cpp +msgid "Import & Edit" +msgstr "" + +#: editor/project_manager.cpp msgid "Create New Project" msgstr "" #: editor/project_manager.cpp +#, fuzzy +msgid "Create & Edit" +msgstr "VytvoÅ™it" + +#: editor/project_manager.cpp msgid "Install Project:" msgstr "" #: editor/project_manager.cpp +#, fuzzy +msgid "Install & Edit" +msgstr "Instalovat" + +#: editor/project_manager.cpp msgid "Project Name:" msgstr "" @@ -5995,10 +6088,6 @@ msgid "Browse" msgstr "" #: editor/project_manager.cpp -msgid "That's a BINGO!" -msgstr "" - -#: editor/project_manager.cpp msgid "Unnamed Project" msgstr "" @@ -6045,6 +6134,10 @@ msgid "" msgstr "" #: editor/project_manager.cpp +msgid "Project Manager" +msgstr "Správce projektů" + +#: editor/project_manager.cpp msgid "Project List" msgstr "Seznam projektů" @@ -6172,11 +6265,6 @@ msgid "Button 9" msgstr "" #: editor/project_settings_editor.cpp -#: modules/visual_script/visual_script_editor.cpp -msgid "Change" -msgstr "ZmÄ›nit" - -#: editor/project_settings_editor.cpp msgid "Joypad Axis Index:" msgstr "" @@ -6655,7 +6743,7 @@ msgstr "" #: editor/scene_tree_dock.cpp #, fuzzy -msgid "Sub-Resources:" +msgid "Sub-Resources" msgstr "Zdroj" #: editor/scene_tree_dock.cpp @@ -6961,7 +7049,7 @@ msgstr "" msgid "Pick one or more items from the list to display the graph." msgstr "" -#: editor/script_editor_debugger.cpp +#: editor/script_editor_debugger.cpp modules/mono/editor/mono_bottom_panel.cpp msgid "Errors" msgstr "" @@ -6970,6 +7058,11 @@ msgid "Child Process Connected" msgstr "" #: editor/script_editor_debugger.cpp +#, fuzzy +msgid "Copy Error" +msgstr "PÅ™ipojit.." + +#: editor/script_editor_debugger.cpp msgid "Inspect Previous Instance" msgstr "" @@ -7323,10 +7416,54 @@ msgstr "Nastavenà projektu" msgid "Pick Distance:" msgstr "" +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Generating solution..." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Generating C# project..." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Failed to create solution." +msgstr "Nelze vytvoÅ™it složku." + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Failed to save solution." +msgstr "ZmÄ›nit měřÃtko výbÄ›ru" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Done" +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Failed to create C# project." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Mono" +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Create C# solution" +msgstr "VytvoÅ™it odbÄ›r" + #: modules/mono/editor/mono_bottom_panel.cpp msgid "Builds" msgstr "" +#: modules/mono/editor/mono_bottom_panel.cpp +#, fuzzy +msgid "Build Project" +msgstr "Nastavenà projektu" + +#: modules/mono/editor/mono_bottom_panel.cpp +msgid "Warnings" +msgstr "" + #: modules/visual_script/visual_script.cpp #, fuzzy msgid "" @@ -7707,27 +7844,32 @@ msgstr "" #: platform/javascript/export/export.cpp #, fuzzy -msgid "Could not write file:\n" +msgid "Could not write file:" msgstr "Nelze vytvoÅ™it složku." #: platform/javascript/export/export.cpp #, fuzzy -msgid "Could not open template for export:\n" +msgid "Could not open template for export:" msgstr "Nelze vytvoÅ™it složku." #: platform/javascript/export/export.cpp #, fuzzy -msgid "Invalid export template:\n" +msgid "Invalid export template:" msgstr "Neplatné jméno vlastnosti." #: platform/javascript/export/export.cpp #, fuzzy -msgid "Could not read custom HTML shell:\n" +msgid "Could not read custom HTML shell:" msgstr "Nelze vytvoÅ™it složku." #: platform/javascript/export/export.cpp #, fuzzy -msgid "Could not read boot splash image file:\n" +msgid "Could not read boot splash image file:" +msgstr "Nelze vytvoÅ™it složku." + +#: platform/javascript/export/export.cpp +#, fuzzy +msgid "Using default boot splash image." msgstr "Nelze vytvoÅ™it složku." #: scene/2d/animated_sprite.cpp @@ -8023,9 +8165,10 @@ msgid "(Other)" msgstr "(OstatnÃ)" #: scene/main/scene_tree.cpp +#, fuzzy msgid "" -"Default Environment as specified in Project Setings (Rendering -> Viewport -" -"> Default Environment) could not be loaded." +"Default Environment as specified in Project Setings (Rendering -> " +"Environment -> Default Environment) could not be loaded." msgstr "" "Výchozà prostÅ™edà specifikované v nastavenà projektu (Vykreslovánà -> " "Zobrazovacà výřez -> Výchozà prostÅ™edÃ) se nepodaÅ™ilo naÄÃst." @@ -8058,9 +8201,6 @@ msgstr "Chyba nahrávánà fontu." msgid "Invalid font size." msgstr "Neplatná velikost fontu." -#~ msgid "Create Subscription" -#~ msgstr "VytvoÅ™it odbÄ›r" - #~ msgid "List:" #~ msgstr "Seznam:" diff --git a/editor/translations/da.po b/editor/translations/da.po index 8c7d899ea2..cb0876cc3a 100644 --- a/editor/translations/da.po +++ b/editor/translations/da.po @@ -200,8 +200,7 @@ msgstr "Opret %d NYE spor og indsæt nøgler?" #: 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 +#: editor/plugins/particles_editor_plugin.cpp editor/script_create_dialog.cpp msgid "Create" msgstr "Opret" @@ -557,6 +556,16 @@ msgstr "Signaler" #: editor/create_dialog.cpp #, fuzzy +msgid "Change %s Type" +msgstr "Skift Base Type" + +#: editor/create_dialog.cpp editor/project_settings_editor.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Change" +msgstr "Skift" + +#: editor/create_dialog.cpp +#, fuzzy msgid "Create New %s" msgstr "Opret Nyt" @@ -668,7 +677,8 @@ msgstr "" "Fjern dem alligevel? (ej fortrydes)" #: editor/dependency_editor.cpp -msgid "Cannot remove:\n" +#, fuzzy +msgid "Cannot remove:" msgstr "Kan ikke fjerne:\n" #: editor/dependency_editor.cpp @@ -751,8 +761,9 @@ msgstr "Projekt grundlæggere" msgid "Lead Developer" msgstr "Ledende Udvikler" -#: editor/editor_about.cpp editor/project_manager.cpp -msgid "Project Manager" +#: editor/editor_about.cpp +#, fuzzy +msgid "Project Manager " msgstr "Projektleder" #: editor/editor_about.cpp @@ -841,7 +852,7 @@ msgid "Success!" msgstr "Succes!" #: editor/editor_asset_installer.cpp -#: editor/plugins/asset_library_editor_plugin.cpp editor/project_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp msgid "Install" msgstr "Installér" @@ -1156,7 +1167,8 @@ msgid "Packing" msgstr "Pakker" #: editor/editor_export.cpp platform/javascript/export/export.cpp -msgid "Template file not found:\n" +#, fuzzy +msgid "Template file not found:" msgstr "Skabelon fil ikke fundet:\n" #: editor/editor_file_dialog.cpp scene/gui/file_dialog.cpp @@ -1419,6 +1431,11 @@ msgstr "Output:" msgid "Clear" msgstr "Clear" +#: editor/editor_log.cpp +#, fuzzy +msgid "Clear Output" +msgstr "Output" + #: editor/editor_node.cpp editor/plugins/animation_player_editor_plugin.cpp msgid "Error saving resource!" msgstr "Fejl, kan ikke gemme ressource!" @@ -1485,8 +1502,10 @@ msgid "This operation can't be done without a tree root." msgstr "Denne handling kan ikke foretages uden tree root" #: editor/editor_node.cpp +#, fuzzy msgid "" -"Couldn't save scene. Likely dependencies (instances) couldn't be satisfied." +"Couldn't save scene. Likely dependencies (instances or inheritance) couldn't " +"be satisfied." msgstr "" "Kunne ikke gemme scene. Der er nogle afhængigheder (forekomster) some ikke " "kunne opfyldes." @@ -2492,7 +2511,7 @@ msgstr "Ingen version.txt fundet inde i skabeloner." #: editor/export_template_manager.cpp #, fuzzy -msgid "Error creating path for templates:\n" +msgid "Error creating path for templates:" msgstr "Fejl ved oprettelse af sti til skabeloner:\n" #: editor/export_template_manager.cpp @@ -2654,9 +2673,8 @@ msgid "View items as a list" msgstr "Vis emner som en liste" #: editor/filesystem_dock.cpp -msgid "" -"\n" -"Status: Import of file failed. Please fix file and reimport manually." +#, fuzzy +msgid "Status: Import of file failed. Please fix file and reimport manually." msgstr "" "\n" "Status: Import af filen fejlede. Venligst reparer filen og genimporter " @@ -2667,21 +2685,23 @@ msgid "Cannot move/rename resources root." msgstr "Kan ikke flytte/omdøbe resourcen root." #: editor/filesystem_dock.cpp -msgid "Cannot move a folder into itself.\n" +#, fuzzy +msgid "Cannot move a folder into itself." msgstr "Kan ikke flytte en mappe til sig selv\n" #: editor/filesystem_dock.cpp #, fuzzy -msgid "Error moving:\n" +msgid "Error moving:" msgstr "Fejl i flytning:\n" #: editor/filesystem_dock.cpp #, fuzzy -msgid "Error duplicating:\n" +msgid "Error duplicating:" msgstr "Fejl under indlæsning:" #: editor/filesystem_dock.cpp -msgid "Unable to update dependencies:\n" +#, fuzzy +msgid "Unable to update dependencies:" msgstr "Kan ikke opdatere afhængigheder:\n" #: editor/filesystem_dock.cpp @@ -3330,6 +3350,11 @@ msgstr "" msgid "Filters.." msgstr "" +#: editor/plugins/animation_tree_editor_plugin.cpp +#, fuzzy +msgid "AnimationTree" +msgstr "Animation Zoom." + #: editor/plugins/asset_library_editor_plugin.cpp msgid "Free" msgstr "" @@ -3495,6 +3520,7 @@ msgid "Bake Lightmaps" msgstr "" #: editor/plugins/camera_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Preview" msgstr "" @@ -4183,7 +4209,7 @@ msgid "Bake!" msgstr "" #: editor/plugins/navigation_mesh_editor_plugin.cpp -msgid "Bake the navigation mesh.\n" +msgid "Bake the navigation mesh." msgstr "" #: editor/plugins/navigation_mesh_editor_plugin.cpp @@ -4576,14 +4602,17 @@ msgstr "" msgid "Paste" msgstr "Indsæt" +#: editor/plugins/resource_preloader_editor_plugin.cpp +#, fuzzy +msgid "ResourcePreloader" +msgstr "Ressource" + #: editor/plugins/script_editor_plugin.cpp msgid "Clear Recent Files" msgstr "" #: editor/plugins/script_editor_plugin.cpp -msgid "" -"Close and save changes?\n" -"\"" +msgid "Close and save changes?" msgstr "" #: editor/plugins/script_editor_plugin.cpp @@ -4660,6 +4689,11 @@ msgid "Copy Script Path" msgstr "Kopier Sti" #: editor/plugins/script_editor_plugin.cpp +#, fuzzy +msgid "Show In File System" +msgstr "Vis I Fil Manager" + +#: editor/plugins/script_editor_plugin.cpp msgid "History Prev" msgstr "" @@ -5092,83 +5126,83 @@ msgid "Rotating %s degrees." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Bottom View." +msgid "Keying is disabled (no key inserted)." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Bottom" +msgid "Animation Key Inserted." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Top View." +msgid "Objects Drawn" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Rear View." +msgid "Material Changes" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Rear" -msgstr "" +msgid "Shader Changes" +msgstr "Skift Shader" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Front View." +msgid "Surface Changes" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Front" +msgid "Draw Calls" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Left View." +msgid "Vertices" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Left" +msgid "FPS" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Right View." +msgid "Top View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Right" +msgid "Bottom View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Keying is disabled (no key inserted)." +msgid "Bottom" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Animation Key Inserted." +msgid "Left View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Objects Drawn" +msgid "Left" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Material Changes" +msgid "Right View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Shader Changes" -msgstr "Skift Shader" +msgid "Right" +msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Surface Changes" +msgid "Front View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Draw Calls" +msgid "Front" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Vertices" +msgid "Rear View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "FPS" +msgid "Rear" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp @@ -5256,15 +5290,12 @@ 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" +#, fuzzy +msgid "Select Mode (Q)" msgstr "Vælg Mode (Q)\n" #: editor/plugins/spatial_editor_plugin.cpp @@ -5540,10 +5571,18 @@ msgstr "Flyt (Før)" msgid "Move (After)" msgstr "" +#: editor/plugins/sprite_frames_editor_plugin.cpp +msgid "SpriteFrames" +msgstr "" + #: editor/plugins/style_box_editor_plugin.cpp msgid "StyleBox Preview:" msgstr "" +#: editor/plugins/style_box_editor_plugin.cpp +msgid "StyleBox" +msgstr "" + #: editor/plugins/texture_region_editor_plugin.cpp msgid "Set Region Rect" msgstr "" @@ -5569,14 +5608,17 @@ msgid "Auto Slice" msgstr "" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Offset:" msgstr "" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Step:" msgstr "" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Separation:" msgstr "" @@ -5714,6 +5756,10 @@ msgstr "" msgid "Color" msgstr "" +#: editor/plugins/theme_editor_plugin.cpp +msgid "Theme" +msgstr "" + #: editor/plugins/tile_map_editor_plugin.cpp msgid "Erase Selection" msgstr "Slet valgte" @@ -5815,6 +5861,31 @@ msgstr "" msgid "Error" msgstr "" +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "Autotiles" +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "" +"Select sub-tile to use as icon, this will be also used on invalid autotile " +"bindings." +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "" +"LMB: set bit on.\n" +"RMB: set bit off." +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +#, fuzzy +msgid "Select current edited sub-tile." +msgstr "Gem den aktuelt redigerede ressource." + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "Select sub-tile to change it's priority." +msgstr "" + #: editor/progress_dialog.cpp scene/gui/dialogs.cpp msgid "Cancel" msgstr "Annuller" @@ -5932,10 +6003,23 @@ msgid "Please choose a folder that does not contain a 'project.godot' file." msgstr "" #: editor/project_manager.cpp +msgid "That's a BINGO!" +msgstr "" + +#: editor/project_manager.cpp msgid "Imported Project" msgstr "" #: editor/project_manager.cpp +#, fuzzy +msgid "Couldn't create folder." +msgstr "Kunne ikke oprette mappe." + +#: editor/project_manager.cpp +msgid "There is already a folder in this path with the specified name." +msgstr "" + +#: editor/project_manager.cpp msgid "It would be a good idea to name your project." msgstr "" @@ -5976,14 +6060,29 @@ msgid "Import Existing Project" msgstr "" #: editor/project_manager.cpp +#, fuzzy +msgid "Import & Edit" +msgstr "Importer" + +#: editor/project_manager.cpp msgid "Create New Project" msgstr "" #: editor/project_manager.cpp +#, fuzzy +msgid "Create & Edit" +msgstr "Opret" + +#: editor/project_manager.cpp msgid "Install Project:" msgstr "" #: editor/project_manager.cpp +#, fuzzy +msgid "Install & Edit" +msgstr "Installér" + +#: editor/project_manager.cpp msgid "Project Name:" msgstr "" @@ -6001,10 +6100,6 @@ msgid "Browse" msgstr "" #: editor/project_manager.cpp -msgid "That's a BINGO!" -msgstr "" - -#: editor/project_manager.cpp msgid "Unnamed Project" msgstr "" @@ -6050,6 +6145,10 @@ msgid "" msgstr "" #: editor/project_manager.cpp +msgid "Project Manager" +msgstr "Projektleder" + +#: editor/project_manager.cpp msgid "Project List" msgstr "" @@ -6176,11 +6275,6 @@ msgid "Button 9" msgstr "" #: editor/project_settings_editor.cpp -#: modules/visual_script/visual_script_editor.cpp -msgid "Change" -msgstr "Skift" - -#: editor/project_settings_editor.cpp msgid "Joypad Axis Index:" msgstr "" @@ -6648,7 +6742,7 @@ msgstr "" #: editor/scene_tree_dock.cpp #, fuzzy -msgid "Sub-Resources:" +msgid "Sub-Resources" msgstr "Sub-Ressourcer:" #: editor/scene_tree_dock.cpp @@ -6941,7 +7035,7 @@ msgstr "" msgid "Pick one or more items from the list to display the graph." msgstr "" -#: editor/script_editor_debugger.cpp +#: editor/script_editor_debugger.cpp modules/mono/editor/mono_bottom_panel.cpp msgid "Errors" msgstr "" @@ -6950,6 +7044,11 @@ msgid "Child Process Connected" msgstr "" #: editor/script_editor_debugger.cpp +#, fuzzy +msgid "Copy Error" +msgstr "Indlæs Fejl" + +#: editor/script_editor_debugger.cpp msgid "Inspect Previous Instance" msgstr "" @@ -7297,10 +7396,55 @@ msgstr "" msgid "Pick Distance:" msgstr "" +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Generating solution..." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Generating C# project..." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Failed to create solution." +msgstr "Fejler med at indlæse ressource." + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Failed to save solution." +msgstr "Fejler med at indlæse ressource." + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Done" +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Failed to create C# project." +msgstr "Fejler med at indlæse ressource." + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Mono" +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Create C# solution" +msgstr "Opret Abonnement" + #: modules/mono/editor/mono_bottom_panel.cpp msgid "Builds" msgstr "" +#: modules/mono/editor/mono_bottom_panel.cpp +#, fuzzy +msgid "Build Project" +msgstr "Projekt" + +#: modules/mono/editor/mono_bottom_panel.cpp +msgid "Warnings" +msgstr "" + #: modules/visual_script/visual_script.cpp msgid "" "A node yielded without working memory, please read the docs on how to yield " @@ -7657,25 +7801,33 @@ msgid "Run exported HTML in the system's default browser." msgstr "" #: platform/javascript/export/export.cpp -msgid "Could not write file:\n" +#, fuzzy +msgid "Could not write file:" msgstr "Kunne ikke skrive til fil:\n" #: platform/javascript/export/export.cpp #, fuzzy -msgid "Could not open template for export:\n" +msgid "Could not open template for export:" msgstr "Kan ikke Ã¥bne skabelon til eksport:\n" #: platform/javascript/export/export.cpp -msgid "Invalid export template:\n" +#, fuzzy +msgid "Invalid export template:" msgstr "Ugyldigt eksport skabelon:\n" #: platform/javascript/export/export.cpp -msgid "Could not read custom HTML shell:\n" +#, fuzzy +msgid "Could not read custom HTML shell:" msgstr "Kan ikke læse brugerdefineret HTML shell:\n" #: platform/javascript/export/export.cpp #, fuzzy -msgid "Could not read boot splash image file:\n" +msgid "Could not read boot splash image file:" +msgstr "Kan ikke læse boot splash billed fil:\n" + +#: platform/javascript/export/export.cpp +#, fuzzy +msgid "Using default boot splash image." msgstr "Kan ikke læse boot splash billed fil:\n" #: scene/2d/animated_sprite.cpp @@ -7972,8 +8124,8 @@ msgstr "" #: scene/main/scene_tree.cpp msgid "" -"Default Environment as specified in Project Setings (Rendering -> Viewport -" -"> Default Environment) could not be loaded." +"Default Environment as specified in Project Setings (Rendering -> " +"Environment -> Default Environment) could not be loaded." msgstr "" #: scene/main/viewport.cpp @@ -8007,9 +8159,6 @@ msgstr "Ugyldig skriftstørrelse." #~ msgid "Move Add Key" #~ msgstr "Flyt Add Key" -#~ msgid "Create Subscription" -#~ msgstr "Opret Abonnement" - #~ msgid "List:" #~ msgstr "Liste:" diff --git a/editor/translations/de.po b/editor/translations/de.po index 14316d4862..d3ab8a6fb8 100644 --- a/editor/translations/de.po +++ b/editor/translations/de.po @@ -219,8 +219,7 @@ msgstr "Erstelle %d NEUE Spuren und füge Schlüsselbilder hinzu?" #: 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 +#: editor/plugins/particles_editor_plugin.cpp editor/script_create_dialog.cpp msgid "Create" msgstr "Erstellen" @@ -576,6 +575,16 @@ msgstr "Signale" #: editor/create_dialog.cpp #, fuzzy +msgid "Change %s Type" +msgstr "Typ ändern" + +#: editor/create_dialog.cpp editor/project_settings_editor.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Change" +msgstr "Ändern" + +#: editor/create_dialog.cpp +#, fuzzy msgid "Create New %s" msgstr "Neu erstellen" @@ -688,7 +697,8 @@ msgstr "" "Trotzdem entfernen? (Nicht Wiederherstellbar)" #: editor/dependency_editor.cpp -msgid "Cannot remove:\n" +#, fuzzy +msgid "Cannot remove:" msgstr "Kann nicht entfernt werden:\n" #: editor/dependency_editor.cpp @@ -771,8 +781,9 @@ msgstr "Projektgründer" msgid "Lead Developer" msgstr "Hauptentwickler" -#: editor/editor_about.cpp editor/project_manager.cpp -msgid "Project Manager" +#: editor/editor_about.cpp +#, fuzzy +msgid "Project Manager " msgstr "Projektverwaltung" #: editor/editor_about.cpp @@ -862,7 +873,7 @@ msgid "Success!" msgstr "Erfolgreich!" #: editor/editor_asset_installer.cpp -#: editor/plugins/asset_library_editor_plugin.cpp editor/project_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp msgid "Install" msgstr "Installieren" @@ -1177,7 +1188,8 @@ msgid "Packing" msgstr "Packe" #: editor/editor_export.cpp platform/javascript/export/export.cpp -msgid "Template file not found:\n" +#, fuzzy +msgid "Template file not found:" msgstr "Template-Datei nicht gefunden:\n" #: editor/editor_file_dialog.cpp scene/gui/file_dialog.cpp @@ -1435,6 +1447,11 @@ msgstr "Ausgabe:" msgid "Clear" msgstr "Löschen" +#: editor/editor_log.cpp +#, fuzzy +msgid "Clear Output" +msgstr "Ausgabe" + #: editor/editor_node.cpp editor/plugins/animation_player_editor_plugin.cpp msgid "Error saving resource!" msgstr "Fehler beim speichern der Ressource!" @@ -1497,8 +1514,10 @@ msgid "This operation can't be done without a tree root." msgstr "Diese Aktion kann nicht ohne eine Wurzel ausgeführt werden." #: editor/editor_node.cpp +#, fuzzy msgid "" -"Couldn't save scene. Likely dependencies (instances) couldn't be satisfied." +"Couldn't save scene. Likely dependencies (instances or inheritance) couldn't " +"be satisfied." msgstr "" "Szene konnte nicht gespeichert werden. Wahrscheinlich werden Abhängigkeiten " "(Instanzen) nicht erfüllt." @@ -2504,7 +2523,8 @@ msgid "No version.txt found inside templates." msgstr "Keine version.txt in Templates gefunden." #: editor/export_template_manager.cpp -msgid "Error creating path for templates:\n" +#, fuzzy +msgid "Error creating path for templates:" msgstr "Fehler bei Erzeugen des Pfads für die Vorlagen:\n" #: editor/export_template_manager.cpp @@ -2666,9 +2686,8 @@ msgid "View items as a list" msgstr "Einträge als Liste anzeigen" #: editor/filesystem_dock.cpp -msgid "" -"\n" -"Status: Import of file failed. Please fix file and reimport manually." +#, fuzzy +msgid "Status: Import of file failed. Please fix file and reimport manually." msgstr "" "\n" "Status: Dateiimport fehlgeschlagen. Manuelle Reparatur und Neuimport nötig." @@ -2678,20 +2697,23 @@ msgid "Cannot move/rename resources root." msgstr "Ressourcen-Wurzel kann nicht verschoben oder umbenannt werden." #: editor/filesystem_dock.cpp -msgid "Cannot move a folder into itself.\n" +#, fuzzy +msgid "Cannot move a folder into itself." msgstr "Ordner kann nicht in sich selbst verschoben werden.\n" #: editor/filesystem_dock.cpp -msgid "Error moving:\n" +#, fuzzy +msgid "Error moving:" msgstr "Fehler beim Verschieben:\n" #: editor/filesystem_dock.cpp #, fuzzy -msgid "Error duplicating:\n" +msgid "Error duplicating:" msgstr "Ladefehler:" #: editor/filesystem_dock.cpp -msgid "Unable to update dependencies:\n" +#, fuzzy +msgid "Unable to update dependencies:" msgstr "Fehler beim Aktualisieren der Abhängigkeiten:\n" #: editor/filesystem_dock.cpp @@ -3340,6 +3362,11 @@ msgstr "Nodefilter bearbeiten" msgid "Filters.." msgstr "Filter.." +#: editor/plugins/animation_tree_editor_plugin.cpp +#, fuzzy +msgid "AnimationTree" +msgstr "Animation" + #: editor/plugins/asset_library_editor_plugin.cpp msgid "Free" msgstr "Kostenlos" @@ -3506,6 +3533,7 @@ msgid "Bake Lightmaps" msgstr "übertrage zu Lightmaps:" #: editor/plugins/camera_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Preview" msgstr "Vorschau" @@ -4202,7 +4230,8 @@ msgid "Bake!" msgstr "Backen!" #: editor/plugins/navigation_mesh_editor_plugin.cpp -msgid "Bake the navigation mesh.\n" +#, fuzzy +msgid "Bake the navigation mesh." msgstr "Navigations-Mesh erzeugen.\n" #: editor/plugins/navigation_mesh_editor_plugin.cpp @@ -4593,14 +4622,18 @@ msgstr "Ressource laden" msgid "Paste" msgstr "Einfügen" +#: editor/plugins/resource_preloader_editor_plugin.cpp +#, fuzzy +msgid "ResourcePreloader" +msgstr "Ressourcenpfad" + #: editor/plugins/script_editor_plugin.cpp msgid "Clear Recent Files" msgstr "Letzte Dateien leeren" #: editor/plugins/script_editor_plugin.cpp -msgid "" -"Close and save changes?\n" -"\"" +#, fuzzy +msgid "Close and save changes?" msgstr "" "Schließen und Änderungen speichern?\n" "„" @@ -4679,6 +4712,11 @@ msgid "Copy Script Path" msgstr "Pfad kopieren" #: editor/plugins/script_editor_plugin.cpp +#, fuzzy +msgid "Show In File System" +msgstr "Im Dateisystem anzeigen" + +#: editor/plugins/script_editor_plugin.cpp msgid "History Prev" msgstr "Zurück im Verlauf" @@ -5115,84 +5153,84 @@ msgid "Rotating %s degrees." msgstr "Rotiere %s Grad." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Bottom View." -msgstr "Sicht von unten." +msgid "Keying is disabled (no key inserted)." +msgstr "Schlüsselbildeinfügen ist deaktiviert (kein Schlüsselbild eingefügt)." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Bottom" -msgstr "Unten" +msgid "Animation Key Inserted." +msgstr "Animationsschlüsselbild eingefügt." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Top View." -msgstr "Sicht von oben." +msgid "Objects Drawn" +msgstr "Gezeichnete Objekte" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Rear View." -msgstr "Sicht von hinten." +msgid "Material Changes" +msgstr "Materialänderungen" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Rear" -msgstr "Hinten" +msgid "Shader Changes" +msgstr "Shader-Änderungen" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Front View." -msgstr "Sicht von Vorne." +msgid "Surface Changes" +msgstr "Oberflächen-Änderungen" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Front" -msgstr "Vorne" +msgid "Draw Calls" +msgstr "Zeichenaufrufe" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Left View." -msgstr "Sicht von links." +msgid "Vertices" +msgstr "Vertices" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Left" -msgstr "Links" +msgid "FPS" +msgstr "FPS" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Right View." -msgstr "Sicht von Rechts." +msgid "Top View." +msgstr "Sicht von oben." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Right" -msgstr "Rechts" +msgid "Bottom View." +msgstr "Sicht von unten." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Keying is disabled (no key inserted)." -msgstr "Schlüsselbildeinfügen ist deaktiviert (kein Schlüsselbild eingefügt)." +msgid "Bottom" +msgstr "Unten" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Animation Key Inserted." -msgstr "Animationsschlüsselbild eingefügt." +msgid "Left View." +msgstr "Sicht von links." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Objects Drawn" -msgstr "Gezeichnete Objekte" +msgid "Left" +msgstr "Links" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Material Changes" -msgstr "Materialänderungen" +msgid "Right View." +msgstr "Sicht von Rechts." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Shader Changes" -msgstr "Shader-Änderungen" +msgid "Right" +msgstr "Rechts" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Surface Changes" -msgstr "Oberflächen-Änderungen" +msgid "Front View." +msgstr "Sicht von Vorne." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Draw Calls" -msgstr "Zeichenaufrufe" +msgid "Front" +msgstr "Vorne" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Vertices" -msgstr "Vertices" +msgid "Rear View." +msgstr "Sicht von hinten." #: editor/plugins/spatial_editor_plugin.cpp -msgid "FPS" -msgstr "FPS" +msgid "Rear" +msgstr "Hinten" #: editor/plugins/spatial_editor_plugin.cpp msgid "Align with view" @@ -5279,15 +5317,12 @@ msgid "Freelook Speed Modifier" msgstr "Freisicht Geschwindigkeitsregler" #: editor/plugins/spatial_editor_plugin.cpp -msgid "preview" -msgstr "Vorschau" - -#: editor/plugins/spatial_editor_plugin.cpp msgid "XForm Dialog" msgstr "Transformationsdialog" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Select Mode (Q)\n" +#, fuzzy +msgid "Select Mode (Q)" msgstr "Auswahlmodus (Q)\n" #: editor/plugins/spatial_editor_plugin.cpp @@ -5567,10 +5602,20 @@ msgstr "Davor bewegen" msgid "Move (After)" msgstr "Dahinter bewegen" +#: editor/plugins/sprite_frames_editor_plugin.cpp +#, fuzzy +msgid "SpriteFrames" +msgstr "Einzelbilder stapeln" + #: editor/plugins/style_box_editor_plugin.cpp msgid "StyleBox Preview:" msgstr "StyleBox-Vorschau:" +#: editor/plugins/style_box_editor_plugin.cpp +#, fuzzy +msgid "StyleBox" +msgstr "Stil" + #: editor/plugins/texture_region_editor_plugin.cpp msgid "Set Region Rect" msgstr "Bereichsrechteck setzen" @@ -5596,14 +5641,17 @@ msgid "Auto Slice" msgstr "Autoschnitt" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Offset:" msgstr "Versatz:" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Step:" msgstr "Schritt:" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Separation:" msgstr "Trennung:" @@ -5741,6 +5789,10 @@ msgstr "Schriftart" msgid "Color" msgstr "Farbe" +#: editor/plugins/theme_editor_plugin.cpp +msgid "Theme" +msgstr "Motiv" + #: editor/plugins/tile_map_editor_plugin.cpp msgid "Erase Selection" msgstr "Auswahl löschen" @@ -5842,6 +5894,32 @@ msgstr "Aus Szene zusammenführen" msgid "Error" msgstr "Fehler" +#: editor/plugins/tile_set_editor_plugin.cpp +#, fuzzy +msgid "Autotiles" +msgstr "Autoschnitt" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "" +"Select sub-tile to use as icon, this will be also used on invalid autotile " +"bindings." +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "" +"LMB: set bit on.\n" +"RMB: set bit off." +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +#, fuzzy +msgid "Select current edited sub-tile." +msgstr "Speichere die so eben bearbeitete Ressource." + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "Select sub-tile to change it's priority." +msgstr "" + #: editor/progress_dialog.cpp scene/gui/dialogs.cpp msgid "Cancel" msgstr "Abbrechen" @@ -5965,10 +6043,23 @@ msgid "Please choose a folder that does not contain a 'project.godot' file." msgstr "Ein Ordner ohne ‚project.godot‘-Datei muss ausgewählt werden." #: editor/project_manager.cpp +msgid "That's a BINGO!" +msgstr "Aber klar :-) !" + +#: editor/project_manager.cpp msgid "Imported Project" msgstr "Importiertes Projekt" #: editor/project_manager.cpp +#, fuzzy +msgid "Couldn't create folder." +msgstr "Ordner konnte nicht erstellt werden." + +#: editor/project_manager.cpp +msgid "There is already a folder in this path with the specified name." +msgstr "" + +#: editor/project_manager.cpp msgid "It would be a good idea to name your project." msgstr "Es wird empfohlen das Projekt zu benennen." @@ -6009,14 +6100,29 @@ msgid "Import Existing Project" msgstr "Existierendes Projekt importieren" #: editor/project_manager.cpp +#, fuzzy +msgid "Import & Edit" +msgstr "Importieren & Öffnen" + +#: editor/project_manager.cpp msgid "Create New Project" msgstr "Erstelle neues Projekt" #: editor/project_manager.cpp +#, fuzzy +msgid "Create & Edit" +msgstr "Erzeuge Emittent" + +#: editor/project_manager.cpp msgid "Install Project:" msgstr "Installiere Projekt:" #: editor/project_manager.cpp +#, fuzzy +msgid "Install & Edit" +msgstr "Installieren" + +#: editor/project_manager.cpp msgid "Project Name:" msgstr "Projektname:" @@ -6033,10 +6139,6 @@ msgid "Browse" msgstr "Durchstöbern" #: editor/project_manager.cpp -msgid "That's a BINGO!" -msgstr "Aber klar :-) !" - -#: editor/project_manager.cpp msgid "Unnamed Project" msgstr "Unbenanntes Projekt" @@ -6093,6 +6195,10 @@ msgid "" msgstr "Sollen wirklich %s Ordner nach Godot-Projekten durchsucht werden?" #: editor/project_manager.cpp +msgid "Project Manager" +msgstr "Projektverwaltung" + +#: editor/project_manager.cpp msgid "Project List" msgstr "Projektliste" @@ -6221,11 +6327,6 @@ msgid "Button 9" msgstr "Taste 9" #: editor/project_settings_editor.cpp -#: modules/visual_script/visual_script_editor.cpp -msgid "Change" -msgstr "Ändern" - -#: editor/project_settings_editor.cpp msgid "Joypad Axis Index:" msgstr "Joystickachsen-Index:" @@ -6700,7 +6801,8 @@ msgid "Error duplicating scene to save it." msgstr "Fehler beim Duplizieren der Szene zum Speichern." #: editor/scene_tree_dock.cpp -msgid "Sub-Resources:" +#, fuzzy +msgid "Sub-Resources" msgstr "Unter-Ressourcen:" #: editor/scene_tree_dock.cpp @@ -7004,7 +7106,7 @@ msgstr "Funktion:" msgid "Pick one or more items from the list to display the graph." msgstr "Ein oder mehrere Einträge der Liste auswählen um Graph anzuzeigen." -#: editor/script_editor_debugger.cpp +#: editor/script_editor_debugger.cpp modules/mono/editor/mono_bottom_panel.cpp msgid "Errors" msgstr "Fehler" @@ -7013,6 +7115,11 @@ msgid "Child Process Connected" msgstr "Unterprozess verbunden" #: editor/script_editor_debugger.cpp +#, fuzzy +msgid "Copy Error" +msgstr "Ladefehler" + +#: editor/script_editor_debugger.cpp msgid "Inspect Previous Instance" msgstr "Vorherige Instanz untersuchen" @@ -7366,10 +7473,58 @@ msgstr "GridMap-Einstellungen" msgid "Pick Distance:" msgstr "Auswahlradius:" +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Generating solution..." +msgstr "Konturen erzeugen..." + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Generating C# project..." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Failed to create solution." +msgstr "Konnte keinen Umriss erzeugen!" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Failed to save solution." +msgstr "Laden der Ressource gescheitert." + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Done" +msgstr "Abgeschlossen!" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Failed to create C# project." +msgstr "Laden der Ressource gescheitert." + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Mono" +msgstr "Mono" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Create C# solution" +msgstr "Umriss erzeugen" + #: modules/mono/editor/mono_bottom_panel.cpp msgid "Builds" msgstr "Fertigstellungen" +#: modules/mono/editor/mono_bottom_panel.cpp +#, fuzzy +msgid "Build Project" +msgstr "Projekt" + +#: modules/mono/editor/mono_bottom_panel.cpp +#, fuzzy +msgid "Warnings" +msgstr "Warnung" + #: modules/visual_script/visual_script.cpp msgid "" "A node yielded without working memory, please read the docs on how to yield " @@ -7732,23 +7887,33 @@ msgid "Run exported HTML in the system's default browser." msgstr "Führe exportiertes HTML im Standard-Browser des Betriebssystems aus." #: platform/javascript/export/export.cpp -msgid "Could not write file:\n" +#, fuzzy +msgid "Could not write file:" msgstr "Konnte Datei nicht schreiben:\n" #: platform/javascript/export/export.cpp -msgid "Could not open template for export:\n" +#, fuzzy +msgid "Could not open template for export:" msgstr "Konnte Exportvorlage nicht öffnen:\n" #: platform/javascript/export/export.cpp -msgid "Invalid export template:\n" +#, fuzzy +msgid "Invalid export template:" msgstr "Ungültige Exportvorlage:\n" #: platform/javascript/export/export.cpp -msgid "Could not read custom HTML shell:\n" +#, fuzzy +msgid "Could not read custom HTML shell:" msgstr "Konnte benutzerdefinierte HTML-Shell nicht lesen:\n" #: platform/javascript/export/export.cpp -msgid "Could not read boot splash image file:\n" +#, fuzzy +msgid "Could not read boot splash image file:" +msgstr "Konnte Bilddatei des Startbildschirms nicht lesen:\n" + +#: platform/javascript/export/export.cpp +#, fuzzy +msgid "Using default boot splash image." msgstr "Konnte Bilddatei des Startbildschirms nicht lesen:\n" #: scene/2d/animated_sprite.cpp @@ -8080,9 +8245,10 @@ msgid "(Other)" msgstr "(Andere)" #: scene/main/scene_tree.cpp +#, fuzzy msgid "" -"Default Environment as specified in Project Setings (Rendering -> Viewport -" -"> Default Environment) could not be loaded." +"Default Environment as specified in Project Setings (Rendering -> " +"Environment -> Default Environment) could not be loaded." msgstr "" "Das Standard-Environment wie festgelegt in den Projekteinstellungen " "(Rendering→Viewport→Standard-Environment) konnte nicht geladen werden." @@ -8116,6 +8282,9 @@ msgstr "Fehler beim Laden der Schriftart." msgid "Invalid font size." msgstr "Ungültige Schriftgröße." +#~ msgid "preview" +#~ msgstr "Vorschau" + #~ msgid "Move Add Key" #~ msgstr "Schlüsselbild bewegen hinzufügen" @@ -8212,9 +8381,6 @@ msgstr "Ungültige Schriftgröße." #~ "‘ kann nicht aktiviert werden, Einlesen der Konfigurationsdatei " #~ "fehlgeschlagen." -#~ msgid "Theme" -#~ msgstr "Motiv" - #~ msgid "Method List For '%s':" #~ msgstr "Methodenliste für '%s':" @@ -8484,9 +8650,6 @@ msgstr "Ungültige Schriftgröße." #~ msgid "Import Anyway" #~ msgstr "Trotzdem importieren" -#~ msgid "Import & Open" -#~ msgstr "Importieren & Öffnen" - #~ msgid "Edited scene has not been saved, open imported scene anyway?" #~ msgstr "" #~ "Bearbeitete Szene wurde nicht gespeichert, trotzdem importierte Szene " @@ -8742,9 +8905,6 @@ msgstr "Ungültige Schriftgröße." #~ msgid "Stereo" #~ msgstr "Stereo" -#~ msgid "Mono" -#~ msgstr "Mono" - #~ msgid "Pitch" #~ msgstr "Tonhöhe" diff --git a/editor/translations/de_CH.po b/editor/translations/de_CH.po index 52cf8a1ec4..da7576e855 100644 --- a/editor/translations/de_CH.po +++ b/editor/translations/de_CH.po @@ -196,8 +196,7 @@ msgstr "Erstelle %d in neuer Ebene inklusiv Bild?" #: 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 +#: editor/plugins/particles_editor_plugin.cpp editor/script_create_dialog.cpp msgid "Create" msgstr "" @@ -550,6 +549,17 @@ msgstr "" #: editor/create_dialog.cpp #, fuzzy +msgid "Change %s Type" +msgstr "Typ ändern" + +#: editor/create_dialog.cpp editor/project_settings_editor.cpp +#: modules/visual_script/visual_script_editor.cpp +#, fuzzy +msgid "Change" +msgstr "Typ ändern" + +#: editor/create_dialog.cpp +#, fuzzy msgid "Create New %s" msgstr "Node erstellen" @@ -655,7 +665,7 @@ msgid "" msgstr "" #: editor/dependency_editor.cpp -msgid "Cannot remove:\n" +msgid "Cannot remove:" msgstr "" #: editor/dependency_editor.cpp @@ -740,9 +750,10 @@ msgstr "Projekt exportieren" msgid "Lead Developer" msgstr "" -#: editor/editor_about.cpp editor/project_manager.cpp -msgid "Project Manager" -msgstr "" +#: editor/editor_about.cpp +#, fuzzy +msgid "Project Manager " +msgstr "Projektname:" #: editor/editor_about.cpp msgid "Developers" @@ -826,7 +837,7 @@ msgid "Success!" msgstr "" #: editor/editor_asset_installer.cpp -#: editor/plugins/asset_library_editor_plugin.cpp editor/project_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp msgid "Install" msgstr "" @@ -1138,7 +1149,7 @@ msgid "Packing" msgstr "" #: editor/editor_export.cpp platform/javascript/export/export.cpp -msgid "Template file not found:\n" +msgid "Template file not found:" msgstr "" #: editor/editor_file_dialog.cpp scene/gui/file_dialog.cpp @@ -1394,6 +1405,11 @@ msgstr "" msgid "Clear" msgstr "" +#: editor/editor_log.cpp +#, fuzzy +msgid "Clear Output" +msgstr "Script hinzufügen" + #: editor/editor_node.cpp editor/plugins/animation_player_editor_plugin.cpp msgid "Error saving resource!" msgstr "" @@ -1461,7 +1477,8 @@ msgstr "Ohne eine Szene kann das nicht funktionieren." #: editor/editor_node.cpp msgid "" -"Couldn't save scene. Likely dependencies (instances) couldn't be satisfied." +"Couldn't save scene. Likely dependencies (instances or inheritance) couldn't " +"be satisfied." msgstr "" #: editor/editor_node.cpp @@ -2410,7 +2427,7 @@ msgstr "" #: editor/export_template_manager.cpp #, fuzzy -msgid "Error creating path for templates:\n" +msgid "Error creating path for templates:" msgstr "Fehler beim Schreiben des Projekts PCK!" #: editor/export_template_manager.cpp @@ -2573,9 +2590,7 @@ msgid "View items as a list" msgstr "" #: editor/filesystem_dock.cpp -msgid "" -"\n" -"Status: Import of file failed. Please fix file and reimport manually." +msgid "Status: Import of file failed. Please fix file and reimport manually." msgstr "" #: editor/filesystem_dock.cpp @@ -2583,22 +2598,22 @@ msgid "Cannot move/rename resources root." msgstr "" #: editor/filesystem_dock.cpp -msgid "Cannot move a folder into itself.\n" +msgid "Cannot move a folder into itself." msgstr "" #: editor/filesystem_dock.cpp #, fuzzy -msgid "Error moving:\n" +msgid "Error moving:" msgstr "Szene kann nicht gespeichert werden." #: editor/filesystem_dock.cpp #, fuzzy -msgid "Error duplicating:\n" +msgid "Error duplicating:" msgstr "Szene kann nicht gespeichert werden." #: editor/filesystem_dock.cpp #, fuzzy -msgid "Unable to update dependencies:\n" +msgid "Unable to update dependencies:" msgstr "Szene '%s' hat kapute Abhängigkeiten:" #: editor/filesystem_dock.cpp @@ -3252,6 +3267,11 @@ msgstr "Node Filter editieren" msgid "Filters.." msgstr "" +#: editor/plugins/animation_tree_editor_plugin.cpp +#, fuzzy +msgid "AnimationTree" +msgstr "Animations-Node" + #: editor/plugins/asset_library_editor_plugin.cpp msgid "Free" msgstr "" @@ -3420,6 +3440,7 @@ msgid "Bake Lightmaps" msgstr "" #: editor/plugins/camera_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Preview" msgstr "" @@ -4118,7 +4139,7 @@ msgid "Bake!" msgstr "" #: editor/plugins/navigation_mesh_editor_plugin.cpp -msgid "Bake the navigation mesh.\n" +msgid "Bake the navigation mesh." msgstr "" #: editor/plugins/navigation_mesh_editor_plugin.cpp @@ -4515,14 +4536,16 @@ msgstr "" msgid "Paste" msgstr "" +#: editor/plugins/resource_preloader_editor_plugin.cpp +msgid "ResourcePreloader" +msgstr "" + #: editor/plugins/script_editor_plugin.cpp msgid "Clear Recent Files" msgstr "" #: editor/plugins/script_editor_plugin.cpp -msgid "" -"Close and save changes?\n" -"\"" +msgid "Close and save changes?" msgstr "" #: editor/plugins/script_editor_plugin.cpp @@ -4598,6 +4621,10 @@ msgid "Copy Script Path" msgstr "" #: editor/plugins/script_editor_plugin.cpp +msgid "Show In File System" +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp msgid "History Prev" msgstr "" @@ -5033,85 +5060,85 @@ msgid "Rotating %s degrees." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Bottom View." -msgstr "" +msgid "Keying is disabled (no key inserted)." +msgstr "\"keying\" ist deaktiviert (Bild nicht hinzugefügt)." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Bottom" -msgstr "" +msgid "Animation Key Inserted." +msgstr "Animationsbild eingefügt." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Top View." +msgid "Objects Drawn" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Rear View." +msgid "Material Changes" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Rear" -msgstr "" +#, fuzzy +msgid "Shader Changes" +msgstr "Typ ändern" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Front View." -msgstr "" +#, fuzzy +msgid "Surface Changes" +msgstr "Oberfläche %d" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Front" +msgid "Draw Calls" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Left View." +msgid "Vertices" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Left" +msgid "FPS" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Right View." +msgid "Top View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Right" +msgid "Bottom View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Keying is disabled (no key inserted)." -msgstr "\"keying\" ist deaktiviert (Bild nicht hinzugefügt)." +msgid "Bottom" +msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Animation Key Inserted." -msgstr "Animationsbild eingefügt." +msgid "Left View." +msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Objects Drawn" +msgid "Left" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Material Changes" +msgid "Right View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -#, fuzzy -msgid "Shader Changes" -msgstr "Typ ändern" +msgid "Right" +msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -#, fuzzy -msgid "Surface Changes" -msgstr "Oberfläche %d" +msgid "Front View." +msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Draw Calls" +msgid "Front" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Vertices" +msgid "Rear View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "FPS" +msgid "Rear" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp @@ -5200,16 +5227,12 @@ 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 #, fuzzy -msgid "Select Mode (Q)\n" +msgid "Select Mode (Q)" msgstr "Selektiere Node(s) zum Importieren aus" #: editor/plugins/spatial_editor_plugin.cpp @@ -5487,10 +5510,18 @@ msgstr "Node(s) entfernen" msgid "Move (After)" msgstr "" +#: editor/plugins/sprite_frames_editor_plugin.cpp +msgid "SpriteFrames" +msgstr "" + #: editor/plugins/style_box_editor_plugin.cpp msgid "StyleBox Preview:" msgstr "" +#: editor/plugins/style_box_editor_plugin.cpp +msgid "StyleBox" +msgstr "" + #: editor/plugins/texture_region_editor_plugin.cpp msgid "Set Region Rect" msgstr "" @@ -5516,14 +5547,17 @@ msgid "Auto Slice" msgstr "" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Offset:" msgstr "" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Step:" msgstr "" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Separation:" msgstr "" @@ -5663,6 +5697,10 @@ msgstr "" msgid "Color" msgstr "" +#: editor/plugins/theme_editor_plugin.cpp +msgid "Theme" +msgstr "" + #: editor/plugins/tile_map_editor_plugin.cpp msgid "Erase Selection" msgstr "" @@ -5764,6 +5802,31 @@ msgstr "" msgid "Error" msgstr "" +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "Autotiles" +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "" +"Select sub-tile to use as icon, this will be also used on invalid autotile " +"bindings." +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "" +"LMB: set bit on.\n" +"RMB: set bit off." +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +#, fuzzy +msgid "Select current edited sub-tile." +msgstr "Node(s) löschen" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "Select sub-tile to change it's priority." +msgstr "" + #: editor/progress_dialog.cpp scene/gui/dialogs.cpp msgid "Cancel" msgstr "Abbrechen" @@ -5885,10 +5948,23 @@ msgid "Please choose a folder that does not contain a 'project.godot' file." msgstr "" #: editor/project_manager.cpp +msgid "That's a BINGO!" +msgstr "" + +#: editor/project_manager.cpp msgid "Imported Project" msgstr "Importierte Projekte" #: editor/project_manager.cpp +#, fuzzy +msgid "Couldn't create folder." +msgstr "Node erstellen" + +#: editor/project_manager.cpp +msgid "There is already a folder in this path with the specified name." +msgstr "" + +#: editor/project_manager.cpp msgid "It would be a good idea to name your project." msgstr "" @@ -5934,14 +6010,28 @@ msgid "Import Existing Project" msgstr "Existierendes Projekt importieren" #: editor/project_manager.cpp +#, fuzzy +msgid "Import & Edit" +msgstr "Importiere von folgendem Node:" + +#: editor/project_manager.cpp msgid "Create New Project" msgstr "Neues Projekt erstellen" #: editor/project_manager.cpp +#, fuzzy +msgid "Create & Edit" +msgstr "Node erstellen" + +#: editor/project_manager.cpp msgid "Install Project:" msgstr "" #: editor/project_manager.cpp +msgid "Install & Edit" +msgstr "" + +#: editor/project_manager.cpp msgid "Project Name:" msgstr "Projektname:" @@ -5959,10 +6049,6 @@ msgid "Browse" msgstr "" #: editor/project_manager.cpp -msgid "That's a BINGO!" -msgstr "" - -#: editor/project_manager.cpp msgid "Unnamed Project" msgstr "" @@ -6009,6 +6095,10 @@ msgid "" msgstr "" #: editor/project_manager.cpp +msgid "Project Manager" +msgstr "" + +#: editor/project_manager.cpp msgid "Project List" msgstr "" @@ -6137,12 +6227,6 @@ msgid "Button 9" msgstr "" #: editor/project_settings_editor.cpp -#: modules/visual_script/visual_script_editor.cpp -#, fuzzy -msgid "Change" -msgstr "Typ ändern" - -#: editor/project_settings_editor.cpp msgid "Joypad Axis Index:" msgstr "" @@ -6619,7 +6703,7 @@ msgid "Error duplicating scene to save it." msgstr "" #: editor/scene_tree_dock.cpp -msgid "Sub-Resources:" +msgid "Sub-Resources" msgstr "" #: editor/scene_tree_dock.cpp @@ -6923,7 +7007,7 @@ msgstr "" msgid "Pick one or more items from the list to display the graph." msgstr "" -#: editor/script_editor_debugger.cpp +#: editor/script_editor_debugger.cpp modules/mono/editor/mono_bottom_panel.cpp msgid "Errors" msgstr "" @@ -6932,6 +7016,11 @@ msgid "Child Process Connected" msgstr "" #: editor/script_editor_debugger.cpp +#, fuzzy +msgid "Copy Error" +msgstr "Connections editieren" + +#: editor/script_editor_debugger.cpp msgid "Inspect Previous Instance" msgstr "" @@ -7282,10 +7371,51 @@ msgstr "Projekteinstellungen" msgid "Pick Distance:" msgstr "" +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Generating solution..." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Generating C# project..." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Failed to create solution." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Failed to save solution." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Done" +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Failed to create C# project." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Mono" +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Create C# solution" +msgstr "" + #: modules/mono/editor/mono_bottom_panel.cpp msgid "Builds" msgstr "" +#: modules/mono/editor/mono_bottom_panel.cpp +#, fuzzy +msgid "Build Project" +msgstr "Projektname:" + +#: modules/mono/editor/mono_bottom_panel.cpp +msgid "Warnings" +msgstr "" + #: modules/visual_script/visual_script.cpp msgid "" "A node yielded without working memory, please read the docs on how to yield " @@ -7654,23 +7784,28 @@ msgid "Run exported HTML in the system's default browser." msgstr "" #: platform/javascript/export/export.cpp -msgid "Could not write file:\n" +#, fuzzy +msgid "Could not write file:" +msgstr "Neues Projekt erstellen" + +#: platform/javascript/export/export.cpp +msgid "Could not open template for export:" msgstr "" #: platform/javascript/export/export.cpp -msgid "Could not open template for export:\n" +msgid "Invalid export template:" msgstr "" #: platform/javascript/export/export.cpp -msgid "Invalid export template:\n" +msgid "Could not read custom HTML shell:" msgstr "" #: platform/javascript/export/export.cpp -msgid "Could not read custom HTML shell:\n" +msgid "Could not read boot splash image file:" msgstr "" #: platform/javascript/export/export.cpp -msgid "Could not read boot splash image file:\n" +msgid "Using default boot splash image." msgstr "" #: scene/2d/animated_sprite.cpp @@ -7947,8 +8082,8 @@ msgstr "" #: scene/main/scene_tree.cpp msgid "" -"Default Environment as specified in Project Setings (Rendering -> Viewport -" -"> Default Environment) could not be loaded." +"Default Environment as specified in Project Setings (Rendering -> " +"Environment -> Default Environment) could not be loaded." msgstr "" #: scene/main/viewport.cpp diff --git a/editor/translations/editor.pot b/editor/translations/editor.pot index 20ded4a4fb..2fd3bc8f99 100644 --- a/editor/translations/editor.pot +++ b/editor/translations/editor.pot @@ -190,8 +190,7 @@ msgstr "" #: 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 +#: editor/plugins/particles_editor_plugin.cpp editor/script_create_dialog.cpp msgid "Create" msgstr "" @@ -542,6 +541,15 @@ msgid "Signals" msgstr "" #: editor/create_dialog.cpp +msgid "Change %s Type" +msgstr "" + +#: editor/create_dialog.cpp editor/project_settings_editor.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Change" +msgstr "" + +#: editor/create_dialog.cpp msgid "Create New %s" msgstr "" @@ -647,7 +655,7 @@ msgid "" msgstr "" #: editor/dependency_editor.cpp -msgid "Cannot remove:\n" +msgid "Cannot remove:" msgstr "" #: editor/dependency_editor.cpp @@ -730,8 +738,8 @@ msgstr "" msgid "Lead Developer" msgstr "" -#: editor/editor_about.cpp editor/project_manager.cpp -msgid "Project Manager" +#: editor/editor_about.cpp +msgid "Project Manager " msgstr "" #: editor/editor_about.cpp @@ -816,7 +824,7 @@ msgid "Success!" msgstr "" #: editor/editor_asset_installer.cpp -#: editor/plugins/asset_library_editor_plugin.cpp editor/project_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp msgid "Install" msgstr "" @@ -1123,7 +1131,7 @@ msgid "Packing" msgstr "" #: editor/editor_export.cpp platform/javascript/export/export.cpp -msgid "Template file not found:\n" +msgid "Template file not found:" msgstr "" #: editor/editor_file_dialog.cpp scene/gui/file_dialog.cpp @@ -1377,6 +1385,10 @@ msgstr "" msgid "Clear" msgstr "" +#: editor/editor_log.cpp +msgid "Clear Output" +msgstr "" + #: editor/editor_node.cpp editor/plugins/animation_player_editor_plugin.cpp msgid "Error saving resource!" msgstr "" @@ -1440,7 +1452,8 @@ msgstr "" #: editor/editor_node.cpp msgid "" -"Couldn't save scene. Likely dependencies (instances) couldn't be satisfied." +"Couldn't save scene. Likely dependencies (instances or inheritance) couldn't " +"be satisfied." msgstr "" #: editor/editor_node.cpp @@ -2372,7 +2385,7 @@ msgid "No version.txt found inside templates." msgstr "" #: editor/export_template_manager.cpp -msgid "Error creating path for templates:\n" +msgid "Error creating path for templates:" msgstr "" #: editor/export_template_manager.cpp @@ -2526,9 +2539,7 @@ msgid "View items as a list" msgstr "" #: editor/filesystem_dock.cpp -msgid "" -"\n" -"Status: Import of file failed. Please fix file and reimport manually." +msgid "Status: Import of file failed. Please fix file and reimport manually." msgstr "" #: editor/filesystem_dock.cpp @@ -2536,19 +2547,19 @@ msgid "Cannot move/rename resources root." msgstr "" #: editor/filesystem_dock.cpp -msgid "Cannot move a folder into itself.\n" +msgid "Cannot move a folder into itself." msgstr "" #: editor/filesystem_dock.cpp -msgid "Error moving:\n" +msgid "Error moving:" msgstr "" #: editor/filesystem_dock.cpp -msgid "Error duplicating:\n" +msgid "Error duplicating:" msgstr "" #: editor/filesystem_dock.cpp -msgid "Unable to update dependencies:\n" +msgid "Unable to update dependencies:" msgstr "" #: editor/filesystem_dock.cpp @@ -3185,6 +3196,10 @@ msgstr "" msgid "Filters.." msgstr "" +#: editor/plugins/animation_tree_editor_plugin.cpp +msgid "AnimationTree" +msgstr "" + #: editor/plugins/asset_library_editor_plugin.cpp msgid "Free" msgstr "" @@ -3350,6 +3365,7 @@ msgid "Bake Lightmaps" msgstr "" #: editor/plugins/camera_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Preview" msgstr "" @@ -4033,7 +4049,7 @@ msgid "Bake!" msgstr "" #: editor/plugins/navigation_mesh_editor_plugin.cpp -msgid "Bake the navigation mesh.\n" +msgid "Bake the navigation mesh." msgstr "" #: editor/plugins/navigation_mesh_editor_plugin.cpp @@ -4422,14 +4438,16 @@ msgstr "" msgid "Paste" msgstr "" +#: editor/plugins/resource_preloader_editor_plugin.cpp +msgid "ResourcePreloader" +msgstr "" + #: editor/plugins/script_editor_plugin.cpp msgid "Clear Recent Files" msgstr "" #: editor/plugins/script_editor_plugin.cpp -msgid "" -"Close and save changes?\n" -"\"" +msgid "Close and save changes?" msgstr "" #: editor/plugins/script_editor_plugin.cpp @@ -4505,6 +4523,10 @@ msgid "Copy Script Path" msgstr "" #: editor/plugins/script_editor_plugin.cpp +msgid "Show In File System" +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp msgid "History Prev" msgstr "" @@ -4936,83 +4958,83 @@ msgid "Rotating %s degrees." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Bottom View." +msgid "Keying is disabled (no key inserted)." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Bottom" +msgid "Animation Key Inserted." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Top View." +msgid "Objects Drawn" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Rear View." +msgid "Material Changes" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Rear" +msgid "Shader Changes" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Front View." +msgid "Surface Changes" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Front" +msgid "Draw Calls" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Left View." +msgid "Vertices" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Left" +msgid "FPS" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Right View." +msgid "Top View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Right" +msgid "Bottom View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Keying is disabled (no key inserted)." +msgid "Bottom" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Animation Key Inserted." +msgid "Left View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Objects Drawn" +msgid "Left" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Material Changes" +msgid "Right View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Shader Changes" +msgid "Right" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Surface Changes" +msgid "Front View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Draw Calls" +msgid "Front" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Vertices" +msgid "Rear View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "FPS" +msgid "Rear" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp @@ -5100,15 +5122,11 @@ 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" +msgid "Select Mode (Q)" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp @@ -5383,10 +5401,18 @@ msgstr "" msgid "Move (After)" msgstr "" +#: editor/plugins/sprite_frames_editor_plugin.cpp +msgid "SpriteFrames" +msgstr "" + #: editor/plugins/style_box_editor_plugin.cpp msgid "StyleBox Preview:" msgstr "" +#: editor/plugins/style_box_editor_plugin.cpp +msgid "StyleBox" +msgstr "" + #: editor/plugins/texture_region_editor_plugin.cpp msgid "Set Region Rect" msgstr "" @@ -5412,14 +5438,17 @@ msgid "Auto Slice" msgstr "" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Offset:" msgstr "" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Step:" msgstr "" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Separation:" msgstr "" @@ -5557,6 +5586,10 @@ msgstr "" msgid "Color" msgstr "" +#: editor/plugins/theme_editor_plugin.cpp +msgid "Theme" +msgstr "" + #: editor/plugins/tile_map_editor_plugin.cpp msgid "Erase Selection" msgstr "" @@ -5657,6 +5690,30 @@ msgstr "" msgid "Error" msgstr "" +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "Autotiles" +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "" +"Select sub-tile to use as icon, this will be also used on invalid autotile " +"bindings." +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "" +"LMB: set bit on.\n" +"RMB: set bit off." +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "Select current edited sub-tile." +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "Select sub-tile to change it's priority." +msgstr "" + #: editor/progress_dialog.cpp scene/gui/dialogs.cpp msgid "Cancel" msgstr "" @@ -5774,10 +5831,22 @@ msgid "Please choose a folder that does not contain a 'project.godot' file." msgstr "" #: editor/project_manager.cpp +msgid "That's a BINGO!" +msgstr "" + +#: editor/project_manager.cpp msgid "Imported Project" msgstr "" #: editor/project_manager.cpp +msgid "Couldn't create folder." +msgstr "" + +#: editor/project_manager.cpp +msgid "There is already a folder in this path with the specified name." +msgstr "" + +#: editor/project_manager.cpp msgid "It would be a good idea to name your project." msgstr "" @@ -5818,14 +5887,26 @@ msgid "Import Existing Project" msgstr "" #: editor/project_manager.cpp +msgid "Import & Edit" +msgstr "" + +#: editor/project_manager.cpp msgid "Create New Project" msgstr "" #: editor/project_manager.cpp +msgid "Create & Edit" +msgstr "" + +#: editor/project_manager.cpp msgid "Install Project:" msgstr "" #: editor/project_manager.cpp +msgid "Install & Edit" +msgstr "" + +#: editor/project_manager.cpp msgid "Project Name:" msgstr "" @@ -5842,10 +5923,6 @@ msgid "Browse" msgstr "" #: editor/project_manager.cpp -msgid "That's a BINGO!" -msgstr "" - -#: editor/project_manager.cpp msgid "Unnamed Project" msgstr "" @@ -5891,6 +5968,10 @@ msgid "" msgstr "" #: editor/project_manager.cpp +msgid "Project Manager" +msgstr "" + +#: editor/project_manager.cpp msgid "Project List" msgstr "" @@ -6017,11 +6098,6 @@ 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 "" @@ -6487,7 +6563,7 @@ msgid "Error duplicating scene to save it." msgstr "" #: editor/scene_tree_dock.cpp -msgid "Sub-Resources:" +msgid "Sub-Resources" msgstr "" #: editor/scene_tree_dock.cpp @@ -6778,7 +6854,7 @@ msgstr "" msgid "Pick one or more items from the list to display the graph." msgstr "" -#: editor/script_editor_debugger.cpp +#: editor/script_editor_debugger.cpp modules/mono/editor/mono_bottom_panel.cpp msgid "Errors" msgstr "" @@ -6787,6 +6863,10 @@ msgid "Child Process Connected" msgstr "" #: editor/script_editor_debugger.cpp +msgid "Copy Error" +msgstr "" + +#: editor/script_editor_debugger.cpp msgid "Inspect Previous Instance" msgstr "" @@ -7132,10 +7212,50 @@ msgstr "" msgid "Pick Distance:" msgstr "" +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Generating solution..." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Generating C# project..." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Failed to create solution." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Failed to save solution." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Done" +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Failed to create C# project." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Mono" +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Create C# solution" +msgstr "" + #: modules/mono/editor/mono_bottom_panel.cpp msgid "Builds" msgstr "" +#: modules/mono/editor/mono_bottom_panel.cpp +msgid "Build Project" +msgstr "" + +#: modules/mono/editor/mono_bottom_panel.cpp +msgid "Warnings" +msgstr "" + #: modules/visual_script/visual_script.cpp msgid "" "A node yielded without working memory, please read the docs on how to yield " @@ -7481,23 +7601,27 @@ msgid "Run exported HTML in the system's default browser." msgstr "" #: platform/javascript/export/export.cpp -msgid "Could not write file:\n" +msgid "Could not write file:" +msgstr "" + +#: platform/javascript/export/export.cpp +msgid "Could not open template for export:" msgstr "" #: platform/javascript/export/export.cpp -msgid "Could not open template for export:\n" +msgid "Invalid export template:" msgstr "" #: platform/javascript/export/export.cpp -msgid "Invalid export template:\n" +msgid "Could not read custom HTML shell:" msgstr "" #: platform/javascript/export/export.cpp -msgid "Could not read custom HTML shell:\n" +msgid "Could not read boot splash image file:" msgstr "" #: platform/javascript/export/export.cpp -msgid "Could not read boot splash image file:\n" +msgid "Using default boot splash image." msgstr "" #: scene/2d/animated_sprite.cpp @@ -7750,8 +7874,8 @@ msgstr "" #: scene/main/scene_tree.cpp msgid "" -"Default Environment as specified in Project Setings (Rendering -> Viewport -" -"> Default Environment) could not be loaded." +"Default Environment as specified in Project Setings (Rendering -> " +"Environment -> Default Environment) could not be loaded." msgstr "" #: scene/main/viewport.cpp diff --git a/editor/translations/el.po b/editor/translations/el.po index 6b63d8eef8..b4c5b06eaa 100644 --- a/editor/translations/el.po +++ b/editor/translations/el.po @@ -3,12 +3,12 @@ # Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md) # This file is distributed under the same license as the Godot source code. # -# George Tsiamasiotis <gtsiam@windowslive.com>, 2017. +# George Tsiamasiotis <gtsiam@windowslive.com>, 2017-2018. # msgid "" msgstr "" "Project-Id-Version: Godot Engine editor\n" -"PO-Revision-Date: 2017-12-05 21:46+0000\n" +"PO-Revision-Date: 2018-01-04 15:26+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.18-dev\n" +"X-Generator: Weblate 2.19-dev\n" #: editor/animation_editor.cpp msgid "Disabled" @@ -27,9 +27,8 @@ msgid "All Selection" msgstr "Επιλογή όλων" #: editor/animation_editor.cpp -#, fuzzy msgid "Anim Change Keyframe Time" -msgstr "Anim Αλλαγή τιμής" +msgstr "Anim Αλλαγή χÏόνου στιγμιοτÏπου" #: editor/animation_editor.cpp msgid "Anim Change Transition" @@ -40,9 +39,8 @@ msgid "Anim Change Transform" msgstr "Anim Αλλαγή Î¼ÎµÏ„Î±ÏƒÏ‡Î·Î¼Î±Ï„Î¹ÏƒÎ¼Î¿Ï (transform)" #: editor/animation_editor.cpp -#, fuzzy msgid "Anim Change Keyframe Value" -msgstr "Anim Αλλαγή τιμής" +msgstr "Anim Αλλαγή τιμής στιγμιοτÏπου" #: editor/animation_editor.cpp msgid "Anim Change Call" @@ -198,8 +196,7 @@ msgstr "ΔημιουÏγία %d νÎων κομματιών και εισαγωΠ#: 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 +#: editor/plugins/particles_editor_plugin.cpp editor/script_create_dialog.cpp msgid "Create" msgstr "ΔημιουÏγία" @@ -537,9 +534,8 @@ msgid "Connecting Signal:" msgstr "ΣÏνδεση στο σήμα:" #: editor/connections_dialog.cpp -#, fuzzy msgid "Disconnect '%s' from '%s'" -msgstr "ΣÏνδεση του '%s' στο '%s'" +msgstr "ΑποσÏνδεση του '%s' απο το '%s'" #: editor/connections_dialog.cpp msgid "Connect.." @@ -556,8 +552,17 @@ msgstr "Σήματα" #: editor/create_dialog.cpp #, fuzzy +msgid "Change %s Type" +msgstr "Αλλαγή Ï„Ïπου" + +#: editor/create_dialog.cpp editor/project_settings_editor.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Change" +msgstr "Αλλαγή" + +#: editor/create_dialog.cpp msgid "Create New %s" -msgstr "ΔημιουÏγία νÎου" +msgstr "ΔημιουÏγία νÎου %s" #: editor/create_dialog.cpp editor/editor_file_dialog.cpp #: editor/filesystem_dock.cpp @@ -667,7 +672,8 @@ msgstr "" "Îα αφαιÏεθοÏν; (ΑδÏνατη η αναίÏεση)" #: editor/dependency_editor.cpp -msgid "Cannot remove:\n" +#, fuzzy +msgid "Cannot remove:" msgstr "ΑδÏνατη η αφαίÏεση:\n" #: editor/dependency_editor.cpp @@ -750,8 +756,9 @@ msgstr "ΙδÏÏ…Ï„ÎÏ‚ του ÎÏγου" msgid "Lead Developer" msgstr "Επικεφαλής Ï€ÏογÏαμματιστής" -#: editor/editor_about.cpp editor/project_manager.cpp -msgid "Project Manager" +#: editor/editor_about.cpp +#, fuzzy +msgid "Project Manager " msgstr "ΔιαχειÏιστής" #: editor/editor_about.cpp @@ -841,7 +848,7 @@ msgid "Success!" msgstr "Επιτυχία!" #: editor/editor_asset_installer.cpp -#: editor/plugins/asset_library_editor_plugin.cpp editor/project_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp msgid "Install" msgstr "Εγκατάσταση" @@ -862,9 +869,8 @@ msgid "Rename Audio Bus" msgstr "Μετονομασία διαÏλου ήχου" #: editor/editor_audio_buses.cpp -#, fuzzy msgid "Change Audio Bus Volume" -msgstr "Εναλλαγή σόλο διαÏλου ήχου" +msgstr "Αλλαγή Îντασης διαÏλου ήχου" #: editor/editor_audio_buses.cpp msgid "Toggle Audio Bus Solo" @@ -929,7 +935,7 @@ msgstr "ΔιαγÏαφή εφÎ" #: editor/editor_audio_buses.cpp msgid "Audio" -msgstr "" +msgstr "Ήχος" #: editor/editor_audio_buses.cpp msgid "Add Audio Bus" @@ -1106,13 +1112,12 @@ msgid "Updating scene.." msgstr "ΕνημÎÏωση σκηνής.." #: editor/editor_data.cpp -#, fuzzy msgid "[empty]" -msgstr "(άδειο)" +msgstr "[άδειο]" #: editor/editor_data.cpp msgid "[unsaved]" -msgstr "" +msgstr "[μη αποθηκευμÎνο]" #: editor/editor_dir_dialog.cpp msgid "Please select a base directory first" @@ -1152,7 +1157,8 @@ msgid "Packing" msgstr "ΠακετάÏισμα" #: editor/editor_export.cpp platform/javascript/export/export.cpp -msgid "Template file not found:\n" +#, fuzzy +msgid "Template file not found:" msgstr "Δεν βÏÎθηκε το αÏχείο Ï€ÏοτÏπου:\n" #: editor/editor_file_dialog.cpp scene/gui/file_dialog.cpp @@ -1410,6 +1416,11 @@ msgstr "Έξοδος:" msgid "Clear" msgstr "ΕκκαθάÏιση" +#: editor/editor_log.cpp +#, fuzzy +msgid "Clear Output" +msgstr "Έξοδος" + #: editor/editor_node.cpp editor/plugins/animation_player_editor_plugin.cpp msgid "Error saving resource!" msgstr "Σφάλμα κατά την αποθήκευση πόÏου!" @@ -1472,8 +1483,10 @@ msgid "This operation can't be done without a tree root." msgstr "Αυτή η λειτουÏγία δεν μποÏεί να γίνει χωÏίς Ïίζα δÎντÏου." #: editor/editor_node.cpp +#, fuzzy msgid "" -"Couldn't save scene. Likely dependencies (instances) couldn't be satisfied." +"Couldn't save scene. Likely dependencies (instances or inheritance) couldn't " +"be satisfied." msgstr "" "ΑδÏνατη η αποθήκευση σκηνής. Πιθανώς οι εξαÏτήσεις (στιγμιότυπα) να μην " "μποÏοÏσαν να ικανοποιηθοÏν." @@ -2368,14 +2381,12 @@ msgid "Frame #:" msgstr "ΚαÏÎ #:" #: editor/editor_profiler.cpp -#, fuzzy msgid "Time" -msgstr "ΧÏόνος:" +msgstr "ΧÏόνος" #: editor/editor_profiler.cpp -#, fuzzy msgid "Calls" -msgstr "Κλήση" +msgstr "Κλήσεις" #: editor/editor_run_native.cpp msgid "Select device from the list" @@ -2482,7 +2493,8 @@ msgid "No version.txt found inside templates." msgstr "Δεν βÏÎθηκε version.txt μÎσα στα Ï€Ïότυπα." #: editor/export_template_manager.cpp -msgid "Error creating path for templates:\n" +#, fuzzy +msgid "Error creating path for templates:" msgstr "Σφάλμα κατά τη δημιουÏγία διαδÏομης για τα Ï€Ïότυπα:\n" #: editor/export_template_manager.cpp @@ -2518,7 +2530,6 @@ msgstr "Δεν λήφθηκε απόκÏιση." #: editor/export_template_manager.cpp #: editor/plugins/asset_library_editor_plugin.cpp -#, fuzzy msgid "Request Failed." msgstr "Το αίτημα απÎτυχε." @@ -2566,9 +2577,8 @@ msgid "Connecting.." msgstr "ΣÏνδεση.." #: editor/export_template_manager.cpp -#, fuzzy msgid "Can't Connect" -msgstr "Δεν ήταν δυνατή η σÏνδεση" +msgstr "ΑδÏνατη η σÏνδεση" #: editor/export_template_manager.cpp msgid "Connected" @@ -2643,9 +2653,8 @@ msgid "View items as a list" msgstr "Εμφάνιση αντικειμÎνων σε λίστα" #: editor/filesystem_dock.cpp -msgid "" -"\n" -"Status: Import of file failed. Please fix file and reimport manually." +#, fuzzy +msgid "Status: Import of file failed. Please fix file and reimport manually." msgstr "" "\n" "Κατάσταση: Η εισαγωγή απÎτυχε. ΠαÏακαλοÏμε διοÏθώστε το αÏχείο και " @@ -2656,20 +2665,23 @@ msgid "Cannot move/rename resources root." msgstr "Δεν ήταν δυνατή η μετακίνηση/μετονομασία του πηγαίου καταλόγου." #: editor/filesystem_dock.cpp -msgid "Cannot move a folder into itself.\n" +#, fuzzy +msgid "Cannot move a folder into itself." msgstr "Δεν είναι δυνατή η μετακίνηση ενός φακÎλου στον εαυτό του.\n" #: editor/filesystem_dock.cpp -msgid "Error moving:\n" +#, fuzzy +msgid "Error moving:" msgstr "Σφάλμα κατά την μετακίνηση:\n" #: editor/filesystem_dock.cpp #, fuzzy -msgid "Error duplicating:\n" -msgstr "Σφάλμα κατά την φόÏτωση:" +msgid "Error duplicating:" +msgstr "Σφάλμα κατά τον διπλασιασμό:\n" #: editor/filesystem_dock.cpp -msgid "Unable to update dependencies:\n" +#, fuzzy +msgid "Unable to update dependencies:" msgstr "ΑδÏνατη η ενημÎÏωση των εξαÏτήσεων:\n" #: editor/filesystem_dock.cpp @@ -2701,14 +2713,12 @@ msgid "Renaming folder:" msgstr "Μετονομασία καταλόγου:" #: editor/filesystem_dock.cpp -#, fuzzy msgid "Duplicating file:" -msgstr "Διπλασιασμός" +msgstr "Διπλασιασμός αÏχείου:" #: editor/filesystem_dock.cpp -#, fuzzy msgid "Duplicating folder:" -msgstr "Μετονομασία καταλόγου:" +msgstr "Διπλασιασμός καταλόγου:" #: editor/filesystem_dock.cpp msgid "Expand all" @@ -2727,7 +2737,6 @@ msgid "Move To.." msgstr "Μετακίνηση σε" #: editor/filesystem_dock.cpp -#, fuzzy msgid "Open Scene(s)" msgstr "Άνοιγμα σκηνής" @@ -2744,9 +2753,8 @@ msgid "View Owners.." msgstr "Î Ïοβολή ιδιοκτητών" #: editor/filesystem_dock.cpp -#, fuzzy msgid "Duplicate.." -msgstr "Διπλασιασμός" +msgstr "ΑναπαÏαγωγή" #: editor/filesystem_dock.cpp msgid "Previous Directory" @@ -2845,14 +2853,12 @@ msgid "Importing Scene.." msgstr "Εισαγωγή σκηνής..." #: editor/import/resource_importer_scene.cpp -#, fuzzy msgid "Generating Lightmaps" -msgstr "ΜεταφοÏά στους χάÏτες φωτός:" +msgstr "ΔημιουÏγία χαÏτών φωτός" #: editor/import/resource_importer_scene.cpp -#, fuzzy msgid "Generating for Mesh: " -msgstr "ΔημιουÏία AABB" +msgstr "ΔημιουÏία για πλÎγμα: " #: editor/import/resource_importer_scene.cpp msgid "Running Custom Script.." @@ -3146,7 +3152,7 @@ msgstr "Εξανάγκασε τονισμό άσπÏου" #: editor/plugins/animation_player_editor_plugin.cpp msgid "Include Gizmos (3D)" -msgstr "ΣυμπεÏιÎλαβε μαÏαφÎτια (3D)" +msgstr "ΣυμπεÏιÎλαβε τα μαÏαφÎτια (3D)" #: editor/plugins/animation_player_editor_plugin.cpp msgid "Create New Animation" @@ -3322,6 +3328,11 @@ msgstr "ΕπεξεÏγασία φίλτÏων κόμβων" msgid "Filters.." msgstr "ΦίλτÏα.." +#: editor/plugins/animation_tree_editor_plugin.cpp +#, fuzzy +msgid "AnimationTree" +msgstr "Κίνηση" + #: editor/plugins/asset_library_editor_plugin.cpp msgid "Free" msgstr "ΔωÏεάν" @@ -3472,23 +3483,31 @@ msgid "" "Save your scene (for images to be saved in the same dir), or pick a save " "path from the BakedLightmap properties." msgstr "" +"Δεν ήταν δυνατός ο Ï€ÏοσδιοÏισμός διαδÏομής για την αποθήκευση των χαÏτών " +"φωτός.\n" +"ΑποθηκεÏστε την σκηνή σας (για να αποθηκευτοÏν οι εικόνες στον ίδιο " +"κατάλογο), ή επιλÎξτε μία διαδÏομή από τις ιδιότητες του BakedLightMap." #: editor/plugins/baked_lightmap_editor_plugin.cpp msgid "" "No meshes to bake. Make sure they contain an UV2 channel and that the 'Bake " "Light' flag is on." msgstr "" +"Δεν υπάÏχουν πλÎγματα για Ï€Ïοετοιμασία. ΣιγουÏευτείτε πως πεÏιÎχουν κανάλι " +"UV2 και πως η σημαία 'Bake Light' είναι ενεÏγοποιημÎνη." #: editor/plugins/baked_lightmap_editor_plugin.cpp msgid "Failed creating lightmap images, make sure path is writable." msgstr "" +"ΑπÎτυχε η δημιουÏγία του χάÏτη φψτός, σιγουÏευτείτε ότι η διαδÏομή είναι " +"εγγÏάψιμη." #: editor/plugins/baked_lightmap_editor_plugin.cpp -#, fuzzy msgid "Bake Lightmaps" -msgstr "ΜεταφοÏά στους χάÏτες φωτός:" +msgstr "Î ÏοεπεξεÏγασία χαÏτών φωτός" #: editor/plugins/camera_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Preview" msgstr "Î Ïοεπισκόπηση" @@ -4001,19 +4020,19 @@ msgstr "ΔημιουÏγία πλÎγματος πλοήγησης" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Contained Mesh is not of type ArrayMesh." -msgstr "" +msgstr "Το πεÏιεχόμενο πλÎγμα δεν είναι Ï„Ïπου ArrayMesh." #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "UV Unwrap failed, mesh may not be manifold?" -msgstr "" +msgstr "Το ξεδίπλωμα των UV απÎτυχε, το πλÎγμα μποÏεί να μην είναι πολλαπλό?" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "No mesh to debug." -msgstr "" +msgstr "ΚανÎνα πλÎγμα για αποσφαλμάτωση." #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Model has no UV in this layer" -msgstr "" +msgstr "Το μοντÎλο δεν Îχει UV σε αυτό το στÏώμα" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "MeshInstance lacks a Mesh!" @@ -4056,18 +4075,16 @@ msgid "Create Outline Mesh.." msgstr "ΔημιουÏγία πλÎγματος πεÏιγÏάμματος.." #: editor/plugins/mesh_instance_editor_plugin.cpp -#, fuzzy msgid "View UV1" -msgstr "ΚάμεÏα" +msgstr "Εμφάνιση UV1" #: editor/plugins/mesh_instance_editor_plugin.cpp -#, fuzzy msgid "View UV2" -msgstr "ΚάμεÏα" +msgstr "Εμφάνιση UV2" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Unwrap UV2 for Lightmap/AO" -msgstr "" +msgstr "Ξεδίπλωμα UV2 για χάÏτη φωτός / ΑΟ" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Create Outline Mesh" @@ -4181,10 +4198,11 @@ msgstr "ΣυμπλήÏωση" #: editor/plugins/navigation_mesh_editor_plugin.cpp msgid "Bake!" -msgstr "Î ÏοεπεξεÏγάσου!" +msgstr "Î Ïοετοίμασε!" #: editor/plugins/navigation_mesh_editor_plugin.cpp -msgid "Bake the navigation mesh.\n" +#, fuzzy +msgid "Bake the navigation mesh." msgstr "Î Ïοετοιμασία του πλÎγματος πλοήγησης.\n" #: editor/plugins/navigation_mesh_editor_plugin.cpp @@ -4575,14 +4593,18 @@ msgstr "ΦόÏτωση πόÏου" msgid "Paste" msgstr "Επικόληση" +#: editor/plugins/resource_preloader_editor_plugin.cpp +#, fuzzy +msgid "ResourcePreloader" +msgstr "ΔιαδÏομή πόÏου" + #: editor/plugins/script_editor_plugin.cpp msgid "Clear Recent Files" msgstr "ΕκκαθάÏιση Ï€Ïόσφατων αÏχείων" #: editor/plugins/script_editor_plugin.cpp -msgid "" -"Close and save changes?\n" -"\"" +#, fuzzy +msgid "Close and save changes?" msgstr "" "Κλείσιμο και αποθήκευση αλλαγών;\n" "\"" @@ -4656,9 +4678,13 @@ msgid "Soft Reload Script" msgstr "Απλή επαναφόÏτωση δεσμής ενεÏγειών" #: editor/plugins/script_editor_plugin.cpp -#, fuzzy msgid "Copy Script Path" -msgstr "ΑντιγÏαφή διαδÏομής" +msgstr "ΑντιγÏαφή διαδÏομής δεσμής ενεÏγειών" + +#: editor/plugins/script_editor_plugin.cpp +#, fuzzy +msgid "Show In File System" +msgstr "Εμφάνιση στο σÏστημα αÏχείων" #: editor/plugins/script_editor_plugin.cpp msgid "History Prev" @@ -4851,9 +4877,8 @@ msgid "Clone Down" msgstr "Κλωνοποίηση κάτω" #: editor/plugins/script_text_editor.cpp -#, fuzzy msgid "Fold/Unfold Line" -msgstr "Ξεδίπλωμα γÏαμμής" +msgstr "Δίπλωμα/Ξεδίπλωμα γÏαμμής" #: editor/plugins/script_text_editor.cpp msgid "Fold All Lines" @@ -5097,85 +5122,85 @@ msgid "Rotating %s degrees." msgstr "ΠεÏιστÏοφή %s μοίÏες." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Bottom View." -msgstr "Κάτω όψη." +msgid "Keying is disabled (no key inserted)." +msgstr "" +"Η δημιουÏγία κλειδιών είναι απενεÏγοποιημÎνη (Δεν Îχει εισαχθεί κλειδί)." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Bottom" -msgstr "Κάτω" +msgid "Animation Key Inserted." +msgstr "Το κλειδί κίνησης Îχει εισαχθεί." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Top View." -msgstr "Πάνω όψη." +msgid "Objects Drawn" +msgstr "ΖωγÏαφισμÎνα αντικείμενα" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Rear View." -msgstr "Πίσω όψη." +msgid "Material Changes" +msgstr "ΑλλαγÎÏ‚ υλικοÏ" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Rear" -msgstr "Πίσω" +msgid "Shader Changes" +msgstr "ΑλλαγÎÏ‚ Ï€ÏογÏάμματος σκίασης" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Front View." -msgstr "ΕμπÏόσθια όψη." +msgid "Surface Changes" +msgstr "ΑλλαγÎÏ‚ επιφάνειας" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Front" -msgstr "ΜπÏοστά" +msgid "Draw Calls" +msgstr "Κλήσεις σχεδίασης" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Left View." -msgstr "ΑÏιστεÏή όψη." +msgid "Vertices" +msgstr "ΚοÏυφÎÏ‚" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Left" -msgstr "ΑÏιστεÏά" +msgid "FPS" +msgstr "FPS" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Right View." -msgstr "Δεξιά όψη." +msgid "Top View." +msgstr "Πάνω όψη." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Right" -msgstr "Δεξιά" +msgid "Bottom View." +msgstr "Κάτω όψη." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Keying is disabled (no key inserted)." -msgstr "" -"Η δημιουÏγία κλειδιών είναι απενεÏγοποιημÎνη (Δεν Îχει εισαχθεί κλειδί)." +msgid "Bottom" +msgstr "Κάτω" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Animation Key Inserted." -msgstr "Το κλειδί κίνησης Îχει εισαχθεί." +msgid "Left View." +msgstr "ΑÏιστεÏή όψη." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Objects Drawn" -msgstr "ΖωγÏαφισμÎνα αντικείμενα" +msgid "Left" +msgstr "ΑÏιστεÏά" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Material Changes" -msgstr "ΑλλαγÎÏ‚ υλικοÏ" +msgid "Right View." +msgstr "Δεξιά όψη." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Shader Changes" -msgstr "ΑλλαγÎÏ‚ Ï€ÏογÏάμματος σκίασης" +msgid "Right" +msgstr "Δεξιά" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Surface Changes" -msgstr "ΑλλαγÎÏ‚ επιφάνειας" +msgid "Front View." +msgstr "ΕμπÏόσθια όψη." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Draw Calls" -msgstr "Κλήσεις σχεδίασης" +msgid "Front" +msgstr "ΜπÏοστά" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Vertices" -msgstr "ΚοÏυφÎÏ‚" +msgid "Rear View." +msgstr "Πίσω όψη." #: editor/plugins/spatial_editor_plugin.cpp -msgid "FPS" -msgstr "FPS" +msgid "Rear" +msgstr "Πίσω" #: editor/plugins/spatial_editor_plugin.cpp msgid "Align with view" @@ -5263,15 +5288,12 @@ msgid "Freelook Speed Modifier" msgstr "ΤαχÏτητα ελεÏθεÏου κοιτάγματος" #: editor/plugins/spatial_editor_plugin.cpp -msgid "preview" -msgstr "Î Ïοεπισκόπηση" - -#: editor/plugins/spatial_editor_plugin.cpp msgid "XForm Dialog" msgstr "Διάλογος XForm" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Select Mode (Q)\n" +#, fuzzy +msgid "Select Mode (Q)" msgstr "Επιλογή λειτουÏγίας (Q)\n" #: editor/plugins/spatial_editor_plugin.cpp @@ -5301,14 +5323,12 @@ msgid "Local Coords" msgstr "ΤοπικÎÏ‚ συντεταγμÎνες" #: editor/plugins/spatial_editor_plugin.cpp -#, fuzzy msgid "Local Space Mode (%s)" -msgstr "ΛειτουÏγία κλιμάκωσης (R)" +msgstr "ΛειτουÏγία Ï„Î¿Ï€Î¹ÎºÎ¿Ï Ï‡ÏŽÏου (%s)" #: editor/plugins/spatial_editor_plugin.cpp -#, fuzzy msgid "Snap Mode (%s)" -msgstr "ΛειτουÏγία κουμπώματος:" +msgstr "ΛειτουÏγία κουμπώματος (%s)" #: editor/plugins/spatial_editor_plugin.cpp msgid "Bottom View" @@ -5425,7 +5445,7 @@ msgstr "Ρυθμίσεις" #: editor/plugins/spatial_editor_plugin.cpp msgid "Skeleton Gizmo visibility" -msgstr "" +msgstr "ΟÏατότητα μαÏαφετιών σκελετοÏ" #: editor/plugins/spatial_editor_plugin.cpp msgid "Snap Settings" @@ -5551,10 +5571,20 @@ msgstr "Μετακίνηση (Î Ïιν)" msgid "Move (After)" msgstr "Μετκίνιση (Μετά)" +#: editor/plugins/sprite_frames_editor_plugin.cpp +#, fuzzy +msgid "SpriteFrames" +msgstr "Στοίβαξη καÏÎ" + #: editor/plugins/style_box_editor_plugin.cpp msgid "StyleBox Preview:" msgstr "Î Ïοεπισκόπηση StyleBox:" +#: editor/plugins/style_box_editor_plugin.cpp +#, fuzzy +msgid "StyleBox" +msgstr "Στυλ" + #: editor/plugins/texture_region_editor_plugin.cpp msgid "Set Region Rect" msgstr "ΟÏισμός οÏθογωνίου πεÏιοχής" @@ -5580,14 +5610,17 @@ msgid "Auto Slice" msgstr "Αυτόματο κόψιμο" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Offset:" msgstr "Μετατόπιση:" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Step:" msgstr "Βήμα:" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Separation:" msgstr "ΔιαχωÏισμός:" @@ -5725,6 +5758,10 @@ msgstr "ΓÏαμματοσειÏά" msgid "Color" msgstr "ΧÏώμα" +#: editor/plugins/theme_editor_plugin.cpp +msgid "Theme" +msgstr "ΘÎμα" + #: editor/plugins/tile_map_editor_plugin.cpp msgid "Erase Selection" msgstr "ΔιαγÏαφή επιλογής" @@ -5810,9 +5847,8 @@ msgid "Merge from scene?" msgstr "Συγχώνευση από σκηνή;" #: editor/plugins/tile_set_editor_plugin.cpp -#, fuzzy msgid "Tile Set" -msgstr "TileSet..." +msgstr "ΣÏνολο πλακιδίων" #: editor/plugins/tile_set_editor_plugin.cpp msgid "Create from Scene" @@ -5826,6 +5862,32 @@ msgstr "Συγχώνευση από σκηνή" msgid "Error" msgstr "Σφάλμα" +#: editor/plugins/tile_set_editor_plugin.cpp +#, fuzzy +msgid "Autotiles" +msgstr "Αυτόματο κόψιμο" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "" +"Select sub-tile to use as icon, this will be also used on invalid autotile " +"bindings." +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "" +"LMB: set bit on.\n" +"RMB: set bit off." +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +#, fuzzy +msgid "Select current edited sub-tile." +msgstr "Αποθήκευσε το Ï„ÏÎχων επεξεÏγαζόμενο πόÏο." + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "Select sub-tile to change it's priority." +msgstr "" + #: editor/progress_dialog.cpp scene/gui/dialogs.cpp msgid "Cancel" msgstr "ΑκÏÏωση" @@ -5952,10 +6014,23 @@ msgstr "" "ΠαÏακαλοÏμε επιλÎξτε Îναν φάκελο που δεν πεÏιÎχει Îνα αÏχείο 'project.godot'." #: editor/project_manager.cpp +msgid "That's a BINGO!" +msgstr "Αυτό είναι Îνα «ΕÏÏηκα»!" + +#: editor/project_manager.cpp msgid "Imported Project" msgstr "ΕισαγμÎνο ÎÏγο" #: editor/project_manager.cpp +#, fuzzy +msgid "Couldn't create folder." +msgstr "ΑδÏνατη η δημιουÏγία φακÎλου." + +#: editor/project_manager.cpp +msgid "There is already a folder in this path with the specified name." +msgstr "" + +#: editor/project_manager.cpp msgid "It would be a good idea to name your project." msgstr "Είναι καλή ιδÎα να ονομάσετε το ÎÏγο σας." @@ -5997,14 +6072,29 @@ msgid "Import Existing Project" msgstr "Εισαγωγή υπαÏÎºÏ„Î¿Ï ÎÏγου" #: editor/project_manager.cpp +#, fuzzy +msgid "Import & Edit" +msgstr "Εισαγωγή & Άνοιγμα" + +#: editor/project_manager.cpp msgid "Create New Project" msgstr "ΔημιουÏγία νÎου ÎÏγου" #: editor/project_manager.cpp +#, fuzzy +msgid "Create & Edit" +msgstr "ΔημιουÏγία πομποÏ" + +#: editor/project_manager.cpp msgid "Install Project:" msgstr "Εγκατάσταση ÎÏγου:" #: editor/project_manager.cpp +#, fuzzy +msgid "Install & Edit" +msgstr "Εγκατάσταση" + +#: editor/project_manager.cpp msgid "Project Name:" msgstr "Όνομα ÎÏγου:" @@ -6021,10 +6111,6 @@ msgid "Browse" msgstr "ΠεÏιήγηση" #: editor/project_manager.cpp -msgid "That's a BINGO!" -msgstr "Αυτό είναι Îνα «ΕÏÏηκα»!" - -#: editor/project_manager.cpp msgid "Unnamed Project" msgstr "Ανώνυμο ÎÏγο" @@ -6081,6 +6167,10 @@ msgstr "" "Είστε Îτοιμοι να σαÏώσετε %s φακÎλους για υπαÏκτά ÎÏγα Godot. Είστε σίγουÏοι;" #: editor/project_manager.cpp +msgid "Project Manager" +msgstr "ΔιαχειÏιστής" + +#: editor/project_manager.cpp msgid "Project List" msgstr "Λίστα ÎÏγων" @@ -6209,11 +6299,6 @@ msgid "Button 9" msgstr "Κουμπί 9" #: 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 "ΑÏιθμός άξονα Joypad:" @@ -6226,9 +6311,8 @@ msgid "Joypad Button Index:" msgstr "ΑÏιθμός ÎºÎ¿Ï…Î¼Ï€Î¹Î¿Ï Joypad:" #: editor/project_settings_editor.cpp -#, fuzzy msgid "Erase Input Action" -msgstr "ΔιαγÏαφή συμβάντος ενÎÏγειας εισόδου" +msgstr "ΔιαγÏαφή ενÎÏγειας εισόδου" #: editor/project_settings_editor.cpp msgid "Erase Input Action Event" @@ -6476,7 +6560,7 @@ msgstr "Îεα δεσμή ενεÏγειών" #: editor/property_editor.cpp msgid "New %s" -msgstr "" +msgstr "ÎÎο %s" #: editor/property_editor.cpp msgid "Make Unique" @@ -6511,9 +6595,8 @@ msgid "On" msgstr "Îαι" #: editor/property_editor.cpp -#, fuzzy msgid "[Empty]" -msgstr "Î Ïοσθήκη άδειου" +msgstr "[Άδειο]" #: editor/property_editor.cpp modules/visual_script/visual_script_editor.cpp msgid "Set" @@ -6691,7 +6774,8 @@ msgid "Error duplicating scene to save it." msgstr "Σφάλμα κατά τον διπλασιασμό σκηνής για αποθήκευση." #: editor/scene_tree_dock.cpp -msgid "Sub-Resources:" +#, fuzzy +msgid "Sub-Resources" msgstr "Yπο-Î ÏŒÏοι:" #: editor/scene_tree_dock.cpp @@ -6997,7 +7081,7 @@ msgstr "" "ΕπιλÎξτε Îνα ή πεÏισσότεÏα αντικείμενα από την λίστα για να εμφανιστεί το " "γÏάφημα." -#: editor/script_editor_debugger.cpp +#: editor/script_editor_debugger.cpp modules/mono/editor/mono_bottom_panel.cpp msgid "Errors" msgstr "Σφάλματα" @@ -7006,6 +7090,11 @@ msgid "Child Process Connected" msgstr "Η παιδική διαδικασία συνδÎθηκε" #: editor/script_editor_debugger.cpp +#, fuzzy +msgid "Copy Error" +msgstr "Σφάλματα φόÏτωσης" + +#: editor/script_editor_debugger.cpp msgid "Inspect Previous Instance" msgstr "ΕπιθεώÏηση του Ï€ÏοηγοÏμενου στιγμιοτÏπου" @@ -7099,7 +7188,7 @@ msgstr "ΣυντομεÏσεις" #: editor/settings_config_dialog.cpp msgid "Binding" -msgstr "" +msgstr "ΣÏνδεση" #: editor/spatial_editor_gizmos.cpp msgid "Change Light Radius" @@ -7151,43 +7240,39 @@ msgstr "Αλλαγή διαστάσεων αισθητήÏα" #: modules/gdnative/gdnative_library_editor_plugin.cpp msgid "Select the dynamic library for this entry" -msgstr "" +msgstr "ΕπιλÎξτε μία δυναμική βιβλιοθήκη για αυτή την εγγÏαφή" #: modules/gdnative/gdnative_library_editor_plugin.cpp msgid "Select dependencies of the library for this entry" -msgstr "" +msgstr "ΕπιλÎξτε τις εξαÏτήσεις της βιβλιοθήκης για αυτήν την εγγÏαφή" #: modules/gdnative/gdnative_library_editor_plugin.cpp -#, fuzzy msgid "Remove current entry" -msgstr "ΑφαίÏεση σημείου καμπÏλης" +msgstr "ΑφαίÏεση Ï„ÏÎχουσας εγγÏαφής" #: modules/gdnative/gdnative_library_editor_plugin.cpp msgid "Double click to create a new entry" -msgstr "" +msgstr "Διπλό κλικ για καινοÏγια εγγÏαφή" #: modules/gdnative/gdnative_library_editor_plugin.cpp msgid "Platform:" -msgstr "" +msgstr "ΠλατφόÏμα:" #: modules/gdnative/gdnative_library_editor_plugin.cpp -#, fuzzy msgid "Platform" -msgstr "ΑντιγÏαφή σε πλατφόÏμα.." +msgstr "ΠλατφόÏμα" #: modules/gdnative/gdnative_library_editor_plugin.cpp -#, fuzzy msgid "Dynamic Library" -msgstr "Βιβλιοθήκη" +msgstr "Δυναμική Βιβλιοθήκη" #: modules/gdnative/gdnative_library_editor_plugin.cpp msgid "Add an architecture entry" -msgstr "" +msgstr "Î ÏοσθÎστε Îνα πεδίο αÏχιτεκτονικής" #: modules/gdnative/gdnative_library_editor_plugin.cpp -#, fuzzy msgid "GDNativeLibrary" -msgstr "GDNative" +msgstr "Βιβλιοθήκη GDNative" #: modules/gdnative/gdnative_library_singleton_editor.cpp msgid "Library" @@ -7358,10 +7443,58 @@ msgstr "Ρυθμίσεις GridMap" msgid "Pick Distance:" msgstr "Επιλογή απόστασης:" +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Generating solution..." +msgstr "ΔημιουÏγία πεÏιγÏαμμάτων..." + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Generating C# project..." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Failed to create solution." +msgstr "Δεν ήταν δυνατή η δημιουÏγία πεÏιγÏάμματος!" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Failed to save solution." +msgstr "ΑπÎτυχε η φόÏτωση πόÏου." + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Done" +msgstr "ΤÎλος!" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Failed to create C# project." +msgstr "ΑπÎτυχε η φόÏτωση πόÏου." + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Mono" +msgstr "Μονοφωνικό" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Create C# solution" +msgstr "ΔημιουÏγία πεÏιγÏάμματος" + #: modules/mono/editor/mono_bottom_panel.cpp msgid "Builds" msgstr "Δόμηση" +#: modules/mono/editor/mono_bottom_panel.cpp +#, fuzzy +msgid "Build Project" +msgstr "ΈÏγο" + +#: modules/mono/editor/mono_bottom_panel.cpp +#, fuzzy +msgid "Warnings" +msgstr "Î Ïοειδοποίηση" + #: modules/visual_script/visual_script.cpp msgid "" "A node yielded without working memory, please read the docs on how to yield " @@ -7724,23 +7857,33 @@ msgid "Run exported HTML in the system's default browser." msgstr "ΕκτÎλεση εξαγόμενης HTMP στον Ï€ÏοεπιλεγμÎνο πεÏιηγητή του συστήματος." #: platform/javascript/export/export.cpp -msgid "Could not write file:\n" +#, fuzzy +msgid "Could not write file:" msgstr "Δεν ήταν δυνατό το γÏάψιμο στο αÏχείο:\n" #: platform/javascript/export/export.cpp -msgid "Could not open template for export:\n" +#, fuzzy +msgid "Could not open template for export:" msgstr "Δεν ήταν δυνατό το άνοιγμα Ï€ÏοτÏπου για εξαγωγή:\n" #: platform/javascript/export/export.cpp -msgid "Invalid export template:\n" +#, fuzzy +msgid "Invalid export template:" msgstr "ΆκυÏο Ï€ÏοτÏπο εξαγωγής:\n" #: platform/javascript/export/export.cpp -msgid "Could not read custom HTML shell:\n" +#, fuzzy +msgid "Could not read custom HTML shell:" msgstr "Δεν ήταν δυνατή η ανάγνωση του Ï€ÏοσαÏμοσμÎνου κελÏφους HTML:\n" #: platform/javascript/export/export.cpp -msgid "Could not read boot splash image file:\n" +#, fuzzy +msgid "Could not read boot splash image file:" +msgstr "Δεν ήταν δυνατή η ανάγνωση της εικόνας εκκίνησης:\n" + +#: platform/javascript/export/export.cpp +#, fuzzy +msgid "Using default boot splash image." msgstr "Δεν ήταν δυνατή η ανάγνωση της εικόνας εκκίνησης:\n" #: scene/2d/animated_sprite.cpp @@ -7905,23 +8048,20 @@ msgid "ARVROrigin requires an ARVRCamera child node" msgstr "Το ARVROrigin απαιτεί Îναν κόμβο ARVRCamera ως παιδί" #: scene/3d/baked_lightmap.cpp -#, fuzzy msgid "Plotting Meshes: " -msgstr "ΤοποθÎτηση πλεγμάτων" +msgstr "ΤοποθÎτηση πλεγμάτων: " #: scene/3d/baked_lightmap.cpp -#, fuzzy msgid "Plotting Lights:" -msgstr "ΤοποθÎτηση πλεγμάτων" +msgstr "ΤοποθÎτηση φώτων:" #: scene/3d/baked_lightmap.cpp scene/3d/gi_probe.cpp msgid "Finishing Plot" msgstr "ΟλοκλήÏωση σχεδιαγÏάμματος" #: scene/3d/baked_lightmap.cpp -#, fuzzy msgid "Lighting Meshes: " -msgstr "ΤοποθÎτηση πλεγμάτων" +msgstr "Φώτηση πλεγμάτων: " #: scene/3d/collision_polygon.cpp msgid "" @@ -8066,9 +8206,10 @@ 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." +"Default Environment as specified in Project Setings (Rendering -> " +"Environment -> Default Environment) could not be loaded." msgstr "" "Το Ï€ÏοεπιλεγμÎνο πεÏιβάλλον, όπως Îχει οÏισθεί στις Ïυθμίσεις ÎÏγου " "(Rendering -> Viewport -> Default Environment) δεν μποÏοÏσε να φοÏτωθεί." @@ -8101,6 +8242,9 @@ msgstr "Σφάλμα κατά την φόÏτωση της γÏαμματοσεΠmsgid "Invalid font size." msgstr "Μη ÎγκυÏο μÎγεθος γÏαμματοσειÏάς." +#~ msgid "preview" +#~ msgstr "Î Ïοεπισκόπηση" + #~ msgid "Move Add Key" #~ msgstr "Μετακίνηση ÎºÎ»ÎµÎ¹Î´Î¹Î¿Ï Ï€Ïοσθήκης" @@ -8194,9 +8338,6 @@ msgstr "Μη ÎγκυÏο μÎγεθος γÏαμματοσειÏάς." #~ msgid "' parsing of config failed." #~ msgstr "' απÎτυχε η ανάλυση του αÏγείου παÏαμÎÏ„Ïων." -#~ msgid "Theme" -#~ msgstr "ΘÎμα" - #~ msgid "Method List For '%s':" #~ msgstr "Λίστα συναÏτήσεων για '%s':" @@ -8467,9 +8608,6 @@ msgstr "Μη ÎγκυÏο μÎγεθος γÏαμματοσειÏάς." #~ msgid "Import Anyway" #~ msgstr "Εισαγωγή οÏτως ή άλλως" -#~ msgid "Import & Open" -#~ msgstr "Εισαγωγή & Άνοιγμα" - #~ msgid "Edited scene has not been saved, open imported scene anyway?" #~ msgstr "" #~ "Η Ï„ÏÎχουσα σκηνή δεν Îχει αποθηκευτεί, άνοιγμα της εισαγμÎνης σκηνής " @@ -8729,9 +8867,6 @@ msgstr "Μη ÎγκυÏο μÎγεθος γÏαμματοσειÏάς." #~ msgid "Stereo" #~ msgstr "ΣτεÏεοφωνικό" -#~ msgid "Mono" -#~ msgstr "Μονοφωνικό" - #~ msgid "Pitch" #~ msgstr "Τόνος" diff --git a/editor/translations/es.po b/editor/translations/es.po index 328e50d9f2..142f52c18a 100644 --- a/editor/translations/es.po +++ b/editor/translations/es.po @@ -218,8 +218,7 @@ msgstr "¿Quieres crear %d NUEVAS pistas e insertar claves?" #: 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 +#: editor/plugins/particles_editor_plugin.cpp editor/script_create_dialog.cpp msgid "Create" msgstr "Crear" @@ -576,6 +575,16 @@ msgstr "Señales" #: editor/create_dialog.cpp #, fuzzy +msgid "Change %s Type" +msgstr "Cambiar tipo" + +#: editor/create_dialog.cpp editor/project_settings_editor.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Change" +msgstr "Cambiar" + +#: editor/create_dialog.cpp +#, fuzzy msgid "Create New %s" msgstr "Crear nuevo" @@ -690,7 +699,8 @@ msgstr "" "¿Seguro que quieres quitarlos? (No puedes deshacerlo)" #: editor/dependency_editor.cpp -msgid "Cannot remove:\n" +#, fuzzy +msgid "Cannot remove:" msgstr "No se puede eliminar:\n" #: editor/dependency_editor.cpp @@ -773,8 +783,9 @@ msgstr "Los Fundadores del Proyecto" msgid "Lead Developer" msgstr "Desarrollador Principal" -#: editor/editor_about.cpp editor/project_manager.cpp -msgid "Project Manager" +#: editor/editor_about.cpp +#, fuzzy +msgid "Project Manager " msgstr "Administrador de proyectos" #: editor/editor_about.cpp @@ -863,7 +874,7 @@ msgid "Success!" msgstr "Finalizado!" #: editor/editor_asset_installer.cpp -#: editor/plugins/asset_library_editor_plugin.cpp editor/project_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp msgid "Install" msgstr "Instalar" @@ -1178,7 +1189,8 @@ msgid "Packing" msgstr "Empaquetando" #: editor/editor_export.cpp platform/javascript/export/export.cpp -msgid "Template file not found:\n" +#, fuzzy +msgid "Template file not found:" msgstr "No se encontró archivo plantilla:\n" #: editor/editor_file_dialog.cpp scene/gui/file_dialog.cpp @@ -1437,6 +1449,11 @@ msgstr "Salida:" msgid "Clear" msgstr "Borrar todo" +#: editor/editor_log.cpp +#, fuzzy +msgid "Clear Output" +msgstr "Salida" + #: editor/editor_node.cpp editor/plugins/animation_player_editor_plugin.cpp msgid "Error saving resource!" msgstr "¡Hubo un error al guardar el recurso!" @@ -1499,8 +1516,10 @@ msgid "This operation can't be done without a tree root." msgstr "Esta operación no puede realizarse sin una escena raÃz." #: editor/editor_node.cpp +#, fuzzy msgid "" -"Couldn't save scene. Likely dependencies (instances) couldn't be satisfied." +"Couldn't save scene. Likely dependencies (instances or inheritance) couldn't " +"be satisfied." msgstr "" "No se pudo guardar la escena. Es posible que no se hayan podido satisfacer " "las dependencias (instancias)." @@ -2508,7 +2527,8 @@ msgid "No version.txt found inside templates." msgstr "No se ha encontrado el archivo version.txt dentro de las plantillas." #: editor/export_template_manager.cpp -msgid "Error creating path for templates:\n" +#, fuzzy +msgid "Error creating path for templates:" msgstr "Error al crear ruta para las plantillas:\n" #: editor/export_template_manager.cpp @@ -2672,9 +2692,8 @@ msgid "View items as a list" msgstr "Ver elementos como una lista" #: editor/filesystem_dock.cpp -msgid "" -"\n" -"Status: Import of file failed. Please fix file and reimport manually." +#, fuzzy +msgid "Status: Import of file failed. Please fix file and reimport manually." msgstr "" "\n" "Estado: No se pudo importar el archivo. Por favor, arregla el archivo e " @@ -2687,20 +2706,22 @@ msgstr "No se puede mover/renombrar la raÃz de recursos." #: editor/filesystem_dock.cpp #, fuzzy -msgid "Cannot move a folder into itself.\n" +msgid "Cannot move a folder into itself." msgstr "No se puede importar una carpeta sobre si misma.\n" #: editor/filesystem_dock.cpp -msgid "Error moving:\n" +#, fuzzy +msgid "Error moving:" msgstr "Error al mover:\n" #: editor/filesystem_dock.cpp #, fuzzy -msgid "Error duplicating:\n" +msgid "Error duplicating:" msgstr "Error al cargar:" #: editor/filesystem_dock.cpp -msgid "Unable to update dependencies:\n" +#, fuzzy +msgid "Unable to update dependencies:" msgstr "No se ha podido actualizar las dependencias:\n" #: editor/filesystem_dock.cpp @@ -3375,6 +3396,11 @@ msgstr "Editar filtros de nodo" msgid "Filters.." msgstr "Filtros.." +#: editor/plugins/animation_tree_editor_plugin.cpp +#, fuzzy +msgid "AnimationTree" +msgstr "Animación" + #: editor/plugins/asset_library_editor_plugin.cpp msgid "Free" msgstr "Libre" @@ -3544,6 +3570,7 @@ msgid "Bake Lightmaps" msgstr "Transfiriendo a «lightmaps»:" #: editor/plugins/camera_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Preview" msgstr "Vista previa" @@ -4284,7 +4311,7 @@ msgstr "¡Quemar!" #: editor/plugins/navigation_mesh_editor_plugin.cpp #, fuzzy -msgid "Bake the navigation mesh.\n" +msgid "Bake the navigation mesh." msgstr "Crear modelo de navegación 3D" #: editor/plugins/navigation_mesh_editor_plugin.cpp @@ -4711,15 +4738,19 @@ msgstr "Cargar recurso" msgid "Paste" msgstr "Pegar" +#: editor/plugins/resource_preloader_editor_plugin.cpp +#, fuzzy +msgid "ResourcePreloader" +msgstr "Ruta de recursos" + #: editor/plugins/script_editor_plugin.cpp #, fuzzy msgid "Clear Recent Files" msgstr "Reestablecer huesos" #: editor/plugins/script_editor_plugin.cpp -msgid "" -"Close and save changes?\n" -"\"" +#, fuzzy +msgid "Close and save changes?" msgstr "" "¿Cerrar y guardar cambios?\n" "\"" @@ -4799,6 +4830,11 @@ msgid "Copy Script Path" msgstr "Copiar ruta" #: editor/plugins/script_editor_plugin.cpp +#, fuzzy +msgid "Show In File System" +msgstr "SistDeArchivos" + +#: editor/plugins/script_editor_plugin.cpp msgid "History Prev" msgstr "Previo en historial" @@ -5253,50 +5289,6 @@ msgid "Rotating %s degrees." msgstr "Girando %s grados." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Bottom View." -msgstr "Vista inferior." - -#: editor/plugins/spatial_editor_plugin.cpp -msgid "Bottom" -msgstr "Fondo" - -#: editor/plugins/spatial_editor_plugin.cpp -msgid "Top View." -msgstr "Vista superior." - -#: editor/plugins/spatial_editor_plugin.cpp -msgid "Rear View." -msgstr "Vista anterior." - -#: editor/plugins/spatial_editor_plugin.cpp -msgid "Rear" -msgstr "Detrás" - -#: editor/plugins/spatial_editor_plugin.cpp -msgid "Front View." -msgstr "Vista frontal." - -#: editor/plugins/spatial_editor_plugin.cpp -msgid "Front" -msgstr "Frente" - -#: editor/plugins/spatial_editor_plugin.cpp -msgid "Left View." -msgstr "Vista izquierda." - -#: editor/plugins/spatial_editor_plugin.cpp -msgid "Left" -msgstr "Izquierda" - -#: editor/plugins/spatial_editor_plugin.cpp -msgid "Right View." -msgstr "Vista derecha." - -#: editor/plugins/spatial_editor_plugin.cpp -msgid "Right" -msgstr "Derecha" - -#: editor/plugins/spatial_editor_plugin.cpp msgid "Keying is disabled (no key inserted)." msgstr "Poner claves está desactivado (no se insertaron claves)." @@ -5339,6 +5331,50 @@ msgid "FPS" msgstr "FPS" #: editor/plugins/spatial_editor_plugin.cpp +msgid "Top View." +msgstr "Vista superior." + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Bottom View." +msgstr "Vista inferior." + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Bottom" +msgstr "Fondo" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Left View." +msgstr "Vista izquierda." + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Left" +msgstr "Izquierda" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Right View." +msgstr "Vista derecha." + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Right" +msgstr "Derecha" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Front View." +msgstr "Vista frontal." + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Front" +msgstr "Frente" + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Rear View." +msgstr "Vista anterior." + +#: editor/plugins/spatial_editor_plugin.cpp +msgid "Rear" +msgstr "Detrás" + +#: editor/plugins/spatial_editor_plugin.cpp msgid "Align with view" msgstr "Alinear con vista" @@ -5436,17 +5472,12 @@ msgid "Freelook Speed Modifier" msgstr "Modificador de velocidad de la vista libre" #: editor/plugins/spatial_editor_plugin.cpp -#, fuzzy -msgid "preview" -msgstr "Vista previa" - -#: editor/plugins/spatial_editor_plugin.cpp msgid "XForm Dialog" msgstr "Ventana de transformación" #: editor/plugins/spatial_editor_plugin.cpp #, fuzzy -msgid "Select Mode (Q)\n" +msgid "Select Mode (Q)" msgstr "Modo de selección" #: editor/plugins/spatial_editor_plugin.cpp @@ -5732,10 +5763,20 @@ msgstr "Borrar nodos" msgid "Move (After)" msgstr "Mover a la izquierda" +#: editor/plugins/sprite_frames_editor_plugin.cpp +#, fuzzy +msgid "SpriteFrames" +msgstr "Frames del Stack" + #: editor/plugins/style_box_editor_plugin.cpp msgid "StyleBox Preview:" msgstr "Vista previa de StyleBox:" +#: editor/plugins/style_box_editor_plugin.cpp +#, fuzzy +msgid "StyleBox" +msgstr "Estilo" + #: editor/plugins/texture_region_editor_plugin.cpp #, fuzzy msgid "Set Region Rect" @@ -5762,14 +5803,17 @@ msgid "Auto Slice" msgstr "Autotrocear" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Offset:" msgstr "Desplazamiento:" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Step:" msgstr "Paso:" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Separation:" msgstr "Separación:" @@ -5910,6 +5954,11 @@ msgstr "TipografÃa" msgid "Color" msgstr "Color" +#: editor/plugins/theme_editor_plugin.cpp +#, fuzzy +msgid "Theme" +msgstr "Guardar tema" + #: editor/plugins/tile_map_editor_plugin.cpp #, fuzzy msgid "Erase Selection" @@ -6016,6 +6065,32 @@ msgstr "Unir desde escena" msgid "Error" msgstr "Error" +#: editor/plugins/tile_set_editor_plugin.cpp +#, fuzzy +msgid "Autotiles" +msgstr "Autotrocear" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "" +"Select sub-tile to use as icon, this will be also used on invalid autotile " +"bindings." +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "" +"LMB: set bit on.\n" +"RMB: set bit off." +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +#, fuzzy +msgid "Select current edited sub-tile." +msgstr "Guardar el recurso editado actualmente." + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "Select sub-tile to change it's priority." +msgstr "" + #: editor/progress_dialog.cpp scene/gui/dialogs.cpp msgid "Cancel" msgstr "Cancelar" @@ -6161,10 +6236,23 @@ msgstr "" "Por favor, elige un directorio que no contenga un archivo 'project.godot'." #: editor/project_manager.cpp +msgid "That's a BINGO!" +msgstr "BINGO!" + +#: editor/project_manager.cpp msgid "Imported Project" msgstr "Proyecto importado" #: editor/project_manager.cpp +#, fuzzy +msgid "Couldn't create folder." +msgstr "No se pudo crear la carpeta." + +#: editor/project_manager.cpp +msgid "There is already a folder in this path with the specified name." +msgstr "" + +#: editor/project_manager.cpp msgid "It would be a good idea to name your project." msgstr "SerÃa una buena idea nombrar tu proyecto." @@ -6210,14 +6298,29 @@ msgid "Import Existing Project" msgstr "Importar proyecto existente" #: editor/project_manager.cpp +#, fuzzy +msgid "Import & Edit" +msgstr "Importar y abrir" + +#: editor/project_manager.cpp msgid "Create New Project" msgstr "Crear proyecto nuevo" #: editor/project_manager.cpp +#, fuzzy +msgid "Create & Edit" +msgstr "Crear emisor" + +#: editor/project_manager.cpp msgid "Install Project:" msgstr "Instalar proyecto:" #: editor/project_manager.cpp +#, fuzzy +msgid "Install & Edit" +msgstr "Instalar" + +#: editor/project_manager.cpp msgid "Project Name:" msgstr "Nombre del proyecto:" @@ -6235,10 +6338,6 @@ msgid "Browse" msgstr "Examinar" #: editor/project_manager.cpp -msgid "That's a BINGO!" -msgstr "BINGO!" - -#: editor/project_manager.cpp msgid "Unnamed Project" msgstr "Proyecto sin nombre" @@ -6299,6 +6398,10 @@ msgstr "" "¿Quieres continuar?" #: editor/project_manager.cpp +msgid "Project Manager" +msgstr "Administrador de proyectos" + +#: editor/project_manager.cpp msgid "Project List" msgstr "Lista de proyectos" @@ -6431,11 +6534,6 @@ msgid "Button 9" msgstr "Botón 9" #: editor/project_settings_editor.cpp -#: modules/visual_script/visual_script_editor.cpp -msgid "Change" -msgstr "Cambiar" - -#: editor/project_settings_editor.cpp #, fuzzy msgid "Joypad Axis Index:" msgstr "Ãndice de ejes del mando:" @@ -6939,7 +7037,7 @@ msgstr "Error al duplicar escena para guardarla." #: editor/scene_tree_dock.cpp #, fuzzy -msgid "Sub-Resources:" +msgid "Sub-Resources" msgstr "Recursos:" #: editor/scene_tree_dock.cpp @@ -7272,7 +7370,7 @@ msgstr "Función:" msgid "Pick one or more items from the list to display the graph." msgstr "Elige uno o más elementos de la lista para mostrar el gráfico." -#: editor/script_editor_debugger.cpp +#: editor/script_editor_debugger.cpp modules/mono/editor/mono_bottom_panel.cpp msgid "Errors" msgstr "Errores" @@ -7281,6 +7379,11 @@ msgid "Child Process Connected" msgstr "Proceso Hijo Conectado" #: editor/script_editor_debugger.cpp +#, fuzzy +msgid "Copy Error" +msgstr "Errores de carga" + +#: editor/script_editor_debugger.cpp msgid "Inspect Previous Instance" msgstr "Inspeccionar instancia anterior" @@ -7664,11 +7767,59 @@ msgstr "Ajustes de fijado" msgid "Pick Distance:" msgstr "Instancia:" +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Generating solution..." +msgstr "Creando octree de texturas" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Generating C# project..." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Failed to create solution." +msgstr "¡No se pudo crear el contorno!" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Failed to save solution." +msgstr "Hubo un problema al cargar el recurso." + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Done" +msgstr "¡Hecho!" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Failed to create C# project." +msgstr "Hubo un problema al cargar el recurso." + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Mono" +msgstr "Mono" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Create C# solution" +msgstr "Crear contorno" + #: modules/mono/editor/mono_bottom_panel.cpp #, fuzzy msgid "Builds" msgstr "Compilaciones" +#: modules/mono/editor/mono_bottom_panel.cpp +#, fuzzy +msgid "Build Project" +msgstr "Proyecto" + +#: modules/mono/editor/mono_bottom_panel.cpp +#, fuzzy +msgid "Warnings" +msgstr "Advertencia" + #: modules/visual_script/visual_script.cpp msgid "" "A node yielded without working memory, please read the docs on how to yield " @@ -8060,27 +8211,32 @@ msgstr "Ejecutar HTML exportado en el navegador por defecto del sistema." #: platform/javascript/export/export.cpp #, fuzzy -msgid "Could not write file:\n" +msgid "Could not write file:" msgstr "No se pudo cargar el tile:" #: platform/javascript/export/export.cpp #, fuzzy -msgid "Could not open template for export:\n" +msgid "Could not open template for export:" msgstr "No se pudo crear la carpeta." #: platform/javascript/export/export.cpp #, fuzzy -msgid "Invalid export template:\n" +msgid "Invalid export template:" msgstr "Instalar plantillas de exportación" #: platform/javascript/export/export.cpp #, fuzzy -msgid "Could not read custom HTML shell:\n" +msgid "Could not read custom HTML shell:" +msgstr "No se pudo cargar el tile:" + +#: platform/javascript/export/export.cpp +#, fuzzy +msgid "Could not read boot splash image file:" msgstr "No se pudo cargar el tile:" #: platform/javascript/export/export.cpp #, fuzzy -msgid "Could not read boot splash image file:\n" +msgid "Using default boot splash image." msgstr "No se pudo cargar el tile:" #: scene/2d/animated_sprite.cpp @@ -8411,9 +8567,10 @@ msgid "(Other)" msgstr "(Otros)" #: scene/main/scene_tree.cpp +#, fuzzy msgid "" -"Default Environment as specified in Project Setings (Rendering -> Viewport -" -"> Default Environment) could not be loaded." +"Default Environment as specified in Project Setings (Rendering -> " +"Environment -> Default Environment) could not be loaded." msgstr "" "El entorno por defecto especificado en los Ajustes del Proyecto (Renderizado " "-> Ventana -> Entorno por Defecto) no se ha podido cargar." @@ -8446,6 +8603,10 @@ msgstr "Error al cargar la tipografÃa." msgid "Invalid font size." msgstr "Tamaño de tipografÃa incorrecto." +#, fuzzy +#~ msgid "preview" +#~ msgstr "Vista previa" + #~ msgid "Move Add Key" #~ msgstr "Mover o añadir clave" @@ -8546,10 +8707,6 @@ msgstr "Tamaño de tipografÃa incorrecto." #~ msgid "' parsing of config failed." #~ msgstr "' análisis de config fallido." -#, fuzzy -#~ msgid "Theme" -#~ msgstr "Guardar tema" - #~ msgid "Method List For '%s':" #~ msgstr "Lista de métodos Para '%s':" @@ -8824,9 +8981,6 @@ msgstr "Tamaño de tipografÃa incorrecto." #~ msgid "Import Anyway" #~ msgstr "Importar de todos modos" -#~ msgid "Import & Open" -#~ msgstr "Importar y abrir" - #~ msgid "Edited scene has not been saved, open imported scene anyway?" #~ msgstr "" #~ "La escena editada no se ha guardado, ¿Quieres abrir la escena importada " @@ -9085,9 +9239,6 @@ msgstr "Tamaño de tipografÃa incorrecto." #~ msgid "Stereo" #~ msgstr "Estéreo" -#~ msgid "Mono" -#~ msgstr "Mono" - #~ msgid "Pitch" #~ msgstr "Altura" diff --git a/editor/translations/es_AR.po b/editor/translations/es_AR.po index a97f2361cc..8bfcd5b4fb 100644 --- a/editor/translations/es_AR.po +++ b/editor/translations/es_AR.po @@ -4,7 +4,7 @@ # This file is distributed under the same license as the Godot source code. # # Diego López <diegodario21@gmail.com>, 2017. -# Lisandro Lorea <lisandrolorea@gmail.com>, 2016-2017. +# Lisandro Lorea <lisandrolorea@gmail.com>, 2016-2018. # Roger BR <drai_kin@hotmail.com>, 2016. # Sebastian Silva <sebastian@sugarlabs.org>, 2016. # @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: Godot Engine editor\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2017-11-30 15:50+0000\n" -"Last-Translator: Diego López <diegodario21@gmail.com>\n" +"PO-Revision-Date: 2018-01-06 13:19+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" "Language: es_AR\n" @@ -21,7 +21,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.18-dev\n" +"X-Generator: Weblate 2.19-dev\n" #: editor/animation_editor.cpp msgid "Disabled" @@ -32,9 +32,8 @@ msgid "All Selection" msgstr "Toda la Selección" #: editor/animation_editor.cpp -#, fuzzy msgid "Anim Change Keyframe Time" -msgstr "Cambiar valor de animación" +msgstr "Cambiar Tiempo de Keyframe de Anim" #: editor/animation_editor.cpp msgid "Anim Change Transition" @@ -45,9 +44,8 @@ msgid "Anim Change Transform" msgstr "Cambiar Transform de Anim" #: editor/animation_editor.cpp -#, fuzzy msgid "Anim Change Keyframe Value" -msgstr "Cambiar valor de animación" +msgstr "Cambiar Valor de Keyframe de Anim" #: editor/animation_editor.cpp msgid "Anim Change Call" @@ -203,8 +201,7 @@ msgstr "Crear %d NUEVOS tracks e insertar claves?" #: 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 +#: editor/plugins/particles_editor_plugin.cpp editor/script_create_dialog.cpp msgid "Create" msgstr "Crear" @@ -541,9 +538,8 @@ msgid "Connecting Signal:" msgstr "Conectando Señal:" #: editor/connections_dialog.cpp -#, fuzzy msgid "Disconnect '%s' from '%s'" -msgstr "Conectar '%s' a '%s'" +msgstr "Desconectar '%s' de '%s'" #: editor/connections_dialog.cpp msgid "Connect.." @@ -560,8 +556,17 @@ msgstr "Señales" #: editor/create_dialog.cpp #, fuzzy +msgid "Change %s Type" +msgstr "Cambiar Tipo" + +#: editor/create_dialog.cpp editor/project_settings_editor.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Change" +msgstr "Cambiar" + +#: editor/create_dialog.cpp msgid "Create New %s" -msgstr "Crear Nuevo" +msgstr "Crear Nuevo %s" #: editor/create_dialog.cpp editor/editor_file_dialog.cpp #: editor/filesystem_dock.cpp @@ -670,7 +675,8 @@ msgstr "" "Quitarlos de todos modos? (imposible deshacer)" #: editor/dependency_editor.cpp -msgid "Cannot remove:\n" +#, fuzzy +msgid "Cannot remove:" msgstr "No se puede remover:\n" #: editor/dependency_editor.cpp @@ -754,8 +760,9 @@ msgstr "Fundadores del Proyecto" msgid "Lead Developer" msgstr "Desarrollador Principal" -#: editor/editor_about.cpp editor/project_manager.cpp -msgid "Project Manager" +#: editor/editor_about.cpp +#, fuzzy +msgid "Project Manager " msgstr "Gestor de Proyectos" #: editor/editor_about.cpp @@ -844,7 +851,7 @@ msgid "Success!" msgstr "Conseguido!" #: editor/editor_asset_installer.cpp -#: editor/plugins/asset_library_editor_plugin.cpp editor/project_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp msgid "Install" msgstr "Instalar" @@ -865,9 +872,8 @@ msgid "Rename Audio Bus" msgstr "Renombrar Bus de Audio" #: editor/editor_audio_buses.cpp -#, fuzzy msgid "Change Audio Bus Volume" -msgstr "Act./Desact. Solo de Bus de Audio" +msgstr "Cambiar Volumen de Bus de Audio" #: editor/editor_audio_buses.cpp msgid "Toggle Audio Bus Solo" @@ -932,7 +938,7 @@ msgstr "Eliminar Efecto" #: editor/editor_audio_buses.cpp msgid "Audio" -msgstr "" +msgstr "Audio" #: editor/editor_audio_buses.cpp msgid "Add Audio Bus" @@ -1113,13 +1119,12 @@ msgid "Updating scene.." msgstr "Actualizando escena.." #: editor/editor_data.cpp -#, fuzzy msgid "[empty]" -msgstr "(vacÃo)" +msgstr "[vacÃo]" #: editor/editor_data.cpp msgid "[unsaved]" -msgstr "" +msgstr "[sin guardar]" #: editor/editor_dir_dialog.cpp msgid "Please select a base directory first" @@ -1159,7 +1164,8 @@ msgid "Packing" msgstr "Empaquetando" #: editor/editor_export.cpp platform/javascript/export/export.cpp -msgid "Template file not found:\n" +#, fuzzy +msgid "Template file not found:" msgstr "Plantilla no encontrada:\n" #: editor/editor_file_dialog.cpp scene/gui/file_dialog.cpp @@ -1417,6 +1423,11 @@ msgstr "Salida:" msgid "Clear" msgstr "Limpiar" +#: editor/editor_log.cpp +#, fuzzy +msgid "Clear Output" +msgstr "Salida" + #: editor/editor_node.cpp editor/plugins/animation_player_editor_plugin.cpp msgid "Error saving resource!" msgstr "Error al guardar el recurso!" @@ -1479,8 +1490,10 @@ msgid "This operation can't be done without a tree root." msgstr "Esta operación no puede hacerse sin una raÃz de árbol." #: editor/editor_node.cpp +#, fuzzy msgid "" -"Couldn't save scene. Likely dependencies (instances) couldn't be satisfied." +"Couldn't save scene. Likely dependencies (instances or inheritance) couldn't " +"be satisfied." msgstr "" "No se pudo guardar la escena. Probablemente no se hayan podido satisfacer " "dependencias (instancias)." @@ -2371,14 +2384,12 @@ msgid "Frame #:" msgstr "Frame #:" #: editor/editor_profiler.cpp -#, fuzzy msgid "Time" -msgstr "Tiempo:" +msgstr "Tiempo" #: editor/editor_profiler.cpp -#, fuzzy msgid "Calls" -msgstr "Llamar" +msgstr "Llamadas" #: editor/editor_run_native.cpp msgid "Select device from the list" @@ -2486,7 +2497,8 @@ msgid "No version.txt found inside templates." msgstr "No se encontro ningún version.txt dentro de las plantillas." #: editor/export_template_manager.cpp -msgid "Error creating path for templates:\n" +#, fuzzy +msgid "Error creating path for templates:" msgstr "Error creando ruta para las plantillas:\n" #: editor/export_template_manager.cpp @@ -2522,7 +2534,6 @@ msgstr "Sin respuesta." #: editor/export_template_manager.cpp #: editor/plugins/asset_library_editor_plugin.cpp -#, fuzzy msgid "Request Failed." msgstr "Solicitud fallida." @@ -2570,7 +2581,6 @@ msgid "Connecting.." msgstr "Conectando.." #: editor/export_template_manager.cpp -#, fuzzy msgid "Can't Connect" msgstr "No se puede conectar" @@ -2647,9 +2657,8 @@ msgid "View items as a list" msgstr "Ver items como una lista" #: editor/filesystem_dock.cpp -msgid "" -"\n" -"Status: Import of file failed. Please fix file and reimport manually." +#, fuzzy +msgid "Status: Import of file failed. Please fix file and reimport manually." msgstr "" "\n" "Estado: Falló la importación del archivo. Por favor arregle el archivo y " @@ -2660,20 +2669,23 @@ msgid "Cannot move/rename resources root." msgstr "No se puede mover/renombrar la raiz de recursos." #: editor/filesystem_dock.cpp -msgid "Cannot move a folder into itself.\n" +#, fuzzy +msgid "Cannot move a folder into itself." msgstr "No se puede mover una carpeta dento de si misma.\n" #: editor/filesystem_dock.cpp -msgid "Error moving:\n" +#, fuzzy +msgid "Error moving:" msgstr "Error al mover:\n" #: editor/filesystem_dock.cpp #, fuzzy -msgid "Error duplicating:\n" -msgstr "Error cargando:" +msgid "Error duplicating:" +msgstr "Error duplicando:\n" #: editor/filesystem_dock.cpp -msgid "Unable to update dependencies:\n" +#, fuzzy +msgid "Unable to update dependencies:" msgstr "No se pudieron actualizar las dependencias:\n" #: editor/filesystem_dock.cpp @@ -2705,14 +2717,12 @@ msgid "Renaming folder:" msgstr "Renombrar carpeta:" #: editor/filesystem_dock.cpp -#, fuzzy msgid "Duplicating file:" -msgstr "Duplicar" +msgstr "Duplicando archivo:" #: editor/filesystem_dock.cpp -#, fuzzy msgid "Duplicating folder:" -msgstr "Renombrar carpeta:" +msgstr "Duplicando carpeta:" #: editor/filesystem_dock.cpp msgid "Expand all" @@ -2731,9 +2741,8 @@ msgid "Move To.." msgstr "Mover A.." #: editor/filesystem_dock.cpp -#, fuzzy msgid "Open Scene(s)" -msgstr "Abrir Escena" +msgstr "Abrir Escena(s)" #: editor/filesystem_dock.cpp msgid "Instance" @@ -2748,9 +2757,8 @@ msgid "View Owners.." msgstr "Ver Dueños.." #: editor/filesystem_dock.cpp -#, fuzzy msgid "Duplicate.." -msgstr "Duplicar" +msgstr "Duplicar.." #: editor/filesystem_dock.cpp msgid "Previous Directory" @@ -2848,14 +2856,12 @@ msgid "Importing Scene.." msgstr "Importando Escena.." #: editor/import/resource_importer_scene.cpp -#, fuzzy msgid "Generating Lightmaps" -msgstr "Transferencia a Lightmaps:" +msgstr "Generando Lightmaps" #: editor/import/resource_importer_scene.cpp -#, fuzzy msgid "Generating for Mesh: " -msgstr "Generando AABB" +msgstr "Generando para Mesh: " #: editor/import/resource_importer_scene.cpp msgid "Running Custom Script.." @@ -3325,6 +3331,11 @@ msgstr "Editar Filtros de Nodo" msgid "Filters.." msgstr "Filtros.." +#: editor/plugins/animation_tree_editor_plugin.cpp +#, fuzzy +msgid "AnimationTree" +msgstr "Animación" + #: editor/plugins/asset_library_editor_plugin.cpp msgid "Free" msgstr "Libre" @@ -3474,23 +3485,30 @@ msgid "" "Save your scene (for images to be saved in the same dir), or pick a save " "path from the BakedLightmap properties." msgstr "" +"No se pudo determinar una ruta de guardado para las imagenes de lightmap.\n" +"Guardá tu escena (para imagenes a ser guardadas en el mismo directorio), o " +"elegà una ruta de guardado desde las propiedades de BakedLightmap." #: editor/plugins/baked_lightmap_editor_plugin.cpp msgid "" "No meshes to bake. Make sure they contain an UV2 channel and that the 'Bake " "Light' flag is on." msgstr "" +"No hay meshes para hacer bake. Asegurate que contienen un canal UV2 y que el " +"flag 'Bake Light' esta activado." #: editor/plugins/baked_lightmap_editor_plugin.cpp msgid "Failed creating lightmap images, make sure path is writable." msgstr "" +"Error al crear imagenes de lightmap. Asegurate que la ruta tenga permiso de " +"escritura." #: editor/plugins/baked_lightmap_editor_plugin.cpp -#, fuzzy msgid "Bake Lightmaps" -msgstr "Transferencia a Lightmaps:" +msgstr "Hacer Bake de Lightmaps" #: editor/plugins/camera_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Preview" msgstr "Vista Previa" @@ -4003,19 +4021,19 @@ msgstr "Crear Mesh de Navegación" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Contained Mesh is not of type ArrayMesh." -msgstr "" +msgstr "La Mesh contenida no es del tipo ArrayMesh." #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "UV Unwrap failed, mesh may not be manifold?" -msgstr "" +msgstr "Fallo el UV Unwrap, la mesh podria no ser manifold?" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "No mesh to debug." -msgstr "" +msgstr "No hay meshes para debuguear." #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Model has no UV in this layer" -msgstr "" +msgstr "El modelo no tiene UV en esta capa" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "MeshInstance lacks a Mesh!" @@ -4058,18 +4076,16 @@ msgid "Create Outline Mesh.." msgstr "Crear Outline Mesh.." #: editor/plugins/mesh_instance_editor_plugin.cpp -#, fuzzy msgid "View UV1" -msgstr "Ver" +msgstr "Ver UV1" #: editor/plugins/mesh_instance_editor_plugin.cpp -#, fuzzy msgid "View UV2" -msgstr "Ver" +msgstr "Ver UV2" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Unwrap UV2 for Lightmap/AO" -msgstr "" +msgstr "Hacer Unwrap de UV2 para Lightmap/AO" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Create Outline Mesh" @@ -4185,7 +4201,8 @@ msgid "Bake!" msgstr "Hacer Bake!" #: editor/plugins/navigation_mesh_editor_plugin.cpp -msgid "Bake the navigation mesh.\n" +#, fuzzy +msgid "Bake the navigation mesh." msgstr "Hacer bake de mesh de navegación.\n" #: editor/plugins/navigation_mesh_editor_plugin.cpp @@ -4575,14 +4592,18 @@ msgstr "Cargar Recurso" msgid "Paste" msgstr "Pegar" +#: editor/plugins/resource_preloader_editor_plugin.cpp +#, fuzzy +msgid "ResourcePreloader" +msgstr "Ruta de Recursos" + #: editor/plugins/script_editor_plugin.cpp msgid "Clear Recent Files" msgstr "Restablecer Archivos Recientes" #: editor/plugins/script_editor_plugin.cpp -msgid "" -"Close and save changes?\n" -"\"" +#, fuzzy +msgid "Close and save changes?" msgstr "" "Cerrar y guardar cambios?\n" "\"" @@ -4656,9 +4677,13 @@ msgid "Soft Reload Script" msgstr "Recarga Soft de Script" #: editor/plugins/script_editor_plugin.cpp -#, fuzzy msgid "Copy Script Path" -msgstr "Copiar Ruta" +msgstr "Copiar Ruta de Script" + +#: editor/plugins/script_editor_plugin.cpp +#, fuzzy +msgid "Show In File System" +msgstr "Mostrar en Sistema de Archivos" #: editor/plugins/script_editor_plugin.cpp msgid "History Prev" @@ -4851,9 +4876,8 @@ msgid "Clone Down" msgstr "Clonar hacia Abajo" #: editor/plugins/script_text_editor.cpp -#, fuzzy msgid "Fold/Unfold Line" -msgstr "Expandir LÃnea" +msgstr "Expandir/Colapsar LÃnea" #: editor/plugins/script_text_editor.cpp msgid "Fold All Lines" @@ -5097,84 +5121,84 @@ msgid "Rotating %s degrees." msgstr "Torando %s grados." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Bottom View." -msgstr "Vista Inferior." +msgid "Keying is disabled (no key inserted)." +msgstr "Poner claves está desactivado (no se insertaron claves)." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Bottom" -msgstr "Fondo" +msgid "Animation Key Inserted." +msgstr "Clave de Animación Insertada." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Top View." -msgstr "Vista Superior." +msgid "Objects Drawn" +msgstr "Objetos Dibujados" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Rear View." -msgstr "Vista Anterior." +msgid "Material Changes" +msgstr "Cambios de Material" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Rear" -msgstr "Detrás" +msgid "Shader Changes" +msgstr "Cambios de Shader" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Front View." -msgstr "Vista Frontal." +msgid "Surface Changes" +msgstr "Cambios de Superficie" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Front" -msgstr "Frente" +msgid "Draw Calls" +msgstr "Llamadas de Dibujado" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Left View." -msgstr "Vista Izquierda." +msgid "Vertices" +msgstr "Vértices" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Left" -msgstr "Izquierda" +msgid "FPS" +msgstr "FPS" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Right View." -msgstr "Vista Derecha." +msgid "Top View." +msgstr "Vista Superior." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Right" -msgstr "Derecha" +msgid "Bottom View." +msgstr "Vista Inferior." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Keying is disabled (no key inserted)." -msgstr "Poner claves está desactivado (no se insertaron claves)." +msgid "Bottom" +msgstr "Fondo" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Animation Key Inserted." -msgstr "Clave de Animación Insertada." +msgid "Left View." +msgstr "Vista Izquierda." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Objects Drawn" -msgstr "Objetos Dibujados" +msgid "Left" +msgstr "Izquierda" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Material Changes" -msgstr "Cambios de Material" +msgid "Right View." +msgstr "Vista Derecha." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Shader Changes" -msgstr "Cambios de Shader" +msgid "Right" +msgstr "Derecha" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Surface Changes" -msgstr "Cambios de Superficie" +msgid "Front View." +msgstr "Vista Frontal." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Draw Calls" -msgstr "Llamadas de Dibujado" +msgid "Front" +msgstr "Frente" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Vertices" -msgstr "Vértices" +msgid "Rear View." +msgstr "Vista Anterior." #: editor/plugins/spatial_editor_plugin.cpp -msgid "FPS" -msgstr "FPS" +msgid "Rear" +msgstr "Detrás" #: editor/plugins/spatial_editor_plugin.cpp msgid "Align with view" @@ -5261,15 +5285,12 @@ msgid "Freelook Speed Modifier" msgstr "Modificador de Velocidad de Vista Libre" #: editor/plugins/spatial_editor_plugin.cpp -msgid "preview" -msgstr "vista previa" - -#: editor/plugins/spatial_editor_plugin.cpp msgid "XForm Dialog" msgstr "Dialogo XForm" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Select Mode (Q)\n" +#, fuzzy +msgid "Select Mode (Q)" msgstr "Modo Seleccionar (Q)\n" #: editor/plugins/spatial_editor_plugin.cpp @@ -5299,14 +5320,12 @@ msgid "Local Coords" msgstr "Coordenadas Locales" #: editor/plugins/spatial_editor_plugin.cpp -#, fuzzy msgid "Local Space Mode (%s)" -msgstr "Modo de Escalado (R)" +msgstr "Modo de Espacio Local (%s)" #: editor/plugins/spatial_editor_plugin.cpp -#, fuzzy msgid "Snap Mode (%s)" -msgstr "Modo Snap:" +msgstr "Modo de Snap (%s)" #: editor/plugins/spatial_editor_plugin.cpp msgid "Bottom View" @@ -5423,7 +5442,7 @@ msgstr "Configuración" #: editor/plugins/spatial_editor_plugin.cpp msgid "Skeleton Gizmo visibility" -msgstr "" +msgstr "Visibilidad de Esqueleto de Gizmo" #: editor/plugins/spatial_editor_plugin.cpp msgid "Snap Settings" @@ -5549,10 +5568,20 @@ msgstr "Mover (Antes)" msgid "Move (After)" msgstr "Mover (Despues)" +#: editor/plugins/sprite_frames_editor_plugin.cpp +#, fuzzy +msgid "SpriteFrames" +msgstr "Frames del Stack" + #: editor/plugins/style_box_editor_plugin.cpp msgid "StyleBox Preview:" msgstr "Vista Previa de StyleBox:" +#: editor/plugins/style_box_editor_plugin.cpp +#, fuzzy +msgid "StyleBox" +msgstr "Estilo" + #: editor/plugins/texture_region_editor_plugin.cpp msgid "Set Region Rect" msgstr "Setear Region Rect" @@ -5578,14 +5607,17 @@ msgid "Auto Slice" msgstr "Auto Rebanar" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Offset:" msgstr "Offset:" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Step:" msgstr "Paso:" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Separation:" msgstr "Separación:" @@ -5723,6 +5755,10 @@ msgstr "TipografÃa" msgid "Color" msgstr "Color" +#: editor/plugins/theme_editor_plugin.cpp +msgid "Theme" +msgstr "Tema" + #: editor/plugins/tile_map_editor_plugin.cpp msgid "Erase Selection" msgstr "Eliminar Selección" @@ -5808,9 +5844,8 @@ msgid "Merge from scene?" msgstr "¿Mergear desde escena?" #: editor/plugins/tile_set_editor_plugin.cpp -#, fuzzy msgid "Tile Set" -msgstr "TileSet.." +msgstr "Tile Set" #: editor/plugins/tile_set_editor_plugin.cpp msgid "Create from Scene" @@ -5824,6 +5859,32 @@ msgstr "Mergear desde Escena" msgid "Error" msgstr "Error" +#: editor/plugins/tile_set_editor_plugin.cpp +#, fuzzy +msgid "Autotiles" +msgstr "Auto Rebanar" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "" +"Select sub-tile to use as icon, this will be also used on invalid autotile " +"bindings." +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "" +"LMB: set bit on.\n" +"RMB: set bit off." +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +#, fuzzy +msgid "Select current edited sub-tile." +msgstr "Guardar el recurso editado actualmente." + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "Select sub-tile to change it's priority." +msgstr "" + #: editor/progress_dialog.cpp scene/gui/dialogs.cpp msgid "Cancel" msgstr "Cancelar" @@ -5952,10 +6013,23 @@ msgstr "" "Por favor elegà una carpeta que no contenga un archivo 'project.godot'." #: editor/project_manager.cpp +msgid "That's a BINGO!" +msgstr "BINGO!" + +#: editor/project_manager.cpp msgid "Imported Project" msgstr "Proyecto Importado" #: editor/project_manager.cpp +#, fuzzy +msgid "Couldn't create folder." +msgstr "No se pudo crear la carpeta." + +#: editor/project_manager.cpp +msgid "There is already a folder in this path with the specified name." +msgstr "" + +#: editor/project_manager.cpp msgid "It would be a good idea to name your project." msgstr "SerÃa buena idea darle un nombre a tu proyecto." @@ -5996,14 +6070,29 @@ msgid "Import Existing Project" msgstr "Importar Proyecto Existente" #: editor/project_manager.cpp +#, fuzzy +msgid "Import & Edit" +msgstr "Importar y Abrir" + +#: editor/project_manager.cpp msgid "Create New Project" msgstr "Crear Proyecto Nuevo" #: editor/project_manager.cpp +#, fuzzy +msgid "Create & Edit" +msgstr "Crear Emisor" + +#: editor/project_manager.cpp msgid "Install Project:" msgstr "Instalar Proyecto:" #: editor/project_manager.cpp +#, fuzzy +msgid "Install & Edit" +msgstr "Instalar" + +#: editor/project_manager.cpp msgid "Project Name:" msgstr "Nombre del Proyecto:" @@ -6020,10 +6109,6 @@ msgid "Browse" msgstr "Examinar" #: editor/project_manager.cpp -msgid "That's a BINGO!" -msgstr "BINGO!" - -#: editor/project_manager.cpp msgid "Unnamed Project" msgstr "Proyecto Sin Nombre" @@ -6082,6 +6167,10 @@ msgstr "" "¿Confirmar?" #: editor/project_manager.cpp +msgid "Project Manager" +msgstr "Gestor de Proyectos" + +#: editor/project_manager.cpp msgid "Project List" msgstr "Listado de Proyectos" @@ -6210,11 +6299,6 @@ msgid "Button 9" msgstr "Botón 9" #: editor/project_settings_editor.cpp -#: modules/visual_script/visual_script_editor.cpp -msgid "Change" -msgstr "Cambiar" - -#: editor/project_settings_editor.cpp msgid "Joypad Axis Index:" msgstr "Indice del Eje del Gamepad:" @@ -6227,9 +6311,8 @@ msgid "Joypad Button Index:" msgstr "Indice del Boton del Gamepad:" #: editor/project_settings_editor.cpp -#, fuzzy msgid "Erase Input Action" -msgstr "Borrar Evento de Acción de Entrada" +msgstr "Borrar Acción de Entrada" #: editor/project_settings_editor.cpp msgid "Erase Input Action Event" @@ -6477,7 +6560,7 @@ msgstr "Nuevo Script" #: editor/property_editor.cpp msgid "New %s" -msgstr "" +msgstr "Nuevo %s" #: editor/property_editor.cpp msgid "Make Unique" @@ -6512,9 +6595,8 @@ msgid "On" msgstr "On" #: editor/property_editor.cpp -#, fuzzy msgid "[Empty]" -msgstr "Agregar VacÃo" +msgstr "[Vacio]" #: editor/property_editor.cpp modules/visual_script/visual_script_editor.cpp msgid "Set" @@ -6688,7 +6770,8 @@ msgid "Error duplicating scene to save it." msgstr "Error al duplicar escena para guardarla." #: editor/scene_tree_dock.cpp -msgid "Sub-Resources:" +#, fuzzy +msgid "Sub-Resources" msgstr "Sub-Recursos:" #: editor/scene_tree_dock.cpp @@ -6992,7 +7075,7 @@ msgstr "Funcion:" msgid "Pick one or more items from the list to display the graph." msgstr "Elegir uno o mas items de la lista para mostrar el gráfico." -#: editor/script_editor_debugger.cpp +#: editor/script_editor_debugger.cpp modules/mono/editor/mono_bottom_panel.cpp msgid "Errors" msgstr "Errores" @@ -7001,6 +7084,11 @@ msgid "Child Process Connected" msgstr "Proceso Hijo Conectado" #: editor/script_editor_debugger.cpp +#, fuzzy +msgid "Copy Error" +msgstr "Erroes de carga" + +#: editor/script_editor_debugger.cpp msgid "Inspect Previous Instance" msgstr "Inspeccionar Instancia Previa" @@ -7094,7 +7182,7 @@ msgstr "Atajos" #: editor/settings_config_dialog.cpp msgid "Binding" -msgstr "" +msgstr "Binding" #: editor/spatial_editor_gizmos.cpp msgid "Change Light Radius" @@ -7146,43 +7234,39 @@ msgstr "Cambiar Extensión de Sonda" #: modules/gdnative/gdnative_library_editor_plugin.cpp msgid "Select the dynamic library for this entry" -msgstr "" +msgstr "Sleccionar una biblioteca dinamica para esta entrada" #: modules/gdnative/gdnative_library_editor_plugin.cpp msgid "Select dependencies of the library for this entry" -msgstr "" +msgstr "Seleccionar dependencias de la biblioteca para esta entrada" #: modules/gdnative/gdnative_library_editor_plugin.cpp -#, fuzzy msgid "Remove current entry" -msgstr "Quitar Punto de Curva" +msgstr "Quitar ingreso actual" #: modules/gdnative/gdnative_library_editor_plugin.cpp msgid "Double click to create a new entry" -msgstr "" +msgstr "Doble click para crear una nueva entrada" #: modules/gdnative/gdnative_library_editor_plugin.cpp msgid "Platform:" -msgstr "" +msgstr "Plataforma:" #: modules/gdnative/gdnative_library_editor_plugin.cpp -#, fuzzy msgid "Platform" -msgstr "Copiar A Plataforma.." +msgstr "Plataforma" #: modules/gdnative/gdnative_library_editor_plugin.cpp -#, fuzzy msgid "Dynamic Library" -msgstr "Biblioteca" +msgstr "Biblioteca Dinámica" #: modules/gdnative/gdnative_library_editor_plugin.cpp msgid "Add an architecture entry" -msgstr "" +msgstr "Agregar una entrada de arquitectura" #: modules/gdnative/gdnative_library_editor_plugin.cpp -#, fuzzy msgid "GDNativeLibrary" -msgstr "GDNative" +msgstr "GDNativeLibrary" #: modules/gdnative/gdnative_library_singleton_editor.cpp msgid "Library" @@ -7354,10 +7438,58 @@ msgstr "Ajustes de GridMap" msgid "Pick Distance:" msgstr "Elegir Instancia:" +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Generating solution..." +msgstr "Creando contornos..." + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Generating C# project..." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Failed to create solution." +msgstr "No se pudo crear el outline!" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Failed to save solution." +msgstr "Fallo al cargar recurso." + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Done" +msgstr "Hecho!" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Failed to create C# project." +msgstr "Fallo al cargar recurso." + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Mono" +msgstr "Mono" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Create C# solution" +msgstr "Crear Outline" + #: modules/mono/editor/mono_bottom_panel.cpp msgid "Builds" msgstr "Builds" +#: modules/mono/editor/mono_bottom_panel.cpp +#, fuzzy +msgid "Build Project" +msgstr "Proyecto" + +#: modules/mono/editor/mono_bottom_panel.cpp +#, fuzzy +msgid "Warnings" +msgstr "Advertencia" + #: modules/visual_script/visual_script.cpp msgid "" "A node yielded without working memory, please read the docs on how to yield " @@ -7718,23 +7850,33 @@ msgid "Run exported HTML in the system's default browser." msgstr "Ejecutar HTML exportado en el navegador por defecto del sistema." #: platform/javascript/export/export.cpp -msgid "Could not write file:\n" +#, fuzzy +msgid "Could not write file:" msgstr "No se pudo escribir el archivo:\n" #: platform/javascript/export/export.cpp -msgid "Could not open template for export:\n" +#, fuzzy +msgid "Could not open template for export:" msgstr "No se pudo abrir la plantilla para exportar:\n" #: platform/javascript/export/export.cpp -msgid "Invalid export template:\n" +#, fuzzy +msgid "Invalid export template:" msgstr "Plantilla de exportación inválida:\n" #: platform/javascript/export/export.cpp -msgid "Could not read custom HTML shell:\n" +#, fuzzy +msgid "Could not read custom HTML shell:" msgstr "No se pudo leer el shell HTML personalizado:\n" #: platform/javascript/export/export.cpp -msgid "Could not read boot splash image file:\n" +#, fuzzy +msgid "Could not read boot splash image file:" +msgstr "No se pudo leer la imagen de boot splash:\n" + +#: platform/javascript/export/export.cpp +#, fuzzy +msgid "Using default boot splash image." msgstr "No se pudo leer la imagen de boot splash:\n" #: scene/2d/animated_sprite.cpp @@ -7895,23 +8037,20 @@ msgid "ARVROrigin requires an ARVRCamera child node" msgstr "ARVROrigin requiere un nodo hijo ARVRCamera" #: scene/3d/baked_lightmap.cpp -#, fuzzy msgid "Plotting Meshes: " -msgstr "Ploteando Meshes" +msgstr "Ploteando Meshes: " #: scene/3d/baked_lightmap.cpp -#, fuzzy msgid "Plotting Lights:" -msgstr "Ploteando Meshes" +msgstr "Ploteando Luces:" #: scene/3d/baked_lightmap.cpp scene/3d/gi_probe.cpp msgid "Finishing Plot" msgstr "Terminando Ploteo" #: scene/3d/baked_lightmap.cpp -#, fuzzy msgid "Lighting Meshes: " -msgstr "Ploteando Meshes" +msgstr "Iluminando Meshes: " #: scene/3d/collision_polygon.cpp msgid "" @@ -8050,9 +8189,10 @@ msgid "(Other)" msgstr "(Otro)" #: scene/main/scene_tree.cpp +#, fuzzy msgid "" -"Default Environment as specified in Project Setings (Rendering -> Viewport -" -"> Default Environment) could not be loaded." +"Default Environment as specified in Project Setings (Rendering -> " +"Environment -> Default Environment) could not be loaded." msgstr "" "El Entorno por Defecto especificado en Configuracion del Editor (Rendering -" "> Viewport -> Entorno por Defecto) no pudo ser cargado." @@ -8085,6 +8225,9 @@ msgstr "Error cargando tipografÃa." msgid "Invalid font size." msgstr "Tamaño de tipografÃa inválido." +#~ msgid "preview" +#~ msgstr "vista previa" + #~ msgid "Move Add Key" #~ msgstr "Mover o Agregar Clave" @@ -8178,9 +8321,6 @@ msgstr "Tamaño de tipografÃa inválido." #~ msgid "' parsing of config failed." #~ msgstr "' falló el parseo de la configuración." -#~ msgid "Theme" -#~ msgstr "Tema" - #~ msgid "Method List For '%s':" #~ msgstr "Lista de Métodos Para '%s':" @@ -8450,9 +8590,6 @@ msgstr "Tamaño de tipografÃa inválido." #~ msgid "Import Anyway" #~ msgstr "Importar de Todos Modos" -#~ msgid "Import & Open" -#~ msgstr "Importar y Abrir" - #~ msgid "Edited scene has not been saved, open imported scene anyway?" #~ msgstr "" #~ "La escena editada no ha sido guardada, abrir la escena importada de todos " @@ -8710,9 +8847,6 @@ msgstr "Tamaño de tipografÃa inválido." #~ msgid "Stereo" #~ msgstr "Estereo" -#~ msgid "Mono" -#~ msgstr "Mono" - #~ msgid "Pitch" #~ msgstr "Altura" diff --git a/editor/translations/fa.po b/editor/translations/fa.po index ec548d97ae..203c60da01 100644 --- a/editor/translations/fa.po +++ b/editor/translations/fa.po @@ -203,8 +203,7 @@ msgstr "ساختن تعداد d% ترک جدید، ودرج کلیدها؟" #: 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 +#: editor/plugins/particles_editor_plugin.cpp editor/script_create_dialog.cpp msgid "Create" msgstr "ساختن" @@ -559,6 +558,16 @@ msgstr "سیگنال‌ها" #: editor/create_dialog.cpp #, fuzzy +msgid "Change %s Type" +msgstr "تغییر نوع" + +#: editor/create_dialog.cpp editor/project_settings_editor.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Change" +msgstr "تغییر بده" + +#: editor/create_dialog.cpp +#, fuzzy msgid "Create New %s" msgstr "ساختن جدید" @@ -671,7 +680,7 @@ msgstr "" "آیا در هر صورت Øذ٠شوند؟(بدون برگشت)" #: editor/dependency_editor.cpp -msgid "Cannot remove:\n" +msgid "Cannot remove:" msgstr "" #: editor/dependency_editor.cpp @@ -754,8 +763,9 @@ msgstr "برپا کننده های پروژه" msgid "Lead Developer" msgstr "" -#: editor/editor_about.cpp editor/project_manager.cpp -msgid "Project Manager" +#: editor/editor_about.cpp +#, fuzzy +msgid "Project Manager " msgstr "مدیر پروژه" #: editor/editor_about.cpp @@ -840,7 +850,7 @@ msgid "Success!" msgstr "" #: editor/editor_asset_installer.cpp -#: editor/plugins/asset_library_editor_plugin.cpp editor/project_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp msgid "Install" msgstr "" @@ -1153,7 +1163,7 @@ msgid "Packing" msgstr "" #: editor/editor_export.cpp platform/javascript/export/export.cpp -msgid "Template file not found:\n" +msgid "Template file not found:" msgstr "" #: editor/editor_file_dialog.cpp scene/gui/file_dialog.cpp @@ -1408,6 +1418,11 @@ msgstr "خروجی:" msgid "Clear" msgstr "پاک کردن" +#: editor/editor_log.cpp +#, fuzzy +msgid "Clear Output" +msgstr "خروجی" + #: editor/editor_node.cpp editor/plugins/animation_player_editor_plugin.cpp msgid "Error saving resource!" msgstr "" @@ -1474,7 +1489,8 @@ msgstr "" #: editor/editor_node.cpp msgid "" -"Couldn't save scene. Likely dependencies (instances) couldn't be satisfied." +"Couldn't save scene. Likely dependencies (instances or inheritance) couldn't " +"be satisfied." msgstr "" #: editor/editor_node.cpp @@ -2411,8 +2427,9 @@ msgid "No version.txt found inside templates." msgstr "" #: editor/export_template_manager.cpp -msgid "Error creating path for templates:\n" -msgstr "" +#, fuzzy +msgid "Error creating path for templates:" +msgstr "خطای بارگذاری قلم." #: editor/export_template_manager.cpp msgid "Extracting Export Templates" @@ -2568,9 +2585,7 @@ msgid "View items as a list" msgstr "" #: editor/filesystem_dock.cpp -msgid "" -"\n" -"Status: Import of file failed. Please fix file and reimport manually." +msgid "Status: Import of file failed. Please fix file and reimport manually." msgstr "" #: editor/filesystem_dock.cpp @@ -2578,22 +2593,22 @@ msgid "Cannot move/rename resources root." msgstr "" #: editor/filesystem_dock.cpp -msgid "Cannot move a folder into itself.\n" +msgid "Cannot move a folder into itself." msgstr "" #: editor/filesystem_dock.cpp #, fuzzy -msgid "Error moving:\n" +msgid "Error moving:" msgstr "خطا در بارگذاری:" #: editor/filesystem_dock.cpp #, fuzzy -msgid "Error duplicating:\n" +msgid "Error duplicating:" msgstr "خطا در بارگذاری:" #: editor/filesystem_dock.cpp #, fuzzy -msgid "Unable to update dependencies:\n" +msgid "Unable to update dependencies:" msgstr "خطا در بارگذاری صØنه به دلیل بستگی‌های Ù…Ùقود:" #: editor/filesystem_dock.cpp @@ -3238,6 +3253,11 @@ msgstr "ویرایش صاÙÛŒ های گره" msgid "Filters.." msgstr "" +#: editor/plugins/animation_tree_editor_plugin.cpp +#, fuzzy +msgid "AnimationTree" +msgstr "گره انیمیشن" + #: editor/plugins/asset_library_editor_plugin.cpp msgid "Free" msgstr "" @@ -3405,6 +3425,7 @@ msgid "Bake Lightmaps" msgstr "" #: editor/plugins/camera_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Preview" msgstr "" @@ -4096,7 +4117,7 @@ msgid "Bake!" msgstr "" #: editor/plugins/navigation_mesh_editor_plugin.cpp -msgid "Bake the navigation mesh.\n" +msgid "Bake the navigation mesh." msgstr "" #: editor/plugins/navigation_mesh_editor_plugin.cpp @@ -4489,14 +4510,17 @@ msgstr "" msgid "Paste" msgstr "چسباندن" +#: editor/plugins/resource_preloader_editor_plugin.cpp +#, fuzzy +msgid "ResourcePreloader" +msgstr "منبع" + #: editor/plugins/script_editor_plugin.cpp msgid "Clear Recent Files" msgstr "" #: editor/plugins/script_editor_plugin.cpp -msgid "" -"Close and save changes?\n" -"\"" +msgid "Close and save changes?" msgstr "" #: editor/plugins/script_editor_plugin.cpp @@ -4574,6 +4598,11 @@ msgid "Copy Script Path" msgstr "رونوشت مسیر گره" #: editor/plugins/script_editor_plugin.cpp +#, fuzzy +msgid "Show In File System" +msgstr "سامانه پرونده" + +#: editor/plugins/script_editor_plugin.cpp msgid "History Prev" msgstr "" @@ -5012,84 +5041,84 @@ msgid "Rotating %s degrees." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Bottom View." +msgid "Keying is disabled (no key inserted)." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Bottom" +msgid "Animation Key Inserted." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Top View." +msgid "Objects Drawn" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Rear View." +msgid "Material Changes" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Rear" -msgstr "" +#, fuzzy +msgid "Shader Changes" +msgstr "تغییر بده" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Front View." +msgid "Surface Changes" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Front" +msgid "Draw Calls" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Left View." +msgid "Vertices" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Left" +msgid "FPS" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Right View." +msgid "Top View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Right" +msgid "Bottom View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Keying is disabled (no key inserted)." +msgid "Bottom" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Animation Key Inserted." +msgid "Left View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Objects Drawn" +msgid "Left" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Material Changes" +msgid "Right View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -#, fuzzy -msgid "Shader Changes" -msgstr "تغییر بده" +msgid "Right" +msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Surface Changes" +msgid "Front View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Draw Calls" +msgid "Front" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Vertices" +msgid "Rear View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "FPS" +msgid "Rear" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp @@ -5181,16 +5210,12 @@ 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 #, fuzzy -msgid "Select Mode (Q)\n" +msgid "Select Mode (Q)" msgstr "انتخاب Øالت" #: editor/plugins/spatial_editor_plugin.cpp @@ -5468,10 +5493,18 @@ msgstr "مسیر به سمت گره:" msgid "Move (After)" msgstr "" +#: editor/plugins/sprite_frames_editor_plugin.cpp +msgid "SpriteFrames" +msgstr "" + #: editor/plugins/style_box_editor_plugin.cpp msgid "StyleBox Preview:" msgstr "" +#: editor/plugins/style_box_editor_plugin.cpp +msgid "StyleBox" +msgstr "" + #: editor/plugins/texture_region_editor_plugin.cpp msgid "Set Region Rect" msgstr "" @@ -5497,14 +5530,17 @@ msgid "Auto Slice" msgstr "" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Offset:" msgstr "" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Step:" msgstr "" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Separation:" msgstr "" @@ -5644,6 +5680,10 @@ msgstr "" msgid "Color" msgstr "" +#: editor/plugins/theme_editor_plugin.cpp +msgid "Theme" +msgstr "" + #: editor/plugins/tile_map_editor_plugin.cpp #, fuzzy msgid "Erase Selection" @@ -5747,6 +5787,31 @@ msgstr "" msgid "Error" msgstr "" +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "Autotiles" +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "" +"Select sub-tile to use as icon, this will be also used on invalid autotile " +"bindings." +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "" +"LMB: set bit on.\n" +"RMB: set bit off." +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +#, fuzzy +msgid "Select current edited sub-tile." +msgstr "ساختن پوشه" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "Select sub-tile to change it's priority." +msgstr "" + #: editor/progress_dialog.cpp scene/gui/dialogs.cpp msgid "Cancel" msgstr "لغو" @@ -5869,10 +5934,23 @@ msgid "Please choose a folder that does not contain a 'project.godot' file." msgstr "" #: editor/project_manager.cpp +msgid "That's a BINGO!" +msgstr "" + +#: editor/project_manager.cpp msgid "Imported Project" msgstr "پروژه واردشده" #: editor/project_manager.cpp +#, fuzzy +msgid "Couldn't create folder." +msgstr "ناتوان در ساختن پوشه." + +#: editor/project_manager.cpp +msgid "There is already a folder in this path with the specified name." +msgstr "" + +#: editor/project_manager.cpp msgid "It would be a good idea to name your project." msgstr "" @@ -5913,14 +5991,29 @@ msgid "Import Existing Project" msgstr "وارد کردن پروژه موجود" #: editor/project_manager.cpp +#, fuzzy +msgid "Import & Edit" +msgstr "وارد کردن" + +#: editor/project_manager.cpp msgid "Create New Project" msgstr "ساختن پروژه جدید" #: editor/project_manager.cpp +#, fuzzy +msgid "Create & Edit" +msgstr "ساختن گره" + +#: editor/project_manager.cpp msgid "Install Project:" msgstr "نصب پروژه:" #: editor/project_manager.cpp +#, fuzzy +msgid "Install & Edit" +msgstr "(نصب شده)" + +#: editor/project_manager.cpp msgid "Project Name:" msgstr "نام پروژه:" @@ -5937,10 +6030,6 @@ msgid "Browse" msgstr "" #: editor/project_manager.cpp -msgid "That's a BINGO!" -msgstr "" - -#: editor/project_manager.cpp msgid "Unnamed Project" msgstr "پروژه بی نام" @@ -5988,6 +6077,10 @@ msgstr "" "آیا انجام این عمل را تایید Ù…ÛŒ کنید؟‌" #: editor/project_manager.cpp +msgid "Project Manager" +msgstr "مدیر پروژه" + +#: editor/project_manager.cpp msgid "Project List" msgstr "Ùهرست پروژه ها" @@ -6114,11 +6207,6 @@ 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 "" @@ -6590,7 +6678,8 @@ msgid "Error duplicating scene to save it." msgstr "" #: editor/scene_tree_dock.cpp -msgid "Sub-Resources:" +#, fuzzy +msgid "Sub-Resources" msgstr "زیرمنبع‌ها:" #: editor/scene_tree_dock.cpp @@ -6894,7 +6983,7 @@ msgstr "" msgid "Pick one or more items from the list to display the graph." msgstr "" -#: editor/script_editor_debugger.cpp +#: editor/script_editor_debugger.cpp modules/mono/editor/mono_bottom_panel.cpp msgid "Errors" msgstr "" @@ -6903,6 +6992,11 @@ msgid "Child Process Connected" msgstr "" #: editor/script_editor_debugger.cpp +#, fuzzy +msgid "Copy Error" +msgstr "خطاهای بارگذاری" + +#: editor/script_editor_debugger.cpp msgid "Inspect Previous Instance" msgstr "" @@ -7266,10 +7360,54 @@ msgstr "ترجیØات" msgid "Pick Distance:" msgstr "" +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Generating solution..." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Generating C# project..." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Failed to create solution." +msgstr "ناتوان در ساختن پوشه." + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Failed to save solution." +msgstr "انتخاب شده را تغییر مقیاس بده" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Done" +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Failed to create C# project." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Mono" +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Create C# solution" +msgstr "انتخاب شده را تغییر مقیاس بده" + #: modules/mono/editor/mono_bottom_panel.cpp msgid "Builds" msgstr "" +#: modules/mono/editor/mono_bottom_panel.cpp +#, fuzzy +msgid "Build Project" +msgstr "پروژه" + +#: modules/mono/editor/mono_bottom_panel.cpp +msgid "Warnings" +msgstr "" + #: modules/visual_script/visual_script.cpp msgid "" "A node yielded without working memory, please read the docs on how to yield " @@ -7639,27 +7777,32 @@ msgstr "" #: platform/javascript/export/export.cpp #, fuzzy -msgid "Could not write file:\n" +msgid "Could not write file:" msgstr "نمی‌تواند یک پوشه ایجاد شود." #: platform/javascript/export/export.cpp #, fuzzy -msgid "Could not open template for export:\n" +msgid "Could not open template for export:" msgstr "نمی‌تواند یک پوشه ایجاد شود." #: platform/javascript/export/export.cpp #, fuzzy -msgid "Invalid export template:\n" +msgid "Invalid export template:" msgstr "نام دارایی ایندکس نامعتبر." #: platform/javascript/export/export.cpp #, fuzzy -msgid "Could not read custom HTML shell:\n" +msgid "Could not read custom HTML shell:" +msgstr "نمی‌تواند یک پوشه ایجاد شود." + +#: platform/javascript/export/export.cpp +#, fuzzy +msgid "Could not read boot splash image file:" msgstr "نمی‌تواند یک پوشه ایجاد شود." #: platform/javascript/export/export.cpp #, fuzzy -msgid "Could not read boot splash image file:\n" +msgid "Using default boot splash image." msgstr "نمی‌تواند یک پوشه ایجاد شود." #: scene/2d/animated_sprite.cpp @@ -7960,8 +8103,8 @@ msgstr "(دیگر)" #: scene/main/scene_tree.cpp msgid "" -"Default Environment as specified in Project Setings (Rendering -> Viewport -" -"> Default Environment) could not be loaded." +"Default Environment as specified in Project Setings (Rendering -> " +"Environment -> Default Environment) could not be loaded." msgstr "" #: scene/main/viewport.cpp diff --git a/editor/translations/fi.po b/editor/translations/fi.po index f0a58b9e1c..8efc80b6ed 100644 --- a/editor/translations/fi.po +++ b/editor/translations/fi.po @@ -204,8 +204,7 @@ msgstr "Luo %d uutta raitaa ja lisää avaimet?" #: 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 +#: editor/plugins/particles_editor_plugin.cpp editor/script_create_dialog.cpp msgid "Create" msgstr "Luo" @@ -564,6 +563,16 @@ msgstr "Signaalit" #: editor/create_dialog.cpp #, fuzzy +msgid "Change %s Type" +msgstr "Muuta tyyppiä" + +#: editor/create_dialog.cpp editor/project_settings_editor.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Change" +msgstr "Muuta" + +#: editor/create_dialog.cpp +#, fuzzy msgid "Create New %s" msgstr "Luo uusi" @@ -677,7 +686,8 @@ msgstr "" "Poistetaanko silti? (ei mahdollisuutta kumota)" #: editor/dependency_editor.cpp -msgid "Cannot remove:\n" +#, fuzzy +msgid "Cannot remove:" msgstr "Ei voida poistaa:\n" #: editor/dependency_editor.cpp @@ -764,8 +774,9 @@ msgstr "Projektin perustajat" msgid "Lead Developer" msgstr "Pääkehittäjä" -#: editor/editor_about.cpp editor/project_manager.cpp -msgid "Project Manager" +#: editor/editor_about.cpp +#, fuzzy +msgid "Project Manager " msgstr "Projektinhallinta" #: editor/editor_about.cpp @@ -854,7 +865,7 @@ msgid "Success!" msgstr "Onnistui!" #: editor/editor_asset_installer.cpp -#: editor/plugins/asset_library_editor_plugin.cpp editor/project_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp msgid "Install" msgstr "Asenna" @@ -1173,7 +1184,8 @@ msgid "Packing" msgstr "Pakataan" #: editor/editor_export.cpp platform/javascript/export/export.cpp -msgid "Template file not found:\n" +#, fuzzy +msgid "Template file not found:" msgstr "Mallitiedostoa ei löytynyt:\n" #: editor/editor_file_dialog.cpp scene/gui/file_dialog.cpp @@ -1448,6 +1460,11 @@ msgstr " Tuloste:" msgid "Clear" msgstr "Tyhjennä" +#: editor/editor_log.cpp +#, fuzzy +msgid "Clear Output" +msgstr "Tuloste" + #: editor/editor_node.cpp editor/plugins/animation_player_editor_plugin.cpp msgid "Error saving resource!" msgstr "Virhe tallennettaessa resurssia!" @@ -1515,8 +1532,10 @@ msgid "This operation can't be done without a tree root." msgstr "Tätä toimintoa ei voi tehdä ilman Sceneä." #: editor/editor_node.cpp +#, fuzzy msgid "" -"Couldn't save scene. Likely dependencies (instances) couldn't be satisfied." +"Couldn't save scene. Likely dependencies (instances or inheritance) couldn't " +"be satisfied." msgstr "Sceneä ei voitu tallentaa. Riippuvuuksia ei voitu tyydyttää." #: editor/editor_node.cpp @@ -2519,7 +2538,8 @@ msgid "No version.txt found inside templates." msgstr "version.txt -tiedostoa ei löytynyt." #: editor/export_template_manager.cpp -msgid "Error creating path for templates:\n" +#, fuzzy +msgid "Error creating path for templates:" msgstr "Virhe luotaessa polkua mallille:\n" #: editor/export_template_manager.cpp @@ -2692,9 +2712,8 @@ msgid "View items as a list" msgstr "Listanäkymä" #: editor/filesystem_dock.cpp -msgid "" -"\n" -"Status: Import of file failed. Please fix file and reimport manually." +#, fuzzy +msgid "Status: Import of file failed. Please fix file and reimport manually." msgstr "" "\n" "Tila: Tuonti epäonnistui. Ole hyvä, korjaa tiedosto, ja tuo uudelleen." @@ -2704,22 +2723,23 @@ msgid "Cannot move/rename resources root." msgstr "Ei voitu siirtää/nimetä uudelleen resurssien päätasoa." #: editor/filesystem_dock.cpp -msgid "Cannot move a folder into itself.\n" +#, fuzzy +msgid "Cannot move a folder into itself." msgstr "Hakemistoa ei voi siirtää itsensä sisään.\n" #: editor/filesystem_dock.cpp #, fuzzy -msgid "Error moving:\n" +msgid "Error moving:" msgstr "Virhe tuotaessa:" #: editor/filesystem_dock.cpp #, fuzzy -msgid "Error duplicating:\n" +msgid "Error duplicating:" msgstr "Virhe ladatessa:" #: editor/filesystem_dock.cpp #, fuzzy -msgid "Unable to update dependencies:\n" +msgid "Unable to update dependencies:" msgstr "Scenellä '%s' on rikkinäisiä riippuvuuksia:" #: editor/filesystem_dock.cpp @@ -3385,6 +3405,11 @@ msgstr "Muokkaa noden suodattimia" msgid "Filters.." msgstr "Suodattimet..." +#: editor/plugins/animation_tree_editor_plugin.cpp +#, fuzzy +msgid "AnimationTree" +msgstr "Animaatio" + #: editor/plugins/asset_library_editor_plugin.cpp msgid "Free" msgstr "Vapauta" @@ -3558,6 +3583,7 @@ msgid "Bake Lightmaps" msgstr "Muunna Lightmapiksi:" #: editor/plugins/camera_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Preview" msgstr "Esikatselu" @@ -4269,7 +4295,7 @@ msgid "Bake!" msgstr "" #: editor/plugins/navigation_mesh_editor_plugin.cpp -msgid "Bake the navigation mesh.\n" +msgid "Bake the navigation mesh." msgstr "" #: editor/plugins/navigation_mesh_editor_plugin.cpp @@ -4673,15 +4699,19 @@ msgstr "Lataa resurssi" msgid "Paste" msgstr "Liitä" +#: editor/plugins/resource_preloader_editor_plugin.cpp +#, fuzzy +msgid "ResourcePreloader" +msgstr "Resurssi" + #: editor/plugins/script_editor_plugin.cpp #, fuzzy msgid "Clear Recent Files" msgstr "Tyhjennä luut" #: editor/plugins/script_editor_plugin.cpp -msgid "" -"Close and save changes?\n" -"\"" +#, fuzzy +msgid "Close and save changes?" msgstr "" "Sulje ja tallenna muutokset?\n" "\"" @@ -4761,6 +4791,11 @@ msgid "Copy Script Path" msgstr "Kopioi polku" #: editor/plugins/script_editor_plugin.cpp +#, fuzzy +msgid "Show In File System" +msgstr "Näytä tiedostojärjestelmässä" + +#: editor/plugins/script_editor_plugin.cpp msgid "History Prev" msgstr "Edellinen historiassa" @@ -5204,89 +5239,89 @@ msgid "Rotating %s degrees." msgstr "Kierto %s astetta." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Bottom View." -msgstr "Pohjanäkymä." +msgid "Keying is disabled (no key inserted)." +msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Bottom" -msgstr "Pohja" +msgid "Animation Key Inserted." +msgstr "Animaatioavain lisätty." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Top View." -msgstr "Pintanäkymä." +msgid "Objects Drawn" +msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Rear View." -msgstr "Takanäkymä." +#, fuzzy +msgid "Material Changes" +msgstr "Päivitä muutokset" #: editor/plugins/spatial_editor_plugin.cpp #, fuzzy -msgid "Rear" -msgstr "Taka/perä" +msgid "Shader Changes" +msgstr "Päivitä muutokset" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Front View." -msgstr "Etunäkymä." +#, fuzzy +msgid "Surface Changes" +msgstr "Päivitä muutokset" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Front" -msgstr "Etu" +msgid "Draw Calls" +msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Left View." -msgstr "Vasen näkymä." +#, fuzzy +msgid "Vertices" +msgstr "Ominaisuudet:" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Left" -msgstr "Vasen" +msgid "FPS" +msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Right View." -msgstr "Oikea näkymä." +msgid "Top View." +msgstr "Pintanäkymä." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Right" -msgstr "OIkea" +msgid "Bottom View." +msgstr "Pohjanäkymä." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Keying is disabled (no key inserted)." -msgstr "" +msgid "Bottom" +msgstr "Pohja" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Animation Key Inserted." -msgstr "Animaatioavain lisätty." +msgid "Left View." +msgstr "Vasen näkymä." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Objects Drawn" -msgstr "" +msgid "Left" +msgstr "Vasen" #: editor/plugins/spatial_editor_plugin.cpp -#, fuzzy -msgid "Material Changes" -msgstr "Päivitä muutokset" +msgid "Right View." +msgstr "Oikea näkymä." #: editor/plugins/spatial_editor_plugin.cpp -#, fuzzy -msgid "Shader Changes" -msgstr "Päivitä muutokset" +msgid "Right" +msgstr "OIkea" #: editor/plugins/spatial_editor_plugin.cpp -#, fuzzy -msgid "Surface Changes" -msgstr "Päivitä muutokset" +msgid "Front View." +msgstr "Etunäkymä." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Draw Calls" -msgstr "" +msgid "Front" +msgstr "Etu" #: editor/plugins/spatial_editor_plugin.cpp -#, fuzzy -msgid "Vertices" -msgstr "Ominaisuudet:" +msgid "Rear View." +msgstr "Takanäkymä." #: editor/plugins/spatial_editor_plugin.cpp -msgid "FPS" -msgstr "" +#, fuzzy +msgid "Rear" +msgstr "Taka/perä" #: editor/plugins/spatial_editor_plugin.cpp msgid "Align with view" @@ -5382,17 +5417,12 @@ msgid "Freelook Speed Modifier" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -#, fuzzy -msgid "preview" -msgstr "Esikatselu" - -#: editor/plugins/spatial_editor_plugin.cpp msgid "XForm Dialog" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp #, fuzzy -msgid "Select Mode (Q)\n" +msgid "Select Mode (Q)" msgstr "Valitse tila" #: editor/plugins/spatial_editor_plugin.cpp @@ -5677,10 +5707,20 @@ msgstr "Poista Node(t)" msgid "Move (After)" msgstr "Siirry vasemmalle" +#: editor/plugins/sprite_frames_editor_plugin.cpp +#, fuzzy +msgid "SpriteFrames" +msgstr "Pinoa Framet" + #: editor/plugins/style_box_editor_plugin.cpp msgid "StyleBox Preview:" msgstr "StyleBox:in esikatselu:" +#: editor/plugins/style_box_editor_plugin.cpp +#, fuzzy +msgid "StyleBox" +msgstr "Tyyli" + #: editor/plugins/texture_region_editor_plugin.cpp #, fuzzy msgid "Set Region Rect" @@ -5707,14 +5747,17 @@ msgid "Auto Slice" msgstr "Jaa automaattisesti" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Offset:" msgstr "Siirtymä:" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Step:" msgstr "Välistys:" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Separation:" msgstr "Erotus:" @@ -5856,6 +5899,10 @@ msgstr "Fontti" msgid "Color" msgstr "Väri" +#: editor/plugins/theme_editor_plugin.cpp +msgid "Theme" +msgstr "Teema" + #: editor/plugins/tile_map_editor_plugin.cpp #, fuzzy msgid "Erase Selection" @@ -5959,6 +6006,32 @@ msgstr "" msgid "Error" msgstr "Virhe" +#: editor/plugins/tile_set_editor_plugin.cpp +#, fuzzy +msgid "Autotiles" +msgstr "Jaa automaattisesti" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "" +"Select sub-tile to use as icon, this will be also used on invalid autotile " +"bindings." +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "" +"LMB: set bit on.\n" +"RMB: set bit off." +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +#, fuzzy +msgid "Select current edited sub-tile." +msgstr "Tallenna tällä hetkellä muokattu resurssi." + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "Select sub-tile to change it's priority." +msgstr "" + #: editor/progress_dialog.cpp scene/gui/dialogs.cpp msgid "Cancel" msgstr "Peru" @@ -6084,10 +6157,23 @@ msgid "Please choose a folder that does not contain a 'project.godot' file." msgstr "Ole hyvä ja valitse hakemisto jossa ei ole 'project.godot' tiedostoa." #: editor/project_manager.cpp +msgid "That's a BINGO!" +msgstr "Sehän on BINGO!" + +#: editor/project_manager.cpp msgid "Imported Project" msgstr "Tuotu projekti" #: editor/project_manager.cpp +#, fuzzy +msgid "Couldn't create folder." +msgstr "Kansiota ei voitu luoda." + +#: editor/project_manager.cpp +msgid "There is already a folder in this path with the specified name." +msgstr "" + +#: editor/project_manager.cpp msgid "It would be a good idea to name your project." msgstr "Olisi hyvä idea antaa projektillesi nimi." @@ -6132,14 +6218,29 @@ msgid "Import Existing Project" msgstr "Tuo olemassaoleva projekti" #: editor/project_manager.cpp +#, fuzzy +msgid "Import & Edit" +msgstr "Tuo & Avaa" + +#: editor/project_manager.cpp msgid "Create New Project" msgstr "Luo uusi projekti" #: editor/project_manager.cpp +#, fuzzy +msgid "Create & Edit" +msgstr "Luo säteilijä/lähetin" + +#: editor/project_manager.cpp msgid "Install Project:" msgstr "Asenna projekti:" #: editor/project_manager.cpp +#, fuzzy +msgid "Install & Edit" +msgstr "Asenna" + +#: editor/project_manager.cpp msgid "Project Name:" msgstr "Projektin nimi:" @@ -6157,10 +6258,6 @@ msgid "Browse" msgstr "Selaa" #: editor/project_manager.cpp -msgid "That's a BINGO!" -msgstr "Sehän on BINGO!" - -#: editor/project_manager.cpp msgid "Unnamed Project" msgstr "Nimetön projekti" @@ -6214,6 +6311,10 @@ msgid "" msgstr "Olet aikeissa etsiä hakemistosta %s Godot projekteja. Oletko varma?" #: editor/project_manager.cpp +msgid "Project Manager" +msgstr "Projektinhallinta" + +#: editor/project_manager.cpp msgid "Project List" msgstr "Projektiluettelo" @@ -6344,11 +6445,6 @@ msgid "Button 9" msgstr "Painike 9" #: editor/project_settings_editor.cpp -#: modules/visual_script/visual_script_editor.cpp -msgid "Change" -msgstr "Muuta" - -#: editor/project_settings_editor.cpp msgid "Joypad Axis Index:" msgstr "Ohjaimen akselin indeksi:" @@ -6825,7 +6921,7 @@ msgstr "" #: editor/scene_tree_dock.cpp #, fuzzy -msgid "Sub-Resources:" +msgid "Sub-Resources" msgstr "Resurssit" #: editor/scene_tree_dock.cpp @@ -7131,7 +7227,7 @@ msgstr "Funktio:" msgid "Pick one or more items from the list to display the graph." msgstr "" -#: editor/script_editor_debugger.cpp +#: editor/script_editor_debugger.cpp modules/mono/editor/mono_bottom_panel.cpp msgid "Errors" msgstr "Virheet" @@ -7140,6 +7236,11 @@ msgid "Child Process Connected" msgstr "Lapsiprosessi yhdistetty" #: editor/script_editor_debugger.cpp +#, fuzzy +msgid "Copy Error" +msgstr "Lataa virheet" + +#: editor/script_editor_debugger.cpp msgid "Inspect Previous Instance" msgstr "Tarkastele edellistä instanssia" @@ -7504,10 +7605,57 @@ msgstr "Näyttöruudun asetukset" msgid "Pick Distance:" msgstr "Poimi tile" +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Generating solution..." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Generating C# project..." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Failed to create solution." +msgstr "Ääriviivoja ei voitu luoda!" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Failed to save solution." +msgstr "Resurssin lataaminen epäonnistui." + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Done" +msgstr "Valmis!" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Failed to create C# project." +msgstr "Resurssin lataaminen epäonnistui." + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Mono" +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Create C# solution" +msgstr "Luo ääriviivat" + #: modules/mono/editor/mono_bottom_panel.cpp msgid "Builds" msgstr "" +#: modules/mono/editor/mono_bottom_panel.cpp +#, fuzzy +msgid "Build Project" +msgstr "Uusi projekti" + +#: modules/mono/editor/mono_bottom_panel.cpp +#, fuzzy +msgid "Warnings" +msgstr "Varoitus" + #: modules/visual_script/visual_script.cpp msgid "" "A node yielded without working memory, please read the docs on how to yield " @@ -7865,26 +8013,33 @@ msgid "Run exported HTML in the system's default browser." msgstr "Suorita viety HTML järjestelmän oletusselaimessa." #: platform/javascript/export/export.cpp -msgid "Could not write file:\n" +#, fuzzy +msgid "Could not write file:" msgstr "Ei voitu kirjoittaa tiedostoa:\n" #: platform/javascript/export/export.cpp -msgid "Could not open template for export:\n" -msgstr "" +#, fuzzy +msgid "Could not open template for export:" +msgstr "Kansiota ei voitu luoda." #: platform/javascript/export/export.cpp #, fuzzy -msgid "Invalid export template:\n" +msgid "Invalid export template:" msgstr "Hallitse vietäviä Templateja" #: platform/javascript/export/export.cpp #, fuzzy -msgid "Could not read custom HTML shell:\n" +msgid "Could not read custom HTML shell:" msgstr "Ei voitu lukea tiedostoa:\n" #: platform/javascript/export/export.cpp #, fuzzy -msgid "Could not read boot splash image file:\n" +msgid "Could not read boot splash image file:" +msgstr "Ei voitu lukea tiedostoa:\n" + +#: platform/javascript/export/export.cpp +#, fuzzy +msgid "Using default boot splash image." msgstr "Ei voitu lukea tiedostoa:\n" #: scene/2d/animated_sprite.cpp @@ -8148,8 +8303,8 @@ msgstr "" #: scene/main/scene_tree.cpp #, fuzzy msgid "" -"Default Environment as specified in Project Setings (Rendering -> Viewport -" -"> Default Environment) could not be loaded." +"Default Environment as specified in Project Setings (Rendering -> " +"Environment -> Default Environment) could not be loaded." msgstr "" "Projektin asetuksissa määriteltyä oletusympäristöä (Renderöinti -> Näkymä -" "> Oletusympäristö) ei voitu ladata." @@ -8183,6 +8338,10 @@ msgid "Invalid font size." msgstr "Virheellinen fonttikoko." #, fuzzy +#~ msgid "preview" +#~ msgstr "Esikatselu" + +#, fuzzy #~ msgid "Move Add Key" #~ msgstr "Siirrä lisäyspainiketta" @@ -8241,9 +8400,6 @@ msgstr "Virheellinen fonttikoko." #~ msgid "Filter:" #~ msgstr "Suodatin:" -#~ msgid "Theme" -#~ msgstr "Teema" - #~ msgid "Arguments:" #~ msgstr "Argumentit:" @@ -8411,9 +8567,6 @@ msgstr "Virheellinen fonttikoko." #~ msgid "Import Anyway" #~ msgstr "Tuo joka tapauksessa" -#~ msgid "Import & Open" -#~ msgstr "Tuo & Avaa" - #~ msgid "Edited scene has not been saved, open imported scene anyway?" #~ msgstr "" #~ "Muokattua Sceneä ei ole tallennettu, avaa tuotu Scene joka tapauksessa?" diff --git a/editor/translations/fr.po b/editor/translations/fr.po index 396dc01a02..008dfef6fb 100644 --- a/editor/translations/fr.po +++ b/editor/translations/fr.po @@ -5,6 +5,7 @@ # # Antoine Carrier <ac.g392@gmail.com>, 2017. # ARocherVj <a.rocher.vj@gmail.com>, 2017. +# Arthur Templé <tuturtemple@gmail.com>, 2018. # Brice <bbric@free.fr>, 2016. # Chenebel Dorian <LoubiTek54@gmail.com>, 2016-2017. # derderder77 <derderder77380@gmail.com>, 2016. @@ -34,8 +35,8 @@ msgid "" msgstr "" "Project-Id-Version: Godot Engine editor\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2017-12-07 06:46+0000\n" -"Last-Translator: LL <lu.lecocq@free.fr>\n" +"PO-Revision-Date: 2018-01-06 13:19+0000\n" +"Last-Translator: Arthur Templé <tuturtemple@gmail.com>\n" "Language-Team: French <https://hosted.weblate.org/projects/godot-engine/" "godot/fr/>\n" "Language: fr\n" @@ -43,7 +44,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.18-dev\n" +"X-Generator: Weblate 2.19-dev\n" #: editor/animation_editor.cpp msgid "Disabled" @@ -54,9 +55,8 @@ msgid "All Selection" msgstr "Toute la sélection" #: editor/animation_editor.cpp -#, fuzzy msgid "Anim Change Keyframe Time" -msgstr "Animation Changer la valeur" +msgstr "Changer l'heure de l'animation des images clés" #: editor/animation_editor.cpp msgid "Anim Change Transition" @@ -67,9 +67,8 @@ msgid "Anim Change Transform" msgstr "Animation Changer la transformation" #: editor/animation_editor.cpp -#, fuzzy msgid "Anim Change Keyframe Value" -msgstr "Animation Changer la valeur" +msgstr "Changer la valeur de l'animation des images clés" #: editor/animation_editor.cpp msgid "Anim Change Call" @@ -225,8 +224,7 @@ msgstr "Créer %d NOUVELLES pistes et insérer des clés ?" #: 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 +#: editor/plugins/particles_editor_plugin.cpp editor/script_create_dialog.cpp msgid "Create" msgstr "Créer" @@ -564,9 +562,8 @@ msgid "Connecting Signal:" msgstr "Connecter un signal :" #: editor/connections_dialog.cpp -#, fuzzy msgid "Disconnect '%s' from '%s'" -msgstr "Connecter « %s » à « %s »" +msgstr "Déconnecter « %s » de « %s »" #: editor/connections_dialog.cpp msgid "Connect.." @@ -583,8 +580,17 @@ msgstr "Signaux" #: editor/create_dialog.cpp #, fuzzy +msgid "Change %s Type" +msgstr "Changer le type" + +#: editor/create_dialog.cpp editor/project_settings_editor.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Change" +msgstr "Changer" + +#: editor/create_dialog.cpp msgid "Create New %s" -msgstr "Créer un nouveau" +msgstr "Créer un nouveau %s" #: editor/create_dialog.cpp editor/editor_file_dialog.cpp #: editor/filesystem_dock.cpp @@ -696,7 +702,8 @@ msgstr "" "Les supprimer tout de même ? (annulation impossible)" #: editor/dependency_editor.cpp -msgid "Cannot remove:\n" +#, fuzzy +msgid "Cannot remove:" msgstr "Impossible à enlever :\n" #: editor/dependency_editor.cpp @@ -779,8 +786,9 @@ msgstr "Fondateurs du projet" msgid "Lead Developer" msgstr "Développeur principal" -#: editor/editor_about.cpp editor/project_manager.cpp -msgid "Project Manager" +#: editor/editor_about.cpp +#, fuzzy +msgid "Project Manager " msgstr "Gestionnaire de projets" #: editor/editor_about.cpp @@ -869,7 +877,7 @@ msgid "Success!" msgstr "Succès!" #: editor/editor_asset_installer.cpp -#: editor/plugins/asset_library_editor_plugin.cpp editor/project_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp msgid "Install" msgstr "Installer" @@ -957,7 +965,7 @@ msgstr "Supprimer l'effet" #: editor/editor_audio_buses.cpp msgid "Audio" -msgstr "" +msgstr "Audio" #: editor/editor_audio_buses.cpp msgid "Add Audio Bus" @@ -1144,7 +1152,7 @@ msgstr "(vide)" #: editor/editor_data.cpp msgid "[unsaved]" -msgstr "" +msgstr "(Non sauvegardé)" #: editor/editor_dir_dialog.cpp msgid "Please select a base directory first" @@ -1184,7 +1192,8 @@ msgid "Packing" msgstr "Empaquetage" #: editor/editor_export.cpp platform/javascript/export/export.cpp -msgid "Template file not found:\n" +#, fuzzy +msgid "Template file not found:" msgstr "Fichier modèle introuvable :\n" #: editor/editor_file_dialog.cpp scene/gui/file_dialog.cpp @@ -1442,6 +1451,11 @@ msgstr "Sortie :" msgid "Clear" msgstr "Effacer" +#: editor/editor_log.cpp +#, fuzzy +msgid "Clear Output" +msgstr "Sortie" + #: editor/editor_node.cpp editor/plugins/animation_player_editor_plugin.cpp msgid "Error saving resource!" msgstr "Erreur d'enregistrement de la ressource !" @@ -1504,8 +1518,10 @@ msgid "This operation can't be done without a tree root." msgstr "Cette opération ne peut être réalisée sans une arborescence racine." #: editor/editor_node.cpp +#, fuzzy msgid "" -"Couldn't save scene. Likely dependencies (instances) couldn't be satisfied." +"Couldn't save scene. Likely dependencies (instances or inheritance) couldn't " +"be satisfied." msgstr "" "Impossible d'enregistrer la scène. Les dépendances (instances) n'ont sans " "doute pas pu être satisfaites." @@ -2519,7 +2535,8 @@ msgid "No version.txt found inside templates." msgstr "Aucun version.txt n'a été trouvé dans les modèles." #: editor/export_template_manager.cpp -msgid "Error creating path for templates:\n" +#, fuzzy +msgid "Error creating path for templates:" msgstr "Erreur lors de la création du chemin pour les modèles:\n" #: editor/export_template_manager.cpp @@ -2681,9 +2698,8 @@ msgid "View items as a list" msgstr "Afficher les éléments sous forme de liste" #: editor/filesystem_dock.cpp -msgid "" -"\n" -"Status: Import of file failed. Please fix file and reimport manually." +#, fuzzy +msgid "Status: Import of file failed. Please fix file and reimport manually." msgstr "" "\n" "Statut : L'importation du fichier a échoué. Veuillez corriger le fichier et " @@ -2694,20 +2710,23 @@ msgid "Cannot move/rename resources root." msgstr "Impossible de déplacer / renommer les ressources root." #: editor/filesystem_dock.cpp -msgid "Cannot move a folder into itself.\n" +#, fuzzy +msgid "Cannot move a folder into itself." msgstr "Impossible de déplacer un dossier dans lui-même.\n" #: editor/filesystem_dock.cpp -msgid "Error moving:\n" +#, fuzzy +msgid "Error moving:" msgstr "Erreur lors du déplacement :\n" #: editor/filesystem_dock.cpp #, fuzzy -msgid "Error duplicating:\n" +msgid "Error duplicating:" msgstr "Erreur au chargement :" #: editor/filesystem_dock.cpp -msgid "Unable to update dependencies:\n" +#, fuzzy +msgid "Unable to update dependencies:" msgstr "Impossible de mettre à jour les dépendences :\n" #: editor/filesystem_dock.cpp @@ -3181,7 +3200,7 @@ msgstr "seul les différence" #: editor/plugins/animation_player_editor_plugin.cpp msgid "Force White Modulate" -msgstr "" +msgstr "Forcer la modulation blanche" #: editor/plugins/animation_player_editor_plugin.cpp msgid "Include Gizmos (3D)" @@ -3361,6 +3380,11 @@ msgstr "Modifier les filtres de nÅ“ud" msgid "Filters.." msgstr "Filtres…" +#: editor/plugins/animation_tree_editor_plugin.cpp +#, fuzzy +msgid "AnimationTree" +msgstr "Animation" + #: editor/plugins/asset_library_editor_plugin.cpp msgid "Free" msgstr "Libérer" @@ -3510,16 +3534,24 @@ msgid "" "Save your scene (for images to be saved in the same dir), or pick a save " "path from the BakedLightmap properties." msgstr "" +"Ne peut pas déterminer un chemin de sauvegarde pour les images lightmap.\n" +"Sauvegarder votre scène (pour que les images soient sauvegardées dans le " +"même répertoire), ou choisissez un répertoire de sauvegarde à partir des " +"propriétés BakedLightmap." #: editor/plugins/baked_lightmap_editor_plugin.cpp msgid "" "No meshes to bake. Make sure they contain an UV2 channel and that the 'Bake " "Light' flag is on." msgstr "" +"Aucun mesh à transférer. Assurez-vous qu'ils contiennent un canal UV2 et que " +"l'indicateur \"Bake Light\" est activé." #: editor/plugins/baked_lightmap_editor_plugin.cpp msgid "Failed creating lightmap images, make sure path is writable." msgstr "" +"Échec de la création des images lightmap, assurez-vous que le chemin est " +"accessible en écriture." #: editor/plugins/baked_lightmap_editor_plugin.cpp #, fuzzy @@ -3527,6 +3559,7 @@ msgid "Bake Lightmaps" msgstr "Transfert vers des lightmaps :" #: editor/plugins/camera_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Preview" msgstr "Aperçu" @@ -3893,11 +3926,11 @@ msgstr "Mettre à jour depuis la scène" #: editor/plugins/curve_editor_plugin.cpp msgid "Flat0" -msgstr "" +msgstr "Plat0" #: editor/plugins/curve_editor_plugin.cpp msgid "Flat1" -msgstr "" +msgstr "Plat1" #: editor/plugins/curve_editor_plugin.cpp msgid "Ease in" @@ -4041,19 +4074,19 @@ msgstr "Créer un maillage de navigation" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Contained Mesh is not of type ArrayMesh." -msgstr "" +msgstr "Le maillage contenu n'est pas de type ArrayMesh." #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "UV Unwrap failed, mesh may not be manifold?" -msgstr "" +msgstr "L'ouverture du UV a échoué, le maillage n'est peut-être pas multiple ?" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "No mesh to debug." -msgstr "" +msgstr "Aucun maillage à déboguer." #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Model has no UV in this layer" -msgstr "" +msgstr "Le modèle n'a pas d'UV dans cette couche" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "MeshInstance lacks a Mesh!" @@ -4108,7 +4141,7 @@ msgstr "Affichage" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Unwrap UV2 for Lightmap/AO" -msgstr "" +msgstr "Ouverture d'UV2 pour Lightmap/AO" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Create Outline Mesh" @@ -4229,7 +4262,7 @@ msgstr "Calculer !" #: editor/plugins/navigation_mesh_editor_plugin.cpp #, fuzzy -msgid "Bake the navigation mesh.\n" +msgid "Bake the navigation mesh." msgstr "Créer un maillage de navigation\n" #: editor/plugins/navigation_mesh_editor_plugin.cpp @@ -4625,14 +4658,18 @@ msgstr "Charger une ressource" msgid "Paste" msgstr "Coller" +#: editor/plugins/resource_preloader_editor_plugin.cpp +#, fuzzy +msgid "ResourcePreloader" +msgstr "Chemin de la ressource" + #: editor/plugins/script_editor_plugin.cpp msgid "Clear Recent Files" msgstr "Effacer les fichiers récents" #: editor/plugins/script_editor_plugin.cpp -msgid "" -"Close and save changes?\n" -"\"" +#, fuzzy +msgid "Close and save changes?" msgstr "Quitter et sauvegarder les modifications?" #: editor/plugins/script_editor_plugin.cpp @@ -4709,6 +4746,11 @@ msgid "Copy Script Path" msgstr "Copier le chemin" #: editor/plugins/script_editor_plugin.cpp +#, fuzzy +msgid "Show In File System" +msgstr "Montrer dans le système de fichiers" + +#: editor/plugins/script_editor_plugin.cpp msgid "History Prev" msgstr "Précédent dans l'historique" @@ -5145,84 +5187,84 @@ msgid "Rotating %s degrees." msgstr "Rotation de %s degrés." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Bottom View." -msgstr "Vue de dessous." +msgid "Keying is disabled (no key inserted)." +msgstr "L'insertion de clé est désactivée (pas de clé insérée)." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Bottom" -msgstr "Dessous" +msgid "Animation Key Inserted." +msgstr "Clé d'animation insérée." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Top View." -msgstr "Vue de dessus." +msgid "Objects Drawn" +msgstr "Objets dessinés" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Rear View." -msgstr "Vue arrière." +msgid "Material Changes" +msgstr "Modifications de materiau" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Rear" -msgstr "Arrière" +msgid "Shader Changes" +msgstr "Modification de shader" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Front View." -msgstr "Vue avant." +msgid "Surface Changes" +msgstr "Modifications de surface" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Front" -msgstr "Avant" +msgid "Draw Calls" +msgstr "Appels de graphes" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Left View." -msgstr "Vue de gauche." +msgid "Vertices" +msgstr "Vertex" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Left" -msgstr "Gauche" +msgid "FPS" +msgstr "Images par secondes" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Right View." -msgstr "Vue de droite." +msgid "Top View." +msgstr "Vue de dessus." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Right" -msgstr "Droite" +msgid "Bottom View." +msgstr "Vue de dessous." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Keying is disabled (no key inserted)." -msgstr "L'insertion de clé est désactivée (pas de clé insérée)." +msgid "Bottom" +msgstr "Dessous" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Animation Key Inserted." -msgstr "Clé d'animation insérée." +msgid "Left View." +msgstr "Vue de gauche." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Objects Drawn" -msgstr "Objets dessinés" +msgid "Left" +msgstr "Gauche" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Material Changes" -msgstr "Modifications de materiau" +msgid "Right View." +msgstr "Vue de droite." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Shader Changes" -msgstr "Modification de shader" +msgid "Right" +msgstr "Droite" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Surface Changes" -msgstr "Modifications de surface" +msgid "Front View." +msgstr "Vue avant." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Draw Calls" -msgstr "Appels de graphes" +msgid "Front" +msgstr "Avant" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Vertices" -msgstr "Vertex" +msgid "Rear View." +msgstr "Vue arrière." #: editor/plugins/spatial_editor_plugin.cpp -msgid "FPS" -msgstr "Images par secondes" +msgid "Rear" +msgstr "Arrière" #: editor/plugins/spatial_editor_plugin.cpp msgid "Align with view" @@ -5309,15 +5351,12 @@ msgid "Freelook Speed Modifier" msgstr "Modificateur de vitesse de la vue libre" #: editor/plugins/spatial_editor_plugin.cpp -msgid "preview" -msgstr "Aperçu" - -#: editor/plugins/spatial_editor_plugin.cpp msgid "XForm Dialog" msgstr "Dialogue XForm" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Select Mode (Q)\n" +#, fuzzy +msgid "Select Mode (Q)" msgstr "Sélectionner le mode (Q)\n" #: editor/plugins/spatial_editor_plugin.cpp @@ -5471,7 +5510,7 @@ msgstr "Paramètres" #: editor/plugins/spatial_editor_plugin.cpp msgid "Skeleton Gizmo visibility" -msgstr "" +msgstr "Visibilité squelette Gizmo" #: editor/plugins/spatial_editor_plugin.cpp msgid "Snap Settings" @@ -5598,10 +5637,20 @@ msgstr "Déplacer le(s) nÅ“ud(s)" msgid "Move (After)" msgstr "Déplacer (Après)" +#: editor/plugins/sprite_frames_editor_plugin.cpp +#, fuzzy +msgid "SpriteFrames" +msgstr "Pile des appels" + #: editor/plugins/style_box_editor_plugin.cpp msgid "StyleBox Preview:" msgstr "Aperçu de la StyleBox :" +#: editor/plugins/style_box_editor_plugin.cpp +#, fuzzy +msgid "StyleBox" +msgstr "Style" + #: editor/plugins/texture_region_editor_plugin.cpp msgid "Set Region Rect" msgstr "Définir région rectangulaire" @@ -5627,14 +5676,17 @@ msgid "Auto Slice" msgstr "Coupe automatique" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Offset:" msgstr "Décalage :" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Step:" msgstr "Pas (s) :" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Separation:" msgstr "Séparation :" @@ -5772,6 +5824,10 @@ msgstr "Police" msgid "Color" msgstr "Couleur" +#: editor/plugins/theme_editor_plugin.cpp +msgid "Theme" +msgstr "Thème" + #: editor/plugins/tile_map_editor_plugin.cpp msgid "Erase Selection" msgstr "Supprimer la sélection" @@ -5874,6 +5930,32 @@ msgstr "Fusionner depuis la scène" msgid "Error" msgstr "Erreur" +#: editor/plugins/tile_set_editor_plugin.cpp +#, fuzzy +msgid "Autotiles" +msgstr "Coupe automatique" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "" +"Select sub-tile to use as icon, this will be also used on invalid autotile " +"bindings." +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "" +"LMB: set bit on.\n" +"RMB: set bit off." +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +#, fuzzy +msgid "Select current edited sub-tile." +msgstr "Enregistrer la ressource actuellement modifiée." + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "Select sub-tile to change it's priority." +msgstr "" + #: editor/progress_dialog.cpp scene/gui/dialogs.cpp msgid "Cancel" msgstr "Annuler" @@ -5998,10 +6080,23 @@ msgstr "" "Veuillez choisir un dossier qui ne contient pas de fichier 'project.godot'." #: editor/project_manager.cpp +msgid "That's a BINGO!" +msgstr "C'est un BINGO !" + +#: editor/project_manager.cpp msgid "Imported Project" msgstr "Projet importé" #: editor/project_manager.cpp +#, fuzzy +msgid "Couldn't create folder." +msgstr "Impossible de créer le dossier." + +#: editor/project_manager.cpp +msgid "There is already a folder in this path with the specified name." +msgstr "" + +#: editor/project_manager.cpp msgid "It would be a good idea to name your project." msgstr "Ce serait une bonne idée de donner un nom à votre projet." @@ -6045,14 +6140,29 @@ msgid "Import Existing Project" msgstr "Importer un projet existant" #: editor/project_manager.cpp +#, fuzzy +msgid "Import & Edit" +msgstr "Importer et ouvrir" + +#: editor/project_manager.cpp msgid "Create New Project" msgstr "Créer un nouveau projet" #: editor/project_manager.cpp +#, fuzzy +msgid "Create & Edit" +msgstr "Créer Émetteur" + +#: editor/project_manager.cpp msgid "Install Project:" msgstr "Installer projet :" #: editor/project_manager.cpp +#, fuzzy +msgid "Install & Edit" +msgstr "Installer" + +#: editor/project_manager.cpp msgid "Project Name:" msgstr "Nom du projet :" @@ -6069,10 +6179,6 @@ msgid "Browse" msgstr "Parcourir" #: editor/project_manager.cpp -msgid "That's a BINGO!" -msgstr "C'est un BINGO !" - -#: editor/project_manager.cpp msgid "Unnamed Project" msgstr "Projet sans titre" @@ -6129,6 +6235,10 @@ msgstr "" "existants. Est-ce que vous confirmez ?" #: editor/project_manager.cpp +msgid "Project Manager" +msgstr "Gestionnaire de projets" + +#: editor/project_manager.cpp msgid "Project List" msgstr "Liste des projets" @@ -6258,11 +6368,6 @@ msgid "Button 9" msgstr "Bouton 9" #: editor/project_settings_editor.cpp -#: modules/visual_script/visual_script_editor.cpp -msgid "Change" -msgstr "Changer" - -#: editor/project_settings_editor.cpp msgid "Joypad Axis Index:" msgstr "Index de l'axe de la manette de jeu :" @@ -6526,7 +6631,7 @@ msgstr "Nouveau script" #: editor/property_editor.cpp msgid "New %s" -msgstr "" +msgstr "Nouveau %s" #: editor/property_editor.cpp msgid "Make Unique" @@ -6736,7 +6841,8 @@ msgid "Error duplicating scene to save it." msgstr "Erreur de duplication de la scène afin de l'enregistrer." #: editor/scene_tree_dock.cpp -msgid "Sub-Resources:" +#, fuzzy +msgid "Sub-Resources" msgstr "Ressources secondaires :" #: editor/scene_tree_dock.cpp @@ -7041,7 +7147,7 @@ msgid "Pick one or more items from the list to display the graph." msgstr "" "Chosissez un ou plusieurs éléments dans la liste pour afficher le graphique." -#: editor/script_editor_debugger.cpp +#: editor/script_editor_debugger.cpp modules/mono/editor/mono_bottom_panel.cpp msgid "Errors" msgstr "Erreurs" @@ -7050,6 +7156,11 @@ msgid "Child Process Connected" msgstr "Processus enfant connecté" #: editor/script_editor_debugger.cpp +#, fuzzy +msgid "Copy Error" +msgstr "Erreurs de chargement" + +#: editor/script_editor_debugger.cpp msgid "Inspect Previous Instance" msgstr "Inspecter l'instance précédente" @@ -7143,7 +7254,7 @@ msgstr "Raccourcis" #: editor/settings_config_dialog.cpp msgid "Binding" -msgstr "" +msgstr "Liaison" #: editor/spatial_editor_gizmos.cpp msgid "Change Light Radius" @@ -7195,11 +7306,11 @@ msgstr "Changer les ampleurs de la sonde" #: modules/gdnative/gdnative_library_editor_plugin.cpp msgid "Select the dynamic library for this entry" -msgstr "" +msgstr "Sélectionnez la librairie dynamique pour cette entrée" #: modules/gdnative/gdnative_library_editor_plugin.cpp msgid "Select dependencies of the library for this entry" -msgstr "" +msgstr "Sélectionnez les dépendances de la librairie pour cette entrée" #: modules/gdnative/gdnative_library_editor_plugin.cpp #, fuzzy @@ -7208,11 +7319,12 @@ msgstr "Supprimer point de courbe" #: modules/gdnative/gdnative_library_editor_plugin.cpp msgid "Double click to create a new entry" -msgstr "" +msgstr "Double-cliquez pour créer une nouvelle entrée" #: modules/gdnative/gdnative_library_editor_plugin.cpp +#, fuzzy msgid "Platform:" -msgstr "" +msgstr "Platform:" #: modules/gdnative/gdnative_library_editor_plugin.cpp #, fuzzy @@ -7225,8 +7337,9 @@ msgid "Dynamic Library" msgstr "Bibliothèque" #: modules/gdnative/gdnative_library_editor_plugin.cpp +#, fuzzy msgid "Add an architecture entry" -msgstr "" +msgstr "Ajouter une entrée architecturale" #: modules/gdnative/gdnative_library_editor_plugin.cpp #, fuzzy @@ -7406,10 +7519,58 @@ msgstr "Paramètres GridMap" msgid "Pick Distance:" msgstr "Choisissez distance :" +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Generating solution..." +msgstr "Création des coutours..." + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Generating C# project..." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Failed to create solution." +msgstr "Impossible de créer le contour !" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Failed to save solution." +msgstr "Impossible de charger la ressource." + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Done" +msgstr "C'est fait !" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Failed to create C# project." +msgstr "Impossible de charger la ressource." + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Mono" +msgstr "Mono" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Create C# solution" +msgstr "Créer le contour" + #: modules/mono/editor/mono_bottom_panel.cpp msgid "Builds" msgstr "Constructions" +#: modules/mono/editor/mono_bottom_panel.cpp +#, fuzzy +msgid "Build Project" +msgstr "Projet" + +#: modules/mono/editor/mono_bottom_panel.cpp +#, fuzzy +msgid "Warnings" +msgstr "Avertissement" + #: modules/visual_script/visual_script.cpp msgid "" "A node yielded without working memory, please read the docs on how to yield " @@ -7771,23 +7932,33 @@ msgid "Run exported HTML in the system's default browser." msgstr "Exécutez le HTML exporté dans le navigateur par défaut du système." #: platform/javascript/export/export.cpp -msgid "Could not write file:\n" +#, fuzzy +msgid "Could not write file:" msgstr "Impossible d'écrire le fichier:\n" #: platform/javascript/export/export.cpp -msgid "Could not open template for export:\n" +#, fuzzy +msgid "Could not open template for export:" msgstr "Impossible d'ouvrir le modèle pour exportation:\n" #: platform/javascript/export/export.cpp -msgid "Invalid export template:\n" +#, fuzzy +msgid "Invalid export template:" msgstr "Modèle d'exportation non valide :\n" #: platform/javascript/export/export.cpp -msgid "Could not read custom HTML shell:\n" +#, fuzzy +msgid "Could not read custom HTML shell:" msgstr "Impossible de lire le shell HTML :\n" #: platform/javascript/export/export.cpp -msgid "Could not read boot splash image file:\n" +#, fuzzy +msgid "Could not read boot splash image file:" +msgstr "Impossible de lire l'image de démarrage :\n" + +#: platform/javascript/export/export.cpp +#, fuzzy +msgid "Using default boot splash image." msgstr "Impossible de lire l'image de démarrage :\n" #: scene/2d/animated_sprite.cpp @@ -8111,9 +8282,10 @@ msgid "(Other)" msgstr "(Autre)" #: scene/main/scene_tree.cpp +#, fuzzy msgid "" -"Default Environment as specified in Project Setings (Rendering -> Viewport -" -"> Default Environment) could not be loaded." +"Default Environment as specified in Project Setings (Rendering -> " +"Environment -> Default Environment) could not be loaded." msgstr "" "L'environnement par défaut spécifié dans les réglages du projet (Rendu -> " "Viewport -> Environnement par défaut) ne peut pas être chargé." @@ -8146,6 +8318,9 @@ msgstr "Erreur lors du chargement de la police." msgid "Invalid font size." msgstr "Taille de police invalide." +#~ msgid "preview" +#~ msgstr "Aperçu" + #~ msgid "Move Add Key" #~ msgstr "Mouvement Ajouter une clé" @@ -8241,9 +8416,6 @@ msgstr "Taille de police invalide." #~ msgid "' parsing of config failed." #~ msgstr "L'analyse de la configuration a échoué." -#~ msgid "Theme" -#~ msgstr "Thème" - #~ msgid "Method List For '%s':" #~ msgstr "Liste des méthodes pour « %s » :" @@ -8514,9 +8686,6 @@ msgstr "Taille de police invalide." #~ msgid "Import Anyway" #~ msgstr "Importer quand même" -#~ msgid "Import & Open" -#~ msgstr "Importer et ouvrir" - #~ msgid "Edited scene has not been saved, open imported scene anyway?" #~ msgstr "" #~ "La scène modifiée actuellement n'a pas été enregistrée, ouvrir la scène " @@ -8773,9 +8942,6 @@ msgstr "Taille de police invalide." #~ msgid "Stereo" #~ msgstr "Stéréo" -#~ msgid "Mono" -#~ msgstr "Mono" - #~ msgid "Pitch" #~ msgstr "Hauteur" diff --git a/editor/translations/he.po b/editor/translations/he.po index 032e8bcac7..869e9fe5fc 100644 --- a/editor/translations/he.po +++ b/editor/translations/he.po @@ -197,8 +197,7 @@ msgstr "" #: 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 +#: editor/plugins/particles_editor_plugin.cpp editor/script_create_dialog.cpp msgid "Create" msgstr "" @@ -549,6 +548,15 @@ msgid "Signals" msgstr "" #: editor/create_dialog.cpp +msgid "Change %s Type" +msgstr "" + +#: editor/create_dialog.cpp editor/project_settings_editor.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Change" +msgstr "" + +#: editor/create_dialog.cpp msgid "Create New %s" msgstr "" @@ -654,7 +662,7 @@ msgid "" msgstr "" #: editor/dependency_editor.cpp -msgid "Cannot remove:\n" +msgid "Cannot remove:" msgstr "" #: editor/dependency_editor.cpp @@ -737,8 +745,8 @@ msgstr "" msgid "Lead Developer" msgstr "" -#: editor/editor_about.cpp editor/project_manager.cpp -msgid "Project Manager" +#: editor/editor_about.cpp +msgid "Project Manager " msgstr "" #: editor/editor_about.cpp @@ -823,7 +831,7 @@ msgid "Success!" msgstr "" #: editor/editor_asset_installer.cpp -#: editor/plugins/asset_library_editor_plugin.cpp editor/project_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp msgid "Install" msgstr "" @@ -1130,7 +1138,7 @@ msgid "Packing" msgstr "" #: editor/editor_export.cpp platform/javascript/export/export.cpp -msgid "Template file not found:\n" +msgid "Template file not found:" msgstr "" #: editor/editor_file_dialog.cpp scene/gui/file_dialog.cpp @@ -1384,6 +1392,10 @@ msgstr "" msgid "Clear" msgstr "" +#: editor/editor_log.cpp +msgid "Clear Output" +msgstr "" + #: editor/editor_node.cpp editor/plugins/animation_player_editor_plugin.cpp msgid "Error saving resource!" msgstr "" @@ -1447,7 +1459,8 @@ msgstr "" #: editor/editor_node.cpp msgid "" -"Couldn't save scene. Likely dependencies (instances) couldn't be satisfied." +"Couldn't save scene. Likely dependencies (instances or inheritance) couldn't " +"be satisfied." msgstr "" #: editor/editor_node.cpp @@ -2379,7 +2392,7 @@ msgid "No version.txt found inside templates." msgstr "" #: editor/export_template_manager.cpp -msgid "Error creating path for templates:\n" +msgid "Error creating path for templates:" msgstr "" #: editor/export_template_manager.cpp @@ -2533,9 +2546,7 @@ msgid "View items as a list" msgstr "" #: editor/filesystem_dock.cpp -msgid "" -"\n" -"Status: Import of file failed. Please fix file and reimport manually." +msgid "Status: Import of file failed. Please fix file and reimport manually." msgstr "" #: editor/filesystem_dock.cpp @@ -2543,19 +2554,19 @@ msgid "Cannot move/rename resources root." msgstr "" #: editor/filesystem_dock.cpp -msgid "Cannot move a folder into itself.\n" +msgid "Cannot move a folder into itself." msgstr "" #: editor/filesystem_dock.cpp -msgid "Error moving:\n" +msgid "Error moving:" msgstr "" #: editor/filesystem_dock.cpp -msgid "Error duplicating:\n" +msgid "Error duplicating:" msgstr "" #: editor/filesystem_dock.cpp -msgid "Unable to update dependencies:\n" +msgid "Unable to update dependencies:" msgstr "" #: editor/filesystem_dock.cpp @@ -3192,6 +3203,10 @@ msgstr "" msgid "Filters.." msgstr "" +#: editor/plugins/animation_tree_editor_plugin.cpp +msgid "AnimationTree" +msgstr "" + #: editor/plugins/asset_library_editor_plugin.cpp msgid "Free" msgstr "" @@ -3357,6 +3372,7 @@ msgid "Bake Lightmaps" msgstr "" #: editor/plugins/camera_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Preview" msgstr "" @@ -4040,7 +4056,7 @@ msgid "Bake!" msgstr "" #: editor/plugins/navigation_mesh_editor_plugin.cpp -msgid "Bake the navigation mesh.\n" +msgid "Bake the navigation mesh." msgstr "" #: editor/plugins/navigation_mesh_editor_plugin.cpp @@ -4429,14 +4445,16 @@ msgstr "" msgid "Paste" msgstr "" +#: editor/plugins/resource_preloader_editor_plugin.cpp +msgid "ResourcePreloader" +msgstr "" + #: editor/plugins/script_editor_plugin.cpp msgid "Clear Recent Files" msgstr "" #: editor/plugins/script_editor_plugin.cpp -msgid "" -"Close and save changes?\n" -"\"" +msgid "Close and save changes?" msgstr "" #: editor/plugins/script_editor_plugin.cpp @@ -4512,6 +4530,10 @@ msgid "Copy Script Path" msgstr "" #: editor/plugins/script_editor_plugin.cpp +msgid "Show In File System" +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp msgid "History Prev" msgstr "" @@ -4943,83 +4965,83 @@ msgid "Rotating %s degrees." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Bottom View." +msgid "Keying is disabled (no key inserted)." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Bottom" +msgid "Animation Key Inserted." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Top View." +msgid "Objects Drawn" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Rear View." +msgid "Material Changes" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Rear" +msgid "Shader Changes" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Front View." +msgid "Surface Changes" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Front" +msgid "Draw Calls" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Left View." +msgid "Vertices" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Left" +msgid "FPS" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Right View." +msgid "Top View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Right" +msgid "Bottom View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Keying is disabled (no key inserted)." +msgid "Bottom" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Animation Key Inserted." +msgid "Left View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Objects Drawn" +msgid "Left" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Material Changes" +msgid "Right View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Shader Changes" +msgid "Right" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Surface Changes" +msgid "Front View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Draw Calls" +msgid "Front" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Vertices" +msgid "Rear View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "FPS" +msgid "Rear" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp @@ -5107,15 +5129,11 @@ 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" +msgid "Select Mode (Q)" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp @@ -5390,10 +5408,18 @@ msgstr "" msgid "Move (After)" msgstr "" +#: editor/plugins/sprite_frames_editor_plugin.cpp +msgid "SpriteFrames" +msgstr "" + #: editor/plugins/style_box_editor_plugin.cpp msgid "StyleBox Preview:" msgstr "" +#: editor/plugins/style_box_editor_plugin.cpp +msgid "StyleBox" +msgstr "" + #: editor/plugins/texture_region_editor_plugin.cpp msgid "Set Region Rect" msgstr "" @@ -5419,14 +5445,17 @@ msgid "Auto Slice" msgstr "" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Offset:" msgstr "" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Step:" msgstr "" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Separation:" msgstr "" @@ -5564,6 +5593,10 @@ msgstr "" msgid "Color" msgstr "" +#: editor/plugins/theme_editor_plugin.cpp +msgid "Theme" +msgstr "" + #: editor/plugins/tile_map_editor_plugin.cpp msgid "Erase Selection" msgstr "" @@ -5664,6 +5697,30 @@ msgstr "" msgid "Error" msgstr "" +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "Autotiles" +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "" +"Select sub-tile to use as icon, this will be also used on invalid autotile " +"bindings." +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "" +"LMB: set bit on.\n" +"RMB: set bit off." +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "Select current edited sub-tile." +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "Select sub-tile to change it's priority." +msgstr "" + #: editor/progress_dialog.cpp scene/gui/dialogs.cpp msgid "Cancel" msgstr "" @@ -5781,10 +5838,22 @@ msgid "Please choose a folder that does not contain a 'project.godot' file." msgstr "" #: editor/project_manager.cpp +msgid "That's a BINGO!" +msgstr "" + +#: editor/project_manager.cpp msgid "Imported Project" msgstr "" #: editor/project_manager.cpp +msgid "Couldn't create folder." +msgstr "" + +#: editor/project_manager.cpp +msgid "There is already a folder in this path with the specified name." +msgstr "" + +#: editor/project_manager.cpp msgid "It would be a good idea to name your project." msgstr "" @@ -5825,14 +5894,26 @@ msgid "Import Existing Project" msgstr "" #: editor/project_manager.cpp +msgid "Import & Edit" +msgstr "" + +#: editor/project_manager.cpp msgid "Create New Project" msgstr "" #: editor/project_manager.cpp +msgid "Create & Edit" +msgstr "" + +#: editor/project_manager.cpp msgid "Install Project:" msgstr "" #: editor/project_manager.cpp +msgid "Install & Edit" +msgstr "" + +#: editor/project_manager.cpp msgid "Project Name:" msgstr "" @@ -5849,10 +5930,6 @@ msgid "Browse" msgstr "" #: editor/project_manager.cpp -msgid "That's a BINGO!" -msgstr "" - -#: editor/project_manager.cpp msgid "Unnamed Project" msgstr "" @@ -5898,6 +5975,10 @@ msgid "" msgstr "" #: editor/project_manager.cpp +msgid "Project Manager" +msgstr "" + +#: editor/project_manager.cpp msgid "Project List" msgstr "" @@ -6024,11 +6105,6 @@ 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 "" @@ -6494,7 +6570,7 @@ msgid "Error duplicating scene to save it." msgstr "" #: editor/scene_tree_dock.cpp -msgid "Sub-Resources:" +msgid "Sub-Resources" msgstr "" #: editor/scene_tree_dock.cpp @@ -6785,7 +6861,7 @@ msgstr "" msgid "Pick one or more items from the list to display the graph." msgstr "" -#: editor/script_editor_debugger.cpp +#: editor/script_editor_debugger.cpp modules/mono/editor/mono_bottom_panel.cpp msgid "Errors" msgstr "" @@ -6794,6 +6870,10 @@ msgid "Child Process Connected" msgstr "" #: editor/script_editor_debugger.cpp +msgid "Copy Error" +msgstr "" + +#: editor/script_editor_debugger.cpp msgid "Inspect Previous Instance" msgstr "" @@ -7139,10 +7219,50 @@ msgstr "" msgid "Pick Distance:" msgstr "" +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Generating solution..." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Generating C# project..." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Failed to create solution." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Failed to save solution." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Done" +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Failed to create C# project." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Mono" +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Create C# solution" +msgstr "" + #: modules/mono/editor/mono_bottom_panel.cpp msgid "Builds" msgstr "" +#: modules/mono/editor/mono_bottom_panel.cpp +msgid "Build Project" +msgstr "" + +#: modules/mono/editor/mono_bottom_panel.cpp +msgid "Warnings" +msgstr "" + #: modules/visual_script/visual_script.cpp msgid "" "A node yielded without working memory, please read the docs on how to yield " @@ -7488,23 +7608,27 @@ msgid "Run exported HTML in the system's default browser." msgstr "" #: platform/javascript/export/export.cpp -msgid "Could not write file:\n" +msgid "Could not write file:" +msgstr "" + +#: platform/javascript/export/export.cpp +msgid "Could not open template for export:" msgstr "" #: platform/javascript/export/export.cpp -msgid "Could not open template for export:\n" +msgid "Invalid export template:" msgstr "" #: platform/javascript/export/export.cpp -msgid "Invalid export template:\n" +msgid "Could not read custom HTML shell:" msgstr "" #: platform/javascript/export/export.cpp -msgid "Could not read custom HTML shell:\n" +msgid "Could not read boot splash image file:" msgstr "" #: platform/javascript/export/export.cpp -msgid "Could not read boot splash image file:\n" +msgid "Using default boot splash image." msgstr "" #: scene/2d/animated_sprite.cpp @@ -7757,8 +7881,8 @@ msgstr "" #: scene/main/scene_tree.cpp msgid "" -"Default Environment as specified in Project Setings (Rendering -> Viewport -" -"> Default Environment) could not be loaded." +"Default Environment as specified in Project Setings (Rendering -> " +"Environment -> Default Environment) could not be loaded." msgstr "" #: scene/main/viewport.cpp diff --git a/editor/translations/hi.po b/editor/translations/hi.po index 2da7f0fed1..18c47a913b 100644 --- a/editor/translations/hi.po +++ b/editor/translations/hi.po @@ -204,8 +204,7 @@ msgstr "" #: 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 +#: editor/plugins/particles_editor_plugin.cpp editor/script_create_dialog.cpp msgid "Create" msgstr "" @@ -565,6 +564,15 @@ msgid "Signals" msgstr "संकेत" #: editor/create_dialog.cpp +msgid "Change %s Type" +msgstr "" + +#: editor/create_dialog.cpp editor/project_settings_editor.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Change" +msgstr "" + +#: editor/create_dialog.cpp #, fuzzy msgid "Create New %s" msgstr "à¤à¤• नया बनाà¤à¤‚" @@ -681,7 +689,8 @@ msgstr "" "वैसे à¤à¥€ उनà¥à¤¹à¥‡à¤‚ निकालें? (कोई पूरà¥à¤µà¤µà¤¤ नहीं)" #: editor/dependency_editor.cpp -msgid "Cannot remove:\n" +#, fuzzy +msgid "Cannot remove:" msgstr "निकाला नहीं जा सकता:\n" #: editor/dependency_editor.cpp @@ -765,8 +774,9 @@ msgstr "परियोजना के संसà¥à¤¥à¤¾à¤ªà¤•" msgid "Lead Developer" msgstr "पà¥à¤°à¤®à¥à¤– डेवलपर" -#: editor/editor_about.cpp editor/project_manager.cpp -msgid "Project Manager" +#: editor/editor_about.cpp +#, fuzzy +msgid "Project Manager " msgstr "पà¥à¤°à¥‹à¤œà¥‡à¤•à¥à¤Ÿ मैनेजर" #: editor/editor_about.cpp @@ -857,7 +867,7 @@ msgid "Success!" msgstr "सफलता!" #: editor/editor_asset_installer.cpp -#: editor/plugins/asset_library_editor_plugin.cpp editor/project_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp msgid "Install" msgstr "इंसà¥à¤Ÿà¥‰à¤²" @@ -1169,7 +1179,7 @@ msgid "Packing" msgstr "" #: editor/editor_export.cpp platform/javascript/export/export.cpp -msgid "Template file not found:\n" +msgid "Template file not found:" msgstr "" #: editor/editor_file_dialog.cpp scene/gui/file_dialog.cpp @@ -1423,6 +1433,10 @@ msgstr "" msgid "Clear" msgstr "" +#: editor/editor_log.cpp +msgid "Clear Output" +msgstr "" + #: editor/editor_node.cpp editor/plugins/animation_player_editor_plugin.cpp msgid "Error saving resource!" msgstr "" @@ -1486,7 +1500,8 @@ msgstr "" #: editor/editor_node.cpp msgid "" -"Couldn't save scene. Likely dependencies (instances) couldn't be satisfied." +"Couldn't save scene. Likely dependencies (instances or inheritance) couldn't " +"be satisfied." msgstr "" #: editor/editor_node.cpp @@ -2418,7 +2433,7 @@ msgid "No version.txt found inside templates." msgstr "" #: editor/export_template_manager.cpp -msgid "Error creating path for templates:\n" +msgid "Error creating path for templates:" msgstr "" #: editor/export_template_manager.cpp @@ -2573,9 +2588,7 @@ msgid "View items as a list" msgstr "" #: editor/filesystem_dock.cpp -msgid "" -"\n" -"Status: Import of file failed. Please fix file and reimport manually." +msgid "Status: Import of file failed. Please fix file and reimport manually." msgstr "" #: editor/filesystem_dock.cpp @@ -2583,21 +2596,23 @@ msgid "Cannot move/rename resources root." msgstr "" #: editor/filesystem_dock.cpp -msgid "Cannot move a folder into itself.\n" +msgid "Cannot move a folder into itself." msgstr "" #: editor/filesystem_dock.cpp -msgid "Error moving:\n" -msgstr "" +#, fuzzy +msgid "Error moving:" +msgstr "लोड होने मे तà¥à¤°à¥à¤Ÿà¤¿:" #: editor/filesystem_dock.cpp #, fuzzy -msgid "Error duplicating:\n" +msgid "Error duplicating:" msgstr "लोड होने मे तà¥à¤°à¥à¤Ÿà¤¿:" #: editor/filesystem_dock.cpp -msgid "Unable to update dependencies:\n" -msgstr "" +#, fuzzy +msgid "Unable to update dependencies:" +msgstr "लापता निरà¥à¤à¤°à¤¤à¤¾à¤“ं के कारण दृशà¥à¤¯ लोड करने में विफल रहे:" #: editor/filesystem_dock.cpp msgid "No name provided" @@ -3237,6 +3252,10 @@ msgstr "" msgid "Filters.." msgstr "" +#: editor/plugins/animation_tree_editor_plugin.cpp +msgid "AnimationTree" +msgstr "" + #: editor/plugins/asset_library_editor_plugin.cpp msgid "Free" msgstr "" @@ -3402,6 +3421,7 @@ msgid "Bake Lightmaps" msgstr "" #: editor/plugins/camera_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Preview" msgstr "" @@ -4085,7 +4105,7 @@ msgid "Bake!" msgstr "" #: editor/plugins/navigation_mesh_editor_plugin.cpp -msgid "Bake the navigation mesh.\n" +msgid "Bake the navigation mesh." msgstr "" #: editor/plugins/navigation_mesh_editor_plugin.cpp @@ -4474,14 +4494,17 @@ msgstr "" msgid "Paste" msgstr "" +#: editor/plugins/resource_preloader_editor_plugin.cpp +#, fuzzy +msgid "ResourcePreloader" +msgstr "संसाधन" + #: editor/plugins/script_editor_plugin.cpp msgid "Clear Recent Files" msgstr "" #: editor/plugins/script_editor_plugin.cpp -msgid "" -"Close and save changes?\n" -"\"" +msgid "Close and save changes?" msgstr "" #: editor/plugins/script_editor_plugin.cpp @@ -4557,6 +4580,10 @@ msgid "Copy Script Path" msgstr "" #: editor/plugins/script_editor_plugin.cpp +msgid "Show In File System" +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp msgid "History Prev" msgstr "" @@ -4988,83 +5015,83 @@ msgid "Rotating %s degrees." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Bottom View." +msgid "Keying is disabled (no key inserted)." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Bottom" +msgid "Animation Key Inserted." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Top View." +msgid "Objects Drawn" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Rear View." +msgid "Material Changes" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Rear" +msgid "Shader Changes" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Front View." +msgid "Surface Changes" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Front" +msgid "Draw Calls" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Left View." +msgid "Vertices" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Left" +msgid "FPS" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Right View." +msgid "Top View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Right" +msgid "Bottom View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Keying is disabled (no key inserted)." +msgid "Bottom" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Animation Key Inserted." +msgid "Left View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Objects Drawn" +msgid "Left" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Material Changes" +msgid "Right View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Shader Changes" +msgid "Right" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Surface Changes" +msgid "Front View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Draw Calls" +msgid "Front" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Vertices" +msgid "Rear View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "FPS" +msgid "Rear" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp @@ -5152,15 +5179,11 @@ 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" +msgid "Select Mode (Q)" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp @@ -5435,10 +5458,18 @@ msgstr "" msgid "Move (After)" msgstr "" +#: editor/plugins/sprite_frames_editor_plugin.cpp +msgid "SpriteFrames" +msgstr "" + #: editor/plugins/style_box_editor_plugin.cpp msgid "StyleBox Preview:" msgstr "" +#: editor/plugins/style_box_editor_plugin.cpp +msgid "StyleBox" +msgstr "" + #: editor/plugins/texture_region_editor_plugin.cpp msgid "Set Region Rect" msgstr "" @@ -5464,14 +5495,17 @@ msgid "Auto Slice" msgstr "" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Offset:" msgstr "" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Step:" msgstr "" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Separation:" msgstr "" @@ -5609,6 +5643,10 @@ msgstr "" msgid "Color" msgstr "" +#: editor/plugins/theme_editor_plugin.cpp +msgid "Theme" +msgstr "" + #: editor/plugins/tile_map_editor_plugin.cpp msgid "Erase Selection" msgstr "" @@ -5709,6 +5747,30 @@ msgstr "" msgid "Error" msgstr "" +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "Autotiles" +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "" +"Select sub-tile to use as icon, this will be also used on invalid autotile " +"bindings." +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "" +"LMB: set bit on.\n" +"RMB: set bit off." +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "Select current edited sub-tile." +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "Select sub-tile to change it's priority." +msgstr "" + #: editor/progress_dialog.cpp scene/gui/dialogs.cpp msgid "Cancel" msgstr "" @@ -5826,10 +5888,22 @@ msgid "Please choose a folder that does not contain a 'project.godot' file." msgstr "" #: editor/project_manager.cpp +msgid "That's a BINGO!" +msgstr "" + +#: editor/project_manager.cpp msgid "Imported Project" msgstr "" #: editor/project_manager.cpp +msgid "Couldn't create folder." +msgstr "" + +#: editor/project_manager.cpp +msgid "There is already a folder in this path with the specified name." +msgstr "" + +#: editor/project_manager.cpp msgid "It would be a good idea to name your project." msgstr "" @@ -5870,14 +5944,28 @@ msgid "Import Existing Project" msgstr "" #: editor/project_manager.cpp +msgid "Import & Edit" +msgstr "" + +#: editor/project_manager.cpp msgid "Create New Project" msgstr "" #: editor/project_manager.cpp +#, fuzzy +msgid "Create & Edit" +msgstr "à¤à¤• नया बनाà¤à¤‚" + +#: editor/project_manager.cpp msgid "Install Project:" msgstr "" #: editor/project_manager.cpp +#, fuzzy +msgid "Install & Edit" +msgstr "इंसà¥à¤Ÿà¥‰à¤²" + +#: editor/project_manager.cpp msgid "Project Name:" msgstr "" @@ -5894,10 +5982,6 @@ msgid "Browse" msgstr "" #: editor/project_manager.cpp -msgid "That's a BINGO!" -msgstr "" - -#: editor/project_manager.cpp msgid "Unnamed Project" msgstr "" @@ -5943,6 +6027,10 @@ msgid "" msgstr "" #: editor/project_manager.cpp +msgid "Project Manager" +msgstr "पà¥à¤°à¥‹à¤œà¥‡à¤•à¥à¤Ÿ मैनेजर" + +#: editor/project_manager.cpp msgid "Project List" msgstr "" @@ -6069,11 +6157,6 @@ 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 "" @@ -6539,8 +6622,9 @@ msgid "Error duplicating scene to save it." msgstr "" #: editor/scene_tree_dock.cpp -msgid "Sub-Resources:" -msgstr "" +#, fuzzy +msgid "Sub-Resources" +msgstr "संसाधन" #: editor/scene_tree_dock.cpp msgid "Clear Inheritance" @@ -6830,7 +6914,7 @@ msgstr "" msgid "Pick one or more items from the list to display the graph." msgstr "" -#: editor/script_editor_debugger.cpp +#: editor/script_editor_debugger.cpp modules/mono/editor/mono_bottom_panel.cpp msgid "Errors" msgstr "" @@ -6839,6 +6923,10 @@ msgid "Child Process Connected" msgstr "" #: editor/script_editor_debugger.cpp +msgid "Copy Error" +msgstr "" + +#: editor/script_editor_debugger.cpp msgid "Inspect Previous Instance" msgstr "" @@ -7184,10 +7272,51 @@ msgstr "" msgid "Pick Distance:" msgstr "" +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Generating solution..." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Generating C# project..." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Failed to create solution." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Failed to save solution." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Done" +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Failed to create C# project." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Mono" +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Create C# solution" +msgstr "सदसà¥à¤¯à¤¤à¤¾ बनाà¤à¤‚" + #: modules/mono/editor/mono_bottom_panel.cpp msgid "Builds" msgstr "" +#: modules/mono/editor/mono_bottom_panel.cpp +msgid "Build Project" +msgstr "" + +#: modules/mono/editor/mono_bottom_panel.cpp +msgid "Warnings" +msgstr "" + #: modules/visual_script/visual_script.cpp msgid "" "A node yielded without working memory, please read the docs on how to yield " @@ -7533,23 +7662,27 @@ msgid "Run exported HTML in the system's default browser." msgstr "" #: platform/javascript/export/export.cpp -msgid "Could not write file:\n" +msgid "Could not write file:" msgstr "" #: platform/javascript/export/export.cpp -msgid "Could not open template for export:\n" +msgid "Could not open template for export:" msgstr "" #: platform/javascript/export/export.cpp -msgid "Invalid export template:\n" +msgid "Invalid export template:" msgstr "" #: platform/javascript/export/export.cpp -msgid "Could not read custom HTML shell:\n" +msgid "Could not read custom HTML shell:" msgstr "" #: platform/javascript/export/export.cpp -msgid "Could not read boot splash image file:\n" +msgid "Could not read boot splash image file:" +msgstr "" + +#: platform/javascript/export/export.cpp +msgid "Using default boot splash image." msgstr "" #: scene/2d/animated_sprite.cpp @@ -7802,8 +7935,8 @@ msgstr "" #: scene/main/scene_tree.cpp msgid "" -"Default Environment as specified in Project Setings (Rendering -> Viewport -" -"> Default Environment) could not be loaded." +"Default Environment as specified in Project Setings (Rendering -> " +"Environment -> Default Environment) could not be loaded." msgstr "" #: scene/main/viewport.cpp @@ -7829,7 +7962,3 @@ msgstr "" #: scene/resources/dynamic_font.cpp msgid "Invalid font size." msgstr "गलत फॉणà¥à¤Ÿ का आकार |" - -#, fuzzy -#~ msgid "Create Subscription" -#~ msgstr "सदसà¥à¤¯à¤¤à¤¾ बनाà¤à¤‚" diff --git a/editor/translations/hu.po b/editor/translations/hu.po index 9f38422bbc..bf50a786cf 100644 --- a/editor/translations/hu.po +++ b/editor/translations/hu.po @@ -200,8 +200,7 @@ msgstr "Létrehoz %d ÚJ útvonalat és beilleszti a kulcsokat?" #: 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 +#: editor/plugins/particles_editor_plugin.cpp editor/script_create_dialog.cpp msgid "Create" msgstr "Létrehozás" @@ -554,6 +553,16 @@ msgstr "Jelzések" #: editor/create_dialog.cpp #, fuzzy +msgid "Change %s Type" +msgstr "Tömb értéktÃpusának megváltoztatása" + +#: editor/create_dialog.cpp editor/project_settings_editor.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Change" +msgstr "" + +#: editor/create_dialog.cpp +#, fuzzy msgid "Create New %s" msgstr "Új létrehozása" @@ -659,7 +668,8 @@ msgid "" msgstr "" #: editor/dependency_editor.cpp -msgid "Cannot remove:\n" +#, fuzzy +msgid "Cannot remove:" msgstr "Nem eltávolÃtható:\n" #: editor/dependency_editor.cpp @@ -742,8 +752,8 @@ msgstr "" msgid "Lead Developer" msgstr "" -#: editor/editor_about.cpp editor/project_manager.cpp -msgid "Project Manager" +#: editor/editor_about.cpp +msgid "Project Manager " msgstr "" #: editor/editor_about.cpp @@ -832,7 +842,7 @@ msgid "Success!" msgstr "" #: editor/editor_asset_installer.cpp -#: editor/plugins/asset_library_editor_plugin.cpp editor/project_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp msgid "Install" msgstr "" @@ -1140,7 +1150,7 @@ msgid "Packing" msgstr "" #: editor/editor_export.cpp platform/javascript/export/export.cpp -msgid "Template file not found:\n" +msgid "Template file not found:" msgstr "" #: editor/editor_file_dialog.cpp scene/gui/file_dialog.cpp @@ -1394,6 +1404,10 @@ msgstr "" msgid "Clear" msgstr "" +#: editor/editor_log.cpp +msgid "Clear Output" +msgstr "" + #: editor/editor_node.cpp editor/plugins/animation_player_editor_plugin.cpp msgid "Error saving resource!" msgstr "" @@ -1457,7 +1471,8 @@ msgstr "" #: editor/editor_node.cpp msgid "" -"Couldn't save scene. Likely dependencies (instances) couldn't be satisfied." +"Couldn't save scene. Likely dependencies (instances or inheritance) couldn't " +"be satisfied." msgstr "" #: editor/editor_node.cpp @@ -2389,7 +2404,7 @@ msgid "No version.txt found inside templates." msgstr "" #: editor/export_template_manager.cpp -msgid "Error creating path for templates:\n" +msgid "Error creating path for templates:" msgstr "" #: editor/export_template_manager.cpp @@ -2544,9 +2559,7 @@ msgid "View items as a list" msgstr "" #: editor/filesystem_dock.cpp -msgid "" -"\n" -"Status: Import of file failed. Please fix file and reimport manually." +msgid "Status: Import of file failed. Please fix file and reimport manually." msgstr "" #: editor/filesystem_dock.cpp @@ -2554,21 +2567,23 @@ msgid "Cannot move/rename resources root." msgstr "" #: editor/filesystem_dock.cpp -msgid "Cannot move a folder into itself.\n" +msgid "Cannot move a folder into itself." msgstr "" #: editor/filesystem_dock.cpp -msgid "Error moving:\n" -msgstr "" +#, fuzzy +msgid "Error moving:" +msgstr "Hiba betöltéskor:" #: editor/filesystem_dock.cpp #, fuzzy -msgid "Error duplicating:\n" +msgid "Error duplicating:" msgstr "Hiba betöltéskor:" #: editor/filesystem_dock.cpp -msgid "Unable to update dependencies:\n" -msgstr "" +#, fuzzy +msgid "Unable to update dependencies:" +msgstr "A Scene-t nem sikerült betölteni a hiányzó függÅ‘ségek miatt:" #: editor/filesystem_dock.cpp msgid "No name provided" @@ -3206,6 +3221,11 @@ msgstr "" msgid "Filters.." msgstr "" +#: editor/plugins/animation_tree_editor_plugin.cpp +#, fuzzy +msgid "AnimationTree" +msgstr "Animáció másolása" + #: editor/plugins/asset_library_editor_plugin.cpp msgid "Free" msgstr "" @@ -3371,6 +3391,7 @@ msgid "Bake Lightmaps" msgstr "" #: editor/plugins/camera_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Preview" msgstr "" @@ -4054,7 +4075,7 @@ msgid "Bake!" msgstr "" #: editor/plugins/navigation_mesh_editor_plugin.cpp -msgid "Bake the navigation mesh.\n" +msgid "Bake the navigation mesh." msgstr "" #: editor/plugins/navigation_mesh_editor_plugin.cpp @@ -4443,14 +4464,16 @@ msgstr "" msgid "Paste" msgstr "" +#: editor/plugins/resource_preloader_editor_plugin.cpp +msgid "ResourcePreloader" +msgstr "" + #: editor/plugins/script_editor_plugin.cpp msgid "Clear Recent Files" msgstr "" #: editor/plugins/script_editor_plugin.cpp -msgid "" -"Close and save changes?\n" -"\"" +msgid "Close and save changes?" msgstr "" #: editor/plugins/script_editor_plugin.cpp @@ -4527,6 +4550,10 @@ msgid "Copy Script Path" msgstr "Útvonal másolása" #: editor/plugins/script_editor_plugin.cpp +msgid "Show In File System" +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp msgid "History Prev" msgstr "" @@ -4958,83 +4985,83 @@ msgid "Rotating %s degrees." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Bottom View." +msgid "Keying is disabled (no key inserted)." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Bottom" +msgid "Animation Key Inserted." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Top View." +msgid "Objects Drawn" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Rear View." +msgid "Material Changes" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Rear" +msgid "Shader Changes" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Front View." +msgid "Surface Changes" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Front" +msgid "Draw Calls" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Left View." +msgid "Vertices" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Left" +msgid "FPS" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Right View." +msgid "Top View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Right" +msgid "Bottom View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Keying is disabled (no key inserted)." +msgid "Bottom" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Animation Key Inserted." +msgid "Left View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Objects Drawn" +msgid "Left" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Material Changes" +msgid "Right View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Shader Changes" +msgid "Right" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Surface Changes" +msgid "Front View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Draw Calls" +msgid "Front" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Vertices" +msgid "Rear View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "FPS" +msgid "Rear" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp @@ -5122,15 +5149,11 @@ 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" +msgid "Select Mode (Q)" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp @@ -5405,10 +5428,18 @@ msgstr "" msgid "Move (After)" msgstr "" +#: editor/plugins/sprite_frames_editor_plugin.cpp +msgid "SpriteFrames" +msgstr "" + #: editor/plugins/style_box_editor_plugin.cpp msgid "StyleBox Preview:" msgstr "" +#: editor/plugins/style_box_editor_plugin.cpp +msgid "StyleBox" +msgstr "" + #: editor/plugins/texture_region_editor_plugin.cpp msgid "Set Region Rect" msgstr "" @@ -5434,14 +5465,17 @@ msgid "Auto Slice" msgstr "" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Offset:" msgstr "" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Step:" msgstr "" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Separation:" msgstr "" @@ -5579,6 +5613,10 @@ msgstr "" msgid "Color" msgstr "" +#: editor/plugins/theme_editor_plugin.cpp +msgid "Theme" +msgstr "" + #: editor/plugins/tile_map_editor_plugin.cpp msgid "Erase Selection" msgstr "" @@ -5679,6 +5717,30 @@ msgstr "" msgid "Error" msgstr "" +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "Autotiles" +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "" +"Select sub-tile to use as icon, this will be also used on invalid autotile " +"bindings." +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "" +"LMB: set bit on.\n" +"RMB: set bit off." +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "Select current edited sub-tile." +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "Select sub-tile to change it's priority." +msgstr "" + #: editor/progress_dialog.cpp scene/gui/dialogs.cpp msgid "Cancel" msgstr "Mégse" @@ -5796,10 +5858,22 @@ msgid "Please choose a folder that does not contain a 'project.godot' file." msgstr "" #: editor/project_manager.cpp +msgid "That's a BINGO!" +msgstr "" + +#: editor/project_manager.cpp msgid "Imported Project" msgstr "" #: editor/project_manager.cpp +msgid "Couldn't create folder." +msgstr "" + +#: editor/project_manager.cpp +msgid "There is already a folder in this path with the specified name." +msgstr "" + +#: editor/project_manager.cpp msgid "It would be a good idea to name your project." msgstr "" @@ -5840,14 +5914,27 @@ msgid "Import Existing Project" msgstr "" #: editor/project_manager.cpp +msgid "Import & Edit" +msgstr "" + +#: editor/project_manager.cpp msgid "Create New Project" msgstr "" #: editor/project_manager.cpp +#, fuzzy +msgid "Create & Edit" +msgstr "Létrehozás" + +#: editor/project_manager.cpp msgid "Install Project:" msgstr "" #: editor/project_manager.cpp +msgid "Install & Edit" +msgstr "" + +#: editor/project_manager.cpp msgid "Project Name:" msgstr "" @@ -5864,10 +5951,6 @@ msgid "Browse" msgstr "" #: editor/project_manager.cpp -msgid "That's a BINGO!" -msgstr "" - -#: editor/project_manager.cpp msgid "Unnamed Project" msgstr "" @@ -5913,6 +5996,10 @@ msgid "" msgstr "" #: editor/project_manager.cpp +msgid "Project Manager" +msgstr "" + +#: editor/project_manager.cpp msgid "Project List" msgstr "" @@ -6039,11 +6126,6 @@ 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 "" @@ -6509,8 +6591,9 @@ msgid "Error duplicating scene to save it." msgstr "" #: editor/scene_tree_dock.cpp -msgid "Sub-Resources:" -msgstr "" +#, fuzzy +msgid "Sub-Resources" +msgstr "Forrás másolása" #: editor/scene_tree_dock.cpp msgid "Clear Inheritance" @@ -6800,7 +6883,7 @@ msgstr "" msgid "Pick one or more items from the list to display the graph." msgstr "" -#: editor/script_editor_debugger.cpp +#: editor/script_editor_debugger.cpp modules/mono/editor/mono_bottom_panel.cpp msgid "Errors" msgstr "" @@ -6809,6 +6892,11 @@ msgid "Child Process Connected" msgstr "" #: editor/script_editor_debugger.cpp +#, fuzzy +msgid "Copy Error" +msgstr "Póz másolása" + +#: editor/script_editor_debugger.cpp msgid "Inspect Previous Instance" msgstr "" @@ -7155,10 +7243,50 @@ msgstr "" msgid "Pick Distance:" msgstr "" +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Generating solution..." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Generating C# project..." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Failed to create solution." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Failed to save solution." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Done" +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Failed to create C# project." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Mono" +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Create C# solution" +msgstr "" + #: modules/mono/editor/mono_bottom_panel.cpp msgid "Builds" msgstr "" +#: modules/mono/editor/mono_bottom_panel.cpp +msgid "Build Project" +msgstr "" + +#: modules/mono/editor/mono_bottom_panel.cpp +msgid "Warnings" +msgstr "" + #: modules/visual_script/visual_script.cpp msgid "" "A node yielded without working memory, please read the docs on how to yield " @@ -7504,23 +7632,27 @@ msgid "Run exported HTML in the system's default browser." msgstr "" #: platform/javascript/export/export.cpp -msgid "Could not write file:\n" +msgid "Could not write file:" +msgstr "" + +#: platform/javascript/export/export.cpp +msgid "Could not open template for export:" msgstr "" #: platform/javascript/export/export.cpp -msgid "Could not open template for export:\n" +msgid "Invalid export template:" msgstr "" #: platform/javascript/export/export.cpp -msgid "Invalid export template:\n" +msgid "Could not read custom HTML shell:" msgstr "" #: platform/javascript/export/export.cpp -msgid "Could not read custom HTML shell:\n" +msgid "Could not read boot splash image file:" msgstr "" #: platform/javascript/export/export.cpp -msgid "Could not read boot splash image file:\n" +msgid "Using default boot splash image." msgstr "" #: scene/2d/animated_sprite.cpp @@ -7773,8 +7905,8 @@ msgstr "(Más)" #: scene/main/scene_tree.cpp msgid "" -"Default Environment as specified in Project Setings (Rendering -> Viewport -" -"> Default Environment) could not be loaded." +"Default Environment as specified in Project Setings (Rendering -> " +"Environment -> Default Environment) could not be loaded." msgstr "" #: scene/main/viewport.cpp diff --git a/editor/translations/id.po b/editor/translations/id.po index e739435ee9..547cc54d41 100644 --- a/editor/translations/id.po +++ b/editor/translations/id.po @@ -207,8 +207,7 @@ msgstr "Buat track BARU %d dan masukkan tombol-tombol?" #: 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 +#: editor/plugins/particles_editor_plugin.cpp editor/script_create_dialog.cpp msgid "Create" msgstr "Buat" @@ -565,6 +564,16 @@ msgstr "Sinyal-sinyal" #: editor/create_dialog.cpp #, fuzzy +msgid "Change %s Type" +msgstr "Ubah Tipe Nilai Array" + +#: editor/create_dialog.cpp editor/project_settings_editor.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Change" +msgstr "Ubah" + +#: editor/create_dialog.cpp +#, fuzzy msgid "Create New %s" msgstr "Buat Baru" @@ -679,7 +688,8 @@ msgstr "" "Hapus saja? (tidak bisa dibatalkan/undo)" #: editor/dependency_editor.cpp -msgid "Cannot remove:\n" +#, fuzzy +msgid "Cannot remove:" msgstr "Tidak bisa dibuang:\n" #: editor/dependency_editor.cpp @@ -763,8 +773,9 @@ msgstr "Penemu Proyek" msgid "Lead Developer" msgstr "Pengembang Utama" -#: editor/editor_about.cpp editor/project_manager.cpp -msgid "Project Manager" +#: editor/editor_about.cpp +#, fuzzy +msgid "Project Manager " msgstr "Manajer Proyek" #: editor/editor_about.cpp @@ -856,7 +867,7 @@ msgid "Success!" msgstr "Sukses!" #: editor/editor_asset_installer.cpp -#: editor/plugins/asset_library_editor_plugin.cpp editor/project_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp msgid "Install" msgstr "Pasang" @@ -1177,7 +1188,8 @@ msgid "Packing" msgstr "Mengemas" #: editor/editor_export.cpp platform/javascript/export/export.cpp -msgid "Template file not found:\n" +#, fuzzy +msgid "Template file not found:" msgstr "Template berkas tidak ditemukan:\n" #: editor/editor_file_dialog.cpp scene/gui/file_dialog.cpp @@ -1453,6 +1465,11 @@ msgstr " Keluaran:" msgid "Clear" msgstr "Bersihkan" +#: editor/editor_log.cpp +#, fuzzy +msgid "Clear Output" +msgstr "Luaran" + #: editor/editor_node.cpp editor/plugins/animation_player_editor_plugin.cpp msgid "Error saving resource!" msgstr "Error menyimpan resource!" @@ -1521,8 +1538,10 @@ msgid "This operation can't be done without a tree root." msgstr "Tindakan ini tidak dapat dibatalkan. Pulihkan saja?" #: editor/editor_node.cpp +#, fuzzy msgid "" -"Couldn't save scene. Likely dependencies (instances) couldn't be satisfied." +"Couldn't save scene. Likely dependencies (instances or inheritance) couldn't " +"be satisfied." msgstr "" "Tidak dapat menyimpan scene. Dependensi (instance) mungkin tidak terpenuhi." @@ -2540,7 +2559,7 @@ msgstr "" #: editor/export_template_manager.cpp #, fuzzy -msgid "Error creating path for templates:\n" +msgid "Error creating path for templates:" msgstr "Gagal menyimpan atlas:" #: editor/export_template_manager.cpp @@ -2712,9 +2731,7 @@ msgid "View items as a list" msgstr "" #: editor/filesystem_dock.cpp -msgid "" -"\n" -"Status: Import of file failed. Please fix file and reimport manually." +msgid "Status: Import of file failed. Please fix file and reimport manually." msgstr "" #: editor/filesystem_dock.cpp @@ -2722,22 +2739,22 @@ msgid "Cannot move/rename resources root." msgstr "" #: editor/filesystem_dock.cpp -msgid "Cannot move a folder into itself.\n" +msgid "Cannot move a folder into itself." msgstr "" #: editor/filesystem_dock.cpp #, fuzzy -msgid "Error moving:\n" +msgid "Error moving:" msgstr "Error memuat:" #: editor/filesystem_dock.cpp #, fuzzy -msgid "Error duplicating:\n" +msgid "Error duplicating:" msgstr "Error saat memuat:" #: editor/filesystem_dock.cpp #, fuzzy -msgid "Unable to update dependencies:\n" +msgid "Unable to update dependencies:" msgstr "Scene '%s' memiliki dependensi yang rusak:" #: editor/filesystem_dock.cpp @@ -3394,6 +3411,11 @@ msgstr "" msgid "Filters.." msgstr "" +#: editor/plugins/animation_tree_editor_plugin.cpp +#, fuzzy +msgid "AnimationTree" +msgstr "Animasi" + #: editor/plugins/asset_library_editor_plugin.cpp msgid "Free" msgstr "" @@ -3566,6 +3588,7 @@ msgid "Bake Lightmaps" msgstr "Ganti Radius Lampu" #: editor/plugins/camera_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Preview" msgstr "" @@ -4264,7 +4287,7 @@ msgid "Bake!" msgstr "" #: editor/plugins/navigation_mesh_editor_plugin.cpp -msgid "Bake the navigation mesh.\n" +msgid "Bake the navigation mesh." msgstr "" #: editor/plugins/navigation_mesh_editor_plugin.cpp @@ -4658,15 +4681,19 @@ msgstr "" msgid "Paste" msgstr "Tempel" +#: editor/plugins/resource_preloader_editor_plugin.cpp +#, fuzzy +msgid "ResourcePreloader" +msgstr "Resource" + #: editor/plugins/script_editor_plugin.cpp msgid "Clear Recent Files" msgstr "" #: editor/plugins/script_editor_plugin.cpp -msgid "" -"Close and save changes?\n" -"\"" -msgstr "" +#, fuzzy +msgid "Close and save changes?" +msgstr "Tutup scene? (Perubahan-perubahan yang belum disimpan akan hilang)" #: editor/plugins/script_editor_plugin.cpp msgid "Error while saving theme" @@ -4743,6 +4770,11 @@ msgid "Copy Script Path" msgstr "Salin Resource" #: editor/plugins/script_editor_plugin.cpp +#, fuzzy +msgid "Show In File System" +msgstr "Tampilkan dalam Manajer Berkas" + +#: editor/plugins/script_editor_plugin.cpp msgid "History Prev" msgstr "" @@ -5181,86 +5213,86 @@ msgid "Rotating %s degrees." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Bottom View." -msgstr "Tampilan Bawah." +msgid "Keying is disabled (no key inserted)." +msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Bottom" -msgstr "Bawah" +msgid "Animation Key Inserted." +msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Top View." -msgstr "Tampilan Atas." +msgid "Objects Drawn" +msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Rear View." -msgstr "Tampilan Belakang." +#, fuzzy +msgid "Material Changes" +msgstr "Menyimpan perubahan-perubahan lokal.." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Rear" -msgstr "Belakang" +#, fuzzy +msgid "Shader Changes" +msgstr "Ubah" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Front View." -msgstr "Tampilan Depan." +msgid "Surface Changes" +msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Front" -msgstr "Depan" +msgid "Draw Calls" +msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Left View." -msgstr "Tampilan Kiri." +msgid "Vertices" +msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Left" -msgstr "Kiri" +msgid "FPS" +msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Right View." -msgstr "Tampilan Kanan." +msgid "Top View." +msgstr "Tampilan Atas." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Right" -msgstr "Kanan" +msgid "Bottom View." +msgstr "Tampilan Bawah." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Keying is disabled (no key inserted)." -msgstr "" +msgid "Bottom" +msgstr "Bawah" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Animation Key Inserted." -msgstr "" +msgid "Left View." +msgstr "Tampilan Kiri." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Objects Drawn" -msgstr "" +msgid "Left" +msgstr "Kiri" #: editor/plugins/spatial_editor_plugin.cpp -#, fuzzy -msgid "Material Changes" -msgstr "Menyimpan perubahan-perubahan lokal.." +msgid "Right View." +msgstr "Tampilan Kanan." #: editor/plugins/spatial_editor_plugin.cpp -#, fuzzy -msgid "Shader Changes" -msgstr "Ubah" +msgid "Right" +msgstr "Kanan" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Surface Changes" -msgstr "" +msgid "Front View." +msgstr "Tampilan Depan." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Draw Calls" -msgstr "" +msgid "Front" +msgstr "Depan" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Vertices" -msgstr "" +msgid "Rear View." +msgstr "Tampilan Belakang." #: editor/plugins/spatial_editor_plugin.cpp -msgid "FPS" -msgstr "" +msgid "Rear" +msgstr "Belakang" #: editor/plugins/spatial_editor_plugin.cpp msgid "Align with view" @@ -5353,17 +5385,12 @@ msgid "Freelook Speed Modifier" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -#, fuzzy -msgid "preview" -msgstr "Pratinjau:" - -#: editor/plugins/spatial_editor_plugin.cpp msgid "XForm Dialog" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp #, fuzzy -msgid "Select Mode (Q)\n" +msgid "Select Mode (Q)" msgstr "Metode Publik:" #: editor/plugins/spatial_editor_plugin.cpp @@ -5642,10 +5669,18 @@ msgstr "Salin Resource" msgid "Move (After)" msgstr "" +#: editor/plugins/sprite_frames_editor_plugin.cpp +msgid "SpriteFrames" +msgstr "" + #: editor/plugins/style_box_editor_plugin.cpp msgid "StyleBox Preview:" msgstr "" +#: editor/plugins/style_box_editor_plugin.cpp +msgid "StyleBox" +msgstr "" + #: editor/plugins/texture_region_editor_plugin.cpp msgid "Set Region Rect" msgstr "" @@ -5671,14 +5706,17 @@ msgid "Auto Slice" msgstr "" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Offset:" msgstr "" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Step:" msgstr "" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Separation:" msgstr "" @@ -5818,6 +5856,11 @@ msgstr "" msgid "Color" msgstr "Warna" +#: editor/plugins/theme_editor_plugin.cpp +#, fuzzy +msgid "Theme" +msgstr "Simpan Tema" + #: editor/plugins/tile_map_editor_plugin.cpp #, fuzzy msgid "Erase Selection" @@ -5921,6 +5964,31 @@ msgstr "" msgid "Error" msgstr "" +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "Autotiles" +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "" +"Select sub-tile to use as icon, this will be also used on invalid autotile " +"bindings." +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "" +"LMB: set bit on.\n" +"RMB: set bit off." +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +#, fuzzy +msgid "Select current edited sub-tile." +msgstr "Simpan sumber yang sedang diatur." + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "Select sub-tile to change it's priority." +msgstr "" + #: editor/progress_dialog.cpp scene/gui/dialogs.cpp msgid "Cancel" msgstr "Batal" @@ -6045,10 +6113,23 @@ msgid "Please choose a folder that does not contain a 'project.godot' file." msgstr "" #: editor/project_manager.cpp +msgid "That's a BINGO!" +msgstr "" + +#: editor/project_manager.cpp msgid "Imported Project" msgstr "" #: editor/project_manager.cpp +#, fuzzy +msgid "Couldn't create folder." +msgstr "Tidak dapat membuat folder." + +#: editor/project_manager.cpp +msgid "There is already a folder in this path with the specified name." +msgstr "" + +#: editor/project_manager.cpp msgid "It would be a good idea to name your project." msgstr "" @@ -6091,14 +6172,29 @@ msgid "Import Existing Project" msgstr "Impor Projek yang Sudah Ada" #: editor/project_manager.cpp +#, fuzzy +msgid "Import & Edit" +msgstr "Impor" + +#: editor/project_manager.cpp msgid "Create New Project" msgstr "Buat Projek Baru" #: editor/project_manager.cpp +#, fuzzy +msgid "Create & Edit" +msgstr "Buat" + +#: editor/project_manager.cpp msgid "Install Project:" msgstr "" #: editor/project_manager.cpp +#, fuzzy +msgid "Install & Edit" +msgstr "Pasang" + +#: editor/project_manager.cpp msgid "Project Name:" msgstr "Nama Projek:" @@ -6116,10 +6212,6 @@ msgid "Browse" msgstr "" #: editor/project_manager.cpp -msgid "That's a BINGO!" -msgstr "" - -#: editor/project_manager.cpp msgid "Unnamed Project" msgstr "" @@ -6172,6 +6264,10 @@ msgid "" msgstr "" #: editor/project_manager.cpp +msgid "Project Manager" +msgstr "Manajer Proyek" + +#: editor/project_manager.cpp msgid "Project List" msgstr "Daftar Projek" @@ -6300,11 +6396,6 @@ msgid "Button 9" msgstr "" #: editor/project_settings_editor.cpp -#: modules/visual_script/visual_script_editor.cpp -msgid "Change" -msgstr "Ubah" - -#: editor/project_settings_editor.cpp msgid "Joypad Axis Index:" msgstr "" @@ -6789,7 +6880,7 @@ msgstr "" #: editor/scene_tree_dock.cpp #, fuzzy -msgid "Sub-Resources:" +msgid "Sub-Resources" msgstr "Resource" #: editor/scene_tree_dock.cpp @@ -7098,7 +7189,7 @@ msgstr "" msgid "Pick one or more items from the list to display the graph." msgstr "" -#: editor/script_editor_debugger.cpp +#: editor/script_editor_debugger.cpp modules/mono/editor/mono_bottom_panel.cpp msgid "Errors" msgstr "" @@ -7107,6 +7198,11 @@ msgid "Child Process Connected" msgstr "" #: editor/script_editor_debugger.cpp +#, fuzzy +msgid "Copy Error" +msgstr "Muat Galat" + +#: editor/script_editor_debugger.cpp msgid "Inspect Previous Instance" msgstr "" @@ -7466,10 +7562,55 @@ msgstr "" msgid "Pick Distance:" msgstr "" +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Generating solution..." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Generating C# project..." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Failed to create solution." +msgstr "Gagal memuat resource." + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Failed to save solution." +msgstr "Gagal memuat resource." + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Done" +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Failed to create C# project." +msgstr "Gagal memuat resource." + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Mono" +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Create C# solution" +msgstr "Buat Subskribsi" + #: modules/mono/editor/mono_bottom_panel.cpp msgid "Builds" msgstr "" +#: modules/mono/editor/mono_bottom_panel.cpp +#, fuzzy +msgid "Build Project" +msgstr "Proyek" + +#: modules/mono/editor/mono_bottom_panel.cpp +msgid "Warnings" +msgstr "" + #: modules/visual_script/visual_script.cpp msgid "" "A node yielded without working memory, please read the docs on how to yield " @@ -7849,27 +7990,32 @@ msgstr "" #: platform/javascript/export/export.cpp #, fuzzy -msgid "Could not write file:\n" +msgid "Could not write file:" msgstr "Tidak dapat membuat folder." #: platform/javascript/export/export.cpp #, fuzzy -msgid "Could not open template for export:\n" +msgid "Could not open template for export:" msgstr "Tidak dapat membuat folder." #: platform/javascript/export/export.cpp #, fuzzy -msgid "Invalid export template:\n" +msgid "Invalid export template:" msgstr "Memuat Ekspor Template-template." #: platform/javascript/export/export.cpp #, fuzzy -msgid "Could not read custom HTML shell:\n" +msgid "Could not read custom HTML shell:" +msgstr "Tidak dapat membuat folder." + +#: platform/javascript/export/export.cpp +#, fuzzy +msgid "Could not read boot splash image file:" msgstr "Tidak dapat membuat folder." #: platform/javascript/export/export.cpp #, fuzzy -msgid "Could not read boot splash image file:\n" +msgid "Using default boot splash image." msgstr "Tidak dapat membuat folder." #: scene/2d/animated_sprite.cpp @@ -8180,8 +8326,8 @@ msgstr "" #: scene/main/scene_tree.cpp #, fuzzy msgid "" -"Default Environment as specified in Project Setings (Rendering -> Viewport -" -"> Default Environment) could not be loaded." +"Default Environment as specified in Project Setings (Rendering -> " +"Environment -> Default Environment) could not be loaded." msgstr "" "Lingkungan Baku yang ditetapkan di Pengaturan Proyek (Rendering -> Viewport -" "> Lingkungan Baku) tidak dapat dimuat" @@ -8216,12 +8362,13 @@ msgstr "Error memuat font." msgid "Invalid font size." msgstr "Ukuran font tidak sah." +#, fuzzy +#~ msgid "preview" +#~ msgstr "Pratinjau:" + #~ msgid "Move Add Key" #~ msgstr "Pindahkan Kunci Tambah" -#~ msgid "Create Subscription" -#~ msgstr "Buat Subskribsi" - #~ msgid "List:" #~ msgstr "Daftar:" @@ -8344,9 +8491,6 @@ msgstr "Ukuran font tidak sah." #~ msgid "Ctrl+" #~ msgstr "Ctrl+" -#~ msgid "Close scene? (Unsaved changes will be lost)" -#~ msgstr "Tutup scene? (Perubahan-perubahan yang belum disimpan akan hilang)" - #~ msgid "" #~ "Open Project Manager? \n" #~ "(Unsaved changes will be lost)" diff --git a/editor/translations/is.po b/editor/translations/is.po index 33e2f9ad3f..e27d2710c2 100644 --- a/editor/translations/is.po +++ b/editor/translations/is.po @@ -198,8 +198,7 @@ msgstr "" #: 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 +#: editor/plugins/particles_editor_plugin.cpp editor/script_create_dialog.cpp msgid "Create" msgstr "" @@ -550,6 +549,15 @@ msgid "Signals" msgstr "" #: editor/create_dialog.cpp +msgid "Change %s Type" +msgstr "" + +#: editor/create_dialog.cpp editor/project_settings_editor.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Change" +msgstr "" + +#: editor/create_dialog.cpp msgid "Create New %s" msgstr "" @@ -655,7 +663,7 @@ msgid "" msgstr "" #: editor/dependency_editor.cpp -msgid "Cannot remove:\n" +msgid "Cannot remove:" msgstr "" #: editor/dependency_editor.cpp @@ -738,8 +746,8 @@ msgstr "" msgid "Lead Developer" msgstr "" -#: editor/editor_about.cpp editor/project_manager.cpp -msgid "Project Manager" +#: editor/editor_about.cpp +msgid "Project Manager " msgstr "" #: editor/editor_about.cpp @@ -824,7 +832,7 @@ msgid "Success!" msgstr "" #: editor/editor_asset_installer.cpp -#: editor/plugins/asset_library_editor_plugin.cpp editor/project_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp msgid "Install" msgstr "" @@ -1131,7 +1139,7 @@ msgid "Packing" msgstr "" #: editor/editor_export.cpp platform/javascript/export/export.cpp -msgid "Template file not found:\n" +msgid "Template file not found:" msgstr "" #: editor/editor_file_dialog.cpp scene/gui/file_dialog.cpp @@ -1385,6 +1393,10 @@ msgstr "" msgid "Clear" msgstr "" +#: editor/editor_log.cpp +msgid "Clear Output" +msgstr "" + #: editor/editor_node.cpp editor/plugins/animation_player_editor_plugin.cpp msgid "Error saving resource!" msgstr "" @@ -1448,7 +1460,8 @@ msgstr "" #: editor/editor_node.cpp msgid "" -"Couldn't save scene. Likely dependencies (instances) couldn't be satisfied." +"Couldn't save scene. Likely dependencies (instances or inheritance) couldn't " +"be satisfied." msgstr "" #: editor/editor_node.cpp @@ -2380,7 +2393,7 @@ msgid "No version.txt found inside templates." msgstr "" #: editor/export_template_manager.cpp -msgid "Error creating path for templates:\n" +msgid "Error creating path for templates:" msgstr "" #: editor/export_template_manager.cpp @@ -2534,9 +2547,7 @@ msgid "View items as a list" msgstr "" #: editor/filesystem_dock.cpp -msgid "" -"\n" -"Status: Import of file failed. Please fix file and reimport manually." +msgid "Status: Import of file failed. Please fix file and reimport manually." msgstr "" #: editor/filesystem_dock.cpp @@ -2544,19 +2555,19 @@ msgid "Cannot move/rename resources root." msgstr "" #: editor/filesystem_dock.cpp -msgid "Cannot move a folder into itself.\n" +msgid "Cannot move a folder into itself." msgstr "" #: editor/filesystem_dock.cpp -msgid "Error moving:\n" +msgid "Error moving:" msgstr "" #: editor/filesystem_dock.cpp -msgid "Error duplicating:\n" +msgid "Error duplicating:" msgstr "" #: editor/filesystem_dock.cpp -msgid "Unable to update dependencies:\n" +msgid "Unable to update dependencies:" msgstr "" #: editor/filesystem_dock.cpp @@ -3194,6 +3205,10 @@ msgstr "" msgid "Filters.." msgstr "" +#: editor/plugins/animation_tree_editor_plugin.cpp +msgid "AnimationTree" +msgstr "" + #: editor/plugins/asset_library_editor_plugin.cpp msgid "Free" msgstr "" @@ -3359,6 +3374,7 @@ msgid "Bake Lightmaps" msgstr "" #: editor/plugins/camera_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Preview" msgstr "" @@ -4042,7 +4058,7 @@ msgid "Bake!" msgstr "" #: editor/plugins/navigation_mesh_editor_plugin.cpp -msgid "Bake the navigation mesh.\n" +msgid "Bake the navigation mesh." msgstr "" #: editor/plugins/navigation_mesh_editor_plugin.cpp @@ -4431,14 +4447,16 @@ msgstr "" msgid "Paste" msgstr "" +#: editor/plugins/resource_preloader_editor_plugin.cpp +msgid "ResourcePreloader" +msgstr "" + #: editor/plugins/script_editor_plugin.cpp msgid "Clear Recent Files" msgstr "" #: editor/plugins/script_editor_plugin.cpp -msgid "" -"Close and save changes?\n" -"\"" +msgid "Close and save changes?" msgstr "" #: editor/plugins/script_editor_plugin.cpp @@ -4514,6 +4532,10 @@ msgid "Copy Script Path" msgstr "" #: editor/plugins/script_editor_plugin.cpp +msgid "Show In File System" +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp msgid "History Prev" msgstr "" @@ -4945,83 +4967,83 @@ msgid "Rotating %s degrees." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Bottom View." +msgid "Keying is disabled (no key inserted)." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Bottom" +msgid "Animation Key Inserted." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Top View." +msgid "Objects Drawn" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Rear View." +msgid "Material Changes" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Rear" +msgid "Shader Changes" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Front View." +msgid "Surface Changes" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Front" +msgid "Draw Calls" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Left View." +msgid "Vertices" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Left" +msgid "FPS" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Right View." +msgid "Top View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Right" +msgid "Bottom View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Keying is disabled (no key inserted)." +msgid "Bottom" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Animation Key Inserted." +msgid "Left View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Objects Drawn" +msgid "Left" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Material Changes" +msgid "Right View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Shader Changes" +msgid "Right" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Surface Changes" +msgid "Front View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Draw Calls" +msgid "Front" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Vertices" +msgid "Rear View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "FPS" +msgid "Rear" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp @@ -5109,15 +5131,11 @@ 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" +msgid "Select Mode (Q)" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp @@ -5392,10 +5410,18 @@ msgstr "" msgid "Move (After)" msgstr "" +#: editor/plugins/sprite_frames_editor_plugin.cpp +msgid "SpriteFrames" +msgstr "" + #: editor/plugins/style_box_editor_plugin.cpp msgid "StyleBox Preview:" msgstr "" +#: editor/plugins/style_box_editor_plugin.cpp +msgid "StyleBox" +msgstr "" + #: editor/plugins/texture_region_editor_plugin.cpp msgid "Set Region Rect" msgstr "" @@ -5421,14 +5447,17 @@ msgid "Auto Slice" msgstr "" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Offset:" msgstr "" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Step:" msgstr "" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Separation:" msgstr "" @@ -5566,6 +5595,10 @@ msgstr "" msgid "Color" msgstr "" +#: editor/plugins/theme_editor_plugin.cpp +msgid "Theme" +msgstr "" + #: editor/plugins/tile_map_editor_plugin.cpp msgid "Erase Selection" msgstr "" @@ -5666,6 +5699,30 @@ msgstr "" msgid "Error" msgstr "" +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "Autotiles" +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "" +"Select sub-tile to use as icon, this will be also used on invalid autotile " +"bindings." +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "" +"LMB: set bit on.\n" +"RMB: set bit off." +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "Select current edited sub-tile." +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "Select sub-tile to change it's priority." +msgstr "" + #: editor/progress_dialog.cpp scene/gui/dialogs.cpp msgid "Cancel" msgstr "" @@ -5783,10 +5840,22 @@ msgid "Please choose a folder that does not contain a 'project.godot' file." msgstr "" #: editor/project_manager.cpp +msgid "That's a BINGO!" +msgstr "" + +#: editor/project_manager.cpp msgid "Imported Project" msgstr "" #: editor/project_manager.cpp +msgid "Couldn't create folder." +msgstr "" + +#: editor/project_manager.cpp +msgid "There is already a folder in this path with the specified name." +msgstr "" + +#: editor/project_manager.cpp msgid "It would be a good idea to name your project." msgstr "" @@ -5827,14 +5896,26 @@ msgid "Import Existing Project" msgstr "" #: editor/project_manager.cpp +msgid "Import & Edit" +msgstr "" + +#: editor/project_manager.cpp msgid "Create New Project" msgstr "" #: editor/project_manager.cpp +msgid "Create & Edit" +msgstr "" + +#: editor/project_manager.cpp msgid "Install Project:" msgstr "" #: editor/project_manager.cpp +msgid "Install & Edit" +msgstr "" + +#: editor/project_manager.cpp msgid "Project Name:" msgstr "" @@ -5851,10 +5932,6 @@ msgid "Browse" msgstr "" #: editor/project_manager.cpp -msgid "That's a BINGO!" -msgstr "" - -#: editor/project_manager.cpp msgid "Unnamed Project" msgstr "" @@ -5900,6 +5977,10 @@ msgid "" msgstr "" #: editor/project_manager.cpp +msgid "Project Manager" +msgstr "" + +#: editor/project_manager.cpp msgid "Project List" msgstr "" @@ -6026,11 +6107,6 @@ 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 "" @@ -6496,7 +6572,7 @@ msgid "Error duplicating scene to save it." msgstr "" #: editor/scene_tree_dock.cpp -msgid "Sub-Resources:" +msgid "Sub-Resources" msgstr "" #: editor/scene_tree_dock.cpp @@ -6787,7 +6863,7 @@ msgstr "" msgid "Pick one or more items from the list to display the graph." msgstr "" -#: editor/script_editor_debugger.cpp +#: editor/script_editor_debugger.cpp modules/mono/editor/mono_bottom_panel.cpp msgid "Errors" msgstr "" @@ -6796,6 +6872,10 @@ msgid "Child Process Connected" msgstr "" #: editor/script_editor_debugger.cpp +msgid "Copy Error" +msgstr "" + +#: editor/script_editor_debugger.cpp msgid "Inspect Previous Instance" msgstr "" @@ -7141,10 +7221,50 @@ msgstr "" msgid "Pick Distance:" msgstr "" +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Generating solution..." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Generating C# project..." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Failed to create solution." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Failed to save solution." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Done" +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Failed to create C# project." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Mono" +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Create C# solution" +msgstr "" + #: modules/mono/editor/mono_bottom_panel.cpp msgid "Builds" msgstr "" +#: modules/mono/editor/mono_bottom_panel.cpp +msgid "Build Project" +msgstr "" + +#: modules/mono/editor/mono_bottom_panel.cpp +msgid "Warnings" +msgstr "" + #: modules/visual_script/visual_script.cpp msgid "" "A node yielded without working memory, please read the docs on how to yield " @@ -7490,23 +7610,27 @@ msgid "Run exported HTML in the system's default browser." msgstr "" #: platform/javascript/export/export.cpp -msgid "Could not write file:\n" +msgid "Could not write file:" +msgstr "" + +#: platform/javascript/export/export.cpp +msgid "Could not open template for export:" msgstr "" #: platform/javascript/export/export.cpp -msgid "Could not open template for export:\n" +msgid "Invalid export template:" msgstr "" #: platform/javascript/export/export.cpp -msgid "Invalid export template:\n" +msgid "Could not read custom HTML shell:" msgstr "" #: platform/javascript/export/export.cpp -msgid "Could not read custom HTML shell:\n" +msgid "Could not read boot splash image file:" msgstr "" #: platform/javascript/export/export.cpp -msgid "Could not read boot splash image file:\n" +msgid "Using default boot splash image." msgstr "" #: scene/2d/animated_sprite.cpp @@ -7759,8 +7883,8 @@ msgstr "" #: scene/main/scene_tree.cpp msgid "" -"Default Environment as specified in Project Setings (Rendering -> Viewport -" -"> Default Environment) could not be loaded." +"Default Environment as specified in Project Setings (Rendering -> " +"Environment -> Default Environment) could not be loaded." msgstr "" #: scene/main/viewport.cpp diff --git a/editor/translations/it.po b/editor/translations/it.po index 974e667dfb..ab11d241d6 100644 --- a/editor/translations/it.po +++ b/editor/translations/it.po @@ -208,8 +208,7 @@ msgstr "Creare %d NUOVE tracce e inserire key?" #: 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 +#: editor/plugins/particles_editor_plugin.cpp editor/script_create_dialog.cpp msgid "Create" msgstr "Crea" @@ -565,6 +564,16 @@ msgstr "Segnali" #: editor/create_dialog.cpp #, fuzzy +msgid "Change %s Type" +msgstr "Cambia Tipo" + +#: editor/create_dialog.cpp editor/project_settings_editor.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Change" +msgstr "Cambia" + +#: editor/create_dialog.cpp +#, fuzzy msgid "Create New %s" msgstr "Crea Nuovo" @@ -677,7 +686,8 @@ msgstr "" "Rimuoverli comunque? (no undo)" #: editor/dependency_editor.cpp -msgid "Cannot remove:\n" +#, fuzzy +msgid "Cannot remove:" msgstr "Impossibile rimouvere:\n" #: editor/dependency_editor.cpp @@ -760,8 +770,9 @@ msgstr "Fondatori Progetto" msgid "Lead Developer" msgstr "Lead Developer" -#: editor/editor_about.cpp editor/project_manager.cpp -msgid "Project Manager" +#: editor/editor_about.cpp +#, fuzzy +msgid "Project Manager " msgstr "Gestione Progetti" #: editor/editor_about.cpp @@ -850,7 +861,7 @@ msgid "Success!" msgstr "Successo!" #: editor/editor_asset_installer.cpp -#: editor/plugins/asset_library_editor_plugin.cpp editor/project_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp msgid "Install" msgstr "Installa" @@ -1165,7 +1176,8 @@ msgid "Packing" msgstr "Impacchettando" #: editor/editor_export.cpp platform/javascript/export/export.cpp -msgid "Template file not found:\n" +#, fuzzy +msgid "Template file not found:" msgstr "File template non trovato:\n" #: editor/editor_file_dialog.cpp scene/gui/file_dialog.cpp @@ -1423,6 +1435,11 @@ msgstr "Output:" msgid "Clear" msgstr "Rimuovi" +#: editor/editor_log.cpp +#, fuzzy +msgid "Clear Output" +msgstr "Output" + #: editor/editor_node.cpp editor/plugins/animation_player_editor_plugin.cpp msgid "Error saving resource!" msgstr "Errore salvando la Risorsa!" @@ -1486,8 +1503,10 @@ msgstr "" "Questa operazione non può essere eseguita senza una radice dell'albero." #: editor/editor_node.cpp +#, fuzzy msgid "" -"Couldn't save scene. Likely dependencies (instances) couldn't be satisfied." +"Couldn't save scene. Likely dependencies (instances or inheritance) couldn't " +"be satisfied." msgstr "" "Impossibile salvare la scena. Probabili dipendenze (instanze) non sono state " "soddisfatte." @@ -2492,7 +2511,8 @@ msgid "No version.txt found inside templates." msgstr "Non é stato trovato version.txt all'interno di templates." #: editor/export_template_manager.cpp -msgid "Error creating path for templates:\n" +#, fuzzy +msgid "Error creating path for templates:" msgstr "Errore di creazione del percorso per le template:\n" #: editor/export_template_manager.cpp @@ -2654,9 +2674,8 @@ msgid "View items as a list" msgstr "Visualizza elementi come una lista" #: editor/filesystem_dock.cpp -msgid "" -"\n" -"Status: Import of file failed. Please fix file and reimport manually." +#, fuzzy +msgid "Status: Import of file failed. Please fix file and reimport manually." msgstr "" "\n" "Stato: Importazione file fallita. Si prega di sistemare il file e " @@ -2667,20 +2686,23 @@ msgid "Cannot move/rename resources root." msgstr "Impossibile spostare/rinominare risorse root." #: editor/filesystem_dock.cpp -msgid "Cannot move a folder into itself.\n" +#, fuzzy +msgid "Cannot move a folder into itself." msgstr "Impossibile spostare una cartella in se stessa.\n" #: editor/filesystem_dock.cpp -msgid "Error moving:\n" +#, fuzzy +msgid "Error moving:" msgstr "Errore spostamento:\n" #: editor/filesystem_dock.cpp #, fuzzy -msgid "Error duplicating:\n" +msgid "Error duplicating:" msgstr "Errore in caricamento:" #: editor/filesystem_dock.cpp -msgid "Unable to update dependencies:\n" +#, fuzzy +msgid "Unable to update dependencies:" msgstr "Impossibile aggiornare le dipendenze:\n" #: editor/filesystem_dock.cpp @@ -3332,6 +3354,11 @@ msgstr "Modifica Filtri Nodi" msgid "Filters.." msgstr "Filtri.." +#: editor/plugins/animation_tree_editor_plugin.cpp +#, fuzzy +msgid "AnimationTree" +msgstr "Animazione" + #: editor/plugins/asset_library_editor_plugin.cpp msgid "Free" msgstr "Gratuito" @@ -3498,6 +3525,7 @@ msgid "Bake Lightmaps" msgstr "Trasferisci a Lightmap:" #: editor/plugins/camera_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Preview" msgstr "Anteprima" @@ -4216,7 +4244,7 @@ msgstr "Bake!" #: editor/plugins/navigation_mesh_editor_plugin.cpp #, fuzzy -msgid "Bake the navigation mesh.\n" +msgid "Bake the navigation mesh." msgstr "Crea Mesh di Navigazione" #: editor/plugins/navigation_mesh_editor_plugin.cpp @@ -4618,15 +4646,18 @@ msgstr "Carica Risorsa" msgid "Paste" msgstr "Incolla" +#: editor/plugins/resource_preloader_editor_plugin.cpp +#, fuzzy +msgid "ResourcePreloader" +msgstr "Percorso Risosa" + #: editor/plugins/script_editor_plugin.cpp msgid "Clear Recent Files" msgstr "Elimina File recenti" #: editor/plugins/script_editor_plugin.cpp #, fuzzy -msgid "" -"Close and save changes?\n" -"\"" +msgid "Close and save changes?" msgstr "" "Chiudere e salvare i cambiamenti?\n" "\"" @@ -4707,6 +4738,11 @@ msgid "Copy Script Path" msgstr "Copia Percorso" #: editor/plugins/script_editor_plugin.cpp +#, fuzzy +msgid "Show In File System" +msgstr "Mostra nel File System" + +#: editor/plugins/script_editor_plugin.cpp msgid "History Prev" msgstr "Cronologia Succ." @@ -5151,84 +5187,84 @@ msgid "Rotating %s degrees." msgstr "Ruotando di %s gradi." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Bottom View." -msgstr "Vista dal Basso." +msgid "Keying is disabled (no key inserted)." +msgstr "Keying disabilitato (nessun key inserito)." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Bottom" -msgstr "Basso" +msgid "Animation Key Inserted." +msgstr "Key d'Animazione Inserito." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Top View." -msgstr "Vista dall'Alto." +msgid "Objects Drawn" +msgstr "Oggetti Disegnati" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Rear View." -msgstr "Vista dal Retro." +msgid "Material Changes" +msgstr "Cambiamenti dei Materiali" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Rear" -msgstr "Retro" +msgid "Shader Changes" +msgstr "Cambiamenti delle Shader" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Front View." -msgstr "Vista Frontale." +msgid "Surface Changes" +msgstr "Cambiamenti delle Superfici" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Front" -msgstr "Fronte" +msgid "Draw Calls" +msgstr "Draw Calls" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Left View." -msgstr "Vista Sinistra." +msgid "Vertices" +msgstr "Vertici" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Left" -msgstr "Sinistra" +msgid "FPS" +msgstr "FPS" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Right View." -msgstr "Vista Destra." +msgid "Top View." +msgstr "Vista dall'Alto." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Right" -msgstr "Destra" +msgid "Bottom View." +msgstr "Vista dal Basso." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Keying is disabled (no key inserted)." -msgstr "Keying disabilitato (nessun key inserito)." +msgid "Bottom" +msgstr "Basso" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Animation Key Inserted." -msgstr "Key d'Animazione Inserito." +msgid "Left View." +msgstr "Vista Sinistra." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Objects Drawn" -msgstr "Oggetti Disegnati" +msgid "Left" +msgstr "Sinistra" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Material Changes" -msgstr "Cambiamenti dei Materiali" +msgid "Right View." +msgstr "Vista Destra." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Shader Changes" -msgstr "Cambiamenti delle Shader" +msgid "Right" +msgstr "Destra" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Surface Changes" -msgstr "Cambiamenti delle Superfici" +msgid "Front View." +msgstr "Vista Frontale." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Draw Calls" -msgstr "Draw Calls" +msgid "Front" +msgstr "Fronte" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Vertices" -msgstr "Vertici" +msgid "Rear View." +msgstr "Vista dal Retro." #: editor/plugins/spatial_editor_plugin.cpp -msgid "FPS" -msgstr "FPS" +msgid "Rear" +msgstr "Retro" #: editor/plugins/spatial_editor_plugin.cpp msgid "Align with view" @@ -5318,17 +5354,12 @@ msgid "Freelook Speed Modifier" msgstr "Modificatore Velocità Vista Libera" #: editor/plugins/spatial_editor_plugin.cpp -#, fuzzy -msgid "preview" -msgstr "Anteprima" - -#: editor/plugins/spatial_editor_plugin.cpp msgid "XForm Dialog" msgstr "Finestra di XForm" #: editor/plugins/spatial_editor_plugin.cpp #, fuzzy -msgid "Select Mode (Q)\n" +msgid "Select Mode (Q)" msgstr "Modalità di Selezione" #: editor/plugins/spatial_editor_plugin.cpp @@ -5609,10 +5640,20 @@ msgstr "Rimuovi nodo(i)" msgid "Move (After)" msgstr "Sposta a Sinistra" +#: editor/plugins/sprite_frames_editor_plugin.cpp +#, fuzzy +msgid "SpriteFrames" +msgstr "Impila Frame" + #: editor/plugins/style_box_editor_plugin.cpp msgid "StyleBox Preview:" msgstr "Anteprima StyleBox:" +#: editor/plugins/style_box_editor_plugin.cpp +#, fuzzy +msgid "StyleBox" +msgstr "Stile" + #: editor/plugins/texture_region_editor_plugin.cpp #, fuzzy msgid "Set Region Rect" @@ -5639,14 +5680,17 @@ msgid "Auto Slice" msgstr "Auto Divisione" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Offset:" msgstr "Offset:" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Step:" msgstr "Step:" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Separation:" msgstr "Separazione:" @@ -5787,6 +5831,10 @@ msgstr "Font" msgid "Color" msgstr "Colore" +#: editor/plugins/theme_editor_plugin.cpp +msgid "Theme" +msgstr "Tema" + #: editor/plugins/tile_map_editor_plugin.cpp #, fuzzy msgid "Erase Selection" @@ -5892,6 +5940,32 @@ msgstr "Unisci da Scena" msgid "Error" msgstr "Errore" +#: editor/plugins/tile_set_editor_plugin.cpp +#, fuzzy +msgid "Autotiles" +msgstr "Auto Divisione" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "" +"Select sub-tile to use as icon, this will be also used on invalid autotile " +"bindings." +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "" +"LMB: set bit on.\n" +"RMB: set bit off." +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +#, fuzzy +msgid "Select current edited sub-tile." +msgstr "Salva la risorsa in modifica." + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "Select sub-tile to change it's priority." +msgstr "" + #: editor/progress_dialog.cpp scene/gui/dialogs.cpp msgid "Cancel" msgstr "Annulla" @@ -6023,10 +6097,23 @@ msgstr "" "Per favore seleziona una cartella che non contiene un file 'project.godot'." #: editor/project_manager.cpp +msgid "That's a BINGO!" +msgstr "Questo è un BINGO!" + +#: editor/project_manager.cpp msgid "Imported Project" msgstr "Progetto Importato" #: editor/project_manager.cpp +#, fuzzy +msgid "Couldn't create folder." +msgstr "Impossibile creare cartella." + +#: editor/project_manager.cpp +msgid "There is already a folder in this path with the specified name." +msgstr "" + +#: editor/project_manager.cpp msgid "It would be a good idea to name your project." msgstr "Sarebbe una buona idea dare un nome al tuo progetto." @@ -6071,14 +6158,29 @@ msgid "Import Existing Project" msgstr "Importa Progetto Esistente" #: editor/project_manager.cpp +#, fuzzy +msgid "Import & Edit" +msgstr "Importa e Apri" + +#: editor/project_manager.cpp msgid "Create New Project" msgstr "Crea Nuovo Progetto" #: editor/project_manager.cpp +#, fuzzy +msgid "Create & Edit" +msgstr "Crea Emitter" + +#: editor/project_manager.cpp msgid "Install Project:" msgstr "Installa Progetto:" #: editor/project_manager.cpp +#, fuzzy +msgid "Install & Edit" +msgstr "Installa" + +#: editor/project_manager.cpp msgid "Project Name:" msgstr "Nome Progetto:" @@ -6096,10 +6198,6 @@ msgid "Browse" msgstr "Sfoglia" #: editor/project_manager.cpp -msgid "That's a BINGO!" -msgstr "Questo è un BINGO!" - -#: editor/project_manager.cpp msgid "Unnamed Project" msgstr "Progetto Senza Nome" @@ -6157,6 +6255,10 @@ msgid "" msgstr "Stai per esaminare %s cartelle per progetti Godot esistenti. Confermi?" #: editor/project_manager.cpp +msgid "Project Manager" +msgstr "Gestione Progetti" + +#: editor/project_manager.cpp msgid "Project List" msgstr "Lista Progetti" @@ -6288,11 +6390,6 @@ msgid "Button 9" msgstr "Pulsante 9" #: editor/project_settings_editor.cpp -#: modules/visual_script/visual_script_editor.cpp -msgid "Change" -msgstr "Cambia" - -#: editor/project_settings_editor.cpp msgid "Joypad Axis Index:" msgstr "Indice Asse Joypad:" @@ -6779,7 +6876,8 @@ msgid "Error duplicating scene to save it." msgstr "Errore duplicando la scena per salvarla." #: editor/scene_tree_dock.cpp -msgid "Sub-Resources:" +#, fuzzy +msgid "Sub-Resources" msgstr "Sub-Risorse:" #: editor/scene_tree_dock.cpp @@ -7090,7 +7188,7 @@ msgstr "Funzione:" msgid "Pick one or more items from the list to display the graph." msgstr "Scegli uno o più oggetti dalla lista per mostrare il grafico." -#: editor/script_editor_debugger.cpp +#: editor/script_editor_debugger.cpp modules/mono/editor/mono_bottom_panel.cpp msgid "Errors" msgstr "Errori" @@ -7099,6 +7197,11 @@ msgid "Child Process Connected" msgstr "Processo Figlio Connesso" #: editor/script_editor_debugger.cpp +#, fuzzy +msgid "Copy Error" +msgstr "Carica Errori" + +#: editor/script_editor_debugger.cpp msgid "Inspect Previous Instance" msgstr "Ispeziona Istanza Precedente" @@ -7474,11 +7577,59 @@ msgstr "Impostazioni Snap" msgid "Pick Distance:" msgstr "Istanza:" +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Generating solution..." +msgstr "Creazione Octree Texture" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Generating C# project..." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Failed to create solution." +msgstr "Impossiblile creare outline!" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Failed to save solution." +msgstr "Caricamento della risorsa fallito." + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Done" +msgstr "Fatto!" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Failed to create C# project." +msgstr "Caricamento della risorsa fallito." + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Mono" +msgstr "Mono" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Create C# solution" +msgstr "Crea Outline" + #: modules/mono/editor/mono_bottom_panel.cpp #, fuzzy msgid "Builds" msgstr "Costruzioni" +#: modules/mono/editor/mono_bottom_panel.cpp +#, fuzzy +msgid "Build Project" +msgstr "Progetto" + +#: modules/mono/editor/mono_bottom_panel.cpp +#, fuzzy +msgid "Warnings" +msgstr "Avvertimento" + #: modules/visual_script/visual_script.cpp msgid "" "A node yielded without working memory, please read the docs on how to yield " @@ -7858,26 +8009,33 @@ msgid "Run exported HTML in the system's default browser." msgstr "Esegui HTML esportato all'interno del browser di sistema di default." #: platform/javascript/export/export.cpp -msgid "Could not write file:\n" +#, fuzzy +msgid "Could not write file:" msgstr "Impossibile scrivere file:\n" #: platform/javascript/export/export.cpp -msgid "Could not open template for export:\n" +#, fuzzy +msgid "Could not open template for export:" msgstr "Impossibile aprire template per l'esportazione:\n" #: platform/javascript/export/export.cpp #, fuzzy -msgid "Invalid export template:\n" +msgid "Invalid export template:" msgstr "Installa Template di Esportazione" #: platform/javascript/export/export.cpp #, fuzzy -msgid "Could not read custom HTML shell:\n" +msgid "Could not read custom HTML shell:" msgstr "Impossibile leggere file:\n" #: platform/javascript/export/export.cpp #, fuzzy -msgid "Could not read boot splash image file:\n" +msgid "Could not read boot splash image file:" +msgstr "Impossibile leggere file:\n" + +#: platform/javascript/export/export.cpp +#, fuzzy +msgid "Using default boot splash image." msgstr "Impossibile leggere file:\n" #: scene/2d/animated_sprite.cpp @@ -8209,9 +8367,10 @@ msgid "(Other)" msgstr "(Altro)" #: scene/main/scene_tree.cpp +#, fuzzy msgid "" -"Default Environment as specified in Project Setings (Rendering -> Viewport -" -"> Default Environment) could not be loaded." +"Default Environment as specified in Project Setings (Rendering -> " +"Environment -> Default Environment) could not be loaded." msgstr "" "Impossobile caricare Ambiente di Default come specificato nelle Impostazioni " "Progetto (Rendering -> Vista -> Ambiente di Default)." @@ -8244,6 +8403,10 @@ msgstr "Errore caricamento font." msgid "Invalid font size." msgstr "Dimensione font Invalida." +#, fuzzy +#~ msgid "preview" +#~ msgstr "Anteprima" + #~ msgid "Move Add Key" #~ msgstr "Sposta Aggiunta Key" @@ -8336,9 +8499,6 @@ msgstr "Dimensione font Invalida." #~ msgid "' parsing of config failed." #~ msgstr "' fallita lettura della configurazione." -#~ msgid "Theme" -#~ msgstr "Tema" - #~ msgid "Method List For '%s':" #~ msgstr "Lista Metodi Per '%s':" @@ -8611,9 +8771,6 @@ msgstr "Dimensione font Invalida." #~ msgid "Import Anyway" #~ msgstr "Importa ComunqueImporta Comunque" -#~ msgid "Import & Open" -#~ msgstr "Importa e Apri" - #~ msgid "Edited scene has not been saved, open imported scene anyway?" #~ msgstr "" #~ "La scena modificata non è stata salvata, aprire la scena importata " @@ -8869,9 +9026,6 @@ msgstr "Dimensione font Invalida." #~ msgid "Stereo" #~ msgstr "Stereo" -#~ msgid "Mono" -#~ msgstr "Mono" - #~ msgid "Pitch" #~ msgstr "Pitch" diff --git a/editor/translations/ja.po b/editor/translations/ja.po index 66b9115692..b31113a7a0 100644 --- a/editor/translations/ja.po +++ b/editor/translations/ja.po @@ -17,7 +17,7 @@ msgid "" msgstr "" "Project-Id-Version: Godot Engine editor\n" -"PO-Revision-Date: 2017-12-20 15:43+0000\n" +"PO-Revision-Date: 2018-01-06 13:19+0000\n" "Last-Translator: NoahDigital <taku_58@hotmail.com>\n" "Language-Team: Japanese <https://hosted.weblate.org/projects/godot-engine/" "godot/ja/>\n" @@ -25,7 +25,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.18\n" +"X-Generator: Weblate 2.19-dev\n" #: editor/animation_editor.cpp msgid "Disabled" @@ -217,8 +217,7 @@ msgstr "æ–°ã—ã„ %d トラックを作æˆã—ã€ã‚ーを挿入ã—ã¾ã™ã‹ï¼Ÿ" #: 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 +#: editor/plugins/particles_editor_plugin.cpp editor/script_create_dialog.cpp msgid "Create" msgstr "作æˆ" @@ -381,47 +380,38 @@ msgid "Change Array Value" msgstr "é…列ã®å€¤ã‚’変更" #: editor/code_editor.cpp -#, fuzzy msgid "Go to Line" msgstr "è¡Œã«ç§»å‹•" #: editor/code_editor.cpp -#, fuzzy msgid "Line Number:" msgstr "行番å·:" #: editor/code_editor.cpp -#, fuzzy msgid "No Matches" msgstr "一致ãªã—" #: editor/code_editor.cpp -#, fuzzy msgid "Replaced %d occurrence(s)." msgstr "%d 箇所を置æ›ã—ã¾ã—ãŸã€‚" #: editor/code_editor.cpp -#, fuzzy msgid "Replace" msgstr "ç½®æ›" #: editor/code_editor.cpp -#, fuzzy msgid "Replace All" msgstr "ã™ã¹ã¦ç½®æ›" #: editor/code_editor.cpp -#, fuzzy msgid "Match Case" msgstr "大文å—å°æ–‡å—を区別ã™ã‚‹" #: editor/code_editor.cpp -#, fuzzy msgid "Whole Words" msgstr "å˜èªžå…¨ä½“" #: editor/code_editor.cpp -#, fuzzy msgid "Selection Only" msgstr "é¸æŠžç¯„囲ã®ã¿" @@ -440,12 +430,10 @@ msgid "Find" msgstr "検索" #: editor/code_editor.cpp -#, fuzzy msgid "Next" msgstr "次" #: editor/code_editor.cpp -#, fuzzy msgid "Not found!" msgstr "見ã¤ã‹ã‚Šã¾ã›ã‚“!" @@ -454,7 +442,6 @@ msgid "Replace By" msgstr "ã§ç½®æ›ã™ã‚‹" #: editor/code_editor.cpp -#, fuzzy msgid "Case Sensitive" msgstr "大文å—å°æ–‡å—を区別" @@ -611,8 +598,19 @@ msgstr "シグナル" #: editor/create_dialog.cpp #, fuzzy +msgid "Change %s Type" +msgstr "åž‹(type)を変更" + +#: editor/create_dialog.cpp editor/project_settings_editor.cpp +#: modules/visual_script/visual_script_editor.cpp +#, fuzzy +msgid "Change" +msgstr "変更" + +#: editor/create_dialog.cpp +#, fuzzy msgid "Create New %s" -msgstr "æ–°è¦ã«ç”Ÿæˆ" +msgstr "%s ã‚’æ–°è¦ä½œæˆ" #: editor/create_dialog.cpp editor/editor_file_dialog.cpp #: editor/filesystem_dock.cpp @@ -649,7 +647,7 @@ msgstr "記述:" #: editor/dependency_editor.cpp #, fuzzy msgid "Search Replacement For:" -msgstr "検索ã—ã¦ç½®æ›" +msgstr "検索ã—ã¦ç½®æ›:" #: editor/dependency_editor.cpp #, fuzzy @@ -738,7 +736,7 @@ msgstr "" #: editor/dependency_editor.cpp #, fuzzy -msgid "Cannot remove:\n" +msgid "Cannot remove:" msgstr "解決ã§ãã¾ã›ã‚“." #: editor/dependency_editor.cpp @@ -806,12 +804,12 @@ msgstr "消去" #: editor/dictionary_property_edit.cpp #, fuzzy msgid "Change Dictionary Key" -msgstr "アニメーションã®åå‰ã‚’変更:" +msgstr "ディクショナリ ã‚ーã®å¤‰æ›´" #: editor/dictionary_property_edit.cpp #, fuzzy msgid "Change Dictionary Value" -msgstr "é…列ã®å€¤ã‚’変更" +msgstr "ディクショナリ 値ã®å¤‰æ›´" #: editor/editor_about.cpp msgid "Thanks from the Godot community!" @@ -829,15 +827,16 @@ msgstr "Godotエンジンã«è²¢çŒ®ã—ãŸäººã€…" #: editor/editor_about.cpp #, fuzzy msgid "Project Founders" -msgstr "プãƒã‚¸ã‚§ã‚¯ãƒˆãƒžãƒãƒ¼ã‚¸ãƒ£ãƒ¼" +msgstr "プãƒã‚¸ã‚§ã‚¯ãƒˆå‰µæ¥è€…" #: editor/editor_about.cpp #, fuzzy msgid "Lead Developer" msgstr "開発者" -#: editor/editor_about.cpp editor/project_manager.cpp -msgid "Project Manager" +#: editor/editor_about.cpp +#, fuzzy +msgid "Project Manager " msgstr "プãƒã‚¸ã‚§ã‚¯ãƒˆãƒžãƒãƒ¼ã‚¸ãƒ£ãƒ¼" #: editor/editor_about.cpp @@ -937,7 +936,7 @@ msgid "Success!" msgstr "æˆåŠŸï¼" #: editor/editor_asset_installer.cpp -#: editor/plugins/asset_library_editor_plugin.cpp editor/project_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp #, fuzzy msgid "Install" msgstr "インストール" @@ -960,9 +959,8 @@ msgid "Rename Audio Bus" msgstr "オーディオãƒã‚¹åを変更" #: editor/editor_audio_buses.cpp -#, fuzzy msgid "Change Audio Bus Volume" -msgstr "オーディオãƒã‚¹ã‚’ソãƒã«åˆ‡ã‚Šæ›¿ãˆ" +msgstr "オーディオãƒã‚¹ã®ãƒœãƒªãƒ¥ãƒ¼ãƒ を変更" #: editor/editor_audio_buses.cpp msgid "Toggle Audio Bus Solo" @@ -1029,12 +1027,11 @@ msgstr "エフェクトを消去" #: editor/editor_audio_buses.cpp msgid "Audio" -msgstr "" +msgstr "オーディオ" #: editor/editor_audio_buses.cpp -#, fuzzy msgid "Add Audio Bus" -msgstr "ãƒã‚¹ã‚’è¿½åŠ ã™ã‚‹" +msgstr "オーディオãƒã‚¹ã‚’è¿½åŠ " #: editor/editor_audio_buses.cpp msgid "Master bus can't be deleted!" @@ -1282,7 +1279,7 @@ msgstr "パッã‚ングã™ã‚‹" #: editor/editor_export.cpp platform/javascript/export/export.cpp #, fuzzy -msgid "Template file not found:\n" +msgid "Template file not found:" msgstr "テンプレートファイルãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“:\n" #: editor/editor_file_dialog.cpp scene/gui/file_dialog.cpp @@ -1577,6 +1574,11 @@ msgstr " 出力:" msgid "Clear" msgstr "削除" +#: editor/editor_log.cpp +#, fuzzy +msgid "Clear Output" +msgstr "出力" + #: editor/editor_node.cpp editor/plugins/animation_player_editor_plugin.cpp #, fuzzy msgid "Error saving resource!" @@ -1652,8 +1654,10 @@ msgid "This operation can't be done without a tree root." msgstr "ã“ã®å‡¦ç†ã«ã¯ã‚·ãƒ¼ãƒ³ãŒå¿…è¦ã§ã™." #: editor/editor_node.cpp +#, fuzzy msgid "" -"Couldn't save scene. Likely dependencies (instances) couldn't be satisfied." +"Couldn't save scene. Likely dependencies (instances or inheritance) couldn't " +"be satisfied." msgstr "" "シーンをä¿å˜ã§ãã¾ã›ã‚“ã§ã—ãŸã€‚ãŠãらãä¾å˜é–¢ä¿‚ (インスタンス) を完備ã•ã‚Œã¦ã„" "ãªã„ã¨æ€ã‚ã‚Œã¾ã™." @@ -2771,7 +2775,8 @@ msgid "No version.txt found inside templates." msgstr "テンプレート内ã«version.txtãŒè¦‹ã¤ã‹ã‚Šã¾ã›ã‚“." #: editor/export_template_manager.cpp -msgid "Error creating path for templates:\n" +#, fuzzy +msgid "Error creating path for templates:" msgstr "テンプレートã®ãƒ‘ス生æˆã‚¨ãƒ©ãƒ¼\n" #: editor/export_template_manager.cpp @@ -2938,9 +2943,8 @@ msgid "View items as a list" msgstr "リスト表示" #: editor/filesystem_dock.cpp -msgid "" -"\n" -"Status: Import of file failed. Please fix file and reimport manually." +#, fuzzy +msgid "Status: Import of file failed. Please fix file and reimport manually." msgstr "" "\n" "状æ³: ファイルã®ã‚¤ãƒ³ãƒãƒ¼ãƒˆã«å¤±æ•—ã—ã¾ã—ãŸã€‚ファイルを修æ£ã—ã¦æ‰‹å‹•ã§å†ã‚¤ãƒ³ãƒãƒ¼" @@ -2953,22 +2957,22 @@ msgstr "ソースã®ãƒ•ã‚©ãƒ³ãƒˆã‚’èªã¿è¾¼ã¿/処ç†ã§ãã¾ã›ã‚“." #: editor/filesystem_dock.cpp #, fuzzy -msgid "Cannot move a folder into itself.\n" +msgid "Cannot move a folder into itself." msgstr "åŒã˜ãƒ•ã‚¡ã‚¤ãƒ«ã«ã‚¤ãƒ³ãƒãƒ¼ãƒˆã§ãã¾ã›ã‚“:" #: editor/filesystem_dock.cpp #, fuzzy -msgid "Error moving:\n" +msgid "Error moving:" msgstr "エラーをインãƒãƒ¼ãƒˆä¸:" #: editor/filesystem_dock.cpp #, fuzzy -msgid "Error duplicating:\n" +msgid "Error duplicating:" msgstr "èªã¿è¾¼ã¿å¤±æ•—:" #: editor/filesystem_dock.cpp #, fuzzy -msgid "Unable to update dependencies:\n" +msgid "Unable to update dependencies:" msgstr "シーン'%s' ã¯ä¾å˜é–¢ä¿‚ãŒå£Šã‚Œã¦ã„ã¾ã™:" #: editor/filesystem_dock.cpp @@ -3704,6 +3708,11 @@ msgstr "ノードフィルターã®ç·¨é›†" msgid "Filters.." msgstr "フィルター.." +#: editor/plugins/animation_tree_editor_plugin.cpp +#, fuzzy +msgid "AnimationTree" +msgstr "アニメーション" + #: editor/plugins/asset_library_editor_plugin.cpp #, fuzzy msgid "Free" @@ -3886,6 +3895,7 @@ msgid "Bake Lightmaps" msgstr "ライトマップã¸ã®è»¢å†™:" #: editor/plugins/camera_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Preview" msgstr "プレビュー" @@ -4673,7 +4683,7 @@ msgstr "ベイク!" #: editor/plugins/navigation_mesh_editor_plugin.cpp #, fuzzy -msgid "Bake the navigation mesh.\n" +msgid "Bake the navigation mesh." msgstr "ナビメッシュ（ナビゲーションメッシュ）ã®ç”Ÿæˆ" #: editor/plugins/navigation_mesh_editor_plugin.cpp @@ -5122,15 +5132,19 @@ msgstr "リソースをèªã¿è¾¼ã‚€" msgid "Paste" msgstr "貼り付ã‘" +#: editor/plugins/resource_preloader_editor_plugin.cpp +#, fuzzy +msgid "ResourcePreloader" +msgstr "リソースã®ãƒ‘ス" + #: editor/plugins/script_editor_plugin.cpp #, fuzzy msgid "Clear Recent Files" msgstr "最近開ã„ãŸãƒ•ã‚¡ã‚¤ãƒ«ã®è¨˜éŒ²ã‚’クリア" #: editor/plugins/script_editor_plugin.cpp -msgid "" -"Close and save changes?\n" -"\"" +#, fuzzy +msgid "Close and save changes?" msgstr "" "変更をä¿å˜ã—ã¦é–‰ã˜ã¾ã™ã‹?\n" "\"" @@ -5214,6 +5228,11 @@ msgstr "パスをコピーã™ã‚‹" #: editor/plugins/script_editor_plugin.cpp #, fuzzy +msgid "Show In File System" +msgstr "ファイルシステム上ã§è¡¨ç¤º" + +#: editor/plugins/script_editor_plugin.cpp +#, fuzzy msgid "History Prev" msgstr "ç›´å‰ã®å±¥æ´" @@ -5688,85 +5707,85 @@ msgid "Rotating %s degrees." msgstr "%s 度回転." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Bottom View." -msgstr "下é¢å›³." +msgid "Keying is disabled (no key inserted)." +msgstr "ã‚ーã¯ç„¡åŠ¹åŒ–ã•ã‚Œã¦ã„ã¾ã™ï¼ˆã‚ーã¯æŒ¿å…¥ã•ã‚Œã¦ã„ã¾ã›ã‚“）." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Bottom" -msgstr "下é¢" +#, fuzzy +msgid "Animation Key Inserted." +msgstr "アニメーションã®ã‚ーãŒæŒ¿å…¥ã•ã‚Œã¦ã„ã¾ã™." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Top View." -msgstr "上é¢å›³." +msgid "Objects Drawn" +msgstr "æç”»ã•ã‚ŒãŸã‚ªãƒ–ジェクト" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Rear View." -msgstr "後é¢å›³." +msgid "Material Changes" +msgstr "ç´ æã®å¤‰æ›´" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Rear" -msgstr "後é¢" +msgid "Shader Changes" +msgstr "シェーダーã®å¤‰æ›´" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Front View." -msgstr "å‰é¢å›³." +msgid "Surface Changes" +msgstr "サーフェースã®å¤‰æ›´" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Front" -msgstr "å‰é¢" +msgid "Draw Calls" +msgstr "ドãƒãƒ¼ã‚³ãƒ¼ãƒ«ï¼ˆDaw call)" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Left View." -msgstr "å·¦å´é¢å›³." +msgid "Vertices" +msgstr "é ‚ç‚¹" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Left" -msgstr "å·¦å´é¢" +msgid "FPS" +msgstr "フレームレート" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Right View." -msgstr "å³å´é¢å›³." +msgid "Top View." +msgstr "上é¢å›³." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Right" -msgstr "å³å´é¢" +msgid "Bottom View." +msgstr "下é¢å›³." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Keying is disabled (no key inserted)." -msgstr "ã‚ーã¯ç„¡åŠ¹åŒ–ã•ã‚Œã¦ã„ã¾ã™ï¼ˆã‚ーã¯æŒ¿å…¥ã•ã‚Œã¦ã„ã¾ã›ã‚“）." +msgid "Bottom" +msgstr "下é¢" #: editor/plugins/spatial_editor_plugin.cpp -#, fuzzy -msgid "Animation Key Inserted." -msgstr "アニメーションã®ã‚ーãŒæŒ¿å…¥ã•ã‚Œã¦ã„ã¾ã™." +msgid "Left View." +msgstr "å·¦å´é¢å›³." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Objects Drawn" -msgstr "æç”»ã•ã‚ŒãŸã‚ªãƒ–ジェクト" +msgid "Left" +msgstr "å·¦å´é¢" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Material Changes" -msgstr "ç´ æã®å¤‰æ›´" +msgid "Right View." +msgstr "å³å´é¢å›³." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Shader Changes" -msgstr "シェーダーã®å¤‰æ›´" +msgid "Right" +msgstr "å³å´é¢" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Surface Changes" -msgstr "サーフェースã®å¤‰æ›´" +msgid "Front View." +msgstr "å‰é¢å›³." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Draw Calls" -msgstr "ドãƒãƒ¼ã‚³ãƒ¼ãƒ«ï¼ˆDaw call)" +msgid "Front" +msgstr "å‰é¢" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Vertices" -msgstr "é ‚ç‚¹" +msgid "Rear View." +msgstr "後é¢å›³." #: editor/plugins/spatial_editor_plugin.cpp -msgid "FPS" -msgstr "フレームレート" +msgid "Rear" +msgstr "後é¢" #: editor/plugins/spatial_editor_plugin.cpp msgid "Align with view" @@ -5863,17 +5882,12 @@ msgid "Freelook Speed Modifier" msgstr "フリールックã®é€Ÿåº¦ã‚’調整" #: editor/plugins/spatial_editor_plugin.cpp -#, fuzzy -msgid "preview" -msgstr "プレビュー" - -#: editor/plugins/spatial_editor_plugin.cpp msgid "XForm Dialog" msgstr "Xformダイアãƒã‚°" #: editor/plugins/spatial_editor_plugin.cpp #, fuzzy -msgid "Select Mode (Q)\n" +msgid "Select Mode (Q)" msgstr "é¸æŠžãƒ¢ãƒ¼ãƒ‰" #: editor/plugins/spatial_editor_plugin.cpp @@ -6170,10 +6184,20 @@ msgstr "ノードを除去" msgid "Move (After)" msgstr "å·¦ã«ç§»å‹•" +#: editor/plugins/sprite_frames_editor_plugin.cpp +#, fuzzy +msgid "SpriteFrames" +msgstr "スタックフレーム" + #: editor/plugins/style_box_editor_plugin.cpp msgid "StyleBox Preview:" msgstr "スタイルボックス　プレビュー:" +#: editor/plugins/style_box_editor_plugin.cpp +#, fuzzy +msgid "StyleBox" +msgstr "スタイル" + #: editor/plugins/texture_region_editor_plugin.cpp #, fuzzy msgid "Set Region Rect" @@ -6201,14 +6225,17 @@ msgid "Auto Slice" msgstr "自動スライス" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Offset:" msgstr "オフセット:" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Step:" msgstr "ステップ:" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Separation:" msgstr "分離:" @@ -6354,6 +6381,10 @@ msgstr "フォント" msgid "Color" msgstr "色" +#: editor/plugins/theme_editor_plugin.cpp +msgid "Theme" +msgstr "テーマ" + #: editor/plugins/tile_map_editor_plugin.cpp #, fuzzy msgid "Erase Selection" @@ -6463,6 +6494,32 @@ msgstr "シーンã‹ã‚‰ãƒžãƒ¼ã‚¸" msgid "Error" msgstr "エラー" +#: editor/plugins/tile_set_editor_plugin.cpp +#, fuzzy +msgid "Autotiles" +msgstr "自動スライス" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "" +"Select sub-tile to use as icon, this will be also used on invalid autotile " +"bindings." +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "" +"LMB: set bit on.\n" +"RMB: set bit off." +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +#, fuzzy +msgid "Select current edited sub-tile." +msgstr "ç¾åœ¨ç·¨é›†ä¸ã®ãƒªã‚½ãƒ¼ã‚¹ã‚’ä¿å˜ã™ã‚‹" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "Select sub-tile to change it's priority." +msgstr "" + #: editor/progress_dialog.cpp scene/gui/dialogs.cpp msgid "Cancel" msgstr "ã‚ャンセル" @@ -6603,10 +6660,23 @@ msgid "Please choose a folder that does not contain a 'project.godot' file." msgstr "'project.godot'ãŒãªã„フォルダをé¸æŠžã—ã¦ãã ã•ã„." #: editor/project_manager.cpp +msgid "That's a BINGO!" +msgstr "当ãŸã‚Š!" + +#: editor/project_manager.cpp msgid "Imported Project" msgstr "インãƒãƒ¼ãƒˆã•ã‚ŒãŸãƒ—ãƒã‚¸ã‚§ã‚¯ãƒˆ" #: editor/project_manager.cpp +#, fuzzy +msgid "Couldn't create folder." +msgstr "フォルダを作æˆã§ãã¾ã›ã‚“ã§ã—ãŸã€‚" + +#: editor/project_manager.cpp +msgid "There is already a folder in this path with the specified name." +msgstr "" + +#: editor/project_manager.cpp msgid "It would be a good idea to name your project." msgstr "プãƒã‚¸ã‚§ã‚¯ãƒˆã«åå‰ã‚’付ã‘ã¦ãã ã•ã„." @@ -6654,15 +6724,30 @@ msgid "Import Existing Project" msgstr "æ—¢å˜ã®ãƒ—ãƒã‚¸ã‚§ã‚¯ãƒˆã‚’インãƒãƒ¼ãƒˆ" #: editor/project_manager.cpp +#, fuzzy +msgid "Import & Edit" +msgstr "インãƒãƒ¼ãƒˆã—ã¦é–‹ã" + +#: editor/project_manager.cpp msgid "Create New Project" msgstr "æ–°ã—ã„プãƒã‚¸ã‚§ã‚¯ãƒˆã‚’作る" #: editor/project_manager.cpp +#, fuzzy +msgid "Create & Edit" +msgstr "発光物を生æˆ" + +#: editor/project_manager.cpp msgid "Install Project:" msgstr "プãƒã‚¸ã‚§ã‚¯ãƒˆã‚’インストール:" #: editor/project_manager.cpp #, fuzzy +msgid "Install & Edit" +msgstr "インストール" + +#: editor/project_manager.cpp +#, fuzzy msgid "Project Name:" msgstr "プãƒã‚¸ã‚§ã‚¯ãƒˆå:" @@ -6680,10 +6765,6 @@ msgid "Browse" msgstr "ブラウズ" #: editor/project_manager.cpp -msgid "That's a BINGO!" -msgstr "当ãŸã‚Š!" - -#: editor/project_manager.cpp msgid "Unnamed Project" msgstr "åç„¡ã—ã®ãƒ—ãƒã‚¸ã‚§ã‚¯ãƒˆ" @@ -6739,6 +6820,10 @@ msgid "" msgstr "" #: editor/project_manager.cpp +msgid "Project Manager" +msgstr "プãƒã‚¸ã‚§ã‚¯ãƒˆãƒžãƒãƒ¼ã‚¸ãƒ£ãƒ¼" + +#: editor/project_manager.cpp msgid "Project List" msgstr "プãƒã‚¸ã‚§ã‚¯ãƒˆã®ãƒªã‚¹ãƒˆ" @@ -6875,12 +6960,6 @@ msgid "Button 9" msgstr "ボタン9" #: editor/project_settings_editor.cpp -#: modules/visual_script/visual_script_editor.cpp -#, fuzzy -msgid "Change" -msgstr "変更" - -#: editor/project_settings_editor.cpp #, fuzzy msgid "Joypad Axis Index:" msgstr "ジョイパッド軸ã®Index:" @@ -7404,7 +7483,8 @@ msgid "Error duplicating scene to save it." msgstr "ä¿å˜ã®ãŸã‚シーンを複製ã™ã‚‹éš›ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿ." #: editor/scene_tree_dock.cpp -msgid "Sub-Resources:" +#, fuzzy +msgid "Sub-Resources" msgstr "サブリソース:" #: editor/scene_tree_dock.cpp @@ -7744,7 +7824,7 @@ msgstr "関数:" msgid "Pick one or more items from the list to display the graph." msgstr "グラフ表示ã™ã‚‹ã«ã¯ãƒªã‚¹ãƒˆã‹ã‚‰ã‚¢ã‚¤ãƒ†ãƒ ã‚’é¸ã‚“ã§ãã ã•ã„." -#: editor/script_editor_debugger.cpp +#: editor/script_editor_debugger.cpp modules/mono/editor/mono_bottom_panel.cpp msgid "Errors" msgstr "エラー" @@ -7754,6 +7834,11 @@ msgstr "åプãƒã‚»ã‚¹æŽ¥ç¶š" #: editor/script_editor_debugger.cpp #, fuzzy +msgid "Copy Error" +msgstr "èªã¿è¾¼ã¿ã‚¨ãƒ©ãƒ¼" + +#: editor/script_editor_debugger.cpp +#, fuzzy msgid "Inspect Previous Instance" msgstr "å‰ã®ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹ã®å†…容を確èª" @@ -8132,10 +8217,58 @@ msgstr "Snapã®è¨å®š" msgid "Pick Distance:" msgstr "インスタンス:" +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Generating solution..." +msgstr "八分木テクスãƒãƒ£ã‚’生æˆ" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Generating C# project..." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Failed to create solution." +msgstr "アウトラインを生æˆã§ãã¾ã›ã‚“ã§ã—ãŸ!" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Failed to save solution." +msgstr "リソースèªã¿è¾¼ã¿å¤±æ•—" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Done" +msgstr "完了!" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Failed to create C# project." +msgstr "リソースèªã¿è¾¼ã¿å¤±æ•—" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Mono" +msgstr "モノラル音声" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Create C# solution" +msgstr "アウトラインを生æˆ" + #: modules/mono/editor/mono_bottom_panel.cpp msgid "Builds" msgstr "ビルド" +#: modules/mono/editor/mono_bottom_panel.cpp +#, fuzzy +msgid "Build Project" +msgstr "プãƒã‚¸ã‚§ã‚¯ãƒˆ" + +#: modules/mono/editor/mono_bottom_panel.cpp +#, fuzzy +msgid "Warnings" +msgstr "è¦å‘Š" + #: modules/visual_script/visual_script.cpp #, fuzzy msgid "" @@ -8561,27 +8694,33 @@ msgid "Run exported HTML in the system's default browser." msgstr "エクスãƒãƒ¼ãƒˆã—ãŸHTMLファイルを既定ã®ãƒ–ラウザã§å®Ÿè¡Œ." #: platform/javascript/export/export.cpp -msgid "Could not write file:\n" +#, fuzzy +msgid "Could not write file:" msgstr "ファイルã«æ›¸ãè¾¼ã¿ã§ãã¾ã›ã‚“ã§ã—ãŸ:\n" #: platform/javascript/export/export.cpp #, fuzzy -msgid "Could not open template for export:\n" +msgid "Could not open template for export:" msgstr "エクスãƒãƒ¼ãƒˆã™ã‚‹ãƒ†ãƒ³ãƒ—レートを開ã‘ã¾ã›ã‚“:\n" #: platform/javascript/export/export.cpp #, fuzzy -msgid "Invalid export template:\n" +msgid "Invalid export template:" msgstr "テンプレート エクスãƒãƒ¼ãƒˆã‚’管ç†" #: platform/javascript/export/export.cpp #, fuzzy -msgid "Could not read custom HTML shell:\n" +msgid "Could not read custom HTML shell:" +msgstr "ファイルをèªã‚ã¾ã›ã‚“ã§ã—ãŸ:\n" + +#: platform/javascript/export/export.cpp +#, fuzzy +msgid "Could not read boot splash image file:" msgstr "ファイルをèªã‚ã¾ã›ã‚“ã§ã—ãŸ:\n" #: platform/javascript/export/export.cpp #, fuzzy -msgid "Could not read boot splash image file:\n" +msgid "Using default boot splash image." msgstr "ファイルをèªã‚ã¾ã›ã‚“ã§ã—ãŸ:\n" #: scene/2d/animated_sprite.cpp @@ -8904,8 +9043,8 @@ msgstr "(ãã®ä»–)" #: scene/main/scene_tree.cpp #, fuzzy msgid "" -"Default Environment as specified in Project Setings (Rendering -> Viewport -" -"> Default Environment) could not be loaded." +"Default Environment as specified in Project Setings (Rendering -> " +"Environment -> Default Environment) could not be loaded." msgstr "" "プãƒã‚¸ã‚§ã‚¯ãƒˆã®è¨å®š (レンダリング-> ビューãƒãƒ¼ãƒˆ -> 既定ã®ç’°å¢ƒ) ã§æ—¢å®šã¨ã•ã‚Œã¦" "ã„る環境(Environment)ã¯èªã¿è¾¼ã‚ã¾ã›ã‚“ã§ã—ãŸ." @@ -8938,6 +9077,10 @@ msgstr "フォントèªã¿è¾¼ã¿ã‚¨ãƒ©ãƒ¼ã€‚" msgid "Invalid font size." msgstr "無効ãªãƒ•ã‚©ãƒ³ãƒˆ サイズã§ã™ã€‚" +#, fuzzy +#~ msgid "preview" +#~ msgstr "プレビュー" + #~ msgid "Move Add Key" #~ msgstr "è¿½åŠ ã—ãŸã‚ーを移動" @@ -9026,9 +9169,6 @@ msgstr "無効ãªãƒ•ã‚©ãƒ³ãƒˆ サイズã§ã™ã€‚" #~ msgid "Filter:" #~ msgstr "フィルター:" -#~ msgid "Theme" -#~ msgstr "テーマ" - #, fuzzy #~ msgid "Method List For '%s':" #~ msgstr "'%s' ã®ãƒ¡ã‚½ãƒƒãƒ‰ä¸€è¦§ï¼š" @@ -9358,10 +9498,6 @@ msgstr "無効ãªãƒ•ã‚©ãƒ³ãƒˆ サイズã§ã™ã€‚" #~ msgstr "ã¨ã‚Šã‚ãˆãšã‚¤ãƒ³ãƒãƒ¼ãƒˆ" #, fuzzy -#~ msgid "Import & Open" -#~ msgstr "インãƒãƒ¼ãƒˆã—ã¦é–‹ã" - -#, fuzzy #~ msgid "Edited scene has not been saved, open imported scene anyway?" #~ msgstr "" #~ "編集ã—ãŸã‚·ãƒ¼ãƒ³ã¯ä¿å˜ã•ã‚Œã¦ã„ã¾ã›ã‚“ãŒã€ãã‚Œã§ã‚‚インãƒãƒ¼ãƒˆã—ãŸã‚·ãƒ¼ãƒ³ã‚’é–‹ãã¾" @@ -9677,9 +9813,6 @@ msgstr "無効ãªãƒ•ã‚©ãƒ³ãƒˆ サイズã§ã™ã€‚" #~ msgid "Stereo" #~ msgstr "ステレオ音声" -#~ msgid "Mono" -#~ msgstr "モノラル音声" - #~ msgid "Pitch" #~ msgstr "ピッãƒ" diff --git a/editor/translations/ko.po b/editor/translations/ko.po index 743f32a9e6..3d282de6b0 100644 --- a/editor/translations/ko.po +++ b/editor/translations/ko.po @@ -5,13 +5,14 @@ # # 박한얼 (volzhs) <volzhs@gmail.com>, 2016-2017. # Ch <ccwpc@hanmail.net>, 2017. +# TheRedPlanet <junmo.moon8@gmail.com>, 2018. # msgid "" msgstr "" "Project-Id-Version: Godot Engine editor\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2017-12-11 00:48+0000\n" -"Last-Translator: 박한얼 <volzhs@gmail.com>\n" +"PO-Revision-Date: 2018-01-06 13:19+0000\n" +"Last-Translator: TheRedPlanet <junmo.moon8@gmail.com>\n" "Language-Team: Korean <https://hosted.weblate.org/projects/godot-engine/" "godot/ko/>\n" "Language: ko\n" @@ -19,13 +20,14 @@ 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.18-dev\n" +"X-Generator: Weblate 2.19-dev\n" #: editor/animation_editor.cpp msgid "Disabled" msgstr "비활성화ë¨" #: editor/animation_editor.cpp +#, fuzzy msgid "All Selection" msgstr "ëª¨ë“ ì„ íƒ" @@ -35,10 +37,12 @@ msgid "Anim Change Keyframe Time" msgstr "ê°’ 변경" #: editor/animation_editor.cpp +#, fuzzy msgid "Anim Change Transition" msgstr "ì „í™˜ 변경" #: editor/animation_editor.cpp +#, fuzzy msgid "Anim Change Transform" msgstr "ì†ì„± 변경" @@ -48,6 +52,7 @@ msgid "Anim Change Keyframe Value" msgstr "ê°’ 변경" #: editor/animation_editor.cpp +#, fuzzy msgid "Anim Change Call" msgstr "호출 변경" @@ -201,8 +206,7 @@ msgstr "%dê°œì˜ ìƒˆ íŠ¸ëž™ì„ ìƒì„±í•˜ê³ 키를 ì¶”ê°€í•˜ì‹œê² ìŠµë‹ˆê¹Œ?" #: 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 +#: editor/plugins/particles_editor_plugin.cpp editor/script_create_dialog.cpp msgid "Create" msgstr "ìƒì„±" @@ -312,7 +316,8 @@ msgstr "최ì í™”" #: editor/animation_editor.cpp msgid "Select an AnimationPlayer from the Scene Tree to edit animations." -msgstr "ì• ë‹ˆë©”ì´ì…˜ íŽ¸ì§‘ì„ ìœ„í•´ì„œëŠ” 씬ì—ì„œ AnimationPlayer를 ì„ íƒí•´ì•¼ 합니다." +msgstr "" +"ì• ë‹ˆë©”ì´ì…˜ íŽ¸ì§‘ì„ ìœ„í•´ì„œëŠ” 씬 트리ì—ì„œ AnimationPlayer를 ì„ íƒí•´ì•¼ 합니다." #: editor/animation_editor.cpp msgid "Key" @@ -538,9 +543,8 @@ msgid "Connecting Signal:" msgstr "ì‹œê·¸ë„ ì—°ê²°:" #: editor/connections_dialog.cpp -#, fuzzy msgid "Disconnect '%s' from '%s'" -msgstr "'%s'를 '%s'ì— ì—°ê²°" +msgstr "'%s'와 '%s'ì˜ ì—°ê²° í•´ì œ" #: editor/connections_dialog.cpp msgid "Connect.." @@ -557,8 +561,17 @@ msgstr "시그ë„" #: editor/create_dialog.cpp #, fuzzy +msgid "Change %s Type" +msgstr "타입 변경" + +#: editor/create_dialog.cpp editor/project_settings_editor.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Change" +msgstr "변경" + +#: editor/create_dialog.cpp msgid "Create New %s" -msgstr "새로 만들기" +msgstr "새 %s ìƒì„±" #: editor/create_dialog.cpp editor/editor_file_dialog.cpp #: editor/filesystem_dock.cpp @@ -601,7 +614,7 @@ msgid "" "Scene '%s' is currently being edited.\n" "Changes will not take effect unless reloaded." msgstr "" -"씬 '%s'ì´(ê°€) 현재 편집 중입니다.\n" +"씬 '%s'(ì´)ê°€ 현재 편집 중입니다.\n" "다시 로드 í• ë•Œ 변경 사í•ì´ ì ìš©ë©ë‹ˆë‹¤." #: editor/dependency_editor.cpp @@ -668,7 +681,8 @@ msgstr "" "ì •ë§ë¡œ ì‚ì œí•˜ì‹œê² ìŠµë‹ˆê¹Œ? (ë˜ëŒë¦¬ê¸° 불가)" #: editor/dependency_editor.cpp -msgid "Cannot remove:\n" +#, fuzzy +msgid "Cannot remove:" msgstr "ì œê±°í• ìˆ˜ 없습니다:\n" #: editor/dependency_editor.cpp @@ -677,7 +691,7 @@ msgstr "로드 중 ì—러:" #: editor/dependency_editor.cpp msgid "Scene failed to load due to missing dependencies:" -msgstr "없어진 ì¢…ì† ê´€ê³„ ë•Œë¬¸ì— ì”¬ì„ ë¡œë“œí• ìˆ˜ 없습니다:" +msgstr "Dependencies를 ì°¾ì„ ìˆ˜ ì—†ìŒìœ¼ë¡œ 씬를 ë¡œë“œí• ìˆ˜ 없습니다:" #: editor/dependency_editor.cpp editor/editor_node.cpp msgid "Open Anyway" @@ -751,8 +765,9 @@ msgstr "프로ì 트 창립ìž" msgid "Lead Developer" msgstr "리드 개발ìž" -#: editor/editor_about.cpp editor/project_manager.cpp -msgid "Project Manager" +#: editor/editor_about.cpp +#, fuzzy +msgid "Project Manager " msgstr "프로ì 트 ë§¤ë‹ˆì €" #: editor/editor_about.cpp @@ -840,7 +855,7 @@ msgid "Success!" msgstr "성공!" #: editor/editor_asset_installer.cpp -#: editor/plugins/asset_library_editor_plugin.cpp editor/project_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp msgid "Install" msgstr "설치" @@ -861,9 +876,8 @@ msgid "Rename Audio Bus" msgstr "오디오 버스 ì´ë¦„ 변경" #: editor/editor_audio_buses.cpp -#, fuzzy msgid "Change Audio Bus Volume" -msgstr "오디오 버스 솔로 í† ê¸€" +msgstr "오디오 버스 볼륨 바꾸기" #: editor/editor_audio_buses.cpp msgid "Toggle Audio Bus Solo" @@ -928,7 +942,7 @@ msgstr "ì´íŽ™íŠ¸ ì‚ì œ" #: editor/editor_audio_buses.cpp msgid "Audio" -msgstr "" +msgstr "ìŒì„±" #: editor/editor_audio_buses.cpp msgid "Add Audio Bus" @@ -1105,13 +1119,12 @@ msgid "Updating scene.." msgstr "씬 ì—…ë°ì´íŠ¸ 중.." #: editor/editor_data.cpp -#, fuzzy msgid "[empty]" -msgstr "(비었ìŒ)" +msgstr "[비었ìŒ]" #: editor/editor_data.cpp msgid "[unsaved]" -msgstr "" +msgstr "[ì €ìž¥ë˜ì§€ ì•ŠìŒ]" #: editor/editor_dir_dialog.cpp msgid "Please select a base directory first" @@ -1151,7 +1164,8 @@ msgid "Packing" msgstr "패킹중" #: editor/editor_export.cpp platform/javascript/export/export.cpp -msgid "Template file not found:\n" +#, fuzzy +msgid "Template file not found:" msgstr "í…œí”Œë¦¿ì„ ì°¾ì„ ìˆ˜ 없습니다:\n" #: editor/editor_file_dialog.cpp scene/gui/file_dialog.cpp @@ -1409,6 +1423,11 @@ msgstr "ì¶œë ¥:" msgid "Clear" msgstr "지우기" +#: editor/editor_log.cpp +#, fuzzy +msgid "Clear Output" +msgstr "ì¶œë ¥" + #: editor/editor_node.cpp editor/plugins/animation_player_editor_plugin.cpp msgid "Error saving resource!" msgstr "리소스 ì €ìž¥ 중 ì—러!" @@ -1471,8 +1490,10 @@ msgid "This operation can't be done without a tree root." msgstr "ì´ ìž‘ì—…ì€ íŠ¸ë¦¬ 루트 ì—†ì´ëŠ” 불가합니다." #: editor/editor_node.cpp +#, fuzzy msgid "" -"Couldn't save scene. Likely dependencies (instances) couldn't be satisfied." +"Couldn't save scene. Likely dependencies (instances or inheritance) couldn't " +"be satisfied." msgstr "" "ì”¬ì„ ì €ìž¥í• ìˆ˜ 없습니다. ì•„ë§ˆë„ ì¢…ì† ê´€ê³„ê°€ 만족스럽지 ì•Šì„ ìˆ˜ 있습니다." @@ -2461,7 +2482,8 @@ msgid "No version.txt found inside templates." msgstr "í…œí”Œë¦¿ì— version.txt를 ì°¾ì„ ìˆ˜ 없습니다." #: editor/export_template_manager.cpp -msgid "Error creating path for templates:\n" +#, fuzzy +msgid "Error creating path for templates:" msgstr "템플릿 경로 ìƒì„± ì—러:\n" #: editor/export_template_manager.cpp @@ -2619,9 +2641,8 @@ msgid "View items as a list" msgstr "리스트로 보기" #: editor/filesystem_dock.cpp -msgid "" -"\n" -"Status: Import of file failed. Please fix file and reimport manually." +#, fuzzy +msgid "Status: Import of file failed. Please fix file and reimport manually." msgstr "" "\n" "ìƒíƒœ: íŒŒì¼ ê°€ì ¸ì˜¤ê¸° 실패. 파ì¼ì„ ìˆ˜ì •í•˜ê³ \"다시 ê°€ì ¸ì˜¤ê¸°\"를 수행하세요." @@ -2631,20 +2652,23 @@ msgid "Cannot move/rename resources root." msgstr "리소스 루트를 옮기거나 ì´ë¦„ì„ ë³€ê²½í• ìˆ˜ 없습니다." #: editor/filesystem_dock.cpp -msgid "Cannot move a folder into itself.\n" +#, fuzzy +msgid "Cannot move a folder into itself." msgstr "í´ë”를 ìžì‹ ì˜ í•˜ìœ„ë¡œ ì´ë™í• 수 없습니다.\n" #: editor/filesystem_dock.cpp -msgid "Error moving:\n" +#, fuzzy +msgid "Error moving:" msgstr "ì´ë™ ì—러:\n" #: editor/filesystem_dock.cpp #, fuzzy -msgid "Error duplicating:\n" -msgstr "로드 중 ì—러:" +msgid "Error duplicating:" +msgstr "ë³µì œ 중 ì—러:\n" #: editor/filesystem_dock.cpp -msgid "Unable to update dependencies:\n" +#, fuzzy +msgid "Unable to update dependencies:" msgstr "종ì†í•ëª©ì„ ì—…ë°ì´íŠ¸ í• ìˆ˜ 없습니다:\n" #: editor/filesystem_dock.cpp @@ -2676,14 +2700,12 @@ msgid "Renaming folder:" msgstr "í´ë”명 변경:" #: editor/filesystem_dock.cpp -#, fuzzy msgid "Duplicating file:" -msgstr "ë³µì œ" +msgstr "íŒŒì¼ ë³µì œ 중:" #: editor/filesystem_dock.cpp -#, fuzzy msgid "Duplicating folder:" -msgstr "í´ë”명 변경:" +msgstr "í´ë” ë³µì œ 중:" #: editor/filesystem_dock.cpp msgid "Expand all" @@ -2702,9 +2724,8 @@ msgid "Move To.." msgstr "ì´ë™.." #: editor/filesystem_dock.cpp -#, fuzzy msgid "Open Scene(s)" -msgstr "씬 열기" +msgstr "씬(들) 열기" #: editor/filesystem_dock.cpp msgid "Instance" @@ -2721,7 +2742,7 @@ msgstr "ì†Œìœ ìž ë³´ê¸°.." #: editor/filesystem_dock.cpp #, fuzzy msgid "Duplicate.." -msgstr "ë³µì œ" +msgstr "ë³µì œ..." #: editor/filesystem_dock.cpp msgid "Previous Directory" @@ -2820,12 +2841,12 @@ msgstr "씬 ê°€ì ¸ì˜¤ëŠ” 중.." #: editor/import/resource_importer_scene.cpp #, fuzzy msgid "Generating Lightmaps" -msgstr "ë¼ì´íŠ¸ë§µìœ¼ë¡œ ì „ì†¡:" +msgstr "ë¼ì´íŠ¸ë§µ ìƒì„± 중" #: editor/import/resource_importer_scene.cpp #, fuzzy msgid "Generating for Mesh: " -msgstr "AABB ìƒì„± 중" +msgstr "메쉬를 위해 ìƒì„± 중: " #: editor/import/resource_importer_scene.cpp msgid "Running Custom Script.." @@ -3294,6 +3315,11 @@ msgstr "노드 í•„í„° 편집" msgid "Filters.." msgstr "í•„í„°.." +#: editor/plugins/animation_tree_editor_plugin.cpp +#, fuzzy +msgid "AnimationTree" +msgstr "ì• ë‹ˆë©”ì´ì…˜" + #: editor/plugins/asset_library_editor_plugin.cpp msgid "Free" msgstr "무료" @@ -3443,23 +3469,29 @@ msgid "" "Save your scene (for images to be saved in the same dir), or pick a save " "path from the BakedLightmap properties." msgstr "" +"ë¼ì´íŠ¸ë§µ ì´ë¯¸ì§€ë“¤ì˜ ì €ìž¥ 경로를 íŒŒì•…í• ìˆ˜ 없습니다.\n" +"(해당 ê²½ë¡œì— ì´ë¯¸ì§€ë“¤ì´ ì €ìž¥ ë 수 있ë„ë¡) ì”¬ì„ ì €ìž¥í•˜ê±°ë‚˜ BakedLightmap ì„¤ì •" +"ì—ì„œ ì €ìž¥ 경로를 ì§€ì •í•˜ì„¸ìš”." #: editor/plugins/baked_lightmap_editor_plugin.cpp +#, fuzzy msgid "" "No meshes to bake. Make sure they contain an UV2 channel and that the 'Bake " "Light' flag is on." msgstr "" +"ë² ì´í¬í• 메쉬가 없습니다. ë©”ì‰¬ë“¤ì´ UV2 채ë„ì„ í¬í•¨í•˜ë©° 'ë¼ì´íŠ¸ ë² ì´í¬' í•ëª©" +"ì´ ì²´í¬ë˜ì–´ 있는지 í™•ì¸ í•´ 주세요." #: editor/plugins/baked_lightmap_editor_plugin.cpp msgid "Failed creating lightmap images, make sure path is writable." msgstr "" #: editor/plugins/baked_lightmap_editor_plugin.cpp -#, fuzzy msgid "Bake Lightmaps" -msgstr "ë¼ì´íŠ¸ë§µìœ¼ë¡œ ì „ì†¡:" +msgstr "ë¼ì´íŠ¸ë§µ ë² ì´í¬" #: editor/plugins/camera_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Preview" msgstr "미리보기" @@ -3740,7 +3772,7 @@ msgstr "í¬ì¦ˆ ì •ë¦¬" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Drag pivot from mouse position" -msgstr "" +msgstr "마우스로 중심ì 드래그" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Set pivot at mouse position" @@ -3825,7 +3857,7 @@ msgstr "" #: editor/plugins/curve_editor_plugin.cpp msgid "Flat1" -msgstr "" +msgstr "Flat1" #: editor/plugins/curve_editor_plugin.cpp msgid "Ease in" @@ -3837,7 +3869,7 @@ msgstr "Ease out" #: editor/plugins/curve_editor_plugin.cpp msgid "Smoothstep" -msgstr "" +msgstr "Smoothstep" #: editor/plugins/curve_editor_plugin.cpp msgid "Modify Curve Point" @@ -3876,8 +3908,9 @@ msgid "Remove Curve Point" msgstr "커프 í¬ì¸íŠ¸ ì‚ì œ" #: editor/plugins/curve_editor_plugin.cpp +#, fuzzy msgid "Toggle Curve Linear Tangent" -msgstr "" +msgstr "ê³¡ì„ ì„ í˜• 탄ì 트 í† ê¸€" #: editor/plugins/curve_editor_plugin.cpp msgid "Hold Shift to edit tangents individually" @@ -3970,7 +4003,7 @@ msgstr "네비게ì´ì…˜ 메쉬 만들기" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Contained Mesh is not of type ArrayMesh." -msgstr "" +msgstr "í¬í•¨ëœ 메쉬는 ArrayMesh íƒ€ìž…ì— ì†í•˜ì§€ 않습니다." #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "UV Unwrap failed, mesh may not be manifold?" @@ -3978,11 +4011,11 @@ msgstr "" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "No mesh to debug." -msgstr "" +msgstr "ë””ë²„ê·¸í• ë©”ì‰¬ê°€ 없습니다." #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Model has no UV in this layer" -msgstr "" +msgstr "모ë¸ì´ ì´ ë ˆì´ì–´ì— UV를 ì§€ë‹ˆê³ ìžˆì§€ 않습니다" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "MeshInstance lacks a Mesh!" @@ -4025,18 +4058,16 @@ msgid "Create Outline Mesh.." msgstr "ì™¸ê³½ì„ ë©”ì‰¬ 만들기.." #: editor/plugins/mesh_instance_editor_plugin.cpp -#, fuzzy msgid "View UV1" -msgstr "보기" +msgstr "UV1 보기" #: editor/plugins/mesh_instance_editor_plugin.cpp -#, fuzzy msgid "View UV2" -msgstr "보기" +msgstr "UV2 보기" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Unwrap UV2 for Lightmap/AO" -msgstr "" +msgstr "ë¼ì´íŠ¸ë§µ/AO를 위해 UV2 언랩" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Create Outline Mesh" @@ -4151,7 +4182,8 @@ msgid "Bake!" msgstr "굽기!" #: editor/plugins/navigation_mesh_editor_plugin.cpp -msgid "Bake the navigation mesh.\n" +#, fuzzy +msgid "Bake the navigation mesh." msgstr "네비게ì´ì…˜ 메쉬 만들기.\n" #: editor/plugins/navigation_mesh_editor_plugin.cpp @@ -4540,14 +4572,18 @@ msgstr "리소스 로드" msgid "Paste" msgstr "붙여넣기" +#: editor/plugins/resource_preloader_editor_plugin.cpp +#, fuzzy +msgid "ResourcePreloader" +msgstr "리소스 경로" + #: editor/plugins/script_editor_plugin.cpp msgid "Clear Recent Files" msgstr "최근 íŒŒì¼ ì§€ìš°ê¸°" #: editor/plugins/script_editor_plugin.cpp -msgid "" -"Close and save changes?\n" -"\"" +#, fuzzy +msgid "Close and save changes?" msgstr "" "변경사í•ì„ ì €ìž¥í•˜ê³ ë‹«ê² ìŠµë‹ˆê¹Œ?\n" "\"" @@ -4621,9 +4657,13 @@ msgid "Soft Reload Script" msgstr "스í¬ë¦½íŠ¸ 다시 로드" #: editor/plugins/script_editor_plugin.cpp -#, fuzzy msgid "Copy Script Path" -msgstr "경로 복사" +msgstr "스í¬ë¦½íŠ¸ 경로 복사" + +#: editor/plugins/script_editor_plugin.cpp +#, fuzzy +msgid "Show In File System" +msgstr "íŒŒì¼ ì‹œìŠ¤í…œì—ì„œ 보기" #: editor/plugins/script_editor_plugin.cpp msgid "History Prev" @@ -5060,84 +5100,84 @@ msgid "Rotating %s degrees." msgstr "%së„ë¡œ íšŒì „." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Bottom View." -msgstr "ì•„ëž«ë©´ 보기." +msgid "Keying is disabled (no key inserted)." +msgstr "키가 비활성화 ë˜ì–´ 있습니다 (키가 삽입ë˜ì§€ 않았습니다)." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Bottom" -msgstr "ì•„ëž«ë©´" +msgid "Animation Key Inserted." +msgstr "ì• ë‹ˆë©”ì´ì…˜ 키가 삽입ë˜ì—ˆìŠµë‹ˆë‹¤." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Top View." -msgstr "윗면 보기." +msgid "Objects Drawn" +msgstr "ê·¸ë ¤ì§„ 오브ì 트" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Rear View." -msgstr "ë’·ë©´ 보기." +msgid "Material Changes" +msgstr "머터리얼 변경" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Rear" -msgstr "ë’·ë©´" +msgid "Shader Changes" +msgstr "ì…°ì´ë” 변경" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Front View." -msgstr "ì •ë©´ 보기." +msgid "Surface Changes" +msgstr "서피스 변경" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Front" -msgstr "ì •ë©´" +msgid "Draw Calls" +msgstr "드로우 콜" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Left View." -msgstr "왼쪽면 보기." +msgid "Vertices" +msgstr "버틱스" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Left" -msgstr "왼쪽면" +msgid "FPS" +msgstr "초당 í”„ë ˆìž„" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Right View." -msgstr "오른쪽면 보기." +msgid "Top View." +msgstr "윗면 보기." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Right" -msgstr "오른쪽면" +msgid "Bottom View." +msgstr "ì•„ëž«ë©´ 보기." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Keying is disabled (no key inserted)." -msgstr "키가 비활성화 ë˜ì–´ 있습니다 (키가 삽입ë˜ì§€ 않았습니다)." +msgid "Bottom" +msgstr "ì•„ëž«ë©´" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Animation Key Inserted." -msgstr "ì• ë‹ˆë©”ì´ì…˜ 키가 삽입ë˜ì—ˆìŠµë‹ˆë‹¤." +msgid "Left View." +msgstr "왼쪽면 보기." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Objects Drawn" -msgstr "ê·¸ë ¤ì§„ 오브ì 트" +msgid "Left" +msgstr "왼쪽면" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Material Changes" -msgstr "머터리얼 변경" +msgid "Right View." +msgstr "오른쪽면 보기." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Shader Changes" -msgstr "ì…°ì´ë” 변경" +msgid "Right" +msgstr "오른쪽면" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Surface Changes" -msgstr "서피스 변경" +msgid "Front View." +msgstr "ì •ë©´ 보기." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Draw Calls" -msgstr "드로우 콜" +msgid "Front" +msgstr "ì •ë©´" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Vertices" -msgstr "버틱스" +msgid "Rear View." +msgstr "ë’·ë©´ 보기." #: editor/plugins/spatial_editor_plugin.cpp -msgid "FPS" -msgstr "초당 í”„ë ˆìž„" +msgid "Rear" +msgstr "ë’·ë©´" #: editor/plugins/spatial_editor_plugin.cpp msgid "Align with view" @@ -5224,15 +5264,12 @@ 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" +#, fuzzy +msgid "Select Mode (Q)" msgstr "ì„ íƒ ëª¨ë“œ (Q)\n" #: editor/plugins/spatial_editor_plugin.cpp @@ -5512,10 +5549,20 @@ msgstr "ì´ë™ (ì´ì „)" msgid "Move (After)" msgstr "ì´ë™ (ì´í›„)" +#: editor/plugins/sprite_frames_editor_plugin.cpp +#, fuzzy +msgid "SpriteFrames" +msgstr "ìŠ¤íƒ í”„ë ˆìž„" + #: editor/plugins/style_box_editor_plugin.cpp msgid "StyleBox Preview:" msgstr "StyleBox 미리보기:" +#: editor/plugins/style_box_editor_plugin.cpp +#, fuzzy +msgid "StyleBox" +msgstr "스타ì¼" + #: editor/plugins/texture_region_editor_plugin.cpp msgid "Set Region Rect" msgstr "êµ¬ì— ì„¤ì •" @@ -5541,14 +5588,17 @@ msgid "Auto Slice" msgstr "ìžë™ ìžë¥´ê¸°" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Offset:" msgstr "오프셋:" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Step:" msgstr "단계:" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Separation:" msgstr "간격:" @@ -5686,6 +5736,10 @@ msgstr "í°íŠ¸" msgid "Color" msgstr "색깔" +#: editor/plugins/theme_editor_plugin.cpp +msgid "Theme" +msgstr "테마" + #: editor/plugins/tile_map_editor_plugin.cpp msgid "Erase Selection" msgstr "ì„ íƒ ì§€ìš°ê¸°" @@ -5787,6 +5841,32 @@ msgstr "씬으로부터 병합하기" msgid "Error" msgstr "ì—러" +#: editor/plugins/tile_set_editor_plugin.cpp +#, fuzzy +msgid "Autotiles" +msgstr "ìžë™ ìžë¥´ê¸°" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "" +"Select sub-tile to use as icon, this will be also used on invalid autotile " +"bindings." +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "" +"LMB: set bit on.\n" +"RMB: set bit off." +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +#, fuzzy +msgid "Select current edited sub-tile." +msgstr "현재 íŽ¸ì§‘ëœ ë¦¬ì†ŒìŠ¤ ì €ìž¥." + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "Select sub-tile to change it's priority." +msgstr "" + #: editor/progress_dialog.cpp scene/gui/dialogs.cpp msgid "Cancel" msgstr "취소" @@ -5905,10 +5985,23 @@ msgid "Please choose a folder that does not contain a 'project.godot' file." msgstr "'project.godot' 파ì¼ì´ 없는 í´ë”를 ì„ íƒ í•˜ì‹ì‹œì˜¤." #: editor/project_manager.cpp +msgid "That's a BINGO!" +msgstr "ë¹™ê³ !" + +#: editor/project_manager.cpp msgid "Imported Project" msgstr "ê°€ì ¸ì˜¨ 프로ì 트" #: editor/project_manager.cpp +#, fuzzy +msgid "Couldn't create folder." +msgstr "í´ë”를 만들 수 없습니다." + +#: editor/project_manager.cpp +msgid "There is already a folder in this path with the specified name." +msgstr "" + +#: editor/project_manager.cpp msgid "It would be a good idea to name your project." msgstr "프로ì 트 ì´ë¦„ì„ ì •í•˜ëŠ” ê²ƒì„ ê¶Œí•©ë‹ˆë‹¤." @@ -5949,14 +6042,29 @@ msgid "Import Existing Project" msgstr "기존 프로ì 트 ê°€ì ¸ì˜¤ê¸°" #: editor/project_manager.cpp +#, fuzzy +msgid "Import & Edit" +msgstr "ê°€ì ¸ì˜¤ê¸° 후 열기" + +#: editor/project_manager.cpp msgid "Create New Project" msgstr "새 프로ì 트 만들기" #: editor/project_manager.cpp +#, fuzzy +msgid "Create & Edit" +msgstr "ì—미터 만들기" + +#: editor/project_manager.cpp msgid "Install Project:" msgstr "프로ì 트 설치:" #: editor/project_manager.cpp +#, fuzzy +msgid "Install & Edit" +msgstr "설치" + +#: editor/project_manager.cpp msgid "Project Name:" msgstr "프로ì 트 명:" @@ -5973,10 +6081,6 @@ msgid "Browse" msgstr "찾아보기" #: editor/project_manager.cpp -msgid "That's a BINGO!" -msgstr "ë¹™ê³ !" - -#: editor/project_manager.cpp msgid "Unnamed Project" msgstr "ì´ë¦„없는 프로ì 트" @@ -6030,6 +6134,10 @@ msgid "" msgstr "%s ì—ì„œ 기존 Godot 프로ì íŠ¸ë“¤ì„ ìŠ¤ìº”í•˜ë ¤ê³ í•©ë‹ˆë‹¤. ì§„í–‰í•˜ì‹œê² ìŠµë‹ˆê¹Œ?" #: editor/project_manager.cpp +msgid "Project Manager" +msgstr "프로ì 트 ë§¤ë‹ˆì €" + +#: editor/project_manager.cpp msgid "Project List" msgstr "프로ì 트 목ë¡" @@ -6158,11 +6266,6 @@ msgid "Button 9" msgstr "버튼 9" #: 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 "ì¡°ì´íŒ¨ë“œ 축 ì¸ë±ìŠ¤:" @@ -6631,7 +6734,8 @@ msgid "Error duplicating scene to save it." msgstr "ì €ìž¥í•˜ê¸° 위해 ì”¬ì„ ë³µì œí•˜ëŠ” ì¤‘ì— ì—러가 ë°œìƒí–ˆìŠµë‹ˆë‹¤." #: editor/scene_tree_dock.cpp -msgid "Sub-Resources:" +#, fuzzy +msgid "Sub-Resources" msgstr "서브-리소스:" #: editor/scene_tree_dock.cpp @@ -6923,7 +7027,7 @@ msgstr "함수:" msgid "Pick one or more items from the list to display the graph." msgstr "" -#: editor/script_editor_debugger.cpp +#: editor/script_editor_debugger.cpp modules/mono/editor/mono_bottom_panel.cpp msgid "Errors" msgstr "ì—러" @@ -6932,6 +7036,11 @@ msgid "Child Process Connected" msgstr "ìžì‹ 프로세스 ì—°ê²°ë¨" #: editor/script_editor_debugger.cpp +#, fuzzy +msgid "Copy Error" +msgstr "로드 ì—러" + +#: editor/script_editor_debugger.cpp msgid "Inspect Previous Instance" msgstr "ì´ì „ ì¸ìŠ¤í„´ìŠ¤ 검사" @@ -7284,10 +7393,58 @@ msgstr "그리드맵 ì„¤ì •" msgid "Pick Distance:" msgstr "거리 ì„ íƒ:" +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Generating solution..." +msgstr "ìœ¤ê³½ì„ ìƒì„± 중..." + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Generating C# project..." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Failed to create solution." +msgstr "ì™¸ê³½ì„ ì„ ë§Œë“¤ìˆ˜ 없습니다!" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Failed to save solution." +msgstr "리소스 로드 실패." + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Done" +msgstr "완료!" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Failed to create C# project." +msgstr "리소스 로드 실패." + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Mono" +msgstr "모노" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Create C# solution" +msgstr "ì™¸ê³½ì„ ë§Œë“¤ê¸°" + #: modules/mono/editor/mono_bottom_panel.cpp msgid "Builds" msgstr "" +#: modules/mono/editor/mono_bottom_panel.cpp +#, fuzzy +msgid "Build Project" +msgstr "프로ì 트" + +#: modules/mono/editor/mono_bottom_panel.cpp +#, fuzzy +msgid "Warnings" +msgstr "ê²½ê³ " + #: modules/visual_script/visual_script.cpp msgid "" "A node yielded without working memory, please read the docs on how to yield " @@ -7629,29 +7786,38 @@ msgid "Run in Browser" msgstr "브ë¼ìš°ì €ì—ì„œ 실행" #: platform/javascript/export/export.cpp +#, fuzzy msgid "Run exported HTML in the system's default browser." -msgstr "" +msgstr "ì‹œìŠ¤í…œì˜ ê¸°ë³¸ 브ë¼ìš°ì €ë¥¼ 사용하여 내보낸 HTML 실행." #: platform/javascript/export/export.cpp -msgid "Could not write file:\n" +#, fuzzy +msgid "Could not write file:" msgstr "파ì¼ì— 쓸 수 ì—†ìŒ:\n" #: platform/javascript/export/export.cpp -msgid "Could not open template for export:\n" +#, fuzzy +msgid "Could not open template for export:" msgstr "내보내기 í…œí”Œë¦¿ì„ ì—´ 수 없습니다:\n" #: platform/javascript/export/export.cpp -msgid "Invalid export template:\n" +#, fuzzy +msgid "Invalid export template:" msgstr "ìœ íš¨í•˜ì§€ ì•Šì€ ë‚´ë³´ë‚´ê¸° 템플릿:\n" #: platform/javascript/export/export.cpp #, fuzzy -msgid "Could not read custom HTML shell:\n" +msgid "Could not read custom HTML shell:" msgstr "타ì¼ì„ ì°¾ì„ ìˆ˜ ì—†ìŒ:" #: platform/javascript/export/export.cpp #, fuzzy -msgid "Could not read boot splash image file:\n" +msgid "Could not read boot splash image file:" +msgstr "타ì¼ì„ ì°¾ì„ ìˆ˜ ì—†ìŒ:" + +#: platform/javascript/export/export.cpp +#, fuzzy +msgid "Using default boot splash image." msgstr "타ì¼ì„ ì°¾ì„ ìˆ˜ ì—†ìŒ:" #: scene/2d/animated_sprite.cpp @@ -7909,7 +8075,7 @@ msgstr "팬 모드" #: scene/gui/color_picker.cpp msgid "Add current color as a preset" -msgstr "" +msgstr "현재 색ìƒì„ 프리셋으로 추가" #: scene/gui/dialogs.cpp msgid "Alert!" @@ -7942,12 +8108,12 @@ msgstr "" #: scene/gui/tree.cpp msgid "(Other)" -msgstr "" +msgstr "(기타)" #: scene/main/scene_tree.cpp msgid "" -"Default Environment as specified in Project Setings (Rendering -> Viewport -" -"> Default Environment) could not be loaded." +"Default Environment as specified in Project Setings (Rendering -> " +"Environment -> Default Environment) could not be loaded." msgstr "" #: scene/main/viewport.cpp @@ -7978,6 +8144,9 @@ msgstr "í°íŠ¸ 로딩 ì—러." msgid "Invalid font size." msgstr "ìœ ìš”í•˜ì§€ ì•Šì€ í°íŠ¸ 사ì´ì¦ˆ." +#~ msgid "preview" +#~ msgstr "미리보기" + #~ msgid "Move Add Key" #~ msgstr "키 ì´ë™" @@ -8059,9 +8228,6 @@ msgstr "ìœ ìš”í•˜ì§€ ì•Šì€ í°íŠ¸ 사ì´ì¦ˆ." #~ msgid "Filter:" #~ msgstr "í•„í„°:" -#~ msgid "Theme" -#~ msgstr "테마" - #~ msgid "Method List For '%s':" #~ msgstr "'%s' 함수 목ë¡:" @@ -8323,9 +8489,6 @@ msgstr "ìœ ìš”í•˜ì§€ ì•Šì€ í°íŠ¸ 사ì´ì¦ˆ." #~ msgid "Import Anyway" #~ msgstr "ë¬´ì‹œí•˜ê³ ê°€ì ¸ì˜¤ê¸°" -#~ msgid "Import & Open" -#~ msgstr "ê°€ì ¸ì˜¤ê¸° 후 열기" - #~ msgid "Edited scene has not been saved, open imported scene anyway?" #~ msgstr "íŽ¸ì§‘ëœ ì”¬ì´ ì €ìž¥ë˜ì§€ 않았습니다. ë¬´ì‹œí•˜ê³ ê°€ì ¸ì˜¨ ì”¬ì„ ì—¬ì‹œê² ìŠµë‹ˆê¹Œ?" @@ -8579,9 +8742,6 @@ msgstr "ìœ ìš”í•˜ì§€ ì•Šì€ í°íŠ¸ 사ì´ì¦ˆ." #~ msgid "Stereo" #~ msgstr "ìŠ¤í…Œë ˆì˜¤" -#~ msgid "Mono" -#~ msgstr "모노" - #~ msgid "Pitch" #~ msgstr "피치" diff --git a/editor/translations/lt.po b/editor/translations/lt.po index 49858d179f..ba5470a974 100644 --- a/editor/translations/lt.po +++ b/editor/translations/lt.po @@ -200,8 +200,7 @@ msgstr "" #: 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 +#: editor/plugins/particles_editor_plugin.cpp editor/script_create_dialog.cpp msgid "Create" msgstr "Sukurti" @@ -557,6 +556,15 @@ msgid "Signals" msgstr "Signalai" #: editor/create_dialog.cpp +msgid "Change %s Type" +msgstr "" + +#: editor/create_dialog.cpp editor/project_settings_editor.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Change" +msgstr "" + +#: editor/create_dialog.cpp #, fuzzy msgid "Create New %s" msgstr "Sukurti NaujÄ…" @@ -663,7 +671,7 @@ msgid "" msgstr "" #: editor/dependency_editor.cpp -msgid "Cannot remove:\n" +msgid "Cannot remove:" msgstr "" #: editor/dependency_editor.cpp @@ -746,8 +754,8 @@ msgstr "" msgid "Lead Developer" msgstr "" -#: editor/editor_about.cpp editor/project_manager.cpp -msgid "Project Manager" +#: editor/editor_about.cpp +msgid "Project Manager " msgstr "" #: editor/editor_about.cpp @@ -832,7 +840,7 @@ msgid "Success!" msgstr "" #: editor/editor_asset_installer.cpp -#: editor/plugins/asset_library_editor_plugin.cpp editor/project_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp msgid "Install" msgstr "" @@ -1139,7 +1147,7 @@ msgid "Packing" msgstr "" #: editor/editor_export.cpp platform/javascript/export/export.cpp -msgid "Template file not found:\n" +msgid "Template file not found:" msgstr "" #: editor/editor_file_dialog.cpp scene/gui/file_dialog.cpp @@ -1393,6 +1401,10 @@ msgstr "" msgid "Clear" msgstr "" +#: editor/editor_log.cpp +msgid "Clear Output" +msgstr "" + #: editor/editor_node.cpp editor/plugins/animation_player_editor_plugin.cpp msgid "Error saving resource!" msgstr "" @@ -1456,7 +1468,8 @@ msgstr "" #: editor/editor_node.cpp msgid "" -"Couldn't save scene. Likely dependencies (instances) couldn't be satisfied." +"Couldn't save scene. Likely dependencies (instances or inheritance) couldn't " +"be satisfied." msgstr "" #: editor/editor_node.cpp @@ -2389,7 +2402,8 @@ msgid "No version.txt found inside templates." msgstr "Å ablonuose nerasta version.txt failo." #: editor/export_template_manager.cpp -msgid "Error creating path for templates:\n" +#, fuzzy +msgid "Error creating path for templates:" msgstr "Klaida kuriant keliÄ… Å¡ablonams:\n" #: editor/export_template_manager.cpp @@ -2543,9 +2557,7 @@ msgid "View items as a list" msgstr "" #: editor/filesystem_dock.cpp -msgid "" -"\n" -"Status: Import of file failed. Please fix file and reimport manually." +msgid "Status: Import of file failed. Please fix file and reimport manually." msgstr "" #: editor/filesystem_dock.cpp @@ -2553,19 +2565,21 @@ msgid "Cannot move/rename resources root." msgstr "" #: editor/filesystem_dock.cpp -msgid "Cannot move a folder into itself.\n" +msgid "Cannot move a folder into itself." msgstr "" #: editor/filesystem_dock.cpp -msgid "Error moving:\n" -msgstr "" +#, fuzzy +msgid "Error moving:" +msgstr "Ä®vyko klaida kraunant Å¡riftÄ…." #: editor/filesystem_dock.cpp -msgid "Error duplicating:\n" -msgstr "" +#, fuzzy +msgid "Error duplicating:" +msgstr "Duplikuoti" #: editor/filesystem_dock.cpp -msgid "Unable to update dependencies:\n" +msgid "Unable to update dependencies:" msgstr "" #: editor/filesystem_dock.cpp @@ -3208,6 +3222,11 @@ msgstr "Redaguoti Nodų Filtrus" msgid "Filters.." msgstr "Filtrai.." +#: editor/plugins/animation_tree_editor_plugin.cpp +#, fuzzy +msgid "AnimationTree" +msgstr "Animacija" + #: editor/plugins/asset_library_editor_plugin.cpp msgid "Free" msgstr "Nemokama" @@ -3373,6 +3392,7 @@ msgid "Bake Lightmaps" msgstr "" #: editor/plugins/camera_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Preview" msgstr "" @@ -4056,7 +4076,7 @@ msgid "Bake!" msgstr "" #: editor/plugins/navigation_mesh_editor_plugin.cpp -msgid "Bake the navigation mesh.\n" +msgid "Bake the navigation mesh." msgstr "" #: editor/plugins/navigation_mesh_editor_plugin.cpp @@ -4445,14 +4465,16 @@ msgstr "" msgid "Paste" msgstr "" +#: editor/plugins/resource_preloader_editor_plugin.cpp +msgid "ResourcePreloader" +msgstr "" + #: editor/plugins/script_editor_plugin.cpp msgid "Clear Recent Files" msgstr "" #: editor/plugins/script_editor_plugin.cpp -msgid "" -"Close and save changes?\n" -"\"" +msgid "Close and save changes?" msgstr "" #: editor/plugins/script_editor_plugin.cpp @@ -4528,6 +4550,10 @@ msgid "Copy Script Path" msgstr "" #: editor/plugins/script_editor_plugin.cpp +msgid "Show In File System" +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp msgid "History Prev" msgstr "" @@ -4959,83 +4985,83 @@ msgid "Rotating %s degrees." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Bottom View." +msgid "Keying is disabled (no key inserted)." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Bottom" +msgid "Animation Key Inserted." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Top View." +msgid "Objects Drawn" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Rear View." +msgid "Material Changes" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Rear" +msgid "Shader Changes" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Front View." +msgid "Surface Changes" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Front" +msgid "Draw Calls" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Left View." +msgid "Vertices" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Left" +msgid "FPS" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Right View." +msgid "Top View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Right" +msgid "Bottom View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Keying is disabled (no key inserted)." +msgid "Bottom" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Animation Key Inserted." +msgid "Left View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Objects Drawn" +msgid "Left" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Material Changes" +msgid "Right View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Shader Changes" +msgid "Right" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Surface Changes" +msgid "Front View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Draw Calls" +msgid "Front" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Vertices" +msgid "Rear View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "FPS" +msgid "Rear" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp @@ -5123,16 +5149,13 @@ 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 "" +#, fuzzy +msgid "Select Mode (Q)" +msgstr "Pasirinkite Nodus, kuriuos norite importuoti" #: editor/plugins/spatial_editor_plugin.cpp msgid "" @@ -5406,10 +5429,18 @@ msgstr "" msgid "Move (After)" msgstr "" +#: editor/plugins/sprite_frames_editor_plugin.cpp +msgid "SpriteFrames" +msgstr "" + #: editor/plugins/style_box_editor_plugin.cpp msgid "StyleBox Preview:" msgstr "" +#: editor/plugins/style_box_editor_plugin.cpp +msgid "StyleBox" +msgstr "" + #: editor/plugins/texture_region_editor_plugin.cpp msgid "Set Region Rect" msgstr "" @@ -5435,14 +5466,17 @@ msgid "Auto Slice" msgstr "" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Offset:" msgstr "" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Step:" msgstr "" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Separation:" msgstr "" @@ -5580,6 +5614,10 @@ msgstr "" msgid "Color" msgstr "" +#: editor/plugins/theme_editor_plugin.cpp +msgid "Theme" +msgstr "" + #: editor/plugins/tile_map_editor_plugin.cpp msgid "Erase Selection" msgstr "" @@ -5680,6 +5718,30 @@ msgstr "" msgid "Error" msgstr "" +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "Autotiles" +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "" +"Select sub-tile to use as icon, this will be also used on invalid autotile " +"bindings." +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "" +"LMB: set bit on.\n" +"RMB: set bit off." +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "Select current edited sub-tile." +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "Select sub-tile to change it's priority." +msgstr "" + #: editor/progress_dialog.cpp scene/gui/dialogs.cpp msgid "Cancel" msgstr "AtÅ¡aukti" @@ -5797,10 +5859,22 @@ msgid "Please choose a folder that does not contain a 'project.godot' file." msgstr "" #: editor/project_manager.cpp +msgid "That's a BINGO!" +msgstr "" + +#: editor/project_manager.cpp msgid "Imported Project" msgstr "" #: editor/project_manager.cpp +msgid "Couldn't create folder." +msgstr "" + +#: editor/project_manager.cpp +msgid "There is already a folder in this path with the specified name." +msgstr "" + +#: editor/project_manager.cpp msgid "It would be a good idea to name your project." msgstr "" @@ -5841,14 +5915,29 @@ msgid "Import Existing Project" msgstr "" #: editor/project_manager.cpp +#, fuzzy +msgid "Import & Edit" +msgstr "Importuoti iÅ¡ Nodo:" + +#: editor/project_manager.cpp msgid "Create New Project" msgstr "" #: editor/project_manager.cpp +#, fuzzy +msgid "Create & Edit" +msgstr "Sukurti" + +#: editor/project_manager.cpp msgid "Install Project:" msgstr "" #: editor/project_manager.cpp +#, fuzzy +msgid "Install & Edit" +msgstr "(Ä®diegta)" + +#: editor/project_manager.cpp msgid "Project Name:" msgstr "" @@ -5865,10 +5954,6 @@ msgid "Browse" msgstr "" #: editor/project_manager.cpp -msgid "That's a BINGO!" -msgstr "" - -#: editor/project_manager.cpp msgid "Unnamed Project" msgstr "" @@ -5914,6 +5999,10 @@ msgid "" msgstr "" #: editor/project_manager.cpp +msgid "Project Manager" +msgstr "" + +#: editor/project_manager.cpp msgid "Project List" msgstr "" @@ -6040,11 +6129,6 @@ 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 "" @@ -6510,7 +6594,7 @@ msgid "Error duplicating scene to save it." msgstr "" #: editor/scene_tree_dock.cpp -msgid "Sub-Resources:" +msgid "Sub-Resources" msgstr "" #: editor/scene_tree_dock.cpp @@ -6801,7 +6885,7 @@ msgstr "" msgid "Pick one or more items from the list to display the graph." msgstr "" -#: editor/script_editor_debugger.cpp +#: editor/script_editor_debugger.cpp modules/mono/editor/mono_bottom_panel.cpp msgid "Errors" msgstr "" @@ -6810,6 +6894,10 @@ msgid "Child Process Connected" msgstr "" #: editor/script_editor_debugger.cpp +msgid "Copy Error" +msgstr "" + +#: editor/script_editor_debugger.cpp msgid "Inspect Previous Instance" msgstr "" @@ -7155,10 +7243,50 @@ msgstr "" msgid "Pick Distance:" msgstr "" +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Generating solution..." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Generating C# project..." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Failed to create solution." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Failed to save solution." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Done" +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Failed to create C# project." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Mono" +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Create C# solution" +msgstr "" + #: modules/mono/editor/mono_bottom_panel.cpp msgid "Builds" msgstr "" +#: modules/mono/editor/mono_bottom_panel.cpp +msgid "Build Project" +msgstr "" + +#: modules/mono/editor/mono_bottom_panel.cpp +msgid "Warnings" +msgstr "" + #: modules/visual_script/visual_script.cpp msgid "" "A node yielded without working memory, please read the docs on how to yield " @@ -7504,23 +7632,27 @@ msgid "Run exported HTML in the system's default browser." msgstr "" #: platform/javascript/export/export.cpp -msgid "Could not write file:\n" +msgid "Could not write file:" +msgstr "" + +#: platform/javascript/export/export.cpp +msgid "Could not open template for export:" msgstr "" #: platform/javascript/export/export.cpp -msgid "Could not open template for export:\n" +msgid "Invalid export template:" msgstr "" #: platform/javascript/export/export.cpp -msgid "Invalid export template:\n" +msgid "Could not read custom HTML shell:" msgstr "" #: platform/javascript/export/export.cpp -msgid "Could not read custom HTML shell:\n" +msgid "Could not read boot splash image file:" msgstr "" #: platform/javascript/export/export.cpp -msgid "Could not read boot splash image file:\n" +msgid "Using default boot splash image." msgstr "" #: scene/2d/animated_sprite.cpp @@ -7775,8 +7907,8 @@ msgstr "(Kita)" #: scene/main/scene_tree.cpp msgid "" -"Default Environment as specified in Project Setings (Rendering -> Viewport -" -"> Default Environment) could not be loaded." +"Default Environment as specified in Project Setings (Rendering -> " +"Environment -> Default Environment) could not be loaded." msgstr "" #: scene/main/viewport.cpp diff --git a/editor/translations/nb.po b/editor/translations/nb.po index 5843a0797c..4bb49b4fc9 100644 --- a/editor/translations/nb.po +++ b/editor/translations/nb.po @@ -205,8 +205,7 @@ msgstr "Lag %d NYE spor og sett inn nøkler?" #: 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 +#: editor/plugins/particles_editor_plugin.cpp editor/script_create_dialog.cpp msgid "Create" msgstr "Lag" @@ -561,6 +560,16 @@ msgstr "Signaler" #: editor/create_dialog.cpp #, fuzzy +msgid "Change %s Type" +msgstr "Endre standard type" + +#: editor/create_dialog.cpp editor/project_settings_editor.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Change" +msgstr "Forandre" + +#: editor/create_dialog.cpp +#, fuzzy msgid "Create New %s" msgstr "Lag Ny" @@ -673,7 +682,8 @@ msgstr "" "Fjern dem likevel? (kan ikke angres)" #: editor/dependency_editor.cpp -msgid "Cannot remove:\n" +#, fuzzy +msgid "Cannot remove:" msgstr "Kan ikke fjerne:\n" #: editor/dependency_editor.cpp @@ -758,8 +768,9 @@ msgstr "Prosjektgrunnleggere" msgid "Lead Developer" msgstr "Utviklingsleder" -#: editor/editor_about.cpp editor/project_manager.cpp -msgid "Project Manager" +#: editor/editor_about.cpp +#, fuzzy +msgid "Project Manager " msgstr "Prosjektleder" #: editor/editor_about.cpp @@ -848,7 +859,7 @@ msgid "Success!" msgstr "Suksess!" #: editor/editor_asset_installer.cpp -#: editor/plugins/asset_library_editor_plugin.cpp editor/project_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp msgid "Install" msgstr "Installer" @@ -1160,7 +1171,8 @@ msgid "Packing" msgstr "Pakking" #: editor/editor_export.cpp platform/javascript/export/export.cpp -msgid "Template file not found:\n" +#, fuzzy +msgid "Template file not found:" msgstr "Malfil ble ikke funnet:\n" #: editor/editor_file_dialog.cpp scene/gui/file_dialog.cpp @@ -1418,6 +1430,11 @@ msgstr "Output:" msgid "Clear" msgstr "Tøm" +#: editor/editor_log.cpp +#, fuzzy +msgid "Clear Output" +msgstr "Output" + #: editor/editor_node.cpp editor/plugins/animation_player_editor_plugin.cpp msgid "Error saving resource!" msgstr "Feil ved lagring av ressurs!" @@ -1482,8 +1499,10 @@ msgid "This operation can't be done without a tree root." msgstr "Denne operasjonen kan ikke gjennomføres uten en trerot." #: editor/editor_node.cpp +#, fuzzy msgid "" -"Couldn't save scene. Likely dependencies (instances) couldn't be satisfied." +"Couldn't save scene. Likely dependencies (instances or inheritance) couldn't " +"be satisfied." msgstr "" "Kunne ikke lagre scene. Sannsynligvis avhengigheter (instanser) ikke kunne " "oppfylles." @@ -2482,7 +2501,8 @@ msgid "No version.txt found inside templates." msgstr "Ingen version.txt funnet i mal." #: editor/export_template_manager.cpp -msgid "Error creating path for templates:\n" +#, fuzzy +msgid "Error creating path for templates:" msgstr "Feil ved laging av sti for mal:\n" #: editor/export_template_manager.cpp @@ -2646,9 +2666,8 @@ msgid "View items as a list" msgstr "Vis elementer som liste" #: editor/filesystem_dock.cpp -msgid "" -"\n" -"Status: Import of file failed. Please fix file and reimport manually." +#, fuzzy +msgid "Status: Import of file failed. Please fix file and reimport manually." msgstr "" "\n" "Status: Import av fil feilet. Vennligst reparer filen eller reimporter " @@ -2660,20 +2679,23 @@ msgid "Cannot move/rename resources root." msgstr "Kan ikke flytte/endre navn ressursrot" #: editor/filesystem_dock.cpp -msgid "Cannot move a folder into itself.\n" +#, fuzzy +msgid "Cannot move a folder into itself." msgstr "Kan ikke flytte mappe inn i seg selv.\n" #: editor/filesystem_dock.cpp -msgid "Error moving:\n" +#, fuzzy +msgid "Error moving:" msgstr "Error ved flytting:\n" #: editor/filesystem_dock.cpp #, fuzzy -msgid "Error duplicating:\n" +msgid "Error duplicating:" msgstr "Feil ved innlasting:" #: editor/filesystem_dock.cpp -msgid "Unable to update dependencies:\n" +#, fuzzy +msgid "Unable to update dependencies:" msgstr "Kan ikke oppdatere av avhengigheter:\n" #: editor/filesystem_dock.cpp @@ -3336,6 +3358,11 @@ msgstr "Rediger Node-Filtre" msgid "Filters.." msgstr "Filtre.." +#: editor/plugins/animation_tree_editor_plugin.cpp +#, fuzzy +msgid "AnimationTree" +msgstr "Animasjon" + #: editor/plugins/asset_library_editor_plugin.cpp msgid "Free" msgstr "Frigjør" @@ -3505,6 +3532,7 @@ msgid "Bake Lightmaps" msgstr "" #: editor/plugins/camera_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Preview" msgstr "ForhÃ¥ndsvis" @@ -4202,7 +4230,7 @@ msgid "Bake!" msgstr "" #: editor/plugins/navigation_mesh_editor_plugin.cpp -msgid "Bake the navigation mesh.\n" +msgid "Bake the navigation mesh." msgstr "" #: editor/plugins/navigation_mesh_editor_plugin.cpp @@ -4595,14 +4623,18 @@ msgstr "" msgid "Paste" msgstr "Lim inn" +#: editor/plugins/resource_preloader_editor_plugin.cpp +#, fuzzy +msgid "ResourcePreloader" +msgstr "Ressurs" + #: editor/plugins/script_editor_plugin.cpp msgid "Clear Recent Files" msgstr "Fjern Nylige Filer" #: editor/plugins/script_editor_plugin.cpp -msgid "" -"Close and save changes?\n" -"\"" +#, fuzzy +msgid "Close and save changes?" msgstr "" "Lukk og lagre endringer?\n" "\"" @@ -4681,6 +4713,11 @@ msgid "Copy Script Path" msgstr "Kopier Sti" #: editor/plugins/script_editor_plugin.cpp +#, fuzzy +msgid "Show In File System" +msgstr "Vis I Filutforsker" + +#: editor/plugins/script_editor_plugin.cpp msgid "History Prev" msgstr "" @@ -5114,84 +5151,84 @@ msgid "Rotating %s degrees." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Bottom View." +msgid "Keying is disabled (no key inserted)." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Bottom" +msgid "Animation Key Inserted." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Top View." +msgid "Objects Drawn" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Rear View." +msgid "Material Changes" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Rear" -msgstr "" +#, fuzzy +msgid "Shader Changes" +msgstr "Forandre" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Front View." +msgid "Surface Changes" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Front" +msgid "Draw Calls" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Left View." +msgid "Vertices" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Left" +msgid "FPS" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Right View." +msgid "Top View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Right" +msgid "Bottom View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Keying is disabled (no key inserted)." +msgid "Bottom" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Animation Key Inserted." +msgid "Left View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Objects Drawn" +msgid "Left" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Material Changes" +msgid "Right View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -#, fuzzy -msgid "Shader Changes" -msgstr "Forandre" +msgid "Right" +msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Surface Changes" +msgid "Front View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Draw Calls" +msgid "Front" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Vertices" +msgid "Rear View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "FPS" +msgid "Rear" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp @@ -5279,16 +5316,13 @@ 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 "" +#, fuzzy +msgid "Select Mode (Q)" +msgstr "Velg Modus" #: editor/plugins/spatial_editor_plugin.cpp msgid "" @@ -5565,10 +5599,18 @@ msgstr "Kopier Noder" msgid "Move (After)" msgstr "" +#: editor/plugins/sprite_frames_editor_plugin.cpp +msgid "SpriteFrames" +msgstr "" + #: editor/plugins/style_box_editor_plugin.cpp msgid "StyleBox Preview:" msgstr "" +#: editor/plugins/style_box_editor_plugin.cpp +msgid "StyleBox" +msgstr "" + #: editor/plugins/texture_region_editor_plugin.cpp msgid "Set Region Rect" msgstr "" @@ -5594,14 +5636,17 @@ msgid "Auto Slice" msgstr "" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Offset:" msgstr "" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Step:" msgstr "" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Separation:" msgstr "" @@ -5740,6 +5785,10 @@ msgstr "" msgid "Color" msgstr "" +#: editor/plugins/theme_editor_plugin.cpp +msgid "Theme" +msgstr "" + #: editor/plugins/tile_map_editor_plugin.cpp #, fuzzy msgid "Erase Selection" @@ -5842,6 +5891,31 @@ msgstr "" msgid "Error" msgstr "" +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "Autotiles" +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "" +"Select sub-tile to use as icon, this will be also used on invalid autotile " +"bindings." +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "" +"LMB: set bit on.\n" +"RMB: set bit off." +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +#, fuzzy +msgid "Select current edited sub-tile." +msgstr "Velg Gjeldende Mappe" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "Select sub-tile to change it's priority." +msgstr "" + #: editor/progress_dialog.cpp scene/gui/dialogs.cpp msgid "Cancel" msgstr "" @@ -5959,10 +6033,23 @@ msgid "Please choose a folder that does not contain a 'project.godot' file." msgstr "" #: editor/project_manager.cpp +msgid "That's a BINGO!" +msgstr "" + +#: editor/project_manager.cpp msgid "Imported Project" msgstr "" #: editor/project_manager.cpp +#, fuzzy +msgid "Couldn't create folder." +msgstr "Kunne ikke opprette mappe." + +#: editor/project_manager.cpp +msgid "There is already a folder in this path with the specified name." +msgstr "" + +#: editor/project_manager.cpp msgid "It would be a good idea to name your project." msgstr "" @@ -6003,14 +6090,29 @@ msgid "Import Existing Project" msgstr "" #: editor/project_manager.cpp +#, fuzzy +msgid "Import & Edit" +msgstr "Importer" + +#: editor/project_manager.cpp msgid "Create New Project" msgstr "" #: editor/project_manager.cpp +#, fuzzy +msgid "Create & Edit" +msgstr "Opprett skript" + +#: editor/project_manager.cpp msgid "Install Project:" msgstr "" #: editor/project_manager.cpp +#, fuzzy +msgid "Install & Edit" +msgstr "Installer" + +#: editor/project_manager.cpp msgid "Project Name:" msgstr "" @@ -6027,10 +6129,6 @@ msgid "Browse" msgstr "" #: editor/project_manager.cpp -msgid "That's a BINGO!" -msgstr "" - -#: editor/project_manager.cpp msgid "Unnamed Project" msgstr "" @@ -6076,6 +6174,10 @@ msgid "" msgstr "" #: editor/project_manager.cpp +msgid "Project Manager" +msgstr "Prosjektleder" + +#: editor/project_manager.cpp msgid "Project List" msgstr "" @@ -6202,11 +6304,6 @@ msgid "Button 9" msgstr "" #: editor/project_settings_editor.cpp -#: modules/visual_script/visual_script_editor.cpp -msgid "Change" -msgstr "Forandre" - -#: editor/project_settings_editor.cpp msgid "Joypad Axis Index:" msgstr "" @@ -6677,8 +6774,9 @@ msgid "Error duplicating scene to save it." msgstr "" #: editor/scene_tree_dock.cpp -msgid "Sub-Resources:" -msgstr "" +#, fuzzy +msgid "Sub-Resources" +msgstr "Ressurs" #: editor/scene_tree_dock.cpp msgid "Clear Inheritance" @@ -6973,7 +7071,7 @@ msgstr "" msgid "Pick one or more items from the list to display the graph." msgstr "" -#: editor/script_editor_debugger.cpp +#: editor/script_editor_debugger.cpp modules/mono/editor/mono_bottom_panel.cpp msgid "Errors" msgstr "" @@ -6982,6 +7080,11 @@ msgid "Child Process Connected" msgstr "" #: editor/script_editor_debugger.cpp +#, fuzzy +msgid "Copy Error" +msgstr "Last Errors" + +#: editor/script_editor_debugger.cpp msgid "Inspect Previous Instance" msgstr "" @@ -7332,10 +7435,57 @@ msgstr "" msgid "Pick Distance:" msgstr "" +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Generating solution..." +msgstr "Lager konturer..." + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Generating C# project..." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Failed to create solution." +msgstr "Kunne ikke lage omriss!" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Failed to save solution." +msgstr "Kunne ikke laste ressurs." + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Done" +msgstr "Ferdig!" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Failed to create C# project." +msgstr "Kunne ikke laste ressurs." + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Mono" +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Create C# solution" +msgstr "Lag Omriss" + #: modules/mono/editor/mono_bottom_panel.cpp msgid "Builds" msgstr "" +#: modules/mono/editor/mono_bottom_panel.cpp +#, fuzzy +msgid "Build Project" +msgstr "Prosjekt" + +#: modules/mono/editor/mono_bottom_panel.cpp +msgid "Warnings" +msgstr "" + #: modules/visual_script/visual_script.cpp msgid "" "A node yielded without working memory, please read the docs on how to yield " @@ -7699,23 +7849,31 @@ msgid "Run exported HTML in the system's default browser." msgstr "" #: platform/javascript/export/export.cpp -msgid "Could not write file:\n" -msgstr "" +#, fuzzy +msgid "Could not write file:" +msgstr "Kunne ikke opprette mappe." #: platform/javascript/export/export.cpp -msgid "Could not open template for export:\n" -msgstr "" +#, fuzzy +msgid "Could not open template for export:" +msgstr "Kunne ikke opprette mappe." #: platform/javascript/export/export.cpp -msgid "Invalid export template:\n" -msgstr "" +#, fuzzy +msgid "Invalid export template:" +msgstr "HÃ¥ndter Eksportmaler" #: platform/javascript/export/export.cpp -msgid "Could not read custom HTML shell:\n" +msgid "Could not read custom HTML shell:" msgstr "" #: platform/javascript/export/export.cpp -msgid "Could not read boot splash image file:\n" +#, fuzzy +msgid "Could not read boot splash image file:" +msgstr "Kunne ikke opprette mappe." + +#: platform/javascript/export/export.cpp +msgid "Using default boot splash image." msgstr "" #: scene/2d/animated_sprite.cpp @@ -7969,8 +8127,8 @@ msgstr "" #: scene/main/scene_tree.cpp msgid "" -"Default Environment as specified in Project Setings (Rendering -> Viewport -" -"> Default Environment) could not be loaded." +"Default Environment as specified in Project Setings (Rendering -> " +"Environment -> Default Environment) could not be loaded." msgstr "" #: scene/main/viewport.cpp diff --git a/editor/translations/nl.po b/editor/translations/nl.po index 7d84e04306..94c06f46c5 100644 --- a/editor/translations/nl.po +++ b/editor/translations/nl.po @@ -211,8 +211,7 @@ msgstr "Maak %d NIEUWE tracks aan en keys invoeren?" #: 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 +#: editor/plugins/particles_editor_plugin.cpp editor/script_create_dialog.cpp msgid "Create" msgstr "Maken" @@ -568,6 +567,16 @@ msgstr "Signalen" #: editor/create_dialog.cpp #, fuzzy +msgid "Change %s Type" +msgstr "Wijzig Array Waarde Type" + +#: editor/create_dialog.cpp editor/project_settings_editor.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Change" +msgstr "Wijzig" + +#: editor/create_dialog.cpp +#, fuzzy msgid "Create New %s" msgstr "Nieuwe Maken" @@ -682,7 +691,8 @@ msgstr "" "Toch verwijderen? (Kan niet ongedaan worden.)" #: editor/dependency_editor.cpp -msgid "Cannot remove:\n" +#, fuzzy +msgid "Cannot remove:" msgstr "Niet wisbaar:\n" #: editor/dependency_editor.cpp @@ -765,8 +775,9 @@ msgstr "Projectoprichters" msgid "Lead Developer" msgstr "Hoofdontwikkelaar" -#: editor/editor_about.cpp editor/project_manager.cpp -msgid "Project Manager" +#: editor/editor_about.cpp +#, fuzzy +msgid "Project Manager " msgstr "Project Manager" #: editor/editor_about.cpp @@ -855,7 +866,7 @@ msgid "Success!" msgstr "Succes!" #: editor/editor_asset_installer.cpp -#: editor/plugins/asset_library_editor_plugin.cpp editor/project_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp msgid "Install" msgstr "Installeer" @@ -1167,7 +1178,8 @@ msgid "Packing" msgstr "Inpakken" #: editor/editor_export.cpp platform/javascript/export/export.cpp -msgid "Template file not found:\n" +#, fuzzy +msgid "Template file not found:" msgstr "Template bestand niet gevonden:\n" #: editor/editor_file_dialog.cpp scene/gui/file_dialog.cpp @@ -1425,6 +1437,11 @@ msgstr "Uitvoer:" msgid "Clear" msgstr "Leegmaken" +#: editor/editor_log.cpp +#, fuzzy +msgid "Clear Output" +msgstr "Output" + #: editor/editor_node.cpp editor/plugins/animation_player_editor_plugin.cpp msgid "Error saving resource!" msgstr "Error bij het opslaan van resource!" @@ -1487,8 +1504,10 @@ msgid "This operation can't be done without a tree root." msgstr "Deze operatie kan niet gedaan worden zonder boomwortel." #: editor/editor_node.cpp +#, fuzzy msgid "" -"Couldn't save scene. Likely dependencies (instances) couldn't be satisfied." +"Couldn't save scene. Likely dependencies (instances or inheritance) couldn't " +"be satisfied." msgstr "" "Kon scene niet opslaan. Waarschijnlijk konden afhankelijkheden (instanties) " "niet voldaan worden." @@ -2497,7 +2516,8 @@ msgid "No version.txt found inside templates." msgstr "Geen version.txt gevonden in sjablonen." #: editor/export_template_manager.cpp -msgid "Error creating path for templates:\n" +#, fuzzy +msgid "Error creating path for templates:" msgstr "Fout bij het maken van een pad voor sjablonen:\n" #: editor/export_template_manager.cpp @@ -2659,9 +2679,8 @@ msgid "View items as a list" msgstr "Bekijk objecten als een lijst" #: editor/filesystem_dock.cpp -msgid "" -"\n" -"Status: Import of file failed. Please fix file and reimport manually." +#, fuzzy +msgid "Status: Import of file failed. Please fix file and reimport manually." msgstr "" "\n" "Status: Importeren van bestand mislukt. Repareer het bestand en importeer " @@ -2672,20 +2691,23 @@ msgid "Cannot move/rename resources root." msgstr "Kan de hoofdmap voor resources niet verplaatsen of hernoemen." #: editor/filesystem_dock.cpp -msgid "Cannot move a folder into itself.\n" +#, fuzzy +msgid "Cannot move a folder into itself." msgstr "Het is niet mogelijk om een map in zichzelf te stoppen.\n" #: editor/filesystem_dock.cpp -msgid "Error moving:\n" +#, fuzzy +msgid "Error moving:" msgstr "Fout bij het verplaatsen:\n" #: editor/filesystem_dock.cpp #, fuzzy -msgid "Error duplicating:\n" +msgid "Error duplicating:" msgstr "Error bij het laden van:" #: editor/filesystem_dock.cpp -msgid "Unable to update dependencies:\n" +#, fuzzy +msgid "Unable to update dependencies:" msgstr "Kon afhankelijkheden niet verversen:\n" #: editor/filesystem_dock.cpp @@ -3343,6 +3365,11 @@ msgstr "Wijzig Node Filters" msgid "Filters.." msgstr "" +#: editor/plugins/animation_tree_editor_plugin.cpp +#, fuzzy +msgid "AnimationTree" +msgstr "Animatie" + #: editor/plugins/asset_library_editor_plugin.cpp msgid "Free" msgstr "Vrij" @@ -3509,6 +3536,7 @@ msgid "Bake Lightmaps" msgstr "" #: editor/plugins/camera_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Preview" msgstr "Voorbeeld" @@ -4202,7 +4230,7 @@ msgid "Bake!" msgstr "" #: editor/plugins/navigation_mesh_editor_plugin.cpp -msgid "Bake the navigation mesh.\n" +msgid "Bake the navigation mesh." msgstr "" #: editor/plugins/navigation_mesh_editor_plugin.cpp @@ -4596,14 +4624,17 @@ msgstr "" msgid "Paste" msgstr "Plakken" +#: editor/plugins/resource_preloader_editor_plugin.cpp +#, fuzzy +msgid "ResourcePreloader" +msgstr "Resource" + #: editor/plugins/script_editor_plugin.cpp msgid "Clear Recent Files" msgstr "" #: editor/plugins/script_editor_plugin.cpp -msgid "" -"Close and save changes?\n" -"\"" +msgid "Close and save changes?" msgstr "" #: editor/plugins/script_editor_plugin.cpp @@ -4681,6 +4712,11 @@ msgid "Copy Script Path" msgstr "Kopieer Pad" #: editor/plugins/script_editor_plugin.cpp +#, fuzzy +msgid "Show In File System" +msgstr "Weergeven in Bestandsbeheer" + +#: editor/plugins/script_editor_plugin.cpp msgid "History Prev" msgstr "" @@ -5119,85 +5155,85 @@ msgid "Rotating %s degrees." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Bottom View." +msgid "Keying is disabled (no key inserted)." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Bottom" +msgid "Animation Key Inserted." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Top View." +msgid "Objects Drawn" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Rear View." -msgstr "" +#, fuzzy +msgid "Material Changes" +msgstr "Lokale wijziging aan het opslaan.." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Rear" -msgstr "" +#, fuzzy +msgid "Shader Changes" +msgstr "Wijzig" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Front View." +msgid "Surface Changes" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Front" +msgid "Draw Calls" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Left View." +msgid "Vertices" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Left" +msgid "FPS" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Right View." +msgid "Top View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Right" +msgid "Bottom View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Keying is disabled (no key inserted)." +msgid "Bottom" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Animation Key Inserted." +msgid "Left View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Objects Drawn" +msgid "Left" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -#, fuzzy -msgid "Material Changes" -msgstr "Lokale wijziging aan het opslaan.." +msgid "Right View." +msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -#, fuzzy -msgid "Shader Changes" -msgstr "Wijzig" +msgid "Right" +msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Surface Changes" +msgid "Front View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Draw Calls" +msgid "Front" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Vertices" +msgid "Rear View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "FPS" +msgid "Rear" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp @@ -5291,17 +5327,13 @@ msgid "Freelook Speed Modifier" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -#, fuzzy -msgid "preview" -msgstr "Preview:" - -#: editor/plugins/spatial_editor_plugin.cpp msgid "XForm Dialog" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Select Mode (Q)\n" -msgstr "" +#, fuzzy +msgid "Select Mode (Q)" +msgstr "Selecteer Modus" #: editor/plugins/spatial_editor_plugin.cpp msgid "" @@ -5579,10 +5611,18 @@ msgstr "Kopiëer Nodes" msgid "Move (After)" msgstr "" +#: editor/plugins/sprite_frames_editor_plugin.cpp +msgid "SpriteFrames" +msgstr "" + #: editor/plugins/style_box_editor_plugin.cpp msgid "StyleBox Preview:" msgstr "" +#: editor/plugins/style_box_editor_plugin.cpp +msgid "StyleBox" +msgstr "" + #: editor/plugins/texture_region_editor_plugin.cpp msgid "Set Region Rect" msgstr "" @@ -5608,14 +5648,17 @@ msgid "Auto Slice" msgstr "" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Offset:" msgstr "" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Step:" msgstr "" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Separation:" msgstr "" @@ -5755,6 +5798,10 @@ msgstr "" msgid "Color" msgstr "" +#: editor/plugins/theme_editor_plugin.cpp +msgid "Theme" +msgstr "" + #: editor/plugins/tile_map_editor_plugin.cpp #, fuzzy msgid "Erase Selection" @@ -5858,6 +5905,31 @@ msgstr "" msgid "Error" msgstr "" +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "Autotiles" +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "" +"Select sub-tile to use as icon, this will be also used on invalid autotile " +"bindings." +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "" +"LMB: set bit on.\n" +"RMB: set bit off." +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +#, fuzzy +msgid "Select current edited sub-tile." +msgstr "De bewerkte bron opslaan." + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "Select sub-tile to change it's priority." +msgstr "" + #: editor/progress_dialog.cpp scene/gui/dialogs.cpp msgid "Cancel" msgstr "Annuleren" @@ -5981,10 +6053,23 @@ msgid "Please choose a folder that does not contain a 'project.godot' file." msgstr "" #: editor/project_manager.cpp +msgid "That's a BINGO!" +msgstr "" + +#: editor/project_manager.cpp msgid "Imported Project" msgstr "" #: editor/project_manager.cpp +#, fuzzy +msgid "Couldn't create folder." +msgstr "Map kon niet gemaakt worden." + +#: editor/project_manager.cpp +msgid "There is already a folder in this path with the specified name." +msgstr "" + +#: editor/project_manager.cpp msgid "It would be a good idea to name your project." msgstr "" @@ -6026,14 +6111,29 @@ msgid "Import Existing Project" msgstr "" #: editor/project_manager.cpp +#, fuzzy +msgid "Import & Edit" +msgstr "Importeren" + +#: editor/project_manager.cpp msgid "Create New Project" msgstr "" #: editor/project_manager.cpp +#, fuzzy +msgid "Create & Edit" +msgstr "Creëer Node" + +#: editor/project_manager.cpp msgid "Install Project:" msgstr "" #: editor/project_manager.cpp +#, fuzzy +msgid "Install & Edit" +msgstr "Installeer" + +#: editor/project_manager.cpp msgid "Project Name:" msgstr "" @@ -6051,10 +6151,6 @@ msgid "Browse" msgstr "" #: editor/project_manager.cpp -msgid "That's a BINGO!" -msgstr "" - -#: editor/project_manager.cpp msgid "Unnamed Project" msgstr "" @@ -6101,6 +6197,10 @@ msgid "" msgstr "" #: editor/project_manager.cpp +msgid "Project Manager" +msgstr "Project Manager" + +#: editor/project_manager.cpp msgid "Project List" msgstr "" @@ -6229,11 +6329,6 @@ msgid "Button 9" msgstr "" #: editor/project_settings_editor.cpp -#: modules/visual_script/visual_script_editor.cpp -msgid "Change" -msgstr "Wijzig" - -#: editor/project_settings_editor.cpp msgid "Joypad Axis Index:" msgstr "" @@ -6708,7 +6803,7 @@ msgstr "" #: editor/scene_tree_dock.cpp #, fuzzy -msgid "Sub-Resources:" +msgid "Sub-Resources" msgstr "Resource" #: editor/scene_tree_dock.cpp @@ -7013,7 +7108,7 @@ msgstr "" msgid "Pick one or more items from the list to display the graph." msgstr "" -#: editor/script_editor_debugger.cpp +#: editor/script_editor_debugger.cpp modules/mono/editor/mono_bottom_panel.cpp msgid "Errors" msgstr "" @@ -7022,6 +7117,11 @@ msgid "Child Process Connected" msgstr "" #: editor/script_editor_debugger.cpp +#, fuzzy +msgid "Copy Error" +msgstr "Laadfouten" + +#: editor/script_editor_debugger.cpp msgid "Inspect Previous Instance" msgstr "" @@ -7375,10 +7475,55 @@ msgstr "" msgid "Pick Distance:" msgstr "" +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Generating solution..." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Generating C# project..." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Failed to create solution." +msgstr "Mislukt om resource te laden." + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Failed to save solution." +msgstr "Mislukt om resource te laden." + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Done" +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Failed to create C# project." +msgstr "Mislukt om resource te laden." + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Mono" +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Create C# solution" +msgstr "Subscriptie Maken" + #: modules/mono/editor/mono_bottom_panel.cpp msgid "Builds" msgstr "" +#: modules/mono/editor/mono_bottom_panel.cpp +#, fuzzy +msgid "Build Project" +msgstr "Project" + +#: modules/mono/editor/mono_bottom_panel.cpp +msgid "Warnings" +msgstr "" + #: modules/visual_script/visual_script.cpp msgid "" "A node yielded without working memory, please read the docs on how to yield " @@ -7758,27 +7903,32 @@ msgstr "" #: platform/javascript/export/export.cpp #, fuzzy -msgid "Could not write file:\n" +msgid "Could not write file:" msgstr "Map kon niet gemaakt worden." #: platform/javascript/export/export.cpp #, fuzzy -msgid "Could not open template for export:\n" +msgid "Could not open template for export:" msgstr "Map kon niet gemaakt worden." #: platform/javascript/export/export.cpp #, fuzzy -msgid "Invalid export template:\n" +msgid "Invalid export template:" msgstr "Ongeldige index eigenschap naam." #: platform/javascript/export/export.cpp #, fuzzy -msgid "Could not read custom HTML shell:\n" +msgid "Could not read custom HTML shell:" +msgstr "Map kon niet gemaakt worden." + +#: platform/javascript/export/export.cpp +#, fuzzy +msgid "Could not read boot splash image file:" msgstr "Map kon niet gemaakt worden." #: platform/javascript/export/export.cpp #, fuzzy -msgid "Could not read boot splash image file:\n" +msgid "Using default boot splash image." msgstr "Map kon niet gemaakt worden." #: scene/2d/animated_sprite.cpp @@ -8081,9 +8231,10 @@ msgid "(Other)" msgstr "(Andere)" #: scene/main/scene_tree.cpp +#, fuzzy msgid "" -"Default Environment as specified in Project Setings (Rendering -> Viewport -" -"> Default Environment) could not be loaded." +"Default Environment as specified in Project Setings (Rendering -> " +"Environment -> Default Environment) could not be loaded." msgstr "" "Standaard Omgeving gespecificeerd in Project Instellingen (Rendering -> " "Viewport -> Standaard Omgeving) kan niet worden geladen." @@ -8116,13 +8267,13 @@ msgstr "Fout bij het laden van lettertype." msgid "Invalid font size." msgstr "Ongeldige lettertype grootte." +#, fuzzy +#~ msgid "preview" +#~ msgstr "Preview:" + #~ msgid "Move Add Key" #~ msgstr "Verplaats Key Toevoegen" -#, fuzzy -#~ msgid "Create Subscription" -#~ msgstr "Subscriptie Maken" - #~ msgid "List:" #~ msgstr "Lijst:" diff --git a/editor/translations/pl.po b/editor/translations/pl.po index cc543c97bb..27cfb1f0ea 100644 --- a/editor/translations/pl.po +++ b/editor/translations/pl.po @@ -25,8 +25,8 @@ msgid "" msgstr "" "Project-Id-Version: Godot Engine editor\n" -"PO-Revision-Date: 2017-12-20 15:43+0000\n" -"Last-Translator: RafaÅ‚ Ziemniak <synaptykq@gmail.com>\n" +"PO-Revision-Date: 2018-01-06 13:19+0000\n" +"Last-Translator: Sebastian Pasich <sebastian.pasich@gmail.com>\n" "Language-Team: Polish <https://hosted.weblate.org/projects/godot-engine/" "godot/pl/>\n" "Language: pl\n" @@ -34,7 +34,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.18\n" +"X-Generator: Weblate 2.19-dev\n" #: editor/animation_editor.cpp msgid "Disabled" @@ -45,9 +45,8 @@ msgid "All Selection" msgstr "Wszystkie zaznaczenia" #: editor/animation_editor.cpp -#, fuzzy msgid "Anim Change Keyframe Time" -msgstr "ZmieÅ„ wartość" +msgstr "ZmieÅ„ czas klatki kluczowej" #: editor/animation_editor.cpp msgid "Anim Change Transition" @@ -58,9 +57,8 @@ msgid "Anim Change Transform" msgstr "Animacja transformacji" #: editor/animation_editor.cpp -#, fuzzy msgid "Anim Change Keyframe Value" -msgstr "ZmieÅ„ wartość" +msgstr "ZmieÅ„ wartość klatki kluczowej" #: editor/animation_editor.cpp msgid "Anim Change Call" @@ -103,6 +101,7 @@ msgid "Anim Track Change Value Mode" msgstr "ZmieÅ„ tryb wartoÅ›ci animacji" #: editor/animation_editor.cpp +#, fuzzy msgid "Anim Track Change Wrap Mode" msgstr "Åšcieżka Animacji - ZmieÅ„ Tryb Zawijania" @@ -216,8 +215,7 @@ msgstr "Utworzyć NOWÄ„ Å›cieżkÄ™ i dodać klatkÄ™ kluczowÄ…?" #: 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 +#: editor/plugins/particles_editor_plugin.cpp editor/script_create_dialog.cpp msgid "Create" msgstr "Utwórz" @@ -391,7 +389,7 @@ msgstr "Nie znaleziono" #: editor/code_editor.cpp msgid "Replaced %d occurrence(s)." -msgstr "Zamieniono %d wystÄ…pieÅ„." +msgstr "ZastÄ…piono %d wystÄ…pieÅ„." #: editor/code_editor.cpp msgid "Replace" @@ -553,9 +551,8 @@ msgid "Connecting Signal:" msgstr "PoÅ‚Ä…czony sygnaÅ‚:" #: editor/connections_dialog.cpp -#, fuzzy msgid "Disconnect '%s' from '%s'" -msgstr "PoÅ‚Ä…cz '%s' z '%s'" +msgstr "RozÅ‚Ä…cz '%s' z '%s'" #: editor/connections_dialog.cpp msgid "Connect.." @@ -572,8 +569,17 @@ msgstr "SygnaÅ‚y" #: editor/create_dialog.cpp #, fuzzy +msgid "Change %s Type" +msgstr "ZmieÅ„ typ" + +#: editor/create_dialog.cpp editor/project_settings_editor.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Change" +msgstr "ZmieÅ„" + +#: editor/create_dialog.cpp msgid "Create New %s" -msgstr "Utwórz nowy" +msgstr "Utwórz nowy %s" #: editor/create_dialog.cpp editor/editor_file_dialog.cpp #: editor/filesystem_dock.cpp @@ -683,7 +689,8 @@ msgstr "" "Usunąć mimo to? (Nie można tego cofnąć)" #: editor/dependency_editor.cpp -msgid "Cannot remove:\n" +#, fuzzy +msgid "Cannot remove:" msgstr "Nie można usunąć:\n" #: editor/dependency_editor.cpp @@ -739,9 +746,8 @@ msgid "Delete" msgstr "UsuÅ„" #: editor/dictionary_property_edit.cpp -#, fuzzy msgid "Change Dictionary Key" -msgstr "ZmieÅ„ Klawisz Tablicy" +msgstr "ZmieÅ„ klucz tablicy" #: editor/dictionary_property_edit.cpp #, fuzzy @@ -768,8 +774,9 @@ msgstr "ZaÅ‚ożyciele projektu" msgid "Lead Developer" msgstr "Deweloper naczelny" -#: editor/editor_about.cpp editor/project_manager.cpp -msgid "Project Manager" +#: editor/editor_about.cpp +#, fuzzy +msgid "Project Manager " msgstr "Menedżer projektów" #: editor/editor_about.cpp @@ -858,7 +865,7 @@ msgid "Success!" msgstr "Sukces!" #: editor/editor_asset_installer.cpp -#: editor/plugins/asset_library_editor_plugin.cpp editor/project_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp msgid "Install" msgstr "Zainstaluj" @@ -879,9 +886,8 @@ msgid "Rename Audio Bus" msgstr "ZmieÅ„ nazwÄ™ magistrali audio" #: editor/editor_audio_buses.cpp -#, fuzzy msgid "Change Audio Bus Volume" -msgstr "PrzeÅ‚Ä…cz tryb solo magistrali audio" +msgstr "ZmieÅ„ gÅ‚oÅ›ność magistrali audio" #: editor/editor_audio_buses.cpp msgid "Toggle Audio Bus Solo" @@ -892,9 +898,8 @@ msgid "Toggle Audio Bus Mute" msgstr "PrzeÅ‚Ä…cz wyciszenie magistrali audio" #: editor/editor_audio_buses.cpp -#, fuzzy msgid "Toggle Audio Bus Bypass Effects" -msgstr "PrzeÅ‚Ä…cz pominiÄ™cie efektu magistrali audio" +msgstr "PrzeÅ‚Ä…cz ominiÄ™cie efektów w magistrali audio" #: editor/editor_audio_buses.cpp msgid "Select Audio Bus Send" @@ -947,7 +952,7 @@ msgstr "UsuÅ„ efekt" #: editor/editor_audio_buses.cpp msgid "Audio" -msgstr "" +msgstr "DźwiÄ™k" #: editor/editor_audio_buses.cpp msgid "Add Audio Bus" @@ -1073,9 +1078,8 @@ msgid "Rename Autoload" msgstr "ZmieÅ„ nazwÄ™ Autoload" #: editor/editor_autoload_settings.cpp -#, fuzzy msgid "Toggle AutoLoad Globals" -msgstr "PrzeÅ‚Ä…cz zmienne globalne w AutoLoad" +msgstr "PrzeÅ‚Ä…cz automatycznie Å‚adowane zmienne globalne" #: editor/editor_autoload_settings.cpp msgid "Move Autoload" @@ -1124,13 +1128,12 @@ msgid "Updating scene.." msgstr "Aktualizacja sceny .." #: editor/editor_data.cpp -#, fuzzy msgid "[empty]" -msgstr "(pusty)" +msgstr "[pusty]" #: editor/editor_data.cpp msgid "[unsaved]" -msgstr "" +msgstr "[niezapisany]" #: editor/editor_dir_dialog.cpp msgid "Please select a base directory first" @@ -1170,7 +1173,8 @@ msgid "Packing" msgstr "Pakowanie" #: editor/editor_export.cpp platform/javascript/export/export.cpp -msgid "Template file not found:\n" +#, fuzzy +msgid "Template file not found:" msgstr "Nie znaleziono pliku szablonu:\n" #: editor/editor_file_dialog.cpp scene/gui/file_dialog.cpp @@ -1178,9 +1182,8 @@ msgid "File Exists, Overwrite?" msgstr "Plik istnieje, nadpisać?" #: editor/editor_file_dialog.cpp scene/gui/file_dialog.cpp -#, fuzzy msgid "Select Current Folder" -msgstr "Utwórz katalog" +msgstr "Wybierz bieżący katalog" #: editor/editor_file_dialog.cpp editor/filesystem_dock.cpp msgid "Copy Path" @@ -1304,7 +1307,7 @@ msgstr "Wyszukaj w Pomocy" #: editor/editor_help.cpp msgid "Class List:" -msgstr "List klas:" +msgstr "Lista klas:" #: editor/editor_help.cpp msgid "Search Classes" @@ -1348,7 +1351,7 @@ msgstr "Metody publiczne:" #: editor/editor_help.cpp msgid "GUI Theme Items" -msgstr "Elementy motywu interfejsu:" +msgstr "Elementy motywu interfejsu" #: editor/editor_help.cpp msgid "GUI Theme Items:" @@ -1429,6 +1432,11 @@ msgstr "WyjÅ›cie:" msgid "Clear" msgstr "Wyczyść" +#: editor/editor_log.cpp +#, fuzzy +msgid "Clear Output" +msgstr "Konsola" + #: editor/editor_node.cpp editor/plugins/animation_player_editor_plugin.cpp msgid "Error saving resource!" msgstr "BÅ‚Ä…d podczas zapisu zasobu!" @@ -1476,7 +1484,7 @@ msgstr "BÅ‚Ä…d Å‚adowania '%s'." #: editor/editor_node.cpp msgid "Saving Scene" -msgstr "Zapisywanie Sceny" +msgstr "Zapisywanie sceny" #: editor/editor_node.cpp msgid "Analyzing" @@ -1484,15 +1492,17 @@ msgstr "Analizowanie" #: editor/editor_node.cpp msgid "Creating Thumbnail" -msgstr "Tworzenie Miniatury" +msgstr "Tworzenie miniatury" #: editor/editor_node.cpp msgid "This operation can't be done without a tree root." msgstr "Ta operacja nie może zostać wykonana bez sceny." #: editor/editor_node.cpp +#, fuzzy msgid "" -"Couldn't save scene. Likely dependencies (instances) couldn't be satisfied." +"Couldn't save scene. Likely dependencies (instances or inheritance) couldn't " +"be satisfied." msgstr "" "Nie udaÅ‚o siÄ™ zapisać sceny. Najprawdopodobniej pewne zależnoÅ›ci nie sÄ… " "speÅ‚nione." @@ -1584,14 +1594,12 @@ msgstr "" "pracy." #: editor/editor_node.cpp -#, fuzzy msgid "Expand all properties" -msgstr "RozwiÅ„ foldery" +msgstr "RozwiÅ„ wszystkie wÅ‚aÅ›ciwoÅ›ci" #: editor/editor_node.cpp -#, fuzzy msgid "Collapse all properties" -msgstr "ZwiÅ„ foldery" +msgstr "ZwiÅ„ wszystkie wÅ‚aÅ›ciwoÅ›ci" #: editor/editor_node.cpp msgid "Copy Params" @@ -1610,7 +1618,6 @@ msgid "Copy Resource" msgstr "Kopiuj zasób" #: editor/editor_node.cpp -#, fuzzy msgid "Make Built-In" msgstr "Skrypt wbudowany" @@ -1794,7 +1801,6 @@ msgid "Unable to load addon script from path: '%s'." msgstr "Nie można zaÅ‚adować skryptu dodatku z Å›cieżki: '%s'." #: editor/editor_node.cpp -#, fuzzy msgid "" "Unable to load addon script from path: '%s' Base type is not EditorPlugin." msgstr "" @@ -2145,7 +2151,7 @@ msgstr "Zapauzuj scenÄ™" #: editor/editor_node.cpp msgid "Stop the scene." -msgstr "Zatrzymaj scene." +msgstr "Zatrzymaj scenÄ™." #: editor/editor_node.cpp msgid "Stop" @@ -2157,7 +2163,7 @@ msgstr "Uruchom aktualnie edytowanÄ… scenÄ™." #: editor/editor_node.cpp msgid "Play Scene" -msgstr "Odtwórz Scene" +msgstr "Odtwórz scenÄ™" #: editor/editor_node.cpp msgid "Play custom scene" @@ -2355,12 +2361,11 @@ msgstr "Åšredni Czas (sek)" #: editor/editor_profiler.cpp msgid "Frame %" -msgstr "% Ramek" +msgstr "Klatka %" #: editor/editor_profiler.cpp -#, fuzzy msgid "Physics Frame %" -msgstr "% Ramek Fixed" +msgstr "Klatki Fizyki %" #: editor/editor_profiler.cpp editor/script_editor_debugger.cpp msgid "Time:" @@ -2379,9 +2384,8 @@ msgid "Frame #:" msgstr "Klatka #:" #: editor/editor_profiler.cpp -#, fuzzy msgid "Time" -msgstr "Czas:" +msgstr "Czas" #: editor/editor_profiler.cpp #, fuzzy @@ -2393,13 +2397,13 @@ msgid "Select device from the list" msgstr "Wybierz urzÄ…dzenie z listy" #: editor/editor_run_native.cpp -#, fuzzy msgid "" "No runnable export preset found for this platform.\n" "Please add a runnable preset in the export menu." msgstr "" -"Nie znaleziono uruchamianej konfiguracji eksportu dla tej platformy.\n" -"Dodaj konfiguracjÄ™ z menu eksportu." +"Nie znaleziono możliwej do uruchomienia konfiguracji eksportu dla tej " +"platformy.\n" +"Dodaj poprawnÄ… konfiguracjÄ™ z menu eksportu." #: editor/editor_run_script.cpp msgid "Write your logic in the _run() method." @@ -2494,7 +2498,8 @@ msgid "No version.txt found inside templates." msgstr "Nie znaleziono pliku version.txt w szablonach." #: editor/export_template_manager.cpp -msgid "Error creating path for templates:\n" +#, fuzzy +msgid "Error creating path for templates:" msgstr "BÅ‚Ä…d tworzenia Å›cieżki dla szablonów:\n" #: editor/export_template_manager.cpp @@ -2579,7 +2584,6 @@ msgid "Connecting.." msgstr "ÅÄ…czenie.." #: editor/export_template_manager.cpp -#, fuzzy msgid "Can't Connect" msgstr "Nie można poÅ‚Ä…czyć" @@ -2655,9 +2659,8 @@ msgid "View items as a list" msgstr "WyÅ›wietlanie elementów jako listÄ™" #: editor/filesystem_dock.cpp -msgid "" -"\n" -"Status: Import of file failed. Please fix file and reimport manually." +#, fuzzy +msgid "Status: Import of file failed. Please fix file and reimport manually." msgstr "" "\n" "Status: Importowanie pliku nie powiodÅ‚o siÄ™. ProszÄ™ naprawić plik i ponownie " @@ -2668,20 +2671,23 @@ msgid "Cannot move/rename resources root." msgstr "Nie można przenieść/zmienić nazwy źródÅ‚owego zasobu." #: editor/filesystem_dock.cpp -msgid "Cannot move a folder into itself.\n" +#, fuzzy +msgid "Cannot move a folder into itself." msgstr "Nie można przenieść katalogu do siebie samego.\n" #: editor/filesystem_dock.cpp -msgid "Error moving:\n" +#, fuzzy +msgid "Error moving:" msgstr "BÅ‚Ä…d przenoszenia:\n" #: editor/filesystem_dock.cpp #, fuzzy -msgid "Error duplicating:\n" -msgstr "BÅ‚Ä…d Å‚adowania:" +msgid "Error duplicating:" +msgstr "BÅ‚Ä…d duplikacji:\n" #: editor/filesystem_dock.cpp -msgid "Unable to update dependencies:\n" +#, fuzzy +msgid "Unable to update dependencies:" msgstr "Nie można zaktualizować zależnoÅ›ci:\n" #: editor/filesystem_dock.cpp @@ -2713,14 +2719,12 @@ msgid "Renaming folder:" msgstr "Zmiana nazwy folderu:" #: editor/filesystem_dock.cpp -#, fuzzy msgid "Duplicating file:" -msgstr "Duplikuj" +msgstr "Duplikowanie pliku:" #: editor/filesystem_dock.cpp -#, fuzzy msgid "Duplicating folder:" -msgstr "Zmiana nazwy folderu:" +msgstr "Duplikowanie Folderu:" #: editor/filesystem_dock.cpp msgid "Expand all" @@ -2739,9 +2743,8 @@ msgid "Move To.." msgstr "PrzenieÅ› Do..." #: editor/filesystem_dock.cpp -#, fuzzy msgid "Open Scene(s)" -msgstr "Otwórz scenÄ™" +msgstr "Otwórz ScenÄ™/y" #: editor/filesystem_dock.cpp msgid "Instance" @@ -2756,9 +2759,8 @@ msgid "View Owners.." msgstr "Pokaż wÅ‚aÅ›cicieli.." #: editor/filesystem_dock.cpp -#, fuzzy msgid "Duplicate.." -msgstr "Duplikuj" +msgstr "Duplikuj.." #: editor/filesystem_dock.cpp msgid "Previous Directory" @@ -2826,9 +2828,8 @@ msgid "Import with Separate Objects+Materials" msgstr "Zaimportuj osobno Obiekty+MateriaÅ‚y" #: editor/import/resource_importer_scene.cpp -#, fuzzy msgid "Import with Separate Objects+Animations" -msgstr "Import z oddzielnymi obiektami i animacjami" +msgstr "Importuj oddzielnie obiekty i animacje" #: editor/import/resource_importer_scene.cpp msgid "Import with Separate Materials+Animations" @@ -2856,14 +2857,12 @@ msgid "Importing Scene.." msgstr "Importowanie Sceny.." #: editor/import/resource_importer_scene.cpp -#, fuzzy msgid "Generating Lightmaps" -msgstr "Generowanie AABB" +msgstr "Generowanie Lightmapy" #: editor/import/resource_importer_scene.cpp -#, fuzzy msgid "Generating for Mesh: " -msgstr "Generowanie AABB" +msgstr "Generowanie dla siatki: " #: editor/import/resource_importer_scene.cpp msgid "Running Custom Script.." @@ -3129,18 +3128,16 @@ msgid "Directions" msgstr "Kategorie:" #: editor/plugins/animation_player_editor_plugin.cpp -#, fuzzy msgid "Past" -msgstr "Wklej" +msgstr "Poprzednie" #: editor/plugins/animation_player_editor_plugin.cpp -#, fuzzy msgid "Future" -msgstr "Funkcje" +msgstr "NastÄ™pne" #: editor/plugins/animation_player_editor_plugin.cpp msgid "Depth" -msgstr "GÅ‚Ä™bokość" +msgstr "GÅ‚Ä™bia" #: editor/plugins/animation_player_editor_plugin.cpp msgid "1 step" @@ -3205,9 +3202,8 @@ msgid "New name:" msgstr "Nowa nazwa:" #: editor/plugins/animation_tree_editor_plugin.cpp -#, fuzzy msgid "Edit Filters" -msgstr "Edytuj filtry wÄ™złów" +msgstr "Edytuj filtry" #: editor/plugins/animation_tree_editor_plugin.cpp #: editor/plugins/multimesh_editor_plugin.cpp @@ -3345,6 +3341,11 @@ msgstr "Edytuj filtry wÄ™złów" msgid "Filters.." msgstr "Filtry.." +#: editor/plugins/animation_tree_editor_plugin.cpp +#, fuzzy +msgid "AnimationTree" +msgstr "Animacja" + #: editor/plugins/asset_library_editor_plugin.cpp msgid "Free" msgstr "Darmowy" @@ -3499,16 +3500,23 @@ msgid "" "Save your scene (for images to be saved in the same dir), or pick a save " "path from the BakedLightmap properties." msgstr "" +"Nie można okreÅ›lić Å›cieżki zapisu dla lightmapy obrazu.\n" +"Zapisz scenÄ™ (obrazy bÄ™dÄ… zapisane w tym samym katalogu), lub przepisz " +"Å›cieżkÄ™ zapisu z wÅ‚aÅ›ciwoÅ›ci BakedLightmap." #: editor/plugins/baked_lightmap_editor_plugin.cpp msgid "" "No meshes to bake. Make sure they contain an UV2 channel and that the 'Bake " "Light' flag is on." msgstr "" +"Brak siatek do cieniowania. Upewnij siÄ™, że zawierajÄ… kanaÅ‚ UV2 i że flaga " +"'Bake Light' jest ustawiona." #: editor/plugins/baked_lightmap_editor_plugin.cpp msgid "Failed creating lightmap images, make sure path is writable." msgstr "" +"BÅ‚Ä…d przy tworzeniu ligtmapy, upewnij siÄ™ że Å›cieżka nie jest ustawiona " +"jedynie do odczytu." #: editor/plugins/baked_lightmap_editor_plugin.cpp #, fuzzy @@ -3516,6 +3524,7 @@ msgid "Bake Lightmaps" msgstr "ZmieÅ„ promieÅ„Â Å›wiatÅ‚a" #: editor/plugins/camera_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Preview" msgstr "PodglÄ…d" @@ -3692,11 +3701,11 @@ msgstr "PrzyciÄ…gaj do rodzica" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Snap to node anchor" -msgstr "" +msgstr "PrzyciÄ…gaj do kotwicy wÄ™zÅ‚a" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Snap to node sides" -msgstr "" +msgstr "PrzyciÄ…gaj do boków wÄ™zÅ‚a" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Snap to other nodes" @@ -3800,7 +3809,7 @@ msgstr "Wyczyść PozÄ™" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Drag pivot from mouse position" -msgstr "" +msgstr "PrzeciÄ…gnij oÅ› z pozycji myszy" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Set pivot at mouse position" @@ -3855,7 +3864,7 @@ msgstr "Stwórz Poly3D" #: editor/plugins/collision_shape_2d_editor_plugin.cpp msgid "Set Handle" -msgstr "" +msgstr "Ustaw Uchwyt" #: editor/plugins/cube_grid_theme_editor_plugin.cpp msgid "Remove item %d?" @@ -3973,10 +3982,13 @@ msgid "Item List Editor" msgstr "Edytor listy elementów" #: editor/plugins/light_occluder_2d_editor_plugin.cpp +#, fuzzy msgid "" "No OccluderPolygon2D resource on this node.\n" "Create and assign one?" msgstr "" +"Brak zasobu OccluderPolygon2D w tym węźle.\n" +"Stworzyć i przypisać nowy?" #: editor/plugins/light_occluder_2d_editor_plugin.cpp msgid "Create Occluder Polygon" @@ -4024,43 +4036,46 @@ msgstr "" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Create Convex Shape" -msgstr "" +msgstr "Utwórz ksztaÅ‚t wypukÅ‚y" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Create Navigation Mesh" -msgstr "" +msgstr "Utwórz siatkÄ™ nawigacyjnÄ… (Navigation Mesh)" #: editor/plugins/mesh_instance_editor_plugin.cpp +#, fuzzy msgid "Contained Mesh is not of type ArrayMesh." -msgstr "" +msgstr "Zawarta siatka nie jest typu ArrayMesh." #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "UV Unwrap failed, mesh may not be manifold?" -msgstr "" +msgstr "BÅ‚Ä…d mapowania UV, siatka modelu może nie być poprawnie wykonana?" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "No mesh to debug." -msgstr "" +msgstr "Brak siatki do debugowania." #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Model has no UV in this layer" -msgstr "" +msgstr "Model nie posiada UV w tej warstwie" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "MeshInstance lacks a Mesh!" -msgstr "" +msgstr "MeshInstance nie posiada siatki! " #: editor/plugins/mesh_instance_editor_plugin.cpp +#, fuzzy msgid "Mesh has not surface to create outlines from!" -msgstr "" +msgstr "Siatka nie posiada powierzchni z której można utworzyć zarys!" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Could not create outline!" msgstr "Nie udaÅ‚o siÄ™ utworzyć zarysu!" #: editor/plugins/mesh_instance_editor_plugin.cpp +#, fuzzy msgid "Create Outline" -msgstr "" +msgstr "Utwórz zarys" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Mesh" @@ -4071,8 +4086,9 @@ msgid "Create Trimesh Static Body" msgstr "" #: editor/plugins/mesh_instance_editor_plugin.cpp +#, fuzzy msgid "Create Convex Static Body" -msgstr "" +msgstr "Utwórz statyczne ciaÅ‚o wypukÅ‚e" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Create Trimesh Collision Sibling" @@ -4084,29 +4100,27 @@ msgstr "" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Create Outline Mesh.." -msgstr "" +msgstr "Utwórz siatkÄ™ zarysu.." #: editor/plugins/mesh_instance_editor_plugin.cpp -#, fuzzy msgid "View UV1" -msgstr "Widok" +msgstr "Widok UV1" #: editor/plugins/mesh_instance_editor_plugin.cpp -#, fuzzy msgid "View UV2" -msgstr "Widok" +msgstr "Widok UV2" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Unwrap UV2 for Lightmap/AO" -msgstr "" +msgstr "RozwiÅ„ siatkÄ™ UV2 dla Lightmapy/AO" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Create Outline Mesh" -msgstr "" +msgstr "Utwórz siatkÄ™ zarysu" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Outline Size:" -msgstr "" +msgstr "Rozmiar zarysu:" #: editor/plugins/multimesh_editor_plugin.cpp msgid "No mesh source specified (and no MultiMesh set in node)." @@ -4146,7 +4160,7 @@ msgstr "PÅ‚aszczyzna jest niepoprawna (brak geometrii)" #: editor/plugins/multimesh_editor_plugin.cpp msgid "Surface source is invalid (no faces)." -msgstr "" +msgstr "PÅ‚aszczyzna jest niepoprawna (brak Å›cian)." #: editor/plugins/multimesh_editor_plugin.cpp msgid "Parent has no solid faces to populate." @@ -4168,12 +4182,14 @@ msgid "Select a Target Surface:" msgstr "Wybierz docelowÄ… przestrzeÅ„" #: editor/plugins/multimesh_editor_plugin.cpp +#, fuzzy msgid "Populate Surface" -msgstr "" +msgstr "ZapeÅ‚nij powierzchniÄ™" #: editor/plugins/multimesh_editor_plugin.cpp +#, fuzzy msgid "Populate MultiMesh" -msgstr "" +msgstr "ZapeÅ‚nij MultiMesh" #: editor/plugins/multimesh_editor_plugin.cpp #, fuzzy @@ -4197,8 +4213,9 @@ msgid "Z-Axis" msgstr "OÅ›-Z" #: editor/plugins/multimesh_editor_plugin.cpp +#, fuzzy msgid "Mesh Up Axis:" -msgstr "" +msgstr "OÅ› \"góra\" siatki:" #: editor/plugins/multimesh_editor_plugin.cpp msgid "Random Rotation:" @@ -4213,24 +4230,28 @@ msgid "Random Scale:" msgstr "Losowa skala:" #: editor/plugins/multimesh_editor_plugin.cpp +#, fuzzy msgid "Populate" -msgstr "" +msgstr "ZapeÅ‚nij" #: editor/plugins/navigation_mesh_editor_plugin.cpp +#, fuzzy msgid "Bake!" -msgstr "" +msgstr "NanieÅ›!" #: editor/plugins/navigation_mesh_editor_plugin.cpp -msgid "Bake the navigation mesh.\n" -msgstr "" +#, fuzzy +msgid "Bake the navigation mesh." +msgstr "NanieÅ› siatkÄ™ nawigacji.\n" #: editor/plugins/navigation_mesh_editor_plugin.cpp +#, fuzzy msgid "Clear the navigation mesh." -msgstr "" +msgstr "Wyczyść siatkÄ™ nawigacji." #: editor/plugins/navigation_mesh_generator.cpp msgid "Setting up Configuration..." -msgstr "" +msgstr "Ustawianie konfiguracji..." #: editor/plugins/navigation_mesh_generator.cpp #, fuzzy @@ -4268,12 +4289,14 @@ msgid "Creating polymesh..." msgstr "Tworzenie polymesh'a..." #: editor/plugins/navigation_mesh_generator.cpp +#, fuzzy msgid "Converting to native navigation mesh..." -msgstr "" +msgstr "Konwertowanie do natywnej siatki nawigacyjnej..." #: editor/plugins/navigation_mesh_generator.cpp +#, fuzzy msgid "Navigation Mesh Generator Setup:" -msgstr "" +msgstr "Ustawienia generatora siatek nawigacyjnych:" #: editor/plugins/navigation_mesh_generator.cpp msgid "Parsing Geometry..." @@ -4284,8 +4307,9 @@ msgid "Done!" msgstr "SkoÅ„czone!" #: editor/plugins/navigation_polygon_editor_plugin.cpp +#, fuzzy msgid "Create Navigation Polygon" -msgstr "" +msgstr "Utwórz wielokÄ…t nawigacyjny" #: editor/plugins/particles_2d_editor_plugin.cpp #: editor/plugins/particles_editor_plugin.cpp @@ -4353,8 +4377,9 @@ msgid "Node does not contain geometry (faces)." msgstr "WÄ™zeÅ‚ nie zawiera geometrii (Å›ciany)." #: editor/plugins/particles_editor_plugin.cpp +#, fuzzy msgid "A processor material of type 'ParticlesMaterial' is required." -msgstr "" +msgstr "MateriaÅ‚ przetwarzajÄ…cy typu 'ParticlesMaterial' jest wymagany." #: editor/plugins/particles_editor_plugin.cpp msgid "Faces contain no area!" @@ -4389,8 +4414,9 @@ msgid "Surface Points" msgstr "Punkty powierzchni" #: editor/plugins/particles_editor_plugin.cpp +#, fuzzy msgid "Surface Points+Normal (Directed)" -msgstr "" +msgstr "Punkty powierzchni+Normalne (Skierowane)" #: editor/plugins/particles_editor_plugin.cpp msgid "Volume" @@ -4621,14 +4647,18 @@ msgstr "Wczytaj Zasób" msgid "Paste" msgstr "Wklej" +#: editor/plugins/resource_preloader_editor_plugin.cpp +#, fuzzy +msgid "ResourcePreloader" +msgstr "Åšcieżka zasobu" + #: editor/plugins/script_editor_plugin.cpp msgid "Clear Recent Files" msgstr "Wyczyść ostatnie pliki" #: editor/plugins/script_editor_plugin.cpp -msgid "" -"Close and save changes?\n" -"\"" +#, fuzzy +msgid "Close and save changes?" msgstr "" "Zamknąć i zapisać zmiany?\n" "\"" @@ -4658,8 +4688,9 @@ msgid "Save Theme As.." msgstr "Zapisz motyw jako.." #: editor/plugins/script_editor_plugin.cpp +#, fuzzy msgid " Class Reference" -msgstr "" +msgstr " Referencja klas" #: editor/plugins/script_editor_plugin.cpp #, fuzzy @@ -4708,6 +4739,11 @@ msgid "Copy Script Path" msgstr "Skopiuj ÅšcieżkÄ™" #: editor/plugins/script_editor_plugin.cpp +#, fuzzy +msgid "Show In File System" +msgstr "Pokaż w systemie plików" + +#: editor/plugins/script_editor_plugin.cpp msgid "History Prev" msgstr "Poprzedni plik" @@ -4866,8 +4902,9 @@ msgid "Lowercase" msgstr "MaÅ‚e Litery" #: editor/plugins/script_text_editor.cpp +#, fuzzy msgid "Capitalize" -msgstr "" +msgstr "Wielkie litery na poczÄ…tku słów" #: editor/plugins/script_text_editor.cpp scene/gui/line_edit.cpp #: scene/gui/text_edit.cpp @@ -4913,11 +4950,11 @@ msgstr "Idź do lini" #: editor/plugins/script_text_editor.cpp msgid "Fold All Lines" -msgstr "" +msgstr "ZwiÅ„ wszystkie linie" #: editor/plugins/script_text_editor.cpp msgid "Unfold All Lines" -msgstr "" +msgstr "RozwiÅ„ wszystkie linie" #: editor/plugins/script_text_editor.cpp msgid "Complete Symbol" @@ -4989,8 +5026,9 @@ msgid "Contextual Help" msgstr "Pomoc kontekstowa" #: editor/plugins/shader_editor_plugin.cpp +#, fuzzy msgid "Shader" -msgstr "" +msgstr "Shader" #: editor/plugins/shader_graph_editor_plugin.cpp msgid "Change Scalar Constant" @@ -5165,88 +5203,92 @@ msgid "Rotating %s degrees." msgstr "Obracanie o %s stopni." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Bottom View." -msgstr "Widok z doÅ‚u." +#, fuzzy +msgid "Keying is disabled (no key inserted)." +msgstr "Kluczowanie jest wyÅ‚Ä…czone (nie wstawiono klucza)." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Bottom" -msgstr "Dół" +#, fuzzy +msgid "Animation Key Inserted." +msgstr "Wstawiono klucz animacji." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Top View." -msgstr "Widok z góry." +#, fuzzy +msgid "Objects Drawn" +msgstr "Narysowane obiekty" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Rear View." -msgstr "Widok z tyÅ‚u." +#, fuzzy +msgid "Material Changes" +msgstr "OdÅ›wież Zmiany" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Rear" -msgstr "TyÅ‚" +#, fuzzy +msgid "Shader Changes" +msgstr "OdÅ›wież Zmiany" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Front View." -msgstr "Widok z przodu." +#, fuzzy +msgid "Surface Changes" +msgstr "OdÅ›wież Zmiany" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Front" -msgstr "Przód" +#, fuzzy +msgid "Draw Calls" +msgstr "WywoÅ‚ania rysowania" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Left View." -msgstr "Widok z lewej." +#, fuzzy +msgid "Vertices" +msgstr "WierzchoÅ‚ek" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Left" -msgstr "Lewa" +msgid "FPS" +msgstr "Klatki na sekundÄ™" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Right View." -msgstr "Widok z prawej." +msgid "Top View." +msgstr "Widok z góry." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Right" -msgstr "Prawa" +msgid "Bottom View." +msgstr "Widok z doÅ‚u." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Keying is disabled (no key inserted)." -msgstr "" +msgid "Bottom" +msgstr "Dół" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Animation Key Inserted." -msgstr "" +msgid "Left View." +msgstr "Widok z lewej." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Objects Drawn" -msgstr "" +msgid "Left" +msgstr "Lewa" #: editor/plugins/spatial_editor_plugin.cpp -#, fuzzy -msgid "Material Changes" -msgstr "OdÅ›wież Zmiany" +msgid "Right View." +msgstr "Widok z prawej." #: editor/plugins/spatial_editor_plugin.cpp -#, fuzzy -msgid "Shader Changes" -msgstr "OdÅ›wież Zmiany" +msgid "Right" +msgstr "Prawa" #: editor/plugins/spatial_editor_plugin.cpp -#, fuzzy -msgid "Surface Changes" -msgstr "OdÅ›wież Zmiany" +msgid "Front View." +msgstr "Widok z przodu." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Draw Calls" -msgstr "" +msgid "Front" +msgstr "Przód" #: editor/plugins/spatial_editor_plugin.cpp -#, fuzzy -msgid "Vertices" -msgstr "WierzchoÅ‚ek" +msgid "Rear View." +msgstr "Widok z tyÅ‚u." #: editor/plugins/spatial_editor_plugin.cpp -msgid "FPS" -msgstr "Klatki na sekundÄ™" +msgid "Rear" +msgstr "TyÅ‚" #: editor/plugins/spatial_editor_plugin.cpp msgid "Align with view" @@ -5345,17 +5387,12 @@ msgid "Freelook Speed Modifier" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -#, fuzzy -msgid "preview" -msgstr "PodglÄ…d" - -#: editor/plugins/spatial_editor_plugin.cpp msgid "XForm Dialog" msgstr "Okno dialogowe XForm" #: editor/plugins/spatial_editor_plugin.cpp #, fuzzy -msgid "Select Mode (Q)\n" +msgid "Select Mode (Q)" msgstr "Tryb zaznaczenia" #: editor/plugins/spatial_editor_plugin.cpp @@ -5641,10 +5678,20 @@ msgstr "UsuÅ„ wÄ™zeÅ‚(y)" msgid "Move (After)" msgstr "PrzesuÅ„ w lewo" +#: editor/plugins/sprite_frames_editor_plugin.cpp +#, fuzzy +msgid "SpriteFrames" +msgstr "Ramki stosu" + #: editor/plugins/style_box_editor_plugin.cpp msgid "StyleBox Preview:" msgstr "PodglÄ…d StyleBox:" +#: editor/plugins/style_box_editor_plugin.cpp +#, fuzzy +msgid "StyleBox" +msgstr "Styl" + #: editor/plugins/texture_region_editor_plugin.cpp #, fuzzy msgid "Set Region Rect" @@ -5671,14 +5718,17 @@ msgid "Auto Slice" msgstr "Tnij automatycznie" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Offset:" msgstr "PrzesuniÄ™cie:" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Step:" msgstr "Krok:" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Separation:" msgstr "Separacja:" @@ -5829,6 +5879,11 @@ msgstr "Font" msgid "Color" msgstr "Kolor" +#: editor/plugins/theme_editor_plugin.cpp +#, fuzzy +msgid "Theme" +msgstr "Zapisz motyw" + #: editor/plugins/tile_map_editor_plugin.cpp msgid "Erase Selection" msgstr "UsuÅ„ zaznaczenie" @@ -5930,6 +5985,32 @@ msgstr "PoÅ‚Ä…cz ze sceny" msgid "Error" msgstr "BÅ‚Ä…d" +#: editor/plugins/tile_set_editor_plugin.cpp +#, fuzzy +msgid "Autotiles" +msgstr "Tnij automatycznie" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "" +"Select sub-tile to use as icon, this will be also used on invalid autotile " +"bindings." +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "" +"LMB: set bit on.\n" +"RMB: set bit off." +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +#, fuzzy +msgid "Select current edited sub-tile." +msgstr "Zapisz aktualnie edytowany zasób." + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "Select sub-tile to change it's priority." +msgstr "" + #: editor/progress_dialog.cpp scene/gui/dialogs.cpp msgid "Cancel" msgstr "Anuluj" @@ -6009,8 +6090,9 @@ msgid "Features" msgstr "Funkcje" #: editor/project_export.cpp +#, fuzzy msgid "Custom (comma-separated):" -msgstr "" +msgstr "Niestandardowe (oddzielone przecinkami):" #: editor/project_export.cpp msgid "Feature List:" @@ -6053,10 +6135,23 @@ msgid "Please choose a folder that does not contain a 'project.godot' file." msgstr "ProszÄ™ wybrać folder nie zawierajÄ…cy pliku 'project.godot'." #: editor/project_manager.cpp +msgid "That's a BINGO!" +msgstr "BINGO!" + +#: editor/project_manager.cpp msgid "Imported Project" msgstr "Zaimportowano projekt" #: editor/project_manager.cpp +#, fuzzy +msgid "Couldn't create folder." +msgstr "Nie można utworzyć katalogu." + +#: editor/project_manager.cpp +msgid "There is already a folder in this path with the specified name." +msgstr "" + +#: editor/project_manager.cpp msgid "It would be a good idea to name your project." msgstr "Dobrym pomysÅ‚em byÅ‚oby nazwanie swojego projektu." @@ -6097,14 +6192,29 @@ msgid "Import Existing Project" msgstr "Importuj istniejÄ…cy projekt" #: editor/project_manager.cpp +#, fuzzy +msgid "Import & Edit" +msgstr "Importuj i Otwórz" + +#: editor/project_manager.cpp msgid "Create New Project" msgstr "Utwórz nowy projekt" #: editor/project_manager.cpp +#, fuzzy +msgid "Create & Edit" +msgstr "Utwórz Emiter" + +#: editor/project_manager.cpp msgid "Install Project:" msgstr "Zainstaluj projekt:" #: editor/project_manager.cpp +#, fuzzy +msgid "Install & Edit" +msgstr "Zainstaluj" + +#: editor/project_manager.cpp msgid "Project Name:" msgstr "Nazwa projektu:" @@ -6121,10 +6231,6 @@ msgid "Browse" msgstr "Szukaj" #: editor/project_manager.cpp -msgid "That's a BINGO!" -msgstr "BINGO!" - -#: editor/project_manager.cpp msgid "Unnamed Project" msgstr "Projekt bez nazwy" @@ -6179,6 +6285,10 @@ msgstr "" "Potwierdzasz?" #: editor/project_manager.cpp +msgid "Project Manager" +msgstr "Menedżer projektów" + +#: editor/project_manager.cpp msgid "Project List" msgstr "Lista projektów" @@ -6211,10 +6321,13 @@ msgid "Can't run project" msgstr "Nie można uruchomić projektu" #: editor/project_manager.cpp +#, fuzzy msgid "" "You don't currently have any projects.\n" "Would you like to explore the official example projects in the Asset Library?" msgstr "" +"Nie posiadasz obecnie żadnych projektów.\n" +"Czy chciaÅ‚byÅ› zobaczyć oficjalne przykÅ‚adowe projekty w bibliotece zasobów?" #: editor/project_settings_editor.cpp msgid "Key " @@ -6306,11 +6419,6 @@ msgid "Button 9" msgstr "Przycisk 9" #: editor/project_settings_editor.cpp -#: modules/visual_script/visual_script_editor.cpp -msgid "Change" -msgstr "ZmieÅ„" - -#: editor/project_settings_editor.cpp msgid "Joypad Axis Index:" msgstr "Indeks osi joysticka:" @@ -6443,8 +6551,9 @@ msgid "Changed Locale Filter" msgstr "ZmieÅ„Â filtr ustawieÅ„Â lokalizacji" #: editor/project_settings_editor.cpp +#, fuzzy msgid "Changed Locale Filter Mode" -msgstr "" +msgstr "ZmieÅ„ tryb filtrowania ustawieÅ„ lokalizacji" #: editor/project_settings_editor.cpp msgid "Project Settings (project.godot)" @@ -6459,8 +6568,9 @@ msgid "Property:" msgstr "WÅ‚aÅ›ciwość:" #: editor/project_settings_editor.cpp +#, fuzzy msgid "Override For.." -msgstr "" +msgstr "Nadpisz dla.." #: editor/project_settings_editor.cpp msgid "Input Map" @@ -6515,8 +6625,9 @@ msgid "Show all locales" msgstr "Pokaż wszystkie lokalizacje" #: editor/project_settings_editor.cpp +#, fuzzy msgid "Show only selected locales" -msgstr "" +msgstr "Pokaż tylko wybrane lokalizacje" #: editor/project_settings_editor.cpp #, fuzzy @@ -6576,8 +6687,9 @@ msgid "New Script" msgstr "Nowy skrypt" #: editor/property_editor.cpp +#, fuzzy msgid "New %s" -msgstr "" +msgstr "Nowy %s" #: editor/property_editor.cpp #, fuzzy @@ -6605,8 +6717,9 @@ msgid "Pick a Node" msgstr "Wybierz wÄ™zeÅ‚" #: editor/property_editor.cpp +#, fuzzy msgid "Bit %d, val %d." -msgstr "" +msgstr "Bit %d, wartość %d." #: editor/property_editor.cpp msgid "On" @@ -6715,8 +6828,9 @@ msgid "This operation can't be done on the tree root." msgstr "Nie można wykonać tej operacji na głównym węźle drzewa." #: editor/scene_tree_dock.cpp +#, fuzzy msgid "Move Node In Parent" -msgstr "" +msgstr "PrzenieÅ› wÄ™zeÅ‚ do wÄ™zÅ‚a nadrzÄ™dnego" #: editor/scene_tree_dock.cpp #, fuzzy @@ -6789,7 +6903,7 @@ msgstr "BÅ‚Ä…d duplikowania sceny przy zapisywaniu." #: editor/scene_tree_dock.cpp #, fuzzy -msgid "Sub-Resources:" +msgid "Sub-Resources" msgstr "Zasoby:" #: editor/scene_tree_dock.cpp @@ -6892,26 +7006,36 @@ msgid "Toggle CanvasItem Visible" msgstr "PrzeÅ‚Ä…cz widoczność CanvasItem" #: editor/scene_tree_editor.cpp +#, fuzzy msgid "Node configuration warning:" -msgstr "" +msgstr "Ostrzeżenie konfiguracji wÄ™zÅ‚a:" #: editor/scene_tree_editor.cpp +#, fuzzy msgid "" "Node has connection(s) and group(s)\n" "Click to show signals dock." msgstr "" +"WÄ™zeÅ‚ posiada poÅ‚Ä…czenia i grupy\n" +"Kliknij, aby wyÅ›wietlić panel sygnałów." #: editor/scene_tree_editor.cpp +#, fuzzy msgid "" "Node has connections.\n" "Click to show signals dock." msgstr "" +"WÄ™zeÅ‚ posiada poÅ‚Ä…czenia.\n" +"Kliknij, aby wyÅ›wietlić panel sygnałów." #: editor/scene_tree_editor.cpp +#, fuzzy msgid "" "Node is in group(s).\n" "Click to show groups dock." msgstr "" +"WÄ™zeÅ‚ jest w grupach.\n" +"Kliknij, aby wyÅ›wietlić panel grup." #: editor/scene_tree_editor.cpp msgid "Instance:" @@ -6955,8 +7079,9 @@ msgid "Scene Tree (Nodes):" msgstr "Drzewo sceny (wÄ™zÅ‚y):" #: editor/scene_tree_editor.cpp +#, fuzzy msgid "Node Configuration Warning!" -msgstr "" +msgstr "Ostrzeżenie konfiguracji wÄ™zÅ‚a!" #: editor/scene_tree_editor.cpp msgid "Select a Node" @@ -7091,7 +7216,7 @@ msgstr "Funkcja:" msgid "Pick one or more items from the list to display the graph." msgstr "Wybierz jeden lub wiÄ™cej elementów z listy by wyÅ›wietlić graf." -#: editor/script_editor_debugger.cpp +#: editor/script_editor_debugger.cpp modules/mono/editor/mono_bottom_panel.cpp msgid "Errors" msgstr "BÅ‚Ä™dy" @@ -7100,6 +7225,11 @@ msgid "Child Process Connected" msgstr "PoÅ‚Ä…czono z procesem potomnym" #: editor/script_editor_debugger.cpp +#, fuzzy +msgid "Copy Error" +msgstr "Wczytaj bÅ‚Ä™dy" + +#: editor/script_editor_debugger.cpp msgid "Inspect Previous Instance" msgstr "Sprawdź poprzedniÄ… instancjÄ™" @@ -7246,11 +7376,11 @@ msgstr "ZmieÅ„ rozmiar Box Shape" #: modules/gdnative/gdnative_library_editor_plugin.cpp msgid "Select the dynamic library for this entry" -msgstr "" +msgstr "Wybierz dynamicznÄ… bibliotekÄ™ do tego pola" #: modules/gdnative/gdnative_library_editor_plugin.cpp msgid "Select dependencies of the library for this entry" -msgstr "" +msgstr "Zaznacz zależnoÅ›ci biblioteki dla tego pola" #: modules/gdnative/gdnative_library_editor_plugin.cpp #, fuzzy @@ -7259,11 +7389,12 @@ msgstr "UsuÅ„ punkt krzywej" #: modules/gdnative/gdnative_library_editor_plugin.cpp msgid "Double click to create a new entry" -msgstr "" +msgstr "Kliknij dwukrotnie by stworzyć nowy wpis" #: modules/gdnative/gdnative_library_editor_plugin.cpp +#, fuzzy msgid "Platform:" -msgstr "" +msgstr "Platforma:" #: modules/gdnative/gdnative_library_editor_plugin.cpp #, fuzzy @@ -7277,7 +7408,7 @@ msgstr "Biblioteka" #: modules/gdnative/gdnative_library_editor_plugin.cpp msgid "Add an architecture entry" -msgstr "" +msgstr "Dodaj pole architektury" #: modules/gdnative/gdnative_library_editor_plugin.cpp #, fuzzy @@ -7358,8 +7489,9 @@ msgid "GridMap Duplicate Selection" msgstr "GridMap duplikuj zaznaczenie" #: modules/gridmap/grid_map_editor_plugin.cpp +#, fuzzy msgid "Floor:" -msgstr "" +msgstr "Poziom:" #: modules/gridmap/grid_map_editor_plugin.cpp msgid "Grid Map" @@ -7376,8 +7508,9 @@ msgid "Previous Floor" msgstr "Poprzedni poziom" #: modules/gridmap/grid_map_editor_plugin.cpp +#, fuzzy msgid "Next Floor" -msgstr "" +msgstr "NastÄ™pny poziom" #: modules/gridmap/grid_map_editor_plugin.cpp #, fuzzy @@ -7385,16 +7518,18 @@ msgid "Clip Disabled" msgstr "WyÅ‚Ä…czone przycinanie" #: modules/gridmap/grid_map_editor_plugin.cpp +#, fuzzy msgid "Clip Above" -msgstr "" +msgstr "Przytnij powyżej" #: modules/gridmap/grid_map_editor_plugin.cpp +#, fuzzy msgid "Clip Below" -msgstr "" +msgstr "Przytnij poniżej" #: modules/gridmap/grid_map_editor_plugin.cpp msgid "Edit X Axis" -msgstr "" +msgstr "Edytuj oÅ› X" #: modules/gridmap/grid_map_editor_plugin.cpp msgid "Edit Y Axis" @@ -7463,10 +7598,58 @@ msgstr "Ustawienia GridMap" msgid "Pick Distance:" msgstr "Wybierz odlegÅ‚ość:" +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Generating solution..." +msgstr "Tworzenie konturów..." + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Generating C# project..." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Failed to create solution." +msgstr "Nie udaÅ‚o siÄ™ utworzyć zarysu!" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Failed to save solution." +msgstr "Nie udaÅ‚o siÄ™ wczytać zasobu." + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Done" +msgstr "SkoÅ„czone!" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Failed to create C# project." +msgstr "Nie udaÅ‚o siÄ™ wczytać zasobu." + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Mono" +msgstr "Mono" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Create C# solution" +msgstr "Utwórz zarys" + #: modules/mono/editor/mono_bottom_panel.cpp msgid "Builds" msgstr "" +#: modules/mono/editor/mono_bottom_panel.cpp +#, fuzzy +msgid "Build Project" +msgstr "Projekt" + +#: modules/mono/editor/mono_bottom_panel.cpp +#, fuzzy +msgid "Warnings" +msgstr "Ostrzeżenie" + #: modules/visual_script/visual_script.cpp msgid "" "A node yielded without working memory, please read the docs on how to yield " @@ -7640,7 +7823,7 @@ msgstr "Warunek" #: modules/visual_script/visual_script_editor.cpp msgid "Sequence" -msgstr "" +msgstr "Sekwencja" #: modules/visual_script/visual_script_editor.cpp msgid "Switch" @@ -7668,8 +7851,9 @@ msgid "Get" msgstr "Pobierz" #: modules/visual_script/visual_script_editor.cpp +#, fuzzy msgid "Script already has function '%s'" -msgstr "" +msgstr "Skrypt posiada już funkcjÄ™ '%s'" #: modules/visual_script/visual_script_editor.cpp #, fuzzy @@ -7759,15 +7943,15 @@ msgstr "Wklej wÄ™zÅ‚y" #: modules/visual_script/visual_script_flow_control.cpp msgid "Input type not iterable: " -msgstr "" +msgstr "Typ danych wejÅ›ciowych nie jest iterowalny: " #: modules/visual_script/visual_script_flow_control.cpp msgid "Iterator became invalid" -msgstr "" +msgstr "Iterator staÅ‚ siÄ™ nieprawidÅ‚owy" #: modules/visual_script/visual_script_flow_control.cpp msgid "Iterator became invalid: " -msgstr "" +msgstr "Iterator staÅ‚ siÄ™ nieprawidÅ‚owy: " #: modules/visual_script/visual_script_func_nodes.cpp #, fuzzy @@ -7803,14 +7987,18 @@ msgid "VariableSet not found in script: " msgstr "Nie znaleziono VariableSet w skrypcie: " #: modules/visual_script/visual_script_nodes.cpp +#, fuzzy msgid "Custom node has no _step() method, can't process graph." msgstr "" +"Niestandardowy wÄ™zeÅ‚ nie posiada metody _step(), nie można przetworzyć grafu." #: modules/visual_script/visual_script_nodes.cpp msgid "" "Invalid return value from _step(), must be integer (seq out), or string " "(error)." msgstr "" +"NieprawidÅ‚owa wartość zwracana przez funkcjÄ™ _step(), musi ona być liczbÄ… " +"caÅ‚kowitÄ… (seq out), lub tekstowÄ… (error)." #: platform/javascript/export/export.cpp msgid "Run in Browser" @@ -7818,28 +8006,36 @@ msgstr "Uruchom w przeglÄ…darce" #: platform/javascript/export/export.cpp msgid "Run exported HTML in the system's default browser." -msgstr "" +msgstr "Uruchom wyeksportowany dokument HTML w domyÅ›lnej przeglÄ…darce." #: platform/javascript/export/export.cpp -msgid "Could not write file:\n" +#, fuzzy +msgid "Could not write file:" msgstr "Nie można zapisać pliku:\n" #: platform/javascript/export/export.cpp -msgid "Could not open template for export:\n" +#, fuzzy +msgid "Could not open template for export:" msgstr "Nie można otworzyć szablonu dla eksportu:\n" #: platform/javascript/export/export.cpp -msgid "Invalid export template:\n" +#, fuzzy +msgid "Invalid export template:" msgstr "Szablon eksportu nieprawidÅ‚owy:\n" #: platform/javascript/export/export.cpp #, fuzzy -msgid "Could not read custom HTML shell:\n" +msgid "Could not read custom HTML shell:" msgstr "Nie można odczytać niestandardowe powÅ‚oki HTML:\n" #: platform/javascript/export/export.cpp #, fuzzy -msgid "Could not read boot splash image file:\n" +msgid "Could not read boot splash image file:" +msgstr "Nie można odczytać pliku obrazu splash:\n" + +#: platform/javascript/export/export.cpp +#, fuzzy +msgid "Using default boot splash image." msgstr "Nie można odczytać pliku obrazu splash:\n" #: scene/2d/animated_sprite.cpp @@ -7943,11 +8139,15 @@ msgid "PathFollow2D only works when set as a child of a Path2D node." msgstr "PathFollow2D zadziaÅ‚a tylko wtedy, gdy bÄ™dzie dzieckiem wÄ™zeÅ‚ Path2D." #: scene/2d/physics_body_2d.cpp +#, fuzzy 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 "" +"Zmiany rozmiaru w RigidBody2D (w trybach character i rigid) zostanÄ… " +"nadpisane przez silnik fizyki podczas dziaÅ‚ania.\n" +"Zamiast tego, zmieÅ„ rozmiary ksztaÅ‚tów kolizji w wÄ™zÅ‚ach podrzÄ™dnych." #: scene/2d/remote_transform_2d.cpp msgid "Path property must point to a valid Node2D node to work." @@ -7963,11 +8163,12 @@ msgstr "" #: scene/3d/arvr_nodes.cpp msgid "ARVRCamera must have an ARVROrigin node as its parent" -msgstr "" +msgstr "ARVRCamera musi dziedziczyć po ARVROrigin node" #: scene/3d/arvr_nodes.cpp +#, fuzzy msgid "ARVRController must have an ARVROrigin node as its parent" -msgstr "" +msgstr "ARVRController musi posiadać wÄ™zeÅ‚ ARVROrigin jako rodzica" #: scene/3d/arvr_nodes.cpp msgid "" @@ -7976,8 +8177,9 @@ msgid "" msgstr "" #: scene/3d/arvr_nodes.cpp +#, fuzzy msgid "ARVRAnchor must have an ARVROrigin node as its parent" -msgstr "" +msgstr "ARVRAnchor musi posiadać wÄ™zeÅ‚ ARVROrigin jako rodzica" #: scene/3d/arvr_nodes.cpp msgid "" @@ -7987,7 +8189,7 @@ msgstr "" #: scene/3d/arvr_nodes.cpp msgid "ARVROrigin requires an ARVRCamera child node" -msgstr "" +msgstr "ARVROrigin wymaga by ARVRCamera dziedziczyÅ‚a po node" #: scene/3d/baked_lightmap.cpp msgid "Plotting Meshes: " @@ -8002,8 +8204,9 @@ msgid "Finishing Plot" msgstr "" #: scene/3d/baked_lightmap.cpp +#, fuzzy msgid "Lighting Meshes: " -msgstr "" +msgstr "OÅ›wietlanie siatek: " #: scene/3d/collision_polygon.cpp msgid "" @@ -8061,11 +8264,15 @@ msgid "" msgstr "" #: scene/3d/physics_body.cpp +#, fuzzy 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 "" +"Zmiany rozmiaru w RigidBody (w trybach character i rigid) zostanÄ… nadpisane " +"przez silnik fizyki podczas dziaÅ‚ania.\n" +"Zamiast tego, zmieÅ„ rozmiary ksztaÅ‚tów kolizji w wÄ™zÅ‚ach podrzÄ™dnych." #: scene/3d/remote_transform.cpp msgid "Path property must point to a valid Spatial node to work." @@ -8091,6 +8298,8 @@ msgid "" "VehicleWheel serves to provide a wheel system to a VehicleBody. Please use " "it as a child of a VehicleBody." msgstr "" +"VehicleWheel zapewnia system kół do VehicleBody. ProszÄ™ użyć go jako " +"dziedziczÄ…cego po VehicleBody." #: scene/gui/color_picker.cpp msgid "Raw Mode" @@ -8098,7 +8307,7 @@ msgstr "Trybie RAW" #: scene/gui/color_picker.cpp msgid "Add current color as a preset" -msgstr "" +msgstr "Dodaj bieżący kolor jako domyÅ›lne" #: scene/gui/dialogs.cpp msgid "Alert!" @@ -8138,9 +8347,10 @@ msgid "(Other)" msgstr "Inne" #: scene/main/scene_tree.cpp +#, fuzzy msgid "" -"Default Environment as specified in Project Setings (Rendering -> Viewport -" -"> Default Environment) could not be loaded." +"Default Environment as specified in Project Setings (Rendering -> " +"Environment -> Default Environment) could not be loaded." msgstr "" "DomyÅ›lne Åšrodowisko okreÅ›lone w Ustawieniach Projektu (Renderowanie -> " "Viewport -> DomyÅ›lne Åšrodowisko) nie mogÅ‚o zostać zaÅ‚adowane." @@ -8173,6 +8383,10 @@ msgstr "BÅ‚Ä…d Å‚adowania fonta." msgid "Invalid font size." msgstr "Niepoprawny rozmiar fonta." +#, fuzzy +#~ msgid "preview" +#~ msgstr "PodglÄ…d" + #~ msgid "Move Add Key" #~ msgstr "Przemieszczono/Dodano klucz" @@ -8258,10 +8472,6 @@ msgstr "Niepoprawny rozmiar fonta." #~ msgid "Filter:" #~ msgstr "Filtr:" -#, fuzzy -#~ msgid "Theme" -#~ msgstr "Zapisz motyw" - #~ msgid "Method List For '%s':" #~ msgstr "Lista metod '%s':" @@ -8528,9 +8738,6 @@ msgstr "Niepoprawny rozmiar fonta." #~ msgid "Import Anyway" #~ msgstr "Zaimportuj Pomimo" -#~ msgid "Import & Open" -#~ msgstr "Importuj i Otwórz" - #~ msgid "Edited scene has not been saved, open imported scene anyway?" #~ msgstr "" #~ "Edytowana sceny nie zostaÅ‚a zapisana. Otworzyć importowanÄ… scenÄ™ mimo " @@ -8761,9 +8968,6 @@ msgstr "Niepoprawny rozmiar fonta." #~ msgid "Stereo" #~ msgstr "Stereo" -#~ msgid "Mono" -#~ msgstr "Mono" - #~ msgid "Pitch" #~ msgstr "Wysokość" diff --git a/editor/translations/pr.po b/editor/translations/pr.po index 8f649949e1..ef1a830945 100644 --- a/editor/translations/pr.po +++ b/editor/translations/pr.po @@ -202,8 +202,7 @@ msgstr "" #: 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 +#: editor/plugins/particles_editor_plugin.cpp editor/script_create_dialog.cpp msgid "Create" msgstr "" @@ -554,6 +553,16 @@ msgid "Signals" msgstr "" #: editor/create_dialog.cpp +#, fuzzy +msgid "Change %s Type" +msgstr "th' Base Type:" + +#: editor/create_dialog.cpp editor/project_settings_editor.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Change" +msgstr "Change" + +#: editor/create_dialog.cpp msgid "Create New %s" msgstr "" @@ -659,7 +668,7 @@ msgid "" msgstr "" #: editor/dependency_editor.cpp -msgid "Cannot remove:\n" +msgid "Cannot remove:" msgstr "" #: editor/dependency_editor.cpp @@ -742,8 +751,8 @@ msgstr "" msgid "Lead Developer" msgstr "" -#: editor/editor_about.cpp editor/project_manager.cpp -msgid "Project Manager" +#: editor/editor_about.cpp +msgid "Project Manager " msgstr "" #: editor/editor_about.cpp @@ -828,7 +837,7 @@ msgid "Success!" msgstr "" #: editor/editor_asset_installer.cpp -#: editor/plugins/asset_library_editor_plugin.cpp editor/project_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp msgid "Install" msgstr "" @@ -1139,7 +1148,7 @@ msgid "Packing" msgstr "" #: editor/editor_export.cpp platform/javascript/export/export.cpp -msgid "Template file not found:\n" +msgid "Template file not found:" msgstr "" #: editor/editor_file_dialog.cpp scene/gui/file_dialog.cpp @@ -1397,6 +1406,10 @@ msgstr "" msgid "Clear" msgstr "" +#: editor/editor_log.cpp +msgid "Clear Output" +msgstr "" + #: editor/editor_node.cpp editor/plugins/animation_player_editor_plugin.cpp msgid "Error saving resource!" msgstr "" @@ -1462,7 +1475,8 @@ msgstr "" #: editor/editor_node.cpp msgid "" -"Couldn't save scene. Likely dependencies (instances) couldn't be satisfied." +"Couldn't save scene. Likely dependencies (instances or inheritance) couldn't " +"be satisfied." msgstr "" #: editor/editor_node.cpp @@ -2397,7 +2411,7 @@ msgstr "" #: editor/export_template_manager.cpp #, fuzzy -msgid "Error creating path for templates:\n" +msgid "Error creating path for templates:" msgstr "Blimey! I can't make th' signature object!" #: editor/export_template_manager.cpp @@ -2556,9 +2570,7 @@ msgid "View items as a list" msgstr "" #: editor/filesystem_dock.cpp -msgid "" -"\n" -"Status: Import of file failed. Please fix file and reimport manually." +msgid "Status: Import of file failed. Please fix file and reimport manually." msgstr "" #: editor/filesystem_dock.cpp @@ -2566,19 +2578,21 @@ msgid "Cannot move/rename resources root." msgstr "" #: editor/filesystem_dock.cpp -msgid "Cannot move a folder into itself.\n" +msgid "Cannot move a folder into itself." msgstr "" #: editor/filesystem_dock.cpp -msgid "Error moving:\n" -msgstr "" +#, fuzzy +msgid "Error moving:" +msgstr "Error loading yer Calligraphy Pen." #: editor/filesystem_dock.cpp -msgid "Error duplicating:\n" -msgstr "" +#, fuzzy +msgid "Error duplicating:" +msgstr "Rename Variable" #: editor/filesystem_dock.cpp -msgid "Unable to update dependencies:\n" +msgid "Unable to update dependencies:" msgstr "" #: editor/filesystem_dock.cpp @@ -3220,6 +3234,10 @@ msgstr "" msgid "Filters.." msgstr "" +#: editor/plugins/animation_tree_editor_plugin.cpp +msgid "AnimationTree" +msgstr "" + #: editor/plugins/asset_library_editor_plugin.cpp msgid "Free" msgstr "" @@ -3385,6 +3403,7 @@ msgid "Bake Lightmaps" msgstr "" #: editor/plugins/camera_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Preview" msgstr "" @@ -4075,7 +4094,7 @@ msgid "Bake!" msgstr "" #: editor/plugins/navigation_mesh_editor_plugin.cpp -msgid "Bake the navigation mesh.\n" +msgid "Bake the navigation mesh." msgstr "" #: editor/plugins/navigation_mesh_editor_plugin.cpp @@ -4468,14 +4487,16 @@ msgstr "" msgid "Paste" msgstr "" +#: editor/plugins/resource_preloader_editor_plugin.cpp +msgid "ResourcePreloader" +msgstr "" + #: editor/plugins/script_editor_plugin.cpp msgid "Clear Recent Files" msgstr "" #: editor/plugins/script_editor_plugin.cpp -msgid "" -"Close and save changes?\n" -"\"" +msgid "Close and save changes?" msgstr "" #: editor/plugins/script_editor_plugin.cpp @@ -4552,6 +4573,10 @@ msgid "Copy Script Path" msgstr "Forge yer Node!" #: editor/plugins/script_editor_plugin.cpp +msgid "Show In File System" +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp msgid "History Prev" msgstr "" @@ -4985,84 +5010,84 @@ msgid "Rotating %s degrees." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Bottom View." +msgid "Keying is disabled (no key inserted)." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Bottom" +msgid "Animation Key Inserted." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Top View." +msgid "Objects Drawn" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Rear View." +msgid "Material Changes" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Rear" -msgstr "" +#, fuzzy +msgid "Shader Changes" +msgstr "Change" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Front View." +msgid "Surface Changes" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Front" +msgid "Draw Calls" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Left View." +msgid "Vertices" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Left" +msgid "FPS" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Right View." +msgid "Top View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Right" +msgid "Bottom View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Keying is disabled (no key inserted)." +msgid "Bottom" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Animation Key Inserted." +msgid "Left View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Objects Drawn" +msgid "Left" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Material Changes" +msgid "Right View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -#, fuzzy -msgid "Shader Changes" -msgstr "Change" +msgid "Right" +msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Surface Changes" +msgid "Front View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Draw Calls" +msgid "Front" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Vertices" +msgid "Rear View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "FPS" +msgid "Rear" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp @@ -5150,16 +5175,13 @@ 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 "" +#, fuzzy +msgid "Select Mode (Q)" +msgstr "Slit th' Node" #: editor/plugins/spatial_editor_plugin.cpp msgid "" @@ -5436,10 +5458,18 @@ msgstr "Forge yer Node!" msgid "Move (After)" msgstr "" +#: editor/plugins/sprite_frames_editor_plugin.cpp +msgid "SpriteFrames" +msgstr "" + #: editor/plugins/style_box_editor_plugin.cpp msgid "StyleBox Preview:" msgstr "" +#: editor/plugins/style_box_editor_plugin.cpp +msgid "StyleBox" +msgstr "" + #: editor/plugins/texture_region_editor_plugin.cpp msgid "Set Region Rect" msgstr "" @@ -5465,14 +5495,17 @@ msgid "Auto Slice" msgstr "" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Offset:" msgstr "" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Step:" msgstr "" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Separation:" msgstr "" @@ -5612,6 +5645,10 @@ msgstr "" msgid "Color" msgstr "" +#: editor/plugins/theme_editor_plugin.cpp +msgid "Theme" +msgstr "" + #: editor/plugins/tile_map_editor_plugin.cpp msgid "Erase Selection" msgstr "" @@ -5712,6 +5749,31 @@ msgstr "" msgid "Error" msgstr "" +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "Autotiles" +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "" +"Select sub-tile to use as icon, this will be also used on invalid autotile " +"bindings." +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "" +"LMB: set bit on.\n" +"RMB: set bit off." +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +#, fuzzy +msgid "Select current edited sub-tile." +msgstr "Slit th' Node" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "Select sub-tile to change it's priority." +msgstr "" + #: editor/progress_dialog.cpp scene/gui/dialogs.cpp msgid "Cancel" msgstr "" @@ -5829,10 +5891,22 @@ msgid "Please choose a folder that does not contain a 'project.godot' file." msgstr "" #: editor/project_manager.cpp +msgid "That's a BINGO!" +msgstr "" + +#: editor/project_manager.cpp msgid "Imported Project" msgstr "" #: editor/project_manager.cpp +msgid "Couldn't create folder." +msgstr "" + +#: editor/project_manager.cpp +msgid "There is already a folder in this path with the specified name." +msgstr "" + +#: editor/project_manager.cpp msgid "It would be a good idea to name your project." msgstr "" @@ -5874,14 +5948,26 @@ msgid "Import Existing Project" msgstr "" #: editor/project_manager.cpp +msgid "Import & Edit" +msgstr "" + +#: editor/project_manager.cpp msgid "Create New Project" msgstr "" #: editor/project_manager.cpp +msgid "Create & Edit" +msgstr "" + +#: editor/project_manager.cpp msgid "Install Project:" msgstr "" #: editor/project_manager.cpp +msgid "Install & Edit" +msgstr "" + +#: editor/project_manager.cpp msgid "Project Name:" msgstr "" @@ -5898,10 +5984,6 @@ msgid "Browse" msgstr "" #: editor/project_manager.cpp -msgid "That's a BINGO!" -msgstr "" - -#: editor/project_manager.cpp msgid "Unnamed Project" msgstr "" @@ -5947,6 +6029,10 @@ msgid "" msgstr "" #: editor/project_manager.cpp +msgid "Project Manager" +msgstr "" + +#: editor/project_manager.cpp msgid "Project List" msgstr "" @@ -6074,11 +6160,6 @@ msgid "Button 9" msgstr "" #: editor/project_settings_editor.cpp -#: modules/visual_script/visual_script_editor.cpp -msgid "Change" -msgstr "Change" - -#: editor/project_settings_editor.cpp msgid "Joypad Axis Index:" msgstr "" @@ -6549,7 +6630,7 @@ msgid "Error duplicating scene to save it." msgstr "" #: editor/scene_tree_dock.cpp -msgid "Sub-Resources:" +msgid "Sub-Resources" msgstr "" #: editor/scene_tree_dock.cpp @@ -6848,7 +6929,7 @@ msgstr "" msgid "Pick one or more items from the list to display the graph." msgstr "" -#: editor/script_editor_debugger.cpp +#: editor/script_editor_debugger.cpp modules/mono/editor/mono_bottom_panel.cpp msgid "Errors" msgstr "" @@ -6857,6 +6938,11 @@ msgid "Child Process Connected" msgstr "" #: editor/script_editor_debugger.cpp +#, fuzzy +msgid "Copy Error" +msgstr "Slit th' Node" + +#: editor/script_editor_debugger.cpp msgid "Inspect Previous Instance" msgstr "" @@ -7210,10 +7296,50 @@ msgstr "" msgid "Pick Distance:" msgstr "" +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Generating solution..." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Generating C# project..." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Failed to create solution." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Failed to save solution." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Done" +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Failed to create C# project." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Mono" +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Create C# solution" +msgstr "" + #: modules/mono/editor/mono_bottom_panel.cpp msgid "Builds" msgstr "" +#: modules/mono/editor/mono_bottom_panel.cpp +msgid "Build Project" +msgstr "" + +#: modules/mono/editor/mono_bottom_panel.cpp +msgid "Warnings" +msgstr "" + #: modules/visual_script/visual_script.cpp msgid "" "A node yielded without working memory, please read the docs on how to yield " @@ -7587,24 +7713,28 @@ msgid "Run exported HTML in the system's default browser." msgstr "" #: platform/javascript/export/export.cpp -msgid "Could not write file:\n" +msgid "Could not write file:" msgstr "" #: platform/javascript/export/export.cpp -msgid "Could not open template for export:\n" +msgid "Could not open template for export:" msgstr "" #: platform/javascript/export/export.cpp #, fuzzy -msgid "Invalid export template:\n" +msgid "Invalid export template:" msgstr "Yer index property name be thrown overboard!" #: platform/javascript/export/export.cpp -msgid "Could not read custom HTML shell:\n" +msgid "Could not read custom HTML shell:" +msgstr "" + +#: platform/javascript/export/export.cpp +msgid "Could not read boot splash image file:" msgstr "" #: platform/javascript/export/export.cpp -msgid "Could not read boot splash image file:\n" +msgid "Using default boot splash image." msgstr "" #: scene/2d/animated_sprite.cpp @@ -7858,8 +7988,8 @@ msgstr "" #: scene/main/scene_tree.cpp msgid "" -"Default Environment as specified in Project Setings (Rendering -> Viewport -" -"> Default Environment) could not be loaded." +"Default Environment as specified in Project Setings (Rendering -> " +"Environment -> Default Environment) could not be loaded." msgstr "" #: scene/main/viewport.cpp diff --git a/editor/translations/pt_BR.po b/editor/translations/pt_BR.po index a0f94fbb4f..600775f68e 100644 --- a/editor/translations/pt_BR.po +++ b/editor/translations/pt_BR.po @@ -15,7 +15,7 @@ # Mailson Silva Marins <mailsons335@gmail.com>, 2016. # MalcomRF <malcomkbk@gmail.com>, 2017. # Marcus Correia <marknokalt@live.com>, 2017. -# Michael Alexsander Silva Dias <michaelalexsander@protonmail.com>, 2017. +# Michael Alexsander Silva Dias <michaelalexsander@protonmail.com>, 2017-2018. # Renato Rotenberg <renato.rotenberg@gmail.com>, 2017. # Rodolfo R Gomes <rodolforg@gmail.com>, 2017. # Tiago Almeida <thyagoeap@gmail.com>, 2017. @@ -24,8 +24,9 @@ msgid "" msgstr "" "Project-Id-Version: Godot Engine editor\n" "POT-Creation-Date: 2016-05-30\n" -"PO-Revision-Date: 2017-12-20 15:43+0000\n" -"Last-Translator: Guilherme Felipe C G Silva <guilhermefelipecgs@gmail.com>\n" +"PO-Revision-Date: 2018-01-06 13:19+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" @@ -33,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.18\n" +"X-Generator: Weblate 2.19-dev\n" #: editor/animation_editor.cpp msgid "Disabled" @@ -44,9 +45,8 @@ msgid "All Selection" msgstr "Toda a Seleção" #: editor/animation_editor.cpp -#, fuzzy msgid "Anim Change Keyframe Time" -msgstr "Mudar Valor da Anim" +msgstr "Alterar tempo de quadro-chave da animação" #: editor/animation_editor.cpp msgid "Anim Change Transition" @@ -57,9 +57,8 @@ msgid "Anim Change Transform" msgstr "Mudar Transformação da Anim" #: editor/animation_editor.cpp -#, fuzzy msgid "Anim Change Keyframe Value" -msgstr "Mudar Valor da Anim" +msgstr "Mudar valor de quadro-chave da animação" #: editor/animation_editor.cpp msgid "Anim Change Call" @@ -103,7 +102,7 @@ msgstr "Mudar Modo de Valor da Trilha" #: editor/animation_editor.cpp msgid "Anim Track Change Wrap Mode" -msgstr "Mudar Modo de Cobertura da Trilha de Animação" +msgstr "Alterar Modo de Loop da Trilha de Animação" #: editor/animation_editor.cpp msgid "Edit Node Curve" @@ -215,8 +214,7 @@ msgstr "Criar %d NOVAS trilhas e inserir chaves?" #: 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 +#: editor/plugins/particles_editor_plugin.cpp editor/script_create_dialog.cpp msgid "Create" msgstr "Criar" @@ -552,9 +550,8 @@ msgid "Connecting Signal:" msgstr "Conectando Sinal:" #: editor/connections_dialog.cpp -#, fuzzy msgid "Disconnect '%s' from '%s'" -msgstr "Conectar \"%s\" a \"%s\"" +msgstr "Desconectar '%s' do '%s'" #: editor/connections_dialog.cpp msgid "Connect.." @@ -571,8 +568,17 @@ msgstr "Sinais" #: editor/create_dialog.cpp #, fuzzy +msgid "Change %s Type" +msgstr "Alterar Tipo" + +#: editor/create_dialog.cpp editor/project_settings_editor.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Change" +msgstr "Alterar" + +#: editor/create_dialog.cpp msgid "Create New %s" -msgstr "Criar Novo" +msgstr "Criar Novo %s" #: editor/create_dialog.cpp editor/editor_file_dialog.cpp #: editor/filesystem_dock.cpp @@ -683,7 +689,8 @@ msgstr "" "Removê-los mesmo assim? (irreversÃvel)" #: editor/dependency_editor.cpp -msgid "Cannot remove:\n" +#, fuzzy +msgid "Cannot remove:" msgstr "Não foi possÃvel remover:\n" #: editor/dependency_editor.cpp @@ -766,8 +773,9 @@ msgstr "Fundadores do Projeto" msgid "Lead Developer" msgstr "Desenvolvedor-chefe" -#: editor/editor_about.cpp editor/project_manager.cpp -msgid "Project Manager" +#: editor/editor_about.cpp +#, fuzzy +msgid "Project Manager " msgstr "Gerenciador de Projetos" #: editor/editor_about.cpp @@ -856,7 +864,7 @@ msgid "Success!" msgstr "Sucesso!" #: editor/editor_asset_installer.cpp -#: editor/plugins/asset_library_editor_plugin.cpp editor/project_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp msgid "Install" msgstr "Instalar" @@ -877,9 +885,8 @@ msgid "Rename Audio Bus" msgstr "Renomear Canal de Ãudio" #: editor/editor_audio_buses.cpp -#, fuzzy msgid "Change Audio Bus Volume" -msgstr "Alternar Solo do Canal de Ãudio" +msgstr "Alternar Volume do Canal de Ãudio" #: editor/editor_audio_buses.cpp msgid "Toggle Audio Bus Solo" @@ -944,7 +951,7 @@ msgstr "Excluir Efeito" #: editor/editor_audio_buses.cpp msgid "Audio" -msgstr "" +msgstr "Ãudio" #: editor/editor_audio_buses.cpp msgid "Add Audio Bus" @@ -1122,13 +1129,12 @@ msgid "Updating scene.." msgstr "Atualizando Cena..." #: editor/editor_data.cpp -#, fuzzy msgid "[empty]" -msgstr "(vazio)" +msgstr "[vazio]" #: editor/editor_data.cpp msgid "[unsaved]" -msgstr "" +msgstr "[não salvo]" #: editor/editor_dir_dialog.cpp msgid "Please select a base directory first" @@ -1168,7 +1174,8 @@ msgid "Packing" msgstr "Empacotando" #: editor/editor_export.cpp platform/javascript/export/export.cpp -msgid "Template file not found:\n" +#, fuzzy +msgid "Template file not found:" msgstr "Arquivo de modelo não encontrado:\n" #: editor/editor_file_dialog.cpp scene/gui/file_dialog.cpp @@ -1426,6 +1433,11 @@ msgstr "SaÃda:" msgid "Clear" msgstr "Limpar" +#: editor/editor_log.cpp +#, fuzzy +msgid "Clear Output" +msgstr "SaÃda" + #: editor/editor_node.cpp editor/plugins/animation_player_editor_plugin.cpp msgid "Error saving resource!" msgstr "Erro ao salvar Recurso!" @@ -1488,8 +1500,10 @@ msgid "This operation can't be done without a tree root." msgstr "Essa operação não pode ser realizada sem uma raiz da cena." #: editor/editor_node.cpp +#, fuzzy msgid "" -"Couldn't save scene. Likely dependencies (instances) couldn't be satisfied." +"Couldn't save scene. Likely dependencies (instances or inheritance) couldn't " +"be satisfied." msgstr "" "Não se pôde salvar a cena. É provável que dependências (instâncias) não " "foram satisfeitas." @@ -1702,7 +1716,7 @@ msgstr "Essa operação não pode ser realizada sem uma cena." #: editor/editor_node.cpp msgid "Export Mesh Library" -msgstr "Exportar Biblioteca de Meshes" +msgstr "Exportar Biblioteca de Malhas" #: editor/editor_node.cpp msgid "This operation can't be done without a root node." @@ -2108,7 +2122,7 @@ msgstr "Documentação Online" #: editor/editor_node.cpp msgid "Q&A" -msgstr "Perguntas e Respostas" +msgstr "P&R" #: editor/editor_node.cpp msgid "Issue Tracker" @@ -2301,7 +2315,7 @@ msgstr "Abrir o Editor anterior" #: editor/editor_plugin.cpp msgid "Creating Mesh Previews" -msgstr "Criando Previsualizações da Mesh" +msgstr "Criando Previsualizações das Malhas" #: editor/editor_plugin.cpp msgid "Thumbnail.." @@ -2373,14 +2387,12 @@ msgid "Frame #:" msgstr "Frame nº:" #: editor/editor_profiler.cpp -#, fuzzy msgid "Time" -msgstr "Tempo:" +msgstr "Tempo" #: editor/editor_profiler.cpp -#, fuzzy msgid "Calls" -msgstr "Chamar" +msgstr "Chamadas" #: editor/editor_run_native.cpp msgid "Select device from the list" @@ -2488,7 +2500,8 @@ msgid "No version.txt found inside templates." msgstr "Não foi encontrado um version.txt dentro dos modelos." #: editor/export_template_manager.cpp -msgid "Error creating path for templates:\n" +#, fuzzy +msgid "Error creating path for templates:" msgstr "Erro ao criar caminho para modelos:\n" #: editor/export_template_manager.cpp @@ -2524,9 +2537,8 @@ msgstr "Sem resposta." #: editor/export_template_manager.cpp #: editor/plugins/asset_library_editor_plugin.cpp -#, fuzzy msgid "Request Failed." -msgstr "Sol. Falhou." +msgstr "Solicitação Falhou." #: editor/export_template_manager.cpp #: editor/plugins/asset_library_editor_plugin.cpp @@ -2572,9 +2584,8 @@ msgid "Connecting.." msgstr "Conectando.." #: editor/export_template_manager.cpp -#, fuzzy msgid "Can't Connect" -msgstr "Não foi possÃvel conectar" +msgstr "Não foi PossÃvel Conectar" #: editor/export_template_manager.cpp msgid "Connected" @@ -2648,9 +2659,8 @@ msgid "View items as a list" msgstr "Visualizar itens como uma lista" #: editor/filesystem_dock.cpp -msgid "" -"\n" -"Status: Import of file failed. Please fix file and reimport manually." +#, fuzzy +msgid "Status: Import of file failed. Please fix file and reimport manually." msgstr "" "\n" "Estado: Falha na importação do arquivo. Por favor, conserte o arquivo e " @@ -2661,20 +2671,23 @@ msgid "Cannot move/rename resources root." msgstr "Não foi possÃvel mover/renomear raiz dos recurso." #: editor/filesystem_dock.cpp -msgid "Cannot move a folder into itself.\n" +#, fuzzy +msgid "Cannot move a folder into itself." msgstr "Não é possÃvel mover uma pasta nela mesma.\n" #: editor/filesystem_dock.cpp -msgid "Error moving:\n" +#, fuzzy +msgid "Error moving:" msgstr "Erro ao mover:\n" #: editor/filesystem_dock.cpp #, fuzzy -msgid "Error duplicating:\n" -msgstr "Erro ao carregar:" +msgid "Error duplicating:" +msgstr "Erro ao duplicar:\n" #: editor/filesystem_dock.cpp -msgid "Unable to update dependencies:\n" +#, fuzzy +msgid "Unable to update dependencies:" msgstr "Não foi possÃvel atualizar dependências:\n" #: editor/filesystem_dock.cpp @@ -2706,14 +2719,12 @@ msgid "Renaming folder:" msgstr "Renomear pasta:" #: editor/filesystem_dock.cpp -#, fuzzy msgid "Duplicating file:" -msgstr "Duplicar" +msgstr "Duplicando arquivo:" #: editor/filesystem_dock.cpp -#, fuzzy msgid "Duplicating folder:" -msgstr "Renomear pasta:" +msgstr "Duplicando pasta:" #: editor/filesystem_dock.cpp msgid "Expand all" @@ -2732,9 +2743,8 @@ msgid "Move To.." msgstr "Mover Para..." #: editor/filesystem_dock.cpp -#, fuzzy msgid "Open Scene(s)" -msgstr "Abrir Cena" +msgstr "Abrir Cena(s)" #: editor/filesystem_dock.cpp msgid "Instance" @@ -2749,9 +2759,8 @@ msgid "View Owners.." msgstr "Visualizar Proprietários..." #: editor/filesystem_dock.cpp -#, fuzzy msgid "Duplicate.." -msgstr "Duplicar" +msgstr "Duplicar..." #: editor/filesystem_dock.cpp msgid "Previous Directory" @@ -2848,14 +2857,12 @@ msgid "Importing Scene.." msgstr "Importando Cena..." #: editor/import/resource_importer_scene.cpp -#, fuzzy msgid "Generating Lightmaps" -msgstr "Transferir para Mapas de Luz:" +msgstr "Generando Lightmaps" #: editor/import/resource_importer_scene.cpp -#, fuzzy msgid "Generating for Mesh: " -msgstr "Gerando AABB" +msgstr "Generando para a Malha: " #: editor/import/resource_importer_scene.cpp msgid "Running Custom Script.." @@ -3326,6 +3333,11 @@ msgstr "Editar Filtros de Nó" msgid "Filters.." msgstr "Filtros..." +#: editor/plugins/animation_tree_editor_plugin.cpp +#, fuzzy +msgid "AnimationTree" +msgstr "Animação" + #: editor/plugins/asset_library_editor_plugin.cpp msgid "Free" msgstr "Livrar" @@ -3475,23 +3487,30 @@ msgid "" "Save your scene (for images to be saved in the same dir), or pick a save " "path from the BakedLightmap properties." msgstr "" +"Não foi possÃvel determinar um caminho para salvar as imagens do lightmap.\n" +"Salve sua cena (para que as imagens sejam salvas no mesmo diretório), ou " +"escolha um caminho nas propriedades do BakedLightmap." #: editor/plugins/baked_lightmap_editor_plugin.cpp msgid "" "No meshes to bake. Make sure they contain an UV2 channel and that the 'Bake " "Light' flag is on." msgstr "" +"Não há malhas para preparar. Certifique-se de que elas possuem um canal UV2 " +"e que a propriedade \"Preparar Luz\" está habilitada." #: editor/plugins/baked_lightmap_editor_plugin.cpp msgid "Failed creating lightmap images, make sure path is writable." msgstr "" +"Falha ao criar imagens do lightmap, certifique-se de que o caminho tem " +"permissões de escrita." #: editor/plugins/baked_lightmap_editor_plugin.cpp -#, fuzzy msgid "Bake Lightmaps" -msgstr "Transferir para Mapas de Luz:" +msgstr "Preparar Lightmaps" #: editor/plugins/camera_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Preview" msgstr "Visualização" @@ -3626,7 +3645,7 @@ msgstr "Modo Panorâmico" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Toggles snapping" -msgstr "Alternar Encaixar" +msgstr "Alternar Encaixamento" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Use Snap" @@ -4000,31 +4019,31 @@ msgstr "Criar Forma Convexa" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Create Navigation Mesh" -msgstr "Criar Mesh de Navegação" +msgstr "Criar Malha de Navegação" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Contained Mesh is not of type ArrayMesh." -msgstr "" +msgstr "Malha contida não é do tipo ArrayMesh." #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "UV Unwrap failed, mesh may not be manifold?" -msgstr "" +msgstr "Falha ao desembrulhar UV. A malha pode não ter múltiplas faces?" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "No mesh to debug." -msgstr "" +msgstr "Nenhuma malha para depurar." #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Model has no UV in this layer" -msgstr "" +msgstr "Modelo não tem uma UV nesta camada" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "MeshInstance lacks a Mesh!" -msgstr "Falta uma Mesh na MeshInstance!" +msgstr "Falta uma Malha na MeshInstance!" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Mesh has not surface to create outlines from!" -msgstr "Mesh não tem superfÃcie para criar contornos dela!" +msgstr "Malha não tem superfÃcie para criar contornos dela!" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Could not create outline!" @@ -4056,25 +4075,23 @@ msgstr "Criar Colisão Convexa Irmã" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Create Outline Mesh.." -msgstr "Criar Mesh de Contorno.." +msgstr "Criar Malha de Contorno.." #: editor/plugins/mesh_instance_editor_plugin.cpp -#, fuzzy msgid "View UV1" -msgstr "Visualizar" +msgstr "Visualizar UV1" #: editor/plugins/mesh_instance_editor_plugin.cpp -#, fuzzy msgid "View UV2" -msgstr "Visualizar" +msgstr "Visualizar UV2" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Unwrap UV2 for Lightmap/AO" -msgstr "" +msgstr "Desembrulhar UV2 para Lightmap/AO" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Create Outline Mesh" -msgstr "Criar Mesh de Contorno" +msgstr "Criar Malha de Contorno" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Outline Size:" @@ -4083,23 +4100,24 @@ msgstr "Tamanho do Contorno:" #: editor/plugins/multimesh_editor_plugin.cpp msgid "No mesh source specified (and no MultiMesh set in node)." msgstr "" -"Nenhuma mesh de origem especificada (e nenhuma MultiMesh definida no nó)." +"Nenhuma malha de origem especificada (e nenhuma MultiMesh definida no nó)." #: editor/plugins/multimesh_editor_plugin.cpp msgid "No mesh source specified (and MultiMesh contains no Mesh)." -msgstr "Nenhuma mesh de origem especificada (e MultiMesh contém nenhuma Mesh)." +msgstr "" +"Nenhuma malha de origem especificada (e MultiMesh contém nenhuma Malha)." #: editor/plugins/multimesh_editor_plugin.cpp msgid "Mesh source is invalid (invalid path)." -msgstr "Mesh de origem é inválida (Caminho inválido)." +msgstr "Malha de origem é inválida (caminho inválido)." #: editor/plugins/multimesh_editor_plugin.cpp msgid "Mesh source is invalid (not a MeshInstance)." -msgstr "Mesh de origem é inválida (não é uma MeshInstance)." +msgstr "Malha de origem é inválida (não é uma MeshInstance)." #: editor/plugins/multimesh_editor_plugin.cpp msgid "Mesh source is invalid (contains no Mesh resource)." -msgstr "Mesh de origem é inválida (contém nenhum recurso de Mesh)." +msgstr "Malha de origem é inválida (contém nenhum recurso de Mesh)." #: editor/plugins/multimesh_editor_plugin.cpp msgid "No surface source specified." @@ -4127,7 +4145,7 @@ msgstr "Não foi possÃvel mapear área." #: editor/plugins/multimesh_editor_plugin.cpp msgid "Select a Source Mesh:" -msgstr "Selecione uma Mesh de origem:" +msgstr "Selecione uma Malha de origem:" #: editor/plugins/multimesh_editor_plugin.cpp msgid "Select a Target Surface:" @@ -4147,7 +4165,7 @@ msgstr "SuperfÃcie Destino:" #: editor/plugins/multimesh_editor_plugin.cpp msgid "Source Mesh:" -msgstr "Mesh de Origem:" +msgstr "Malha de Origem:" #: editor/plugins/multimesh_editor_plugin.cpp msgid "X-Axis" @@ -4163,7 +4181,7 @@ msgstr "Eixo-Z" #: editor/plugins/multimesh_editor_plugin.cpp msgid "Mesh Up Axis:" -msgstr "Mesh acima do Eixo:" +msgstr "Malha acima do Eixo:" #: editor/plugins/multimesh_editor_plugin.cpp msgid "Random Rotation:" @@ -4186,12 +4204,13 @@ msgid "Bake!" msgstr "Precalcular!" #: editor/plugins/navigation_mesh_editor_plugin.cpp -msgid "Bake the navigation mesh.\n" -msgstr "Preparar a mesh de navegação.\n" +#, fuzzy +msgid "Bake the navigation mesh." +msgstr "Preparar a malha de navegação.\n" #: editor/plugins/navigation_mesh_editor_plugin.cpp msgid "Clear the navigation mesh." -msgstr "Apagar a mesh de navegação." +msgstr "Apagar a malha de navegação." #: editor/plugins/navigation_mesh_generator.cpp msgid "Setting up Configuration..." @@ -4231,11 +4250,11 @@ msgstr "Criando polimalha..." #: editor/plugins/navigation_mesh_generator.cpp msgid "Converting to native navigation mesh..." -msgstr "Convertando para mesh de navegação nativa..." +msgstr "Convertando para malha de navegação nativa..." #: editor/plugins/navigation_mesh_generator.cpp msgid "Navigation Mesh Generator Setup:" -msgstr "Configuração do Gerador de Mesh de Navegação:" +msgstr "Configuração do Gerador de Malha de Navegação:" #: editor/plugins/navigation_mesh_generator.cpp msgid "Parsing Geometry..." @@ -4331,7 +4350,7 @@ msgstr "Gerar AABB" #: editor/plugins/particles_editor_plugin.cpp msgid "Create Emission Points From Mesh" -msgstr "Criar Pontos de Emissão a Partir do Mesh" +msgstr "Criar Pontos de Emissão a Partir da Malha" #: editor/plugins/particles_editor_plugin.cpp msgid "Create Emission Points From Node" @@ -4576,14 +4595,18 @@ msgstr "Carregar Recurso" msgid "Paste" msgstr "Colar" +#: editor/plugins/resource_preloader_editor_plugin.cpp +#, fuzzy +msgid "ResourcePreloader" +msgstr "Caminho do recurso" + #: editor/plugins/script_editor_plugin.cpp msgid "Clear Recent Files" msgstr "Limpar Arquivos Recentes" #: editor/plugins/script_editor_plugin.cpp -msgid "" -"Close and save changes?\n" -"\"" +#, fuzzy +msgid "Close and save changes?" msgstr "" "Fechar e salvar mudanças?\n" "\"" @@ -4657,9 +4680,13 @@ msgid "Soft Reload Script" msgstr "Recarregar Script (suave)" #: editor/plugins/script_editor_plugin.cpp -#, fuzzy msgid "Copy Script Path" -msgstr "Copiar Caminho" +msgstr "Copiar Caminho do Script" + +#: editor/plugins/script_editor_plugin.cpp +#, fuzzy +msgid "Show In File System" +msgstr "Mostrar em Arquivos" #: editor/plugins/script_editor_plugin.cpp msgid "History Prev" @@ -4852,9 +4879,8 @@ msgid "Clone Down" msgstr "Clonar Abaixo" #: editor/plugins/script_text_editor.cpp -#, fuzzy msgid "Fold/Unfold Line" -msgstr "Mostrar Linha" +msgstr "Dobrar/Desdobrar Linha" #: editor/plugins/script_text_editor.cpp msgid "Fold All Lines" @@ -5019,7 +5045,7 @@ msgstr "Modificar Curve Map" #: editor/plugins/shader_graph_editor_plugin.cpp msgid "Change Input Name" -msgstr "Alterar Nome de Entrada" +msgstr "Alterar Nome da Entrada" #: editor/plugins/shader_graph_editor_plugin.cpp msgid "Connect Graph Nodes" @@ -5051,7 +5077,7 @@ msgstr "Erro: VÃnculo de Conexão CÃclico" #: editor/plugins/shader_graph_editor_plugin.cpp msgid "Error: Missing Input Connections" -msgstr "Erro: Faltando Conexões de Entrada" +msgstr "Erro: Faltando as Conexões da Entrada" #: editor/plugins/shader_graph_editor_plugin.cpp msgid "Add Shader Graph Node" @@ -5098,84 +5124,84 @@ msgid "Rotating %s degrees." msgstr "Rotacionando %s degraus." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Bottom View." -msgstr "Visão inferior." +msgid "Keying is disabled (no key inserted)." +msgstr "Chaveamento está desativado (nenhuma chave inserida)." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Bottom" -msgstr "Baixo" +msgid "Animation Key Inserted." +msgstr "Chave de Animação Inserida." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Top View." -msgstr "Visão Superior." +msgid "Objects Drawn" +msgstr "Objetos Desenhados" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Rear View." -msgstr "Visão Traseira." +msgid "Material Changes" +msgstr "Mudanças de Material" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Rear" -msgstr "Traseira" +msgid "Shader Changes" +msgstr "Mudanças de Shader" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Front View." -msgstr "Visão Frontal." +msgid "Surface Changes" +msgstr "Mudanças de SuperfÃcie" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Front" -msgstr "Frente" +msgid "Draw Calls" +msgstr "Chamadas de Desenho" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Left View." -msgstr "Visão Esquerda." +msgid "Vertices" +msgstr "Vértices" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Left" -msgstr "Esquerda" +msgid "FPS" +msgstr "FPS" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Right View." -msgstr "Visão Direita." +msgid "Top View." +msgstr "Visão Superior." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Right" -msgstr "Direita" +msgid "Bottom View." +msgstr "Visão inferior." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Keying is disabled (no key inserted)." -msgstr "Chaveamento está desativado (nenhuma chave inserida)." +msgid "Bottom" +msgstr "Baixo" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Animation Key Inserted." -msgstr "Chave de Animação Inserida." +msgid "Left View." +msgstr "Visão Esquerda." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Objects Drawn" -msgstr "Objetos Desenhados" +msgid "Left" +msgstr "Esquerda" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Material Changes" -msgstr "Mudanças de Material" +msgid "Right View." +msgstr "Visão Direita." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Shader Changes" -msgstr "Mudanças de Shader" +msgid "Right" +msgstr "Direita" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Surface Changes" -msgstr "Mudanças de SuperfÃcie" +msgid "Front View." +msgstr "Visão Frontal." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Draw Calls" -msgstr "Chamadas de Desenho" +msgid "Front" +msgstr "Frente" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Vertices" -msgstr "Vértices" +msgid "Rear View." +msgstr "Visão Traseira." #: editor/plugins/spatial_editor_plugin.cpp -msgid "FPS" -msgstr "FPS" +msgid "Rear" +msgstr "Traseira" #: editor/plugins/spatial_editor_plugin.cpp msgid "Align with view" @@ -5262,15 +5288,12 @@ msgid "Freelook Speed Modifier" msgstr "Modificador de velocidade da Visão Livre" #: editor/plugins/spatial_editor_plugin.cpp -msgid "preview" -msgstr "previsualizar" - -#: editor/plugins/spatial_editor_plugin.cpp msgid "XForm Dialog" msgstr "Diálogo XForm" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Select Mode (Q)\n" +#, fuzzy +msgid "Select Mode (Q)" msgstr "Modo de Seleção (Q)\n" #: editor/plugins/spatial_editor_plugin.cpp @@ -5300,14 +5323,12 @@ msgid "Local Coords" msgstr "Coordenadas Locais" #: editor/plugins/spatial_editor_plugin.cpp -#, fuzzy msgid "Local Space Mode (%s)" -msgstr "Modo Escala (R)" +msgstr "Modo Espaço Local (%s)" #: editor/plugins/spatial_editor_plugin.cpp -#, fuzzy msgid "Snap Mode (%s)" -msgstr "Modo Snap:" +msgstr "Modo Encaixe (%s)" #: editor/plugins/spatial_editor_plugin.cpp msgid "Bottom View" @@ -5424,7 +5445,7 @@ msgstr "Configurações" #: editor/plugins/spatial_editor_plugin.cpp msgid "Skeleton Gizmo visibility" -msgstr "" +msgstr "Visibilidade do Gizmo de Esqueleto" #: editor/plugins/spatial_editor_plugin.cpp msgid "Snap Settings" @@ -5550,10 +5571,20 @@ msgstr "Mover (Antes)" msgid "Move (After)" msgstr "Mover (Depois)" +#: editor/plugins/sprite_frames_editor_plugin.cpp +#, fuzzy +msgid "SpriteFrames" +msgstr "Pilha de Quadros" + #: editor/plugins/style_box_editor_plugin.cpp msgid "StyleBox Preview:" msgstr "Pré-Visualização do StyleBox:" +#: editor/plugins/style_box_editor_plugin.cpp +#, fuzzy +msgid "StyleBox" +msgstr "Estilo" + #: editor/plugins/texture_region_editor_plugin.cpp msgid "Set Region Rect" msgstr "Definir Retângulo de Região" @@ -5579,14 +5610,17 @@ msgid "Auto Slice" msgstr "Auto Fatiar" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Offset:" msgstr "Deslocamento:" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Step:" msgstr "Passo:" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Separation:" msgstr "Separação:" @@ -5724,6 +5758,10 @@ msgstr "Fonte" msgid "Color" msgstr "Cor" +#: editor/plugins/theme_editor_plugin.cpp +msgid "Theme" +msgstr "Tema" + #: editor/plugins/tile_map_editor_plugin.cpp msgid "Erase Selection" msgstr "Apagar Seleção" @@ -5809,9 +5847,8 @@ msgid "Merge from scene?" msgstr "Fundir a partir de cena?" #: editor/plugins/tile_set_editor_plugin.cpp -#, fuzzy msgid "Tile Set" -msgstr "TileSet..." +msgstr "Tile Set" #: editor/plugins/tile_set_editor_plugin.cpp msgid "Create from Scene" @@ -5825,6 +5862,32 @@ msgstr "Fundir a partir de Cena" msgid "Error" msgstr "Erro" +#: editor/plugins/tile_set_editor_plugin.cpp +#, fuzzy +msgid "Autotiles" +msgstr "Auto Fatiar" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "" +"Select sub-tile to use as icon, this will be also used on invalid autotile " +"bindings." +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "" +"LMB: set bit on.\n" +"RMB: set bit off." +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +#, fuzzy +msgid "Select current edited sub-tile." +msgstr "Salva o recurso editado atualmente." + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "Select sub-tile to change it's priority." +msgstr "" + #: editor/progress_dialog.cpp scene/gui/dialogs.cpp msgid "Cancel" msgstr "Cancelar" @@ -5953,10 +6016,23 @@ msgstr "" "Por favor, escolha uma pasta que não contenha um arquivo 'project.godot'." #: editor/project_manager.cpp +msgid "That's a BINGO!" +msgstr "É um BINGO!" + +#: editor/project_manager.cpp msgid "Imported Project" msgstr "Projeto Importado" #: editor/project_manager.cpp +#, fuzzy +msgid "Couldn't create folder." +msgstr "Não foi possÃvel criar a pasta." + +#: editor/project_manager.cpp +msgid "There is already a folder in this path with the specified name." +msgstr "" + +#: editor/project_manager.cpp msgid "It would be a good idea to name your project." msgstr "Seria uma boa ideia nomear o seu projeto." @@ -5997,14 +6073,29 @@ msgid "Import Existing Project" msgstr "Importar Projeto Existente" #: editor/project_manager.cpp +#, fuzzy +msgid "Import & Edit" +msgstr "Importar e Abrir" + +#: editor/project_manager.cpp msgid "Create New Project" msgstr "Criar Novo Projeto" #: editor/project_manager.cpp +#, fuzzy +msgid "Create & Edit" +msgstr "Criar Emissor" + +#: editor/project_manager.cpp msgid "Install Project:" msgstr "Instalar Projeto:" #: editor/project_manager.cpp +#, fuzzy +msgid "Install & Edit" +msgstr "Instalar" + +#: editor/project_manager.cpp msgid "Project Name:" msgstr "Nome do Projeto:" @@ -6021,10 +6112,6 @@ msgid "Browse" msgstr "Navegar" #: editor/project_manager.cpp -msgid "That's a BINGO!" -msgstr "É um BINGO!" - -#: editor/project_manager.cpp msgid "Unnamed Project" msgstr "Projeto Sem Nome" @@ -6080,6 +6167,10 @@ msgstr "" "confirma?" #: editor/project_manager.cpp +msgid "Project Manager" +msgstr "Gerenciador de Projetos" + +#: editor/project_manager.cpp msgid "Project List" msgstr "Lista de Projetos" @@ -6145,11 +6236,11 @@ msgstr "A ação \"%s\" já existe!" #: editor/project_settings_editor.cpp msgid "Rename Input Action Event" -msgstr "Renomear Evento Ação de Entrada" +msgstr "Renomear Evento de Ação de Entrada" #: editor/project_settings_editor.cpp msgid "Add Input Action Event" -msgstr "Adicionar Evento Ação de Entrada" +msgstr "Adicionar Evento de Ação de Entrada" #: editor/project_settings_editor.cpp editor/settings_config_dialog.cpp msgid "Shift+" @@ -6208,11 +6299,6 @@ msgid "Button 9" msgstr "Botão 9" #: editor/project_settings_editor.cpp -#: modules/visual_script/visual_script_editor.cpp -msgid "Change" -msgstr "Alterar" - -#: editor/project_settings_editor.cpp msgid "Joypad Axis Index:" msgstr "Ãndice de Eixo do Joypad:" @@ -6225,13 +6311,12 @@ msgid "Joypad Button Index:" msgstr "Ãndice de Botão do Joypad:" #: editor/project_settings_editor.cpp -#, fuzzy msgid "Erase Input Action" -msgstr "Apagar Evento Ação de Entrada" +msgstr "Apagar Ação de Entrada" #: editor/project_settings_editor.cpp msgid "Erase Input Action Event" -msgstr "Apagar Evento Ação de Entrada" +msgstr "Apagar Evento de Ação de Entrada" #: editor/project_settings_editor.cpp msgid "Add Event" @@ -6475,7 +6560,7 @@ msgstr "Novo Script" #: editor/property_editor.cpp msgid "New %s" -msgstr "" +msgstr "Novo %s" #: editor/property_editor.cpp msgid "Make Unique" @@ -6510,9 +6595,8 @@ msgid "On" msgstr "Ativo" #: editor/property_editor.cpp -#, fuzzy msgid "[Empty]" -msgstr "Adicionar Vazio" +msgstr "[Vazio]" #: editor/property_editor.cpp modules/visual_script/visual_script_editor.cpp msgid "Set" @@ -6684,7 +6768,8 @@ msgid "Error duplicating scene to save it." msgstr "Erro duplicando cena ao salvar." #: editor/scene_tree_dock.cpp -msgid "Sub-Resources:" +#, fuzzy +msgid "Sub-Resources" msgstr "Sub-Recursos:" #: editor/scene_tree_dock.cpp @@ -6987,7 +7072,7 @@ msgstr "Função:" msgid "Pick one or more items from the list to display the graph." msgstr "Escolhe um ou mais itens da lista para mostrar o gráfico." -#: editor/script_editor_debugger.cpp +#: editor/script_editor_debugger.cpp modules/mono/editor/mono_bottom_panel.cpp msgid "Errors" msgstr "Erros" @@ -6996,6 +7081,11 @@ msgid "Child Process Connected" msgstr "Processo Filho Conectado" #: editor/script_editor_debugger.cpp +#, fuzzy +msgid "Copy Error" +msgstr "Erros de Carregamento" + +#: editor/script_editor_debugger.cpp msgid "Inspect Previous Instance" msgstr "Inspecionar a Instância Anterior" @@ -7089,7 +7179,7 @@ msgstr "Atalhos" #: editor/settings_config_dialog.cpp msgid "Binding" -msgstr "" +msgstr "VInculamento" #: editor/spatial_editor_gizmos.cpp msgid "Change Light Radius" @@ -7141,43 +7231,39 @@ msgstr "Alterar a Extensão da Sonda" #: modules/gdnative/gdnative_library_editor_plugin.cpp msgid "Select the dynamic library for this entry" -msgstr "" +msgstr "Selecione a biblioteca dinâmica para esta entrada" #: modules/gdnative/gdnative_library_editor_plugin.cpp msgid "Select dependencies of the library for this entry" -msgstr "" +msgstr "Selecione as dependências da biblioteca para esta entrada" #: modules/gdnative/gdnative_library_editor_plugin.cpp -#, fuzzy msgid "Remove current entry" -msgstr "Remover Ponto da Curva" +msgstr "Remover a entrada atual" #: modules/gdnative/gdnative_library_editor_plugin.cpp msgid "Double click to create a new entry" -msgstr "" +msgstr "Dê um clique duplo para criar uma nova entrada" #: modules/gdnative/gdnative_library_editor_plugin.cpp msgid "Platform:" -msgstr "" +msgstr "Plataforma:" #: modules/gdnative/gdnative_library_editor_plugin.cpp -#, fuzzy msgid "Platform" -msgstr "Copiar para a Plataforma..." +msgstr "Plataforma" #: modules/gdnative/gdnative_library_editor_plugin.cpp -#, fuzzy msgid "Dynamic Library" -msgstr "Biblioteca" +msgstr "Biblioteca Dinâmica" #: modules/gdnative/gdnative_library_editor_plugin.cpp msgid "Add an architecture entry" -msgstr "" +msgstr "Adicionar uma entrada de arquitetura" #: modules/gdnative/gdnative_library_editor_plugin.cpp -#, fuzzy msgid "GDNativeLibrary" -msgstr "GDNative" +msgstr "GDNativeLibrary" #: modules/gdnative/gdnative_library_singleton_editor.cpp msgid "Library" @@ -7347,10 +7433,58 @@ msgstr "Configurações do GridMap" msgid "Pick Distance:" msgstr "Escolha uma Distância:" +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Generating solution..." +msgstr "Criando contornos..." + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Generating C# project..." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Failed to create solution." +msgstr "Não se pôde criar contorno!" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Failed to save solution." +msgstr "Falha ao carregar recurso." + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Done" +msgstr "Pronto!" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Failed to create C# project." +msgstr "Falha ao carregar recurso." + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Mono" +msgstr "Mono" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Create C# solution" +msgstr "Criar Contorno" + #: modules/mono/editor/mono_bottom_panel.cpp msgid "Builds" msgstr "Compilações" +#: modules/mono/editor/mono_bottom_panel.cpp +#, fuzzy +msgid "Build Project" +msgstr "Projeto" + +#: modules/mono/editor/mono_bottom_panel.cpp +#, fuzzy +msgid "Warnings" +msgstr "Aviso" + #: modules/visual_script/visual_script.cpp msgid "" "A node yielded without working memory, please read the docs on how to yield " @@ -7561,7 +7695,7 @@ msgstr "Script já tem uma função '%s'" #: modules/visual_script/visual_script_editor.cpp msgid "Change Input Value" -msgstr "Alterar Valor de Entrada" +msgstr "Alterar Valor da Entrada" #: modules/visual_script/visual_script_editor.cpp msgid "Can't copy the function node." @@ -7710,23 +7844,33 @@ msgid "Run exported HTML in the system's default browser." msgstr "Rodar HTML exportado no navegador padrão do sistema." #: platform/javascript/export/export.cpp -msgid "Could not write file:\n" +#, fuzzy +msgid "Could not write file:" msgstr "Não foi possÃvel escrever o arquivo:\n" #: platform/javascript/export/export.cpp -msgid "Could not open template for export:\n" +#, fuzzy +msgid "Could not open template for export:" msgstr "Não foi possÃvel abrir o modelo para exportar:\n" #: platform/javascript/export/export.cpp -msgid "Invalid export template:\n" +#, fuzzy +msgid "Invalid export template:" msgstr "Template de Exportação Inválido:\n" #: platform/javascript/export/export.cpp -msgid "Could not read custom HTML shell:\n" +#, fuzzy +msgid "Could not read custom HTML shell:" msgstr "Não foi possÃvel ler o shell HTML personalizado:\n" #: platform/javascript/export/export.cpp -msgid "Could not read boot splash image file:\n" +#, fuzzy +msgid "Could not read boot splash image file:" +msgstr "Não foi possÃvel ler o arquivo de imagem boot splash:\n" + +#: platform/javascript/export/export.cpp +#, fuzzy +msgid "Using default boot splash image." msgstr "Não foi possÃvel ler o arquivo de imagem boot splash:\n" #: scene/2d/animated_sprite.cpp @@ -7890,23 +8034,20 @@ msgid "ARVROrigin requires an ARVRCamera child node" msgstr "ARVROrigin necessita um nó ARVRCamera como filho" #: scene/3d/baked_lightmap.cpp -#, fuzzy msgid "Plotting Meshes: " -msgstr "Planejando Malhas" +msgstr "Planejando Malhas: " #: scene/3d/baked_lightmap.cpp -#, fuzzy msgid "Plotting Lights:" -msgstr "Planejando Malhas" +msgstr "Planejando Luzes:" #: scene/3d/baked_lightmap.cpp scene/3d/gi_probe.cpp msgid "Finishing Plot" msgstr "Terminando de Plotar" #: scene/3d/baked_lightmap.cpp -#, fuzzy msgid "Lighting Meshes: " -msgstr "Planejando Malhas" +msgstr "Iluminando Malhas: " #: scene/3d/collision_polygon.cpp msgid "" @@ -7962,7 +8103,7 @@ msgstr "" msgid "" "Nothing is visible because meshes have not been assigned to draw passes." msgstr "" -"Nada está visÃvel porque as malhas não foram atribuÃdas a passes de desenho." +"Nada está visÃvel porque as meshes não foram atribuÃdas a passes de desenho." #: scene/3d/physics_body.cpp msgid "" @@ -8046,12 +8187,13 @@ msgid "(Other)" msgstr "(Outro)" #: scene/main/scene_tree.cpp +#, fuzzy msgid "" -"Default Environment as specified in Project Setings (Rendering -> Viewport -" -"> Default Environment) could not be loaded." +"Default Environment as specified in Project Setings (Rendering -> " +"Environment -> Default Environment) could not be loaded." msgstr "" -"O Ambiente Padrão como especificado nas Configurações de Projeto " -"(Renderização - Viewport -> Ambiente Padrão) não pôde ser carregado." +"O Ambiente Padrão como especificado nas Configurações de Projeto (Rendering -" +"> Environment -> Default Environment) não pôde ser carregado." #: scene/main/viewport.cpp msgid "" @@ -8081,6 +8223,9 @@ msgstr "Erro ao carregar fonte." msgid "Invalid font size." msgstr "Tamanho de fonte inválido." +#~ msgid "preview" +#~ msgstr "previsualizar" + #~ msgid "Move Add Key" #~ msgstr "Mover Adicionar Chave" @@ -8174,9 +8319,6 @@ msgstr "Tamanho de fonte inválido." #~ msgid "' parsing of config failed." #~ msgstr "' falha no processamento de configurações." -#~ msgid "Theme" -#~ msgstr "Tema" - #~ msgid "Method List For '%s':" #~ msgstr "Lista de Métodos para \"%s\":" @@ -8447,9 +8589,6 @@ msgstr "Tamanho de fonte inválido." #~ msgid "Import Anyway" #~ msgstr "Importar Mesmo Assim" -#~ msgid "Import & Open" -#~ msgstr "Importar e Abrir" - #~ msgid "Edited scene has not been saved, open imported scene anyway?" #~ msgstr "A cena editada não foi salva, abrir cena importada ainda assim?" @@ -8703,9 +8842,6 @@ msgstr "Tamanho de fonte inválido." #~ msgid "Stereo" #~ msgstr "Estéreo" -#~ msgid "Mono" -#~ msgstr "Mono" - #~ msgid "Pitch" #~ msgstr "Pitch" diff --git a/editor/translations/pt_PT.po b/editor/translations/pt_PT.po index 3fdb664e07..3483815fd6 100644 --- a/editor/translations/pt_PT.po +++ b/editor/translations/pt_PT.po @@ -206,8 +206,7 @@ msgstr "Criar %d NOVAS pistas e inserir chaves?" #: 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 +#: editor/plugins/particles_editor_plugin.cpp editor/script_create_dialog.cpp msgid "Create" msgstr "Criar" @@ -562,6 +561,16 @@ msgstr "Sinais" #: editor/create_dialog.cpp #, fuzzy +msgid "Change %s Type" +msgstr "Mudar tipo" + +#: editor/create_dialog.cpp editor/project_settings_editor.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Change" +msgstr "Mudar" + +#: editor/create_dialog.cpp +#, fuzzy msgid "Create New %s" msgstr "Criar Novo" @@ -674,7 +683,8 @@ msgstr "" "Remover mesmo assim? (sem anular)" #: editor/dependency_editor.cpp -msgid "Cannot remove:\n" +#, fuzzy +msgid "Cannot remove:" msgstr "Não é possÃvel remover:\n" #: editor/dependency_editor.cpp @@ -757,8 +767,9 @@ msgstr "Fundadores do Projeto" msgid "Lead Developer" msgstr "Desenvolvedor-chefe" -#: editor/editor_about.cpp editor/project_manager.cpp -msgid "Project Manager" +#: editor/editor_about.cpp +#, fuzzy +msgid "Project Manager " msgstr "Gestor de Projeto" #: editor/editor_about.cpp @@ -847,7 +858,7 @@ msgid "Success!" msgstr "Sucesso!" #: editor/editor_asset_installer.cpp -#: editor/plugins/asset_library_editor_plugin.cpp editor/project_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp msgid "Install" msgstr "Instalar" @@ -1162,7 +1173,8 @@ msgid "Packing" msgstr "Empacotamento" #: editor/editor_export.cpp platform/javascript/export/export.cpp -msgid "Template file not found:\n" +#, fuzzy +msgid "Template file not found:" msgstr "Ficheiro Modelo não encontrado:\n" #: editor/editor_file_dialog.cpp scene/gui/file_dialog.cpp @@ -1420,6 +1432,11 @@ msgstr "SaÃda:" msgid "Clear" msgstr "Limpar" +#: editor/editor_log.cpp +#, fuzzy +msgid "Clear Output" +msgstr "SaÃda" + #: editor/editor_node.cpp editor/plugins/animation_player_editor_plugin.cpp msgid "Error saving resource!" msgstr "Erro ao guardar recurso!" @@ -1482,8 +1499,10 @@ msgid "This operation can't be done without a tree root." msgstr "Esta operação não pode ser feita sem uma raiz da árvore." #: editor/editor_node.cpp +#, fuzzy msgid "" -"Couldn't save scene. Likely dependencies (instances) couldn't be satisfied." +"Couldn't save scene. Likely dependencies (instances or inheritance) couldn't " +"be satisfied." msgstr "" "Não foi possÃvel guardar Cena. Provavelmente, as dependências (instâncias) " "não puderam ser satisfeitas." @@ -2480,7 +2499,8 @@ msgid "No version.txt found inside templates." msgstr "Não foi encontrado version.txt dentro dos Modelos." #: editor/export_template_manager.cpp -msgid "Error creating path for templates:\n" +#, fuzzy +msgid "Error creating path for templates:" msgstr "Erro ao criar o Caminho para os Modelos:\n" #: editor/export_template_manager.cpp @@ -2640,9 +2660,8 @@ msgid "View items as a list" msgstr "Visualizar itens como uma lista" #: editor/filesystem_dock.cpp -msgid "" -"\n" -"Status: Import of file failed. Please fix file and reimport manually." +#, fuzzy +msgid "Status: Import of file failed. Please fix file and reimport manually." msgstr "" "\n" "Estado: A importação do Ficheiro falhou. Corrija o Ficheiro e importe " @@ -2653,20 +2672,23 @@ msgid "Cannot move/rename resources root." msgstr "Não foi possÃvel mover/renomear raÃz dos recursos." #: editor/filesystem_dock.cpp -msgid "Cannot move a folder into itself.\n" +#, fuzzy +msgid "Cannot move a folder into itself." msgstr "Não pode mover uma pasta para si mesma.\n" #: editor/filesystem_dock.cpp -msgid "Error moving:\n" +#, fuzzy +msgid "Error moving:" msgstr "Erro ao mover:\n" #: editor/filesystem_dock.cpp #, fuzzy -msgid "Error duplicating:\n" +msgid "Error duplicating:" msgstr "Erro ao carregar:" #: editor/filesystem_dock.cpp -msgid "Unable to update dependencies:\n" +#, fuzzy +msgid "Unable to update dependencies:" msgstr "Não foi possÃvel atualizar as dependências:\n" #: editor/filesystem_dock.cpp @@ -3316,6 +3338,11 @@ msgstr "Editar filtros de Nó" msgid "Filters.." msgstr "Filtros..." +#: editor/plugins/animation_tree_editor_plugin.cpp +#, fuzzy +msgid "AnimationTree" +msgstr "Animação" + #: editor/plugins/asset_library_editor_plugin.cpp msgid "Free" msgstr "Livre" @@ -3482,6 +3509,7 @@ msgid "Bake Lightmaps" msgstr "Mudar raio da luz" #: editor/plugins/camera_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Preview" msgstr "Previsualização" @@ -4174,7 +4202,8 @@ msgid "Bake!" msgstr "Cozinhar!" #: editor/plugins/navigation_mesh_editor_plugin.cpp -msgid "Bake the navigation mesh.\n" +#, fuzzy +msgid "Bake the navigation mesh." msgstr "Cozinhar a Mesh de navegação.\n" #: editor/plugins/navigation_mesh_editor_plugin.cpp @@ -4563,14 +4592,18 @@ msgstr "Carregar recurso" msgid "Paste" msgstr "Colar" +#: editor/plugins/resource_preloader_editor_plugin.cpp +#, fuzzy +msgid "ResourcePreloader" +msgstr "Caminho de recurso" + #: editor/plugins/script_editor_plugin.cpp msgid "Clear Recent Files" msgstr "Limpar Ficheiros recentes" #: editor/plugins/script_editor_plugin.cpp -msgid "" -"Close and save changes?\n" -"\"" +#, fuzzy +msgid "Close and save changes?" msgstr "" "Fechar e guardar alterações?\n" "\"" @@ -4649,6 +4682,11 @@ msgid "Copy Script Path" msgstr "Copiar Caminho" #: editor/plugins/script_editor_plugin.cpp +#, fuzzy +msgid "Show In File System" +msgstr "Mostrar no Sistema de Ficheiros" + +#: editor/plugins/script_editor_plugin.cpp msgid "History Prev" msgstr "Histórico anterior" @@ -5085,84 +5123,84 @@ msgid "Rotating %s degrees." msgstr "A rodar %s graus." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Bottom View." -msgstr "Vista de fundo." +msgid "Keying is disabled (no key inserted)." +msgstr "Edição desativada (nenhum Ponto inserido)." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Bottom" -msgstr "Fundo" +msgid "Animation Key Inserted." +msgstr "Ponto de Animação inserido." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Top View." -msgstr "Vista de topo." +msgid "Objects Drawn" +msgstr "Objetos desenhados" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Rear View." -msgstr "Vista de trás." +msgid "Material Changes" +msgstr "Mudanças de Material" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Rear" -msgstr "Trás" +msgid "Shader Changes" +msgstr "Alterações do Shader" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Front View." -msgstr "Vista de frente." +msgid "Surface Changes" +msgstr "Mudanças de superfÃcie" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Front" -msgstr "Frente" +msgid "Draw Calls" +msgstr "Chamadas de desenho" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Left View." -msgstr "Vista de esquerda." +msgid "Vertices" +msgstr "Vértices" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Left" -msgstr "Esquerda" +msgid "FPS" +msgstr "FPS" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Right View." -msgstr "Vista de direita." +msgid "Top View." +msgstr "Vista de topo." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Right" -msgstr "Direita" +msgid "Bottom View." +msgstr "Vista de fundo." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Keying is disabled (no key inserted)." -msgstr "Edição desativada (nenhum Ponto inserido)." +msgid "Bottom" +msgstr "Fundo" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Animation Key Inserted." -msgstr "Ponto de Animação inserido." +msgid "Left View." +msgstr "Vista de esquerda." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Objects Drawn" -msgstr "Objetos desenhados" +msgid "Left" +msgstr "Esquerda" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Material Changes" -msgstr "Mudanças de Material" +msgid "Right View." +msgstr "Vista de direita." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Shader Changes" -msgstr "Alterações do Shader" +msgid "Right" +msgstr "Direita" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Surface Changes" -msgstr "Mudanças de superfÃcie" +msgid "Front View." +msgstr "Vista de frente." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Draw Calls" -msgstr "Chamadas de desenho" +msgid "Front" +msgstr "Frente" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Vertices" -msgstr "Vértices" +msgid "Rear View." +msgstr "Vista de trás." #: editor/plugins/spatial_editor_plugin.cpp -msgid "FPS" -msgstr "FPS" +msgid "Rear" +msgstr "Trás" #: editor/plugins/spatial_editor_plugin.cpp msgid "Align with view" @@ -5249,15 +5287,12 @@ msgid "Freelook Speed Modifier" msgstr "Modificador de velocidade Freelook" #: editor/plugins/spatial_editor_plugin.cpp -msgid "preview" -msgstr "Pré-visualização" - -#: editor/plugins/spatial_editor_plugin.cpp msgid "XForm Dialog" msgstr "Diálogo XForm" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Select Mode (Q)\n" +#, fuzzy +msgid "Select Mode (Q)" msgstr "Modo seleção (Q)\n" #: editor/plugins/spatial_editor_plugin.cpp @@ -5537,10 +5572,20 @@ msgstr "Mover (antes)" msgid "Move (After)" msgstr "Mover (depois)" +#: editor/plugins/sprite_frames_editor_plugin.cpp +#, fuzzy +msgid "SpriteFrames" +msgstr "Empilhar Frames" + #: editor/plugins/style_box_editor_plugin.cpp msgid "StyleBox Preview:" msgstr "Pré-visualização StyleBox:" +#: editor/plugins/style_box_editor_plugin.cpp +#, fuzzy +msgid "StyleBox" +msgstr "Estilo" + #: editor/plugins/texture_region_editor_plugin.cpp msgid "Set Region Rect" msgstr "Definir região Rect" @@ -5566,14 +5611,17 @@ msgid "Auto Slice" msgstr "Corte automático" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Offset:" msgstr "Compensação:" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Step:" msgstr "Passo:" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Separation:" msgstr "Separação:" @@ -5711,6 +5759,11 @@ msgstr "Letra" msgid "Color" msgstr "Cor" +#: editor/plugins/theme_editor_plugin.cpp +#, fuzzy +msgid "Theme" +msgstr "Guardar tema" + #: editor/plugins/tile_map_editor_plugin.cpp msgid "Erase Selection" msgstr "Apagar seleção" @@ -5812,6 +5865,32 @@ msgstr "Fundir a partir da Cena" msgid "Error" msgstr "Erro" +#: editor/plugins/tile_set_editor_plugin.cpp +#, fuzzy +msgid "Autotiles" +msgstr "Corte automático" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "" +"Select sub-tile to use as icon, this will be also used on invalid autotile " +"bindings." +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "" +"LMB: set bit on.\n" +"RMB: set bit off." +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +#, fuzzy +msgid "Select current edited sub-tile." +msgstr "Guarde o recurso editado." + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "Select sub-tile to change it's priority." +msgstr "" + #: editor/progress_dialog.cpp scene/gui/dialogs.cpp msgid "Cancel" msgstr "Cancelar" @@ -5937,10 +6016,23 @@ msgid "Please choose a folder that does not contain a 'project.godot' file." msgstr "Escolha uma pasta que não contenha um Ficheiro 'project.godot'." #: editor/project_manager.cpp +msgid "That's a BINGO!" +msgstr "É um BINGO!" + +#: editor/project_manager.cpp msgid "Imported Project" msgstr "Projeto importado" #: editor/project_manager.cpp +#, fuzzy +msgid "Couldn't create folder." +msgstr "Não foi possÃvel criar pasta." + +#: editor/project_manager.cpp +msgid "There is already a folder in this path with the specified name." +msgstr "" + +#: editor/project_manager.cpp msgid "It would be a good idea to name your project." msgstr "Seria uma boa ideia dar um nome ao Projeto." @@ -5981,14 +6073,29 @@ msgid "Import Existing Project" msgstr "Importar Projeto existente" #: editor/project_manager.cpp +#, fuzzy +msgid "Import & Edit" +msgstr "Importar" + +#: editor/project_manager.cpp msgid "Create New Project" msgstr "Criar novo Projeto" #: editor/project_manager.cpp +#, fuzzy +msgid "Create & Edit" +msgstr "Criar emissor" + +#: editor/project_manager.cpp msgid "Install Project:" msgstr "Instalar Projeto:" #: editor/project_manager.cpp +#, fuzzy +msgid "Install & Edit" +msgstr "Instalar" + +#: editor/project_manager.cpp msgid "Project Name:" msgstr "Nome do Projeto:" @@ -6005,10 +6112,6 @@ msgid "Browse" msgstr "Navegar" #: editor/project_manager.cpp -msgid "That's a BINGO!" -msgstr "É um BINGO!" - -#: editor/project_manager.cpp msgid "Unnamed Project" msgstr "Projeto sem nome" @@ -6063,6 +6166,10 @@ msgstr "" "Está prestes a analisar %s pastas para Projetos Godot existentes. Confirma?" #: editor/project_manager.cpp +msgid "Project Manager" +msgstr "Gestor de Projeto" + +#: editor/project_manager.cpp msgid "Project List" msgstr "Lista de Projetos" @@ -6191,11 +6298,6 @@ msgid "Button 9" msgstr "Botão 9" #: editor/project_settings_editor.cpp -#: modules/visual_script/visual_script_editor.cpp -msgid "Change" -msgstr "Mudar" - -#: editor/project_settings_editor.cpp msgid "Joypad Axis Index:" msgstr "Ãndice do Eixo do joystick:" @@ -6667,7 +6769,8 @@ msgid "Error duplicating scene to save it." msgstr "Erro ao duplicar Cena para guardar." #: editor/scene_tree_dock.cpp -msgid "Sub-Resources:" +#, fuzzy +msgid "Sub-Resources" msgstr "Sub-recursos:" #: editor/scene_tree_dock.cpp @@ -6970,7 +7073,7 @@ msgstr "Função:" msgid "Pick one or more items from the list to display the graph." msgstr "Escolha um ou mais itens da lista para exibir o gráfico." -#: editor/script_editor_debugger.cpp +#: editor/script_editor_debugger.cpp modules/mono/editor/mono_bottom_panel.cpp msgid "Errors" msgstr "Erros" @@ -6979,6 +7082,11 @@ msgid "Child Process Connected" msgstr "Processo filho conectado" #: editor/script_editor_debugger.cpp +#, fuzzy +msgid "Copy Error" +msgstr "Carregar Erros" + +#: editor/script_editor_debugger.cpp msgid "Inspect Previous Instance" msgstr "Inspecionar instância anterior" @@ -7330,10 +7438,58 @@ msgstr "Configurações do GridMap" msgid "Pick Distance:" msgstr "Distância de escolha:" +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Generating solution..." +msgstr "A criar contornos..." + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Generating C# project..." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Failed to create solution." +msgstr "Contorno não pode ser criado!" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Failed to save solution." +msgstr "Falha ao carregar recurso." + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Done" +msgstr "Feito!" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Failed to create C# project." +msgstr "Falha ao carregar recurso." + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Mono" +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Create C# solution" +msgstr "Criar contorno" + #: modules/mono/editor/mono_bottom_panel.cpp msgid "Builds" msgstr "Builds" +#: modules/mono/editor/mono_bottom_panel.cpp +#, fuzzy +msgid "Build Project" +msgstr "Projeto" + +#: modules/mono/editor/mono_bottom_panel.cpp +#, fuzzy +msgid "Warnings" +msgstr "Aviso" + #: modules/visual_script/visual_script.cpp msgid "" "A node yielded without working memory, please read the docs on how to yield " @@ -7692,23 +7848,33 @@ msgid "Run exported HTML in the system's default browser." msgstr "Executar HTML exportado no Navegador padrão do sistema." #: platform/javascript/export/export.cpp -msgid "Could not write file:\n" +#, fuzzy +msgid "Could not write file:" msgstr "ImpossÃvel escrever Ficheiro:\n" #: platform/javascript/export/export.cpp -msgid "Could not open template for export:\n" +#, fuzzy +msgid "Could not open template for export:" msgstr "ImpossÃvel abrir Modelo para exportar:\n" #: platform/javascript/export/export.cpp -msgid "Invalid export template:\n" +#, fuzzy +msgid "Invalid export template:" msgstr "Modelo de exportação inválido:\n" #: platform/javascript/export/export.cpp -msgid "Could not read custom HTML shell:\n" +#, fuzzy +msgid "Could not read custom HTML shell:" msgstr "ImpossÃvel ler Shell HTML personalizado:\n" #: platform/javascript/export/export.cpp -msgid "Could not read boot splash image file:\n" +#, fuzzy +msgid "Could not read boot splash image file:" +msgstr "ImpossÃvel ler Ficheiro do ecrã de inicialização:\n" + +#: platform/javascript/export/export.cpp +#, fuzzy +msgid "Using default boot splash image." msgstr "ImpossÃvel ler Ficheiro do ecrã de inicialização:\n" #: scene/2d/animated_sprite.cpp @@ -8030,9 +8196,10 @@ msgid "(Other)" msgstr "(Outro)" #: scene/main/scene_tree.cpp +#, fuzzy msgid "" -"Default Environment as specified in Project Setings (Rendering -> Viewport -" -"> Default Environment) could not be loaded." +"Default Environment as specified in Project Setings (Rendering -> " +"Environment -> Default Environment) could not be loaded." msgstr "" "Ambiente padrão especificado em Configuração do Projeto (Rendering -> " "Viewport -> Default Environment) não pode ser carregado." @@ -8065,6 +8232,9 @@ msgstr "Erro ao carregar letra." msgid "Invalid font size." msgstr "Tamanho de letra inválido." +#~ msgid "preview" +#~ msgstr "Pré-visualização" + #~ msgid "Move Add Key" #~ msgstr "Mover Adicionar Chave" diff --git a/editor/translations/ru.po b/editor/translations/ru.po index 0dd2003fd3..54a350fab5 100644 --- a/editor/translations/ru.po +++ b/editor/translations/ru.po @@ -17,7 +17,7 @@ msgid "" msgstr "" "Project-Id-Version: Godot Engine editor\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2017-11-29 10:40+0000\n" +"PO-Revision-Date: 2017-12-22 14:18+0000\n" "Last-Translator: ijet <my-ijet@mail.ru>\n" "Language-Team: Russian <https://hosted.weblate.org/projects/godot-engine/" "godot/ru/>\n" @@ -27,7 +27,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.18-dev\n" +"X-Generator: Weblate 2.19-dev\n" #: editor/animation_editor.cpp msgid "Disabled" @@ -38,9 +38,8 @@ msgid "All Selection" msgstr "Ð’Ñе выбранные Ñлементы" #: editor/animation_editor.cpp -#, fuzzy msgid "Anim Change Keyframe Time" -msgstr "Изменить значение" +msgstr "Изменить Ð²Ñ€ÐµÐ¼Ñ ÐºÐ»ÑŽÑ‡ÐµÐ²Ð¾Ð³Ð¾ кадра" #: editor/animation_editor.cpp msgid "Anim Change Transition" @@ -51,9 +50,8 @@ msgid "Anim Change Transform" msgstr "Изменить положение" #: editor/animation_editor.cpp -#, fuzzy msgid "Anim Change Keyframe Value" -msgstr "Изменить значение" +msgstr "Измененить значение ключевого кадра" #: editor/animation_editor.cpp msgid "Anim Change Call" @@ -209,8 +207,7 @@ msgstr "Создать %d новые дорожки и вÑтавить ключ #: 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 +#: editor/plugins/particles_editor_plugin.cpp editor/script_create_dialog.cpp msgid "Create" msgstr "Создать" @@ -460,7 +457,7 @@ msgstr "СброÑить приближение" #: editor/code_editor.cpp editor/script_editor_debugger.cpp msgid "Line:" -msgstr "Стр:" +msgstr "Строка:" #: editor/code_editor.cpp msgid "Col:" @@ -546,9 +543,8 @@ msgid "Connecting Signal:" msgstr "Подключение Ñигнала:" #: editor/connections_dialog.cpp -#, fuzzy msgid "Disconnect '%s' from '%s'" -msgstr "ПриÑоединить '%s' к '%s'" +msgstr "Отключить '%s' от '%s'" #: editor/connections_dialog.cpp msgid "Connect.." @@ -565,8 +561,17 @@ msgstr "Сигналы" #: editor/create_dialog.cpp #, fuzzy +msgid "Change %s Type" +msgstr "Изменить тип" + +#: editor/create_dialog.cpp editor/project_settings_editor.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Change" +msgstr "Изменить" + +#: editor/create_dialog.cpp msgid "Create New %s" -msgstr "Создать новый" +msgstr "Создать %s" #: editor/create_dialog.cpp editor/editor_file_dialog.cpp #: editor/filesystem_dock.cpp @@ -676,7 +681,8 @@ msgstr "" "Ð’ÑÑ‘ равно удалить его? (ÐÐµÐ»ÑŒÐ·Ñ Ð¾Ñ‚Ð¼ÐµÐ½Ð¸Ñ‚ÑŒ!)" #: editor/dependency_editor.cpp -msgid "Cannot remove:\n" +#, fuzzy +msgid "Cannot remove:" msgstr "Ðе удаётÑÑ ÑƒÐ´Ð°Ð»Ð¸Ñ‚ÑŒ:\n" #: editor/dependency_editor.cpp @@ -759,8 +765,9 @@ msgstr "ОÑнователи Проекта" msgid "Lead Developer" msgstr "Ведущий Разработчик" -#: editor/editor_about.cpp editor/project_manager.cpp -msgid "Project Manager" +#: editor/editor_about.cpp +#, fuzzy +msgid "Project Manager " msgstr "Менеджер проектов" #: editor/editor_about.cpp @@ -849,7 +856,7 @@ msgid "Success!" msgstr "УÑпех!" #: editor/editor_asset_installer.cpp -#: editor/plugins/asset_library_editor_plugin.cpp editor/project_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp msgid "Install" msgstr "УÑтановить" @@ -870,9 +877,8 @@ msgid "Rename Audio Bus" msgstr "Переименовать аудио шину" #: editor/editor_audio_buses.cpp -#, fuzzy msgid "Change Audio Bus Volume" -msgstr "Переключить аудио шину - Ñоло" +msgstr "Изменить громкоÑÑ‚ÑŒ звуковой шины" #: editor/editor_audio_buses.cpp msgid "Toggle Audio Bus Solo" @@ -937,7 +943,7 @@ msgstr "Удалить Ñффект" #: editor/editor_audio_buses.cpp msgid "Audio" -msgstr "" +msgstr "Ðудио" #: editor/editor_audio_buses.cpp msgid "Add Audio Bus" @@ -1118,13 +1124,12 @@ msgid "Updating scene.." msgstr "Обновление Ñцены.." #: editor/editor_data.cpp -#, fuzzy msgid "[empty]" -msgstr "(пуÑто)" +msgstr "[пуÑто]" #: editor/editor_data.cpp msgid "[unsaved]" -msgstr "" +msgstr "[не Ñохранено]" #: editor/editor_dir_dialog.cpp msgid "Please select a base directory first" @@ -1164,7 +1169,8 @@ msgid "Packing" msgstr "Упаковывание" #: editor/editor_export.cpp platform/javascript/export/export.cpp -msgid "Template file not found:\n" +#, fuzzy +msgid "Template file not found:" msgstr "Файл шаблона не найден:\n" #: editor/editor_file_dialog.cpp scene/gui/file_dialog.cpp @@ -1422,6 +1428,11 @@ msgstr "Вывод:" msgid "Clear" msgstr "ОчиÑтить" +#: editor/editor_log.cpp +#, fuzzy +msgid "Clear Output" +msgstr "Вывод" + #: editor/editor_node.cpp editor/plugins/animation_player_editor_plugin.cpp msgid "Error saving resource!" msgstr "Ошибка при Ñохранении реÑурÑа!" @@ -1484,8 +1495,10 @@ msgid "This operation can't be done without a tree root." msgstr "Ðта Ð¾Ð¿ÐµÑ€Ð°Ñ†Ð¸Ñ Ð½Ðµ может быть выполнена без ÐºÐ¾Ñ€Ð½Ñ Ð´ÐµÑ€ÐµÐ²Ð°." #: editor/editor_node.cpp +#, fuzzy msgid "" -"Couldn't save scene. Likely dependencies (instances) couldn't be satisfied." +"Couldn't save scene. Likely dependencies (instances or inheritance) couldn't " +"be satisfied." msgstr "" "Ðе возможно Ñохранить Ñцену. ВероÑтно, завиÑимоÑти (ÑкземплÑры) не могли " "быть удовлетворены." @@ -2366,14 +2379,12 @@ msgid "Frame #:" msgstr "Кадр #:" #: editor/editor_profiler.cpp -#, fuzzy msgid "Time" -msgstr "ВремÑ:" +msgstr "ВремÑ" #: editor/editor_profiler.cpp -#, fuzzy msgid "Calls" -msgstr "Вызов" +msgstr "Вызовы" #: editor/editor_run_native.cpp msgid "Select device from the list" @@ -2480,7 +2491,8 @@ msgid "No version.txt found inside templates." msgstr "Ðе найден version.txt файл в шаблонах." #: editor/export_template_manager.cpp -msgid "Error creating path for templates:\n" +#, fuzzy +msgid "Error creating path for templates:" msgstr "Ошибка ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ ÑˆÐ°Ð±Ð»Ð¾Ð½Ð¾Ð²:\n" #: editor/export_template_manager.cpp @@ -2516,9 +2528,8 @@ msgstr "Ðет ответа." #: editor/export_template_manager.cpp #: editor/plugins/asset_library_editor_plugin.cpp -#, fuzzy msgid "Request Failed." -msgstr "Ð—Ð°Ð¿Ñ€Ð¾Ñ Ð½Ðµ прошёл." +msgstr "Ðе удалоÑÑŒ выполнить запроÑ." #: editor/export_template_manager.cpp #: editor/plugins/asset_library_editor_plugin.cpp @@ -2564,7 +2575,6 @@ msgid "Connecting.." msgstr "Подключение.." #: editor/export_template_manager.cpp -#, fuzzy msgid "Can't Connect" msgstr "Ðе удаётÑÑ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒÑÑ" @@ -2641,9 +2651,8 @@ msgid "View items as a list" msgstr "ПроÑмотр Ñлементов в виде ÑпиÑка" #: editor/filesystem_dock.cpp -msgid "" -"\n" -"Status: Import of file failed. Please fix file and reimport manually." +#, fuzzy +msgid "Status: Import of file failed. Please fix file and reimport manually." msgstr "" "\n" "СтатуÑ: Импорт файла не удалÑÑ. ПожалуйÑта, иÑправьте файл и " @@ -2654,20 +2663,23 @@ msgid "Cannot move/rename resources root." msgstr "ÐÐµÐ»ÑŒÐ·Ñ Ð¿ÐµÑ€ÐµÐ¼ÐµÑтить/переименовать корень." #: editor/filesystem_dock.cpp -msgid "Cannot move a folder into itself.\n" +#, fuzzy +msgid "Cannot move a folder into itself." msgstr "Ðевозможно перемеÑтить папку в ÑебÑ.\n" #: editor/filesystem_dock.cpp -msgid "Error moving:\n" +#, fuzzy +msgid "Error moving:" msgstr "Ошибка перемещениÑ:\n" #: editor/filesystem_dock.cpp #, fuzzy -msgid "Error duplicating:\n" -msgstr "Ошибка при загрузке:" +msgid "Error duplicating:" +msgstr "Ошибка дублированиÑ:\n" #: editor/filesystem_dock.cpp -msgid "Unable to update dependencies:\n" +#, fuzzy +msgid "Unable to update dependencies:" msgstr "Ðе удаётÑÑ Ð¾Ð±Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ завиÑимоÑти:\n" #: editor/filesystem_dock.cpp @@ -2699,14 +2711,12 @@ msgid "Renaming folder:" msgstr "Переименование папки:" #: editor/filesystem_dock.cpp -#, fuzzy msgid "Duplicating file:" -msgstr "Дублировать" +msgstr "Дублирование файла:" #: editor/filesystem_dock.cpp -#, fuzzy msgid "Duplicating folder:" -msgstr "Переименование папки:" +msgstr "Дублирование папки:" #: editor/filesystem_dock.cpp msgid "Expand all" @@ -2725,9 +2735,8 @@ msgid "Move To.." msgstr "ПеремеÑтить в.." #: editor/filesystem_dock.cpp -#, fuzzy msgid "Open Scene(s)" -msgstr "Открыть Ñцену" +msgstr "Открыть Ñцену(ны)" #: editor/filesystem_dock.cpp msgid "Instance" @@ -2742,9 +2751,8 @@ msgid "View Owners.." msgstr "ПроÑмотреть владельцев.." #: editor/filesystem_dock.cpp -#, fuzzy msgid "Duplicate.." -msgstr "Дублировать" +msgstr "Дублировать.." #: editor/filesystem_dock.cpp msgid "Previous Directory" @@ -2841,14 +2849,12 @@ msgid "Importing Scene.." msgstr "Импортирование Ñцены.." #: editor/import/resource_importer_scene.cpp -#, fuzzy msgid "Generating Lightmaps" -msgstr "Передача в карты оÑвещениÑ:" +msgstr "Создание карт оÑвещениÑ" #: editor/import/resource_importer_scene.cpp -#, fuzzy msgid "Generating for Mesh: " -msgstr "Генерировать AABB" +msgstr "Создание Ð´Ð»Ñ Ð¿Ð¾Ð»Ð¸Ñетки: " #: editor/import/resource_importer_scene.cpp msgid "Running Custom Script.." @@ -3319,6 +3325,11 @@ msgstr "Редактировать фильтры узла" msgid "Filters.." msgstr "Фильтры.." +#: editor/plugins/animation_tree_editor_plugin.cpp +#, fuzzy +msgid "AnimationTree" +msgstr "ÐнимациÑ" + #: editor/plugins/asset_library_editor_plugin.cpp msgid "Free" msgstr "ОÑвободить" @@ -3468,23 +3479,29 @@ msgid "" "Save your scene (for images to be saved in the same dir), or pick a save " "path from the BakedLightmap properties." msgstr "" +"Ðе удаетÑÑ Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»Ð¸Ñ‚ÑŒ путь Ð´Ð»Ñ ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ lightmap.\n" +"Сохраните ваши Ñцены (чтобы Ð¸Ð·Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ Ð±Ñ‹Ð»Ð¸ Ñохранены в том же разделе), " +"или выберите путь ÑÐ¾Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ð² ÑвойÑтвах BakedLightmap." #: editor/plugins/baked_lightmap_editor_plugin.cpp msgid "" "No meshes to bake. Make sure they contain an UV2 channel and that the 'Bake " "Light' flag is on." msgstr "" +"Ðет полиÑеток Ð´Ð»Ñ Ð·Ð°Ð¿ÐµÐºÐ°Ð½Ð¸Ñ. УбедитеÑÑŒ, что они Ñодержат канал UV2 и что " +"флаг 'Запекание Ñвета' включен." #: editor/plugins/baked_lightmap_editor_plugin.cpp msgid "Failed creating lightmap images, make sure path is writable." msgstr "" +"Сбой ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ ÐºÐ°Ñ€Ñ‚Ñ‹ оÑвещенноÑти, убедитеÑÑŒ, что путь доÑтупен Ð´Ð»Ñ Ð·Ð°Ð¿Ð¸Ñи." #: editor/plugins/baked_lightmap_editor_plugin.cpp -#, fuzzy msgid "Bake Lightmaps" -msgstr "Передача в карты оÑвещениÑ:" +msgstr "Запекать карты оÑвещениÑ" #: editor/plugins/camera_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Preview" msgstr "ПредпроÑмотр" @@ -3631,7 +3648,7 @@ msgstr "Параметры прилипаниÑ" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Snap to grid" -msgstr "Прилипание к Ñетке" +msgstr "ПривÑзка к Ñетке" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Use Rotation Snap" @@ -3639,7 +3656,7 @@ msgstr "ИÑпользовать привÑзку вращениÑ" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Configure Snap..." -msgstr "ÐаÑтроить прилипание.." +msgstr "ÐаÑтроить привÑзку..." #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Snap Relative" @@ -3655,7 +3672,7 @@ msgstr "Ð˜Ð½Ñ‚ÐµÐ»Ð»ÐµÐºÑ‚ÑƒÐ°Ð»ÑŒÐ½Ð°Ñ Ð¿Ñ€Ð¸Ð²Ñзка" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Snap to parent" -msgstr "ПривÑзать к родителю" +msgstr "ПривÑзка к родителю" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Snap to node anchor" @@ -3671,7 +3688,7 @@ msgstr "ПривÑзка к другим узлам" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Snap to guides" -msgstr "Прилипание к Ñетке" +msgstr "ПривÑзка к направлÑющим" #: editor/plugins/canvas_item_editor_plugin.cpp #: editor/plugins/spatial_editor_plugin.cpp @@ -3997,19 +4014,19 @@ msgstr "Создать полиÑетку навигации" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Contained Mesh is not of type ArrayMesh." -msgstr "" +msgstr "ПолиÑетка не ArrayMesh типа." #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "UV Unwrap failed, mesh may not be manifold?" -msgstr "" +msgstr "UV развертка не удалаÑÑŒ, возможно у полиÑетки не одноÑвÑÐ·Ð½Ð°Ñ Ñ„Ð¾Ñ€Ð¼Ð°?" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "No mesh to debug." -msgstr "" +msgstr "Ðет полиÑетки Ð´Ð»Ñ Ð¾Ñ‚Ð»Ð°Ð´ÐºÐ¸." #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Model has no UV in this layer" -msgstr "" +msgstr "У модели нет UV в Ñтом Ñлое" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "MeshInstance lacks a Mesh!" @@ -4052,18 +4069,16 @@ msgid "Create Outline Mesh.." msgstr "Создать полиÑетку обводки.." #: editor/plugins/mesh_instance_editor_plugin.cpp -#, fuzzy msgid "View UV1" -msgstr "Обзор" +msgstr "ПроÑмотр UV1" #: editor/plugins/mesh_instance_editor_plugin.cpp -#, fuzzy msgid "View UV2" -msgstr "Обзор" +msgstr "ПроÑмотр UV2" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Unwrap UV2 for Lightmap/AO" -msgstr "" +msgstr "Развернуть UV2 Ð´Ð»Ñ Lightmap/AO" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Create Outline Mesh" @@ -4075,11 +4090,11 @@ msgstr "Размер обводки:" #: editor/plugins/multimesh_editor_plugin.cpp msgid "No mesh source specified (and no MultiMesh set in node)." -msgstr "Ðе указан иÑточник полиÑетки (и мульти полиÑетка не указана в узле)." +msgstr "Ðе указан иÑточник полиÑетки (и MultiMesh не указана в узле)." #: editor/plugins/multimesh_editor_plugin.cpp msgid "No mesh source specified (and MultiMesh contains no Mesh)." -msgstr "Ðе указана иÑÑ…Ð¾Ð´Ð½Ð°Ñ Ð¿Ð¾Ð»Ð¸Ñетка (и в мульти полиÑетке нет полиÑетки)." +msgstr "Ðе указана иÑÑ…Ð¾Ð´Ð½Ð°Ñ Ð¿Ð¾Ð»Ð¸Ñетка (и в MultiMesh нет полиÑетки)." #: editor/plugins/multimesh_editor_plugin.cpp msgid "Mesh source is invalid (invalid path)." @@ -4155,7 +4170,7 @@ msgstr "ОÑÑŒ Z" #: editor/plugins/multimesh_editor_plugin.cpp msgid "Mesh Up Axis:" -msgstr "Сетка до оÑи:" +msgstr "ОÑÑŒ вверх полиÑетки:" #: editor/plugins/multimesh_editor_plugin.cpp msgid "Random Rotation:" @@ -4178,7 +4193,8 @@ msgid "Bake!" msgstr "Запечь!" #: editor/plugins/navigation_mesh_editor_plugin.cpp -msgid "Bake the navigation mesh.\n" +#, fuzzy +msgid "Bake the navigation mesh." msgstr "Создать полиÑетку навигации.\n" #: editor/plugins/navigation_mesh_editor_plugin.cpp @@ -4223,11 +4239,11 @@ msgstr "Создание полиÑетки..." #: editor/plugins/navigation_mesh_generator.cpp 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 msgid "Parsing Geometry..." @@ -4244,7 +4260,7 @@ msgstr "Создать Navigation Polygon" #: editor/plugins/particles_2d_editor_plugin.cpp #: editor/plugins/particles_editor_plugin.cpp msgid "Generating AABB" -msgstr "Генерировать AABB" +msgstr "Создание AABB" #: editor/plugins/particles_2d_editor_plugin.cpp msgid "Can only set point into a ParticlesMaterial process material" @@ -4567,14 +4583,18 @@ msgstr "Загрузить реÑурÑ" msgid "Paste" msgstr "Ð’Ñтавить" +#: editor/plugins/resource_preloader_editor_plugin.cpp +#, fuzzy +msgid "ResourcePreloader" +msgstr "Путь реÑурÑа" + #: editor/plugins/script_editor_plugin.cpp msgid "Clear Recent Files" msgstr "ОчиÑтить Ðедавние Файлы" #: editor/plugins/script_editor_plugin.cpp -msgid "" -"Close and save changes?\n" -"\"" +#, fuzzy +msgid "Close and save changes?" msgstr "" "Закрыть и Ñохранить изменениÑ?\n" "\"" @@ -4648,9 +4668,13 @@ msgid "Soft Reload Script" msgstr "ÐœÑгко перезагрузить Ñкрипты" #: editor/plugins/script_editor_plugin.cpp -#, fuzzy msgid "Copy Script Path" -msgstr "Копировать путь" +msgstr "Копировать путь к Ñкрипту" + +#: editor/plugins/script_editor_plugin.cpp +#, fuzzy +msgid "Show In File System" +msgstr "Показать в файловой ÑиÑтеме" #: editor/plugins/script_editor_plugin.cpp msgid "History Prev" @@ -4843,9 +4867,8 @@ msgid "Clone Down" msgstr "Копировать вниз" #: editor/plugins/script_text_editor.cpp -#, fuzzy msgid "Fold/Unfold Line" -msgstr "Развернуть Ñтроку" +msgstr "Свернуть/Развернуть Ñтроку" #: editor/plugins/script_text_editor.cpp msgid "Fold All Lines" @@ -5082,91 +5105,91 @@ msgstr "МаÑштаб: " #: editor/plugins/spatial_editor_plugin.cpp msgid "Translating: " -msgstr "Переводы: " +msgstr "Перемещение: " #: editor/plugins/spatial_editor_plugin.cpp msgid "Rotating %s degrees." msgstr "Поворот на %s градуÑов." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Bottom View." -msgstr "Вид Снизу." +msgid "Keying is disabled (no key inserted)." +msgstr "МанипулÑÑ†Ð¸Ñ Ð¾Ñ‚ÐºÐ»ÑŽÑ‡ÐµÐ½Ð° (без вÑтавленного ключа)." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Bottom" -msgstr "Ðиз" +msgid "Animation Key Inserted." +msgstr "Ключ анимации вÑтавлен." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Top View." -msgstr "Вид Ñверху." +msgid "Objects Drawn" +msgstr "ÐариÑовано обьектов" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Rear View." -msgstr "Вид Ñзади." +msgid "Material Changes" +msgstr "Ð˜Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¼Ð°Ñ‚ÐµÑ€Ð¸Ð°Ð»Ð°" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Rear" -msgstr "Зад" +msgid "Shader Changes" +msgstr "Ð˜Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ ÑˆÐµÐ¹Ð´ÐµÑ€Ð¾Ð²" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Front View." -msgstr "Вид Ñпереди." +msgid "Surface Changes" +msgstr "Ð˜Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¿Ð¾Ð²ÐµÑ€Ñ…Ð½Ð¾Ñти" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Front" -msgstr "Перед" +msgid "Draw Calls" +msgstr "Вызовы отриÑовки" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Left View." -msgstr "Вид Ñлева." +msgid "Vertices" +msgstr "Вершины" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Left" -msgstr "Лево" +msgid "FPS" +msgstr "FPS" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Right View." -msgstr "Вид Ñправа." +msgid "Top View." +msgstr "Вид Ñверху." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Right" -msgstr "Право" +msgid "Bottom View." +msgstr "Вид Снизу." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Keying is disabled (no key inserted)." -msgstr "МанипулÑÑ†Ð¸Ñ Ð¾Ñ‚ÐºÐ»ÑŽÑ‡ÐµÐ½Ð° (без вÑтавленного ключа)." +msgid "Bottom" +msgstr "Ðиз" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Animation Key Inserted." -msgstr "Ключ анимации вÑтавлен." +msgid "Left View." +msgstr "Вид Ñлева." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Objects Drawn" -msgstr "ÐариÑовано обьектов" +msgid "Left" +msgstr "Лево" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Material Changes" -msgstr "Ð˜Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¼Ð°Ñ‚ÐµÑ€Ð¸Ð°Ð»Ð°" +msgid "Right View." +msgstr "Вид Ñправа." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Shader Changes" -msgstr "Ð˜Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ ÑˆÐµÐ¹Ð´ÐµÑ€Ð¾Ð²" +msgid "Right" +msgstr "Право" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Surface Changes" -msgstr "Ð˜Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¿Ð¾Ð²ÐµÑ€Ñ…Ð½Ð¾Ñти" +msgid "Front View." +msgstr "Вид Ñпереди." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Draw Calls" -msgstr "Вызовы отриÑовки" +msgid "Front" +msgstr "Перед" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Vertices" -msgstr "Вершины" +msgid "Rear View." +msgstr "Вид Ñзади." #: editor/plugins/spatial_editor_plugin.cpp -msgid "FPS" -msgstr "FPS" +msgid "Rear" +msgstr "Зад" #: editor/plugins/spatial_editor_plugin.cpp msgid "Align with view" @@ -5253,15 +5276,12 @@ msgid "Freelook Speed Modifier" msgstr "Обзор модификатор ÑкороÑти" #: editor/plugins/spatial_editor_plugin.cpp -msgid "preview" -msgstr "предпроÑмотр" - -#: editor/plugins/spatial_editor_plugin.cpp msgid "XForm Dialog" msgstr "XForm диалоговое окно" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Select Mode (Q)\n" +#, fuzzy +msgid "Select Mode (Q)" msgstr "Режим Ð²Ñ‹Ð´ÐµÐ»ÐµÐ½Ð¸Ñ (Q)\n" #: editor/plugins/spatial_editor_plugin.cpp @@ -5291,14 +5311,12 @@ msgid "Local Coords" msgstr "Локальные координаты" #: editor/plugins/spatial_editor_plugin.cpp -#, fuzzy msgid "Local Space Mode (%s)" -msgstr "Режим маÑÑˆÑ‚Ð°Ð±Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ (R)" +msgstr "Режим локального проÑтранÑтва (%s)" #: editor/plugins/spatial_editor_plugin.cpp -#, fuzzy msgid "Snap Mode (%s)" -msgstr "Режим привÑзки:" +msgstr "Режим привÑзки (%s)" #: editor/plugins/spatial_editor_plugin.cpp msgid "Bottom View" @@ -5415,7 +5433,7 @@ msgstr "ÐаÑтройки" #: editor/plugins/spatial_editor_plugin.cpp msgid "Skeleton Gizmo visibility" -msgstr "" +msgstr "ВидимоÑÑ‚ÑŒ гизмо Ñкелета" #: editor/plugins/spatial_editor_plugin.cpp msgid "Snap Settings" @@ -5423,7 +5441,7 @@ msgstr "Параметры привÑзки" #: editor/plugins/spatial_editor_plugin.cpp msgid "Translate Snap:" -msgstr "ПривÑзка преобразований:" +msgstr "ПривÑзка перемещениÑ:" #: editor/plugins/spatial_editor_plugin.cpp msgid "Rotate Snap (deg.):" @@ -5455,7 +5473,7 @@ msgstr "Изменение преобразованиÑ" #: editor/plugins/spatial_editor_plugin.cpp msgid "Translate:" -msgstr "Смещение:" +msgstr "Перемещение:" #: editor/plugins/spatial_editor_plugin.cpp msgid "Rotate (deg.):" @@ -5541,10 +5559,20 @@ msgstr "ПеремеÑтить (до)" msgid "Move (After)" msgstr "ПеремеÑтить (поÑле)" +#: editor/plugins/sprite_frames_editor_plugin.cpp +#, fuzzy +msgid "SpriteFrames" +msgstr "Стек" + #: editor/plugins/style_box_editor_plugin.cpp msgid "StyleBox Preview:" msgstr "StyleBox предпроÑмотр:" +#: editor/plugins/style_box_editor_plugin.cpp +#, fuzzy +msgid "StyleBox" +msgstr "Стиль" + #: editor/plugins/texture_region_editor_plugin.cpp msgid "Set Region Rect" msgstr "Задать регион" @@ -5570,14 +5598,17 @@ msgid "Auto Slice" msgstr "ÐвтоматичеÑки" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Offset:" msgstr "ОтÑтуп:" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Step:" msgstr "Шаг:" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Separation:" msgstr "Разделение:" @@ -5715,6 +5746,10 @@ msgstr "Шрифт" msgid "Color" msgstr "Цвет" +#: editor/plugins/theme_editor_plugin.cpp +msgid "Theme" +msgstr "Тема" + #: editor/plugins/tile_map_editor_plugin.cpp msgid "Erase Selection" msgstr "ОчиÑтить выделенное" @@ -5800,9 +5835,8 @@ msgid "Merge from scene?" msgstr "СлиÑние из Ñцены?" #: editor/plugins/tile_set_editor_plugin.cpp -#, fuzzy msgid "Tile Set" -msgstr "Ðабор тайлов.." +msgstr "Ðабор тайлов" #: editor/plugins/tile_set_editor_plugin.cpp msgid "Create from Scene" @@ -5816,6 +5850,32 @@ msgstr "СлиÑние из Ñцены" msgid "Error" msgstr "Ошибка" +#: editor/plugins/tile_set_editor_plugin.cpp +#, fuzzy +msgid "Autotiles" +msgstr "ÐвтоматичеÑки" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "" +"Select sub-tile to use as icon, this will be also used on invalid autotile " +"bindings." +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "" +"LMB: set bit on.\n" +"RMB: set bit off." +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +#, fuzzy +msgid "Select current edited sub-tile." +msgstr "Сохранить текущий редактируемый реÑурÑ." + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "Select sub-tile to change it's priority." +msgstr "" + #: editor/progress_dialog.cpp scene/gui/dialogs.cpp msgid "Cancel" msgstr "Отмена" @@ -5935,10 +5995,23 @@ msgid "Please choose a folder that does not contain a 'project.godot' file." msgstr "ПожалуйÑта, выберите папку, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ Ð½Ðµ Ñодержит файл 'project.godot'." #: editor/project_manager.cpp +msgid "That's a BINGO!" +msgstr "Бинго!" + +#: editor/project_manager.cpp msgid "Imported Project" msgstr "Импортированный проект" #: editor/project_manager.cpp +#, fuzzy +msgid "Couldn't create folder." +msgstr "Ðевозможно Ñоздать папку." + +#: editor/project_manager.cpp +msgid "There is already a folder in this path with the specified name." +msgstr "" + +#: editor/project_manager.cpp msgid "It would be a good idea to name your project." msgstr "Было бы неплохо назвать ваш проект." @@ -5979,14 +6052,29 @@ msgid "Import Existing Project" msgstr "Импортировать ÑущеÑтвующий проект" #: editor/project_manager.cpp +#, fuzzy +msgid "Import & Edit" +msgstr "Импортировать и Открыть" + +#: editor/project_manager.cpp msgid "Create New Project" msgstr "Создать новый проект" #: editor/project_manager.cpp +#, fuzzy +msgid "Create & Edit" +msgstr "Создать излучатель" + +#: editor/project_manager.cpp msgid "Install Project:" msgstr "УÑтановить проект:" #: editor/project_manager.cpp +#, fuzzy +msgid "Install & Edit" +msgstr "УÑтановить" + +#: editor/project_manager.cpp msgid "Project Name:" msgstr "Ðазвание проекта:" @@ -6003,10 +6091,6 @@ msgid "Browse" msgstr "Обзор" #: editor/project_manager.cpp -msgid "That's a BINGO!" -msgstr "Бинго!" - -#: editor/project_manager.cpp msgid "Unnamed Project" msgstr "БезымÑнный проект" @@ -6061,6 +6145,10 @@ msgstr "" "Подтверждаете?" #: editor/project_manager.cpp +msgid "Project Manager" +msgstr "Менеджер проектов" + +#: editor/project_manager.cpp msgid "Project List" msgstr "СпиÑок проектов" @@ -6189,11 +6277,6 @@ msgid "Button 9" msgstr "Кнопка 9" #: 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 "Ð˜Ð½Ð´ÐµÐºÑ Ð¾Ñи джойÑтика:" @@ -6206,7 +6289,6 @@ msgid "Joypad Button Index:" msgstr "Ð˜Ð½Ð´ÐµÐºÑ ÐºÐ½Ð¾Ð¿ÐºÐ¸ джойÑтика:" #: editor/project_settings_editor.cpp -#, fuzzy msgid "Erase Input Action" msgstr "Удалить дейÑтвие" @@ -6456,7 +6538,7 @@ msgstr "Ðовый Ñкрипт" #: editor/property_editor.cpp msgid "New %s" -msgstr "" +msgstr "Ðовый %s" #: editor/property_editor.cpp msgid "Make Unique" @@ -6491,9 +6573,8 @@ msgid "On" msgstr "Вкл" #: editor/property_editor.cpp -#, fuzzy msgid "[Empty]" -msgstr "Добавить пуÑтоту" +msgstr "[ПуÑто]" #: editor/property_editor.cpp modules/visual_script/visual_script_editor.cpp msgid "Set" @@ -6667,7 +6748,8 @@ msgid "Error duplicating scene to save it." msgstr "Ошибка Ð´ÑƒÐ±Ð»Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ñцены, при её Ñохранении." #: editor/scene_tree_dock.cpp -msgid "Sub-Resources:" +#, fuzzy +msgid "Sub-Resources" msgstr "Вложенные РеÑурÑÑ‹:" #: editor/scene_tree_dock.cpp @@ -6971,7 +7053,7 @@ msgid "Pick one or more items from the list to display the graph." msgstr "" "Выбрать один или неÑколько Ñлементов из ÑпиÑка, чтобы отобразить график." -#: editor/script_editor_debugger.cpp +#: editor/script_editor_debugger.cpp modules/mono/editor/mono_bottom_panel.cpp msgid "Errors" msgstr "Ошибки" @@ -6980,6 +7062,11 @@ msgid "Child Process Connected" msgstr "Дочерний процеÑÑ ÑвÑзан" #: editor/script_editor_debugger.cpp +#, fuzzy +msgid "Copy Error" +msgstr "Ошибки загрузки" + +#: editor/script_editor_debugger.cpp msgid "Inspect Previous Instance" msgstr "ОÑмотреть предыдущий ÑкземплÑÑ€" @@ -7073,7 +7160,7 @@ msgstr "ГорÑчие клавиши" #: editor/settings_config_dialog.cpp msgid "Binding" -msgstr "" +msgstr "ПривÑзка" #: editor/spatial_editor_gizmos.cpp msgid "Change Light Radius" @@ -7125,43 +7212,39 @@ msgstr "Изменить Probe Extents" #: modules/gdnative/gdnative_library_editor_plugin.cpp msgid "Select the dynamic library for this entry" -msgstr "" +msgstr "Выберите динамичеÑкую библиотеку Ð´Ð»Ñ Ñтого полÑ" #: modules/gdnative/gdnative_library_editor_plugin.cpp msgid "Select dependencies of the library for this entry" -msgstr "" +msgstr "Выберите завиÑимоÑти библиотеки Ð´Ð»Ñ Ñтого полÑ" #: modules/gdnative/gdnative_library_editor_plugin.cpp -#, fuzzy msgid "Remove current entry" -msgstr "Удалить точку кривой" +msgstr "Удалить текущее поле" #: modules/gdnative/gdnative_library_editor_plugin.cpp msgid "Double click to create a new entry" -msgstr "" +msgstr "Дважды щелкните, чтобы Ñоздать новое поле" #: modules/gdnative/gdnative_library_editor_plugin.cpp msgid "Platform:" -msgstr "" +msgstr "Платформа:" #: modules/gdnative/gdnative_library_editor_plugin.cpp -#, fuzzy msgid "Platform" -msgstr "Скопировать на платформу.." +msgstr "Платформа" #: modules/gdnative/gdnative_library_editor_plugin.cpp -#, fuzzy msgid "Dynamic Library" -msgstr "Библиотека" +msgstr "ДинамичеÑÐºÐ°Ñ Ð±Ð¸Ð±Ð»Ð¸Ð¾Ñ‚ÐµÐºÐ°" #: modules/gdnative/gdnative_library_editor_plugin.cpp msgid "Add an architecture entry" -msgstr "" +msgstr "Добавить поле архитектуры" #: modules/gdnative/gdnative_library_editor_plugin.cpp -#, fuzzy msgid "GDNativeLibrary" -msgstr "GDNative" +msgstr "GDNative библиотека" #: modules/gdnative/gdnative_library_singleton_editor.cpp msgid "Library" @@ -7330,10 +7413,58 @@ msgstr "GridMap Параметры" msgid "Pick Distance:" msgstr "РаÑÑтоÑние выбора:" +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Generating solution..." +msgstr "Создание контуров..." + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Generating C# project..." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Failed to create solution." +msgstr "Ðевозможно Ñоздать контур!" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Failed to save solution." +msgstr "Ðе удалоÑÑŒ загрузить реÑурÑ." + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Done" +msgstr "Сделано!" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Failed to create C# project." +msgstr "Ðе удалоÑÑŒ загрузить реÑурÑ." + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Mono" +msgstr "Моно" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Create C# solution" +msgstr "Создать контур" + #: modules/mono/editor/mono_bottom_panel.cpp msgid "Builds" msgstr "Билды" +#: modules/mono/editor/mono_bottom_panel.cpp +#, fuzzy +msgid "Build Project" +msgstr "Проект" + +#: modules/mono/editor/mono_bottom_panel.cpp +#, fuzzy +msgid "Warnings" +msgstr "Предупреждение" + #: modules/visual_script/visual_script.cpp msgid "" "A node yielded without working memory, please read the docs on how to yield " @@ -7692,23 +7823,33 @@ msgid "Run exported HTML in the system's default browser." msgstr "ЗапуÑтить HTML в Ñтандартном браузере ÑиÑтемы." #: platform/javascript/export/export.cpp -msgid "Could not write file:\n" +#, fuzzy +msgid "Could not write file:" msgstr "Ðе удалоÑÑŒ запиÑать файл:\n" #: platform/javascript/export/export.cpp -msgid "Could not open template for export:\n" +#, fuzzy +msgid "Could not open template for export:" msgstr "Ðе удалоÑÑŒ открыть шаблон Ð´Ð»Ñ ÑкÑпорта:\n" #: platform/javascript/export/export.cpp -msgid "Invalid export template:\n" +#, fuzzy +msgid "Invalid export template:" msgstr "Ðеверный шаблон ÑкÑпорта:\n" #: platform/javascript/export/export.cpp -msgid "Could not read custom HTML shell:\n" +#, fuzzy +msgid "Could not read custom HTML shell:" msgstr "Ðе удаетÑÑ Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ‚ÑŒ пользовательÑкую HTML-оболочку:\n" #: platform/javascript/export/export.cpp -msgid "Could not read boot splash image file:\n" +#, fuzzy +msgid "Could not read boot splash image file:" +msgstr "Ðе удалоÑÑŒ прочитать файл Ð¸Ð·Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ Ð·Ð°Ñтавки:\n" + +#: platform/javascript/export/export.cpp +#, fuzzy +msgid "Using default boot splash image." msgstr "Ðе удалоÑÑŒ прочитать файл Ð¸Ð·Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ Ð·Ð°Ñтавки:\n" #: scene/2d/animated_sprite.cpp @@ -7873,23 +8014,20 @@ msgid "ARVROrigin requires an ARVRCamera child node" msgstr "ARVROrigin требует дочерний узел ARVRCamera" #: scene/3d/baked_lightmap.cpp -#, fuzzy msgid "Plotting Meshes: " -msgstr "ПоÑтроение Ñетки" +msgstr "ПоÑтроение полиÑетки: " #: scene/3d/baked_lightmap.cpp -#, fuzzy msgid "Plotting Lights:" -msgstr "ПоÑтроение Ñетки" +msgstr "ПоÑтроение Света:" #: scene/3d/baked_lightmap.cpp scene/3d/gi_probe.cpp msgid "Finishing Plot" msgstr "Завершение поÑтроениÑ" #: scene/3d/baked_lightmap.cpp -#, fuzzy msgid "Lighting Meshes: " -msgstr "ПоÑтроение Ñетки" +msgstr "ОÑвещение полиÑетки: " #: scene/3d/collision_polygon.cpp msgid "" @@ -7925,7 +8063,7 @@ msgstr "" #: scene/3d/gi_probe.cpp msgid "Plotting Meshes" -msgstr "ПоÑтроение Ñетки" +msgstr "ПоÑтроение полиÑетки" #: scene/3d/navigation_mesh.cpp msgid "A NavigationMesh resource must be set or created for this node to work." @@ -8028,9 +8166,10 @@ 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." +"Default Environment as specified in Project Setings (Rendering -> " +"Environment -> Default Environment) could not be loaded." msgstr "" "Среда по умолчанию, как определено в ÐаÑтройках проекта (Rendering -> " "Viewport -> Default Environment) не может быть загружена." @@ -8064,6 +8203,9 @@ msgstr "Ошибка загрузки шрифта." msgid "Invalid font size." msgstr "ÐедопуÑтимый размер шрифта." +#~ msgid "preview" +#~ msgstr "предпроÑмотр" + #~ msgid "Move Add Key" #~ msgstr "Подвинуть ключ" @@ -8157,9 +8299,6 @@ msgstr "ÐедопуÑтимый размер шрифта." #~ msgid "' parsing of config failed." #~ msgstr "' анализ конфигурации не удалÑÑ." -#~ msgid "Theme" -#~ msgstr "Тема" - #~ msgid "Method List For '%s':" #~ msgstr "СпиÑок методов Ð´Ð»Ñ '%s':" @@ -8429,9 +8568,6 @@ msgstr "ÐедопуÑтимый размер шрифта." #~ msgid "Import Anyway" #~ msgstr "Импортировать в любом Ñлучае" -#~ msgid "Import & Open" -#~ msgstr "Импортировать и Открыть" - #~ msgid "Edited scene has not been saved, open imported scene anyway?" #~ msgstr "" #~ "Ð ÐµÐ´Ð°ÐºÑ‚Ð¸Ñ€ÑƒÐµÐ¼Ð°Ñ Ñцена не была Ñохранена, открыть импортированную Ñцену в " @@ -8687,9 +8823,6 @@ msgstr "ÐедопуÑтимый размер шрифта." #~ msgid "Stereo" #~ msgstr "Стерео" -#~ msgid "Mono" -#~ msgstr "Моно" - #~ msgid "Pitch" #~ msgstr "Ð’Ñ‹Ñота" diff --git a/editor/translations/sk.po b/editor/translations/sk.po index 83201baab1..e0f0fa14b1 100644 --- a/editor/translations/sk.po +++ b/editor/translations/sk.po @@ -197,8 +197,7 @@ msgstr "" #: 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 +#: editor/plugins/particles_editor_plugin.cpp editor/script_create_dialog.cpp msgid "Create" msgstr "" @@ -549,6 +548,15 @@ msgid "Signals" msgstr "" #: editor/create_dialog.cpp +msgid "Change %s Type" +msgstr "" + +#: editor/create_dialog.cpp editor/project_settings_editor.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Change" +msgstr "" + +#: editor/create_dialog.cpp #, fuzzy msgid "Create New %s" msgstr "VytvoriÅ¥ adresár" @@ -655,7 +663,7 @@ msgid "" msgstr "" #: editor/dependency_editor.cpp -msgid "Cannot remove:\n" +msgid "Cannot remove:" msgstr "" #: editor/dependency_editor.cpp @@ -738,8 +746,8 @@ msgstr "" msgid "Lead Developer" msgstr "" -#: editor/editor_about.cpp editor/project_manager.cpp -msgid "Project Manager" +#: editor/editor_about.cpp +msgid "Project Manager " msgstr "" #: editor/editor_about.cpp @@ -826,7 +834,7 @@ msgid "Success!" msgstr "" #: editor/editor_asset_installer.cpp -#: editor/plugins/asset_library_editor_plugin.cpp editor/project_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp msgid "Install" msgstr "" @@ -1136,7 +1144,7 @@ msgid "Packing" msgstr "" #: editor/editor_export.cpp platform/javascript/export/export.cpp -msgid "Template file not found:\n" +msgid "Template file not found:" msgstr "" #: editor/editor_file_dialog.cpp scene/gui/file_dialog.cpp @@ -1397,6 +1405,11 @@ msgstr "" msgid "Clear" msgstr "" +#: editor/editor_log.cpp +#, fuzzy +msgid "Clear Output" +msgstr "Popis:" + #: editor/editor_node.cpp editor/plugins/animation_player_editor_plugin.cpp msgid "Error saving resource!" msgstr "" @@ -1460,7 +1473,8 @@ msgstr "" #: editor/editor_node.cpp msgid "" -"Couldn't save scene. Likely dependencies (instances) couldn't be satisfied." +"Couldn't save scene. Likely dependencies (instances or inheritance) couldn't " +"be satisfied." msgstr "" #: editor/editor_node.cpp @@ -2399,7 +2413,7 @@ msgid "No version.txt found inside templates." msgstr "" #: editor/export_template_manager.cpp -msgid "Error creating path for templates:\n" +msgid "Error creating path for templates:" msgstr "" #: editor/export_template_manager.cpp @@ -2556,9 +2570,7 @@ msgid "View items as a list" msgstr "" #: editor/filesystem_dock.cpp -msgid "" -"\n" -"Status: Import of file failed. Please fix file and reimport manually." +msgid "Status: Import of file failed. Please fix file and reimport manually." msgstr "" #: editor/filesystem_dock.cpp @@ -2566,19 +2578,19 @@ msgid "Cannot move/rename resources root." msgstr "" #: editor/filesystem_dock.cpp -msgid "Cannot move a folder into itself.\n" +msgid "Cannot move a folder into itself." msgstr "" #: editor/filesystem_dock.cpp -msgid "Error moving:\n" +msgid "Error moving:" msgstr "" #: editor/filesystem_dock.cpp -msgid "Error duplicating:\n" +msgid "Error duplicating:" msgstr "" #: editor/filesystem_dock.cpp -msgid "Unable to update dependencies:\n" +msgid "Unable to update dependencies:" msgstr "" #: editor/filesystem_dock.cpp @@ -3221,6 +3233,10 @@ msgstr "" msgid "Filters.." msgstr "" +#: editor/plugins/animation_tree_editor_plugin.cpp +msgid "AnimationTree" +msgstr "" + #: editor/plugins/asset_library_editor_plugin.cpp msgid "Free" msgstr "" @@ -3388,6 +3404,7 @@ msgid "Bake Lightmaps" msgstr "" #: editor/plugins/camera_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Preview" msgstr "" @@ -4081,7 +4098,7 @@ msgid "Bake!" msgstr "" #: editor/plugins/navigation_mesh_editor_plugin.cpp -msgid "Bake the navigation mesh.\n" +msgid "Bake the navigation mesh." msgstr "" #: editor/plugins/navigation_mesh_editor_plugin.cpp @@ -4474,14 +4491,16 @@ msgstr "" msgid "Paste" msgstr "VložiÅ¥" +#: editor/plugins/resource_preloader_editor_plugin.cpp +msgid "ResourcePreloader" +msgstr "" + #: editor/plugins/script_editor_plugin.cpp msgid "Clear Recent Files" msgstr "" #: editor/plugins/script_editor_plugin.cpp -msgid "" -"Close and save changes?\n" -"\"" +msgid "Close and save changes?" msgstr "" #: editor/plugins/script_editor_plugin.cpp @@ -4558,6 +4577,10 @@ msgid "Copy Script Path" msgstr "" #: editor/plugins/script_editor_plugin.cpp +msgid "Show In File System" +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp msgid "History Prev" msgstr "" @@ -4989,83 +5012,83 @@ msgid "Rotating %s degrees." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Bottom View." +msgid "Keying is disabled (no key inserted)." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Bottom" +msgid "Animation Key Inserted." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Top View." +msgid "Objects Drawn" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Rear View." +msgid "Material Changes" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Rear" +msgid "Shader Changes" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Front View." +msgid "Surface Changes" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Front" +msgid "Draw Calls" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Left View." +msgid "Vertices" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Left" +msgid "FPS" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Right View." +msgid "Top View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Right" +msgid "Bottom View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Keying is disabled (no key inserted)." +msgid "Bottom" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Animation Key Inserted." +msgid "Left View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Objects Drawn" +msgid "Left" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Material Changes" +msgid "Right View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Shader Changes" +msgid "Right" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Surface Changes" +msgid "Front View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Draw Calls" +msgid "Front" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Vertices" +msgid "Rear View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "FPS" +msgid "Rear" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp @@ -5154,15 +5177,11 @@ 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" +msgid "Select Mode (Q)" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp @@ -5441,10 +5460,18 @@ msgstr "VložiÅ¥" msgid "Move (After)" msgstr "" +#: editor/plugins/sprite_frames_editor_plugin.cpp +msgid "SpriteFrames" +msgstr "" + #: editor/plugins/style_box_editor_plugin.cpp msgid "StyleBox Preview:" msgstr "" +#: editor/plugins/style_box_editor_plugin.cpp +msgid "StyleBox" +msgstr "" + #: editor/plugins/texture_region_editor_plugin.cpp msgid "Set Region Rect" msgstr "" @@ -5470,14 +5497,17 @@ msgid "Auto Slice" msgstr "" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Offset:" msgstr "" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Step:" msgstr "" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp #, fuzzy msgid "Separation:" msgstr "Popis:" @@ -5618,6 +5648,10 @@ msgstr "" msgid "Color" msgstr "" +#: editor/plugins/theme_editor_plugin.cpp +msgid "Theme" +msgstr "" + #: editor/plugins/tile_map_editor_plugin.cpp #, fuzzy msgid "Erase Selection" @@ -5720,6 +5754,31 @@ msgstr "" msgid "Error" msgstr "" +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "Autotiles" +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "" +"Select sub-tile to use as icon, this will be also used on invalid autotile " +"bindings." +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "" +"LMB: set bit on.\n" +"RMB: set bit off." +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +#, fuzzy +msgid "Select current edited sub-tile." +msgstr "VytvoriÅ¥ adresár" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "Select sub-tile to change it's priority." +msgstr "" + #: editor/progress_dialog.cpp scene/gui/dialogs.cpp msgid "Cancel" msgstr "" @@ -5837,10 +5896,23 @@ msgid "Please choose a folder that does not contain a 'project.godot' file." msgstr "" #: editor/project_manager.cpp +msgid "That's a BINGO!" +msgstr "" + +#: editor/project_manager.cpp msgid "Imported Project" msgstr "" #: editor/project_manager.cpp +#, fuzzy +msgid "Couldn't create folder." +msgstr "VytvoriÅ¥ adresár" + +#: editor/project_manager.cpp +msgid "There is already a folder in this path with the specified name." +msgstr "" + +#: editor/project_manager.cpp msgid "It would be a good idea to name your project." msgstr "" @@ -5882,14 +5954,27 @@ msgid "Import Existing Project" msgstr "" #: editor/project_manager.cpp +msgid "Import & Edit" +msgstr "" + +#: editor/project_manager.cpp msgid "Create New Project" msgstr "" #: editor/project_manager.cpp +#, fuzzy +msgid "Create & Edit" +msgstr "VytvoriÅ¥ adresár" + +#: editor/project_manager.cpp msgid "Install Project:" msgstr "" #: editor/project_manager.cpp +msgid "Install & Edit" +msgstr "" + +#: editor/project_manager.cpp msgid "Project Name:" msgstr "" @@ -5907,10 +5992,6 @@ msgid "Browse" msgstr "" #: editor/project_manager.cpp -msgid "That's a BINGO!" -msgstr "" - -#: editor/project_manager.cpp msgid "Unnamed Project" msgstr "" @@ -5956,6 +6037,10 @@ msgid "" msgstr "" #: editor/project_manager.cpp +msgid "Project Manager" +msgstr "" + +#: editor/project_manager.cpp msgid "Project List" msgstr "" @@ -6083,11 +6168,6 @@ 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 "" @@ -6557,7 +6637,7 @@ msgid "Error duplicating scene to save it." msgstr "" #: editor/scene_tree_dock.cpp -msgid "Sub-Resources:" +msgid "Sub-Resources" msgstr "" #: editor/scene_tree_dock.cpp @@ -6859,7 +6939,7 @@ msgstr "" msgid "Pick one or more items from the list to display the graph." msgstr "" -#: editor/script_editor_debugger.cpp +#: editor/script_editor_debugger.cpp modules/mono/editor/mono_bottom_panel.cpp msgid "Errors" msgstr "" @@ -6868,6 +6948,10 @@ msgid "Child Process Connected" msgstr "" #: editor/script_editor_debugger.cpp +msgid "Copy Error" +msgstr "" + +#: editor/script_editor_debugger.cpp msgid "Inspect Previous Instance" msgstr "" @@ -7217,10 +7301,50 @@ msgstr "" msgid "Pick Distance:" msgstr "" +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Generating solution..." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Generating C# project..." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Failed to create solution." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Failed to save solution." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Done" +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Failed to create C# project." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Mono" +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Create C# solution" +msgstr "" + #: modules/mono/editor/mono_bottom_panel.cpp msgid "Builds" msgstr "" +#: modules/mono/editor/mono_bottom_panel.cpp +msgid "Build Project" +msgstr "" + +#: modules/mono/editor/mono_bottom_panel.cpp +msgid "Warnings" +msgstr "" + #: modules/visual_script/visual_script.cpp msgid "" "A node yielded without working memory, please read the docs on how to yield " @@ -7575,23 +7699,28 @@ msgid "Run exported HTML in the system's default browser." msgstr "" #: platform/javascript/export/export.cpp -msgid "Could not write file:\n" +#, fuzzy +msgid "Could not write file:" +msgstr "Popis:" + +#: platform/javascript/export/export.cpp +msgid "Could not open template for export:" msgstr "" #: platform/javascript/export/export.cpp -msgid "Could not open template for export:\n" +msgid "Invalid export template:" msgstr "" #: platform/javascript/export/export.cpp -msgid "Invalid export template:\n" +msgid "Could not read custom HTML shell:" msgstr "" #: platform/javascript/export/export.cpp -msgid "Could not read custom HTML shell:\n" +msgid "Could not read boot splash image file:" msgstr "" #: platform/javascript/export/export.cpp -msgid "Could not read boot splash image file:\n" +msgid "Using default boot splash image." msgstr "" #: scene/2d/animated_sprite.cpp @@ -7851,8 +7980,8 @@ msgstr "" #: scene/main/scene_tree.cpp msgid "" -"Default Environment as specified in Project Setings (Rendering -> Viewport -" -"> Default Environment) could not be loaded." +"Default Environment as specified in Project Setings (Rendering -> " +"Environment -> Default Environment) could not be loaded." msgstr "" #: scene/main/viewport.cpp diff --git a/editor/translations/sl.po b/editor/translations/sl.po index 07b74c1367..89f734648c 100644 --- a/editor/translations/sl.po +++ b/editor/translations/sl.po @@ -201,8 +201,7 @@ msgstr "" #: 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 +#: editor/plugins/particles_editor_plugin.cpp editor/script_create_dialog.cpp msgid "Create" msgstr "Ustvari" @@ -554,6 +553,16 @@ msgstr "" #: editor/create_dialog.cpp #, fuzzy +msgid "Change %s Type" +msgstr "Osnovni Tip:" + +#: editor/create_dialog.cpp editor/project_settings_editor.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Change" +msgstr "Spremeni" + +#: editor/create_dialog.cpp +#, fuzzy msgid "Create New %s" msgstr "Ustvari" @@ -659,7 +668,7 @@ msgid "" msgstr "" #: editor/dependency_editor.cpp -msgid "Cannot remove:\n" +msgid "Cannot remove:" msgstr "" #: editor/dependency_editor.cpp @@ -742,8 +751,8 @@ msgstr "" msgid "Lead Developer" msgstr "" -#: editor/editor_about.cpp editor/project_manager.cpp -msgid "Project Manager" +#: editor/editor_about.cpp +msgid "Project Manager " msgstr "" #: editor/editor_about.cpp @@ -828,7 +837,7 @@ msgid "Success!" msgstr "" #: editor/editor_asset_installer.cpp -#: editor/plugins/asset_library_editor_plugin.cpp editor/project_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp msgid "Install" msgstr "" @@ -1139,7 +1148,7 @@ msgid "Packing" msgstr "" #: editor/editor_export.cpp platform/javascript/export/export.cpp -msgid "Template file not found:\n" +msgid "Template file not found:" msgstr "" #: editor/editor_file_dialog.cpp scene/gui/file_dialog.cpp @@ -1397,6 +1406,10 @@ msgstr "" msgid "Clear" msgstr "" +#: editor/editor_log.cpp +msgid "Clear Output" +msgstr "" + #: editor/editor_node.cpp editor/plugins/animation_player_editor_plugin.cpp msgid "Error saving resource!" msgstr "" @@ -1460,7 +1473,8 @@ msgstr "" #: editor/editor_node.cpp msgid "" -"Couldn't save scene. Likely dependencies (instances) couldn't be satisfied." +"Couldn't save scene. Likely dependencies (instances or inheritance) couldn't " +"be satisfied." msgstr "" #: editor/editor_node.cpp @@ -2393,7 +2407,7 @@ msgid "No version.txt found inside templates." msgstr "" #: editor/export_template_manager.cpp -msgid "Error creating path for templates:\n" +msgid "Error creating path for templates:" msgstr "" #: editor/export_template_manager.cpp @@ -2549,9 +2563,7 @@ msgid "View items as a list" msgstr "" #: editor/filesystem_dock.cpp -msgid "" -"\n" -"Status: Import of file failed. Please fix file and reimport manually." +msgid "Status: Import of file failed. Please fix file and reimport manually." msgstr "" #: editor/filesystem_dock.cpp @@ -2559,19 +2571,21 @@ msgid "Cannot move/rename resources root." msgstr "" #: editor/filesystem_dock.cpp -msgid "Cannot move a folder into itself.\n" +msgid "Cannot move a folder into itself." msgstr "" #: editor/filesystem_dock.cpp -msgid "Error moving:\n" -msgstr "" +#, fuzzy +msgid "Error moving:" +msgstr "Napaka naložitve pisave." #: editor/filesystem_dock.cpp -msgid "Error duplicating:\n" -msgstr "" +#, fuzzy +msgid "Error duplicating:" +msgstr "Preimenuj Spremenljivko" #: editor/filesystem_dock.cpp -msgid "Unable to update dependencies:\n" +msgid "Unable to update dependencies:" msgstr "" #: editor/filesystem_dock.cpp @@ -3214,6 +3228,11 @@ msgstr "" msgid "Filters.." msgstr "" +#: editor/plugins/animation_tree_editor_plugin.cpp +#, fuzzy +msgid "AnimationTree" +msgstr "Približaj Animacijo" + #: editor/plugins/asset_library_editor_plugin.cpp msgid "Free" msgstr "" @@ -3379,6 +3398,7 @@ msgid "Bake Lightmaps" msgstr "" #: editor/plugins/camera_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Preview" msgstr "" @@ -4069,7 +4089,7 @@ msgid "Bake!" msgstr "" #: editor/plugins/navigation_mesh_editor_plugin.cpp -msgid "Bake the navigation mesh.\n" +msgid "Bake the navigation mesh." msgstr "" #: editor/plugins/navigation_mesh_editor_plugin.cpp @@ -4462,14 +4482,16 @@ msgstr "" msgid "Paste" msgstr "" +#: editor/plugins/resource_preloader_editor_plugin.cpp +msgid "ResourcePreloader" +msgstr "" + #: editor/plugins/script_editor_plugin.cpp msgid "Clear Recent Files" msgstr "" #: editor/plugins/script_editor_plugin.cpp -msgid "" -"Close and save changes?\n" -"\"" +msgid "Close and save changes?" msgstr "" #: editor/plugins/script_editor_plugin.cpp @@ -4545,6 +4567,10 @@ msgid "Copy Script Path" msgstr "" #: editor/plugins/script_editor_plugin.cpp +msgid "Show In File System" +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp msgid "History Prev" msgstr "" @@ -4979,84 +5005,84 @@ msgid "Rotating %s degrees." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Bottom View." +msgid "Keying is disabled (no key inserted)." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Bottom" +msgid "Animation Key Inserted." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Top View." +msgid "Objects Drawn" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Rear View." +msgid "Material Changes" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Rear" -msgstr "" +#, fuzzy +msgid "Shader Changes" +msgstr "Spremeni" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Front View." +msgid "Surface Changes" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Front" +msgid "Draw Calls" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Left View." +msgid "Vertices" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Left" +msgid "FPS" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Right View." +msgid "Top View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Right" +msgid "Bottom View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Keying is disabled (no key inserted)." +msgid "Bottom" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Animation Key Inserted." +msgid "Left View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Objects Drawn" +msgid "Left" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Material Changes" +msgid "Right View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -#, fuzzy -msgid "Shader Changes" -msgstr "Spremeni" +msgid "Right" +msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Surface Changes" +msgid "Front View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Draw Calls" +msgid "Front" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Vertices" +msgid "Rear View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "FPS" +msgid "Rear" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp @@ -5144,16 +5170,13 @@ 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 "" +#, fuzzy +msgid "Select Mode (Q)" +msgstr "Dodaj Setter Lastnost" #: editor/plugins/spatial_editor_plugin.cpp msgid "" @@ -5429,10 +5452,18 @@ msgstr "" msgid "Move (After)" msgstr "" +#: editor/plugins/sprite_frames_editor_plugin.cpp +msgid "SpriteFrames" +msgstr "" + #: editor/plugins/style_box_editor_plugin.cpp msgid "StyleBox Preview:" msgstr "" +#: editor/plugins/style_box_editor_plugin.cpp +msgid "StyleBox" +msgstr "" + #: editor/plugins/texture_region_editor_plugin.cpp msgid "Set Region Rect" msgstr "" @@ -5458,14 +5489,17 @@ msgid "Auto Slice" msgstr "" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Offset:" msgstr "" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Step:" msgstr "" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Separation:" msgstr "" @@ -5605,6 +5639,10 @@ msgstr "" msgid "Color" msgstr "" +#: editor/plugins/theme_editor_plugin.cpp +msgid "Theme" +msgstr "" + #: editor/plugins/tile_map_editor_plugin.cpp msgid "Erase Selection" msgstr "" @@ -5705,6 +5743,31 @@ msgstr "" msgid "Error" msgstr "" +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "Autotiles" +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "" +"Select sub-tile to use as icon, this will be also used on invalid autotile " +"bindings." +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "" +"LMB: set bit on.\n" +"RMB: set bit off." +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +#, fuzzy +msgid "Select current edited sub-tile." +msgstr "Dodaj Setter Lastnost" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "Select sub-tile to change it's priority." +msgstr "" + #: editor/progress_dialog.cpp scene/gui/dialogs.cpp msgid "Cancel" msgstr "PrekliÄi" @@ -5822,10 +5885,22 @@ msgid "Please choose a folder that does not contain a 'project.godot' file." msgstr "" #: editor/project_manager.cpp +msgid "That's a BINGO!" +msgstr "" + +#: editor/project_manager.cpp msgid "Imported Project" msgstr "" #: editor/project_manager.cpp +msgid "Couldn't create folder." +msgstr "" + +#: editor/project_manager.cpp +msgid "There is already a folder in this path with the specified name." +msgstr "" + +#: editor/project_manager.cpp msgid "It would be a good idea to name your project." msgstr "" @@ -5867,14 +5942,27 @@ msgid "Import Existing Project" msgstr "" #: editor/project_manager.cpp +msgid "Import & Edit" +msgstr "" + +#: editor/project_manager.cpp msgid "Create New Project" msgstr "" #: editor/project_manager.cpp +#, fuzzy +msgid "Create & Edit" +msgstr "Ustvari" + +#: editor/project_manager.cpp msgid "Install Project:" msgstr "" #: editor/project_manager.cpp +msgid "Install & Edit" +msgstr "" + +#: editor/project_manager.cpp msgid "Project Name:" msgstr "" @@ -5891,10 +5979,6 @@ msgid "Browse" msgstr "" #: editor/project_manager.cpp -msgid "That's a BINGO!" -msgstr "" - -#: editor/project_manager.cpp msgid "Unnamed Project" msgstr "" @@ -5940,6 +6024,10 @@ msgid "" msgstr "" #: editor/project_manager.cpp +msgid "Project Manager" +msgstr "" + +#: editor/project_manager.cpp msgid "Project List" msgstr "" @@ -6067,11 +6155,6 @@ msgid "Button 9" msgstr "" #: editor/project_settings_editor.cpp -#: modules/visual_script/visual_script_editor.cpp -msgid "Change" -msgstr "Spremeni" - -#: editor/project_settings_editor.cpp msgid "Joypad Axis Index:" msgstr "" @@ -6541,7 +6624,7 @@ msgid "Error duplicating scene to save it." msgstr "" #: editor/scene_tree_dock.cpp -msgid "Sub-Resources:" +msgid "Sub-Resources" msgstr "" #: editor/scene_tree_dock.cpp @@ -6837,7 +6920,7 @@ msgstr "" msgid "Pick one or more items from the list to display the graph." msgstr "" -#: editor/script_editor_debugger.cpp +#: editor/script_editor_debugger.cpp modules/mono/editor/mono_bottom_panel.cpp msgid "Errors" msgstr "" @@ -6846,6 +6929,10 @@ msgid "Child Process Connected" msgstr "" #: editor/script_editor_debugger.cpp +msgid "Copy Error" +msgstr "" + +#: editor/script_editor_debugger.cpp msgid "Inspect Previous Instance" msgstr "" @@ -7195,10 +7282,50 @@ msgstr "" msgid "Pick Distance:" msgstr "" +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Generating solution..." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Generating C# project..." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Failed to create solution." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Failed to save solution." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Done" +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Failed to create C# project." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Mono" +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Create C# solution" +msgstr "" + #: modules/mono/editor/mono_bottom_panel.cpp msgid "Builds" msgstr "" +#: modules/mono/editor/mono_bottom_panel.cpp +msgid "Build Project" +msgstr "" + +#: modules/mono/editor/mono_bottom_panel.cpp +msgid "Warnings" +msgstr "" + #: modules/visual_script/visual_script.cpp msgid "" "A node yielded without working memory, please read the docs on how to yield " @@ -7561,24 +7688,28 @@ msgid "Run exported HTML in the system's default browser." msgstr "" #: platform/javascript/export/export.cpp -msgid "Could not write file:\n" +msgid "Could not write file:" msgstr "" #: platform/javascript/export/export.cpp -msgid "Could not open template for export:\n" +msgid "Could not open template for export:" msgstr "" #: platform/javascript/export/export.cpp #, fuzzy -msgid "Invalid export template:\n" +msgid "Invalid export template:" msgstr "Neveljaven indeks lastnosti imena." #: platform/javascript/export/export.cpp -msgid "Could not read custom HTML shell:\n" +msgid "Could not read custom HTML shell:" +msgstr "" + +#: platform/javascript/export/export.cpp +msgid "Could not read boot splash image file:" msgstr "" #: platform/javascript/export/export.cpp -msgid "Could not read boot splash image file:\n" +msgid "Using default boot splash image." msgstr "" #: scene/2d/animated_sprite.cpp @@ -7847,8 +7978,8 @@ msgstr "(Ostalo)" #: scene/main/scene_tree.cpp msgid "" -"Default Environment as specified in Project Setings (Rendering -> Viewport -" -"> Default Environment) could not be loaded." +"Default Environment as specified in Project Setings (Rendering -> " +"Environment -> Default Environment) could not be loaded." msgstr "" #: scene/main/viewport.cpp diff --git a/editor/translations/sr_Cyrl.po b/editor/translations/sr_Cyrl.po index 06b90e8b70..c168421518 100644 --- a/editor/translations/sr_Cyrl.po +++ b/editor/translations/sr_Cyrl.po @@ -199,8 +199,7 @@ msgstr "Ðаправите %d нових трака и убаците кључе #: 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 +#: editor/plugins/particles_editor_plugin.cpp editor/script_create_dialog.cpp msgid "Create" msgstr "Ðаправи" @@ -555,6 +554,16 @@ msgstr "Сигнали" #: editor/create_dialog.cpp #, fuzzy +msgid "Change %s Type" +msgstr "Измени уобичајен тип" + +#: editor/create_dialog.cpp editor/project_settings_editor.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Change" +msgstr "" + +#: editor/create_dialog.cpp +#, fuzzy msgid "Create New %s" msgstr "Ðаправи нов" @@ -666,7 +675,8 @@ msgstr "" "Ипак их обриши? (ÐЕМРОПОЗИВÐЊÐ)" #: editor/dependency_editor.cpp -msgid "Cannot remove:\n" +#, fuzzy +msgid "Cannot remove:" msgstr "Ðе може Ñе обриÑати:\n" #: editor/dependency_editor.cpp @@ -749,8 +759,9 @@ msgstr "ОÑнивачи пројекта" msgid "Lead Developer" msgstr "Главни девелопер" -#: editor/editor_about.cpp editor/project_manager.cpp -msgid "Project Manager" +#: editor/editor_about.cpp +#, fuzzy +msgid "Project Manager " msgstr "Менаџер пројекта" #: editor/editor_about.cpp @@ -839,7 +850,7 @@ msgid "Success!" msgstr "УÑпех!" #: editor/editor_asset_installer.cpp -#: editor/plugins/asset_library_editor_plugin.cpp editor/project_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp msgid "Install" msgstr "ИнÑталирај" @@ -1148,7 +1159,8 @@ msgid "Packing" msgstr "Паковање" #: editor/editor_export.cpp platform/javascript/export/export.cpp -msgid "Template file not found:\n" +#, fuzzy +msgid "Template file not found:" msgstr "ШаблонÑка датотека није пронађена:\n" #: editor/editor_file_dialog.cpp scene/gui/file_dialog.cpp @@ -1406,6 +1418,11 @@ msgstr "Излаз:" msgid "Clear" msgstr "Обриши" +#: editor/editor_log.cpp +#, fuzzy +msgid "Clear Output" +msgstr "Излаз" + #: editor/editor_node.cpp editor/plugins/animation_player_editor_plugin.cpp msgid "Error saving resource!" msgstr "Грешка при чувању реÑурÑа!" @@ -1468,8 +1485,10 @@ msgid "This operation can't be done without a tree root." msgstr "Ова операција Ñе не може обавити без корена дрвета." #: editor/editor_node.cpp +#, fuzzy msgid "" -"Couldn't save scene. Likely dependencies (instances) couldn't be satisfied." +"Couldn't save scene. Likely dependencies (instances or inheritance) couldn't " +"be satisfied." msgstr "Ðе могу Ñачувати Ñцену. Вероватно завиÑноÑти ниÑу задовољене." #: editor/editor_node.cpp @@ -2460,7 +2479,8 @@ msgid "No version.txt found inside templates." msgstr "„version.txt“ није пронаћен у шаблону." #: editor/export_template_manager.cpp -msgid "Error creating path for templates:\n" +#, fuzzy +msgid "Error creating path for templates:" msgstr "Грешка при прављењу пута за шаблоне:\n" #: editor/export_template_manager.cpp @@ -2620,9 +2640,8 @@ msgid "View items as a list" msgstr "Прикажи Ñтвари као лиÑта" #: editor/filesystem_dock.cpp -msgid "" -"\n" -"Status: Import of file failed. Please fix file and reimport manually." +#, fuzzy +msgid "Status: Import of file failed. Please fix file and reimport manually." msgstr "" "\n" "СтатуÑ: Увоз датотеке неуÑпео. Молим, иÑправите датотеку и поново је увезите " @@ -2633,20 +2652,23 @@ msgid "Cannot move/rename resources root." msgstr "Ðе могу померити/преименовати корен реÑурÑа." #: editor/filesystem_dock.cpp -msgid "Cannot move a folder into itself.\n" +#, fuzzy +msgid "Cannot move a folder into itself." msgstr "Ðе могу померити директоријум у њену Ñаму.\n" #: editor/filesystem_dock.cpp -msgid "Error moving:\n" +#, fuzzy +msgid "Error moving:" msgstr "Грешка при померању:\n" #: editor/filesystem_dock.cpp #, fuzzy -msgid "Error duplicating:\n" +msgid "Error duplicating:" msgstr "Грешка при учитавању:" #: editor/filesystem_dock.cpp -msgid "Unable to update dependencies:\n" +#, fuzzy +msgid "Unable to update dependencies:" msgstr "Ðије могуће ажурирати завиÑноÑти:\n" #: editor/filesystem_dock.cpp @@ -3295,6 +3317,11 @@ msgstr "Измени филтере чвора" msgid "Filters.." msgstr "Филтери..." +#: editor/plugins/animation_tree_editor_plugin.cpp +#, fuzzy +msgid "AnimationTree" +msgstr "Ðнимација" + #: editor/plugins/asset_library_editor_plugin.cpp msgid "Free" msgstr "Слободно" @@ -3460,6 +3487,7 @@ msgid "Bake Lightmaps" msgstr "" #: editor/plugins/camera_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Preview" msgstr "Преглед" @@ -4152,7 +4180,8 @@ msgid "Bake!" msgstr "ИÑпеци!" #: editor/plugins/navigation_mesh_editor_plugin.cpp -msgid "Bake the navigation mesh.\n" +#, fuzzy +msgid "Bake the navigation mesh." msgstr "ИÑпеци навигациону мрежу.\n" #: editor/plugins/navigation_mesh_editor_plugin.cpp @@ -4541,14 +4570,18 @@ msgstr "Учитај реÑурÑ" msgid "Paste" msgstr "Ðалепи" +#: editor/plugins/resource_preloader_editor_plugin.cpp +#, fuzzy +msgid "ResourcePreloader" +msgstr "РеÑурÑ" + #: editor/plugins/script_editor_plugin.cpp msgid "Clear Recent Files" msgstr "ОчиÑти недавно отворене датотеке" #: editor/plugins/script_editor_plugin.cpp -msgid "" -"Close and save changes?\n" -"\"" +#, fuzzy +msgid "Close and save changes?" msgstr "" "Затвори и Ñачувај измене?\n" "\"" @@ -4627,6 +4660,11 @@ msgid "Copy Script Path" msgstr "Копирај пут" #: editor/plugins/script_editor_plugin.cpp +#, fuzzy +msgid "Show In File System" +msgstr "Покажи у менаџеру датотека" + +#: editor/plugins/script_editor_plugin.cpp msgid "History Prev" msgstr "ИÑторија претходно" @@ -5063,84 +5101,84 @@ msgid "Rotating %s degrees." msgstr "Ротација за %s Ñтепени." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Bottom View." -msgstr "Поглед одоздо." +msgid "Keying is disabled (no key inserted)." +msgstr "Кључеви Ñу онемогућени (нема убачених кључева)." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Bottom" -msgstr "Доле" +msgid "Animation Key Inserted." +msgstr "Ðнимациони кључ убачен." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Top View." -msgstr "Поглед одозго." +msgid "Objects Drawn" +msgstr "Ðацртани објекти" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Rear View." -msgstr "Бочни поглед." +msgid "Material Changes" +msgstr "Промене материјала" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Rear" -msgstr "Бок" +msgid "Shader Changes" +msgstr "Промене шејдера" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Front View." -msgstr "Поглед Ñпреда." +msgid "Surface Changes" +msgstr "Промене површи" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Front" -msgstr "ИÑпред" +msgid "Draw Calls" +msgstr "Позиви цртања" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Left View." -msgstr "Леви поглед." +msgid "Vertices" +msgstr "Тачке" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Left" -msgstr "Лево" +msgid "FPS" +msgstr "FPS" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Right View." -msgstr "ДеÑни поглед." +msgid "Top View." +msgstr "Поглед одозго." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Right" -msgstr "деÑно" +msgid "Bottom View." +msgstr "Поглед одоздо." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Keying is disabled (no key inserted)." -msgstr "Кључеви Ñу онемогућени (нема убачених кључева)." +msgid "Bottom" +msgstr "Доле" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Animation Key Inserted." -msgstr "Ðнимациони кључ убачен." +msgid "Left View." +msgstr "Леви поглед." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Objects Drawn" -msgstr "Ðацртани објекти" +msgid "Left" +msgstr "Лево" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Material Changes" -msgstr "Промене материјала" +msgid "Right View." +msgstr "ДеÑни поглед." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Shader Changes" -msgstr "Промене шејдера" +msgid "Right" +msgstr "деÑно" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Surface Changes" -msgstr "Промене површи" +msgid "Front View." +msgstr "Поглед Ñпреда." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Draw Calls" -msgstr "Позиви цртања" +msgid "Front" +msgstr "ИÑпред" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Vertices" -msgstr "Тачке" +msgid "Rear View." +msgstr "Бочни поглед." #: editor/plugins/spatial_editor_plugin.cpp -msgid "FPS" -msgstr "FPS" +msgid "Rear" +msgstr "Бок" #: editor/plugins/spatial_editor_plugin.cpp msgid "Align with view" @@ -5227,15 +5265,12 @@ msgid "Freelook Speed Modifier" msgstr "Брзина Ñлободног погледа" #: editor/plugins/spatial_editor_plugin.cpp -msgid "preview" -msgstr "преглед" - -#: editor/plugins/spatial_editor_plugin.cpp msgid "XForm Dialog" msgstr "XForm дијалог" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Select Mode (Q)\n" +#, fuzzy +msgid "Select Mode (Q)" msgstr "Режим Ñелекције (Q)\n" #: editor/plugins/spatial_editor_plugin.cpp @@ -5516,10 +5551,20 @@ msgstr "Помери (иза)" msgid "Move (After)" msgstr "Помери (иÑпред)" +#: editor/plugins/sprite_frames_editor_plugin.cpp +#, fuzzy +msgid "SpriteFrames" +msgstr "Ðалепи оквир" + #: editor/plugins/style_box_editor_plugin.cpp msgid "StyleBox Preview:" msgstr "StyleBox преглед:" +#: editor/plugins/style_box_editor_plugin.cpp +#, fuzzy +msgid "StyleBox" +msgstr "Стил" + #: editor/plugins/texture_region_editor_plugin.cpp msgid "Set Region Rect" msgstr "ПоÑтави правоугаони регион" @@ -5545,14 +5590,17 @@ msgid "Auto Slice" msgstr "ÐутоматÑки рез" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Offset:" msgstr "ОфÑет:" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Step:" msgstr "Корак:" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Separation:" msgstr "ОдвојеноÑÑ‚:" @@ -5694,6 +5742,11 @@ msgstr "Фонт" msgid "Color" msgstr "Боја" +#: editor/plugins/theme_editor_plugin.cpp +#, fuzzy +msgid "Theme" +msgstr "Сачувај тему" + #: editor/plugins/tile_map_editor_plugin.cpp msgid "Erase Selection" msgstr "Обриши одабрано" @@ -5798,6 +5851,32 @@ msgstr "Споји од Ñцене" msgid "Error" msgstr "Грешка" +#: editor/plugins/tile_set_editor_plugin.cpp +#, fuzzy +msgid "Autotiles" +msgstr "ÐутоматÑки рез" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "" +"Select sub-tile to use as icon, this will be also used on invalid autotile " +"bindings." +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "" +"LMB: set bit on.\n" +"RMB: set bit off." +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +#, fuzzy +msgid "Select current edited sub-tile." +msgstr "Сачувај тренутно измењени реÑурÑ." + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "Select sub-tile to change it's priority." +msgstr "" + #: editor/progress_dialog.cpp scene/gui/dialogs.cpp msgid "Cancel" msgstr "" @@ -5922,10 +6001,23 @@ msgid "Please choose a folder that does not contain a 'project.godot' file." msgstr "" #: editor/project_manager.cpp +msgid "That's a BINGO!" +msgstr "" + +#: editor/project_manager.cpp msgid "Imported Project" msgstr "" #: editor/project_manager.cpp +#, fuzzy +msgid "Couldn't create folder." +msgstr "ÐеуÑпех при прављењу директоријума." + +#: editor/project_manager.cpp +msgid "There is already a folder in this path with the specified name." +msgstr "" + +#: editor/project_manager.cpp msgid "It would be a good idea to name your project." msgstr "" @@ -5966,14 +6058,29 @@ msgid "Import Existing Project" msgstr "" #: editor/project_manager.cpp +#, fuzzy +msgid "Import & Edit" +msgstr "Увоз" + +#: editor/project_manager.cpp msgid "Create New Project" msgstr "" #: editor/project_manager.cpp +#, fuzzy +msgid "Create & Edit" +msgstr "Ðаправи емитер" + +#: editor/project_manager.cpp msgid "Install Project:" msgstr "" #: editor/project_manager.cpp +#, fuzzy +msgid "Install & Edit" +msgstr "ИнÑталирај" + +#: editor/project_manager.cpp msgid "Project Name:" msgstr "" @@ -5990,10 +6097,6 @@ msgid "Browse" msgstr "" #: editor/project_manager.cpp -msgid "That's a BINGO!" -msgstr "" - -#: editor/project_manager.cpp msgid "Unnamed Project" msgstr "" @@ -6039,6 +6142,10 @@ msgid "" msgstr "" #: editor/project_manager.cpp +msgid "Project Manager" +msgstr "Менаџер пројекта" + +#: editor/project_manager.cpp msgid "Project List" msgstr "" @@ -6165,11 +6272,6 @@ 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 "" @@ -6637,8 +6739,9 @@ msgid "Error duplicating scene to save it." msgstr "" #: editor/scene_tree_dock.cpp -msgid "Sub-Resources:" -msgstr "" +#, fuzzy +msgid "Sub-Resources" +msgstr "РеÑурÑи" #: editor/scene_tree_dock.cpp msgid "Clear Inheritance" @@ -6928,7 +7031,7 @@ msgstr "" msgid "Pick one or more items from the list to display the graph." msgstr "" -#: editor/script_editor_debugger.cpp +#: editor/script_editor_debugger.cpp modules/mono/editor/mono_bottom_panel.cpp msgid "Errors" msgstr "" @@ -6937,6 +7040,11 @@ msgid "Child Process Connected" msgstr "" #: editor/script_editor_debugger.cpp +#, fuzzy +msgid "Copy Error" +msgstr "Учитај грешке" + +#: editor/script_editor_debugger.cpp msgid "Inspect Previous Instance" msgstr "" @@ -7283,10 +7391,57 @@ msgstr "" msgid "Pick Distance:" msgstr "" +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Generating solution..." +msgstr "Прављење контура..." + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Generating C# project..." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Failed to create solution." +msgstr "ÐеуÑпех при прављењу ивица!" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Failed to save solution." +msgstr "Грешка при учитавању реÑурÑа." + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Done" +msgstr "Готово!" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Failed to create C# project." +msgstr "Грешка при учитавању реÑурÑа." + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Mono" +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Create C# solution" +msgstr "Ðаправи ивице" + #: modules/mono/editor/mono_bottom_panel.cpp msgid "Builds" msgstr "" +#: modules/mono/editor/mono_bottom_panel.cpp +#, fuzzy +msgid "Build Project" +msgstr "Пројекат" + +#: modules/mono/editor/mono_bottom_panel.cpp +msgid "Warnings" +msgstr "" + #: modules/visual_script/visual_script.cpp msgid "" "A node yielded without working memory, please read the docs on how to yield " @@ -7632,23 +7787,33 @@ msgid "Run exported HTML in the system's default browser." msgstr "" #: platform/javascript/export/export.cpp -msgid "Could not write file:\n" -msgstr "" +#, fuzzy +msgid "Could not write file:" +msgstr "ÐеуÑпех при тражењу плочице:" #: platform/javascript/export/export.cpp -msgid "Could not open template for export:\n" -msgstr "" +#, fuzzy +msgid "Could not open template for export:" +msgstr "ÐеуÑпех при прављењу директоријума." #: platform/javascript/export/export.cpp -msgid "Invalid export template:\n" +#, fuzzy +msgid "Invalid export template:" msgstr "Ðеважећи извозни шаблон:\n" #: platform/javascript/export/export.cpp -msgid "Could not read custom HTML shell:\n" -msgstr "" +#, fuzzy +msgid "Could not read custom HTML shell:" +msgstr "ÐеуÑпех при учитавању датотеке Ñа Ñличицом учитавања:\n" #: platform/javascript/export/export.cpp -msgid "Could not read boot splash image file:\n" +#, fuzzy +msgid "Could not read boot splash image file:" +msgstr "ÐеуÑпех при учитавању датотеке Ñа Ñличицом учитавања:\n" + +#: platform/javascript/export/export.cpp +#, fuzzy +msgid "Using default boot splash image." msgstr "ÐеуÑпех при учитавању датотеке Ñа Ñличицом учитавања:\n" #: scene/2d/animated_sprite.cpp @@ -7901,8 +8066,8 @@ msgstr "" #: scene/main/scene_tree.cpp msgid "" -"Default Environment as specified in Project Setings (Rendering -> Viewport -" -"> Default Environment) could not be loaded." +"Default Environment as specified in Project Setings (Rendering -> " +"Environment -> Default Environment) could not be loaded." msgstr "" #: scene/main/viewport.cpp @@ -7929,6 +8094,9 @@ msgstr "" msgid "Invalid font size." msgstr "Ðеважећа величина фонта." +#~ msgid "preview" +#~ msgstr "преглед" + #~ msgid "Move Add Key" #~ msgstr "Помери кључ" diff --git a/editor/translations/sv.po b/editor/translations/sv.po index 6eb50bacf1..4ab3f5eb96 100644 --- a/editor/translations/sv.po +++ b/editor/translations/sv.po @@ -205,8 +205,7 @@ msgstr "Skapa %d NYA spÃ¥r och infoga nycklar?" #: 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 +#: editor/plugins/particles_editor_plugin.cpp editor/script_create_dialog.cpp msgid "Create" msgstr "Skapa" @@ -590,6 +589,17 @@ msgstr "Signaler" #: editor/create_dialog.cpp #, fuzzy +msgid "Change %s Type" +msgstr "Ändra Typ" + +#: editor/create_dialog.cpp editor/project_settings_editor.cpp +#: modules/visual_script/visual_script_editor.cpp +#, fuzzy +msgid "Change" +msgstr "Ändra" + +#: editor/create_dialog.cpp +#, fuzzy msgid "Create New %s" msgstr "Skapa Ny" @@ -716,7 +726,7 @@ msgstr "" #: editor/dependency_editor.cpp #, fuzzy -msgid "Cannot remove:\n" +msgid "Cannot remove:" msgstr "Kan inte ta bort:\n" #: editor/dependency_editor.cpp @@ -814,9 +824,9 @@ msgstr "Projektgrundare" msgid "Lead Developer" msgstr "Lead Developer" -#: editor/editor_about.cpp editor/project_manager.cpp +#: editor/editor_about.cpp #, fuzzy -msgid "Project Manager" +msgid "Project Manager " msgstr "Projektledare" #: editor/editor_about.cpp @@ -919,7 +929,7 @@ msgid "Success!" msgstr "Klart!" #: editor/editor_asset_installer.cpp -#: editor/plugins/asset_library_editor_plugin.cpp editor/project_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp msgid "Install" msgstr "Installera" @@ -1285,7 +1295,7 @@ msgstr "Packar" #: editor/editor_export.cpp platform/javascript/export/export.cpp #, fuzzy -msgid "Template file not found:\n" +msgid "Template file not found:" msgstr "Mallfil hittades inte:\n" #: editor/editor_file_dialog.cpp scene/gui/file_dialog.cpp @@ -1577,6 +1587,11 @@ msgstr "Output:" msgid "Clear" msgstr "Rensa" +#: editor/editor_log.cpp +#, fuzzy +msgid "Clear Output" +msgstr "Output:" + #: editor/editor_node.cpp editor/plugins/animation_player_editor_plugin.cpp #, fuzzy msgid "Error saving resource!" @@ -1651,7 +1666,8 @@ msgstr "Ã…tgärden kan inte göras utan en trädrot." #: editor/editor_node.cpp #, fuzzy msgid "" -"Couldn't save scene. Likely dependencies (instances) couldn't be satisfied." +"Couldn't save scene. Likely dependencies (instances or inheritance) couldn't " +"be satisfied." msgstr "" "Kunde inte spara scenen. Förmodligen kunde inte beroenden (instanser) " "uppfyllas." @@ -2710,8 +2726,9 @@ msgid "No version.txt found inside templates." msgstr "" #: editor/export_template_manager.cpp -msgid "Error creating path for templates:\n" -msgstr "" +#, fuzzy +msgid "Error creating path for templates:" +msgstr "Fel vid laddning av mall '%s'" #: editor/export_template_manager.cpp msgid "Extracting Export Templates" @@ -2879,9 +2896,7 @@ msgid "View items as a list" msgstr "" #: editor/filesystem_dock.cpp -msgid "" -"\n" -"Status: Import of file failed. Please fix file and reimport manually." +msgid "Status: Import of file failed. Please fix file and reimport manually." msgstr "" #: editor/filesystem_dock.cpp @@ -2889,21 +2904,23 @@ msgid "Cannot move/rename resources root." msgstr "" #: editor/filesystem_dock.cpp -msgid "Cannot move a folder into itself.\n" +msgid "Cannot move a folder into itself." msgstr "" #: editor/filesystem_dock.cpp -msgid "Error moving:\n" -msgstr "" +#, fuzzy +msgid "Error moving:" +msgstr "Fel vid laddning:" #: editor/filesystem_dock.cpp #, fuzzy -msgid "Error duplicating:\n" +msgid "Error duplicating:" msgstr "Fel vid laddning:" #: editor/filesystem_dock.cpp -msgid "Unable to update dependencies:\n" -msgstr "" +#, fuzzy +msgid "Unable to update dependencies:" +msgstr "Scen '%s' har trasiga beroenden:" #: editor/filesystem_dock.cpp msgid "No name provided" @@ -3577,6 +3594,11 @@ msgstr "Redigera Node-Filter" msgid "Filters.." msgstr "Filter.." +#: editor/plugins/animation_tree_editor_plugin.cpp +#, fuzzy +msgid "AnimationTree" +msgstr "Animation" + #: editor/plugins/asset_library_editor_plugin.cpp msgid "Free" msgstr "" @@ -3745,6 +3767,7 @@ msgid "Bake Lightmaps" msgstr "" #: editor/plugins/camera_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp #, fuzzy msgid "Preview" msgstr "Förhandsgranska" @@ -4449,7 +4472,7 @@ msgid "Bake!" msgstr "" #: editor/plugins/navigation_mesh_editor_plugin.cpp -msgid "Bake the navigation mesh.\n" +msgid "Bake the navigation mesh." msgstr "" #: editor/plugins/navigation_mesh_editor_plugin.cpp @@ -4842,15 +4865,18 @@ msgstr "Ladda Resurs" msgid "Paste" msgstr "Klistra in" +#: editor/plugins/resource_preloader_editor_plugin.cpp +#, fuzzy +msgid "ResourcePreloader" +msgstr "Resurs" + #: editor/plugins/script_editor_plugin.cpp msgid "Clear Recent Files" msgstr "" #: editor/plugins/script_editor_plugin.cpp #, fuzzy -msgid "" -"Close and save changes?\n" -"\"" +msgid "Close and save changes?" msgstr "" "Stäng och spara ändringar?\n" "\"" @@ -4937,6 +4963,11 @@ msgid "Copy Script Path" msgstr "Kopiera Sökvägen" #: editor/plugins/script_editor_plugin.cpp +#, fuzzy +msgid "Show In File System" +msgstr "Visa i Filsystemet" + +#: editor/plugins/script_editor_plugin.cpp msgid "History Prev" msgstr "" @@ -5395,39 +5426,55 @@ msgid "Rotating %s degrees." msgstr "Roterar %s grader." #: editor/plugins/spatial_editor_plugin.cpp -#, fuzzy -msgid "Bottom View." -msgstr "Vy UnderifrÃ¥n" +msgid "Keying is disabled (no key inserted)." +msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -#, fuzzy -msgid "Bottom" -msgstr "Botten" +msgid "Animation Key Inserted." +msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -#, fuzzy -msgid "Top View." -msgstr "Vy OvanifrÃ¥n." +msgid "Objects Drawn" +msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -#, fuzzy -msgid "Rear View." -msgstr "Vy BakifrÃ¥n." +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 "FPS" #: editor/plugins/spatial_editor_plugin.cpp #, fuzzy -msgid "Rear" -msgstr "Baksida" +msgid "Top View." +msgstr "Vy OvanifrÃ¥n." #: editor/plugins/spatial_editor_plugin.cpp #, fuzzy -msgid "Front View." -msgstr "Vy FramifrÃ¥n." +msgid "Bottom View." +msgstr "Vy UnderifrÃ¥n" #: editor/plugins/spatial_editor_plugin.cpp #, fuzzy -msgid "Front" -msgstr "Framsida" +msgid "Bottom" +msgstr "Botten" #: editor/plugins/spatial_editor_plugin.cpp #, fuzzy @@ -5450,40 +5497,24 @@ msgid "Right" msgstr "Höger" #: 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 "" +#, fuzzy +msgid "Front View." +msgstr "Vy FramifrÃ¥n." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Draw Calls" -msgstr "" +#, fuzzy +msgid "Front" +msgstr "Framsida" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Vertices" -msgstr "" +#, fuzzy +msgid "Rear View." +msgstr "Vy BakifrÃ¥n." #: editor/plugins/spatial_editor_plugin.cpp -msgid "FPS" -msgstr "FPS" +#, fuzzy +msgid "Rear" +msgstr "Baksida" #: editor/plugins/spatial_editor_plugin.cpp msgid "Align with view" @@ -5573,17 +5604,13 @@ msgid "Freelook Speed Modifier" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -#, fuzzy -msgid "preview" -msgstr "förhandsgranska" - -#: editor/plugins/spatial_editor_plugin.cpp msgid "XForm Dialog" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Select Mode (Q)\n" -msgstr "" +#, fuzzy +msgid "Select Mode (Q)" +msgstr "Välj Node" #: editor/plugins/spatial_editor_plugin.cpp msgid "" @@ -5868,10 +5895,19 @@ msgstr "Flytta (före)" msgid "Move (After)" msgstr "Flytta (efter)" +#: editor/plugins/sprite_frames_editor_plugin.cpp +msgid "SpriteFrames" +msgstr "" + #: editor/plugins/style_box_editor_plugin.cpp msgid "StyleBox Preview:" msgstr "" +#: editor/plugins/style_box_editor_plugin.cpp +#, fuzzy +msgid "StyleBox" +msgstr "Stil" + #: editor/plugins/texture_region_editor_plugin.cpp msgid "Set Region Rect" msgstr "" @@ -5897,14 +5933,17 @@ msgid "Auto Slice" msgstr "" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Offset:" msgstr "" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Step:" msgstr "" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Separation:" msgstr "" @@ -6052,6 +6091,11 @@ msgstr "Font" msgid "Color" msgstr "Färg" +#: editor/plugins/theme_editor_plugin.cpp +#, fuzzy +msgid "Theme" +msgstr "Spara Tema" + #: editor/plugins/tile_map_editor_plugin.cpp msgid "Erase Selection" msgstr "" @@ -6156,6 +6200,31 @@ msgstr "" msgid "Error" msgstr "Fel" +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "Autotiles" +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "" +"Select sub-tile to use as icon, this will be also used on invalid autotile " +"bindings." +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "" +"LMB: set bit on.\n" +"RMB: set bit off." +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +#, fuzzy +msgid "Select current edited sub-tile." +msgstr "Skapa Mapp" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "Select sub-tile to change it's priority." +msgstr "" + #: editor/progress_dialog.cpp scene/gui/dialogs.cpp #, fuzzy msgid "Cancel" @@ -6281,11 +6350,24 @@ msgid "Please choose a folder that does not contain a 'project.godot' file." msgstr "" #: editor/project_manager.cpp +msgid "That's a BINGO!" +msgstr "Det är en BINGO!" + +#: editor/project_manager.cpp msgid "Imported Project" msgstr "" #: editor/project_manager.cpp #, fuzzy +msgid "Couldn't create folder." +msgstr "Kunde inte skapa mapp." + +#: editor/project_manager.cpp +msgid "There is already a folder in this path with the specified name." +msgstr "" + +#: editor/project_manager.cpp +#, fuzzy msgid "It would be a good idea to name your project." msgstr "Det vore en bra idé att namnge ditt projekt." @@ -6330,16 +6412,31 @@ msgstr "Importera Befintligt Projekt" #: editor/project_manager.cpp #, fuzzy +msgid "Import & Edit" +msgstr "Importera" + +#: editor/project_manager.cpp +#, fuzzy msgid "Create New Project" msgstr "Skapa Nytt Projekt" #: editor/project_manager.cpp #, fuzzy +msgid "Create & Edit" +msgstr "Skapa Skript" + +#: editor/project_manager.cpp +#, fuzzy msgid "Install Project:" msgstr "Installera Projekt:" #: editor/project_manager.cpp #, fuzzy +msgid "Install & Edit" +msgstr "Installera" + +#: editor/project_manager.cpp +#, fuzzy msgid "Project Name:" msgstr "Projektnamn:" @@ -6357,10 +6454,6 @@ msgid "Browse" msgstr "Bläddra" #: editor/project_manager.cpp -msgid "That's a BINGO!" -msgstr "Det är en BINGO!" - -#: editor/project_manager.cpp #, fuzzy msgid "Unnamed Project" msgstr "Namnlöst Projekt" @@ -6409,6 +6502,11 @@ msgstr "" #: editor/project_manager.cpp #, fuzzy +msgid "Project Manager" +msgstr "Projektledare" + +#: editor/project_manager.cpp +#, fuzzy msgid "Project List" msgstr "Projektlista" @@ -6545,12 +6643,6 @@ msgid "Button 9" msgstr "" #: editor/project_settings_editor.cpp -#: modules/visual_script/visual_script_editor.cpp -#, fuzzy -msgid "Change" -msgstr "Ändra" - -#: editor/project_settings_editor.cpp msgid "Joypad Axis Index:" msgstr "" @@ -7045,8 +7137,9 @@ msgid "Error duplicating scene to save it." msgstr "" #: editor/scene_tree_dock.cpp -msgid "Sub-Resources:" -msgstr "" +#, fuzzy +msgid "Sub-Resources" +msgstr "Resurser" #: editor/scene_tree_dock.cpp msgid "Clear Inheritance" @@ -7365,7 +7458,7 @@ msgstr "Funktion:" msgid "Pick one or more items from the list to display the graph." msgstr "" -#: editor/script_editor_debugger.cpp +#: editor/script_editor_debugger.cpp modules/mono/editor/mono_bottom_panel.cpp #, fuzzy msgid "Errors" msgstr "Fel" @@ -7376,6 +7469,11 @@ msgid "Child Process Connected" msgstr "Barnprocess Ansluten" #: editor/script_editor_debugger.cpp +#, fuzzy +msgid "Copy Error" +msgstr "Fel" + +#: editor/script_editor_debugger.cpp msgid "Inspect Previous Instance" msgstr "" @@ -7740,10 +7838,58 @@ msgstr "" msgid "Pick Distance:" msgstr "" +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Generating solution..." +msgstr "Skapar konturer..." + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Generating C# project..." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Failed to create solution." +msgstr "Misslyckades att ladda resurs." + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Failed to save solution." +msgstr "Misslyckades att ladda resurs." + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Done" +msgstr "Klar!" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Failed to create C# project." +msgstr "Misslyckades att ladda resurs." + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Mono" +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Create C# solution" +msgstr "Skapa Prenumeration" + #: modules/mono/editor/mono_bottom_panel.cpp msgid "Builds" msgstr "" +#: modules/mono/editor/mono_bottom_panel.cpp +#, fuzzy +msgid "Build Project" +msgstr "Projekt" + +#: modules/mono/editor/mono_bottom_panel.cpp +#, fuzzy +msgid "Warnings" +msgstr "Varning" + #: modules/visual_script/visual_script.cpp msgid "" "A node yielded without working memory, please read the docs on how to yield " @@ -8115,23 +8261,29 @@ msgstr "Kör exporterad HTML i systemets standardwebbläsare." #: platform/javascript/export/export.cpp #, fuzzy -msgid "Could not write file:\n" +msgid "Could not write file:" msgstr "Kunde inte skriva till filen:\n" #: platform/javascript/export/export.cpp -msgid "Could not open template for export:\n" -msgstr "" +#, fuzzy +msgid "Could not open template for export:" +msgstr "Kunde inte skapa mapp." #: platform/javascript/export/export.cpp -msgid "Invalid export template:\n" +msgid "Invalid export template:" msgstr "" #: platform/javascript/export/export.cpp -msgid "Could not read custom HTML shell:\n" +msgid "Could not read custom HTML shell:" msgstr "" #: platform/javascript/export/export.cpp -msgid "Could not read boot splash image file:\n" +#, fuzzy +msgid "Could not read boot splash image file:" +msgstr "Kunde inte skriva till filen:\n" + +#: platform/javascript/export/export.cpp +msgid "Using default boot splash image." msgstr "" #: scene/2d/animated_sprite.cpp @@ -8418,8 +8570,8 @@ msgstr "" #: scene/main/scene_tree.cpp msgid "" -"Default Environment as specified in Project Setings (Rendering -> Viewport -" -"> Default Environment) could not be loaded." +"Default Environment as specified in Project Setings (Rendering -> " +"Environment -> Default Environment) could not be loaded." msgstr "" #: scene/main/viewport.cpp @@ -8450,13 +8602,13 @@ msgstr "Fel vid laddning av font." msgid "Invalid font size." msgstr "Ogiltig teckenstorlek." +#, fuzzy +#~ msgid "preview" +#~ msgstr "förhandsgranska" + #~ msgid "Move Add Key" #~ msgstr "Flytta Lägg Till Nyckel" -#, fuzzy -#~ msgid "Create Subscription" -#~ msgstr "Skapa Prenumeration" - #~ msgid "List:" #~ msgstr "Lista:" diff --git a/editor/translations/ta.po b/editor/translations/ta.po index 30b6f45c0b..d7362178a4 100644 --- a/editor/translations/ta.po +++ b/editor/translations/ta.po @@ -198,8 +198,7 @@ msgstr "" #: 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 +#: editor/plugins/particles_editor_plugin.cpp editor/script_create_dialog.cpp msgid "Create" msgstr "" @@ -550,6 +549,15 @@ msgid "Signals" msgstr "" #: editor/create_dialog.cpp +msgid "Change %s Type" +msgstr "" + +#: editor/create_dialog.cpp editor/project_settings_editor.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Change" +msgstr "" + +#: editor/create_dialog.cpp msgid "Create New %s" msgstr "" @@ -655,7 +663,7 @@ msgid "" msgstr "" #: editor/dependency_editor.cpp -msgid "Cannot remove:\n" +msgid "Cannot remove:" msgstr "" #: editor/dependency_editor.cpp @@ -738,8 +746,8 @@ msgstr "" msgid "Lead Developer" msgstr "" -#: editor/editor_about.cpp editor/project_manager.cpp -msgid "Project Manager" +#: editor/editor_about.cpp +msgid "Project Manager " msgstr "" #: editor/editor_about.cpp @@ -824,7 +832,7 @@ msgid "Success!" msgstr "" #: editor/editor_asset_installer.cpp -#: editor/plugins/asset_library_editor_plugin.cpp editor/project_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp msgid "Install" msgstr "" @@ -1131,7 +1139,7 @@ msgid "Packing" msgstr "" #: editor/editor_export.cpp platform/javascript/export/export.cpp -msgid "Template file not found:\n" +msgid "Template file not found:" msgstr "" #: editor/editor_file_dialog.cpp scene/gui/file_dialog.cpp @@ -1385,6 +1393,10 @@ msgstr "" msgid "Clear" msgstr "" +#: editor/editor_log.cpp +msgid "Clear Output" +msgstr "" + #: editor/editor_node.cpp editor/plugins/animation_player_editor_plugin.cpp msgid "Error saving resource!" msgstr "" @@ -1448,7 +1460,8 @@ msgstr "" #: editor/editor_node.cpp msgid "" -"Couldn't save scene. Likely dependencies (instances) couldn't be satisfied." +"Couldn't save scene. Likely dependencies (instances or inheritance) couldn't " +"be satisfied." msgstr "" #: editor/editor_node.cpp @@ -2380,7 +2393,7 @@ msgid "No version.txt found inside templates." msgstr "" #: editor/export_template_manager.cpp -msgid "Error creating path for templates:\n" +msgid "Error creating path for templates:" msgstr "" #: editor/export_template_manager.cpp @@ -2534,9 +2547,7 @@ msgid "View items as a list" msgstr "" #: editor/filesystem_dock.cpp -msgid "" -"\n" -"Status: Import of file failed. Please fix file and reimport manually." +msgid "Status: Import of file failed. Please fix file and reimport manually." msgstr "" #: editor/filesystem_dock.cpp @@ -2544,19 +2555,19 @@ msgid "Cannot move/rename resources root." msgstr "" #: editor/filesystem_dock.cpp -msgid "Cannot move a folder into itself.\n" +msgid "Cannot move a folder into itself." msgstr "" #: editor/filesystem_dock.cpp -msgid "Error moving:\n" +msgid "Error moving:" msgstr "" #: editor/filesystem_dock.cpp -msgid "Error duplicating:\n" +msgid "Error duplicating:" msgstr "" #: editor/filesystem_dock.cpp -msgid "Unable to update dependencies:\n" +msgid "Unable to update dependencies:" msgstr "" #: editor/filesystem_dock.cpp @@ -3194,6 +3205,10 @@ msgstr "" msgid "Filters.." msgstr "" +#: editor/plugins/animation_tree_editor_plugin.cpp +msgid "AnimationTree" +msgstr "" + #: editor/plugins/asset_library_editor_plugin.cpp msgid "Free" msgstr "" @@ -3359,6 +3374,7 @@ msgid "Bake Lightmaps" msgstr "" #: editor/plugins/camera_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Preview" msgstr "" @@ -4042,7 +4058,7 @@ msgid "Bake!" msgstr "" #: editor/plugins/navigation_mesh_editor_plugin.cpp -msgid "Bake the navigation mesh.\n" +msgid "Bake the navigation mesh." msgstr "" #: editor/plugins/navigation_mesh_editor_plugin.cpp @@ -4431,14 +4447,16 @@ msgstr "" msgid "Paste" msgstr "" +#: editor/plugins/resource_preloader_editor_plugin.cpp +msgid "ResourcePreloader" +msgstr "" + #: editor/plugins/script_editor_plugin.cpp msgid "Clear Recent Files" msgstr "" #: editor/plugins/script_editor_plugin.cpp -msgid "" -"Close and save changes?\n" -"\"" +msgid "Close and save changes?" msgstr "" #: editor/plugins/script_editor_plugin.cpp @@ -4514,6 +4532,10 @@ msgid "Copy Script Path" msgstr "" #: editor/plugins/script_editor_plugin.cpp +msgid "Show In File System" +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp msgid "History Prev" msgstr "" @@ -4945,83 +4967,83 @@ msgid "Rotating %s degrees." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Bottom View." +msgid "Keying is disabled (no key inserted)." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Bottom" +msgid "Animation Key Inserted." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Top View." +msgid "Objects Drawn" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Rear View." +msgid "Material Changes" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Rear" +msgid "Shader Changes" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Front View." +msgid "Surface Changes" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Front" +msgid "Draw Calls" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Left View." +msgid "Vertices" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Left" +msgid "FPS" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Right View." +msgid "Top View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Right" +msgid "Bottom View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Keying is disabled (no key inserted)." +msgid "Bottom" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Animation Key Inserted." +msgid "Left View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Objects Drawn" +msgid "Left" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Material Changes" +msgid "Right View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Shader Changes" +msgid "Right" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Surface Changes" +msgid "Front View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Draw Calls" +msgid "Front" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Vertices" +msgid "Rear View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "FPS" +msgid "Rear" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp @@ -5109,15 +5131,11 @@ 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" +msgid "Select Mode (Q)" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp @@ -5392,10 +5410,18 @@ msgstr "" msgid "Move (After)" msgstr "" +#: editor/plugins/sprite_frames_editor_plugin.cpp +msgid "SpriteFrames" +msgstr "" + #: editor/plugins/style_box_editor_plugin.cpp msgid "StyleBox Preview:" msgstr "" +#: editor/plugins/style_box_editor_plugin.cpp +msgid "StyleBox" +msgstr "" + #: editor/plugins/texture_region_editor_plugin.cpp msgid "Set Region Rect" msgstr "" @@ -5421,14 +5447,17 @@ msgid "Auto Slice" msgstr "" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Offset:" msgstr "" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Step:" msgstr "" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Separation:" msgstr "" @@ -5566,6 +5595,10 @@ msgstr "" msgid "Color" msgstr "" +#: editor/plugins/theme_editor_plugin.cpp +msgid "Theme" +msgstr "" + #: editor/plugins/tile_map_editor_plugin.cpp msgid "Erase Selection" msgstr "" @@ -5666,6 +5699,30 @@ msgstr "" msgid "Error" msgstr "" +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "Autotiles" +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "" +"Select sub-tile to use as icon, this will be also used on invalid autotile " +"bindings." +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "" +"LMB: set bit on.\n" +"RMB: set bit off." +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "Select current edited sub-tile." +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "Select sub-tile to change it's priority." +msgstr "" + #: editor/progress_dialog.cpp scene/gui/dialogs.cpp msgid "Cancel" msgstr "" @@ -5783,10 +5840,22 @@ msgid "Please choose a folder that does not contain a 'project.godot' file." msgstr "" #: editor/project_manager.cpp +msgid "That's a BINGO!" +msgstr "" + +#: editor/project_manager.cpp msgid "Imported Project" msgstr "" #: editor/project_manager.cpp +msgid "Couldn't create folder." +msgstr "" + +#: editor/project_manager.cpp +msgid "There is already a folder in this path with the specified name." +msgstr "" + +#: editor/project_manager.cpp msgid "It would be a good idea to name your project." msgstr "" @@ -5827,14 +5896,26 @@ msgid "Import Existing Project" msgstr "" #: editor/project_manager.cpp +msgid "Import & Edit" +msgstr "" + +#: editor/project_manager.cpp msgid "Create New Project" msgstr "" #: editor/project_manager.cpp +msgid "Create & Edit" +msgstr "" + +#: editor/project_manager.cpp msgid "Install Project:" msgstr "" #: editor/project_manager.cpp +msgid "Install & Edit" +msgstr "" + +#: editor/project_manager.cpp msgid "Project Name:" msgstr "" @@ -5851,10 +5932,6 @@ msgid "Browse" msgstr "" #: editor/project_manager.cpp -msgid "That's a BINGO!" -msgstr "" - -#: editor/project_manager.cpp msgid "Unnamed Project" msgstr "" @@ -5900,6 +5977,10 @@ msgid "" msgstr "" #: editor/project_manager.cpp +msgid "Project Manager" +msgstr "" + +#: editor/project_manager.cpp msgid "Project List" msgstr "" @@ -6026,11 +6107,6 @@ 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 "" @@ -6496,7 +6572,7 @@ msgid "Error duplicating scene to save it." msgstr "" #: editor/scene_tree_dock.cpp -msgid "Sub-Resources:" +msgid "Sub-Resources" msgstr "" #: editor/scene_tree_dock.cpp @@ -6787,7 +6863,7 @@ msgstr "" msgid "Pick one or more items from the list to display the graph." msgstr "" -#: editor/script_editor_debugger.cpp +#: editor/script_editor_debugger.cpp modules/mono/editor/mono_bottom_panel.cpp msgid "Errors" msgstr "" @@ -6796,6 +6872,10 @@ msgid "Child Process Connected" msgstr "" #: editor/script_editor_debugger.cpp +msgid "Copy Error" +msgstr "" + +#: editor/script_editor_debugger.cpp msgid "Inspect Previous Instance" msgstr "" @@ -7141,10 +7221,50 @@ msgstr "" msgid "Pick Distance:" msgstr "" +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Generating solution..." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Generating C# project..." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Failed to create solution." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Failed to save solution." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Done" +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Failed to create C# project." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Mono" +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Create C# solution" +msgstr "" + #: modules/mono/editor/mono_bottom_panel.cpp msgid "Builds" msgstr "" +#: modules/mono/editor/mono_bottom_panel.cpp +msgid "Build Project" +msgstr "" + +#: modules/mono/editor/mono_bottom_panel.cpp +msgid "Warnings" +msgstr "" + #: modules/visual_script/visual_script.cpp msgid "" "A node yielded without working memory, please read the docs on how to yield " @@ -7490,23 +7610,27 @@ msgid "Run exported HTML in the system's default browser." msgstr "" #: platform/javascript/export/export.cpp -msgid "Could not write file:\n" +msgid "Could not write file:" +msgstr "" + +#: platform/javascript/export/export.cpp +msgid "Could not open template for export:" msgstr "" #: platform/javascript/export/export.cpp -msgid "Could not open template for export:\n" +msgid "Invalid export template:" msgstr "" #: platform/javascript/export/export.cpp -msgid "Invalid export template:\n" +msgid "Could not read custom HTML shell:" msgstr "" #: platform/javascript/export/export.cpp -msgid "Could not read custom HTML shell:\n" +msgid "Could not read boot splash image file:" msgstr "" #: platform/javascript/export/export.cpp -msgid "Could not read boot splash image file:\n" +msgid "Using default boot splash image." msgstr "" #: scene/2d/animated_sprite.cpp @@ -7759,8 +7883,8 @@ msgstr "" #: scene/main/scene_tree.cpp msgid "" -"Default Environment as specified in Project Setings (Rendering -> Viewport -" -"> Default Environment) could not be loaded." +"Default Environment as specified in Project Setings (Rendering -> " +"Environment -> Default Environment) could not be loaded." msgstr "" #: scene/main/viewport.cpp diff --git a/editor/translations/th.po b/editor/translations/th.po index 69ba3b2279..fac87388a4 100644 --- a/editor/translations/th.po +++ b/editor/translations/th.po @@ -9,15 +9,15 @@ msgid "" msgstr "" "Project-Id-Version: Godot Engine editor\n" -"PO-Revision-Date: 2017-12-03 07:50+0000\n" -"Last-Translator: Kaveeta Vivatchai <katviv@protonmail.com>\n" +"PO-Revision-Date: 2018-01-06 13:19+0000\n" +"Last-Translator: Poommetee Ketson <poommetee@protonmail.com>\n" "Language-Team: Thai <https://hosted.weblate.org/projects/godot-engine/godot/" "th/>\n" "Language: th\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.18-dev\n" +"X-Generator: Weblate 2.19-dev\n" #: editor/animation_editor.cpp msgid "Disabled" @@ -28,9 +28,8 @@ msgid "All Selection" msgstr "เลืà¸à¸à¸—ั้งหมด" #: editor/animation_editor.cpp -#, fuzzy msgid "Anim Change Keyframe Time" -msgstr "à¹à¸à¹‰à¹„ขค่าà¹à¸à¸™à¸´à¹€à¸¡à¸Šà¸±à¸™" +msgstr "à¹à¸à¹‰à¹„ขเวลาคีย์เฟรมà¹à¸à¸™à¸´à¹€à¸¡à¸Šà¸±à¸™" #: editor/animation_editor.cpp msgid "Anim Change Transition" @@ -41,9 +40,8 @@ msgid "Anim Change Transform" msgstr "เคลื่à¸à¸™à¸¢à¹‰à¸²à¸¢à¹à¸à¸™à¸´à¹€à¸¡à¸Šà¸±à¸™" #: editor/animation_editor.cpp -#, fuzzy msgid "Anim Change Keyframe Value" -msgstr "à¹à¸à¹‰à¹„ขค่าà¹à¸à¸™à¸´à¹€à¸¡à¸Šà¸±à¸™" +msgstr "à¹à¸à¹‰à¹„ขค่าคีย์เฟรมà¹à¸à¸™à¸´à¹€à¸¡à¸Šà¸±à¸™" #: editor/animation_editor.cpp msgid "Anim Change Call" @@ -199,8 +197,7 @@ msgstr "เพิ่ม %d à¹à¸—ร็à¸à¹ƒà¸«à¸¡à¹ˆà¹à¸¥à¸°à¹€à¸žà¸´à¹ˆà¸¡à¸ #: 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 +#: editor/plugins/particles_editor_plugin.cpp editor/script_create_dialog.cpp msgid "Create" msgstr "สร้าง" @@ -534,9 +531,8 @@ msgid "Connecting Signal:" msgstr "เชื่à¸à¸¡à¹‚ยงสัà¸à¸à¸²à¸“:" #: editor/connections_dialog.cpp -#, fuzzy msgid "Disconnect '%s' from '%s'" -msgstr "เชื่à¸à¸¡ '%s' à¸à¸±à¸š '%s'" +msgstr "ลบà¸à¸²à¸£à¹€à¸Šà¸·à¹ˆà¸à¸¡à¹‚ยง '%s' à¸à¸±à¸š '%s'" #: editor/connections_dialog.cpp msgid "Connect.." @@ -553,8 +549,17 @@ msgstr "สัà¸à¸à¸²à¸“" #: editor/create_dialog.cpp #, fuzzy +msgid "Change %s Type" +msgstr "เปลี่ยนประเภท" + +#: editor/create_dialog.cpp editor/project_settings_editor.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Change" +msgstr "เปลี่ยน" + +#: editor/create_dialog.cpp msgid "Create New %s" -msgstr "สร้างใหม่" +msgstr "สร้าง %s ใหม่" #: editor/create_dialog.cpp editor/editor_file_dialog.cpp #: editor/filesystem_dock.cpp @@ -664,7 +669,8 @@ msgstr "" "ยืนยันจะลบหรืà¸à¹„ม่? (ย้à¸à¸™à¸à¸¥à¸±à¸šà¹„ม่ได้)" #: editor/dependency_editor.cpp -msgid "Cannot remove:\n" +#, fuzzy +msgid "Cannot remove:" msgstr "ไม่สามารถลบ:\n" #: editor/dependency_editor.cpp @@ -741,14 +747,15 @@ msgstr "ผู้ช่วยพัฒนา Godot Engine" #: editor/editor_about.cpp msgid "Project Founders" -msgstr "ผู้บุà¸à¹€à¸šà¸´à¸à¹‚ครงà¸à¸²à¸£" +msgstr "ผู้ริเริ่มโครงà¸à¸²à¸£" #: editor/editor_about.cpp msgid "Lead Developer" msgstr "ผู้พัฒนาหลัà¸" -#: editor/editor_about.cpp editor/project_manager.cpp -msgid "Project Manager" +#: editor/editor_about.cpp +#, fuzzy +msgid "Project Manager " msgstr "ตัวจัดà¸à¸²à¸£à¹‚ปรเจà¸à¸•à¹Œ" #: editor/editor_about.cpp @@ -836,7 +843,7 @@ msgid "Success!" msgstr "สำเร็จ!" #: editor/editor_asset_installer.cpp -#: editor/plugins/asset_library_editor_plugin.cpp editor/project_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp msgid "Install" msgstr "ติดตั้ง" @@ -857,9 +864,8 @@ msgid "Rename Audio Bus" msgstr "เปลี่ยนชื่ภAudio Bus" #: editor/editor_audio_buses.cpp -#, fuzzy msgid "Change Audio Bus Volume" -msgstr "สลับ Solo ขà¸à¸‡ Audio Bus" +msgstr "ปรับระดับเสียง Audio Bus" #: editor/editor_audio_buses.cpp msgid "Toggle Audio Bus Solo" @@ -924,7 +930,7 @@ msgstr "ลบเà¸à¸Ÿà¹€à¸Ÿà¸à¸•à¹Œ" #: editor/editor_audio_buses.cpp msgid "Audio" -msgstr "" +msgstr "เสียง" #: editor/editor_audio_buses.cpp msgid "Add Audio Bus" @@ -1099,13 +1105,12 @@ msgid "Updating scene.." msgstr "à¸à¸±à¸žà¹€à¸”ทฉาà¸.." #: editor/editor_data.cpp -#, fuzzy msgid "[empty]" -msgstr "(ว่างเปล่า)" +msgstr "[ว่างเปล่า]" #: editor/editor_data.cpp msgid "[unsaved]" -msgstr "" +msgstr "[ไฟล์ใหม่]" #: editor/editor_dir_dialog.cpp msgid "Please select a base directory first" @@ -1145,7 +1150,8 @@ msgid "Packing" msgstr "à¸à¸³à¸¥à¸±à¸‡à¸£à¸§à¸šà¸£à¸§à¸¡" #: editor/editor_export.cpp platform/javascript/export/export.cpp -msgid "Template file not found:\n" +#, fuzzy +msgid "Template file not found:" msgstr "ไม่พบà¹à¸¡à¹ˆà¹à¸šà¸š:\n" #: editor/editor_file_dialog.cpp scene/gui/file_dialog.cpp @@ -1399,6 +1405,11 @@ msgstr "ข้à¸à¸„วาม:" msgid "Clear" msgstr "ลบ" +#: editor/editor_log.cpp +#, fuzzy +msgid "Clear Output" +msgstr "ข้à¸à¸„วาม" + #: editor/editor_node.cpp editor/plugins/animation_player_editor_plugin.cpp msgid "Error saving resource!" msgstr "บันทึà¸à¸£à¸µà¸‹à¸à¸£à¹Œà¸ªà¸œà¸´à¸”พลาด!" @@ -1461,8 +1472,10 @@ msgid "This operation can't be done without a tree root." msgstr "ทำไม่ได้ถ้าไม่มีฉาà¸" #: editor/editor_node.cpp +#, fuzzy msgid "" -"Couldn't save scene. Likely dependencies (instances) couldn't be satisfied." +"Couldn't save scene. Likely dependencies (instances or inheritance) couldn't " +"be satisfied." msgstr "บันทึà¸à¸‰à¸²à¸à¹„ม่ได้ à¸à¸²à¸ˆà¸ˆà¸°à¸¡à¸µà¸à¸²à¸£à¸à¹‰à¸²à¸‡à¸à¸´à¸‡à¹„ม่สมบูรณ์" #: editor/editor_node.cpp @@ -2313,14 +2326,12 @@ msgid "Frame #:" msgstr "เฟรมที่:" #: editor/editor_profiler.cpp -#, fuzzy msgid "Time" -msgstr "เวลา:" +msgstr "เวลา" #: editor/editor_profiler.cpp -#, fuzzy msgid "Calls" -msgstr "เรียà¸" +msgstr "จำนวนครั้ง" #: editor/editor_run_native.cpp msgid "Select device from the list" @@ -2425,7 +2436,8 @@ msgid "No version.txt found inside templates." msgstr "ไม่พบ version.txt ในà¹à¸¡à¹ˆà¹à¸šà¸š" #: editor/export_template_manager.cpp -msgid "Error creating path for templates:\n" +#, fuzzy +msgid "Error creating path for templates:" msgstr "ผิดพลาดขณะสร้างตำà¹à¸«à¸™à¹ˆà¸‡à¹à¸¡à¹ˆà¹à¸šà¸š:\n" #: editor/export_template_manager.cpp @@ -2459,7 +2471,6 @@ msgstr "ไม่มีà¸à¸²à¸£à¸•à¸à¸šà¸à¸¥à¸±à¸š" #: editor/export_template_manager.cpp #: editor/plugins/asset_library_editor_plugin.cpp -#, fuzzy msgid "Request Failed." msgstr "ร้à¸à¸‡à¸‚à¸à¸œà¸´à¸”พลาด" @@ -2507,7 +2518,6 @@ msgid "Connecting.." msgstr "à¸à¸³à¸¥à¸±à¸‡à¹€à¸Šà¸·à¹ˆà¸à¸¡à¸•à¹ˆà¸.." #: editor/export_template_manager.cpp -#, fuzzy msgid "Can't Connect" msgstr "เชื่à¸à¸¡à¸•à¹ˆà¸à¹„ม่ได้" @@ -2581,9 +2591,8 @@ msgid "View items as a list" msgstr "à¹à¸ªà¸”งเป็นรายชื่à¸à¹„ฟล์" #: editor/filesystem_dock.cpp -msgid "" -"\n" -"Status: Import of file failed. Please fix file and reimport manually." +#, fuzzy +msgid "Status: Import of file failed. Please fix file and reimport manually." msgstr "" "\n" "สถานะ: นำเข้าไฟล์ล้มเหลว à¸à¸£à¸¸à¸“าà¹à¸à¹‰à¹„ขไฟล์à¹à¸¥à¸°à¸™à¸³à¹€à¸‚้าใหม่" @@ -2593,20 +2602,23 @@ msgid "Cannot move/rename resources root." msgstr "ไม่สามารถย้าย/เปลี่ยนชื่à¸à¹‚ฟลเดà¸à¸£à¹Œà¸£à¸²à¸" #: editor/filesystem_dock.cpp -msgid "Cannot move a folder into itself.\n" +#, fuzzy +msgid "Cannot move a folder into itself." msgstr "ย้ายโฟลเดà¸à¸£à¹Œà¸¡à¸²à¸‚้างในตัวมันเà¸à¸‡à¹„ม่ได้\n" #: editor/filesystem_dock.cpp -msgid "Error moving:\n" +#, fuzzy +msgid "Error moving:" msgstr "ผิดพลาดขณะย้าย:\n" #: editor/filesystem_dock.cpp #, fuzzy -msgid "Error duplicating:\n" -msgstr "ผิดพลาดขณะโหลด:" +msgid "Error duplicating:" +msgstr "ผิดพลาดขณะทำซ้ำ:\n" #: editor/filesystem_dock.cpp -msgid "Unable to update dependencies:\n" +#, fuzzy +msgid "Unable to update dependencies:" msgstr "ไม่สามารถà¸à¸±à¸žà¹€à¸”ทà¸à¸²à¸£à¸à¹‰à¸²à¸‡à¸à¸´à¸‡:\n" #: editor/filesystem_dock.cpp @@ -2638,14 +2650,12 @@ msgid "Renaming folder:" msgstr "เปลี่ยนชื่à¸à¹‚ฟลเดà¸à¸£à¹Œ:" #: editor/filesystem_dock.cpp -#, fuzzy msgid "Duplicating file:" -msgstr "ทำซ้ำ" +msgstr "ทำซ้ำไฟล์:" #: editor/filesystem_dock.cpp -#, fuzzy msgid "Duplicating folder:" -msgstr "เปลี่ยนชื่à¸à¹‚ฟลเดà¸à¸£à¹Œ:" +msgstr "ทำซ้ำโฟลเดà¸à¸£à¹Œ:" #: editor/filesystem_dock.cpp msgid "Expand all" @@ -2664,7 +2674,6 @@ msgid "Move To.." msgstr "ย้ายไป.." #: editor/filesystem_dock.cpp -#, fuzzy msgid "Open Scene(s)" msgstr "เปิดไฟล์ฉาà¸" @@ -2681,9 +2690,8 @@ msgid "View Owners.." msgstr "ดูเจ้าขà¸à¸‡.." #: editor/filesystem_dock.cpp -#, fuzzy msgid "Duplicate.." -msgstr "ทำซ้ำ" +msgstr "ทำซ้ำ.." #: editor/filesystem_dock.cpp msgid "Previous Directory" @@ -2780,14 +2788,12 @@ msgid "Importing Scene.." msgstr "à¸à¸³à¸¥à¸±à¸‡à¸™à¸³à¹€à¸‚้าฉาà¸.." #: editor/import/resource_importer_scene.cpp -#, fuzzy msgid "Generating Lightmaps" -msgstr "ส่งผ่านไปยัง Lightmaps:" +msgstr "à¸à¸³à¸¥à¸±à¸‡à¸ªà¸£à¹‰à¸²à¸‡ Lightmaps" #: editor/import/resource_importer_scene.cpp -#, fuzzy msgid "Generating for Mesh: " -msgstr "สร้างเส้นà¸à¸£à¸à¸š" +msgstr "สร้างสำหรับพื้นผิว: " #: editor/import/resource_importer_scene.cpp msgid "Running Custom Script.." @@ -3255,6 +3261,11 @@ msgstr "à¹à¸à¹‰à¹„ขตัวà¸à¸£à¸à¸‡à¹‚หนด" msgid "Filters.." msgstr "ตัวà¸à¸£à¸à¸‡.." +#: editor/plugins/animation_tree_editor_plugin.cpp +#, fuzzy +msgid "AnimationTree" +msgstr "à¹à¸à¸™à¸´à¹€à¸¡à¸Šà¸±à¸™" + #: editor/plugins/asset_library_editor_plugin.cpp msgid "Free" msgstr "ฟรี" @@ -3404,23 +3415,26 @@ msgid "" "Save your scene (for images to be saved in the same dir), or pick a save " "path from the BakedLightmap properties." msgstr "" +"ไม่สามารถเลืà¸à¸à¸•à¸³à¹à¸«à¸™à¹ˆà¸‡à¸—ี่จะบันทึà¸à¸ าพ lightmap\n" +"à¸à¸£à¸¸à¸“าบันทึà¸à¸‰à¸²à¸ (เพื่à¸à¸šà¸±à¸™à¸—ึà¸à¸ าพในโฟลเดà¸à¸£à¹Œà¹€à¸”ียวà¸à¸±à¸™) หรืà¸à¸£à¸°à¸šà¸¸à¸•à¸³à¹à¸«à¸™à¹ˆà¸‡à¹ƒà¸™à¸„ุณสมบัติขà¸à¸‡ BakedLightmap" #: editor/plugins/baked_lightmap_editor_plugin.cpp msgid "" "No meshes to bake. Make sure they contain an UV2 channel and that the 'Bake " "Light' flag is on." msgstr "" +"ไม่มีพื้นผิวให้สร้าง lightmap à¸à¸£à¸¸à¸“าตรวจสà¸à¸šà¸§à¹ˆà¸²à¸žà¸·à¹‰à¸™à¸œà¸´à¸§à¸¡à¸µ UV2 à¹à¸¥à¸°à¹„ด้เปิดใช้งาน 'Bake Light'" #: editor/plugins/baked_lightmap_editor_plugin.cpp msgid "Failed creating lightmap images, make sure path is writable." -msgstr "" +msgstr "ผิดพลาดขณะสร้างภาพ lightmap à¸à¸£à¸¸à¸“าตรวจสà¸à¸šà¸§à¹ˆà¸²à¸ªà¸²à¸¡à¸²à¸£à¸–เขียนไฟล์ในตำà¹à¸«à¸™à¹ˆà¸‡à¸—ี่บันทึà¸à¹„ด้" #: editor/plugins/baked_lightmap_editor_plugin.cpp -#, fuzzy msgid "Bake Lightmaps" -msgstr "ส่งผ่านไปยัง Lightmaps:" +msgstr "สร้าง Lightmaps" #: editor/plugins/camera_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Preview" msgstr "ตัวà¸à¸¢à¹ˆà¸²à¸‡" @@ -3931,19 +3945,19 @@ msgstr "สร้าง Mesh นำทาง" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Contained Mesh is not of type ArrayMesh." -msgstr "" +msgstr "Mesh ไม่ได้เป็นประเภท ArrayMesh" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "UV Unwrap failed, mesh may not be manifold?" -msgstr "" +msgstr "ผิดพลาดขณะสร้างà¹à¸œà¹ˆà¸™à¸„ลี่ UV พื้นผิวนี้ไม่สามารถคลี่ได้?" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "No mesh to debug." -msgstr "" +msgstr "ไม่มีพื้นผิวให้à¹à¸à¹‰à¹„ขจุดบà¸à¸žà¸£à¹ˆà¸à¸‡" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Model has no UV in this layer" -msgstr "" +msgstr "โมเดลไม่มี UV ในชั้นนี้" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "MeshInstance lacks a Mesh!" @@ -3986,18 +4000,16 @@ msgid "Create Outline Mesh.." msgstr "สร้างเส้นขà¸à¸š Mesh.." #: editor/plugins/mesh_instance_editor_plugin.cpp -#, fuzzy msgid "View UV1" -msgstr "มุมมà¸à¸‡" +msgstr "à¹à¸ªà¸”ง UV1" #: editor/plugins/mesh_instance_editor_plugin.cpp -#, fuzzy msgid "View UV2" -msgstr "มุมมà¸à¸‡" +msgstr "à¹à¸ªà¸”ง UV2" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Unwrap UV2 for Lightmap/AO" -msgstr "" +msgstr "สร้างà¹à¸œà¹ˆà¸™à¸„ลี่ UV2 สำหรับ Lightmap/AO" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Create Outline Mesh" @@ -4112,7 +4124,8 @@ msgid "Bake!" msgstr "สร้าง!" #: editor/plugins/navigation_mesh_editor_plugin.cpp -msgid "Bake the navigation mesh.\n" +#, fuzzy +msgid "Bake the navigation mesh." msgstr "สร้าง Mesh นำทาง\n" #: editor/plugins/navigation_mesh_editor_plugin.cpp @@ -4501,14 +4514,18 @@ msgstr "โหลดรีซà¸à¸£à¹Œà¸ª" msgid "Paste" msgstr "วาง" +#: editor/plugins/resource_preloader_editor_plugin.cpp +#, fuzzy +msgid "ResourcePreloader" +msgstr "ตำà¹à¸«à¸™à¹ˆà¸‡à¸£à¸µà¸‹à¸à¸£à¹Œà¸ª" + #: editor/plugins/script_editor_plugin.cpp msgid "Clear Recent Files" msgstr "ล้างรายà¸à¸²à¸£à¹„ฟล์ล่าสุด" #: editor/plugins/script_editor_plugin.cpp -msgid "" -"Close and save changes?\n" -"\"" +#, fuzzy +msgid "Close and save changes?" msgstr "" "ปิดà¹à¸¥à¸°à¸šà¸±à¸™à¸—ึà¸?\n" "\"" @@ -4582,9 +4599,13 @@ msgid "Soft Reload Script" msgstr "โหลดสคริปต์ใหม่" #: editor/plugins/script_editor_plugin.cpp -#, fuzzy msgid "Copy Script Path" -msgstr "คัดลà¸à¸à¸•à¸³à¹à¸«à¸™à¹ˆà¸‡" +msgstr "คัดลà¸à¸à¸•à¸³à¹à¸«à¸™à¹ˆà¸‡à¸ªà¸„ริปต์" + +#: editor/plugins/script_editor_plugin.cpp +#, fuzzy +msgid "Show In File System" +msgstr "เปิดในตัวจัดà¸à¸²à¸£à¹„ฟล์" #: editor/plugins/script_editor_plugin.cpp msgid "History Prev" @@ -4775,9 +4796,8 @@ msgid "Clone Down" msgstr "คัดลà¸à¸à¸šà¸£à¸£à¸—ัดลงมา" #: editor/plugins/script_text_editor.cpp -#, fuzzy msgid "Fold/Unfold Line" -msgstr "à¹à¸ªà¸”ง" +msgstr "ซ่à¸à¸™/à¹à¸ªà¸”งบรรทัด" #: editor/plugins/script_text_editor.cpp msgid "Fold All Lines" @@ -5021,84 +5041,84 @@ msgid "Rotating %s degrees." msgstr "หมุน %s à¸à¸‡à¸¨à¸²" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Bottom View." -msgstr "มุมล่าง" +msgid "Keying is disabled (no key inserted)." +msgstr "ยà¸à¹€à¸¥à¸´à¸à¸à¸²à¸£à¸ªà¸£à¹‰à¸²à¸‡à¸„ีย์ (ไม่ได้à¹à¸—รà¸à¸„ีย์)" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Bottom" -msgstr "ล่าง" +msgid "Animation Key Inserted." +msgstr "à¹à¸—รà¸à¸„ีย์à¹à¸à¸™à¸´à¹€à¸¡à¸Šà¸±à¸™" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Top View." -msgstr "มุมบน" +msgid "Objects Drawn" +msgstr "จำนวนวัตถุที่วาด" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Rear View." -msgstr "มุมหลัง" +msgid "Material Changes" +msgstr "จำนวนครั้งที่เปลี่ยนวัสดุ" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Rear" -msgstr "หลัง" +msgid "Shader Changes" +msgstr "จำนวนครั้งที่เปลี่ยน Shader" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Front View." -msgstr "มุมหน้า" +msgid "Surface Changes" +msgstr "จำนวนครั้งที่เปลี่ยนพื้นผิว" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Front" -msgstr "หน้า" +msgid "Draw Calls" +msgstr "จำนวนครั้งในà¸à¸²à¸£à¸§à¸²à¸”" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Left View." -msgstr "มุมซ้าย" +msgid "Vertices" +msgstr "มุมรูปทรง" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Left" -msgstr "ซ้าย" +msgid "FPS" +msgstr "เฟรมต่à¸à¸§à¸´à¸™à¸²à¸—ี" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Right View." -msgstr "มุมขวา" +msgid "Top View." +msgstr "มุมบน" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Right" -msgstr "ขวา" +msgid "Bottom View." +msgstr "มุมล่าง" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Keying is disabled (no key inserted)." -msgstr "ยà¸à¹€à¸¥à¸´à¸à¸à¸²à¸£à¸ªà¸£à¹‰à¸²à¸‡à¸„ีย์ (ไม่ได้à¹à¸—รà¸à¸„ีย์)" +msgid "Bottom" +msgstr "ล่าง" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Animation Key Inserted." -msgstr "à¹à¸—รà¸à¸„ีย์à¹à¸à¸™à¸´à¹€à¸¡à¸Šà¸±à¸™" +msgid "Left View." +msgstr "มุมซ้าย" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Objects Drawn" -msgstr "จำนวนวัตถุที่วาด" +msgid "Left" +msgstr "ซ้าย" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Material Changes" -msgstr "จำนวนครั้งที่เปลี่ยนวัสดุ" +msgid "Right View." +msgstr "มุมขวา" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Shader Changes" -msgstr "จำนวนครั้งที่เปลี่ยน Shader" +msgid "Right" +msgstr "ขวา" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Surface Changes" -msgstr "จำนวนครั้งที่เปลี่ยนพื้นผิว" +msgid "Front View." +msgstr "มุมหน้า" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Draw Calls" -msgstr "จำนวนครั้งในà¸à¸²à¸£à¸§à¸²à¸”" +msgid "Front" +msgstr "หน้า" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Vertices" -msgstr "มุมรูปทรง" +msgid "Rear View." +msgstr "มุมหลัง" #: editor/plugins/spatial_editor_plugin.cpp -msgid "FPS" -msgstr "เฟรมต่à¸à¸§à¸´à¸™à¸²à¸—ี" +msgid "Rear" +msgstr "หลัง" #: editor/plugins/spatial_editor_plugin.cpp msgid "Align with view" @@ -5185,15 +5205,12 @@ 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" +#, fuzzy +msgid "Select Mode (Q)" msgstr "โหมดเลืà¸à¸ (Q)\n" #: editor/plugins/spatial_editor_plugin.cpp @@ -5223,14 +5240,12 @@ msgid "Local Coords" msgstr "พิà¸à¸±à¸”ภายใน" #: editor/plugins/spatial_editor_plugin.cpp -#, fuzzy msgid "Local Space Mode (%s)" -msgstr "โหมดปรับขนาด (R)" +msgstr "โหมดพิà¸à¸±à¸”ภายใน (%s)" #: editor/plugins/spatial_editor_plugin.cpp -#, fuzzy msgid "Snap Mode (%s)" -msgstr "โหมดà¸à¸²à¸£à¸ˆà¸³à¸à¸±à¸”:" +msgstr "โหมดà¸à¸²à¸£à¸ˆà¸³à¸à¸±à¸” (%s)" #: editor/plugins/spatial_editor_plugin.cpp msgid "Bottom View" @@ -5347,7 +5362,7 @@ msgstr "ตัวเลืà¸à¸" #: editor/plugins/spatial_editor_plugin.cpp msgid "Skeleton Gizmo visibility" -msgstr "" +msgstr "à¹à¸ªà¸”งโครงà¸à¸£à¸°à¸”ูà¸" #: editor/plugins/spatial_editor_plugin.cpp msgid "Snap Settings" @@ -5473,10 +5488,20 @@ msgstr "ย้าย (à¸à¹ˆà¸à¸™)" msgid "Move (After)" msgstr "ย้าย (หลัง)" +#: editor/plugins/sprite_frames_editor_plugin.cpp +#, fuzzy +msgid "SpriteFrames" +msgstr "สà¹à¸•à¸„" + #: editor/plugins/style_box_editor_plugin.cpp msgid "StyleBox Preview:" msgstr "ตัวà¸à¸¢à¹ˆà¸²à¸‡ StyleBox:" +#: editor/plugins/style_box_editor_plugin.cpp +#, fuzzy +msgid "StyleBox" +msgstr "รูปà¹à¸šà¸š" + #: editor/plugins/texture_region_editor_plugin.cpp msgid "Set Region Rect" msgstr "à¸à¸³à¸«à¸™à¸”ขà¸à¸šà¹€à¸‚ต Texture" @@ -5502,14 +5527,17 @@ msgid "Auto Slice" msgstr "à¹à¸šà¹ˆà¸‡à¸à¸±à¸•à¹‚นมัติ" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Offset:" msgstr "เลื่à¸à¸™:" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Step:" msgstr "ขนาด:" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Separation:" msgstr "เว้น:" @@ -5647,6 +5675,10 @@ msgstr "ฟà¸à¸™à¸•à¹Œ" msgid "Color" msgstr "สี" +#: editor/plugins/theme_editor_plugin.cpp +msgid "Theme" +msgstr "ธีม" + #: editor/plugins/tile_map_editor_plugin.cpp msgid "Erase Selection" msgstr "ลบที่เลืà¸à¸" @@ -5732,9 +5764,8 @@ msgid "Merge from scene?" msgstr "รวมจาà¸à¸‰à¸²à¸?" #: editor/plugins/tile_set_editor_plugin.cpp -#, fuzzy msgid "Tile Set" -msgstr "TileSet.." +msgstr "Tile Set" #: editor/plugins/tile_set_editor_plugin.cpp msgid "Create from Scene" @@ -5748,6 +5779,32 @@ msgstr "รวมจาà¸à¸‰à¸²à¸" msgid "Error" msgstr "ผิดพลาด" +#: editor/plugins/tile_set_editor_plugin.cpp +#, fuzzy +msgid "Autotiles" +msgstr "à¹à¸šà¹ˆà¸‡à¸à¸±à¸•à¹‚นมัติ" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "" +"Select sub-tile to use as icon, this will be also used on invalid autotile " +"bindings." +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "" +"LMB: set bit on.\n" +"RMB: set bit off." +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +#, fuzzy +msgid "Select current edited sub-tile." +msgstr "บันทึà¸à¸£à¸µà¸‹à¸à¸£à¹Œà¸ªà¸—ี่à¸à¸³à¸¥à¸±à¸‡à¸›à¸£à¸±à¸šà¹à¸•à¹ˆà¸‡" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "Select sub-tile to change it's priority." +msgstr "" + #: editor/progress_dialog.cpp scene/gui/dialogs.cpp msgid "Cancel" msgstr "ยà¸à¹€à¸¥à¸´à¸" @@ -5865,10 +5922,23 @@ msgid "Please choose a folder that does not contain a 'project.godot' file." msgstr "à¸à¸£à¸¸à¸“าเลืà¸à¸à¹‚ฟลเดà¸à¸£à¹Œà¸—ี่ไม่มีไฟล์ 'project.godot'" #: editor/project_manager.cpp +msgid "That's a BINGO!" +msgstr "บิงโà¸!" + +#: editor/project_manager.cpp msgid "Imported Project" msgstr "นำเข้าโปรเจà¸à¸•à¹Œà¹à¸¥à¹‰à¸§" #: editor/project_manager.cpp +#, fuzzy +msgid "Couldn't create folder." +msgstr "ไม่สามารถสร้างโฟลเดà¸à¸£à¹Œ" + +#: editor/project_manager.cpp +msgid "There is already a folder in this path with the specified name." +msgstr "" + +#: editor/project_manager.cpp msgid "It would be a good idea to name your project." msgstr "ควรตั้งชื่à¸à¹‚ปรเจà¸à¸•à¹Œ" @@ -5909,14 +5979,29 @@ msgid "Import Existing Project" msgstr "นำเข้าโปรเจà¸à¸•à¹Œà¸—ี่มีà¸à¸¢à¸¹à¹ˆà¹€à¸”ิม" #: editor/project_manager.cpp +#, fuzzy +msgid "Import & Edit" +msgstr "นำเข้าà¹à¸¥à¸°à¹€à¸›à¸´à¸”" + +#: editor/project_manager.cpp msgid "Create New Project" msgstr "สร้างโปรเจà¸à¸•à¹Œà¹ƒà¸«à¸¡à¹ˆ" #: editor/project_manager.cpp +#, fuzzy +msgid "Create & Edit" +msgstr "สร้างตัวปะทุ" + +#: editor/project_manager.cpp msgid "Install Project:" msgstr "ติดตั้งโปรเจà¸à¸•à¹Œ:" #: editor/project_manager.cpp +#, fuzzy +msgid "Install & Edit" +msgstr "ติดตั้ง" + +#: editor/project_manager.cpp msgid "Project Name:" msgstr "ชื่à¸à¹‚ปรเจà¸à¸•à¹Œ:" @@ -5933,10 +6018,6 @@ msgid "Browse" msgstr "เลืà¸à¸" #: editor/project_manager.cpp -msgid "That's a BINGO!" -msgstr "บิงโà¸!" - -#: editor/project_manager.cpp msgid "Unnamed Project" msgstr "โปรเจà¸à¸•à¹Œà¹„ม่มีชื่à¸" @@ -5988,6 +6069,10 @@ msgid "" msgstr "จะทำà¸à¸²à¸£à¸ªà¹à¸à¸™à¸«à¸²à¹‚ปรเจà¸à¸•à¹Œà¹ƒà¸™ %s โฟลเดà¸à¸£à¹Œ ยืนยัน?" #: editor/project_manager.cpp +msgid "Project Manager" +msgstr "ตัวจัดà¸à¸²à¸£à¹‚ปรเจà¸à¸•à¹Œ" + +#: editor/project_manager.cpp msgid "Project List" msgstr "รายชื่à¸à¹‚ปรเจà¸à¸•à¹Œ" @@ -6024,7 +6109,7 @@ msgid "" "You don't currently have any projects.\n" "Would you like to explore the official example projects in the Asset Library?" msgstr "" -"คุณยังไม่มีโปรเจà¸à¸•à¹Œà¹ƒà¸”ๆ\n" +"คุณยังไม่มีโปรเจà¸à¸•à¹Œà¹ƒà¸” ๆ\n" "ต้à¸à¸‡à¸à¸²à¸£à¸ªà¸³à¸£à¸§à¸ˆà¹‚ปรเจà¸à¸•à¹Œà¸•à¸±à¸§à¸à¸¢à¹ˆà¸²à¸‡à¹ƒà¸™à¹à¸«à¸¥à¹ˆà¸‡à¸£à¸§à¸¡à¸—รัพยาà¸à¸£à¸«à¸£à¸·à¸à¹„ม่?" #: editor/project_settings_editor.cpp @@ -6057,7 +6142,7 @@ msgstr "เปลี่ยนชื่à¸à¸à¸²à¸£à¸à¸£à¸°à¸—ำ" #: editor/project_settings_editor.cpp msgid "Add Input Action Event" -msgstr "เพิ่มà¸à¸²à¸£à¸à¸£à¸°à¸—ำ" +msgstr "เพิ่มปุ่มà¸à¸”ขà¸à¸‡à¸à¸²à¸£à¸à¸£à¸°à¸—ำ" #: editor/project_settings_editor.cpp editor/settings_config_dialog.cpp msgid "Shift+" @@ -6116,11 +6201,6 @@ msgid "Button 9" msgstr "ปุ่ม 9" #: 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 "คันบังคับจà¸à¸¢:" @@ -6133,13 +6213,12 @@ msgid "Joypad Button Index:" msgstr "ปุ่มจà¸à¸¢:" #: editor/project_settings_editor.cpp -#, fuzzy msgid "Erase Input Action" msgstr "ลบà¸à¸²à¸£à¸à¸£à¸°à¸—ำ" #: editor/project_settings_editor.cpp msgid "Erase Input Action Event" -msgstr "ลบà¸à¸²à¸£à¸à¸£à¸°à¸—ำ" +msgstr "ลบปุ่มà¸à¸”ขà¸à¸‡à¸à¸²à¸£à¸à¸£à¸°à¸—ำ" #: editor/project_settings_editor.cpp msgid "Add Event" @@ -6383,7 +6462,7 @@ msgstr "สคริปต์ใหม่" #: editor/property_editor.cpp msgid "New %s" -msgstr "" +msgstr "%s ใหม่" #: editor/property_editor.cpp msgid "Make Unique" @@ -6418,9 +6497,8 @@ msgid "On" msgstr "เปิด" #: editor/property_editor.cpp -#, fuzzy msgid "[Empty]" -msgstr "เพิ่มà¹à¸šà¸šà¸§à¹ˆà¸²à¸‡à¹€à¸›à¸¥à¹ˆà¸²" +msgstr "[ว่างเปล่า]" #: editor/property_editor.cpp modules/visual_script/visual_script_editor.cpp msgid "Set" @@ -6588,7 +6666,8 @@ msgid "Error duplicating scene to save it." msgstr "ผิดพลาดขณะทำซ้ำฉาà¸à¹€à¸žà¸·à¹ˆà¸à¸šà¸±à¸™à¸—ึà¸" #: editor/scene_tree_dock.cpp -msgid "Sub-Resources:" +#, fuzzy +msgid "Sub-Resources" msgstr "รีซà¸à¸£à¹Œà¸ªà¸¢à¹ˆà¸à¸¢:" #: editor/scene_tree_dock.cpp @@ -6889,7 +6968,7 @@ msgstr "ฟังà¸à¹Œà¸Šà¸±à¸™:" msgid "Pick one or more items from the list to display the graph." msgstr "เลืà¸à¸à¸‚้à¸à¸¡à¸¹à¸¥à¸ˆà¸²à¸à¸£à¸²à¸¢à¸Šà¸·à¹ˆà¸à¹€à¸žà¸·à¹ˆà¸à¹à¸ªà¸”งà¸à¸£à¸²à¸Ÿ" -#: editor/script_editor_debugger.cpp +#: editor/script_editor_debugger.cpp modules/mono/editor/mono_bottom_panel.cpp msgid "Errors" msgstr "ข้à¸à¸œà¸´à¸”พลาด" @@ -6898,6 +6977,11 @@ msgid "Child Process Connected" msgstr "เชื่à¸à¸¡à¸à¸£à¸°à¸šà¸§à¸™à¸à¸²à¸£à¹à¸¥à¹‰à¸§" #: editor/script_editor_debugger.cpp +#, fuzzy +msgid "Copy Error" +msgstr "โหลดผิดพลาด" + +#: editor/script_editor_debugger.cpp msgid "Inspect Previous Instance" msgstr "ตรวจสà¸à¸šà¸à¸´à¸™à¸ªà¹à¸•à¸™à¸‹à¹Œà¸à¹ˆà¸à¸™à¸«à¸™à¹‰à¸²" @@ -6991,7 +7075,7 @@ msgstr "ทางลัด" #: editor/settings_config_dialog.cpp msgid "Binding" -msgstr "" +msgstr "ปุ่มลัด" #: editor/spatial_editor_gizmos.cpp msgid "Change Light Radius" @@ -7043,43 +7127,39 @@ msgstr "à¹à¸à¹‰à¹„ขขนาด Probe" #: modules/gdnative/gdnative_library_editor_plugin.cpp msgid "Select the dynamic library for this entry" -msgstr "" +msgstr "เลืà¸à¸à¹„ดนามิà¸à¹„ลบรารีสำหรับรายà¸à¸²à¸£à¸™à¸µà¹‰" #: modules/gdnative/gdnative_library_editor_plugin.cpp msgid "Select dependencies of the library for this entry" -msgstr "" +msgstr "เลืà¸à¸à¸à¸²à¸£à¸à¹‰à¸²à¸‡à¸à¸´à¸‡à¸‚à¸à¸‡à¹„ลบรารีสำหรับรายà¸à¸²à¸£à¸™à¸µà¹‰" #: modules/gdnative/gdnative_library_editor_plugin.cpp -#, fuzzy msgid "Remove current entry" -msgstr "ลบจุดบนเส้นโค้ง" +msgstr "ลบรายà¸à¸²à¸£" #: modules/gdnative/gdnative_library_editor_plugin.cpp msgid "Double click to create a new entry" -msgstr "" +msgstr "คลิà¸à¸ªà¸à¸‡à¸„รั้งเพื่à¸à¸ªà¸£à¹‰à¸²à¸‡à¸£à¸²à¸¢à¸à¸²à¸£à¹ƒà¸«à¸¡à¹ˆ" #: modules/gdnative/gdnative_library_editor_plugin.cpp msgid "Platform:" -msgstr "" +msgstr "à¹à¸žà¸¥à¸•à¸Ÿà¸à¸£à¹Œà¸¡:" #: modules/gdnative/gdnative_library_editor_plugin.cpp -#, fuzzy msgid "Platform" -msgstr "คัดลà¸à¸à¹„ปยังà¹à¸žà¸¥à¸•à¸Ÿà¸à¸£à¹Œà¸¡.." +msgstr "à¹à¸žà¸¥à¸•à¸Ÿà¸à¸£à¹Œà¸¡" #: modules/gdnative/gdnative_library_editor_plugin.cpp -#, fuzzy msgid "Dynamic Library" -msgstr "ไลบรารี" +msgstr "ไดนามิà¸à¹„ลบรารี" #: modules/gdnative/gdnative_library_editor_plugin.cpp msgid "Add an architecture entry" -msgstr "" +msgstr "เพิ่มรายà¸à¸²à¸£à¹à¸žà¸¥à¸•à¸Ÿà¸à¸£à¹Œà¸¡" #: modules/gdnative/gdnative_library_editor_plugin.cpp -#, fuzzy msgid "GDNativeLibrary" -msgstr "GDNative" +msgstr "GDNativeLibrary" #: modules/gdnative/gdnative_library_singleton_editor.cpp msgid "Library" @@ -7247,10 +7327,58 @@ msgstr "à¸à¸²à¸£à¸•à¸±à¹‰à¸‡à¸„่า GridMap" msgid "Pick Distance:" msgstr "ระยะà¸à¸²à¸£à¹€à¸¥à¸·à¸à¸:" +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Generating solution..." +msgstr "à¸à¸³à¸¥à¸±à¸‡à¸ªà¸£à¹‰à¸²à¸‡à¸„à¸à¸™à¸—ัวร์..." + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Generating C# project..." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Failed to create solution." +msgstr "สร้างเส้นรà¸à¸šà¸£à¸¹à¸›à¹„ม่ได้!" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Failed to save solution." +msgstr "โหลดรีซà¸à¸£à¹Œà¸ªà¹„ม่ได้" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Done" +msgstr "เสร็จสิ้น!" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Failed to create C# project." +msgstr "โหลดรีซà¸à¸£à¹Œà¸ªà¹„ม่ได้" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Mono" +msgstr "โมโน" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Create C# solution" +msgstr "สร้างเส้นรà¸à¸šà¸£à¸¹à¸›" + #: modules/mono/editor/mono_bottom_panel.cpp msgid "Builds" msgstr "สร้าง" +#: modules/mono/editor/mono_bottom_panel.cpp +#, fuzzy +msgid "Build Project" +msgstr "โปรเจà¸à¸•à¹Œ" + +#: modules/mono/editor/mono_bottom_panel.cpp +#, fuzzy +msgid "Warnings" +msgstr "คำเตืà¸à¸™" + #: modules/visual_script/visual_script.cpp msgid "" "A node yielded without working memory, please read the docs on how to yield " @@ -7597,23 +7725,33 @@ msgid "Run exported HTML in the system's default browser." msgstr "รันไฟล์ HTML ที่ส่งà¸à¸à¸à¹ƒà¸™à¹€à¸šà¸£à¸²à¹€à¸‹à¸à¸£à¹Œ" #: platform/javascript/export/export.cpp -msgid "Could not write file:\n" +#, fuzzy +msgid "Could not write file:" msgstr "เขียนไฟล์ไม่ได้:\n" #: platform/javascript/export/export.cpp -msgid "Could not open template for export:\n" +#, fuzzy +msgid "Could not open template for export:" msgstr "เปิดà¹à¸¡à¹ˆà¹à¸šà¸šà¹€à¸žà¸·à¹ˆà¸à¸ªà¹ˆà¸‡à¸à¸à¸à¹„ม่ได้:\n" #: platform/javascript/export/export.cpp -msgid "Invalid export template:\n" +#, fuzzy +msgid "Invalid export template:" msgstr "à¹à¸¡à¹ˆà¹à¸šà¸šà¸ªà¹ˆà¸‡à¸à¸à¸à¹„ม่ถูà¸à¸•à¹‰à¸à¸‡:\n" #: platform/javascript/export/export.cpp -msgid "Could not read custom HTML shell:\n" +#, fuzzy +msgid "Could not read custom HTML shell:" msgstr "ไม่สามารถà¸à¹ˆà¸²à¸™à¹‚ครงสร้าง HTML:\n" #: platform/javascript/export/export.cpp -msgid "Could not read boot splash image file:\n" +#, fuzzy +msgid "Could not read boot splash image file:" +msgstr "ไม่สามารถà¸à¹ˆà¸²à¸™à¹„ฟล์ภาพขณะบูต:\n" + +#: platform/javascript/export/export.cpp +#, fuzzy +msgid "Using default boot splash image." msgstr "ไม่สามารถà¸à¹ˆà¸²à¸™à¹„ฟล์ภาพขณะบูต:\n" #: scene/2d/animated_sprite.cpp @@ -7753,23 +7891,20 @@ msgid "ARVROrigin requires an ARVRCamera child node" msgstr "ARVROrigin ต้à¸à¸‡à¸¡à¸µ ARVRCamera เป็นโหนดลูà¸" #: scene/3d/baked_lightmap.cpp -#, fuzzy msgid "Plotting Meshes: " -msgstr "วางà¹à¸™à¸§ meshes" +msgstr "วางà¹à¸™à¸§ meshes: " #: scene/3d/baked_lightmap.cpp -#, fuzzy msgid "Plotting Lights:" -msgstr "วางà¹à¸™à¸§ meshes" +msgstr "วางà¹à¸™à¸§à¹à¸ªà¸‡:" #: scene/3d/baked_lightmap.cpp scene/3d/gi_probe.cpp msgid "Finishing Plot" msgstr "เสร็จสิ้นà¸à¸²à¸£à¸§à¸²à¸‡à¹à¸™à¸§" #: scene/3d/baked_lightmap.cpp -#, fuzzy msgid "Lighting Meshes: " -msgstr "วางà¹à¸™à¸§ meshes" +msgstr "ส่à¸à¸‡à¹à¸ªà¸‡à¸šà¸™à¸žà¸·à¹‰à¸™à¸œà¸´à¸§: " #: scene/3d/collision_polygon.cpp msgid "" @@ -7894,9 +8029,10 @@ 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." +"Default Environment as specified in Project Setings (Rendering -> " +"Environment -> Default Environment) could not be loaded." msgstr "" "ไม่สามารถโหลด Environment ปริยายที่à¸à¸³à¸«à¸™à¸”ในตัวเลืà¸à¸à¹‚ปรเจà¸à¸•à¹Œà¹„ด้ (Rendering -> Viewport " "-> Default Environment)" @@ -7928,6 +8064,9 @@ msgstr "ผิดพลาดขณะโหลดฟà¸à¸™à¸•à¹Œ" msgid "Invalid font size." msgstr "ขนาดฟà¸à¸™à¸•à¹Œà¸œà¸´à¸”พลาด" +#~ msgid "preview" +#~ msgstr "ตัวà¸à¸¢à¹ˆà¸²à¸‡" + #~ msgid "Move Add Key" #~ msgstr "เลื่à¸à¸™à¸«à¸£à¸·à¸à¹€à¸žà¸´à¹ˆà¸¡à¸„ีย์à¹à¸à¸™à¸´à¹€à¸¡à¸Šà¸±à¸™" @@ -8020,9 +8159,6 @@ msgstr "ขนาดฟà¸à¸™à¸•à¹Œà¸œà¸´à¸”พลาด" #~ msgid "' parsing of config failed." #~ msgstr "' ผิดพลาดขณะà¸à¹ˆà¸²à¸™à¹„ฟล์" -#~ msgid "Theme" -#~ msgstr "ธีม" - #~ msgid "Method List For '%s':" #~ msgstr "รายชื่à¸à¹€à¸¡à¸—็à¸à¸”ขà¸à¸‡ '%s':" @@ -8286,9 +8422,6 @@ msgstr "ขนาดฟà¸à¸™à¸•à¹Œà¸œà¸´à¸”พลาด" #~ msgid "Import Anyway" #~ msgstr "ยืนยันนำเข้า" -#~ msgid "Import & Open" -#~ msgstr "นำเข้าà¹à¸¥à¸°à¹€à¸›à¸´à¸”" - #~ msgid "Edited scene has not been saved, open imported scene anyway?" #~ msgstr "ฉาà¸à¸›à¸±à¸ˆà¸ˆà¸¸à¸šà¸±à¸™à¸¢à¸±à¸‡à¹„ม่ได้บันทึภยืนยันเปิดไฟล์ฉาà¸à¸—ี่นำเข้า?" @@ -8534,9 +8667,6 @@ msgstr "ขนาดฟà¸à¸™à¸•à¹Œà¸œà¸´à¸”พลาด" #~ msgid "Stereo" #~ msgstr "สเตà¸à¸£à¸´à¹‚à¸" -#~ msgid "Mono" -#~ msgstr "โมโน" - #~ msgid "Pitch" #~ msgstr "เสียงสูงต่ำ" diff --git a/editor/translations/tr.po b/editor/translations/tr.po index 1a80028964..60cd32b132 100644 --- a/editor/translations/tr.po +++ b/editor/translations/tr.po @@ -18,7 +18,7 @@ msgid "" msgstr "" "Project-Id-Version: Godot Engine editor\n" -"PO-Revision-Date: 2017-12-04 20:50+0000\n" +"PO-Revision-Date: 2018-01-06 13:19+0000\n" "Last-Translator: razah <icnikerazah@gmail.com>\n" "Language-Team: Turkish <https://hosted.weblate.org/projects/godot-engine/" "godot/tr/>\n" @@ -26,7 +26,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.18-dev\n" +"X-Generator: Weblate 2.19-dev\n" #: editor/animation_editor.cpp msgid "Disabled" @@ -208,8 +208,7 @@ msgstr "%d YENÄ° izler oluÅŸtur ve anahtarlar gir?" #: 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 +#: editor/plugins/particles_editor_plugin.cpp editor/script_create_dialog.cpp msgid "Create" msgstr "OluÅŸtur" @@ -566,6 +565,16 @@ msgstr "Sinyaller" #: editor/create_dialog.cpp #, fuzzy +msgid "Change %s Type" +msgstr "Türü DeÄŸiÅŸtir" + +#: editor/create_dialog.cpp editor/project_settings_editor.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Change" +msgstr "DeÄŸiÅŸtir" + +#: editor/create_dialog.cpp +#, fuzzy msgid "Create New %s" msgstr "Yeni oluÅŸtur" @@ -677,7 +686,8 @@ msgstr "" "Yine de kaldırmak istiyor musunuz? (geri alınamaz)" #: editor/dependency_editor.cpp -msgid "Cannot remove:\n" +#, fuzzy +msgid "Cannot remove:" msgstr "Kaldırılamadı:\n" #: editor/dependency_editor.cpp @@ -760,8 +770,9 @@ msgstr "Projenin Kurucuları" msgid "Lead Developer" msgstr "BaÅŸ GeliÅŸtirici" -#: editor/editor_about.cpp editor/project_manager.cpp -msgid "Project Manager" +#: editor/editor_about.cpp +#, fuzzy +msgid "Project Manager " msgstr "Proje Yöneticisi" #: editor/editor_about.cpp @@ -850,7 +861,7 @@ msgid "Success!" msgstr "BaÅŸarılı!" #: editor/editor_asset_installer.cpp -#: editor/plugins/asset_library_editor_plugin.cpp editor/project_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp msgid "Install" msgstr "Kur" @@ -938,7 +949,7 @@ msgstr "Efekt'i Sil" #: editor/editor_audio_buses.cpp msgid "Audio" -msgstr "" +msgstr "Ses" #: editor/editor_audio_buses.cpp msgid "Add Audio Bus" @@ -1119,7 +1130,7 @@ msgstr "(boÅŸ)" #: editor/editor_data.cpp msgid "[unsaved]" -msgstr "" +msgstr "[kaydedilmemiÅŸ]" #: editor/editor_dir_dialog.cpp msgid "Please select a base directory first" @@ -1159,7 +1170,8 @@ msgid "Packing" msgstr "Çıkınla" #: editor/editor_export.cpp platform/javascript/export/export.cpp -msgid "Template file not found:\n" +#, fuzzy +msgid "Template file not found:" msgstr "Biçem dosyası bulunamadı:\n" #: editor/editor_file_dialog.cpp scene/gui/file_dialog.cpp @@ -1417,6 +1429,11 @@ msgstr "Çıktı:" msgid "Clear" msgstr "Temizle" +#: editor/editor_log.cpp +#, fuzzy +msgid "Clear Output" +msgstr "Çıktı" + #: editor/editor_node.cpp editor/plugins/animation_player_editor_plugin.cpp msgid "Error saving resource!" msgstr "Kaynak kaydedilirken hata!" @@ -1479,8 +1496,10 @@ msgid "This operation can't be done without a tree root." msgstr "Bu iÅŸlem bir kök sahne olmadan yapılamaz." #: editor/editor_node.cpp +#, fuzzy msgid "" -"Couldn't save scene. Likely dependencies (instances) couldn't be satisfied." +"Couldn't save scene. Likely dependencies (instances or inheritance) couldn't " +"be satisfied." msgstr "Sahne kaydedilemedi. Anlaşılan bağımlılıklar (örnekler) karşılanamadı." #: editor/editor_node.cpp @@ -1971,7 +1990,7 @@ msgstr "Proje Listesine Çık" #: editor/editor_node.cpp editor/plugins/script_editor_plugin.cpp msgid "Debug" -msgstr "Kusur Ayıkla" +msgstr "Hata Ayıklama" #: editor/editor_node.cpp msgid "Deploy with Remote Debug" @@ -2473,7 +2492,8 @@ msgid "No version.txt found inside templates." msgstr "Åžablonların içinde version.txt bulunamadı." #: editor/export_template_manager.cpp -msgid "Error creating path for templates:\n" +#, fuzzy +msgid "Error creating path for templates:" msgstr "Åžablonlar için yol oluÅŸturulurken hata:\n" #: editor/export_template_manager.cpp @@ -2633,9 +2653,8 @@ msgid "View items as a list" msgstr "Öğeleri liste olarak göster" #: editor/filesystem_dock.cpp -msgid "" -"\n" -"Status: Import of file failed. Please fix file and reimport manually." +#, fuzzy +msgid "Status: Import of file failed. Please fix file and reimport manually." msgstr "" "\n" "Durum: Dosya içe aktarma baÅŸarısız oldu. Lütfen dosyayı onarın ve tekrar içe " @@ -2646,20 +2665,23 @@ msgid "Cannot move/rename resources root." msgstr "Kaynakların kökü taşınamaz/yeniden adlandırılamaz." #: editor/filesystem_dock.cpp -msgid "Cannot move a folder into itself.\n" +#, fuzzy +msgid "Cannot move a folder into itself." msgstr "Bir klasör kendisinin içine taşınamaz.\n" #: editor/filesystem_dock.cpp -msgid "Error moving:\n" +#, fuzzy +msgid "Error moving:" msgstr "Taşıma Hatası:\n" #: editor/filesystem_dock.cpp #, fuzzy -msgid "Error duplicating:\n" +msgid "Error duplicating:" msgstr "Yüklerken hata:" #: editor/filesystem_dock.cpp -msgid "Unable to update dependencies:\n" +#, fuzzy +msgid "Unable to update dependencies:" msgstr "Bağımlılıklar güncellenemedi:\n" #: editor/filesystem_dock.cpp @@ -3310,6 +3332,11 @@ msgstr "Düğüm Süzgeçlerini Düzenle" msgid "Filters.." msgstr "Süzgeçler..." +#: editor/plugins/animation_tree_editor_plugin.cpp +#, fuzzy +msgid "AnimationTree" +msgstr "Animasyon" + #: editor/plugins/asset_library_editor_plugin.cpp msgid "Free" msgstr "Ãœcretsiz" @@ -3476,6 +3503,7 @@ msgid "Bake Lightmaps" msgstr "Işık Haritalarına Aktar:" #: editor/plugins/camera_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Preview" msgstr "Önizleme" @@ -4169,7 +4197,8 @@ msgid "Bake!" msgstr "PiÅŸir!" #: editor/plugins/navigation_mesh_editor_plugin.cpp -msgid "Bake the navigation mesh.\n" +#, fuzzy +msgid "Bake the navigation mesh." msgstr "Yönlendirici örüntüsünü piÅŸir.\n" #: editor/plugins/navigation_mesh_editor_plugin.cpp @@ -4558,14 +4587,18 @@ msgstr "Kaynak Yükle" msgid "Paste" msgstr "Yapıştır" +#: editor/plugins/resource_preloader_editor_plugin.cpp +#, fuzzy +msgid "ResourcePreloader" +msgstr "Kaynak Yolu" + #: editor/plugins/script_editor_plugin.cpp msgid "Clear Recent Files" msgstr "En Son Dosyaları Temizle" #: editor/plugins/script_editor_plugin.cpp -msgid "" -"Close and save changes?\n" -"\"" +#, fuzzy +msgid "Close and save changes?" msgstr "" "Kapa ve deÄŸiÅŸiklikleri kaydet?\n" "\"" @@ -4644,6 +4677,11 @@ msgid "Copy Script Path" msgstr "Dosya Yolunu Tıpkıla" #: editor/plugins/script_editor_plugin.cpp +#, fuzzy +msgid "Show In File System" +msgstr "Dosya Sisteminde Göster" + +#: editor/plugins/script_editor_plugin.cpp msgid "History Prev" msgstr "Öceki GeçmiÅŸ" @@ -5080,84 +5118,84 @@ msgid "Rotating %s degrees." msgstr "%s Düzey Dönüyor." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Bottom View." -msgstr "Alttan Görünüm." +msgid "Keying is disabled (no key inserted)." +msgstr "Anahtar ekleme devre dışı (eklenmiÅŸ anahtar yok)." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Bottom" -msgstr "Alt" +msgid "Animation Key Inserted." +msgstr "Animasyon Anahtarı Eklendi." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Top View." -msgstr "Ãœstten Görünüm." +msgid "Objects Drawn" +msgstr "ÇizilmiÅŸ Nesneler" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Rear View." -msgstr "Arkadan Görünüm." +msgid "Material Changes" +msgstr "Materyal DeÄŸiÅŸiklikleri" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Rear" -msgstr "Arka" +msgid "Shader Changes" +msgstr "Shader DeÄŸiÅŸiklikleri" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Front View." -msgstr "Önden Görünüm." +msgid "Surface Changes" +msgstr "Yüzey DeÄŸiÅŸiklikleri" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Front" -msgstr "Ön" +msgid "Draw Calls" +msgstr "Çizim ÇaÄŸrıları" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Left View." -msgstr "Soldan Görünüm." +msgid "Vertices" +msgstr "Köşenoktalar" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Left" -msgstr "Sol" +msgid "FPS" +msgstr "FPS" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Right View." -msgstr "SaÄŸdan Görünüm." +msgid "Top View." +msgstr "Ãœstten Görünüm." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Right" -msgstr "SaÄŸ" +msgid "Bottom View." +msgstr "Alttan Görünüm." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Keying is disabled (no key inserted)." -msgstr "Anahtar ekleme devre dışı (eklenmiÅŸ anahtar yok)." +msgid "Bottom" +msgstr "Alt" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Animation Key Inserted." -msgstr "Animasyon Anahtarı Eklendi." +msgid "Left View." +msgstr "Soldan Görünüm." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Objects Drawn" -msgstr "ÇizilmiÅŸ Nesneler" +msgid "Left" +msgstr "Sol" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Material Changes" -msgstr "Materyal DeÄŸiÅŸiklikleri" +msgid "Right View." +msgstr "SaÄŸdan Görünüm." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Shader Changes" -msgstr "Shader DeÄŸiÅŸiklikleri" +msgid "Right" +msgstr "SaÄŸ" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Surface Changes" -msgstr "Yüzey DeÄŸiÅŸiklikleri" +msgid "Front View." +msgstr "Önden Görünüm." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Draw Calls" -msgstr "Çizim ÇaÄŸrıları" +msgid "Front" +msgstr "Ön" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Vertices" -msgstr "Köşenoktalar" +msgid "Rear View." +msgstr "Arkadan Görünüm." #: editor/plugins/spatial_editor_plugin.cpp -msgid "FPS" -msgstr "FPS" +msgid "Rear" +msgstr "Arka" #: editor/plugins/spatial_editor_plugin.cpp msgid "Align with view" @@ -5244,15 +5282,12 @@ msgid "Freelook Speed Modifier" msgstr "Serbestbakış Hız DeÄŸiÅŸtirici" #: editor/plugins/spatial_editor_plugin.cpp -msgid "preview" -msgstr "önizleme" - -#: editor/plugins/spatial_editor_plugin.cpp msgid "XForm Dialog" msgstr "XForm Ä°letiÅŸim Kutusu" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Select Mode (Q)\n" +#, fuzzy +msgid "Select Mode (Q)" msgstr "Seçim Kipi (Q)\n" #: editor/plugins/spatial_editor_plugin.cpp @@ -5532,10 +5567,20 @@ msgstr "Taşı (Önce)" msgid "Move (After)" msgstr "Taşı (Sonra)" +#: editor/plugins/sprite_frames_editor_plugin.cpp +#, fuzzy +msgid "SpriteFrames" +msgstr "Çerçeveleri Yığ" + #: editor/plugins/style_box_editor_plugin.cpp msgid "StyleBox Preview:" msgstr "StyleBox Önizleme:" +#: editor/plugins/style_box_editor_plugin.cpp +#, fuzzy +msgid "StyleBox" +msgstr "Yoldam" + #: editor/plugins/texture_region_editor_plugin.cpp msgid "Set Region Rect" msgstr "Dikdörtgen Bölgesini Ayarla" @@ -5561,14 +5606,17 @@ msgid "Auto Slice" msgstr "Otomatik Dilimle" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Offset:" msgstr "Kaydırma:" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Step:" msgstr "Adım:" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Separation:" msgstr "Ayrım:" @@ -5706,6 +5754,10 @@ msgstr "Yazı Tipi" msgid "Color" msgstr "Renk" +#: editor/plugins/theme_editor_plugin.cpp +msgid "Theme" +msgstr "Kalıp" + #: editor/plugins/tile_map_editor_plugin.cpp msgid "Erase Selection" msgstr "Seçimi Sil" @@ -5807,6 +5859,32 @@ msgstr "Sahneden BirleÅŸtir" msgid "Error" msgstr "Hata" +#: editor/plugins/tile_set_editor_plugin.cpp +#, fuzzy +msgid "Autotiles" +msgstr "Otomatik Dilimle" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "" +"Select sub-tile to use as icon, this will be also used on invalid autotile " +"bindings." +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "" +"LMB: set bit on.\n" +"RMB: set bit off." +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +#, fuzzy +msgid "Select current edited sub-tile." +msgstr "Düzenlenen kaynağı kaydedin." + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "Select sub-tile to change it's priority." +msgstr "" + #: editor/progress_dialog.cpp scene/gui/dialogs.cpp msgid "Cancel" msgstr "Vazgeç" @@ -5930,10 +6008,23 @@ msgid "Please choose a folder that does not contain a 'project.godot' file." msgstr "Lütfen 'proje.godot' dosyası içermeyen bir klasör seçin." #: editor/project_manager.cpp +msgid "That's a BINGO!" +msgstr "YaÅŸa BE!" + +#: editor/project_manager.cpp msgid "Imported Project" msgstr "İçe Aktarılan Proje" #: editor/project_manager.cpp +#, fuzzy +msgid "Couldn't create folder." +msgstr "Klasör oluÅŸturulamadı." + +#: editor/project_manager.cpp +msgid "There is already a folder in this path with the specified name." +msgstr "" + +#: editor/project_manager.cpp msgid "It would be a good idea to name your project." msgstr "Projenizi isimlendirmek iyi bir fikir olabilir." @@ -5974,14 +6065,29 @@ msgid "Import Existing Project" msgstr "Var Olan Projeyi İçe Aktar" #: editor/project_manager.cpp +#, fuzzy +msgid "Import & Edit" +msgstr "İçe Aktar & Aç" + +#: editor/project_manager.cpp msgid "Create New Project" msgstr "Yeni Proje OluÅŸtur" #: editor/project_manager.cpp +#, fuzzy +msgid "Create & Edit" +msgstr "Yayıcı OluÅŸtur" + +#: editor/project_manager.cpp msgid "Install Project:" msgstr "Projeyi Kur:" #: editor/project_manager.cpp +#, fuzzy +msgid "Install & Edit" +msgstr "Kur" + +#: editor/project_manager.cpp msgid "Project Name:" msgstr "Proje Adı:" @@ -5998,10 +6104,6 @@ msgid "Browse" msgstr "Gözat" #: editor/project_manager.cpp -msgid "That's a BINGO!" -msgstr "YaÅŸa BE!" - -#: editor/project_manager.cpp msgid "Unnamed Project" msgstr "Adsız Proje" @@ -6057,6 +6159,10 @@ msgstr "" "musunuz?" #: editor/project_manager.cpp +msgid "Project Manager" +msgstr "Proje Yöneticisi" + +#: editor/project_manager.cpp msgid "Project List" msgstr "Proje Listesi" @@ -6185,11 +6291,6 @@ msgid "Button 9" msgstr "Düğme 9" #: editor/project_settings_editor.cpp -#: modules/visual_script/visual_script_editor.cpp -msgid "Change" -msgstr "DeÄŸiÅŸtir" - -#: editor/project_settings_editor.cpp msgid "Joypad Axis Index:" msgstr "Oyun Kolu Ekseni Ä°ndeksi:" @@ -6660,7 +6761,8 @@ msgid "Error duplicating scene to save it." msgstr "Kaydetmek için sahne çoÄŸaltılırken hata." #: editor/scene_tree_dock.cpp -msgid "Sub-Resources:" +#, fuzzy +msgid "Sub-Resources" msgstr "Alt Kaynaklar:" #: editor/scene_tree_dock.cpp @@ -6963,7 +7065,7 @@ msgstr "Fonksiyon:" msgid "Pick one or more items from the list to display the graph." msgstr "GrafiÄŸi görüntülemek için listeden bir veya daha fazla öğe seçin." -#: editor/script_editor_debugger.cpp +#: editor/script_editor_debugger.cpp modules/mono/editor/mono_bottom_panel.cpp msgid "Errors" msgstr "Hatalar" @@ -6972,6 +7074,11 @@ msgid "Child Process Connected" msgstr "Çocuk Süreç BaÄŸlandı" #: editor/script_editor_debugger.cpp +#, fuzzy +msgid "Copy Error" +msgstr "Hataları Yükle" + +#: editor/script_editor_debugger.cpp msgid "Inspect Previous Instance" msgstr "Önceki ÖrneÄŸi Ä°ncele" @@ -7322,10 +7429,58 @@ msgstr "IzgaraHaritası Ayarları" msgid "Pick Distance:" msgstr "Uzaklık Seç:" +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Generating solution..." +msgstr "Konturlar oluÅŸturuluyor..." + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Generating C# project..." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Failed to create solution." +msgstr "Anahat oluÅŸturulamadı!" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Failed to save solution." +msgstr "Kaynak yükleme baÅŸarısız oldu." + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Done" +msgstr "Oldu!" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Failed to create C# project." +msgstr "Kaynak yükleme baÅŸarısız oldu." + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Mono" +msgstr "Tekli" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Create C# solution" +msgstr "Anahat OluÅŸtur" + #: modules/mono/editor/mono_bottom_panel.cpp msgid "Builds" msgstr "Ä°nÅŸalar" +#: modules/mono/editor/mono_bottom_panel.cpp +#, fuzzy +msgid "Build Project" +msgstr "Proje" + +#: modules/mono/editor/mono_bottom_panel.cpp +#, fuzzy +msgid "Warnings" +msgstr "Uyarı" + #: modules/visual_script/visual_script.cpp msgid "" "A node yielded without working memory, please read the docs on how to yield " @@ -7683,23 +7838,33 @@ msgid "Run exported HTML in the system's default browser." msgstr "Dışa aktarılmış HTML'yi sistemin varsayılan tarayıcısında çalıştır." #: platform/javascript/export/export.cpp -msgid "Could not write file:\n" +#, fuzzy +msgid "Could not write file:" msgstr "Dosya yazılamadı:\n" #: platform/javascript/export/export.cpp -msgid "Could not open template for export:\n" +#, fuzzy +msgid "Could not open template for export:" msgstr "Dışa aktarma için ÅŸablon açılamadı:\n" #: platform/javascript/export/export.cpp -msgid "Invalid export template:\n" +#, fuzzy +msgid "Invalid export template:" msgstr "Geçersiz Dışa Aktarım Åžablonu:\n" #: platform/javascript/export/export.cpp -msgid "Could not read custom HTML shell:\n" +#, fuzzy +msgid "Could not read custom HTML shell:" msgstr "Özel HTML çekirdeÄŸi okunamadı:\n" #: platform/javascript/export/export.cpp -msgid "Could not read boot splash image file:\n" +#, fuzzy +msgid "Could not read boot splash image file:" +msgstr "Açılış ekranı resim dosyası okunamadı:\n" + +#: platform/javascript/export/export.cpp +#, fuzzy +msgid "Using default boot splash image." msgstr "Açılış ekranı resim dosyası okunamadı:\n" #: scene/2d/animated_sprite.cpp @@ -8020,9 +8185,10 @@ msgid "(Other)" msgstr "(DiÄŸer)" #: scene/main/scene_tree.cpp +#, fuzzy msgid "" -"Default Environment as specified in Project Setings (Rendering -> Viewport -" -"> Default Environment) could not be loaded." +"Default Environment as specified in Project Setings (Rendering -> " +"Environment -> Default Environment) could not be loaded." msgstr "" "Proje Ayarlarında tanımlanmış Varsayılan Ortam (Ä°ÅŸleme -> Görüntükapısı -> " "Varsayılan Ortam) Yüklenemedi." @@ -8055,6 +8221,9 @@ msgstr "Yazıtipi yükleme hatası." msgid "Invalid font size." msgstr "Geçersiz yazıtipi boyutu." +#~ msgid "preview" +#~ msgstr "önizleme" + #~ msgid "Move Add Key" #~ msgstr "Hareket Anahtar Ekle" @@ -8142,9 +8311,6 @@ msgstr "Geçersiz yazıtipi boyutu." #~ msgid "Filter:" #~ msgstr "Süzgeç:" -#~ msgid "Theme" -#~ msgstr "Kalıp" - #~ msgid "Method List For '%s':" #~ msgstr "'%s' İçin Yöntem Dizelgesi:" @@ -8407,9 +8573,6 @@ msgstr "Geçersiz yazıtipi boyutu." #~ msgid "Import Anyway" #~ msgstr "Yine de İçe Aktar" -#~ msgid "Import & Open" -#~ msgstr "İçe Aktar & Aç" - #~ msgid "Edited scene has not been saved, open imported scene anyway?" #~ msgstr "" #~ "Düzenlenen sahne kaydedilmedi, yine de içe aktarılan sahne açılsın mı?" @@ -8666,9 +8829,6 @@ msgstr "Geçersiz yazıtipi boyutu." #~ msgid "Stereo" #~ msgstr "Çiftli" -#~ msgid "Mono" -#~ msgstr "Tekli" - #~ msgid "Pitch" #~ msgstr "Perde" diff --git a/editor/translations/uk.po b/editor/translations/uk.po index de2ab23773..b3da859893 100644 --- a/editor/translations/uk.po +++ b/editor/translations/uk.po @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: Godot Engine editor\n" -"PO-Revision-Date: 2017-12-20 15:43+0000\n" -"Last-Translator: ÐœÐ°Ñ€Ñ Ð¯Ð¼Ð±Ð°Ñ€ <mjambarmeta@gmail.com>\n" +"PO-Revision-Date: 2018-01-06 13:19+0000\n" +"Last-Translator: ОлекÑандр Пилипчук <pilipchukap@rambler.ru>\n" "Language-Team: Ukrainian <https://hosted.weblate.org/projects/godot-engine/" "godot/uk/>\n" "Language: uk\n" @@ -19,7 +19,7 @@ msgstr "" "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\n" +"X-Generator: Weblate 2.19-dev\n" #: editor/animation_editor.cpp msgid "Disabled" @@ -30,9 +30,8 @@ msgid "All Selection" msgstr "УÑÑ– вибранні елементи" #: editor/animation_editor.cpp -#, fuzzy msgid "Anim Change Keyframe Time" -msgstr "Змінити значеннÑ" +msgstr "Змінити Ñ‡Ð°Ñ ÐºÐ»ÑŽÑ‡Ð¾Ð²Ð¾Ð³Ð¾ кадру" #: editor/animation_editor.cpp msgid "Anim Change Transition" @@ -43,9 +42,8 @@ msgid "Anim Change Transform" msgstr "Змінити перетвореннÑ" #: editor/animation_editor.cpp -#, fuzzy msgid "Anim Change Keyframe Value" -msgstr "Змінити значеннÑ" +msgstr "Змінити Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ ÐºÐ»ÑŽÑ‡Ð¾Ð²Ð¾Ð³Ð¾ кадру" #: editor/animation_editor.cpp msgid "Anim Change Call" @@ -109,18 +107,16 @@ msgid "Duplicate Selection" msgstr "Дублювати виділене" #: editor/animation_editor.cpp -#, fuzzy msgid "Duplicate Transposed" -msgstr "ПереміÑтити дублікат" +msgstr "Дублювати транÑпоноване" #: editor/animation_editor.cpp msgid "Remove Selection" msgstr "Вилучити виділене" #: editor/animation_editor.cpp -#, fuzzy msgid "Continuous" -msgstr "Ðевгаваючий" +msgstr "Ðеперервна" #: editor/animation_editor.cpp msgid "Discrete" @@ -203,8 +199,7 @@ msgstr "Створити %d нові доріжки Ñ– вÑтавити ключ #: 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 +#: editor/plugins/particles_editor_plugin.cpp editor/script_create_dialog.cpp msgid "Create" msgstr "Створити" @@ -229,7 +224,6 @@ msgid "Change Anim Loop" msgstr "Змінити цикл анімації" #: editor/animation_editor.cpp -#, fuzzy msgid "Anim Create Typed Value Key" msgstr "Створити типовий ключ Ð·Ð½Ð°Ñ‡ÐµÐ½Ð½Ñ Ð°Ð½Ñ–Ð¼Ð°Ñ†Ñ–Ñ—" @@ -251,7 +245,7 @@ msgstr "МаÑÑˆÑ‚Ð°Ð±ÑƒÐ²Ð°Ð½Ð½Ñ Ð°Ð½Ñ–Ð¼Ð°Ñ†Ñ–Ñ—." #: editor/animation_editor.cpp msgid "Length (s):" -msgstr "Довжина (Ñек.):" +msgstr "ТриваліÑÑ‚ÑŒ (Ñек.):" #: editor/animation_editor.cpp msgid "Animation length (in seconds)." @@ -541,9 +535,8 @@ msgid "Connecting Signal:" msgstr "ÐŸÑ–Ð´ÐºÐ»ÑŽÑ‡ÐµÐ½Ð½Ñ Ñигналу:" #: editor/connections_dialog.cpp -#, fuzzy msgid "Disconnect '%s' from '%s'" -msgstr "З'Ñ”Ð´Ð½Ð°Ð½Ð½Ñ '%s' Ð´Ð»Ñ %s'" +msgstr "Від'єднати '%s' від '%s'" #: editor/connections_dialog.cpp msgid "Connect.." @@ -560,8 +553,17 @@ msgstr "Сигнали" #: editor/create_dialog.cpp #, fuzzy +msgid "Change %s Type" +msgstr "Змінити базовий тип" + +#: editor/create_dialog.cpp editor/project_settings_editor.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Change" +msgstr "" + +#: editor/create_dialog.cpp msgid "Create New %s" -msgstr "Створити новий" +msgstr "Створити новий %s" #: editor/create_dialog.cpp editor/editor_file_dialog.cpp #: editor/filesystem_dock.cpp @@ -672,7 +674,8 @@ msgstr "" "Видалити Ñ—Ñ… у будь-Ñкому разі? (ÑкаÑÑƒÐ²Ð°Ð½Ð½Ñ Ð½ÐµÐ¼Ð¾Ð¶Ð»Ð¸Ð²Ðµ)" #: editor/dependency_editor.cpp -msgid "Cannot remove:\n" +#, fuzzy +msgid "Cannot remove:" msgstr "Ðеможливо вилучити:\n" #: editor/dependency_editor.cpp @@ -755,8 +758,9 @@ msgstr "ЗаÑновники проекту" msgid "Lead Developer" msgstr "Ведучий розробник" -#: editor/editor_about.cpp editor/project_manager.cpp -msgid "Project Manager" +#: editor/editor_about.cpp +#, fuzzy +msgid "Project Manager " msgstr "Керівник проекту" #: editor/editor_about.cpp @@ -845,7 +849,7 @@ msgid "Success!" msgstr "УÑпіх!" #: editor/editor_asset_installer.cpp -#: editor/plugins/asset_library_editor_plugin.cpp editor/project_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp msgid "Install" msgstr "Ð’Ñтановити" @@ -866,9 +870,8 @@ msgid "Rename Audio Bus" msgstr "ÐŸÐµÑ€ÐµÐ¹Ð¼ÐµÐ½ÑƒÐ²Ð°Ð½Ð½Ñ Ð°ÑƒÐ´Ñ–Ð¾ шини" #: editor/editor_audio_buses.cpp -#, fuzzy msgid "Change Audio Bus Volume" -msgstr "Перемкнути аудіо шину Ñоло" +msgstr "Змінити гучніÑÑ‚ÑŒ звукової шини" #: editor/editor_audio_buses.cpp msgid "Toggle Audio Bus Solo" @@ -933,7 +936,7 @@ msgstr "Видалити ефект" #: editor/editor_audio_buses.cpp msgid "Audio" -msgstr "" +msgstr "Звук" #: editor/editor_audio_buses.cpp msgid "Add Audio Bus" @@ -1113,11 +1116,11 @@ msgstr "ÐžÐ½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ñцени.." #: editor/editor_data.cpp msgid "[empty]" -msgstr "" +msgstr "[порожньо]" #: editor/editor_data.cpp msgid "[unsaved]" -msgstr "" +msgstr "[не збережено]" #: editor/editor_dir_dialog.cpp msgid "Please select a base directory first" @@ -1157,7 +1160,8 @@ msgid "Packing" msgstr "ПакуваннÑ" #: editor/editor_export.cpp platform/javascript/export/export.cpp -msgid "Template file not found:\n" +#, fuzzy +msgid "Template file not found:" msgstr "Файл шаблону не знайдено:\n" #: editor/editor_file_dialog.cpp scene/gui/file_dialog.cpp @@ -1185,7 +1189,6 @@ msgid "Refresh" msgstr "Оновити" #: editor/editor_file_dialog.cpp scene/gui/file_dialog.cpp -#, fuzzy msgid "All Recognized" msgstr "УÑе розпізнано" @@ -1416,6 +1419,11 @@ msgstr "Вивід:" msgid "Clear" msgstr "ОчиÑтити" +#: editor/editor_log.cpp +#, fuzzy +msgid "Clear Output" +msgstr "Результат" + #: editor/editor_node.cpp editor/plugins/animation_player_editor_plugin.cpp msgid "Error saving resource!" msgstr "Помилка Ð·Ð±ÐµÑ€ÐµÐ¶ÐµÐ½Ð½Ñ Ñ€ÐµÑурÑу!" @@ -1478,8 +1486,10 @@ msgid "This operation can't be done without a tree root." msgstr "Ð¦Ñ Ð¾Ð¿ÐµÑ€Ð°Ñ†Ñ–Ñ Ð½Ðµ може бути виконана без кореню дерева." #: editor/editor_node.cpp +#, fuzzy msgid "" -"Couldn't save scene. Likely dependencies (instances) couldn't be satisfied." +"Couldn't save scene. Likely dependencies (instances or inheritance) couldn't " +"be satisfied." msgstr "" "Ðе вдалоÑÑ Ð·Ð±ÐµÑ€ÐµÐ³Ñ‚Ð¸ Ñцену. Вірогідно, залежноÑÑ‚Ñ– (екземплÑри) не задоволені." @@ -1701,7 +1711,7 @@ 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." @@ -2363,14 +2373,12 @@ msgid "Frame #:" msgstr "Кадр #:" #: editor/editor_profiler.cpp -#, fuzzy msgid "Time" -msgstr "ЧаÑ:" +msgstr "ЧаÑ" #: editor/editor_profiler.cpp -#, fuzzy msgid "Calls" -msgstr "Виклик" +msgstr "Виклики" #: editor/editor_run_native.cpp msgid "Select device from the list" @@ -2381,6 +2389,8 @@ 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." @@ -2475,7 +2485,8 @@ msgid "No version.txt found inside templates." msgstr "Файл version.txt не знайдено у шаблонах." #: editor/export_template_manager.cpp -msgid "Error creating path for templates:\n" +#, fuzzy +msgid "Error creating path for templates:" msgstr "Помилка ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ ÑˆÐ»Ñху Ð´Ð»Ñ ÑˆÐ°Ð±Ð»Ð¾Ð½Ñ–Ð²:\n" #: editor/export_template_manager.cpp @@ -2511,7 +2522,6 @@ msgstr "Ðемає відповіді." #: editor/export_template_manager.cpp #: editor/plugins/asset_library_editor_plugin.cpp -#, fuzzy msgid "Request Failed." msgstr "Запит не вдавÑÑ." @@ -2559,7 +2569,6 @@ msgid "Connecting.." msgstr "З’єданнÑ.." #: editor/export_template_manager.cpp -#, fuzzy msgid "Can't Connect" msgstr "Ðе вдаєтьÑÑ Ð·â€™Ñ”Ð´Ð½Ð°Ñ‚Ð¸ÑÑ" @@ -2637,9 +2646,8 @@ msgid "View items as a list" msgstr "ПереглÑд елементів Ñк ÑпиÑок" #: editor/filesystem_dock.cpp -msgid "" -"\n" -"Status: Import of file failed. Please fix file and reimport manually." +#, fuzzy +msgid "Status: Import of file failed. Please fix file and reimport manually." msgstr "" "\n" "СтатуÑ: не вдалоÑÑ Ñ–Ð¼Ð¿Ð¾Ñ€Ñ‚ÑƒÐ²Ð°Ñ‚Ð¸ файл. Виправте файл та повторно імпортуйте " @@ -2650,20 +2658,23 @@ msgid "Cannot move/rename resources root." msgstr "Ðеможливо переміÑтити/перейменувати корінь реÑурÑів." #: editor/filesystem_dock.cpp -msgid "Cannot move a folder into itself.\n" +#, fuzzy +msgid "Cannot move a folder into itself." msgstr "Ðе вдаєтьÑÑ Ð¿ÐµÑ€ÐµÐ¼Ñ–Ñтити теку в Ñебе.\n" #: editor/filesystem_dock.cpp -msgid "Error moving:\n" +#, fuzzy +msgid "Error moving:" msgstr "Помилка переміщеннÑ:\n" #: editor/filesystem_dock.cpp #, fuzzy -msgid "Error duplicating:\n" -msgstr "Помилка завантаженнÑ:" +msgid "Error duplicating:" +msgstr "Помилка дублюваннÑ:\n" #: editor/filesystem_dock.cpp -msgid "Unable to update dependencies:\n" +#, fuzzy +msgid "Unable to update dependencies:" msgstr "Ðеможливо оновити залежноÑÑ‚Ñ–:\n" #: editor/filesystem_dock.cpp @@ -2695,14 +2706,12 @@ msgid "Renaming folder:" msgstr "ÐŸÐµÑ€ÐµÐ¹Ð¼ÐµÐ½ÑƒÐ²Ð°Ð½Ð½Ñ Ñ‚ÐµÐºÐ¸:" #: editor/filesystem_dock.cpp -#, fuzzy msgid "Duplicating file:" -msgstr "Дублювати" +msgstr "Ð”ÑƒÐ±Ð»ÑŽÐ²Ð°Ð½Ð½Ñ Ñ„Ð°Ð¹Ð»Ñƒ:" #: editor/filesystem_dock.cpp -#, fuzzy msgid "Duplicating folder:" -msgstr "ÐŸÐµÑ€ÐµÐ¹Ð¼ÐµÐ½ÑƒÐ²Ð°Ð½Ð½Ñ Ñ‚ÐµÐºÐ¸:" +msgstr "Ð”ÑƒÐ±Ð»ÑŽÐ²Ð°Ð½Ð½Ñ Ñ‚ÐµÐºÐ¸:" #: editor/filesystem_dock.cpp msgid "Expand all" @@ -2721,9 +2730,8 @@ msgid "Move To.." msgstr "ПереміÑтити до..." #: editor/filesystem_dock.cpp -#, fuzzy msgid "Open Scene(s)" -msgstr "Відкрити Ñцену" +msgstr "Відкрити Ñцену(и)" #: editor/filesystem_dock.cpp msgid "Instance" @@ -2738,9 +2746,8 @@ msgid "View Owners.." msgstr "ПереглÑнути влаÑників.." #: editor/filesystem_dock.cpp -#, fuzzy msgid "Duplicate.." -msgstr "Дублювати" +msgstr "Дублювати.." #: editor/filesystem_dock.cpp msgid "Previous Directory" @@ -2837,14 +2844,12 @@ msgid "Importing Scene.." msgstr "Ð†Ð¼Ð¿Ð¾Ñ€Ñ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ñцени.." #: editor/import/resource_importer_scene.cpp -#, fuzzy msgid "Generating Lightmaps" -msgstr "Ð§Ð°Ñ Ð³ÐµÐ½ÐµÑ€Ð°Ñ†Ñ–Ñ— (Ñек):" +msgstr "Ð¡Ñ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ ÐºÐ°Ñ€Ñ‚ оÑвітленнÑ" #: editor/import/resource_importer_scene.cpp -#, fuzzy msgid "Generating for Mesh: " -msgstr "Ð§Ð°Ñ Ð³ÐµÐ½ÐµÑ€Ð°Ñ†Ñ–Ñ— (Ñек):" +msgstr "Ð¡Ñ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð´Ð»Ñ Ñітки: " #: editor/import/resource_importer_scene.cpp msgid "Running Custom Script.." @@ -3052,7 +3057,6 @@ msgid "Animation position (in seconds)." msgstr "ÐŸÐ¾Ð·Ð¸Ñ†Ñ–Ñ Ð°Ð½Ñ–Ð¼Ð°Ñ†Ñ–Ñ— (в Ñекундах)." #: editor/plugins/animation_player_editor_plugin.cpp -#, fuzzy msgid "Scale animation playback globally for the node." msgstr "Шкала Ð²Ñ–Ð´Ñ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð³Ð»Ð¾Ð±Ð°Ð»ÑŒÐ½Ð¾ анімації Ð´Ð»Ñ Ð²ÑƒÐ·Ð»Ð°." @@ -3137,7 +3141,6 @@ msgid "Force White Modulate" msgstr "ПримуÑово Ñ€Ð¾Ð·Ñ„Ð°Ñ€Ð±Ð¾Ð²ÑƒÐ²Ð°Ð½Ð½Ñ Ð±Ñ–Ð»Ð¸Ð¼" #: editor/plugins/animation_player_editor_plugin.cpp -#, fuzzy msgid "Include Gizmos (3D)" msgstr "Включити ÒÑ–Ð·Ð¼Ð¾Ñ (3D)" @@ -3166,7 +3169,7 @@ msgstr "Далі (автоматична черга):" #: editor/plugins/animation_player_editor_plugin.cpp msgid "Cross-Animation Blend Times" -msgstr "" +msgstr "Ð§Ð°Ñ Ð¼Ñ–Ð¶ анімаціÑми" #: editor/plugins/animation_player_editor_plugin.cpp #: editor/plugins/canvas_item_editor_plugin.cpp @@ -3188,11 +3191,11 @@ msgstr "МаÑштаб:" #: editor/plugins/animation_tree_editor_plugin.cpp msgid "Fade In (s):" -msgstr "" +msgstr "ÐароÑÑ‚Ð°Ð½Ð½Ñ (Ñ):" #: editor/plugins/animation_tree_editor_plugin.cpp msgid "Fade Out (s):" -msgstr "" +msgstr "Ð—Ð°Ñ‚ÑƒÑ…Ð°Ð½Ð½Ñ (Ñ):" #: editor/plugins/animation_tree_editor_plugin.cpp msgid "Blend" @@ -3237,7 +3240,7 @@ msgstr "Ð—Ð¼Ñ–ÑˆÑƒÐ²Ð°Ð½Ð½Ñ 1:" #: editor/plugins/animation_tree_editor_plugin.cpp msgid "X-Fade Time (s):" -msgstr "" +msgstr "Ð§Ð°Ñ X-Fade (Ñ):" #: editor/plugins/animation_tree_editor_plugin.cpp msgid "Current:" @@ -3249,11 +3252,11 @@ msgstr "Додати вхід" #: editor/plugins/animation_tree_editor_plugin.cpp msgid "Clear Auto-Advance" -msgstr "" +msgstr "Ðвтоматичне очищеннÑ" #: editor/plugins/animation_tree_editor_plugin.cpp msgid "Set Auto-Advance" -msgstr "" +msgstr "Ðвтоматичні параметри" #: editor/plugins/animation_tree_editor_plugin.cpp msgid "Delete Input" @@ -3273,7 +3276,7 @@ msgstr "Ðнімаційний вузол" #: editor/plugins/animation_tree_editor_plugin.cpp msgid "OneShot Node" -msgstr "" +msgstr "Одноразовий вузол" #: editor/plugins/animation_tree_editor_plugin.cpp msgid "Mix Node" @@ -3281,27 +3284,27 @@ msgstr "Змішувати вузол" #: editor/plugins/animation_tree_editor_plugin.cpp msgid "Blend2 Node" -msgstr "" +msgstr "Вузол Blend2" #: editor/plugins/animation_tree_editor_plugin.cpp msgid "Blend3 Node" -msgstr "" +msgstr "Вузол Blend3" #: editor/plugins/animation_tree_editor_plugin.cpp msgid "Blend4 Node" -msgstr "" +msgstr "Вузол Blend4" #: editor/plugins/animation_tree_editor_plugin.cpp msgid "TimeScale Node" -msgstr "" +msgstr "Вузол чаÑової шкали" #: editor/plugins/animation_tree_editor_plugin.cpp msgid "TimeSeek Node" -msgstr "" +msgstr "Вузол пошуку чаÑу" #: editor/plugins/animation_tree_editor_plugin.cpp msgid "Transition Node" -msgstr "" +msgstr "Вузол переходу" #: editor/plugins/animation_tree_editor_plugin.cpp msgid "Import Animations.." @@ -3315,6 +3318,11 @@ msgstr "Редагувати фільтри вузла" msgid "Filters.." msgstr "Фільтри..." +#: editor/plugins/animation_tree_editor_plugin.cpp +#, fuzzy +msgid "AnimationTree" +msgstr "ÐнімаціÑ" + #: editor/plugins/asset_library_editor_plugin.cpp msgid "Free" msgstr "Вивільнити" @@ -3373,7 +3381,7 @@ msgstr "Помилка Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ð°ÐºÑ‚Ð¸Ð²Ð°:" #: editor/plugins/asset_library_editor_plugin.cpp msgid "Fetching:" -msgstr "" +msgstr "ВидобуваннÑ:" #: editor/plugins/asset_library_editor_plugin.cpp msgid "Resolving.." @@ -3452,7 +3460,7 @@ msgstr "Офіційний" #: editor/plugins/asset_library_editor_plugin.cpp msgid "Testing" -msgstr "" +msgstr "ТеÑтуваннÑ" #: editor/plugins/asset_library_editor_plugin.cpp msgid "Assets ZIP File" @@ -3464,22 +3472,30 @@ msgid "" "Save your scene (for images to be saved in the same dir), or pick a save " "path from the BakedLightmap properties." msgstr "" +"Ðе вдаєтьÑÑ Ð²Ð¸Ð·Ð½Ð°Ñ‡Ð¸Ñ‚Ð¸ шлÑÑ… Ð´Ð»Ñ Ð·Ð±ÐµÑ€ÐµÐ¶ÐµÐ½Ð½Ñ ÐºÐ°Ñ€Ñ‚ оÑвітленнÑ.\n" +"Збережіть вашу Ñцену (щоб Ð·Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð½Ñ Ð±ÑƒÐ»Ð¸ збережені в одній теці), або " +"виберіть шлÑÑ… Ð·Ð±ÐµÑ€Ñ–Ð³Ð°Ð½Ð½Ñ Ñƒ влаÑтивоÑÑ‚ÑÑ… BakedLightmap." #: editor/plugins/baked_lightmap_editor_plugin.cpp msgid "" "No meshes to bake. Make sure they contain an UV2 channel and that the 'Bake " "Light' flag is on." msgstr "" +"Ðемає поліÑеток Ð´Ð»Ñ Ð·Ð°Ð¿Ñ–ÐºÐ°Ð½Ð½Ñ. ПереконайтеÑÑ, що вони міÑÑ‚ÑÑ‚ÑŒ канал UV2 Ñ– що " +"прапор 'Ð—Ð°Ð¿Ñ–ÐºÐ°Ð½Ð½Ñ Ñвітла' включений." #: editor/plugins/baked_lightmap_editor_plugin.cpp msgid "Failed creating lightmap images, make sure path is writable." msgstr "" +"Збій ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ ÐºÐ°Ñ€Ñ‚Ð¸ оÑвітленоÑÑ‚Ñ–, переконайтеÑÑ, що шлÑÑ… доÑтупний Ð´Ð»Ñ " +"запиÑу." #: editor/plugins/baked_lightmap_editor_plugin.cpp msgid "Bake Lightmaps" -msgstr "" +msgstr "Запікати карти оÑвітленнÑ" #: editor/plugins/camera_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Preview" msgstr "Попередній переглÑд" @@ -3490,24 +3506,24 @@ 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 msgid "Grid Step:" -msgstr "" +msgstr "Крок Ñітки:" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Rotation Offset:" -msgstr "" +msgstr "ВідÑтуп повороту:" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Rotation Step:" -msgstr "" +msgstr "Крок повороту:" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Move Pivot" -msgstr "" +msgstr "ПереміÑтити опорну точку" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Move Action" @@ -3547,19 +3563,19 @@ msgstr "Редагувати ІК-ланцюг" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Edit CanvasItem" -msgstr "" +msgstr "Редагувати CanvasItem" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Anchors only" -msgstr "" +msgstr "Тільки прив'Ñзки" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Change Anchors and Margins" -msgstr "" +msgstr "Змінити прив'Ñзки Ñ– розміри" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Change Anchors" -msgstr "" +msgstr "Змінити прив'Ñзки" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Paste Pose" @@ -3571,7 +3587,7 @@ msgstr "Режим виділеннÑ" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Drag: Rotate" -msgstr "" +msgstr "ПеретÑгуваннÑ: Поворот" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Alt+Drag: Move" @@ -3580,6 +3596,8 @@ msgstr "Alt+ПеретÑгнути: переміÑтити" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Press 'v' to Change Pivot, 'Shift+v' to Drag Pivot (while moving)." msgstr "" +"ÐатиÑніть 'V', щоб змінити Pivot, 'Shift + V' Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÑ‚ÑÐ³ÑƒÐ²Ð°Ð½Ð½Ñ Pivot (під " +"Ñ‡Ð°Ñ Ð¿ÐµÑ€ÐµÐ¼Ñ–Ñ‰ÐµÐ½Ð½Ñ)." #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Alt+RMB: Depth list selection" @@ -3604,7 +3622,7 @@ msgstr "" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Click to change object's rotation pivot." -msgstr "" +msgstr "ÐšÐ»Ð°Ñ†Ð°Ð½Ð½Ñ Ð·Ð¼Ñ–Ð½ÑŽÑ” центр Ð¾Ð±ÐµÑ€Ñ‚Ð°Ð½Ð½Ñ Ð¾Ð±'єкта." #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Pan Mode" @@ -3640,31 +3658,31 @@ msgstr "ВідноÑна прив'Ñзка" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Use Pixel Snap" -msgstr "" +msgstr "ВикориÑтати Ð¿Ñ€Ð¸Ð»Ð¸Ð¿Ð°Ð½Ð½Ñ Ð´Ð¾ пікÑелів" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Smart snapping" -msgstr "" +msgstr "Інтелектуальне прилипаннÑ" #: editor/plugins/canvas_item_editor_plugin.cpp 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 msgid "Snap to guides" -msgstr "" +msgstr "ÐŸÑ€Ð¸Ð»Ð¸Ð¿Ð°Ð½Ð½Ñ Ð´Ð¾ напрÑмних" #: editor/plugins/canvas_item_editor_plugin.cpp #: editor/plugins/spatial_editor_plugin.cpp @@ -3682,7 +3700,7 @@ msgstr "Гарантує нащадки об'єкта не можуть бути #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Restores the object's children's ability to be selected." -msgstr "" +msgstr "Відновлює можливіÑÑ‚ÑŒ вибору нащадків об'єкта." #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Make Bones" @@ -3728,11 +3746,11 @@ msgstr "Показати напрÑмні" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Center Selection" -msgstr "" +msgstr "Центрувати на вибраному" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Frame Selection" -msgstr "" +msgstr "Кадрувати вибране" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Layout" @@ -3760,11 +3778,11 @@ msgstr "ОчиÑтити позу" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Drag pivot from mouse position" -msgstr "" +msgstr "ПеретÑгти центр Ð¾Ð±ÐµÑ€Ñ‚Ð°Ð½Ð½Ñ Ð· Ð¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð½Ñ Ð¼Ð¸ÑˆÑ–" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Set pivot at mouse position" -msgstr "" +msgstr "Ð’Ñтановити центр Ð¾Ð±ÐµÑ€Ñ‚Ð°Ð½Ð½Ñ Ð½Ð° міÑці вказівника миші" #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Multiply grid step by 2" @@ -3790,7 +3808,7 @@ 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 "" +msgstr "Помилка Ð´Ð¾Ð´Ð°Ð²Ð°Ð½Ð½Ñ Ñцени з %s" #: editor/plugins/canvas_item_editor_plugin.cpp #: editor/plugins/spatial_editor_plugin.cpp editor/scene_tree_dock.cpp @@ -3806,6 +3824,8 @@ 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" @@ -3813,7 +3833,7 @@ msgstr "Створити полігон3D" #: editor/plugins/collision_shape_2d_editor_plugin.cpp msgid "Set Handle" -msgstr "" +msgstr "Ð’Ñтановити обробник" #: editor/plugins/cube_grid_theme_editor_plugin.cpp msgid "Remove item %d?" @@ -3839,23 +3859,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 msgid "Ease in" -msgstr "" +msgstr "Перейти в" #: editor/plugins/curve_editor_plugin.cpp 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" @@ -3863,11 +3883,11 @@ msgstr "Змінити точку кривої" #: editor/plugins/curve_editor_plugin.cpp msgid "Modify Curve Tangent" -msgstr "" +msgstr "Змінити дотичну до кривої" #: editor/plugins/curve_editor_plugin.cpp msgid "Load Curve Preset" -msgstr "" +msgstr "Завантажити заготовку кривої" #: editor/plugins/curve_editor_plugin.cpp msgid "Add point" @@ -3879,15 +3899,15 @@ msgstr "Вилучити точку" #: editor/plugins/curve_editor_plugin.cpp msgid "Left linear" -msgstr "" +msgstr "Лівий лінійний" #: editor/plugins/curve_editor_plugin.cpp msgid "Right linear" -msgstr "" +msgstr "Правий лінійний" #: editor/plugins/curve_editor_plugin.cpp msgid "Load preset" -msgstr "" +msgstr "Завантажити заготовку" #: editor/plugins/curve_editor_plugin.cpp msgid "Remove Curve Point" @@ -3895,24 +3915,24 @@ msgstr "Видалити точку кривої" #: editor/plugins/curve_editor_plugin.cpp msgid "Toggle Curve Linear Tangent" -msgstr "" +msgstr "Переключити криву лінійного тангенÑу" #: editor/plugins/curve_editor_plugin.cpp msgid "Hold Shift to edit tangents individually" -msgstr "" +msgstr "Утримуйте Shift, щоб змінити дотичні окремо" #: editor/plugins/gi_probe_editor_plugin.cpp msgid "Bake GI Probe" -msgstr "" +msgstr "Запекти пробу GI" #: editor/plugins/gradient_editor_plugin.cpp msgid "Add/Remove Color Ramp Point" -msgstr "" +msgstr "Додати/Видалити точку градієнта" #: editor/plugins/gradient_editor_plugin.cpp #: editor/plugins/shader_graph_editor_plugin.cpp msgid "Modify Color Ramp" -msgstr "" +msgstr "Змінити градієнт" #: editor/plugins/item_list_editor_plugin.cpp msgid "Item %d" @@ -3931,10 +3951,12 @@ 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 "" +msgstr "Створено затінювальний полігон" #: editor/plugins/light_occluder_2d_editor_plugin.cpp msgid "Create a new polygon from scratch." @@ -3954,19 +3976,19 @@ msgstr "CTRL+ЛКМ: Розділити Ñегмент." #: editor/plugins/light_occluder_2d_editor_plugin.cpp msgid "RMB: Erase Point." -msgstr "" +msgstr "ПКМ: Стерти точку." #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Mesh is empty!" -msgstr "" +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!" @@ -3974,11 +3996,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" @@ -3986,23 +4008,23 @@ msgstr "Створити навигаційну Ñітку" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Contained Mesh is not of type ArrayMesh." -msgstr "" +msgstr "Вбудована Ñітка не має типу ArrayMesh." #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "UV Unwrap failed, mesh may not be manifold?" -msgstr "" +msgstr "UV розгортка не вдалаÑÑ, можливо у поліÑеткі не однозв'Ñзна форма?" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "No mesh to debug." -msgstr "" +msgstr "Ðемає Ñітки Ð´Ð»Ñ Ð½Ð°Ð»Ð°Ð³Ð¾Ð´Ð¶ÐµÐ½Ð½Ñ." #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Model has no UV in this layer" -msgstr "" +msgstr "Модель не має UV на цьому шарі" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "MeshInstance lacks a Mesh!" -msgstr "" +msgstr "У MeshInstance немає Ñітки!" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Mesh has not surface to create outlines from!" @@ -4022,53 +4044,51 @@ msgstr "Сітка" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Create Trimesh Static Body" -msgstr "" +msgstr "Створити увігнуте Ñтатичне тіло" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Create Convex Static Body" -msgstr "" +msgstr "Створити опукле Ñтатичне тіло" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Create Trimesh Collision Sibling" -msgstr "" +msgstr "Створити увігнуту облаÑÑ‚ÑŒ зіткненнÑ" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Create Convex Collision Sibling" -msgstr "" +msgstr "Створити опуклу облаÑÑ‚ÑŒ зіткненнÑ" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Create Outline Mesh.." -msgstr "" +msgstr "Створити контурну Ñітку .." #: editor/plugins/mesh_instance_editor_plugin.cpp -#, fuzzy msgid "View UV1" -msgstr "ПереглÑд" +msgstr "ПереглÑд UV1" #: editor/plugins/mesh_instance_editor_plugin.cpp -#, fuzzy msgid "View UV2" -msgstr "ПереглÑд" +msgstr "ПереглÑд UV2" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Unwrap UV2 for Lightmap/AO" -msgstr "" +msgstr "Розгорнути UV2 Ð´Ð»Ñ ÐºÐ°Ñ€Ñ‚Ð¸ оÑвітленнÑ/AO" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Create Outline Mesh" -msgstr "" +msgstr "Створити Ñітку обведеннÑ" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Outline Size:" -msgstr "" +msgstr "Розмір обведеннÑ:" #: editor/plugins/multimesh_editor_plugin.cpp msgid "No mesh source specified (and no MultiMesh set in node)." -msgstr "" +msgstr "Ðе вказане джерело Ñітки (й у вузлі не вказано MultiMesh)." #: editor/plugins/multimesh_editor_plugin.cpp msgid "No mesh source specified (and MultiMesh contains no Mesh)." -msgstr "" +msgstr "Ðе вказане джерело Ñітки (й у вузлі не вказано MultiMesh)." #: editor/plugins/multimesh_editor_plugin.cpp msgid "Mesh source is invalid (invalid path)." @@ -4076,15 +4096,15 @@ msgstr "Джерело Ñітки недійÑне (неправильний шР#: editor/plugins/multimesh_editor_plugin.cpp msgid "Mesh source is invalid (not a MeshInstance)." -msgstr "" +msgstr "Ðеправильне джерело Ñітки (не MultiMesh)." #: editor/plugins/multimesh_editor_plugin.cpp msgid "Mesh source is invalid (contains no Mesh resource)." -msgstr "" +msgstr "Ðеправильне джерело Ñітки (немає реÑурÑу Ñітки)." #: editor/plugins/multimesh_editor_plugin.cpp msgid "No surface source specified." -msgstr "" +msgstr "Ðе задано джерело поверхні." #: editor/plugins/multimesh_editor_plugin.cpp msgid "Surface source is invalid (invalid path)." @@ -4096,15 +4116,15 @@ msgstr "Джерело поверхні недійÑне (без Ð³ÐµÐ¾Ð¼ÐµÑ‚Ñ€Ñ #: editor/plugins/multimesh_editor_plugin.cpp msgid "Surface source is invalid (no faces)." -msgstr "" +msgstr "Ðеправильне джерело поверхні (немає граней)." #: editor/plugins/multimesh_editor_plugin.cpp msgid "Parent has no solid faces to populate." -msgstr "" +msgstr "Предок не має Ñуцільних граней Ð´Ð»Ñ Ð·Ð°Ð¿Ð¾Ð²Ð½ÐµÐ½Ð½Ñ." #: editor/plugins/multimesh_editor_plugin.cpp msgid "Couldn't map area." -msgstr "" +msgstr "Ðе вдалоÑÑ Ð²Ñ–Ð´Ð¾Ð±Ñ€Ð°Ð·Ð¸Ñ‚Ð¸ ділÑнку." #: editor/plugins/multimesh_editor_plugin.cpp msgid "Select a Source Mesh:" @@ -4120,7 +4140,7 @@ msgstr "Заповнити поверхню" #: editor/plugins/multimesh_editor_plugin.cpp msgid "Populate MultiMesh" -msgstr "" +msgstr "Заповнити мультиÑітку" #: editor/plugins/multimesh_editor_plugin.cpp msgid "Target Surface:" @@ -4128,23 +4148,23 @@ msgstr "Цільова поверхнÑ:" #: editor/plugins/multimesh_editor_plugin.cpp msgid "Source Mesh:" -msgstr "" +msgstr "Початкова Ñітка:" #: editor/plugins/multimesh_editor_plugin.cpp msgid "X-Axis" -msgstr "" +msgstr "Ð’Ñ–ÑÑŒ X" #: editor/plugins/multimesh_editor_plugin.cpp msgid "Y-Axis" -msgstr "" +msgstr "Ð’Ñ–ÑÑŒ Y" #: editor/plugins/multimesh_editor_plugin.cpp msgid "Z-Axis" -msgstr "" +msgstr "Ð’Ñ–ÑÑŒ Z" #: editor/plugins/multimesh_editor_plugin.cpp msgid "Mesh Up Axis:" -msgstr "" +msgstr "Ð’Ñ–ÑÑŒ вгору Ñітки:" #: editor/plugins/multimesh_editor_plugin.cpp msgid "Random Rotation:" @@ -4164,11 +4184,12 @@ msgstr "Заповнити" #: editor/plugins/navigation_mesh_editor_plugin.cpp msgid "Bake!" -msgstr "" +msgstr "Запекти!" #: editor/plugins/navigation_mesh_editor_plugin.cpp -msgid "Bake the navigation mesh.\n" -msgstr "" +#, fuzzy +msgid "Bake the navigation mesh." +msgstr "Запекти навігаційну Ñітку.\n" #: editor/plugins/navigation_mesh_editor_plugin.cpp msgid "Clear the navigation mesh." @@ -4184,7 +4205,7 @@ msgstr "Розрахунок розміру Ñітки..." #: editor/plugins/navigation_mesh_generator.cpp msgid "Creating heightfield..." -msgstr "" +msgstr "Ð¡Ñ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ ÐºÐ°Ñ€Ñ‚Ð¸ виÑот..." #: editor/plugins/navigation_mesh_generator.cpp msgid "Marking walkable triangles..." @@ -4192,15 +4213,15 @@ 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 msgid "Partitioning..." -msgstr "" +msgstr "РозбиттÑ..." #: editor/plugins/navigation_mesh_generator.cpp msgid "Creating contours..." @@ -4208,11 +4229,11 @@ msgstr "Ð¡Ñ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ ÐºÐ¾Ð½Ñ‚ÑƒÑ€Ñ–Ð²..." #: editor/plugins/navigation_mesh_generator.cpp msgid "Creating polymesh..." -msgstr "" +msgstr "Ð¡Ñ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ñітки..." #: editor/plugins/navigation_mesh_generator.cpp msgid "Converting to native navigation mesh..." -msgstr "" +msgstr "ÐŸÐµÑ€ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð½Ð° влаÑну навігаційну Ñітку..." #: editor/plugins/navigation_mesh_generator.cpp msgid "Navigation Mesh Generator Setup:" @@ -4220,7 +4241,7 @@ msgstr "ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð³ÐµÐ½ÐµÑ€Ð°Ñ‚Ð¾Ñ€Ð° навігаційної Ñ #: editor/plugins/navigation_mesh_generator.cpp msgid "Parsing Geometry..." -msgstr "" +msgstr "Ðналіз геометрії..." #: editor/plugins/navigation_mesh_generator.cpp msgid "Done!" @@ -4233,7 +4254,7 @@ msgstr "Ð¡Ñ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð½Ð°Ð²Ñ–Ð³Ð°Ñ†Ñ–Ð¹Ð½Ð¾Ð³Ð¾ полігону" #: editor/plugins/particles_2d_editor_plugin.cpp #: editor/plugins/particles_editor_plugin.cpp msgid "Generating AABB" -msgstr "" +msgstr "Ð¡Ñ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ AABB" #: editor/plugins/particles_2d_editor_plugin.cpp msgid "Can only set point into a ParticlesMaterial process material" @@ -4253,11 +4274,11 @@ msgstr "" #: editor/plugins/particles_2d_editor_plugin.cpp msgid "Load Emission Mask" -msgstr "" +msgstr "Завантажити маÑку випромінюваннÑ" #: editor/plugins/particles_2d_editor_plugin.cpp msgid "Clear Emission Mask" -msgstr "" +msgstr "ОчиÑтити маÑку випромінюваннÑ" #: editor/plugins/particles_2d_editor_plugin.cpp #: editor/plugins/particles_editor_plugin.cpp @@ -4275,15 +4296,15 @@ msgstr "Ð§Ð°Ñ Ð³ÐµÐ½ÐµÑ€Ð°Ñ†Ñ–Ñ— (Ñек):" #: editor/plugins/particles_2d_editor_plugin.cpp msgid "Emission Mask" -msgstr "" +msgstr "МаÑка випромінюваннÑ" #: editor/plugins/particles_2d_editor_plugin.cpp msgid "Capture from Pixel" -msgstr "Ð—Ð°Ñ…Ð¾Ð¿Ð»ÐµÐ½Ð½Ñ Ð· пікÑелÑ" +msgstr "Захопити з пікÑелÑ" #: editor/plugins/particles_2d_editor_plugin.cpp msgid "Emission Colors" -msgstr "" +msgstr "Кольори випромінюваннÑ" #: editor/plugins/particles_editor_plugin.cpp msgid "Node does not contain geometry." @@ -4291,7 +4312,7 @@ msgstr "Вузол не міÑтить геометрії." #: editor/plugins/particles_editor_plugin.cpp msgid "Node does not contain geometry (faces)." -msgstr "" +msgstr "Вузол не міÑтить геометрії (граней)." #: editor/plugins/particles_editor_plugin.cpp msgid "A processor material of type 'ParticlesMaterial' is required." @@ -4299,31 +4320,31 @@ msgstr "" #: editor/plugins/particles_editor_plugin.cpp msgid "Faces contain no area!" -msgstr "" +msgstr "Грані не міÑÑ‚ÑÑ‚ÑŒ ділÑнки!" #: editor/plugins/particles_editor_plugin.cpp msgid "No faces!" -msgstr "" +msgstr "Ðемає граней!" #: editor/plugins/particles_editor_plugin.cpp msgid "Generate AABB" -msgstr "" +msgstr "Генерувати AABB" #: editor/plugins/particles_editor_plugin.cpp msgid "Create Emission Points From Mesh" -msgstr "" +msgstr "Створити випромінювач з Ñітки" #: editor/plugins/particles_editor_plugin.cpp msgid "Create Emission Points From Node" -msgstr "" +msgstr "Створити випромінювач з вузла" #: editor/plugins/particles_editor_plugin.cpp msgid "Create Emitter" -msgstr "" +msgstr "Створити випромінювач" #: editor/plugins/particles_editor_plugin.cpp msgid "Emission Points:" -msgstr "" +msgstr "Точок випромінюваннÑ:" #: editor/plugins/particles_editor_plugin.cpp msgid "Surface Points" @@ -4331,7 +4352,7 @@ msgstr "Точки поверхні" #: editor/plugins/particles_editor_plugin.cpp msgid "Surface Points+Normal (Directed)" -msgstr "" +msgstr "Точки поверхні + нормаль (напрÑмлена)" #: editor/plugins/particles_editor_plugin.cpp msgid "Volume" @@ -4339,11 +4360,11 @@ msgstr "Об'єм" #: editor/plugins/particles_editor_plugin.cpp msgid "Emission Source: " -msgstr "" +msgstr "Джерело випромінюваннÑ: " #: editor/plugins/particles_editor_plugin.cpp msgid "Generate Visibility AABB" -msgstr "" +msgstr "Генерувати AABB" #: editor/plugins/path_2d_editor_plugin.cpp msgid "Remove Point from Curve" @@ -4556,14 +4577,18 @@ msgstr "" msgid "Paste" msgstr "" +#: editor/plugins/resource_preloader_editor_plugin.cpp +#, fuzzy +msgid "ResourcePreloader" +msgstr "РеÑурÑ" + #: editor/plugins/script_editor_plugin.cpp msgid "Clear Recent Files" msgstr "" #: editor/plugins/script_editor_plugin.cpp -msgid "" -"Close and save changes?\n" -"\"" +#, fuzzy +msgid "Close and save changes?" msgstr "" "Закрити та зберегти зміни?\n" "\"" @@ -4637,9 +4662,13 @@ msgid "Soft Reload Script" msgstr "" #: editor/plugins/script_editor_plugin.cpp -#, fuzzy msgid "Copy Script Path" -msgstr "Копіювати шлÑÑ…" +msgstr "Копіювати шлÑÑ… до Ñкрипту" + +#: editor/plugins/script_editor_plugin.cpp +#, fuzzy +msgid "Show In File System" +msgstr "Показати в файловому менеджері" #: editor/plugins/script_editor_plugin.cpp msgid "History Prev" @@ -5073,83 +5102,83 @@ msgid "Rotating %s degrees." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Bottom View." +msgid "Keying is disabled (no key inserted)." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Bottom" +msgid "Animation Key Inserted." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Top View." +msgid "Objects Drawn" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Rear View." +msgid "Material Changes" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Rear" +msgid "Shader Changes" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Front View." +msgid "Surface Changes" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Front" +msgid "Draw Calls" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Left View." +msgid "Vertices" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Left" +msgid "FPS" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Right View." +msgid "Top View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Right" +msgid "Bottom View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Keying is disabled (no key inserted)." +msgid "Bottom" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Animation Key Inserted." +msgid "Left View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Objects Drawn" +msgid "Left" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Material Changes" +msgid "Right View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Shader Changes" +msgid "Right" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Surface Changes" +msgid "Front View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Draw Calls" +msgid "Front" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Vertices" +msgid "Rear View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "FPS" +msgid "Rear" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp @@ -5237,16 +5266,13 @@ 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 "" +#, fuzzy +msgid "Select Mode (Q)" +msgstr "Режим виділеннÑ" #: editor/plugins/spatial_editor_plugin.cpp msgid "" @@ -5520,10 +5546,18 @@ msgstr "" msgid "Move (After)" msgstr "" +#: editor/plugins/sprite_frames_editor_plugin.cpp +msgid "SpriteFrames" +msgstr "" + #: editor/plugins/style_box_editor_plugin.cpp msgid "StyleBox Preview:" msgstr "" +#: editor/plugins/style_box_editor_plugin.cpp +msgid "StyleBox" +msgstr "" + #: editor/plugins/texture_region_editor_plugin.cpp msgid "Set Region Rect" msgstr "" @@ -5549,14 +5583,17 @@ msgid "Auto Slice" msgstr "" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Offset:" msgstr "" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Step:" msgstr "" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Separation:" msgstr "" @@ -5694,6 +5731,10 @@ msgstr "" msgid "Color" msgstr "" +#: editor/plugins/theme_editor_plugin.cpp +msgid "Theme" +msgstr "" + #: editor/plugins/tile_map_editor_plugin.cpp msgid "Erase Selection" msgstr "" @@ -5724,7 +5765,7 @@ msgstr "" #: editor/plugins/tile_map_editor_plugin.cpp msgid "Find tile" -msgstr "" +msgstr "Знайти плитку" #: editor/plugins/tile_map_editor_plugin.cpp msgid "Transpose" @@ -5740,11 +5781,11 @@ msgstr "" #: editor/plugins/tile_map_editor_plugin.cpp msgid "Paint Tile" -msgstr "" +msgstr "Ðамалювати плитку" #: editor/plugins/tile_map_editor_plugin.cpp msgid "Pick Tile" -msgstr "" +msgstr "Вибрати плитку" #: editor/plugins/tile_map_editor_plugin.cpp msgid "Rotate 0 degrees" @@ -5764,7 +5805,7 @@ msgstr "" #: editor/plugins/tile_set_editor_plugin.cpp msgid "Could not find tile:" -msgstr "" +msgstr "Ðеможливо знайти плитку:" #: editor/plugins/tile_set_editor_plugin.cpp msgid "Item name or ID:" @@ -5779,9 +5820,8 @@ msgid "Merge from scene?" msgstr "" #: editor/plugins/tile_set_editor_plugin.cpp -#, fuzzy msgid "Tile Set" -msgstr "Ðабір тайлів.." +msgstr "Ðабір плитки" #: editor/plugins/tile_set_editor_plugin.cpp msgid "Create from Scene" @@ -5795,6 +5835,31 @@ msgstr "" msgid "Error" msgstr "" +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "Autotiles" +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "" +"Select sub-tile to use as icon, this will be also used on invalid autotile " +"bindings." +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "" +"LMB: set bit on.\n" +"RMB: set bit off." +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +#, fuzzy +msgid "Select current edited sub-tile." +msgstr "Зберегти поточний редагований реÑурÑ." + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "Select sub-tile to change it's priority." +msgstr "" + #: editor/progress_dialog.cpp scene/gui/dialogs.cpp msgid "Cancel" msgstr "СкаÑувати" @@ -5912,10 +5977,23 @@ msgid "Please choose a folder that does not contain a 'project.godot' file." msgstr "" #: editor/project_manager.cpp +msgid "That's a BINGO!" +msgstr "" + +#: editor/project_manager.cpp msgid "Imported Project" msgstr "" #: editor/project_manager.cpp +#, fuzzy +msgid "Couldn't create folder." +msgstr "Ðеможливо Ñтворити теку." + +#: editor/project_manager.cpp +msgid "There is already a folder in this path with the specified name." +msgstr "" + +#: editor/project_manager.cpp msgid "It would be a good idea to name your project." msgstr "" @@ -5956,14 +6034,29 @@ msgid "Import Existing Project" msgstr "" #: editor/project_manager.cpp +#, fuzzy +msgid "Import & Edit" +msgstr "Імпортувати" + +#: editor/project_manager.cpp msgid "Create New Project" msgstr "" #: editor/project_manager.cpp +#, fuzzy +msgid "Create & Edit" +msgstr "Створити випромінювач" + +#: editor/project_manager.cpp msgid "Install Project:" msgstr "" #: editor/project_manager.cpp +#, fuzzy +msgid "Install & Edit" +msgstr "Ð’Ñтановити" + +#: editor/project_manager.cpp msgid "Project Name:" msgstr "" @@ -5980,10 +6073,6 @@ msgid "Browse" msgstr "" #: editor/project_manager.cpp -msgid "That's a BINGO!" -msgstr "" - -#: editor/project_manager.cpp msgid "Unnamed Project" msgstr "" @@ -6029,6 +6118,10 @@ msgid "" msgstr "" #: editor/project_manager.cpp +msgid "Project Manager" +msgstr "Керівник проекту" + +#: editor/project_manager.cpp msgid "Project List" msgstr "" @@ -6155,11 +6248,6 @@ msgid "Button 9" msgstr "Кнопка 9" #: 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 "" @@ -6625,8 +6713,9 @@ msgid "Error duplicating scene to save it." msgstr "" #: editor/scene_tree_dock.cpp -msgid "Sub-Resources:" -msgstr "" +#, fuzzy +msgid "Sub-Resources" +msgstr "РеÑурÑ" #: editor/scene_tree_dock.cpp msgid "Clear Inheritance" @@ -6918,7 +7007,7 @@ msgstr "ФункціÑ:" msgid "Pick one or more items from the list to display the graph." msgstr "" -#: editor/script_editor_debugger.cpp +#: editor/script_editor_debugger.cpp modules/mono/editor/mono_bottom_panel.cpp msgid "Errors" msgstr "Помилки" @@ -6927,6 +7016,11 @@ msgid "Child Process Connected" msgstr "" #: editor/script_editor_debugger.cpp +#, fuzzy +msgid "Copy Error" +msgstr "Завантажити помилки" + +#: editor/script_editor_debugger.cpp msgid "Inspect Previous Instance" msgstr "" @@ -7079,9 +7173,8 @@ msgid "Select dependencies of the library for this entry" msgstr "" #: modules/gdnative/gdnative_library_editor_plugin.cpp -#, fuzzy msgid "Remove current entry" -msgstr "Видалити точку кривої" +msgstr "Видалити поточне поле" #: modules/gdnative/gdnative_library_editor_plugin.cpp msgid "Double click to create a new entry" @@ -7096,18 +7189,16 @@ msgid "Platform" msgstr "" #: modules/gdnative/gdnative_library_editor_plugin.cpp -#, fuzzy msgid "Dynamic Library" -msgstr "Бібліотека" +msgstr "Динамічна бібліотека" #: modules/gdnative/gdnative_library_editor_plugin.cpp msgid "Add an architecture entry" msgstr "" #: modules/gdnative/gdnative_library_editor_plugin.cpp -#, fuzzy msgid "GDNativeLibrary" -msgstr "Бібліотека" +msgstr "Бібліотека GDNative" #: modules/gdnative/gdnative_library_singleton_editor.cpp msgid "Library" @@ -7275,10 +7366,58 @@ msgstr "" msgid "Pick Distance:" msgstr "" +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Generating solution..." +msgstr "Ð¡Ñ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ ÐºÐ¾Ð½Ñ‚ÑƒÑ€Ñ–Ð²..." + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Generating C# project..." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Failed to create solution." +msgstr "Ðе вдалоÑÑ Ñтворити контур!" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Failed to save solution." +msgstr "Ðе вдалоÑÑ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶Ð¸Ñ‚Ð¸ реÑурÑ." + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Done" +msgstr "Зроблено!" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Failed to create C# project." +msgstr "Ðе вдалоÑÑ Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶Ð¸Ñ‚Ð¸ реÑурÑ." + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Mono" +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Create C# solution" +msgstr "Створити контур" + #: modules/mono/editor/mono_bottom_panel.cpp msgid "Builds" msgstr "" +#: modules/mono/editor/mono_bottom_panel.cpp +#, fuzzy +msgid "Build Project" +msgstr "Проект" + +#: modules/mono/editor/mono_bottom_panel.cpp +#, fuzzy +msgid "Warnings" +msgstr "ПопередженнÑ" + #: modules/visual_script/visual_script.cpp msgid "" "A node yielded without working memory, please read the docs on how to yield " @@ -7624,23 +7763,33 @@ msgid "Run exported HTML in the system's default browser." msgstr "Виконати екÑпортований HTML у браузері за умовчаннÑм ÑиÑтеми." #: platform/javascript/export/export.cpp -msgid "Could not write file:\n" +#, fuzzy +msgid "Could not write file:" msgstr "Ðе вдалоÑÑ Ð·Ð°Ð¿Ð¸Ñати файл:\n" #: platform/javascript/export/export.cpp -msgid "Could not open template for export:\n" +#, fuzzy +msgid "Could not open template for export:" msgstr "Ðе вдалоÑÑ Ð²Ñ–Ð´ÐºÑ€Ð¸Ñ‚Ð¸ шаблон Ð´Ð»Ñ ÐµÐºÑпорту:\n" #: platform/javascript/export/export.cpp -msgid "Invalid export template:\n" +#, fuzzy +msgid "Invalid export template:" msgstr "Ðеправильний шаблон екÑпорту:\n" #: platform/javascript/export/export.cpp -msgid "Could not read custom HTML shell:\n" +#, fuzzy +msgid "Could not read custom HTML shell:" msgstr "Ðе вдалоÑÑ Ð¿Ñ€Ð¾Ñ‡Ð¸Ñ‚Ð°Ñ‚Ð¸ Ñпеціальну оболонку HTML:\n" #: platform/javascript/export/export.cpp -msgid "Could not read boot splash image file:\n" +#, fuzzy +msgid "Could not read boot splash image file:" +msgstr "Ðе вдалоÑÑ Ñ€Ð¾Ð·Ð¿Ñ–Ð·Ð½Ð°Ñ‚Ð¸ файл Ð·Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð½Ñ Ð·Ð°Ñтавки:\n" + +#: platform/javascript/export/export.cpp +#, fuzzy +msgid "Using default boot splash image." msgstr "Ðе вдалоÑÑ Ñ€Ð¾Ð·Ð¿Ñ–Ð·Ð½Ð°Ñ‚Ð¸ файл Ð·Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð½Ñ Ð·Ð°Ñтавки:\n" #: scene/2d/animated_sprite.cpp @@ -7767,23 +7916,20 @@ msgid "ARVROrigin requires an ARVRCamera child node" msgstr "" #: scene/3d/baked_lightmap.cpp -#, fuzzy msgid "Plotting Meshes: " -msgstr "Побудова Ñітки" +msgstr "Побудова Ñітки: " #: scene/3d/baked_lightmap.cpp -#, fuzzy msgid "Plotting Lights:" -msgstr "Побудова Ñітки" +msgstr "Побудова Ñвітла:" #: scene/3d/baked_lightmap.cpp scene/3d/gi_probe.cpp msgid "Finishing Plot" msgstr "Завершальна ділÑнка" #: scene/3d/baked_lightmap.cpp -#, fuzzy msgid "Lighting Meshes: " -msgstr "Побудова Ñітки" +msgstr "ОÑÐ²Ñ–Ñ‚Ð»ÐµÐ½Ð½Ñ Ñітки: " #: scene/3d/collision_polygon.cpp msgid "" @@ -7898,8 +8044,8 @@ msgstr "(Інші)" #: scene/main/scene_tree.cpp msgid "" -"Default Environment as specified in Project Setings (Rendering -> Viewport -" -"> Default Environment) could not be loaded." +"Default Environment as specified in Project Setings (Rendering -> " +"Environment -> Default Environment) could not be loaded." msgstr "" #: scene/main/viewport.cpp diff --git a/editor/translations/ur_PK.po b/editor/translations/ur_PK.po index 8876d52ace..f834e4a105 100644 --- a/editor/translations/ur_PK.po +++ b/editor/translations/ur_PK.po @@ -197,8 +197,7 @@ msgstr "" #: 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 +#: editor/plugins/particles_editor_plugin.cpp editor/script_create_dialog.cpp msgid "Create" msgstr "" @@ -549,6 +548,15 @@ msgid "Signals" msgstr "" #: editor/create_dialog.cpp +msgid "Change %s Type" +msgstr "" + +#: editor/create_dialog.cpp editor/project_settings_editor.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Change" +msgstr "" + +#: editor/create_dialog.cpp #, fuzzy msgid "Create New %s" msgstr "سب سکریپشن بنائیں" @@ -655,7 +663,7 @@ msgid "" msgstr "" #: editor/dependency_editor.cpp -msgid "Cannot remove:\n" +msgid "Cannot remove:" msgstr "" #: editor/dependency_editor.cpp @@ -738,8 +746,8 @@ msgstr "" msgid "Lead Developer" msgstr "" -#: editor/editor_about.cpp editor/project_manager.cpp -msgid "Project Manager" +#: editor/editor_about.cpp +msgid "Project Manager " msgstr "" #: editor/editor_about.cpp @@ -824,7 +832,7 @@ msgid "Success!" msgstr "" #: editor/editor_asset_installer.cpp -#: editor/plugins/asset_library_editor_plugin.cpp editor/project_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp msgid "Install" msgstr "" @@ -1136,7 +1144,7 @@ msgid "Packing" msgstr "" #: editor/editor_export.cpp platform/javascript/export/export.cpp -msgid "Template file not found:\n" +msgid "Template file not found:" msgstr "" #: editor/editor_file_dialog.cpp scene/gui/file_dialog.cpp @@ -1394,6 +1402,11 @@ msgstr "" msgid "Clear" msgstr "" +#: editor/editor_log.cpp +#, fuzzy +msgid "Clear Output" +msgstr "سب سکریپشن بنائیں" + #: editor/editor_node.cpp editor/plugins/animation_player_editor_plugin.cpp msgid "Error saving resource!" msgstr "" @@ -1457,7 +1470,8 @@ msgstr "" #: editor/editor_node.cpp msgid "" -"Couldn't save scene. Likely dependencies (instances) couldn't be satisfied." +"Couldn't save scene. Likely dependencies (instances or inheritance) couldn't " +"be satisfied." msgstr "" #: editor/editor_node.cpp @@ -2391,7 +2405,7 @@ msgid "No version.txt found inside templates." msgstr "" #: editor/export_template_manager.cpp -msgid "Error creating path for templates:\n" +msgid "Error creating path for templates:" msgstr "" #: editor/export_template_manager.cpp @@ -2548,9 +2562,7 @@ msgid "View items as a list" msgstr "" #: editor/filesystem_dock.cpp -msgid "" -"\n" -"Status: Import of file failed. Please fix file and reimport manually." +msgid "Status: Import of file failed. Please fix file and reimport manually." msgstr "" #: editor/filesystem_dock.cpp @@ -2558,19 +2570,19 @@ msgid "Cannot move/rename resources root." msgstr "" #: editor/filesystem_dock.cpp -msgid "Cannot move a folder into itself.\n" +msgid "Cannot move a folder into itself." msgstr "" #: editor/filesystem_dock.cpp -msgid "Error moving:\n" +msgid "Error moving:" msgstr "" #: editor/filesystem_dock.cpp -msgid "Error duplicating:\n" +msgid "Error duplicating:" msgstr "" #: editor/filesystem_dock.cpp -msgid "Unable to update dependencies:\n" +msgid "Unable to update dependencies:" msgstr "" #: editor/filesystem_dock.cpp @@ -3209,6 +3221,10 @@ msgstr "" msgid "Filters.." msgstr "" +#: editor/plugins/animation_tree_editor_plugin.cpp +msgid "AnimationTree" +msgstr "" + #: editor/plugins/asset_library_editor_plugin.cpp msgid "Free" msgstr "" @@ -3374,6 +3390,7 @@ msgid "Bake Lightmaps" msgstr "" #: editor/plugins/camera_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Preview" msgstr "" @@ -4065,7 +4082,7 @@ msgid "Bake!" msgstr "" #: editor/plugins/navigation_mesh_editor_plugin.cpp -msgid "Bake the navigation mesh.\n" +msgid "Bake the navigation mesh." msgstr "" #: editor/plugins/navigation_mesh_editor_plugin.cpp @@ -4458,14 +4475,16 @@ msgstr "" msgid "Paste" msgstr "" +#: editor/plugins/resource_preloader_editor_plugin.cpp +msgid "ResourcePreloader" +msgstr "" + #: editor/plugins/script_editor_plugin.cpp msgid "Clear Recent Files" msgstr "" #: editor/plugins/script_editor_plugin.cpp -msgid "" -"Close and save changes?\n" -"\"" +msgid "Close and save changes?" msgstr "" #: editor/plugins/script_editor_plugin.cpp @@ -4542,6 +4561,10 @@ msgid "Copy Script Path" msgstr "" #: editor/plugins/script_editor_plugin.cpp +msgid "Show In File System" +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp msgid "History Prev" msgstr "" @@ -4973,83 +4996,83 @@ msgid "Rotating %s degrees." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Bottom View." +msgid "Keying is disabled (no key inserted)." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Bottom" +msgid "Animation Key Inserted." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Top View." +msgid "Objects Drawn" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Rear View." +msgid "Material Changes" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Rear" +msgid "Shader Changes" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Front View." +msgid "Surface Changes" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Front" +msgid "Draw Calls" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Left View." +msgid "Vertices" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Left" +msgid "FPS" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Right View." +msgid "Top View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Right" +msgid "Bottom View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Keying is disabled (no key inserted)." +msgid "Bottom" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Animation Key Inserted." +msgid "Left View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Objects Drawn" +msgid "Left" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Material Changes" +msgid "Right View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Shader Changes" +msgid "Right" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Surface Changes" +msgid "Front View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Draw Calls" +msgid "Front" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Vertices" +msgid "Rear View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "FPS" +msgid "Rear" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp @@ -5137,15 +5160,11 @@ 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" +msgid "Select Mode (Q)" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp @@ -5425,10 +5444,18 @@ msgstr "ایکشن منتقل کریں" msgid "Move (After)" msgstr "ایکشن منتقل کریں" +#: editor/plugins/sprite_frames_editor_plugin.cpp +msgid "SpriteFrames" +msgstr "" + #: editor/plugins/style_box_editor_plugin.cpp msgid "StyleBox Preview:" msgstr "" +#: editor/plugins/style_box_editor_plugin.cpp +msgid "StyleBox" +msgstr "" + #: editor/plugins/texture_region_editor_plugin.cpp msgid "Set Region Rect" msgstr "" @@ -5454,14 +5481,17 @@ msgid "Auto Slice" msgstr "" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Offset:" msgstr "" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Step:" msgstr "" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Separation:" msgstr "" @@ -5601,6 +5631,10 @@ msgstr "" msgid "Color" msgstr "" +#: editor/plugins/theme_editor_plugin.cpp +msgid "Theme" +msgstr "" + #: editor/plugins/tile_map_editor_plugin.cpp #, fuzzy msgid "Erase Selection" @@ -5702,6 +5736,30 @@ msgstr "" msgid "Error" msgstr "" +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "Autotiles" +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "" +"Select sub-tile to use as icon, this will be also used on invalid autotile " +"bindings." +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "" +"LMB: set bit on.\n" +"RMB: set bit off." +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "Select current edited sub-tile." +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "Select sub-tile to change it's priority." +msgstr "" + #: editor/progress_dialog.cpp scene/gui/dialogs.cpp msgid "Cancel" msgstr "" @@ -5819,10 +5877,23 @@ msgid "Please choose a folder that does not contain a 'project.godot' file." msgstr "" #: editor/project_manager.cpp +msgid "That's a BINGO!" +msgstr "" + +#: editor/project_manager.cpp msgid "Imported Project" msgstr "" #: editor/project_manager.cpp +#, fuzzy +msgid "Couldn't create folder." +msgstr "سب سکریپشن بنائیں" + +#: editor/project_manager.cpp +msgid "There is already a folder in this path with the specified name." +msgstr "" + +#: editor/project_manager.cpp msgid "It would be a good idea to name your project." msgstr "" @@ -5864,14 +5935,27 @@ msgid "Import Existing Project" msgstr "" #: editor/project_manager.cpp +msgid "Import & Edit" +msgstr "" + +#: editor/project_manager.cpp msgid "Create New Project" msgstr "" #: editor/project_manager.cpp +#, fuzzy +msgid "Create & Edit" +msgstr "سب سکریپشن بنائیں" + +#: editor/project_manager.cpp msgid "Install Project:" msgstr "" #: editor/project_manager.cpp +msgid "Install & Edit" +msgstr "" + +#: editor/project_manager.cpp msgid "Project Name:" msgstr "" @@ -5888,10 +5972,6 @@ msgid "Browse" msgstr "" #: editor/project_manager.cpp -msgid "That's a BINGO!" -msgstr "" - -#: editor/project_manager.cpp msgid "Unnamed Project" msgstr "" @@ -5937,6 +6017,10 @@ msgid "" msgstr "" #: editor/project_manager.cpp +msgid "Project Manager" +msgstr "" + +#: editor/project_manager.cpp msgid "Project List" msgstr "" @@ -6064,11 +6148,6 @@ 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 "" @@ -6536,7 +6615,7 @@ msgid "Error duplicating scene to save it." msgstr "" #: editor/scene_tree_dock.cpp -msgid "Sub-Resources:" +msgid "Sub-Resources" msgstr "" #: editor/scene_tree_dock.cpp @@ -6836,7 +6915,7 @@ msgstr "" msgid "Pick one or more items from the list to display the graph." msgstr "" -#: editor/script_editor_debugger.cpp +#: editor/script_editor_debugger.cpp modules/mono/editor/mono_bottom_panel.cpp msgid "Errors" msgstr "" @@ -6845,6 +6924,10 @@ msgid "Child Process Connected" msgstr "" #: editor/script_editor_debugger.cpp +msgid "Copy Error" +msgstr "" + +#: editor/script_editor_debugger.cpp msgid "Inspect Previous Instance" msgstr "" @@ -7195,10 +7278,51 @@ msgstr "" msgid "Pick Distance:" msgstr "" +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Generating solution..." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Generating C# project..." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Failed to create solution." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Failed to save solution." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Done" +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Failed to create C# project." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Mono" +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Create C# solution" +msgstr "سب سکریپشن بنائیں" + #: modules/mono/editor/mono_bottom_panel.cpp msgid "Builds" msgstr "" +#: modules/mono/editor/mono_bottom_panel.cpp +msgid "Build Project" +msgstr "" + +#: modules/mono/editor/mono_bottom_panel.cpp +msgid "Warnings" +msgstr "" + #: modules/visual_script/visual_script.cpp msgid "" "A node yielded without working memory, please read the docs on how to yield " @@ -7548,23 +7672,28 @@ msgid "Run exported HTML in the system's default browser." msgstr "" #: platform/javascript/export/export.cpp -msgid "Could not write file:\n" +#, fuzzy +msgid "Could not write file:" +msgstr "سب سکریپشن بنائیں" + +#: platform/javascript/export/export.cpp +msgid "Could not open template for export:" msgstr "" #: platform/javascript/export/export.cpp -msgid "Could not open template for export:\n" +msgid "Invalid export template:" msgstr "" #: platform/javascript/export/export.cpp -msgid "Invalid export template:\n" +msgid "Could not read custom HTML shell:" msgstr "" #: platform/javascript/export/export.cpp -msgid "Could not read custom HTML shell:\n" +msgid "Could not read boot splash image file:" msgstr "" #: platform/javascript/export/export.cpp -msgid "Could not read boot splash image file:\n" +msgid "Using default boot splash image." msgstr "" #: scene/2d/animated_sprite.cpp @@ -7817,8 +7946,8 @@ msgstr "" #: scene/main/scene_tree.cpp msgid "" -"Default Environment as specified in Project Setings (Rendering -> Viewport -" -"> Default Environment) could not be loaded." +"Default Environment as specified in Project Setings (Rendering -> " +"Environment -> Default Environment) could not be loaded." msgstr "" #: scene/main/viewport.cpp @@ -7845,8 +7974,5 @@ msgstr "" msgid "Invalid font size." msgstr "" -#~ msgid "Create Subscription" -#~ msgstr "سب سکریپشن بنائیں" - #~ msgid "Samples" #~ msgstr "نمونے" diff --git a/editor/translations/vi.po b/editor/translations/vi.po index 89b1200f6b..94e42d6464 100644 --- a/editor/translations/vi.po +++ b/editor/translations/vi.po @@ -201,8 +201,7 @@ msgstr "" #: 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 +#: editor/plugins/particles_editor_plugin.cpp editor/script_create_dialog.cpp msgid "Create" msgstr "Tạo" @@ -553,6 +552,15 @@ msgid "Signals" msgstr "" #: editor/create_dialog.cpp +msgid "Change %s Type" +msgstr "" + +#: editor/create_dialog.cpp editor/project_settings_editor.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Change" +msgstr "" + +#: editor/create_dialog.cpp #, fuzzy msgid "Create New %s" msgstr "Tạo" @@ -659,7 +667,7 @@ msgid "" msgstr "" #: editor/dependency_editor.cpp -msgid "Cannot remove:\n" +msgid "Cannot remove:" msgstr "" #: editor/dependency_editor.cpp @@ -742,8 +750,8 @@ msgstr "" msgid "Lead Developer" msgstr "" -#: editor/editor_about.cpp editor/project_manager.cpp -msgid "Project Manager" +#: editor/editor_about.cpp +msgid "Project Manager " msgstr "" #: editor/editor_about.cpp @@ -828,7 +836,7 @@ msgid "Success!" msgstr "" #: editor/editor_asset_installer.cpp -#: editor/plugins/asset_library_editor_plugin.cpp editor/project_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp msgid "Install" msgstr "" @@ -1135,7 +1143,7 @@ msgid "Packing" msgstr "" #: editor/editor_export.cpp platform/javascript/export/export.cpp -msgid "Template file not found:\n" +msgid "Template file not found:" msgstr "" #: editor/editor_file_dialog.cpp scene/gui/file_dialog.cpp @@ -1389,6 +1397,10 @@ msgstr "" msgid "Clear" msgstr "" +#: editor/editor_log.cpp +msgid "Clear Output" +msgstr "" + #: editor/editor_node.cpp editor/plugins/animation_player_editor_plugin.cpp msgid "Error saving resource!" msgstr "" @@ -1452,7 +1464,8 @@ msgstr "" #: editor/editor_node.cpp msgid "" -"Couldn't save scene. Likely dependencies (instances) couldn't be satisfied." +"Couldn't save scene. Likely dependencies (instances or inheritance) couldn't " +"be satisfied." msgstr "" #: editor/editor_node.cpp @@ -2384,7 +2397,7 @@ msgid "No version.txt found inside templates." msgstr "" #: editor/export_template_manager.cpp -msgid "Error creating path for templates:\n" +msgid "Error creating path for templates:" msgstr "" #: editor/export_template_manager.cpp @@ -2538,9 +2551,7 @@ msgid "View items as a list" msgstr "" #: editor/filesystem_dock.cpp -msgid "" -"\n" -"Status: Import of file failed. Please fix file and reimport manually." +msgid "Status: Import of file failed. Please fix file and reimport manually." msgstr "" #: editor/filesystem_dock.cpp @@ -2548,19 +2559,20 @@ msgid "Cannot move/rename resources root." msgstr "" #: editor/filesystem_dock.cpp -msgid "Cannot move a folder into itself.\n" +msgid "Cannot move a folder into itself." msgstr "" #: editor/filesystem_dock.cpp -msgid "Error moving:\n" -msgstr "" +#, fuzzy +msgid "Error moving:" +msgstr "Lá»—i tải font." #: editor/filesystem_dock.cpp -msgid "Error duplicating:\n" +msgid "Error duplicating:" msgstr "" #: editor/filesystem_dock.cpp -msgid "Unable to update dependencies:\n" +msgid "Unable to update dependencies:" msgstr "" #: editor/filesystem_dock.cpp @@ -3197,6 +3209,10 @@ msgstr "" msgid "Filters.." msgstr "" +#: editor/plugins/animation_tree_editor_plugin.cpp +msgid "AnimationTree" +msgstr "" + #: editor/plugins/asset_library_editor_plugin.cpp msgid "Free" msgstr "" @@ -3362,6 +3378,7 @@ msgid "Bake Lightmaps" msgstr "" #: editor/plugins/camera_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Preview" msgstr "" @@ -4045,7 +4062,7 @@ msgid "Bake!" msgstr "" #: editor/plugins/navigation_mesh_editor_plugin.cpp -msgid "Bake the navigation mesh.\n" +msgid "Bake the navigation mesh." msgstr "" #: editor/plugins/navigation_mesh_editor_plugin.cpp @@ -4434,14 +4451,16 @@ msgstr "" msgid "Paste" msgstr "" +#: editor/plugins/resource_preloader_editor_plugin.cpp +msgid "ResourcePreloader" +msgstr "" + #: editor/plugins/script_editor_plugin.cpp msgid "Clear Recent Files" msgstr "" #: editor/plugins/script_editor_plugin.cpp -msgid "" -"Close and save changes?\n" -"\"" +msgid "Close and save changes?" msgstr "" #: editor/plugins/script_editor_plugin.cpp @@ -4517,6 +4536,10 @@ msgid "Copy Script Path" msgstr "" #: editor/plugins/script_editor_plugin.cpp +msgid "Show In File System" +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp msgid "History Prev" msgstr "" @@ -4948,83 +4971,83 @@ msgid "Rotating %s degrees." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Bottom View." +msgid "Keying is disabled (no key inserted)." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Bottom" +msgid "Animation Key Inserted." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Top View." +msgid "Objects Drawn" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Rear View." +msgid "Material Changes" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Rear" +msgid "Shader Changes" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Front View." +msgid "Surface Changes" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Front" +msgid "Draw Calls" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Left View." +msgid "Vertices" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Left" +msgid "FPS" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Right View." +msgid "Top View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Right" +msgid "Bottom View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Keying is disabled (no key inserted)." +msgid "Bottom" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Animation Key Inserted." +msgid "Left View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Objects Drawn" +msgid "Left" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Material Changes" +msgid "Right View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Shader Changes" +msgid "Right" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Surface Changes" +msgid "Front View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Draw Calls" +msgid "Front" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Vertices" +msgid "Rear View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "FPS" +msgid "Rear" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp @@ -5112,15 +5135,11 @@ 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" +msgid "Select Mode (Q)" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp @@ -5395,10 +5414,18 @@ msgstr "" msgid "Move (After)" msgstr "" +#: editor/plugins/sprite_frames_editor_plugin.cpp +msgid "SpriteFrames" +msgstr "" + #: editor/plugins/style_box_editor_plugin.cpp msgid "StyleBox Preview:" msgstr "" +#: editor/plugins/style_box_editor_plugin.cpp +msgid "StyleBox" +msgstr "" + #: editor/plugins/texture_region_editor_plugin.cpp msgid "Set Region Rect" msgstr "" @@ -5424,14 +5451,17 @@ msgid "Auto Slice" msgstr "" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Offset:" msgstr "" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Step:" msgstr "" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Separation:" msgstr "" @@ -5569,6 +5599,10 @@ msgstr "" msgid "Color" msgstr "" +#: editor/plugins/theme_editor_plugin.cpp +msgid "Theme" +msgstr "" + #: editor/plugins/tile_map_editor_plugin.cpp msgid "Erase Selection" msgstr "" @@ -5669,6 +5703,30 @@ msgstr "" msgid "Error" msgstr "" +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "Autotiles" +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "" +"Select sub-tile to use as icon, this will be also used on invalid autotile " +"bindings." +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "" +"LMB: set bit on.\n" +"RMB: set bit off." +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "Select current edited sub-tile." +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "Select sub-tile to change it's priority." +msgstr "" + #: editor/progress_dialog.cpp scene/gui/dialogs.cpp msgid "Cancel" msgstr "" @@ -5786,10 +5844,22 @@ msgid "Please choose a folder that does not contain a 'project.godot' file." msgstr "" #: editor/project_manager.cpp +msgid "That's a BINGO!" +msgstr "" + +#: editor/project_manager.cpp msgid "Imported Project" msgstr "" #: editor/project_manager.cpp +msgid "Couldn't create folder." +msgstr "" + +#: editor/project_manager.cpp +msgid "There is already a folder in this path with the specified name." +msgstr "" + +#: editor/project_manager.cpp msgid "It would be a good idea to name your project." msgstr "" @@ -5830,14 +5900,27 @@ msgid "Import Existing Project" msgstr "" #: editor/project_manager.cpp +msgid "Import & Edit" +msgstr "" + +#: editor/project_manager.cpp msgid "Create New Project" msgstr "" #: editor/project_manager.cpp +#, fuzzy +msgid "Create & Edit" +msgstr "Tạo" + +#: editor/project_manager.cpp msgid "Install Project:" msgstr "" #: editor/project_manager.cpp +msgid "Install & Edit" +msgstr "" + +#: editor/project_manager.cpp msgid "Project Name:" msgstr "" @@ -5854,10 +5937,6 @@ msgid "Browse" msgstr "" #: editor/project_manager.cpp -msgid "That's a BINGO!" -msgstr "" - -#: editor/project_manager.cpp msgid "Unnamed Project" msgstr "" @@ -5903,6 +5982,10 @@ msgid "" msgstr "" #: editor/project_manager.cpp +msgid "Project Manager" +msgstr "" + +#: editor/project_manager.cpp msgid "Project List" msgstr "" @@ -6029,11 +6112,6 @@ 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 "" @@ -6499,7 +6577,7 @@ msgid "Error duplicating scene to save it." msgstr "" #: editor/scene_tree_dock.cpp -msgid "Sub-Resources:" +msgid "Sub-Resources" msgstr "" #: editor/scene_tree_dock.cpp @@ -6790,7 +6868,7 @@ msgstr "" msgid "Pick one or more items from the list to display the graph." msgstr "" -#: editor/script_editor_debugger.cpp +#: editor/script_editor_debugger.cpp modules/mono/editor/mono_bottom_panel.cpp msgid "Errors" msgstr "" @@ -6799,6 +6877,10 @@ msgid "Child Process Connected" msgstr "" #: editor/script_editor_debugger.cpp +msgid "Copy Error" +msgstr "" + +#: editor/script_editor_debugger.cpp msgid "Inspect Previous Instance" msgstr "" @@ -7144,10 +7226,50 @@ msgstr "" msgid "Pick Distance:" msgstr "" +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Generating solution..." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Generating C# project..." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Failed to create solution." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Failed to save solution." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Done" +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Failed to create C# project." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Mono" +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Create C# solution" +msgstr "" + #: modules/mono/editor/mono_bottom_panel.cpp msgid "Builds" msgstr "" +#: modules/mono/editor/mono_bottom_panel.cpp +msgid "Build Project" +msgstr "" + +#: modules/mono/editor/mono_bottom_panel.cpp +msgid "Warnings" +msgstr "" + #: modules/visual_script/visual_script.cpp msgid "" "A node yielded without working memory, please read the docs on how to yield " @@ -7493,23 +7615,27 @@ msgid "Run exported HTML in the system's default browser." msgstr "" #: platform/javascript/export/export.cpp -msgid "Could not write file:\n" +msgid "Could not write file:" +msgstr "" + +#: platform/javascript/export/export.cpp +msgid "Could not open template for export:" msgstr "" #: platform/javascript/export/export.cpp -msgid "Could not open template for export:\n" +msgid "Invalid export template:" msgstr "" #: platform/javascript/export/export.cpp -msgid "Invalid export template:\n" +msgid "Could not read custom HTML shell:" msgstr "" #: platform/javascript/export/export.cpp -msgid "Could not read custom HTML shell:\n" +msgid "Could not read boot splash image file:" msgstr "" #: platform/javascript/export/export.cpp -msgid "Could not read boot splash image file:\n" +msgid "Using default boot splash image." msgstr "" #: scene/2d/animated_sprite.cpp @@ -7762,8 +7888,8 @@ msgstr "(Khác)" #: scene/main/scene_tree.cpp msgid "" -"Default Environment as specified in Project Setings (Rendering -> Viewport -" -"> Default Environment) could not be loaded." +"Default Environment as specified in Project Setings (Rendering -> " +"Environment -> Default Environment) could not be loaded." msgstr "" #: scene/main/viewport.cpp diff --git a/editor/translations/zh_CN.po b/editor/translations/zh_CN.po index e1ee53bf94..db4e616527 100644 --- a/editor/translations/zh_CN.po +++ b/editor/translations/zh_CN.po @@ -1,4 +1,4 @@ -# Chinese (China) translation of the Godot Engine editor +# Chinese (Simplified) translation of the Godot Engine editor # Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. # Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md) # This file is distributed under the same license as the Godot source code. @@ -9,7 +9,7 @@ # ageazrael <ageazrael@gmail.com>, 2016. # Bruce Guo <guoboism@hotmail.com>, 2016. # dragonandy <dragonandy@foxmail.com>, 2017. -# Geequlim <geequlim@gmail.com>, 2016-2017. +# Geequlim <geequlim@gmail.com>, 2016-2018. # lalalaring <783482203@qq.com>, 2017. # Luo Jun <vipsbpig@gmail.com>, 2016-2017. # oberon-tonya <360119124@qq.com>, 2016. @@ -21,9 +21,9 @@ # msgid "" msgstr "" -"Project-Id-Version: Godot Engine editor\n" -"POT-Creation-Date: \n" -"PO-Revision-Date: 2017-12-10 10:33+0000\n" +"Project-Id-Version: Chinese (Simplified) (Godot Engine)\n" +"POT-Creation-Date: 2018-01-06 09:18+0200\n" +"PO-Revision-Date: 2018-01-06 09:01+0000\n" "Last-Translator: Geequlim <geequlim@gmail.com>\n" "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/" "godot-engine/godot/zh_Hans/>\n" @@ -32,7 +32,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.18-dev\n" +"X-Generator: Weblate 2.19-dev\n" #: editor/animation_editor.cpp msgid "Disabled" @@ -43,9 +43,8 @@ msgid "All Selection" msgstr "所有选ä¸é¡¹" #: editor/animation_editor.cpp -#, fuzzy msgid "Anim Change Keyframe Time" -msgstr "修改动画值" +msgstr "修改动画关键帧的时间" #: editor/animation_editor.cpp msgid "Anim Change Transition" @@ -56,9 +55,8 @@ msgid "Anim Change Transform" msgstr "修改å˜æ¢" #: editor/animation_editor.cpp -#, fuzzy msgid "Anim Change Keyframe Value" -msgstr "修改动画值" +msgstr "修改动画关键帧的值" #: editor/animation_editor.cpp msgid "Anim Change Call" @@ -214,8 +212,7 @@ msgstr "创建%d个新轨é“并æ’入关键帧？" #: 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 +#: editor/plugins/particles_editor_plugin.cpp editor/script_create_dialog.cpp msgid "Create" msgstr "创建" @@ -549,9 +546,8 @@ msgid "Connecting Signal:" msgstr "连接事件:" #: editor/connections_dialog.cpp -#, fuzzy msgid "Disconnect '%s' from '%s'" -msgstr "连接'%s'到'%s'" +msgstr "å–消'%s'的连接'%s'" #: editor/connections_dialog.cpp msgid "Connect.." @@ -568,8 +564,17 @@ msgstr "ä¿¡å·" #: editor/create_dialog.cpp #, fuzzy +msgid "Change %s Type" +msgstr "更改类型" + +#: editor/create_dialog.cpp editor/project_settings_editor.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Change" +msgstr "更改" + +#: editor/create_dialog.cpp msgid "Create New %s" -msgstr "新建" +msgstr "创建新的 %s" #: editor/create_dialog.cpp editor/editor_file_dialog.cpp #: editor/filesystem_dock.cpp @@ -673,7 +678,8 @@ msgid "" msgstr "è¦åˆ 除的文件被其他资æºæ‰€ä¾èµ–，ä»ç„¶è¦åˆ 除å—ï¼Ÿï¼ˆæ— æ³•æ’¤é”€ï¼‰" #: editor/dependency_editor.cpp -msgid "Cannot remove:\n" +#, fuzzy +msgid "Cannot remove:" msgstr "æ— æ³•ç§»é™¤:\n" #: editor/dependency_editor.cpp @@ -756,8 +762,9 @@ msgstr "项目创始人" msgid "Lead Developer" msgstr "主è¦å¼€å‘者" -#: editor/editor_about.cpp editor/project_manager.cpp -msgid "Project Manager" +#: editor/editor_about.cpp +#, fuzzy +msgid "Project Manager " msgstr "项目管ç†å‘˜" #: editor/editor_about.cpp @@ -844,7 +851,7 @@ msgid "Success!" msgstr "完æˆï¼" #: editor/editor_asset_installer.cpp -#: editor/plugins/asset_library_editor_plugin.cpp editor/project_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp msgid "Install" msgstr "安装" @@ -865,9 +872,8 @@ msgid "Rename Audio Bus" msgstr "é‡å‘½å音频总线（Audio Bus）" #: editor/editor_audio_buses.cpp -#, fuzzy msgid "Change Audio Bus Volume" -msgstr "切æ¢éŸ³é¢‘独å¥" +msgstr "修改音频Bus音é‡" #: editor/editor_audio_buses.cpp msgid "Toggle Audio Bus Solo" @@ -932,7 +938,7 @@ msgstr "åˆ é™¤æ•ˆæžœ" #: editor/editor_audio_buses.cpp msgid "Audio" -msgstr "" +msgstr "音频" #: editor/editor_audio_buses.cpp msgid "Add Audio Bus" @@ -1113,7 +1119,7 @@ msgstr "（空）" #: editor/editor_data.cpp msgid "[unsaved]" -msgstr "" +msgstr "[ä½ä¿å˜]" #: editor/editor_dir_dialog.cpp msgid "Please select a base directory first" @@ -1153,7 +1159,8 @@ msgid "Packing" msgstr "打包ä¸" #: editor/editor_export.cpp platform/javascript/export/export.cpp -msgid "Template file not found:\n" +#, fuzzy +msgid "Template file not found:" msgstr "找ä¸åˆ°æ¨¡æ¿æ–‡ä»¶:\n" #: editor/editor_file_dialog.cpp scene/gui/file_dialog.cpp @@ -1411,6 +1418,11 @@ msgstr "输出：" msgid "Clear" msgstr "清除" +#: editor/editor_log.cpp +#, fuzzy +msgid "Clear Output" +msgstr "输出" + #: editor/editor_node.cpp editor/plugins/animation_player_editor_plugin.cpp msgid "Error saving resource!" msgstr "ä¿å˜èµ„æºå‡ºé”™ï¼" @@ -1473,8 +1485,10 @@ msgid "This operation can't be done without a tree root." msgstr "æ¤æ“作必须在打开一个场景åŽæ‰èƒ½æ‰§è¡Œã€‚" #: editor/editor_node.cpp +#, fuzzy msgid "" -"Couldn't save scene. Likely dependencies (instances) couldn't be satisfied." +"Couldn't save scene. Likely dependencies (instances or inheritance) couldn't " +"be satisfied." msgstr "æ— æ³•ä¿å˜åœºæ™¯ï¼Œä¾èµ–项（实例）验è¯å¤±è´¥ã€‚" #: editor/editor_node.cpp @@ -2326,14 +2340,12 @@ msgid "Frame #:" msgstr "帧åºå·:" #: editor/editor_profiler.cpp -#, fuzzy msgid "Time" -msgstr "时间:" +msgstr "时间" #: editor/editor_profiler.cpp -#, fuzzy msgid "Calls" -msgstr "调用到" +msgstr "调用次数" #: editor/editor_run_native.cpp msgid "Select device from the list" @@ -2438,7 +2450,8 @@ msgid "No version.txt found inside templates." msgstr "模æ¿ä¸æ²¡æœ‰æ‰¾åˆ°version.txt文件。" #: editor/export_template_manager.cpp -msgid "Error creating path for templates:\n" +#, fuzzy +msgid "Error creating path for templates:" msgstr "æ— æ³•å°†æ¨¡æ¿ä¿å˜åˆ°ä»¥ä¸‹æ–‡ä»¶:\n" #: editor/export_template_manager.cpp @@ -2472,9 +2485,8 @@ msgstr "æ— å“应。" #: editor/export_template_manager.cpp #: editor/plugins/asset_library_editor_plugin.cpp -#, fuzzy msgid "Request Failed." -msgstr "请求失败." +msgstr "请求失败。" #: editor/export_template_manager.cpp #: editor/plugins/asset_library_editor_plugin.cpp @@ -2520,7 +2532,6 @@ msgid "Connecting.." msgstr "连接ä¸.." #: editor/export_template_manager.cpp -#, fuzzy msgid "Can't Connect" msgstr "æ— æ³•è¿žæŽ¥" @@ -2594,9 +2605,8 @@ msgid "View items as a list" msgstr "将项目作为列表查看" #: editor/filesystem_dock.cpp -msgid "" -"\n" -"Status: Import of file failed. Please fix file and reimport manually." +#, fuzzy +msgid "Status: Import of file failed. Please fix file and reimport manually." msgstr "" "\n" "状æ€: 导入文件失败。请手动修å¤æ–‡ä»¶å’Œå¯¼å…¥ã€‚" @@ -2606,20 +2616,23 @@ msgid "Cannot move/rename resources root." msgstr "æ— æ³•ç§»åŠ¨/é‡å‘½åæ ¹èµ„æºã€‚" #: editor/filesystem_dock.cpp -msgid "Cannot move a folder into itself.\n" +#, fuzzy +msgid "Cannot move a folder into itself." msgstr "æ— æ³•å°†æ–‡ä»¶å¤¹ç§»åŠ¨åˆ°å…¶è‡ªèº«ã€‚\n" #: editor/filesystem_dock.cpp -msgid "Error moving:\n" +#, fuzzy +msgid "Error moving:" msgstr "移动时出错:\n" #: editor/filesystem_dock.cpp #, fuzzy -msgid "Error duplicating:\n" -msgstr "åŠ è½½å‡ºé”™:" +msgid "Error duplicating:" +msgstr "å¤åˆ¶å‡ºé”™:" #: editor/filesystem_dock.cpp -msgid "Unable to update dependencies:\n" +#, fuzzy +msgid "Unable to update dependencies:" msgstr "æ— æ³•æ›´æ–°ä¾èµ–关系:\n" #: editor/filesystem_dock.cpp @@ -2651,14 +2664,12 @@ msgid "Renaming folder:" msgstr "é‡å‘½å文件夹:" #: editor/filesystem_dock.cpp -#, fuzzy msgid "Duplicating file:" -msgstr "æ‹·è´" +msgstr "æ‹·è´æ–‡ä»¶:" #: editor/filesystem_dock.cpp -#, fuzzy msgid "Duplicating folder:" -msgstr "é‡å‘½å文件夹:" +msgstr "å¤åˆ¶æ–‡ä»¶å¤¹:" #: editor/filesystem_dock.cpp msgid "Expand all" @@ -2677,7 +2688,6 @@ msgid "Move To.." msgstr "移动.." #: editor/filesystem_dock.cpp -#, fuzzy msgid "Open Scene(s)" msgstr "打开场景" @@ -2694,9 +2704,8 @@ msgid "View Owners.." msgstr "查看所有者.." #: editor/filesystem_dock.cpp -#, fuzzy msgid "Duplicate.." -msgstr "æ‹·è´" +msgstr "æ‹·è´.." #: editor/filesystem_dock.cpp msgid "Previous Directory" @@ -2793,14 +2802,12 @@ msgid "Importing Scene.." msgstr "导入场景.." #: editor/import/resource_importer_scene.cpp -#, fuzzy msgid "Generating Lightmaps" -msgstr "转移到光照贴图:" +msgstr "æ£åœ¨ç”Ÿæˆå…‰ç…§è´´å›¾" #: editor/import/resource_importer_scene.cpp -#, fuzzy msgid "Generating for Mesh: " -msgstr "æ£åœ¨ç”ŸæˆAABB" +msgstr "æ£åœ¨ç”ŸæˆMesh" #: editor/import/resource_importer_scene.cpp msgid "Running Custom Script.." @@ -3085,7 +3092,7 @@ msgstr "3æ¥" #: editor/plugins/animation_player_editor_plugin.cpp msgid "Differences Only" -msgstr "" +msgstr "ä»…ä¸åŒ" #: editor/plugins/animation_player_editor_plugin.cpp msgid "Force White Modulate" @@ -3093,7 +3100,7 @@ msgstr "" #: editor/plugins/animation_player_editor_plugin.cpp msgid "Include Gizmos (3D)" -msgstr "" +msgstr "包括3D控制器" #: editor/plugins/animation_player_editor_plugin.cpp msgid "Create New Animation" @@ -3269,6 +3276,11 @@ msgstr "编辑节点ç›é€‰" msgid "Filters.." msgstr "ç›é€‰.." +#: editor/plugins/animation_tree_editor_plugin.cpp +#, fuzzy +msgid "AnimationTree" +msgstr "动画" + #: editor/plugins/asset_library_editor_plugin.cpp msgid "Free" msgstr "释放" @@ -3418,23 +3430,26 @@ msgid "" "Save your scene (for images to be saved in the same dir), or pick a save " "path from the BakedLightmap properties." msgstr "" +"æ— æ³•ç¡®å®šå…‰ç…§è´´å›¾çš„ä¿å˜è·¯å¾„。\n" +"请先ä¿å˜åœºæ™¯ï¼ˆå…‰ç…§è´´å›¾å°†è¢«å˜åœ¨åŒä¸€ç›®å½•ä¸‹ï¼‰æˆ–从属性é¢æ¿ä¸æ‰‹åŠ¨ä¿å˜ " +"`BakedLightmap` 属性。" #: editor/plugins/baked_lightmap_editor_plugin.cpp msgid "" "No meshes to bake. Make sure they contain an UV2 channel and that the 'Bake " "Light' flag is on." -msgstr "" +msgstr "没有å¯çƒ˜ç„™çš„Mesh。请确ä¿Mesh包å«UV2通é“并且勾选'Bake Light'选项。" #: editor/plugins/baked_lightmap_editor_plugin.cpp msgid "Failed creating lightmap images, make sure path is writable." -msgstr "" +msgstr "创建光照贴图失败，切确ä¿æ–‡ä»¶æ˜¯å¯å†™çš„。" #: editor/plugins/baked_lightmap_editor_plugin.cpp -#, fuzzy msgid "Bake Lightmaps" -msgstr "转移到光照贴图:" +msgstr "烘焙光照贴图" #: editor/plugins/camera_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Preview" msgstr "预览" @@ -3469,12 +3484,10 @@ msgid "Move Action" msgstr "移动动作" #: editor/plugins/canvas_item_editor_plugin.cpp -#, fuzzy msgid "Move vertical guide" msgstr "ç§»åŠ¨åž‚ç›´æ ‡å°º" #: editor/plugins/canvas_item_editor_plugin.cpp -#, fuzzy msgid "Create new vertical guide" msgstr "åˆ›å»ºæ–°çš„åž‚ç›´æ ‡å°º" @@ -3670,7 +3683,6 @@ msgid "Show Grid" msgstr "æ˜¾ç¤ºç½‘æ ¼" #: editor/plugins/canvas_item_editor_plugin.cpp -#, fuzzy msgid "Show helpers" msgstr "显示辅助线" @@ -3679,9 +3691,8 @@ msgid "Show rulers" msgstr "æ˜¾ç¤ºæ ‡å°º" #: editor/plugins/canvas_item_editor_plugin.cpp -#, fuzzy msgid "Show guides" -msgstr "æ˜¾ç¤ºæ ‡å°º" +msgstr "æ˜¾ç¤ºæ ‡å°º " #: editor/plugins/canvas_item_editor_plugin.cpp msgid "Center Selection" @@ -3815,9 +3826,8 @@ msgid "Ease out" msgstr "æ¸å‡º" #: editor/plugins/curve_editor_plugin.cpp -#, fuzzy msgid "Smoothstep" -msgstr "圆滑级别" +msgstr "圆滑级别 " #: editor/plugins/curve_editor_plugin.cpp msgid "Modify Curve Point" @@ -3950,7 +3960,7 @@ msgstr "创建导航Mesh(ç½‘æ ¼)" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Contained Mesh is not of type ArrayMesh." -msgstr "" +msgstr "包å«çš„Meshä¸æ˜¯ArrayMesh类型。" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "UV Unwrap failed, mesh may not be manifold?" @@ -3958,11 +3968,11 @@ msgstr "" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "No mesh to debug." -msgstr "" +msgstr "没有è¦è°ƒè¯•çš„mesh。" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "Model has no UV in this layer" -msgstr "" +msgstr "模型在æ¤å±‚上没有UV图" #: editor/plugins/mesh_instance_editor_plugin.cpp msgid "MeshInstance lacks a Mesh!" @@ -4128,10 +4138,11 @@ msgstr "å¡«å……" #: editor/plugins/navigation_mesh_editor_plugin.cpp msgid "Bake!" -msgstr "烘培ï¼" +msgstr "烘焙ï¼" #: editor/plugins/navigation_mesh_editor_plugin.cpp -msgid "Bake the navigation mesh.\n" +#, fuzzy +msgid "Bake the navigation mesh." msgstr "çƒ˜ç„™å¯¼èˆªç½‘æ ¼(mesh).\n" #: editor/plugins/navigation_mesh_editor_plugin.cpp @@ -4147,50 +4158,42 @@ msgid "Calculating grid size..." 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 "æ ‡è®°å¯ç§»åŠ¨ä¸‰è§’å½¢..." #: editor/plugins/navigation_mesh_generator.cpp -#, fuzzy msgid "Constructing compact heightfield..." -msgstr "构建紧凑高度图..." +msgstr "构建紧凑高度图... " #: editor/plugins/navigation_mesh_generator.cpp msgid "Eroding walkable area..." 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 msgid "Creating polymesh..." 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 "å¯¼èˆªç½‘æ ¼(Mesh)生æˆè®¾ç½®:" #: editor/plugins/navigation_mesh_generator.cpp -#, fuzzy msgid "Parsing Geometry..." msgstr "解æžå¤šè¾¹å½¢ä¸..." @@ -4395,19 +4398,16 @@ msgid "Curve Point #" msgstr "曲线定点 #" #: editor/plugins/path_editor_plugin.cpp -#, fuzzy msgid "Set Curve Point Position" -msgstr "设置曲线顶点åæ ‡" +msgstr "设置曲线的顶点åæ ‡" #: editor/plugins/path_editor_plugin.cpp -#, fuzzy msgid "Set Curve In Position" -msgstr "设置的曲线开始ä½ç½®ï¼ˆPos）" +msgstr "设置曲线的内控制点" #: editor/plugins/path_editor_plugin.cpp -#, fuzzy msgid "Set Curve Out Position" -msgstr "设置曲线结æŸä½ç½®ï¼ˆPos）" +msgstr "设置曲线外控制点" #: editor/plugins/path_editor_plugin.cpp msgid "Split Path" @@ -4531,14 +4531,18 @@ msgstr "åŠ è½½èµ„æº" msgid "Paste" msgstr "粘贴" +#: editor/plugins/resource_preloader_editor_plugin.cpp +#, fuzzy +msgid "ResourcePreloader" +msgstr "资æºè·¯å¾„" + #: editor/plugins/script_editor_plugin.cpp msgid "Clear Recent Files" msgstr "清ç†å½“å‰æ–‡ä»¶" #: editor/plugins/script_editor_plugin.cpp -msgid "" -"Close and save changes?\n" -"\"" +#, fuzzy +msgid "Close and save changes?" msgstr "" "å…³é—并ä¿å˜æ›´æ”¹å—？\n" "\"" @@ -4612,9 +4616,13 @@ msgid "Soft Reload Script" msgstr "软é‡è½½è„šæœ¬" #: editor/plugins/script_editor_plugin.cpp -#, fuzzy msgid "Copy Script Path" -msgstr "æ‹·è´è·¯å¾„" +msgstr "æ‹·è´è„šæœ¬è·¯å¾„" + +#: editor/plugins/script_editor_plugin.cpp +#, fuzzy +msgid "Show In File System" +msgstr "在资æºç®¡ç†å™¨ä¸å±•ç¤º" #: editor/plugins/script_editor_plugin.cpp msgid "History Prev" @@ -4645,7 +4653,6 @@ msgid "Close All" msgstr "å…³é—全部" #: editor/plugins/script_editor_plugin.cpp -#, fuzzy msgid "Close Other Tabs" msgstr "å…³é—å…¶ä»–æ ‡ç¾é¡µ" @@ -4806,9 +4813,8 @@ msgid "Clone Down" msgstr "æ‹·è´åˆ°ä¸‹ä¸€è¡Œ" #: editor/plugins/script_text_editor.cpp -#, fuzzy msgid "Fold/Unfold Line" -msgstr "å–消折å è¡Œ" +msgstr "切æ¢å è¡Œ" #: editor/plugins/script_text_editor.cpp msgid "Fold All Lines" @@ -5044,7 +5050,6 @@ msgid "Scaling: " msgstr "缩放： " #: editor/plugins/spatial_editor_plugin.cpp -#, fuzzy msgid "Translating: " msgstr "è¯è¨€:" @@ -5053,84 +5058,84 @@ msgid "Rotating %s degrees." msgstr "旋转%s度。" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Bottom View." -msgstr "仰视图(Bottom View)。" +msgid "Keying is disabled (no key inserted)." +msgstr "键控被ç¦ç”¨ï¼ˆæœªæ’入键）。" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Bottom" -msgstr "底部" +msgid "Animation Key Inserted." +msgstr "æ’入动画键。" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Top View." -msgstr "俯视图(Top View)。" +msgid "Objects Drawn" +msgstr "绘制的对象" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Rear View." -msgstr "åŽè§†å›¾ã€‚" +msgid "Material Changes" +msgstr "æè´¨å˜æ›´" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Rear" -msgstr "åŽæ–¹" +msgid "Shader Changes" +msgstr "ç€è‰²å™¨å˜æ›´" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Front View." -msgstr "æ£è§†å›¾ã€‚" +msgid "Surface Changes" +msgstr "表é¢å˜æ›´" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Front" -msgstr "å‰é¢" +msgid "Draw Calls" +msgstr "绘制调用(Draw Calls)" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Left View." -msgstr "左视图。" +msgid "Vertices" +msgstr "顶点" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Left" -msgstr "左方" +msgid "FPS" +msgstr "帧数" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Right View." -msgstr "å³è§†å›¾ã€‚" +msgid "Top View." +msgstr "俯视图(Top View)。" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Right" -msgstr "å³æ–¹" +msgid "Bottom View." +msgstr "仰视图(Bottom View)。" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Keying is disabled (no key inserted)." -msgstr "键控被ç¦ç”¨ï¼ˆæœªæ’入键）。" +msgid "Bottom" +msgstr "底部" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Animation Key Inserted." -msgstr "æ’入动画键。" +msgid "Left View." +msgstr "左视图。" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Objects Drawn" -msgstr "绘制的对象" +msgid "Left" +msgstr "左方" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Material Changes" -msgstr "æè´¨å˜æ›´" +msgid "Right View." +msgstr "å³è§†å›¾ã€‚" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Shader Changes" -msgstr "ç€è‰²å™¨å˜æ›´" +msgid "Right" +msgstr "å³æ–¹" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Surface Changes" -msgstr "表é¢å˜æ›´" +msgid "Front View." +msgstr "æ£è§†å›¾ã€‚" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Draw Calls" -msgstr "绘制调用(Draw Calls)" +msgid "Front" +msgstr "å‰é¢" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Vertices" -msgstr "顶点" +msgid "Rear View." +msgstr "åŽè§†å›¾ã€‚" #: editor/plugins/spatial_editor_plugin.cpp -msgid "FPS" -msgstr "帧数" +msgid "Rear" +msgstr "åŽæ–¹" #: editor/plugins/spatial_editor_plugin.cpp msgid "Align with view" @@ -5177,7 +5182,6 @@ msgid "View FPS" msgstr "查看帧率" #: editor/plugins/spatial_editor_plugin.cpp -#, fuzzy msgid "Half Resolution" msgstr "一åŠåˆ†è¾¨çŽ‡" @@ -5218,15 +5222,12 @@ msgid "Freelook Speed Modifier" msgstr "自由视图速度调整" #: editor/plugins/spatial_editor_plugin.cpp -msgid "preview" -msgstr "预览" - -#: editor/plugins/spatial_editor_plugin.cpp msgid "XForm Dialog" msgstr "XForm对è¯æ¡†" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Select Mode (Q)\n" +#, fuzzy +msgid "Select Mode (Q)" msgstr "é€‰æ‹©æ¨¡å¼ (Q)\n" #: editor/plugins/spatial_editor_plugin.cpp @@ -5261,9 +5262,8 @@ msgid "Local Space Mode (%s)" msgstr "缩放模å¼ï¼ˆR）" #: editor/plugins/spatial_editor_plugin.cpp -#, fuzzy msgid "Snap Mode (%s)" -msgstr "å¸é™„模å¼:" +msgstr "å¸é™„æ¨¡å¼ (%s)" #: editor/plugins/spatial_editor_plugin.cpp msgid "Bottom View" @@ -5326,9 +5326,8 @@ msgid "Tool Scale" msgstr "缩放工具" #: editor/plugins/spatial_editor_plugin.cpp -#, fuzzy msgid "Toggle Freelook" -msgstr "开关自由观察模å¼" +msgstr "切æ¢è‡ªç”±è§‚察模å¼" #: editor/plugins/spatial_editor_plugin.cpp msgid "Transform" @@ -5381,21 +5380,19 @@ msgstr "设置" #: editor/plugins/spatial_editor_plugin.cpp msgid "Skeleton Gizmo visibility" -msgstr "" +msgstr "骨骼控制器å¯è§" #: editor/plugins/spatial_editor_plugin.cpp msgid "Snap Settings" msgstr "å¸é™„设置" #: editor/plugins/spatial_editor_plugin.cpp -#, fuzzy msgid "Translate Snap:" msgstr "移动å¸é™„:" #: editor/plugins/spatial_editor_plugin.cpp -#, fuzzy msgid "Rotate Snap (deg.):" -msgstr "旋转å¸é™„（度）：" +msgstr "旋转å¸é™„（度）:" #: editor/plugins/spatial_editor_plugin.cpp msgid "Scale Snap (%):" @@ -5509,10 +5506,20 @@ msgstr "å¾€å‰ç§»åŠ¨" msgid "Move (After)" msgstr "å¾€åŽç§»åŠ¨" +#: editor/plugins/sprite_frames_editor_plugin.cpp +#, fuzzy +msgid "SpriteFrames" +msgstr "å †æ ˆå¸§ï¼ˆFrames）" + #: editor/plugins/style_box_editor_plugin.cpp msgid "StyleBox Preview:" msgstr "StyleBox预览:" +#: editor/plugins/style_box_editor_plugin.cpp +#, fuzzy +msgid "StyleBox" +msgstr "æ ·å¼" + #: editor/plugins/texture_region_editor_plugin.cpp msgid "Set Region Rect" msgstr "设置纹ç†åŒºåŸŸ" @@ -5538,14 +5545,17 @@ msgid "Auto Slice" msgstr "自动è£å‰ª" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Offset:" msgstr "ç½‘æ ¼å移é‡:" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Step:" msgstr "æ¥é•¿ï¼ˆç§’）:" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Separation:" msgstr "分隔:" @@ -5607,9 +5617,8 @@ msgid "Create Empty Editor Template" msgstr "创建空编辑器主题模æ¿" #: editor/plugins/theme_editor_plugin.cpp -#, fuzzy msgid "Create From Current Editor Theme" -msgstr "从现有编辑器主题模æ¿åˆ›å»º" +msgstr "从当å‰ç¼–辑器主题创建" #: editor/plugins/theme_editor_plugin.cpp msgid "CheckBox Radio1" @@ -5684,6 +5693,10 @@ msgstr "å—体" msgid "Color" msgstr "颜色" +#: editor/plugins/theme_editor_plugin.cpp +msgid "Theme" +msgstr "主题" + #: editor/plugins/tile_map_editor_plugin.cpp msgid "Erase Selection" msgstr "擦除选ä¸" @@ -5769,9 +5782,8 @@ msgid "Merge from scene?" msgstr "确定è¦åˆå¹¶åœºæ™¯ï¼Ÿ" #: editor/plugins/tile_set_editor_plugin.cpp -#, fuzzy msgid "Tile Set" -msgstr "ç –å—集.." +msgstr "ç –å—集" #: editor/plugins/tile_set_editor_plugin.cpp msgid "Create from Scene" @@ -5785,6 +5797,32 @@ msgstr "从场景ä¸åˆå¹¶" msgid "Error" msgstr "错误" +#: editor/plugins/tile_set_editor_plugin.cpp +#, fuzzy +msgid "Autotiles" +msgstr "自动è£å‰ª" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "" +"Select sub-tile to use as icon, this will be also used on invalid autotile " +"bindings." +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "" +"LMB: set bit on.\n" +"RMB: set bit off." +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +#, fuzzy +msgid "Select current edited sub-tile." +msgstr "ä¿å˜å½“å‰ç¼–辑的资æºã€‚" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "Select sub-tile to change it's priority." +msgstr "" + #: editor/progress_dialog.cpp scene/gui/dialogs.cpp msgid "Cancel" msgstr "å–消" @@ -5794,9 +5832,8 @@ msgid "Runnable" msgstr "å¯ç”¨" #: editor/project_export.cpp -#, fuzzy msgid "Delete patch '%s' from list?" -msgstr "åˆ é™¤Patch''%s'" +msgstr "确认è¦ä»Žåˆ—表ä¸åˆ 除Patch %s å—？" #: editor/project_export.cpp msgid "Delete preset '%s'?" @@ -5903,10 +5940,23 @@ msgid "Please choose a folder that does not contain a 'project.godot' file." msgstr "请选择一个ä¸åŒ…å«'project.godot'文件的文件夹。" #: editor/project_manager.cpp +msgid "That's a BINGO!" +msgstr "ç¢‰å ¡äº†ï¼" + +#: editor/project_manager.cpp msgid "Imported Project" msgstr "已导入的项目" #: editor/project_manager.cpp +#, fuzzy +msgid "Couldn't create folder." +msgstr "æ— æ³•åˆ›å»ºç›®å½•ã€‚" + +#: editor/project_manager.cpp +msgid "There is already a folder in this path with the specified name." +msgstr "" + +#: editor/project_manager.cpp msgid "It would be a good idea to name your project." msgstr "为项目命å是一个好主æ„。" @@ -5947,14 +5997,29 @@ msgid "Import Existing Project" msgstr "导入现有项目" #: editor/project_manager.cpp +#, fuzzy +msgid "Import & Edit" +msgstr "导入|打开" + +#: editor/project_manager.cpp msgid "Create New Project" msgstr "新建项目" #: editor/project_manager.cpp +#, fuzzy +msgid "Create & Edit" +msgstr "创建å‘射器(Emitter)" + +#: editor/project_manager.cpp msgid "Install Project:" msgstr "安装项目:" #: editor/project_manager.cpp +#, fuzzy +msgid "Install & Edit" +msgstr "安装" + +#: editor/project_manager.cpp msgid "Project Name:" msgstr "项目å称:" @@ -5971,10 +6036,6 @@ msgid "Browse" msgstr "æµè§ˆ" #: editor/project_manager.cpp -msgid "That's a BINGO!" -msgstr "ç¢‰å ¡äº†ï¼" - -#: editor/project_manager.cpp msgid "Unnamed Project" msgstr "未命å项目" @@ -6026,6 +6087,10 @@ msgid "" msgstr "您确认è¦æ‰«æ%s目录下现有的Godot项目å—？" #: editor/project_manager.cpp +msgid "Project Manager" +msgstr "项目管ç†å‘˜" + +#: editor/project_manager.cpp msgid "Project List" msgstr "项目列表" @@ -6154,11 +6219,6 @@ msgid "Button 9" msgstr "按键 9" #: 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 "手柄摇æ†åºå·:" @@ -6171,7 +6231,6 @@ msgid "Joypad Button Index:" msgstr "手柄按钮:" #: editor/project_settings_editor.cpp -#, fuzzy msgid "Erase Input Action" msgstr "移除输入事件" @@ -6284,9 +6343,8 @@ 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" @@ -6353,12 +6411,10 @@ msgid "Locale" msgstr "地区" #: editor/project_settings_editor.cpp -#, fuzzy msgid "Locales Filter" msgstr "区域ç›é€‰å™¨" #: editor/project_settings_editor.cpp -#, fuzzy msgid "Show all locales" msgstr "显示所有区域设置" @@ -6424,7 +6480,7 @@ msgstr "新建脚本" #: editor/property_editor.cpp msgid "New %s" -msgstr "" +msgstr "新建%s" #: editor/property_editor.cpp msgid "Make Unique" @@ -6476,9 +6532,8 @@ msgid "Select Property" msgstr "选择属性" #: editor/property_selector.cpp -#, fuzzy msgid "Select Virtual Method" -msgstr "选择虚拟方法" +msgstr "选择虚拟方法 " #: editor/property_selector.cpp msgid "Select Method" @@ -6630,7 +6685,8 @@ msgid "Error duplicating scene to save it." msgstr "å¤åˆ¶åœºæ™¯å‡ºé”™ã€‚" #: editor/scene_tree_dock.cpp -msgid "Sub-Resources:" +#, fuzzy +msgid "Sub-Resources" msgstr "å资æº:" #: editor/scene_tree_dock.cpp @@ -6837,9 +6893,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" @@ -6934,7 +6989,7 @@ msgstr "函数:" msgid "Pick one or more items from the list to display the graph." msgstr "从列表ä¸é€‰å–一个或多个项目以显示图形。" -#: editor/script_editor_debugger.cpp +#: editor/script_editor_debugger.cpp modules/mono/editor/mono_bottom_panel.cpp msgid "Errors" msgstr "错误" @@ -6943,6 +6998,11 @@ msgid "Child Process Connected" msgstr "å进程已连接" #: editor/script_editor_debugger.cpp +#, fuzzy +msgid "Copy Error" +msgstr "åŠ è½½é”™è¯¯" + +#: editor/script_editor_debugger.cpp msgid "Inspect Previous Instance" msgstr "编辑上一个实例" @@ -7036,7 +7096,7 @@ msgstr "å¿«æ·é”®" #: editor/settings_config_dialog.cpp msgid "Binding" -msgstr "" +msgstr "绑定" #: editor/spatial_editor_gizmos.cpp msgid "Change Light Radius" @@ -7088,46 +7148,41 @@ msgstr "修改探针(Probe)范围" #: modules/gdnative/gdnative_library_editor_plugin.cpp msgid "Select the dynamic library for this entry" -msgstr "" +msgstr "选择该平å°çš„动æ€é“¾æŽ¥åº“" #: modules/gdnative/gdnative_library_editor_plugin.cpp msgid "Select dependencies of the library for this entry" -msgstr "" +msgstr "选择该链接库的ä¾èµ–项" #: modules/gdnative/gdnative_library_editor_plugin.cpp -#, fuzzy msgid "Remove current entry" -msgstr "移除路径顶点" +msgstr "åˆ é™¤å½“å‰é…置项" #: modules/gdnative/gdnative_library_editor_plugin.cpp msgid "Double click to create a new entry" -msgstr "" +msgstr "åŒå‡»æ·»åŠ æ–°çš„å¹³å°æž¶æž„é…置项" #: modules/gdnative/gdnative_library_editor_plugin.cpp msgid "Platform:" -msgstr "" +msgstr "å¹³å°:" #: modules/gdnative/gdnative_library_editor_plugin.cpp -#, fuzzy msgid "Platform" -msgstr "å¤åˆ¶åˆ°å¹³å°.." +msgstr "å¹³å°" #: modules/gdnative/gdnative_library_editor_plugin.cpp -#, fuzzy msgid "Dynamic Library" -msgstr "库" +msgstr "动æ€é“¾æŽ¥åº“" #: modules/gdnative/gdnative_library_editor_plugin.cpp msgid "Add an architecture entry" -msgstr "" +msgstr "æ·»åŠ CPU架构项" #: modules/gdnative/gdnative_library_editor_plugin.cpp -#, fuzzy msgid "GDNativeLibrary" -msgstr "GDNative" +msgstr "动æ€é“¾æŽ¥åº“" #: modules/gdnative/gdnative_library_singleton_editor.cpp -#, fuzzy msgid "Library" msgstr "库" @@ -7284,9 +7339,8 @@ msgid "Erase Area" msgstr "擦除区域" #: modules/gridmap/grid_map_editor_plugin.cpp -#, fuzzy msgid "Clear Selection" -msgstr "清除选ä¸" +msgstr "清空选ä¸" #: modules/gridmap/grid_map_editor_plugin.cpp msgid "GridMap Settings" @@ -7296,10 +7350,58 @@ msgstr "æ …æ ¼å›¾è®¾ç½®" msgid "Pick Distance:" msgstr "拾å–è·ç¦»:" +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Generating solution..." +msgstr "æ£åœ¨åˆ›å»ºè½®å»“... " + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Generating C# project..." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Failed to create solution." +msgstr "æ— æ³•åˆ›å»ºè½®å»“(outlines)ï¼" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Failed to save solution." +msgstr "åŠ è½½èµ„æºå¤±è´¥ã€‚" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Done" +msgstr "å®Œæˆ !" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Failed to create C# project." +msgstr "åŠ è½½èµ„æºå¤±è´¥ã€‚" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Mono" +msgstr "å•å£°é“" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Create C# solution" +msgstr "创建轮廓(outlines)" + #: modules/mono/editor/mono_bottom_panel.cpp msgid "Builds" msgstr "构建" +#: modules/mono/editor/mono_bottom_panel.cpp +#, fuzzy +msgid "Build Project" +msgstr "项目" + +#: modules/mono/editor/mono_bottom_panel.cpp +#, fuzzy +msgid "Warnings" +msgstr "è¦å‘Š" + #: modules/visual_script/visual_script.cpp msgid "" "A node yielded without working memory, please read the docs on how to yield " @@ -7408,27 +7510,24 @@ msgid "Duplicate VisualScript Nodes" msgstr "å¤åˆ¶ VisualScript 节点" #: modules/visual_script/visual_script_editor.cpp -#, fuzzy msgid "Hold %s to drop a Getter. Hold Shift to drop a generic signature." -msgstr "按ä½%s放置一个Getter节点，按ä½Shift键放置一个通用ç¾å。" +msgstr "æŒ‰ä½ %s 放置一个Getter节点，按ä½Shift键放置一个通用ç¾å。" #: modules/visual_script/visual_script_editor.cpp 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 -#, fuzzy msgid "Hold %s to drop a simple reference to the node." -msgstr "按ä½%s放置一个场景节点的引用节点。" +msgstr "æŒ‰ä½ %s 放置一个场景节点的引用节点。" #: modules/visual_script/visual_script_editor.cpp msgid "Hold Ctrl to drop a simple reference to the node." msgstr "按ä½Ctrl键放置一个场景节点的引用节点。" #: modules/visual_script/visual_script_editor.cpp -#, fuzzy msgid "Hold %s to drop a Variable Setter." -msgstr "按ä½%s放置å˜é‡çš„Setter节点。" +msgstr "æŒ‰ä½ %s 放置å˜é‡çš„Setter节点。" #: modules/visual_script/visual_script_editor.cpp msgid "Hold Ctrl to drop a Variable Setter." @@ -7649,26 +7748,34 @@ msgid "Run exported HTML in the system's default browser." msgstr "使用默认æµè§ˆå™¨æ‰“开导出的HTML文件." #: platform/javascript/export/export.cpp -msgid "Could not write file:\n" +#, fuzzy +msgid "Could not write file:" msgstr "æ— æ³•å†™å…¥æ–‡ä»¶:\n" #: platform/javascript/export/export.cpp -msgid "Could not open template for export:\n" +#, fuzzy +msgid "Could not open template for export:" msgstr "æ— æ³•æ‰“å¼€å¯¼å‡ºæ¨¡æ¿ï¼š\n" #: platform/javascript/export/export.cpp -msgid "Invalid export template:\n" +#, fuzzy +msgid "Invalid export template:" msgstr "æ— æ•ˆçš„å¯¼å‡ºæ¨¡æ¿ï¼š\n" #: platform/javascript/export/export.cpp #, fuzzy -msgid "Could not read custom HTML shell:\n" +msgid "Could not read custom HTML shell:" msgstr "æ— æ³•è¯»å–自定义HTML命令:\n" #: platform/javascript/export/export.cpp #, fuzzy -msgid "Could not read boot splash image file:\n" -msgstr "æ— æ³•è¯»å–å¯åŠ¨å›¾ç‰‡æ–‡ä»¶:\n" +msgid "Could not read boot splash image file:" +msgstr "æ— æ³•è¯»å–å¯åŠ¨å›¾ç‰‡æ–‡ä»¶ï¼š\n" + +#: platform/javascript/export/export.cpp +#, fuzzy +msgid "Using default boot splash image." +msgstr "æ— æ³•è¯»å–å¯åŠ¨å›¾ç‰‡æ–‡ä»¶ï¼š\n" #: scene/2d/animated_sprite.cpp msgid "" @@ -7928,9 +8035,8 @@ msgid "Please Confirm..." msgstr "请确认..." #: scene/gui/file_dialog.cpp -#, fuzzy msgid "Select this Folder" -msgstr "选择方å¼" +msgstr "选择当å‰ç›®å½•" #: scene/gui/popup.cpp msgid "" @@ -7956,9 +8062,10 @@ 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." +"Default Environment as specified in Project Setings (Rendering -> " +"Environment -> Default Environment) could not be loaded." msgstr "项目设置ä¸çš„é»˜è®¤çŽ¯å¢ƒæ— æ³•åŠ è½½ï¼Œè¯¦è§ï¼ˆæ¸²æŸ“->视图->默认环境） 。" #: scene/main/viewport.cpp @@ -7988,6 +8095,9 @@ msgstr "åŠ è½½å—体出错。" msgid "Invalid font size." msgstr "å—体大å°éžæ³•ã€‚" +#~ msgid "preview" +#~ msgstr "预览" + #~ msgid "Move Add Key" #~ msgstr "ç§»åŠ¨å·²æ·»åŠ å…³é”®å¸§" @@ -8084,9 +8194,6 @@ msgstr "å—体大å°éžæ³•ã€‚" #~ msgid "' parsing of config failed." #~ msgstr "' 解æžé…置失败。" -#~ msgid "Theme" -#~ msgstr "主题" - #~ msgid "Method List For '%s':" #~ msgstr "'%s'的方法列表：" @@ -8354,9 +8461,6 @@ msgstr "å—体大å°éžæ³•ã€‚" #~ msgid "Import Anyway" #~ msgstr "ä»ç„¶å¯¼å…¥" -#~ msgid "Import & Open" -#~ msgstr "导入|打开" - #~ msgid "Edited scene has not been saved, open imported scene anyway?" #~ msgstr "æ£åœ¨ç¼–辑的场景尚未ä¿å˜ï¼Œä»ç„¶è¦æ‰“开导入的场景å—？" @@ -8609,9 +8713,6 @@ msgstr "å—体大å°éžæ³•ã€‚" #~ msgid "Stereo" #~ msgstr "立体声" -#~ msgid "Mono" -#~ msgstr "å•å£°é“" - #~ msgid "Pitch" #~ msgstr "音调" diff --git a/editor/translations/zh_HK.po b/editor/translations/zh_HK.po index a4fd11fc40..f9ebeb54a2 100644 --- a/editor/translations/zh_HK.po +++ b/editor/translations/zh_HK.po @@ -208,8 +208,7 @@ msgstr "新增 %d 個新軌跡並æ’入關éµå¹€ï¼Ÿ" #: 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 +#: editor/plugins/particles_editor_plugin.cpp editor/script_create_dialog.cpp #, fuzzy msgid "Create" msgstr "新增" @@ -593,6 +592,17 @@ msgstr "訊號" #: editor/create_dialog.cpp #, fuzzy +msgid "Change %s Type" +msgstr "更改動畫循環" + +#: editor/create_dialog.cpp editor/project_settings_editor.cpp +#: modules/visual_script/visual_script_editor.cpp +#, fuzzy +msgid "Change" +msgstr "當改變時更新" + +#: editor/create_dialog.cpp +#, fuzzy msgid "Create New %s" msgstr "新增" @@ -699,7 +709,8 @@ msgid "" msgstr "" #: editor/dependency_editor.cpp -msgid "Cannot remove:\n" +#, fuzzy +msgid "Cannot remove:" msgstr "無法移除：\n" #: editor/dependency_editor.cpp @@ -786,9 +797,10 @@ msgstr "專案è¨å®š" msgid "Lead Developer" msgstr "開發者" -#: editor/editor_about.cpp editor/project_manager.cpp -msgid "Project Manager" -msgstr "" +#: editor/editor_about.cpp +#, fuzzy +msgid "Project Manager " +msgstr "é–‹å•Ÿ Project Manager?" #: editor/editor_about.cpp msgid "Developers" @@ -878,7 +890,7 @@ msgid "Success!" msgstr "æˆåŠŸï¼" #: editor/editor_asset_installer.cpp -#: editor/plugins/asset_library_editor_plugin.cpp editor/project_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp msgid "Install" msgstr "安è£" @@ -1212,8 +1224,9 @@ msgid "Packing" msgstr "" #: editor/editor_export.cpp platform/javascript/export/export.cpp -msgid "Template file not found:\n" -msgstr "" +#, fuzzy +msgid "Template file not found:" +msgstr "未找到佈局å稱ï¼" #: editor/editor_file_dialog.cpp scene/gui/file_dialog.cpp msgid "File Exists, Overwrite?" @@ -1481,6 +1494,11 @@ msgstr "" msgid "Clear" msgstr "清空" +#: editor/editor_log.cpp +#, fuzzy +msgid "Clear Output" +msgstr "下一個腳本" + #: editor/editor_node.cpp editor/plugins/animation_player_editor_plugin.cpp #, fuzzy msgid "Error saving resource!" @@ -1552,7 +1570,8 @@ msgstr "ä¸èƒ½åŸ·è¡Œé€™å€‹å‹•ä½œï¼Œå› 為沒有tree root." #: editor/editor_node.cpp msgid "" -"Couldn't save scene. Likely dependencies (instances) couldn't be satisfied." +"Couldn't save scene. Likely dependencies (instances or inheritance) couldn't " +"be satisfied." msgstr "" #: editor/editor_node.cpp @@ -2533,8 +2552,9 @@ msgid "No version.txt found inside templates." msgstr "找ä¸åˆ°version.txt inside templates." #: editor/export_template_manager.cpp -msgid "Error creating path for templates:\n" -msgstr "" +#, fuzzy +msgid "Error creating path for templates:" +msgstr "載入å—形出ç¾éŒ¯èª¤" #: editor/export_template_manager.cpp msgid "Extracting Export Templates" @@ -2704,9 +2724,7 @@ msgid "View items as a list" msgstr "" #: editor/filesystem_dock.cpp -msgid "" -"\n" -"Status: Import of file failed. Please fix file and reimport manually." +msgid "Status: Import of file failed. Please fix file and reimport manually." msgstr "" #: editor/filesystem_dock.cpp @@ -2714,21 +2732,21 @@ msgid "Cannot move/rename resources root." msgstr "" #: editor/filesystem_dock.cpp -msgid "Cannot move a folder into itself.\n" +msgid "Cannot move a folder into itself." msgstr "" #: editor/filesystem_dock.cpp #, fuzzy -msgid "Error moving:\n" +msgid "Error moving:" msgstr "載入錯誤:" #: editor/filesystem_dock.cpp #, fuzzy -msgid "Error duplicating:\n" +msgid "Error duplicating:" msgstr "載入錯誤:" #: editor/filesystem_dock.cpp -msgid "Unable to update dependencies:\n" +msgid "Unable to update dependencies:" msgstr "" #: editor/filesystem_dock.cpp @@ -3385,6 +3403,11 @@ msgstr "" msgid "Filters.." msgstr "" +#: editor/plugins/animation_tree_editor_plugin.cpp +#, fuzzy +msgid "AnimationTree" +msgstr "新增動畫" + #: editor/plugins/asset_library_editor_plugin.cpp msgid "Free" msgstr "" @@ -3553,6 +3576,7 @@ msgid "Bake Lightmaps" msgstr "" #: editor/plugins/camera_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Preview" msgstr "" @@ -4248,7 +4272,7 @@ msgid "Bake!" msgstr "" #: editor/plugins/navigation_mesh_editor_plugin.cpp -msgid "Bake the navigation mesh.\n" +msgid "Bake the navigation mesh." msgstr "" #: editor/plugins/navigation_mesh_editor_plugin.cpp @@ -4642,15 +4666,19 @@ msgstr "" msgid "Paste" msgstr "貼上" +#: editor/plugins/resource_preloader_editor_plugin.cpp +#, fuzzy +msgid "ResourcePreloader" +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 "" +#, fuzzy +msgid "Close and save changes?" +msgstr "è¦é—œé–‰å ´æ™¯å—Žï¼Ÿï¼ˆæœªå„²å˜çš„更改將會消失）" #: editor/plugins/script_editor_plugin.cpp msgid "Error while saving theme" @@ -4727,6 +4755,11 @@ msgid "Copy Script Path" msgstr "複製路徑" #: editor/plugins/script_editor_plugin.cpp +#, fuzzy +msgid "Show In File System" +msgstr "檔案系統" + +#: editor/plugins/script_editor_plugin.cpp msgid "History Prev" msgstr "" @@ -5168,86 +5201,86 @@ msgid "Rotating %s degrees." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Bottom View." +msgid "Keying is disabled (no key inserted)." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Bottom" +msgid "Animation Key Inserted." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Top View." +msgid "Objects Drawn" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Rear View." -msgstr "" +#, fuzzy +msgid "Material Changes" +msgstr "當改變時更新" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Rear" -msgstr "" +#, fuzzy +msgid "Shader Changes" +msgstr "當改變時更新" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Front View." -msgstr "" +#, fuzzy +msgid "Surface Changes" +msgstr "當改變時更新" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Front" +msgid "Draw Calls" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Left View." +msgid "Vertices" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Left" +msgid "FPS" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Right View." +msgid "Top View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Right" +msgid "Bottom View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Keying is disabled (no key inserted)." +msgid "Bottom" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Animation Key Inserted." +msgid "Left View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Objects Drawn" +msgid "Left" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -#, fuzzy -msgid "Material Changes" -msgstr "當改變時更新" +msgid "Right View." +msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -#, fuzzy -msgid "Shader Changes" -msgstr "當改變時更新" +msgid "Right" +msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -#, fuzzy -msgid "Surface Changes" -msgstr "當改變時更新" +msgid "Front View." +msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Draw Calls" +msgid "Front" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Vertices" +msgid "Rear View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "FPS" +msgid "Rear" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp @@ -5339,17 +5372,12 @@ msgid "Freelook Speed Modifier" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -#, fuzzy -msgid "preview" -msgstr "é 覽:" - -#: editor/plugins/spatial_editor_plugin.cpp msgid "XForm Dialog" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp #, fuzzy -msgid "Select Mode (Q)\n" +msgid "Select Mode (Q)" msgstr "é¸æ“‡æ¨¡å¼" #: editor/plugins/spatial_editor_plugin.cpp @@ -5629,10 +5657,18 @@ msgstr "移動模å¼" msgid "Move (After)" msgstr "" +#: editor/plugins/sprite_frames_editor_plugin.cpp +msgid "SpriteFrames" +msgstr "" + #: editor/plugins/style_box_editor_plugin.cpp msgid "StyleBox Preview:" msgstr "" +#: editor/plugins/style_box_editor_plugin.cpp +msgid "StyleBox" +msgstr "" + #: editor/plugins/texture_region_editor_plugin.cpp msgid "Set Region Rect" msgstr "" @@ -5658,14 +5694,17 @@ msgid "Auto Slice" msgstr "" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Offset:" msgstr "" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Step:" msgstr "" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Separation:" msgstr "" @@ -5805,6 +5844,10 @@ msgstr "" msgid "Color" msgstr "" +#: editor/plugins/theme_editor_plugin.cpp +msgid "Theme" +msgstr "" + #: editor/plugins/tile_map_editor_plugin.cpp #, fuzzy msgid "Erase Selection" @@ -5908,6 +5951,31 @@ msgstr "" msgid "Error" msgstr "" +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "Autotiles" +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "" +"Select sub-tile to use as icon, this will be also used on invalid autotile " +"bindings." +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "" +"LMB: set bit on.\n" +"RMB: set bit off." +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +#, fuzzy +msgid "Select current edited sub-tile." +msgstr "新增資料夾" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "Select sub-tile to change it's priority." +msgstr "" + #: editor/progress_dialog.cpp scene/gui/dialogs.cpp msgid "Cancel" msgstr "å–消" @@ -6032,10 +6100,23 @@ msgid "Please choose a folder that does not contain a 'project.godot' file." msgstr "" #: editor/project_manager.cpp +msgid "That's a BINGO!" +msgstr "" + +#: editor/project_manager.cpp msgid "Imported Project" msgstr "" #: editor/project_manager.cpp +#, fuzzy +msgid "Couldn't create folder." +msgstr "無法新增資料夾" + +#: editor/project_manager.cpp +msgid "There is already a folder in this path with the specified name." +msgstr "" + +#: editor/project_manager.cpp msgid "It would be a good idea to name your project." msgstr "" @@ -6077,14 +6158,29 @@ msgid "Import Existing Project" msgstr "" #: editor/project_manager.cpp +#, fuzzy +msgid "Import & Edit" +msgstr "å°Žå…¥" + +#: editor/project_manager.cpp msgid "Create New Project" msgstr "" #: editor/project_manager.cpp +#, fuzzy +msgid "Create & Edit" +msgstr "新增" + +#: editor/project_manager.cpp msgid "Install Project:" msgstr "" #: editor/project_manager.cpp +#, fuzzy +msgid "Install & Edit" +msgstr "安è£" + +#: editor/project_manager.cpp msgid "Project Name:" msgstr "" @@ -6102,10 +6198,6 @@ msgid "Browse" msgstr "ç€è¦½" #: editor/project_manager.cpp -msgid "That's a BINGO!" -msgstr "" - -#: editor/project_manager.cpp msgid "Unnamed Project" msgstr "" @@ -6152,6 +6244,10 @@ msgid "" msgstr "" #: editor/project_manager.cpp +msgid "Project Manager" +msgstr "" + +#: editor/project_manager.cpp msgid "Project List" msgstr "" @@ -6280,12 +6376,6 @@ msgid "Button 9" msgstr "" #: editor/project_settings_editor.cpp -#: modules/visual_script/visual_script_editor.cpp -#, fuzzy -msgid "Change" -msgstr "當改變時更新" - -#: editor/project_settings_editor.cpp msgid "Joypad Axis Index:" msgstr "" @@ -6764,7 +6854,7 @@ msgstr "" #: editor/scene_tree_dock.cpp #, fuzzy -msgid "Sub-Resources:" +msgid "Sub-Resources" msgstr "資æº" #: editor/scene_tree_dock.cpp @@ -7073,7 +7163,7 @@ msgstr "" msgid "Pick one or more items from the list to display the graph." msgstr "" -#: editor/script_editor_debugger.cpp +#: editor/script_editor_debugger.cpp modules/mono/editor/mono_bottom_panel.cpp msgid "Errors" msgstr "錯誤" @@ -7082,6 +7172,11 @@ msgid "Child Process Connected" msgstr "" #: editor/script_editor_debugger.cpp +#, fuzzy +msgid "Copy Error" +msgstr "載入錯誤" + +#: editor/script_editor_debugger.cpp msgid "Inspect Previous Instance" msgstr "" @@ -7437,10 +7532,55 @@ msgstr "è¨å®š" msgid "Pick Distance:" msgstr "" +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Generating solution..." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Generating C# project..." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Failed to create solution." +msgstr "資æºåŠ 載失敗。" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Failed to save solution." +msgstr "資æºåŠ 載失敗。" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Done" +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Failed to create C# project." +msgstr "資æºåŠ 載失敗。" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Mono" +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Create C# solution" +msgstr "縮放selection" + #: modules/mono/editor/mono_bottom_panel.cpp msgid "Builds" msgstr "" +#: modules/mono/editor/mono_bottom_panel.cpp +#, fuzzy +msgid "Build Project" +msgstr "專案" + +#: modules/mono/editor/mono_bottom_panel.cpp +msgid "Warnings" +msgstr "" + #: modules/visual_script/visual_script.cpp msgid "" "A node yielded without working memory, please read the docs on how to yield " @@ -7803,27 +7943,32 @@ msgstr "" #: platform/javascript/export/export.cpp #, fuzzy -msgid "Could not write file:\n" +msgid "Could not write file:" msgstr "無法新增資料夾" #: platform/javascript/export/export.cpp #, fuzzy -msgid "Could not open template for export:\n" +msgid "Could not open template for export:" msgstr "無法新增資料夾" #: platform/javascript/export/export.cpp #, fuzzy -msgid "Invalid export template:\n" +msgid "Invalid export template:" msgstr "管ç†è¼¸å‡ºç¯„本" #: platform/javascript/export/export.cpp #, fuzzy -msgid "Could not read custom HTML shell:\n" +msgid "Could not read custom HTML shell:" msgstr "無法新增資料夾" #: platform/javascript/export/export.cpp #, fuzzy -msgid "Could not read boot splash image file:\n" +msgid "Could not read boot splash image file:" +msgstr "無法新增資料夾" + +#: platform/javascript/export/export.cpp +#, fuzzy +msgid "Using default boot splash image." msgstr "無法新增資料夾" #: scene/2d/animated_sprite.cpp @@ -8077,8 +8222,8 @@ msgstr "" #: scene/main/scene_tree.cpp msgid "" -"Default Environment as specified in Project Setings (Rendering -> Viewport -" -"> Default Environment) could not be loaded." +"Default Environment as specified in Project Setings (Rendering -> " +"Environment -> Default Environment) could not be loaded." msgstr "" #: scene/main/viewport.cpp @@ -8106,6 +8251,10 @@ msgid "Invalid font size." msgstr "無效å—åž‹" #, fuzzy +#~ msgid "preview" +#~ msgstr "é 覽:" + +#, fuzzy #~ msgid "Move Add Key" #~ msgstr "移動" @@ -8153,9 +8302,6 @@ msgstr "無效å—åž‹" #~ msgid "Ctrl+" #~ msgstr "Ctrl+" -#~ msgid "Close scene? (Unsaved changes will be lost)" -#~ msgstr "è¦é—œé–‰å ´æ™¯å—Žï¼Ÿï¼ˆæœªå„²å˜çš„更改將會消失）" - #~ msgid "" #~ "Open Project Manager? \n" #~ "(Unsaved changes will be lost)" diff --git a/editor/translations/zh_TW.po b/editor/translations/zh_TW.po index 1cd5d9a4a7..4a399d0e6a 100644 --- a/editor/translations/zh_TW.po +++ b/editor/translations/zh_TW.po @@ -203,8 +203,7 @@ msgstr "創建 %d 個新軌並æ’å…¥ç•«æ ¼?" #: 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 +#: editor/plugins/particles_editor_plugin.cpp editor/script_create_dialog.cpp msgid "Create" msgstr "新增" @@ -557,6 +556,16 @@ msgstr "" #: editor/create_dialog.cpp #, fuzzy +msgid "Change %s Type" +msgstr "變更é¡é 尺寸" + +#: editor/create_dialog.cpp editor/project_settings_editor.cpp +#: modules/visual_script/visual_script_editor.cpp +msgid "Change" +msgstr "" + +#: editor/create_dialog.cpp +#, fuzzy msgid "Create New %s" msgstr "新增" @@ -666,7 +675,7 @@ msgstr "" "æ¤å‹•ä½œç„¡æ³•å¾©åŽŸ, 確定è¦åˆªé™¤å—Ž?" #: editor/dependency_editor.cpp -msgid "Cannot remove:\n" +msgid "Cannot remove:" msgstr "" #: editor/dependency_editor.cpp @@ -749,9 +758,10 @@ msgstr "專案創始人" msgid "Lead Developer" msgstr "" -#: editor/editor_about.cpp editor/project_manager.cpp -msgid "Project Manager" -msgstr "" +#: editor/editor_about.cpp +#, fuzzy +msgid "Project Manager " +msgstr "專案創始人" #: editor/editor_about.cpp msgid "Developers" @@ -836,7 +846,7 @@ msgid "Success!" msgstr "" #: editor/editor_asset_installer.cpp -#: editor/plugins/asset_library_editor_plugin.cpp editor/project_manager.cpp +#: editor/plugins/asset_library_editor_plugin.cpp msgid "Install" msgstr "" @@ -1149,7 +1159,7 @@ msgid "Packing" msgstr "" #: editor/editor_export.cpp platform/javascript/export/export.cpp -msgid "Template file not found:\n" +msgid "Template file not found:" msgstr "" #: editor/editor_file_dialog.cpp scene/gui/file_dialog.cpp @@ -1406,6 +1416,11 @@ msgstr "輸出:" msgid "Clear" msgstr "清除" +#: editor/editor_log.cpp +#, fuzzy +msgid "Clear Output" +msgstr "輸出:" + #: editor/editor_node.cpp editor/plugins/animation_player_editor_plugin.cpp msgid "Error saving resource!" msgstr "" @@ -1470,7 +1485,8 @@ msgstr "æ¤æ“作無法復原, 確定è¦é‚„原嗎?" #: editor/editor_node.cpp msgid "" -"Couldn't save scene. Likely dependencies (instances) couldn't be satisfied." +"Couldn't save scene. Likely dependencies (instances or inheritance) couldn't " +"be satisfied." msgstr "" #: editor/editor_node.cpp @@ -2412,8 +2428,9 @@ msgid "No version.txt found inside templates." msgstr "" #: editor/export_template_manager.cpp -msgid "Error creating path for templates:\n" -msgstr "" +#, fuzzy +msgid "Error creating path for templates:" +msgstr "è¼‰å…¥å ´æ™¯æ™‚ç™¼ç”ŸéŒ¯èª¤" #: editor/export_template_manager.cpp msgid "Extracting Export Templates" @@ -2576,9 +2593,7 @@ msgid "View items as a list" msgstr "" #: editor/filesystem_dock.cpp -msgid "" -"\n" -"Status: Import of file failed. Please fix file and reimport manually." +msgid "Status: Import of file failed. Please fix file and reimport manually." msgstr "" #: editor/filesystem_dock.cpp @@ -2586,22 +2601,22 @@ msgid "Cannot move/rename resources root." msgstr "" #: editor/filesystem_dock.cpp -msgid "Cannot move a folder into itself.\n" +msgid "Cannot move a folder into itself." msgstr "" #: editor/filesystem_dock.cpp #, fuzzy -msgid "Error moving:\n" +msgid "Error moving:" msgstr "載入時發生錯誤:" #: editor/filesystem_dock.cpp #, fuzzy -msgid "Error duplicating:\n" +msgid "Error duplicating:" msgstr "載入時發生錯誤:" #: editor/filesystem_dock.cpp #, fuzzy -msgid "Unable to update dependencies:\n" +msgid "Unable to update dependencies:" msgstr "å ´æ™¯ç¼ºå°‘äº†æŸäº›è³‡æºä»¥è‡³æ–¼ç„¡æ³•è¼‰å…¥" #: editor/filesystem_dock.cpp @@ -3246,6 +3261,10 @@ msgstr "" msgid "Filters.." msgstr "" +#: editor/plugins/animation_tree_editor_plugin.cpp +msgid "AnimationTree" +msgstr "" + #: editor/plugins/asset_library_editor_plugin.cpp msgid "Free" msgstr "" @@ -3414,6 +3433,7 @@ msgid "Bake Lightmaps" msgstr "變更光æºåŠå¾‘" #: editor/plugins/camera_editor_plugin.cpp +#: editor/plugins/spatial_editor_plugin.cpp msgid "Preview" msgstr "" @@ -4105,7 +4125,7 @@ msgid "Bake!" msgstr "" #: editor/plugins/navigation_mesh_editor_plugin.cpp -msgid "Bake the navigation mesh.\n" +msgid "Bake the navigation mesh." msgstr "" #: editor/plugins/navigation_mesh_editor_plugin.cpp @@ -4498,15 +4518,19 @@ msgstr "" msgid "Paste" msgstr "" +#: editor/plugins/resource_preloader_editor_plugin.cpp +#, fuzzy +msgid "ResourcePreloader" +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 "" +#, fuzzy +msgid "Close and save changes?" +msgstr "沒有儲å˜çš„變更都會éºå¤±, 確定è¦é—œé–‰?" #: editor/plugins/script_editor_plugin.cpp msgid "Error while saving theme" @@ -4582,6 +4606,10 @@ msgid "Copy Script Path" msgstr "" #: editor/plugins/script_editor_plugin.cpp +msgid "Show In File System" +msgstr "" + +#: editor/plugins/script_editor_plugin.cpp msgid "History Prev" msgstr "" @@ -5019,84 +5047,84 @@ msgid "Rotating %s degrees." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Bottom View." +msgid "Keying is disabled (no key inserted)." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Bottom" +msgid "Animation Key Inserted." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Top View." +msgid "Objects Drawn" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Rear View." -msgstr "" +#, fuzzy +msgid "Material Changes" +msgstr "æ£åœ¨å„²å˜è®Šæ›´.." #: editor/plugins/spatial_editor_plugin.cpp -msgid "Rear" +msgid "Shader Changes" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Front View." +msgid "Surface Changes" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Front" +msgid "Draw Calls" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Left View." +msgid "Vertices" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Left" +msgid "FPS" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Right View." +msgid "Top View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Right" +msgid "Bottom View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Keying is disabled (no key inserted)." +msgid "Bottom" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Animation Key Inserted." +msgid "Left View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Objects Drawn" +msgid "Left" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -#, fuzzy -msgid "Material Changes" -msgstr "æ£åœ¨å„²å˜è®Šæ›´.." +msgid "Right View." +msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Shader Changes" +msgid "Right" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Surface Changes" +msgid "Front View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Draw Calls" +msgid "Front" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "Vertices" +msgid "Rear View." msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -msgid "FPS" +msgid "Rear" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp @@ -5187,17 +5215,13 @@ msgid "Freelook Speed Modifier" msgstr "" #: editor/plugins/spatial_editor_plugin.cpp -#, fuzzy -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 "" +#, fuzzy +msgid "Select Mode (Q)" +msgstr "僅é¸æ“‡å€åŸŸ" #: editor/plugins/spatial_editor_plugin.cpp msgid "" @@ -5472,10 +5496,18 @@ msgstr "" msgid "Move (After)" msgstr "" +#: editor/plugins/sprite_frames_editor_plugin.cpp +msgid "SpriteFrames" +msgstr "" + #: editor/plugins/style_box_editor_plugin.cpp msgid "StyleBox Preview:" msgstr "" +#: editor/plugins/style_box_editor_plugin.cpp +msgid "StyleBox" +msgstr "" + #: editor/plugins/texture_region_editor_plugin.cpp msgid "Set Region Rect" msgstr "" @@ -5501,14 +5533,17 @@ msgid "Auto Slice" msgstr "" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Offset:" msgstr "" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Step:" msgstr "" #: editor/plugins/texture_region_editor_plugin.cpp +#: editor/plugins/tile_set_editor_plugin.cpp msgid "Separation:" msgstr "" @@ -5647,6 +5682,10 @@ msgstr "" msgid "Color" msgstr "" +#: editor/plugins/theme_editor_plugin.cpp +msgid "Theme" +msgstr "" + #: editor/plugins/tile_map_editor_plugin.cpp #, fuzzy msgid "Erase Selection" @@ -5749,6 +5788,31 @@ msgstr "" msgid "Error" msgstr "" +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "Autotiles" +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "" +"Select sub-tile to use as icon, this will be also used on invalid autotile " +"bindings." +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "" +"LMB: set bit on.\n" +"RMB: set bit off." +msgstr "" + +#: editor/plugins/tile_set_editor_plugin.cpp +#, fuzzy +msgid "Select current edited sub-tile." +msgstr "新增資料夾" + +#: editor/plugins/tile_set_editor_plugin.cpp +msgid "Select sub-tile to change it's priority." +msgstr "" + #: editor/progress_dialog.cpp scene/gui/dialogs.cpp msgid "Cancel" msgstr "" @@ -5869,10 +5933,23 @@ msgid "Please choose a folder that does not contain a 'project.godot' file." msgstr "" #: editor/project_manager.cpp +msgid "That's a BINGO!" +msgstr "" + +#: editor/project_manager.cpp msgid "Imported Project" msgstr "" #: editor/project_manager.cpp +#, fuzzy +msgid "Couldn't create folder." +msgstr "無法新增資料夾" + +#: editor/project_manager.cpp +msgid "There is already a folder in this path with the specified name." +msgstr "" + +#: editor/project_manager.cpp msgid "It would be a good idea to name your project." msgstr "" @@ -5914,14 +5991,27 @@ msgid "Import Existing Project" msgstr "" #: editor/project_manager.cpp +msgid "Import & Edit" +msgstr "" + +#: editor/project_manager.cpp msgid "Create New Project" msgstr "" #: editor/project_manager.cpp +#, fuzzy +msgid "Create & Edit" +msgstr "新增" + +#: editor/project_manager.cpp msgid "Install Project:" msgstr "" #: editor/project_manager.cpp +msgid "Install & Edit" +msgstr "" + +#: editor/project_manager.cpp msgid "Project Name:" msgstr "" @@ -5939,10 +6029,6 @@ msgid "Browse" msgstr "" #: editor/project_manager.cpp -msgid "That's a BINGO!" -msgstr "" - -#: editor/project_manager.cpp msgid "Unnamed Project" msgstr "" @@ -5989,6 +6075,10 @@ msgid "" msgstr "" #: editor/project_manager.cpp +msgid "Project Manager" +msgstr "" + +#: editor/project_manager.cpp msgid "Project List" msgstr "" @@ -6116,11 +6206,6 @@ 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 "" @@ -6592,8 +6677,9 @@ msgid "Error duplicating scene to save it." msgstr "" #: editor/scene_tree_dock.cpp -msgid "Sub-Resources:" -msgstr "" +#, fuzzy +msgid "Sub-Resources" +msgstr "複製資æº" #: editor/scene_tree_dock.cpp msgid "Clear Inheritance" @@ -6891,7 +6977,7 @@ msgstr "" msgid "Pick one or more items from the list to display the graph." msgstr "" -#: editor/script_editor_debugger.cpp +#: editor/script_editor_debugger.cpp modules/mono/editor/mono_bottom_panel.cpp msgid "Errors" msgstr "" @@ -6900,6 +6986,11 @@ msgid "Child Process Connected" msgstr "" #: editor/script_editor_debugger.cpp +#, fuzzy +msgid "Copy Error" +msgstr "連接..." + +#: editor/script_editor_debugger.cpp msgid "Inspect Previous Instance" msgstr "" @@ -7263,10 +7354,52 @@ msgstr "專案è¨å®š" msgid "Pick Distance:" msgstr "" +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Generating solution..." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Generating C# project..." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +#, fuzzy +msgid "Failed to create solution." +msgstr "無法新增資料夾" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Failed to save solution." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Done" +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Failed to create C# project." +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Mono" +msgstr "" + +#: modules/mono/editor/godotsharp_editor.cpp +msgid "Create C# solution" +msgstr "" + #: modules/mono/editor/mono_bottom_panel.cpp msgid "Builds" msgstr "" +#: modules/mono/editor/mono_bottom_panel.cpp +#, fuzzy +msgid "Build Project" +msgstr "專案è¨å®š" + +#: modules/mono/editor/mono_bottom_panel.cpp +msgid "Warnings" +msgstr "" + #: modules/visual_script/visual_script.cpp msgid "" "A node yielded without working memory, please read the docs on how to yield " @@ -7616,24 +7749,32 @@ msgid "Run exported HTML in the system's default browser." msgstr "" #: platform/javascript/export/export.cpp -msgid "Could not write file:\n" -msgstr "" +#, fuzzy +msgid "Could not write file:" +msgstr "無法新增資料夾" #: platform/javascript/export/export.cpp -msgid "Could not open template for export:\n" -msgstr "" +#, fuzzy +msgid "Could not open template for export:" +msgstr "無法新增資料夾" #: platform/javascript/export/export.cpp -msgid "Invalid export template:\n" +msgid "Invalid export template:" msgstr "" #: platform/javascript/export/export.cpp -msgid "Could not read custom HTML shell:\n" -msgstr "" +#, fuzzy +msgid "Could not read custom HTML shell:" +msgstr "無法新增資料夾" + +#: platform/javascript/export/export.cpp +#, fuzzy +msgid "Could not read boot splash image file:" +msgstr "無法新增資料夾" #: platform/javascript/export/export.cpp #, fuzzy -msgid "Could not read boot splash image file:\n" +msgid "Using default boot splash image." msgstr "無法新增資料夾" #: scene/2d/animated_sprite.cpp @@ -7893,8 +8034,8 @@ msgstr "" #: scene/main/scene_tree.cpp msgid "" -"Default Environment as specified in Project Setings (Rendering -> Viewport -" -"> Default Environment) could not be loaded." +"Default Environment as specified in Project Setings (Rendering -> " +"Environment -> Default Environment) could not be loaded." msgstr "" #: scene/main/viewport.cpp @@ -7921,6 +8062,10 @@ msgstr "讀å–å—體錯誤。" msgid "Invalid font size." msgstr "無效的å—體大å°ã€‚" +#, fuzzy +#~ msgid "preview" +#~ msgstr "é 覽:" + #~ msgid "List:" #~ msgstr "列表:" @@ -7946,9 +8091,6 @@ msgstr "無效的å—體大å°ã€‚" #~ msgid "Ctrl+" #~ msgstr "Ctrl+" -#~ msgid "Close scene? (Unsaved changes will be lost)" -#~ msgstr "沒有儲å˜çš„變更都會éºå¤±, 確定è¦é—œé–‰?" - #~ msgid "" #~ "Open Project Manager? \n" #~ "(Unsaved changes will be lost)" diff --git a/main/input_default.cpp b/main/input_default.cpp index c3454d86f3..fb831b7647 100644 --- a/main/input_default.cpp +++ b/main/input_default.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "input_default.h" #include "input_map.h" diff --git a/main/input_default.h b/main/input_default.h index 3d9a809325..0479fdc0ff 100644 --- a/main/input_default.h +++ b/main/input_default.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef INPUT_DEFAULT_H #define INPUT_DEFAULT_H diff --git a/main/main.cpp b/main/main.cpp index 1cb89e87ef..48537dc3a7 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "main.h" #include "app_icon.gen.h" @@ -664,6 +665,8 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph GLOBAL_DEF("memory/limits/multithreaded_server/rid_pool_prealloc", 60); GLOBAL_DEF("network/limits/debugger_stdout/max_chars_per_second", 2048); + GLOBAL_DEF("network/limits/debugger_stdout/max_messages_per_frame", 10); + GLOBAL_DEF("network/limits/debugger_stdout/max_errors_per_frame", 10); if (debug_mode == "remote") { diff --git a/main/main.h b/main/main.h index 4455f4b8ec..1165c79494 100644 --- a/main/main.h +++ b/main/main.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef MAIN_H #define MAIN_H diff --git a/main/performance.cpp b/main/performance.cpp index 0ff2f5d540..fc915e2e76 100644 --- a/main/performance.cpp +++ b/main/performance.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "performance.h" #include "message_queue.h" #include "os/os.h" diff --git a/main/performance.h b/main/performance.h index 0c8406e464..464226b517 100644 --- a/main/performance.h +++ b/main/performance.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef PERFORMANCE_H #define PERFORMANCE_H diff --git a/main/tests/test_gdscript.cpp b/main/tests/test_gdscript.cpp index 1580a8e664..5c7633a0cf 100644 --- a/main/tests/test_gdscript.cpp +++ b/main/tests/test_gdscript.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "test_gdscript.h" #include "os/file_access.h" diff --git a/main/tests/test_gdscript.h b/main/tests/test_gdscript.h index 218f7a21a0..91e0be1238 100644 --- a/main/tests/test_gdscript.h +++ b/main/tests/test_gdscript.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef TEST_GDSCRIPT_H #define TEST_GDSCRIPT_H diff --git a/main/tests/test_gui.cpp b/main/tests/test_gui.cpp index e9bbd2489e..b7b6c21692 100644 --- a/main/tests/test_gui.cpp +++ b/main/tests/test_gui.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef _3D_DISABLED #include "test_gui.h" diff --git a/main/tests/test_gui.h b/main/tests/test_gui.h index 156b3ed182..3ed9dae522 100644 --- a/main/tests/test_gui.h +++ b/main/tests/test_gui.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef TEST_GUI_H #define TEST_GUI_H diff --git a/main/tests/test_image.cpp b/main/tests/test_image.cpp index eb7b4f8076..cb87458a93 100644 --- a/main/tests/test_image.cpp +++ b/main/tests/test_image.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "test_image.h" #include "io/image_loader.h" diff --git a/main/tests/test_image.h b/main/tests/test_image.h index ce1dabb433..d45b4e4e15 100644 --- a/main/tests/test_image.h +++ b/main/tests/test_image.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef TEST_IMAGE_H #define TEST_IMAGE_H diff --git a/main/tests/test_io.cpp b/main/tests/test_io.cpp index 42d79ba1f6..08dc374ed1 100644 --- a/main/tests/test_io.cpp +++ b/main/tests/test_io.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "test_io.h" #ifdef MINIZIP_ENABLED diff --git a/main/tests/test_io.h b/main/tests/test_io.h index 2cc1bfefaf..76567829e7 100644 --- a/main/tests/test_io.h +++ b/main/tests/test_io.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef TEST_IO_H #define TEST_IO_H diff --git a/main/tests/test_main.cpp b/main/tests/test_main.cpp index 41eae89c9e..c9431a1a09 100644 --- a/main/tests/test_main.cpp +++ b/main/tests/test_main.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "list.h" #include "os/main_loop.h" diff --git a/main/tests/test_main.h b/main/tests/test_main.h index 6f78127521..d319391070 100644 --- a/main/tests/test_main.h +++ b/main/tests/test_main.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef TEST_MAIN_H #define TEST_MAIN_H diff --git a/main/tests/test_math.cpp b/main/tests/test_math.cpp index 515b43a38a..8b71c5dc70 100644 --- a/main/tests/test_math.cpp +++ b/main/tests/test_math.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "test_math.h" #include "camera_matrix.h" diff --git a/main/tests/test_math.h b/main/tests/test_math.h index e3b74e94de..26a33aa164 100644 --- a/main/tests/test_math.h +++ b/main/tests/test_math.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef TEST_MATH_H #define TEST_MATH_H diff --git a/main/tests/test_oa_hash_map.cpp b/main/tests/test_oa_hash_map.cpp index 47ae8912b2..ac65fdf19c 100644 --- a/main/tests/test_oa_hash_map.cpp +++ b/main/tests/test_oa_hash_map.cpp @@ -1,5 +1,5 @@ /*************************************************************************/ -/* test_oa_hash_map.h */ +/* test_oa_hash_map.cpp */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ diff --git a/main/tests/test_oa_hash_map.h b/main/tests/test_oa_hash_map.h index c2812cebb7..a63da537d8 100644 --- a/main/tests/test_oa_hash_map.h +++ b/main/tests/test_oa_hash_map.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef TEST_OA_HASH_MAP_H #define TEST_OA_HASH_MAP_H diff --git a/main/tests/test_ordered_hash_map.cpp b/main/tests/test_ordered_hash_map.cpp index b57bc0bcc9..668a8788ff 100644 --- a/main/tests/test_ordered_hash_map.cpp +++ b/main/tests/test_ordered_hash_map.cpp @@ -3,7 +3,7 @@ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ -/* http://www.godotengine.org */ +/* https://godotengine.org */ /*************************************************************************/ /* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md) */ diff --git a/main/tests/test_ordered_hash_map.h b/main/tests/test_ordered_hash_map.h index a327e4e18b..6723e70b79 100644 --- a/main/tests/test_ordered_hash_map.h +++ b/main/tests/test_ordered_hash_map.h @@ -3,7 +3,7 @@ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ -/* http://www.godotengine.org */ +/* https://godotengine.org */ /*************************************************************************/ /* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md) */ @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef TEST_ORDERED_HASH_MAP_H #define TEST_ORDERED_HASH_MAP_H diff --git a/main/tests/test_physics.cpp b/main/tests/test_physics.cpp index 275f67cd86..475663dabe 100644 --- a/main/tests/test_physics.cpp +++ b/main/tests/test_physics.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "test_physics.h" #include "map.h" diff --git a/main/tests/test_physics.h b/main/tests/test_physics.h index 2b51899394..4d62f3a0cf 100644 --- a/main/tests/test_physics.h +++ b/main/tests/test_physics.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef TEST_PHYSICS_H #define TEST_PHYSICS_H diff --git a/main/tests/test_physics_2d.cpp b/main/tests/test_physics_2d.cpp index 0af74a656e..482a858650 100644 --- a/main/tests/test_physics_2d.cpp +++ b/main/tests/test_physics_2d.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "test_physics_2d.h" #include "map.h" diff --git a/main/tests/test_physics_2d.h b/main/tests/test_physics_2d.h index e927a595ea..1031aa7f71 100644 --- a/main/tests/test_physics_2d.h +++ b/main/tests/test_physics_2d.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef TEST_PHYSICS_2D_H #define TEST_PHYSICS_2D_H diff --git a/main/tests/test_render.cpp b/main/tests/test_render.cpp index fa415e9bca..9340e69bc5 100644 --- a/main/tests/test_render.cpp +++ b/main/tests/test_render.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "test_render.h" #include "math_funcs.h" diff --git a/main/tests/test_render.h b/main/tests/test_render.h index c79d9edcc7..9084b57067 100644 --- a/main/tests/test_render.h +++ b/main/tests/test_render.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef TEST_RENDER_H #define TEST_RENDER_H diff --git a/main/tests/test_shader_lang.cpp b/main/tests/test_shader_lang.cpp index 1ca43686d4..63032597ed 100644 --- a/main/tests/test_shader_lang.cpp +++ b/main/tests/test_shader_lang.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "test_shader_lang.h" #include "os/file_access.h" diff --git a/main/tests/test_shader_lang.h b/main/tests/test_shader_lang.h index 9dd4958c55..235bf10463 100644 --- a/main/tests/test_shader_lang.h +++ b/main/tests/test_shader_lang.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef TEST_SHADER_LANG_H #define TEST_SHADER_LANG_H diff --git a/main/tests/test_string.cpp b/main/tests/test_string.cpp index 129adc5477..5179f6d6d1 100644 --- a/main/tests/test_string.cpp +++ b/main/tests/test_string.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "ustring.h" #include <wchar.h> //#include "math_funcs.h" diff --git a/main/tests/test_string.h b/main/tests/test_string.h index 5e34929ff1..110e115309 100644 --- a/main/tests/test_string.h +++ b/main/tests/test_string.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef TEST_STRING_H #define TEST_STRING_H diff --git a/methods.py b/methods.py index f9da6c8dd5..fbdac8a966 100644 --- a/methods.py +++ b/methods.py @@ -1274,6 +1274,8 @@ def detect_modules(): for x in files: if (not os.path.isdir(x)): continue + if (not os.path.exists(x + "/config.py")): + continue x = x.replace("modules/", "") # rest of world x = x.replace("modules\\", "") # win32 module_list.append(x) diff --git a/misc/dist/html/default.html b/misc/dist/html/default.html index 0f78fc640e..a1a4e89d02 100644 --- a/misc/dist/html/default.html +++ b/misc/dist/html/default.html @@ -350,7 +350,7 @@ $GODOT_HEAD_INCLUDE }; function printError(text) { - if (!text.startsWith('**ERROR**: ')) { + if (!String.prototype.trim.call(text).startsWith('**ERROR**: ')) { text = '**ERROR**: ' + text; } print(text); diff --git a/misc/dist/ios_xcode/godot_ios/dummy.cpp b/misc/dist/ios_xcode/godot_ios/dummy.cpp index 78ec87fc10..61de772b44 100644 --- a/misc/dist/ios_xcode/godot_ios/dummy.cpp +++ b/misc/dist/ios_xcode/godot_ios/dummy.cpp @@ -1 +1 @@ -$cpp_code
\ No newline at end of file +$cpp_code diff --git a/misc/scripts/addheader.py b/misc/scripts/fix_headers.py index 58d9fa35a3..809820c20f 100644 --- a/misc/scripts/addheader.py +++ b/misc/scripts/fix_headers.py @@ -1,3 +1,6 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- + header = """\ /*************************************************************************/ /* $filename */ @@ -30,22 +33,21 @@ header = """\ /*************************************************************************/ """ -f = open("files", "rb") +files = open("files", "rb") + +fname = files.readline() -fname = f.readline() while (fname != ""): - fr = open(fname.strip(), "rb") - l = fr.readline() - bc = False + # Handle replacing $filename with actual filename and keep alignment fsingle = fname.strip() - if (fsingle.find("/") != -1): fsingle = fsingle[fsingle.rfind("/") + 1:] rep_fl = "$filename" rep_fi = fsingle len_fl = len(rep_fl) len_fi = len(rep_fi) + # Pad with spaces to keep alignment if (len_fi < len_fl): for x in range(len_fl - len_fi): rep_fi += " " @@ -56,16 +58,43 @@ while (fname != ""): text = header.replace(rep_fl, rep_fi) else: text = header.replace("$filename", fsingle) + text += "\n" + + # We now have the proper header, so we want to ignore the one in the original file + # and potentially empty lines and badly formatted lines, while keeping comments that + # come after the header, and then keep everything non-header unchanged. + # To do so, we skip empty lines that may be at the top in a first pass. + # In a second pass, we skip all consecutive comment lines starting with "/*", + # then we can append the rest (step 2). + + fileread = open(fname.strip(), "rb") + line = fileread.readline() + header_done = False + + while (line.strip() == ""): # Skip empty lines at the top + line = fileread.readline() + + if (line.find("/**********") == -1): # Godot header starts this way + # Maybe starting with a non-Godot comment, abort header magic + header_done = True + + while (not header_done): # Handle header now + if (line.find("/*") != 0): # No more starting with a comment + header_done = True + if (line.strip() != ""): + text += line + line = fileread.readline() + + while (line != ""): # Dump everything until EOF + text += line + line = fileread.readline() + + fileread.close() - while (l != ""): - if ((l.find("//") != 0 and l.find("/*") != 0 and l.strip() != "") or bc): - text += l - bc = True - l = fr.readline() + # Write + fileread = open(fname.strip(), "wb") + fileread.write(text) + fileread.close() - fr.close() - fr = open(fname.strip(), "wb") - fr.write(text) - fr.close() - # print(text) - fname = f.readline() + # Next file + fname = files.readline() diff --git a/modules/bullet/area_bullet.cpp b/modules/bullet/area_bullet.cpp index 195d89d0c0..9d46e4fe30 100644 --- a/modules/bullet/area_bullet.cpp +++ b/modules/bullet/area_bullet.cpp @@ -1,10 +1,9 @@ /*************************************************************************/ /* area_bullet.cpp */ -/* Author: AndreaCatania */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ -/* http://www.godotengine.org */ +/* https://godotengine.org */ /*************************************************************************/ /* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md) */ @@ -30,13 +29,19 @@ /*************************************************************************/ #include "area_bullet.h" -#include "BulletCollision/CollisionDispatch/btGhostObject.h" -#include "btBulletCollisionCommon.h" + #include "bullet_types_converter.h" #include "bullet_utilities.h" #include "collision_object_bullet.h" #include "space_bullet.h" +#include <BulletCollision/CollisionDispatch/btGhostObject.h> +#include <btBulletCollisionCommon.h> + +/** + @author AndreaCatania +*/ + AreaBullet::AreaBullet() : RigidCollisionObjectBullet(CollisionObjectBullet::TYPE_AREA), monitorable(true), diff --git a/modules/bullet/area_bullet.h b/modules/bullet/area_bullet.h index 3e0913b891..78136d574b 100644 --- a/modules/bullet/area_bullet.h +++ b/modules/bullet/area_bullet.h @@ -1,10 +1,9 @@ /*************************************************************************/ /* area_bullet.h */ -/* Author: AndreaCatania */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ -/* http://www.godotengine.org */ +/* https://godotengine.org */ /*************************************************************************/ /* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md) */ @@ -37,6 +36,10 @@ #include "servers/physics_server.h" #include "space_bullet.h" +/** + @author AndreaCatania +*/ + class btGhostObject; class AreaBullet : public RigidCollisionObjectBullet { diff --git a/modules/bullet/btRayShape.cpp b/modules/bullet/btRayShape.cpp index 8f6434b46b..4164450cd2 100644 --- a/modules/bullet/btRayShape.cpp +++ b/modules/bullet/btRayShape.cpp @@ -1,10 +1,9 @@ /*************************************************************************/ -/* btRayShape.h */ -/* Author: AndreaCatania */ +/* btRayShape.cpp */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ -/* http://www.godotengine.org */ +/* https://godotengine.org */ /*************************************************************************/ /* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md) */ @@ -30,9 +29,15 @@ /*************************************************************************/ #include "btRayShape.h" -#include "LinearMath/btAabbUtil2.h" + #include "math/math_funcs.h" +#include <LinearMath/btAabbUtil2.h> + +/** + @author AndreaCatania +*/ + btRayShape::btRayShape(btScalar length) : btConvexInternalShape(), m_shapeAxis(0, 0, 1) { diff --git a/modules/bullet/btRayShape.h b/modules/bullet/btRayShape.h index be7acaa01f..99a9412dbe 100644 --- a/modules/bullet/btRayShape.h +++ b/modules/bullet/btRayShape.h @@ -1,10 +1,9 @@ /*************************************************************************/ -/* btRayShape.h */ -/* Author: AndreaCatania */ +/* btRayShape.h */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ -/* http://www.godotengine.org */ +/* https://godotengine.org */ /*************************************************************************/ /* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md) */ @@ -29,12 +28,16 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -/// IMPORTANT The class name and filename was created by following Bullet writing rules for an easy (eventually ) porting to bullet +/// IMPORTANT The class name and filename was created by following Bullet writing rules for an easy (eventually) porting to bullet /// This shape is a custom shape that is not present to Bullet physics engine #ifndef BTRAYSHAPE_H #define BTRAYSHAPE_H -#include "BulletCollision/CollisionShapes/btConvexInternalShape.h" +#include <BulletCollision/CollisionShapes/btConvexInternalShape.h> + +/** + @author AndreaCatania +*/ /// Ray shape around z axis ATTRIBUTE_ALIGNED16(class) diff --git a/modules/bullet/bullet_physics_server.cpp b/modules/bullet/bullet_physics_server.cpp index 679e4def82..51de4998fa 100644 --- a/modules/bullet/bullet_physics_server.cpp +++ b/modules/bullet/bullet_physics_server.cpp @@ -1,10 +1,9 @@ /*************************************************************************/ /* bullet_physics_server.cpp */ -/* Author: AndreaCatania */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ -/* http://www.godotengine.org */ +/* https://godotengine.org */ /*************************************************************************/ /* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md) */ @@ -30,7 +29,7 @@ /*************************************************************************/ #include "bullet_physics_server.h" -#include "LinearMath/btVector3.h" + #include "bullet_utilities.h" #include "class_db.h" #include "cone_twist_joint_bullet.h" @@ -41,8 +40,15 @@ #include "pin_joint_bullet.h" #include "shape_bullet.h" #include "slider_joint_bullet.h" + +#include <LinearMath/btVector3.h> + #include <assert.h> +/** + @author AndreaCatania +*/ + #define CreateThenReturnRID(owner, ridData) \ RID rid = owner.make_rid(ridData); \ ridData->set_self(rid); \ diff --git a/modules/bullet/bullet_physics_server.h b/modules/bullet/bullet_physics_server.h index 006ad0f821..1c94428a2a 100644 --- a/modules/bullet/bullet_physics_server.h +++ b/modules/bullet/bullet_physics_server.h @@ -1,10 +1,9 @@ /*************************************************************************/ /* bullet_physics_server.h */ -/* Author: AndreaCatania */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ -/* http://www.godotengine.org */ +/* https://godotengine.org */ /*************************************************************************/ /* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md) */ @@ -41,6 +40,10 @@ #include "soft_body_bullet.h" #include "space_bullet.h" +/** + @author AndreaCatania +*/ + class BulletPhysicsServer : public PhysicsServer { GDCLASS(BulletPhysicsServer, PhysicsServer) diff --git a/modules/bullet/bullet_types_converter.cpp b/modules/bullet/bullet_types_converter.cpp index 42a6f156a5..a0fe598227 100644 --- a/modules/bullet/bullet_types_converter.cpp +++ b/modules/bullet/bullet_types_converter.cpp @@ -1,10 +1,9 @@ /*************************************************************************/ /* bullet_types_converter.cpp */ -/* Author: AndreaCatania */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ -/* http://www.godotengine.org */ +/* https://godotengine.org */ /*************************************************************************/ /* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md) */ @@ -33,6 +32,10 @@ #include "bullet_types_converter.h" +/** + @author AndreaCatania +*/ + // ++ BULLET to GODOT ++++++++++ void B_TO_G(btVector3 const &inVal, Vector3 &outVal) { outVal[0] = inVal[0]; diff --git a/modules/bullet/bullet_types_converter.h b/modules/bullet/bullet_types_converter.h index 349cad65aa..84321fe837 100644 --- a/modules/bullet/bullet_types_converter.h +++ b/modules/bullet/bullet_types_converter.h @@ -1,10 +1,9 @@ /*************************************************************************/ /* bullet_types_converter.h */ -/* Author: AndreaCatania */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ -/* http://www.godotengine.org */ +/* https://godotengine.org */ /*************************************************************************/ /* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md) */ @@ -32,14 +31,19 @@ #ifndef BULLET_TYPES_CONVERTER_H #define BULLET_TYPES_CONVERTER_H -#include "LinearMath/btMatrix3x3.h" -#include "LinearMath/btTransform.h" -#include "LinearMath/btVector3.h" #include "core/math/matrix3.h" #include "core/math/transform.h" #include "core/math/vector3.h" #include "core/typedefs.h" +#include <LinearMath/btMatrix3x3.h> +#include <LinearMath/btTransform.h> +#include <LinearMath/btVector3.h> + +/** + @author AndreaCatania +*/ + // Bullet to Godot extern void B_TO_G(btVector3 const &inVal, Vector3 &outVal); extern void INVERT_B_TO_G(btVector3 const &inVal, Vector3 &outVal); diff --git a/modules/bullet/bullet_utilities.h b/modules/bullet/bullet_utilities.h index 1a44f48844..2841dfbe69 100644 --- a/modules/bullet/bullet_utilities.h +++ b/modules/bullet/bullet_utilities.h @@ -1,10 +1,9 @@ /*************************************************************************/ /* bullet_utilities.h */ -/* Author: AndreaCatania */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ -/* http://www.godotengine.org */ +/* https://godotengine.org */ /*************************************************************************/ /* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md) */ @@ -32,6 +31,10 @@ #ifndef BULLET_UTILITIES_H #define BULLET_UTILITIES_H +/** + @author AndreaCatania +*/ + #pragma once #define bulletnew(cl) \ diff --git a/modules/bullet/collision_object_bullet.cpp b/modules/bullet/collision_object_bullet.cpp index 1350be20b6..b3dfc2eecf 100644 --- a/modules/bullet/collision_object_bullet.cpp +++ b/modules/bullet/collision_object_bullet.cpp @@ -1,10 +1,9 @@ /*************************************************************************/ /* collision_object_bullet.cpp */ -/* Author: AndreaCatania */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ -/* http://www.godotengine.org */ +/* https://godotengine.org */ /*************************************************************************/ /* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md) */ @@ -30,14 +29,20 @@ /*************************************************************************/ #include "collision_object_bullet.h" + #include "area_bullet.h" -#include "btBulletCollisionCommon.h" #include "bullet_physics_server.h" #include "bullet_types_converter.h" #include "bullet_utilities.h" #include "shape_bullet.h" #include "space_bullet.h" +#include <btBulletCollisionCommon.h> + +/** + @author AndreaCatania +*/ + #define enableDynamicAabbTree true #define initialChildCapacity 1 diff --git a/modules/bullet/collision_object_bullet.h b/modules/bullet/collision_object_bullet.h index 6a3fbe65ff..a9b8aee019 100644 --- a/modules/bullet/collision_object_bullet.h +++ b/modules/bullet/collision_object_bullet.h @@ -1,10 +1,9 @@ /*************************************************************************/ /* collision_object_bullet.h */ -/* Author: AndreaCatania */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ -/* http://www.godotengine.org */ +/* https://godotengine.org */ /*************************************************************************/ /* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md) */ @@ -32,13 +31,18 @@ #ifndef COLLISION_OBJECT_BULLET_H #define COLLISION_OBJECT_BULLET_H -#include "LinearMath/btTransform.h" #include "core/vset.h" #include "object.h" #include "shape_owner_bullet.h" #include "transform.h" #include "vector3.h" +#include <LinearMath/btTransform.h> + +/** + @author AndreaCatania +*/ + class AreaBullet; class ShapeBullet; class btCollisionObject; diff --git a/modules/bullet/cone_twist_joint_bullet.cpp b/modules/bullet/cone_twist_joint_bullet.cpp index c8944d23c5..472ad3b52c 100644 --- a/modules/bullet/cone_twist_joint_bullet.cpp +++ b/modules/bullet/cone_twist_joint_bullet.cpp @@ -1,10 +1,9 @@ /*************************************************************************/ /* cone_twist_joint_bullet.cpp */ -/* Author: AndreaCatania */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ -/* http://www.godotengine.org */ +/* https://godotengine.org */ /*************************************************************************/ /* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md) */ @@ -30,11 +29,17 @@ /*************************************************************************/ #include "cone_twist_joint_bullet.h" -#include "BulletDynamics/ConstraintSolver/btConeTwistConstraint.h" + #include "bullet_types_converter.h" #include "bullet_utilities.h" #include "rigid_body_bullet.h" +#include <BulletDynamics/ConstraintSolver/btConeTwistConstraint.h> + +/** + @author AndreaCatania +*/ + ConeTwistJointBullet::ConeTwistJointBullet(RigidBodyBullet *rbA, RigidBodyBullet *rbB, const Transform &rbAFrame, const Transform &rbBFrame) : JointBullet() { diff --git a/modules/bullet/cone_twist_joint_bullet.h b/modules/bullet/cone_twist_joint_bullet.h index 5f0bccbd31..bd6eb49196 100644 --- a/modules/bullet/cone_twist_joint_bullet.h +++ b/modules/bullet/cone_twist_joint_bullet.h @@ -1,10 +1,9 @@ /*************************************************************************/ /* cone_twist_joint_bullet.h */ -/* Author: AndreaCatania */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ -/* http://www.godotengine.org */ +/* https://godotengine.org */ /*************************************************************************/ /* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md) */ @@ -34,6 +33,10 @@ #include "joint_bullet.h" +/** + @author AndreaCatania +*/ + class RigidBodyBullet; class ConeTwistJointBullet : public JointBullet { diff --git a/modules/bullet/constraint_bullet.cpp b/modules/bullet/constraint_bullet.cpp index 0c5ba29cb3..b60e89b6fd 100644 --- a/modules/bullet/constraint_bullet.cpp +++ b/modules/bullet/constraint_bullet.cpp @@ -1,10 +1,9 @@ /*************************************************************************/ /* constraint_bullet.cpp */ -/* Author: AndreaCatania */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ -/* http://www.godotengine.org */ +/* https://godotengine.org */ /*************************************************************************/ /* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md) */ @@ -30,9 +29,14 @@ /*************************************************************************/ #include "constraint_bullet.h" + #include "collision_object_bullet.h" #include "space_bullet.h" +/** + @author AndreaCatania +*/ + ConstraintBullet::ConstraintBullet() : space(NULL), constraint(NULL) {} diff --git a/modules/bullet/constraint_bullet.h b/modules/bullet/constraint_bullet.h index a753ee0429..23be5a5063 100644 --- a/modules/bullet/constraint_bullet.h +++ b/modules/bullet/constraint_bullet.h @@ -1,10 +1,9 @@ /*************************************************************************/ /* constraint_bullet.h */ -/* Author: AndreaCatania */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ -/* http://www.godotengine.org */ +/* https://godotengine.org */ /*************************************************************************/ /* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md) */ @@ -32,10 +31,15 @@ #ifndef CONSTRAINT_BULLET_H #define CONSTRAINT_BULLET_H -#include "BulletDynamics/ConstraintSolver/btTypedConstraint.h" #include "bullet_utilities.h" #include "rid_bullet.h" +#include <BulletDynamics/ConstraintSolver/btTypedConstraint.h> + +/** + @author AndreaCatania +*/ + class RigidBodyBullet; class SpaceBullet; class btTypedConstraint; diff --git a/modules/bullet/generic_6dof_joint_bullet.cpp b/modules/bullet/generic_6dof_joint_bullet.cpp index 674b30b23a..151a79a69f 100644 --- a/modules/bullet/generic_6dof_joint_bullet.cpp +++ b/modules/bullet/generic_6dof_joint_bullet.cpp @@ -1,10 +1,9 @@ /*************************************************************************/ /* generic_6dof_joint_bullet.cpp */ -/* Author: AndreaCatania */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ -/* http://www.godotengine.org */ +/* https://godotengine.org */ /*************************************************************************/ /* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md) */ @@ -30,11 +29,17 @@ /*************************************************************************/ #include "generic_6dof_joint_bullet.h" -#include "BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h" + #include "bullet_types_converter.h" #include "bullet_utilities.h" #include "rigid_body_bullet.h" +#include <BulletDynamics/ConstraintSolver/btGeneric6DofConstraint.h> + +/** + @author AndreaCatania +*/ + Generic6DOFJointBullet::Generic6DOFJointBullet(RigidBodyBullet *rbA, RigidBodyBullet *rbB, const Transform &frameInA, const Transform &frameInB, bool useLinearReferenceFrameA) : JointBullet() { diff --git a/modules/bullet/generic_6dof_joint_bullet.h b/modules/bullet/generic_6dof_joint_bullet.h index df66892d66..ad06582eac 100644 --- a/modules/bullet/generic_6dof_joint_bullet.h +++ b/modules/bullet/generic_6dof_joint_bullet.h @@ -1,10 +1,9 @@ /*************************************************************************/ /* generic_6dof_joint_bullet.h */ -/* Author: AndreaCatania */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ -/* http://www.godotengine.org */ +/* https://godotengine.org */ /*************************************************************************/ /* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md) */ @@ -34,6 +33,10 @@ #include "joint_bullet.h" +/** + @author AndreaCatania +*/ + class RigidBodyBullet; class Generic6DOFJointBullet : public JointBullet { diff --git a/modules/bullet/godot_collision_configuration.cpp b/modules/bullet/godot_collision_configuration.cpp index 6d83a9bccb..f4bb9acbd7 100644 --- a/modules/bullet/godot_collision_configuration.cpp +++ b/modules/bullet/godot_collision_configuration.cpp @@ -1,10 +1,9 @@ /*************************************************************************/ /* godot_collision_configuration.cpp */ -/* Author: AndreaCatania */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ -/* http://www.godotengine.org */ +/* https://godotengine.org */ /*************************************************************************/ /* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md) */ @@ -30,10 +29,16 @@ /*************************************************************************/ #include "godot_collision_configuration.h" -#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" -#include "BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h" + #include "godot_ray_world_algorithm.h" +#include <BulletCollision/BroadphaseCollision/btBroadphaseProxy.h> +#include <BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h> + +/** + @author AndreaCatania +*/ + GodotCollisionConfiguration::GodotCollisionConfiguration(const btDiscreteDynamicsWorld *world, const btDefaultCollisionConstructionInfo &constructionInfo) : btDefaultCollisionConfiguration(constructionInfo) { diff --git a/modules/bullet/godot_collision_configuration.h b/modules/bullet/godot_collision_configuration.h index 835edac907..9b30ad0c62 100644 --- a/modules/bullet/godot_collision_configuration.h +++ b/modules/bullet/godot_collision_configuration.h @@ -1,10 +1,9 @@ /*************************************************************************/ /* godot_collision_configuration.h */ -/* Author: AndreaCatania */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ -/* http://www.godotengine.org */ +/* https://godotengine.org */ /*************************************************************************/ /* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md) */ @@ -32,7 +31,11 @@ #ifndef GODOT_COLLISION_CONFIGURATION_H #define GODOT_COLLISION_CONFIGURATION_H -#include "BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h" +#include <BulletCollision/CollisionDispatch/btDefaultCollisionConfiguration.h> + +/** + @author AndreaCatania +*/ class btDiscreteDynamicsWorld; diff --git a/modules/bullet/godot_collision_dispatcher.cpp b/modules/bullet/godot_collision_dispatcher.cpp index 31a965869e..1815f2152e 100644 --- a/modules/bullet/godot_collision_dispatcher.cpp +++ b/modules/bullet/godot_collision_dispatcher.cpp @@ -1,10 +1,9 @@ /*************************************************************************/ /* godot_collision_dispatcher.cpp */ -/* Author: AndreaCatania */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ -/* http://www.godotengine.org */ +/* https://godotengine.org */ /*************************************************************************/ /* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md) */ @@ -30,8 +29,13 @@ /*************************************************************************/ #include "godot_collision_dispatcher.h" + #include "collision_object_bullet.h" +/** + @author AndreaCatania +*/ + const int GodotCollisionDispatcher::CASTED_TYPE_AREA = static_cast<int>(CollisionObjectBullet::TYPE_AREA); GodotCollisionDispatcher::GodotCollisionDispatcher(btCollisionConfiguration *collisionConfiguration) : diff --git a/modules/bullet/godot_collision_dispatcher.h b/modules/bullet/godot_collision_dispatcher.h index ab3ab2af31..2e5a6c2732 100644 --- a/modules/bullet/godot_collision_dispatcher.h +++ b/modules/bullet/godot_collision_dispatcher.h @@ -1,10 +1,9 @@ /*************************************************************************/ /* godot_collision_dispatcher.h */ -/* Author: AndreaCatania */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ -/* http://www.godotengine.org */ +/* https://godotengine.org */ /*************************************************************************/ /* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md) */ @@ -33,8 +32,13 @@ #define GODOT_COLLISION_DISPATCHER_H #include "int_types.h" + #include <btBulletDynamicsCommon.h> +/** + @author AndreaCatania +*/ + /// This class is required to implement custom collision behaviour in the narrowphase class GodotCollisionDispatcher : public btCollisionDispatcher { private: diff --git a/modules/bullet/godot_motion_state.h b/modules/bullet/godot_motion_state.h index 79f139898c..2ebe368536 100644 --- a/modules/bullet/godot_motion_state.h +++ b/modules/bullet/godot_motion_state.h @@ -1,10 +1,9 @@ /*************************************************************************/ /* godot_motion_state.h */ -/* Author: AndreaCatania */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ -/* http://www.godotengine.org */ +/* https://godotengine.org */ /*************************************************************************/ /* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md) */ @@ -32,9 +31,14 @@ #ifndef GODOT_MOTION_STATE_H #define GODOT_MOTION_STATE_H -#include "LinearMath/btMotionState.h" #include "rigid_body_bullet.h" +#include <LinearMath/btMotionState.h> + +/** + @author AndreaCatania +*/ + class RigidBodyBullet; // This clas is responsible to move kinematic actor diff --git a/modules/bullet/godot_ray_world_algorithm.cpp b/modules/bullet/godot_ray_world_algorithm.cpp index 3dd10b9ab3..709eed9e40 100644 --- a/modules/bullet/godot_ray_world_algorithm.cpp +++ b/modules/bullet/godot_ray_world_algorithm.cpp @@ -1,10 +1,9 @@ /*************************************************************************/ /* godot_ray_world_algorithm.cpp */ -/* Author: AndreaCatania */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ -/* http://www.godotengine.org */ +/* https://godotengine.org */ /*************************************************************************/ /* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md) */ @@ -30,10 +29,16 @@ /*************************************************************************/ #include "godot_ray_world_algorithm.h" -#include "BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h" + #include "btRayShape.h" #include "collision_object_bullet.h" +#include <BulletDynamics/Dynamics/btDiscreteDynamicsWorld.h> + +/** + @author AndreaCatania +*/ + GodotRayWorldAlgorithm::CreateFunc::CreateFunc(const btDiscreteDynamicsWorld *world) : m_world(world) {} diff --git a/modules/bullet/godot_ray_world_algorithm.h b/modules/bullet/godot_ray_world_algorithm.h index f2c9008f58..c716c1d88d 100644 --- a/modules/bullet/godot_ray_world_algorithm.h +++ b/modules/bullet/godot_ray_world_algorithm.h @@ -1,10 +1,9 @@ /*************************************************************************/ /* godot_ray_world_algorithm.h */ -/* Author: AndreaCatania */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ -/* http://www.godotengine.org */ +/* https://godotengine.org */ /*************************************************************************/ /* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md) */ @@ -32,9 +31,13 @@ #ifndef GODOT_RAY_WORLD_ALGORITHM_H #define GODOT_RAY_WORLD_ALGORITHM_H -#include "BulletCollision/CollisionDispatch/btActivatingCollisionAlgorithm.h" -#include "BulletCollision/CollisionDispatch/btCollisionCreateFunc.h" -#include "BulletCollision/CollisionDispatch/btCollisionDispatcher.h" +#include <BulletCollision/CollisionDispatch/btActivatingCollisionAlgorithm.h> +#include <BulletCollision/CollisionDispatch/btCollisionCreateFunc.h> +#include <BulletCollision/CollisionDispatch/btCollisionDispatcher.h> + +/** + @author AndreaCatania +*/ class btDiscreteDynamicsWorld; diff --git a/modules/bullet/godot_result_callbacks.cpp b/modules/bullet/godot_result_callbacks.cpp index a91cbec340..8d4ca6d6a7 100644 --- a/modules/bullet/godot_result_callbacks.cpp +++ b/modules/bullet/godot_result_callbacks.cpp @@ -1,10 +1,9 @@ /*************************************************************************/ /* godot_result_callbacks.cpp */ -/* Author: AndreaCatania */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ -/* http://www.godotengine.org */ +/* https://godotengine.org */ /*************************************************************************/ /* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md) */ @@ -30,10 +29,15 @@ /*************************************************************************/ #include "godot_result_callbacks.h" + #include "bullet_types_converter.h" #include "collision_object_bullet.h" #include "rigid_body_bullet.h" +/** + @author AndreaCatania +*/ + bool GodotFilterCallback::test_collision_filters(uint32_t body0_collision_layer, uint32_t body0_collision_mask, uint32_t body1_collision_layer, uint32_t body1_collision_mask) { return body0_collision_layer & body1_collision_mask || body1_collision_layer & body0_collision_mask; } diff --git a/modules/bullet/godot_result_callbacks.h b/modules/bullet/godot_result_callbacks.h index 407fb79b9a..b18965a5b8 100644 --- a/modules/bullet/godot_result_callbacks.h +++ b/modules/bullet/godot_result_callbacks.h @@ -1,10 +1,9 @@ /*************************************************************************/ /* godot_result_callbacks.h */ -/* Author: AndreaCatania */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ -/* http://www.godotengine.org */ +/* https://godotengine.org */ /*************************************************************************/ /* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md) */ @@ -32,10 +31,15 @@ #ifndef GODOT_RESULT_CALLBACKS_H #define GODOT_RESULT_CALLBACKS_H -#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" -#include "btBulletDynamicsCommon.h" #include "servers/physics_server.h" +#include <BulletCollision/BroadphaseCollision/btBroadphaseProxy.h> +#include <btBulletDynamicsCommon.h> + +/** + @author AndreaCatania +*/ + class RigidBodyBullet; /// This class is required to implement custom collision behaviour in the broadphase diff --git a/modules/bullet/hinge_joint_bullet.cpp b/modules/bullet/hinge_joint_bullet.cpp index c731a3c134..97ea7ca3df 100644 --- a/modules/bullet/hinge_joint_bullet.cpp +++ b/modules/bullet/hinge_joint_bullet.cpp @@ -1,10 +1,9 @@ /*************************************************************************/ /* hinge_joint_bullet.cpp */ -/* Author: AndreaCatania */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ -/* http://www.godotengine.org */ +/* https://godotengine.org */ /*************************************************************************/ /* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md) */ @@ -30,11 +29,17 @@ /*************************************************************************/ #include "hinge_joint_bullet.h" -#include "BulletDynamics/ConstraintSolver/btHingeConstraint.h" + #include "bullet_types_converter.h" #include "bullet_utilities.h" #include "rigid_body_bullet.h" +#include <BulletDynamics/ConstraintSolver/btHingeConstraint.h> + +/** + @author AndreaCatania +*/ + HingeJointBullet::HingeJointBullet(RigidBodyBullet *rbA, RigidBodyBullet *rbB, const Transform &frameA, const Transform &frameB) : JointBullet() { diff --git a/modules/bullet/hinge_joint_bullet.h b/modules/bullet/hinge_joint_bullet.h index 72146fca8b..ca87c8dd8c 100644 --- a/modules/bullet/hinge_joint_bullet.h +++ b/modules/bullet/hinge_joint_bullet.h @@ -1,10 +1,9 @@ /*************************************************************************/ /* hinge_joint_bullet.h */ -/* Author: AndreaCatania */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ -/* http://www.godotengine.org */ +/* https://godotengine.org */ /*************************************************************************/ /* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md) */ @@ -34,6 +33,10 @@ #include "joint_bullet.h" +/** + @author AndreaCatania +*/ + class HingeJointBullet : public JointBullet { class btHingeConstraint *hingeConstraint; diff --git a/modules/bullet/joint_bullet.cpp b/modules/bullet/joint_bullet.cpp index 8aa15e731d..aaeb9f9ce7 100644 --- a/modules/bullet/joint_bullet.cpp +++ b/modules/bullet/joint_bullet.cpp @@ -1,10 +1,9 @@ /*************************************************************************/ /* joint_bullet.cpp */ -/* Author: AndreaCatania */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ -/* http://www.godotengine.org */ +/* https://godotengine.org */ /*************************************************************************/ /* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md) */ @@ -30,8 +29,13 @@ /*************************************************************************/ #include "joint_bullet.h" + #include "space_bullet.h" +/** + @author AndreaCatania +*/ + JointBullet::JointBullet() : ConstraintBullet() {} diff --git a/modules/bullet/joint_bullet.h b/modules/bullet/joint_bullet.h index 2d4f774345..4a5333fb85 100644 --- a/modules/bullet/joint_bullet.h +++ b/modules/bullet/joint_bullet.h @@ -1,10 +1,9 @@ /*************************************************************************/ /* joint_bullet.h */ -/* Author: AndreaCatania */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ -/* http://www.godotengine.org */ +/* https://godotengine.org */ /*************************************************************************/ /* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md) */ @@ -35,6 +34,10 @@ #include "constraint_bullet.h" #include "servers/physics_server.h" +/** + @author AndreaCatania +*/ + class RigidBodyBullet; class btTypedConstraint; diff --git a/modules/bullet/pin_joint_bullet.cpp b/modules/bullet/pin_joint_bullet.cpp index 7c44548496..c4e5b8cdbe 100644 --- a/modules/bullet/pin_joint_bullet.cpp +++ b/modules/bullet/pin_joint_bullet.cpp @@ -1,10 +1,9 @@ /*************************************************************************/ /* pin_joint_bullet.cpp */ -/* Author: AndreaCatania */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ -/* http://www.godotengine.org */ +/* https://godotengine.org */ /*************************************************************************/ /* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md) */ @@ -30,10 +29,16 @@ /*************************************************************************/ #include "pin_joint_bullet.h" -#include "BulletDynamics/ConstraintSolver/btPoint2PointConstraint.h" + #include "bullet_types_converter.h" #include "rigid_body_bullet.h" +#include <BulletDynamics/ConstraintSolver/btPoint2PointConstraint.h> + +/** + @author AndreaCatania +*/ + PinJointBullet::PinJointBullet(RigidBodyBullet *p_body_a, const Vector3 &p_pos_a, RigidBodyBullet *p_body_b, const Vector3 &p_pos_b) : JointBullet() { if (p_body_b) { diff --git a/modules/bullet/pin_joint_bullet.h b/modules/bullet/pin_joint_bullet.h index 5610e6aa05..648010bf78 100644 --- a/modules/bullet/pin_joint_bullet.h +++ b/modules/bullet/pin_joint_bullet.h @@ -1,10 +1,9 @@ /*************************************************************************/ /* pin_joint_bullet.h */ -/* Author: AndreaCatania */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ -/* http://www.godotengine.org */ +/* https://godotengine.org */ /*************************************************************************/ /* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md) */ @@ -34,6 +33,10 @@ #include "joint_bullet.h" +/** + @author AndreaCatania +*/ + class RigidBodyBullet; class PinJointBullet : public JointBullet { diff --git a/modules/bullet/register_types.cpp b/modules/bullet/register_types.cpp index 2a420f424b..b119b7720f 100644 --- a/modules/bullet/register_types.cpp +++ b/modules/bullet/register_types.cpp @@ -1,10 +1,9 @@ /*************************************************************************/ /* register_types.cpp */ -/* Author: AndreaCatania */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ -/* http://www.godotengine.org */ +/* https://godotengine.org */ /*************************************************************************/ /* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md) */ @@ -30,9 +29,14 @@ /*************************************************************************/ #include "register_types.h" + #include "bullet_physics_server.h" #include "class_db.h" +/** + @author AndreaCatania +*/ + PhysicsServer *_createBulletPhysicsCallback() { return memnew(BulletPhysicsServer); } diff --git a/modules/bullet/register_types.h b/modules/bullet/register_types.h index 4edc3fb839..226bcd9402 100644 --- a/modules/bullet/register_types.h +++ b/modules/bullet/register_types.h @@ -1,10 +1,9 @@ /*************************************************************************/ /* register_types.h */ -/* Author: AndreaCatania */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ -/* http://www.godotengine.org */ +/* https://godotengine.org */ /*************************************************************************/ /* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md) */ @@ -32,6 +31,10 @@ #ifndef REGISTER_BULLET_TYPES_H #define REGISTER_BULLET_TYPES_H +/** + @author AndreaCatania +*/ + void register_bullet_types(); void unregister_bullet_types(); #endif diff --git a/modules/bullet/rid_bullet.h b/modules/bullet/rid_bullet.h index 72859b628e..a9351d7728 100644 --- a/modules/bullet/rid_bullet.h +++ b/modules/bullet/rid_bullet.h @@ -1,10 +1,9 @@ /*************************************************************************/ /* rid_bullet.h */ -/* Author: AndreaCatania */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ -/* http://www.godotengine.org */ +/* https://godotengine.org */ /*************************************************************************/ /* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md) */ @@ -34,6 +33,10 @@ #include "core/rid.h" +/** + @author AndreaCatania +*/ + class BulletPhysicsServer; class RIDBullet : public RID_Data { diff --git a/modules/bullet/rigid_body_bullet.cpp b/modules/bullet/rigid_body_bullet.cpp index c183b012ab..0e293a38a6 100644 --- a/modules/bullet/rigid_body_bullet.cpp +++ b/modules/bullet/rigid_body_bullet.cpp @@ -1,10 +1,9 @@ /*************************************************************************/ -/* body_bullet.cpp */ -/* Author: AndreaCatania */ +/* rigid_body_bullet.cpp */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ -/* http://www.godotengine.org */ +/* https://godotengine.org */ /*************************************************************************/ /* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md) */ @@ -30,18 +29,25 @@ /*************************************************************************/ #include "rigid_body_bullet.h" -#include "BulletCollision/CollisionDispatch/btGhostObject.h" -#include "BulletCollision/CollisionShapes/btConvexPointCloudShape.h" -#include "BulletDynamics/Dynamics/btRigidBody.h" -#include "btBulletCollisionCommon.h" + #include "btRayShape.h" #include "bullet_physics_server.h" #include "bullet_types_converter.h" #include "bullet_utilities.h" #include "godot_motion_state.h" #include "joint_bullet.h" + +#include <BulletCollision/CollisionDispatch/btGhostObject.h> +#include <BulletCollision/CollisionShapes/btConvexPointCloudShape.h> +#include <BulletDynamics/Dynamics/btRigidBody.h> +#include <btBulletCollisionCommon.h> + #include <assert.h> +/** + @author AndreaCatania +*/ + BulletPhysicsDirectBodyState *BulletPhysicsDirectBodyState::singleton = NULL; Vector3 BulletPhysicsDirectBodyState::get_total_gravity() const { diff --git a/modules/bullet/rigid_body_bullet.h b/modules/bullet/rigid_body_bullet.h index ff1596e6f4..eb9417e391 100644 --- a/modules/bullet/rigid_body_bullet.h +++ b/modules/bullet/rigid_body_bullet.h @@ -1,10 +1,9 @@ /*************************************************************************/ -/* body_bullet.h */ -/* Author: AndreaCatania */ +/* rigid_body_bullet.h */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ -/* http://www.godotengine.org */ +/* https://godotengine.org */ /*************************************************************************/ /* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md) */ @@ -32,11 +31,16 @@ #ifndef BODYBULLET_H #define BODYBULLET_H -#include "BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h" -#include "LinearMath/btTransform.h" #include "collision_object_bullet.h" #include "space_bullet.h" +#include <BulletCollision/BroadphaseCollision/btCollisionAlgorithm.h> +#include <LinearMath/btTransform.h> + +/** + @author AndreaCatania +*/ + class AreaBullet; class SpaceBullet; class btRigidBody; diff --git a/modules/bullet/shape_bullet.cpp b/modules/bullet/shape_bullet.cpp index d5a89e39e2..ee1cc418bc 100644 --- a/modules/bullet/shape_bullet.cpp +++ b/modules/bullet/shape_bullet.cpp @@ -1,10 +1,9 @@ /*************************************************************************/ /* shape_bullet.cpp */ -/* Author: AndreaCatania */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ -/* http://www.godotengine.org */ +/* https://godotengine.org */ /*************************************************************************/ /* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md) */ @@ -30,15 +29,21 @@ /*************************************************************************/ #include "shape_bullet.h" -#include "BulletCollision/CollisionShapes/btConvexPointCloudShape.h" -#include "BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h" -#include "btBulletCollisionCommon.h" + #include "btRayShape.h" #include "bullet_physics_server.h" #include "bullet_types_converter.h" #include "bullet_utilities.h" #include "shape_owner_bullet.h" +#include <BulletCollision/CollisionShapes/btConvexPointCloudShape.h> +#include <BulletCollision/CollisionShapes/btHeightfieldTerrainShape.h> +#include <btBulletCollisionCommon.h> + +/** + @author AndreaCatania +*/ + ShapeBullet::ShapeBullet() {} ShapeBullet::~ShapeBullet() {} diff --git a/modules/bullet/shape_bullet.h b/modules/bullet/shape_bullet.h index a9782a9333..12fa9754bd 100644 --- a/modules/bullet/shape_bullet.h +++ b/modules/bullet/shape_bullet.h @@ -1,10 +1,9 @@ /*************************************************************************/ /* shape_bullet.h */ -/* Author: AndreaCatania */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ -/* http://www.godotengine.org */ +/* https://godotengine.org */ /*************************************************************************/ /* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md) */ @@ -32,14 +31,19 @@ #ifndef SHAPE_BULLET_H #define SHAPE_BULLET_H -#include "LinearMath/btAlignedObjectArray.h" -#include "LinearMath/btScalar.h" -#include "LinearMath/btVector3.h" #include "core/variant.h" #include "geometry.h" #include "rid_bullet.h" #include "servers/physics_server.h" +#include <LinearMath/btAlignedObjectArray.h> +#include <LinearMath/btScalar.h> +#include <LinearMath/btVector3.h> + +/** + @author AndreaCatania +*/ + class ShapeBullet; class btCollisionShape; class ShapeOwnerBullet; diff --git a/modules/bullet/shape_owner_bullet.cpp b/modules/bullet/shape_owner_bullet.cpp index 7b753e1c48..d6ba5d81bc 100644 --- a/modules/bullet/shape_owner_bullet.cpp +++ b/modules/bullet/shape_owner_bullet.cpp @@ -1,10 +1,9 @@ /*************************************************************************/ /* shape_owner_bullet.cpp */ -/* Author: AndreaCatania */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ -/* http://www.godotengine.org */ +/* https://godotengine.org */ /*************************************************************************/ /* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md) */ @@ -30,3 +29,7 @@ /*************************************************************************/ #include "shape_owner_bullet.h" + +/** + @author AndreaCatania +*/ diff --git a/modules/bullet/shape_owner_bullet.h b/modules/bullet/shape_owner_bullet.h index 4e81b4be6e..29d42d12f2 100644 --- a/modules/bullet/shape_owner_bullet.h +++ b/modules/bullet/shape_owner_bullet.h @@ -1,10 +1,9 @@ /*************************************************************************/ /* shape_owner_bullet.h */ -/* Author: AndreaCatania */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ -/* http://www.godotengine.org */ +/* https://godotengine.org */ /*************************************************************************/ /* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md) */ @@ -34,11 +33,15 @@ #include "rid_bullet.h" +/** + @author AndreaCatania +*/ + class ShapeBullet; class btCollisionShape; class CollisionObjectBullet; -/// Each clas that want to use Shapes must inherit this class +/// Each class that want to use Shapes must inherit this class /// E.G. BodyShape is a child of this class ShapeOwnerBullet { public: diff --git a/modules/bullet/slider_joint_bullet.cpp b/modules/bullet/slider_joint_bullet.cpp index 09cbd5032c..9e1cd23989 100644 --- a/modules/bullet/slider_joint_bullet.cpp +++ b/modules/bullet/slider_joint_bullet.cpp @@ -1,10 +1,9 @@ /*************************************************************************/ /* slider_joint_bullet.cpp */ -/* Author: AndreaCatania */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ -/* http://www.godotengine.org */ +/* https://godotengine.org */ /*************************************************************************/ /* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md) */ @@ -30,11 +29,17 @@ /*************************************************************************/ #include "slider_joint_bullet.h" -#include "BulletDynamics/ConstraintSolver/btSliderConstraint.h" + #include "bullet_types_converter.h" #include "bullet_utilities.h" #include "rigid_body_bullet.h" +#include <BulletDynamics/ConstraintSolver/btSliderConstraint.h> + +/** + @author AndreaCatania +*/ + SliderJointBullet::SliderJointBullet(RigidBodyBullet *rbA, RigidBodyBullet *rbB, const Transform &frameInA, const Transform &frameInB) : JointBullet() { diff --git a/modules/bullet/slider_joint_bullet.h b/modules/bullet/slider_joint_bullet.h index 4b9a70a323..d532906c0d 100644 --- a/modules/bullet/slider_joint_bullet.h +++ b/modules/bullet/slider_joint_bullet.h @@ -1,10 +1,9 @@ /*************************************************************************/ /* slider_joint_bullet.h */ -/* Author: AndreaCatania */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ -/* http://www.godotengine.org */ +/* https://godotengine.org */ /*************************************************************************/ /* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md) */ @@ -34,6 +33,10 @@ #include "joint_bullet.h" +/** + @author AndreaCatania +*/ + class RigidBodyBullet; class SliderJointBullet : public JointBullet { diff --git a/modules/bullet/soft_body_bullet.cpp b/modules/bullet/soft_body_bullet.cpp index 268967f014..5c20eb73f1 100644 --- a/modules/bullet/soft_body_bullet.cpp +++ b/modules/bullet/soft_body_bullet.cpp @@ -1,10 +1,9 @@ /*************************************************************************/ /* soft_body_bullet.cpp */ -/* Author: AndreaCatania */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ -/* http://www.godotengine.org */ +/* https://godotengine.org */ /*************************************************************************/ /* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md) */ @@ -30,11 +29,15 @@ /*************************************************************************/ #include "soft_body_bullet.h" + #include "bullet_types_converter.h" #include "bullet_utilities.h" +#include "scene/3d/immediate_geometry.h" #include "space_bullet.h" -#include "scene/3d/immediate_geometry.h" +/** + @author AndreaCatania +*/ SoftBodyBullet::SoftBodyBullet() : CollisionObjectBullet(CollisionObjectBullet::TYPE_SOFT_BODY), diff --git a/modules/bullet/soft_body_bullet.h b/modules/bullet/soft_body_bullet.h index 83597ae7d2..9895643b84 100644 --- a/modules/bullet/soft_body_bullet.h +++ b/modules/bullet/soft_body_bullet.h @@ -1,10 +1,9 @@ /*************************************************************************/ /* soft_body_bullet.h */ -/* Author: AndreaCatania */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ -/* http://www.godotengine.org */ +/* https://godotengine.org */ /*************************************************************************/ /* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md) */ @@ -32,14 +31,16 @@ #ifndef SOFT_BODY_BULLET_H #define SOFT_BODY_BULLET_H +#include "collision_object_bullet.h" +#include "scene/resources/material.h" // TODO remove this please + #ifdef None /// This is required to remove the macro None defined by x11 compiler because this word "None" is used internally by Bullet #undef None #define x11_None 0L #endif -#include "BulletSoftBody/btSoftBodyHelpers.h" -#include "collision_object_bullet.h" +#include <BulletSoftBody/btSoftBodyHelpers.h> #ifdef x11_None /// This is required to re add the macro None defined by x11 compiler @@ -47,7 +48,9 @@ #define None 0L #endif -#include "scene/resources/material.h" // TODO remove thsi please +/** + @author AndreaCatania +*/ struct SoftShapeData {}; struct TrimeshSoftShapeData : public SoftShapeData { diff --git a/modules/bullet/space_bullet.cpp b/modules/bullet/space_bullet.cpp index a67c627ba4..83dd055760 100644 --- a/modules/bullet/space_bullet.cpp +++ b/modules/bullet/space_bullet.cpp @@ -1,10 +1,9 @@ /*************************************************************************/ /* space_bullet.cpp */ -/* Author: AndreaCatania */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ -/* http://www.godotengine.org */ +/* https://godotengine.org */ /*************************************************************************/ /* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md) */ @@ -30,14 +29,7 @@ /*************************************************************************/ #include "space_bullet.h" -#include "BulletCollision/CollisionDispatch/btCollisionObject.h" -#include "BulletCollision/CollisionDispatch/btGhostObject.h" -#include "BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.h" -#include "BulletCollision/NarrowPhaseCollision/btGjkPairDetector.h" -#include "BulletCollision/NarrowPhaseCollision/btPointCollector.h" -#include "BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.h" -#include "BulletSoftBody/btSoftRigidDynamicsWorld.h" -#include "btBulletDynamicsCommon.h" + #include "bullet_physics_server.h" #include "bullet_types_converter.h" #include "bullet_utilities.h" @@ -48,8 +40,22 @@ #include "servers/physics_server.h" #include "soft_body_bullet.h" #include "ustring.h" + +#include <BulletCollision/CollisionDispatch/btCollisionObject.h> +#include <BulletCollision/CollisionDispatch/btGhostObject.h> +#include <BulletCollision/NarrowPhaseCollision/btGjkEpaPenetrationDepthSolver.h> +#include <BulletCollision/NarrowPhaseCollision/btGjkPairDetector.h> +#include <BulletCollision/NarrowPhaseCollision/btPointCollector.h> +#include <BulletSoftBody/btSoftBodyRigidBodyCollisionConfiguration.h> +#include <BulletSoftBody/btSoftRigidDynamicsWorld.h> +#include <btBulletDynamicsCommon.h> + #include <assert.h> +/** + @author AndreaCatania +*/ + BulletPhysicsDirectSpaceState::BulletPhysicsDirectSpaceState(SpaceBullet *p_space) : PhysicsDirectSpaceState(), space(p_space) {} diff --git a/modules/bullet/space_bullet.h b/modules/bullet/space_bullet.h index 69ea2fcc58..8d31ab765b 100644 --- a/modules/bullet/space_bullet.h +++ b/modules/bullet/space_bullet.h @@ -1,10 +1,9 @@ /*************************************************************************/ /* space_bullet.h */ -/* Author: AndreaCatania */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ -/* http://www.godotengine.org */ +/* https://godotengine.org */ /*************************************************************************/ /* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md) */ @@ -32,17 +31,22 @@ #ifndef SPACE_BULLET_H #define SPACE_BULLET_H -#include "BulletCollision/BroadphaseCollision/btBroadphaseProxy.h" -#include "BulletCollision/BroadphaseCollision/btOverlappingPairCache.h" -#include "LinearMath/btScalar.h" -#include "LinearMath/btTransform.h" -#include "LinearMath/btVector3.h" #include "core/variant.h" #include "core/vector.h" #include "godot_result_callbacks.h" #include "rid_bullet.h" #include "servers/physics_server.h" +#include <BulletCollision/BroadphaseCollision/btBroadphaseProxy.h> +#include <BulletCollision/BroadphaseCollision/btOverlappingPairCache.h> +#include <LinearMath/btScalar.h> +#include <LinearMath/btTransform.h> +#include <LinearMath/btVector3.h> + +/** + @author AndreaCatania +*/ + class AreaBullet; class btBroadphaseInterface; class btCollisionDispatcher; diff --git a/modules/dds/register_types.cpp b/modules/dds/register_types.cpp index 76244c76a4..d6351fb6fe 100644 --- a/modules/dds/register_types.cpp +++ b/modules/dds/register_types.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "register_types.h" #include "texture_loader_dds.h" diff --git a/modules/dds/register_types.h b/modules/dds/register_types.h index 74db58937e..c7f7839c24 100644 --- a/modules/dds/register_types.h +++ b/modules/dds/register_types.h @@ -27,5 +27,6 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + void register_dds_types(); void unregister_dds_types(); diff --git a/modules/dds/texture_loader_dds.cpp b/modules/dds/texture_loader_dds.cpp index d01af20544..9424080b6d 100644 --- a/modules/dds/texture_loader_dds.cpp +++ b/modules/dds/texture_loader_dds.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "texture_loader_dds.h" #include "os/file_access.h" diff --git a/modules/dds/texture_loader_dds.h b/modules/dds/texture_loader_dds.h index 0adae2fb2a..14d99ff506 100644 --- a/modules/dds/texture_loader_dds.h +++ b/modules/dds/texture_loader_dds.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef TEXTURE_LOADER_DDS_H #define TEXTURE_LOADER_DDS_H diff --git a/modules/enet/networked_multiplayer_enet.cpp b/modules/enet/networked_multiplayer_enet.cpp index 2b5dd67938..3ad80d3978 100644 --- a/modules/enet/networked_multiplayer_enet.cpp +++ b/modules/enet/networked_multiplayer_enet.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "networked_multiplayer_enet.h" #include "io/marshalls.h" #include "os/os.h" diff --git a/modules/enet/networked_multiplayer_enet.h b/modules/enet/networked_multiplayer_enet.h index d6644aed2d..93758de94b 100644 --- a/modules/enet/networked_multiplayer_enet.h +++ b/modules/enet/networked_multiplayer_enet.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef NETWORKED_MULTIPLAYER_ENET_H #define NETWORKED_MULTIPLAYER_ENET_H diff --git a/modules/enet/register_types.cpp b/modules/enet/register_types.cpp index 94d0eaa43f..cabaeb692a 100644 --- a/modules/enet/register_types.cpp +++ b/modules/enet/register_types.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "register_types.h" #include "error_macros.h" #include "networked_multiplayer_enet.h" diff --git a/modules/enet/register_types.h b/modules/enet/register_types.h index 03cc2c8525..bcf0893ae4 100644 --- a/modules/enet/register_types.h +++ b/modules/enet/register_types.h @@ -27,5 +27,6 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + void register_enet_types(); void unregister_enet_types(); diff --git a/modules/etc/image_etc.cpp b/modules/etc/image_etc.cpp index 2224ecc356..e56ec774dd 100644 --- a/modules/etc/image_etc.cpp +++ b/modules/etc/image_etc.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "image_etc.h" #include "Etc.h" #include "EtcFilter.h" diff --git a/modules/etc/image_etc.h b/modules/etc/image_etc.h index fb32a120b1..371c38176f 100644 --- a/modules/etc/image_etc.h +++ b/modules/etc/image_etc.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef IMAGE_ETC1_H #define IMAGE_ETC1_H diff --git a/modules/etc/register_types.cpp b/modules/etc/register_types.cpp index 42baf91dfa..1d1f0e1b77 100644 --- a/modules/etc/register_types.cpp +++ b/modules/etc/register_types.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "register_types.h" #include "image_etc.h" diff --git a/modules/etc/register_types.h b/modules/etc/register_types.h index 1f1336dc10..4a8513a687 100644 --- a/modules/etc/register_types.h +++ b/modules/etc/register_types.h @@ -27,5 +27,6 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + void register_etc_types(); void unregister_etc_types(); diff --git a/modules/etc/texture_loader_pkm.cpp b/modules/etc/texture_loader_pkm.cpp index 4f6df04341..ac89259c9b 100644 --- a/modules/etc/texture_loader_pkm.cpp +++ b/modules/etc/texture_loader_pkm.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "texture_loader_pkm.h" #include "os/file_access.h" diff --git a/modules/etc/texture_loader_pkm.h b/modules/etc/texture_loader_pkm.h index 1e8833b547..3c6d9180bd 100644 --- a/modules/etc/texture_loader_pkm.h +++ b/modules/etc/texture_loader_pkm.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef TEXTURE_LOADER_PKM_H #define TEXTURE_LOADER_PKM_H diff --git a/modules/freetype/register_types.cpp b/modules/freetype/register_types.cpp index c3fa84417d..bde04b714c 100644 --- a/modules/freetype/register_types.cpp +++ b/modules/freetype/register_types.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "register_types.h" void register_freetype_types() {} diff --git a/modules/freetype/register_types.h b/modules/freetype/register_types.h index 959d646cd4..0cec0e3951 100644 --- a/modules/freetype/register_types.h +++ b/modules/freetype/register_types.h @@ -27,5 +27,6 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + void register_freetype_types(); void unregister_freetype_types(); diff --git a/modules/gdnative/SCsub b/modules/gdnative/SCsub index 4e73ebfb9d..c92c3f30a2 100644 --- a/modules/gdnative/SCsub +++ b/modules/gdnative/SCsub @@ -245,6 +245,14 @@ if ARGUMENTS.get('gdnative_wrapper', False): gd_wrapper_env = env.Clone() gd_wrapper_env.Append(CPPPATH=['#modules/gdnative/include/']) + if gd_wrapper_env['use_lto']: + if not env.msvc: + gd_wrapper_env.Append(CCFLAGS=['--no-lto']) + gd_wrapper_env.Append(LINKFLAGS=['--no-lto']) + else: + gd_wrapper_env.Append(CCFLAGS=['/GL-']) + gd_wrapper_env.Append(LINKFLAGS=['/LTCG:OFF']) + if not env.msvc: gd_wrapper_env.Append(CCFLAGS=['-fPIC']) diff --git a/modules/gdnative/doc_classes/GDNativeLibrary.xml b/modules/gdnative/doc_classes/GDNativeLibrary.xml index 647d27929f..14bd0e9654 100644 --- a/modules/gdnative/doc_classes/GDNativeLibrary.xml +++ b/modules/gdnative/doc_classes/GDNativeLibrary.xml @@ -31,6 +31,8 @@ <members> <member name="load_once" type="bool" setter="set_load_once" getter="should_load_once"> </member> + <member name="reloadable" type="bool" setter="set_reloadable" getter="is_reloadable"> + </member> <member name="singleton" type="bool" setter="set_singleton" getter="is_singleton"> </member> <member name="symbol_prefix" type="String" setter="set_symbol_prefix" getter="get_symbol_prefix"> diff --git a/modules/gdnative/gdnative.cpp b/modules/gdnative/gdnative.cpp index 57db9ac51c..1379083b42 100644 --- a/modules/gdnative/gdnative.cpp +++ b/modules/gdnative/gdnative.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "gdnative.h" #include "global_constants.h" @@ -37,9 +38,12 @@ #include "scene/main/scene_tree.h" -const String init_symbol = "gdnative_init"; -const String terminate_symbol = "gdnative_terminate"; -const String default_symbol_prefix = "godot_"; +static const String init_symbol = "gdnative_init"; +static const String terminate_symbol = "gdnative_terminate"; +static const String default_symbol_prefix = "godot_"; +static const bool default_singleton = false; +static const bool default_load_once = true; +static const bool default_reloadable = true; // Defined in gdnative_api_struct.gen.cpp extern const godot_gdnative_core_api_struct api_struct; @@ -50,6 +54,9 @@ GDNativeLibrary::GDNativeLibrary() { config_file.instance(); symbol_prefix = default_symbol_prefix; + load_once = default_load_once; + singleton = default_singleton; + reloadable = default_reloadable; if (GDNativeLibrary::loaded_libraries == NULL) { GDNativeLibrary::loaded_libraries = memnew((Map<String, Vector<Ref<GDNative> > >)); @@ -68,14 +75,17 @@ void GDNativeLibrary::_bind_methods() { ClassDB::bind_method(D_METHOD("should_load_once"), &GDNativeLibrary::should_load_once); ClassDB::bind_method(D_METHOD("is_singleton"), &GDNativeLibrary::is_singleton); ClassDB::bind_method(D_METHOD("get_symbol_prefix"), &GDNativeLibrary::get_symbol_prefix); + ClassDB::bind_method(D_METHOD("is_reloadable"), &GDNativeLibrary::is_reloadable); ClassDB::bind_method(D_METHOD("set_load_once", "load_once"), &GDNativeLibrary::set_load_once); ClassDB::bind_method(D_METHOD("set_singleton", "singleton"), &GDNativeLibrary::set_singleton); ClassDB::bind_method(D_METHOD("set_symbol_prefix", "symbol_prefix"), &GDNativeLibrary::set_symbol_prefix); + ClassDB::bind_method(D_METHOD("set_reloadable", "reloadable"), &GDNativeLibrary::set_reloadable); ADD_PROPERTYNZ(PropertyInfo(Variant::BOOL, "load_once"), "set_load_once", "should_load_once"); ADD_PROPERTYNZ(PropertyInfo(Variant::BOOL, "singleton"), "set_singleton", "is_singleton"); ADD_PROPERTYNZ(PropertyInfo(Variant::STRING, "symbol_prefix"), "set_symbol_prefix", "get_symbol_prefix"); + ADD_PROPERTYNZ(PropertyInfo(Variant::BOOL, "reloadable"), "set_reloadable", "is_reloadable"); } GDNative::GDNative() { @@ -317,9 +327,10 @@ RES GDNativeLibraryResourceLoader::load(const String &p_path, const String &p_or *r_error = err; } - lib->set_singleton(config->get_value("general", "singleton", false)); - lib->set_load_once(config->get_value("general", "load_once", true)); + lib->set_singleton(config->get_value("general", "singleton", default_singleton)); + lib->set_load_once(config->get_value("general", "load_once", default_load_once)); lib->set_symbol_prefix(config->get_value("general", "symbol_prefix", default_symbol_prefix)); + lib->set_reloadable(config->get_value("general", "reloadable", default_reloadable)); String entry_lib_path; { @@ -415,6 +426,7 @@ Error GDNativeLibraryResourceSaver::save(const String &p_path, const RES &p_reso config->set_value("general", "singleton", lib->is_singleton()); config->set_value("general", "load_once", lib->should_load_once()); config->set_value("general", "symbol_prefix", lib->get_symbol_prefix()); + config->set_value("general", "reloadable", lib->is_reloadable()); return config->save(p_path); } diff --git a/modules/gdnative/gdnative.h b/modules/gdnative/gdnative.h index 26c19dcf22..3298ea950f 100644 --- a/modules/gdnative/gdnative.h +++ b/modules/gdnative/gdnative.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef GDNATIVE_H #define GDNATIVE_H @@ -59,6 +60,7 @@ class GDNativeLibrary : public Resource { bool singleton; bool load_once; String symbol_prefix; + bool reloadable; public: GDNativeLibrary(); @@ -86,6 +88,10 @@ public: return symbol_prefix; } + _FORCE_INLINE_ bool is_reloadable() const { + return reloadable; + } + _FORCE_INLINE_ void set_load_once(bool p_load_once) { load_once = p_load_once; } @@ -96,6 +102,10 @@ public: symbol_prefix = p_symbol_prefix; } + _FORCE_INLINE_ void set_reloadable(bool p_reloadable) { + reloadable = p_reloadable; + } + static void _bind_methods(); }; diff --git a/modules/gdnative/gdnative/aabb.cpp b/modules/gdnative/gdnative/aabb.cpp index 706e81a606..0597e1cdd6 100644 --- a/modules/gdnative/gdnative/aabb.cpp +++ b/modules/gdnative/gdnative/aabb.cpp @@ -1,5 +1,5 @@ /*************************************************************************/ -/* aabb.cpp */ +/* aabb.cpp */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "gdnative/aabb.h" #include "core/math/aabb.h" diff --git a/modules/gdnative/gdnative/array.cpp b/modules/gdnative/gdnative/array.cpp index 72020b5361..1fb0ff0500 100644 --- a/modules/gdnative/gdnative/array.cpp +++ b/modules/gdnative/gdnative/array.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "gdnative/array.h" #include "core/array.h" diff --git a/modules/gdnative/gdnative/basis.cpp b/modules/gdnative/gdnative/basis.cpp index 7b9acc6bd0..372bdf3fb1 100644 --- a/modules/gdnative/gdnative/basis.cpp +++ b/modules/gdnative/gdnative/basis.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "gdnative/basis.h" #include "core/math/matrix3.h" diff --git a/modules/gdnative/gdnative/color.cpp b/modules/gdnative/gdnative/color.cpp index 4fd4458bfb..4089f4458a 100644 --- a/modules/gdnative/gdnative/color.cpp +++ b/modules/gdnative/gdnative/color.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "gdnative/color.h" #include "core/color.h" diff --git a/modules/gdnative/gdnative/dictionary.cpp b/modules/gdnative/gdnative/dictionary.cpp index b2ac8e0426..786e614158 100644 --- a/modules/gdnative/gdnative/dictionary.cpp +++ b/modules/gdnative/gdnative/dictionary.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "gdnative/dictionary.h" #include "core/variant.h" diff --git a/modules/gdnative/gdnative/gdnative.cpp b/modules/gdnative/gdnative/gdnative.cpp index 38fb2ee818..041990e137 100644 --- a/modules/gdnative/gdnative/gdnative.cpp +++ b/modules/gdnative/gdnative/gdnative.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "gdnative/gdnative.h" #include "class_db.h" diff --git a/modules/gdnative/gdnative/node_path.cpp b/modules/gdnative/gdnative/node_path.cpp index 8c490709c0..f24facaae8 100644 --- a/modules/gdnative/gdnative/node_path.cpp +++ b/modules/gdnative/gdnative/node_path.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "gdnative/node_path.h" #include "core/node_path.h" diff --git a/modules/gdnative/gdnative/plane.cpp b/modules/gdnative/gdnative/plane.cpp index de272d6f08..be821edcc3 100644 --- a/modules/gdnative/gdnative/plane.cpp +++ b/modules/gdnative/gdnative/plane.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "gdnative/plane.h" #include "core/math/plane.h" diff --git a/modules/gdnative/gdnative/pool_arrays.cpp b/modules/gdnative/gdnative/pool_arrays.cpp index dc24bf4d15..6e014905a3 100644 --- a/modules/gdnative/gdnative/pool_arrays.cpp +++ b/modules/gdnative/gdnative/pool_arrays.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "gdnative/pool_arrays.h" #include "array.h" diff --git a/modules/gdnative/gdnative/quat.cpp b/modules/gdnative/gdnative/quat.cpp index 2f577e485a..56ff7fe3a8 100644 --- a/modules/gdnative/gdnative/quat.cpp +++ b/modules/gdnative/gdnative/quat.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "gdnative/quat.h" #include "core/math/quat.h" diff --git a/modules/gdnative/gdnative/rect2.cpp b/modules/gdnative/gdnative/rect2.cpp index c449a0d14c..83c58db520 100644 --- a/modules/gdnative/gdnative/rect2.cpp +++ b/modules/gdnative/gdnative/rect2.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "gdnative/rect2.h" #include "core/math/math_2d.h" diff --git a/modules/gdnative/gdnative/rid.cpp b/modules/gdnative/gdnative/rid.cpp index fe04f1e92f..4374738f48 100644 --- a/modules/gdnative/gdnative/rid.cpp +++ b/modules/gdnative/gdnative/rid.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "gdnative/rid.h" #include "core/resource.h" diff --git a/modules/gdnative/gdnative/string.cpp b/modules/gdnative/gdnative/string.cpp index a99adb3beb..350dc540f7 100644 --- a/modules/gdnative/gdnative/string.cpp +++ b/modules/gdnative/gdnative/string.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "gdnative/string.h" #include "core/string_db.h" diff --git a/modules/gdnative/gdnative/string_name.cpp b/modules/gdnative/gdnative/string_name.cpp index 86067df433..b2a86b843c 100644 --- a/modules/gdnative/gdnative/string_name.cpp +++ b/modules/gdnative/gdnative/string_name.cpp @@ -1,9 +1,9 @@ /*************************************************************************/ -/* string_name.cpp */ +/* string_name.cpp */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ -/* http://www.godotengine.org */ +/* https://godotengine.org */ /*************************************************************************/ /* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md) */ @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "gdnative/string_name.h" #include "core/string_db.h" diff --git a/modules/gdnative/gdnative/transform.cpp b/modules/gdnative/gdnative/transform.cpp index 4b6589a209..9bd8c99612 100644 --- a/modules/gdnative/gdnative/transform.cpp +++ b/modules/gdnative/gdnative/transform.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "gdnative/transform.h" #include "core/math/transform.h" diff --git a/modules/gdnative/gdnative/transform2d.cpp b/modules/gdnative/gdnative/transform2d.cpp index 0ff5420f4f..c69607a18a 100644 --- a/modules/gdnative/gdnative/transform2d.cpp +++ b/modules/gdnative/gdnative/transform2d.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "gdnative/transform2d.h" #include "core/math/math_2d.h" diff --git a/modules/gdnative/gdnative/variant.cpp b/modules/gdnative/gdnative/variant.cpp index 6447641096..423f3312e1 100644 --- a/modules/gdnative/gdnative/variant.cpp +++ b/modules/gdnative/gdnative/variant.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "gdnative/variant.h" #include "core/reference.h" diff --git a/modules/gdnative/gdnative/vector2.cpp b/modules/gdnative/gdnative/vector2.cpp index aadce281b3..9e40b42373 100644 --- a/modules/gdnative/gdnative/vector2.cpp +++ b/modules/gdnative/gdnative/vector2.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "gdnative/vector2.h" #include "core/math/math_2d.h" diff --git a/modules/gdnative/gdnative/vector3.cpp b/modules/gdnative/gdnative/vector3.cpp index 4de9889c23..a7e18fa22b 100644 --- a/modules/gdnative/gdnative/vector3.cpp +++ b/modules/gdnative/gdnative/vector3.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "gdnative/vector3.h" #include "core/variant.h" diff --git a/modules/gdnative/gdnative_library_editor_plugin.h b/modules/gdnative/gdnative_library_editor_plugin.h index 2b635d0937..94bc2adc7d 100644 --- a/modules/gdnative/gdnative_library_editor_plugin.h +++ b/modules/gdnative/gdnative_library_editor_plugin.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef GDNATIVE_LIBRARY_EDITOR_PLUGIN_H #define GDNATIVE_LIBRARY_EDITOR_PLUGIN_H diff --git a/modules/gdnative/gdnative_library_singleton_editor.cpp b/modules/gdnative/gdnative_library_singleton_editor.cpp index 4c0049f90d..0aafb95e2e 100644 --- a/modules/gdnative/gdnative_library_singleton_editor.cpp +++ b/modules/gdnative/gdnative_library_singleton_editor.cpp @@ -1,5 +1,5 @@ /*************************************************************************/ -/* gdnative_library_singleton_editor.cpp */ +/* gdnative_library_singleton_editor.cpp */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifdef TOOLS_ENABLED #include "gdnative_library_singleton_editor.h" #include "gdnative.h" diff --git a/modules/gdnative/gdnative_library_singleton_editor.h b/modules/gdnative/gdnative_library_singleton_editor.h index d00ddc9211..d3b5ba3846 100644 --- a/modules/gdnative/gdnative_library_singleton_editor.h +++ b/modules/gdnative/gdnative_library_singleton_editor.h @@ -1,5 +1,5 @@ /*************************************************************************/ -/* gdnative_library_singleton_editor.h */ +/* gdnative_library_singleton_editor.h */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef GD_NATIVE_LIBRARY_EDITOR_H #define GD_NATIVE_LIBRARY_EDITOR_H diff --git a/modules/gdnative/include/arvr/godot_arvr.h b/modules/gdnative/include/arvr/godot_arvr.h index fc4626c967..b9aedc0bef 100644 --- a/modules/gdnative/include/arvr/godot_arvr.h +++ b/modules/gdnative/include/arvr/godot_arvr.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef GODOT_NATIVEARVR_H #define GODOT_NATIVEARVR_H diff --git a/modules/gdnative/include/gdnative/aabb.h b/modules/gdnative/include/gdnative/aabb.h index a40061ce2e..dca5d4bb14 100644 --- a/modules/gdnative/include/gdnative/aabb.h +++ b/modules/gdnative/include/gdnative/aabb.h @@ -1,5 +1,5 @@ /*************************************************************************/ -/* aabb.h */ +/* aabb.h */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef GODOT_AABB_H #define GODOT_AABB_H diff --git a/modules/gdnative/include/gdnative/basis.h b/modules/gdnative/include/gdnative/basis.h index ce9ac590d9..53e950b4a2 100644 --- a/modules/gdnative/include/gdnative/basis.h +++ b/modules/gdnative/include/gdnative/basis.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef GODOT_BASIS_H #define GODOT_BASIS_H diff --git a/modules/gdnative/include/gdnative/color.h b/modules/gdnative/include/gdnative/color.h index 14086c1155..1f0ac8354d 100644 --- a/modules/gdnative/include/gdnative/color.h +++ b/modules/gdnative/include/gdnative/color.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef GODOT_COLOR_H #define GODOT_COLOR_H diff --git a/modules/gdnative/include/gdnative/dictionary.h b/modules/gdnative/include/gdnative/dictionary.h index 07ffb3346b..a86d60dc72 100644 --- a/modules/gdnative/include/gdnative/dictionary.h +++ b/modules/gdnative/include/gdnative/dictionary.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef GODOT_DICTIONARY_H #define GODOT_DICTIONARY_H diff --git a/modules/gdnative/include/gdnative/gdnative.h b/modules/gdnative/include/gdnative/gdnative.h index d066df8046..56d3779d34 100644 --- a/modules/gdnative/include/gdnative/gdnative.h +++ b/modules/gdnative/include/gdnative/gdnative.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef GODOT_GDNATIVE_H #define GODOT_GDNATIVE_H diff --git a/modules/gdnative/include/gdnative/node_path.h b/modules/gdnative/include/gdnative/node_path.h index e58c332cdf..2b55e01d13 100644 --- a/modules/gdnative/include/gdnative/node_path.h +++ b/modules/gdnative/include/gdnative/node_path.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef GODOT_NODE_PATH_H #define GODOT_NODE_PATH_H diff --git a/modules/gdnative/include/gdnative/plane.h b/modules/gdnative/include/gdnative/plane.h index d40a76374f..6c8a6ae1a4 100644 --- a/modules/gdnative/include/gdnative/plane.h +++ b/modules/gdnative/include/gdnative/plane.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef GODOT_PLANE_H #define GODOT_PLANE_H diff --git a/modules/gdnative/include/gdnative/pool_arrays.h b/modules/gdnative/include/gdnative/pool_arrays.h index f91bd4694b..69a93725a8 100644 --- a/modules/gdnative/include/gdnative/pool_arrays.h +++ b/modules/gdnative/include/gdnative/pool_arrays.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef GODOT_POOL_ARRAYS_H #define GODOT_POOL_ARRAYS_H diff --git a/modules/gdnative/include/gdnative/quat.h b/modules/gdnative/include/gdnative/quat.h index 3696a303df..4e86960aaf 100644 --- a/modules/gdnative/include/gdnative/quat.h +++ b/modules/gdnative/include/gdnative/quat.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef GODOT_QUAT_H #define GODOT_QUAT_H diff --git a/modules/gdnative/include/gdnative/rect2.h b/modules/gdnative/include/gdnative/rect2.h index 7b223b450e..4adcb73e3d 100644 --- a/modules/gdnative/include/gdnative/rect2.h +++ b/modules/gdnative/include/gdnative/rect2.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef GODOT_RECT2_H #define GODOT_RECT2_H diff --git a/modules/gdnative/include/gdnative/rid.h b/modules/gdnative/include/gdnative/rid.h index effa89bbbd..0942334ee5 100644 --- a/modules/gdnative/include/gdnative/rid.h +++ b/modules/gdnative/include/gdnative/rid.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef GODOT_RID_H #define GODOT_RID_H diff --git a/modules/gdnative/include/gdnative/string.h b/modules/gdnative/include/gdnative/string.h index 90397b0e40..080c0aa171 100644 --- a/modules/gdnative/include/gdnative/string.h +++ b/modules/gdnative/include/gdnative/string.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef GODOT_STRING_H #define GODOT_STRING_H diff --git a/modules/gdnative/include/gdnative/string_name.h b/modules/gdnative/include/gdnative/string_name.h index 287f98d523..5068a3d8f9 100644 --- a/modules/gdnative/include/gdnative/string_name.h +++ b/modules/gdnative/include/gdnative/string_name.h @@ -1,9 +1,9 @@ /*************************************************************************/ -/* string_name.h */ +/* string_name.h */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ -/* http://www.godotengine.org */ +/* https://godotengine.org */ /*************************************************************************/ /* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md) */ @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef GODOT_STRING_NAME_H #define GODOT_STRING_NAME_H diff --git a/modules/gdnative/include/gdnative/transform.h b/modules/gdnative/include/gdnative/transform.h index d5e2e9364f..10a242b205 100644 --- a/modules/gdnative/include/gdnative/transform.h +++ b/modules/gdnative/include/gdnative/transform.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef GODOT_TRANSFORM_H #define GODOT_TRANSFORM_H diff --git a/modules/gdnative/include/gdnative/transform2d.h b/modules/gdnative/include/gdnative/transform2d.h index c92225a110..aed941f139 100644 --- a/modules/gdnative/include/gdnative/transform2d.h +++ b/modules/gdnative/include/gdnative/transform2d.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef GODOT_TRANSFORM2D_H #define GODOT_TRANSFORM2D_H diff --git a/modules/gdnative/include/gdnative/variant.h b/modules/gdnative/include/gdnative/variant.h index af26ab99db..d2e8246bfb 100644 --- a/modules/gdnative/include/gdnative/variant.h +++ b/modules/gdnative/include/gdnative/variant.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef GODOT_VARIANT_H #define GODOT_VARIANT_H diff --git a/modules/gdnative/include/gdnative/vector2.h b/modules/gdnative/include/gdnative/vector2.h index c7e7926b0a..af97524dac 100644 --- a/modules/gdnative/include/gdnative/vector2.h +++ b/modules/gdnative/include/gdnative/vector2.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef GODOT_VECTOR2_H #define GODOT_VECTOR2_H diff --git a/modules/gdnative/include/gdnative/vector3.h b/modules/gdnative/include/gdnative/vector3.h index c117bad380..e0299a8a30 100644 --- a/modules/gdnative/include/gdnative/vector3.h +++ b/modules/gdnative/include/gdnative/vector3.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef GODOT_VECTOR3_H #define GODOT_VECTOR3_H diff --git a/modules/gdnative/include/nativescript/godot_nativescript.h b/modules/gdnative/include/nativescript/godot_nativescript.h index e6fd9d3f84..fdd2a65bb2 100644 --- a/modules/gdnative/include/nativescript/godot_nativescript.h +++ b/modules/gdnative/include/nativescript/godot_nativescript.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef GODOT_NATIVESCRIPT_H #define GODOT_NATIVESCRIPT_H diff --git a/modules/gdnative/include/pluginscript/godot_pluginscript.h b/modules/gdnative/include/pluginscript/godot_pluginscript.h index fca29b67ca..671be3bbb9 100644 --- a/modules/gdnative/include/pluginscript/godot_pluginscript.h +++ b/modules/gdnative/include/pluginscript/godot_pluginscript.h @@ -1,5 +1,5 @@ /*************************************************************************/ -/* godot_nativescript.h */ +/* godot_pluginscript.h */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef GODOT_PLUGINSCRIPT_H #define GODOT_PLUGINSCRIPT_H diff --git a/modules/gdnative/nativescript/api_generator.cpp b/modules/gdnative/nativescript/api_generator.cpp index 687aa66219..4012e821bb 100644 --- a/modules/gdnative/nativescript/api_generator.cpp +++ b/modules/gdnative/nativescript/api_generator.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "api_generator.h" #ifdef TOOLS_ENABLED diff --git a/modules/gdnative/nativescript/api_generator.h b/modules/gdnative/nativescript/api_generator.h index 23fd0377ad..de234b2f0d 100644 --- a/modules/gdnative/nativescript/api_generator.h +++ b/modules/gdnative/nativescript/api_generator.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef API_GENERATOR_H #define API_GENERATOR_H diff --git a/modules/gdnative/nativescript/godot_nativescript.cpp b/modules/gdnative/nativescript/godot_nativescript.cpp index c9434c404e..b4f7e1555e 100644 --- a/modules/gdnative/nativescript/godot_nativescript.cpp +++ b/modules/gdnative/nativescript/godot_nativescript.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "nativescript/godot_nativescript.h" #include "class_db.h" diff --git a/modules/gdnative/nativescript/nativescript.cpp b/modules/gdnative/nativescript/nativescript.cpp index 823d794f72..e9e3180835 100644 --- a/modules/gdnative/nativescript/nativescript.cpp +++ b/modules/gdnative/nativescript/nativescript.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "nativescript.h" #include "gdnative/gdnative.h" @@ -789,8 +790,13 @@ NativeScriptInstance::~NativeScriptInstance() { NativeScriptLanguage *NativeScriptLanguage::singleton; -void NativeScriptLanguage::_unload_stuff() { +void NativeScriptLanguage::_unload_stuff(bool p_reload) { for (Map<String, Map<StringName, NativeScriptDesc> >::Element *L = library_classes.front(); L; L = L->next()) { + + if (p_reload && !library_gdnatives[L->key()]->get_library()->is_reloadable()) { + continue; + } + for (Map<StringName, NativeScriptDesc>::Element *C = L->get().front(); C; C = C->next()) { // free property stuff first @@ -1107,10 +1113,16 @@ void NativeReloadNode::_notification(int p_what) { #ifndef NO_THREADS MutexLock lock(NSL->mutex); #endif - NSL->_unload_stuff(); + NSL->_unload_stuff(true); for (Map<String, Ref<GDNative> >::Element *L = NSL->library_gdnatives.front(); L; L = L->next()) { - L->get()->terminate(); + Ref<GDNative> gdn = L->get(); + + if (!gdn->get_library()->is_reloadable()) { + continue; + } + + gdn->terminate(); NSL->library_classes.erase(L->key()); } @@ -1128,21 +1140,23 @@ void NativeReloadNode::_notification(int p_what) { Set<StringName> libs_to_remove; for (Map<String, Ref<GDNative> >::Element *L = NSL->library_gdnatives.front(); L; L = L->next()) { - if (!L->get()->initialize()) { + Ref<GDNative> gdn = L->get(); + + if (!gdn->get_library()->is_reloadable()) { + continue; + } + + if (!gdn->initialize()) { libs_to_remove.insert(L->key()); continue; } NSL->library_classes.insert(L->key(), Map<StringName, NativeScriptDesc>()); - void *args[1] = { - (void *)&L->key() - }; - // here the library registers all the classes and stuff. void *proc_ptr; - Error err = L->get()->get_symbol(L->get()->get_library()->get_symbol_prefix() + "nativescript_init", proc_ptr); + Error err = gdn->get_symbol(gdn->get_library()->get_symbol_prefix() + "nativescript_init", proc_ptr); if (err != OK) { ERR_PRINT(String("No godot_nativescript_init in \"" + L->key() + "\" found").utf8().get_data()); } else { diff --git a/modules/gdnative/nativescript/nativescript.h b/modules/gdnative/nativescript/nativescript.h index 5eefdf1567..ac94c84bc4 100644 --- a/modules/gdnative/nativescript/nativescript.h +++ b/modules/gdnative/nativescript/nativescript.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef NATIVE_SCRIPT_H #define NATIVE_SCRIPT_H @@ -204,7 +205,7 @@ class NativeScriptLanguage : public ScriptLanguage { private: static NativeScriptLanguage *singleton; - void _unload_stuff(); + void _unload_stuff(bool p_reload = false); #ifndef NO_THREADS Mutex *mutex; diff --git a/modules/gdnative/nativescript/register_types.cpp b/modules/gdnative/nativescript/register_types.cpp index d7d2c11d54..cb55a13b3e 100644 --- a/modules/gdnative/nativescript/register_types.cpp +++ b/modules/gdnative/nativescript/register_types.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "register_types.h" #include "io/resource_loader.h" diff --git a/modules/gdnative/nativescript/register_types.h b/modules/gdnative/nativescript/register_types.h index 66cd4c33bb..7389010f8e 100644 --- a/modules/gdnative/nativescript/register_types.h +++ b/modules/gdnative/nativescript/register_types.h @@ -27,5 +27,6 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + void register_nativescript_types(); void unregister_nativescript_types(); diff --git a/modules/gdnative/pluginscript/pluginscript_instance.cpp b/modules/gdnative/pluginscript/pluginscript_instance.cpp index c9e7c60399..52d112bc93 100644 --- a/modules/gdnative/pluginscript/pluginscript_instance.cpp +++ b/modules/gdnative/pluginscript/pluginscript_instance.cpp @@ -3,7 +3,7 @@ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ -/* http://www.godotengine.org */ +/* https://godotengine.org */ /*************************************************************************/ /* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md) */ diff --git a/modules/gdnative/pluginscript/pluginscript_instance.h b/modules/gdnative/pluginscript/pluginscript_instance.h index 7848739d9b..3c7b360ad9 100644 --- a/modules/gdnative/pluginscript/pluginscript_instance.h +++ b/modules/gdnative/pluginscript/pluginscript_instance.h @@ -3,7 +3,7 @@ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ -/* http://www.godotengine.org */ +/* https://godotengine.org */ /*************************************************************************/ /* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md) */ diff --git a/modules/gdnative/pluginscript/pluginscript_language.cpp b/modules/gdnative/pluginscript/pluginscript_language.cpp index 382b28a0bb..2405afc677 100644 --- a/modules/gdnative/pluginscript/pluginscript_language.cpp +++ b/modules/gdnative/pluginscript/pluginscript_language.cpp @@ -3,7 +3,7 @@ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ -/* http://www.godotengine.org */ +/* https://godotengine.org */ /*************************************************************************/ /* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md) */ diff --git a/modules/gdnative/pluginscript/pluginscript_language.h b/modules/gdnative/pluginscript/pluginscript_language.h index 5bbd3507e3..709345885b 100644 --- a/modules/gdnative/pluginscript/pluginscript_language.h +++ b/modules/gdnative/pluginscript/pluginscript_language.h @@ -3,7 +3,7 @@ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ -/* http://www.godotengine.org */ +/* https://godotengine.org */ /*************************************************************************/ /* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md) */ diff --git a/modules/gdnative/pluginscript/pluginscript_loader.cpp b/modules/gdnative/pluginscript/pluginscript_loader.cpp index 62ba41a24e..acba297fa0 100644 --- a/modules/gdnative/pluginscript/pluginscript_loader.cpp +++ b/modules/gdnative/pluginscript/pluginscript_loader.cpp @@ -3,7 +3,7 @@ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ -/* http://www.godotengine.org */ +/* https://godotengine.org */ /*************************************************************************/ /* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md) */ diff --git a/modules/gdnative/pluginscript/pluginscript_loader.h b/modules/gdnative/pluginscript/pluginscript_loader.h index 5e59d25d75..9276ea3ef9 100644 --- a/modules/gdnative/pluginscript/pluginscript_loader.h +++ b/modules/gdnative/pluginscript/pluginscript_loader.h @@ -3,7 +3,7 @@ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ -/* http://www.godotengine.org */ +/* https://godotengine.org */ /*************************************************************************/ /* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md) */ diff --git a/modules/gdnative/pluginscript/pluginscript_script.cpp b/modules/gdnative/pluginscript/pluginscript_script.cpp index 876719820b..b4525ff8aa 100644 --- a/modules/gdnative/pluginscript/pluginscript_script.cpp +++ b/modules/gdnative/pluginscript/pluginscript_script.cpp @@ -3,7 +3,7 @@ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ -/* http://www.godotengine.org */ +/* https://godotengine.org */ /*************************************************************************/ /* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md) */ diff --git a/modules/gdnative/pluginscript/pluginscript_script.h b/modules/gdnative/pluginscript/pluginscript_script.h index 9928e115ea..6b343ad844 100644 --- a/modules/gdnative/pluginscript/pluginscript_script.h +++ b/modules/gdnative/pluginscript/pluginscript_script.h @@ -3,7 +3,7 @@ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ -/* http://www.godotengine.org */ +/* https://godotengine.org */ /*************************************************************************/ /* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md) */ diff --git a/modules/gdnative/pluginscript/register_types.cpp b/modules/gdnative/pluginscript/register_types.cpp index b7c8b6f536..8888f9e157 100644 --- a/modules/gdnative/pluginscript/register_types.cpp +++ b/modules/gdnative/pluginscript/register_types.cpp @@ -3,7 +3,7 @@ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ -/* http://www.godotengine.org */ +/* https://godotengine.org */ /*************************************************************************/ /* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md) */ @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "register_types.h" #include "core/project_settings.h" diff --git a/modules/gdnative/pluginscript/register_types.h b/modules/gdnative/pluginscript/register_types.h index be2b1ca4c8..76651aa986 100644 --- a/modules/gdnative/pluginscript/register_types.h +++ b/modules/gdnative/pluginscript/register_types.h @@ -3,7 +3,7 @@ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ -/* http://www.godotengine.org */ +/* https://godotengine.org */ /*************************************************************************/ /* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md) */ @@ -27,5 +27,6 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + void register_pluginscript_types(); void unregister_pluginscript_types(); diff --git a/modules/gdnative/register_types.cpp b/modules/gdnative/register_types.cpp index 21330dfefd..a0b6fbeb75 100644 --- a/modules/gdnative/register_types.cpp +++ b/modules/gdnative/register_types.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "register_types.h" #include "gdnative/gdnative.h" diff --git a/modules/gdnative/register_types.h b/modules/gdnative/register_types.h index 39d47dccb0..4549687f55 100644 --- a/modules/gdnative/register_types.h +++ b/modules/gdnative/register_types.h @@ -27,5 +27,6 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + void register_gdnative_types(); void unregister_gdnative_types(); diff --git a/modules/gdscript/gdscript.cpp b/modules/gdscript/gdscript.cpp index 11c13ce2ea..228c7dc56f 100644 --- a/modules/gdscript/gdscript.cpp +++ b/modules/gdscript/gdscript.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "gdscript.h" #include "engine.h" diff --git a/modules/gdscript/gdscript.h b/modules/gdscript/gdscript.h index d669fd6664..b5bbaa6dc9 100644 --- a/modules/gdscript/gdscript.h +++ b/modules/gdscript/gdscript.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef GDSCRIPT_H #define GDSCRIPT_H diff --git a/modules/gdscript/gdscript_compiler.cpp b/modules/gdscript/gdscript_compiler.cpp index 360cce9ca0..f380bedf7f 100644 --- a/modules/gdscript/gdscript_compiler.cpp +++ b/modules/gdscript/gdscript_compiler.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "gdscript_compiler.h" #include "gdscript.h" diff --git a/modules/gdscript/gdscript_compiler.h b/modules/gdscript/gdscript_compiler.h index 4b35898bb0..62aafdbe01 100644 --- a/modules/gdscript/gdscript_compiler.h +++ b/modules/gdscript/gdscript_compiler.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef GDSCRIPT_COMPILER_H #define GDSCRIPT_COMPILER_H diff --git a/modules/gdscript/gdscript_editor.cpp b/modules/gdscript/gdscript_editor.cpp index 9dcaaf828f..bcfe8525b4 100644 --- a/modules/gdscript/gdscript_editor.cpp +++ b/modules/gdscript/gdscript_editor.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "gdscript.h" #include "core/engine.h" diff --git a/modules/gdscript/gdscript_function.cpp b/modules/gdscript/gdscript_function.cpp index 3023b489e5..a2f449909f 100644 --- a/modules/gdscript/gdscript_function.cpp +++ b/modules/gdscript/gdscript_function.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "gdscript_function.h" #include "gdscript.h" diff --git a/modules/gdscript/gdscript_function.h b/modules/gdscript/gdscript_function.h index e499820954..9310444c7a 100644 --- a/modules/gdscript/gdscript_function.h +++ b/modules/gdscript/gdscript_function.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef GDSCRIPT_FUNCTION_H #define GDSCRIPT_FUNCTION_H diff --git a/modules/gdscript/gdscript_functions.cpp b/modules/gdscript/gdscript_functions.cpp index cae3bcadfe..f15f2197da 100644 --- a/modules/gdscript/gdscript_functions.cpp +++ b/modules/gdscript/gdscript_functions.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "gdscript_functions.h" #include "class_db.h" diff --git a/modules/gdscript/gdscript_functions.h b/modules/gdscript/gdscript_functions.h index 5bbd848339..1d54006084 100644 --- a/modules/gdscript/gdscript_functions.h +++ b/modules/gdscript/gdscript_functions.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef GDSCRIPT_FUNCTIONS_H #define GDSCRIPT_FUNCTIONS_H diff --git a/modules/gdscript/gdscript_parser.cpp b/modules/gdscript/gdscript_parser.cpp index 4b3feb49b9..2a6d37812e 100644 --- a/modules/gdscript/gdscript_parser.cpp +++ b/modules/gdscript/gdscript_parser.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "gdscript_parser.h" #include "gdscript.h" diff --git a/modules/gdscript/gdscript_parser.h b/modules/gdscript/gdscript_parser.h index 1b851434db..485ba1263d 100644 --- a/modules/gdscript/gdscript_parser.h +++ b/modules/gdscript/gdscript_parser.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef GDSCRIPT_PARSER_H #define GDSCRIPT_PARSER_H diff --git a/modules/gdscript/gdscript_tokenizer.cpp b/modules/gdscript/gdscript_tokenizer.cpp index 281aa6ca44..6a844cd651 100644 --- a/modules/gdscript/gdscript_tokenizer.cpp +++ b/modules/gdscript/gdscript_tokenizer.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "gdscript_tokenizer.h" #include "gdscript_functions.h" diff --git a/modules/gdscript/gdscript_tokenizer.h b/modules/gdscript/gdscript_tokenizer.h index 9a09058cf3..b020c85199 100644 --- a/modules/gdscript/gdscript_tokenizer.h +++ b/modules/gdscript/gdscript_tokenizer.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef GDSCRIPT_TOKENIZER_H #define GDSCRIPT_TOKENIZER_H diff --git a/modules/gdscript/register_types.cpp b/modules/gdscript/register_types.cpp index 50f5da9995..95efcda80f 100644 --- a/modules/gdscript/register_types.cpp +++ b/modules/gdscript/register_types.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "register_types.h" #include "gdscript.h" diff --git a/modules/gdscript/register_types.h b/modules/gdscript/register_types.h index 21ad85f12e..2b88a67c7e 100644 --- a/modules/gdscript/register_types.h +++ b/modules/gdscript/register_types.h @@ -27,5 +27,6 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + void register_gdscript_types(); void unregister_gdscript_types(); diff --git a/modules/gridmap/grid_map.cpp b/modules/gridmap/grid_map.cpp index 9a03bc410a..e8e9419af8 100644 --- a/modules/gridmap/grid_map.cpp +++ b/modules/gridmap/grid_map.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "grid_map.h" #include "message_queue.h" #include "scene/3d/light.h" diff --git a/modules/gridmap/grid_map.h b/modules/gridmap/grid_map.h index 7b97fe3183..b17fe43ae8 100644 --- a/modules/gridmap/grid_map.h +++ b/modules/gridmap/grid_map.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef GRID_MAP_H #define GRID_MAP_H diff --git a/modules/gridmap/grid_map_editor_plugin.cpp b/modules/gridmap/grid_map_editor_plugin.cpp index dc7dbb0b0d..7b7bc0fa2a 100644 --- a/modules/gridmap/grid_map_editor_plugin.cpp +++ b/modules/gridmap/grid_map_editor_plugin.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "grid_map_editor_plugin.h" #include "editor/editor_scale.h" #include "editor/editor_settings.h" diff --git a/modules/gridmap/grid_map_editor_plugin.h b/modules/gridmap/grid_map_editor_plugin.h index a49b44e7a2..3fc92bf7aa 100644 --- a/modules/gridmap/grid_map_editor_plugin.h +++ b/modules/gridmap/grid_map_editor_plugin.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef GRID_MAP_EDITOR_PLUGIN_H #define GRID_MAP_EDITOR_PLUGIN_H diff --git a/modules/gridmap/register_types.cpp b/modules/gridmap/register_types.cpp index 23a8d16497..a3ceea10af 100644 --- a/modules/gridmap/register_types.cpp +++ b/modules/gridmap/register_types.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "register_types.h" #ifndef _3D_DISABLED #include "class_db.h" diff --git a/modules/gridmap/register_types.h b/modules/gridmap/register_types.h index 0e19f1ce8d..4ff107bec8 100644 --- a/modules/gridmap/register_types.h +++ b/modules/gridmap/register_types.h @@ -27,5 +27,6 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + void register_gridmap_types(); void unregister_gridmap_types(); diff --git a/modules/hdr/image_loader_hdr.cpp b/modules/hdr/image_loader_hdr.cpp index 2b829ef246..3cc362b5d6 100644 --- a/modules/hdr/image_loader_hdr.cpp +++ b/modules/hdr/image_loader_hdr.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "image_loader_hdr.h" #include "os/os.h" diff --git a/modules/hdr/image_loader_hdr.h b/modules/hdr/image_loader_hdr.h index 4d4edc4df7..3cce483745 100644 --- a/modules/hdr/image_loader_hdr.h +++ b/modules/hdr/image_loader_hdr.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef IMAGE_LOADER_HDR_H #define IMAGE_LOADER_HDR_H diff --git a/modules/hdr/register_types.cpp b/modules/hdr/register_types.cpp index 469fdfc85e..8688daad69 100644 --- a/modules/hdr/register_types.cpp +++ b/modules/hdr/register_types.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "register_types.h" #include "image_loader_hdr.h" diff --git a/modules/hdr/register_types.h b/modules/hdr/register_types.h index b3f69405f2..e064f5d945 100644 --- a/modules/hdr/register_types.h +++ b/modules/hdr/register_types.h @@ -27,5 +27,6 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + void register_hdr_types(); void unregister_hdr_types(); diff --git a/modules/jpg/image_loader_jpegd.cpp b/modules/jpg/image_loader_jpegd.cpp index b90d968753..0168be3a26 100644 --- a/modules/jpg/image_loader_jpegd.cpp +++ b/modules/jpg/image_loader_jpegd.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "image_loader_jpegd.h" #include "os/os.h" diff --git a/modules/jpg/image_loader_jpegd.h b/modules/jpg/image_loader_jpegd.h index b4bcb11239..3e3ac5217f 100644 --- a/modules/jpg/image_loader_jpegd.h +++ b/modules/jpg/image_loader_jpegd.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef IMAGE_LOADER_JPG_H #define IMAGE_LOADER_JPG_H diff --git a/modules/jpg/register_types.cpp b/modules/jpg/register_types.cpp index 809c934be4..450ac065f4 100644 --- a/modules/jpg/register_types.cpp +++ b/modules/jpg/register_types.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "register_types.h" #include "image_loader_jpegd.h" diff --git a/modules/jpg/register_types.h b/modules/jpg/register_types.h index d38fb908d3..6f10c18c12 100644 --- a/modules/jpg/register_types.h +++ b/modules/jpg/register_types.h @@ -27,5 +27,6 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + void register_jpg_types(); void unregister_jpg_types(); diff --git a/modules/mobile_vr/mobile_interface.cpp b/modules/mobile_vr/mobile_interface.cpp index 4e8894f9fb..07a81e07b0 100644 --- a/modules/mobile_vr/mobile_interface.cpp +++ b/modules/mobile_vr/mobile_interface.cpp @@ -3,7 +3,7 @@ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ -/* http://www.godotengine.org */ +/* https://godotengine.org */ /*************************************************************************/ /* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md) */ diff --git a/modules/mobile_vr/mobile_interface.h b/modules/mobile_vr/mobile_interface.h index 4a2484667d..bb84281b46 100644 --- a/modules/mobile_vr/mobile_interface.h +++ b/modules/mobile_vr/mobile_interface.h @@ -3,7 +3,7 @@ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ -/* http://www.godotengine.org */ +/* https://godotengine.org */ /*************************************************************************/ /* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md) */ @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef MOBILE_VR_INTERFACE_H #define MOBILE_VR_INTERFACE_H diff --git a/modules/mobile_vr/register_types.cpp b/modules/mobile_vr/register_types.cpp index 6a513607fa..0655727a4a 100644 --- a/modules/mobile_vr/register_types.cpp +++ b/modules/mobile_vr/register_types.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "register_types.h" #include "mobile_interface.h" diff --git a/modules/mobile_vr/register_types.h b/modules/mobile_vr/register_types.h index d9625d1bba..621f8dea80 100644 --- a/modules/mobile_vr/register_types.h +++ b/modules/mobile_vr/register_types.h @@ -27,5 +27,6 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + void register_mobile_vr_types(); void unregister_mobile_vr_types(); diff --git a/modules/mono/csharp_script.cpp b/modules/mono/csharp_script.cpp index f95a3dab2d..949c636050 100644 --- a/modules/mono/csharp_script.cpp +++ b/modules/mono/csharp_script.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "csharp_script.h" #include <mono/metadata/threads.h> @@ -913,19 +914,23 @@ bool CSharpInstance::set(const StringName &p_name, const Variant &p_value) { ERR_FAIL_COND_V(!script.is_valid(), false); + MonoObject *mono_object = get_mono_object(); + ERR_FAIL_NULL_V(mono_object, false); + GDMonoClass *top = script->script_class; while (top && top != script->native) { GDMonoField *field = script->script_class->get_field(p_name); if (field) { - MonoObject *mono_object = get_mono_object(); - - ERR_EXPLAIN("Reference has been garbage collected?"); - ERR_FAIL_NULL_V(mono_object, false); + field->set_value_from_variant(mono_object, p_value); + return true; + } - field->set_value(mono_object, p_value); + GDMonoProperty *property = script->script_class->get_property(p_name); + if (property) { + property->set_value(mono_object, GDMonoMarshal::variant_to_mono_object(p_value)); return true; } @@ -934,16 +939,15 @@ bool CSharpInstance::set(const StringName &p_name, const Variant &p_value) { // Call _set - Variant name = p_name; - const Variant *args[2] = { &name, &p_value }; - - MonoObject *mono_object = get_mono_object(); top = script->script_class; while (top && top != script->native) { GDMonoMethod *method = top->get_method(CACHED_STRING_NAME(_set), 2); if (method) { + Variant name = p_name; + const Variant *args[2] = { &name, &p_value }; + MonoObject *ret = method->invoke(mono_object, args); if (ret && GDMonoMarshal::unbox<MonoBoolean>(ret) == true) @@ -960,31 +964,49 @@ bool CSharpInstance::get(const StringName &p_name, Variant &r_ret) const { ERR_FAIL_COND_V(!script.is_valid(), false); + MonoObject *mono_object = get_mono_object(); + ERR_FAIL_NULL_V(mono_object, false); + GDMonoClass *top = script->script_class; while (top && top != script->native) { GDMonoField *field = top->get_field(p_name); if (field) { - MonoObject *mono_object = get_mono_object(); - - ERR_EXPLAIN("Reference has been garbage collected?"); - ERR_FAIL_NULL_V(mono_object, false); - MonoObject *value = field->get_value(mono_object); r_ret = GDMonoMarshal::mono_object_to_variant(value, field->get_type()); return true; } - // Call _get + GDMonoProperty *property = top->get_property(p_name); + + if (property) { + MonoObject *exc = NULL; + MonoObject *value = property->get_value(mono_object, &exc); + if (exc) { + r_ret = Variant(); + GDMonoUtils::print_unhandled_exception(exc); + } else { + r_ret = GDMonoMarshal::mono_object_to_variant(value, property->get_type()); + } + return true; + } + top = top->get_parent_class(); + } + + // Call _get + + top = script->script_class; + + while (top && top != script->native) { GDMonoMethod *method = top->get_method(CACHED_STRING_NAME(_get), 1); if (method) { Variant name = p_name; const Variant *args[1] = { &name }; - MonoObject *ret = method->invoke(get_mono_object(), args); + MonoObject *ret = method->invoke(mono_object, args); if (ret) { r_ret = GDMonoMarshal::mono_object_to_variant(ret); @@ -1186,6 +1208,20 @@ bool CSharpInstance::refcount_decremented() { return ref_dying; } +ScriptInstance::RPCMode CSharpInstance::_member_get_rpc_mode(GDMonoClassMember *p_member) const { + + if (p_member->has_attribute(CACHED_CLASS(RemoteAttribute))) + return RPC_MODE_REMOTE; + if (p_member->has_attribute(CACHED_CLASS(SyncAttribute))) + return RPC_MODE_SYNC; + if (p_member->has_attribute(CACHED_CLASS(MasterAttribute))) + return RPC_MODE_MASTER; + if (p_member->has_attribute(CACHED_CLASS(SlaveAttribute))) + return RPC_MODE_SLAVE; + + return RPC_MODE_DISABLED; +} + ScriptInstance::RPCMode CSharpInstance::get_rpc_mode(const StringName &p_method) const { GDMonoClass *top = script->script_class; @@ -1193,17 +1229,8 @@ ScriptInstance::RPCMode CSharpInstance::get_rpc_mode(const StringName &p_method) while (top && top != script->native) { GDMonoMethod *method = top->get_method(p_method); - if (method) { // TODO should we reject static methods? - // TODO cache result - if (method->has_attribute(CACHED_CLASS(RemoteAttribute))) - return RPC_MODE_REMOTE; - if (method->has_attribute(CACHED_CLASS(SyncAttribute))) - return RPC_MODE_SYNC; - if (method->has_attribute(CACHED_CLASS(MasterAttribute))) - return RPC_MODE_MASTER; - if (method->has_attribute(CACHED_CLASS(SlaveAttribute))) - return RPC_MODE_SLAVE; - } + if (method && !method->is_static()) + return _member_get_rpc_mode(method); top = top->get_parent_class(); } @@ -1218,17 +1245,13 @@ ScriptInstance::RPCMode CSharpInstance::get_rset_mode(const StringName &p_variab while (top && top != script->native) { GDMonoField *field = top->get_field(p_variable); - if (field) { // TODO should we reject static fields? - // TODO cache result - if (field->has_attribute(CACHED_CLASS(RemoteAttribute))) - return RPC_MODE_REMOTE; - if (field->has_attribute(CACHED_CLASS(SyncAttribute))) - return RPC_MODE_SYNC; - if (field->has_attribute(CACHED_CLASS(MasterAttribute))) - return RPC_MODE_MASTER; - if (field->has_attribute(CACHED_CLASS(SlaveAttribute))) - return RPC_MODE_SLAVE; - } + if (field && !field->is_static()) + return _member_get_rpc_mode(field); + + GDMonoProperty *property = top->get_property(p_variable); + + if (property && !property->is_static()) + return _member_get_rpc_mode(property); top = top->get_parent_class(); } @@ -1353,7 +1376,7 @@ bool CSharpScript::_update_exports() { // We are creating a temporary new instance of the class here to get the default value // TODO Workaround. Should be replaced with IL opcodes analysis - MonoObject *tmp_object = mono_object_new(SCRIPTS_DOMAIN, script_class->get_raw()); + MonoObject *tmp_object = mono_object_new(SCRIPTS_DOMAIN, script_class->get_mono_ptr()); if (tmp_object) { CACHED_FIELD(GodotObject, ptr)->set_value_raw(tmp_object, tmp_object); // FIXME WTF is this workaround @@ -1376,65 +1399,55 @@ bool CSharpScript::_update_exports() { GDMonoClass *top = script_class; while (top && top != native) { + PropertyInfo prop_info; + bool exported; + const Vector<GDMonoField *> &fields = top->get_all_fields(); for (int i = fields.size() - 1; i >= 0; i--) { GDMonoField *field = fields[i]; - if (field->is_static()) { - if (field->has_attribute(CACHED_CLASS(ExportAttribute))) - ERR_PRINTS("Cannot export field because it is static: " + top->get_full_name() + "." + field->get_name()); - continue; - } - - String name = field->get_name(); - StringName cname = name; + if (_get_member_export(top, field, prop_info, exported)) { + StringName name = field->get_name(); - if (member_info.has(cname)) - continue; + if (exported) { + member_info[name] = prop_info; + exported_members_cache.push_front(prop_info); - ManagedType field_type = field->get_type(); - Variant::Type type = GDMonoMarshal::managed_to_variant_type(field_type); + if (tmp_object) { + exported_members_defval_cache[name] = GDMonoMarshal::mono_object_to_variant(field->get_value(tmp_object)); + } + } else { + member_info[name] = prop_info; + } + } + } - if (field->has_attribute(CACHED_CLASS(ExportAttribute))) { - // Field has Export attribute - MonoObject *attr = field->get_attribute(CACHED_CLASS(ExportAttribute)); + const Vector<GDMonoProperty *> &properties = top->get_all_properties(); - PropertyHint hint; - String hint_string; + for (int i = properties.size() - 1; i >= 0; i--) { + GDMonoProperty *property = properties[i]; - if (type == Variant::NIL) { - ERR_PRINTS("Unknown type of exported field: " + top->get_full_name() + "." + field->get_name()); - continue; - } else if (type == Variant::INT && field_type.type_encoding == MONO_TYPE_VALUETYPE && mono_class_is_enum(field_type.type_class->get_raw())) { - type = Variant::INT; - hint = PROPERTY_HINT_ENUM; + if (_get_member_export(top, property, prop_info, exported)) { + StringName name = property->get_name(); - Vector<MonoClassField *> fields = field_type.type_class->get_enum_fields(); + if (exported) { + member_info[name] = prop_info; + exported_members_cache.push_front(prop_info); - for (int i = 0; i < fields.size(); i++) { - if (i > 0) - hint_string += ","; - hint_string += mono_field_get_name(fields[i]); + if (tmp_object) { + MonoObject *exc = NULL; + MonoObject *ret = property->get_value(tmp_object, &exc); + if (exc) { + exported_members_defval_cache[name] = Variant(); + GDMonoUtils::print_unhandled_exception(exc); + } else { + exported_members_defval_cache[name] = GDMonoMarshal::mono_object_to_variant(ret); + } } - } else if (type == Variant::OBJECT && CACHED_CLASS(GodotReference)->is_assignable_from(field_type.type_class)) { - hint = PROPERTY_HINT_RESOURCE_TYPE; - hint_string = NATIVE_GDMONOCLASS_NAME(field_type.type_class); } else { - hint = PropertyHint(CACHED_FIELD(ExportAttribute, hint)->get_int_value(attr)); - hint_string = CACHED_FIELD(ExportAttribute, hintString)->get_string_value(attr); + member_info[name] = prop_info; } - - PropertyInfo prop_info = PropertyInfo(type, name, hint, hint_string, PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_SCRIPT_VARIABLE); - - member_info[cname] = prop_info; - exported_members_cache.push_front(prop_info); - - if (tmp_object) { - exported_members_defval_cache[cname] = GDMonoMarshal::mono_object_to_variant(field->get_value(tmp_object)); - } - } else { - member_info[cname] = PropertyInfo(type, name, PROPERTY_HINT_NONE, "", PROPERTY_USAGE_SCRIPT_VARIABLE); } } @@ -1458,6 +1471,77 @@ bool CSharpScript::_update_exports() { return false; } +bool CSharpScript::_get_member_export(GDMonoClass *p_class, GDMonoClassMember *p_member, PropertyInfo &r_prop_info, bool &r_exported) { + + StringName name = p_member->get_name(); + + if (p_member->is_static()) { + if (p_member->has_attribute(CACHED_CLASS(ExportAttribute))) + ERR_PRINTS("Cannot export member because it is static: " + p_class->get_full_name() + "." + name.operator String()); + return false; + } + + if (member_info.has(name)) + return false; + + ManagedType type; + + if (p_member->get_member_type() == GDMonoClassMember::MEMBER_TYPE_FIELD) { + type = static_cast<GDMonoField *>(p_member)->get_type(); + } else if (p_member->get_member_type() == GDMonoClassMember::MEMBER_TYPE_PROPERTY) { + type = static_cast<GDMonoProperty *>(p_member)->get_type(); + } else { + CRASH_NOW(); + } + + Variant::Type variant_type = GDMonoMarshal::managed_to_variant_type(type); + + if (p_member->has_attribute(CACHED_CLASS(ExportAttribute))) { + if (p_member->get_member_type() == GDMonoClassMember::MEMBER_TYPE_PROPERTY) { + GDMonoProperty *property = static_cast<GDMonoProperty *>(p_member); + if (!property->has_getter() || !property->has_setter()) { + ERR_PRINTS("Cannot export property because it does not provide a getter or a setter: " + p_class->get_full_name() + "." + name.operator String()); + return false; + } + } + + MonoObject *attr = p_member->get_attribute(CACHED_CLASS(ExportAttribute)); + + PropertyHint hint; + String hint_string; + + if (variant_type == Variant::NIL) { + ERR_PRINTS("Unknown type of exported member: " + p_class->get_full_name() + "." + name.operator String()); + return false; + } else if (variant_type == Variant::INT && type.type_encoding == MONO_TYPE_VALUETYPE && mono_class_is_enum(type.type_class->get_mono_ptr())) { + variant_type = Variant::INT; + hint = PROPERTY_HINT_ENUM; + + Vector<MonoClassField *> fields = type.type_class->get_enum_fields(); + + for (int i = 0; i < fields.size(); i++) { + if (i > 0) + hint_string += ","; + hint_string += mono_field_get_name(fields[i]); + } + } else if (variant_type == Variant::OBJECT && CACHED_CLASS(GodotReference)->is_assignable_from(type.type_class)) { + hint = PROPERTY_HINT_RESOURCE_TYPE; + hint_string = NATIVE_GDMONOCLASS_NAME(type.type_class); + } else { + hint = PropertyHint(CACHED_FIELD(ExportAttribute, hint)->get_int_value(attr)); + hint_string = CACHED_FIELD(ExportAttribute, hintString)->get_string_value(attr); + } + + r_prop_info = PropertyInfo(variant_type, name.operator String(), hint, hint_string, PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_SCRIPT_VARIABLE); + r_exported = true; + } else { + r_prop_info = PropertyInfo(variant_type, name.operator String(), PROPERTY_HINT_NONE, "", PROPERTY_USAGE_SCRIPT_VARIABLE); + r_exported = false; + } + + return true; +} + void CSharpScript::_clear() { tool = false; @@ -1626,7 +1710,7 @@ CSharpInstance *CSharpScript::_create_instance(const Variant **p_args, int p_arg /* STEP 2, INITIALIZE AND CONSTRUCT */ - MonoObject *mono_object = mono_object_new(SCRIPTS_DOMAIN, script_class->get_raw()); + MonoObject *mono_object = mono_object_new(SCRIPTS_DOMAIN, script_class->get_mono_ptr()); if (!mono_object) { instance->script = Ref<CSharpScript>(); diff --git a/modules/mono/csharp_script.h b/modules/mono/csharp_script.h index 27e68a7a56..171601f3d8 100644 --- a/modules/mono/csharp_script.h +++ b/modules/mono/csharp_script.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef CSHARP_SCRIPT_H #define CSHARP_SCRIPT_H @@ -104,6 +105,8 @@ class CSharpScript : public Script { void _clear(); bool _update_exports(); + bool _get_member_export(GDMonoClass *p_class, GDMonoClassMember *p_member, PropertyInfo &r_prop_info, bool &r_exported); + CSharpInstance *_create_instance(const Variant **p_args, int p_argcount, Object *p_owner, bool p_isref, Variant::CallError &r_error); Variant _new(const Variant **p_args, int p_argcount, Variant::CallError &r_error); @@ -178,6 +181,8 @@ class CSharpInstance : public ScriptInstance { void _call_multilevel(MonoObject *p_mono_object, const StringName &p_method, const Variant **p_args, int p_argcount); + RPCMode _member_get_rpc_mode(GDMonoClassMember *p_member) const; + public: MonoObject *get_mono_object() const; diff --git a/modules/mono/editor/bindings_generator.cpp b/modules/mono/editor/bindings_generator.cpp index 0e41e00f30..2205ac4e98 100644 --- a/modules/mono/editor/bindings_generator.cpp +++ b/modules/mono/editor/bindings_generator.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "bindings_generator.h" #ifdef DEBUG_METHODS_ENABLED diff --git a/modules/mono/editor/bindings_generator.h b/modules/mono/editor/bindings_generator.h index 9da7add867..717a6b7a6b 100644 --- a/modules/mono/editor/bindings_generator.h +++ b/modules/mono/editor/bindings_generator.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef BINDINGS_GENERATOR_H #define BINDINGS_GENERATOR_H diff --git a/modules/mono/editor/csharp_project.cpp b/modules/mono/editor/csharp_project.cpp index 89e72e5c4b..e4269b0aec 100644 --- a/modules/mono/editor/csharp_project.cpp +++ b/modules/mono/editor/csharp_project.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "csharp_project.h" #include "os/os.h" diff --git a/modules/mono/editor/csharp_project.h b/modules/mono/editor/csharp_project.h index 59277664b2..381dd17e02 100644 --- a/modules/mono/editor/csharp_project.h +++ b/modules/mono/editor/csharp_project.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef CSHARP_PROJECT_H #define CSHARP_PROJECT_H diff --git a/modules/mono/editor/godotsharp_builds.cpp b/modules/mono/editor/godotsharp_builds.cpp index 58d26a0f83..6b41b10981 100644 --- a/modules/mono/editor/godotsharp_builds.cpp +++ b/modules/mono/editor/godotsharp_builds.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "godotsharp_builds.h" #include "main/main.h" @@ -446,7 +447,7 @@ void GodotSharpBuilds::BuildProcess::start(bool p_blocking) { GDMonoClass *klass = GDMono::get_singleton()->get_editor_tools_assembly()->get_class("GodotSharpTools.Build", "BuildInstance"); - MonoObject *mono_object = mono_object_new(mono_domain_get(), klass->get_raw()); + MonoObject *mono_object = mono_object_new(mono_domain_get(), klass->get_mono_ptr()); // Construct diff --git a/modules/mono/editor/godotsharp_builds.h b/modules/mono/editor/godotsharp_builds.h index 956f8f6253..5d2390ecd9 100644 --- a/modules/mono/editor/godotsharp_builds.h +++ b/modules/mono/editor/godotsharp_builds.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef GODOTSHARP_BUILDS_H #define GODOTSHARP_BUILDS_H diff --git a/modules/mono/editor/godotsharp_editor.cpp b/modules/mono/editor/godotsharp_editor.cpp index f964fac8e9..da0a7b4fbd 100644 --- a/modules/mono/editor/godotsharp_editor.cpp +++ b/modules/mono/editor/godotsharp_editor.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "godotsharp_editor.h" #include "core/os/os.h" diff --git a/modules/mono/editor/godotsharp_editor.h b/modules/mono/editor/godotsharp_editor.h index f9b4fb42fb..1b83bae1cd 100644 --- a/modules/mono/editor/godotsharp_editor.h +++ b/modules/mono/editor/godotsharp_editor.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef GODOTSHARP_EDITOR_H #define GODOTSHARP_EDITOR_H diff --git a/modules/mono/editor/mono_bottom_panel.cpp b/modules/mono/editor/mono_bottom_panel.cpp index 7c8d822037..43689548b5 100644 --- a/modules/mono/editor/mono_bottom_panel.cpp +++ b/modules/mono/editor/mono_bottom_panel.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "mono_bottom_panel.h" #include "../csharp_script.h" diff --git a/modules/mono/editor/mono_bottom_panel.h b/modules/mono/editor/mono_bottom_panel.h index d7573361ab..a44d3a9af8 100644 --- a/modules/mono/editor/mono_bottom_panel.h +++ b/modules/mono/editor/mono_bottom_panel.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef MONO_BOTTOM_PANEL_H #define MONO_BOTTOM_PANEL_H diff --git a/modules/mono/editor/mono_build_info.h b/modules/mono/editor/mono_build_info.h index 115fc9ea55..4806764a61 100644 --- a/modules/mono/editor/mono_build_info.h +++ b/modules/mono/editor/mono_build_info.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef MONO_BUILD_INFO_H #define MONO_BUILD_INFO_H diff --git a/modules/mono/editor/monodevelop_instance.cpp b/modules/mono/editor/monodevelop_instance.cpp index 57b3382bff..0b0b36e1e3 100644 --- a/modules/mono/editor/monodevelop_instance.cpp +++ b/modules/mono/editor/monodevelop_instance.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "monodevelop_instance.h" #include "../mono_gd/gd_mono.h" @@ -62,7 +63,7 @@ MonoDevelopInstance::MonoDevelopInstance(const String &p_solution) { GDMonoClass *klass = GDMono::get_singleton()->get_editor_tools_assembly()->get_class("GodotSharpTools.Editor", "MonoDevelopInstance"); - MonoObject *obj = mono_object_new(TOOLS_DOMAIN, klass->get_raw()); + MonoObject *obj = mono_object_new(TOOLS_DOMAIN, klass->get_mono_ptr()); GDMonoMethod *ctor = klass->get_method(".ctor", 1); MonoObject *ex = NULL; diff --git a/modules/mono/editor/monodevelop_instance.h b/modules/mono/editor/monodevelop_instance.h index 783d12325f..7e8a76b595 100644 --- a/modules/mono/editor/monodevelop_instance.h +++ b/modules/mono/editor/monodevelop_instance.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef MONODEVELOP_INSTANCE_H #define MONODEVELOP_INSTANCE_H diff --git a/modules/mono/editor/net_solution.cpp b/modules/mono/editor/net_solution.cpp index b9df5b5327..dab96e44e9 100644 --- a/modules/mono/editor/net_solution.cpp +++ b/modules/mono/editor/net_solution.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "net_solution.h" #include "os/dir_access.h" diff --git a/modules/mono/editor/net_solution.h b/modules/mono/editor/net_solution.h index 21af1938cb..293e86917a 100644 --- a/modules/mono/editor/net_solution.h +++ b/modules/mono/editor/net_solution.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef NET_SOLUTION_H #define NET_SOLUTION_H diff --git a/modules/mono/glue/glue_header.h b/modules/mono/glue/glue_header.h index 1d64fa4d72..32988c5afa 100644 --- a/modules/mono/glue/glue_header.h +++ b/modules/mono/glue/glue_header.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "../csharp_script.h" #include "../mono_gd/gd_mono_class.h" #include "../mono_gd/gd_mono_internals.h" diff --git a/modules/mono/godotsharp_defs.h b/modules/mono/godotsharp_defs.h index 1679eb6242..4c26c3e6bd 100644 --- a/modules/mono/godotsharp_defs.h +++ b/modules/mono/godotsharp_defs.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef GODOTSHARP_DEFS_H #define GODOTSHARP_DEFS_H diff --git a/modules/mono/godotsharp_dirs.cpp b/modules/mono/godotsharp_dirs.cpp index a2965080d6..92c5cdc5c1 100644 --- a/modules/mono/godotsharp_dirs.cpp +++ b/modules/mono/godotsharp_dirs.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "godotsharp_dirs.h" #include "os/os.h" diff --git a/modules/mono/godotsharp_dirs.h b/modules/mono/godotsharp_dirs.h index 0e484fea91..e87b5a4150 100644 --- a/modules/mono/godotsharp_dirs.h +++ b/modules/mono/godotsharp_dirs.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef GODOTSHARP_DIRS_H #define GODOTSHARP_DIRS_H diff --git a/modules/mono/mono_gc_handle.cpp b/modules/mono/mono_gc_handle.cpp index 5ae12f5ebf..4e82bcd03e 100644 --- a/modules/mono/mono_gc_handle.cpp +++ b/modules/mono/mono_gc_handle.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "mono_gc_handle.h" #include "mono_gd/gd_mono.h" diff --git a/modules/mono/mono_gc_handle.h b/modules/mono/mono_gc_handle.h index 565f5d4f76..9cb3ef0fbb 100644 --- a/modules/mono/mono_gc_handle.h +++ b/modules/mono/mono_gc_handle.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef CSHARP_GC_HANDLE_H #define CSHARP_GC_HANDLE_H diff --git a/modules/mono/mono_gd/gd_mono.cpp b/modules/mono/mono_gd/gd_mono.cpp index 5b65f020fc..d4df7e0cb2 100644 --- a/modules/mono/mono_gd/gd_mono.cpp +++ b/modules/mono/mono_gd/gd_mono.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "gd_mono.h" #include <mono/metadata/exception.h> @@ -52,8 +53,7 @@ void gdmono_unhandled_exception_hook(MonoObject *exc, void *user_data) { (void)user_data; // UNUSED - ERR_PRINT(GDMonoUtils::get_exception_name_and_message(exc).utf8()); - mono_print_unhandled_exception(exc); + GDMonoUtils::print_unhandled_exception(exc); abort(); } diff --git a/modules/mono/mono_gd/gd_mono.h b/modules/mono/mono_gd/gd_mono.h index c565e26de6..67251778c6 100644 --- a/modules/mono/mono_gd/gd_mono.h +++ b/modules/mono/mono_gd/gd_mono.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef GD_MONO_H #define GD_MONO_H @@ -112,14 +113,6 @@ public: #endif #endif - enum MemberVisibility { - PRIVATE, - PROTECTED_AND_INTERNAL, // FAM_AND_ASSEM - INTERNAL, // ASSEMBLY - PROTECTED, // FAMILY - PUBLIC - }; - static GDMono *get_singleton() { return singleton; } // Do not use these, unless you know what you're doing diff --git a/modules/mono/mono_gd/gd_mono_assembly.cpp b/modules/mono/mono_gd/gd_mono_assembly.cpp index 7a1bf99a36..ba56ed6ed5 100644 --- a/modules/mono/mono_gd/gd_mono_assembly.cpp +++ b/modules/mono/mono_gd/gd_mono_assembly.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "gd_mono_assembly.h" #include <mono/metadata/mono-debug.h> @@ -318,7 +319,7 @@ GDMonoClass *GDMonoAssembly::get_object_derived_class(const StringName &p_class) void *iter = NULL; while (true) { - MonoClass *raw_nested = mono_class_get_nested_types(current_nested->get_raw(), &iter); + MonoClass *raw_nested = mono_class_get_nested_types(current_nested->get_mono_ptr(), &iter); if (!raw_nested) break; diff --git a/modules/mono/mono_gd/gd_mono_assembly.h b/modules/mono/mono_gd/gd_mono_assembly.h index 9f38202758..8e7aa701bf 100644 --- a/modules/mono/mono_gd/gd_mono_assembly.h +++ b/modules/mono/mono_gd/gd_mono_assembly.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef GD_MONO_ASSEMBLY_H #define GD_MONO_ASSEMBLY_H diff --git a/modules/mono/mono_gd/gd_mono_class.cpp b/modules/mono/mono_gd/gd_mono_class.cpp index 2bcce86d8c..d3315568cb 100644 --- a/modules/mono/mono_gd/gd_mono_class.cpp +++ b/modules/mono/mono_gd/gd_mono_class.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "gd_mono_class.h" #include <mono/metadata/attrdefs.h> @@ -35,7 +36,7 @@ MonoType *GDMonoClass::get_raw_type(GDMonoClass *p_class) { - return mono_class_get_type(p_class->get_raw()); + return mono_class_get_type(p_class->get_mono_ptr()); } bool GDMonoClass::is_assignable_from(GDMonoClass *p_from) const { @@ -74,7 +75,7 @@ Vector<MonoClassField *> GDMonoClass::get_enum_fields() { void *iter = NULL; MonoClassField *raw_field = NULL; - while ((raw_field = mono_class_get_fields(get_raw(), &iter)) != NULL) { + while ((raw_field = mono_class_get_fields(get_mono_ptr(), &iter)) != NULL) { uint32_t field_flags = mono_field_get_flags(raw_field); // Enums have an instance field named value__ which holds the value of the enum. @@ -105,7 +106,7 @@ bool GDMonoClass::has_attribute(GDMonoClass *p_attr_class) { if (!attributes) return false; - return mono_custom_attrs_has_attr(attributes, p_attr_class->get_raw()); + return mono_custom_attrs_has_attr(attributes, p_attr_class->get_mono_ptr()); } MonoObject *GDMonoClass::get_attribute(GDMonoClass *p_attr_class) { @@ -120,14 +121,14 @@ MonoObject *GDMonoClass::get_attribute(GDMonoClass *p_attr_class) { if (!attributes) return NULL; - return mono_custom_attrs_get_attr(attributes, p_attr_class->get_raw()); + return mono_custom_attrs_get_attr(attributes, p_attr_class->get_mono_ptr()); } void GDMonoClass::fetch_attributes() { ERR_FAIL_COND(attributes != NULL); - attributes = mono_custom_attrs_from_class(get_raw()); + attributes = mono_custom_attrs_from_class(get_mono_ptr()); attrs_fetched = true; } @@ -140,7 +141,7 @@ void GDMonoClass::fetch_methods_with_godot_api_checks(GDMonoClass *p_native_base void *iter = NULL; MonoMethod *raw_method = NULL; - while ((raw_method = mono_class_get_methods(get_raw(), &iter)) != NULL) { + while ((raw_method = mono_class_get_methods(get_mono_ptr(), &iter)) != NULL) { StringName name = mono_method_get_name(raw_method); GDMonoMethod *method = get_method(raw_method, name); @@ -334,7 +335,7 @@ const Vector<GDMonoField *> &GDMonoClass::get_all_fields() { void *iter = NULL; MonoClassField *raw_field = NULL; - while ((raw_field = mono_class_get_fields(get_raw(), &iter)) != NULL) { + while ((raw_field = mono_class_get_fields(mono_class, &iter)) != NULL) { StringName name = mono_field_get_name(raw_field); Map<StringName, GDMonoField *>::Element *match = fields.find(name); @@ -353,6 +354,54 @@ const Vector<GDMonoField *> &GDMonoClass::get_all_fields() { return fields_list; } +GDMonoProperty *GDMonoClass::get_property(const StringName &p_name) { + + Map<StringName, GDMonoProperty *>::Element *result = properties.find(p_name); + + if (result) + return result->value(); + + if (properties_fetched) + return NULL; + + MonoProperty *raw_property = mono_class_get_property_from_name(mono_class, String(p_name).utf8().get_data()); + + if (raw_property) { + GDMonoProperty *property = memnew(GDMonoProperty(raw_property, this)); + properties.insert(p_name, property); + + return property; + } + + return NULL; +} + +const Vector<GDMonoProperty *> &GDMonoClass::get_all_properties() { + + if (properties_fetched) + return properties_list; + + void *iter = NULL; + MonoProperty *raw_property = NULL; + while ((raw_property = mono_class_get_properties(mono_class, &iter)) != NULL) { + StringName name = mono_property_get_name(raw_property); + + Map<StringName, GDMonoProperty *>::Element *match = properties.find(name); + + if (match) { + properties_list.push_back(match->get()); + } else { + GDMonoProperty *property = memnew(GDMonoProperty(raw_property, this)); + properties.insert(name, property); + properties_list.push_back(property); + } + } + + properties_fetched = true; + + return properties_list; +} + GDMonoClass::GDMonoClass(const StringName &p_namespace, const StringName &p_name, MonoClass *p_class, GDMonoAssembly *p_assembly) { namespace_name = p_namespace; @@ -365,6 +414,7 @@ GDMonoClass::GDMonoClass(const StringName &p_namespace, const StringName &p_name methods_fetched = false; fields_fetched = false; + properties_fetched = false; } GDMonoClass::~GDMonoClass() { @@ -377,6 +427,10 @@ GDMonoClass::~GDMonoClass() { memdelete(E->value()); } + for (Map<StringName, GDMonoProperty *>::Element *E = properties.front(); E; E = E->next()) { + memdelete(E->value()); + } + { // Ugly workaround... // We may have duplicated values, because we redirect snake_case methods to PascalCasel (only Godot API methods). diff --git a/modules/mono/mono_gd/gd_mono_class.h b/modules/mono/mono_gd/gd_mono_class.h index b9d34eef3a..b6052ac0ed 100644 --- a/modules/mono/mono_gd/gd_mono_class.h +++ b/modules/mono/mono_gd/gd_mono_class.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef GD_MONO_CLASS_H #define GD_MONO_CLASS_H @@ -38,6 +39,7 @@ #include "gd_mono_field.h" #include "gd_mono_header.h" #include "gd_mono_method.h" +#include "gd_mono_property.h" #include "gd_mono_utils.h" class GDMonoClass { @@ -84,6 +86,10 @@ class GDMonoClass { Map<StringName, GDMonoField *> fields; Vector<GDMonoField *> fields_list; + bool properties_fetched; + Map<StringName, GDMonoProperty *> properties; + Vector<GDMonoProperty *> properties_list; + friend class GDMonoAssembly; GDMonoClass(const StringName &p_namespace, const StringName &p_name, MonoClass *p_class, GDMonoAssembly *p_assembly); @@ -95,7 +101,7 @@ public: _FORCE_INLINE_ StringName get_namespace() const { return namespace_name; } _FORCE_INLINE_ StringName get_name() const { return class_name; } - _FORCE_INLINE_ MonoClass *get_raw() const { return mono_class; } + _FORCE_INLINE_ MonoClass *get_mono_ptr() const { return mono_class; } _FORCE_INLINE_ const GDMonoAssembly *get_assembly() const { return assembly; } String get_full_name() const; @@ -124,6 +130,9 @@ public: GDMonoField *get_field(const StringName &p_name); const Vector<GDMonoField *> &get_all_fields(); + GDMonoProperty *get_property(const StringName &p_name); + const Vector<GDMonoProperty *> &get_all_properties(); + ~GDMonoClass(); }; diff --git a/modules/pbm/bitmap_loader_pbm.h b/modules/mono/mono_gd/gd_mono_class_member.h index d5955adba3..008ea0e416 100644 --- a/modules/pbm/bitmap_loader_pbm.h +++ b/modules/mono/mono_gd/gd_mono_class_member.h @@ -1,5 +1,5 @@ /*************************************************************************/ -/* bitmap_loader_pbm.h */ +/* gd_mono_class_member.h */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ @@ -27,21 +27,41 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef BITMAP_LOADER_PBM_H -#define BITMAP_LOADER_PBM_H +#ifndef GD_MONO_CLASS_MEMBER_H +#define GD_MONO_CLASS_MEMBER_H -#include "io/resource_loader.h" +#include "gd_mono_header.h" -/** - @author Juan Linietsky <reduzio@gmail.com> -*/ -class ResourceFormatPBM : public ResourceFormatLoader { +#include <mono/metadata/object.h> +class GDMonoClassMember { public: - virtual RES load(const String &p_path, const String &p_original_path = "", Error *r_error = NULL); - virtual void get_recognized_extensions(List<String> *p_extensions) const; - virtual bool handles_type(const String &p_type) const; - virtual String get_resource_type(const String &p_path) const; + enum Visibility { + PRIVATE, + PROTECTED_AND_INTERNAL, // FAM_AND_ASSEM + INTERNAL, // ASSEMBLY + PROTECTED, // FAMILY + PUBLIC + }; + + enum MemberType { + MEMBER_TYPE_FIELD, + MEMBER_TYPE_PROPERTY, + MEMBER_TYPE_METHOD + }; + + virtual ~GDMonoClassMember() {} + + virtual MemberType get_member_type() = 0; + + virtual StringName get_name() = 0; + + virtual bool is_static() = 0; + + virtual Visibility get_visibility() = 0; + + virtual bool has_attribute(GDMonoClass *p_attr_class) = 0; + virtual MonoObject *get_attribute(GDMonoClass *p_attr_class) = 0; }; -#endif +#endif // GD_MONO_CLASS_MEMBER_H diff --git a/modules/mono/mono_gd/gd_mono_field.cpp b/modules/mono/mono_gd/gd_mono_field.cpp index 133cfc9145..3b91777ed4 100644 --- a/modules/mono/mono_gd/gd_mono_field.cpp +++ b/modules/mono/mono_gd/gd_mono_field.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "gd_mono_field.h" #include <mono/metadata/attrdefs.h> @@ -38,7 +39,7 @@ void GDMonoField::set_value_raw(MonoObject *p_object, void *p_ptr) { mono_field_set_value(p_object, mono_field, &p_ptr); } -void GDMonoField::set_value(MonoObject *p_object, const Variant &p_value) { +void GDMonoField::set_value_from_variant(MonoObject *p_object, const Variant &p_value) { #define SET_FROM_STRUCT_AND_BREAK(m_type) \ { \ const m_type &val = p_value.operator ::m_type(); \ @@ -138,7 +139,7 @@ void GDMonoField::set_value(MonoObject *p_object, const Variant &p_value) { if (tclass == CACHED_CLASS(Plane)) SET_FROM_STRUCT_AND_BREAK(Plane); - if (mono_class_is_enum(tclass->get_raw())) + if (mono_class_is_enum(tclass->get_mono_ptr())) SET_FROM_PRIMITIVE(signed int); ERR_EXPLAIN(String() + "Attempted to set the value of a field of unmarshallable type: " + tclass->get_name()); @@ -264,7 +265,7 @@ void GDMonoField::set_value(MonoObject *p_object, const Variant &p_value) { } break; case MONO_TYPE_GENERICINST: { - if (CACHED_RAW_MONO_CLASS(Dictionary) == type.type_class->get_raw()) { + if (CACHED_RAW_MONO_CLASS(Dictionary) == type.type_class->get_mono_ptr()) { MonoObject *managed = GDMonoMarshal::Dictionary_to_mono_object(p_value.operator Dictionary()); mono_field_set_value(p_object, mono_field, managed); break; @@ -280,6 +281,10 @@ void GDMonoField::set_value(MonoObject *p_object, const Variant &p_value) { #undef SET_FROM_PRIMITIVE } +MonoObject *GDMonoField::get_value(MonoObject *p_object) { + return mono_field_get_value_object(mono_domain_get(), mono_field, p_object); +} + bool GDMonoField::get_bool_value(MonoObject *p_object) { return (bool)GDMonoMarshal::unbox<MonoBoolean>(get_value(p_object)); } @@ -302,7 +307,7 @@ bool GDMonoField::has_attribute(GDMonoClass *p_attr_class) { if (!attributes) return false; - return mono_custom_attrs_has_attr(attributes, p_attr_class->get_raw()); + return mono_custom_attrs_has_attr(attributes, p_attr_class->get_mono_ptr()); } MonoObject *GDMonoField::get_attribute(GDMonoClass *p_attr_class) { @@ -314,12 +319,12 @@ MonoObject *GDMonoField::get_attribute(GDMonoClass *p_attr_class) { if (!attributes) return NULL; - return mono_custom_attrs_get_attr(attributes, p_attr_class->get_raw()); + return mono_custom_attrs_get_attr(attributes, p_attr_class->get_mono_ptr()); } void GDMonoField::fetch_attributes() { ERR_FAIL_COND(attributes != NULL); - attributes = mono_custom_attrs_from_field(owner->get_raw(), get_raw()); + attributes = mono_custom_attrs_from_field(owner->get_mono_ptr(), mono_field); attrs_fetched = true; } @@ -327,26 +332,26 @@ bool GDMonoField::is_static() { return mono_field_get_flags(mono_field) & MONO_FIELD_ATTR_STATIC; } -GDMono::MemberVisibility GDMonoField::get_visibility() { +GDMonoClassMember::Visibility GDMonoField::get_visibility() { switch (mono_field_get_flags(mono_field) & MONO_FIELD_ATTR_FIELD_ACCESS_MASK) { case MONO_FIELD_ATTR_PRIVATE: - return GDMono::PRIVATE; + return GDMonoClassMember::PRIVATE; case MONO_FIELD_ATTR_FAM_AND_ASSEM: - return GDMono::PROTECTED_AND_INTERNAL; + return GDMonoClassMember::PROTECTED_AND_INTERNAL; case MONO_FIELD_ATTR_ASSEMBLY: - return GDMono::INTERNAL; + return GDMonoClassMember::INTERNAL; case MONO_FIELD_ATTR_FAMILY: - return GDMono::PROTECTED; + return GDMonoClassMember::PROTECTED; case MONO_FIELD_ATTR_PUBLIC: - return GDMono::PUBLIC; + return GDMonoClassMember::PUBLIC; default: - ERR_FAIL_V(GDMono::PRIVATE); + ERR_FAIL_V(GDMonoClassMember::PRIVATE); } } -GDMonoField::GDMonoField(MonoClassField *p_raw_field, GDMonoClass *p_owner) { +GDMonoField::GDMonoField(MonoClassField *p_mono_field, GDMonoClass *p_owner) { owner = p_owner; - mono_field = p_raw_field; + mono_field = p_mono_field; name = mono_field_get_name(mono_field); MonoType *field_type = mono_field_get_type(mono_field); type.type_encoding = mono_type_get_type(field_type); diff --git a/modules/mono/mono_gd/gd_mono_field.h b/modules/mono/mono_gd/gd_mono_field.h index a5559df059..a6b368c4d6 100644 --- a/modules/mono/mono_gd/gd_mono_field.h +++ b/modules/mono/mono_gd/gd_mono_field.h @@ -27,47 +27,49 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef GDMONOFIELD_H #define GDMONOFIELD_H #include "gd_mono.h" +#include "gd_mono_class_member.h" #include "gd_mono_header.h" -class GDMonoField { +class GDMonoField : public GDMonoClassMember { + GDMonoClass *owner; MonoClassField *mono_field; - String name; + StringName name; ManagedType type; bool attrs_fetched; MonoCustomAttrInfo *attributes; public: - _FORCE_INLINE_ String get_name() const { return name; } - _FORCE_INLINE_ ManagedType get_type() const { return type; } + virtual MemberType get_member_type() { return MEMBER_TYPE_FIELD; } - _FORCE_INLINE_ MonoClassField *get_raw() const { return mono_field; } + virtual StringName get_name() { return name; } + + virtual bool is_static(); + virtual Visibility get_visibility(); + + virtual bool has_attribute(GDMonoClass *p_attr_class); + virtual MonoObject *get_attribute(GDMonoClass *p_attr_class); + void fetch_attributes(); + + _FORCE_INLINE_ ManagedType get_type() const { return type; } void set_value_raw(MonoObject *p_object, void *p_ptr); - void set_value(MonoObject *p_object, const Variant &p_value); + void set_value_from_variant(MonoObject *p_object, const Variant &p_value); - _FORCE_INLINE_ MonoObject *get_value(MonoObject *p_object) { - return mono_field_get_value_object(mono_domain_get(), mono_field, p_object); - } + MonoObject *get_value(MonoObject *p_object); bool get_bool_value(MonoObject *p_object); int get_int_value(MonoObject *p_object); String get_string_value(MonoObject *p_object); - bool has_attribute(GDMonoClass *p_attr_class); - MonoObject *get_attribute(GDMonoClass *p_attr_class); - void fetch_attributes(); - - bool is_static(); - GDMono::MemberVisibility get_visibility(); - - GDMonoField(MonoClassField *p_raw_field, GDMonoClass *p_owner); + GDMonoField(MonoClassField *p_mono_field, GDMonoClass *p_owner); ~GDMonoField(); }; diff --git a/modules/mono/mono_gd/gd_mono_header.h b/modules/mono/mono_gd/gd_mono_header.h index a749aa8768..2b5110f0b9 100644 --- a/modules/mono/mono_gd/gd_mono_header.h +++ b/modules/mono/mono_gd/gd_mono_header.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef GD_MONO_HEADER_H #define GD_MONO_HEADER_H @@ -34,8 +35,10 @@ class GDMonoAssembly; class GDMonoClass; -class GDMonoMethod; +class GDMonoClassMember; class GDMonoField; +class GDMonoProperty; +class GDMonoMethod; struct ManagedType { int type_encoding; diff --git a/modules/mono/mono_gd/gd_mono_internals.cpp b/modules/mono/mono_gd/gd_mono_internals.cpp index 95d15c3581..a1a79f957f 100644 --- a/modules/mono/mono_gd/gd_mono_internals.cpp +++ b/modules/mono/mono_gd/gd_mono_internals.cpp @@ -1,5 +1,5 @@ /*************************************************************************/ -/* godotsharp_internals.cpp */ +/* gd_mono_internals.cpp */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "gd_mono_internals.h" #include "../csharp_script.h" diff --git a/modules/mono/mono_gd/gd_mono_internals.h b/modules/mono/mono_gd/gd_mono_internals.h index 91f6fcbbc7..abec65e7d4 100644 --- a/modules/mono/mono_gd/gd_mono_internals.h +++ b/modules/mono/mono_gd/gd_mono_internals.h @@ -1,5 +1,5 @@ /*************************************************************************/ -/* godotsharp_internals.h */ +/* gd_mono_internals.h */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef GD_MONO_INTERNALS_H #define GD_MONO_INTERNALS_H diff --git a/modules/mono/mono_gd/gd_mono_log.cpp b/modules/mono/mono_gd/gd_mono_log.cpp index f954530552..eabea8dc3c 100644 --- a/modules/mono/mono_gd/gd_mono_log.cpp +++ b/modules/mono/mono_gd/gd_mono_log.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "gd_mono_log.h" #include <mono/utils/mono-logger.h> diff --git a/modules/mono/mono_gd/gd_mono_log.h b/modules/mono/mono_gd/gd_mono_log.h index 4ed5f2a255..a7e374858c 100644 --- a/modules/mono/mono_gd/gd_mono_log.h +++ b/modules/mono/mono_gd/gd_mono_log.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef GD_MONO_LOG_H #define GD_MONO_LOG_H diff --git a/modules/mono/mono_gd/gd_mono_marshal.cpp b/modules/mono/mono_gd/gd_mono_marshal.cpp index 48d08b159c..1ec8f41c91 100644 --- a/modules/mono/mono_gd/gd_mono_marshal.cpp +++ b/modules/mono/mono_gd/gd_mono_marshal.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "gd_mono_marshal.h" #include "gd_mono.h" @@ -113,7 +114,7 @@ Variant::Type managed_to_variant_type(const ManagedType &p_type) { if (tclass == CACHED_CLASS(Plane)) return Variant::PLANE; - if (mono_class_is_enum(tclass->get_raw())) + if (mono_class_is_enum(tclass->get_mono_ptr())) return Variant::INT; } break; @@ -164,7 +165,7 @@ Variant::Type managed_to_variant_type(const ManagedType &p_type) { } break; case MONO_TYPE_GENERICINST: { - if (CACHED_RAW_MONO_CLASS(Dictionary) == p_type.type_class->get_raw()) { + if (CACHED_RAW_MONO_CLASS(Dictionary) == p_type.type_class->get_mono_ptr()) { return Variant::DICTIONARY; } } break; @@ -306,9 +307,9 @@ MonoObject *variant_to_mono_object(const Variant *p_var, const ManagedType &p_ty if (tclass == CACHED_CLASS(Plane)) RETURN_BOXED_STRUCT(Plane, p_var); - if (mono_class_is_enum(tclass->get_raw())) { + if (mono_class_is_enum(tclass->get_mono_ptr())) { int val = p_var->operator signed int(); - return BOX_ENUM(tclass->get_raw(), val); + return BOX_ENUM(tclass->get_mono_ptr(), val); } } break; @@ -432,7 +433,7 @@ MonoObject *variant_to_mono_object(const Variant *p_var, const ManagedType &p_ty } break; case MONO_TYPE_GENERICINST: { - if (CACHED_RAW_MONO_CLASS(Dictionary) == p_type.type_class->get_raw()) { + if (CACHED_RAW_MONO_CLASS(Dictionary) == p_type.type_class->get_mono_ptr()) { return Dictionary_to_mono_object(p_var->operator Dictionary()); } } break; @@ -528,7 +529,7 @@ Variant mono_object_to_variant(MonoObject *p_obj, const ManagedType &p_type) { if (tclass == CACHED_CLASS(Plane)) RETURN_UNBOXED_STRUCT(Plane, p_obj); - if (mono_class_is_enum(tclass->get_raw())) + if (mono_class_is_enum(tclass->get_mono_ptr())) return unbox<int32_t>(p_obj); } break; @@ -585,7 +586,7 @@ Variant mono_object_to_variant(MonoObject *p_obj, const ManagedType &p_type) { } break; case MONO_TYPE_GENERICINST: { - if (CACHED_RAW_MONO_CLASS(Dictionary) == p_type.type_class->get_raw()) { + if (CACHED_RAW_MONO_CLASS(Dictionary) == p_type.type_class->get_mono_ptr()) { return mono_object_to_Dictionary(p_obj); } } break; diff --git a/modules/mono/mono_gd/gd_mono_marshal.h b/modules/mono/mono_gd/gd_mono_marshal.h index 0570415575..727b9fa230 100644 --- a/modules/mono/mono_gd/gd_mono_marshal.h +++ b/modules/mono/mono_gd/gd_mono_marshal.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef GDMONOMARSHAL_H #define GDMONOMARSHAL_H diff --git a/modules/mono/mono_gd/gd_mono_method.cpp b/modules/mono/mono_gd/gd_mono_method.cpp index 01afd1e51e..1f8e9a1926 100644 --- a/modules/mono/mono_gd/gd_mono_method.cpp +++ b/modules/mono/mono_gd/gd_mono_method.cpp @@ -27,11 +27,14 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "gd_mono_method.h" #include "gd_mono_class.h" #include "gd_mono_marshal.h" +#include <mono/metadata/attrdefs.h> + void GDMonoMethod::_update_signature() { // Apparently MonoMethodSignature needs not to be freed. // mono_method_signature caches the result, we don't need to cache it ourselves. @@ -41,7 +44,6 @@ void GDMonoMethod::_update_signature() { } void GDMonoMethod::_update_signature(MonoMethodSignature *p_method_sig) { - is_instance = mono_signature_is_instance(p_method_sig); params_count = mono_signature_get_param_count(p_method_sig); MonoType *ret_type = mono_signature_get_return_type(p_method_sig); @@ -61,15 +63,34 @@ void GDMonoMethod::_update_signature(MonoMethodSignature *p_method_sig) { param_type.type_encoding = mono_type_get_type(param_raw_type); - if (param_type.type_encoding != MONO_TYPE_VOID) { - MonoClass *param_type_class = mono_class_from_mono_type(param_raw_type); - param_type.type_class = GDMono::get_singleton()->get_class(param_type_class); - } + MonoClass *param_type_class = mono_class_from_mono_type(param_raw_type); + param_type.type_class = GDMono::get_singleton()->get_class(param_type_class); param_types.push_back(param_type); } } +bool GDMonoMethod::is_static() { + return mono_method_get_flags(mono_method, NULL) & MONO_METHOD_ATTR_STATIC; +} + +GDMonoClassMember::Visibility GDMonoMethod::get_visibility() { + switch (mono_method_get_flags(mono_method, NULL) & MONO_METHOD_ATTR_ACCESS_MASK) { + case MONO_METHOD_ATTR_PRIVATE: + return GDMonoClassMember::PRIVATE; + case MONO_METHOD_ATTR_FAM_AND_ASSEM: + return GDMonoClassMember::PROTECTED_AND_INTERNAL; + case MONO_METHOD_ATTR_ASSEM: + return GDMonoClassMember::INTERNAL; + case MONO_METHOD_ATTR_FAMILY: + return GDMonoClassMember::PROTECTED; + case MONO_METHOD_ATTR_PUBLIC: + return GDMonoClassMember::PUBLIC; + default: + ERR_FAIL_V(GDMonoClassMember::PRIVATE); + } +} + void *GDMonoMethod::get_thunk() { return mono_method_get_unmanaged_thunk(mono_method); } @@ -87,11 +108,11 @@ MonoObject *GDMonoMethod::invoke(MonoObject *p_object, const Variant **p_params, MonoObject *ret = mono_runtime_invoke_array(mono_method, p_object, params, &exc); if (exc) { + ret = NULL; if (r_exc) { *r_exc = exc; } else { - ERR_PRINT(GDMonoUtils::get_exception_name_and_message(exc).utf8()); - mono_print_unhandled_exception(exc); + GDMonoUtils::print_unhandled_exception(exc); } } @@ -104,8 +125,7 @@ MonoObject *GDMonoMethod::invoke(MonoObject *p_object, const Variant **p_params, if (r_exc) { *r_exc = exc; } else { - ERR_PRINT(GDMonoUtils::get_exception_name_and_message(exc).utf8()); - mono_print_unhandled_exception(exc); + GDMonoUtils::print_unhandled_exception(exc); } } @@ -123,11 +143,11 @@ MonoObject *GDMonoMethod::invoke_raw(MonoObject *p_object, void **p_params, Mono MonoObject *ret = mono_runtime_invoke(mono_method, p_object, p_params, &exc); if (exc) { + ret = NULL; if (r_exc) { *r_exc = exc; } else { - ERR_PRINT(GDMonoUtils::get_exception_name_and_message(exc).utf8()); - mono_print_unhandled_exception(exc); + GDMonoUtils::print_unhandled_exception(exc); } } @@ -143,7 +163,7 @@ bool GDMonoMethod::has_attribute(GDMonoClass *p_attr_class) { if (!attributes) return false; - return mono_custom_attrs_has_attr(attributes, p_attr_class->get_raw()); + return mono_custom_attrs_has_attr(attributes, p_attr_class->get_mono_ptr()); } MonoObject *GDMonoMethod::get_attribute(GDMonoClass *p_attr_class) { @@ -155,7 +175,7 @@ MonoObject *GDMonoMethod::get_attribute(GDMonoClass *p_attr_class) { if (!attributes) return NULL; - return mono_custom_attrs_get_attr(attributes, p_attr_class->get_raw()); + return mono_custom_attrs_get_attr(attributes, p_attr_class->get_mono_ptr()); } void GDMonoMethod::fetch_attributes() { diff --git a/modules/mono/mono_gd/gd_mono_method.h b/modules/mono/mono_gd/gd_mono_method.h index f1f6e51d45..14df8dcfb4 100644 --- a/modules/mono/mono_gd/gd_mono_method.h +++ b/modules/mono/mono_gd/gd_mono_method.h @@ -27,17 +27,18 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef GD_MONO_METHOD_H #define GD_MONO_METHOD_H #include "gd_mono.h" +#include "gd_mono_class_member.h" #include "gd_mono_header.h" -class GDMonoMethod { +class GDMonoMethod : public GDMonoClassMember { StringName name; - bool is_instance; int params_count; ManagedType return_type; Vector<ManagedType> param_types; @@ -53,9 +54,18 @@ class GDMonoMethod { MonoMethod *mono_method; public: - _FORCE_INLINE_ StringName get_name() { return name; } + virtual MemberType get_member_type() { return MEMBER_TYPE_METHOD; } + + virtual StringName get_name() { return name; } + + virtual bool is_static(); + + virtual Visibility get_visibility(); + + virtual bool has_attribute(GDMonoClass *p_attr_class); + virtual MonoObject *get_attribute(GDMonoClass *p_attr_class); + virtual void fetch_attributes(); - _FORCE_INLINE_ bool is_static() { return !is_instance; } _FORCE_INLINE_ int get_parameters_count() { return params_count; } _FORCE_INLINE_ ManagedType get_return_type() { return return_type; } @@ -65,10 +75,6 @@ public: MonoObject *invoke(MonoObject *p_object, MonoObject **r_exc = NULL); MonoObject *invoke_raw(MonoObject *p_object, void **p_params, MonoObject **r_exc = NULL); - bool has_attribute(GDMonoClass *p_attr_class); - MonoObject *get_attribute(GDMonoClass *p_attr_class); - void fetch_attributes(); - String get_full_name(bool p_signature = false) const; String get_full_name_no_class() const; String get_ret_type_full_name() const; diff --git a/modules/mono/mono_gd/gd_mono_property.cpp b/modules/mono/mono_gd/gd_mono_property.cpp new file mode 100644 index 0000000000..bc5a1d3a39 --- /dev/null +++ b/modules/mono/mono_gd/gd_mono_property.cpp @@ -0,0 +1,199 @@ +/*************************************************************************/ +/* gd_mono_property.cpp */ +/*************************************************************************/ +/* This file is part of: */ +/* GODOT ENGINE */ +/* https://godotengine.org */ +/*************************************************************************/ +/* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ +/* Copyright (c) 2014-2018 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 "gd_mono_property.h" + +#include "gd_mono_class.h" +#include "gd_mono_marshal.h" + +#include <mono/metadata/attrdefs.h> + +GDMonoProperty::GDMonoProperty(MonoProperty *p_mono_property, GDMonoClass *p_owner) { + owner = p_owner; + mono_property = p_mono_property; + name = mono_property_get_name(mono_property); + + MonoMethod *prop_method = mono_property_get_get_method(mono_property); + + if (prop_method) { + MonoMethodSignature *getter_sig = mono_method_signature(prop_method); + + MonoType *ret_type = mono_signature_get_return_type(getter_sig); + + type.type_encoding = mono_type_get_type(ret_type); + MonoClass *ret_type_class = mono_class_from_mono_type(ret_type); + type.type_class = GDMono::get_singleton()->get_class(ret_type_class); + } else { + prop_method = mono_property_get_set_method(mono_property); + + MonoMethodSignature *setter_sig = mono_method_signature(prop_method); + + void *iter = NULL; + MonoType *param_raw_type = mono_signature_get_params(setter_sig, &iter); + + type.type_encoding = mono_type_get_type(param_raw_type); + MonoClass *param_type_class = mono_class_from_mono_type(param_raw_type); + type.type_class = GDMono::get_singleton()->get_class(param_type_class); + } + + attrs_fetched = false; + attributes = NULL; +} + +GDMonoProperty::~GDMonoProperty() { + if (attributes) { + mono_custom_attrs_free(attributes); + } +} + +bool GDMonoProperty::is_static() { + MonoMethod *prop_method = mono_property_get_get_method(mono_property); + if (prop_method == NULL) + prop_method = mono_property_get_set_method(mono_property); + return mono_method_get_flags(prop_method, NULL) & MONO_METHOD_ATTR_STATIC; +} + +GDMonoClassMember::Visibility GDMonoProperty::get_visibility() { + MonoMethod *prop_method = mono_property_get_get_method(mono_property); + if (prop_method == NULL) + prop_method = mono_property_get_set_method(mono_property); + + switch (mono_method_get_flags(prop_method, NULL) & MONO_METHOD_ATTR_ACCESS_MASK) { + case MONO_METHOD_ATTR_PRIVATE: + return GDMonoClassMember::PRIVATE; + case MONO_METHOD_ATTR_FAM_AND_ASSEM: + return GDMonoClassMember::PROTECTED_AND_INTERNAL; + case MONO_METHOD_ATTR_ASSEM: + return GDMonoClassMember::INTERNAL; + case MONO_METHOD_ATTR_FAMILY: + return GDMonoClassMember::PROTECTED; + case MONO_METHOD_ATTR_PUBLIC: + return GDMonoClassMember::PUBLIC; + default: + ERR_FAIL_V(GDMonoClassMember::PRIVATE); + } +} + +bool GDMonoProperty::has_attribute(GDMonoClass *p_attr_class) { + ERR_FAIL_NULL_V(p_attr_class, false); + + if (!attrs_fetched) + fetch_attributes(); + + if (!attributes) + return false; + + return mono_custom_attrs_has_attr(attributes, p_attr_class->get_mono_ptr()); +} + +MonoObject *GDMonoProperty::get_attribute(GDMonoClass *p_attr_class) { + ERR_FAIL_NULL_V(p_attr_class, NULL); + + if (!attrs_fetched) + fetch_attributes(); + + if (!attributes) + return NULL; + + return mono_custom_attrs_get_attr(attributes, p_attr_class->get_mono_ptr()); +} + +void GDMonoProperty::fetch_attributes() { + ERR_FAIL_COND(attributes != NULL); + attributes = mono_custom_attrs_from_property(owner->get_mono_ptr(), mono_property); + attrs_fetched = true; +} + +bool GDMonoProperty::has_getter() { + return mono_property_get_get_method(mono_property) != NULL; +} + +bool GDMonoProperty::has_setter() { + return mono_property_get_set_method(mono_property) != NULL; +} + +void GDMonoProperty::set_value(MonoObject *p_object, MonoObject *p_value, MonoObject **r_exc) { + MonoMethod *prop_method = mono_property_get_get_method(mono_property); + + MonoArray *params = mono_array_new(mono_domain_get(), CACHED_CLASS_RAW(MonoObject), 1); + mono_array_set(params, MonoObject *, 0, p_value); + + MonoObject *exc = NULL; + mono_runtime_invoke_array(prop_method, p_object, params, &exc); + + if (exc) { + if (r_exc) { + *r_exc = exc; + } else { + GDMonoUtils::print_unhandled_exception(exc); + } + } +} + +void GDMonoProperty::set_value(MonoObject *p_object, void **p_params, MonoObject **r_exc) { + MonoObject *exc = NULL; + mono_property_set_value(mono_property, p_object, p_params, &exc); + + if (exc) { + if (r_exc) { + *r_exc = exc; + } else { + GDMonoUtils::print_unhandled_exception(exc); + } + } +} + +MonoObject *GDMonoProperty::get_value(MonoObject *p_object, MonoObject **r_exc) { + MonoObject *exc = NULL; + MonoObject *ret = mono_property_get_value(mono_property, p_object, NULL, &exc); + + if (exc) { + ret = NULL; + if (r_exc) { + *r_exc = exc; + } else { + GDMonoUtils::print_unhandled_exception(exc); + } + } + + return ret; +} + +bool GDMonoProperty::get_bool_value(MonoObject *p_object) { + return (bool)GDMonoMarshal::unbox<MonoBoolean>(get_value(p_object)); +} + +int GDMonoProperty::get_int_value(MonoObject *p_object) { + return GDMonoMarshal::unbox<int32_t>(get_value(p_object)); +} + +String GDMonoProperty::get_string_value(MonoObject *p_object) { + MonoObject *val = get_value(p_object); + return GDMonoMarshal::mono_string_to_godot((MonoString *)val); +} diff --git a/modules/pbm/register_types.cpp b/modules/mono/mono_gd/gd_mono_property.h index c2a1585afa..2a0065e850 100644 --- a/modules/pbm/register_types.cpp +++ b/modules/mono/mono_gd/gd_mono_property.h @@ -1,5 +1,5 @@ /*************************************************************************/ -/* register_types.cpp */ +/* gd_mono_property.h */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ @@ -27,19 +27,51 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#include "register_types.h" +#ifndef GD_MONO_PROPERTY_H +#define GD_MONO_PROPERTY_H -#include "bitmap_loader_pbm.h" +#include "gd_mono.h" +#include "gd_mono_class_member.h" +#include "gd_mono_header.h" -static ResourceFormatPBM *pbm_loader = NULL; +class GDMonoProperty : public GDMonoClassMember { -void register_pbm_types() { + GDMonoClass *owner; + MonoProperty *mono_property; - pbm_loader = memnew(ResourceFormatPBM); - ResourceLoader::add_resource_format_loader(pbm_loader); -} + StringName name; + ManagedType type; -void unregister_pbm_types() { + bool attrs_fetched; + MonoCustomAttrInfo *attributes; - memdelete(pbm_loader); -} +public: + virtual MemberType get_member_type() { return MEMBER_TYPE_PROPERTY; } + + virtual StringName get_name() { return name; } + + virtual bool is_static(); + virtual Visibility get_visibility(); + + virtual bool has_attribute(GDMonoClass *p_attr_class); + virtual MonoObject *get_attribute(GDMonoClass *p_attr_class); + void fetch_attributes(); + + bool has_getter(); + bool has_setter(); + + _FORCE_INLINE_ ManagedType get_type() const { return type; } + + void set_value(MonoObject *p_object, MonoObject *p_value, MonoObject **r_exc = NULL); + void set_value(MonoObject *p_object, void **p_params, MonoObject **r_exc = NULL); + MonoObject *get_value(MonoObject *p_object, MonoObject **r_exc = NULL); + + bool get_bool_value(MonoObject *p_object); + int get_int_value(MonoObject *p_object); + String get_string_value(MonoObject *p_object); + + GDMonoProperty(MonoProperty *p_mono_property, GDMonoClass *p_owner); + ~GDMonoProperty(); +}; + +#endif // GD_MONO_PROPERTY_H diff --git a/modules/mono/mono_gd/gd_mono_utils.cpp b/modules/mono/mono_gd/gd_mono_utils.cpp index 03f3053372..ff999b36f2 100644 --- a/modules/mono/mono_gd/gd_mono_utils.cpp +++ b/modules/mono/mono_gd/gd_mono_utils.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "gd_mono_utils.h" #include "os/dir_access.h" @@ -198,7 +199,7 @@ void update_godot_api_cache() { CACHE_RAW_MONO_CLASS_AND_CHECK(Dictionary, mono_class_from_mono_type(dict_type)); } - MonoObject *task_scheduler = mono_object_new(SCRIPTS_DOMAIN, GODOT_API_CLASS(GodotTaskScheduler)->get_raw()); + MonoObject *task_scheduler = mono_object_new(SCRIPTS_DOMAIN, GODOT_API_CLASS(GodotTaskScheduler)->get_mono_ptr()); mono_runtime_object_init(task_scheduler); mono_cache.task_scheduler_handle = MonoGCHandle::create_strong(task_scheduler); } @@ -298,7 +299,7 @@ MonoObject *create_managed_for_godot_object(GDMonoClass *p_class, const StringNa ERR_FAIL_V(NULL); } - MonoObject *mono_object = mono_object_new(SCRIPTS_DOMAIN, p_class->get_raw()); + MonoObject *mono_object = mono_object_new(SCRIPTS_DOMAIN, p_class->get_mono_ptr()); ERR_FAIL_NULL_V(mono_object, NULL); CACHED_FIELD(GodotObject, ptr)->set_value_raw(mono_object, p_object); @@ -364,4 +365,10 @@ String get_exception_name_and_message(MonoObject *p_ex) { return res; } + +void print_unhandled_exception(MonoObject *p_ex) { + ERR_PRINT(GDMonoUtils::get_exception_name_and_message(p_ex).utf8()); + mono_print_unhandled_exception(p_ex); +} + } // namespace GDMonoUtils diff --git a/modules/mono/mono_gd/gd_mono_utils.h b/modules/mono/mono_gd/gd_mono_utils.h index 62d31f78fb..284585856e 100644 --- a/modules/mono/mono_gd/gd_mono_utils.h +++ b/modules/mono/mono_gd/gd_mono_utils.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef GD_MONOUTILS_H #define GD_MONOUTILS_H @@ -166,12 +167,14 @@ MonoDomain *create_domain(const String &p_friendly_name); String get_exception_name_and_message(MonoObject *p_ex); +void print_unhandled_exception(MonoObject *p_ex); + } // 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))) #define CACHED_CLASS(m_class) (GDMonoUtils::mono_cache.class_##m_class) -#define CACHED_CLASS_RAW(m_class) (GDMonoUtils::mono_cache.class_##m_class->get_raw()) +#define CACHED_CLASS_RAW(m_class) (GDMonoUtils::mono_cache.class_##m_class->get_mono_ptr()) #define CACHED_NS_CLASS(m_ns, m_class) (GDMonoUtils::mono_cache.class_##m_ns##_##m_class) #define CACHED_RAW_MONO_CLASS(m_class) (GDMonoUtils::mono_cache.rawclass_##m_class) #define CACHED_FIELD(m_class, m_field) (GDMonoUtils::mono_cache.field_##m_class##_##m_field) diff --git a/modules/mono/register_types.cpp b/modules/mono/register_types.cpp index 9bc384063d..4410996546 100644 --- a/modules/mono/register_types.cpp +++ b/modules/mono/register_types.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "register_types.h" #include "engine.h" diff --git a/modules/mono/register_types.h b/modules/mono/register_types.h index d4f052b793..ab8a7d6463 100644 --- a/modules/mono/register_types.h +++ b/modules/mono/register_types.h @@ -27,5 +27,6 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + void register_mono_types(); void unregister_mono_types(); diff --git a/modules/mono/signal_awaiter_utils.cpp b/modules/mono/signal_awaiter_utils.cpp index bad75224dc..2671e9a970 100644 --- a/modules/mono/signal_awaiter_utils.cpp +++ b/modules/mono/signal_awaiter_utils.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "signal_awaiter_utils.h" #include "csharp_script.h" diff --git a/modules/mono/signal_awaiter_utils.h b/modules/mono/signal_awaiter_utils.h index 97cf4238da..a6a205ff8d 100644 --- a/modules/mono/signal_awaiter_utils.h +++ b/modules/mono/signal_awaiter_utils.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef SIGNAL_AWAITER_UTILS_H #define SIGNAL_AWAITER_UTILS_H diff --git a/modules/mono/utils/mono_reg_utils.cpp b/modules/mono/utils/mono_reg_utils.cpp index 8d91e16c5c..9bb8da8ac0 100644 --- a/modules/mono/utils/mono_reg_utils.cpp +++ b/modules/mono/utils/mono_reg_utils.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "mono_reg_utils.h" #ifdef WINDOWS_ENABLED diff --git a/modules/mono/utils/mono_reg_utils.h b/modules/mono/utils/mono_reg_utils.h index 80270ad794..edf31f5a07 100644 --- a/modules/mono/utils/mono_reg_utils.h +++ b/modules/mono/utils/mono_reg_utils.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef MONO_REG_UTILS_H #define MONO_REG_UTILS_H diff --git a/modules/mono/utils/path_utils.cpp b/modules/mono/utils/path_utils.cpp index dfbb1b9ba4..4b77aeb54e 100644 --- a/modules/mono/utils/path_utils.cpp +++ b/modules/mono/utils/path_utils.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "path_utils.h" #include "os/dir_access.h" diff --git a/modules/mono/utils/path_utils.h b/modules/mono/utils/path_utils.h index 4e8d8f2815..184cacfac7 100644 --- a/modules/mono/utils/path_utils.h +++ b/modules/mono/utils/path_utils.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef PATH_UTILS_H #define PATH_UTILS_H diff --git a/modules/mono/utils/string_utils.cpp b/modules/mono/utils/string_utils.cpp index 4bea504d28..8691932f9a 100644 --- a/modules/mono/utils/string_utils.cpp +++ b/modules/mono/utils/string_utils.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "string_utils.h" namespace { diff --git a/modules/mono/utils/string_utils.h b/modules/mono/utils/string_utils.h index b02abc77be..5dddaee6e8 100644 --- a/modules/mono/utils/string_utils.h +++ b/modules/mono/utils/string_utils.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef STRING_FORMAT_H #define STRING_FORMAT_H diff --git a/modules/ogg/register_types.cpp b/modules/ogg/register_types.cpp index 993b2f9e1b..dba5dcc6e2 100644 --- a/modules/ogg/register_types.cpp +++ b/modules/ogg/register_types.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "register_types.h" // Dummy module as libogg is needed by other modules (vorbis, theora, opus, ...) diff --git a/modules/ogg/register_types.h b/modules/ogg/register_types.h index 39482dc71b..e82c90de0b 100644 --- a/modules/ogg/register_types.h +++ b/modules/ogg/register_types.h @@ -27,5 +27,6 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + void register_ogg_types(); void unregister_ogg_types(); diff --git a/modules/openssl/register_types.cpp b/modules/openssl/register_types.cpp index e103b3b9bf..916acc260e 100644 --- a/modules/openssl/register_types.cpp +++ b/modules/openssl/register_types.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "register_types.h" #include "stream_peer_openssl.h" diff --git a/modules/openssl/register_types.h b/modules/openssl/register_types.h index d87f1a31df..94d917ca81 100644 --- a/modules/openssl/register_types.h +++ b/modules/openssl/register_types.h @@ -27,5 +27,6 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + void register_openssl_types(); void unregister_openssl_types(); diff --git a/modules/openssl/stream_peer_openssl.cpp b/modules/openssl/stream_peer_openssl.cpp index 30a03f9000..e3cb9bbdf8 100644 --- a/modules/openssl/stream_peer_openssl.cpp +++ b/modules/openssl/stream_peer_openssl.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "stream_peer_openssl.h" // Compatibility with OpenSSL 1.1.0. diff --git a/modules/openssl/stream_peer_openssl.h b/modules/openssl/stream_peer_openssl.h index a696e29d6c..29c8647e58 100644 --- a/modules/openssl/stream_peer_openssl.h +++ b/modules/openssl/stream_peer_openssl.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef STREAM_PEER_OPEN_SSL_H #define STREAM_PEER_OPEN_SSL_H diff --git a/modules/opus/audio_stream_opus.cpp b/modules/opus/audio_stream_opus.cpp index 260612e370..8323ff33ac 100644 --- a/modules/opus/audio_stream_opus.cpp +++ b/modules/opus/audio_stream_opus.cpp @@ -8,8 +8,6 @@ /* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md) */ /* */ -/* Author: George Marques <george@gmarqu.es> */ -/* */ /* 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 */ @@ -29,8 +27,13 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "audio_stream_opus.h" +/** + @author George Marques <george@gmarqu.es> +*/ + const float AudioStreamPlaybackOpus::osrate = 48000.0f; int AudioStreamPlaybackOpus::_op_read_func(void *_stream, unsigned char *_ptr, int _nbytes) { diff --git a/modules/opus/audio_stream_opus.h b/modules/opus/audio_stream_opus.h index 7be133b5bc..3ffdaf2c18 100644 --- a/modules/opus/audio_stream_opus.h +++ b/modules/opus/audio_stream_opus.h @@ -8,8 +8,6 @@ /* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md) */ /* */ -/* Author: George Marques <george@gmarqu.es> */ -/* */ /* 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 */ @@ -39,6 +37,10 @@ #include <opus/opusfile.h> +/** + @author George Marques <george@gmarqu.es> +*/ + class AudioStreamPlaybackOpus : public AudioStreamPlayback { GDCLASS(AudioStreamPlaybackOpus, AudioStreamPlayback) diff --git a/modules/opus/register_types.cpp b/modules/opus/register_types.cpp index 41bee6d552..f34555841e 100644 --- a/modules/opus/register_types.cpp +++ b/modules/opus/register_types.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "register_types.h" #include "audio_stream_opus.h" diff --git a/modules/opus/register_types.h b/modules/opus/register_types.h index 85a7efbfc0..84335adfc9 100644 --- a/modules/opus/register_types.h +++ b/modules/opus/register_types.h @@ -27,5 +27,6 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + void register_opus_types(); void unregister_opus_types(); diff --git a/modules/opus/stub/register_types.cpp b/modules/opus/stub/register_types.cpp index 449edcc0f5..fe2bce63ba 100644 --- a/modules/opus/stub/register_types.cpp +++ b/modules/opus/stub/register_types.cpp @@ -3,7 +3,7 @@ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ -/* http://www.godotengine.org */ +/* https://godotengine.org */ /*************************************************************************/ /* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md) */ @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "register_types.h" // Dummy module as libvorbis is needed by other modules (theora ...) diff --git a/modules/opus/stub/register_types.h b/modules/opus/stub/register_types.h index c41cc4818c..84335adfc9 100644 --- a/modules/opus/stub/register_types.h +++ b/modules/opus/stub/register_types.h @@ -3,7 +3,7 @@ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ -/* http://www.godotengine.org */ +/* https://godotengine.org */ /*************************************************************************/ /* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md) */ @@ -27,5 +27,6 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + void register_opus_types(); void unregister_opus_types(); diff --git a/modules/pbm/SCsub b/modules/pbm/SCsub deleted file mode 100644 index fa328be025..0000000000 --- a/modules/pbm/SCsub +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env python - -Import('env') -Import('env_modules') - -env_pbm = env_modules.Clone() - -env_pbm.add_source_files(env.modules_sources, "*.cpp") diff --git a/modules/pbm/bitmap_loader_pbm.cpp b/modules/pbm/bitmap_loader_pbm.cpp deleted file mode 100644 index 39d238ae5c..0000000000 --- a/modules/pbm/bitmap_loader_pbm.cpp +++ /dev/null @@ -1,236 +0,0 @@ -/*************************************************************************/ -/* bitmap_loader_pbm.cpp */ -/*************************************************************************/ -/* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ -/*************************************************************************/ -/* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ -/* Copyright (c) 2014-2018 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 "bitmap_loader_pbm.h" -#include "os/file_access.h" -#include "scene/resources/bit_mask.h" - -static bool _get_token(FileAccessRef &f, uint8_t &saved, PoolVector<uint8_t> &r_token, bool p_binary = false, bool p_single_chunk = false) { - - int token_max = r_token.size(); - PoolVector<uint8_t>::Write w; - if (token_max) - w = r_token.write(); - int ofs = 0; - bool lf = false; - - while (true) { - - uint8_t b; - if (saved) { - b = saved; - saved = 0; - } else { - b = f->get_8(); - } - if (f->eof_reached()) { - if (ofs) { - w = PoolVector<uint8_t>::Write(); - r_token.resize(ofs); - return true; - } else { - return false; - } - } - - if (!ofs && !p_binary && b == '#') { - //skip comment - while (b != '\n') { - if (f->eof_reached()) { - return false; - } - - b = f->get_8(); - } - - lf = true; - - } else if (b <= 32 && !(p_binary && (ofs || lf))) { - - if (b == '\n') { - lf = true; - } - - if (ofs && !p_single_chunk) { - w = PoolVector<uint8_t>::Write(); - r_token.resize(ofs); - saved = b; - - return true; - } - } else { - - bool resized = false; - while (ofs >= token_max) { - if (token_max) - token_max <<= 1; - else - token_max = 1; - resized = true; - } - if (resized) { - // Note: Certain C++ static analyzers might point out that the following assigment is unnecessary. - // This is wrong since PoolVector<class T>::Write has an operator= method where the lhs gets updated under certain conditions. - // See core/dvector.h. - w = PoolVector<uint8_t>::Write(); - r_token.resize(token_max); - w = r_token.write(); - } - w[ofs++] = b; - } - } - - return false; -} - -static int _get_number_from_token(PoolVector<uint8_t> &r_token) { - - int len = r_token.size(); - PoolVector<uint8_t>::Read r = r_token.read(); - return String::to_int((const char *)r.ptr(), len); -} - -RES ResourceFormatPBM::load(const String &p_path, const String &p_original_path, Error *r_error) { - -#define _RETURN(m_err) \ - { \ - if (r_error) \ - *r_error = m_err; \ - ERR_FAIL_V(RES()); \ - } - - FileAccessRef f = FileAccess::open(p_path, FileAccess::READ); - uint8_t saved = 0; - if (!f) - _RETURN(ERR_CANT_OPEN); - - PoolVector<uint8_t> token; - - if (!_get_token(f, saved, token)) { - _RETURN(ERR_PARSE_ERROR); - } - - if (token.size() != 2) { - _RETURN(ERR_FILE_CORRUPT); - } - if (token[0] != 'P') { - _RETURN(ERR_FILE_CORRUPT); - } - if (token[1] != '1' && token[1] != '4') { - _RETURN(ERR_FILE_CORRUPT); - } - - bool bits = token[1] == '4'; - - if (!_get_token(f, saved, token)) { - _RETURN(ERR_PARSE_ERROR); - } - - int width = _get_number_from_token(token); - if (width <= 0) { - _RETURN(ERR_FILE_CORRUPT); - } - - if (!_get_token(f, saved, token)) { - _RETURN(ERR_PARSE_ERROR); - } - - int height = _get_number_from_token(token); - if (height <= 0) { - _RETURN(ERR_FILE_CORRUPT); - } - - Ref<BitMap> bm; - bm.instance(); - bm->create(Size2i(width, height)); - - if (!bits) { - - int required_bytes = width * height; - if (!_get_token(f, saved, token, false, true)) { - _RETURN(ERR_PARSE_ERROR); - } - - if (token.size() < required_bytes) { - _RETURN(ERR_FILE_CORRUPT); - } - - PoolVector<uint8_t>::Read r = token.read(); - - for (int i = 0; i < height; i++) { - for (int j = 0; j < width; j++) { - - char num = r[i * width + j]; - bm->set_bit(Point2i(j, i), num == '0'); - } - } - - } else { - //a single, entire token of bits! - if (!_get_token(f, saved, token, true)) { - _RETURN(ERR_PARSE_ERROR); - } - int required_bytes = Math::ceil((width * height) / 8.0); - if (token.size() < required_bytes) { - _RETURN(ERR_FILE_CORRUPT); - } - - PoolVector<uint8_t>::Read r = token.read(); - int bitwidth = width; - if (bitwidth % 8) - bitwidth += 8 - (bitwidth % 8); - - for (int i = 0; i < height; i++) { - for (int j = 0; j < width; j++) { - - int ofs = bitwidth * i + j; - - uint8_t byte = r[ofs / 8]; - bool bit = (byte >> (7 - (ofs % 8))) & 1; - - bm->set_bit(Point2i(j, i), !bit); - } - } - } - - return bm; -} - -void ResourceFormatPBM::get_recognized_extensions(List<String> *p_extensions) const { - p_extensions->push_back("pbm"); -} -bool ResourceFormatPBM::handles_type(const String &p_type) const { - return p_type == "BitMap"; -} -String ResourceFormatPBM::get_resource_type(const String &p_path) const { - - if (p_path.get_extension().to_lower() == "pbm") - return "BitMap"; - return ""; -} diff --git a/modules/pbm/config.py b/modules/pbm/config.py deleted file mode 100644 index 5f133eba90..0000000000 --- a/modules/pbm/config.py +++ /dev/null @@ -1,5 +0,0 @@ -def can_build(platform): - return True - -def configure(env): - pass diff --git a/modules/pbm/register_types.h b/modules/pbm/register_types.h deleted file mode 100644 index 958e162da1..0000000000 --- a/modules/pbm/register_types.h +++ /dev/null @@ -1,31 +0,0 @@ -/*************************************************************************/ -/* register_types.h */ -/*************************************************************************/ -/* This file is part of: */ -/* GODOT ENGINE */ -/* https://godotengine.org */ -/*************************************************************************/ -/* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ -/* Copyright (c) 2014-2018 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_pbm_types(); -void unregister_pbm_types(); diff --git a/modules/pvr/register_types.cpp b/modules/pvr/register_types.cpp index f1cd481a4a..0991828ef2 100644 --- a/modules/pvr/register_types.cpp +++ b/modules/pvr/register_types.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "register_types.h" #include "texture_loader_pvr.h" diff --git a/modules/pvr/register_types.h b/modules/pvr/register_types.h index b53dd8da52..d187ab5334 100644 --- a/modules/pvr/register_types.h +++ b/modules/pvr/register_types.h @@ -27,5 +27,6 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + void register_pvr_types(); void unregister_pvr_types(); diff --git a/modules/pvr/texture_loader_pvr.cpp b/modules/pvr/texture_loader_pvr.cpp index 5046526d81..76c0b969d8 100644 --- a/modules/pvr/texture_loader_pvr.cpp +++ b/modules/pvr/texture_loader_pvr.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "texture_loader_pvr.h" #include "PvrTcEncoder.h" #include "RgbaBitmap.h" diff --git a/modules/pvr/texture_loader_pvr.h b/modules/pvr/texture_loader_pvr.h index ae6df3658a..9369178336 100644 --- a/modules/pvr/texture_loader_pvr.h +++ b/modules/pvr/texture_loader_pvr.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef TEXTURE_LOADER_PVR_H #define TEXTURE_LOADER_PVR_H diff --git a/modules/regex/regex.cpp b/modules/regex/regex.cpp index 9bcbc4c4ea..3fe7e36d45 100644 --- a/modules/regex/regex.cpp +++ b/modules/regex/regex.cpp @@ -343,15 +343,20 @@ String RegEx::sub(const String &p_subject, const String &p_replacement, bool p_a ERR_FAIL_COND_V(!is_valid(), String()); - String output; - output.resize(p_subject.length()); + // safety_zone is the number of chars we allocate in addition to the number of chars expected in order to + // guard against the PCRE API writing one additional \0 at the end. PCRE's API docs are unclear on whether + // PCRE understands outlength in pcre2_substitute() as counting an implicit additional terminating char or + // not. always allocating one char more than telling PCRE has us on the safe side. + const int safety_zone = 1; + + PCRE2_SIZE olength = p_subject.length() + 1; // space for output string and one terminating \0 character + Vector<CharType> output; + output.resize(olength + safety_zone); uint32_t flags = PCRE2_SUBSTITUTE_OVERFLOW_LENGTH; if (p_all) flags |= PCRE2_SUBSTITUTE_GLOBAL; - PCRE2_SIZE olength = output.length(); - PCRE2_SIZE length = p_subject.length(); if (p_end >= 0 && (uint32_t)p_end < length) length = p_end; @@ -363,15 +368,15 @@ String RegEx::sub(const String &p_subject, const String &p_replacement, bool p_a pcre2_match_context_16 *mctx = pcre2_match_context_create_16(gctx); PCRE2_SPTR16 s = (PCRE2_SPTR16)p_subject.c_str(); PCRE2_SPTR16 r = (PCRE2_SPTR16)p_replacement.c_str(); - PCRE2_UCHAR16 *o = (PCRE2_UCHAR16 *)output.c_str(); + PCRE2_UCHAR16 *o = (PCRE2_UCHAR16 *)output.ptrw(); pcre2_match_data_16 *match = pcre2_match_data_create_from_pattern_16(c, gctx); int res = pcre2_substitute_16(c, s, length, p_offset, flags, match, mctx, r, p_replacement.length(), o, &olength); if (res == PCRE2_ERROR_NOMEMORY) { - output.resize(olength); - o = (PCRE2_UCHAR16 *)output.c_str(); + output.resize(olength + safety_zone); + o = (PCRE2_UCHAR16 *)output.ptrw(); res = pcre2_substitute_16(c, s, length, p_offset, flags, match, mctx, r, p_replacement.length(), o, &olength); } @@ -388,15 +393,15 @@ String RegEx::sub(const String &p_subject, const String &p_replacement, bool p_a pcre2_match_context_32 *mctx = pcre2_match_context_create_32(gctx); PCRE2_SPTR32 s = (PCRE2_SPTR32)p_subject.c_str(); PCRE2_SPTR32 r = (PCRE2_SPTR32)p_replacement.c_str(); - PCRE2_UCHAR32 *o = (PCRE2_UCHAR32 *)output.c_str(); + PCRE2_UCHAR32 *o = (PCRE2_UCHAR32 *)output.ptrw(); pcre2_match_data_32 *match = pcre2_match_data_create_from_pattern_32(c, gctx); int res = pcre2_substitute_32(c, s, length, p_offset, flags, match, mctx, r, p_replacement.length(), o, &olength); if (res == PCRE2_ERROR_NOMEMORY) { - output.resize(olength); - o = (PCRE2_UCHAR32 *)output.c_str(); + output.resize(olength + safety_zone); + o = (PCRE2_UCHAR32 *)output.ptrw(); res = pcre2_substitute_32(c, s, length, p_offset, flags, match, mctx, r, p_replacement.length(), o, &olength); } @@ -407,7 +412,7 @@ String RegEx::sub(const String &p_subject, const String &p_replacement, bool p_a return String(); } - return output; + return String(output.ptr(), olength); } bool RegEx::is_valid() const { diff --git a/modules/register_module_types.h b/modules/register_module_types.h index 4f9c2eb41f..f4163418e8 100644 --- a/modules/register_module_types.h +++ b/modules/register_module_types.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef REGISTER_MODULE_TYPES_H #define REGISTER_MODULE_TYPES_H diff --git a/modules/squish/image_compress_squish.cpp b/modules/squish/image_compress_squish.cpp index c97cee6e1d..0cf24dd8d8 100644 --- a/modules/squish/image_compress_squish.cpp +++ b/modules/squish/image_compress_squish.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "image_compress_squish.h" #include "print_string.h" diff --git a/modules/squish/image_compress_squish.h b/modules/squish/image_compress_squish.h index 83dab024b2..c022063fe5 100644 --- a/modules/squish/image_compress_squish.h +++ b/modules/squish/image_compress_squish.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef IMAGE_COMPRESS_SQUISH_H #define IMAGE_COMPRESS_SQUISH_H diff --git a/modules/squish/register_types.cpp b/modules/squish/register_types.cpp index 600a33cdd6..d4ed676cce 100644 --- a/modules/squish/register_types.cpp +++ b/modules/squish/register_types.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "register_types.h" #ifdef TOOLS_ENABLED diff --git a/modules/squish/register_types.h b/modules/squish/register_types.h index f9971f4f19..00f5c345c4 100644 --- a/modules/squish/register_types.h +++ b/modules/squish/register_types.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifdef TOOLS_ENABLED void register_squish_types(); void unregister_squish_types(); diff --git a/modules/stb_vorbis/audio_stream_ogg_vorbis.cpp b/modules/stb_vorbis/audio_stream_ogg_vorbis.cpp index 786c2bf051..d06bd79460 100644 --- a/modules/stb_vorbis/audio_stream_ogg_vorbis.cpp +++ b/modules/stb_vorbis/audio_stream_ogg_vorbis.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "audio_stream_ogg_vorbis.h" #include "os/file_access.h" diff --git a/modules/stb_vorbis/audio_stream_ogg_vorbis.h b/modules/stb_vorbis/audio_stream_ogg_vorbis.h index 8644e1ba37..bb01c26902 100644 --- a/modules/stb_vorbis/audio_stream_ogg_vorbis.h +++ b/modules/stb_vorbis/audio_stream_ogg_vorbis.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef AUDIO_STREAM_STB_VORBIS_H #define AUDIO_STREAM_STB_VORBIS_H diff --git a/modules/stb_vorbis/register_types.cpp b/modules/stb_vorbis/register_types.cpp index 992cc1f159..514ef4c071 100644 --- a/modules/stb_vorbis/register_types.cpp +++ b/modules/stb_vorbis/register_types.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "register_types.h" #include "audio_stream_ogg_vorbis.h" #include "resource_importer_ogg_vorbis.h" diff --git a/modules/stb_vorbis/register_types.h b/modules/stb_vorbis/register_types.h index 9af22e2374..142be0efdf 100644 --- a/modules/stb_vorbis/register_types.h +++ b/modules/stb_vorbis/register_types.h @@ -27,5 +27,6 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + void register_stb_vorbis_types(); void unregister_stb_vorbis_types(); diff --git a/modules/stb_vorbis/resource_importer_ogg_vorbis.cpp b/modules/stb_vorbis/resource_importer_ogg_vorbis.cpp index db4443255d..16ebfa2832 100644 --- a/modules/stb_vorbis/resource_importer_ogg_vorbis.cpp +++ b/modules/stb_vorbis/resource_importer_ogg_vorbis.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "resource_importer_ogg_vorbis.h" #include "io/resource_saver.h" diff --git a/modules/stb_vorbis/resource_importer_ogg_vorbis.h b/modules/stb_vorbis/resource_importer_ogg_vorbis.h index 9b7bf1946e..a1847545aa 100644 --- a/modules/stb_vorbis/resource_importer_ogg_vorbis.h +++ b/modules/stb_vorbis/resource_importer_ogg_vorbis.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef RESOURCEIMPORTEROGGVORBIS_H #define RESOURCEIMPORTEROGGVORBIS_H diff --git a/modules/svg/image_loader_svg.cpp b/modules/svg/image_loader_svg.cpp index ea538a2895..8ccd229f3d 100644 --- a/modules/svg/image_loader_svg.cpp +++ b/modules/svg/image_loader_svg.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "image_loader_svg.h" #include "os/os.h" diff --git a/modules/svg/image_loader_svg.h b/modules/svg/image_loader_svg.h index 61bf390bc7..63854da2f6 100644 --- a/modules/svg/image_loader_svg.h +++ b/modules/svg/image_loader_svg.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef IMAGE_LOADER_SVG_H #define IMAGE_LOADER_SVG_H diff --git a/modules/svg/register_types.cpp b/modules/svg/register_types.cpp index ddd63009f7..56426662cd 100644 --- a/modules/svg/register_types.cpp +++ b/modules/svg/register_types.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "register_types.h" #include "image_loader_svg.h" diff --git a/modules/svg/register_types.h b/modules/svg/register_types.h index 8759e3cdd5..015c586c6b 100644 --- a/modules/svg/register_types.h +++ b/modules/svg/register_types.h @@ -27,5 +27,6 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + void register_svg_types(); void unregister_svg_types(); diff --git a/modules/tga/image_loader_tga.cpp b/modules/tga/image_loader_tga.cpp index dec8526b0a..7391bed699 100644 --- a/modules/tga/image_loader_tga.cpp +++ b/modules/tga/image_loader_tga.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "image_loader_tga.h" #include "os/os.h" diff --git a/modules/tga/image_loader_tga.h b/modules/tga/image_loader_tga.h index 2a0b6f4504..c4b10b7f49 100644 --- a/modules/tga/image_loader_tga.h +++ b/modules/tga/image_loader_tga.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef IMAGE_LOADER_TGA_H #define IMAGE_LOADER_TGA_H diff --git a/modules/tga/register_types.cpp b/modules/tga/register_types.cpp index 81991b1142..ac1b56af16 100644 --- a/modules/tga/register_types.cpp +++ b/modules/tga/register_types.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "register_types.h" #include "image_loader_tga.h" diff --git a/modules/tga/register_types.h b/modules/tga/register_types.h index 1b6f66a4d0..6483f2576e 100644 --- a/modules/tga/register_types.h +++ b/modules/tga/register_types.h @@ -27,5 +27,6 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + void register_tga_types(); void unregister_tga_types(); diff --git a/modules/thekla_unwrap/register_types.cpp b/modules/thekla_unwrap/register_types.cpp index eb11325dde..c74cbd9d18 100644 --- a/modules/thekla_unwrap/register_types.cpp +++ b/modules/thekla_unwrap/register_types.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "register_types.h" #include "error_macros.h" #include "thirdparty/thekla_atlas/thekla/thekla_atlas.h" diff --git a/modules/thekla_unwrap/register_types.h b/modules/thekla_unwrap/register_types.h index 7a542592b5..8a0eab9437 100644 --- a/modules/thekla_unwrap/register_types.h +++ b/modules/thekla_unwrap/register_types.h @@ -27,5 +27,6 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + void register_thekla_unwrap_types(); void unregister_thekla_unwrap_types(); diff --git a/modules/theora/register_types.cpp b/modules/theora/register_types.cpp index c6d125226b..9bc5ed903a 100644 --- a/modules/theora/register_types.cpp +++ b/modules/theora/register_types.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "register_types.h" #include "resource_importer_theora.h" #include "video_stream_theora.h" diff --git a/modules/theora/register_types.h b/modules/theora/register_types.h index 69b43744b5..4a81d7743b 100644 --- a/modules/theora/register_types.h +++ b/modules/theora/register_types.h @@ -27,5 +27,6 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + void register_theora_types(); void unregister_theora_types(); diff --git a/modules/theora/resource_importer_theora.cpp b/modules/theora/resource_importer_theora.cpp index 0c9a21c825..ee9bab74a7 100644 --- a/modules/theora/resource_importer_theora.cpp +++ b/modules/theora/resource_importer_theora.cpp @@ -3,7 +3,7 @@ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ -/* http://www.godotengine.org */ +/* https://godotengine.org */ /*************************************************************************/ /* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md) */ @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "resource_importer_theora.h" #include "io/resource_saver.h" diff --git a/modules/theora/resource_importer_theora.h b/modules/theora/resource_importer_theora.h index 913bf87a42..e3c79287ad 100644 --- a/modules/theora/resource_importer_theora.h +++ b/modules/theora/resource_importer_theora.h @@ -3,7 +3,7 @@ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ -/* http://www.godotengine.org */ +/* https://godotengine.org */ /*************************************************************************/ /* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md) */ @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef RESOURCEIMPORTEROGGTHEORA_H #define RESOURCEIMPORTEROGGTHEORA_H diff --git a/modules/theora/video_stream_theora.cpp b/modules/theora/video_stream_theora.cpp index 2ff3fb6d7a..ac1e81859a 100644 --- a/modules/theora/video_stream_theora.cpp +++ b/modules/theora/video_stream_theora.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "video_stream_theora.h" #include "os/os.h" diff --git a/modules/theora/video_stream_theora.h b/modules/theora/video_stream_theora.h index cbcdd34bfc..4bdbbdae20 100644 --- a/modules/theora/video_stream_theora.h +++ b/modules/theora/video_stream_theora.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef VIDEO_STREAM_THEORA_H #define VIDEO_STREAM_THEORA_H diff --git a/modules/tinyexr/image_loader_tinyexr.cpp b/modules/tinyexr/image_loader_tinyexr.cpp index c4d9e7c7e0..0abefe11ee 100644 --- a/modules/tinyexr/image_loader_tinyexr.cpp +++ b/modules/tinyexr/image_loader_tinyexr.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "image_loader_tinyexr.h" #include "os/os.h" diff --git a/modules/tinyexr/image_loader_tinyexr.h b/modules/tinyexr/image_loader_tinyexr.h index b46c9582e1..6706e0972a 100644 --- a/modules/tinyexr/image_loader_tinyexr.h +++ b/modules/tinyexr/image_loader_tinyexr.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef IMAGE_LOADER_TINYEXR_H #define IMAGE_LOADER_TINYEXR_H diff --git a/modules/tinyexr/register_types.cpp b/modules/tinyexr/register_types.cpp index 648cc98c25..61217805cf 100644 --- a/modules/tinyexr/register_types.cpp +++ b/modules/tinyexr/register_types.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "register_types.h" #include "image_loader_tinyexr.h" diff --git a/modules/tinyexr/register_types.h b/modules/tinyexr/register_types.h index e2bd8a0cbe..70cd0bfbf8 100644 --- a/modules/tinyexr/register_types.h +++ b/modules/tinyexr/register_types.h @@ -27,5 +27,6 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + void register_tinyexr_types(); void unregister_tinyexr_types(); diff --git a/modules/visual_script/register_types.cpp b/modules/visual_script/register_types.cpp index a9c6554198..2809cff362 100644 --- a/modules/visual_script/register_types.cpp +++ b/modules/visual_script/register_types.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "register_types.h" #include "core/engine.h" diff --git a/modules/visual_script/register_types.h b/modules/visual_script/register_types.h index 3d6eb25d10..27b3bd649a 100644 --- a/modules/visual_script/register_types.h +++ b/modules/visual_script/register_types.h @@ -27,5 +27,6 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + void register_visual_script_types(); void unregister_visual_script_types(); diff --git a/modules/visual_script/visual_script.cpp b/modules/visual_script/visual_script.cpp index 26c3aed465..fd493978e6 100644 --- a/modules/visual_script/visual_script.cpp +++ b/modules/visual_script/visual_script.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "visual_script.h" #include "os/os.h" diff --git a/modules/visual_script/visual_script.h b/modules/visual_script/visual_script.h index 76eadece66..69bb522173 100644 --- a/modules/visual_script/visual_script.h +++ b/modules/visual_script/visual_script.h @@ -27,8 +27,9 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef VSCRIPT_H -#define VSCRIPT_H + +#ifndef VISUAL_SCRIPT_H +#define VISUAL_SCRIPT_H #include "os/thread.h" #include "script_language.h" @@ -617,4 +618,4 @@ static Ref<VisualScriptNode> create_node_generic(const String &p_name) { return node; } -#endif // VSCRIPT_H +#endif // VISUAL_SCRIPT_H diff --git a/modules/visual_script/visual_script_builtin_funcs.cpp b/modules/visual_script/visual_script_builtin_funcs.cpp index 3ace2de176..1ee0989564 100644 --- a/modules/visual_script/visual_script_builtin_funcs.cpp +++ b/modules/visual_script/visual_script_builtin_funcs.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "visual_script_builtin_funcs.h" #include "class_db.h" diff --git a/modules/visual_script/visual_script_builtin_funcs.h b/modules/visual_script/visual_script_builtin_funcs.h index 1e098535f3..f862d5c26f 100644 --- a/modules/visual_script/visual_script_builtin_funcs.h +++ b/modules/visual_script/visual_script_builtin_funcs.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef VISUAL_SCRIPT_BUILTIN_FUNCS_H #define VISUAL_SCRIPT_BUILTIN_FUNCS_H diff --git a/modules/visual_script/visual_script_editor.cpp b/modules/visual_script/visual_script_editor.cpp index dfd563499f..37b0b8ac55 100644 --- a/modules/visual_script/visual_script_editor.cpp +++ b/modules/visual_script/visual_script_editor.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "visual_script_editor.h" #include "core/script_language.h" diff --git a/modules/visual_script/visual_script_editor.h b/modules/visual_script/visual_script_editor.h index 48b6a92b76..4d789e6ef7 100644 --- a/modules/visual_script/visual_script_editor.h +++ b/modules/visual_script/visual_script_editor.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef VISUALSCRIPT_EDITOR_H #define VISUALSCRIPT_EDITOR_H diff --git a/modules/visual_script/visual_script_expression.cpp b/modules/visual_script/visual_script_expression.cpp index 2a051b3288..16de04e4cf 100644 --- a/modules/visual_script/visual_script_expression.cpp +++ b/modules/visual_script/visual_script_expression.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "visual_script_expression.h" bool VisualScriptExpression::_set(const StringName &p_name, const Variant &p_value) { diff --git a/modules/visual_script/visual_script_expression.h b/modules/visual_script/visual_script_expression.h index 628f06fc0b..1f41e442c5 100644 --- a/modules/visual_script/visual_script_expression.h +++ b/modules/visual_script/visual_script_expression.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef VISUALSCRIPTEXPRESSION_H #define VISUALSCRIPTEXPRESSION_H diff --git a/modules/visual_script/visual_script_flow_control.cpp b/modules/visual_script/visual_script_flow_control.cpp index 56aeeac7fb..5c097dfa76 100644 --- a/modules/visual_script/visual_script_flow_control.cpp +++ b/modules/visual_script/visual_script_flow_control.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "visual_script_flow_control.h" #include "io/resource_loader.h" diff --git a/modules/visual_script/visual_script_flow_control.h b/modules/visual_script/visual_script_flow_control.h index c985d1b9a9..40809d488a 100644 --- a/modules/visual_script/visual_script_flow_control.h +++ b/modules/visual_script/visual_script_flow_control.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef VISUAL_SCRIPT_FLOW_CONTROL_H #define VISUAL_SCRIPT_FLOW_CONTROL_H diff --git a/modules/visual_script/visual_script_func_nodes.cpp b/modules/visual_script/visual_script_func_nodes.cpp index 345d2f7df8..130b243715 100644 --- a/modules/visual_script/visual_script_func_nodes.cpp +++ b/modules/visual_script/visual_script_func_nodes.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "visual_script_func_nodes.h" #include "engine.h" diff --git a/modules/visual_script/visual_script_func_nodes.h b/modules/visual_script/visual_script_func_nodes.h index 925f3b94aa..0b30eae65a 100644 --- a/modules/visual_script/visual_script_func_nodes.h +++ b/modules/visual_script/visual_script_func_nodes.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef VISUAL_SCRIPT_FUNC_NODES_H #define VISUAL_SCRIPT_FUNC_NODES_H diff --git a/modules/visual_script/visual_script_nodes.cpp b/modules/visual_script/visual_script_nodes.cpp index a41b3fc6c9..1988eb0f5b 100644 --- a/modules/visual_script/visual_script_nodes.cpp +++ b/modules/visual_script/visual_script_nodes.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "visual_script_nodes.h" #include "engine.h" diff --git a/modules/visual_script/visual_script_nodes.h b/modules/visual_script/visual_script_nodes.h index d49f64f3a6..a581e81c8c 100644 --- a/modules/visual_script/visual_script_nodes.h +++ b/modules/visual_script/visual_script_nodes.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef VISUAL_SCRIPT_NODES_H #define VISUAL_SCRIPT_NODES_H diff --git a/modules/visual_script/visual_script_yield_nodes.cpp b/modules/visual_script/visual_script_yield_nodes.cpp index 1961809be0..a96e8408c0 100644 --- a/modules/visual_script/visual_script_yield_nodes.cpp +++ b/modules/visual_script/visual_script_yield_nodes.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "visual_script_yield_nodes.h" #include "os/os.h" diff --git a/modules/visual_script/visual_script_yield_nodes.h b/modules/visual_script/visual_script_yield_nodes.h index b6efd88c0e..4009240581 100644 --- a/modules/visual_script/visual_script_yield_nodes.h +++ b/modules/visual_script/visual_script_yield_nodes.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef VISUAL_SCRIPT_YIELD_NODES_H #define VISUAL_SCRIPT_YIELD_NODES_H diff --git a/modules/vorbis/audio_stream_ogg_vorbis.cpp b/modules/vorbis/audio_stream_ogg_vorbis.cpp index 999c06f664..bae8f7be5f 100644 --- a/modules/vorbis/audio_stream_ogg_vorbis.cpp +++ b/modules/vorbis/audio_stream_ogg_vorbis.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "audio_stream_ogg_vorbis.h" size_t AudioStreamPlaybackOGGVorbis::_ov_read_func(void *p_dst, size_t p_data, size_t p_count, void *_f) { diff --git a/modules/vorbis/audio_stream_ogg_vorbis.h b/modules/vorbis/audio_stream_ogg_vorbis.h index 24102a43ec..01de8a3143 100644 --- a/modules/vorbis/audio_stream_ogg_vorbis.h +++ b/modules/vorbis/audio_stream_ogg_vorbis.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef AUDIO_STREAM_OGG_VORBIS_H #define AUDIO_STREAM_OGG_VORBIS_H diff --git a/modules/vorbis/register_types.cpp b/modules/vorbis/register_types.cpp index ffa3971c3e..0ea1fbe8b2 100644 --- a/modules/vorbis/register_types.cpp +++ b/modules/vorbis/register_types.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "register_types.h" #include "audio_stream_ogg_vorbis.h" diff --git a/modules/vorbis/register_types.h b/modules/vorbis/register_types.h index 8e54747036..3885502da2 100644 --- a/modules/vorbis/register_types.h +++ b/modules/vorbis/register_types.h @@ -27,5 +27,6 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + void register_vorbis_types(); void unregister_vorbis_types(); diff --git a/modules/vorbis/stub/register_types.cpp b/modules/vorbis/stub/register_types.cpp index 39abb9aafc..02ac9518c8 100644 --- a/modules/vorbis/stub/register_types.cpp +++ b/modules/vorbis/stub/register_types.cpp @@ -3,7 +3,7 @@ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ -/* http://www.godotengine.org */ +/* https://godotengine.org */ /*************************************************************************/ /* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md) */ @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "register_types.h" // Dummy module as libvorbis is needed by other modules (theora ...) diff --git a/modules/vorbis/stub/register_types.h b/modules/vorbis/stub/register_types.h index a6c51fb3e1..3885502da2 100644 --- a/modules/vorbis/stub/register_types.h +++ b/modules/vorbis/stub/register_types.h @@ -3,7 +3,7 @@ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ -/* http://www.godotengine.org */ +/* https://godotengine.org */ /*************************************************************************/ /* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md) */ @@ -27,5 +27,6 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + void register_vorbis_types(); void unregister_vorbis_types(); diff --git a/modules/webm/register_types.cpp b/modules/webm/register_types.cpp index 10c06ca4e5..1183dd41f7 100644 --- a/modules/webm/register_types.cpp +++ b/modules/webm/register_types.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "register_types.h" #include "resource_importer_webm.h" #include "video_stream_webm.h" diff --git a/modules/webm/register_types.h b/modules/webm/register_types.h index a429a9a398..102da2b0f5 100644 --- a/modules/webm/register_types.h +++ b/modules/webm/register_types.h @@ -27,5 +27,6 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + void register_webm_types(); void unregister_webm_types(); diff --git a/modules/webm/resource_importer_webm.cpp b/modules/webm/resource_importer_webm.cpp index 2ea1485437..7124a503e8 100644 --- a/modules/webm/resource_importer_webm.cpp +++ b/modules/webm/resource_importer_webm.cpp @@ -3,7 +3,7 @@ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ -/* http://www.godotengine.org */ +/* https://godotengine.org */ /*************************************************************************/ /* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md) */ @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "resource_importer_webm.h" #include "io/resource_saver.h" diff --git a/modules/webm/resource_importer_webm.h b/modules/webm/resource_importer_webm.h index 7cce805e70..d61e6e2a93 100644 --- a/modules/webm/resource_importer_webm.h +++ b/modules/webm/resource_importer_webm.h @@ -3,7 +3,7 @@ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ -/* http://www.godotengine.org */ +/* https://godotengine.org */ /*************************************************************************/ /* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md) */ @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef RESOURCEIMPORTERWEBM_H #define RESOURCEIMPORTERWEBM_H diff --git a/modules/webm/video_stream_webm.cpp b/modules/webm/video_stream_webm.cpp index e915af3e6c..e6952d14d7 100644 --- a/modules/webm/video_stream_webm.cpp +++ b/modules/webm/video_stream_webm.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "video_stream_webm.h" #include "OpusVorbisDecoder.hpp" diff --git a/modules/webm/video_stream_webm.h b/modules/webm/video_stream_webm.h index c0b4490bf5..dde993d154 100644 --- a/modules/webm/video_stream_webm.h +++ b/modules/webm/video_stream_webm.h @@ -27,6 +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 VIDEO_STREAM_WEBM_H +#define VIDEO_STREAM_WEBM_H + #include "io/resource_loader.h" #include "scene/resources/video_stream.h" @@ -122,3 +126,5 @@ public: String get_file(); virtual void set_audio_track(int p_track); }; + +#endif // VIDEO_STREAM_WEBM_H diff --git a/modules/webp/image_loader_webp.cpp b/modules/webp/image_loader_webp.cpp index 903b456540..cdf2d75e96 100644 --- a/modules/webp/image_loader_webp.cpp +++ b/modules/webp/image_loader_webp.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "image_loader_webp.h" #include "io/marshalls.h" diff --git a/modules/webp/image_loader_webp.h b/modules/webp/image_loader_webp.h index b00c8b1b05..f051fed4b8 100644 --- a/modules/webp/image_loader_webp.h +++ b/modules/webp/image_loader_webp.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef IMAGE_LOADER_WEBP_H #define IMAGE_LOADER_WEBP_H diff --git a/modules/webp/register_types.cpp b/modules/webp/register_types.cpp index 86eb558dff..9a2e83c65d 100644 --- a/modules/webp/register_types.cpp +++ b/modules/webp/register_types.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "register_types.h" #include "image_loader_webp.h" diff --git a/modules/webp/register_types.h b/modules/webp/register_types.h index 025bc49be1..711f5be61d 100644 --- a/modules/webp/register_types.h +++ b/modules/webp/register_types.h @@ -27,5 +27,6 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + void register_webp_types(); void unregister_webp_types(); diff --git a/platform/android/audio_driver_jandroid.cpp b/platform/android/audio_driver_jandroid.cpp index 1f05d6cd9b..7545ee88d0 100644 --- a/platform/android/audio_driver_jandroid.cpp +++ b/platform/android/audio_driver_jandroid.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "audio_driver_jandroid.h" #include "os/os.h" diff --git a/platform/android/audio_driver_jandroid.h b/platform/android/audio_driver_jandroid.h index 5cd8eb8e0c..763f0e9b5a 100644 --- a/platform/android/audio_driver_jandroid.h +++ b/platform/android/audio_driver_jandroid.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef AUDIO_DRIVER_ANDROID_H #define AUDIO_DRIVER_ANDROID_H diff --git a/platform/android/audio_driver_opensl.cpp b/platform/android/audio_driver_opensl.cpp index f0218e13bd..87a7d04e01 100644 --- a/platform/android/audio_driver_opensl.cpp +++ b/platform/android/audio_driver_opensl.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "audio_driver_opensl.h" #include <string.h> diff --git a/platform/android/audio_driver_opensl.h b/platform/android/audio_driver_opensl.h index 9dc74c6c8a..2022bad02a 100644 --- a/platform/android/audio_driver_opensl.h +++ b/platform/android/audio_driver_opensl.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef AUDIO_DRIVER_OPENSL_H #define AUDIO_DRIVER_OPENSL_H diff --git a/platform/android/build.gradle.template b/platform/android/build.gradle.template index 13b4d3b6c7..89189ef1a0 100644 --- a/platform/android/build.gradle.template +++ b/platform/android/build.gradle.template @@ -20,7 +20,7 @@ allprojects { } dependencies { - compile 'com.android.support:support-v4:23.+' // can be removed if minSdkVersion 16 and modify DownloadNotification.java & V14CustomNotification.java + compile 'com.android.support:support-v4:27.+' // can be removed if minSdkVersion 16 and modify DownloadNotification.java & V14CustomNotification.java $$GRADLE_DEPENDENCIES$$ } diff --git a/platform/android/dir_access_android.cpp b/platform/android/dir_access_android.cpp index c6e11ec505..402da4527e 100644 --- a/platform/android/dir_access_android.cpp +++ b/platform/android/dir_access_android.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifdef ANDROID_NATIVE_ACTIVITY #include "dir_access_android.h" #include "file_access_android.h" diff --git a/platform/android/dir_access_android.h b/platform/android/dir_access_android.h index 970202b5cc..085d7160cd 100644 --- a/platform/android/dir_access_android.h +++ b/platform/android/dir_access_android.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef DIR_ACCESS_ANDROID_H #define DIR_ACCESS_ANDROID_H diff --git a/platform/android/dir_access_jandroid.cpp b/platform/android/dir_access_jandroid.cpp index 6abab3edf6..5601dcc763 100644 --- a/platform/android/dir_access_jandroid.cpp +++ b/platform/android/dir_access_jandroid.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef ANDROID_NATIVE_ACTIVITY #include "dir_access_jandroid.h" diff --git a/platform/android/dir_access_jandroid.h b/platform/android/dir_access_jandroid.h index 4a9112fb27..8dc52ab9c8 100644 --- a/platform/android/dir_access_jandroid.h +++ b/platform/android/dir_access_jandroid.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef DIR_ACCESS_JANDROID_H #define DIR_ACCESS_JANDROID_H diff --git a/platform/android/export/export.cpp b/platform/android/export/export.cpp index 922a53621f..b26d2a3aa4 100644 --- a/platform/android/export/export.cpp +++ b/platform/android/export/export.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "export.h" #include "editor/editor_export.h" diff --git a/platform/android/export/export.h b/platform/android/export/export.h index eb18e04863..9d66626866 100644 --- a/platform/android/export/export.h +++ b/platform/android/export/export.h @@ -27,4 +27,5 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + void register_android_exporter(); diff --git a/platform/android/file_access_android.cpp b/platform/android/file_access_android.cpp index d958ef8294..c2eed50e4c 100644 --- a/platform/android/file_access_android.cpp +++ b/platform/android/file_access_android.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "file_access_android.h" #include "print_string.h" diff --git a/platform/android/file_access_android.h b/platform/android/file_access_android.h index f44c19f963..03f4c59521 100644 --- a/platform/android/file_access_android.h +++ b/platform/android/file_access_android.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef FILE_ACCESS_ANDROID_H #define FILE_ACCESS_ANDROID_H diff --git a/platform/android/file_access_jandroid.cpp b/platform/android/file_access_jandroid.cpp index 4285a136a2..1a9d3af4ea 100644 --- a/platform/android/file_access_jandroid.cpp +++ b/platform/android/file_access_jandroid.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef ANDROID_NATIVE_ACTIVITY #include "file_access_jandroid.h" diff --git a/platform/android/file_access_jandroid.h b/platform/android/file_access_jandroid.h index c537f2f01a..72f81ee02e 100644 --- a/platform/android/file_access_jandroid.h +++ b/platform/android/file_access_jandroid.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef FILE_ACCESS_JANDROID_H #define FILE_ACCESS_JANDROID_H diff --git a/platform/android/globals/global_defaults.cpp b/platform/android/globals/global_defaults.cpp index 4a7dd07090..a315f80452 100644 --- a/platform/android/globals/global_defaults.cpp +++ b/platform/android/globals/global_defaults.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "global_defaults.h" #include "project_settings.h" diff --git a/platform/android/globals/global_defaults.h b/platform/android/globals/global_defaults.h index 412942eb88..99da2dd527 100644 --- a/platform/android/globals/global_defaults.h +++ b/platform/android/globals/global_defaults.h @@ -27,4 +27,5 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + void register_android_global_defaults(); diff --git a/platform/android/godot_android.cpp b/platform/android/godot_android.cpp index 1643be7763..64715b3683 100644 --- a/platform/android/godot_android.cpp +++ b/platform/android/godot_android.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifdef ANDROID_NATIVE_ACTIVITY #include "engine.h" diff --git a/platform/android/java/src/org/godotengine/godot/Dictionary.java b/platform/android/java/src/org/godotengine/godot/Dictionary.java index b7ced69d0e..de6b4af568 100644 --- a/platform/android/java/src/org/godotengine/godot/Dictionary.java +++ b/platform/android/java/src/org/godotengine/godot/Dictionary.java @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + package org.godotengine.godot; import java.util.HashMap; diff --git a/platform/android/java/src/org/godotengine/godot/Godot.java b/platform/android/java/src/org/godotengine/godot/Godot.java index d6e060f8d5..b5b0afb9e0 100644 --- a/platform/android/java/src/org/godotengine/godot/Godot.java +++ b/platform/android/java/src/org/godotengine/godot/Godot.java @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + package org.godotengine.godot; import android.R; @@ -827,7 +828,6 @@ public class Godot extends Activity implements SensorEventListener, IDownloaderC //@Override public boolean dispatchTouchEvent (MotionEvent event) { public boolean gotTouchEvent(final MotionEvent event) { - super.onTouchEvent(event); final int evcount = event.getPointerCount(); if (evcount == 0) return true; @@ -841,6 +841,7 @@ public class Godot extends Activity implements SensorEventListener, IDownloaderC arr[i * 3 + 1] = (int)event.getX(i); arr[i * 3 + 2] = (int)event.getY(i); } + final int pointer_idx = event.getPointerId(event.getActionIndex()); //System.out.printf("gaction: %d\n",event.getAction()); final int action = event.getAction() & MotionEvent.ACTION_MASK; @@ -861,13 +862,10 @@ public class Godot extends Activity implements SensorEventListener, IDownloaderC */ } break; case MotionEvent.ACTION_POINTER_UP: { - final int indexPointUp = event.getActionIndex(); - final int pointer_idx = event.getPointerId(indexPointUp); GodotLib.touch(4, pointer_idx, evcount, arr); //System.out.printf("%d - s.up at: %f,%f\n",pointer_idx, event.getX(pointer_idx),event.getY(pointer_idx)); } break; case MotionEvent.ACTION_POINTER_DOWN: { - int pointer_idx = event.getActionIndex(); GodotLib.touch(3, pointer_idx, evcount, arr); //System.out.printf("%d - s.down at: %f,%f\n",pointer_idx, event.getX(pointer_idx),event.getY(pointer_idx)); } break; diff --git a/platform/android/java/src/org/godotengine/godot/GodotDownloaderAlarmReceiver.java b/platform/android/java/src/org/godotengine/godot/GodotDownloaderAlarmReceiver.java index a3fed28c6f..4701bac9df 100644 --- a/platform/android/java/src/org/godotengine/godot/GodotDownloaderAlarmReceiver.java +++ b/platform/android/java/src/org/godotengine/godot/GodotDownloaderAlarmReceiver.java @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + package org.godotengine.godot; import com.google.android.vending.expansion.downloader.DownloaderClientMarshaller; diff --git a/platform/android/java/src/org/godotengine/godot/GodotDownloaderService.java b/platform/android/java/src/org/godotengine/godot/GodotDownloaderService.java index 9da705409b..3a94354843 100644 --- a/platform/android/java/src/org/godotengine/godot/GodotDownloaderService.java +++ b/platform/android/java/src/org/godotengine/godot/GodotDownloaderService.java @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + package org.godotengine.godot; import android.content.Context; diff --git a/platform/android/java/src/org/godotengine/godot/GodotIO.java b/platform/android/java/src/org/godotengine/godot/GodotIO.java index 2382288ca8..a95c508d21 100644 --- a/platform/android/java/src/org/godotengine/godot/GodotIO.java +++ b/platform/android/java/src/org/godotengine/godot/GodotIO.java @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + package org.godotengine.godot; import java.util.HashMap; import java.util.Locale; diff --git a/platform/android/java/src/org/godotengine/godot/GodotLib.java b/platform/android/java/src/org/godotengine/godot/GodotLib.java index 9deb9dcb35..45eb188327 100644 --- a/platform/android/java/src/org/godotengine/godot/GodotLib.java +++ b/platform/android/java/src/org/godotengine/godot/GodotLib.java @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + package org.godotengine.godot; // Wrapper for native library diff --git a/platform/android/java/src/org/godotengine/godot/GodotPaymentV3.java b/platform/android/java/src/org/godotengine/godot/GodotPaymentV3.java index 7db0ef1b18..6b7f7a283e 100644 --- a/platform/android/java/src/org/godotengine/godot/GodotPaymentV3.java +++ b/platform/android/java/src/org/godotengine/godot/GodotPaymentV3.java @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + package org.godotengine.godot; import android.app.Activity; diff --git a/platform/android/java/src/org/godotengine/godot/GodotView.java b/platform/android/java/src/org/godotengine/godot/GodotView.java index db7daa1307..0222758c2b 100644 --- a/platform/android/java/src/org/godotengine/godot/GodotView.java +++ b/platform/android/java/src/org/godotengine/godot/GodotView.java @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + package org.godotengine.godot; import android.content.Context; import android.graphics.PixelFormat; @@ -109,7 +110,7 @@ public class GodotView extends GLSurfaceView implements InputDeviceListener { @Override public boolean onTouchEvent(MotionEvent event) { - + super.onTouchEvent(event); return activity.gotTouchEvent(event); }; diff --git a/platform/android/java/src/org/godotengine/godot/input/GodotEditText.java b/platform/android/java/src/org/godotengine/godot/input/GodotEditText.java index df62ac5a01..53fcf5ef70 100644 --- a/platform/android/java/src/org/godotengine/godot/input/GodotEditText.java +++ b/platform/android/java/src/org/godotengine/godot/input/GodotEditText.java @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + package org.godotengine.godot.input; import android.content.Context; import android.util.AttributeSet; diff --git a/platform/android/java/src/org/godotengine/godot/input/GodotTextInputWrapper.java b/platform/android/java/src/org/godotengine/godot/input/GodotTextInputWrapper.java index eb3075fdfc..1102ab7450 100644 --- a/platform/android/java/src/org/godotengine/godot/input/GodotTextInputWrapper.java +++ b/platform/android/java/src/org/godotengine/godot/input/GodotTextInputWrapper.java @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + package org.godotengine.godot.input; import android.content.Context; import android.text.Editable; diff --git a/platform/android/java/src/org/godotengine/godot/payments/ConsumeTask.java b/platform/android/java/src/org/godotengine/godot/payments/ConsumeTask.java index f78e454d93..afe5f81b6d 100644 --- a/platform/android/java/src/org/godotengine/godot/payments/ConsumeTask.java +++ b/platform/android/java/src/org/godotengine/godot/payments/ConsumeTask.java @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + package org.godotengine.godot.payments; import com.android.vending.billing.IInAppBillingService; diff --git a/platform/android/java/src/org/godotengine/godot/payments/GenericConsumeTask.java b/platform/android/java/src/org/godotengine/godot/payments/GenericConsumeTask.java index 747eea5e5c..8b48193ae2 100644 --- a/platform/android/java/src/org/godotengine/godot/payments/GenericConsumeTask.java +++ b/platform/android/java/src/org/godotengine/godot/payments/GenericConsumeTask.java @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + package org.godotengine.godot.payments; import com.android.vending.billing.IInAppBillingService; diff --git a/platform/android/java/src/org/godotengine/godot/payments/HandlePurchaseTask.java b/platform/android/java/src/org/godotengine/godot/payments/HandlePurchaseTask.java index b49244cf09..766989f953 100644 --- a/platform/android/java/src/org/godotengine/godot/payments/HandlePurchaseTask.java +++ b/platform/android/java/src/org/godotengine/godot/payments/HandlePurchaseTask.java @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + package org.godotengine.godot.payments; import org.json.JSONException; diff --git a/platform/android/java/src/org/godotengine/godot/payments/PaymentsCache.java b/platform/android/java/src/org/godotengine/godot/payments/PaymentsCache.java index 05e634c13c..40cdeea72e 100644 --- a/platform/android/java/src/org/godotengine/godot/payments/PaymentsCache.java +++ b/platform/android/java/src/org/godotengine/godot/payments/PaymentsCache.java @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + package org.godotengine.godot.payments; import android.content.Context; diff --git a/platform/android/java/src/org/godotengine/godot/payments/PaymentsManager.java b/platform/android/java/src/org/godotengine/godot/payments/PaymentsManager.java index 8086489897..da6d66ae88 100644 --- a/platform/android/java/src/org/godotengine/godot/payments/PaymentsManager.java +++ b/platform/android/java/src/org/godotengine/godot/payments/PaymentsManager.java @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + package org.godotengine.godot.payments; import android.app.Activity; diff --git a/platform/android/java/src/org/godotengine/godot/payments/PurchaseTask.java b/platform/android/java/src/org/godotengine/godot/payments/PurchaseTask.java index a31b6ed9f2..e1d9bcee65 100644 --- a/platform/android/java/src/org/godotengine/godot/payments/PurchaseTask.java +++ b/platform/android/java/src/org/godotengine/godot/payments/PurchaseTask.java @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + package org.godotengine.godot.payments; import org.json.JSONException; diff --git a/platform/android/java/src/org/godotengine/godot/payments/ReleaseAllConsumablesTask.java b/platform/android/java/src/org/godotengine/godot/payments/ReleaseAllConsumablesTask.java index 6ab6673183..e00e37f9d1 100644 --- a/platform/android/java/src/org/godotengine/godot/payments/ReleaseAllConsumablesTask.java +++ b/platform/android/java/src/org/godotengine/godot/payments/ReleaseAllConsumablesTask.java @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + package org.godotengine.godot.payments; import java.util.ArrayList; diff --git a/platform/android/java/src/org/godotengine/godot/payments/ValidateTask.java b/platform/android/java/src/org/godotengine/godot/payments/ValidateTask.java index c10008c4e1..1eb9d001e0 100644 --- a/platform/android/java/src/org/godotengine/godot/payments/ValidateTask.java +++ b/platform/android/java/src/org/godotengine/godot/payments/ValidateTask.java @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + package org.godotengine.godot.payments; import org.json.JSONException; diff --git a/platform/android/java/src/org/godotengine/godot/utils/Crypt.java b/platform/android/java/src/org/godotengine/godot/utils/Crypt.java index cdaf60bded..f34511137e 100644 --- a/platform/android/java/src/org/godotengine/godot/utils/Crypt.java +++ b/platform/android/java/src/org/godotengine/godot/utils/Crypt.java @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + package org.godotengine.godot.utils; import java.security.MessageDigest; diff --git a/platform/android/java/src/org/godotengine/godot/utils/CustomSSLSocketFactory.java b/platform/android/java/src/org/godotengine/godot/utils/CustomSSLSocketFactory.java index 7bd8fb63b2..7216d8b5a4 100644 --- a/platform/android/java/src/org/godotengine/godot/utils/CustomSSLSocketFactory.java +++ b/platform/android/java/src/org/godotengine/godot/utils/CustomSSLSocketFactory.java @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + package org.godotengine.godot.utils; import java.io.IOException; import java.net.Socket; diff --git a/platform/android/java/src/org/godotengine/godot/utils/HttpRequester.java b/platform/android/java/src/org/godotengine/godot/utils/HttpRequester.java index ae1233674e..b84f5cce2e 100644 --- a/platform/android/java/src/org/godotengine/godot/utils/HttpRequester.java +++ b/platform/android/java/src/org/godotengine/godot/utils/HttpRequester.java @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + package org.godotengine.godot.utils; import java.io.BufferedReader; diff --git a/platform/android/java/src/org/godotengine/godot/utils/RequestParams.java b/platform/android/java/src/org/godotengine/godot/utils/RequestParams.java index 7df98fab85..2368766afa 100644 --- a/platform/android/java/src/org/godotengine/godot/utils/RequestParams.java +++ b/platform/android/java/src/org/godotengine/godot/utils/RequestParams.java @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + package org.godotengine.godot.utils; import java.util.ArrayList; diff --git a/platform/android/java_class_wrapper.cpp b/platform/android/java_class_wrapper.cpp index 1d03c3671a..80a32452a5 100644 --- a/platform/android/java_class_wrapper.cpp +++ b/platform/android/java_class_wrapper.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "java_class_wrapper.h" #include "thread_jandroid.h" diff --git a/platform/android/java_class_wrapper.h b/platform/android/java_class_wrapper.h index 4b374bc216..648c147ca8 100644 --- a/platform/android/java_class_wrapper.h +++ b/platform/android/java_class_wrapper.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef JAVA_CLASS_WRAPPER_H #define JAVA_CLASS_WRAPPER_H diff --git a/platform/android/java_glue.cpp b/platform/android/java_glue.cpp index 25aee74c46..4e9e4f6260 100644 --- a/platform/android/java_glue.cpp +++ b/platform/android/java_glue.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef ANDROID_NATIVE_ACTIVITY #include "java_glue.h" diff --git a/platform/android/java_glue.h b/platform/android/java_glue.h index fb997e950b..d433b5f0d8 100644 --- a/platform/android/java_glue.h +++ b/platform/android/java_glue.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef ANDROID_NATIVE_ACTIVITY #ifndef JAVA_GLUE_H diff --git a/platform/android/os_android.cpp b/platform/android/os_android.cpp index 1542f4a5e4..23811f963a 100644 --- a/platform/android/os_android.cpp +++ b/platform/android/os_android.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "os_android.h" #include "core/io/file_access_buffered_fa.h" @@ -443,25 +444,27 @@ void OS_Android::process_touch(int p_what, int p_pointer, const Vector<TouchPos> } touch.clear(); } - } break; - case 3: { // add tuchi - - ERR_FAIL_INDEX(p_pointer, p_points.size()); + case 3: { // add touch - TouchPos tp = p_points[p_pointer]; - touch.push_back(tp); + for (int i = 0; i < p_points.size(); i++) { + if (p_points[i].id == p_pointer) { + TouchPos tp = p_points[i]; + touch.push_back(tp); - Ref<InputEventScreenTouch> ev; - ev.instance(); + Ref<InputEventScreenTouch> ev; + ev.instance(); - ev->set_index(tp.id); - ev->set_pressed(true); - ev->set_position(tp.pos); - input->parse_input_event(ev); + ev->set_index(tp.id); + ev->set_pressed(true); + ev->set_position(tp.pos); + input->parse_input_event(ev); + break; + } + } } break; - case 4: { + case 4: { // remove touch for (int i = 0; i < touch.size(); i++) { if (touch[i].id == p_pointer) { @@ -473,10 +476,10 @@ void OS_Android::process_touch(int p_what, int p_pointer, const Vector<TouchPos> ev->set_position(touch[i].pos); input->parse_input_event(ev); touch.remove(i); - i--; + + break; } } - } break; } } diff --git a/platform/android/os_android.h b/platform/android/os_android.h index c0ab2acd2e..7ace7b5200 100644 --- a/platform/android/os_android.h +++ b/platform/android/os_android.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef OS_ANDROID_H #define OS_ANDROID_H diff --git a/platform/android/platform_config.h b/platform/android/platform_config.h index 3b3ea3930c..299d8563dd 100644 --- a/platform/android/platform_config.h +++ b/platform/android/platform_config.h @@ -27,5 +27,6 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include <alloca.h> #include <malloc.h> diff --git a/platform/android/thread_jandroid.cpp b/platform/android/thread_jandroid.cpp index 29c4e7301c..e85813605f 100644 --- a/platform/android/thread_jandroid.cpp +++ b/platform/android/thread_jandroid.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "thread_jandroid.h" #include "core/safe_refcount.h" diff --git a/platform/android/thread_jandroid.h b/platform/android/thread_jandroid.h index 37b3b38408..2bb64f3db2 100644 --- a/platform/android/thread_jandroid.h +++ b/platform/android/thread_jandroid.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef THREAD_POSIX_H #define THREAD_POSIX_H diff --git a/platform/haiku/audio_driver_media_kit.cpp b/platform/haiku/audio_driver_media_kit.cpp index f687339fec..278a994c54 100644 --- a/platform/haiku/audio_driver_media_kit.cpp +++ b/platform/haiku/audio_driver_media_kit.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "audio_driver_media_kit.h" #ifdef MEDIA_KIT_ENABLED diff --git a/platform/haiku/audio_driver_media_kit.h b/platform/haiku/audio_driver_media_kit.h index 844ab4c60e..a09403e7d6 100644 --- a/platform/haiku/audio_driver_media_kit.h +++ b/platform/haiku/audio_driver_media_kit.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "servers/audio_server.h" #ifdef MEDIA_KIT_ENABLED diff --git a/platform/haiku/context_gl_haiku.cpp b/platform/haiku/context_gl_haiku.cpp index 9332e93389..41df17d2d1 100644 --- a/platform/haiku/context_gl_haiku.cpp +++ b/platform/haiku/context_gl_haiku.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "context_gl_haiku.h" #if defined(OPENGL_ENABLED) diff --git a/platform/haiku/context_gl_haiku.h b/platform/haiku/context_gl_haiku.h index 193c1e77f9..74f09984f2 100644 --- a/platform/haiku/context_gl_haiku.h +++ b/platform/haiku/context_gl_haiku.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef CONTEXT_GL_HAIKU_H #define CONTEXT_GL_HAIKU_H diff --git a/platform/haiku/godot_haiku.cpp b/platform/haiku/godot_haiku.cpp index d207d36606..b042d81650 100644 --- a/platform/haiku/godot_haiku.cpp +++ b/platform/haiku/godot_haiku.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "main/main.h" #include "os_haiku.h" diff --git a/platform/haiku/haiku_application.cpp b/platform/haiku/haiku_application.cpp index d7fa505b79..4f5e3e42a2 100644 --- a/platform/haiku/haiku_application.cpp +++ b/platform/haiku/haiku_application.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "haiku_application.h" HaikuApplication::HaikuApplication() : diff --git a/platform/haiku/haiku_application.h b/platform/haiku/haiku_application.h index 4408f466fb..f92969bbb1 100644 --- a/platform/haiku/haiku_application.h +++ b/platform/haiku/haiku_application.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef HAIKU_APPLICATION_H #define HAIKU_APPLICATION_H diff --git a/platform/haiku/haiku_direct_window.cpp b/platform/haiku/haiku_direct_window.cpp index cf33e42220..b234a2ff91 100644 --- a/platform/haiku/haiku_direct_window.cpp +++ b/platform/haiku/haiku_direct_window.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include <UnicodeChar.h> #include "haiku_direct_window.h" diff --git a/platform/haiku/haiku_direct_window.h b/platform/haiku/haiku_direct_window.h index 0bdcb51ca1..55c2f5fccc 100644 --- a/platform/haiku/haiku_direct_window.h +++ b/platform/haiku/haiku_direct_window.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef HAIKU_DIRECT_WINDOW_H #define HAIKU_DIRECT_WINDOW_H diff --git a/platform/haiku/haiku_gl_view.cpp b/platform/haiku/haiku_gl_view.cpp index e47dc2f726..a40cbe5765 100644 --- a/platform/haiku/haiku_gl_view.cpp +++ b/platform/haiku/haiku_gl_view.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "haiku_gl_view.h" #include "main/main.h" diff --git a/platform/haiku/haiku_gl_view.h b/platform/haiku/haiku_gl_view.h index e67f3e6b0a..1a694dc13b 100644 --- a/platform/haiku/haiku_gl_view.h +++ b/platform/haiku/haiku_gl_view.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef HAIKU_GL_VIEW_H #define HAIKU_GL_VIEW_H diff --git a/platform/haiku/key_mapping_haiku.cpp b/platform/haiku/key_mapping_haiku.cpp index 62671b0cc3..28a282e25c 100644 --- a/platform/haiku/key_mapping_haiku.cpp +++ b/platform/haiku/key_mapping_haiku.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include <InterfaceDefs.h> #include "key_mapping_haiku.h" diff --git a/platform/haiku/key_mapping_haiku.h b/platform/haiku/key_mapping_haiku.h index 5a1b9f9134..917151bc4a 100644 --- a/platform/haiku/key_mapping_haiku.h +++ b/platform/haiku/key_mapping_haiku.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef KEY_MAPPING_HAIKU_H #define KEY_MAPPING_HAIKU_H diff --git a/platform/haiku/os_haiku.cpp b/platform/haiku/os_haiku.cpp index 2d1d976399..97fab5ca0d 100644 --- a/platform/haiku/os_haiku.cpp +++ b/platform/haiku/os_haiku.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "os_haiku.h" #include "drivers/gles3/rasterizer_gles3.h" @@ -114,7 +115,7 @@ Error OS_Haiku::initialize(const VideoMode &p_desired, int p_video_driver, int p visual_server = memnew(VisualServerRaster(rasterizer)); - ERR_FAIL_COND(!visual_server, ERR_UNAVAILABLE); + ERR_FAIL_COND_V(!visual_server, ERR_UNAVAILABLE); // TODO: enable multithreaded VS /* diff --git a/platform/haiku/os_haiku.h b/platform/haiku/os_haiku.h index 9af15eefc0..615ae682ef 100644 --- a/platform/haiku/os_haiku.h +++ b/platform/haiku/os_haiku.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef OS_HAIKU_H #define OS_HAIKU_H diff --git a/platform/haiku/platform_config.h b/platform/haiku/platform_config.h index 5a7bc3db23..bbd72dfeb6 100644 --- a/platform/haiku/platform_config.h +++ b/platform/haiku/platform_config.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include <alloca.h> // for ifaddrs.h needed in drivers/unix/ip_unix.cpp diff --git a/platform/iphone/app_delegate.h b/platform/iphone/app_delegate.h index 11656ca1f3..f14864b5b7 100644 --- a/platform/iphone/app_delegate.h +++ b/platform/iphone/app_delegate.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #import "gl_view.h" #import "view_controller.h" #import <UIKit/UIKit.h> diff --git a/platform/iphone/app_delegate.mm b/platform/iphone/app_delegate.mm index 96f542c170..5c3799ab09 100644 --- a/platform/iphone/app_delegate.mm +++ b/platform/iphone/app_delegate.mm @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #import "app_delegate.h" #include "core/project_settings.h" diff --git a/platform/iphone/export/export.cpp b/platform/iphone/export/export.cpp index 99d44f3b5e..e3119814f4 100644 --- a/platform/iphone/export/export.cpp +++ b/platform/iphone/export/export.cpp @@ -407,7 +407,7 @@ Error EditorExportPlatformIOS::_export_loading_screens(const Ref<EditorExportPre Error err = da->copy(loading_screen_file, p_dest_dir + info.export_name); if (err) { memdelete(da); - String err_str = String("Failed to export loading screen: ") + loading_screen_file; + String err_str = String("Failed to export loading screen (") + info.preset_key + ") from path: " + loading_screen_file; ERR_PRINT(err_str.utf8().get_data()); return err; } diff --git a/platform/iphone/export/export.h b/platform/iphone/export/export.h index f67c34a626..ea79973290 100644 --- a/platform/iphone/export/export.h +++ b/platform/iphone/export/export.h @@ -27,4 +27,5 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + void register_iphone_exporter(); diff --git a/platform/iphone/game_center.h b/platform/iphone/game_center.h index bf7ec1f93e..9a62cccb1a 100644 --- a/platform/iphone/game_center.h +++ b/platform/iphone/game_center.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifdef GAME_CENTER_ENABLED #ifndef GAME_CENTER_H diff --git a/platform/iphone/game_center.mm b/platform/iphone/game_center.mm index 958158c254..57ff79f7bc 100644 --- a/platform/iphone/game_center.mm +++ b/platform/iphone/game_center.mm @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifdef GAME_CENTER_ENABLED #include "game_center.h" diff --git a/platform/iphone/gl_view.mm b/platform/iphone/gl_view.mm index f0dafacd03..69116c64c6 100644 --- a/platform/iphone/gl_view.mm +++ b/platform/iphone/gl_view.mm @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #import "gl_view.h" #include "core/os/keyboard.h" diff --git a/platform/iphone/globals/global_defaults.cpp b/platform/iphone/globals/global_defaults.cpp index 97a7ec1678..ccc90665c5 100644 --- a/platform/iphone/globals/global_defaults.cpp +++ b/platform/iphone/globals/global_defaults.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "global_defaults.h" #include "project_settings.h" diff --git a/platform/iphone/globals/global_defaults.h b/platform/iphone/globals/global_defaults.h index f58659ebff..3e3c220f4a 100644 --- a/platform/iphone/globals/global_defaults.h +++ b/platform/iphone/globals/global_defaults.h @@ -27,4 +27,5 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + void register_iphone_global_defaults(); diff --git a/platform/iphone/godot_iphone.cpp b/platform/iphone/godot_iphone.cpp index 440dae5da5..dacbf42087 100644 --- a/platform/iphone/godot_iphone.cpp +++ b/platform/iphone/godot_iphone.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "main/main.h" #include "os_iphone.h" #include "ustring.h" diff --git a/platform/iphone/icloud.h b/platform/iphone/icloud.h index d2514919ba..52bb1131a0 100644 --- a/platform/iphone/icloud.h +++ b/platform/iphone/icloud.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifdef ICLOUD_ENABLED #ifndef ICLOUD_H diff --git a/platform/iphone/icloud.mm b/platform/iphone/icloud.mm index db4d86b812..7508a480ce 100644 --- a/platform/iphone/icloud.mm +++ b/platform/iphone/icloud.mm @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifdef ICLOUD_ENABLED #include "icloud.h" diff --git a/platform/iphone/in_app_store.h b/platform/iphone/in_app_store.h index 28f23d77e1..7d53eaae20 100644 --- a/platform/iphone/in_app_store.h +++ b/platform/iphone/in_app_store.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifdef STOREKIT_ENABLED #ifndef IN_APP_STORE_H diff --git a/platform/iphone/in_app_store.mm b/platform/iphone/in_app_store.mm index 3399a64732..9bb3d7d3fa 100644 --- a/platform/iphone/in_app_store.mm +++ b/platform/iphone/in_app_store.mm @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifdef STOREKIT_ENABLED #include "in_app_store.h" diff --git a/platform/iphone/ios.h b/platform/iphone/ios.h index aca0ac54a9..5e77683949 100644 --- a/platform/iphone/ios.h +++ b/platform/iphone/ios.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef IOS_H #define IOS_H diff --git a/platform/iphone/ios.mm b/platform/iphone/ios.mm index 48104b9c4f..7eb4f495f7 100644 --- a/platform/iphone/ios.mm +++ b/platform/iphone/ios.mm @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "ios.h" #import <UIKit/UIKit.h> diff --git a/platform/iphone/main.m b/platform/iphone/main.m index dfe468dc13..0f0810f28f 100644 --- a/platform/iphone/main.m +++ b/platform/iphone/main.m @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #import "app_delegate.h" #import <UIKit/UIKit.h> diff --git a/platform/iphone/os_iphone.cpp b/platform/iphone/os_iphone.cpp index d420f95e33..c284ab6905 100644 --- a/platform/iphone/os_iphone.cpp +++ b/platform/iphone/os_iphone.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifdef IPHONE_ENABLED #include "os_iphone.h" diff --git a/platform/iphone/os_iphone.h b/platform/iphone/os_iphone.h index 611bc2d4cb..2e4458aeed 100644 --- a/platform/iphone/os_iphone.h +++ b/platform/iphone/os_iphone.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifdef IPHONE_ENABLED #ifndef OS_IPHONE_H diff --git a/platform/iphone/platform_config.h b/platform/iphone/platform_config.h index 373c70d822..d205c7da83 100644 --- a/platform/iphone/platform_config.h +++ b/platform/iphone/platform_config.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include <alloca.h> #define GLES3_INCLUDE_H <ES3/gl.h> diff --git a/platform/iphone/platform_refcount.h b/platform/iphone/platform_refcount.h index 90e716e4e4..94e4e5fa3b 100644 --- a/platform/iphone/platform_refcount.h +++ b/platform/iphone/platform_refcount.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "safe_refcount.h" #ifdef IPHONE_ENABLED diff --git a/platform/iphone/sem_iphone.cpp b/platform/iphone/sem_iphone.cpp index 04eb6e9332..ec1337d63f 100644 --- a/platform/iphone/sem_iphone.cpp +++ b/platform/iphone/sem_iphone.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "sem_iphone.h" #include <fcntl.h> diff --git a/platform/iphone/sem_iphone.h b/platform/iphone/sem_iphone.h index 8311538419..ebd4e4ee43 100644 --- a/platform/iphone/sem_iphone.h +++ b/platform/iphone/sem_iphone.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef SEM_IPHONE_H #define SEM_IPHONE_H diff --git a/platform/iphone/view_controller.h b/platform/iphone/view_controller.h index cd08be3aa7..31c4f0daf3 100644 --- a/platform/iphone/view_controller.h +++ b/platform/iphone/view_controller.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #import <GameKit/GameKit.h> #import <UIKit/UIKit.h> diff --git a/platform/iphone/view_controller.mm b/platform/iphone/view_controller.mm index f6487ea6c8..cdaae0cb81 100644 --- a/platform/iphone/view_controller.mm +++ b/platform/iphone/view_controller.mm @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #import "view_controller.h" #include "os_iphone.h" diff --git a/platform/javascript/api/api.cpp b/platform/javascript/api/api.cpp index fe3b20b7a0..b377ca4e52 100644 --- a/platform/javascript/api/api.cpp +++ b/platform/javascript/api/api.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "api.h" #include "engine.h" #include "javascript_eval.h" diff --git a/platform/javascript/api/api.h b/platform/javascript/api/api.h index ab3e47ec31..5f22f082e9 100644 --- a/platform/javascript/api/api.h +++ b/platform/javascript/api/api.h @@ -27,5 +27,6 @@ /* 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/api/javascript_eval.h b/platform/javascript/api/javascript_eval.h index d39d97f7c5..05f7c9f38a 100644 --- a/platform/javascript/api/javascript_eval.h +++ b/platform/javascript/api/javascript_eval.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef JAVASCRIPT_EVAL_H #define JAVASCRIPT_EVAL_H diff --git a/platform/javascript/audio_driver_javascript.cpp b/platform/javascript/audio_driver_javascript.cpp index acf6ef87ba..5bf345e6cd 100644 --- a/platform/javascript/audio_driver_javascript.cpp +++ b/platform/javascript/audio_driver_javascript.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "audio_driver_javascript.h" #include <emscripten.h> diff --git a/platform/javascript/audio_driver_javascript.h b/platform/javascript/audio_driver_javascript.h index d44e2c51e6..d78ab8eea4 100644 --- a/platform/javascript/audio_driver_javascript.h +++ b/platform/javascript/audio_driver_javascript.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef AUDIO_DRIVER_JAVASCRIPT_H #define AUDIO_DRIVER_JAVASCRIPT_H diff --git a/platform/javascript/detect.py b/platform/javascript/detect.py index 8472c3ccab..8c7a904bca 100644 --- a/platform/javascript/detect.py +++ b/platform/javascript/detect.py @@ -49,8 +49,14 @@ def configure(env): ## Build type if (env["target"] == "release"): - env.Append(CCFLAGS=['-O3']) - env.Append(LINKFLAGS=['-O3']) + # Use -Os to prioritize optimizing for reduced file size. This is + # particularly valuable for the web platform because it directly + # decreases download time. + # -Os reduces file size by around 5 MiB over -O3. -Oz only saves about + # 100 KiB over -Os, which does not justify the negative impact on + # run-time performance. + env.Append(CCFLAGS=['-Os']) + env.Append(LINKFLAGS=['-Os']) elif (env["target"] == "release_debug"): env.Append(CCFLAGS=['-O2', '-DDEBUG_ENABLED']) diff --git a/platform/javascript/dom_keys.h b/platform/javascript/dom_keys.h index cfd55dfc90..4edca63c6d 100644 --- a/platform/javascript/dom_keys.h +++ b/platform/javascript/dom_keys.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef DOM_KEYS_H #define DOM_KEYS_H diff --git a/platform/javascript/engine.js b/platform/javascript/engine.js index dc4bdc7efb..bca1851f40 100644 --- a/platform/javascript/engine.js +++ b/platform/javascript/engine.js @@ -138,13 +138,17 @@ } var actualCanvas = this.rtenv.canvas; - var context = false; + var testContext = false; + var testCanvas; try { - context = actualCanvas.getContext('webgl2') || actualCanvas.getContext('experimental-webgl2'); + testCanvas = document.createElement('canvas'); + testContext = testCanvas.getContext('webgl2') || testCanvas.getContext('experimental-webgl2'); } catch (e) {} - if (!context) { + if (!testContext) { throw new Error("WebGL 2 not available"); } + testCanvas = null; + testContext = null; // canvas can grab focus on click if (actualCanvas.tabIndex < 0) { diff --git a/platform/javascript/export/export.cpp b/platform/javascript/export/export.cpp index ab7aa96372..61f55beb4e 100644 --- a/platform/javascript/export/export.cpp +++ b/platform/javascript/export/export.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "editor/editor_node.h" #include "editor_export.h" #include "io/zip_io.h" @@ -277,7 +278,7 @@ Error EditorExportPlatformJavaScript::export_project(const Ref<EditorExportPrese 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 + "\n" + TTR("Using default boot splash image."); + EditorNode::get_singleton()->show_warning(TTR("Could not read boot splash image file:") + "\n" + splash_path + "\n" + TTR("Using default boot splash image.")); splash.unref(); } } diff --git a/platform/javascript/export/export.h b/platform/javascript/export/export.h index 756c3ef9fa..2835d0723f 100644 --- a/platform/javascript/export/export.h +++ b/platform/javascript/export/export.h @@ -27,4 +27,5 @@ /* 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_exporter(); diff --git a/platform/javascript/http_client_javascript.cpp b/platform/javascript/http_client_javascript.cpp index f23867cc60..1cd2719723 100644 --- a/platform/javascript/http_client_javascript.cpp +++ b/platform/javascript/http_client_javascript.cpp @@ -3,7 +3,7 @@ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ -/* http://www.godotengine.org */ +/* https://godotengine.org */ /*************************************************************************/ /* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md) */ @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "http_request.h" #include "io/http_client.h" diff --git a/platform/javascript/http_request.h b/platform/javascript/http_request.h index 2ca48bfd00..b5ff46d7fe 100644 --- a/platform/javascript/http_request.h +++ b/platform/javascript/http_request.h @@ -3,7 +3,7 @@ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ -/* http://www.godotengine.org */ +/* https://godotengine.org */ /*************************************************************************/ /* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2014-2018 Godot Engine contributors (cf. AUTHORS.md) */ @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef HTTP_REQUEST_H #define HTTP_REQUEST_H diff --git a/platform/javascript/javascript_eval.cpp b/platform/javascript/javascript_eval.cpp index 9abea29a93..2ef88345f6 100644 --- a/platform/javascript/javascript_eval.cpp +++ b/platform/javascript/javascript_eval.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifdef JAVASCRIPT_EVAL_ENABLED #include "api/javascript_eval.h" diff --git a/platform/javascript/javascript_main.cpp b/platform/javascript/javascript_main.cpp index 973f8f500c..e85fe0800f 100644 --- a/platform/javascript/javascript_main.cpp +++ b/platform/javascript/javascript_main.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "emscripten.h" #include "io/resource_loader.h" #include "main/main.h" @@ -64,7 +65,7 @@ int main(int argc, char *argv[]) { FS.mkdir('/userfs'); FS.mount(IDBFS, {}, '/userfs'); FS.syncfs(true, function(err) { - Module['ccall']('main_after_fs_sync', null, ['string'], [err ? err.message : ""]) + ccall('main_after_fs_sync', null, ['string'], [err ? err.message : ""]) }); ); /* clang-format on */ diff --git a/platform/javascript/os_javascript.cpp b/platform/javascript/os_javascript.cpp index 665280df96..b10ef821dd 100644 --- a/platform/javascript/os_javascript.cpp +++ b/platform/javascript/os_javascript.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "os_javascript.h" #include "core/engine.h" @@ -429,7 +430,7 @@ Error OS_JavaScript::initialize(const VideoMode &p_desired, int p_video_driver, attributes.antialias = false; attributes.majorVersion = 2; EMSCRIPTEN_WEBGL_CONTEXT_HANDLE ctx = emscripten_webgl_create_context(NULL, &attributes); - ERR_FAIL_COND(emscripten_webgl_make_context_current(ctx) != EMSCRIPTEN_RESULT_SUCCESS, ERR_UNAVAILABLE); + ERR_FAIL_COND_V(emscripten_webgl_make_context_current(ctx) != EMSCRIPTEN_RESULT_SUCCESS, ERR_UNAVAILABLE); video_mode = p_desired; // can't fulfil fullscreen request due to browser security @@ -565,7 +566,7 @@ void OS_JavaScript::set_css_cursor(const char *p_cursor) { /* clang-format off */ EM_ASM_({ - Module.canvas.style.cursor = Module.UTF8ToString($0); + Module.canvas.style.cursor = UTF8ToString($0); }, p_cursor); /* clang-format on */ } @@ -575,7 +576,7 @@ const char *OS_JavaScript::get_css_cursor() const { char cursor[16]; /* clang-format off */ EM_ASM_INT({ - Module.stringToUTF8(Module.canvas.style.cursor ? Module.canvas.style.cursor : 'auto', $0, 16); + stringToUTF8(Module.canvas.style.cursor ? Module.canvas.style.cursor : 'auto', $0, 16); }, cursor); /* clang-format on */ return cursor; @@ -781,6 +782,9 @@ void OS_JavaScript::set_cursor_shape(CursorShape p_shape) { set_css_cursor(godot2dom_cursor(cursor_shape)); } +void OS_JavaScript::set_custom_mouse_cursor(const RES &p_cursor, CursorShape p_shape, const Vector2 &p_hotspot) { +} + void OS_JavaScript::main_loop_begin() { if (main_loop) @@ -788,7 +792,7 @@ void OS_JavaScript::main_loop_begin() { /* clang-format off */ EM_ASM_ARGS({ - const send_notification = Module.cwrap('send_notification', null, ['number']); + const send_notification = cwrap('send_notification', null, ['number']); const notifs = arguments; (['mouseover', 'mouseleave', 'focus', 'blur']).forEach(function(event, i) { Module.canvas.addEventListener(event, send_notification.bind(null, notifs[i])); @@ -985,6 +989,7 @@ bool OS_JavaScript::is_userfs_persistent() const { } 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; @@ -997,6 +1002,10 @@ OS_JavaScript::OS_JavaScript(const char *p_execpath, GetUserDataDirFunc p_get_us idbfs_available = false; time_to_save_sync = -1; + + Vector<Logger *> loggers; + loggers.push_back(memnew(StdLogger)); + _set_logger(memnew(CompositeLogger(loggers))); } OS_JavaScript::~OS_JavaScript() { diff --git a/platform/javascript/os_javascript.h b/platform/javascript/os_javascript.h index eaf8465be9..ce4763ab64 100644 --- a/platform/javascript/os_javascript.h +++ b/platform/javascript/os_javascript.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef OS_JAVASCRIPT_H #define OS_JAVASCRIPT_H @@ -127,6 +128,7 @@ public: virtual bool is_userfs_persistent() const; virtual void set_cursor_shape(CursorShape p_shape); + virtual void set_custom_mouse_cursor(const RES &p_cursor, CursorShape p_shape, const Vector2 &p_hotspot); void main_loop_begin(); bool main_loop_iterate(); diff --git a/platform/javascript/platform_config.h b/platform/javascript/platform_config.h index 413fea20d8..af4cf07393 100644 --- a/platform/javascript/platform_config.h +++ b/platform/javascript/platform_config.h @@ -27,4 +27,5 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include <alloca.h> diff --git a/platform/osx/crash_handler_osx.h b/platform/osx/crash_handler_osx.h index 51e0a3ffcb..5d93afb22d 100644 --- a/platform/osx/crash_handler_osx.h +++ b/platform/osx/crash_handler_osx.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef CRASH_HANDLER_OSX_H #define CRASH_HANDLER_OSX_H diff --git a/platform/osx/crash_handler_osx.mm b/platform/osx/crash_handler_osx.mm index c4b5204e1a..d757674a9b 100644 --- a/platform/osx/crash_handler_osx.mm +++ b/platform/osx/crash_handler_osx.mm @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "main/main.h" #include "os_osx.h" #include "project_settings.h" diff --git a/platform/osx/detect.py b/platform/osx/detect.py index 2e686fbee4..bb601abd40 100644 --- a/platform/osx/detect.py +++ b/platform/osx/detect.py @@ -76,7 +76,7 @@ def configure(env): mpprefix = os.environ.get("MACPORTS_PREFIX", "/opt/local") mpclangver = env["macports_clang"] env["CC"] = mpprefix + "/libexec/llvm-" + mpclangver + "/bin/clang" - env["LD"] = mpprefix + "/libexec/llvm-" + mpclangver + "/bin/clang++" + env["LINK"] = mpprefix + "/libexec/llvm-" + mpclangver + "/bin/clang++" env["CXX"] = mpprefix + "/libexec/llvm-" + mpclangver + "/bin/clang++" env['AR'] = mpprefix + "/libexec/llvm-" + mpclangver + "/bin/llvm-ar" env['RANLIB'] = mpprefix + "/libexec/llvm-" + mpclangver + "/bin/llvm-ranlib" @@ -110,7 +110,7 @@ def configure(env): if (env["CXX"] == "clang++"): env.Append(CPPFLAGS=['-DTYPED_METHOD_BIND']) env["CC"] = "clang" - env["LD"] = "clang++" + env["LINK"] = "clang++" ## Dependencies diff --git a/platform/osx/dir_access_osx.h b/platform/osx/dir_access_osx.h index eec3016eaa..e01ff2fe4d 100644 --- a/platform/osx/dir_access_osx.h +++ b/platform/osx/dir_access_osx.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef DIR_ACCESS_OSX_H #define DIR_ACCESS_OSX_H diff --git a/platform/osx/dir_access_osx.mm b/platform/osx/dir_access_osx.mm index a187083dd1..cf66cab060 100644 --- a/platform/osx/dir_access_osx.mm +++ b/platform/osx/dir_access_osx.mm @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "dir_access_osx.h" #if defined(UNIX_ENABLED) || defined(LIBC_FILEIO_ENABLED) diff --git a/platform/osx/export/export.cpp b/platform/osx/export/export.cpp index 657a899367..c4efa1f0ff 100644 --- a/platform/osx/export/export.cpp +++ b/platform/osx/export/export.cpp @@ -359,6 +359,11 @@ Error EditorExportPlatformOSX::export_project(const Ref<EditorExportPreset> &p_p } if (err == OK) { + print_line("Creating " + tmp_app_path_name + "/Contents/Frameworks"); + err = tmp_app_path->make_dir_recursive(tmp_app_path_name + "/Contents/Frameworks"); + } + + if (err == OK) { print_line("Creating " + tmp_app_path_name + "/Contents/Resources"); err = tmp_app_path->make_dir_recursive(tmp_app_path_name + "/Contents/Resources"); } @@ -502,10 +507,23 @@ Error EditorExportPlatformOSX::export_project(const Ref<EditorExportPreset> &p_p if (use_dmg()) { String pack_path = tmp_app_path_name + "/Contents/Resources/" + pkg_name + ".pck"; - err = save_pack(p_preset, pack_path); + Vector<SharedObject> shared_objects; + Error err = save_pack(p_preset, pack_path, &shared_objects); // see if we can code sign our new package String identity = p_preset->get("codesign/identity"); + + if (err == OK) { + DirAccess *da = DirAccess::create(DirAccess::ACCESS_FILESYSTEM); + for (int i = 0; i < shared_objects.size(); i++) { + da->copy(shared_objects[i].path, tmp_app_path_name + "/Contents/Frameworks/" + shared_objects[i].path.get_file()); + if (err == OK && identity != "") { + err = _code_sign(p_preset, tmp_app_path_name + "/Contents/Frameworks/" + shared_objects[i].path.get_file()); + } + } + memdelete(da); + } + if (err == OK && identity != "") { ep.step("Code signing bundle", 2); @@ -541,7 +559,9 @@ Error EditorExportPlatformOSX::export_project(const Ref<EditorExportPreset> &p_p } else { String pack_path = EditorSettings::get_singleton()->get_cache_dir().plus_file(pkg_name + ".pck"); - Error err = save_pack(p_preset, pack_path); + + Vector<SharedObject> shared_objects; + Error err = save_pack(p_preset, pack_path, &shared_objects); if (err == OK) { zipOpenNewFileInZip(dst_pkg_zip, @@ -567,11 +587,32 @@ Error EditorExportPlatformOSX::export_project(const Ref<EditorExportPreset> &p_p break; zipWriteInFileInZip(dst_pkg_zip, buf, r); } + zipCloseFileInZip(dst_pkg_zip); memdelete(pf); } else { err = ERR_CANT_OPEN; } + + //add shared objects + for (int i = 0; i < shared_objects.size(); i++) { + Vector<uint8_t> file = FileAccess::get_file_as_array(shared_objects[i].path); + ERR_CONTINUE(file.empty()); + + zipOpenNewFileInZip(dst_pkg_zip, + (pkg_name + ".app/Contents/Frameworks/").plus_file(shared_objects[i].path.get_file()).utf8().get_data(), + NULL, + NULL, + 0, + NULL, + 0, + NULL, + Z_DEFLATED, + Z_DEFAULT_COMPRESSION); + + zipWriteInFileInZip(dst_pkg_zip, file.ptr(), file.size()); + zipCloseFileInZip(dst_pkg_zip); + } } } } diff --git a/platform/osx/export/export.h b/platform/osx/export/export.h index ccb96022f9..08294fc33c 100644 --- a/platform/osx/export/export.h +++ b/platform/osx/export/export.h @@ -27,4 +27,5 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + void register_osx_exporter(); diff --git a/platform/osx/godot_main_osx.mm b/platform/osx/godot_main_osx.mm index 156b4c02f2..9d1a5566c9 100644 --- a/platform/osx/godot_main_osx.mm +++ b/platform/osx/godot_main_osx.mm @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "main/main.h" #include "os_osx.h" diff --git a/platform/osx/joypad_osx.cpp b/platform/osx/joypad_osx.cpp index bc65aa8149..20ceadca9d 100644 --- a/platform/osx/joypad_osx.cpp +++ b/platform/osx/joypad_osx.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "joypad_osx.h" #include <machine/endian.h> diff --git a/platform/osx/joypad_osx.h b/platform/osx/joypad_osx.h index 78ee4581d5..addbefc5ad 100644 --- a/platform/osx/joypad_osx.h +++ b/platform/osx/joypad_osx.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef JOYPADOSX_H #define JOYPADOSX_H diff --git a/platform/osx/os_osx.h b/platform/osx/os_osx.h index 2a71de12e9..3648d41604 100644 --- a/platform/osx/os_osx.h +++ b/platform/osx/os_osx.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef OS_OSX_H #define OS_OSX_H @@ -138,6 +139,8 @@ 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, bool p_also_set_library_path = false); + virtual void set_cursor_shape(CursorShape p_shape); virtual void set_custom_mouse_cursor(const RES &p_cursor, CursorShape p_shape, const Vector2 &p_hotspot); diff --git a/platform/osx/os_osx.mm b/platform/osx/os_osx.mm index a16391c30f..939f75859c 100644 --- a/platform/osx/os_osx.mm +++ b/platform/osx/os_osx.mm @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "os_osx.h" #include "dir_access_osx.h" @@ -38,6 +39,8 @@ #include "servers/visual/visual_server_raster.h" #include "version_generated.gen.h" +#include <mach-o/dyld.h> + #include <Carbon/Carbon.h> #import <Cocoa/Cocoa.h> #include <IOKit/IOCFPlugIn.h> @@ -48,6 +51,7 @@ #include <os/log.h> #endif +#include <dlfcn.h> #include <fcntl.h> #include <libproc.h> #include <stdio.h> @@ -57,25 +61,31 @@ #include <unistd.h> #if MAC_OS_X_VERSION_MAX_ALLOWED < 101200 +#define NSEventMaskAny NSAnyEventMask +#define NSEventTypeKeyDown NSKeyDown +#define NSEventTypeKeyUp NSKeyUp +#define NSEventModifierFlagShift NSShiftKeyMask +#define NSEventModifierFlagCommand NSCommandKeyMask +#define NSEventModifierFlagControl NSControlKeyMask +#define NSEventModifierFlagOption NSAlternateKeyMask +#define NSWindowStyleMaskTitled NSTitledWindowMask +#define NSWindowStyleMaskResizable NSResizableWindowMask +#define NSWindowStyleMaskMiniaturizable NSMiniaturizableWindowMask +#define NSWindowStyleMaskClosable NSClosableWindowMask #define NSWindowStyleMaskBorderless NSBorderlessWindowMask #endif static NSRect convertRectToBacking(NSRect contentRect) { -#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1070 - if (floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_6) - return [OS_OSX::singleton->window_view convertRectToBacking:contentRect]; - else -#endif /*MAC_OS_X_VERSION_MAX_ALLOWED*/ - return contentRect; + return [OS_OSX::singleton->window_view convertRectToBacking:contentRect]; } static void get_key_modifier_state(unsigned int p_osx_state, Ref<InputEventWithModifiers> state) { - state->set_shift((p_osx_state & NSShiftKeyMask)); - state->set_control((p_osx_state & NSControlKeyMask)); - state->set_alt((p_osx_state & NSAlternateKeyMask)); - state->set_metakey((p_osx_state & NSCommandKeyMask)); + state->set_shift((p_osx_state & NSEventModifierFlagShift)); + state->set_control((p_osx_state & NSEventModifierFlagControl)); + state->set_alt((p_osx_state & NSEventModifierFlagOption)); + state->set_metakey((p_osx_state & NSEventModifierFlagCommand)); } static int mouse_x = 0; @@ -103,7 +113,7 @@ static Vector2 get_mouse_pos(NSEvent *event) { // special case handling of command-period, which is traditionally a special // shortcut in macOS and doesn't arrive at our regular keyDown handler. - if ([event type] == NSKeyDown) { + if ([event type] == NSEventTypeKeyDown) { if (([event modifierFlags] & NSEventModifierFlagCommand) && [event keyCode] == 0x2f) { Ref<InputEventKey> k; @@ -121,7 +131,7 @@ static Vector2 get_mouse_pos(NSEvent *event) { // From http://cocoadev.com/index.pl?GameKeyboardHandlingAlmost // This works around an AppKit bug, where key up events while holding // down the command key don't get sent to the key window. - if ([event type] == NSKeyUp && ([event modifierFlags] & NSCommandKeyMask)) + if ([event type] == NSEventTypeKeyUp && ([event modifierFlags] & NSEventModifierFlagCommand)) [[self keyWindow] sendEvent:event]; else [super sendEvent:event]; @@ -187,7 +197,6 @@ static Vector2 get_mouse_pos(NSEvent *event) { return NO; } -#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1070 - (void)windowDidEnterFullScreen:(NSNotification *)notification { OS_OSX::singleton->zoomed = true; } @@ -195,7 +204,6 @@ static Vector2 get_mouse_pos(NSEvent *event) { - (void)windowDidExitFullScreen:(NSNotification *)notification { OS_OSX::singleton->zoomed = false; } -#endif // MAC_OS_X_VERSION_MAX_ALLOWED - (void)windowDidChangeBackingProperties:(NSNotification *)notification { if (!OS_OSX::singleton) @@ -389,8 +397,8 @@ static const NSRange kEmptyRange = { NSNotFound, 0 }; - (void)cancelComposition { [self unmarkText]; - NSInputManager *currentInputManager = [NSInputManager currentInputManager]; - [currentInputManager markedTextAbandoned:self]; + NSTextInputContext *currentInputContext = [NSTextInputContext currentInputContext]; + [currentInputContext discardMarkedText]; } - (void)insertText:(id)aString { @@ -419,8 +427,8 @@ static const NSRange kEmptyRange = { NSNotFound, 0 }; NSCharacterSet *ctrlChars = [NSCharacterSet controlCharacterSet]; NSCharacterSet *wsnlChars = [NSCharacterSet whitespaceAndNewlineCharacterSet]; if ([characters rangeOfCharacterFromSet:ctrlChars].length && [characters rangeOfCharacterFromSet:wsnlChars].length == 0) { - NSInputManager *currentInputManager = [NSInputManager currentInputManager]; - [currentInputManager markedTextAbandoned:self]; + NSTextInputContext *currentInputContext = [NSTextInputContext currentInputContext]; + [currentInputContext discardMarkedText]; [self cancelComposition]; return; } @@ -506,7 +514,7 @@ static void _mouseDownEvent(NSEvent *event, int index, int mask, bool pressed) { } - (void)mouseDown:(NSEvent *)event { - if (([event modifierFlags] & NSControlKeyMask)) { + if (([event modifierFlags] & NSEventModifierFlagControl)) { mouse_down_control = true; _mouseDownEvent(event, BUTTON_RIGHT, BUTTON_MASK_RIGHT, true); } else { @@ -807,29 +815,29 @@ static int translateKey(unsigned int key) { int mod = [event modifierFlags]; if (key == 0x36 || key == 0x37) { - if (mod & NSCommandKeyMask) { - mod &= ~NSCommandKeyMask; + if (mod & NSEventModifierFlagCommand) { + mod &= ~NSEventModifierFlagCommand; k->set_pressed(true); } else { k->set_pressed(false); } } else if (key == 0x38 || key == 0x3c) { - if (mod & NSShiftKeyMask) { - mod &= ~NSShiftKeyMask; + if (mod & NSEventModifierFlagShift) { + mod &= ~NSEventModifierFlagShift; k->set_pressed(true); } else { k->set_pressed(false); } } else if (key == 0x3a || key == 0x3d) { - if (mod & NSAlternateKeyMask) { - mod &= ~NSAlternateKeyMask; + if (mod & NSEventModifierFlagOption) { + mod &= ~NSEventModifierFlagOption; k->set_pressed(true); } else { k->set_pressed(false); } } else if (key == 0x3b || key == 0x3e) { - if (mod & NSControlKeyMask) { - mod &= ~NSControlKeyMask; + if (mod & NSEventModifierFlagControl) { + mod &= ~NSEventModifierFlagControl; k->set_pressed(true); } else { k->set_pressed(false); @@ -889,20 +897,12 @@ inline void sendPanEvent(double dx, double dy, int modifierFlags) { - (void)scrollWheel:(NSEvent *)event { double deltaX, deltaY; -#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1070 - if (floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_6) { - deltaX = [event scrollingDeltaX]; - deltaY = [event scrollingDeltaY]; + deltaX = [event scrollingDeltaX]; + deltaY = [event scrollingDeltaY]; - if ([event hasPreciseScrollingDeltas]) { - deltaX *= 0.03; - deltaY *= 0.03; - } - } else -#endif // MAC_OS_X_VERSION_MAX_ALLOWED - { - deltaX = [event deltaX]; - deltaY = [event deltaY]; + if ([event hasPreciseScrollingDeltas]) { + deltaX *= 0.03; + deltaY *= 0.03; } if ([event phase] != NSEventPhaseNone || [event momentumPhase] != NSEventPhaseNone) { @@ -1004,7 +1004,7 @@ Error OS_OSX::initialize(const VideoMode &p_desired, int p_video_driver, int p_a if (p_desired.borderless_window) { styleMask = NSWindowStyleMaskBorderless; } else { - styleMask = NSTitledWindowMask | NSClosableWindowMask | NSMiniaturizableWindowMask | (p_desired.resizable ? NSResizableWindowMask : 0); + styleMask = NSWindowStyleMaskTitled | NSWindowStyleMaskClosable | NSWindowStyleMaskMiniaturizable | (p_desired.resizable ? NSWindowStyleMaskResizable : 0); } window_object = [[GodotWindow alloc] @@ -1013,7 +1013,7 @@ Error OS_OSX::initialize(const VideoMode &p_desired, int p_video_driver, int p_a backing:NSBackingStoreBuffered defer:NO]; - ERR_FAIL_COND(window_object == nil, ERR_UNAVAILABLE); + ERR_FAIL_COND_V(window_object == nil, ERR_UNAVAILABLE); window_view = [[GodotContentView alloc] init]; @@ -1029,7 +1029,7 @@ Error OS_OSX::initialize(const VideoMode &p_desired, int p_video_driver, int p_a window_size.width = p_desired.width * displayScale; window_size.height = p_desired.height * displayScale; - if (floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_6 && displayScale > 1.0) { + if (displayScale > 1.0) { [window_view setWantsBestResolutionOpenGLSurface:YES]; //if (current_videomode.resizable) [window_object setCollectionBehavior:NSWindowCollectionBehaviorFullScreenPrimary]; @@ -1041,8 +1041,7 @@ Error OS_OSX::initialize(const VideoMode &p_desired, int p_video_driver, int p_a [window_object setAcceptsMouseMovedEvents:YES]; [window_object center]; - if (floor(NSAppKitVersionNumber) > NSAppKitVersionNumber10_6) - [window_object setRestorable:NO]; + [window_object setRestorable:NO]; unsigned int attributeCount = 0; @@ -1100,11 +1099,11 @@ Error OS_OSX::initialize(const VideoMode &p_desired, int p_video_driver, int p_a #undef ADD_ATTR2 pixelFormat = [[NSOpenGLPixelFormat alloc] initWithAttributes:attributes]; - ERR_FAIL_COND(pixelFormat == nil, ERR_UNAVAILABLE); + ERR_FAIL_COND_V(pixelFormat == nil, ERR_UNAVAILABLE); context = [[NSOpenGLContext alloc] initWithFormat:pixelFormat shareContext:nil]; - ERR_FAIL_COND(context == nil, ERR_UNAVAILABLE); + ERR_FAIL_COND_V(context == nil, ERR_UNAVAILABLE); [context setView:window_view]; @@ -1202,34 +1201,42 @@ public: switch (p_type) { case ERR_WARNING: - os_log_info(OS_LOG_DEFAULT, - "WARNING: %{public}s: %{public}s\nAt: %{public}s:%i.", - p_function, err_details, p_file, p_line); + if (floor(NSAppKitVersionNumber) >= NSAppKitVersionNumber10_12) { + os_log_info(OS_LOG_DEFAULT, + "WARNING: %{public}s: %{public}s\nAt: %{public}s:%i.", + p_function, err_details, p_file, p_line); + } logf_error("\E[1;33mWARNING: %s: \E[0m\E[1m%s\n", p_function, err_details); logf_error("\E[0;33m At: %s:%i.\E[0m\n", p_file, p_line); break; case ERR_SCRIPT: - os_log_error(OS_LOG_DEFAULT, - "SCRIPT ERROR: %{public}s: %{public}s\nAt: %{public}s:%i.", - p_function, err_details, p_file, p_line); + if (floor(NSAppKitVersionNumber) >= NSAppKitVersionNumber10_12) { + os_log_error(OS_LOG_DEFAULT, + "SCRIPT ERROR: %{public}s: %{public}s\nAt: %{public}s:%i.", + p_function, err_details, p_file, p_line); + } logf_error("\E[1;35mSCRIPT ERROR: %s: \E[0m\E[1m%s\n", p_function, err_details); logf_error("\E[0;35m At: %s:%i.\E[0m\n", p_file, p_line); break; case ERR_SHADER: - os_log_error(OS_LOG_DEFAULT, - "SHADER ERROR: %{public}s: %{public}s\nAt: %{public}s:%i.", - p_function, err_details, p_file, p_line); + if (floor(NSAppKitVersionNumber) >= NSAppKitVersionNumber10_12) { + os_log_error(OS_LOG_DEFAULT, + "SHADER ERROR: %{public}s: %{public}s\nAt: %{public}s:%i.", + p_function, err_details, p_file, p_line); + } logf_error("\E[1;36mSHADER ERROR: %s: \E[0m\E[1m%s\n", p_function, err_details); logf_error("\E[0;36m At: %s:%i.\E[0m\n", p_file, p_line); break; case ERR_ERROR: default: - os_log_error(OS_LOG_DEFAULT, - "ERROR: %{public}s: %{public}s\nAt: %{public}s:%i.", - p_function, err_details, p_file, p_line); + if (floor(NSAppKitVersionNumber) >= NSAppKitVersionNumber10_12) { + os_log_error(OS_LOG_DEFAULT, + "ERROR: %{public}s: %{public}s\nAt: %{public}s:%i.", + p_function, err_details, p_file, p_line); + } logf_error("\E[1;31mERROR: %s: \E[0m\E[1m%s\n", p_function, err_details); logf_error("\E[0;31m At: %s:%i.\E[0m\n", p_file, p_line); break; @@ -1258,6 +1265,28 @@ void OS_OSX::alert(const String &p_alert, const String &p_title) { [window release]; } +Error OS_OSX::open_dynamic_library(const String p_path, void *&p_library_handle, bool p_also_set_library_path) { + + String path = p_path; + + if (!FileAccess::exists(path)) { + //this code exists so gdnative can load .dylib files from within the executable path + path = get_executable_path().get_base_dir().plus_file(p_path.get_file()); + } + + if (!FileAccess::exists(path)) { + //this code exists so gdnative can load .dylib files from a standard macOS location + path = get_executable_path().get_base_dir().plus_file("../Frameworks").plus_file(p_path.get_file()); + } + + p_library_handle = dlopen(path.utf8().get_data(), RTLD_NOW); + if (!p_library_handle) { + ERR_EXPLAIN("Can't open dynamic library: " + p_path + ". Error: " + dlerror()); + ERR_FAIL_V(ERR_CANT_OPEN); + } + return OK; +} + void OS_OSX::set_cursor_shape(CursorShape p_shape) { if (cursor_shape == p_shape) @@ -1742,9 +1771,8 @@ float OS_OSX::_display_scale(id screen) const { if ([screen respondsToSelector:@selector(backingScaleFactor)]) { return fmax(1.0, [screen backingScaleFactor]); } - } else { - return 1.0; } + return 1.0; } Point2 OS_OSX::get_native_window_position() const { @@ -1803,10 +1831,14 @@ void OS_OSX::set_window_size(const Size2 p_size) { CGFloat menuBarHeight = [[[NSApplication sharedApplication] mainMenu] menuBarHeight]; if (menuBarHeight != 0.f) { size.y += menuBarHeight; -#if MAC_OS_X_VERSION_MAX_ALLOWED <= 101104 } else { - size.y += [[NSStatusBar systemStatusBar] thickness]; +#if MAC_OS_X_VERSION_MAX_ALLOWED >= 101200 + if (floor(NSAppKitVersionNumber) < NSAppKitVersionNumber10_12) { +#else + { #endif + size.y += [[NSStatusBar systemStatusBar] thickness]; + } } } @@ -1819,36 +1851,27 @@ void OS_OSX::set_window_size(const Size2 p_size) { void OS_OSX::set_window_fullscreen(bool p_enabled) { if (zoomed != p_enabled) { -#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1070 [window_object toggleFullScreen:nil]; -#else - [window_object performZoom:nil]; -#endif /*MAC_OS_X_VERSION_MAX_ALLOWED*/ } zoomed = p_enabled; }; bool OS_OSX::is_window_fullscreen() const { -#if MAC_OS_X_VERSION_MAX_ALLOWED < 1070 - if ([window_object respondsToSelector:@selector(isZoomed)]) - return [window_object isZoomed]; -#endif /*MAC_OS_X_VERSION_MAX_ALLOWED*/ - return zoomed; }; void OS_OSX::set_window_resizable(bool p_enabled) { if (p_enabled) - [window_object setStyleMask:[window_object styleMask] | NSResizableWindowMask]; + [window_object setStyleMask:[window_object styleMask] | NSWindowStyleMaskResizable]; else - [window_object setStyleMask:[window_object styleMask] & ~NSResizableWindowMask]; + [window_object setStyleMask:[window_object styleMask] & ~NSWindowStyleMaskResizable]; }; bool OS_OSX::is_window_resizable() const { - return [window_object styleMask] & NSResizableWindowMask; + return [window_object styleMask] & NSWindowStyleMaskResizable; }; void OS_OSX::set_window_minimized(bool p_enabled) { @@ -1903,7 +1926,7 @@ void OS_OSX::set_borderless_window(bool p_borderless) { if (p_borderless) { [window_object setStyleMask:NSWindowStyleMaskBorderless]; } else { - [window_object setStyleMask:NSTitledWindowMask | NSClosableWindowMask | NSMiniaturizableWindowMask | NSResizableWindowMask]; + [window_object setStyleMask:NSWindowStyleMaskTitled | NSWindowStyleMaskClosable | NSWindowStyleMaskMiniaturizable | NSWindowStyleMaskResizable]; // Force update of the window styles NSRect frameRect = [window_object frame]; @@ -2027,7 +2050,7 @@ void OS_OSX::process_events() { while (true) { NSEvent *event = [NSApp - nextEventMatchingMask:NSAnyEventMask + nextEventMatchingMask:NSEventMaskAny untilDate:[NSDate distantPast] inMode:NSDefaultRunLoopMode dequeue:YES]; @@ -2219,7 +2242,7 @@ OS_OSX::OS_OSX() { [apple_menu addItemWithTitle:title action:@selector(hide:) keyEquivalent:@"h"]; menu_item = [apple_menu addItemWithTitle:NSLocalizedString(@"Hide Others", nil) action:@selector(hideOtherApplications:) keyEquivalent:@"h"]; - [menu_item setKeyEquivalentModifierMask:(NSAlternateKeyMask | NSCommandKeyMask)]; + [menu_item setKeyEquivalentModifierMask:(NSEventModifierFlagOption | NSEventModifierFlagCommand)]; [apple_menu addItemWithTitle:NSLocalizedString(@"Show all", nil) action:@selector(unhideAllApplications:) keyEquivalent:@""]; diff --git a/platform/osx/platform_config.h b/platform/osx/platform_config.h index a3715e7e4e..1b497cebef 100644 --- a/platform/osx/platform_config.h +++ b/platform/osx/platform_config.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include <alloca.h> #define GLES3_INCLUDE_H "glad/glad.h" diff --git a/platform/osx/sem_osx.cpp b/platform/osx/sem_osx.cpp index 2e7da62e5b..92f749322e 100644 --- a/platform/osx/sem_osx.cpp +++ b/platform/osx/sem_osx.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "sem_osx.h" #include <fcntl.h> diff --git a/platform/osx/sem_osx.h b/platform/osx/sem_osx.h index 0b9bbdfa76..ce31e966b7 100644 --- a/platform/osx/sem_osx.h +++ b/platform/osx/sem_osx.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef SEM_OSX_H #define SEM_OSX_H diff --git a/platform/register_platform_apis.h b/platform/register_platform_apis.h index 3ac3b319da..1c50eb95e3 100644 --- a/platform/register_platform_apis.h +++ b/platform/register_platform_apis.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef REGISTER_APIS_H #define REGISTER_APIS_H diff --git a/platform/server/detect.py b/platform/server/detect.py index ffec2af933..72c9c770e3 100644 --- a/platform/server/detect.py +++ b/platform/server/detect.py @@ -59,7 +59,7 @@ def configure(env): if ('clang++' not in env['CXX']): env["CC"] = "clang" env["CXX"] = "clang++" - env["LD"] = "clang++" + env["LINK"] = "clang++" env.Append(CPPFLAGS=['-DTYPED_METHOD_BIND']) env.extra_suffix = ".llvm" + env.extra_suffix diff --git a/platform/server/godot_server.cpp b/platform/server/godot_server.cpp index 8e4742a1b0..3e48f0bf7f 100644 --- a/platform/server/godot_server.cpp +++ b/platform/server/godot_server.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "main/main.h" #include "os_server.h" diff --git a/platform/server/os_server.cpp b/platform/server/os_server.cpp index e8d076322c..370a347399 100644 --- a/platform/server/os_server.cpp +++ b/platform/server/os_server.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + //#include "servers/visual/visual_server_raster.h" //#include "servers/visual/rasterizer_dummy.h" #include "os_server.h" @@ -67,7 +68,7 @@ Error OS_Server::initialize(const VideoMode &p_desired, int p_video_driver, int spatial_sound_2d_server = memnew(SpatialSound2DServerSW); spatial_sound_2d_server->init(); - ERR_FAIL_COND(!visual_server, ERR_UNAVAILABLE); + ERR_FAIL_COND_V(!visual_server, ERR_UNAVAILABLE); visual_server->init(); @@ -77,6 +78,7 @@ Error OS_Server::initialize(const VideoMode &p_desired, int p_video_driver, int return OK; } + void OS_Server::finalize() { if (main_loop) diff --git a/platform/server/os_server.h b/platform/server/os_server.h index 6739375468..7abb4565d5 100644 --- a/platform/server/os_server.h +++ b/platform/server/os_server.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef OS_SERVER_H #define OS_SERVER_H diff --git a/platform/server/platform_config.h b/platform/server/platform_config.h index 413fea20d8..af4cf07393 100644 --- a/platform/server/platform_config.h +++ b/platform/server/platform_config.h @@ -27,4 +27,5 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include <alloca.h> diff --git a/platform/uwp/app.cpp b/platform/uwp/app.cpp index 4468c18eba..5ff62b38f9 100644 --- a/platform/uwp/app.cpp +++ b/platform/uwp/app.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + // // This file demonstrates how to initialize EGL in a Windows Store app, using ICoreWindow. // diff --git a/platform/uwp/app.h b/platform/uwp/app.h index 0641ea1b8c..c23270b8ba 100644 --- a/platform/uwp/app.h +++ b/platform/uwp/app.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #pragma once #include <string> diff --git a/platform/uwp/export/export.h b/platform/uwp/export/export.h index 8e248b1969..bd759c8647 100644 --- a/platform/uwp/export/export.h +++ b/platform/uwp/export/export.h @@ -27,4 +27,5 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + void register_uwp_exporter(); diff --git a/platform/uwp/gl_context_egl.cpp b/platform/uwp/gl_context_egl.cpp index 2dde05a01f..88c9c8d687 100644 --- a/platform/uwp/gl_context_egl.cpp +++ b/platform/uwp/gl_context_egl.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "gl_context_egl.h" #include "EGL/eglext.h" diff --git a/platform/uwp/gl_context_egl.h b/platform/uwp/gl_context_egl.h index 55fd7ce705..527baf1054 100644 --- a/platform/uwp/gl_context_egl.h +++ b/platform/uwp/gl_context_egl.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef CONTEXT_EGL_H #define CONTEXT_EGL_H diff --git a/platform/uwp/joypad_uwp.h b/platform/uwp/joypad_uwp.h index 442f805b1f..98202cce9e 100644 --- a/platform/uwp/joypad_uwp.h +++ b/platform/uwp/joypad_uwp.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef JOYPAD_UWP_H #define JOYPAD_UWP_H diff --git a/platform/uwp/os_uwp.cpp b/platform/uwp/os_uwp.cpp index 96f9c895bc..d00da3dbcd 100644 --- a/platform/uwp/os_uwp.cpp +++ b/platform/uwp/os_uwp.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "os_uwp.h" #include "drivers/gles3/rasterizer_gles3.h" diff --git a/platform/uwp/os_uwp.h b/platform/uwp/os_uwp.h index ad12b6286f..95afdab469 100644 --- a/platform/uwp/os_uwp.h +++ b/platform/uwp/os_uwp.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef OSUWP_H #define OSUWP_H diff --git a/platform/uwp/platform_config.h b/platform/uwp/platform_config.h index 0a21339237..606795479b 100644 --- a/platform/uwp/platform_config.h +++ b/platform/uwp/platform_config.h @@ -27,4 +27,5 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include <malloc.h> diff --git a/platform/uwp/thread_uwp.cpp b/platform/uwp/thread_uwp.cpp index 79d244dd61..25cd29190f 100644 --- a/platform/uwp/thread_uwp.cpp +++ b/platform/uwp/thread_uwp.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "thread_uwp.h" #include "os/memory.h" diff --git a/platform/uwp/thread_uwp.h b/platform/uwp/thread_uwp.h index 24ae5ec22a..89081f3b2b 100644 --- a/platform/uwp/thread_uwp.h +++ b/platform/uwp/thread_uwp.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef THREAD_UWP_H #define THREAD_UWP_H diff --git a/platform/windows/context_gl_win.cpp b/platform/windows/context_gl_win.cpp index 6875d23dfa..8b57fdd9ce 100644 --- a/platform/windows/context_gl_win.cpp +++ b/platform/windows/context_gl_win.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #if defined(OPENGL_ENABLED) || defined(GLES_ENABLED) // Author: Juan Linietsky <reduzio@gmail.com>, (C) 2008 diff --git a/platform/windows/context_gl_win.h b/platform/windows/context_gl_win.h index d30f842f4b..e7578a1aeb 100644 --- a/platform/windows/context_gl_win.h +++ b/platform/windows/context_gl_win.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #if defined(OPENGL_ENABLED) || defined(GLES_ENABLED) // Author: Juan Linietsky <reduzio@gmail.com>, (C) 2008 diff --git a/platform/windows/crash_handler_win.cpp b/platform/windows/crash_handler_win.cpp index 50b4f2d811..804c2d44eb 100644 --- a/platform/windows/crash_handler_win.cpp +++ b/platform/windows/crash_handler_win.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "main/main.h" #include "os_windows.h" #include "project_settings.h" diff --git a/platform/windows/crash_handler_win.h b/platform/windows/crash_handler_win.h index 6f170fb958..95b1468197 100644 --- a/platform/windows/crash_handler_win.h +++ b/platform/windows/crash_handler_win.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef CRASH_HANDLER_WIN_H #define CRASH_HANDLER_WIN_H diff --git a/platform/windows/ctxgl_procaddr.cpp b/platform/windows/ctxgl_procaddr.cpp index dfb15cc358..434eeea16e 100644 --- a/platform/windows/ctxgl_procaddr.cpp +++ b/platform/windows/ctxgl_procaddr.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifdef OPENGL_ENABLED #include "ctxgl_procaddr.h" #include <GL/gl.h> diff --git a/platform/windows/ctxgl_procaddr.h b/platform/windows/ctxgl_procaddr.h index 168f808285..cd229fb8db 100644 --- a/platform/windows/ctxgl_procaddr.h +++ b/platform/windows/ctxgl_procaddr.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef CTXGL_PROCADDR_H #define CTXGL_PROCADDR_H diff --git a/platform/windows/detect.py b/platform/windows/detect.py index 489bac50f5..bd05d5605d 100644 --- a/platform/windows/detect.py +++ b/platform/windows/detect.py @@ -265,7 +265,7 @@ def configure(env): env['CXX'] = mingw_prefix + "g++" env['AR'] = mingw_prefix + "gcc-ar" env['RANLIB'] = mingw_prefix + "gcc-ranlib" - env['LD'] = mingw_prefix + "g++" + env['LINK'] = mingw_prefix + "g++" env["x86_libtheora_opt_gcc"] = True if env['use_lto']: diff --git a/platform/windows/export/export.cpp b/platform/windows/export/export.cpp index d5c2cf7992..97544c18f5 100644 --- a/platform/windows/export/export.cpp +++ b/platform/windows/export/export.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "editor/editor_export.h" #include "editor/editor_settings.h" #include "os/file_access.h" diff --git a/platform/windows/export/export.h b/platform/windows/export/export.h index 78421928ff..7f62e8955c 100644 --- a/platform/windows/export/export.h +++ b/platform/windows/export/export.h @@ -27,4 +27,5 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + void register_windows_exporter(); diff --git a/platform/windows/godot_win.cpp b/platform/windows/godot_win.cpp index 20e351c47c..80f53dd1a1 100644 --- a/platform/windows/godot_win.cpp +++ b/platform/windows/godot_win.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "main/main.h" #include "os_windows.h" #include <locale.h> diff --git a/platform/windows/joypad.cpp b/platform/windows/joypad.cpp index 4a3936b175..796531fe24 100644 --- a/platform/windows/joypad.cpp +++ b/platform/windows/joypad.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "joypad.h" #include <oleauto.h> #include <wbemidl.h> diff --git a/platform/windows/joypad.h b/platform/windows/joypad.h index f3d24bce85..0d14480733 100644 --- a/platform/windows/joypad.h +++ b/platform/windows/joypad.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef JOYPAD_H #define JOYPAD_H diff --git a/platform/windows/key_mapping_win.cpp b/platform/windows/key_mapping_win.cpp index bb90cb661a..69dd385354 100644 --- a/platform/windows/key_mapping_win.cpp +++ b/platform/windows/key_mapping_win.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "key_mapping_win.h" #include <stdio.h> diff --git a/platform/windows/key_mapping_win.h b/platform/windows/key_mapping_win.h index 2daf3f4f01..8d6461f27d 100644 --- a/platform/windows/key_mapping_win.h +++ b/platform/windows/key_mapping_win.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef KEY_MAPPING_WINDOWS_H #define KEY_MAPPING_WINDOWS_H diff --git a/platform/windows/lang_table.h b/platform/windows/lang_table.h index 614fbd8ae9..1a966b502a 100644 --- a/platform/windows/lang_table.h +++ b/platform/windows/lang_table.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef LANG_TABLE_H #define LANG_TABLE_H diff --git a/platform/windows/os_windows.cpp b/platform/windows/os_windows.cpp index a48ae8cc8c..4f4b225b14 100644 --- a/platform/windows/os_windows.cpp +++ b/platform/windows/os_windows.cpp @@ -416,6 +416,7 @@ LRESULT OS_Windows::WndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) /*mm->get_button_mask()|=(wParam&MK_XBUTTON1)?(1<<5):0; mm->get_button_mask()|=(wParam&MK_XBUTTON2)?(1<<6):0;*/ mm->set_position(Vector2(GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam))); + mm->set_global_position(Vector2(GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam))); if (mouse_mode == MOUSE_MODE_CAPTURED) { @@ -1633,6 +1634,13 @@ void OS_Windows::_update_window_style(bool repaint) { Error OS_Windows::open_dynamic_library(const String p_path, void *&p_library_handle, bool p_also_set_library_path) { + String path = p_path; + + if (!FileAccess::exists(path)) { + //this code exists so gdnative can load .dll files from within the executable path + path = get_executable_path().get_base_dir().plus_file(p_path.get_file()); + } + typedef DLL_DIRECTORY_COOKIE(WINAPI * PAddDllDirectory)(PCWSTR); typedef BOOL(WINAPI * PRemoveDllDirectory)(DLL_DIRECTORY_COOKIE); @@ -1643,10 +1651,10 @@ Error OS_Windows::open_dynamic_library(const String p_path, void *&p_library_han DLL_DIRECTORY_COOKIE cookie; if (p_also_set_library_path && has_dll_directory_api) { - cookie = add_dll_directory(p_path.get_base_dir().c_str()); + cookie = add_dll_directory(path.get_base_dir().c_str()); } - p_library_handle = (void *)LoadLibraryExW(p_path.c_str(), NULL, (p_also_set_library_path && has_dll_directory_api) ? LOAD_LIBRARY_SEARCH_DEFAULT_DIRS : 0); + p_library_handle = (void *)LoadLibraryExW(path.c_str(), NULL, (p_also_set_library_path && has_dll_directory_api) ? LOAD_LIBRARY_SEARCH_DEFAULT_DIRS : 0); if (p_also_set_library_path && has_dll_directory_api) { remove_dll_directory(cookie); diff --git a/platform/windows/os_windows.h b/platform/windows/os_windows.h index 1863642f39..c24e35e929 100644 --- a/platform/windows/os_windows.h +++ b/platform/windows/os_windows.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef OS_WINDOWS_H #define OS_WINDOWS_H #include "context_gl_win.h" diff --git a/platform/windows/platform_config.h b/platform/windows/platform_config.h index 6c26a8228d..10ec9110d1 100644 --- a/platform/windows/platform_config.h +++ b/platform/windows/platform_config.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include <malloc.h> //#else //#include <alloca.h> diff --git a/platform/x11/context_gl_x11.cpp b/platform/x11/context_gl_x11.cpp index b232f36a46..20f2212861 100644 --- a/platform/x11/context_gl_x11.cpp +++ b/platform/x11/context_gl_x11.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "context_gl_x11.h" #ifdef X11_ENABLED diff --git a/platform/x11/context_gl_x11.h b/platform/x11/context_gl_x11.h index efebd3f78d..c969f0044d 100644 --- a/platform/x11/context_gl_x11.h +++ b/platform/x11/context_gl_x11.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef CONTEXT_GL_X11_H #define CONTEXT_GL_X11_H diff --git a/platform/x11/crash_handler_x11.cpp b/platform/x11/crash_handler_x11.cpp index f0eb8a6d5b..43b9051ea7 100644 --- a/platform/x11/crash_handler_x11.cpp +++ b/platform/x11/crash_handler_x11.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifdef DEBUG_ENABLED #define CRASH_HANDLER_ENABLED 1 #endif diff --git a/platform/x11/crash_handler_x11.h b/platform/x11/crash_handler_x11.h index 36ab29b597..49ca0df9a8 100644 --- a/platform/x11/crash_handler_x11.h +++ b/platform/x11/crash_handler_x11.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef CRASH_HANDLER_X11_H #define CRASH_HANDLER_X11_H diff --git a/platform/x11/detect.py b/platform/x11/detect.py index cb45fed1be..478b42f9f7 100644 --- a/platform/x11/detect.py +++ b/platform/x11/detect.py @@ -109,7 +109,7 @@ def configure(env): if ('clang++' not in env['CXX']): env["CC"] = "clang" env["CXX"] = "clang++" - env["LD"] = "clang++" + env["LINK"] = "clang++" env.Append(CPPFLAGS=['-DTYPED_METHOD_BIND']) env.extra_suffix = ".llvm" + env.extra_suffix diff --git a/platform/x11/export/export.cpp b/platform/x11/export/export.cpp index 3a8786f296..904aceaca0 100644 --- a/platform/x11/export/export.cpp +++ b/platform/x11/export/export.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "export.h" #include "editor/editor_export.h" diff --git a/platform/x11/export/export.h b/platform/x11/export/export.h index 152a64df86..ac44cef8f7 100644 --- a/platform/x11/export/export.h +++ b/platform/x11/export/export.h @@ -27,4 +27,5 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + void register_x11_exporter(); diff --git a/platform/x11/godot_x11.cpp b/platform/x11/godot_x11.cpp index c7d7bb643b..3241cbcbf9 100644 --- a/platform/x11/godot_x11.cpp +++ b/platform/x11/godot_x11.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include <limits.h> #include <locale.h> #include <stdlib.h> diff --git a/platform/x11/key_mapping_x11.cpp b/platform/x11/key_mapping_x11.cpp index 5e15768d66..423e2737ee 100644 --- a/platform/x11/key_mapping_x11.cpp +++ b/platform/x11/key_mapping_x11.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "key_mapping_x11.h" /***** SCAN CODE CONVERSION ******/ diff --git a/platform/x11/key_mapping_x11.h b/platform/x11/key_mapping_x11.h index 022affcbea..62dfcf3a4d 100644 --- a/platform/x11/key_mapping_x11.h +++ b/platform/x11/key_mapping_x11.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef KEY_MAPPING_X11_H #define KEY_MAPPING_X11_H diff --git a/platform/x11/os_x11.cpp b/platform/x11/os_x11.cpp index 5ca3ad45b8..e4165e2fe3 100644 --- a/platform/x11/os_x11.cpp +++ b/platform/x11/os_x11.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "os_x11.h" #include "drivers/gles3/rasterizer_gles3.h" #include "errno.h" @@ -522,6 +523,8 @@ Error OS_X11::initialize(const VideoMode &p_desired, int p_video_driver, int p_a _window_changed(&xevent); } } + + return OK; } void OS_X11::xim_destroy_callback(::XIM im, ::XPointer client_data, diff --git a/platform/x11/os_x11.h b/platform/x11/os_x11.h index 2bf2f3cf26..f7bc0b73e0 100644 --- a/platform/x11/os_x11.h +++ b/platform/x11/os_x11.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef OS_X11_H #define OS_X11_H diff --git a/platform/x11/platform_config.h b/platform/x11/platform_config.h index 0ad94803c2..58d6b210ee 100644 --- a/platform/x11/platform_config.h +++ b/platform/x11/platform_config.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifdef __linux__ #include <alloca.h> #endif diff --git a/scene/2d/animated_sprite.cpp b/scene/2d/animated_sprite.cpp index fb8bb3bb83..a9d3a4cc64 100644 --- a/scene/2d/animated_sprite.cpp +++ b/scene/2d/animated_sprite.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "animated_sprite.h" #include "os/os.h" #include "scene/scene_string_names.h" diff --git a/scene/2d/animated_sprite.h b/scene/2d/animated_sprite.h index 8a696a40fc..2c356d619f 100644 --- a/scene/2d/animated_sprite.h +++ b/scene/2d/animated_sprite.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef ANIMATED_SPRITE_H #define ANIMATED_SPRITE_H diff --git a/scene/2d/area_2d.cpp b/scene/2d/area_2d.cpp index 29a01d30e1..6ecf661efd 100644 --- a/scene/2d/area_2d.cpp +++ b/scene/2d/area_2d.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "area_2d.h" #include "scene/scene_string_names.h" #include "servers/audio_server.h" diff --git a/scene/2d/area_2d.h b/scene/2d/area_2d.h index 66217c7b08..0fda9b867d 100644 --- a/scene/2d/area_2d.h +++ b/scene/2d/area_2d.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef AREA_2D_H #define AREA_2D_H diff --git a/scene/2d/audio_stream_player_2d.cpp b/scene/2d/audio_stream_player_2d.cpp index 937a026e34..ed602bbc70 100644 --- a/scene/2d/audio_stream_player_2d.cpp +++ b/scene/2d/audio_stream_player_2d.cpp @@ -1,3 +1,32 @@ +/*************************************************************************/ +/* audio_stream_player_2d.cpp */ +/*************************************************************************/ +/* This file is part of: */ +/* GODOT ENGINE */ +/* https://godotengine.org */ +/*************************************************************************/ +/* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ +/* Copyright (c) 2014-2018 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 "audio_stream_player_2d.h" diff --git a/scene/2d/audio_stream_player_2d.h b/scene/2d/audio_stream_player_2d.h index 85104fce21..39bc985f58 100644 --- a/scene/2d/audio_stream_player_2d.h +++ b/scene/2d/audio_stream_player_2d.h @@ -1,3 +1,33 @@ +/*************************************************************************/ +/* audio_stream_player_2d.h */ +/*************************************************************************/ +/* This file is part of: */ +/* GODOT ENGINE */ +/* https://godotengine.org */ +/*************************************************************************/ +/* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ +/* Copyright (c) 2014-2018 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 AUDIO_STREAM_PLAYER_2D_H #define AUDIO_STREAM_PLAYER_2D_H diff --git a/scene/2d/back_buffer_copy.cpp b/scene/2d/back_buffer_copy.cpp index 1d13db493c..446b367be0 100644 --- a/scene/2d/back_buffer_copy.cpp +++ b/scene/2d/back_buffer_copy.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "back_buffer_copy.h" void BackBufferCopy::_update_copy_mode() { diff --git a/scene/2d/back_buffer_copy.h b/scene/2d/back_buffer_copy.h index 01438ca7a1..b786c2b828 100644 --- a/scene/2d/back_buffer_copy.h +++ b/scene/2d/back_buffer_copy.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef BACKBUFFERCOPY_H #define BACKBUFFERCOPY_H diff --git a/scene/2d/camera_2d.cpp b/scene/2d/camera_2d.cpp index 02e21913a5..0a6d80d49c 100644 --- a/scene/2d/camera_2d.cpp +++ b/scene/2d/camera_2d.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "camera_2d.h" #include "core/math/math_funcs.h" #include "scene/scene_string_names.h" diff --git a/scene/2d/camera_2d.h b/scene/2d/camera_2d.h index 743bf6abd6..99571500bf 100644 --- a/scene/2d/camera_2d.h +++ b/scene/2d/camera_2d.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef CAMERA_2D_H #define CAMERA_2D_H diff --git a/scene/2d/canvas_item.cpp b/scene/2d/canvas_item.cpp index 4fb22ac04a..0854efc69c 100644 --- a/scene/2d/canvas_item.cpp +++ b/scene/2d/canvas_item.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "canvas_item.h" #include "core/method_bind_ext.gen.inc" #include "message_queue.h" diff --git a/scene/2d/canvas_item.h b/scene/2d/canvas_item.h index 1db9e4902a..7e5bea0511 100644 --- a/scene/2d/canvas_item.h +++ b/scene/2d/canvas_item.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef CANVAS_ITEM_H #define CANVAS_ITEM_H diff --git a/scene/2d/canvas_modulate.cpp b/scene/2d/canvas_modulate.cpp index 925c01f6b3..2f8568ccbf 100644 --- a/scene/2d/canvas_modulate.cpp +++ b/scene/2d/canvas_modulate.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "canvas_modulate.h" void CanvasModulate::_notification(int p_what) { diff --git a/scene/2d/canvas_modulate.h b/scene/2d/canvas_modulate.h index b9d7b14b0a..888ed95f6b 100644 --- a/scene/2d/canvas_modulate.h +++ b/scene/2d/canvas_modulate.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef CANVASMODULATE_H #define CANVASMODULATE_H diff --git a/scene/2d/collision_object_2d.cpp b/scene/2d/collision_object_2d.cpp index b4f9f3fd9d..e451e7a65b 100644 --- a/scene/2d/collision_object_2d.cpp +++ b/scene/2d/collision_object_2d.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "collision_object_2d.h" #include "scene/scene_string_names.h" #include "servers/physics_2d_server.h" diff --git a/scene/2d/collision_object_2d.h b/scene/2d/collision_object_2d.h index 62298b4036..ee3cea46a5 100644 --- a/scene/2d/collision_object_2d.h +++ b/scene/2d/collision_object_2d.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef COLLISION_OBJECT_2D_H #define COLLISION_OBJECT_2D_H diff --git a/scene/2d/collision_polygon_2d.cpp b/scene/2d/collision_polygon_2d.cpp index 8c6b25f296..965507e385 100644 --- a/scene/2d/collision_polygon_2d.cpp +++ b/scene/2d/collision_polygon_2d.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "collision_polygon_2d.h" #include "collision_object_2d.h" diff --git a/scene/2d/collision_polygon_2d.h b/scene/2d/collision_polygon_2d.h index fa7e5e1046..83451f3f1a 100644 --- a/scene/2d/collision_polygon_2d.h +++ b/scene/2d/collision_polygon_2d.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef COLLISION_POLYGON_2D_H #define COLLISION_POLYGON_2D_H diff --git a/scene/2d/collision_shape_2d.cpp b/scene/2d/collision_shape_2d.cpp index 1956e23421..bf213614ed 100644 --- a/scene/2d/collision_shape_2d.cpp +++ b/scene/2d/collision_shape_2d.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "collision_shape_2d.h" #include "collision_object_2d.h" diff --git a/scene/2d/collision_shape_2d.h b/scene/2d/collision_shape_2d.h index 921066c5c8..b3f7d3f02a 100644 --- a/scene/2d/collision_shape_2d.h +++ b/scene/2d/collision_shape_2d.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef COLLISION_SHAPE_2D_H #define COLLISION_SHAPE_2D_H diff --git a/scene/2d/joints_2d.cpp b/scene/2d/joints_2d.cpp index eec483c29e..7a96a54854 100644 --- a/scene/2d/joints_2d.cpp +++ b/scene/2d/joints_2d.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "joints_2d.h" #include "engine.h" diff --git a/scene/2d/joints_2d.h b/scene/2d/joints_2d.h index 9b6ba22d64..744994f0a7 100644 --- a/scene/2d/joints_2d.h +++ b/scene/2d/joints_2d.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef JOINTS_2D_H #define JOINTS_2D_H diff --git a/scene/2d/light_2d.cpp b/scene/2d/light_2d.cpp index a6a871be1d..999d8a2630 100644 --- a/scene/2d/light_2d.cpp +++ b/scene/2d/light_2d.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "light_2d.h" #include "engine.h" diff --git a/scene/2d/light_2d.h b/scene/2d/light_2d.h index 9c55f72870..b216ad5e95 100644 --- a/scene/2d/light_2d.h +++ b/scene/2d/light_2d.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef LIGHT_2D_H #define LIGHT_2D_H diff --git a/scene/2d/light_occluder_2d.cpp b/scene/2d/light_occluder_2d.cpp index b95d4f8f0a..d4481583fb 100644 --- a/scene/2d/light_occluder_2d.cpp +++ b/scene/2d/light_occluder_2d.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "light_occluder_2d.h" #include "engine.h" diff --git a/scene/2d/light_occluder_2d.h b/scene/2d/light_occluder_2d.h index a2e81ef2b4..5e16351a6f 100644 --- a/scene/2d/light_occluder_2d.h +++ b/scene/2d/light_occluder_2d.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef LIGHTOCCLUDER2D_H #define LIGHTOCCLUDER2D_H diff --git a/scene/2d/line_2d.cpp b/scene/2d/line_2d.cpp index abc80216d4..f0ab9652b4 100644 --- a/scene/2d/line_2d.cpp +++ b/scene/2d/line_2d.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "line_2d.h" #include "line_builder.h" diff --git a/scene/2d/line_2d.h b/scene/2d/line_2d.h index 54a4683dc7..0eba024555 100644 --- a/scene/2d/line_2d.h +++ b/scene/2d/line_2d.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef LINE2D_H #define LINE2D_H diff --git a/scene/2d/line_builder.cpp b/scene/2d/line_builder.cpp index ae2f9371a3..e78d2e9c34 100644 --- a/scene/2d/line_builder.cpp +++ b/scene/2d/line_builder.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "line_builder.h" //---------------------------------------------------------------------------- diff --git a/scene/2d/line_builder.h b/scene/2d/line_builder.h index 0b19cd4674..daa2ed7c24 100644 --- a/scene/2d/line_builder.h +++ b/scene/2d/line_builder.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef LINE_BUILDER_H #define LINE_BUILDER_H diff --git a/scene/2d/navigation2d.cpp b/scene/2d/navigation2d.cpp index 8e910563ca..4737e14111 100644 --- a/scene/2d/navigation2d.cpp +++ b/scene/2d/navigation2d.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "navigation2d.h" #define USE_ENTRY_POINT diff --git a/scene/2d/navigation2d.h b/scene/2d/navigation2d.h index 52c4967d3d..02c46d5de1 100644 --- a/scene/2d/navigation2d.h +++ b/scene/2d/navigation2d.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef NAVIGATION_2D_H #define NAVIGATION_2D_H diff --git a/scene/2d/navigation_polygon.cpp b/scene/2d/navigation_polygon.cpp index dde41dbf3f..2625748f34 100644 --- a/scene/2d/navigation_polygon.cpp +++ b/scene/2d/navigation_polygon.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "navigation_polygon.h" #include "core_string_names.h" diff --git a/scene/2d/navigation_polygon.h b/scene/2d/navigation_polygon.h index 7b5220f92d..d7684c2d94 100644 --- a/scene/2d/navigation_polygon.h +++ b/scene/2d/navigation_polygon.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef NAVIGATION_POLYGON_H #define NAVIGATION_POLYGON_H diff --git a/scene/2d/node_2d.cpp b/scene/2d/node_2d.cpp index e133f86ef7..95a1cbfce3 100644 --- a/scene/2d/node_2d.cpp +++ b/scene/2d/node_2d.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "node_2d.h" #include "message_queue.h" diff --git a/scene/2d/node_2d.h b/scene/2d/node_2d.h index 321021a748..f817b214f8 100644 --- a/scene/2d/node_2d.h +++ b/scene/2d/node_2d.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef NODE2D_H #define NODE2D_H diff --git a/scene/2d/parallax_background.cpp b/scene/2d/parallax_background.cpp index 46d0b7647f..027d64b813 100644 --- a/scene/2d/parallax_background.cpp +++ b/scene/2d/parallax_background.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "parallax_background.h" #include "parallax_layer.h" diff --git a/scene/2d/parallax_background.h b/scene/2d/parallax_background.h index a7b745f199..31d1c553a2 100644 --- a/scene/2d/parallax_background.h +++ b/scene/2d/parallax_background.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef PARALLAX_BACKGROUND_H #define PARALLAX_BACKGROUND_H diff --git a/scene/2d/parallax_layer.cpp b/scene/2d/parallax_layer.cpp index 7a9ea1931e..050f98b02b 100644 --- a/scene/2d/parallax_layer.cpp +++ b/scene/2d/parallax_layer.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "parallax_layer.h" #include "engine.h" diff --git a/scene/2d/parallax_layer.h b/scene/2d/parallax_layer.h index 937451c3e2..b2b98b0ef6 100644 --- a/scene/2d/parallax_layer.h +++ b/scene/2d/parallax_layer.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef PARALLAX_LAYER_H #define PARALLAX_LAYER_H diff --git a/scene/2d/particles_2d.cpp b/scene/2d/particles_2d.cpp index a760b8e599..7eaa5bb88c 100644 --- a/scene/2d/particles_2d.cpp +++ b/scene/2d/particles_2d.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "particles_2d.h" #include "engine.h" diff --git a/scene/2d/particles_2d.h b/scene/2d/particles_2d.h index e7a510d8bc..f367095581 100644 --- a/scene/2d/particles_2d.h +++ b/scene/2d/particles_2d.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef PARTICLES_FRAME_H #define PARTICLES_FRAME_H diff --git a/scene/2d/path_2d.cpp b/scene/2d/path_2d.cpp index d2a307a9ed..71ba335f13 100644 --- a/scene/2d/path_2d.cpp +++ b/scene/2d/path_2d.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "path_2d.h" #include "engine.h" diff --git a/scene/2d/path_2d.h b/scene/2d/path_2d.h index 7f53821c7e..fd16f67219 100644 --- a/scene/2d/path_2d.h +++ b/scene/2d/path_2d.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef PATH_2D_H #define PATH_2D_H diff --git a/scene/2d/path_texture.cpp b/scene/2d/path_texture.cpp index 59e01f7cb6..d36a9fb65a 100644 --- a/scene/2d/path_texture.cpp +++ b/scene/2d/path_texture.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "path_texture.h" void PathTexture::set_begin_texture(const Ref<Texture> &p_texture) { diff --git a/scene/2d/path_texture.h b/scene/2d/path_texture.h index cfe00f3880..7a347c0653 100644 --- a/scene/2d/path_texture.h +++ b/scene/2d/path_texture.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef PATH_TEXTURE_H #define PATH_TEXTURE_H diff --git a/scene/2d/physics_body_2d.cpp b/scene/2d/physics_body_2d.cpp index ec6ff182db..60aebf5d09 100644 --- a/scene/2d/physics_body_2d.cpp +++ b/scene/2d/physics_body_2d.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "physics_body_2d.h" #include "engine.h" diff --git a/scene/2d/physics_body_2d.h b/scene/2d/physics_body_2d.h index a39eb09514..c755f30f2b 100644 --- a/scene/2d/physics_body_2d.h +++ b/scene/2d/physics_body_2d.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef PHYSICS_BODY_2D_H #define PHYSICS_BODY_2D_H diff --git a/scene/2d/polygon_2d.cpp b/scene/2d/polygon_2d.cpp index f9951cdd08..1b74256248 100644 --- a/scene/2d/polygon_2d.cpp +++ b/scene/2d/polygon_2d.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "polygon_2d.h" #include "core/math/geometry.h" diff --git a/scene/2d/polygon_2d.h b/scene/2d/polygon_2d.h index 5014cbc6e9..f62c78c55b 100644 --- a/scene/2d/polygon_2d.h +++ b/scene/2d/polygon_2d.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef POLYGON_2D_H #define POLYGON_2D_H diff --git a/scene/2d/position_2d.cpp b/scene/2d/position_2d.cpp index bff7554ec3..37f6aaa2d6 100644 --- a/scene/2d/position_2d.cpp +++ b/scene/2d/position_2d.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "position_2d.h" #include "engine.h" diff --git a/scene/2d/position_2d.h b/scene/2d/position_2d.h index e5862974fa..6f6a34c452 100644 --- a/scene/2d/position_2d.h +++ b/scene/2d/position_2d.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef POSITION_2D_H #define POSITION_2D_H diff --git a/scene/2d/ray_cast_2d.cpp b/scene/2d/ray_cast_2d.cpp index d7c152b108..5a563143ad 100644 --- a/scene/2d/ray_cast_2d.cpp +++ b/scene/2d/ray_cast_2d.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "ray_cast_2d.h" #include "collision_object_2d.h" diff --git a/scene/2d/ray_cast_2d.h b/scene/2d/ray_cast_2d.h index a2e1d689fc..0850cdc7cc 100644 --- a/scene/2d/ray_cast_2d.h +++ b/scene/2d/ray_cast_2d.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef RAY_CAST_2D_H #define RAY_CAST_2D_H diff --git a/scene/2d/remote_transform_2d.cpp b/scene/2d/remote_transform_2d.cpp index c283d69f86..da764e032b 100644 --- a/scene/2d/remote_transform_2d.cpp +++ b/scene/2d/remote_transform_2d.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "remote_transform_2d.h" #include "scene/scene_string_names.h" diff --git a/scene/2d/remote_transform_2d.h b/scene/2d/remote_transform_2d.h index cfc38ebabb..3f395f820e 100644 --- a/scene/2d/remote_transform_2d.h +++ b/scene/2d/remote_transform_2d.h @@ -27,6 +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 REMOTE_TRANSFORM_2D_H +#define REMOTE_TRANSFORM_2D_H + #include "scene/2d/node_2d.h" class RemoteTransform2D : public Node2D { @@ -69,3 +73,5 @@ public: RemoteTransform2D(); }; + +#endif // REMOTE_TRANSFORM_2D_H diff --git a/scene/2d/screen_button.cpp b/scene/2d/screen_button.cpp index cf059ec55e..b6cb734cee 100644 --- a/scene/2d/screen_button.cpp +++ b/scene/2d/screen_button.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "screen_button.h" #include "input_map.h" #include "os/input.h" diff --git a/scene/2d/screen_button.h b/scene/2d/screen_button.h index ad558bb9ec..e6f2a2f3cd 100644 --- a/scene/2d/screen_button.h +++ b/scene/2d/screen_button.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef SCREEN_BUTTON_H #define SCREEN_BUTTON_H diff --git a/scene/2d/sprite.cpp b/scene/2d/sprite.cpp index 68df95c042..9c344b9581 100644 --- a/scene/2d/sprite.cpp +++ b/scene/2d/sprite.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "sprite.h" #include "core/core_string_names.h" #include "os/os.h" diff --git a/scene/2d/sprite.h b/scene/2d/sprite.h index 7d9b2cf457..261165bbf9 100644 --- a/scene/2d/sprite.h +++ b/scene/2d/sprite.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef SPRITE_H #define SPRITE_H diff --git a/scene/2d/tile_map.cpp b/scene/2d/tile_map.cpp index 8bd5676bc7..5367e42aa9 100644 --- a/scene/2d/tile_map.cpp +++ b/scene/2d/tile_map.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "tile_map.h" #include "io/marshalls.h" diff --git a/scene/2d/tile_map.h b/scene/2d/tile_map.h index 21258f27c9..973e527b42 100644 --- a/scene/2d/tile_map.h +++ b/scene/2d/tile_map.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef TILE_MAP_H #define TILE_MAP_H diff --git a/scene/2d/visibility_notifier_2d.cpp b/scene/2d/visibility_notifier_2d.cpp index cc6ee1a426..c2227d9964 100644 --- a/scene/2d/visibility_notifier_2d.cpp +++ b/scene/2d/visibility_notifier_2d.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "visibility_notifier_2d.h" #include "engine.h" diff --git a/scene/2d/visibility_notifier_2d.h b/scene/2d/visibility_notifier_2d.h index b2fbb39dfc..93a35a709e 100644 --- a/scene/2d/visibility_notifier_2d.h +++ b/scene/2d/visibility_notifier_2d.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef VISIBILITY_NOTIFIER_2D_H #define VISIBILITY_NOTIFIER_2D_H diff --git a/scene/2d/y_sort.cpp b/scene/2d/y_sort.cpp index 85c068b212..d3997c13c3 100644 --- a/scene/2d/y_sort.cpp +++ b/scene/2d/y_sort.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "y_sort.h" void YSort::set_sort_enabled(bool p_enabled) { diff --git a/scene/2d/y_sort.h b/scene/2d/y_sort.h index 63796f8719..5ff12aa25a 100644 --- a/scene/2d/y_sort.h +++ b/scene/2d/y_sort.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef Y_SORT_H #define Y_SORT_H diff --git a/scene/3d/area.cpp b/scene/3d/area.cpp index ad8bf7141a..4089d80d4e 100644 --- a/scene/3d/area.cpp +++ b/scene/3d/area.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "area.h" #include "scene/scene_string_names.h" #include "servers/audio_server.h" diff --git a/scene/3d/area.h b/scene/3d/area.h index fa01a783f9..e49b7e493b 100644 --- a/scene/3d/area.h +++ b/scene/3d/area.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef AREA_H #define AREA_H diff --git a/scene/3d/audio_stream_player_3d.cpp b/scene/3d/audio_stream_player_3d.cpp index 6c102e4027..cf2a47f14c 100644 --- a/scene/3d/audio_stream_player_3d.cpp +++ b/scene/3d/audio_stream_player_3d.cpp @@ -1,3 +1,33 @@ +/*************************************************************************/ +/* audio_stream_player_3d.cpp */ +/*************************************************************************/ +/* This file is part of: */ +/* GODOT ENGINE */ +/* https://godotengine.org */ +/*************************************************************************/ +/* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ +/* Copyright (c) 2014-2018 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 "audio_stream_player_3d.h" #include "engine.h" #include "scene/3d/area.h" diff --git a/scene/3d/audio_stream_player_3d.h b/scene/3d/audio_stream_player_3d.h index 5982d7a3ac..9a1f369da2 100644 --- a/scene/3d/audio_stream_player_3d.h +++ b/scene/3d/audio_stream_player_3d.h @@ -1,3 +1,33 @@ +/*************************************************************************/ +/* audio_stream_player_3d.h */ +/*************************************************************************/ +/* This file is part of: */ +/* GODOT ENGINE */ +/* https://godotengine.org */ +/*************************************************************************/ +/* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ +/* Copyright (c) 2014-2018 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 AUDIO_STREAM_PLAYER_3D_H #define AUDIO_STREAM_PLAYER_3D_H diff --git a/scene/3d/baked_lightmap.cpp b/scene/3d/baked_lightmap.cpp index 8c282a31b8..96eb7eb6f4 100644 --- a/scene/3d/baked_lightmap.cpp +++ b/scene/3d/baked_lightmap.cpp @@ -1,3 +1,33 @@ +/*************************************************************************/ +/* baked_lightmap.cpp */ +/*************************************************************************/ +/* This file is part of: */ +/* GODOT ENGINE */ +/* https://godotengine.org */ +/*************************************************************************/ +/* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ +/* Copyright (c) 2014-2018 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 "baked_lightmap.h" #include "io/resource_saver.h" #include "os/dir_access.h" diff --git a/scene/3d/baked_lightmap.h b/scene/3d/baked_lightmap.h index 9b53e41d73..60b62f74eb 100644 --- a/scene/3d/baked_lightmap.h +++ b/scene/3d/baked_lightmap.h @@ -1,3 +1,33 @@ +/*************************************************************************/ +/* baked_lightmap.h */ +/*************************************************************************/ +/* This file is part of: */ +/* GODOT ENGINE */ +/* https://godotengine.org */ +/*************************************************************************/ +/* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ +/* Copyright (c) 2014-2018 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 BAKED_INDIRECT_LIGHT_H #define BAKED_INDIRECT_LIGHT_H diff --git a/scene/3d/bone_attachment.cpp b/scene/3d/bone_attachment.cpp index 9e3b15461b..3882b8548b 100644 --- a/scene/3d/bone_attachment.cpp +++ b/scene/3d/bone_attachment.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "bone_attachment.h" bool BoneAttachment::_get(const StringName &p_name, Variant &r_ret) const { diff --git a/scene/3d/bone_attachment.h b/scene/3d/bone_attachment.h index 57bc71a51f..fa31642354 100644 --- a/scene/3d/bone_attachment.h +++ b/scene/3d/bone_attachment.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef BONE_ATTACHMENT_H #define BONE_ATTACHMENT_H diff --git a/scene/3d/camera.cpp b/scene/3d/camera.cpp index 840783c399..6998b34cfd 100644 --- a/scene/3d/camera.cpp +++ b/scene/3d/camera.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "camera.h" #include "camera_matrix.h" diff --git a/scene/3d/camera.h b/scene/3d/camera.h index c24286ecc5..3fd3303a25 100644 --- a/scene/3d/camera.h +++ b/scene/3d/camera.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef CAMERA_H #define CAMERA_H diff --git a/scene/3d/collision_object.cpp b/scene/3d/collision_object.cpp index e591b17aa6..b246fe75f4 100644 --- a/scene/3d/collision_object.cpp +++ b/scene/3d/collision_object.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "collision_object.h" #include "scene/scene_string_names.h" diff --git a/scene/3d/collision_object.h b/scene/3d/collision_object.h index c1fed559c5..c58e02848f 100644 --- a/scene/3d/collision_object.h +++ b/scene/3d/collision_object.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef COLLISION_OBJECT_H #define COLLISION_OBJECT_H diff --git a/scene/3d/collision_polygon.cpp b/scene/3d/collision_polygon.cpp index 7d894a0544..ef1b33a4e2 100644 --- a/scene/3d/collision_polygon.cpp +++ b/scene/3d/collision_polygon.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "collision_polygon.h" #include "collision_object.h" diff --git a/scene/3d/collision_polygon.h b/scene/3d/collision_polygon.h index b979057da1..6643cfa044 100644 --- a/scene/3d/collision_polygon.h +++ b/scene/3d/collision_polygon.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef COLLISION_POLYGON_H #define COLLISION_POLYGON_H diff --git a/scene/3d/collision_shape.cpp b/scene/3d/collision_shape.cpp index b5f3a09c09..d6d49a197c 100644 --- a/scene/3d/collision_shape.cpp +++ b/scene/3d/collision_shape.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "collision_shape.h" #include "scene/resources/box_shape.h" #include "scene/resources/capsule_shape.h" diff --git a/scene/3d/collision_shape.h b/scene/3d/collision_shape.h index 4728d3d5c1..724a025165 100644 --- a/scene/3d/collision_shape.h +++ b/scene/3d/collision_shape.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef COLLISION_SHAPE_H #define COLLISION_SHAPE_H diff --git a/scene/3d/gi_probe.cpp b/scene/3d/gi_probe.cpp index 21e8a6e17a..ce9e801385 100644 --- a/scene/3d/gi_probe.cpp +++ b/scene/3d/gi_probe.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "gi_probe.h" #include "mesh_instance.h" diff --git a/scene/3d/gi_probe.h b/scene/3d/gi_probe.h index af3c854f1f..af4b646590 100644 --- a/scene/3d/gi_probe.h +++ b/scene/3d/gi_probe.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef GIPROBE_H #define GIPROBE_H diff --git a/scene/3d/immediate_geometry.cpp b/scene/3d/immediate_geometry.cpp index 8d8c1b65fc..14a0b0505d 100644 --- a/scene/3d/immediate_geometry.cpp +++ b/scene/3d/immediate_geometry.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "immediate_geometry.h" void ImmediateGeometry::begin(Mesh::PrimitiveType p_primitive, const Ref<Texture> &p_texture) { diff --git a/scene/3d/immediate_geometry.h b/scene/3d/immediate_geometry.h index abcabf2c34..f7201b4bba 100644 --- a/scene/3d/immediate_geometry.h +++ b/scene/3d/immediate_geometry.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef IMMEDIATE_GEOMETRY_H #define IMMEDIATE_GEOMETRY_H diff --git a/scene/3d/interpolated_camera.cpp b/scene/3d/interpolated_camera.cpp index 03f82e0e44..9865fe156a 100644 --- a/scene/3d/interpolated_camera.cpp +++ b/scene/3d/interpolated_camera.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "interpolated_camera.h" #include "engine.h" diff --git a/scene/3d/interpolated_camera.h b/scene/3d/interpolated_camera.h index d74b13c214..b025112295 100644 --- a/scene/3d/interpolated_camera.h +++ b/scene/3d/interpolated_camera.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef INTERPOLATED_CAMERA_H #define INTERPOLATED_CAMERA_H diff --git a/scene/3d/light.cpp b/scene/3d/light.cpp index 04c1f9e3e8..240bd631a1 100644 --- a/scene/3d/light.cpp +++ b/scene/3d/light.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "light.h" #include "engine.h" diff --git a/scene/3d/light.h b/scene/3d/light.h index 2639e47217..b35b397ced 100644 --- a/scene/3d/light.h +++ b/scene/3d/light.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef LIGHT_H #define LIGHT_H diff --git a/scene/3d/listener.cpp b/scene/3d/listener.cpp index 752a2059f5..439c1f8c45 100644 --- a/scene/3d/listener.cpp +++ b/scene/3d/listener.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "listener.h" #include "scene/resources/mesh.h" diff --git a/scene/3d/listener.h b/scene/3d/listener.h index db8dca8ce2..8047971ebd 100644 --- a/scene/3d/listener.h +++ b/scene/3d/listener.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef LISTENER_H #define LISTENER_H diff --git a/scene/3d/mesh_instance.cpp b/scene/3d/mesh_instance.cpp index cffcbd9a41..80bae911d4 100644 --- a/scene/3d/mesh_instance.cpp +++ b/scene/3d/mesh_instance.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "mesh_instance.h" #include "collision_shape.h" diff --git a/scene/3d/mesh_instance.h b/scene/3d/mesh_instance.h index 74041a46bc..5d359cd4d5 100644 --- a/scene/3d/mesh_instance.h +++ b/scene/3d/mesh_instance.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef MESH_INSTANCE_H #define MESH_INSTANCE_H diff --git a/scene/3d/multimesh_instance.cpp b/scene/3d/multimesh_instance.cpp index a6a8d434fa..4cbd1df64a 100644 --- a/scene/3d/multimesh_instance.cpp +++ b/scene/3d/multimesh_instance.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "multimesh_instance.h" void MultiMeshInstance::_bind_methods() { diff --git a/scene/3d/multimesh_instance.h b/scene/3d/multimesh_instance.h index 312748b6f0..1cd077a0a5 100644 --- a/scene/3d/multimesh_instance.h +++ b/scene/3d/multimesh_instance.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef MULTIMESH_INSTANCE_H #define MULTIMESH_INSTANCE_H diff --git a/scene/3d/navigation.cpp b/scene/3d/navigation.cpp index 5d41fe576b..e7ab6cde8a 100644 --- a/scene/3d/navigation.cpp +++ b/scene/3d/navigation.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "navigation.h" void Navigation::_navmesh_link(int p_id) { diff --git a/scene/3d/navigation.h b/scene/3d/navigation.h index a5a4deebcd..5a501039c8 100644 --- a/scene/3d/navigation.h +++ b/scene/3d/navigation.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef NAVIGATION_H #define NAVIGATION_H diff --git a/scene/3d/navigation_mesh.cpp b/scene/3d/navigation_mesh.cpp index 3e548b8e8f..5ec5b8b6c7 100644 --- a/scene/3d/navigation_mesh.cpp +++ b/scene/3d/navigation_mesh.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "navigation_mesh.h" #include "mesh_instance.h" #include "navigation.h" diff --git a/scene/3d/navigation_mesh.h b/scene/3d/navigation_mesh.h index 0a81e1c67b..753ad76edc 100644 --- a/scene/3d/navigation_mesh.h +++ b/scene/3d/navigation_mesh.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef NAVIGATION_MESH_H #define NAVIGATION_MESH_H diff --git a/scene/3d/particles.cpp b/scene/3d/particles.cpp index fda4647141..219464ae1f 100644 --- a/scene/3d/particles.cpp +++ b/scene/3d/particles.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "particles.h" #include "scene/resources/surface_tool.h" #include "servers/visual_server.h" diff --git a/scene/3d/particles.h b/scene/3d/particles.h index ebd2b6ce48..17e21c6cee 100644 --- a/scene/3d/particles.h +++ b/scene/3d/particles.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef VISUALINSTANCEPARTICLES_H #define VISUALINSTANCEPARTICLES_H diff --git a/scene/3d/path.cpp b/scene/3d/path.cpp index e0520fdb7c..afe4dd3f46 100644 --- a/scene/3d/path.cpp +++ b/scene/3d/path.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "path.h" #include "engine.h" diff --git a/scene/3d/path.h b/scene/3d/path.h index 7c3e0f35cc..fe57103d25 100644 --- a/scene/3d/path.h +++ b/scene/3d/path.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef PATH_H #define PATH_H diff --git a/scene/3d/physics_body.cpp b/scene/3d/physics_body.cpp index 4c4e4bf1e6..7d638d8737 100644 --- a/scene/3d/physics_body.cpp +++ b/scene/3d/physics_body.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "physics_body.h" #include "engine.h" diff --git a/scene/3d/physics_body.h b/scene/3d/physics_body.h index f64733e707..332eb3c740 100644 --- a/scene/3d/physics_body.h +++ b/scene/3d/physics_body.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef PHYSICS_BODY__H #define PHYSICS_BODY__H diff --git a/scene/3d/physics_joint.cpp b/scene/3d/physics_joint.cpp index c36e684477..fed6d76f65 100644 --- a/scene/3d/physics_joint.cpp +++ b/scene/3d/physics_joint.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "physics_joint.h" void Joint::_update_joint(bool p_only_free) { diff --git a/scene/3d/physics_joint.h b/scene/3d/physics_joint.h index 1520c40cdd..000109ac55 100644 --- a/scene/3d/physics_joint.h +++ b/scene/3d/physics_joint.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef PHYSICS_JOINT_H #define PHYSICS_JOINT_H diff --git a/scene/3d/portal.cpp b/scene/3d/portal.cpp index 35ef6fa2f1..d16d9ed7c5 100644 --- a/scene/3d/portal.cpp +++ b/scene/3d/portal.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "portal.h" #include "project_settings.h" #include "scene/resources/surface_tool.h" diff --git a/scene/3d/portal.h b/scene/3d/portal.h index 545dd61650..cb3f208072 100644 --- a/scene/3d/portal.h +++ b/scene/3d/portal.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef PORTAL_H #define PORTAL_H diff --git a/scene/3d/position_3d.cpp b/scene/3d/position_3d.cpp index 955c54a008..3ae04f491f 100644 --- a/scene/3d/position_3d.cpp +++ b/scene/3d/position_3d.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "position_3d.h" #include "scene/resources/mesh.h" diff --git a/scene/3d/position_3d.h b/scene/3d/position_3d.h index 59512ea108..2bc69eff9b 100644 --- a/scene/3d/position_3d.h +++ b/scene/3d/position_3d.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef POSITION_3D_H #define POSITION_3D_H diff --git a/scene/3d/proximity_group.cpp b/scene/3d/proximity_group.cpp index 7daf43aefd..f719a0356b 100644 --- a/scene/3d/proximity_group.cpp +++ b/scene/3d/proximity_group.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "proximity_group.h" #include "math_funcs.h" diff --git a/scene/3d/proximity_group.h b/scene/3d/proximity_group.h index 7c61c0f949..aae44e0be5 100644 --- a/scene/3d/proximity_group.h +++ b/scene/3d/proximity_group.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef PROXIMITY_GROUP_H #define PROXIMITY_GROUP_H diff --git a/scene/3d/ray_cast.cpp b/scene/3d/ray_cast.cpp index 962af4b244..556774a0d1 100644 --- a/scene/3d/ray_cast.cpp +++ b/scene/3d/ray_cast.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "ray_cast.h" #include "collision_object.h" diff --git a/scene/3d/ray_cast.h b/scene/3d/ray_cast.h index c44fd907e5..20cea80700 100644 --- a/scene/3d/ray_cast.h +++ b/scene/3d/ray_cast.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef RAY_CAST_H #define RAY_CAST_H diff --git a/scene/3d/reflection_probe.cpp b/scene/3d/reflection_probe.cpp index b8fa50357a..9e3a9ac27f 100644 --- a/scene/3d/reflection_probe.cpp +++ b/scene/3d/reflection_probe.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "reflection_probe.h" void ReflectionProbe::set_intensity(float p_intensity) { diff --git a/scene/3d/reflection_probe.h b/scene/3d/reflection_probe.h index 742e4121f7..13ae1c81f6 100644 --- a/scene/3d/reflection_probe.h +++ b/scene/3d/reflection_probe.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef REFLECTIONPROBE_H #define REFLECTIONPROBE_H diff --git a/scene/3d/remote_transform.h b/scene/3d/remote_transform.h index 5fc9b071b0..6b788a2d75 100644 --- a/scene/3d/remote_transform.h +++ b/scene/3d/remote_transform.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef REMOTETRANSFORM_H #define REMOTETRANSFORM_H diff --git a/scene/3d/room_instance.cpp b/scene/3d/room_instance.cpp index 94ad07c617..0d83a9942e 100644 --- a/scene/3d/room_instance.cpp +++ b/scene/3d/room_instance.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "room_instance.h" #include "servers/visual_server.h" diff --git a/scene/3d/room_instance.h b/scene/3d/room_instance.h index dc066c73c3..ff388e606c 100644 --- a/scene/3d/room_instance.h +++ b/scene/3d/room_instance.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef ROOM_INSTANCE_H #define ROOM_INSTANCE_H diff --git a/scene/3d/scenario_fx.cpp b/scene/3d/scenario_fx.cpp index cefe3e46f3..02768ac91f 100644 --- a/scene/3d/scenario_fx.cpp +++ b/scene/3d/scenario_fx.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "scenario_fx.h" #include "scene/main/viewport.h" diff --git a/scene/3d/scenario_fx.h b/scene/3d/scenario_fx.h index 3a8a927f88..7a8e2b548f 100644 --- a/scene/3d/scenario_fx.h +++ b/scene/3d/scenario_fx.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef SCENARIO_FX_H #define SCENARIO_FX_H diff --git a/scene/3d/skeleton.cpp b/scene/3d/skeleton.cpp index aaa378bb68..99541db4d3 100644 --- a/scene/3d/skeleton.cpp +++ b/scene/3d/skeleton.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "skeleton.h" #include "message_queue.h" diff --git a/scene/3d/skeleton.h b/scene/3d/skeleton.h index 1b999d91c3..de0d4216d9 100644 --- a/scene/3d/skeleton.h +++ b/scene/3d/skeleton.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef SKELETON_H #define SKELETON_H diff --git a/scene/3d/spatial.cpp b/scene/3d/spatial.cpp index a55c4a2cc5..b3740dba68 100644 --- a/scene/3d/spatial.cpp +++ b/scene/3d/spatial.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "spatial.h" #include "engine.h" diff --git a/scene/3d/spatial.h b/scene/3d/spatial.h index 1c2e73d5ba..518bba9a51 100644 --- a/scene/3d/spatial.h +++ b/scene/3d/spatial.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef SPATIAL_H #define SPATIAL_H diff --git a/scene/3d/spatial_velocity_tracker.cpp b/scene/3d/spatial_velocity_tracker.cpp index 1c7423e645..75da3a7911 100644 --- a/scene/3d/spatial_velocity_tracker.cpp +++ b/scene/3d/spatial_velocity_tracker.cpp @@ -1,3 +1,33 @@ +/*************************************************************************/ +/* spatial_velocity_tracker.cpp */ +/*************************************************************************/ +/* This file is part of: */ +/* GODOT ENGINE */ +/* https://godotengine.org */ +/*************************************************************************/ +/* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ +/* Copyright (c) 2014-2018 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 "spatial_velocity_tracker.h" #include "engine.h" diff --git a/scene/3d/spatial_velocity_tracker.h b/scene/3d/spatial_velocity_tracker.h index c4371ff1f7..a8278a4fb5 100644 --- a/scene/3d/spatial_velocity_tracker.h +++ b/scene/3d/spatial_velocity_tracker.h @@ -1,3 +1,33 @@ +/*************************************************************************/ +/* spatial_velocity_tracker.h */ +/*************************************************************************/ +/* This file is part of: */ +/* GODOT ENGINE */ +/* https://godotengine.org */ +/*************************************************************************/ +/* Copyright (c) 2007-2018 Juan Linietsky, Ariel Manzur. */ +/* Copyright (c) 2014-2018 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 SPATIAL_VELOCITY_TRACKER_H #define SPATIAL_VELOCITY_TRACKER_H diff --git a/scene/3d/sprite_3d.cpp b/scene/3d/sprite_3d.cpp index 6bd673c7a2..232855c978 100644 --- a/scene/3d/sprite_3d.cpp +++ b/scene/3d/sprite_3d.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "sprite_3d.h" #include "core_string_names.h" #include "scene/scene_string_names.h" diff --git a/scene/3d/sprite_3d.h b/scene/3d/sprite_3d.h index 0ec8f4d668..23e1d96b4b 100644 --- a/scene/3d/sprite_3d.h +++ b/scene/3d/sprite_3d.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef SPRITE_3D_H #define SPRITE_3D_H diff --git a/scene/3d/vehicle_body.cpp b/scene/3d/vehicle_body.cpp index d9918c0b62..bc968b0a5f 100644 --- a/scene/3d/vehicle_body.cpp +++ b/scene/3d/vehicle_body.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "vehicle_body.h" #define ROLLING_INFLUENCE_FIX diff --git a/scene/3d/vehicle_body.h b/scene/3d/vehicle_body.h index b4420e95e7..1c7dacf5ac 100644 --- a/scene/3d/vehicle_body.h +++ b/scene/3d/vehicle_body.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef VEHICLE_BODY_H #define VEHICLE_BODY_H diff --git a/scene/3d/visibility_notifier.cpp b/scene/3d/visibility_notifier.cpp index e6c660bad7..a8818a06c3 100644 --- a/scene/3d/visibility_notifier.cpp +++ b/scene/3d/visibility_notifier.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "visibility_notifier.h" #include "engine.h" diff --git a/scene/3d/visibility_notifier.h b/scene/3d/visibility_notifier.h index ae17939e12..b1985f4a0c 100644 --- a/scene/3d/visibility_notifier.h +++ b/scene/3d/visibility_notifier.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef VISIBILITY_NOTIFIER_H #define VISIBILITY_NOTIFIER_H diff --git a/scene/3d/visual_instance.cpp b/scene/3d/visual_instance.cpp index 7497f35d29..00541a7d8a 100644 --- a/scene/3d/visual_instance.cpp +++ b/scene/3d/visual_instance.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "visual_instance.h" #include "scene/scene_string_names.h" diff --git a/scene/3d/visual_instance.h b/scene/3d/visual_instance.h index 34f035c9f8..8458a343b2 100644 --- a/scene/3d/visual_instance.h +++ b/scene/3d/visual_instance.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef VISUAL_INSTANCE_H #define VISUAL_INSTANCE_H diff --git a/scene/animation/animation_cache.cpp b/scene/animation/animation_cache.cpp index 76043436df..df83be6d50 100644 --- a/scene/animation/animation_cache.cpp +++ b/scene/animation/animation_cache.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "animation_cache.h" void AnimationCache::_node_exit_tree(Node *p_node) { diff --git a/scene/animation/animation_cache.h b/scene/animation/animation_cache.h index 63c1f243ef..cf28236376 100644 --- a/scene/animation/animation_cache.h +++ b/scene/animation/animation_cache.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef ANIMATION_CACHE_H #define ANIMATION_CACHE_H diff --git a/scene/animation/animation_player.cpp b/scene/animation/animation_player.cpp index bac95c6cca..f56e8fa9e3 100644 --- a/scene/animation/animation_player.cpp +++ b/scene/animation/animation_player.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "animation_player.h" #include "engine.h" diff --git a/scene/animation/animation_player.h b/scene/animation/animation_player.h index 40a7252528..ef17e5adac 100644 --- a/scene/animation/animation_player.h +++ b/scene/animation/animation_player.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef ANIMATION_PLAYER_H #define ANIMATION_PLAYER_H diff --git a/scene/animation/animation_tree_player.cpp b/scene/animation/animation_tree_player.cpp index 5777562f93..89f0e43a86 100644 --- a/scene/animation/animation_tree_player.cpp +++ b/scene/animation/animation_tree_player.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "animation_tree_player.h" #include "animation_player.h" diff --git a/scene/animation/animation_tree_player.h b/scene/animation/animation_tree_player.h index c6062b97e4..09d6f6fcb4 100644 --- a/scene/animation/animation_tree_player.h +++ b/scene/animation/animation_tree_player.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef ANIMATION_TREE_PLAYER_H #define ANIMATION_TREE_PLAYER_H diff --git a/scene/animation/tween.cpp b/scene/animation/tween.cpp index 1711fbffee..3fc68fc5e8 100644 --- a/scene/animation/tween.cpp +++ b/scene/animation/tween.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "tween.h" #include "method_bind_ext.gen.inc" diff --git a/scene/animation/tween.h b/scene/animation/tween.h index f052c415ae..757d80e90a 100644 --- a/scene/animation/tween.h +++ b/scene/animation/tween.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef TWEEN_H #define TWEEN_H diff --git a/scene/animation/tween_interpolaters.cpp b/scene/animation/tween_interpolaters.cpp index 72c603473a..11f2b0c17f 100644 --- a/scene/animation/tween_interpolaters.cpp +++ b/scene/animation/tween_interpolaters.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "tween.h" const real_t pi = 3.1415926535898; diff --git a/scene/audio/audio_player.cpp b/scene/audio/audio_player.cpp index 2c90fd5511..cf070c2235 100644 --- a/scene/audio/audio_player.cpp +++ b/scene/audio/audio_player.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "audio_player.h" #include "engine.h" diff --git a/scene/audio/audio_player.h b/scene/audio/audio_player.h index 8d7a635a8b..4fee30c0c2 100644 --- a/scene/audio/audio_player.h +++ b/scene/audio/audio_player.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef AUDIOPLAYER_H #define AUDIOPLAYER_H diff --git a/scene/gui/base_button.cpp b/scene/gui/base_button.cpp index 41ff000ac1..d765248cca 100644 --- a/scene/gui/base_button.cpp +++ b/scene/gui/base_button.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "base_button.h" #include "os/keyboard.h" @@ -538,15 +539,15 @@ BaseButton::BaseButton() { set_focus_mode(FOCUS_ALL); enabled_focus_mode = FOCUS_ALL; action_mode = ACTION_MODE_BUTTON_RELEASE; +} + +BaseButton::~BaseButton() { if (button_group.is_valid()) { button_group->buttons.erase(this); } } -BaseButton::~BaseButton() { -} - void ButtonGroup::get_buttons(List<BaseButton *> *r_buttons) { for (Set<BaseButton *>::Element *E = buttons.front(); E; E = E->next()) { diff --git a/scene/gui/base_button.h b/scene/gui/base_button.h index 00c9fe959c..9e0e1493d1 100644 --- a/scene/gui/base_button.h +++ b/scene/gui/base_button.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef BASE_BUTTON_H #define BASE_BUTTON_H diff --git a/scene/gui/box_container.cpp b/scene/gui/box_container.cpp index b7f1dbaa70..12b9fe7c03 100644 --- a/scene/gui/box_container.cpp +++ b/scene/gui/box_container.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "box_container.h" #include "label.h" #include "margin_container.h" diff --git a/scene/gui/box_container.h b/scene/gui/box_container.h index b22b3e28e3..abc228f804 100644 --- a/scene/gui/box_container.h +++ b/scene/gui/box_container.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef BOX_CONTAINER_H #define BOX_CONTAINER_H diff --git a/scene/gui/button.cpp b/scene/gui/button.cpp index d5715d63b6..03b25a138f 100644 --- a/scene/gui/button.cpp +++ b/scene/gui/button.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "button.h" #include "print_string.h" #include "servers/visual_server.h" diff --git a/scene/gui/button.h b/scene/gui/button.h index b3645fff7a..0b41b14f02 100644 --- a/scene/gui/button.h +++ b/scene/gui/button.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef BUTTON_H #define BUTTON_H diff --git a/scene/gui/center_container.cpp b/scene/gui/center_container.cpp index bf9ca69be4..cf71f89830 100644 --- a/scene/gui/center_container.cpp +++ b/scene/gui/center_container.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "center_container.h" Size2 CenterContainer::get_minimum_size() const { diff --git a/scene/gui/center_container.h b/scene/gui/center_container.h index 97912b11c7..519e1493ec 100644 --- a/scene/gui/center_container.h +++ b/scene/gui/center_container.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef CENTER_CONTAINER_H #define CENTER_CONTAINER_H diff --git a/scene/gui/check_box.cpp b/scene/gui/check_box.cpp index 73db240468..0790f87ea7 100644 --- a/scene/gui/check_box.cpp +++ b/scene/gui/check_box.cpp @@ -1,5 +1,5 @@ /*************************************************************************/ -/* check_button.cpp */ +/* check_box.cpp */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "check_box.h" #include "servers/visual_server.h" diff --git a/scene/gui/check_box.h b/scene/gui/check_box.h index e7358c1fb2..8375b46ca0 100644 --- a/scene/gui/check_box.h +++ b/scene/gui/check_box.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef CHECK_BOX_H #define CHECK_BOX_H diff --git a/scene/gui/check_button.cpp b/scene/gui/check_button.cpp index dbafcd4353..f9ed0ecdbb 100644 --- a/scene/gui/check_button.cpp +++ b/scene/gui/check_button.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "check_button.h" #include "print_string.h" diff --git a/scene/gui/check_button.h b/scene/gui/check_button.h index 8cf927de9b..a11749e3f6 100644 --- a/scene/gui/check_button.h +++ b/scene/gui/check_button.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef CHECK_BUTTON_H #define CHECK_BUTTON_H diff --git a/scene/gui/color_picker.cpp b/scene/gui/color_picker.cpp index 63478886c6..08a39e9e79 100644 --- a/scene/gui/color_picker.cpp +++ b/scene/gui/color_picker.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "color_picker.h" #include "os/input.h" diff --git a/scene/gui/color_picker.h b/scene/gui/color_picker.h index 1f6a8fb1bb..01ae1cc464 100644 --- a/scene/gui/color_picker.h +++ b/scene/gui/color_picker.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef COLOR_PICKER_H #define COLOR_PICKER_H diff --git a/scene/gui/color_rect.cpp b/scene/gui/color_rect.cpp index d212ba9416..463f3911dc 100644 --- a/scene/gui/color_rect.cpp +++ b/scene/gui/color_rect.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "color_rect.h" void ColorRect::set_frame_color(const Color &p_color) { diff --git a/scene/gui/color_rect.h b/scene/gui/color_rect.h index 747ae72997..a841008f76 100644 --- a/scene/gui/color_rect.h +++ b/scene/gui/color_rect.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef COLOR_RECT_H #define COLOR_RECT_H diff --git a/scene/gui/container.cpp b/scene/gui/container.cpp index 20616d5dd8..7cb0ad5707 100644 --- a/scene/gui/container.cpp +++ b/scene/gui/container.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "container.h" #include "message_queue.h" #include "scene/scene_string_names.h" diff --git a/scene/gui/container.h b/scene/gui/container.h index 2b9910dcf5..c472162f58 100644 --- a/scene/gui/container.h +++ b/scene/gui/container.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef CONTAINER_H #define CONTAINER_H diff --git a/scene/gui/control.cpp b/scene/gui/control.cpp index 6072653c54..979a65f455 100644 --- a/scene/gui/control.cpp +++ b/scene/gui/control.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "control.h" #include "project_settings.h" #include "scene/main/canvas_layer.h" @@ -860,6 +861,8 @@ Ref<StyleBox> Control::get_stylebox(const StringName &p_name, const StringName & class_name = ClassDB::get_parent_class_nocheck(class_name); } + class_name = type; + Control *parent = Object::cast_to<Control>(theme_owner->get_parent()); if (parent) @@ -868,8 +871,6 @@ Ref<StyleBox> Control::get_stylebox(const StringName &p_name, const StringName & theme_owner = NULL; } - class_name = type; - while (class_name != StringName()) { if (Theme::get_default()->has_stylebox(p_name, class_name)) return Theme::get_default()->get_stylebox(p_name, class_name); @@ -2154,6 +2155,7 @@ void Control::set_theme(const Ref<Theme> &p_theme) { data.theme = p_theme; if (!p_theme.is_null()) { + data.theme_owner = this; _propagate_theme_changed(this, this); } else { diff --git a/scene/gui/control.h b/scene/gui/control.h index 8da40e7d3f..2d61ecb2af 100644 --- a/scene/gui/control.h +++ b/scene/gui/control.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef CONTROL_H #define CONTROL_H diff --git a/scene/gui/dialogs.cpp b/scene/gui/dialogs.cpp index a2cf0c951f..d9737fa21a 100644 --- a/scene/gui/dialogs.cpp +++ b/scene/gui/dialogs.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "dialogs.h" #include "line_edit.h" #include "print_string.h" diff --git a/scene/gui/dialogs.h b/scene/gui/dialogs.h index c4cde8ef22..e61ede7c3d 100644 --- a/scene/gui/dialogs.h +++ b/scene/gui/dialogs.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef DIALOGS_H #define DIALOGS_H diff --git a/scene/gui/file_dialog.cpp b/scene/gui/file_dialog.cpp index 7bf06bc8c2..c4b2685012 100644 --- a/scene/gui/file_dialog.cpp +++ b/scene/gui/file_dialog.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "file_dialog.h" #include "os/keyboard.h" #include "print_string.h" diff --git a/scene/gui/file_dialog.h b/scene/gui/file_dialog.h index 04f004bf47..2a09494682 100644 --- a/scene/gui/file_dialog.h +++ b/scene/gui/file_dialog.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef FILE_DIALOG_H #define FILE_DIALOG_H diff --git a/scene/gui/gradient_edit.cpp b/scene/gui/gradient_edit.cpp index 10cbac7d40..3985039716 100644 --- a/scene/gui/gradient_edit.cpp +++ b/scene/gui/gradient_edit.cpp @@ -1,5 +1,5 @@ /*************************************************************************/ -/* color_ramp_edit.cpp */ +/* gradient_edit.cpp */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "gradient_edit.h" #include "os/keyboard.h" diff --git a/scene/gui/gradient_edit.h b/scene/gui/gradient_edit.h index 5471b0a769..e7834ea0de 100644 --- a/scene/gui/gradient_edit.h +++ b/scene/gui/gradient_edit.h @@ -1,5 +1,5 @@ /*************************************************************************/ -/* color_ramp_edit.h */ +/* gradient_edit.h */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ @@ -27,8 +27,9 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef SCENE_GUI_COLOR_RAMP_EDIT_H_ -#define SCENE_GUI_COLOR_RAMP_EDIT_H_ + +#ifndef GRADIENT_EDIT_H +#define GRADIENT_EDIT_H #include "scene/gui/color_picker.h" #include "scene/gui/popup.h" @@ -72,9 +73,4 @@ public: virtual ~GradientEdit(); }; -/*class ColorRampEditPanel : public Panel -{ - GDCLASS(ColorRampEditPanel, Panel ); -};*/ - -#endif /* SCENE_GUI_COLOR_RAMP_EDIT_H_ */ +#endif // GRADIENT_EDIT_H diff --git a/scene/gui/graph_edit.cpp b/scene/gui/graph_edit.cpp index d0ab77ecf8..b8451d2f10 100644 --- a/scene/gui/graph_edit.cpp +++ b/scene/gui/graph_edit.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "graph_edit.h" #include "os/input.h" diff --git a/scene/gui/graph_edit.h b/scene/gui/graph_edit.h index d307765bc0..3bfde44854 100644 --- a/scene/gui/graph_edit.h +++ b/scene/gui/graph_edit.h @@ -1,5 +1,5 @@ /*************************************************************************/ -/* graph_edit.cpp */ +/* graph_edit.h */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef GRAPH_EDIT_H #define GRAPH_EDIT_H diff --git a/scene/gui/graph_node.cpp b/scene/gui/graph_node.cpp index 12aa79bf65..c5d5da1219 100644 --- a/scene/gui/graph_node.cpp +++ b/scene/gui/graph_node.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "graph_node.h" #include "method_bind_ext.gen.inc" diff --git a/scene/gui/graph_node.h b/scene/gui/graph_node.h index 13ef533134..20d25a69b0 100644 --- a/scene/gui/graph_node.h +++ b/scene/gui/graph_node.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef GRAPH_NODE_H #define GRAPH_NODE_H diff --git a/scene/gui/grid_container.cpp b/scene/gui/grid_container.cpp index a0d9b5f5ff..8c3f835be3 100644 --- a/scene/gui/grid_container.cpp +++ b/scene/gui/grid_container.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "grid_container.h" void GridContainer::_notification(int p_what) { diff --git a/scene/gui/grid_container.h b/scene/gui/grid_container.h index c52f8230b0..243d06f034 100644 --- a/scene/gui/grid_container.h +++ b/scene/gui/grid_container.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef GRID_CONTAINER_H #define GRID_CONTAINER_H diff --git a/scene/gui/item_list.cpp b/scene/gui/item_list.cpp index 5a4a0b2106..3b3d7164b6 100644 --- a/scene/gui/item_list.cpp +++ b/scene/gui/item_list.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "item_list.h" #include "os/os.h" #include "project_settings.h" diff --git a/scene/gui/item_list.h b/scene/gui/item_list.h index e56d5e5224..24e9498044 100644 --- a/scene/gui/item_list.h +++ b/scene/gui/item_list.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef ITEMLIST_H #define ITEMLIST_H diff --git a/scene/gui/label.cpp b/scene/gui/label.cpp index be065bc0fb..0a1d42c5e1 100644 --- a/scene/gui/label.cpp +++ b/scene/gui/label.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "label.h" #include "print_string.h" #include "project_settings.h" diff --git a/scene/gui/label.h b/scene/gui/label.h index 160eb66e53..d5e0b60773 100644 --- a/scene/gui/label.h +++ b/scene/gui/label.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef LABEL_H #define LABEL_H diff --git a/scene/gui/line_edit.cpp b/scene/gui/line_edit.cpp index dff7722a9e..53f609723f 100644 --- a/scene/gui/line_edit.cpp +++ b/scene/gui/line_edit.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "line_edit.h" #include "label.h" #include "os/keyboard.h" diff --git a/scene/gui/line_edit.h b/scene/gui/line_edit.h index f57fde2525..e15980d3c4 100644 --- a/scene/gui/line_edit.h +++ b/scene/gui/line_edit.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef LINE_EDIT_H #define LINE_EDIT_H diff --git a/scene/gui/link_button.cpp b/scene/gui/link_button.cpp index dca83dc31f..d862e8669c 100644 --- a/scene/gui/link_button.cpp +++ b/scene/gui/link_button.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "link_button.h" void LinkButton::set_text(const String &p_text) { diff --git a/scene/gui/link_button.h b/scene/gui/link_button.h index 610f481e4e..0821ad9c0d 100644 --- a/scene/gui/link_button.h +++ b/scene/gui/link_button.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef LINKBUTTON_H #define LINKBUTTON_H diff --git a/scene/gui/margin_container.cpp b/scene/gui/margin_container.cpp index 97cc16c22d..5e1d53fe1d 100644 --- a/scene/gui/margin_container.cpp +++ b/scene/gui/margin_container.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "margin_container.h" Size2 MarginContainer::get_minimum_size() const { diff --git a/scene/gui/margin_container.h b/scene/gui/margin_container.h index 443e0769bc..ea75109248 100644 --- a/scene/gui/margin_container.h +++ b/scene/gui/margin_container.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef MARGIN_CONTAINER_H #define MARGIN_CONTAINER_H diff --git a/scene/gui/menu_button.cpp b/scene/gui/menu_button.cpp index caf3b90fa1..d25bd00f37 100644 --- a/scene/gui/menu_button.cpp +++ b/scene/gui/menu_button.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "menu_button.h" #include "os/keyboard.h" #include "scene/main/viewport.h" diff --git a/scene/gui/menu_button.h b/scene/gui/menu_button.h index bfe168adf7..2356444ecb 100644 --- a/scene/gui/menu_button.h +++ b/scene/gui/menu_button.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef MENU_BUTTON_H #define MENU_BUTTON_H diff --git a/scene/gui/nine_patch_rect.cpp b/scene/gui/nine_patch_rect.cpp index 0e753675f7..b8f6ffe6d2 100644 --- a/scene/gui/nine_patch_rect.cpp +++ b/scene/gui/nine_patch_rect.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "nine_patch_rect.h" #include "servers/visual_server.h" diff --git a/scene/gui/nine_patch_rect.h b/scene/gui/nine_patch_rect.h index dc6c5c8a28..b4b4602a7d 100644 --- a/scene/gui/nine_patch_rect.h +++ b/scene/gui/nine_patch_rect.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef NINE_PATCH_RECT_H #define NINE_PATCH_RECT_H diff --git a/scene/gui/option_button.cpp b/scene/gui/option_button.cpp index a447889971..ba35e6cd19 100644 --- a/scene/gui/option_button.cpp +++ b/scene/gui/option_button.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "option_button.h" #include "print_string.h" diff --git a/scene/gui/option_button.h b/scene/gui/option_button.h index c2854e9d1a..f65fa1b631 100644 --- a/scene/gui/option_button.h +++ b/scene/gui/option_button.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef OPTION_BUTTON_H #define OPTION_BUTTON_H diff --git a/scene/gui/panel.cpp b/scene/gui/panel.cpp index 28a221b63e..4375e03a50 100644 --- a/scene/gui/panel.cpp +++ b/scene/gui/panel.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "panel.h" #include "print_string.h" diff --git a/scene/gui/panel.h b/scene/gui/panel.h index 8641be4423..db8b35372e 100644 --- a/scene/gui/panel.h +++ b/scene/gui/panel.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef PANEL_H #define PANEL_H diff --git a/scene/gui/panel_container.cpp b/scene/gui/panel_container.cpp index 9d73b82952..a778d62659 100644 --- a/scene/gui/panel_container.cpp +++ b/scene/gui/panel_container.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "panel_container.h" Size2 PanelContainer::get_minimum_size() const { diff --git a/scene/gui/panel_container.h b/scene/gui/panel_container.h index 0a412cb091..267e2b921f 100644 --- a/scene/gui/panel_container.h +++ b/scene/gui/panel_container.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef PANEL_CONTAINER_H #define PANEL_CONTAINER_H diff --git a/scene/gui/popup.cpp b/scene/gui/popup.cpp index 73bf867c37..d18a3a3f2f 100644 --- a/scene/gui/popup.cpp +++ b/scene/gui/popup.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "popup.h" #include "engine.h" diff --git a/scene/gui/popup.h b/scene/gui/popup.h index efe2ee88c2..550e803578 100644 --- a/scene/gui/popup.h +++ b/scene/gui/popup.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef POPUP_H #define POPUP_H diff --git a/scene/gui/popup_menu.cpp b/scene/gui/popup_menu.cpp index 7999f50013..cf01ce8643 100644 --- a/scene/gui/popup_menu.cpp +++ b/scene/gui/popup_menu.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "popup_menu.h" #include "os/input.h" #include "os/keyboard.h" @@ -122,8 +123,7 @@ int PopupMenu::_get_mouse_over(const Point2 &p_over) const { for (int i = 0; i < items.size(); i++) { - if (i > 0) - ofs.y += vseparation; + ofs.y += vseparation; float h; if (!items[i].icon.is_null()) { @@ -189,6 +189,26 @@ void PopupMenu::_submenu_timeout() { submenu_over = -1; } +void PopupMenu::_scroll(float p_factor, const Point2 &p_over) { + + const float global_y = get_global_position().y; + + int vseparation = get_constant("vseparation"); + Ref<Font> font = get_font("font"); + + float dy = (vseparation + font->get_height()) * 3 * p_factor; + if (dy > 0 && global_y < 0) + dy = MIN(dy, -global_y - 1); + else if (dy < 0 && global_y + get_size().y > get_viewport_rect().size.y) + dy = -MIN(-dy, global_y + get_size().y - get_viewport_rect().size.y - 1); + set_position(get_position() + Vector2(0, dy)); + + Ref<InputEventMouseMotion> ie; + ie.instance(); + ie->set_position(p_over - Vector2(0, dy)); + _gui_input(ie); +} + void PopupMenu::_gui_input(const Ref<InputEvent> &p_event) { Ref<InputEventKey> k = p_event; @@ -286,39 +306,13 @@ void PopupMenu::_gui_input(const Ref<InputEvent> &p_event) { case BUTTON_WHEEL_DOWN: { if (get_global_position().y + get_size().y > get_viewport_rect().size.y) { - - int vseparation = get_constant("vseparation"); - Ref<Font> font = get_font("font"); - - Point2 pos = get_position(); - int s = (vseparation + font->get_height()) * 3; - pos.y -= (s * b->get_factor()); - set_position(pos); - - //update hover - Ref<InputEventMouseMotion> ie; - ie.instance(); - ie->set_position(b->get_position() + Vector2(0, s)); - _gui_input(ie); + _scroll(-b->get_factor(), b->get_position()); } } break; case BUTTON_WHEEL_UP: { if (get_global_position().y < 0) { - - int vseparation = get_constant("vseparation"); - Ref<Font> font = get_font("font"); - - Point2 pos = get_position(); - int s = (vseparation + font->get_height()) * 3; - pos.y += (s * b->get_factor()); - set_position(pos); - - //update hover - Ref<InputEventMouseMotion> ie; - ie.instance(); - ie->set_position(b->get_position() - Vector2(0, s)); - _gui_input(ie); + _scroll(b->get_factor(), b->get_position()); } } break; case BUTTON_LEFT: { @@ -387,6 +381,13 @@ void PopupMenu::_gui_input(const Ref<InputEvent> &p_event) { update(); } } + + Ref<InputEventPanGesture> pan_gesture = p_event; + if (pan_gesture.is_valid()) { + if (get_global_position().y + get_size().y > get_viewport_rect().size.y || get_global_position().y < 0) { + _scroll(-pan_gesture->get_delta().y, pan_gesture->get_position()); + } + } } bool PopupMenu::has_point(const Point2 &p_point) const { @@ -459,7 +460,7 @@ void PopupMenu::_notification(int p_what) { if (i == mouse_over) { - hover->draw(ci, Rect2(item_ofs + Point2(-hseparation, -vseparation), Size2(get_size().width - style->get_minimum_size().width + hseparation * 2, h + vseparation * 2))); + hover->draw(ci, Rect2(item_ofs + Point2(-hseparation, -vseparation / 2), Size2(get_size().width - style->get_minimum_size().width + hseparation * 2, h + vseparation))); } if (items[i].separator) { diff --git a/scene/gui/popup_menu.h b/scene/gui/popup_menu.h index f51ba81c89..60f36e95ec 100644 --- a/scene/gui/popup_menu.h +++ b/scene/gui/popup_menu.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef POPUP_MENU_H #define POPUP_MENU_H @@ -83,6 +84,7 @@ class PopupMenu : public Popup { String _get_accel_text(int p_item) const; int _get_mouse_over(const Point2 &p_over) const; virtual Size2 get_minimum_size() const; + void _scroll(float p_factor, const Point2 &p_over); void _gui_input(const Ref<InputEvent> &p_event); void _activate_submenu(int over); void _submenu_timeout(); diff --git a/scene/gui/progress_bar.cpp b/scene/gui/progress_bar.cpp index 505068f155..c85bed0451 100644 --- a/scene/gui/progress_bar.cpp +++ b/scene/gui/progress_bar.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "progress_bar.h" Size2 ProgressBar::get_minimum_size() const { diff --git a/scene/gui/progress_bar.h b/scene/gui/progress_bar.h index f7b2a194ba..d091c983b1 100644 --- a/scene/gui/progress_bar.h +++ b/scene/gui/progress_bar.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef PROGRESS_BAR_H #define PROGRESS_BAR_H diff --git a/scene/gui/range.cpp b/scene/gui/range.cpp index b1a33906d2..a74a577898 100644 --- a/scene/gui/range.cpp +++ b/scene/gui/range.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "range.h" void Range::_value_changed_notify() { diff --git a/scene/gui/range.h b/scene/gui/range.h index 521ce412cf..de9383afd8 100644 --- a/scene/gui/range.h +++ b/scene/gui/range.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef RANGE_H #define RANGE_H diff --git a/scene/gui/reference_rect.cpp b/scene/gui/reference_rect.cpp index 1b25965dab..5e25f43daf 100644 --- a/scene/gui/reference_rect.cpp +++ b/scene/gui/reference_rect.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "reference_rect.h" #include "engine.h" diff --git a/scene/gui/reference_rect.h b/scene/gui/reference_rect.h index 3a062f1b6b..473e348c85 100644 --- a/scene/gui/reference_rect.h +++ b/scene/gui/reference_rect.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef REFERENCE_RECT_H #define REFERENCE_RECT_H diff --git a/scene/gui/rich_text_label.cpp b/scene/gui/rich_text_label.cpp index bf048ea1b6..49618d0138 100644 --- a/scene/gui/rich_text_label.cpp +++ b/scene/gui/rich_text_label.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "rich_text_label.h" #include "os/keyboard.h" #include "os/os.h" diff --git a/scene/gui/rich_text_label.h b/scene/gui/rich_text_label.h index c942ecc00f..48f746e28d 100644 --- a/scene/gui/rich_text_label.h +++ b/scene/gui/rich_text_label.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef RICH_TEXT_LABEL_H #define RICH_TEXT_LABEL_H diff --git a/scene/gui/scroll_bar.cpp b/scene/gui/scroll_bar.cpp index 3ac1ba0e48..d54500bc51 100644 --- a/scene/gui/scroll_bar.cpp +++ b/scene/gui/scroll_bar.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "scroll_bar.h" #include "os/keyboard.h" diff --git a/scene/gui/scroll_bar.h b/scene/gui/scroll_bar.h index 9d0dc3ccbc..15e037f8bb 100644 --- a/scene/gui/scroll_bar.h +++ b/scene/gui/scroll_bar.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef SCROLL_BAR_H #define SCROLL_BAR_H diff --git a/scene/gui/scroll_container.cpp b/scene/gui/scroll_container.cpp index 42745a7042..1e324a303e 100644 --- a/scene/gui/scroll_container.cpp +++ b/scene/gui/scroll_container.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "scroll_container.h" #include "os/os.h" bool ScrollContainer::clips_input() const { diff --git a/scene/gui/scroll_container.h b/scene/gui/scroll_container.h index 997d03cbf2..6e3387918b 100644 --- a/scene/gui/scroll_container.h +++ b/scene/gui/scroll_container.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef SCROLL_CONTAINER_H #define SCROLL_CONTAINER_H diff --git a/scene/gui/separator.cpp b/scene/gui/separator.cpp index f65d51cf86..cd0b06da81 100644 --- a/scene/gui/separator.cpp +++ b/scene/gui/separator.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "separator.h" Size2 Separator::get_minimum_size() const { diff --git a/scene/gui/separator.h b/scene/gui/separator.h index 985ccce31d..7949c7ca9b 100644 --- a/scene/gui/separator.h +++ b/scene/gui/separator.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef SEPARATOR_H #define SEPARATOR_H diff --git a/scene/gui/shortcut.cpp b/scene/gui/shortcut.cpp index 4f32786854..36490cf254 100644 --- a/scene/gui/shortcut.cpp +++ b/scene/gui/shortcut.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "shortcut.h" #include "os/keyboard.h" diff --git a/scene/gui/shortcut.h b/scene/gui/shortcut.h index 1d5bfc8bd9..f9240642bf 100644 --- a/scene/gui/shortcut.h +++ b/scene/gui/shortcut.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef SHORTCUT_H #define SHORTCUT_H diff --git a/scene/gui/slider.cpp b/scene/gui/slider.cpp index 37b4d30e3c..a7a1b499c3 100644 --- a/scene/gui/slider.cpp +++ b/scene/gui/slider.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "slider.h" #include "os/keyboard.h" diff --git a/scene/gui/slider.h b/scene/gui/slider.h index c380ab25a5..e77a0b7423 100644 --- a/scene/gui/slider.h +++ b/scene/gui/slider.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef SLIDER_H #define SLIDER_H diff --git a/scene/gui/spin_box.cpp b/scene/gui/spin_box.cpp index 76bcde01af..3c5d524d80 100644 --- a/scene/gui/spin_box.cpp +++ b/scene/gui/spin_box.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "spin_box.h" #include "os/input.h" diff --git a/scene/gui/spin_box.h b/scene/gui/spin_box.h index ab969556d9..b8565ec082 100644 --- a/scene/gui/spin_box.h +++ b/scene/gui/spin_box.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef SPIN_BOX_H #define SPIN_BOX_H diff --git a/scene/gui/split_container.cpp b/scene/gui/split_container.cpp index d0b7537665..e1d49019b3 100644 --- a/scene/gui/split_container.cpp +++ b/scene/gui/split_container.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "split_container.h" #include "label.h" diff --git a/scene/gui/split_container.h b/scene/gui/split_container.h index 2f3e480434..a31dc766d2 100644 --- a/scene/gui/split_container.h +++ b/scene/gui/split_container.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef SPLIT_CONTAINER_H #define SPLIT_CONTAINER_H diff --git a/scene/gui/tab_container.cpp b/scene/gui/tab_container.cpp index d00e360642..0312e58094 100644 --- a/scene/gui/tab_container.cpp +++ b/scene/gui/tab_container.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "tab_container.h" #include "message_queue.h" diff --git a/scene/gui/tab_container.h b/scene/gui/tab_container.h index 7374fc2d77..0ba8c205ea 100644 --- a/scene/gui/tab_container.h +++ b/scene/gui/tab_container.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef TAB_CONTAINER_H #define TAB_CONTAINER_H diff --git a/scene/gui/tabs.cpp b/scene/gui/tabs.cpp index 3ab031a2ea..ba808566e1 100644 --- a/scene/gui/tabs.cpp +++ b/scene/gui/tabs.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "tabs.h" #include "message_queue.h" diff --git a/scene/gui/tabs.h b/scene/gui/tabs.h index ffc0944829..246b3cba67 100644 --- a/scene/gui/tabs.h +++ b/scene/gui/tabs.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef TABS_H #define TABS_H diff --git a/scene/gui/text_edit.cpp b/scene/gui/text_edit.cpp index 87043c65eb..a3f59b54fc 100644 --- a/scene/gui/text_edit.cpp +++ b/scene/gui/text_edit.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "text_edit.h" #include "message_queue.h" @@ -1746,15 +1747,15 @@ void TextEdit::indent_left() { void TextEdit::_get_mouse_pos(const Point2i &p_mouse, int &r_row, int &r_col) const { float rows = p_mouse.y; - rows -= cache.style_normal->get_margin(MARGIN_TOP); rows /= get_row_height(); - int lsp = get_line_scroll_pos(true); - int row = cursor.line_ofs + (rows + (round(v_scroll->get_value()) - lsp)); + rows += v_scroll->get_value(); + int row = Math::floor(rows); 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 + (round(v_scroll->get_value()) - lsp)); + int lsp = get_line_scroll_pos(true); + int f_ofs = num_lines_from(CLAMP(cursor.line_ofs, 0, text.size() - 1), MIN(row + 1 - cursor.line_ofs, text.size() - cursor.line_ofs)) - 1; + row = cursor.line_ofs + f_ofs; row = CLAMP(row, 0, text.size() - num_lines_from(text.size() - 1, -1)); } @@ -3640,9 +3641,10 @@ void TextEdit::center_viewport_to_cursor() { int visible_rows = get_visible_rows(); 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 : 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); + if (text.size() >= visible_rows) { + int max_ofs = text.size() - (scroll_past_end_of_file_enabled ? 1 : MAX(num_lines_from(text.size() - 1, -visible_rows), 0)); + cursor.line_ofs = CLAMP(cursor.line - num_lines_from(MAX(cursor.line - visible_rows / 2, 0), -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)) diff --git a/scene/gui/text_edit.h b/scene/gui/text_edit.h index ccd7ba8278..88121a06f0 100644 --- a/scene/gui/text_edit.h +++ b/scene/gui/text_edit.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef TEXT_EDIT_H #define TEXT_EDIT_H diff --git a/scene/gui/texture_button.cpp b/scene/gui/texture_button.cpp index ec77fae1fa..07c9894611 100644 --- a/scene/gui/texture_button.cpp +++ b/scene/gui/texture_button.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "texture_button.h" Size2 TextureButton::get_minimum_size() const { diff --git a/scene/gui/texture_button.h b/scene/gui/texture_button.h index c6b05703ed..1cf4b66413 100644 --- a/scene/gui/texture_button.h +++ b/scene/gui/texture_button.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef TEXTURE_BUTTON_H #define TEXTURE_BUTTON_H diff --git a/scene/gui/texture_progress.cpp b/scene/gui/texture_progress.cpp index 5f0c7f7385..01b00c34ea 100644 --- a/scene/gui/texture_progress.cpp +++ b/scene/gui/texture_progress.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "texture_progress.h" #include "engine.h" diff --git a/scene/gui/texture_progress.h b/scene/gui/texture_progress.h index ab1f42fe3b..77c3980e29 100644 --- a/scene/gui/texture_progress.h +++ b/scene/gui/texture_progress.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef TEXTURE_PROGRESS_H #define TEXTURE_PROGRESS_H diff --git a/scene/gui/texture_rect.cpp b/scene/gui/texture_rect.cpp index 5b689cfce2..f4285525f6 100644 --- a/scene/gui/texture_rect.cpp +++ b/scene/gui/texture_rect.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "texture_rect.h" #include "servers/visual_server.h" diff --git a/scene/gui/texture_rect.h b/scene/gui/texture_rect.h index b6ccdff217..b684ac816c 100644 --- a/scene/gui/texture_rect.h +++ b/scene/gui/texture_rect.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef TEXTURE_FRAME_H #define TEXTURE_FRAME_H diff --git a/scene/gui/tool_button.cpp b/scene/gui/tool_button.cpp index e86776af90..4220a6b5ce 100644 --- a/scene/gui/tool_button.cpp +++ b/scene/gui/tool_button.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "tool_button.h" ToolButton::ToolButton() { diff --git a/scene/gui/tool_button.h b/scene/gui/tool_button.h index 14a7cdc2fe..b8be18e560 100644 --- a/scene/gui/tool_button.h +++ b/scene/gui/tool_button.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef TOOL_BUTTON_H #define TOOL_BUTTON_H diff --git a/scene/gui/tree.cpp b/scene/gui/tree.cpp index b1a421c24f..fd5a47d875 100644 --- a/scene/gui/tree.cpp +++ b/scene/gui/tree.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "tree.h" #include <limits.h> @@ -915,6 +916,7 @@ int Tree::compute_item_height(TreeItem *p_item) const { if (p_item == root && hide_root) return 0; + ERR_FAIL_COND_V(cache.font.is_null(), 0); int height = cache.font->get_height(); for (int i = 0; i < columns.size(); i++) { @@ -988,6 +990,8 @@ int Tree::get_item_height(TreeItem *p_item) const { void Tree::draw_item_rect(const TreeItem::Cell &p_cell, const Rect2i &p_rect, const Color &p_color, const Color &p_icon_color) { + ERR_FAIL_COND(cache.font.is_null()); + Rect2i rect = p_rect; Ref<Font> font = cache.font; String text = p_cell.text; @@ -1057,6 +1061,7 @@ int Tree::draw_item(const Point2i &p_pos, const Point2 &p_draw_ofs, const Size2 //draw separation. //if (p_item->get_parent()!=root || !hide_root) + ERR_FAIL_COND_V(cache.font.is_null(), -1); Ref<Font> font = cache.font; int font_ascent = font->get_ascent(); @@ -2793,6 +2798,7 @@ void Tree::update_scrollbars() { int Tree::_get_title_button_height() const { + ERR_FAIL_COND_V(cache.font.is_null() || cache.title_button.is_null(), 0); return show_column_titles ? cache.font->get_height() + cache.title_button->get_minimum_size().height : 0; } diff --git a/scene/gui/tree.h b/scene/gui/tree.h index a6ebf6c3da..ccacb44e6b 100644 --- a/scene/gui/tree.h +++ b/scene/gui/tree.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef TREE_H #define TREE_H diff --git a/scene/gui/video_player.cpp b/scene/gui/video_player.cpp index 06be83bf08..b0739a2f37 100644 --- a/scene/gui/video_player.cpp +++ b/scene/gui/video_player.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "video_player.h" #include "os/os.h" @@ -37,11 +38,6 @@ int VideoPlayer::sp_get_channel_count() const { return playback->get_channels(); } -void VideoPlayer::sp_set_mix_rate(int p_rate) { - - server_mix_rate = p_rate; -} - bool VideoPlayer::mix(AudioFrame *p_buffer, int p_frames) { // Check the amount resampler can really handle. @@ -240,7 +236,7 @@ void VideoPlayer::set_stream(const Ref<VideoStream> &p_stream) { AudioServer::get_singleton()->lock(); if (channels > 0) - resampler.setup(channels, playback->get_mix_rate(), server_mix_rate, buffering_ms, 0); + resampler.setup(channels, playback->get_mix_rate(), AudioServer::get_singleton()->get_mix_rate(), buffering_ms, 0); else resampler.clear(); AudioServer::get_singleton()->unlock(); @@ -493,7 +489,6 @@ VideoPlayer::VideoPlayer() { bus_index = 0; buffering_ms = 500; - server_mix_rate = 44100; // internal_stream.player=this; // stream_rid=AudioServer::get_singleton()->audio_stream_create(&internal_stream); diff --git a/scene/gui/video_player.h b/scene/gui/video_player.h index e772851b0e..5c379b5620 100644 --- a/scene/gui/video_player.h +++ b/scene/gui/video_player.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef VIDEO_PLAYER_H #define VIDEO_PLAYER_H @@ -49,7 +50,6 @@ class VideoPlayer : public Control { Ref<VideoStream> stream; int sp_get_channel_count() const; - void sp_set_mix_rate(int p_rate); //notify the stream of the mix rate bool mix(AudioFrame *p_buffer, int p_frames); RID stream_rid; @@ -68,7 +68,6 @@ class VideoPlayer : public Control { bool expand; bool loops; int buffering_ms; - int server_mix_rate; int audio_track; int bus_index; diff --git a/scene/gui/viewport_container.cpp b/scene/gui/viewport_container.cpp index e949c20c36..af849589cf 100644 --- a/scene/gui/viewport_container.cpp +++ b/scene/gui/viewport_container.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "viewport_container.h" #include "scene/main/viewport.h" diff --git a/scene/gui/viewport_container.h b/scene/gui/viewport_container.h index c28b3075aa..cd8b4dd5c1 100644 --- a/scene/gui/viewport_container.h +++ b/scene/gui/viewport_container.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef VIEWPORTCONTAINER_H #define VIEWPORTCONTAINER_H diff --git a/scene/main/canvas_layer.cpp b/scene/main/canvas_layer.cpp index 939de346eb..f720864daa 100644 --- a/scene/main/canvas_layer.cpp +++ b/scene/main/canvas_layer.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "canvas_layer.h" #include "viewport.h" diff --git a/scene/main/canvas_layer.h b/scene/main/canvas_layer.h index 81d2616cdc..c3352a6dba 100644 --- a/scene/main/canvas_layer.h +++ b/scene/main/canvas_layer.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef CANVAS_LAYER_H #define CANVAS_LAYER_H diff --git a/scene/main/http_request.cpp b/scene/main/http_request.cpp index e99a21fbce..49d69299ea 100644 --- a/scene/main/http_request.cpp +++ b/scene/main/http_request.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "http_request.h" #include "version.h" diff --git a/scene/main/http_request.h b/scene/main/http_request.h index 1777a7f8f1..eb5d020bc5 100644 --- a/scene/main/http_request.h +++ b/scene/main/http_request.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef HTTPREQUEST_H #define HTTPREQUEST_H diff --git a/scene/main/instance_placeholder.cpp b/scene/main/instance_placeholder.cpp index a2c29d8209..24b04c0c4a 100644 --- a/scene/main/instance_placeholder.cpp +++ b/scene/main/instance_placeholder.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "instance_placeholder.h" #include "io/resource_loader.h" diff --git a/scene/main/instance_placeholder.h b/scene/main/instance_placeholder.h index 9b2f1e1168..d70f1318ea 100644 --- a/scene/main/instance_placeholder.h +++ b/scene/main/instance_placeholder.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef INSTANCE_PLACEHOLDER_H #define INSTANCE_PLACEHOLDER_H diff --git a/scene/main/node.cpp b/scene/main/node.cpp index d82000e3fa..a36f398024 100644 --- a/scene/main/node.cpp +++ b/scene/main/node.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "node.h" #include "core/core_string_names.h" diff --git a/scene/main/node.h b/scene/main/node.h index 2aca84324d..dc6bda4621 100644 --- a/scene/main/node.h +++ b/scene/main/node.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef NODE_H #define NODE_H diff --git a/scene/main/resource_preloader.cpp b/scene/main/resource_preloader.cpp index 76fa40cc7c..a779b49141 100644 --- a/scene/main/resource_preloader.cpp +++ b/scene/main/resource_preloader.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "resource_preloader.h" void ResourcePreloader::_set_resources(const Array &p_data) { diff --git a/scene/main/resource_preloader.h b/scene/main/resource_preloader.h index 479cde51ae..98c7b21f37 100644 --- a/scene/main/resource_preloader.h +++ b/scene/main/resource_preloader.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef RESOURCE_PRELOADER_H #define RESOURCE_PRELOADER_H diff --git a/scene/main/scene_tree.cpp b/scene/main/scene_tree.cpp index 632d912e43..bc250ff4d5 100644 --- a/scene/main/scene_tree.cpp +++ b/scene/main/scene_tree.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "scene_tree.h" #include "editor/editor_node.h" @@ -2350,7 +2351,7 @@ SceneTree::SceneTree() { ProjectSettings::get_singleton()->set("rendering/environment/default_environment", ""); } else { //file was erased, notify user. - ERR_PRINTS(RTR("Default Environment as specified in Project Setings (Rendering -> Environment -> Default Environment) could not be loaded.")); + ERR_PRINTS(RTR("Default Environment as specified in Project Settings (Rendering -> Environment -> Default Environment) could not be loaded.")); } } } diff --git a/scene/main/scene_tree.h b/scene/main/scene_tree.h index dab446e226..6c4cc4e6d1 100644 --- a/scene/main/scene_tree.h +++ b/scene/main/scene_tree.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef SCENE_MAIN_LOOP_H #define SCENE_MAIN_LOOP_H diff --git a/scene/main/timer.cpp b/scene/main/timer.cpp index 90cec07f56..b7fb449259 100755 --- a/scene/main/timer.cpp +++ b/scene/main/timer.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "timer.h" #include "engine.h" diff --git a/scene/main/timer.h b/scene/main/timer.h index 8c15e2eac7..410d985407 100755 --- a/scene/main/timer.h +++ b/scene/main/timer.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef TIMER_H #define TIMER_H diff --git a/scene/main/viewport.cpp b/scene/main/viewport.cpp index 78706ee14a..5f1257a855 100644 --- a/scene/main/viewport.cpp +++ b/scene/main/viewport.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "viewport.h" #include "os/input.h" @@ -678,6 +679,20 @@ void Viewport::_notification(int p_what) { } } break; + case SceneTree::NOTIFICATION_WM_FOCUS_OUT: { + if (gui.mouse_focus) { + //if mouse is being pressed, send a release event + Ref<InputEventMouseButton> mb; + mb.instance(); + mb->set_position(gui.mouse_focus->get_local_mouse_position()); + mb->set_global_position(gui.mouse_focus->get_local_mouse_position()); + mb->set_button_index(gui.mouse_focus_button); + mb->set_pressed(false); + Control *c = gui.mouse_focus; + gui.mouse_focus = NULL; + c->call_multilevel(SceneStringNames::get_singleton()->_gui_input, mb); + } + } break; } } @@ -2376,12 +2391,9 @@ List<Control *>::Element *Viewport::_gui_show_modal(Control *p_control) { mb->set_global_position(gui.mouse_focus->get_local_mouse_position()); mb->set_button_index(gui.mouse_focus_button); mb->set_pressed(false); - gui.mouse_focus->call_multilevel(SceneStringNames::get_singleton()->_gui_input, mb); - - //if (gui.mouse_over == gui.mouse_focus) { - // gui.mouse_focus->notification(Control::NOTIFICATION_MOUSE_EXIT); - //} + Control *c = gui.mouse_focus; gui.mouse_focus = NULL; + c->call_multilevel(SceneStringNames::get_singleton()->_gui_input, mb); } return gui.modal_stack.back(); diff --git a/scene/main/viewport.h b/scene/main/viewport.h index 92c53a7ab8..48e2929e54 100644 --- a/scene/main/viewport.h +++ b/scene/main/viewport.h @@ -1,4 +1,3 @@ - /*************************************************************************/ /* viewport.h */ /*************************************************************************/ @@ -28,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef VIEWPORT_H #define VIEWPORT_H diff --git a/scene/register_scene_types.cpp b/scene/register_scene_types.cpp index 998c790c94..2dee74f561 100644 --- a/scene/register_scene_types.cpp +++ b/scene/register_scene_types.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "register_scene_types.h" #include "core/class_db.h" diff --git a/scene/register_scene_types.h b/scene/register_scene_types.h index da7e290f25..9121c015fd 100644 --- a/scene/register_scene_types.h +++ b/scene/register_scene_types.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef REGISTER_SCENE_TYPES_H #define REGISTER_SCENE_TYPES_H diff --git a/scene/resources/animation.cpp b/scene/resources/animation.cpp index 367c8235f5..a32e77bbfd 100644 --- a/scene/resources/animation.cpp +++ b/scene/resources/animation.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "animation.h" #include "geometry.h" diff --git a/scene/resources/animation.h b/scene/resources/animation.h index 2975c7fd9d..73691a69f2 100644 --- a/scene/resources/animation.h +++ b/scene/resources/animation.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef ANIMATION_H #define ANIMATION_H diff --git a/scene/resources/audio_stream_sample.cpp b/scene/resources/audio_stream_sample.cpp index e52a83d17e..22992f6a40 100644 --- a/scene/resources/audio_stream_sample.cpp +++ b/scene/resources/audio_stream_sample.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "audio_stream_sample.h" void AudioStreamPlaybackSample::start(float p_from_pos) { diff --git a/scene/resources/audio_stream_sample.h b/scene/resources/audio_stream_sample.h index a51483aa21..41754301eb 100644 --- a/scene/resources/audio_stream_sample.h +++ b/scene/resources/audio_stream_sample.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef AUDIOSTREAMSAMPLE_H #define AUDIOSTREAMSAMPLE_H diff --git a/scene/resources/bit_mask.cpp b/scene/resources/bit_mask.cpp index 85bcfc9ecd..e99db8d9cb 100644 --- a/scene/resources/bit_mask.cpp +++ b/scene/resources/bit_mask.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "bit_mask.h" #include "io/image_loader.h" @@ -111,8 +112,8 @@ int BitMap::get_true_bit_count() const { void BitMap::set_bit(const Point2 &p_pos, bool p_value) { - int x = Math::fast_ftoi(p_pos.x); - int y = Math::fast_ftoi(p_pos.y); + int x = p_pos.x; + int y = p_pos.y; ERR_FAIL_INDEX(x, width); ERR_FAIL_INDEX(y, height); diff --git a/scene/resources/bit_mask.h b/scene/resources/bit_mask.h index 403f151004..cf126ef96b 100644 --- a/scene/resources/bit_mask.h +++ b/scene/resources/bit_mask.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef BIT_MASK_H #define BIT_MASK_H @@ -38,7 +39,6 @@ class BitMap : public Resource { GDCLASS(BitMap, Resource); OBJ_SAVE_TYPE(BitMap); - RES_BASE_EXTENSION("pbm"); Vector<uint8_t> bitmask; int width; diff --git a/scene/resources/bounds.cpp b/scene/resources/bounds.cpp index 3e4be0defa..b115d92be3 100644 --- a/scene/resources/bounds.cpp +++ b/scene/resources/bounds.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "bounds.h" void Bounds::_bind_methods() { diff --git a/scene/resources/bounds.h b/scene/resources/bounds.h index 1454064853..dfe2fe40c6 100644 --- a/scene/resources/bounds.h +++ b/scene/resources/bounds.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef BOUNDS_H #define BOUNDS_H diff --git a/scene/resources/box_shape.cpp b/scene/resources/box_shape.cpp index d93791ef4f..e9e01ed98a 100644 --- a/scene/resources/box_shape.cpp +++ b/scene/resources/box_shape.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "box_shape.h" #include "servers/physics_server.h" diff --git a/scene/resources/box_shape.h b/scene/resources/box_shape.h index 2bbf455a46..5ef16b4766 100644 --- a/scene/resources/box_shape.h +++ b/scene/resources/box_shape.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef BOX_SHAPE_H #define BOX_SHAPE_H diff --git a/scene/resources/canvas.cpp b/scene/resources/canvas.cpp index e46b40736e..8da1da9541 100644 --- a/scene/resources/canvas.cpp +++ b/scene/resources/canvas.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "canvas.h" #include "servers/visual_server.h" diff --git a/scene/resources/canvas.h b/scene/resources/canvas.h index 1bb57987e3..dfdea82ca5 100644 --- a/scene/resources/canvas.h +++ b/scene/resources/canvas.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef CANVAS_H #define CANVAS_H diff --git a/scene/resources/capsule_shape.cpp b/scene/resources/capsule_shape.cpp index bb721759c9..101970bad8 100644 --- a/scene/resources/capsule_shape.cpp +++ b/scene/resources/capsule_shape.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "capsule_shape.h" #include "servers/physics_server.h" diff --git a/scene/resources/capsule_shape.h b/scene/resources/capsule_shape.h index 6a0b27bb0b..f89d07c5f1 100644 --- a/scene/resources/capsule_shape.h +++ b/scene/resources/capsule_shape.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef CAPSULE_SHAPE_H #define CAPSULE_SHAPE_H diff --git a/scene/resources/capsule_shape_2d.cpp b/scene/resources/capsule_shape_2d.cpp index 2722ff7207..95ab34abb2 100644 --- a/scene/resources/capsule_shape_2d.cpp +++ b/scene/resources/capsule_shape_2d.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "capsule_shape_2d.h" #include "servers/physics_2d_server.h" diff --git a/scene/resources/capsule_shape_2d.h b/scene/resources/capsule_shape_2d.h index 784f2c02c8..04d663c010 100644 --- a/scene/resources/capsule_shape_2d.h +++ b/scene/resources/capsule_shape_2d.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef CAPSULE_SHAPE_2D_H #define CAPSULE_SHAPE_2D_H diff --git a/scene/resources/circle_shape_2d.cpp b/scene/resources/circle_shape_2d.cpp index 669b1d8e7d..1c7bb76b26 100644 --- a/scene/resources/circle_shape_2d.cpp +++ b/scene/resources/circle_shape_2d.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "circle_shape_2d.h" #include "servers/physics_2d_server.h" diff --git a/scene/resources/circle_shape_2d.h b/scene/resources/circle_shape_2d.h index 3668521a55..06bb433170 100644 --- a/scene/resources/circle_shape_2d.h +++ b/scene/resources/circle_shape_2d.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef CIRCLE_SHAPE_2D_H #define CIRCLE_SHAPE_2D_H diff --git a/scene/resources/color_ramp.cpp b/scene/resources/color_ramp.cpp index 22d52ef1ec..8c09130873 100644 --- a/scene/resources/color_ramp.cpp +++ b/scene/resources/color_ramp.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "color_ramp.h" #include "core_string_names.h" diff --git a/scene/resources/color_ramp.h b/scene/resources/color_ramp.h index 4e041355b2..c042a0d3d0 100644 --- a/scene/resources/color_ramp.h +++ b/scene/resources/color_ramp.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef SCENE_RESOURCES_COLOR_RAMP_H_ #define SCENE_RESOURCES_COLOR_RAMP_H_ diff --git a/scene/resources/concave_polygon_shape.cpp b/scene/resources/concave_polygon_shape.cpp index 718aaeb27a..2fb500b8a8 100644 --- a/scene/resources/concave_polygon_shape.cpp +++ b/scene/resources/concave_polygon_shape.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "concave_polygon_shape.h" #include "servers/physics_server.h" diff --git a/scene/resources/concave_polygon_shape.h b/scene/resources/concave_polygon_shape.h index b94e3eca9c..b659ac7311 100644 --- a/scene/resources/concave_polygon_shape.h +++ b/scene/resources/concave_polygon_shape.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef CONCAVE_POLYGON_SHAPE_H #define CONCAVE_POLYGON_SHAPE_H diff --git a/scene/resources/concave_polygon_shape_2d.cpp b/scene/resources/concave_polygon_shape_2d.cpp index 69765796f6..d4343680ef 100644 --- a/scene/resources/concave_polygon_shape_2d.cpp +++ b/scene/resources/concave_polygon_shape_2d.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "concave_polygon_shape_2d.h" #include "servers/physics_2d_server.h" diff --git a/scene/resources/concave_polygon_shape_2d.h b/scene/resources/concave_polygon_shape_2d.h index 7ca14d4d66..e8fa7369ac 100644 --- a/scene/resources/concave_polygon_shape_2d.h +++ b/scene/resources/concave_polygon_shape_2d.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef CONCAVE_POLYGON_SHAPE_2D_H #define CONCAVE_POLYGON_SHAPE_2D_H diff --git a/scene/resources/convex_polygon_shape.cpp b/scene/resources/convex_polygon_shape.cpp index e022b76907..a2e0996996 100644 --- a/scene/resources/convex_polygon_shape.cpp +++ b/scene/resources/convex_polygon_shape.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "convex_polygon_shape.h" #include "quick_hull.h" #include "servers/physics_server.h" diff --git a/scene/resources/convex_polygon_shape.h b/scene/resources/convex_polygon_shape.h index 0a840f0bc5..62567fc031 100644 --- a/scene/resources/convex_polygon_shape.h +++ b/scene/resources/convex_polygon_shape.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef CONVEX_POLYGON_SHAPE_H #define CONVEX_POLYGON_SHAPE_H diff --git a/scene/resources/convex_polygon_shape_2d.cpp b/scene/resources/convex_polygon_shape_2d.cpp index 0402a70898..d061c4ea1e 100644 --- a/scene/resources/convex_polygon_shape_2d.cpp +++ b/scene/resources/convex_polygon_shape_2d.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "convex_polygon_shape_2d.h" #include "geometry.h" diff --git a/scene/resources/convex_polygon_shape_2d.h b/scene/resources/convex_polygon_shape_2d.h index 320cf94a5e..69c237a0e6 100644 --- a/scene/resources/convex_polygon_shape_2d.h +++ b/scene/resources/convex_polygon_shape_2d.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef CONVEX_POLYGON_SHAPE_2D_H #define CONVEX_POLYGON_SHAPE_2D_H diff --git a/scene/resources/curve.cpp b/scene/resources/curve.cpp index 95cb336740..e95a07c8b8 100644 --- a/scene/resources/curve.cpp +++ b/scene/resources/curve.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "curve.h" #include "core_string_names.h" diff --git a/scene/resources/curve.h b/scene/resources/curve.h index 4d421246bf..4f55e4055c 100644 --- a/scene/resources/curve.h +++ b/scene/resources/curve.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef CURVE_H #define CURVE_H diff --git a/scene/resources/dynamic_font.cpp b/scene/resources/dynamic_font.cpp index d52002ad5c..575c222cc1 100644 --- a/scene/resources/dynamic_font.cpp +++ b/scene/resources/dynamic_font.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifdef FREETYPE_ENABLED #include "dynamic_font.h" #include "os/file_access.h" @@ -650,8 +651,8 @@ DynamicFontAtSize::~DynamicFontAtSize() { if (valid) { FT_Done_FreeType(library); - font->size_cache.erase(id); } + font->size_cache.erase(id); } ///////////////////////// diff --git a/scene/resources/dynamic_font.h b/scene/resources/dynamic_font.h index 1a890dd65d..a949892086 100644 --- a/scene/resources/dynamic_font.h +++ b/scene/resources/dynamic_font.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef DYNAMIC_FONT_H #define DYNAMIC_FONT_H diff --git a/scene/resources/dynamic_font_stb.cpp b/scene/resources/dynamic_font_stb.cpp index 70495e9bbf..098b794a95 100644 --- a/scene/resources/dynamic_font_stb.cpp +++ b/scene/resources/dynamic_font_stb.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "dynamic_font_stb.h" #ifndef FREETYPE_ENABLED diff --git a/scene/resources/dynamic_font_stb.h b/scene/resources/dynamic_font_stb.h index 3d4ad4389c..4c1097d28b 100644 --- a/scene/resources/dynamic_font_stb.h +++ b/scene/resources/dynamic_font_stb.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef DYNAMICFONT_STB_H #define DYNAMICFONT_STB_H diff --git a/scene/resources/environment.cpp b/scene/resources/environment.cpp index b2c91f90eb..3d060ab7e3 100644 --- a/scene/resources/environment.cpp +++ b/scene/resources/environment.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "environment.h" #include "project_settings.h" #include "servers/visual_server.h" diff --git a/scene/resources/environment.h b/scene/resources/environment.h index 9e2461a2ce..27fd57aa09 100644 --- a/scene/resources/environment.h +++ b/scene/resources/environment.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef ENVIRONMENT_H #define ENVIRONMENT_H diff --git a/scene/resources/font.cpp b/scene/resources/font.cpp index 7b4bd273bd..5d2e3c172a 100644 --- a/scene/resources/font.cpp +++ b/scene/resources/font.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "font.h" #include "core/io/resource_loader.h" diff --git a/scene/resources/font.h b/scene/resources/font.h index 5eaf82d6bc..3f228ca002 100644 --- a/scene/resources/font.h +++ b/scene/resources/font.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef FONT_H #define FONT_H diff --git a/scene/resources/material.cpp b/scene/resources/material.cpp index 4e3991b573..28d5508698 100644 --- a/scene/resources/material.cpp +++ b/scene/resources/material.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "material.h" #include "scene/scene_string_names.h" diff --git a/scene/resources/material.h b/scene/resources/material.h index 9ce1765e62..10bbcfd642 100644 --- a/scene/resources/material.h +++ b/scene/resources/material.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef MATERIAL_H #define MATERIAL_H diff --git a/scene/resources/mesh.cpp b/scene/resources/mesh.cpp index dc726adf86..a2008fd1a7 100644 --- a/scene/resources/mesh.cpp +++ b/scene/resources/mesh.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "mesh.h" #include "pair.h" diff --git a/scene/resources/mesh.h b/scene/resources/mesh.h index 98d9edd48b..e8b7ecaf9a 100644 --- a/scene/resources/mesh.h +++ b/scene/resources/mesh.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef MESH_H #define MESH_H diff --git a/scene/resources/mesh_data_tool.cpp b/scene/resources/mesh_data_tool.cpp index 2854d45b52..8639b325c3 100644 --- a/scene/resources/mesh_data_tool.cpp +++ b/scene/resources/mesh_data_tool.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "mesh_data_tool.h" void MeshDataTool::clear() { diff --git a/scene/resources/mesh_data_tool.h b/scene/resources/mesh_data_tool.h index fde6e5a46e..f614b80c3b 100644 --- a/scene/resources/mesh_data_tool.h +++ b/scene/resources/mesh_data_tool.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef MESH_DATA_TOOL_H #define MESH_DATA_TOOL_H diff --git a/scene/resources/mesh_library.cpp b/scene/resources/mesh_library.cpp index adf646f2d9..e1d3540fd1 100644 --- a/scene/resources/mesh_library.cpp +++ b/scene/resources/mesh_library.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "mesh_library.h" bool MeshLibrary::_set(const StringName &p_name, const Variant &p_value) { diff --git a/scene/resources/mesh_library.h b/scene/resources/mesh_library.h index a0bcfec2b6..69719960e2 100644 --- a/scene/resources/mesh_library.h +++ b/scene/resources/mesh_library.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef GRID_THEME_H #define GRID_THEME_H diff --git a/scene/resources/multimesh.cpp b/scene/resources/multimesh.cpp index a89b1c7342..b2564fd798 100644 --- a/scene/resources/multimesh.cpp +++ b/scene/resources/multimesh.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "multimesh.h" #include "servers/visual_server.h" diff --git a/scene/resources/multimesh.h b/scene/resources/multimesh.h index f84d0c77c6..0875d6d06d 100644 --- a/scene/resources/multimesh.h +++ b/scene/resources/multimesh.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef MULTIMESH_H #define MULTIMESH_H diff --git a/scene/resources/packed_scene.cpp b/scene/resources/packed_scene.cpp index 9dc29151d5..c13a72698b 100644 --- a/scene/resources/packed_scene.cpp +++ b/scene/resources/packed_scene.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "packed_scene.h" #include "core/core_string_names.h" diff --git a/scene/resources/packed_scene.h b/scene/resources/packed_scene.h index 01035863d9..278986eb62 100644 --- a/scene/resources/packed_scene.h +++ b/scene/resources/packed_scene.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef PACKED_SCENE_H #define PACKED_SCENE_H diff --git a/scene/resources/plane_shape.cpp b/scene/resources/plane_shape.cpp index 881ecc616e..4d38ebe090 100644 --- a/scene/resources/plane_shape.cpp +++ b/scene/resources/plane_shape.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "plane_shape.h" #include "servers/physics_server.h" diff --git a/scene/resources/plane_shape.h b/scene/resources/plane_shape.h index 3225a614e5..c24c9474fb 100644 --- a/scene/resources/plane_shape.h +++ b/scene/resources/plane_shape.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef PLANE_SHAPE_H #define PLANE_SHAPE_H diff --git a/scene/resources/polygon_path_finder.cpp b/scene/resources/polygon_path_finder.cpp index f26ec5e0a8..cd885d95eb 100644 --- a/scene/resources/polygon_path_finder.cpp +++ b/scene/resources/polygon_path_finder.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "polygon_path_finder.h" #include "geometry.h" diff --git a/scene/resources/polygon_path_finder.h b/scene/resources/polygon_path_finder.h index 960e6739d6..19761c274c 100644 --- a/scene/resources/polygon_path_finder.h +++ b/scene/resources/polygon_path_finder.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef POLYGON_PATH_FINDER_H #define POLYGON_PATH_FINDER_H diff --git a/scene/resources/ray_shape.cpp b/scene/resources/ray_shape.cpp index dfd7aee23a..78a19050f1 100644 --- a/scene/resources/ray_shape.cpp +++ b/scene/resources/ray_shape.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "ray_shape.h" #include "servers/physics_server.h" diff --git a/scene/resources/ray_shape.h b/scene/resources/ray_shape.h index 45fd8ea603..4bd96116fe 100644 --- a/scene/resources/ray_shape.h +++ b/scene/resources/ray_shape.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef RAY_SHAPE_H #define RAY_SHAPE_H #include "scene/resources/shape.h" diff --git a/scene/resources/rectangle_shape_2d.cpp b/scene/resources/rectangle_shape_2d.cpp index 5c4c838e29..aeb22f6d0a 100644 --- a/scene/resources/rectangle_shape_2d.cpp +++ b/scene/resources/rectangle_shape_2d.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "rectangle_shape_2d.h" #include "servers/physics_2d_server.h" diff --git a/scene/resources/rectangle_shape_2d.h b/scene/resources/rectangle_shape_2d.h index 1e2a40d695..2d66d328fd 100644 --- a/scene/resources/rectangle_shape_2d.h +++ b/scene/resources/rectangle_shape_2d.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef RECTANGLE_SHAPE_2D_H #define RECTANGLE_SHAPE_2D_H diff --git a/scene/resources/room.cpp b/scene/resources/room.cpp index f46b074225..9493f8fbe6 100644 --- a/scene/resources/room.cpp +++ b/scene/resources/room.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "room.h" #include "servers/visual_server.h" diff --git a/scene/resources/room.h b/scene/resources/room.h index 367757fdb9..359d918665 100644 --- a/scene/resources/room.h +++ b/scene/resources/room.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef ROOM_BOUNDS_H #define ROOM_BOUNDS_H diff --git a/scene/resources/scene_format_text.cpp b/scene/resources/scene_format_text.cpp index 9910fe8dfc..71a691fe27 100644 --- a/scene/resources/scene_format_text.cpp +++ b/scene/resources/scene_format_text.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "scene_format_text.h" #include "core/io/resource_format_binary.h" #include "os/dir_access.h" diff --git a/scene/resources/scene_format_text.h b/scene/resources/scene_format_text.h index 6782aff6fd..c014b9bfae 100644 --- a/scene/resources/scene_format_text.h +++ b/scene/resources/scene_format_text.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef SCENE_FORMAT_TEXT_H #define SCENE_FORMAT_TEXT_H diff --git a/scene/resources/segment_shape_2d.cpp b/scene/resources/segment_shape_2d.cpp index 346599b25a..81110015b5 100644 --- a/scene/resources/segment_shape_2d.cpp +++ b/scene/resources/segment_shape_2d.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "segment_shape_2d.h" #include "servers/physics_2d_server.h" diff --git a/scene/resources/segment_shape_2d.h b/scene/resources/segment_shape_2d.h index 39a71f61d5..4ed30c0443 100644 --- a/scene/resources/segment_shape_2d.h +++ b/scene/resources/segment_shape_2d.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef SEGMENT_SHAPE_2D_H #define SEGMENT_SHAPE_2D_H diff --git a/scene/resources/shader.cpp b/scene/resources/shader.cpp index c33267d023..36740a307b 100644 --- a/scene/resources/shader.cpp +++ b/scene/resources/shader.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "shader.h" #include "os/file_access.h" #include "scene/scene_string_names.h" diff --git a/scene/resources/shader.h b/scene/resources/shader.h index e9f5873588..248a6f0125 100644 --- a/scene/resources/shader.h +++ b/scene/resources/shader.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef SHADER_H #define SHADER_H diff --git a/scene/resources/shader_graph.cpp b/scene/resources/shader_graph.cpp index 431150d1dd..60ba3af7d5 100644 --- a/scene/resources/shader_graph.cpp +++ b/scene/resources/shader_graph.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "shader_graph.h" #include "scene/scene_string_names.h" diff --git a/scene/resources/shader_graph.h b/scene/resources/shader_graph.h index f9856158b9..e3a68f8572 100644 --- a/scene/resources/shader_graph.h +++ b/scene/resources/shader_graph.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef SHADER_GRAPH_H #define SHADER_GRAPH_H diff --git a/scene/resources/shape.cpp b/scene/resources/shape.cpp index edec89641f..418d8ce819 100644 --- a/scene/resources/shape.cpp +++ b/scene/resources/shape.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "shape.h" #include "os/os.h" diff --git a/scene/resources/shape.h b/scene/resources/shape.h index bdbc9ba1e4..ad87a69679 100644 --- a/scene/resources/shape.h +++ b/scene/resources/shape.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef SHAPE_H #define SHAPE_H diff --git a/scene/resources/shape_2d.cpp b/scene/resources/shape_2d.cpp index 15c8b6b748..0ca518e5bb 100644 --- a/scene/resources/shape_2d.cpp +++ b/scene/resources/shape_2d.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "shape_2d.h" #include "servers/physics_2d_server.h" RID Shape2D::get_rid() const { diff --git a/scene/resources/shape_2d.h b/scene/resources/shape_2d.h index 877a159aee..ed655b8a93 100644 --- a/scene/resources/shape_2d.h +++ b/scene/resources/shape_2d.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef SHAPE_2D_H #define SHAPE_2D_H diff --git a/scene/resources/shape_line_2d.cpp b/scene/resources/shape_line_2d.cpp index 9548d35370..1a81eea6e5 100644 --- a/scene/resources/shape_line_2d.cpp +++ b/scene/resources/shape_line_2d.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "shape_line_2d.h" #include "servers/physics_2d_server.h" #include "servers/visual_server.h" diff --git a/scene/resources/shape_line_2d.h b/scene/resources/shape_line_2d.h index fe6f2d675e..7d31941558 100644 --- a/scene/resources/shape_line_2d.h +++ b/scene/resources/shape_line_2d.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef SHAPE_LINE_2D_H #define SHAPE_LINE_2D_H diff --git a/scene/resources/sky_box.cpp b/scene/resources/sky_box.cpp index 42ed6f72fa..f2d5cb3516 100644 --- a/scene/resources/sky_box.cpp +++ b/scene/resources/sky_box.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "sky_box.h" #include "io/image_loader.h" diff --git a/scene/resources/sky_box.h b/scene/resources/sky_box.h index b62f9064c5..e561653a9e 100644 --- a/scene/resources/sky_box.h +++ b/scene/resources/sky_box.h @@ -27,8 +27,9 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef Sky_H -#define Sky_H + +#ifndef SKY_BOX_H +#define SKY_BOX_H #include "os/thread.h" #include "scene/resources/texture.h" @@ -195,4 +196,4 @@ public: VARIANT_ENUM_CAST(ProceduralSky::TextureSize) -#endif // Sky_H +#endif // SKY_BOX_H diff --git a/scene/resources/space_2d.cpp b/scene/resources/space_2d.cpp index e2661e83f5..062f4099db 100644 --- a/scene/resources/space_2d.cpp +++ b/scene/resources/space_2d.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "space_2d.h" RID Space2D::get_rid() const { diff --git a/scene/resources/space_2d.h b/scene/resources/space_2d.h index 3ed1e4199a..148285ac6d 100644 --- a/scene/resources/space_2d.h +++ b/scene/resources/space_2d.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef SPACE_2D_H #define SPACE_2D_H diff --git a/scene/resources/sphere_shape.cpp b/scene/resources/sphere_shape.cpp index c61749a598..d8ca1cf3f1 100644 --- a/scene/resources/sphere_shape.cpp +++ b/scene/resources/sphere_shape.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "sphere_shape.h" #include "servers/physics_server.h" diff --git a/scene/resources/sphere_shape.h b/scene/resources/sphere_shape.h index c1e0069941..5dd7daabc5 100644 --- a/scene/resources/sphere_shape.h +++ b/scene/resources/sphere_shape.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef SPHERE_SHAPE_H #define SPHERE_SHAPE_H diff --git a/scene/resources/style_box.cpp b/scene/resources/style_box.cpp index 7c8007ff9c..235e398904 100644 --- a/scene/resources/style_box.cpp +++ b/scene/resources/style_box.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "style_box.h" #include <limits.h> diff --git a/scene/resources/style_box.h b/scene/resources/style_box.h index bdaa04e492..fb79aa360e 100644 --- a/scene/resources/style_box.h +++ b/scene/resources/style_box.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef STYLE_BOX_H #define STYLE_BOX_H diff --git a/scene/resources/surface_tool.cpp b/scene/resources/surface_tool.cpp index a2535d0ddb..07c1036a10 100644 --- a/scene/resources/surface_tool.cpp +++ b/scene/resources/surface_tool.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "surface_tool.h" #include "method_bind_ext.gen.inc" diff --git a/scene/resources/surface_tool.h b/scene/resources/surface_tool.h index d18c1fc263..7a9aa349bb 100644 --- a/scene/resources/surface_tool.h +++ b/scene/resources/surface_tool.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef SURFACE_TOOL_H #define SURFACE_TOOL_H diff --git a/scene/resources/texture.cpp b/scene/resources/texture.cpp index ea51a5ba8d..2ce102dd7a 100644 --- a/scene/resources/texture.cpp +++ b/scene/resources/texture.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "texture.h" #include "core/method_bind_ext.gen.inc" #include "core/os/os.h" diff --git a/scene/resources/texture.h b/scene/resources/texture.h index 1b0754ad3b..93d7ec4ef9 100644 --- a/scene/resources/texture.h +++ b/scene/resources/texture.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef TEXTURE_H #define TEXTURE_H diff --git a/scene/resources/theme.cpp b/scene/resources/theme.cpp index 7337c5ec4d..f903669fc7 100644 --- a/scene/resources/theme.cpp +++ b/scene/resources/theme.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "theme.h" #include "os/file_access.h" #include "print_string.h" diff --git a/scene/resources/theme.h b/scene/resources/theme.h index 0d15a9a11e..c23f237c75 100644 --- a/scene/resources/theme.h +++ b/scene/resources/theme.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef THEME_H #define THEME_H diff --git a/scene/resources/tile_set.cpp b/scene/resources/tile_set.cpp index 89de2de279..710612d5f4 100644 --- a/scene/resources/tile_set.cpp +++ b/scene/resources/tile_set.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "tile_set.h" #include "array.h" diff --git a/scene/resources/tile_set.h b/scene/resources/tile_set.h index e7e5c06d34..1306e2878c 100644 --- a/scene/resources/tile_set.h +++ b/scene/resources/tile_set.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef TILE_SET_H #define TILE_SET_H diff --git a/scene/resources/video_stream.cpp b/scene/resources/video_stream.cpp index ddedc1a37e..3cd8cbae77 100644 --- a/scene/resources/video_stream.cpp +++ b/scene/resources/video_stream.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "video_stream.h" void VideoStreamPlayback::_bind_methods(){ diff --git a/scene/resources/video_stream.h b/scene/resources/video_stream.h index bd5bf54d0a..0d25d9d687 100644 --- a/scene/resources/video_stream.h +++ b/scene/resources/video_stream.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef VIDEO_STREAM_H #define VIDEO_STREAM_H diff --git a/scene/resources/world.cpp b/scene/resources/world.cpp index 57f567bc3c..fff336c16f 100644 --- a/scene/resources/world.cpp +++ b/scene/resources/world.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "world.h" #include "camera_matrix.h" diff --git a/scene/resources/world.h b/scene/resources/world.h index 19b8bd03a6..54bdf25784 100644 --- a/scene/resources/world.h +++ b/scene/resources/world.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef WORLD_H #define WORLD_H diff --git a/scene/resources/world_2d.cpp b/scene/resources/world_2d.cpp index 1f75c43d75..8b1f5d630f 100644 --- a/scene/resources/world_2d.cpp +++ b/scene/resources/world_2d.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "world_2d.h" #include "servers/physics_2d_server.h" #include "servers/visual_server.h" diff --git a/scene/resources/world_2d.h b/scene/resources/world_2d.h index 84fa00e6cd..59f34e32f2 100644 --- a/scene/resources/world_2d.h +++ b/scene/resources/world_2d.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef WORLD_2D_H #define WORLD_2D_H diff --git a/scene/scene_string_names.cpp b/scene/scene_string_names.cpp index e72bc63c53..7d8dfea2bc 100644 --- a/scene/scene_string_names.cpp +++ b/scene/scene_string_names.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "scene_string_names.h" SceneStringNames *SceneStringNames::singleton = NULL; diff --git a/scene/scene_string_names.h b/scene/scene_string_names.h index 8e7a0c0075..1b30d7c1bf 100644 --- a/scene/scene_string_names.h +++ b/scene/scene_string_names.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef SCENE_STRING_NAMES_H #define SCENE_STRING_NAMES_H diff --git a/servers/arvr/arvr_interface.cpp b/servers/arvr/arvr_interface.cpp index b599e1c5cc..29478ee994 100644 --- a/servers/arvr/arvr_interface.cpp +++ b/servers/arvr/arvr_interface.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "arvr_interface.h" void ARVRInterface::_bind_methods() { diff --git a/servers/arvr/arvr_interface.h b/servers/arvr/arvr_interface.h index a70c7cec0e..0b922c5892 100644 --- a/servers/arvr/arvr_interface.h +++ b/servers/arvr/arvr_interface.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef ARVR_INTERFACE_H #define ARVR_INTERFACE_H diff --git a/servers/arvr/arvr_positional_tracker.cpp b/servers/arvr/arvr_positional_tracker.cpp index 08b5bab641..c12d0bbc15 100644 --- a/servers/arvr/arvr_positional_tracker.cpp +++ b/servers/arvr/arvr_positional_tracker.cpp @@ -1,5 +1,5 @@ /*************************************************************************/ -/* arvr_postional_tracker.cpp */ +/* arvr_positional_tracker.cpp */ /*************************************************************************/ /* This file is part of: */ /* GODOT ENGINE */ @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "arvr_positional_tracker.h" #include "core/os/input.h" diff --git a/servers/arvr/arvr_positional_tracker.h b/servers/arvr/arvr_positional_tracker.h index 884aae3076..525e47a681 100644 --- a/servers/arvr/arvr_positional_tracker.h +++ b/servers/arvr/arvr_positional_tracker.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef ARVR_POSITIONAL_TRACKER_H #define ARVR_POSITIONAL_TRACKER_H diff --git a/servers/audio/audio_driver_dummy.cpp b/servers/audio/audio_driver_dummy.cpp index 244eaf1340..1ca2334392 100644 --- a/servers/audio/audio_driver_dummy.cpp +++ b/servers/audio/audio_driver_dummy.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "audio_driver_dummy.h" #include "os/os.h" diff --git a/servers/audio/audio_driver_dummy.h b/servers/audio/audio_driver_dummy.h index 329941bc09..ba4f69edf4 100644 --- a/servers/audio/audio_driver_dummy.h +++ b/servers/audio/audio_driver_dummy.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef AUDIO_DRIVER_DUMMY_H #define AUDIO_DRIVER_DUMMY_H diff --git a/servers/audio/audio_effect.cpp b/servers/audio/audio_effect.cpp index 21ffbcf0e1..b061dad259 100644 --- a/servers/audio/audio_effect.cpp +++ b/servers/audio/audio_effect.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "audio_effect.h" AudioEffect::AudioEffect() { diff --git a/servers/audio/audio_effect.h b/servers/audio/audio_effect.h index 3f80fb00e2..cf732d4bdd 100644 --- a/servers/audio/audio_effect.h +++ b/servers/audio/audio_effect.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef AUDIOEFFECT_H #define AUDIOEFFECT_H diff --git a/servers/audio/audio_filter_sw.cpp b/servers/audio/audio_filter_sw.cpp index e3f6b7f359..70cb7beacb 100644 --- a/servers/audio/audio_filter_sw.cpp +++ b/servers/audio/audio_filter_sw.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "audio_filter_sw.h" void AudioFilterSW::set_mode(Mode p_mode) { diff --git a/servers/audio/audio_filter_sw.h b/servers/audio/audio_filter_sw.h index 4d00462876..4174f9bd51 100644 --- a/servers/audio/audio_filter_sw.h +++ b/servers/audio/audio_filter_sw.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef AUDIO_FILTER_SW_H #define AUDIO_FILTER_SW_H diff --git a/servers/audio/audio_rb_resampler.cpp b/servers/audio/audio_rb_resampler.cpp index 6c671d5b88..dc917e29e2 100644 --- a/servers/audio/audio_rb_resampler.cpp +++ b/servers/audio/audio_rb_resampler.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "audio_rb_resampler.h" #include "core/math/math_funcs.h" #include "os/os.h" diff --git a/servers/audio/audio_rb_resampler.h b/servers/audio/audio_rb_resampler.h index 0359093e30..6ef79c93fa 100644 --- a/servers/audio/audio_rb_resampler.h +++ b/servers/audio/audio_rb_resampler.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef AUDIO_RB_RESAMPLER_H #define AUDIO_RB_RESAMPLER_H diff --git a/servers/audio/audio_stream.cpp b/servers/audio/audio_stream.cpp index b9000a3ea7..369dfac042 100644 --- a/servers/audio/audio_stream.cpp +++ b/servers/audio/audio_stream.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "audio_stream.h" ////////////////////////////// diff --git a/servers/audio/audio_stream.h b/servers/audio/audio_stream.h index f3db58ada3..a6fb88364f 100644 --- a/servers/audio/audio_stream.h +++ b/servers/audio/audio_stream.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef AUDIO_STREAM_H #define AUDIO_STREAM_H diff --git a/servers/audio/effects/audio_effect_amplify.cpp b/servers/audio/effects/audio_effect_amplify.cpp index 542019d32c..9c8dfa8cb9 100644 --- a/servers/audio/effects/audio_effect_amplify.cpp +++ b/servers/audio/effects/audio_effect_amplify.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "audio_effect_amplify.h" void AudioEffectAmplifyInstance::process(const AudioFrame *p_src_frames, AudioFrame *p_dst_frames, int p_frame_count) { diff --git a/servers/audio/effects/audio_effect_amplify.h b/servers/audio/effects/audio_effect_amplify.h index 88c7d8f73f..1096dc04df 100644 --- a/servers/audio/effects/audio_effect_amplify.h +++ b/servers/audio/effects/audio_effect_amplify.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef AUDIOEFFECTAMPLIFY_H #define AUDIOEFFECTAMPLIFY_H diff --git a/servers/audio/effects/audio_effect_chorus.cpp b/servers/audio/effects/audio_effect_chorus.cpp index 7945fc6c08..f2f554a09b 100644 --- a/servers/audio/effects/audio_effect_chorus.cpp +++ b/servers/audio/effects/audio_effect_chorus.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "audio_effect_chorus.h" #include "math_funcs.h" #include "servers/audio_server.h" diff --git a/servers/audio/effects/audio_effect_chorus.h b/servers/audio/effects/audio_effect_chorus.h index f1e0e16f3d..a4646df7d7 100644 --- a/servers/audio/effects/audio_effect_chorus.h +++ b/servers/audio/effects/audio_effect_chorus.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef AUDIOEFFECTCHORUS_H #define AUDIOEFFECTCHORUS_H diff --git a/servers/audio/effects/audio_effect_compressor.cpp b/servers/audio/effects/audio_effect_compressor.cpp index 27c59ce356..0252b2f341 100644 --- a/servers/audio/effects/audio_effect_compressor.cpp +++ b/servers/audio/effects/audio_effect_compressor.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "audio_effect_compressor.h" #include "servers/audio_server.h" diff --git a/servers/audio/effects/audio_effect_compressor.h b/servers/audio/effects/audio_effect_compressor.h index ca87659a34..ef11249415 100644 --- a/servers/audio/effects/audio_effect_compressor.h +++ b/servers/audio/effects/audio_effect_compressor.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef AUDIOEFFECTCOMPRESSOR_H #define AUDIOEFFECTCOMPRESSOR_H diff --git a/servers/audio/effects/audio_effect_delay.cpp b/servers/audio/effects/audio_effect_delay.cpp index 98283d6453..e3af898afa 100644 --- a/servers/audio/effects/audio_effect_delay.cpp +++ b/servers/audio/effects/audio_effect_delay.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "audio_effect_delay.h" #include "math_funcs.h" #include "servers/audio_server.h" diff --git a/servers/audio/effects/audio_effect_delay.h b/servers/audio/effects/audio_effect_delay.h index cd45d0e9e7..f173bd6dfc 100644 --- a/servers/audio/effects/audio_effect_delay.h +++ b/servers/audio/effects/audio_effect_delay.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef AUDIOEFFECTDELAY_H #define AUDIOEFFECTDELAY_H diff --git a/servers/audio/effects/audio_effect_distortion.cpp b/servers/audio/effects/audio_effect_distortion.cpp index 2105fd42d7..c9ac0db644 100644 --- a/servers/audio/effects/audio_effect_distortion.cpp +++ b/servers/audio/effects/audio_effect_distortion.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "audio_effect_distortion.h" #include "math_funcs.h" #include "servers/audio_server.h" diff --git a/servers/audio/effects/audio_effect_distortion.h b/servers/audio/effects/audio_effect_distortion.h index d4f7076864..8d9ff1c03f 100644 --- a/servers/audio/effects/audio_effect_distortion.h +++ b/servers/audio/effects/audio_effect_distortion.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef AUDIOEFFECTDISTORTION_H #define AUDIOEFFECTDISTORTION_H diff --git a/servers/audio/effects/audio_effect_eq.cpp b/servers/audio/effects/audio_effect_eq.cpp index 49a2b17c54..a30fca4e8d 100644 --- a/servers/audio/effects/audio_effect_eq.cpp +++ b/servers/audio/effects/audio_effect_eq.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "audio_effect_eq.h" #include "servers/audio_server.h" diff --git a/servers/audio/effects/audio_effect_eq.h b/servers/audio/effects/audio_effect_eq.h index 70c2cf57b9..c45fb753ea 100644 --- a/servers/audio/effects/audio_effect_eq.h +++ b/servers/audio/effects/audio_effect_eq.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef AUDIOEFFECTEQ_H #define AUDIOEFFECTEQ_H diff --git a/servers/audio/effects/audio_effect_filter.cpp b/servers/audio/effects/audio_effect_filter.cpp index e4a6aa23b2..75a43d2d41 100644 --- a/servers/audio/effects/audio_effect_filter.cpp +++ b/servers/audio/effects/audio_effect_filter.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "audio_effect_filter.h" #include "servers/audio_server.h" diff --git a/servers/audio/effects/audio_effect_filter.h b/servers/audio/effects/audio_effect_filter.h index 39506d50ec..11978882bc 100644 --- a/servers/audio/effects/audio_effect_filter.h +++ b/servers/audio/effects/audio_effect_filter.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef AUDIOEFFECTFILTER_H #define AUDIOEFFECTFILTER_H diff --git a/servers/audio/effects/audio_effect_limiter.cpp b/servers/audio/effects/audio_effect_limiter.cpp index f746f0b94a..77454dc57b 100644 --- a/servers/audio/effects/audio_effect_limiter.cpp +++ b/servers/audio/effects/audio_effect_limiter.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "audio_effect_limiter.h" void AudioEffectLimiterInstance::process(const AudioFrame *p_src_frames, AudioFrame *p_dst_frames, int p_frame_count) { diff --git a/servers/audio/effects/audio_effect_limiter.h b/servers/audio/effects/audio_effect_limiter.h index 841a6c7e4e..8077d2da23 100644 --- a/servers/audio/effects/audio_effect_limiter.h +++ b/servers/audio/effects/audio_effect_limiter.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef AUDIO_EFFECT_LIMITER_H #define AUDIO_EFFECT_LIMITER_H diff --git a/servers/audio/effects/audio_effect_panner.cpp b/servers/audio/effects/audio_effect_panner.cpp index a55f476f40..6b6ca405e0 100644 --- a/servers/audio/effects/audio_effect_panner.cpp +++ b/servers/audio/effects/audio_effect_panner.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "audio_effect_panner.h" void AudioEffectPannerInstance::process(const AudioFrame *p_src_frames, AudioFrame *p_dst_frames, int p_frame_count) { diff --git a/servers/audio/effects/audio_effect_panner.h b/servers/audio/effects/audio_effect_panner.h index db78959b0a..cdab11c445 100644 --- a/servers/audio/effects/audio_effect_panner.h +++ b/servers/audio/effects/audio_effect_panner.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef AUDIOEFFECTPANNER_H #define AUDIOEFFECTPANNER_H diff --git a/servers/audio/effects/audio_effect_phaser.cpp b/servers/audio/effects/audio_effect_phaser.cpp index 4a824acf58..c0a9bd773d 100644 --- a/servers/audio/effects/audio_effect_phaser.cpp +++ b/servers/audio/effects/audio_effect_phaser.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "audio_effect_phaser.h" #include "math_funcs.h" #include "servers/audio_server.h" diff --git a/servers/audio/effects/audio_effect_phaser.h b/servers/audio/effects/audio_effect_phaser.h index 6755a0718c..96ba2b0abf 100644 --- a/servers/audio/effects/audio_effect_phaser.h +++ b/servers/audio/effects/audio_effect_phaser.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef AUDIO_EFFECT_PHASER_H #define AUDIO_EFFECT_PHASER_H diff --git a/servers/audio/effects/audio_effect_pitch_shift.cpp b/servers/audio/effects/audio_effect_pitch_shift.cpp index 6db31f259e..ddd0a0db6b 100644 --- a/servers/audio/effects/audio_effect_pitch_shift.cpp +++ b/servers/audio/effects/audio_effect_pitch_shift.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "audio_effect_pitch_shift.h" #include "math_funcs.h" diff --git a/servers/audio/effects/audio_effect_pitch_shift.h b/servers/audio/effects/audio_effect_pitch_shift.h index 3b9c35f6c4..f1c78d752f 100644 --- a/servers/audio/effects/audio_effect_pitch_shift.h +++ b/servers/audio/effects/audio_effect_pitch_shift.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef AUDIO_EFFECT_PITCH_SHIFT_H #define AUDIO_EFFECT_PITCH_SHIFT_H diff --git a/servers/audio/effects/audio_effect_reverb.cpp b/servers/audio/effects/audio_effect_reverb.cpp index f8750144b1..03f5377a80 100644 --- a/servers/audio/effects/audio_effect_reverb.cpp +++ b/servers/audio/effects/audio_effect_reverb.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "audio_effect_reverb.h" #include "servers/audio_server.h" void AudioEffectReverbInstance::process(const AudioFrame *p_src_frames, AudioFrame *p_dst_frames, int p_frame_count) { diff --git a/servers/audio/effects/audio_effect_reverb.h b/servers/audio/effects/audio_effect_reverb.h index 47c9c9f112..5646fd2238 100644 --- a/servers/audio/effects/audio_effect_reverb.h +++ b/servers/audio/effects/audio_effect_reverb.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef AUDIOEFFECTREVERB_H #define AUDIOEFFECTREVERB_H diff --git a/servers/audio/effects/audio_effect_stereo_enhance.cpp b/servers/audio/effects/audio_effect_stereo_enhance.cpp index ea2ecba4f4..cf5228f8b6 100644 --- a/servers/audio/effects/audio_effect_stereo_enhance.cpp +++ b/servers/audio/effects/audio_effect_stereo_enhance.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "audio_effect_stereo_enhance.h" #include "servers/audio_server.h" void AudioEffectStereoEnhanceInstance::process(const AudioFrame *p_src_frames, AudioFrame *p_dst_frames, int p_frame_count) { diff --git a/servers/audio/effects/audio_effect_stereo_enhance.h b/servers/audio/effects/audio_effect_stereo_enhance.h index aa7cd3c6af..13dd4ac042 100644 --- a/servers/audio/effects/audio_effect_stereo_enhance.h +++ b/servers/audio/effects/audio_effect_stereo_enhance.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef AUDIOEFFECTSTEREOENHANCE_H #define AUDIOEFFECTSTEREOENHANCE_H diff --git a/servers/audio/reverb_sw.cpp b/servers/audio/reverb_sw.cpp index 765bbf6996..52e7699deb 100644 --- a/servers/audio/reverb_sw.cpp +++ b/servers/audio/reverb_sw.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "reverb_sw.h" #include "print_string.h" #include "stdlib.h" diff --git a/servers/audio/reverb_sw.h b/servers/audio/reverb_sw.h index 29ce47aaa5..15f9a43183 100644 --- a/servers/audio/reverb_sw.h +++ b/servers/audio/reverb_sw.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef REVERB_SW_H #define REVERB_SW_H diff --git a/servers/audio/voice_rb_sw.h b/servers/audio/voice_rb_sw.h index 5e48f948cf..42045428a8 100644 --- a/servers/audio/voice_rb_sw.h +++ b/servers/audio/voice_rb_sw.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef VOICE_RB_SW_H #define VOICE_RB_SW_H diff --git a/servers/audio_server.cpp b/servers/audio_server.cpp index f2198bdf2f..76d0154348 100644 --- a/servers/audio_server.cpp +++ b/servers/audio_server.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "audio_server.h" #include "io/resource_loader.h" #include "os/file_access.h" diff --git a/servers/audio_server.h b/servers/audio_server.h index 263bcd9818..188d38db94 100644 --- a/servers/audio_server.h +++ b/servers/audio_server.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef AUDIO_SERVER_H #define AUDIO_SERVER_H diff --git a/servers/physics/area_pair_sw.cpp b/servers/physics/area_pair_sw.cpp index 7b4a520eba..d2fef0ab77 100644 --- a/servers/physics/area_pair_sw.cpp +++ b/servers/physics/area_pair_sw.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "area_pair_sw.h" #include "collision_solver_sw.h" diff --git a/servers/physics/area_pair_sw.h b/servers/physics/area_pair_sw.h index 3095fea583..b66599dd11 100644 --- a/servers/physics/area_pair_sw.h +++ b/servers/physics/area_pair_sw.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef AREA_PAIR_SW_H #define AREA_PAIR_SW_H diff --git a/servers/physics/area_sw.cpp b/servers/physics/area_sw.cpp index 373e5788d7..8f9d4075b8 100644 --- a/servers/physics/area_sw.cpp +++ b/servers/physics/area_sw.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "area_sw.h" #include "body_sw.h" #include "space_sw.h" diff --git a/servers/physics/area_sw.h b/servers/physics/area_sw.h index 0295f6ab3a..ae19b0e04e 100644 --- a/servers/physics/area_sw.h +++ b/servers/physics/area_sw.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef AREA_SW_H #define AREA_SW_H diff --git a/servers/physics/body_pair_sw.cpp b/servers/physics/body_pair_sw.cpp index 2d8ab44ddb..882d201f61 100644 --- a/servers/physics/body_pair_sw.cpp +++ b/servers/physics/body_pair_sw.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "body_pair_sw.h" #include "collision_solver_sw.h" diff --git a/servers/physics/body_pair_sw.h b/servers/physics/body_pair_sw.h index b65711340b..fd85d77718 100644 --- a/servers/physics/body_pair_sw.h +++ b/servers/physics/body_pair_sw.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef BODY_PAIR_SW_H #define BODY_PAIR_SW_H diff --git a/servers/physics/body_sw.cpp b/servers/physics/body_sw.cpp index 95101d6f8e..cc9681193c 100644 --- a/servers/physics/body_sw.cpp +++ b/servers/physics/body_sw.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "body_sw.h" #include "area_sw.h" #include "space_sw.h" diff --git a/servers/physics/body_sw.h b/servers/physics/body_sw.h index 85c40bc527..e8ea5531e5 100644 --- a/servers/physics/body_sw.h +++ b/servers/physics/body_sw.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef BODY_SW_H #define BODY_SW_H diff --git a/servers/physics/broad_phase_basic.cpp b/servers/physics/broad_phase_basic.cpp index d06279c45a..52483a8b14 100644 --- a/servers/physics/broad_phase_basic.cpp +++ b/servers/physics/broad_phase_basic.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "broad_phase_basic.h" #include "list.h" #include "print_string.h" diff --git a/servers/physics/broad_phase_basic.h b/servers/physics/broad_phase_basic.h index b291e988a3..47fcdb3060 100644 --- a/servers/physics/broad_phase_basic.h +++ b/servers/physics/broad_phase_basic.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef BROAD_PHASE_BASIC_H #define BROAD_PHASE_BASIC_H diff --git a/servers/physics/broad_phase_octree.cpp b/servers/physics/broad_phase_octree.cpp index b71489c575..7f43fbdb6a 100644 --- a/servers/physics/broad_phase_octree.cpp +++ b/servers/physics/broad_phase_octree.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "broad_phase_octree.h" #include "collision_object_sw.h" diff --git a/servers/physics/broad_phase_octree.h b/servers/physics/broad_phase_octree.h index 5c37f51cbe..e7028eba98 100644 --- a/servers/physics/broad_phase_octree.h +++ b/servers/physics/broad_phase_octree.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef BROAD_PHASE_OCTREE_H #define BROAD_PHASE_OCTREE_H diff --git a/servers/physics/broad_phase_sw.cpp b/servers/physics/broad_phase_sw.cpp index 619aab7e46..2a490c3e80 100644 --- a/servers/physics/broad_phase_sw.cpp +++ b/servers/physics/broad_phase_sw.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "broad_phase_sw.h" BroadPhaseSW::CreateFunction BroadPhaseSW::create_func = NULL; diff --git a/servers/physics/broad_phase_sw.h b/servers/physics/broad_phase_sw.h index ef55f881d5..7559942cd4 100644 --- a/servers/physics/broad_phase_sw.h +++ b/servers/physics/broad_phase_sw.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef BROAD_PHASE_SW_H #define BROAD_PHASE_SW_H diff --git a/servers/physics/collision_object_sw.cpp b/servers/physics/collision_object_sw.cpp index 7b5d960357..f7a58a9cf2 100644 --- a/servers/physics/collision_object_sw.cpp +++ b/servers/physics/collision_object_sw.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "collision_object_sw.h" #include "servers/physics/physics_server_sw.h" #include "space_sw.h" diff --git a/servers/physics/collision_object_sw.h b/servers/physics/collision_object_sw.h index 6683cabd5b..f5d32e56a0 100644 --- a/servers/physics/collision_object_sw.h +++ b/servers/physics/collision_object_sw.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef COLLISION_OBJECT_SW_H #define COLLISION_OBJECT_SW_H diff --git a/servers/physics/collision_solver_sat.cpp b/servers/physics/collision_solver_sat.cpp index 30a0f5ce94..eefb0f0396 100644 --- a/servers/physics/collision_solver_sat.cpp +++ b/servers/physics/collision_solver_sat.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "collision_solver_sat.h" #include "geometry.h" diff --git a/servers/physics/collision_solver_sat.h b/servers/physics/collision_solver_sat.h index 3ebfa88256..1d83d9889d 100644 --- a/servers/physics/collision_solver_sat.h +++ b/servers/physics/collision_solver_sat.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef COLLISION_SOLVER_SAT_H #define COLLISION_SOLVER_SAT_H diff --git a/servers/physics/collision_solver_sw.cpp b/servers/physics/collision_solver_sw.cpp index ce56b004f6..e26a7a4d89 100644 --- a/servers/physics/collision_solver_sw.cpp +++ b/servers/physics/collision_solver_sw.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "collision_solver_sw.h" #include "collision_solver_sat.h" diff --git a/servers/physics/collision_solver_sw.h b/servers/physics/collision_solver_sw.h index 0c3418a4ec..cbcb6b850a 100644 --- a/servers/physics/collision_solver_sw.h +++ b/servers/physics/collision_solver_sw.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef COLLISION_SOLVER_SW_H #define COLLISION_SOLVER_SW_H diff --git a/servers/physics/constraint_sw.h b/servers/physics/constraint_sw.h index a11ac04ffd..a641f06f0c 100644 --- a/servers/physics/constraint_sw.h +++ b/servers/physics/constraint_sw.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef CONSTRAINT_SW_H #define CONSTRAINT_SW_H diff --git a/servers/physics/gjk_epa.cpp b/servers/physics/gjk_epa.cpp index 7a2eb9b0ad..a42b7ed82b 100644 --- a/servers/physics/gjk_epa.cpp +++ b/servers/physics/gjk_epa.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "gjk_epa.h" /* Disabling formatting for thirdparty code snippet */ diff --git a/servers/physics/gjk_epa.h b/servers/physics/gjk_epa.h index bc00de0f6c..f6d052608e 100644 --- a/servers/physics/gjk_epa.h +++ b/servers/physics/gjk_epa.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef GJK_EPA_H #define GJK_EPA_H diff --git a/servers/physics/joints_sw.h b/servers/physics/joints_sw.h index 1a49e84392..af27b1c25b 100644 --- a/servers/physics/joints_sw.h +++ b/servers/physics/joints_sw.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef JOINTS_SW_H #define JOINTS_SW_H diff --git a/servers/physics/physics_server_sw.cpp b/servers/physics/physics_server_sw.cpp index fc6ba534e6..5681ca838a 100644 --- a/servers/physics/physics_server_sw.cpp +++ b/servers/physics/physics_server_sw.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "physics_server_sw.h" #include "broad_phase_basic.h" diff --git a/servers/physics/physics_server_sw.h b/servers/physics/physics_server_sw.h index a64ebf76b6..132ac78968 100644 --- a/servers/physics/physics_server_sw.h +++ b/servers/physics/physics_server_sw.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef PHYSICS_SERVER_SW #define PHYSICS_SERVER_SW diff --git a/servers/physics/shape_sw.cpp b/servers/physics/shape_sw.cpp index 5ac1ba46d7..5a58742958 100644 --- a/servers/physics/shape_sw.cpp +++ b/servers/physics/shape_sw.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "shape_sw.h" #include "geometry.h" diff --git a/servers/physics/shape_sw.h b/servers/physics/shape_sw.h index 1bcbb91f90..4a9a6289ff 100644 --- a/servers/physics/shape_sw.h +++ b/servers/physics/shape_sw.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef SHAPE_SW_H #define SHAPE_SW_H diff --git a/servers/physics/space_sw.cpp b/servers/physics/space_sw.cpp index d66886ad91..fe6c42a531 100644 --- a/servers/physics/space_sw.cpp +++ b/servers/physics/space_sw.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "space_sw.h" #include "collision_solver_sw.h" diff --git a/servers/physics/space_sw.h b/servers/physics/space_sw.h index c080d82785..0d519ea50b 100644 --- a/servers/physics/space_sw.h +++ b/servers/physics/space_sw.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef SPACE_SW_H #define SPACE_SW_H diff --git a/servers/physics/step_sw.cpp b/servers/physics/step_sw.cpp index 662d54b6de..ad08cb6353 100644 --- a/servers/physics/step_sw.cpp +++ b/servers/physics/step_sw.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "step_sw.h" #include "joints_sw.h" diff --git a/servers/physics/step_sw.h b/servers/physics/step_sw.h index 3286d8085e..25e9fedf79 100644 --- a/servers/physics/step_sw.h +++ b/servers/physics/step_sw.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef STEP_SW_H #define STEP_SW_H diff --git a/servers/physics_2d/area_2d_sw.cpp b/servers/physics_2d/area_2d_sw.cpp index db43ca840f..037c92bac6 100644 --- a/servers/physics_2d/area_2d_sw.cpp +++ b/servers/physics_2d/area_2d_sw.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "area_2d_sw.h" #include "body_2d_sw.h" #include "space_2d_sw.h" diff --git a/servers/physics_2d/area_2d_sw.h b/servers/physics_2d/area_2d_sw.h index a2925a4d2d..d2058ad5af 100644 --- a/servers/physics_2d/area_2d_sw.h +++ b/servers/physics_2d/area_2d_sw.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef AREA_2D_SW_H #define AREA_2D_SW_H diff --git a/servers/physics_2d/area_pair_2d_sw.cpp b/servers/physics_2d/area_pair_2d_sw.cpp index c2c1f71149..9d515d2183 100644 --- a/servers/physics_2d/area_pair_2d_sw.cpp +++ b/servers/physics_2d/area_pair_2d_sw.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "area_pair_2d_sw.h" #include "collision_solver_2d_sw.h" diff --git a/servers/physics_2d/area_pair_2d_sw.h b/servers/physics_2d/area_pair_2d_sw.h index 496023904c..243b99a79c 100644 --- a/servers/physics_2d/area_pair_2d_sw.h +++ b/servers/physics_2d/area_pair_2d_sw.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef AREA_PAIR_2D_SW_H #define AREA_PAIR_2D_SW_H diff --git a/servers/physics_2d/body_2d_sw.cpp b/servers/physics_2d/body_2d_sw.cpp index 38344ec20b..aa063d6c1e 100644 --- a/servers/physics_2d/body_2d_sw.cpp +++ b/servers/physics_2d/body_2d_sw.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "body_2d_sw.h" #include "area_2d_sw.h" #include "physics_2d_server_sw.h" diff --git a/servers/physics_2d/body_2d_sw.h b/servers/physics_2d/body_2d_sw.h index 497b20b7ad..782adf3416 100644 --- a/servers/physics_2d/body_2d_sw.h +++ b/servers/physics_2d/body_2d_sw.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef BODY_2D_SW_H #define BODY_2D_SW_H diff --git a/servers/physics_2d/body_pair_2d_sw.cpp b/servers/physics_2d/body_pair_2d_sw.cpp index ca98e78b55..f51882b5ee 100644 --- a/servers/physics_2d/body_pair_2d_sw.cpp +++ b/servers/physics_2d/body_pair_2d_sw.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "body_pair_2d_sw.h" #include "collision_solver_2d_sw.h" #include "space_2d_sw.h" diff --git a/servers/physics_2d/body_pair_2d_sw.h b/servers/physics_2d/body_pair_2d_sw.h index b85136b5b4..e54a32fb46 100644 --- a/servers/physics_2d/body_pair_2d_sw.h +++ b/servers/physics_2d/body_pair_2d_sw.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef BODY_PAIR_2D_SW_H #define BODY_PAIR_2D_SW_H diff --git a/servers/physics_2d/broad_phase_2d_basic.cpp b/servers/physics_2d/broad_phase_2d_basic.cpp index fbb32fbbf8..067d86f474 100644 --- a/servers/physics_2d/broad_phase_2d_basic.cpp +++ b/servers/physics_2d/broad_phase_2d_basic.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "broad_phase_2d_basic.h" BroadPhase2DBasic::ID BroadPhase2DBasic::create(CollisionObject2DSW *p_object_, int p_subindex) { diff --git a/servers/physics_2d/broad_phase_2d_basic.h b/servers/physics_2d/broad_phase_2d_basic.h index 2e08f8990f..f0f0b3df88 100644 --- a/servers/physics_2d/broad_phase_2d_basic.h +++ b/servers/physics_2d/broad_phase_2d_basic.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef BROAD_PHASE_2D_BASIC_H #define BROAD_PHASE_2D_BASIC_H diff --git a/servers/physics_2d/broad_phase_2d_hash_grid.cpp b/servers/physics_2d/broad_phase_2d_hash_grid.cpp index 0351f10764..1a5b2d5e3a 100644 --- a/servers/physics_2d/broad_phase_2d_hash_grid.cpp +++ b/servers/physics_2d/broad_phase_2d_hash_grid.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "broad_phase_2d_hash_grid.h" #include "project_settings.h" diff --git a/servers/physics_2d/broad_phase_2d_hash_grid.h b/servers/physics_2d/broad_phase_2d_hash_grid.h index b7de3ef621..5188abc837 100644 --- a/servers/physics_2d/broad_phase_2d_hash_grid.h +++ b/servers/physics_2d/broad_phase_2d_hash_grid.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef BROAD_PHASE_2D_HASH_GRID_H #define BROAD_PHASE_2D_HASH_GRID_H diff --git a/servers/physics_2d/broad_phase_2d_sw.cpp b/servers/physics_2d/broad_phase_2d_sw.cpp index b8fc84b8ce..6e3dce000f 100644 --- a/servers/physics_2d/broad_phase_2d_sw.cpp +++ b/servers/physics_2d/broad_phase_2d_sw.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "broad_phase_2d_sw.h" BroadPhase2DSW::CreateFunction BroadPhase2DSW::create_func = NULL; diff --git a/servers/physics_2d/broad_phase_2d_sw.h b/servers/physics_2d/broad_phase_2d_sw.h index 0e39c2766f..80ae970624 100644 --- a/servers/physics_2d/broad_phase_2d_sw.h +++ b/servers/physics_2d/broad_phase_2d_sw.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef BROAD_PHASE_2D_SW_H #define BROAD_PHASE_2D_SW_H diff --git a/servers/physics_2d/collision_object_2d_sw.cpp b/servers/physics_2d/collision_object_2d_sw.cpp index 4d33a72a69..80cdd58aeb 100644 --- a/servers/physics_2d/collision_object_2d_sw.cpp +++ b/servers/physics_2d/collision_object_2d_sw.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "collision_object_2d_sw.h" #include "space_2d_sw.h" diff --git a/servers/physics_2d/collision_object_2d_sw.h b/servers/physics_2d/collision_object_2d_sw.h index 0ffdca21d3..5f25c27158 100644 --- a/servers/physics_2d/collision_object_2d_sw.h +++ b/servers/physics_2d/collision_object_2d_sw.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef COLLISION_OBJECT_2D_SW_H #define COLLISION_OBJECT_2D_SW_H diff --git a/servers/physics_2d/collision_solver_2d_sat.cpp b/servers/physics_2d/collision_solver_2d_sat.cpp index fc7d9f7760..0d1ffca50d 100644 --- a/servers/physics_2d/collision_solver_2d_sat.cpp +++ b/servers/physics_2d/collision_solver_2d_sat.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "collision_solver_2d_sat.h" #include "geometry.h" diff --git a/servers/physics_2d/collision_solver_2d_sat.h b/servers/physics_2d/collision_solver_2d_sat.h index 939e3942f7..ba35c63fbc 100644 --- a/servers/physics_2d/collision_solver_2d_sat.h +++ b/servers/physics_2d/collision_solver_2d_sat.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef COLLISION_SOLVER_2D_SAT_H #define COLLISION_SOLVER_2D_SAT_H diff --git a/servers/physics_2d/collision_solver_2d_sw.cpp b/servers/physics_2d/collision_solver_2d_sw.cpp index 1853c02288..a6ef110149 100644 --- a/servers/physics_2d/collision_solver_2d_sw.cpp +++ b/servers/physics_2d/collision_solver_2d_sw.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "collision_solver_2d_sw.h" #include "collision_solver_2d_sat.h" diff --git a/servers/physics_2d/collision_solver_2d_sw.h b/servers/physics_2d/collision_solver_2d_sw.h index 866443cd7f..e39c41fb75 100644 --- a/servers/physics_2d/collision_solver_2d_sw.h +++ b/servers/physics_2d/collision_solver_2d_sw.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef COLLISION_SOLVER_2D_SW_H #define COLLISION_SOLVER_2D_SW_H diff --git a/servers/physics_2d/constraint_2d_sw.h b/servers/physics_2d/constraint_2d_sw.h index 1ddf0386be..a08037bb37 100644 --- a/servers/physics_2d/constraint_2d_sw.h +++ b/servers/physics_2d/constraint_2d_sw.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef CONSTRAINT_2D_SW_H #define CONSTRAINT_2D_SW_H diff --git a/servers/physics_2d/joints_2d_sw.cpp b/servers/physics_2d/joints_2d_sw.cpp index 9865d375f0..7fba8acebd 100644 --- a/servers/physics_2d/joints_2d_sw.cpp +++ b/servers/physics_2d/joints_2d_sw.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "joints_2d_sw.h" #include "space_2d_sw.h" diff --git a/servers/physics_2d/joints_2d_sw.h b/servers/physics_2d/joints_2d_sw.h index af66f408a7..e2002eef0d 100644 --- a/servers/physics_2d/joints_2d_sw.h +++ b/servers/physics_2d/joints_2d_sw.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef JOINTS_2D_SW_H #define JOINTS_2D_SW_H diff --git a/servers/physics_2d/physics_2d_server_sw.cpp b/servers/physics_2d/physics_2d_server_sw.cpp index 42b1cb8dda..7d7bbbebac 100644 --- a/servers/physics_2d/physics_2d_server_sw.cpp +++ b/servers/physics_2d/physics_2d_server_sw.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "physics_2d_server_sw.h" #include "broad_phase_2d_basic.h" #include "broad_phase_2d_hash_grid.h" diff --git a/servers/physics_2d/physics_2d_server_sw.h b/servers/physics_2d/physics_2d_server_sw.h index a4a4b2e582..97edb85582 100644 --- a/servers/physics_2d/physics_2d_server_sw.h +++ b/servers/physics_2d/physics_2d_server_sw.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef PHYSICS_2D_SERVER_SW #define PHYSICS_2D_SERVER_SW diff --git a/servers/physics_2d/physics_2d_server_wrap_mt.cpp b/servers/physics_2d/physics_2d_server_wrap_mt.cpp index 97e35e6d21..804b93ecd8 100644 --- a/servers/physics_2d/physics_2d_server_wrap_mt.cpp +++ b/servers/physics_2d/physics_2d_server_wrap_mt.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "physics_2d_server_wrap_mt.h" #include "os/os.h" diff --git a/servers/physics_2d/physics_2d_server_wrap_mt.h b/servers/physics_2d/physics_2d_server_wrap_mt.h index 3b63871058..276c37c577 100644 --- a/servers/physics_2d/physics_2d_server_wrap_mt.h +++ b/servers/physics_2d/physics_2d_server_wrap_mt.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef PHYSICS2DSERVERWRAPMT_H #define PHYSICS2DSERVERWRAPMT_H diff --git a/servers/physics_2d/shape_2d_sw.cpp b/servers/physics_2d/shape_2d_sw.cpp index 7f9ca11846..4605516fe0 100644 --- a/servers/physics_2d/shape_2d_sw.cpp +++ b/servers/physics_2d/shape_2d_sw.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "shape_2d_sw.h" #include "geometry.h" diff --git a/servers/physics_2d/shape_2d_sw.h b/servers/physics_2d/shape_2d_sw.h index 82179e0124..c4c267b368 100644 --- a/servers/physics_2d/shape_2d_sw.h +++ b/servers/physics_2d/shape_2d_sw.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef SHAPE_2D_2DSW_H #define SHAPE_2D_2DSW_H diff --git a/servers/physics_2d/space_2d_sw.cpp b/servers/physics_2d/space_2d_sw.cpp index 687bb9e435..d3b81c627a 100644 --- a/servers/physics_2d/space_2d_sw.cpp +++ b/servers/physics_2d/space_2d_sw.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "space_2d_sw.h" #include "collision_solver_2d_sw.h" diff --git a/servers/physics_2d/space_2d_sw.h b/servers/physics_2d/space_2d_sw.h index 9e1babf5f3..a18bb2be2d 100644 --- a/servers/physics_2d/space_2d_sw.h +++ b/servers/physics_2d/space_2d_sw.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef SPACE_2D_SW_H #define SPACE_2D_SW_H diff --git a/servers/physics_2d/step_2d_sw.cpp b/servers/physics_2d/step_2d_sw.cpp index 0ab57647b4..6108b885f0 100644 --- a/servers/physics_2d/step_2d_sw.cpp +++ b/servers/physics_2d/step_2d_sw.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "step_2d_sw.h" #include "os/os.h" diff --git a/servers/physics_2d/step_2d_sw.h b/servers/physics_2d/step_2d_sw.h index bac654fc00..4aa669d3a7 100644 --- a/servers/physics_2d/step_2d_sw.h +++ b/servers/physics_2d/step_2d_sw.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef STEP_2D_SW_H #define STEP_2D_SW_H diff --git a/servers/physics_2d_server.cpp b/servers/physics_2d_server.cpp index 0762dc5a8d..18cb276d4c 100644 --- a/servers/physics_2d_server.cpp +++ b/servers/physics_2d_server.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "physics_2d_server.h" #include "core/project_settings.h" #include "print_string.h" diff --git a/servers/physics_2d_server.h b/servers/physics_2d_server.h index 017866ffe1..be447ed137 100644 --- a/servers/physics_2d_server.h +++ b/servers/physics_2d_server.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef PHYSICS_2D_SERVER_H #define PHYSICS_2D_SERVER_H diff --git a/servers/physics_server.cpp b/servers/physics_server.cpp index db315e4324..95875d2166 100644 --- a/servers/physics_server.cpp +++ b/servers/physics_server.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "physics_server.h" #include "core/project_settings.h" #include "print_string.h" diff --git a/servers/physics_server.h b/servers/physics_server.h index 15e7c78be2..8b8b8f856d 100644 --- a/servers/physics_server.h +++ b/servers/physics_server.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef PHYSICS_SERVER_H #define PHYSICS_SERVER_H diff --git a/servers/register_server_types.cpp b/servers/register_server_types.cpp index a318b76919..aaac32a4f2 100644 --- a/servers/register_server_types.cpp +++ b/servers/register_server_types.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "register_server_types.h" #include "engine.h" #include "project_settings.h" diff --git a/servers/register_server_types.h b/servers/register_server_types.h index 5fe97885d0..0af41ae424 100644 --- a/servers/register_server_types.h +++ b/servers/register_server_types.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef REGISTER_SERVER_TYPES_H #define REGISTER_SERVER_TYPES_H diff --git a/servers/visual/rasterizer.cpp b/servers/visual/rasterizer.cpp index ea2b3cafb8..be46690e55 100644 --- a/servers/visual/rasterizer.cpp +++ b/servers/visual/rasterizer.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "rasterizer.h" #include "os/os.h" diff --git a/servers/visual/rasterizer.h b/servers/visual/rasterizer.h index ba7c6f6a02..f2bb853a3b 100644 --- a/servers/visual/rasterizer.h +++ b/servers/visual/rasterizer.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef RASTERIZER_H #define RASTERIZER_H diff --git a/servers/visual/shader_language.cpp b/servers/visual/shader_language.cpp index f0f93ff2a7..29c27eee85 100644 --- a/servers/visual/shader_language.cpp +++ b/servers/visual/shader_language.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "shader_language.h" #include "os/os.h" #include "print_string.h" diff --git a/servers/visual/shader_language.h b/servers/visual/shader_language.h index dfadfaa30a..e8cdf1f897 100644 --- a/servers/visual/shader_language.h +++ b/servers/visual/shader_language.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef SHADER_LANGUAGE_H #define SHADER_LANGUAGE_H diff --git a/servers/visual/shader_types.cpp b/servers/visual/shader_types.cpp index 429282c10c..9042649337 100644 --- a/servers/visual/shader_types.cpp +++ b/servers/visual/shader_types.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "shader_types.h" const Map<StringName, ShaderLanguage::FunctionInfo> &ShaderTypes::get_functions(VS::ShaderMode p_mode) { diff --git a/servers/visual/shader_types.h b/servers/visual/shader_types.h index 9f0fb8b572..1f43ff9c92 100644 --- a/servers/visual/shader_types.h +++ b/servers/visual/shader_types.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef SHADERTYPES_H #define SHADERTYPES_H diff --git a/servers/visual/visual_server_canvas.cpp b/servers/visual/visual_server_canvas.cpp index b163402a07..d82d93a59d 100644 --- a/servers/visual/visual_server_canvas.cpp +++ b/servers/visual/visual_server_canvas.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "visual_server_canvas.h" #include "visual_server_global.h" #include "visual_server_viewport.h" diff --git a/servers/visual/visual_server_canvas.h b/servers/visual/visual_server_canvas.h index 320fc2fb0b..f4331ad291 100644 --- a/servers/visual/visual_server_canvas.h +++ b/servers/visual/visual_server_canvas.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef VISUALSERVERCANVAS_H #define VISUALSERVERCANVAS_H diff --git a/servers/visual/visual_server_global.cpp b/servers/visual/visual_server_global.cpp index a4b2b5bae9..61a8951f75 100644 --- a/servers/visual/visual_server_global.cpp +++ b/servers/visual/visual_server_global.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "visual_server_global.h" RasterizerStorage *VisualServerGlobals::storage = NULL; diff --git a/servers/visual/visual_server_global.h b/servers/visual/visual_server_global.h index 7260cc6cd1..b4888dfd50 100644 --- a/servers/visual/visual_server_global.h +++ b/servers/visual/visual_server_global.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef VISUALSERVERGLOBAL_H #define VISUALSERVERGLOBAL_H diff --git a/servers/visual/visual_server_light_baker.cpp b/servers/visual/visual_server_light_baker.cpp index 73353c8141..ed87e84a03 100644 --- a/servers/visual/visual_server_light_baker.cpp +++ b/servers/visual/visual_server_light_baker.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "visual_server_light_baker.h" VisualServerLightBaker::VisualServerLightBaker() { diff --git a/servers/visual/visual_server_light_baker.h b/servers/visual/visual_server_light_baker.h index d22e50fc14..77472d0994 100644 --- a/servers/visual/visual_server_light_baker.h +++ b/servers/visual/visual_server_light_baker.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef VISUALSERVERLIGHTBAKER_H #define VISUALSERVERLIGHTBAKER_H diff --git a/servers/visual/visual_server_raster.cpp b/servers/visual/visual_server_raster.cpp index ee5b26a8a4..64a3502e40 100644 --- a/servers/visual/visual_server_raster.cpp +++ b/servers/visual/visual_server_raster.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "visual_server_raster.h" #include "default_mouse_cursor.xpm" diff --git a/servers/visual/visual_server_raster.h b/servers/visual/visual_server_raster.h index 864ae81140..106b84a6ff 100644 --- a/servers/visual/visual_server_raster.h +++ b/servers/visual/visual_server_raster.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef VISUAL_SERVER_RASTER_H #define VISUAL_SERVER_RASTER_H diff --git a/servers/visual/visual_server_scene.cpp b/servers/visual/visual_server_scene.cpp index 9866496083..8d8bbb881f 100644 --- a/servers/visual/visual_server_scene.cpp +++ b/servers/visual/visual_server_scene.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "visual_server_scene.h" #include "os/os.h" #include "visual_server_global.h" @@ -658,7 +659,6 @@ void VisualServerScene::instance_set_use_lightmap(RID p_instance, RID p_lightmap Instance *instance = instance_owner.get(p_instance); ERR_FAIL_COND(!instance); - ERR_FAIL_COND(!is_geometry_instance(instance->base_type)); if (instance->lightmap_capture) { InstanceLightmapCaptureData *lightmap_capture = static_cast<InstanceLightmapCaptureData *>(((Instance *)instance->lightmap_capture)->base_data); @@ -3297,6 +3297,7 @@ bool VisualServerScene::free(RID p_rid) { Instance *instance = instance_owner.get(p_rid); + instance_set_use_lightmap(p_rid, RID(), RID()); instance_set_scenario(p_rid, RID()); instance_set_base(p_rid, RID()); instance_geometry_set_material_override(p_rid, RID()); diff --git a/servers/visual/visual_server_scene.h b/servers/visual/visual_server_scene.h index fc57225f88..206503e643 100644 --- a/servers/visual/visual_server_scene.h +++ b/servers/visual/visual_server_scene.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef VISUALSERVERSCENE_H #define VISUALSERVERSCENE_H diff --git a/servers/visual/visual_server_viewport.cpp b/servers/visual/visual_server_viewport.cpp index c1ee9e7847..222dc6351b 100644 --- a/servers/visual/visual_server_viewport.cpp +++ b/servers/visual/visual_server_viewport.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "visual_server_viewport.h" #include "project_settings.h" diff --git a/servers/visual/visual_server_viewport.h b/servers/visual/visual_server_viewport.h index 24904d37e9..1d28cf22a3 100644 --- a/servers/visual/visual_server_viewport.h +++ b/servers/visual/visual_server_viewport.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef VISUALSERVERVIEWPORT_H #define VISUALSERVERVIEWPORT_H diff --git a/servers/visual/visual_server_wrap_mt.cpp b/servers/visual/visual_server_wrap_mt.cpp index 67b83b7618..094e2794ed 100644 --- a/servers/visual/visual_server_wrap_mt.cpp +++ b/servers/visual/visual_server_wrap_mt.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "visual_server_wrap_mt.h" #include "os/os.h" #include "project_settings.h" diff --git a/servers/visual/visual_server_wrap_mt.h b/servers/visual/visual_server_wrap_mt.h index 276e445f4d..236b7ccb83 100644 --- a/servers/visual/visual_server_wrap_mt.h +++ b/servers/visual/visual_server_wrap_mt.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef VISUAL_SERVER_WRAP_MT_H #define VISUAL_SERVER_WRAP_MT_H diff --git a/servers/visual_server.cpp b/servers/visual_server.cpp index bf6d425fb9..5f520f1d04 100644 --- a/servers/visual_server.cpp +++ b/servers/visual_server.cpp @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #include "visual_server.h" #include "method_bind_ext.gen.inc" @@ -711,7 +712,7 @@ Error VisualServer::_surface_set_data(Array p_arrays, uint32_t p_format, uint32_ if (first) { for (int i = 0; i < total_bones; i++) { - r_bone_aabb[i].size == Vector3(-1, -1, -1); //negative means unused + r_bone_aabb[i].size = Vector3(-1, -1, -1); //negative means unused } } diff --git a/servers/visual_server.h b/servers/visual_server.h index eb2c56cd3a..16ba135c30 100644 --- a/servers/visual_server.h +++ b/servers/visual_server.h @@ -27,6 +27,7 @@ /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ + #ifndef VISUAL_SERVER_H #define VISUAL_SERVER_H |