Update files to Godot 3.4.5-stable (3.4 branch)

(cherry picked from commit e00386d464)
(cherry picked from commit 26b49b9ac6)

android/godot_android.h

@@ -28,8 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#ifndef GODOT_ANDROID_H
-#define GODOT_ANDROID_H
+#ifndef GODOT_ANDROID_GDN_H
+#define GODOT_ANDROID_GDN_H
 
 #include <gdnative/gdnative.h>
 
@@ -53,4 +53,4 @@ bool GDAPI godot_android_is_activity_resumed();
 }
 #endif
 
-#endif // GODOT_ANDROID_H
+#endif /* !GODOT_ANDROID_GDN_H */

arvr/godot_arvr.h

@@ -28,8 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#ifndef GODOT_ARVR_H
-#define GODOT_ARVR_H
+#ifndef GODOT_NATIVEARVR_H
+#define GODOT_NATIVEARVR_H
 
 #include <gdnative/gdnative.h>
 
@@ -95,4 +95,4 @@ godot_int GDAPI godot_arvr_get_depthid(godot_rid *p_render_target);
 }
 #endif
 
-#endif // GODOT_ARVR_H
+#endif /* !GODOT_NATIVEARVR_H */

gdnative/aabb.h

@@ -28,8 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#ifndef GDNATIVE_AABB_H
-#define GDNATIVE_AABB_H
+#ifndef GODOT_AABB_H
+#define GODOT_AABB_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -115,4 +115,4 @@ godot_bool GDAPI godot_aabb_operator_equal(const godot_aabb *p_self, const godot
 }
 #endif
 
-#endif // GDNATIVE_AABB_H
+#endif // GODOT_AABB_H

gdnative/array.h

@@ -28,8 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#ifndef GDNATIVE_ARRAY_H
-#define GDNATIVE_ARRAY_H
+#ifndef GODOT_ARRAY_H
+#define GODOT_ARRAY_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -144,4 +144,4 @@ void GDAPI godot_array_shuffle(godot_array *p_self);
 }
 #endif
 
-#endif // GDNATIVE_ARRAY_H
+#endif // GODOT_ARRAY_H

gdnative/basis.h

@@ -28,8 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#ifndef GDNATIVE_BASIS_H
-#define GDNATIVE_BASIS_H
+#ifndef GODOT_BASIS_H
+#define GODOT_BASIS_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -133,4 +133,4 @@ godot_basis GDAPI godot_basis_slerp(const godot_basis *p_self, const godot_basis
 }
 #endif
 
-#endif // GDNATIVE_BASIS_H
+#endif // GODOT_BASIS_H

gdnative/color.h

@@ -28,8 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#ifndef GDNATIVE_COLOR_H
-#define GDNATIVE_COLOR_H
+#ifndef GODOT_COLOR_H
+#define GODOT_COLOR_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -117,4 +117,4 @@ godot_bool GDAPI godot_color_operator_less(const godot_color *p_self, const godo
 }
 #endif
 
-#endif // GDNATIVE_COLOR_H
+#endif // GODOT_COLOR_H

gdnative/dictionary.h

@@ -28,8 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#ifndef GDNATIVE_DICTIONARY_H
-#define GDNATIVE_DICTIONARY_H
+#ifndef GODOT_DICTIONARY_H
+#define GODOT_DICTIONARY_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -102,12 +102,8 @@ godot_bool GDAPI godot_dictionary_erase_with_return(godot_dictionary *p_self, co
 
 godot_variant GDAPI godot_dictionary_get_with_default(const godot_dictionary *p_self, const godot_variant *p_key, const godot_variant *p_default);
 
-// GDNative core 1.3
-
-void GDAPI godot_dictionary_merge(godot_dictionary *p_self, const godot_dictionary *p_dictionary, const godot_bool p_overwrite);
-
 #ifdef __cplusplus
 }
 #endif
 
-#endif // GDNATIVE_DICTIONARY_H
+#endif // GODOT_DICTIONARY_H

gdnative/gdnative.h

@@ -28,8 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#ifndef GDNATIVE_GDNATIVE_H
-#define GDNATIVE_GDNATIVE_H
+#ifndef GODOT_GDNATIVE_H
+#define GODOT_GDNATIVE_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -53,15 +53,13 @@ extern "C" {
 #endif
 
 // This is for libraries *using* the header, NOT GODOT EXPOSING STUFF!!
-#if !defined(GDN_EXPORT)
-#if defined(_WIN32)
-#define GDN_EXPORT __declspec(dllexport)
-#elif defined(__GNUC__)
+#ifdef __GNUC__
 #define GDN_EXPORT __attribute__((visibility("default")))
+#elif defined(_WIN32)
+#define GDN_EXPORT __declspec(dllexport)
 #else
 #define GDN_EXPORT
 #endif
-#endif
 
 #include <stdbool.h>
 #include <stdint.h>
@@ -301,4 +299,4 @@ godot_object GDAPI *godot_instance_from_id(godot_int p_instance_id);
 }
 #endif
 
-#endif // GDNATIVE_GDNATIVE_H
+#endif // GODOT_C_H

gdnative/node_path.h

@@ -28,8 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#ifndef GDNATIVE_NODE_PATH_H
-#define GDNATIVE_NODE_PATH_H
+#ifndef GODOT_NODE_PATH_H
+#define GODOT_NODE_PATH_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -86,4 +86,4 @@ godot_node_path godot_node_path_get_as_property_path(const godot_node_path *p_se
 }
 #endif
 
-#endif // GDNATIVE_NODE_PATH_H
+#endif // GODOT_NODE_PATH_H

gdnative/plane.h

@@ -28,8 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#ifndef GDNATIVE_PLANE_H
-#define GDNATIVE_PLANE_H
+#ifndef GODOT_PLANE_H
+#define GODOT_PLANE_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -100,4 +100,4 @@ void GDAPI godot_plane_set_d(godot_plane *p_self, const godot_real p_d);
 }
 #endif
 
-#endif // GDNATIVE_PLANE_H
+#endif // GODOT_PLANE_H

gdnative/pool_arrays.h

@@ -28,8 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#ifndef GDNATIVE_POOL_ARRAYS_H
-#define GDNATIVE_POOL_ARRAYS_H
+#ifndef GODOT_POOL_ARRAYS_H
+#define GODOT_POOL_ARRAYS_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -182,8 +182,6 @@ void GDAPI godot_pool_byte_array_remove(godot_pool_byte_array *p_self, const god
 
 void GDAPI godot_pool_byte_array_resize(godot_pool_byte_array *p_self, const godot_int p_size);
 
-void GDAPI godot_pool_byte_array_sort(godot_pool_byte_array *p_self);
-
 godot_pool_byte_array_read_access GDAPI *godot_pool_byte_array_read(const godot_pool_byte_array *p_self);
 
 godot_pool_byte_array_write_access GDAPI *godot_pool_byte_array_write(godot_pool_byte_array *p_self);
@@ -195,8 +193,6 @@ godot_int GDAPI godot_pool_byte_array_size(const godot_pool_byte_array *p_self);
 
 godot_bool GDAPI godot_pool_byte_array_empty(const godot_pool_byte_array *p_self);
 
-godot_bool GDAPI godot_pool_byte_array_has(const godot_pool_byte_array *p_self, const uint8_t p_data);
-
 void GDAPI godot_pool_byte_array_destroy(godot_pool_byte_array *p_self);
 
 // int
@@ -219,8 +215,6 @@ void GDAPI godot_pool_int_array_remove(godot_pool_int_array *p_self, const godot
 
 void GDAPI godot_pool_int_array_resize(godot_pool_int_array *p_self, const godot_int p_size);
 
-void GDAPI godot_pool_int_array_sort(godot_pool_int_array *p_self);
-
 godot_pool_int_array_read_access GDAPI *godot_pool_int_array_read(const godot_pool_int_array *p_self);
 
 godot_pool_int_array_write_access GDAPI *godot_pool_int_array_write(godot_pool_int_array *p_self);
@@ -232,8 +226,6 @@ godot_int GDAPI godot_pool_int_array_size(const godot_pool_int_array *p_self);
 
 godot_bool GDAPI godot_pool_int_array_empty(const godot_pool_int_array *p_self);
 
-godot_bool GDAPI godot_pool_int_array_has(const godot_pool_int_array *p_self, const godot_int p_data);
-
 void GDAPI godot_pool_int_array_destroy(godot_pool_int_array *p_self);
 
 // real
@@ -256,8 +248,6 @@ void GDAPI godot_pool_real_array_remove(godot_pool_real_array *p_self, const god
 
 void GDAPI godot_pool_real_array_resize(godot_pool_real_array *p_self, const godot_int p_size);
 
-void GDAPI godot_pool_real_array_sort(godot_pool_real_array *p_self);
-
 godot_pool_real_array_read_access GDAPI *godot_pool_real_array_read(const godot_pool_real_array *p_self);
 
 godot_pool_real_array_write_access GDAPI *godot_pool_real_array_write(godot_pool_real_array *p_self);
@@ -269,8 +259,6 @@ godot_int GDAPI godot_pool_real_array_size(const godot_pool_real_array *p_self);
 
 godot_bool GDAPI godot_pool_real_array_empty(const godot_pool_real_array *p_self);
 
-godot_bool GDAPI godot_pool_real_array_has(const godot_pool_real_array *p_self, const godot_real p_data);
-
 void GDAPI godot_pool_real_array_destroy(godot_pool_real_array *p_self);
 
 // string
@@ -287,16 +275,12 @@ godot_error GDAPI godot_pool_string_array_insert(godot_pool_string_array *p_self
 
 void GDAPI godot_pool_string_array_invert(godot_pool_string_array *p_self);
 
-godot_string GDAPI godot_pool_string_array_join(const godot_pool_string_array *p_self, const godot_string *p_delimiter);
-
 void GDAPI godot_pool_string_array_push_back(godot_pool_string_array *p_self, const godot_string *p_data);
 
 void GDAPI godot_pool_string_array_remove(godot_pool_string_array *p_self, const godot_int p_idx);
 
 void GDAPI godot_pool_string_array_resize(godot_pool_string_array *p_self, const godot_int p_size);
 
-void GDAPI godot_pool_string_array_sort(godot_pool_string_array *p_self);
-
 godot_pool_string_array_read_access GDAPI *godot_pool_string_array_read(const godot_pool_string_array *p_self);
 
 godot_pool_string_array_write_access GDAPI *godot_pool_string_array_write(godot_pool_string_array *p_self);
@@ -308,8 +292,6 @@ godot_int GDAPI godot_pool_string_array_size(const godot_pool_string_array *p_se
 
 godot_bool GDAPI godot_pool_string_array_empty(const godot_pool_string_array *p_self);
 
-godot_bool GDAPI godot_pool_string_array_has(const godot_pool_string_array *p_self, const godot_string *p_data);
-
 void GDAPI godot_pool_string_array_destroy(godot_pool_string_array *p_self);
 
 // vector2
@@ -332,8 +314,6 @@ void GDAPI godot_pool_vector2_array_remove(godot_pool_vector2_array *p_self, con
 
 void GDAPI godot_pool_vector2_array_resize(godot_pool_vector2_array *p_self, const godot_int p_size);
 
-void GDAPI godot_pool_vector2_array_sort(godot_pool_vector2_array *p_self);
-
 godot_pool_vector2_array_read_access GDAPI *godot_pool_vector2_array_read(const godot_pool_vector2_array *p_self);
 
 godot_pool_vector2_array_write_access GDAPI *godot_pool_vector2_array_write(godot_pool_vector2_array *p_self);
@@ -345,8 +325,6 @@ godot_int GDAPI godot_pool_vector2_array_size(const godot_pool_vector2_array *p_
 
 godot_bool GDAPI godot_pool_vector2_array_empty(const godot_pool_vector2_array *p_self);
 
-godot_bool GDAPI godot_pool_vector2_array_has(const godot_pool_vector2_array *p_self, const godot_vector2 *p_data);
-
 void GDAPI godot_pool_vector2_array_destroy(godot_pool_vector2_array *p_self);
 
 // vector3
@@ -369,8 +347,6 @@ void GDAPI godot_pool_vector3_array_remove(godot_pool_vector3_array *p_self, con
 
 void GDAPI godot_pool_vector3_array_resize(godot_pool_vector3_array *p_self, const godot_int p_size);
 
-void GDAPI godot_pool_vector3_array_sort(godot_pool_vector3_array *p_self);
-
 godot_pool_vector3_array_read_access GDAPI *godot_pool_vector3_array_read(const godot_pool_vector3_array *p_self);
 
 godot_pool_vector3_array_write_access GDAPI *godot_pool_vector3_array_write(godot_pool_vector3_array *p_self);
@@ -382,8 +358,6 @@ godot_int GDAPI godot_pool_vector3_array_size(const godot_pool_vector3_array *p_
 
 godot_bool GDAPI godot_pool_vector3_array_empty(const godot_pool_vector3_array *p_self);
 
-godot_bool GDAPI godot_pool_vector3_array_has(const godot_pool_vector3_array *p_self, const godot_vector3 *p_data);
-
 void GDAPI godot_pool_vector3_array_destroy(godot_pool_vector3_array *p_self);
 
 // color
@@ -406,8 +380,6 @@ void GDAPI godot_pool_color_array_remove(godot_pool_color_array *p_self, const g
 
 void GDAPI godot_pool_color_array_resize(godot_pool_color_array *p_self, const godot_int p_size);
 
-void GDAPI godot_pool_color_array_sort(godot_pool_color_array *p_self);
-
 godot_pool_color_array_read_access GDAPI *godot_pool_color_array_read(const godot_pool_color_array *p_self);
 
 godot_pool_color_array_write_access GDAPI *godot_pool_color_array_write(godot_pool_color_array *p_self);
@@ -419,8 +391,6 @@ godot_int GDAPI godot_pool_color_array_size(const godot_pool_color_array *p_self
 
 godot_bool GDAPI godot_pool_color_array_empty(const godot_pool_color_array *p_self);
 
-godot_bool GDAPI godot_pool_color_array_has(const godot_pool_color_array *p_self, const godot_color *p_data);
-
 void GDAPI godot_pool_color_array_destroy(godot_pool_color_array *p_self);
 
 //
@@ -505,4 +475,4 @@ void GDAPI godot_pool_color_array_write_access_destroy(godot_pool_color_array_wr
 }
 #endif
 
-#endif // GDNATIVE_POOL_ARRAYS_H
+#endif // GODOT_POOL_ARRAYS_H

gdnative/quat.h

@@ -28,8 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#ifndef GDNATIVE_QUAT_H
-#define GDNATIVE_QUAT_H
+#ifndef GODOT_QUAT_H
+#define GODOT_QUAT_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -115,4 +115,4 @@ void GDAPI godot_quat_set_axis_angle(godot_quat *p_self, const godot_vector3 *p_
 }
 #endif
 
-#endif // GDNATIVE_QUAT_H
+#endif // GODOT_QUAT_H

gdnative/rect2.h

@@ -28,8 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#ifndef GDNATIVE_RECT2_H
-#define GDNATIVE_RECT2_H
+#ifndef GODOT_RECT2_H
+#define GODOT_RECT2_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -99,4 +99,4 @@ void GDAPI godot_rect2_set_size(godot_rect2 *p_self, const godot_vector2 *p_size
 }
 #endif
 
-#endif // GDNATIVE_RECT2_H
+#endif // GODOT_RECT2_H

gdnative/rid.h

@@ -28,8 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#ifndef GDNATIVE_RID_H
-#define GDNATIVE_RID_H
+#ifndef GODOT_RID_H
+#define GODOT_RID_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -71,4 +71,4 @@ godot_bool GDAPI godot_rid_operator_less(const godot_rid *p_self, const godot_ri
 }
 #endif
 
-#endif // GDNATIVE_RID_H
+#endif // GODOT_RID_H

gdnative/string.h

@@ -28,8 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#ifndef GDNATIVE_STRING_H
-#define GDNATIVE_STRING_H
+#ifndef GODOT_STRING_H
+#define GODOT_STRING_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -129,8 +129,6 @@ godot_string GDAPI godot_string_md5(const uint8_t *p_md5);
 godot_string GDAPI godot_string_num(double p_num);
 godot_string GDAPI godot_string_num_int64(int64_t p_num, godot_int p_base);
 godot_string GDAPI godot_string_num_int64_capitalized(int64_t p_num, godot_int p_base, godot_bool p_capitalize_hex);
-godot_string GDAPI godot_string_num_uint64(uint64_t p_num, godot_int p_base);
-godot_string GDAPI godot_string_num_uint64_capitalized(uint64_t p_num, godot_int p_base, godot_bool p_capitalize_hex);
 godot_string GDAPI godot_string_num_real(double p_num);
 godot_string GDAPI godot_string_num_scientific(double p_num);
 godot_string GDAPI godot_string_num_with_decimals(double p_num, godot_int p_decimals);
@@ -181,8 +179,6 @@ godot_array GDAPI godot_string_split_ints_mk(const godot_string *p_self, const g
 godot_array GDAPI godot_string_split_ints_mk_allows_empty(const godot_string *p_self, const godot_array *p_splitters);
 godot_array GDAPI godot_string_split_spaces(const godot_string *p_self);
 
-godot_string GDAPI godot_string_join(const godot_string *p_self, const godot_array *p_parts);
-
 wchar_t GDAPI godot_string_char_lowercase(wchar_t p_char);
 wchar_t GDAPI godot_string_char_uppercase(wchar_t p_char);
 godot_string GDAPI godot_string_to_lower(const godot_string *p_self);
@@ -264,4 +260,4 @@ void GDAPI godot_string_destroy(godot_string *p_self);
 }
 #endif
 
-#endif // GDNATIVE_STRING_H
+#endif // GODOT_STRING_H

gdnative/string_name.h

@@ -28,8 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#ifndef GDNATIVE_STRING_NAME_H
-#define GDNATIVE_STRING_NAME_H
+#ifndef GODOT_STRING_NAME_H
+#define GODOT_STRING_NAME_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -75,4 +75,4 @@ void GDAPI godot_string_name_destroy(godot_string_name *p_self);
 }
 #endif
 
-#endif // GDNATIVE_STRING_NAME_H
+#endif // GODOT_STRING_NAME_H

gdnative/transform.h

@@ -28,8 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#ifndef GDNATIVE_TRANSFORM_H
-#define GDNATIVE_TRANSFORM_H
+#ifndef GODOT_TRANSFORM_H
+#define GODOT_TRANSFORM_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -108,4 +108,4 @@ godot_aabb GDAPI godot_transform_xform_inv_aabb(const godot_transform *p_self, c
 }
 #endif
 
-#endif // GDNATIVE_TRANSFORM_H
+#endif // GODOT_TRANSFORM_H

gdnative/transform2d.h

@@ -28,8 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#ifndef GDNATIVE_TRANSFORM2D_H
-#define GDNATIVE_TRANSFORM2D_H
+#ifndef GODOT_TRANSFORM2D_H
+#define GODOT_TRANSFORM2D_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -106,4 +106,4 @@ godot_rect2 GDAPI godot_transform2d_xform_inv_rect2(const godot_transform2d *p_s
 }
 #endif
 
-#endif // GDNATIVE_TRANSFORM2D_H
+#endif // GODOT_TRANSFORM2D_H

gdnative/variant.h

@@ -28,8 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#ifndef GDNATIVE_VARIANT_H
-#define GDNATIVE_VARIANT_H
+#ifndef GODOT_VARIANT_H
+#define GODOT_VARIANT_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -252,4 +252,4 @@ void GDAPI godot_variant_evaluate(godot_variant_operator p_op, const godot_varia
 }
 #endif
 
-#endif // GDNATIVE_VARIANT_H
+#endif

gdnative/vector2.h

@@ -28,8 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#ifndef GDNATIVE_VECTOR2_H
-#define GDNATIVE_VECTOR2_H
+#ifndef GODOT_VECTOR2_H
+#define GODOT_VECTOR2_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -139,4 +139,4 @@ godot_real GDAPI godot_vector2_get_y(const godot_vector2 *p_self);
 }
 #endif
 
-#endif // GDNATIVE_VECTOR2_H
+#endif // GODOT_VECTOR2_H

gdnative/vector3.h

@@ -28,8 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#ifndef GDNATIVE_VECTOR3_H
-#define GDNATIVE_VECTOR3_H
+#ifndef GODOT_VECTOR3_H
+#define GODOT_VECTOR3_H
 
 #ifdef __cplusplus
 extern "C" {
@@ -146,4 +146,4 @@ godot_real GDAPI godot_vector3_get_axis(const godot_vector3 *p_self, const godot
 }
 #endif
 
-#endif // GDNATIVE_VECTOR3_H
+#endif // GODOT_VECTOR3_H

gdnative_api.json

@@ -17,163 +17,7 @@
           "major": 1,
           "minor": 2
         },
-        "next": {
-          "type": "CORE",
-          "version": {
-            "major": 1,
-            "minor": 3
-          },
-          "next": null,
-          "api": [
-            {
-              "name": "godot_dictionary_merge",
-              "return_type": "void",
-              "arguments": [
-                ["godot_dictionary *", "p_self"],
-                ["const godot_dictionary *", "p_dictionary"],
-                ["const godot_bool", "p_overwrite"]
-              ]
-            },
-            {
-              "name": "godot_pool_byte_array_has",
-              "return_type": "godot_bool",
-              "arguments": [
-                ["const godot_pool_byte_array *", "p_self"],
-                ["const uint8_t", "p_data"]
-              ]
-            },
-            {
-              "name": "godot_pool_byte_array_sort",
-              "return_type": "void",
-              "arguments": [
-                ["godot_pool_byte_array *", "p_self"]
-              ]
-            },
-            {
-              "name": "godot_pool_int_array_has",
-              "return_type": "godot_bool",
-              "arguments": [
-                ["const godot_pool_int_array *", "p_self"],
-                ["const godot_int", "p_data"]
-              ]
-            },
-            {
-              "name": "godot_pool_int_array_sort",
-              "return_type": "void",
-              "arguments": [
-                ["godot_pool_int_array *", "p_self"]
-              ]
-            },
-            {
-              "name": "godot_pool_real_array_has",
-              "return_type": "godot_bool",
-              "arguments": [
-                ["const godot_pool_real_array *", "p_self"],
-                ["const godot_real", "p_data"]
-              ]
-            },
-            {
-              "name": "godot_pool_real_array_sort",
-              "return_type": "void",
-              "arguments": [
-                ["godot_pool_real_array *", "p_self"]
-              ]
-            },
-            {
-              "name": "godot_pool_string_array_has",
-              "return_type": "godot_bool",
-              "arguments": [
-                ["const godot_pool_string_array *", "p_self"],
-                ["const godot_string *", "p_data"]
-              ]
-            },
-            {
-              "name": "godot_pool_string_array_join",
-              "return_type": "godot_string",
-              "arguments": [
-                ["const godot_pool_string_array *", "p_self"],
-                ["const godot_string *", "p_delimiter"]
-              ]
-            },
-            {
-              "name": "godot_pool_string_array_sort",
-              "return_type": "void",
-              "arguments": [
-                ["godot_pool_string_array *", "p_self"]
-              ]
-            },
-            {
-              "name": "godot_pool_vector2_array_has",
-              "return_type": "godot_bool",
-              "arguments": [
-                ["const godot_pool_vector2_array *", "p_self"],
-                ["const godot_vector2 *", "p_data"]
-              ]
-            },
-            {
-              "name": "godot_pool_vector2_array_sort",
-              "return_type": "void",
-              "arguments": [
-                ["godot_pool_vector2_array *", "p_self"]
-              ]
-            },
-            {
-              "name": "godot_pool_vector3_array_has",
-              "return_type": "godot_bool",
-              "arguments": [
-                ["const godot_pool_vector3_array *", "p_self"],
-                ["const godot_vector3 *", "p_data"]
-              ]
-            },
-            {
-              "name": "godot_pool_vector3_array_sort",
-              "return_type": "void",
-              "arguments": [
-                ["godot_pool_vector3_array *", "p_self"]
-              ]
-            },
-            {
-              "name": "godot_pool_color_array_has",
-              "return_type": "godot_bool",
-              "arguments": [
-                ["const godot_pool_color_array *", "p_self"],
-                ["const godot_color *", "p_data"]
-              ]
-            },
-            {
-              "name": "godot_pool_color_array_sort",
-              "return_type": "void",
-              "arguments": [
-                ["godot_pool_color_array *", "p_self"]
-              ]
-            },
-            {
-              "name": "godot_string_join",
-              "return_type": "godot_string",
-              "arguments": [
-                ["const godot_string *", "p_self"],
-                ["const godot_array *", "p_parts"]
-              ]
-            },
-            {
-              "name": "godot_string_num_uint64",
-              "return_type": "godot_string",
-              "arguments": [
-                ["uint64_t", "p_num"],
-                ["godot_int", "p_base"]
-              ]
-            },
-            {
-              "name": "godot_string_num_uint64_capitalized",
-              "return_type": "godot_string",
-              "arguments": [
-                ["uint64_t", "p_num"],
-                ["godot_int", "p_base"],
-                ["godot_bool", "p_capitalize_hex"]
-              ]
-            }
-          ]
-        },
+        "next": null,
         "api": [
           {
             "name": "godot_dictionary_duplicate",

gdnative_api_struct.gen.h

@@ -157,31 +157,6 @@ typedef struct godot_gdnative_ext_net_api_struct {
 	void (*godot_net_bind_multiplayer_peer)(godot_object *p_obj, const godot_net_multiplayer_peer *p_interface);
 } godot_gdnative_ext_net_api_struct;
 
-typedef struct godot_gdnative_core_1_3_api_struct {
-	unsigned int type;
-	godot_gdnative_api_version version;
-	const godot_gdnative_api_struct *next;
-	void (*godot_dictionary_merge)(godot_dictionary *p_self, const godot_dictionary *p_dictionary, const godot_bool p_overwrite);
-	godot_bool (*godot_pool_byte_array_has)(const godot_pool_byte_array *p_self, const uint8_t p_data);
-	void (*godot_pool_byte_array_sort)(godot_pool_byte_array *p_self);
-	godot_bool (*godot_pool_int_array_has)(const godot_pool_int_array *p_self, const godot_int p_data);
-	void (*godot_pool_int_array_sort)(godot_pool_int_array *p_self);
-	godot_bool (*godot_pool_real_array_has)(const godot_pool_real_array *p_self, const godot_real p_data);
-	void (*godot_pool_real_array_sort)(godot_pool_real_array *p_self);
-	godot_bool (*godot_pool_string_array_has)(const godot_pool_string_array *p_self, const godot_string *p_data);
-	godot_string (*godot_pool_string_array_join)(const godot_pool_string_array *p_self, const godot_string *p_delimiter);
-	void (*godot_pool_string_array_sort)(godot_pool_string_array *p_self);
-	godot_bool (*godot_pool_vector2_array_has)(const godot_pool_vector2_array *p_self, const godot_vector2 *p_data);
-	void (*godot_pool_vector2_array_sort)(godot_pool_vector2_array *p_self);
-	godot_bool (*godot_pool_vector3_array_has)(const godot_pool_vector3_array *p_self, const godot_vector3 *p_data);
-	void (*godot_pool_vector3_array_sort)(godot_pool_vector3_array *p_self);
-	godot_bool (*godot_pool_color_array_has)(const godot_pool_color_array *p_self, const godot_color *p_data);
-	void (*godot_pool_color_array_sort)(godot_pool_color_array *p_self);
-	godot_string (*godot_string_join)(const godot_string *p_self, const godot_array *p_parts);
-	godot_string (*godot_string_num_uint64)(uint64_t p_num, godot_int p_base);
-	godot_string (*godot_string_num_uint64_capitalized)(uint64_t p_num, godot_int p_base, godot_bool p_capitalize_hex);
-} godot_gdnative_core_1_3_api_struct;
-
 typedef struct godot_gdnative_core_1_2_api_struct {
 	unsigned int type;
 	godot_gdnative_api_version version;

nativescript/godot_nativescript.h

@@ -61,10 +61,8 @@ typedef enum {
 	GODOT_PROPERTY_HINT_FLAGS, ///< hint_text= "flag1,flag2,etc" (as bit flags)
 	GODOT_PROPERTY_HINT_LAYERS_2D_RENDER,
 	GODOT_PROPERTY_HINT_LAYERS_2D_PHYSICS,
-	GODOT_PROPERTY_HINT_LAYERS_2D_NAVIGATION,
 	GODOT_PROPERTY_HINT_LAYERS_3D_RENDER,
 	GODOT_PROPERTY_HINT_LAYERS_3D_PHYSICS,
-	GODOT_PROPERTY_HINT_LAYERS_3D_NAVIGATION,
 	GODOT_PROPERTY_HINT_FILE, ///< a file path must be passed, hint_text (optionally) is a filter "*.png,*.wav,*.doc,"
 	GODOT_PROPERTY_HINT_DIR, ///< a directory path must be passed
 	GODOT_PROPERTY_HINT_GLOBAL_FILE, ///< a file path must be passed, hint_text (optionally) is a filter "*.png,*.wav,*.doc,"
@@ -249,4 +247,4 @@ void GDAPI godot_nativescript_profiling_add_data(const char *p_signature, uint64
 }
 #endif
 
-#endif // GODOT_NATIVESCRIPT_H
+#endif

net/godot_net.h

@@ -28,8 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#ifndef GODOT_NET_H
-#define GODOT_NET_H
+#ifndef GODOT_NATIVENET_H
+#define GODOT_NATIVENET_H
 
 #include <gdnative/gdnative.h>
 
@@ -117,4 +117,4 @@ void GDAPI godot_net_bind_multiplayer_peer(godot_object *p_obj, const godot_net_
 // WebRTC Bindings
 #include "net/godot_webrtc.h"
 
-#endif // GODOT_NET_H
+#endif /* GODOT_NATIVENET_H */

net/godot_webrtc.h

@@ -28,8 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#ifndef GODOT_WEBRTC_H
-#define GODOT_WEBRTC_H
+#ifndef GODOT_NATIVEWEBRTC_H
+#define GODOT_NATIVEWEBRTC_H
 
 #include <gdnative/gdnative.h>
 
@@ -126,4 +126,4 @@ void GDAPI godot_net_bind_webrtc_data_channel(godot_object *p_obj, const godot_n
 }
 #endif
 
-#endif // GODOT_WEBRTC_H
+#endif

videodecoder/godot_videodecoder.h

@@ -28,8 +28,8 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#ifndef GODOT_VIDEODECODER_H
-#define GODOT_VIDEODECODER_H
+#ifndef GODOT_NATIVEVIDEODECODER_H
+#define GODOT_NATIVEVIDEODECODER_H
 
 #include <gdnative/gdnative.h>
 
@@ -72,4 +72,4 @@ void GDAPI godot_videodecoder_register_decoder(const godot_videodecoder_interfac
 }
 #endif
 
-#endif // GODOT_VIDEODECODER_H
+#endif /* GODOT_NATIVEVIDEODECODER_H */