diff options
Diffstat (limited to 'editor')
| -rw-r--r-- | editor/animation_editor.cpp | 2 | ||||
| -rw-r--r-- | editor/code_editor.cpp | 4 | ||||
| -rw-r--r-- | editor/collada/collada.cpp | 4 | ||||
| -rw-r--r-- | editor/connections_dialog.cpp | 2 | ||||
| -rw-r--r-- | editor/create_dialog.cpp | 14 | ||||
| -rw-r--r-- | editor/doc/doc_data.cpp | 2 | ||||
| -rw-r--r-- | editor/editor_export.cpp | 4 | ||||
| -rw-r--r-- | editor/editor_file_dialog.h | 2 | ||||
| -rw-r--r-- | editor/editor_help.cpp | 8 | ||||
| -rw-r--r-- | editor/editor_node.cpp | 4 | ||||
| -rw-r--r-- | editor/editor_resource_preview.cpp | 4 | ||||
| -rw-r--r-- | editor/editor_resource_preview.h | 2 | ||||
| -rw-r--r-- | editor/import/editor_import_collada.cpp | 4 | ||||
| -rw-r--r-- | editor/import/resource_importer_wav.cpp | 2 | ||||
| -rw-r--r-- | editor/io_plugins/editor_atlas.cpp | 2 | ||||
| -rw-r--r-- | editor/io_plugins/editor_font_import_plugin.cpp | 4 | ||||
| -rw-r--r-- | editor/plugins/shader_editor_plugin.cpp | 2 | ||||
| -rw-r--r-- | editor/plugins/shader_graph_editor_plugin.cpp | 2 | ||||
| -rw-r--r-- | editor/plugins/texture_region_editor_plugin.cpp | 2 | ||||
| -rw-r--r-- | editor/scene_tree_dock.cpp | 2 |
20 files changed, 35 insertions, 37 deletions
diff --git a/editor/animation_editor.cpp b/editor/animation_editor.cpp index 1a65014634..fe342b0ee8 100644 --- a/editor/animation_editor.cpp +++ b/editor/animation_editor.cpp @@ -2503,7 +2503,7 @@ void AnimationKeyEditor::_track_editor_gui_input(const InputEvent &p_input) { float newpos = E->get().pos - from_t + motion; /* if (newpos<0) - continue; //no add at the begining + continue; //no add at the beginning */ undo_redo->add_do_method(animation.ptr(), "track_insert_key", E->key().track, newpos, animation->track_get_key_value(E->key().track, E->key().key), animation->track_get_key_transition(E->key().track, E->key().key)); } diff --git a/editor/code_editor.cpp b/editor/code_editor.cpp index c71c2cc608..c4f836f3e4 100644 --- a/editor/code_editor.cpp +++ b/editor/code_editor.cpp @@ -241,7 +241,7 @@ void FindReplaceBar::_replace_all() { } text_edit->set_v_scroll(vsval); - set_error(vformat(TTR("Replaced %d Ocurrence(s)."), rc)); + set_error(vformat(TTR("Replaced %d occurrence(s)."), rc)); } void FindReplaceBar::_get_search_from(int &r_line, int &r_col) { @@ -703,7 +703,7 @@ void FindReplaceDialog::_replace() { text_edit->set_v_scroll(vsval); //text_edit->set_h_scroll(hsval); - error_label->set_text(vformat(TTR("Replaced %d ocurrence(s)."), rc)); + error_label->set_text(vformat(TTR("Replaced %d occurrence(s)."), rc)); //hide(); } else { diff --git a/editor/collada/collada.cpp b/editor/collada/collada.cpp index d96f1f4b6e..4705810eca 100644 --- a/editor/collada/collada.cpp +++ b/editor/collada/collada.cpp @@ -1697,7 +1697,7 @@ Collada::Node *Collada::_parse_visual_scene_node(XMLParser &parser) { } else if (section != "node") { //usually what defines the type of node - //print_line(" dont know what to do with "+section); + //print_line(" don't know what to do with "+section); if (section.begins_with("instance_")) { if (!node) { @@ -2444,7 +2444,7 @@ bool Collada::_move_geometry_to_skeletons(VisualScene *p_vscene, Node *p_node, L //p_node->default_transform=Transform(); //this seems to be correct, because bind shape makes the object local to the skeleton p_node->ignore_anim = true; // collada may animate this later, if it does, then this is not supported (redo your original asset and don't animate the base mesh) p_node->parent = sk; - //sk->children.push_back(0,p_node); //avoid INFINIT loop + //sk->children.push_back(0,p_node); //avoid INFINITE loop p_mgeom->push_back(p_node); return true; } diff --git a/editor/connections_dialog.cpp b/editor/connections_dialog.cpp index 03f77dbe94..49990c4340 100644 --- a/editor/connections_dialog.cpp +++ b/editor/connections_dialog.cpp @@ -121,7 +121,7 @@ void ConnectDialog::_tree_node_selected() { continue; // hidden method, not show! if (ClassDB::has_method(node->get_type(),"Node") || ClassDB::has_method(node->get_type(),"Control",true)) - continue; //avoid too much unnecesary stuff + continue; //avoid too much unnecessary stuff String method=E->get().name+"("; for(int i=0;i<E->get().arguments.size();i++) { diff --git a/editor/create_dialog.cpp b/editor/create_dialog.cpp index 442ef1fbd3..0e2ec92fde 100644 --- a/editor/create_dialog.cpp +++ b/editor/create_dialog.cpp @@ -29,12 +29,12 @@ #include "create_dialog.h" #include "class_db.h" -#include "editor_node.h" -#include "print_string.h" -#include "scene/gui/box_container.h" #include "editor_help.h" +#include "editor_node.h" #include "editor_settings.h" #include "os/keyboard.h" +#include "print_string.h" +#include "scene/gui/box_container.h" void CreateDialog::popup_create(bool p_dontclear) { @@ -86,15 +86,13 @@ void CreateDialog::popup_create(bool p_dontclear) { _update_favorite_list(); - // Restore valid window bounds or pop up at default size. if (EditorSettings::get_singleton()->has("interface/dialogs/create_new_node_bounds")) { - popup(EditorSettings::get_singleton()->get("interface/dialogs/create_new_node_bounds")); + popup(EditorSettings::get_singleton()->get("interface/dialogs/create_new_node_bounds")); } else { popup_centered_ratio(); } - if (p_dontclear) search_box->select_all(); else { @@ -213,7 +211,7 @@ void CreateDialog::_update_search() { continue; // do not show editor nodes if (!ClassDB::can_instance(type)) - continue; // cant create what can't be instanced + continue; // can't create what can't be instanced if (search_box->get_text() == "") { add_type(type, types, root, &to_select); @@ -316,7 +314,7 @@ void CreateDialog::_confirmed() { void CreateDialog::_notification(int p_what) { - switch (p_what) { + switch (p_what) { case NOTIFICATION_ENTER_TREE: { connect("confirmed", this, "_confirmed"); favorite->set_icon(get_icon("Favorites", "EditorIcons")); diff --git a/editor/doc/doc_data.cpp b/editor/doc/doc_data.cpp index 4f1b85f236..c6a51cce3d 100644 --- a/editor/doc/doc_data.cpp +++ b/editor/doc/doc_data.cpp @@ -210,7 +210,7 @@ void DocData::generate(bool p_basic_types) { for (List<MethodInfo>::Element *E = method_list.front(); E; E = E->next()) { if (E->get().name == "" || (E->get().name[0] == '_' && !(E->get().flags & METHOD_FLAG_VIRTUAL))) - continue; //hiden, dont count + continue; //hidden, don't count MethodDoc method; diff --git a/editor/editor_export.cpp b/editor/editor_export.cpp index d2976808fe..f601cacf54 100644 --- a/editor/editor_export.cpp +++ b/editor/editor_export.cpp @@ -1807,7 +1807,7 @@ Error EditorExportPlatform::export_project_files(EditorExportSaveFunction p_func if (slices.size()!=10) { atlas_valid=false; - print_line("CANT SLICE IN 10"); + print_line("CAN'T SLICE IN 10"); break; } uint64_t mod_time = slices[0].to_int64(); @@ -1946,7 +1946,7 @@ Error EditorExportPlatform::export_project_files(EditorExportSaveFunction p_func if (f) { //recreating deps.. String depline; - //depline=String(F->get())+"::"+itos(FileAccess::get_modified_time(F->get()))+"::"+FileAccess::getD_METHOD5(F->get()); name unneccesary by top md5 + //depline=String(F->get())+"::"+itos(FileAccess::get_modified_time(F->get()))+"::"+FileAccess::getD_METHOD5(F->get()); name unnecessary by top md5 depline=itos(FileAccess::get_modified_time(F->get()))+"::"+FileAccess::getD_METHOD5(F->get()); depline+="::"+itos(region.pos.x)+"::"+itos(region.pos.y)+"::"+itos(region.size.x)+"::"+itos(region.size.y); depline+="::"+itos(margin.pos.x)+"::"+itos(margin.pos.y)+"::"+itos(margin.size.x)+"::"+itos(margin.size.y); diff --git a/editor/editor_file_dialog.h b/editor/editor_file_dialog.h index 6c1bf08a40..21b764e85b 100644 --- a/editor/editor_file_dialog.h +++ b/editor/editor_file_dialog.h @@ -162,7 +162,7 @@ private: virtual void _post_popup(); void _save_to_recent(); - //callback funtion is callback(String p_path,Ref<Texture> preview,Variant udata) preview null if could not load + //callback function is callback(String p_path,Ref<Texture> preview,Variant udata) preview null if could not load void _thumbnail_result(const String &p_path, const Ref<Texture> &p_preview, const Variant &p_udata); void _thumbnail_done(const String &p_path, const Ref<Texture> &p_preview, const Variant &p_udata); diff --git a/editor/editor_help.cpp b/editor/editor_help.cpp index 161326ebab..3b2f187af5 100644 --- a/editor/editor_help.cpp +++ b/editor/editor_help.cpp @@ -779,7 +779,7 @@ Error EditorHelp::_goto_desc(const String &p_class, int p_vscr) { class_desc->set_table_column_expand(1, 1); for (int i = 0; i < cd.properties.size(); i++) { - property_line[cd.properties[i].name] = class_desc->get_line_count() - 2; //gets overriden if description + property_line[cd.properties[i].name] = class_desc->get_line_count() - 2; //gets overridden if description class_desc->push_cell(); class_desc->push_align(RichTextLabel::ALIGN_RIGHT); @@ -874,7 +874,7 @@ Error EditorHelp::_goto_desc(const String &p_class, int p_vscr) { class_desc->push_cell(); - method_line[methods[i].name] = class_desc->get_line_count() - 2; //gets overriden if description + method_line[methods[i].name] = class_desc->get_line_count() - 2; //gets overridden if description class_desc->push_align(RichTextLabel::ALIGN_RIGHT); class_desc->push_font(doc_code_font); _add_type(methods[i].return_type); @@ -959,7 +959,7 @@ Error EditorHelp::_goto_desc(const String &p_class, int p_vscr) { for (int i = 0; i < cd.theme_properties.size(); i++) { - theme_property_line[cd.theme_properties[i].name] = class_desc->get_line_count() - 2; //gets overriden if description + theme_property_line[cd.theme_properties[i].name] = class_desc->get_line_count() - 2; //gets overridden if description class_desc->push_font(doc_code_font); _add_type(cd.theme_properties[i].type); class_desc->push_color(EditorSettings::get_singleton()->get("text_editor/highlighting/text_color")); @@ -1002,7 +1002,7 @@ Error EditorHelp::_goto_desc(const String &p_class, int p_vscr) { for (int i = 0; i < cd.signals.size(); i++) { - signal_line[cd.signals[i].name] = class_desc->get_line_count() - 2; //gets overriden if description + signal_line[cd.signals[i].name] = class_desc->get_line_count() - 2; //gets overridden if description class_desc->push_font(doc_code_font); // monofont //_add_type("void"); //class_desc->add_text(" "); diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp index 72f2318f12..18c16af5af 100644 --- a/editor/editor_node.cpp +++ b/editor/editor_node.cpp @@ -2606,7 +2606,7 @@ void EditorNode::_menu_option_confirm(int p_option, bool p_confirmed) { current_option=-1; //accept->get_cancel()->hide(); accept->get_ok()->set_text("I see.."); - accept->set_text("Can't import if edited scene was not saved."); //i dont think this code will ever run + accept->set_text("Can't import if edited scene was not saved."); //i don't think this code will ever run accept->popup_centered(Size2(300,70)); break; @@ -4846,7 +4846,7 @@ EditorNode::EditorNode() { ResourceLoader::set_timestamp_on_load(true); ResourceSaver::set_timestamp_on_save(true); - { //register importers at the begining, so dialogs are created with the right extensions + { //register importers at the beginning, so dialogs are created with the right extensions Ref<ResourceImporterTexture> import_texture; import_texture.instance(); ResourceFormatImporter::get_singleton()->add_importer(import_texture); diff --git a/editor/editor_resource_preview.cpp b/editor/editor_resource_preview.cpp index 9eb6758cc2..281602021f 100644 --- a/editor/editor_resource_preview.cpp +++ b/editor/editor_resource_preview.cpp @@ -41,7 +41,7 @@ bool EditorResourcePreviewGenerator::handles(const String &p_type) const { if (get_script_instance() && get_script_instance()->has_method("handles")) { return get_script_instance()->call("handles", p_type); } - ERR_EXPLAIN("EditorResourcePreviewGenerator::handles needs to be overriden"); + ERR_EXPLAIN("EditorResourcePreviewGenerator::handles needs to be overridden"); ERR_FAIL_V(false); } Ref<Texture> EditorResourcePreviewGenerator::generate(const RES &p_from) { @@ -49,7 +49,7 @@ Ref<Texture> EditorResourcePreviewGenerator::generate(const RES &p_from) { if (get_script_instance() && get_script_instance()->has_method("generate")) { return get_script_instance()->call("generate", p_from); } - ERR_EXPLAIN("EditorResourcePreviewGenerator::generate needs to be overriden"); + ERR_EXPLAIN("EditorResourcePreviewGenerator::generate needs to be overridden"); ERR_FAIL_V(Ref<Texture>()); } diff --git a/editor/editor_resource_preview.h b/editor/editor_resource_preview.h index ad7f0946e5..ebb280a8cf 100644 --- a/editor/editor_resource_preview.h +++ b/editor/editor_resource_preview.h @@ -113,7 +113,7 @@ protected: public: static EditorResourcePreview *get_singleton(); - //callback funtion is callback(String p_path,Ref<Texture> preview,Variant udata) preview null if could not load + //callback function is callback(String p_path,Ref<Texture> preview,Variant udata) preview null if could not load void queue_resource_preview(const String &p_res, Object *p_receiver, const StringName &p_receiver_func, const Variant &p_userdata); void queue_edited_resource_preview(const Ref<Resource> &p_path, Object *p_receiver, const StringName &p_receiver_func, const Variant &p_userdata); diff --git a/editor/import/editor_import_collada.cpp b/editor/import/editor_import_collada.cpp index b4ce666e0c..93614fb511 100644 --- a/editor/import/editor_import_collada.cpp +++ b/editor/import/editor_import_collada.cpp @@ -774,7 +774,7 @@ Error ColladaImport::_create_mesh_surfaces(bool p_optimize, Ref<Mesh> &p_mesh, c weights.resize(4); } - //make sure weights allways add up to 1 + //make sure weights always add up to 1 float total = 0; for (int i = 0; i < weights.size(); i++) total += weights[i].weight; @@ -818,7 +818,7 @@ Error ColladaImport::_create_mesh_surfaces(bool p_optimize, Ref<Mesh> &p_mesh, c /* CREATE PRIMITIVE ARRAY */ /**************************/ - // The way collada uses indices is more optimal, and friendlier with 3D modelling sofware, + // The way collada uses indices is more optimal, and friendlier with 3D modelling software, // because it can index everything, not only vertices (similar to how the WII works). // This is, however, more incompatible with standard video cards, so arrays must be converted. // Must convert to GL/DX format. diff --git a/editor/import/resource_importer_wav.cpp b/editor/import/resource_importer_wav.cpp index c28c7dd425..751fd36414 100644 --- a/editor/import/resource_importer_wav.cpp +++ b/editor/import/resource_importer_wav.cpp @@ -176,7 +176,7 @@ Error ResourceImporterWAV::import(const String &p_source_file, const String &p_s break; } - /* Dont need anything else, continue */ + /* Don't need anything else, continue */ format_found = true; } diff --git a/editor/io_plugins/editor_atlas.cpp b/editor/io_plugins/editor_atlas.cpp index 1aa480f442..4be22c34c7 100644 --- a/editor/io_plugins/editor_atlas.cpp +++ b/editor/io_plugins/editor_atlas.cpp @@ -49,7 +49,7 @@ void EditorAtlas::fit(const Vector<Size2i> &p_rects, Vector<Point2i> &r_result, //super simple, almost brute force scanline stacking fitter //it's pretty basic for now, but it tries to make sure that the aspect ratio of the - //resulting atlas is somehow square. This is necesary because video cards have limits + //resulting atlas is somehow square. This is necessary because video cards have limits //on texture size (usually 2048 or 4096), so the more square a texture, the more chances //it will work in every hardware. // for example, it will prioritize a 1024x1024 atlas (works everywhere) instead of a diff --git a/editor/io_plugins/editor_font_import_plugin.cpp b/editor/io_plugins/editor_font_import_plugin.cpp index bad3b36383..2898d85de9 100644 --- a/editor/io_plugins/editor_font_import_plugin.cpp +++ b/editor/io_plugins/editor_font_import_plugin.cpp @@ -745,8 +745,8 @@ struct _EditorFontData { Vector<uint8_t> bitmap; int width,height; - int ofs_x; //ofset to center, from ABOVE - int ofs_y; //ofset to begining, from LEFT + int ofs_x; //offset to center, from ABOVE + int ofs_y; //offset to beginning, from LEFT int valign; //vertical alignment int halign; float advance; diff --git a/editor/plugins/shader_editor_plugin.cpp b/editor/plugins/shader_editor_plugin.cpp index c295a6679e..11dfb7b910 100644 --- a/editor/plugins/shader_editor_plugin.cpp +++ b/editor/plugins/shader_editor_plugin.cpp @@ -470,7 +470,7 @@ bool ShaderEditorPlugin::handles(Object *p_object) const { bool handles = true; Shader *shader = p_object->cast_to<Shader>(); /* - if (!shader || shader->cast_to<ShaderGraph>()) // Dont handle ShaderGraph's + if (!shader || shader->cast_to<ShaderGraph>()) // Don't handle ShaderGraph's handles = false; */ diff --git a/editor/plugins/shader_graph_editor_plugin.cpp b/editor/plugins/shader_graph_editor_plugin.cpp index d55c133dc9..bff7dece20 100644 --- a/editor/plugins/shader_graph_editor_plugin.cpp +++ b/editor/plugins/shader_graph_editor_plugin.cpp @@ -2425,7 +2425,7 @@ void ShaderGraphView::_create_node(int p_id) { colors.push_back("ShadowColor"); colors.push_back("Diffuse"); colors.push_back("Specular"); - colors.push_back("Emmision"); + colors.push_back("Emission"); Array reals; reals.push_back("Alpha"); reals.push_back("DiffuseAlpha"); diff --git a/editor/plugins/texture_region_editor_plugin.cpp b/editor/plugins/texture_region_editor_plugin.cpp index 5e992d3ec1..c0b410ba99 100644 --- a/editor/plugins/texture_region_editor_plugin.cpp +++ b/editor/plugins/texture_region_editor_plugin.cpp @@ -710,7 +710,7 @@ void TextureRegionEditor::_edit_region() { autoslice_cache.erase(F->next()); } else { queue_erase = true; - //Cant delete the first rect in the list. + //Can't delete the first rect in the list. } merged = true; } diff --git a/editor/scene_tree_dock.cpp b/editor/scene_tree_dock.cpp index f9baa7ea3c..1c6c195719 100644 --- a/editor/scene_tree_dock.cpp +++ b/editor/scene_tree_dock.cpp @@ -1570,7 +1570,7 @@ void SceneTreeDock::_normalize_drop(Node *&to_node, int &to_pos, int p_type) { //drop at below selected node if (to_node == EditorNode::get_singleton()->get_edited_scene()) { //if at lower sibling of root node - to_pos = 0; //just insert at begining of root node + to_pos = 0; //just insert at beginning of root node return; } |