diff options
| -rw-r--r-- | AUTHORS.md | 2 | ||||
| -rw-r--r-- | DONORS.md | 43 | ||||
| -rw-r--r-- | editor/editor_help.cpp | 2 | ||||
| -rw-r--r-- | editor/find_in_files.cpp | 57 | ||||
| -rw-r--r-- | editor/plugins/script_editor_plugin.cpp | 3 | ||||
| -rw-r--r-- | editor/property_selector.cpp | 2 | ||||
| -rw-r--r-- | editor/quick_open.cpp | 2 | ||||
| -rw-r--r-- | platform/windows/os_windows.cpp | 7 |
8 files changed, 44 insertions, 74 deletions
diff --git a/AUTHORS.md b/AUTHORS.md index 13a67ce3f5..2f109aff6e 100644 --- a/AUTHORS.md +++ b/AUTHORS.md @@ -73,7 +73,7 @@ name is available. J08nY Jakub Grzesik (kubecz3k) Jérôme GULLY (Nutriz) - JFonS + Joan Fons Sanchez (JFonS) Johan Manuel (29jm) Joshua Grams (JoshuaGrams) Juan Linietsky (reduz) @@ -13,30 +13,29 @@ generous deed immortalized in the next stable release of Godot Engine. ## Platinum sponsors Enjin Coin <https://enjincoin.io> - GameDev.TV <https://gdev.tv/godot> ## Gold sponsors Gamblify <https://www.gamblify.com> + GameDev.TV <https://gdev.tv/godot> + Image Campus <https://www.imagecampus.edu.ar> ## Mini sponsors Andrew Dunai Brandon Lamb Christian Uldall Pedersen - Christopher Igoe Christoph Woinke + David Graham GameDev.net Hein-Pieter van Braam iDev.Network Studios Jamal Alyafei - Jay Sistar Leona Eden Matthieu Huvé Mike King Nathan Warden Neal Gompa (Conan Kudo) - Pascal Julien Patrick Aarstad Ruslan Mustakov Slobodan Milnovic @@ -67,7 +66,6 @@ generous deed immortalized in the next stable release of Godot Engine. Gary Oberbrunner Jay Horton Johannes Wuensch - Josep G. Camarasa Joshua Lesperance Krzysztof Dluzniewski Kyle Szklenski @@ -77,7 +75,7 @@ generous deed immortalized in the next stable release of Godot Engine. Ranoller Sergey Svenne Krap - Timothy Hagberg + Xananax BanjoNode2D Beliar @@ -92,6 +90,7 @@ generous deed immortalized in the next stable release of Godot Engine. Justo Delgado Baudí KTL Laurence Bannister + Markus Wiesner paul gruenbacher Rami Robert Willes @@ -106,7 +105,6 @@ generous deed immortalized in the next stable release of Godot Engine. Alessandra Pereyra Alexey Dyadchenko Amanda Haldy - Branwen Danielle Zakariasen Chau Siu Hung Chris Brown Chris Petrich @@ -130,9 +128,8 @@ generous deed immortalized in the next stable release of Godot Engine. joe513 Juraj Móza Justin Arnold - Lars Wuethrich Leandro Voltolino - Markus Wiesner + Marius Kamm Marvin Nahuel Sacchetti Nick Nikitin @@ -140,8 +137,6 @@ generous deed immortalized in the next stable release of Godot Engine. Pete Goodwin ray-tracer Ruben Soares Luis - Rufus Xavier Sarsaparilla - Sindre Sømme Sofox Stoned Xander Trent McPheron @@ -167,7 +162,6 @@ generous deed immortalized in the next stable release of Godot Engine. Bailey Bastian Böhm Benedikt - Benjamin Beshara Ben Vercammen Blair Allen Brandon @@ -178,7 +172,6 @@ generous deed immortalized in the next stable release of Godot Engine. Chris Chapin Christian Baune Christian Winter - Christopher Schmitt Collin Shooltz Daniel Johnson Daniel Kaplan @@ -192,11 +185,13 @@ generous deed immortalized in the next stable release of Godot Engine. Edward Herbert Elias Nykrem Eric Martini + Eric Williams Eugenio Hugo Salgüero Jáñez Fabian Becker fengjiongmax Foomf G3Dev sàrl + George Lesica Gerrit Großkopf Gilberto K. Otubo Greg Olson @@ -206,6 +201,7 @@ generous deed immortalized in the next stable release of Godot Engine. ialex32x Jahn Johansen Jaime Ruiz-Borau Vizárraga + Jako Danar Jeff Hungerford Joel Fivat Johan Lindberg @@ -213,9 +209,9 @@ generous deed immortalized in the next stable release of Godot Engine. Jonas Yamazaki Jonathan Martin Jonathan Nieto - Jonathon Jon Bonazza Jon Sully + Jose Malheiro Josh 'Cheeseness' Bush Juanfran Juan Negrier @@ -227,14 +223,16 @@ generous deed immortalized in the next stable release of Godot Engine. Kevin Kamper Meejach Petersen Klavdij Voncina Krzysztof Jankowski + Krzysztof Sierszecki + KsyTek Games Linus Lind Lundgren Loreshaper Games - Luc Magitem Luis Moraes Macil magodev - Manolis Makris + Malcolm Martin Eigel + Matt Welke Max R.R. Collada Maxwell Mertcan Mermerkaya @@ -245,17 +243,18 @@ generous deed immortalized in the next stable release of Godot Engine. Mikael Olsson MoM Moritz Laass + Moritz Weissenberger Natrim nee Neil Blakey-Milner Nick Pavlica Niclas Eriksen + Nicolás Montaña Nicolas SAN AGUSTIN - Niko Leopold + Nik Noi Sek Pan Ip Pascal Grüter - Pat LaBine Patrick Nafarrete Paul E Hansen Paul Gieske @@ -273,10 +272,7 @@ generous deed immortalized in the next stable release of Godot Engine. Roman Tinkov Sasori Olkof Sootstone - Stefan Butucea - The K-B Theo Cranmore - Thibaud Galloy Thibault Barbaroux Thomas Bell Thomas Holmes @@ -284,18 +280,15 @@ generous deed immortalized in the next stable release of Godot Engine. tiansheng li Tim Tom Larrow - Tristan Crawford - Tryggve Sollid Trym Nilsen + Tyggve Sollid Tyler Stafos UltyX Vaiktorg Victor Viktor Ferenczi waka nya - werner mendizabal Wout Standaert - Yu He ## Bronze donors diff --git a/editor/editor_help.cpp b/editor/editor_help.cpp index caa60eb645..3ee8d9c6c5 100644 --- a/editor/editor_help.cpp +++ b/editor/editor_help.cpp @@ -252,6 +252,8 @@ void EditorHelpSearch::_notification(int p_what) { connect("confirmed", this, "_confirmed"); _update_search(); + } else if (p_what == NOTIFICATION_EXIT_TREE) { + disconnect("confirmed", this, "_confirmed"); } else if (p_what == NOTIFICATION_VISIBILITY_CHANGED) { if (is_visible_in_tree()) { diff --git a/editor/find_in_files.cpp b/editor/find_in_files.cpp index 0ccaa95fb7..705bb1d9c5 100644 --- a/editor/find_in_files.cpp +++ b/editor/find_in_files.cpp @@ -29,6 +29,7 @@ /*************************************************************************/ #include "find_in_files.h" + #include "core/os/dir_access.h" #include "core/os/os.h" #include "editor_node.h" @@ -89,8 +90,6 @@ static bool find_next(const String &line, String pattern, int from, bool match_c //-------------------------------------------------------------------------------- FindInFiles::FindInFiles() { _root_prefix = ROOT_PREFIX; - _extension_filter.insert("gd"); - _extension_filter.insert("cs"); _searching = false; _whole_words = true; _match_case = true; @@ -301,8 +300,7 @@ const char *FindInFilesDialog::SIGNAL_REPLACE_REQUESTED = "replace_requested"; FindInFilesDialog::FindInFilesDialog() { - set_custom_minimum_size(Size2(400, 190) * EDSCALE); - set_resizable(true); + set_custom_minimum_size(Size2(500 * EDSCALE, 0)); set_title(TTR("Find in Files")); VBoxContainer *vbc = memnew(VBoxContainer); @@ -317,7 +315,7 @@ FindInFilesDialog::FindInFilesDialog() { vbc->add_child(gc); Label *find_label = memnew(Label); - find_label->set_text(TTR("Find: ")); + find_label->set_text(TTR("Find:")); gc->add_child(find_label); _search_text_line_edit = memnew(LineEdit); @@ -326,10 +324,7 @@ FindInFilesDialog::FindInFilesDialog() { _search_text_line_edit->connect("text_entered", this, "_on_search_text_entered"); gc->add_child(_search_text_line_edit); - { - Control *placeholder = memnew(Control); - gc->add_child(placeholder); - } + gc->add_child(memnew(Control)); // Space to mantain the grid aligned. { HBoxContainer *hbc = memnew(HBoxContainer); @@ -346,7 +341,7 @@ FindInFilesDialog::FindInFilesDialog() { } Label *folder_label = memnew(Label); - folder_label->set_text(TTR("Folder: ")); + folder_label->set_text(TTR("Folder:")); gc->add_child(folder_label); { @@ -374,7 +369,7 @@ FindInFilesDialog::FindInFilesDialog() { } Label *filter_label = memnew(Label); - filter_label->set_text(TTR("Filter: ")); + filter_label->set_text(TTR("Filters:")); gc->add_child(filter_label); { @@ -382,7 +377,8 @@ FindInFilesDialog::FindInFilesDialog() { Vector<String> exts; exts.push_back("gd"); - exts.push_back("cs"); + if (Engine::get_singleton()->has_singleton("GodotSharp")) + exts.push_back("cs"); for (int i = 0; i < exts.size(); ++i) { CheckBox *cb = memnew(CheckBox); @@ -395,39 +391,14 @@ FindInFilesDialog::FindInFilesDialog() { gc->add_child(hbc); } - { - Control *placeholder = memnew(Control); - placeholder->set_custom_minimum_size(Size2(0, EDSCALE * 16)); - vbc->add_child(placeholder); - } - - { - HBoxContainer *hbc = memnew(HBoxContainer); - hbc->set_alignment(HBoxContainer::ALIGN_CENTER); - - _find_button = add_button(TTR("Find..."), false, "find"); - _find_button->set_disabled(true); - - { - Control *placeholder = memnew(Control); - placeholder->set_custom_minimum_size(Size2(EDSCALE * 16, 0)); - hbc->add_child(placeholder); - } - - _replace_button = add_button(TTR("Replace..."), false, "replace"); - _replace_button->set_disabled(true); + _find_button = add_button(TTR("Find..."), false, "find"); + _find_button->set_disabled(true); - { - Control *placeholder = memnew(Control); - placeholder->set_custom_minimum_size(Size2(EDSCALE * 16, 0)); - hbc->add_child(placeholder); - } - - Button *cancel_button = get_ok(); - cancel_button->set_text(TTR("Cancel")); + _replace_button = add_button(TTR("Replace..."), false, "replace"); + _replace_button->set_disabled(true); - vbc->add_child(hbc); - } + Button *cancel_button = get_ok(); + cancel_button->set_text(TTR("Cancel")); } void FindInFilesDialog::set_search_text(String text) { diff --git a/editor/plugins/script_editor_plugin.cpp b/editor/plugins/script_editor_plugin.cpp index 04011dbb2b..323dfa681b 100644 --- a/editor/plugins/script_editor_plugin.cpp +++ b/editor/plugins/script_editor_plugin.cpp @@ -210,6 +210,9 @@ void ScriptEditorQuickOpen::_notification(int p_what) { search_box->set_right_icon(get_icon("Search", "EditorIcons")); search_box->set_clear_button_enabled(true); } break; + case NOTIFICATION_EXIT_TREE: { + disconnect("confirmed", this, "_confirmed"); + } break; } } diff --git a/editor/property_selector.cpp b/editor/property_selector.cpp index 9042bdc7c1..a8c97be936 100644 --- a/editor/property_selector.cpp +++ b/editor/property_selector.cpp @@ -394,6 +394,8 @@ void PropertySelector::_notification(int p_what) { if (p_what == NOTIFICATION_ENTER_TREE) { connect("confirmed", this, "_confirmed"); + } else if (p_what == NOTIFICATION_EXIT_TREE) { + disconnect("confirmed", this, "_confirmed"); } } diff --git a/editor/quick_open.cpp b/editor/quick_open.cpp index e48a0022e8..8dacc3c142 100644 --- a/editor/quick_open.cpp +++ b/editor/quick_open.cpp @@ -261,6 +261,8 @@ void EditorQuickOpen::_notification(int p_what) { search_box->set_right_icon(get_icon("Search", "EditorIcons")); search_box->set_clear_button_enabled(true); + } else if (p_what == NOTIFICATION_EXIT_TREE) { + disconnect("confirmed", this, "_confirmed"); } } diff --git a/platform/windows/os_windows.cpp b/platform/windows/os_windows.cpp index f8705c4bff..5e9f9bc59b 100644 --- a/platform/windows/os_windows.cpp +++ b/platform/windows/os_windows.cpp @@ -58,11 +58,8 @@ static const WORD MAX_CONSOLE_LINES = 1500; extern "C" { -#ifdef _MSC_VER -_declspec(dllexport) DWORD NvOptimusEnablement = 0x00000001; -#else -__attribute__((visibility("default"))) DWORD NvOptimusEnablement = 0x00000001; -#endif +__declspec(dllexport) DWORD NvOptimusEnablement = 1; +__declspec(dllexport) int AmdPowerXpressRequestHighPerformance = 1; } // Workaround mingw-w64 < 4.0 bug |