summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--AUTHORS.md2
-rw-r--r--doc/classes/Polygon2D.xml6
-rw-r--r--modules/gdnative/config.py2
-rw-r--r--modules/gdnative/doc_classes/ResourceFormatLoaderVideoStreamGDNative.xml15
-rw-r--r--modules/gdnative/doc_classes/VideoStreamGDNative.xml29
5 files changed, 51 insertions, 3 deletions
diff --git a/AUTHORS.md b/AUTHORS.md
index 00fe8297be..7859a3cd37 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -56,6 +56,7 @@ name is available.
Emmanuel Leblond (touilleMan)
Eric Lasota (elasota)
est31
+ Fabian Mathews (supagu)
Fabio Alessandrelli (Faless)
Ferenc Arn (tagcup)
Franklin Sobrinho (TheHX)
@@ -123,7 +124,6 @@ name is available.
Saniko (sanikoyes)
SaracenOne
sersoong
- supagu
Theo Hallenius (TheoXD)
Thomas Herzog (karroffel)
Timo (toger5)
diff --git a/doc/classes/Polygon2D.xml b/doc/classes/Polygon2D.xml
index c63d66ff5b..9803837e5d 100644
--- a/doc/classes/Polygon2D.xml
+++ b/doc/classes/Polygon2D.xml
@@ -87,6 +87,8 @@
<member name="color" type="Color" setter="set_color" getter="get_color">
The polygon's fill color. If [code]texture[/code] is defined, it will be multiplied by this color. It will also be the default color for vertices not set in [code]vertex_colors[/code].
</member>
+ <member name="internal_vertex_count" type="int" setter="set_internal_vertex_count" getter="get_internal_vertex_count">
+ </member>
<member name="invert_border" type="float" setter="set_invert_border" getter="get_invert_border">
Added padding applied to the bounding box when using [code]invert[/code]. Setting this value too small may result in a "Bad Polygon" error. Default value: [code]100[/code].
</member>
@@ -99,9 +101,9 @@
<member name="polygon" type="PoolVector2Array" setter="set_polygon" getter="get_polygon">
The polygon's list of vertices. The final point will be connected to the first.
</member>
- <member name="skeleton" type="NodePath" setter="set_skeleton" getter="get_skeleton">
+ <member name="polygons" type="Array" setter="set_polygons" getter="get_polygons">
</member>
- <member name="splits" type="PoolIntArray" setter="set_splits" getter="get_splits">
+ <member name="skeleton" type="NodePath" setter="set_skeleton" getter="get_skeleton">
</member>
<member name="texture" type="Texture" setter="set_texture" getter="get_texture">
The polygon's fill texture. Use [code]uv[/code] to set texture coordinates.
diff --git a/modules/gdnative/config.py b/modules/gdnative/config.py
index 701a13d32f..a36e76287a 100644
--- a/modules/gdnative/config.py
+++ b/modules/gdnative/config.py
@@ -13,7 +13,9 @@ def get_doc_classes():
"NativeScript",
"PacketPeerGDNative",
"PluginScript",
+ "ResourceFormatLoaderVideoStreamGDNative",
"StreamPeerGDNative",
+ "VideoStreamGDNative",
]
def get_doc_path():
diff --git a/modules/gdnative/doc_classes/ResourceFormatLoaderVideoStreamGDNative.xml b/modules/gdnative/doc_classes/ResourceFormatLoaderVideoStreamGDNative.xml
new file mode 100644
index 0000000000..61a7f60499
--- /dev/null
+++ b/modules/gdnative/doc_classes/ResourceFormatLoaderVideoStreamGDNative.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class name="ResourceFormatLoaderVideoStreamGDNative" inherits="ResourceFormatLoader" category="Core" version="3.1">
+ <brief_description>
+ </brief_description>
+ <description>
+ </description>
+ <tutorials>
+ </tutorials>
+ <demos>
+ </demos>
+ <methods>
+ </methods>
+ <constants>
+ </constants>
+</class>
diff --git a/modules/gdnative/doc_classes/VideoStreamGDNative.xml b/modules/gdnative/doc_classes/VideoStreamGDNative.xml
new file mode 100644
index 0000000000..20575c768b
--- /dev/null
+++ b/modules/gdnative/doc_classes/VideoStreamGDNative.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class name="VideoStreamGDNative" inherits="VideoStream" category="Core" version="3.1">
+ <brief_description>
+ </brief_description>
+ <description>
+ </description>
+ <tutorials>
+ </tutorials>
+ <demos>
+ </demos>
+ <methods>
+ <method name="get_file">
+ <return type="String">
+ </return>
+ <description>
+ </description>
+ </method>
+ <method name="set_file">
+ <return type="void">
+ </return>
+ <argument index="0" name="file" type="String">
+ </argument>
+ <description>
+ </description>
+ </method>
+ </methods>
+ <constants>
+ </constants>
+</class>