diff options
| -rw-r--r-- | doc/classes/EditorInspectorPlugin.xml | 14 | ||||
| -rw-r--r-- | doc/classes/EditorProperty.xml | 4 | ||||
| -rw-r--r-- | doc/classes/MeshTexture.xml | 10 | ||||
| -rw-r--r-- | editor/editor_file_dialog.cpp | 10 | ||||
| -rw-r--r-- | editor/plugins/visual_shader_editor_plugin.cpp | 10 | ||||
| -rw-r--r-- | editor/progress_dialog.cpp | 3 | ||||
| -rw-r--r-- | editor/project_export.cpp | 18 | ||||
| -rw-r--r-- | editor/project_export.h | 6 | ||||
| -rw-r--r-- | methods.py | 8 | ||||
| -rw-r--r-- | platform/android/java/AndroidManifest.xml | 7 | ||||
| -rw-r--r-- | platform/android/java/build.gradle | 6 | ||||
| -rw-r--r-- | platform/windows/os_windows.cpp | 2 | ||||
| -rw-r--r-- | scene/resources/visual_shader.cpp | 3 |
13 files changed, 54 insertions, 47 deletions
diff --git a/doc/classes/EditorInspectorPlugin.xml b/doc/classes/EditorInspectorPlugin.xml index dd60c479c6..f2dcd2177c 100644 --- a/doc/classes/EditorInspectorPlugin.xml +++ b/doc/classes/EditorInspectorPlugin.xml @@ -4,13 +4,13 @@ Plugin for adding custom property editors on inspector. </brief_description> <description> - This plugins allows adding custom property editors to [EditorInspector]. - Plugins are registered via [method EditorPlugin.add_inspector_plugin]. - When an object is edited, the [method can_handle] function is called and must return true if the object type is supported. - If supported, the function [method parse_begin] will be called, allowing to place custom controls at the beginning of the class. - Subsequently, the [method parse_category] and [method parse_property] are called for every category and property. They offer the ability to add custom controls to the inspector too. - Finally [method parse_end] will be called. - On each of these calls, the "add" functions can be called. + This plugins allows adding custom property editors to [EditorInspector]. + Plugins are registered via [method EditorPlugin.add_inspector_plugin]. + When an object is edited, the [method can_handle] function is called and must return true if the object type is supported. + If supported, the function [method parse_begin] will be called, allowing to place custom controls at the beginning of the class. + Subsequently, the [method parse_category] and [method parse_property] are called for every category and property. They offer the ability to add custom controls to the inspector too. + Finally [method parse_end] will be called. + On each of these calls, the "add" functions can be called. </description> <tutorials> </tutorials> diff --git a/doc/classes/EditorProperty.xml b/doc/classes/EditorProperty.xml index e187b8156b..735c270279 100644 --- a/doc/classes/EditorProperty.xml +++ b/doc/classes/EditorProperty.xml @@ -15,7 +15,7 @@ <argument index="0" name="control" type="Control"> </argument> <description> - If any of the controls added can gain keyboard focus, add it here. This ensures that focus will be restored if the inspector is refreshed. + If any of the controls added can gain keyboard focus, add it here. This ensures that focus will be restored if the inspector is refreshed. </description> </method> <method name="emit_changed"> @@ -60,7 +60,7 @@ <argument index="0" name="editor" type="Control"> </argument> <description> - Add controls with this function if you want them on the bottom (below the label). + Add controls with this function if you want them on the bottom (below the label). </description> </method> <method name="update_property" qualifiers="virtual"> diff --git a/doc/classes/MeshTexture.xml b/doc/classes/MeshTexture.xml index 915e5f07cc..d305cca482 100644 --- a/doc/classes/MeshTexture.xml +++ b/doc/classes/MeshTexture.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8" ?> <class name="MeshTexture" inherits="Texture" category="Core" version="3.2"> <brief_description> - Simple texture that uses a mesh to draw itself. + Simple texture that uses a mesh to draw itself. </brief_description> <description> - Simple texture that uses a mesh to draw itself. It's limited because flags can't be changed and region drawing is not supported. + Simple texture that uses a mesh to draw itself. It's limited because flags can't be changed and region drawing is not supported. </description> <tutorials> </tutorials> @@ -12,13 +12,13 @@ </methods> <members> <member name="base_texture" type="Texture" setter="set_base_texture" getter="get_base_texture"> - Set the base texture that the Mesh will use to draw. + Set the base texture that the Mesh will use to draw. </member> <member name="image_size" type="Vector2" setter="set_image_size" getter="get_image_size"> - Set the size of the image, needed for reference. + Set the size of the image, needed for reference. </member> <member name="mesh" type="Mesh" setter="set_mesh" getter="get_mesh"> - Set the mesh used to draw. It must be a mesh using 2D vertices. + Set the mesh used to draw. It must be a mesh using 2D vertices. </member> </members> <constants> diff --git a/editor/editor_file_dialog.cpp b/editor/editor_file_dialog.cpp index e6a6d9e6a6..724b821267 100644 --- a/editor/editor_file_dialog.cpp +++ b/editor/editor_file_dialog.cpp @@ -233,8 +233,8 @@ void EditorFileDialog::_file_entered(const String &p_file) { void EditorFileDialog::_save_confirm_pressed() { String f = dir_access->get_current_dir().plus_file(file->get_text()); _save_to_recent(); - emit_signal("file_selected", f); hide(); + emit_signal("file_selected", f); } void EditorFileDialog::_post_popup() { @@ -343,8 +343,8 @@ void EditorFileDialog::_action_pressed() { if (files.size()) { _save_to_recent(); - emit_signal("files_selected", files); hide(); + emit_signal("files_selected", files); } return; @@ -354,8 +354,8 @@ void EditorFileDialog::_action_pressed() { if ((mode == MODE_OPEN_ANY || mode == MODE_OPEN_FILE) && dir_access->file_exists(f)) { _save_to_recent(); - emit_signal("file_selected", f); hide(); + emit_signal("file_selected", f); } else if (mode == MODE_OPEN_ANY || mode == MODE_OPEN_DIR) { String path = dir_access->get_current_dir(); @@ -374,8 +374,8 @@ void EditorFileDialog::_action_pressed() { } _save_to_recent(); - emit_signal("dir_selected", path); hide(); + emit_signal("dir_selected", path); } if (mode == MODE_SAVE_FILE) { @@ -441,8 +441,8 @@ void EditorFileDialog::_action_pressed() { } else { _save_to_recent(); - emit_signal("file_selected", f); hide(); + emit_signal("file_selected", f); } } } diff --git a/editor/plugins/visual_shader_editor_plugin.cpp b/editor/plugins/visual_shader_editor_plugin.cpp index c619b5d224..a732231e17 100644 --- a/editor/plugins/visual_shader_editor_plugin.cpp +++ b/editor/plugins/visual_shader_editor_plugin.cpp @@ -351,7 +351,6 @@ void VisualShaderEditor::_update_graph() { Ref<VisualShaderNode> vsnode = visual_shader->get_node(type, nodes[n_i]); GraphNode *node = memnew(GraphNode); - graph->add_child(node); /*if (!vsnode->is_connected("changed", this, "_node_changed")) { vsnode->connect("changed", this, "_node_changed", varray(vsnode->get_instance_id()), CONNECT_DEFERRED); @@ -374,6 +373,8 @@ void VisualShaderEditor::_update_graph() { Ref<VisualShaderNodeUniform> uniform = vsnode; if (uniform.is_valid()) { + graph->add_child(node); + LineEdit *uniform_name = memnew(LineEdit); uniform_name->set_text(uniform->get_uniform_name()); node->add_child(uniform_name); @@ -523,7 +524,7 @@ void VisualShaderEditor::_update_graph() { } } - if (vsnode->get_output_port_for_preview() >= 0) { + if (vsnode->get_output_port_for_preview() >= 0 && vsnode->get_output_port_type(vsnode->get_output_port_for_preview()) != VisualShaderNode::PORT_TYPE_TRANSFORM) { VisualShaderNodePortPreview *port_preview = memnew(VisualShaderNodePortPreview); port_preview->setup(visual_shader, type, nodes[n_i], vsnode->get_output_port_for_preview()); port_preview->set_h_size_flags(SIZE_SHRINK_CENTER); @@ -537,6 +538,10 @@ void VisualShaderEditor::_update_graph() { error_label->set_text(error); node->add_child(error_label); } + + if (!uniform.is_valid()) { + graph->add_child(node); + } } for (List<VisualShader::Connection>::Element *E = connections.front(); E; E = E->next()) { @@ -757,7 +762,6 @@ void VisualShaderEditor::_connection_request(const String &p_from, int p_from_in int to = p_to.to_int(); if (!visual_shader->can_connect_nodes(type, from, p_from_index, to, p_to_index)) { - EditorNode::get_singleton()->show_warning(TTR("Unable to connect, port may be in use or connection may be invalid.")); return; } diff --git a/editor/progress_dialog.cpp b/editor/progress_dialog.cpp index 5fdc725f50..09203a70a0 100644 --- a/editor/progress_dialog.cpp +++ b/editor/progress_dialog.cpp @@ -161,6 +161,7 @@ void ProgressDialog::_popup() { main->set_margin(MARGIN_TOP, style->get_margin(MARGIN_TOP)); main->set_margin(MARGIN_BOTTOM, -style->get_margin(MARGIN_BOTTOM)); + raise(); popup_centered(ms); } @@ -219,6 +220,8 @@ bool ProgressDialog::task_step(const String &p_task, const String &p_state, int last_progress_tick = OS::get_singleton()->get_ticks_usec(); if (cancel_hb->is_visible()) { OS::get_singleton()->force_process_input(); + } else { + OS::get_singleton()->process_and_drop_events(); } Main::iteration(); // this will not work on a lot of platforms, so it's only meant for the editor return cancelled; diff --git a/editor/project_export.cpp b/editor/project_export.cpp index 82a6a07805..f1d4772549 100644 --- a/editor/project_export.cpp +++ b/editor/project_export.cpp @@ -931,7 +931,7 @@ void ProjectExportDialog::_export_project() { Ref<EditorExportPlatform> platform = current->get_platform(); ERR_FAIL_COND(platform.is_null()); - export_project->set_access(FileDialog::ACCESS_FILESYSTEM); + export_project->set_access(EditorFileDialog::ACCESS_FILESYSTEM); export_project->clear_filters(); List<String> extension_list = platform->get_binary_extensions(current); @@ -955,7 +955,7 @@ void ProjectExportDialog::_export_project() { export_project->get_line_edit()->connect("text_entered", export_project, "_file_entered"); } - export_project->set_mode(FileDialog::MODE_SAVE_FILE); + export_project->set_mode(EditorFileDialog::MODE_SAVE_FILE); export_project->popup_centered_ratio(); } @@ -1184,9 +1184,9 @@ ProjectExportDialog::ProjectExportDialog() { patches_hb->add_child(patch_export); patches_hb->add_spacer(); - patch_dialog = memnew(FileDialog); + patch_dialog = memnew(EditorFileDialog); patch_dialog->add_filter("*.pck ; Pack File"); - patch_dialog->set_mode(FileDialog::MODE_OPEN_FILE); + patch_dialog->set_mode(EditorFileDialog::MODE_OPEN_FILE); patch_dialog->connect("file_selected", this, "_patch_selected"); add_child(patch_dialog); @@ -1266,11 +1266,11 @@ ProjectExportDialog::ProjectExportDialog() { export_all_button->connect("pressed", this, "_export_all_dialog"); export_all_button->set_disabled(true); - export_pck_zip = memnew(FileDialog); + export_pck_zip = memnew(EditorFileDialog); export_pck_zip->add_filter("*.zip ; ZIP File"); export_pck_zip->add_filter("*.pck ; Godot Game Pack"); - export_pck_zip->set_access(FileDialog::ACCESS_FILESYSTEM); - export_pck_zip->set_mode(FileDialog::MODE_SAVE_FILE); + export_pck_zip->set_access(EditorFileDialog::ACCESS_FILESYSTEM); + export_pck_zip->set_mode(EditorFileDialog::MODE_SAVE_FILE); add_child(export_pck_zip); export_pck_zip->connect("file_selected", this, "_export_pck_zip_selected"); @@ -1300,8 +1300,8 @@ ProjectExportDialog::ProjectExportDialog() { export_templates_error->add_child(download_templates); download_templates->connect("pressed", this, "_open_export_template_manager"); - export_project = memnew(FileDialog); - export_project->set_access(FileDialog::ACCESS_FILESYSTEM); + export_project = memnew(EditorFileDialog); + export_project->set_access(EditorFileDialog::ACCESS_FILESYSTEM); add_child(export_project); export_project->connect("file_selected", this, "_export_project_to_path"); export_project->get_line_edit()->connect("text_changed", this, "_validate_export_path"); diff --git a/editor/project_export.h b/editor/project_export.h index f8b6484477..476a30c9c0 100644 --- a/editor/project_export.h +++ b/editor/project_export.h @@ -90,7 +90,7 @@ private: Tree *patches; Button *patch_export; int patch_index; - FileDialog *patch_dialog; + EditorFileDialog *patch_dialog; ConfirmationDialog *patch_erase; Button *export_button; @@ -139,8 +139,8 @@ private: bool can_drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from) const; void drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from); - FileDialog *export_pck_zip; - FileDialog *export_project; + EditorFileDialog *export_pck_zip; + EditorFileDialog *export_project; CheckBox *export_debug; CheckBox *export_pck_zip_debug; diff --git a/methods.py b/methods.py index d2bad7f9dd..9efd8bf2f4 100644 --- a/methods.py +++ b/methods.py @@ -24,10 +24,16 @@ def disable_warnings(self): # We have to remove existing warning level defines before appending /w, # otherwise we get: "warning D9025 : overriding '/W3' with '/w'" warn_flags = ['/Wall', '/W4', '/W3', '/W2', '/W1', '/WX'] - self['CCFLAGS'] = [x for x in self['CCFLAGS'] if not x in warn_flags] self.Append(CCFLAGS=['/w']) + self.Append(CFLAGS=['/w']) + self.Append(CPPFLAGS=['/w']) + self['CCFLAGS'] = [x for x in self['CCFLAGS'] if not x in warn_flags] + self['CFLAGS'] = [x for x in self['CFLAGS'] if not x in warn_flags] + self['CPPFLAGS'] = [x for x in self['CPPFLAGS'] if not x in warn_flags] else: self.Append(CCFLAGS=['-w']) + self.Append(CFLAGS=['-w']) + self.Append(CPPFLAGS=['-w']) def add_module_version_string(self,s): diff --git a/platform/android/java/AndroidManifest.xml b/platform/android/java/AndroidManifest.xml index 29ddd844ba..613d24fbd2 100644 --- a/platform/android/java/AndroidManifest.xml +++ b/platform/android/java/AndroidManifest.xml @@ -43,13 +43,6 @@ <!--Custom application XML added by add-ons--> <!--CHUNK_APPLICATION_BEGIN--> -<activity android:name="com.google.android.gms.ads.AdActivity" - android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|uiMode|screenSize|smallestScreenSize"/> -<meta-data android:name="com.google.android.gms.version" - android:value="@integer/google_play_services_version" /> -<meta-data - android:name="com.google.android.gms.ads.AD_MANAGER_APP" - android:value="true"/> <!--CHUNK_APPLICATION_END--> </application> diff --git a/platform/android/java/build.gradle b/platform/android/java/build.gradle index 868bbee831..c468277daa 100644 --- a/platform/android/java/build.gradle +++ b/platform/android/java/build.gradle @@ -10,8 +10,8 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:3.2.1' -//CHUNK_BUILD_DEPENDENCIES_BEGIN -//CHUNK_BUILD_DEPENDENCIES_END +//CHUNK_BUILDSCRIPT_DEPENDENCIES_BEGIN +//CHUNK_BUILDSCRIPT_DEPENDENCIES_END } } @@ -31,7 +31,6 @@ allprojects { dependencies { implementation "com.android.support:support-core-utils:28.0.0" //CHUNK_DEPENDENCIES_BEGIN -compile ('com.google.android.gms:play-services-ads:16.0.0') { exclude group: 'com.android.support' } //CHUNK_DEPENDENCIES_END } @@ -66,7 +65,6 @@ android { manifest.srcFile 'AndroidManifest.xml' java.srcDirs = ['src' //DIR_SRC_BEGIN -,'/home/red/coding/godot-demos/2d/platformer/android/admob/src' //DIR_SRC_END ] res.srcDirs = [ diff --git a/platform/windows/os_windows.cpp b/platform/windows/os_windows.cpp index a6a947761b..193a3fa2c6 100644 --- a/platform/windows/os_windows.cpp +++ b/platform/windows/os_windows.cpp @@ -2485,7 +2485,7 @@ Error OS_Windows::execute(const String &p_path, const List<String> &p_arguments, } (*r_pipe) += buf; if (p_pipe_mutex) { - p_pipe_mutex->lock(); + p_pipe_mutex->unlock(); } } diff --git a/scene/resources/visual_shader.cpp b/scene/resources/visual_shader.cpp index 4229147ba2..b8f21948c3 100644 --- a/scene/resources/visual_shader.cpp +++ b/scene/resources/visual_shader.cpp @@ -240,6 +240,9 @@ bool VisualShader::can_connect_nodes(Type p_type, int p_from_node, int p_from_po if (!g->nodes.has(p_from_node)) return false; + if (p_from_node == p_to_node) + return false; + if (p_from_port < 0 || p_from_port >= g->nodes[p_from_node].node->get_output_port_count()) return false; |