From d03f35f1bc0ecf09d436ebb44356f8add5b95a3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Sat, 16 Dec 2017 20:34:16 +0100 Subject: [PATCH] Bind TextEdit.deselect and update documentation --- doc/classes/Animation.xml | 2 +- doc/classes/BakedLightmap.xml | 77 ++++++++++++++++++++ doc/classes/BakedLightmapData.xml | 113 ++++++++++++++++++++++++++++++ doc/classes/Curve.xml | 2 +- doc/classes/HTTPClient.xml | 3 +- doc/classes/Light.xml | 8 +++ doc/classes/PacketPeer.xml | 4 +- doc/classes/SceneState.xml | 8 +++ doc/classes/ScriptEditor.xml | 10 +++ doc/classes/SpatialMaterial.xml | 10 ++- doc/classes/TextEdit.xml | 7 ++ doc/classes/TileMap.xml | 18 +++++ doc/classes/VisualServer.xml | 4 +- scene/gui/text_edit.cpp | 6 +- servers/visual_server.cpp | 1 + servers/visual_server.h | 1 - 16 files changed, 262 insertions(+), 12 deletions(-) create mode 100644 doc/classes/BakedLightmap.xml create mode 100644 doc/classes/BakedLightmapData.xml diff --git a/doc/classes/Animation.xml b/doc/classes/Animation.xml index dd248d18f7c..f78b39eadb6 100644 --- a/doc/classes/Animation.xml +++ b/doc/classes/Animation.xml @@ -321,7 +321,7 @@ - Enables/disables the given track. Tracks are enabled by default. + Enables/disables the given track. Tracks are enabled by default. diff --git a/doc/classes/BakedLightmap.xml b/doc/classes/BakedLightmap.xml new file mode 100644 index 00000000000..8084af38175 --- /dev/null +++ b/doc/classes/BakedLightmap.xml @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/doc/classes/BakedLightmapData.xml b/doc/classes/BakedLightmapData.xml new file mode 100644 index 00000000000..6997dcb0b23 --- /dev/null +++ b/doc/classes/BakedLightmapData.xml @@ -0,0 +1,113 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/doc/classes/Curve.xml b/doc/classes/Curve.xml index f7ef9a182cd..8a007cc5cc4 100644 --- a/doc/classes/Curve.xml +++ b/doc/classes/Curve.xml @@ -107,9 +107,9 @@ - Returns the y value for the point that would exist at x-position [code]offset[/code] along the curve using the baked cache. Bakes the curve's points if not already baked. + Returns the y value for the point that would exist at x-position [code]offset[/code] along the curve using the baked cache. Bakes the curve's points if not already baked. diff --git a/doc/classes/HTTPClient.xml b/doc/classes/HTTPClient.xml index 9d4b45a8d7a..80f6966e128 100644 --- a/doc/classes/HTTPClient.xml +++ b/doc/classes/HTTPClient.xml @@ -26,7 +26,7 @@ - + @@ -35,6 +35,7 @@ Connect to a host. This needs to be done before any requests are sent. The host should not have http:// prepended but will strip the protocol identifier if provided. + If no [code]port[/code] is specified (or [code]-1[/code] is used), it is automatically set to 80 for HTTP and 443 for HTTPS (if [code]use_ssl[/code] is enabled). [code]verify_host[/code] will check the SSL identity of the host if set to [code]true[/code]. diff --git a/doc/classes/Light.xml b/doc/classes/Light.xml index e4f92cc9b3a..4aa39ffff66 100644 --- a/doc/classes/Light.xml +++ b/doc/classes/Light.xml @@ -15,6 +15,8 @@ + + @@ -71,5 +73,11 @@ + + + + + + diff --git a/doc/classes/PacketPeer.xml b/doc/classes/PacketPeer.xml index 891f0c9ffcd..57d88d7ff8b 100644 --- a/doc/classes/PacketPeer.xml +++ b/doc/classes/PacketPeer.xml @@ -18,7 +18,7 @@ Return the number of packets currently available in the ring-buffer. - + @@ -32,7 +32,7 @@ Return the error state of the last packet received (via [method get_packet] and [method get_var]). - + diff --git a/doc/classes/SceneState.xml b/doc/classes/SceneState.xml index 4fcaaa23dca..f5cf2dbee4b 100644 --- a/doc/classes/SceneState.xml +++ b/doc/classes/SceneState.xml @@ -88,6 +88,14 @@ Returns the list of group names associated with the node at [code]idx[/code]. + + + + + + + + diff --git a/doc/classes/ScriptEditor.xml b/doc/classes/ScriptEditor.xml index 0b035f90d23..81b0b3d0c32 100644 --- a/doc/classes/ScriptEditor.xml +++ b/doc/classes/ScriptEditor.xml @@ -57,6 +57,16 @@ Returns an array with all [Script] objects which are currently open in editor. + + + + + + + + + + diff --git a/doc/classes/SpatialMaterial.xml b/doc/classes/SpatialMaterial.xml index cf08b0daae2..403a6dc9300 100644 --- a/doc/classes/SpatialMaterial.xml +++ b/doc/classes/SpatialMaterial.xml @@ -75,6 +75,8 @@ + + @@ -305,13 +307,15 @@ - + + + - + - + diff --git a/doc/classes/TextEdit.xml b/doc/classes/TextEdit.xml index da30c4c7bd0..85cbeaaa031 100644 --- a/doc/classes/TextEdit.xml +++ b/doc/classes/TextEdit.xml @@ -109,6 +109,13 @@ Cut the current selection. + + + + + Clears the current selection. + + diff --git a/doc/classes/TileMap.xml b/doc/classes/TileMap.xml index 72cd56dc558..510a215fbca 100644 --- a/doc/classes/TileMap.xml +++ b/doc/classes/TileMap.xml @@ -182,6 +182,24 @@ + + + + + + + + + + + + + + + + + + diff --git a/doc/classes/VisualServer.xml b/doc/classes/VisualServer.xml index 1a9dc3a6695..0cba132de8d 100644 --- a/doc/classes/VisualServer.xml +++ b/doc/classes/VisualServer.xml @@ -2315,7 +2315,9 @@ - + + + The max value for INSTANCE_* constants, used internally. diff --git a/scene/gui/text_edit.cpp b/scene/gui/text_edit.cpp index 2ce709732cf..83aee5ca300 100644 --- a/scene/gui/text_edit.cpp +++ b/scene/gui/text_edit.cpp @@ -5468,8 +5468,10 @@ void TextEdit::_bind_methods() { ClassDB::bind_method(D_METHOD("cut"), &TextEdit::cut); ClassDB::bind_method(D_METHOD("copy"), &TextEdit::copy); ClassDB::bind_method(D_METHOD("paste"), &TextEdit::paste); - ClassDB::bind_method(D_METHOD("select_all"), &TextEdit::select_all); + ClassDB::bind_method(D_METHOD("select", "from_line", "from_column", "to_line", "to_column"), &TextEdit::select); + ClassDB::bind_method(D_METHOD("select_all"), &TextEdit::select_all); + ClassDB::bind_method(D_METHOD("deselect"), &TextEdit::deselect); ClassDB::bind_method(D_METHOD("is_selection_active"), &TextEdit::is_selection_active); ClassDB::bind_method(D_METHOD("get_selection_from_line"), &TextEdit::get_selection_from_line); @@ -5681,4 +5683,4 @@ TextEdit::TextEdit() { } TextEdit::~TextEdit() { -} \ No newline at end of file +} diff --git a/servers/visual_server.cpp b/servers/visual_server.cpp index 153cff2f221..c0b53c2d9ac 100644 --- a/servers/visual_server.cpp +++ b/servers/visual_server.cpp @@ -1820,6 +1820,7 @@ void VisualServer::_bind_methods() { BIND_ENUM_CONSTANT(INSTANCE_LIGHT); BIND_ENUM_CONSTANT(INSTANCE_REFLECTION_PROBE); BIND_ENUM_CONSTANT(INSTANCE_GI_PROBE); + BIND_ENUM_CONSTANT(INSTANCE_LIGHTMAP_CAPTURE); BIND_ENUM_CONSTANT(INSTANCE_MAX); BIND_ENUM_CONSTANT(INSTANCE_GEOMETRY_MASK); diff --git a/servers/visual_server.h b/servers/visual_server.h index ad4d32b9674..ff1f3cf0b97 100644 --- a/servers/visual_server.h +++ b/servers/visual_server.h @@ -751,7 +751,6 @@ public: INSTANCE_GI_PROBE, INSTANCE_LIGHTMAP_CAPTURE, INSTANCE_MAX, - /*INSTANCE_BAKED_LIGHT_SAMPLER,*/ INSTANCE_GEOMETRY_MASK = (1 << INSTANCE_MESH) | (1 << INSTANCE_MULTIMESH) | (1 << INSTANCE_IMMEDIATE) | (1 << INSTANCE_PARTICLES) };