Andrew/redot-engine
1
0
Fork 0
mirror of https://github.com/Redot-Engine/redot-engine.git synced 2025-12-05 23:07:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit godotengine/godot@4ebf67c

Browse Source
This commit is contained in:
Arctis-Fireblight
2025-08-27 23:18:33 -05:00
parent 50ed0e4bd2 4ebf67c12d
commit 00692349f5
177 changed files with 1631 additions and 967 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/input/input_map.cpp
View File

@@ -898,7 +898,7 @@ void InputMap::load_default() {
}
InputMap::InputMap() {
ERR_FAIL_COND_MSG(singleton, "Singleton in InputMap already exist.");
ERR_FAIL_COND_MSG(singleton, "Singleton in InputMap already exists.");
singleton = this;
}

9
core/io/dir_access.cpp
View File

@@ -492,19 +492,22 @@ Error DirAccess::_copy_dir(Ref<DirAccess> &p_target_da, const String &p_to, int
while (!n.is_empty()) {
if (n != "." && n != "..") {
if (p_copy_links && is_link(get_current_dir().path_join(n))) {
create_link(read_link(get_current_dir().path_join(n)), p_to + n);
Error err = p_target_da->create_link(read_link(get_current_dir().path_join(n)), p_to + n);
if (err) {
ERR_PRINT(vformat("Failed to copy symlink \"%s\".", n));
}
} else if (current_is_dir()) {
dirs.push_back(n);
} else {
const String &rel_path = n;
if (!n.is_relative_path()) {
list_dir_end();
return ERR_BUG;
ERR_FAIL_V_MSG(ERR_BUG, vformat("BUG: \"%s\" is not a relative path.", n));
}
Error err = copy(get_current_dir().path_join(n), p_to + rel_path, p_chmod_flags);
if (err) {
list_dir_end();
return err;
ERR_FAIL_V_MSG(err, vformat("Failed to copy file \"%s\".", n));
}
}
}

2
core/io/ip.cpp
View File

@@ -333,7 +333,7 @@ IP *IP::get_singleton() {
IP *(*IP::_create)() = nullptr;
IP *IP::create() {
ERR_FAIL_COND_V_MSG(singleton, nullptr, "IP singleton already exist.");
ERR_FAIL_COND_V_MSG(singleton, nullptr, "IP singleton already exists.");
ERR_FAIL_NULL_V(_create, nullptr);
return _create();
}

2
core/object/script_language_extension.h
View File

@@ -462,7 +462,7 @@ public:
r_result.description = ret.get("description", "");
r_result.is_deprecated = ret.get("is_deprecated", false);
r_result.deprecated_message = ret.get("deprecated_message", "");
r_result.is_deprecated = ret.get("is_deprecated", false);
r_result.is_experimental = ret.get("is_experimental", false);
r_result.experimental_message = ret.get("experimental_message", "");
r_result.doc_type = ret.get("doc_type", "");