diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2022-03-18 14:29:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-18 14:29:58 +0100 |
| commit | 5c8bd6fd71ac289415f0ff670442cd52bdc0d52b (patch) | |
| tree | f2b2b3c3e1f1d67b1df414d08f054c2f1f8c8331 /core/variant | |
| parent | da26fcc91a5643d592067d44d6cace34295fadda (diff) | |
| parent | f19cd44346a68a649cabfe85cc3ba7a44ceb0ca4 (diff) | |
Merge pull request #58233 from bruvzg/gde_ts
Diffstat (limited to 'core/variant')
| -rw-r--r-- | core/variant/variant_call.cpp | 2 | ||||
| -rw-r--r-- | core/variant/variant_op.cpp | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/core/variant/variant_call.cpp b/core/variant/variant_call.cpp index 17be51eba6..a02f9c5823 100644 --- a/core/variant/variant_call.cpp +++ b/core/variant/variant_call.cpp @@ -1467,6 +1467,8 @@ static void _register_variant_builtin_methods() { bind_static_method(String, num_scientific, sarray("number"), varray()); bind_static_method(String, num, sarray("number", "decimals"), varray(-1)); + bind_static_method(String, num_int64, sarray("number", "base", "capitalize_hex"), varray(10, false)); + bind_static_method(String, num_uint64, sarray("number", "base", "capitalize_hex"), varray(10, false)); bind_static_method(String, chr, sarray("char"), varray()); bind_static_method(String, humanize_size, sarray("size"), varray()); diff --git a/core/variant/variant_op.cpp b/core/variant/variant_op.cpp index cd1ae9f41f..35e0319aa3 100644 --- a/core/variant/variant_op.cpp +++ b/core/variant/variant_op.cpp @@ -177,6 +177,7 @@ void Variant::_register_variant_operators() { register_op<OperatorEvaluatorAdd<double, double, double>>(Variant::OP_ADD, Variant::FLOAT, Variant::FLOAT); register_op<OperatorEvaluatorAdd<String, String, String>>(Variant::OP_ADD, Variant::STRING, Variant::STRING); register_op<OperatorEvaluatorAdd<String, char32_t, String>>(Variant::OP_ADD, Variant::INT, Variant::STRING); + register_op<OperatorEvaluatorAdd<String, String, char32_t>>(Variant::OP_ADD, Variant::STRING, Variant::INT); register_op<OperatorEvaluatorAdd<Vector2, Vector2, Vector2>>(Variant::OP_ADD, Variant::VECTOR2, Variant::VECTOR2); register_op<OperatorEvaluatorAdd<Vector2i, Vector2i, Vector2i>>(Variant::OP_ADD, Variant::VECTOR2I, Variant::VECTOR2I); register_op<OperatorEvaluatorAdd<Vector3, Vector3, Vector3>>(Variant::OP_ADD, Variant::VECTOR3, Variant::VECTOR3); |