From 433b8ee526ca58e742848db012be21c17e8fa9c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Sat, 26 Jan 2019 22:21:53 +0100 Subject: [PATCH] doc: Sync classref with current source --- doc/classes/CollisionObject2D.xml | 18 ++++++++++++++++ doc/classes/CollisionPolygon2D.xml | 2 ++ doc/classes/CollisionShape2D.xml | 2 ++ doc/classes/EditorProperty.xml | 14 +++++++++++++ doc/classes/InputEventMIDI.xml | 33 ++++++++++++++++++++++++++++++ doc/classes/Physics2DServer.xml | 2 ++ doc/classes/StyleBox.xml | 6 ++++++ doc/classes/SurfaceTool.xml | 8 -------- doc/classes/Theme.xml | 8 ++++++++ doc/classes/TileSet.xml | 22 ++++++++++++++++++++ scene/resources/theme.cpp | 2 +- servers/physics_2d_server.cpp | 2 +- 12 files changed, 109 insertions(+), 10 deletions(-) create mode 100644 doc/classes/InputEventMIDI.xml diff --git a/doc/classes/CollisionObject2D.xml b/doc/classes/CollisionObject2D.xml index 48a198b2488..91f283a2b7e 100644 --- a/doc/classes/CollisionObject2D.xml +++ b/doc/classes/CollisionObject2D.xml @@ -40,6 +40,14 @@ Returns the object's [RID]. + + + + + + + + @@ -185,6 +193,16 @@ If [code]enable[/code] is [code]true[/code], collisions for the shape owner originating from this [code]CollisionObject2D[/code] will not be reported to collided with [code]CollisionObject2D[/code]s. + + + + + + + + + + diff --git a/doc/classes/CollisionPolygon2D.xml b/doc/classes/CollisionPolygon2D.xml index f63adbf71ab..3dd87a41206 100644 --- a/doc/classes/CollisionPolygon2D.xml +++ b/doc/classes/CollisionPolygon2D.xml @@ -22,6 +22,8 @@ If [code]true[/code], only edges that face up, relative to CollisionPolygon2D's rotation, will collide with other objects. + + The polygon's list of vertices. The final point will be connected to the first. diff --git a/doc/classes/CollisionShape2D.xml b/doc/classes/CollisionShape2D.xml index d3c616ee3d8..07dbde1c219 100644 --- a/doc/classes/CollisionShape2D.xml +++ b/doc/classes/CollisionShape2D.xml @@ -20,6 +20,8 @@ Sets whether this collision shape should only detect collision on one side (top or bottom). + + The actual shape owned by this collision shape. diff --git a/doc/classes/EditorProperty.xml b/doc/classes/EditorProperty.xml index 7d095543303..b3fc036edbf 100644 --- a/doc/classes/EditorProperty.xml +++ b/doc/classes/EditorProperty.xml @@ -9,6 +9,20 @@ + + + + + + + + + + + + + + diff --git a/doc/classes/InputEventMIDI.xml b/doc/classes/InputEventMIDI.xml new file mode 100644 index 00000000000..2cdd70e42c3 --- /dev/null +++ b/doc/classes/InputEventMIDI.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/doc/classes/Physics2DServer.xml b/doc/classes/Physics2DServer.xml index cd887ff9506..fe1465260f6 100644 --- a/doc/classes/Physics2DServer.xml +++ b/doc/classes/Physics2DServer.xml @@ -735,6 +735,8 @@ + + Enables one way collision on body if [code]enable[/code] is [code]true[/code]. diff --git a/doc/classes/StyleBox.xml b/doc/classes/StyleBox.xml index dee3e6db49d..be21abe275e 100644 --- a/doc/classes/StyleBox.xml +++ b/doc/classes/StyleBox.xml @@ -27,6 +27,12 @@ + + + + + + diff --git a/doc/classes/SurfaceTool.xml b/doc/classes/SurfaceTool.xml index 2e5d5d81c9e..fd158587e56 100644 --- a/doc/classes/SurfaceTool.xml +++ b/doc/classes/SurfaceTool.xml @@ -75,14 +75,6 @@ Specify a Tangent for the next Vertex to use. - - - - - - - - diff --git a/doc/classes/Theme.xml b/doc/classes/Theme.xml index 8c6acd2c514..bffd8ea6d96 100644 --- a/doc/classes/Theme.xml +++ b/doc/classes/Theme.xml @@ -80,6 +80,14 @@ Sets theme values to a copy of the default theme values. + + + + + + + + diff --git a/doc/classes/TileSet.xml b/doc/classes/TileSet.xml index 9e31f7e1b1b..4abe94f1193 100644 --- a/doc/classes/TileSet.xml +++ b/doc/classes/TileSet.xml @@ -439,6 +439,16 @@ Returns the one-way collision value of a tile's shape. + + + + + + + + + + @@ -633,6 +643,18 @@ Enables one-way collision on a tile's shape. + + + + + + + + + + + + diff --git a/scene/resources/theme.cpp b/scene/resources/theme.cpp index 87b40d54472..8d1a24dbf83 100644 --- a/scene/resources/theme.cpp +++ b/scene/resources/theme.cpp @@ -756,7 +756,7 @@ void Theme::_bind_methods() { ClassDB::bind_method(D_METHOD("_emit_theme_changed"), &Theme::_emit_theme_changed); ClassDB::bind_method("copy_default_theme", &Theme::copy_default_theme); - ClassDB::bind_method("copy_theme", &Theme::copy_theme); + ClassDB::bind_method(D_METHOD("copy_theme", "other"), &Theme::copy_theme); ADD_PROPERTY(PropertyInfo(Variant::OBJECT, "default_font", PROPERTY_HINT_RESOURCE_TYPE, "Font"), "set_default_font", "get_default_font"); } diff --git a/servers/physics_2d_server.cpp b/servers/physics_2d_server.cpp index 99f539ea866..ca914b67e05 100644 --- a/servers/physics_2d_server.cpp +++ b/servers/physics_2d_server.cpp @@ -620,7 +620,7 @@ void Physics2DServer::_bind_methods() { ClassDB::bind_method(D_METHOD("body_clear_shapes", "body"), &Physics2DServer::body_clear_shapes); ClassDB::bind_method(D_METHOD("body_set_shape_disabled", "body", "shape_idx", "disable"), &Physics2DServer::body_set_shape_disabled); - ClassDB::bind_method(D_METHOD("body_set_shape_as_one_way_collision", "body", "shape_idx", "enable"), &Physics2DServer::body_set_shape_as_one_way_collision); + ClassDB::bind_method(D_METHOD("body_set_shape_as_one_way_collision", "body", "shape_idx", "enable", "margin"), &Physics2DServer::body_set_shape_as_one_way_collision); ClassDB::bind_method(D_METHOD("body_attach_object_instance_id", "body", "id"), &Physics2DServer::body_attach_object_instance_id); ClassDB::bind_method(D_METHOD("body_get_object_instance_id", "body"), &Physics2DServer::body_get_object_instance_id);