diff options
53 files changed, 726 insertions, 288 deletions
diff --git a/core/bind/core_bind.cpp b/core/bind/core_bind.cpp index 438db5d518..f1edc3d7d7 100644 --- a/core/bind/core_bind.cpp +++ b/core/bind/core_bind.cpp @@ -62,8 +62,8 @@ void _ResourceLoader::_bind_methods() { ObjectTypeDB::bind_method(_MD("load:Resource","path","type_hint", "p_no_cache"),&_ResourceLoader::load,DEFVAL(""), DEFVAL(false)); ObjectTypeDB::bind_method(_MD("get_recognized_extensions_for_type","type"),&_ResourceLoader::get_recognized_extensions_for_type); ObjectTypeDB::bind_method(_MD("set_abort_on_missing_resources","abort"),&_ResourceLoader::set_abort_on_missing_resources); - ObjectTypeDB::bind_method(_MD("get_dependencies"),&_ResourceLoader::get_dependencies); - ObjectTypeDB::bind_method(_MD("has"),&_ResourceLoader::has); + ObjectTypeDB::bind_method(_MD("get_dependencies","path"),&_ResourceLoader::get_dependencies); + ObjectTypeDB::bind_method(_MD("has","path"),&_ResourceLoader::has); } _ResourceLoader::_ResourceLoader() { @@ -96,7 +96,7 @@ _ResourceSaver *_ResourceSaver::singleton=NULL; void _ResourceSaver::_bind_methods() { - ObjectTypeDB::bind_method(_MD("save","path","resource:Resource"),&_ResourceSaver::save, DEFVAL(0)); + ObjectTypeDB::bind_method(_MD("save","path","resource:Resource","flags"),&_ResourceSaver::save,DEFVAL(0)); ObjectTypeDB::bind_method(_MD("get_recognized_extensions","type"),&_ResourceSaver::get_recognized_extensions); BIND_CONSTANT(FLAG_RELATIVE_PATHS); @@ -812,7 +812,7 @@ void _OS::_bind_methods() { ObjectTypeDB::bind_method(_MD("get_unix_time"),&_OS::get_unix_time); ObjectTypeDB::bind_method(_MD("get_system_time_msec"), &_OS::get_system_time_msec); - ObjectTypeDB::bind_method(_MD("set_icon"),&_OS::set_icon); + ObjectTypeDB::bind_method(_MD("set_icon","icon"),&_OS::set_icon); ObjectTypeDB::bind_method(_MD("delay_usec","usec"),&_OS::delay_usec); ObjectTypeDB::bind_method(_MD("delay_msec","msec"),&_OS::delay_msec); @@ -851,9 +851,9 @@ void _OS::_bind_methods() { ObjectTypeDB::bind_method(_MD("get_frames_per_second"),&_OS::get_frames_per_second); ObjectTypeDB::bind_method(_MD("print_all_textures_by_size"),&_OS::print_all_textures_by_size); - ObjectTypeDB::bind_method(_MD("print_resources_by_type"),&_OS::print_resources_by_type); + ObjectTypeDB::bind_method(_MD("print_resources_by_type","types"),&_OS::print_resources_by_type); - ObjectTypeDB::bind_method(_MD("native_video_play"),&_OS::native_video_play); + ObjectTypeDB::bind_method(_MD("native_video_play","path","volume","audio_track","subtitle_track"),&_OS::native_video_play); ObjectTypeDB::bind_method(_MD("native_video_is_playing"),&_OS::native_video_is_playing); ObjectTypeDB::bind_method(_MD("native_video_stop"),&_OS::native_video_stop); ObjectTypeDB::bind_method(_MD("native_video_pause"),&_OS::native_video_pause); diff --git a/core/globals.cpp b/core/globals.cpp index eed37c2308..38e88e43e2 100644 --- a/core/globals.cpp +++ b/core/globals.cpp @@ -1390,11 +1390,11 @@ void Globals::_bind_methods() { ObjectTypeDB::bind_method(_MD("localize_path","path"),&Globals::localize_path); ObjectTypeDB::bind_method(_MD("globalize_path","path"),&Globals::globalize_path); ObjectTypeDB::bind_method(_MD("save"),&Globals::save); - ObjectTypeDB::bind_method(_MD("has_singleton"),&Globals::has_singleton); - ObjectTypeDB::bind_method(_MD("get_singleton"),&Globals::get_singleton_object); - ObjectTypeDB::bind_method(_MD("load_resource_pack"),&Globals::_load_resource_pack); + ObjectTypeDB::bind_method(_MD("has_singleton","name"),&Globals::has_singleton); + ObjectTypeDB::bind_method(_MD("get_singleton","name"),&Globals::get_singleton_object); + ObjectTypeDB::bind_method(_MD("load_resource_pack","pack"),&Globals::_load_resource_pack); - ObjectTypeDB::bind_method(_MD("save_custom"),&Globals::_save_custom_bnd); + ObjectTypeDB::bind_method(_MD("save_custom","file"),&Globals::_save_custom_bnd); } diff --git a/core/io/config_file.cpp b/core/io/config_file.cpp index 75388f514a..26dd862e00 100644 --- a/core/io/config_file.cpp +++ b/core/io/config_file.cpp @@ -736,7 +736,7 @@ void ConfigFile::_bind_methods(){ ObjectTypeDB::bind_method(_MD("has_section_key","section","key"),&ConfigFile::has_section_key); ObjectTypeDB::bind_method(_MD("get_sections"),&ConfigFile::_get_sections); - ObjectTypeDB::bind_method(_MD("get_section_keys"),&ConfigFile::_get_section_keys); + ObjectTypeDB::bind_method(_MD("get_section_keys","section"),&ConfigFile::_get_section_keys); ObjectTypeDB::bind_method(_MD("load:Error","path"),&ConfigFile::load); ObjectTypeDB::bind_method(_MD("save:Error","path"),&ConfigFile::save); diff --git a/core/io/xml_parser.cpp b/core/io/xml_parser.cpp index 1ff458f325..4fb175e639 100644 --- a/core/io/xml_parser.cpp +++ b/core/io/xml_parser.cpp @@ -385,15 +385,15 @@ void XMLParser::_bind_methods() { ObjectTypeDB::bind_method(_MD("get_node_data"),&XMLParser::get_node_data); ObjectTypeDB::bind_method(_MD("get_node_offset"),&XMLParser::get_node_offset); ObjectTypeDB::bind_method(_MD("get_attribute_count"),&XMLParser::get_attribute_count); - ObjectTypeDB::bind_method(_MD("get_attribute_name"),&XMLParser::get_attribute_name); - ObjectTypeDB::bind_method(_MD("get_attribute_value"),(String (XMLParser::*)(int) const) &XMLParser::get_attribute_value); - ObjectTypeDB::bind_method(_MD("has_attribute"),&XMLParser::has_attribute); - ObjectTypeDB::bind_method(_MD("get_named_attribute_value"), (String (XMLParser::*)(const String&) const) &XMLParser::get_attribute_value); - ObjectTypeDB::bind_method(_MD("get_named_attribute_value_safe"), &XMLParser::get_attribute_value_safe); + ObjectTypeDB::bind_method(_MD("get_attribute_name","idx"),&XMLParser::get_attribute_name); + ObjectTypeDB::bind_method(_MD("get_attribute_value","idx"),(String (XMLParser::*)(int) const) &XMLParser::get_attribute_value); + ObjectTypeDB::bind_method(_MD("has_attribute","name"),&XMLParser::has_attribute); + ObjectTypeDB::bind_method(_MD("get_named_attribute_value","name"), (String (XMLParser::*)(const String&) const) &XMLParser::get_attribute_value); + ObjectTypeDB::bind_method(_MD("get_named_attribute_value_safe","name"), &XMLParser::get_attribute_value_safe); ObjectTypeDB::bind_method(_MD("is_empty"),&XMLParser::is_empty); ObjectTypeDB::bind_method(_MD("get_current_line"),&XMLParser::get_current_line); ObjectTypeDB::bind_method(_MD("skip_section"),&XMLParser::skip_section); - ObjectTypeDB::bind_method(_MD("seek"),&XMLParser::seek); + ObjectTypeDB::bind_method(_MD("seek","pos"),&XMLParser::seek); ObjectTypeDB::bind_method(_MD("open","file"),&XMLParser::open); ObjectTypeDB::bind_method(_MD("open_buffer","buffer"),&XMLParser::open_buffer); diff --git a/core/object.cpp b/core/object.cpp index 9fdd11eb2e..773581d41d 100644 --- a/core/object.cpp +++ b/core/object.cpp @@ -1550,7 +1550,7 @@ void Object::_bind_methods() { ObjectTypeDB::bind_method(_MD("get","property"),&Object::_get_bind); ObjectTypeDB::bind_method(_MD("get_property_list"),&Object::_get_property_list_bind); ObjectTypeDB::bind_method(_MD("get_method_list"),&Object::_get_method_list_bind); - ObjectTypeDB::bind_method(_MD("notification","what"),&Object::notification,DEFVAL(false)); + ObjectTypeDB::bind_method(_MD("notification","what","reversed"),&Object::notification,DEFVAL(false)); ObjectTypeDB::bind_method(_MD("get_instance_ID"),&Object::get_instance_ID); ObjectTypeDB::bind_method(_MD("set_script","script:Script"),&Object::set_script); @@ -1615,7 +1615,7 @@ void Object::_bind_methods() { ObjectTypeDB::bind_method(_MD("callv:Variant","method","arg_array"),&Object::callv); - ObjectTypeDB::bind_method(_MD("has_method"),&Object::has_method); + ObjectTypeDB::bind_method(_MD("has_method","method"),&Object::has_method); ObjectTypeDB::bind_method(_MD("get_signal_list"),&Object::_get_signal_list); diff --git a/core/os/input.cpp b/core/os/input.cpp index 15872d02fd..53358fd4f5 100644 --- a/core/os/input.cpp +++ b/core/os/input.cpp @@ -62,8 +62,8 @@ void Input::_bind_methods() { ObjectTypeDB::bind_method(_MD("set_mouse_mode","mode"),&Input::set_mouse_mode); ObjectTypeDB::bind_method(_MD("get_mouse_mode"),&Input::get_mouse_mode); ObjectTypeDB::bind_method(_MD("warp_mouse_pos","to"),&Input::warp_mouse_pos); - ObjectTypeDB::bind_method(_MD("action_press"),&Input::action_press); - ObjectTypeDB::bind_method(_MD("action_release"),&Input::action_release); + ObjectTypeDB::bind_method(_MD("action_press","action"),&Input::action_press); + ObjectTypeDB::bind_method(_MD("action_release","action"),&Input::action_release); ObjectTypeDB::bind_method(_MD("set_custom_mouse_cursor","image:Texture","hotspot"),&Input::set_custom_mouse_cursor,DEFVAL(Vector2())); BIND_CONSTANT( MOUSE_MODE_VISIBLE ); diff --git a/core/resource.cpp b/core/resource.cpp index 6967599f96..13e0f73b80 100644 --- a/core/resource.cpp +++ b/core/resource.cpp @@ -278,7 +278,7 @@ void Resource::_bind_methods() { ObjectTypeDB::bind_method(_MD("set_import_metadata","metadata"),&Resource::set_import_metadata); ObjectTypeDB::bind_method(_MD("get_import_metadata"),&Resource::get_import_metadata); - ObjectTypeDB::bind_method(_MD("duplicate"),&Resource::duplicate,DEFVAL(false)); + ObjectTypeDB::bind_method(_MD("duplicate","subresources"),&Resource::duplicate,DEFVAL(false)); ADD_SIGNAL( MethodInfo("changed") ); ADD_PROPERTY( PropertyInfo(Variant::STRING,"resource/path",PROPERTY_HINT_NONE,"",PROPERTY_USAGE_EDITOR ), _SCS("set_path"),_SCS("get_path")); ADD_PROPERTYNZ( PropertyInfo(Variant::STRING,"resource/name"), _SCS("set_name"),_SCS("get_name")); diff --git a/core/translation.cpp b/core/translation.cpp index 8247cd1201..bab6cde966 100644 --- a/core/translation.cpp +++ b/core/translation.cpp @@ -670,10 +670,10 @@ void TranslationServer::_bind_methods() { ObjectTypeDB::bind_method(_MD("set_locale","locale"),&TranslationServer::set_locale); ObjectTypeDB::bind_method(_MD("get_locale"),&TranslationServer::get_locale); - ObjectTypeDB::bind_method(_MD("translate"),&TranslationServer::translate); + ObjectTypeDB::bind_method(_MD("translate","message"),&TranslationServer::translate); - ObjectTypeDB::bind_method(_MD("add_translation"),&TranslationServer::add_translation); - ObjectTypeDB::bind_method(_MD("remove_translation"),&TranslationServer::remove_translation); + ObjectTypeDB::bind_method(_MD("add_translation","translation:Translation"),&TranslationServer::add_translation); + ObjectTypeDB::bind_method(_MD("remove_translation","translation:Translation"),&TranslationServer::remove_translation); ObjectTypeDB::bind_method(_MD("clear"),&TranslationServer::clear); diff --git a/doc/base/classes.xml b/doc/base/classes.xml index 075f97c68e..a885b99989 100644 --- a/doc/base/classes.xml +++ b/doc/base/classes.xml @@ -525,13 +525,13 @@ Converts the value of a variable to a String. </description> </method> - <method name="str2var:var"> + <method name="str2var:Variant"> <return type="Nil"> </return> <argument index="0" name="string" type="String"> </argument> <description> - Converts the value of a String to a variable. + Converts the value of a String to a Variant. </description> </method> <method name="range"> @@ -573,7 +573,7 @@ <method name="hash"> <return type="int"> </return> - <argument index="0" name="var:var" type="var"> + <argument index="0" name="var:Variant" type="var"> </argument> <description> Hashes the variable passed and returns an integer. @@ -1849,6 +1849,8 @@ </description> </method> <method name="register_text_enter"> + <return type="LineEdit"> + </return> <argument index="0" name="line_edit" type="Object"> </argument> <description> @@ -3724,7 +3726,7 @@ </description> </method> <method name="overlaps_body" qualifiers="const"> - <return type="bool"> + <return type="PhysicsBody2D"> </return> <argument index="0" name="body" type="Object"> </argument> @@ -3733,7 +3735,7 @@ </description> </method> <method name="overlaps_area" qualifiers="const"> - <return type="bool"> + <return type="Area2D"> </return> <argument index="0" name="area" type="Object"> </argument> @@ -3898,6 +3900,14 @@ Get whether this is a shared array instance. </description> </method> + <method name="pop_back"> + <description> + </description> + </method> + <method name="pop_front"> + <description> + </description> + </method> <method name="push_back"> <argument index="0" name="value" type="var"> </argument> @@ -3905,6 +3915,12 @@ Append an element at the end of the array. </description> </method> + <method name="push_front"> + <argument index="0" name="value" type="var"> + </argument> + <description> + </description> + </method> <method name="remove"> <argument index="0" name="pos" type="int"> </argument> @@ -4088,8 +4104,6 @@ </return> <argument index="0" name="sample" type="RID"> </argument> - <argument index="1" name="arg1" type="String"> - </argument> <description> Return the description of an audio sample. Mainly used for organization. </description> @@ -4133,7 +4147,7 @@ <method name="sample_set_data"> <argument index="0" name="sample" type="RID"> </argument> - <argument index="1" name="arg1" type="RawArray"> + <argument index="1" name="data" type="RawArray"> </argument> <description> Set the sample data for a given sample as an array of bytes. The length must be equal to the sample lenght expected in bytes or an error will be produced. @@ -5946,7 +5960,7 @@ </description> </method> <method name="set_zoom"> - <argument index="0" name="arg0" type="Vector2"> + <argument index="0" name="zoom" type="Vector2"> </argument> <description> </description> @@ -5969,6 +5983,18 @@ <description> </description> </method> + <method name="set_enable_follow_smoothing"> + <argument index="0" name="follow_smoothing" type="bool"> + </argument> + <description> + </description> + </method> + <method name="is_follow_smoothing_enabled" qualifiers="const"> + <return type="bool"> + </return> + <description> + </description> + </method> <method name="force_update_scroll"> <description> Force the camera to update scroll immediately. @@ -6061,6 +6087,12 @@ Hide the CanvasItem currently visible. </description> </method> + <method name="set_hidden"> + <argument index="0" name="hidden" type="bool"> + </argument> + <description> + </description> + </method> <method name="update"> <description> Queue the CanvasItem for update. NOTIFICATION_DRAW will be called on idle time to request redraw. @@ -6186,6 +6218,8 @@ </argument> <argument index="1" name="pos" type="Vector2"> </argument> + <argument index="2" name="modulate" type="Color" default="Color(1,1,1,1)"> + </argument> <description> Draw a texture at a given position. </description> @@ -7060,7 +7094,7 @@ <argument index="1" name="shape" type="Shape"> </argument> <description> - Change a shape in the collision body. + Change a shape in the collision body. </description> </method> <method name="set_shape_transform"> @@ -7175,7 +7209,7 @@ </description> <methods> <method name="set_build_mode"> - <argument index="0" name="arg0" type="int"> + <argument index="0" name="build_mode" type="int"> </argument> <description> </description> @@ -7250,7 +7284,7 @@ </description> </method> <method name="set_build_mode"> - <argument index="0" name="arg0" type="int"> + <argument index="0" name="build_mode" type="int"> </argument> <description> Set whether the polygon is to be a [ConvexPolygon2D] ([code]build_mode[/code]=0), or a [ConcavePolygon2D] ([code]build_mode[/code]=1). @@ -7264,7 +7298,7 @@ </description> </method> <method name="set_trigger"> - <argument index="0" name="arg0" type="bool"> + <argument index="0" name="trigger" type="bool"> </argument> <description> Set whether this polygon is a trigger. A trigger polygon detects collisions, but is otherwise unaffected by physics (i.e. colliding objects will not get blocked). @@ -7304,7 +7338,7 @@ </description> <methods> <method name="resource_changed"> - <argument index="0" name="arg0" type="Object"> + <argument index="0" name="resource" type="Object"> </argument> <description> </description> @@ -7734,6 +7768,66 @@ <description> </description> <methods> + <method name="add_point"> + <argument index="0" name="offset" type="float"> + </argument> + <argument index="1" name="color" type="Color"> + </argument> + <description> + </description> + </method> + <method name="remove_point"> + <argument index="0" name="offset" type="int"> + </argument> + <description> + </description> + </method> + <method name="set_offset"> + <argument index="0" name="point" type="int"> + </argument> + <argument index="1" name="offset" type="float"> + </argument> + <description> + </description> + </method> + <method name="get_offset" qualifiers="const"> + <return type="float"> + </return> + <argument index="0" name="point" type="int"> + </argument> + <description> + </description> + </method> + <method name="set_color"> + <argument index="0" name="point" type="int"> + </argument> + <argument index="1" name="color" type="Color"> + </argument> + <description> + </description> + </method> + <method name="get_color" qualifiers="const"> + <return type="Color"> + </return> + <argument index="0" name="point" type="int"> + </argument> + <description> + </description> + </method> + <method name="interpolate"> + <return type="Color"> + </return> + <argument index="0" name="offset" type="float"> + </argument> + <description> + </description> + </method> + <method name="get_point_count" qualifiers="const"> + <return type="int"> + </return> + <description> + </description> + </method> <method name="set_offsets"> <argument index="0" name="offsets" type="RealArray"> </argument> @@ -7904,7 +7998,7 @@ <method name="get_section_keys" qualifiers="const"> <return type="StringArray"> </return> - <argument index="0" name="arg0" type="String"> + <argument index="0" name="section" type="String"> </argument> <description> </description> @@ -8150,6 +8244,18 @@ Move the Control to a new position, relative to the top-left corner of the [i]window[/i] Control, and without changing current anchor mode. (see [method set_margin]). </description> </method> + <method name="set_rotation"> + <argument index="0" name="rotation" type="float"> + </argument> + <description> + </description> + </method> + <method name="set_scale"> + <argument index="0" name="scale" type="Vector2"> + </argument> + <description> + </description> + </method> <method name="get_margin" qualifiers="const"> <return type="float"> </return> @@ -8186,6 +8292,18 @@ Returns the size of the Control, computed from all margins, however the size returned will [b]never be smaller than the minimum size reported by [method get_minimum_size][/b]. This means that even if end position of the Control rectangle is smaller than the begin position, the Control will still display and interact correctly. (see description, [method get_minimum_size], [method set_margin], [method set_anchor]). </description> </method> + <method name="get_rotation" qualifiers="const"> + <return type="float"> + </return> + <description> + </description> + </method> + <method name="get_scale" qualifiers="const"> + <return type="Vector2"> + </return> + <description> + </description> + </method> <method name="get_custom_minimum_size" qualifiers="const"> <return type="Vector2"> </return> @@ -9602,7 +9720,7 @@ This approximation makes straight segments between each point, then subdivides t </description> </method> <method name="set_show_hidden_files"> - <argument index="0" name="arg0" type="bool"> + <argument index="0" name="show" type="bool"> </argument> <description> </description> @@ -10195,6 +10313,12 @@ This approximation makes straight segments between each point, then subdivides t <description> </description> </method> + <method name="get_length" qualifiers="const"> + <return type="float"> + </return> + <description> + </description> + </method> <method name="set_autoplay"> <argument index="0" name="enabled" type="bool"> </argument> @@ -10215,24 +10339,18 @@ This approximation makes straight segments between each point, then subdivides t <description> </description> </method> - <method name="get_channel_volumeidx" qualifiers="const"> + <method name="get_channel_volume" qualifiers="const"> <return type="float"> </return> - <argument index="0" name="arg0" type="int"> + <argument index="0" name="idx" type="int"> </argument> <description> </description> </method> - <method name="get_length" qualifiers="const"> - <return type="float"> - </return> - <description> - </description> - </method> <method name="get_channel_last_note_time" qualifiers="const"> <return type="float"> </return> - <argument index="0" name="arg0" type="int"> + <argument index="0" name="idx" type="int"> </argument> <description> </description> @@ -10619,7 +10737,7 @@ This approximation makes straight segments between each point, then subdivides t </description> </method> <method name="set_show_hidden_files"> - <argument index="0" name="arg0" type="bool"> + <argument index="0" name="show" type="bool"> </argument> <description> </description> @@ -10681,6 +10799,8 @@ This approximation makes straight segments between each point, then subdivides t </theme_item> <theme_item name="folder" type="Texture"> </theme_item> + <theme_item name="reload" type="Texture"> + </theme_item> </theme_items> </class> <class name="FixedMaterial" inherits="Material" category="Core"> @@ -10919,9 +11039,9 @@ This approximation makes straight segments between each point, then subdivides t <method name="get_kerning_pair" qualifiers="const"> <return type="int"> </return> - <argument index="0" name="arg0" type="int"> + <argument index="0" name="char_a" type="int"> </argument> - <argument index="1" name="arg1" type="int"> + <argument index="1" name="char_b" type="int"> </argument> <description> Return a kerning pair as a difference. Kerning pairs are special cases where a typeface advance is determined by the next character. @@ -11032,6 +11152,18 @@ This approximation makes straight segments between each point, then subdivides t Draw character "char" into a canvas item using the font at a given "pos" position, with "modulate" color, and optionally kerning if "next" is apassed. clipping the width. "pos" specifies te baseline, not the top. To draw from the top, [i]ascent[/i] must be added to the Y axis. The width used by the character is returned, making this function useful for drawing strings character by character. </description> </method> + <method name="set_fallback"> + <argument index="0" name="fallback" type="Object"> + </argument> + <description> + </description> + </method> + <method name="get_fallback" qualifiers="const"> + <return type="Object"> + </return> + <description> + </description> + </method> </methods> <constants> </constants> @@ -11089,6 +11221,8 @@ This approximation makes straight segments between each point, then subdivides t </description> <methods> <method name="resume"> + <return type="Variant"> + </return> <argument index="0" name="arg" type="var" default="NULL"> </argument> <description> @@ -11695,7 +11829,7 @@ This approximation makes straight segments between each point, then subdivides t <method name="has_singleton" qualifiers="const"> <return type="bool"> </return> - <argument index="0" name="arg0" type="String"> + <argument index="0" name="name" type="String"> </argument> <description> </description> @@ -11703,7 +11837,7 @@ This approximation makes straight segments between each point, then subdivides t <method name="get_singleton" qualifiers="const"> <return type="Object"> </return> - <argument index="0" name="arg0" type="String"> + <argument index="0" name="name" type="String"> </argument> <description> </description> @@ -11711,7 +11845,7 @@ This approximation makes straight segments between each point, then subdivides t <method name="load_resource_pack"> <return type="bool"> </return> - <argument index="0" name="arg0" type="String"> + <argument index="0" name="pack" type="String"> </argument> <description> </description> @@ -11719,7 +11853,7 @@ This approximation makes straight segments between each point, then subdivides t <method name="save_custom"> <return type="int"> </return> - <argument index="0" name="arg0" type="String"> + <argument index="0" name="file" type="String"> </argument> <description> </description> @@ -12235,7 +12369,7 @@ This approximation makes straight segments between each point, then subdivides t </description> </method> <method name="resource_changed"> - <argument index="0" name="arg0" type="Object"> + <argument index="0" name="resource" type="Object"> </argument> <description> </description> @@ -13369,6 +13503,10 @@ returns:= "username=user&password=pass" <description> </description> </method> + <method name="shrink_x2_and_keep_size"> + <description> + </description> + </method> <method name="set_size_override"> <argument index="0" name="size" type="Vector2"> </argument> @@ -13552,13 +13690,13 @@ returns:= "username=user&password=pass" </description> </method> <method name="action_press"> - <argument index="0" name="arg0" type="String"> + <argument index="0" name="action" type="String"> </argument> <description> </description> </method> <method name="action_release"> - <argument index="0" name="arg0" type="String"> + <argument index="0" name="action" type="String"> </argument> <description> </description> @@ -15038,6 +15176,18 @@ returns:= "username=user&password=pass" <description> </description> </method> + <method name="set_exclude_nodes_from_collision"> + <argument index="0" name="enable" type="bool"> + </argument> + <description> + </description> + </method> + <method name="get_exclude_nodes_from_collision" qualifiers="const"> + <return type="bool"> + </return> + <description> + </description> + </method> </methods> <constants> </constants> @@ -15090,6 +15240,18 @@ returns:= "username=user&password=pass" <description> </description> </method> + <method name="set_exclude_nodes_from_collision"> + <argument index="0" name="enable" type="bool"> + </argument> + <description> + </description> + </method> + <method name="get_exclude_nodes_from_collision" qualifiers="const"> + <return type="bool"> + </return> + <description> + </description> + </method> </methods> <constants> </constants> @@ -15150,6 +15312,8 @@ returns:= "username=user&password=pass" </description> </method> <method name="get_collider" qualifiers="const"> + <return type="Object"> + </return> <description> </description> </method> @@ -15288,6 +15452,8 @@ returns:= "username=user&password=pass" </description> </method> <method name="get_collider" qualifiers="const"> + <return type="Object"> + </return> <description> </description> </method> @@ -15615,7 +15781,7 @@ returns:= "username=user&password=pass" <method name="get_parameter" qualifiers="const"> <return type="float"> </return> - <argument index="0" name="arg0" type="int"> + <argument index="0" name="variable" type="int"> </argument> <description> </description> @@ -15631,7 +15797,7 @@ returns:= "username=user&password=pass" <method name="get_color" qualifiers="const"> <return type="Color"> </return> - <argument index="0" name="arg0" type="int"> + <argument index="0" name="color" type="int"> </argument> <description> </description> @@ -15968,6 +16134,8 @@ returns:= "username=user&password=pass" </constant> <constant name="MODE_MIX" value="2"> </constant> + <constant name="MODE_MASK" value="3"> + </constant> </constants> </class> <class name="LightOccluder2D" inherits="Node2D" category="Core"> @@ -16332,6 +16500,8 @@ returns:= "username=user&password=pass" </description> </method> <method name="base64_to_variant"> + <return type="Variant"> + </return> <argument index="0" name="base64_str" type="String"> </argument> <description> @@ -16920,9 +17090,9 @@ returns:= "username=user&password=pass" </argument> <argument index="1" name="arrays" type="Array"> </argument> - <argument index="2" name="morph_arrays" type="Array"> + <argument index="2" name="morph_arrays" type="Array" default="Array()"> </argument> - <argument index="3" name="arg3" type="bool" default="Array()"> + <argument index="3" name="alphasort" type="bool" default="false"> </argument> <description> Create a new surface ([method get_surface_count] that will become surf_idx for this. @@ -17595,7 +17765,7 @@ returns:= "username=user&password=pass" </description> </method> <method name="set_instance_count"> - <argument index="0" name="arg0" type="int"> + <argument index="0" name="count" type="int"> </argument> <description> Set the amount of instnces that is going to be drawn. Changing this number will erase all the existing instance transform and color data. @@ -17609,9 +17779,9 @@ returns:= "username=user&password=pass" </description> </method> <method name="set_instance_transform"> - <argument index="0" name="arg0" type="int"> + <argument index="0" name="instance" type="int"> </argument> - <argument index="1" name="arg1" type="Transform"> + <argument index="1" name="transform" type="Transform"> </argument> <description> Set the transform for a specific instance. @@ -17620,16 +17790,16 @@ returns:= "username=user&password=pass" <method name="get_instance_transform" qualifiers="const"> <return type="Transform"> </return> - <argument index="0" name="arg0" type="int"> + <argument index="0" name="instance" type="int"> </argument> <description> Return the transform of a specific instance. </description> </method> <method name="set_instance_color"> - <argument index="0" name="arg0" type="int"> + <argument index="0" name="instance" type="int"> </argument> - <argument index="1" name="arg1" type="Color"> + <argument index="1" name="color" type="Color"> </argument> <description> Set the color of a specific instance. @@ -17638,14 +17808,14 @@ returns:= "username=user&password=pass" <method name="get_instance_color" qualifiers="const"> <return type="Color"> </return> - <argument index="0" name="arg0" type="int"> + <argument index="0" name="instance" type="int"> </argument> <description> Get the color of a specific instance. </description> </method> <method name="set_aabb"> - <argument index="0" name="arg0" type="AABB"> + <argument index="0" name="visibility_aabb" type="AABB"> </argument> <description> Set the visibility AABB. If not provided, MultiMesh will not be visible. @@ -18346,8 +18516,11 @@ returns:= "username=user&password=pass" <method name="add_child"> <argument index="0" name="node" type="Node"> </argument> + <argument index="1" name="legible_unique_name" type="bool" default="false"> + </argument> <description> Add a child [Node]. Nodes can have as many children as they want, but every child must have a unique name. Children nodes are automatically deleted when the parent node is deleted, so deleting a whole scene is performed by deleting its topmost node. + The optional boolean argument enforces creating child node with human-readable names, based on the name of node being instanced instead of its type only. </description> </method> <method name="remove_child"> @@ -18489,7 +18662,7 @@ returns:= "username=user&password=pass" <method name="add_to_group"> <argument index="0" name="group" type="String"> </argument> - <argument index="1" name="arg1" type="bool" default="false"> + <argument index="1" name="persistent" type="bool" default="false"> </argument> <description> Add a node to a group. Groups are helpers to name and organize group of nodes, like for example: "Enemies", "Collectables", etc. A [Node] can be in any number of groups. Nodes can be assigned a group at any time, but will not be added to it until they are inside the scene tree (see [method is_inside_scene]). @@ -18940,7 +19113,7 @@ returns:= "username=user&password=pass" </description> </method> <method name="edit_set_pivot"> - <argument index="0" name="arg0" type="Vector2"> + <argument index="0" name="pivot" type="Vector2"> </argument> <description> </description> @@ -18948,7 +19121,7 @@ returns:= "username=user&password=pass" <method name="get_relative_transform" qualifiers="const"> <return type="Matrix32"> </return> - <argument index="0" name="arg0" type="Object"> + <argument index="0" name="parent" type="Object"> </argument> <description> </description> @@ -19417,7 +19590,7 @@ returns:= "username=user&password=pass" </description> </method> <method name="set_icon"> - <argument index="0" name="arg0" type="Image"> + <argument index="0" name="icon" type="Image"> </argument> <description> </description> @@ -19582,7 +19755,7 @@ returns:= "username=user&password=pass" </description> </method> <method name="print_resources_by_type"> - <argument index="0" name="arg0" type="StringArray"> + <argument index="0" name="types" type="StringArray"> </argument> <description> </description> @@ -19590,13 +19763,13 @@ returns:= "username=user&password=pass" <method name="native_video_play"> <return type="int"> </return> - <argument index="0" name="arg0" type="String"> + <argument index="0" name="path" type="String"> </argument> - <argument index="1" name="arg1" type="float"> + <argument index="1" name="volume" type="float"> </argument> - <argument index="2" name="arg2" type="String"> + <argument index="2" name="audio_track" type="String"> </argument> - <argument index="3" name="arg3" type="String"> + <argument index="3" name="subtitle_track" type="String"> </argument> <description> </description> @@ -19823,7 +19996,7 @@ returns:= "username=user&password=pass" <method name="notification"> <argument index="0" name="what" type="int"> </argument> - <argument index="1" name="arg1" type="bool" default="false"> + <argument index="1" name="reversed" type="bool" default="false"> </argument> <description> Notify the object of something. @@ -19961,6 +20134,8 @@ returns:= "username=user&password=pass" </description> </method> <method name="callv"> + <return type="Variant"> + </return> <argument index="0" name="method" type="String"> </argument> <argument index="1" name="arg_array" type="Array"> @@ -19971,7 +20146,7 @@ returns:= "username=user&password=pass" <method name="has_method" qualifiers="const"> <return type="bool"> </return> - <argument index="0" name="arg0" type="String"> + <argument index="0" name="method" type="String"> </argument> <description> </description> @@ -20299,7 +20474,7 @@ returns:= "username=user&password=pass" </description> </method> <method name="select"> - <argument index="0" name="arg0" type="int"> + <argument index="0" name="idx" type="int"> </argument> <description> Select an item by index and make it the current item. @@ -20398,7 +20573,7 @@ returns:= "username=user&password=pass" <method name="flush"> <return type="int"> </return> - <argument index="0" name="arg0" type="bool"> + <argument index="0" name="verbose" type="bool"> </argument> <description> </description> @@ -20514,7 +20689,7 @@ returns:= "username=user&password=pass" <method name="put_var"> <return type="int"> </return> - <argument index="0" name="var" type="var"> + <argument index="0" name="var" type="Variant"> </argument> <description> </description> @@ -20735,7 +20910,7 @@ returns:= "username=user&password=pass" </description> </method> <method name="set_ignore_camera_zoom"> - <argument index="0" name="arg0" type="bool"> + <argument index="0" name="ignore" type="bool"> </argument> <description> </description> @@ -20998,7 +21173,7 @@ returns:= "username=user&password=pass" <method name="get_randomness" qualifiers="const"> <return type="float"> </return> - <argument index="0" name="arg0" type="int"> + <argument index="0" name="variable" type="int"> </argument> <description> Return the randomness for a specific variable of the particle system. Randomness produces small changes from the default each time a particle is emitted. @@ -21055,7 +21230,7 @@ returns:= "username=user&password=pass" </description> </method> <method name="set_emit_timeout"> - <argument index="0" name="arg0" type="float"> + <argument index="0" name="timeout" type="float"> </argument> <description> </description> @@ -21245,6 +21420,8 @@ returns:= "username=user&password=pass" </description> </method> <method name="set_texture"> + <return type="Texture"> + </return> <argument index="0" name="texture" type="Object"> </argument> <description> @@ -21269,6 +21446,8 @@ returns:= "username=user&password=pass" </description> </method> <method name="set_color_ramp"> + <return type="ColorRamp"> + </return> <argument index="0" name="color_ramp" type="Object"> </argument> <description> @@ -22147,6 +22326,8 @@ This method controls whether the position between two cached points is interpola </description> </method> <method name="get_contact_collider_shape_metadata" qualifiers="const"> + <return type="Variant"> + </return> <argument index="0" name="contact_idx" type="int"> </argument> <description> @@ -22561,11 +22742,11 @@ This method controls whether the position between two cached points is interpola </description> </method> <method name="area_set_monitor_callback"> - <argument index="0" name="receiver" type="RID"> + <argument index="0" name="area" type="RID"> </argument> - <argument index="1" name="method" type="Object"> + <argument index="1" name="receiver" type="Object"> </argument> - <argument index="2" name="arg2" type="String"> + <argument index="2" name="method" type="String"> </argument> <description> </description> @@ -22875,9 +23056,9 @@ This method controls whether the position between two cached points is interpola </description> </method> <method name="body_set_one_way_collision_direction"> - <argument index="0" name="normal" type="RID"> + <argument index="0" name="body" type="RID"> </argument> - <argument index="1" name="arg1" type="Vector2"> + <argument index="1" name="normal" type="Vector2"> </argument> <description> </description> @@ -22885,15 +23066,15 @@ This method controls whether the position between two cached points is interpola <method name="body_get_one_way_collision_direction" qualifiers="const"> <return type="Vector2"> </return> - <argument index="0" name="arg0" type="RID"> + <argument index="0" name="body" type="RID"> </argument> <description> </description> </method> <method name="body_set_one_way_collision_max_depth"> - <argument index="0" name="normal" type="RID"> + <argument index="0" name="body" type="RID"> </argument> - <argument index="1" name="arg1" type="float"> + <argument index="1" name="depth" type="float"> </argument> <description> </description> @@ -22901,7 +23082,7 @@ This method controls whether the position between two cached points is interpola <method name="body_get_one_way_collision_max_depth" qualifiers="const"> <return type="float"> </return> - <argument index="0" name="arg0" type="RID"> + <argument index="0" name="body" type="RID"> </argument> <description> </description> @@ -22929,7 +23110,7 @@ This method controls whether the position between two cached points is interpola </argument> <argument index="2" name="method" type="String"> </argument> - <argument index="3" name="arg3" type="var"> + <argument index="3" name="userdata" type="var" default="NULL"> </argument> <description> </description> @@ -23053,7 +23234,7 @@ This method controls whether the position between two cached points is interpola <method name="get_process_info"> <return type="int"> </return> - <argument index="0" name="arg0" type="int"> + <argument index="0" name="process_info" type="int"> </argument> <description> </description> @@ -23092,15 +23273,15 @@ This method controls whether the position between two cached points is interpola </constant> <constant name="AREA_PARAM_PRIORITY" value="7"> </constant> + <constant name="AREA_SPACE_OVERRIDE_DISABLED" value="0"> + This area does not affect gravity/damp. These are generally areas that exist only to detect collisions, and objects entering or exiting them. + </constant> <constant name="AREA_SPACE_OVERRIDE_COMBINE" value="1"> This area adds its gravity/damp values to whatever has been calculated so far. This way, many overlapping areas can combine their physics to make interesting effects. </constant> <constant name="AREA_SPACE_OVERRIDE_COMBINE_REPLACE" value="2"> This area adds its gravity/damp values to whatever has been calculated so far. Then stops taking into account the rest of the areas, even the default one. </constant> - <constant name="AREA_SPACE_OVERRIDE_DISABLED" value="0"> - This area does not affect gravity/damp. These are generally areas that exist only to detect collisions, and objects entering or exiting them. - </constant> <constant name="AREA_SPACE_OVERRIDE_REPLACE" value="3"> This area replaces any gravity/damp, even the default one, and stops taking into account the rest of the areas. </constant> @@ -24078,11 +24259,11 @@ This method controls whether the position between two cached points is interpola </description> </method> <method name="area_set_monitor_callback"> - <argument index="0" name="receiver" type="RID"> + <argument index="0" name="area" type="RID"> </argument> - <argument index="1" name="method" type="Object"> + <argument index="1" name="receiver" type="Object"> </argument> - <argument index="2" name="arg2" type="String"> + <argument index="2" name="method" type="String"> </argument> <description> </description> @@ -24142,8 +24323,6 @@ This method controls whether the position between two cached points is interpola </return> <argument index="0" name="body" type="RID"> </argument> - <argument index="1" name="arg1" type="int"> - </argument> <description> </description> </method> @@ -24688,7 +24867,7 @@ This method controls whether the position between two cached points is interpola <method name="get_process_info"> <return type="int"> </return> - <argument index="0" name="arg0" type="int"> + <argument index="0" name="process_info" type="int"> </argument> <description> </description> @@ -24855,15 +25034,15 @@ This method controls whether the position between two cached points is interpola </constant> <constant name="AREA_PARAM_PRIORITY" value="7"> </constant> + <constant name="AREA_SPACE_OVERRIDE_DISABLED" value="0"> + This area does not affect gravity/damp. These are generally areas that exist only to detect collisions, and objects entering or exiting them. + </constant> <constant name="AREA_SPACE_OVERRIDE_COMBINE" value="1"> This area adds its gravity/damp values to whatever has been calculated so far. This way, many overlapping areas can combine their physics to make interesting effects. </constant> <constant name="AREA_SPACE_OVERRIDE_COMBINE_REPLACE" value="2"> This area adds its gravity/damp values to whatever has been calculated so far. Then stops taking into account the rest of the areas, even the default one. </constant> - <constant name="AREA_SPACE_OVERRIDE_DISABLED" value="0"> - This area does not affect gravity/damp. These are generally areas that exist only to detect collisions, and objects entering or exiting them. - </constant> <constant name="AREA_SPACE_OVERRIDE_REPLACE" value="3"> This area replaces any gravity/damp, even the default one, and stops taking into account the rest of the areas. </constant> @@ -25679,7 +25858,7 @@ This method controls whether the position between two cached points is interpola <method name="set_item_checked"> <argument index="0" name="idx" type="int"> </argument> - <argument index="1" name="arg1" type="bool"> + <argument index="1" name="checked" type="bool"> </argument> <description> Set the checkstate status of the item at index "idx". @@ -26367,12 +26546,6 @@ This method controls whether the position between two cached points is interpola Return value mapped to 0 to 1 (unit) range. </description> </method> - <method name="get_rounded_values" qualifiers="const"> - <return type="bool"> - </return> - <description> - </description> - </method> <method name="set_val"> <argument index="0" name="value" type="float"> </argument> @@ -26420,11 +26593,17 @@ This method controls whether the position between two cached points is interpola </description> </method> <method name="set_rounded_values"> - <argument index="0" name="arg0" type="bool"> + <argument index="0" name="enabled" type="bool"> </argument> <description> </description> </method> + <method name="is_rounded_values" qualifiers="const"> + <return type="bool"> + </return> + <description> + </description> + </method> <method name="set_exp_unit_value"> <argument index="0" name="enabled" type="bool"> </argument> @@ -27073,7 +27252,7 @@ This method controls whether the position between two cached points is interpola <argument index="1" name="capture" type="int" default="9"> </argument> <description> - Compiles and assign the regular expression pattern to use. The limit on the number of capturing groups can be specified or made unlimited if negative. + Compiles and assign the regular expression pattern to use. The limit on the number of capturing groups can be specified or made unlimited if negative. </description> </method> <method name="find" qualifiers="const"> @@ -27224,7 +27403,7 @@ This method controls whether the position between two cached points is interpola <method name="duplicate"> <return type="Object"> </return> - <argument index="0" name="arg0" type="bool" default="false"> + <argument index="0" name="subresources" type="bool" default="false"> </argument> <description> </description> @@ -27413,7 +27592,7 @@ This method controls whether the position between two cached points is interpola <method name="get_dependencies"> <return type="StringArray"> </return> - <argument index="0" name="arg0" type="String"> + <argument index="0" name="path" type="String"> </argument> <description> </description> @@ -27421,7 +27600,7 @@ This method controls whether the position between two cached points is interpola <method name="has"> <return type="bool"> </return> - <argument index="0" name="arg0" type="String"> + <argument index="0" name="path" type="String"> </argument> <description> </description> @@ -27507,7 +27686,7 @@ This method controls whether the position between two cached points is interpola </argument> <argument index="1" name="resource" type="Resource"> </argument> - <argument index="2" name="arg2" type="int" default="0"> + <argument index="2" name="flags" type="int" default="0"> </argument> <description> Save a resource to disk, to a given path. @@ -27602,6 +27781,26 @@ This method controls whether the position between two cached points is interpola <description> </description> </method> + <method name="push_table"> + <argument index="0" name="columns" type="int"> + </argument> + <description> + </description> + </method> + <method name="set_table_column_expand"> + <argument index="0" name="column" type="int"> + </argument> + <argument index="1" name="expand" type="bool"> + </argument> + <argument index="2" name="ratio" type="int"> + </argument> + <description> + </description> + </method> + <method name="push_cell"> + <description> + </description> + </method> <method name="pop"> <description> </description> @@ -27653,7 +27852,7 @@ This method controls whether the position between two cached points is interpola </description> </method> <method name="scroll_to_line"> - <argument index="0" name="arg0" type="int"> + <argument index="0" name="line" type="int"> </argument> <description> </description> @@ -27766,7 +27965,7 @@ This method controls whether the position between two cached points is interpola </constant> <constant name="LIST_DOTS" value="2"> </constant> - <constant name="ITEM_MAIN" value="0"> + <constant name="ITEM_FRAME" value="0"> </constant> <constant name="ITEM_TEXT" value="1"> </constant> @@ -27786,10 +27985,14 @@ This method controls whether the position between two cached points is interpola </constant> <constant name="ITEM_LIST" value="9"> </constant> - <constant name="ITEM_META" value="10"> + <constant name="ITEM_META" value="11"> </constant> </constants> <theme_items> + <theme_item name="table_vseparation" type="int"> + </theme_item> + <theme_item name="table_hseparation" type="int"> + </theme_item> <theme_item name="line_separation" type="int"> </theme_item> <theme_item name="default_color" type="Color"> @@ -29375,7 +29578,7 @@ This method controls whether the position between two cached points is interpola <method name="get_nodes_in_group"> <return type="Array"> </return> - <argument index="0" name="arg0" type="String"> + <argument index="0" name="group" type="String"> </argument> <description> </description> @@ -29980,13 +30183,13 @@ This method controls whether the position between two cached points is interpola <description> </description> </method> - <method name="scalar_const_node_get_value"> + <method name="scalar_const_node_get_value" qualifiers="const"> + <return type="float"> + </return> <argument index="0" name="shader_type" type="int"> </argument> <argument index="1" name="id" type="int"> </argument> - <argument index="2" name="arg2" type="float"> - </argument> <description> </description> </method> @@ -30000,13 +30203,13 @@ This method controls whether the position between two cached points is interpola <description> </description> </method> - <method name="vec_const_node_get_value"> + <method name="vec_const_node_get_value" qualifiers="const"> + <return type="Vector3"> + </return> <argument index="0" name="shader_type" type="int"> </argument> <argument index="1" name="id" type="int"> </argument> - <argument index="2" name="arg2" type="Vector3"> - </argument> <description> </description> </method> @@ -30020,13 +30223,13 @@ This method controls whether the position between two cached points is interpola <description> </description> </method> - <method name="rgb_const_node_get_value"> + <method name="rgb_const_node_get_value" qualifiers="const"> + <return type="Color"> + </return> <argument index="0" name="shader_type" type="int"> </argument> <argument index="1" name="id" type="int"> </argument> - <argument index="2" name="arg2" type="Color"> - </argument> <description> </description> </method> @@ -30040,13 +30243,13 @@ This method controls whether the position between two cached points is interpola <description> </description> </method> - <method name="xform_const_node_get_value"> + <method name="xform_const_node_get_value" qualifiers="const"> + <return type="Transform"> + </return> <argument index="0" name="shader_type" type="int"> </argument> <argument index="1" name="id" type="int"> </argument> - <argument index="2" name="arg2" type="Transform"> - </argument> <description> </description> </method> @@ -30060,13 +30263,13 @@ This method controls whether the position between two cached points is interpola <description> </description> </method> - <method name="texture_node_get_filter_size"> + <method name="texture_node_get_filter_size" qualifiers="const"> + <return type="int"> + </return> <argument index="0" name="shader_type" type="int"> </argument> <argument index="1" name="id" type="int"> </argument> - <argument index="2" name="arg2" type="int"> - </argument> <description> </description> </method> @@ -30080,13 +30283,13 @@ This method controls whether the position between two cached points is interpola <description> </description> </method> - <method name="texture_node_get_filter_strength"> + <method name="texture_node_get_filter_strength" qualifiers="const"> + <return type="float"> + </return> <argument index="0" name="shader_type" type="int"> </argument> <argument index="1" name="id" type="float"> </argument> - <argument index="2" name="arg2" type="float"> - </argument> <description> </description> </method> @@ -30513,6 +30716,8 @@ This method controls whether the position between two cached points is interpola </description> </method> <method name="node_get_state" qualifiers="const"> + <return type="Variant"> + </return> <argument index="0" name="shader_type" type="int"> </argument> <argument index="1" name="id" type="int"> @@ -30775,12 +30980,14 @@ This method controls whether the position between two cached points is interpola <method name="set_shader_param"> <argument index="0" name="param" type="String"> </argument> - <argument index="1" name="value" type="var"> + <argument index="1" name="value" type="Variant"> </argument> <description> </description> </method> <method name="get_shader_param" qualifiers="const"> + <return type="Variant"> + </return> <argument index="0" name="param" type="String"> </argument> <description> @@ -30856,6 +31063,8 @@ This method controls whether the position between two cached points is interpola </description> </method> <method name="collide_and_get_contacts"> + <return type="Variant"> + </return> <argument index="0" name="local_xform" type="Matrix32"> </argument> <argument index="1" name="with_shape" type="Shape2D"> @@ -30868,6 +31077,8 @@ This method controls whether the position between two cached points is interpola </description> </method> <method name="collide_with_motion_and_get_contacts"> + <return type="Variant"> + </return> <argument index="0" name="local_xform" type="Matrix32"> </argument> <argument index="1" name="local_motion" type="Vector2"> @@ -31422,6 +31633,12 @@ This method controls whether the position between two cached points is interpola <description> </description> </method> + <method name="set_hidden"> + <argument index="0" name="hidden" type="bool"> + </argument> + <description> + </description> + </method> <method name="set_notify_local_transform"> <argument index="0" name="enable" type="bool"> </argument> @@ -31710,7 +31927,7 @@ This method controls whether the position between two cached points is interpola </description> </method> <method name="play"> - <argument index="0" name="arg0" type="float" default="0"> + <argument index="0" name="offset" type="float" default="0"> </argument> <description> </description> @@ -32639,6 +32856,178 @@ This method controls whether the position between two cached points is interpola Return a chunk data with the received bytes. The amount of bytes to be received can be requested in the "bytes" argument. If not enough bytes are available, the function will return how many were actually received. This function returns two values, an [Error] code, and a data array. </description> </method> + <method name="get_available_bytes" qualifiers="const"> + <return type="int"> + </return> + <description> + </description> + </method> + <method name="set_big_endian"> + <argument index="0" name="enable" type="bool"> + </argument> + <description> + </description> + </method> + <method name="is_big_endian_enabled" qualifiers="const"> + <return type="bool"> + </return> + <description> + </description> + </method> + <method name="put_8"> + <argument index="0" name="val" type="int"> + </argument> + <description> + </description> + </method> + <method name="put_u8"> + <argument index="0" name="val" type="int"> + </argument> + <description> + </description> + </method> + <method name="put_16"> + <argument index="0" name="val" type="int"> + </argument> + <description> + </description> + </method> + <method name="put_u16"> + <argument index="0" name="val" type="int"> + </argument> + <description> + </description> + </method> + <method name="put_32"> + <argument index="0" name="val" type="int"> + </argument> + <description> + </description> + </method> + <method name="put_u32"> + <argument index="0" name="val" type="int"> + </argument> + <description> + </description> + </method> + <method name="put_64"> + <argument index="0" name="val" type="int"> + </argument> + <description> + </description> + </method> + <method name="put_u64"> + <argument index="0" name="val" type="int"> + </argument> + <description> + </description> + </method> + <method name="put_float"> + <argument index="0" name="val" type="float"> + </argument> + <description> + </description> + </method> + <method name="put_double"> + <argument index="0" name="val" type="float"> + </argument> + <description> + </description> + </method> + <method name="put_utf8_string"> + <argument index="0" name="val" type="String"> + </argument> + <description> + </description> + </method> + <method name="put_var"> + <argument index="0" name="val" type="Variant"> + </argument> + <description> + </description> + </method> + <method name="get_8"> + <return type="int"> + </return> + <description> + </description> + </method> + <method name="get_u8"> + <return type="int"> + </return> + <description> + </description> + </method> + <method name="get_16"> + <return type="int"> + </return> + <description> + </description> + </method> + <method name="get_u16"> + <return type="int"> + </return> + <description> + </description> + </method> + <method name="get_32"> + <return type="int"> + </return> + <description> + </description> + </method> + <method name="get_u32"> + <return type="int"> + </return> + <description> + </description> + </method> + <method name="get_64"> + <return type="int"> + </return> + <description> + </description> + </method> + <method name="get_u64"> + <return type="int"> + </return> + <description> + </description> + </method> + <method name="get_float"> + <return type="float"> + </return> + <description> + </description> + </method> + <method name="get_double"> + <return type="float"> + </return> + <description> + </description> + </method> + <method name="get_string"> + <return type="String"> + </return> + <argument index="0" name="bytes" type="int"> + </argument> + <description> + </description> + </method> + <method name="get_utf8_string"> + <return type="String"> + </return> + <argument index="0" name="bytes" type="int"> + </argument> + <description> + </description> + </method> + <method name="get_var"> + <return type="Variant"> + </return> + <description> + </description> + </method> </methods> <constants> </constants> @@ -32770,7 +33159,7 @@ This method controls whether the position between two cached points is interpola </description> </method> <method name="play"> - <argument index="0" name="arg0" type="float" default="0"> + <argument index="0" name="offset" type="float" default="0"> </argument> <description> </description> @@ -33449,9 +33838,9 @@ This method controls whether the position between two cached points is interpola </description> </method> <method name="draw" qualifiers="const"> - <argument index="0" name="arg0" type="RID"> + <argument index="0" name="canvas_item" type="RID"> </argument> - <argument index="1" name="arg1" type="Rect2"> + <argument index="1" name="rect" type="Rect2"> </argument> <description> </description> @@ -33604,7 +33993,7 @@ This method controls whether the position between two cached points is interpola <method name="get_expand_margin_size" qualifiers="const"> <return type="float"> </return> - <argument index="0" name="arg0" type="int"> + <argument index="0" name="margin" type="int"> </argument> <description> Return the expand margin size (from enum MARGIN_*). Parts of the image below the size of the margin (and in the direction of the margin) will not expand. @@ -33645,7 +34034,7 @@ This method controls whether the position between two cached points is interpola <method name="get_margin_size" qualifiers="const"> <return type="float"> </return> - <argument index="0" name="arg0" type="int"> + <argument index="0" name="margin" type="int"> </argument> <description> </description> @@ -33661,7 +34050,7 @@ This method controls whether the position between two cached points is interpola <method name="get_expand_margin_size" qualifiers="const"> <return type="float"> </return> - <argument index="0" name="arg0" type="int"> + <argument index="0" name="margin" type="int"> </argument> <description> </description> @@ -34132,6 +34521,14 @@ This method controls whether the position between two cached points is interpola </theme_item> <theme_item name="font_color_fg" type="Color"> </theme_item> + <theme_item name="increment_hilite" type="Texture"> + </theme_item> + <theme_item name="decrement_hilite" type="Texture"> + </theme_item> + <theme_item name="increment" type="Texture"> + </theme_item> + <theme_item name="decrement" type="Texture"> + </theme_item> <theme_item name="font" type="Font"> </theme_item> <theme_item name="tab_fg" type="StyleBox"> @@ -34195,7 +34592,7 @@ This method controls whether the position between two cached points is interpola <method name="get_line" qualifiers="const"> <return type="String"> </return> - <argument index="0" name="arg0" type="int"> + <argument index="0" name="line" type="int"> </argument> <description> Return the text of a specific line. @@ -34204,7 +34601,7 @@ This method controls whether the position between two cached points is interpola <method name="cursor_set_column"> <argument index="0" name="column" type="int"> </argument> - <argument index="1" name="arg1" type="bool"> + <argument index="1" name="adjust_viewport" type="bool" default="false"> </argument> <description> </description> @@ -34212,7 +34609,7 @@ This method controls whether the position between two cached points is interpola <method name="cursor_set_line"> <argument index="0" name="line" type="int"> </argument> - <argument index="1" name="arg1" type="bool"> + <argument index="1" name="adjust_viewport" type="bool" default="false"> </argument> <description> </description> @@ -34554,7 +34951,7 @@ This method controls whether the position between two cached points is interpola </argument> <argument index="2" name="modulate" type="Color" default="Color(1,1,1,1)"> </argument> - <argument index="3" name="arg3" type="bool" default="false"> + <argument index="3" name="transpose" type="bool" default="false"> </argument> <description> </description> @@ -34568,7 +34965,7 @@ This method controls whether the position between two cached points is interpola </argument> <argument index="3" name="modulate" type="Color" default="Color(1,1,1,1)"> </argument> - <argument index="4" name="arg4" type="bool" default="false"> + <argument index="4" name="transpose" type="bool" default="false"> </argument> <description> </description> @@ -34582,7 +34979,7 @@ This method controls whether the position between two cached points is interpola </argument> <argument index="3" name="modulate" type="Color" default="Color(1,1,1,1)"> </argument> - <argument index="4" name="arg4" type="bool" default="false"> + <argument index="4" name="transpose" type="bool" default="false"> </argument> <description> </description> @@ -34657,7 +35054,7 @@ This method controls whether the position between two cached points is interpola <description> </description> </method> - <method name="set_scale"> + <method name="set_texture_scale"> <argument index="0" name="scale" type="Vector2"> </argument> <description> @@ -34705,7 +35102,7 @@ This method controls whether the position between two cached points is interpola <description> </description> </method> - <method name="get_scale" qualifiers="const"> + <method name="get_texture_scale" qualifiers="const"> <return type="Vector2"> </return> <description> @@ -34927,7 +35324,7 @@ This method controls whether the position between two cached points is interpola <method name="get_icon_list" qualifiers="const"> <return type="StringArray"> </return> - <argument index="0" name="arg0" type="String"> + <argument index="0" name="type" type="String"> </argument> <description> </description> @@ -34973,7 +35370,7 @@ This method controls whether the position between two cached points is interpola <method name="get_stylebox_list" qualifiers="const"> <return type="StringArray"> </return> - <argument index="0" name="arg0" type="String"> + <argument index="0" name="type" type="String"> </argument> <description> </description> @@ -35019,7 +35416,7 @@ This method controls whether the position between two cached points is interpola <method name="get_font_list" qualifiers="const"> <return type="StringArray"> </return> - <argument index="0" name="arg0" type="String"> + <argument index="0" name="type" type="String"> </argument> <description> </description> @@ -35065,7 +35462,7 @@ This method controls whether the position between two cached points is interpola <method name="get_color_list" qualifiers="const"> <return type="StringArray"> </return> - <argument index="0" name="arg0" type="String"> + <argument index="0" name="type" type="String"> </argument> <description> </description> @@ -35111,7 +35508,7 @@ This method controls whether the position between two cached points is interpola <method name="get_constant_list" qualifiers="const"> <return type="StringArray"> </return> - <argument index="0" name="arg0" type="String"> + <argument index="0" name="type" type="String"> </argument> <description> </description> @@ -35131,7 +35528,7 @@ This method controls whether the position between two cached points is interpola <method name="get_type_list" qualifiers="const"> <return type="StringArray"> </return> - <argument index="0" name="arg0" type="String"> + <argument index="0" name="type" type="String"> </argument> <description> </description> @@ -35177,6 +35574,16 @@ This method controls whether the position between two cached points is interpola </description> </method> <method name="wait_to_finish"> + <return type="Variant"> + </return> + <description> + </description> + </method> + <method name="set_name"> + <return type="Error"> + </return> + <argument index="0" name="name" type="String"> + </argument> <description> </description> </method> @@ -35416,6 +35823,18 @@ This method controls whether the position between two cached points is interpola Return the collision bounce parameter. </description> </method> + <method name="set_occluder_light_mask"> + <argument index="0" name="mask" type="int"> + </argument> + <description> + </description> + </method> + <method name="get_occluder_light_mask" qualifiers="const"> + <return type="int"> + </return> + <description> + </description> + </method> <method name="set_cell"> <argument index="0" name="x" type="int"> </argument> @@ -36281,19 +36700,19 @@ This method controls whether the position between two cached points is interpola <method name="translate" qualifiers="const"> <return type="String"> </return> - <argument index="0" name="arg0" type="String"> + <argument index="0" name="message" type="String"> </argument> <description> </description> </method> <method name="add_translation"> - <argument index="0" name="arg0" type="Object"> + <argument index="0" name="translation" type="Translation"> </argument> <description> </description> </method> <method name="remove_translation"> - <argument index="0" name="arg0" type="Object"> + <argument index="0" name="translation" type="Translation"> </argument> <description> </description> @@ -36331,17 +36750,17 @@ This method controls whether the position between two cached points is interpola </description> </method> <method name="set_column_min_width"> - <argument index="0" name="arg0" type="int"> + <argument index="0" name="column" type="int"> </argument> - <argument index="1" name="arg1" type="int"> + <argument index="1" name="min_width" type="int"> </argument> <description> </description> </method> <method name="set_column_expand"> - <argument index="0" name="arg0" type="int"> + <argument index="0" name="column" type="int"> </argument> - <argument index="1" name="arg1" type="bool"> + <argument index="1" name="expand" type="bool"> </argument> <description> </description> @@ -36349,13 +36768,13 @@ This method controls whether the position between two cached points is interpola <method name="get_column_width" qualifiers="const"> <return type="int"> </return> - <argument index="0" name="arg0" type="int"> + <argument index="0" name="column" type="int"> </argument> <description> </description> </method> <method name="set_hide_root"> - <argument index="0" name="arg0" type="bool"> + <argument index="0" name="enable" type="bool"> </argument> <description> </description> @@ -36815,6 +37234,8 @@ This method controls whether the position between two cached points is interpola </description> </method> <method name="remove_child"> + <return type="TreeItem"> + </return> <argument index="0" name="child" type="Object"> </argument> <description> @@ -36913,7 +37334,7 @@ This method controls whether the position between two cached points is interpola </argument> <argument index="1" name="button" type="Texture"> </argument> - <argument index="2" name="arg2" type="int"> + <argument index="2" name="button_idx" type="int"> </argument> <description> </description> @@ -37437,7 +37858,7 @@ This method controls whether the position between two cached points is interpola </argument> <argument index="1" name="property" type="String"> </argument> - <argument index="2" name="value" type="var"> + <argument index="2" name="value" type="Variant"> </argument> <description> </description> @@ -37447,7 +37868,7 @@ This method controls whether the position between two cached points is interpola </argument> <argument index="1" name="property" type="String"> </argument> - <argument index="2" name="value" type="var"> + <argument index="2" name="value" type="Variant"> </argument> <description> </description> @@ -38475,6 +38896,12 @@ This method controls whether the position between two cached points is interpola <description> </description> </method> + <method name="get_video_texutre"> + <return type="Texture"> + </return> + <description> + </description> + </method> </methods> <constants> </constants> @@ -38805,7 +39232,7 @@ This method controls whether the position between two cached points is interpola </description> </method> <method name="set_render_target_to_screen_rect"> - <argument index="0" name="arg0" type="Rect2"> + <argument index="0" name="rect" type="Rect2"> </argument> <description> </description> @@ -40277,6 +40704,14 @@ This method controls whether the position between two cached points is interpola <description> </description> </method> + <method name="canvas_item_set_z"> + <argument index="0" name="arg0" type="RID"> + </argument> + <argument index="1" name="arg1" type="int"> + </argument> + <description> + </description> + </method> <method name="canvas_item_add_line"> <argument index="0" name="arg0" type="RID"> </argument> @@ -40722,6 +41157,8 @@ This method controls whether the position between two cached points is interpola </description> <methods> <method name="get_ref" qualifiers="const"> + <return type="Object"> + </return> <description> </description> </method> @@ -40933,7 +41370,7 @@ This method controls whether the position between two cached points is interpola <method name="get_attribute_name" qualifiers="const"> <return type="String"> </return> - <argument index="0" name="arg0" type="int"> + <argument index="0" name="idx" type="int"> </argument> <description> </description> @@ -40941,7 +41378,7 @@ This method controls whether the position between two cached points is interpola <method name="get_attribute_value" qualifiers="const"> <return type="String"> </return> - <argument index="0" name="arg0" type="int"> + <argument index="0" name="idx" type="int"> </argument> <description> </description> @@ -40949,7 +41386,7 @@ This method controls whether the position between two cached points is interpola <method name="has_attribute" qualifiers="const"> <return type="bool"> </return> - <argument index="0" name="arg0" type="String"> + <argument index="0" name="name" type="String"> </argument> <description> </description> @@ -40957,7 +41394,7 @@ This method controls whether the position between two cached points is interpola <method name="get_named_attribute_value" qualifiers="const"> <return type="String"> </return> - <argument index="0" name="arg0" type="String"> + <argument index="0" name="name" type="String"> </argument> <description> </description> @@ -40965,7 +41402,7 @@ This method controls whether the position between two cached points is interpola <method name="get_named_attribute_value_safe" qualifiers="const"> <return type="String"> </return> - <argument index="0" name="arg0" type="String"> + <argument index="0" name="name" type="String"> </argument> <description> </description> @@ -40989,7 +41426,7 @@ This method controls whether the position between two cached points is interpola <method name="seek"> <return type="int"> </return> - <argument index="0" name="arg0" type="int"> + <argument index="0" name="pos" type="int"> </argument> <description> </description> diff --git a/modules/gridmap/grid_map.cpp b/modules/gridmap/grid_map.cpp index ad7c392cd0..423c272ee7 100644 --- a/modules/gridmap/grid_map.cpp +++ b/modules/gridmap/grid_map.cpp @@ -1096,7 +1096,7 @@ void GridMap::_bind_methods() { // ObjectTypeDB::bind_method(_MD("_recreate_octants"),&GridMap::_recreate_octants); ObjectTypeDB::bind_method(_MD("_update_dirty_map_callback"),&GridMap::_update_dirty_map_callback); - ObjectTypeDB::bind_method(_MD("resource_changed"),&GridMap::resource_changed); + ObjectTypeDB::bind_method(_MD("resource_changed","resource"),&GridMap::resource_changed); ObjectTypeDB::bind_method(_MD("set_center_x","enable"),&GridMap::set_center_x); ObjectTypeDB::bind_method(_MD("get_center_x"),&GridMap::get_center_x); diff --git a/platform/javascript/audio_server_javascript.cpp b/platform/javascript/audio_server_javascript.cpp index a2c6740eaf..fbd5d2e1c0 100644 --- a/platform/javascript/audio_server_javascript.cpp +++ b/platform/javascript/audio_server_javascript.cpp @@ -33,7 +33,7 @@ void AudioServerJavascript::sample_set_description(RID p_sample, const String& p } -String AudioServerJavascript::sample_get_description(RID p_sample, const String& p_description) const{ +String AudioServerJavascript::sample_get_description(RID p_sample) const{ return String(); } diff --git a/platform/javascript/audio_server_javascript.h b/platform/javascript/audio_server_javascript.h index 450237d324..1dc90c48ee 100644 --- a/platform/javascript/audio_server_javascript.h +++ b/platform/javascript/audio_server_javascript.h @@ -95,7 +95,7 @@ public: virtual RID sample_create(SampleFormat p_format, bool p_stereo, int p_length); virtual void sample_set_description(RID p_sample, const String& p_description); - virtual String sample_get_description(RID p_sample, const String& p_description) const; + virtual String sample_get_description(RID p_sample) const; virtual SampleFormat sample_get_format(RID p_sample) const; virtual bool sample_is_stereo(RID p_sample) const; diff --git a/scene/2d/camera_2d.cpp b/scene/2d/camera_2d.cpp index b7b99f935a..d1cc8bbcc4 100644 --- a/scene/2d/camera_2d.cpp +++ b/scene/2d/camera_2d.cpp @@ -503,7 +503,7 @@ void Camera2D::_bind_methods() { ObjectTypeDB::bind_method(_MD("get_camera_pos"),&Camera2D::get_camera_pos); ObjectTypeDB::bind_method(_MD("get_camera_screen_center"),&Camera2D::get_camera_screen_center); - ObjectTypeDB::bind_method(_MD("set_zoom"),&Camera2D::set_zoom); + ObjectTypeDB::bind_method(_MD("set_zoom","zoom"),&Camera2D::set_zoom); ObjectTypeDB::bind_method(_MD("get_zoom"),&Camera2D::get_zoom); diff --git a/scene/2d/canvas_item.cpp b/scene/2d/canvas_item.cpp index 275e4d0304..7df6864a65 100644 --- a/scene/2d/canvas_item.cpp +++ b/scene/2d/canvas_item.cpp @@ -1080,7 +1080,7 @@ void CanvasItem::_bind_methods() { ObjectTypeDB::bind_method(_MD("draw_line","from","to","color","width"),&CanvasItem::draw_line,DEFVAL(1.0)); ObjectTypeDB::bind_method(_MD("draw_rect","rect","color"),&CanvasItem::draw_rect); ObjectTypeDB::bind_method(_MD("draw_circle","pos","radius","color"),&CanvasItem::draw_circle); - ObjectTypeDB::bind_method(_MD("draw_texture","texture:Texture","pos"),&CanvasItem::draw_texture); + ObjectTypeDB::bind_method(_MD("draw_texture","texture:Texture","pos","modulate"),&CanvasItem::draw_texture,DEFVAL(Color(1,1,1,1))); ObjectTypeDB::bind_method(_MD("draw_texture_rect","texture:Texture","rect","tile","modulate","transpose"),&CanvasItem::draw_texture_rect,DEFVAL(Color(1,1,1)),DEFVAL(false)); ObjectTypeDB::bind_method(_MD("draw_texture_rect_region","texture:Texture","rect","src_rect","modulate","transpose"),&CanvasItem::draw_texture_rect_region,DEFVAL(Color(1,1,1)),DEFVAL(false)); ObjectTypeDB::bind_method(_MD("draw_style_box","style_box:StyleBox","rect"),&CanvasItem::draw_style_box); diff --git a/scene/2d/collision_polygon_2d.cpp b/scene/2d/collision_polygon_2d.cpp index 616d3da7c9..354d54b69f 100644 --- a/scene/2d/collision_polygon_2d.cpp +++ b/scene/2d/collision_polygon_2d.cpp @@ -257,10 +257,10 @@ void CollisionPolygon2D::_bind_methods() { ObjectTypeDB::bind_method(_MD("set_polygon","polygon"),&CollisionPolygon2D::set_polygon); ObjectTypeDB::bind_method(_MD("get_polygon"),&CollisionPolygon2D::get_polygon); - ObjectTypeDB::bind_method(_MD("set_build_mode"),&CollisionPolygon2D::set_build_mode); + ObjectTypeDB::bind_method(_MD("set_build_mode","build_mode"),&CollisionPolygon2D::set_build_mode); ObjectTypeDB::bind_method(_MD("get_build_mode"),&CollisionPolygon2D::get_build_mode); - ObjectTypeDB::bind_method(_MD("set_trigger"),&CollisionPolygon2D::set_trigger); + ObjectTypeDB::bind_method(_MD("set_trigger","trigger"),&CollisionPolygon2D::set_trigger); ObjectTypeDB::bind_method(_MD("is_trigger"),&CollisionPolygon2D::is_trigger); ObjectTypeDB::bind_method(_MD("_set_shape_range","shape_range"),&CollisionPolygon2D::_set_shape_range); diff --git a/scene/2d/node_2d.cpp b/scene/2d/node_2d.cpp index 52b112f090..975827bc7e 100644 --- a/scene/2d/node_2d.cpp +++ b/scene/2d/node_2d.cpp @@ -394,9 +394,9 @@ void Node2D::_bind_methods() { ObjectTypeDB::bind_method(_MD("set_z_as_relative","enable"),&Node2D::set_z_as_relative); ObjectTypeDB::bind_method(_MD("is_z_relative"),&Node2D::is_z_relative); - ObjectTypeDB::bind_method(_MD("edit_set_pivot"),&Node2D::edit_set_pivot); + ObjectTypeDB::bind_method(_MD("edit_set_pivot","pivot"),&Node2D::edit_set_pivot); - ObjectTypeDB::bind_method(_MD("get_relative_transform"),&Node2D::get_relative_transform); + ObjectTypeDB::bind_method(_MD("get_relative_transform","parent"),&Node2D::get_relative_transform); ADD_PROPERTYNZ(PropertyInfo(Variant::VECTOR2,"transform/pos"),_SCS("set_pos"),_SCS("get_pos")); ADD_PROPERTYNZ(PropertyInfo(Variant::REAL,"transform/rot",PROPERTY_HINT_RANGE,"-1440,1440,0.1"),_SCS("_set_rotd"),_SCS("_get_rotd")); diff --git a/scene/2d/parallax_background.cpp b/scene/2d/parallax_background.cpp index 8bb4eb55ba..fc38a55cdf 100644 --- a/scene/2d/parallax_background.cpp +++ b/scene/2d/parallax_background.cpp @@ -193,7 +193,7 @@ void ParallaxBackground::_bind_methods() { ObjectTypeDB::bind_method(_MD("get_limit_begin"),&ParallaxBackground::get_limit_begin); ObjectTypeDB::bind_method(_MD("set_limit_end","ofs"),&ParallaxBackground::set_limit_end); ObjectTypeDB::bind_method(_MD("get_limit_end"),&ParallaxBackground::get_limit_end); - ObjectTypeDB::bind_method(_MD("set_ignore_camera_zoom"), &ParallaxBackground::set_ignore_camera_zoom); + ObjectTypeDB::bind_method(_MD("set_ignore_camera_zoom","ignore"), &ParallaxBackground::set_ignore_camera_zoom); ObjectTypeDB::bind_method(_MD("is_ignore_camera_zoom"), &ParallaxBackground::is_ignore_camera_zoom); diff --git a/scene/3d/body_shape.cpp b/scene/3d/body_shape.cpp index b54cbfe0f9..49f95550c9 100644 --- a/scene/3d/body_shape.cpp +++ b/scene/3d/body_shape.cpp @@ -402,7 +402,7 @@ int CollisionShape::_get_update_shape_index() const{ void CollisionShape::_bind_methods() { //not sure if this should do anything - ObjectTypeDB::bind_method(_MD("resource_changed"),&CollisionShape::resource_changed); + ObjectTypeDB::bind_method(_MD("resource_changed","resource"),&CollisionShape::resource_changed); ObjectTypeDB::bind_method(_MD("set_shape","shape"),&CollisionShape::set_shape); ObjectTypeDB::bind_method(_MD("get_shape"),&CollisionShape::get_shape); ObjectTypeDB::bind_method(_MD("_add_to_collision_object"),&CollisionShape::_add_to_collision_object); diff --git a/scene/3d/collision_polygon.cpp b/scene/3d/collision_polygon.cpp index bb0a1fca12..3b14e1d767 100644 --- a/scene/3d/collision_polygon.cpp +++ b/scene/3d/collision_polygon.cpp @@ -236,7 +236,7 @@ void CollisionPolygon::_bind_methods() { ObjectTypeDB::bind_method(_MD("_add_to_collision_object"),&CollisionPolygon::_add_to_collision_object); - ObjectTypeDB::bind_method(_MD("set_build_mode"),&CollisionPolygon::set_build_mode); + ObjectTypeDB::bind_method(_MD("set_build_mode","build_mode"),&CollisionPolygon::set_build_mode); ObjectTypeDB::bind_method(_MD("get_build_mode"),&CollisionPolygon::get_build_mode); ObjectTypeDB::bind_method(_MD("set_depth","depth"),&CollisionPolygon::set_depth); diff --git a/scene/3d/light.cpp b/scene/3d/light.cpp index 9f9c87b675..38fff2089c 100644 --- a/scene/3d/light.cpp +++ b/scene/3d/light.cpp @@ -487,9 +487,9 @@ bool Light::is_editor_only() const{ void Light::_bind_methods() { ObjectTypeDB::bind_method(_MD("set_parameter","variable","value"), &Light::set_parameter ); - ObjectTypeDB::bind_method(_MD("get_parameter"), &Light::get_parameter ); + ObjectTypeDB::bind_method(_MD("get_parameter","variable"), &Light::get_parameter ); ObjectTypeDB::bind_method(_MD("set_color","color","value"), &Light::set_color ); - ObjectTypeDB::bind_method(_MD("get_color"), &Light::get_color ); + ObjectTypeDB::bind_method(_MD("get_color","color"), &Light::get_color ); ObjectTypeDB::bind_method(_MD("set_project_shadows","enable"), &Light::set_project_shadows ); ObjectTypeDB::bind_method(_MD("has_project_shadows"), &Light::has_project_shadows ); ObjectTypeDB::bind_method(_MD("set_projector","projector:Texture"), &Light::set_projector ); diff --git a/scene/3d/particles.cpp b/scene/3d/particles.cpp index 6868646c48..e06f0288d3 100644 --- a/scene/3d/particles.cpp +++ b/scene/3d/particles.cpp @@ -422,14 +422,14 @@ void Particles::_bind_methods() { ObjectTypeDB::bind_method(_MD("set_variable","variable","value"),&Particles::set_variable); ObjectTypeDB::bind_method(_MD("get_variable","variable"),&Particles::get_variable); ObjectTypeDB::bind_method(_MD("set_randomness","variable","randomness"),&Particles::set_randomness); - ObjectTypeDB::bind_method(_MD("get_randomness"),&Particles::get_randomness); + ObjectTypeDB::bind_method(_MD("get_randomness","variable"),&Particles::get_randomness); ObjectTypeDB::bind_method(_MD("set_color_phase_pos","phase","pos"),&Particles::set_color_phase_pos); ObjectTypeDB::bind_method(_MD("get_color_phase_pos","phase"),&Particles::get_color_phase_pos); ObjectTypeDB::bind_method(_MD("set_color_phase_color","phase","color"),&Particles::set_color_phase_color); ObjectTypeDB::bind_method(_MD("get_color_phase_color","phase"),&Particles::get_color_phase_color); ObjectTypeDB::bind_method(_MD("set_material","material:Material"),&Particles::set_material); ObjectTypeDB::bind_method(_MD("get_material:Material"),&Particles::get_material); - ObjectTypeDB::bind_method(_MD("set_emit_timeout"),&Particles::set_emit_timeout); + ObjectTypeDB::bind_method(_MD("set_emit_timeout","timeout"),&Particles::set_emit_timeout); ObjectTypeDB::bind_method(_MD("get_emit_timeout"),&Particles::get_emit_timeout); ObjectTypeDB::bind_method(_MD("set_height_from_velocity","enable"),&Particles::set_height_from_velocity); ObjectTypeDB::bind_method(_MD("has_height_from_velocity"),&Particles::has_height_from_velocity); diff --git a/scene/3d/spatial_stream_player.cpp b/scene/3d/spatial_stream_player.cpp index 7ed2335fcb..7f9b2a343e 100644 --- a/scene/3d/spatial_stream_player.cpp +++ b/scene/3d/spatial_stream_player.cpp @@ -332,7 +332,7 @@ void SpatialStreamPlayer::_bind_methods() { ObjectTypeDB::bind_method(_MD("set_stream","stream:Stream"),&SpatialStreamPlayer::set_stream); ObjectTypeDB::bind_method(_MD("get_stream:Stream"),&SpatialStreamPlayer::get_stream); - ObjectTypeDB::bind_method(_MD("play"),&SpatialStreamPlayer::play,DEFVAL(0)); + ObjectTypeDB::bind_method(_MD("play","offset"),&SpatialStreamPlayer::play,DEFVAL(0)); ObjectTypeDB::bind_method(_MD("stop"),&SpatialStreamPlayer::stop); ObjectTypeDB::bind_method(_MD("is_playing"),&SpatialStreamPlayer::is_playing); diff --git a/scene/audio/event_player.cpp b/scene/audio/event_player.cpp index 1bd692431d..11f2c7d5cd 100644 --- a/scene/audio/event_player.cpp +++ b/scene/audio/event_player.cpp @@ -312,16 +312,14 @@ void EventPlayer::_bind_methods() { ObjectTypeDB::bind_method(_MD("get_pos"),&EventPlayer::get_pos); ObjectTypeDB::bind_method(_MD("seek_pos","time"),&EventPlayer::seek_pos); + ObjectTypeDB::bind_method(_MD("get_length"),&EventPlayer::get_length); + ObjectTypeDB::bind_method(_MD("set_autoplay","enabled"),&EventPlayer::set_autoplay); ObjectTypeDB::bind_method(_MD("has_autoplay"),&EventPlayer::has_autoplay); ObjectTypeDB::bind_method(_MD("set_channel_volume","idx","channel_volume"),&EventPlayer::set_channel_volume); - ObjectTypeDB::bind_method(_MD("get_channel_volume""idx"),&EventPlayer::get_channel_volume); - - ObjectTypeDB::bind_method(_MD("get_length"),&EventPlayer::get_length); - - - ObjectTypeDB::bind_method(_MD("get_channel_last_note_time"),&EventPlayer::get_channel_last_note_time); + ObjectTypeDB::bind_method(_MD("get_channel_volume","idx"),&EventPlayer::get_channel_volume); + ObjectTypeDB::bind_method(_MD("get_channel_last_note_time","idx"),&EventPlayer::get_channel_last_note_time); ObjectTypeDB::bind_method(_MD("_set_play","play"),&EventPlayer::_set_play); ObjectTypeDB::bind_method(_MD("_get_play"),&EventPlayer::_get_play); diff --git a/scene/audio/stream_player.cpp b/scene/audio/stream_player.cpp index d08fdd0c76..c621d1cb47 100644 --- a/scene/audio/stream_player.cpp +++ b/scene/audio/stream_player.cpp @@ -333,7 +333,7 @@ void StreamPlayer::_bind_methods() { ObjectTypeDB::bind_method(_MD("set_stream","stream:Stream"),&StreamPlayer::set_stream); ObjectTypeDB::bind_method(_MD("get_stream:Stream"),&StreamPlayer::get_stream); - ObjectTypeDB::bind_method(_MD("play"),&StreamPlayer::play,DEFVAL(0)); + ObjectTypeDB::bind_method(_MD("play","offset"),&StreamPlayer::play,DEFVAL(0)); ObjectTypeDB::bind_method(_MD("stop"),&StreamPlayer::stop); ObjectTypeDB::bind_method(_MD("is_playing"),&StreamPlayer::is_playing); diff --git a/scene/gui/file_dialog.cpp b/scene/gui/file_dialog.cpp index 9179d3a4e1..ad30295e60 100644 --- a/scene/gui/file_dialog.cpp +++ b/scene/gui/file_dialog.cpp @@ -650,7 +650,7 @@ void FileDialog::_bind_methods() { ObjectTypeDB::bind_method(_MD("get_vbox:VBoxContainer"),&FileDialog::get_vbox); ObjectTypeDB::bind_method(_MD("set_access","access"),&FileDialog::set_access); ObjectTypeDB::bind_method(_MD("get_access"),&FileDialog::get_access); - ObjectTypeDB::bind_method(_MD("set_show_hidden_files"),&FileDialog::set_show_hidden_files); + ObjectTypeDB::bind_method(_MD("set_show_hidden_files","show"),&FileDialog::set_show_hidden_files); ObjectTypeDB::bind_method(_MD("is_showing_hidden_files"),&FileDialog::is_showing_hidden_files); ObjectTypeDB::bind_method(_MD("_select_drive"),&FileDialog::_select_drive); ObjectTypeDB::bind_method(_MD("_make_dir"),&FileDialog::_make_dir); diff --git a/scene/gui/option_button.cpp b/scene/gui/option_button.cpp index 3cc5acc1a6..540df323b6 100644 --- a/scene/gui/option_button.cpp +++ b/scene/gui/option_button.cpp @@ -304,7 +304,7 @@ void OptionButton::_bind_methods() { ObjectTypeDB::bind_method(_MD("get_item_count"),&OptionButton::get_item_count); ObjectTypeDB::bind_method(_MD("add_separator"),&OptionButton::add_separator); ObjectTypeDB::bind_method(_MD("clear"),&OptionButton::clear); - ObjectTypeDB::bind_method(_MD("select"),&OptionButton::select); + ObjectTypeDB::bind_method(_MD("select","idx"),&OptionButton::select); ObjectTypeDB::bind_method(_MD("get_selected"),&OptionButton::get_selected); ObjectTypeDB::bind_method(_MD("get_selected_ID"),&OptionButton::get_selected_ID); ObjectTypeDB::bind_method(_MD("get_selected_metadata"),&OptionButton::get_selected_metadata); diff --git a/scene/gui/popup_menu.cpp b/scene/gui/popup_menu.cpp index 9dc03272b2..c250ca34c1 100644 --- a/scene/gui/popup_menu.cpp +++ b/scene/gui/popup_menu.cpp @@ -898,7 +898,7 @@ void PopupMenu::_bind_methods() { ObjectTypeDB::bind_method(_MD("set_item_icon","idx","icon"),&PopupMenu::set_item_icon); ObjectTypeDB::bind_method(_MD("set_item_accelerator","idx","accel"),&PopupMenu::set_item_accelerator); ObjectTypeDB::bind_method(_MD("set_item_metadata","idx","metadata"),&PopupMenu::set_item_metadata); - ObjectTypeDB::bind_method(_MD("set_item_checked","idx"),&PopupMenu::set_item_checked); + ObjectTypeDB::bind_method(_MD("set_item_checked","idx","checked"),&PopupMenu::set_item_checked); ObjectTypeDB::bind_method(_MD("set_item_disabled","idx","disabled"),&PopupMenu::set_item_disabled); ObjectTypeDB::bind_method(_MD("set_item_submenu","idx","submenu"),&PopupMenu::set_item_submenu); ObjectTypeDB::bind_method(_MD("set_item_as_separator","idx","enable"),&PopupMenu::set_item_as_separator); diff --git a/scene/gui/range.cpp b/scene/gui/range.cpp index 7103ee651f..bee6527795 100644 --- a/scene/gui/range.cpp +++ b/scene/gui/range.cpp @@ -216,11 +216,10 @@ void Range::_bind_methods() { ObjectTypeDB::bind_method(_MD("get_val"),&Range::get_val); ObjectTypeDB::bind_method(_MD("get_value"),&Range::get_val); ObjectTypeDB::bind_method(_MD("get_min"),&Range::get_min); - ObjectTypeDB::bind_method(_MD("get_max"),&Range::get_max); - ObjectTypeDB::bind_method(_MD("get_step"),&Range::get_step); - ObjectTypeDB::bind_method(_MD("get_page"),&Range::get_page); - ObjectTypeDB::bind_method(_MD("get_unit_value"),&Range::get_unit_value); - ObjectTypeDB::bind_method(_MD("get_rounded_values"),&Range::get_rounded_values); + ObjectTypeDB::bind_method(_MD("get_max"),&Range::get_max); + ObjectTypeDB::bind_method(_MD("get_step"),&Range::get_step); + ObjectTypeDB::bind_method(_MD("get_page"),&Range::get_page); + ObjectTypeDB::bind_method(_MD("get_unit_value"),&Range::get_unit_value); ObjectTypeDB::bind_method(_MD("set_val","value"),&Range::set_val); ObjectTypeDB::bind_method(_MD("set_value","value"),&Range::set_val); ObjectTypeDB::bind_method(_MD("set_min","minimum"),&Range::set_min); @@ -228,7 +227,8 @@ void Range::_bind_methods() { ObjectTypeDB::bind_method(_MD("set_step","step"),&Range::set_step); ObjectTypeDB::bind_method(_MD("set_page","pagesize"),&Range::set_page); ObjectTypeDB::bind_method(_MD("set_unit_value","value"),&Range::set_unit_value); - ObjectTypeDB::bind_method(_MD("set_rounded_values"),&Range::set_rounded_values); + ObjectTypeDB::bind_method(_MD("set_rounded_values","enabled"),&Range::set_rounded_values); + ObjectTypeDB::bind_method(_MD("is_rounded_values"),&Range::is_rounded_values); ObjectTypeDB::bind_method(_MD("set_exp_unit_value","enabled"),&Range::set_exp_unit_value); ObjectTypeDB::bind_method(_MD("is_unit_value_exp"),&Range::is_unit_value_exp); @@ -244,16 +244,18 @@ void Range::_bind_methods() { ADD_PROPERTY( PropertyInfo( Variant::REAL, "range/page" ), _SCS("set_page"), _SCS("get_page") ); ADD_PROPERTY( PropertyInfo( Variant::REAL, "range/value" ), _SCS("set_val"), _SCS("get_val") ); ADD_PROPERTY( PropertyInfo( Variant::BOOL, "range/exp_edit" ), _SCS("set_exp_unit_value"), _SCS("is_unit_value_exp") ); - ADD_PROPERTY( PropertyInfo( Variant::BOOL, "rounded_values" ), _SCS("set_rounded_values"), _SCS("get_rounded_values") ); + ADD_PROPERTY( PropertyInfo( Variant::BOOL, "range/rounded" ), _SCS("set_rounded_values"), _SCS("is_rounded_values") ); } -void Range::set_rounded_values(bool p){ - _rounded_values = p; +void Range::set_rounded_values(bool p_enable) { + + _rounded_values = p_enable; } -bool Range::get_rounded_values() const{ - return _rounded_values; +bool Range::is_rounded_values() const { + + return _rounded_values; } void Range::set_exp_unit_value(bool p_enable) { diff --git a/scene/gui/range.h b/scene/gui/range.h index 48361ddb0e..f31a81f0b5 100644 --- a/scene/gui/range.h +++ b/scene/gui/range.h @@ -72,22 +72,23 @@ public: void set_step(double p_step); void set_page(double p_page); void set_unit_value(double p_value); - void set_rounded_values(bool); - + double get_val() const; double get_min() const; double get_max() const; double get_step() const; double get_page() const; double get_unit_value() const; - bool get_rounded_values() const; + + void set_rounded_values(bool p_enable); + bool is_rounded_values() const; void set_exp_unit_value(bool p_enable); bool is_unit_value_exp() const; void share(Range *p_range); void unshare(); - + Range(); ~Range(); diff --git a/scene/gui/rich_text_label.cpp b/scene/gui/rich_text_label.cpp index fd8ba33a51..b65ff156f2 100644 --- a/scene/gui/rich_text_label.cpp +++ b/scene/gui/rich_text_label.cpp @@ -1948,7 +1948,7 @@ void RichTextLabel::_bind_methods() { ObjectTypeDB::bind_method(_MD("push_meta","data"),&RichTextLabel::push_meta); ObjectTypeDB::bind_method(_MD("push_underline"),&RichTextLabel::push_underline); ObjectTypeDB::bind_method(_MD("push_table","columns"),&RichTextLabel::push_table); - ObjectTypeDB::bind_method(_MD("set_table_column_expand","column","expand"),&RichTextLabel::set_table_column_expand); + ObjectTypeDB::bind_method(_MD("set_table_column_expand","column","expand","ratio"),&RichTextLabel::set_table_column_expand); ObjectTypeDB::bind_method(_MD("push_cell"),&RichTextLabel::push_cell); ObjectTypeDB::bind_method(_MD("pop"),&RichTextLabel::pop); @@ -1965,7 +1965,7 @@ void RichTextLabel::_bind_methods() { ObjectTypeDB::bind_method(_MD("get_v_scroll"),&RichTextLabel::get_v_scroll); - ObjectTypeDB::bind_method(_MD("scroll_to_line"),&RichTextLabel::scroll_to_line); + ObjectTypeDB::bind_method(_MD("scroll_to_line","line"),&RichTextLabel::scroll_to_line); ObjectTypeDB::bind_method(_MD("set_tab_size","spaces"),&RichTextLabel::set_tab_size); ObjectTypeDB::bind_method(_MD("get_tab_size"),&RichTextLabel::get_tab_size); diff --git a/scene/gui/text_edit.cpp b/scene/gui/text_edit.cpp index 29969b65e6..f46336a224 100644 --- a/scene/gui/text_edit.cpp +++ b/scene/gui/text_edit.cpp @@ -3742,10 +3742,10 @@ void TextEdit::_bind_methods() { ObjectTypeDB::bind_method(_MD("get_line_count"),&TextEdit::get_line_count); ObjectTypeDB::bind_method(_MD("get_text"),&TextEdit::get_text); - ObjectTypeDB::bind_method(_MD("get_line"),&TextEdit::get_line); + ObjectTypeDB::bind_method(_MD("get_line","line"),&TextEdit::get_line); - ObjectTypeDB::bind_method(_MD("cursor_set_column","column"),&TextEdit::cursor_set_column); - ObjectTypeDB::bind_method(_MD("cursor_set_line","line"),&TextEdit::cursor_set_line); + ObjectTypeDB::bind_method(_MD("cursor_set_column","column","adjust_viewport"),&TextEdit::cursor_set_column,DEFVAL(false)); + ObjectTypeDB::bind_method(_MD("cursor_set_line","line","adjust_viewport"),&TextEdit::cursor_set_line,DEFVAL(false)); ObjectTypeDB::bind_method(_MD("cursor_get_column"),&TextEdit::cursor_get_column); ObjectTypeDB::bind_method(_MD("cursor_get_line"),&TextEdit::cursor_get_line); diff --git a/scene/gui/tree.cpp b/scene/gui/tree.cpp index 1b204cff65..585f3a8936 100644 --- a/scene/gui/tree.cpp +++ b/scene/gui/tree.cpp @@ -672,7 +672,7 @@ void TreeItem::_bind_methods() { ObjectTypeDB::bind_method(_MD("clear_custom_bg_color","column"),&TreeItem::clear_custom_bg_color); ObjectTypeDB::bind_method(_MD("get_custom_bg_color","column"),&TreeItem::get_custom_bg_color); - ObjectTypeDB::bind_method(_MD("add_button","column","button:Texture"),&TreeItem::add_button); + ObjectTypeDB::bind_method(_MD("add_button","column","button:Texture","button_idx"),&TreeItem::add_button); ObjectTypeDB::bind_method(_MD("get_button_count","column"),&TreeItem::get_button_count); ObjectTypeDB::bind_method(_MD("get_button:Texture","column","button_idx"),&TreeItem::get_button); ObjectTypeDB::bind_method(_MD("erase_button","column","button_idx"),&TreeItem::erase_button); @@ -3193,11 +3193,11 @@ void Tree::_bind_methods() { ObjectTypeDB::bind_method(_MD("create_item:TreeItem","parent:TreeItem"),&Tree::_create_item,DEFVAL((Object*)NULL)); ObjectTypeDB::bind_method(_MD("get_root:TreeItem"),&Tree::get_root); - ObjectTypeDB::bind_method(_MD("set_column_min_width"),&Tree::set_column_min_width); - ObjectTypeDB::bind_method(_MD("set_column_expand"),&Tree::set_column_expand); - ObjectTypeDB::bind_method(_MD("get_column_width"),&Tree::get_column_width); + ObjectTypeDB::bind_method(_MD("set_column_min_width","column","min_width"),&Tree::set_column_min_width); + ObjectTypeDB::bind_method(_MD("set_column_expand","column","expand"),&Tree::set_column_expand); + ObjectTypeDB::bind_method(_MD("get_column_width","column"),&Tree::get_column_width); - ObjectTypeDB::bind_method(_MD("set_hide_root"),&Tree::set_hide_root); + ObjectTypeDB::bind_method(_MD("set_hide_root","enable"),&Tree::set_hide_root); ObjectTypeDB::bind_method(_MD("get_next_selected:TreeItem","from:TreeItem"),&Tree::_get_next_selected); ObjectTypeDB::bind_method(_MD("get_selected:TreeItem"),&Tree::get_selected); ObjectTypeDB::bind_method(_MD("get_selected_column"),&Tree::get_selected_column); diff --git a/scene/main/node.cpp b/scene/main/node.cpp index a832162994..027e9ace65 100644 --- a/scene/main/node.cpp +++ b/scene/main/node.cpp @@ -2001,7 +2001,7 @@ void Node::_bind_methods() { ObjectTypeDB::bind_method(_MD("is_greater_than","node:Node"),&Node::is_greater_than); ObjectTypeDB::bind_method(_MD("get_path"),&Node::get_path); ObjectTypeDB::bind_method(_MD("get_path_to","node:Node"),&Node::get_path_to); - ObjectTypeDB::bind_method(_MD("add_to_group","group"),&Node::add_to_group,DEFVAL(false)); + ObjectTypeDB::bind_method(_MD("add_to_group","group","persistent"),&Node::add_to_group,DEFVAL(false)); ObjectTypeDB::bind_method(_MD("remove_from_group","group"),&Node::remove_from_group); ObjectTypeDB::bind_method(_MD("is_in_group","group"),&Node::is_in_group); ObjectTypeDB::bind_method(_MD("move_child","child_node:Node","to_pos"),&Node::move_child); diff --git a/scene/main/scene_main_loop.cpp b/scene/main/scene_main_loop.cpp index adf053f5c9..cdfaa4c716 100644 --- a/scene/main/scene_main_loop.cpp +++ b/scene/main/scene_main_loop.cpp @@ -1586,7 +1586,7 @@ void SceneTree::_bind_methods() { ObjectTypeDB::bind_method(_MD("notify_group","call_flags","group","notification"),&SceneTree::notify_group); ObjectTypeDB::bind_method(_MD("set_group","call_flags","group","property","value"),&SceneTree::set_group); - ObjectTypeDB::bind_method(_MD("get_nodes_in_group"),&SceneTree::_get_nodes_in_group); + ObjectTypeDB::bind_method(_MD("get_nodes_in_group","group"),&SceneTree::_get_nodes_in_group); ObjectTypeDB::bind_method(_MD("get_root:Viewport"),&SceneTree::get_root); diff --git a/scene/main/viewport.cpp b/scene/main/viewport.cpp index d19b5767c2..26b5594599 100644 --- a/scene/main/viewport.cpp +++ b/scene/main/viewport.cpp @@ -1456,7 +1456,7 @@ void Viewport::_bind_methods() { ObjectTypeDB::bind_method(_MD("set_as_audio_listener_2d","enable"), &Viewport::set_as_audio_listener_2d); ObjectTypeDB::bind_method(_MD("is_audio_listener_2d","enable"), &Viewport::is_audio_listener_2d); - ObjectTypeDB::bind_method(_MD("set_render_target_to_screen_rect"), &Viewport::set_render_target_to_screen_rect); + ObjectTypeDB::bind_method(_MD("set_render_target_to_screen_rect","rect"), &Viewport::set_render_target_to_screen_rect); ObjectTypeDB::bind_method(_MD("get_mouse_pos"), &Viewport::get_mouse_pos); ObjectTypeDB::bind_method(_MD("warp_mouse","to_pos"), &Viewport::warp_mouse); diff --git a/scene/resources/font.cpp b/scene/resources/font.cpp index aad5e7cfdd..3890f4bedb 100644 --- a/scene/resources/font.cpp +++ b/scene/resources/font.cpp @@ -517,7 +517,7 @@ void Font::_bind_methods() { ObjectTypeDB::bind_method(_MD("get_descent"),&Font::get_descent); ObjectTypeDB::bind_method(_MD("add_kerning_pair","char_a","char_b","kerning"),&Font::add_kerning_pair); - ObjectTypeDB::bind_method(_MD("get_kerning_pair"),&Font::get_kerning_pair); + ObjectTypeDB::bind_method(_MD("get_kerning_pair","char_a","char_b"),&Font::get_kerning_pair); ObjectTypeDB::bind_method(_MD("add_texture","texture:Texture"),&Font::add_texture); ObjectTypeDB::bind_method(_MD("add_char","character","texture","rect","align","advance"),&Font::add_char,DEFVAL(Point2()),DEFVAL(-1)); diff --git a/scene/resources/mesh.cpp b/scene/resources/mesh.cpp index 8cb0904415..88ed2f45c5 100644 --- a/scene/resources/mesh.cpp +++ b/scene/resources/mesh.cpp @@ -971,7 +971,7 @@ void Mesh::_bind_methods() { ObjectTypeDB::bind_method(_MD("set_morph_target_mode","mode"),&Mesh::set_morph_target_mode); ObjectTypeDB::bind_method(_MD("get_morph_target_mode"),&Mesh::get_morph_target_mode); - ObjectTypeDB::bind_method(_MD("add_surface","primitive","arrays","morph_arrays"),&Mesh::add_surface,DEFVAL(Array())); + ObjectTypeDB::bind_method(_MD("add_surface","primitive","arrays","morph_arrays","alphasort"),&Mesh::add_surface,DEFVAL(Array()),DEFVAL(false)); ObjectTypeDB::bind_method(_MD("get_surface_count"),&Mesh::get_surface_count); ObjectTypeDB::bind_method(_MD("surface_remove","surf_idx"),&Mesh::surface_remove); ObjectTypeDB::bind_method(_MD("surface_get_array_len","surf_idx"),&Mesh::surface_get_array_len); diff --git a/scene/resources/multimesh.cpp b/scene/resources/multimesh.cpp index 0755d101b2..ee68c3b7fc 100644 --- a/scene/resources/multimesh.cpp +++ b/scene/resources/multimesh.cpp @@ -224,13 +224,13 @@ void MultiMesh::_bind_methods() { ObjectTypeDB::bind_method(_MD("set_mesh","mesh:Mesh"),&MultiMesh::set_mesh); ObjectTypeDB::bind_method(_MD("get_mesh:Mesh"),&MultiMesh::get_mesh); - ObjectTypeDB::bind_method(_MD("set_instance_count"),&MultiMesh::set_instance_count); + ObjectTypeDB::bind_method(_MD("set_instance_count","count"),&MultiMesh::set_instance_count); ObjectTypeDB::bind_method(_MD("get_instance_count"),&MultiMesh::get_instance_count); - ObjectTypeDB::bind_method(_MD("set_instance_transform"),&MultiMesh::set_instance_transform); - ObjectTypeDB::bind_method(_MD("get_instance_transform"),&MultiMesh::get_instance_transform); - ObjectTypeDB::bind_method(_MD("set_instance_color"),&MultiMesh::set_instance_color); - ObjectTypeDB::bind_method(_MD("get_instance_color"),&MultiMesh::get_instance_color); - ObjectTypeDB::bind_method(_MD("set_aabb"),&MultiMesh::set_aabb); + ObjectTypeDB::bind_method(_MD("set_instance_transform","instance","transform"),&MultiMesh::set_instance_transform); + ObjectTypeDB::bind_method(_MD("get_instance_transform","instance"),&MultiMesh::get_instance_transform); + ObjectTypeDB::bind_method(_MD("set_instance_color","instance","color"),&MultiMesh::set_instance_color); + ObjectTypeDB::bind_method(_MD("get_instance_color","instance"),&MultiMesh::get_instance_color); + ObjectTypeDB::bind_method(_MD("set_aabb","visibility_aabb"),&MultiMesh::set_aabb); ObjectTypeDB::bind_method(_MD("get_aabb"),&MultiMesh::get_aabb); ObjectTypeDB::bind_method(_MD("generate_aabb"),&MultiMesh::generate_aabb); diff --git a/scene/resources/shader_graph.cpp b/scene/resources/shader_graph.cpp index f8a14e58a0..04334e1159 100644 --- a/scene/resources/shader_graph.cpp +++ b/scene/resources/shader_graph.cpp @@ -179,25 +179,25 @@ void ShaderGraph::_bind_methods() { ObjectTypeDB::bind_method(_MD("default_get_value","shader_type","id","param_id"), &ShaderGraph::default_get_value); ObjectTypeDB::bind_method(_MD("scalar_const_node_set_value","shader_type","id","value"),&ShaderGraph::scalar_const_node_set_value); - ObjectTypeDB::bind_method(_MD("scalar_const_node_get_value","shader_type","id"),&ShaderGraph::scalar_const_node_set_value); + ObjectTypeDB::bind_method(_MD("scalar_const_node_get_value","shader_type","id"),&ShaderGraph::scalar_const_node_get_value); ObjectTypeDB::bind_method(_MD("vec_const_node_set_value","shader_type","id","value"),&ShaderGraph::vec_const_node_set_value); - ObjectTypeDB::bind_method(_MD("vec_const_node_get_value","shader_type","id"),&ShaderGraph::vec_const_node_set_value); + ObjectTypeDB::bind_method(_MD("vec_const_node_get_value","shader_type","id"),&ShaderGraph::vec_const_node_get_value); ObjectTypeDB::bind_method(_MD("rgb_const_node_set_value","shader_type","id","value"),&ShaderGraph::rgb_const_node_set_value); - ObjectTypeDB::bind_method(_MD("rgb_const_node_get_value","shader_type","id"),&ShaderGraph::rgb_const_node_set_value); + ObjectTypeDB::bind_method(_MD("rgb_const_node_get_value","shader_type","id"),&ShaderGraph::rgb_const_node_get_value); ObjectTypeDB::bind_method(_MD("xform_const_node_set_value","shader_type","id","value"),&ShaderGraph::xform_const_node_set_value); - ObjectTypeDB::bind_method(_MD("xform_const_node_get_value","shader_type","id"),&ShaderGraph::xform_const_node_set_value); + ObjectTypeDB::bind_method(_MD("xform_const_node_get_value","shader_type","id"),&ShaderGraph::xform_const_node_get_value); // void get_node_list(ShaderType p_which,List<int> *p_node_list) const; ObjectTypeDB::bind_method(_MD("texture_node_set_filter_size","shader_type","id","filter_size"),&ShaderGraph::texture_node_set_filter_size); - ObjectTypeDB::bind_method(_MD("texture_node_get_filter_size","shader_type","id"),&ShaderGraph::texture_node_set_filter_size); + ObjectTypeDB::bind_method(_MD("texture_node_get_filter_size","shader_type","id"),&ShaderGraph::texture_node_get_filter_size); ObjectTypeDB::bind_method(_MD("texture_node_set_filter_strength","shader_type","id","filter_strength"),&ShaderGraph::texture_node_set_filter_strength); - ObjectTypeDB::bind_method(_MD("texture_node_get_filter_strength","shader_type","id"),&ShaderGraph::texture_node_set_filter_strength); + ObjectTypeDB::bind_method(_MD("texture_node_get_filter_strength","shader_type","id"),&ShaderGraph::texture_node_get_filter_strength); ObjectTypeDB::bind_method(_MD("scalar_op_node_set_op","shader_type","id","op"),&ShaderGraph::scalar_op_node_set_op); ObjectTypeDB::bind_method(_MD("scalar_op_node_get_op","shader_type","id"),&ShaderGraph::scalar_op_node_get_op); diff --git a/scene/resources/style_box.cpp b/scene/resources/style_box.cpp index 527fae5946..1f518c30e1 100644 --- a/scene/resources/style_box.cpp +++ b/scene/resources/style_box.cpp @@ -83,7 +83,7 @@ void StyleBox::_bind_methods() { ObjectTypeDB::bind_method(_MD("get_center_size"),&StyleBox::get_center_size); ObjectTypeDB::bind_method(_MD("get_offset"),&StyleBox::get_offset); - ObjectTypeDB::bind_method(_MD("draw"),&StyleBox::draw); + ObjectTypeDB::bind_method(_MD("draw","canvas_item","rect"),&StyleBox::draw); ADD_PROPERTYI( PropertyInfo( Variant::REAL, "content_margin/left", PROPERTY_HINT_RANGE,"-1,2048,1" ), _SCS("set_default_margin"),_SCS("get_default_margin"), MARGIN_LEFT ); ADD_PROPERTYI( PropertyInfo( Variant::REAL, "content_margin/right", PROPERTY_HINT_RANGE,"-1,2048,1" ), _SCS("set_default_margin"),_SCS("get_default_margin"), MARGIN_RIGHT ); @@ -182,10 +182,10 @@ void StyleBoxTexture::_bind_methods() { ObjectTypeDB::bind_method(_MD("get_texture:Texture"),&StyleBoxTexture::get_texture); ObjectTypeDB::bind_method(_MD("set_margin_size","margin","size"),&StyleBoxTexture::set_margin_size); - ObjectTypeDB::bind_method(_MD("get_margin_size"),&StyleBoxTexture::get_margin_size); + ObjectTypeDB::bind_method(_MD("get_margin_size","margin"),&StyleBoxTexture::get_margin_size); ObjectTypeDB::bind_method(_MD("set_expand_margin_size","margin","size"),&StyleBoxTexture::set_expand_margin_size); - ObjectTypeDB::bind_method(_MD("get_expand_margin_size"),&StyleBoxTexture::get_expand_margin_size); + ObjectTypeDB::bind_method(_MD("get_expand_margin_size","margin"),&StyleBoxTexture::get_expand_margin_size); ObjectTypeDB::bind_method(_MD("set_draw_center","enable"),&StyleBoxTexture::set_draw_center); ObjectTypeDB::bind_method(_MD("get_draw_center"),&StyleBoxTexture::get_draw_center); @@ -392,7 +392,7 @@ void StyleBoxImageMask::_bind_methods() { ObjectTypeDB::bind_method(_MD("set_expand","expand"),&StyleBoxImageMask::set_expand); ObjectTypeDB::bind_method(_MD("get_expand"),&StyleBoxImageMask::get_expand); ObjectTypeDB::bind_method(_MD("set_expand_margin_size","margin","size"),&StyleBoxImageMask::set_expand_margin_size); - ObjectTypeDB::bind_method(_MD("get_expand_margin_size"),&StyleBoxImageMask::get_expand_margin_size); + ObjectTypeDB::bind_method(_MD("get_expand_margin_size","margin"),&StyleBoxImageMask::get_expand_margin_size); ADD_PROPERTY( PropertyInfo(Variant::IMAGE, "image"), _SCS("set_image"), _SCS("get_image")); ADD_PROPERTY( PropertyInfo(Variant::BOOL, "expand"), _SCS("set_expand"), _SCS("get_expand")); diff --git a/scene/resources/texture.cpp b/scene/resources/texture.cpp index 5df3d64d1a..edfa12da1f 100644 --- a/scene/resources/texture.cpp +++ b/scene/resources/texture.cpp @@ -70,9 +70,9 @@ void Texture::_bind_methods() { ObjectTypeDB::bind_method(_MD("has_alpha"),&Texture::has_alpha); ObjectTypeDB::bind_method(_MD("set_flags","flags"),&Texture::set_flags); ObjectTypeDB::bind_method(_MD("get_flags"),&Texture::get_flags); - ObjectTypeDB::bind_method(_MD("draw","canvas_item","pos","modulate"),&Texture::draw,DEFVAL(Color(1,1,1)),DEFVAL(false)); - ObjectTypeDB::bind_method(_MD("draw_rect","canvas_item","rect","tile","modulate"),&Texture::draw_rect,DEFVAL(Color(1,1,1)),DEFVAL(false)); - ObjectTypeDB::bind_method(_MD("draw_rect_region","canvas_item","rect","src_rect","modulate"),&Texture::draw_rect_region,DEFVAL(Color(1,1,1)),DEFVAL(false)); + ObjectTypeDB::bind_method(_MD("draw","canvas_item","pos","modulate","transpose"),&Texture::draw,DEFVAL(Color(1,1,1)),DEFVAL(false)); + ObjectTypeDB::bind_method(_MD("draw_rect","canvas_item","rect","tile","modulate","transpose"),&Texture::draw_rect,DEFVAL(Color(1,1,1)),DEFVAL(false)); + ObjectTypeDB::bind_method(_MD("draw_rect_region","canvas_item","rect","src_rect","modulate","transpose"),&Texture::draw_rect_region,DEFVAL(Color(1,1,1)),DEFVAL(false)); BIND_CONSTANT( FLAG_MIPMAPS ); BIND_CONSTANT( FLAG_REPEAT ); diff --git a/scene/resources/theme.cpp b/scene/resources/theme.cpp index 651e234b49..006aeeeaac 100644 --- a/scene/resources/theme.cpp +++ b/scene/resources/theme.cpp @@ -552,36 +552,36 @@ void Theme::_bind_methods() { ObjectTypeDB::bind_method(_MD("get_icon:Texture","name","type"),&Theme::get_icon); ObjectTypeDB::bind_method(_MD("has_icon","name","type"),&Theme::has_icon); ObjectTypeDB::bind_method(_MD("clear_icon","name","type"),&Theme::clear_icon); - ObjectTypeDB::bind_method(_MD("get_icon_list"),&Theme::_get_icon_list); + ObjectTypeDB::bind_method(_MD("get_icon_list","type"),&Theme::_get_icon_list); ObjectTypeDB::bind_method(_MD("set_stylebox","name","type","texture:StyleBox"),&Theme::set_stylebox); ObjectTypeDB::bind_method(_MD("get_stylebox:StyleBox","name","type"),&Theme::get_stylebox); ObjectTypeDB::bind_method(_MD("has_stylebox","name","type"),&Theme::has_stylebox); ObjectTypeDB::bind_method(_MD("clear_stylebox","name","type"),&Theme::clear_stylebox); - ObjectTypeDB::bind_method(_MD("get_stylebox_list"),&Theme::_get_stylebox_list); + ObjectTypeDB::bind_method(_MD("get_stylebox_list","type"),&Theme::_get_stylebox_list); ObjectTypeDB::bind_method(_MD("set_font","name","type","font:Font"),&Theme::set_font); ObjectTypeDB::bind_method(_MD("get_font:Font","name","type"),&Theme::get_font); ObjectTypeDB::bind_method(_MD("has_font","name","type"),&Theme::has_font); ObjectTypeDB::bind_method(_MD("clear_font","name","type"),&Theme::clear_font); - ObjectTypeDB::bind_method(_MD("get_font_list"),&Theme::_get_font_list); + ObjectTypeDB::bind_method(_MD("get_font_list","type"),&Theme::_get_font_list); ObjectTypeDB::bind_method(_MD("set_color","name","type","color"),&Theme::set_color); ObjectTypeDB::bind_method(_MD("get_color","name","type"),&Theme::get_color); ObjectTypeDB::bind_method(_MD("has_color","name","type"),&Theme::has_color); ObjectTypeDB::bind_method(_MD("clear_color","name","type"),&Theme::clear_color); - ObjectTypeDB::bind_method(_MD("get_color_list"),&Theme::_get_color_list); + ObjectTypeDB::bind_method(_MD("get_color_list","type"),&Theme::_get_color_list); ObjectTypeDB::bind_method(_MD("set_constant","name","type","constant"),&Theme::set_constant); ObjectTypeDB::bind_method(_MD("get_constant","name","type"),&Theme::get_constant); ObjectTypeDB::bind_method(_MD("has_constant","name","type"),&Theme::has_constant); ObjectTypeDB::bind_method(_MD("clear_constant","name","type"),&Theme::clear_constant); - ObjectTypeDB::bind_method(_MD("get_constant_list"),&Theme::_get_constant_list); + ObjectTypeDB::bind_method(_MD("get_constant_list","type"),&Theme::_get_constant_list); ObjectTypeDB::bind_method(_MD("set_default_font","font"),&Theme::set_default_theme_font); ObjectTypeDB::bind_method(_MD("get_default_font"),&Theme::get_default_theme_font); - ObjectTypeDB::bind_method(_MD("get_type_list"),&Theme::_get_type_list); + ObjectTypeDB::bind_method(_MD("get_type_list","type"),&Theme::_get_type_list); ObjectTypeDB::bind_method("copy_default_theme",&Theme::copy_default_theme); diff --git a/servers/audio/audio_server_sw.cpp b/servers/audio/audio_server_sw.cpp index 500886d73a..9d7cdc2420 100644 --- a/servers/audio/audio_server_sw.cpp +++ b/servers/audio/audio_server_sw.cpp @@ -360,7 +360,7 @@ void AudioServerSW::sample_set_description(RID p_sample, const String& p_descrip AUDIO_LOCK sample_manager->sample_set_description(p_sample,p_description); } -String AudioServerSW::sample_get_description(RID p_sample, const String& p_description) const { +String AudioServerSW::sample_get_description(RID p_sample) const { AUDIO_LOCK return sample_manager->sample_get_description(p_sample); diff --git a/servers/audio/audio_server_sw.h b/servers/audio/audio_server_sw.h index c566e129c1..75d635e243 100644 --- a/servers/audio/audio_server_sw.h +++ b/servers/audio/audio_server_sw.h @@ -118,7 +118,7 @@ public: virtual RID sample_create(SampleFormat p_format, bool p_stereo, int p_length); virtual void sample_set_description(RID p_sample, const String& p_description); - virtual String sample_get_description(RID p_sample, const String& p_description) const; + virtual String sample_get_description(RID p_sample) const; virtual SampleFormat sample_get_format(RID p_sample) const; virtual bool sample_is_stereo(RID p_sample) const; diff --git a/servers/audio_server.cpp b/servers/audio_server.cpp index 6c5a2de97b..8dbfea3fd6 100644 --- a/servers/audio_server.cpp +++ b/servers/audio_server.cpp @@ -88,7 +88,7 @@ void AudioServer::_bind_methods() { ObjectTypeDB::bind_method(_MD("sample_get_length","sample"), &AudioServer::sample_get_length ); ObjectTypeDB::bind_method(_MD("sample_set_signed_data","sample","data"), &AudioServer::sample_set_signed_data ); - ObjectTypeDB::bind_method(_MD("sample_set_data","sample"), &AudioServer::sample_set_data ); + ObjectTypeDB::bind_method(_MD("sample_set_data","sample","data"), &AudioServer::sample_set_data ); ObjectTypeDB::bind_method(_MD("sample_get_data","sample"), &AudioServer::sample_get_data ); ObjectTypeDB::bind_method(_MD("sample_set_mix_rate","sample","mix_rate"), &AudioServer::sample_set_mix_rate ); diff --git a/servers/audio_server.h b/servers/audio_server.h index cd3e920f31..6490a281d8 100644 --- a/servers/audio_server.h +++ b/servers/audio_server.h @@ -160,7 +160,7 @@ public: virtual RID sample_create(SampleFormat p_format, bool p_stereo, int p_length)=0; virtual void sample_set_description(RID p_sample, const String& p_description)=0; - virtual String sample_get_description(RID p_sample, const String& p_description) const=0; + virtual String sample_get_description(RID p_sample) const=0; virtual SampleFormat sample_get_format(RID p_sample) const=0; virtual bool sample_is_stereo(RID p_sample) const=0; diff --git a/servers/physics/physics_server_sw.cpp b/servers/physics/physics_server_sw.cpp index a9a8042c19..7a35510963 100644 --- a/servers/physics/physics_server_sw.cpp +++ b/servers/physics/physics_server_sw.cpp @@ -517,7 +517,7 @@ void PhysicsServerSW::body_set_mode(RID p_body, BodyMode p_mode) { body->set_mode(p_mode); }; -PhysicsServer::BodyMode PhysicsServerSW::body_get_mode(RID p_body, BodyMode p_mode) const { +PhysicsServer::BodyMode PhysicsServerSW::body_get_mode(RID p_body) const { BodySW *body = body_owner.get(p_body); ERR_FAIL_COND_V(!body,BODY_MODE_STATIC); diff --git a/servers/physics/physics_server_sw.h b/servers/physics/physics_server_sw.h index abbb057616..b9dcff658b 100644 --- a/servers/physics/physics_server_sw.h +++ b/servers/physics/physics_server_sw.h @@ -146,7 +146,7 @@ public: virtual RID body_get_space(RID p_body) const; virtual void body_set_mode(RID p_body, BodyMode p_mode); - virtual BodyMode body_get_mode(RID p_body, BodyMode p_mode) const; + virtual BodyMode body_get_mode(RID p_body) const; virtual void body_add_shape(RID p_body, RID p_shape, const Transform& p_transform=Transform()); virtual void body_set_shape(RID p_body, int p_shape_idx,RID p_shape); diff --git a/servers/physics_2d_server.cpp b/servers/physics_2d_server.cpp index c18b32468a..789ec9950b 100644 --- a/servers/physics_2d_server.cpp +++ b/servers/physics_2d_server.cpp @@ -548,7 +548,7 @@ void Physics2DServer::_bind_methods() { ObjectTypeDB::bind_method(_MD("area_attach_object_instance_ID","area","id"),&Physics2DServer::area_attach_object_instance_ID); ObjectTypeDB::bind_method(_MD("area_get_object_instance_ID","area"),&Physics2DServer::area_get_object_instance_ID); - ObjectTypeDB::bind_method(_MD("area_set_monitor_callback","receiver","method"),&Physics2DServer::area_set_monitor_callback); + ObjectTypeDB::bind_method(_MD("area_set_monitor_callback","area","receiver","method"),&Physics2DServer::area_set_monitor_callback); ObjectTypeDB::bind_method(_MD("body_create","mode","init_sleeping"),&Physics2DServer::body_create,DEFVAL(BODY_MODE_RIGID),DEFVAL(false)); @@ -606,17 +606,17 @@ void Physics2DServer::_bind_methods() { ObjectTypeDB::bind_method(_MD("body_set_max_contacts_reported","body","amount"),&Physics2DServer::body_set_max_contacts_reported); ObjectTypeDB::bind_method(_MD("body_get_max_contacts_reported","body"),&Physics2DServer::body_get_max_contacts_reported); - ObjectTypeDB::bind_method(_MD("body_set_one_way_collision_direction","normal"),&Physics2DServer::body_set_one_way_collision_direction); - ObjectTypeDB::bind_method(_MD("body_get_one_way_collision_direction"),&Physics2DServer::body_get_one_way_collision_direction); + ObjectTypeDB::bind_method(_MD("body_set_one_way_collision_direction","body","normal"),&Physics2DServer::body_set_one_way_collision_direction); + ObjectTypeDB::bind_method(_MD("body_get_one_way_collision_direction","body"),&Physics2DServer::body_get_one_way_collision_direction); - ObjectTypeDB::bind_method(_MD("body_set_one_way_collision_max_depth","normal"),&Physics2DServer::body_set_one_way_collision_max_depth); - ObjectTypeDB::bind_method(_MD("body_get_one_way_collision_max_depth"),&Physics2DServer::body_get_one_way_collision_max_depth); + ObjectTypeDB::bind_method(_MD("body_set_one_way_collision_max_depth","body","depth"),&Physics2DServer::body_set_one_way_collision_max_depth); + ObjectTypeDB::bind_method(_MD("body_get_one_way_collision_max_depth","body"),&Physics2DServer::body_get_one_way_collision_max_depth); ObjectTypeDB::bind_method(_MD("body_set_omit_force_integration","body","enable"),&Physics2DServer::body_set_omit_force_integration); ObjectTypeDB::bind_method(_MD("body_is_omitting_force_integration","body"),&Physics2DServer::body_is_omitting_force_integration); - ObjectTypeDB::bind_method(_MD("body_set_force_integration_callback","body","receiver","method"),&Physics2DServer::body_set_force_integration_callback); + ObjectTypeDB::bind_method(_MD("body_set_force_integration_callback","body","receiver","method","userdata"),&Physics2DServer::body_set_force_integration_callback,DEFVAL(Variant())); ObjectTypeDB::bind_method(_MD("body_test_motion","body","motion","margin","result:Physics2DTestMotionResult"),&Physics2DServer::_body_test_motion,DEFVAL(0.08),DEFVAL(Variant())); @@ -638,7 +638,7 @@ void Physics2DServer::_bind_methods() { ObjectTypeDB::bind_method(_MD("set_active","active"),&Physics2DServer::set_active); - ObjectTypeDB::bind_method(_MD("get_process_info"),&Physics2DServer::get_process_info); + ObjectTypeDB::bind_method(_MD("get_process_info","process_info"),&Physics2DServer::get_process_info); // ObjectTypeDB::bind_method(_MD("init"),&Physics2DServer::init); // ObjectTypeDB::bind_method(_MD("step"),&Physics2DServer::step); diff --git a/servers/physics_server.cpp b/servers/physics_server.cpp index bc2b37d92c..ea5f5fbbbf 100644 --- a/servers/physics_server.cpp +++ b/servers/physics_server.cpp @@ -467,7 +467,7 @@ void PhysicsServer::_bind_methods() { ObjectTypeDB::bind_method(_MD("area_attach_object_instance_ID","area","id"),&PhysicsServer::area_attach_object_instance_ID); ObjectTypeDB::bind_method(_MD("area_get_object_instance_ID","area"),&PhysicsServer::area_get_object_instance_ID); - ObjectTypeDB::bind_method(_MD("area_set_monitor_callback","receiver","method"),&PhysicsServer::area_set_monitor_callback); + ObjectTypeDB::bind_method(_MD("area_set_monitor_callback","area","receiver","method"),&PhysicsServer::area_set_monitor_callback); ObjectTypeDB::bind_method(_MD("area_set_ray_pickable","area","enable"),&PhysicsServer::area_set_ray_pickable); ObjectTypeDB::bind_method(_MD("area_is_ray_pickable","area"),&PhysicsServer::area_is_ray_pickable); @@ -671,7 +671,7 @@ void PhysicsServer::_bind_methods() { //ObjectTypeDB::bind_method(_MD("flush_queries"),&PhysicsServer::flush_queries); - ObjectTypeDB::bind_method(_MD("get_process_info"),&PhysicsServer::get_process_info); + ObjectTypeDB::bind_method(_MD("get_process_info","process_info"),&PhysicsServer::get_process_info); BIND_CONSTANT( SHAPE_PLANE ); BIND_CONSTANT( SHAPE_RAY ); diff --git a/servers/physics_server.h b/servers/physics_server.h index 66296fa15d..d0065e13aa 100644 --- a/servers/physics_server.h +++ b/servers/physics_server.h @@ -372,7 +372,7 @@ public: virtual RID body_get_space(RID p_body) const=0; virtual void body_set_mode(RID p_body, BodyMode p_mode)=0; - virtual BodyMode body_get_mode(RID p_body, BodyMode p_mode) const=0; + virtual BodyMode body_get_mode(RID p_body) const=0; virtual void body_add_shape(RID p_body, RID p_shape, const Transform& p_transform=Transform())=0; virtual void body_set_shape(RID p_body, int p_shape_idx,RID p_shape)=0; diff --git a/tools/editor/editor_file_dialog.cpp b/tools/editor/editor_file_dialog.cpp index fc7ee2bde7..28a9b63412 100644 --- a/tools/editor/editor_file_dialog.cpp +++ b/tools/editor/editor_file_dialog.cpp @@ -1071,7 +1071,7 @@ void EditorFileDialog::_bind_methods() { ObjectTypeDB::bind_method(_MD("get_vbox:VBoxContainer"),&EditorFileDialog::get_vbox); ObjectTypeDB::bind_method(_MD("set_access","access"),&EditorFileDialog::set_access); ObjectTypeDB::bind_method(_MD("get_access"),&EditorFileDialog::get_access); - ObjectTypeDB::bind_method(_MD("set_show_hidden_files"),&EditorFileDialog::set_show_hidden_files); + ObjectTypeDB::bind_method(_MD("set_show_hidden_files","show"),&EditorFileDialog::set_show_hidden_files); ObjectTypeDB::bind_method(_MD("is_showing_hidden_files"),&EditorFileDialog::is_showing_hidden_files); ObjectTypeDB::bind_method(_MD("_select_drive"),&EditorFileDialog::_select_drive); ObjectTypeDB::bind_method(_MD("_make_dir"),&EditorFileDialog::_make_dir); diff --git a/tools/pck/pck_packer.cpp b/tools/pck/pck_packer.cpp index d398fefb5f..228d37df7c 100644 --- a/tools/pck/pck_packer.cpp +++ b/tools/pck/pck_packer.cpp @@ -26,7 +26,7 @@ void PCKPacker::_bind_methods() { ObjectTypeDB::bind_method(_MD("pck_start","pck_name","alignment"),&PCKPacker::pck_start); ObjectTypeDB::bind_method(_MD("add_file","pck_path","source_path"),&PCKPacker::add_file); - ObjectTypeDB::bind_method(_MD("flush"),&PCKPacker::flush); + ObjectTypeDB::bind_method(_MD("flush","verbose"),&PCKPacker::flush); }; |