diff options
| -rw-r--r-- | COPYRIGHT.txt | 12 | ||||
| -rw-r--r-- | doc/classes/CanvasItem.xml | 2 | ||||
| -rw-r--r-- | main/main.cpp | 2 | ||||
| -rw-r--r-- | modules/mono/mono_gd/gd_mono_utils.cpp | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/COPYRIGHT.txt b/COPYRIGHT.txt index ef9f854370..bcfaf61664 100644 --- a/COPYRIGHT.txt +++ b/COPYRIGHT.txt @@ -1050,11 +1050,11 @@ License: MPL-2.0 means . (a) that the initial Contributor has attached the notice described - in Exhibit B to the Covered Software; or + in Exhibit B to the Covered Software; or . (b) that the Covered Software was made available under the terms of - version 1.1 or earlier of the License, but not also under the - terms of a Secondary License. + version 1.1 or earlier of the License, but not also under the + terms of a Secondary License. . 1.6. "Executable Form" means any form of the work other than Source Code Form. @@ -1075,11 +1075,11 @@ License: MPL-2.0 means any of the following: . (a) any file in Source Code Form that results from an addition to, - deletion from, or modification of the contents of Covered - Software; or + deletion from, or modification of the contents of Covered + Software; or . (b) any new file in Source Code Form that contains any Covered - Software. + Software. . 1.11. "Patent Claims" of a Contributor means any patent claim(s), including without limitation, method, diff --git a/doc/classes/CanvasItem.xml b/doc/classes/CanvasItem.xml index ed53bc85be..0ec8da976c 100644 --- a/doc/classes/CanvasItem.xml +++ b/doc/classes/CanvasItem.xml @@ -415,7 +415,7 @@ <return type="bool"> </return> <description> - Returns [code]true[/code] if the node is in the [SceneTree] and is visible on-screen. + Returns [code]true[/code] if the node is present in the [SceneTree], its [member visible] property is [code]true[/code] and its inherited visibility is also [code]true[/code]. </description> </method> <method name="make_canvas_position_local" qualifiers="const"> diff --git a/main/main.cpp b/main/main.cpp index d670b1d0b5..4759e378e9 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -903,7 +903,7 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph OS::get_singleton()->set_screen_orientation(OS::SCREEN_LANDSCAPE); } - Engine::get_singleton()->set_iterations_per_second(GLOBAL_DEF("physics/common/fixed_fps", 60)); + Engine::get_singleton()->set_iterations_per_second(GLOBAL_DEF("physics/common/physics_fps", 60)); Engine::get_singleton()->set_target_fps(GLOBAL_DEF("debug/settings/fps/force_fps", 0)); GLOBAL_DEF("debug/settings/stdout/print_fps", OS::get_singleton()->is_stdout_verbose()); diff --git a/modules/mono/mono_gd/gd_mono_utils.cpp b/modules/mono/mono_gd/gd_mono_utils.cpp index 835a4614c1..a2f0819a72 100644 --- a/modules/mono/mono_gd/gd_mono_utils.cpp +++ b/modules/mono/mono_gd/gd_mono_utils.cpp @@ -184,7 +184,7 @@ void update_godot_api_cache() { CACHE_CLASS_AND_CHECK(Color, GODOT_API_CLASS(Color)); CACHE_CLASS_AND_CHECK(Plane, GODOT_API_CLASS(Plane)); CACHE_CLASS_AND_CHECK(NodePath, GODOT_API_CLASS(NodePath)); - CACHE_CLASS_AND_CHECK(RID, GODOT_API_CLASS(NodePath)); + CACHE_CLASS_AND_CHECK(RID, GODOT_API_CLASS(RID)); CACHE_CLASS_AND_CHECK(GodotObject, GODOT_API_CLASS(Object)); CACHE_CLASS_AND_CHECK(GodotReference, GODOT_API_CLASS(Reference)); CACHE_CLASS_AND_CHECK(Node, GODOT_API_CLASS(Node)); |