diff options
| -rw-r--r-- | COPYRIGHT.txt | 2 | ||||
| -rw-r--r-- | doc/classes/SceneTreeTimer.xml | 2 | ||||
| -rw-r--r-- | editor/project_export.cpp | 2 | ||||
| -rw-r--r-- | thirdparty/README.md | 2 | ||||
| -rw-r--r-- | thirdparty/etcpak/AUTHORS.txt | 2 | ||||
| -rw-r--r-- | thirdparty/etcpak/LICENSE.txt | 2 |
6 files changed, 8 insertions, 4 deletions
diff --git a/COPYRIGHT.txt b/COPYRIGHT.txt index 60fda8f971..3f4981b7fb 100644 --- a/COPYRIGHT.txt +++ b/COPYRIGHT.txt @@ -179,7 +179,7 @@ License: Expat Files: ./thirdparty/etcpak/ Comment: etcpak -Copyright: 2013-2021, Bartosz Taudul +Copyright: 2013-2022, Bartosz Taudul License: BSD-3-clause Files: ./thirdparty/fonts/DroidSans*.woff2 diff --git a/doc/classes/SceneTreeTimer.xml b/doc/classes/SceneTreeTimer.xml index 2e9aeebceb..f28e65c5bf 100644 --- a/doc/classes/SceneTreeTimer.xml +++ b/doc/classes/SceneTreeTimer.xml @@ -22,7 +22,7 @@ } [/csharp] [/codeblocks] - The timer will be automatically freed after its time elapses, so be aware that any reference you might have kept to it will become invalid. + The timer will be dereferenced after its time elapses. To preserve the timer, you can keep a reference to it. See [RefCounted]. </description> <tutorials> </tutorials> diff --git a/editor/project_export.cpp b/editor/project_export.cpp index b77ab179fb..030337a4bc 100644 --- a/editor/project_export.cpp +++ b/editor/project_export.cpp @@ -1027,10 +1027,12 @@ ProjectExportDialog::ProjectExportDialog() { mc->add_child(presets); presets->connect("item_selected", callable_mp(this, &ProjectExportDialog::_edit_preset)); duplicate_preset = memnew(Button); + duplicate_preset->set_tooltip(TTR("Duplicate")); duplicate_preset->set_flat(true); preset_hb->add_child(duplicate_preset); duplicate_preset->connect("pressed", callable_mp(this, &ProjectExportDialog::_duplicate_preset)); delete_preset = memnew(Button); + delete_preset->set_tooltip(TTR("Delete")); delete_preset->set_flat(true); preset_hb->add_child(delete_preset); delete_preset->connect("pressed", callable_mp(this, &ProjectExportDialog::_delete_preset)); diff --git a/thirdparty/README.md b/thirdparty/README.md index 47894f21a7..595a9a85ce 100644 --- a/thirdparty/README.md +++ b/thirdparty/README.md @@ -118,7 +118,7 @@ will limit its functionality to IPv4 only. ## etcpak - Upstream: https://github.com/wolfpld/etcpak -- Version: git (f128369e64a5f4715de8125b325e4fe7debb5194, 2022) +- Version: 1.0 (a77d5a37ddf48034cee8aeb9e8792a623c265b4c, 2022) - License: BSD-3-Clause Files extracted from upstream source: diff --git a/thirdparty/etcpak/AUTHORS.txt b/thirdparty/etcpak/AUTHORS.txt index e7bae62c85..675b4eb2a9 100644 --- a/thirdparty/etcpak/AUTHORS.txt +++ b/thirdparty/etcpak/AUTHORS.txt @@ -1,3 +1,5 @@ Bartosz Taudul <wolf@nereid.pl> Daniel Jungmann <el.3d.source@gmail.com> Florian Penzkofer <fp@nullptr.de> +Jae-Ho Nah <nahjaeho@gmail.com> +Marcin Ławicki <marcin.lawicki@gmail.com> diff --git a/thirdparty/etcpak/LICENSE.txt b/thirdparty/etcpak/LICENSE.txt index 59e85d6ea5..9c71039b9b 100644 --- a/thirdparty/etcpak/LICENSE.txt +++ b/thirdparty/etcpak/LICENSE.txt @@ -1,6 +1,6 @@ etcpak, an extremely fast ETC compression utility (https://github.com/wolfpld/etcpak) -Copyright (c) 2013-2021, Bartosz Taudul <wolf@nereid.pl> +Copyright (c) 2013-2022, Bartosz Taudul <wolf@nereid.pl> All rights reserved. Redistribution and use in source and binary forms, with or without |