From ae7664597ed15f9ac779a9bac0595ab4125457c4 Mon Sep 17 00:00:00 2001
From: Lars Müller <34514239+appgurueu@users.noreply.github.com>
Date: Wed, 4 May 2022 13:44:14 +0200
Subject: Add vector.combine (#11920)

---
 doc/client_lua_api.txt | 1 +
 doc/lua_api.txt        | 3 +++
 2 files changed, 4 insertions(+)

(limited to 'doc')

diff --git a/doc/client_lua_api.txt b/doc/client_lua_api.txt
index e3cc2dd16..d08cd9b5e 100644
--- a/doc/client_lua_api.txt
+++ b/doc/client_lua_api.txt
@@ -580,6 +580,7 @@ Spatial Vectors
 * `vector.floor(v)`: returns a vector, each dimension rounded down
 * `vector.round(v)`: returns a vector, each dimension rounded to nearest int
 * `vector.apply(v, func)`: returns a vector
+* `vector.combine(v, w, func)`: returns a vector
 * `vector.equals(v1, v2)`: returns a boolean
 
 For the following functions `x` can be either a vector or a number:
diff --git a/doc/lua_api.txt b/doc/lua_api.txt
index 339ce8a27..e95c5ced8 100644
--- a/doc/lua_api.txt
+++ b/doc/lua_api.txt
@@ -3409,6 +3409,9 @@ vectors are written like this: `(x, y, z)`:
 * `vector.apply(v, func)`:
     * Returns a vector where the function `func` has been applied to each
       component.
+* `vector.combine(v, w, func)`:
+	* Returns a vector where the function `func` has combined both components of `v` and `w`
+	  for each component
 * `vector.equals(v1, v2)`:
     * Returns a boolean, `true` if the vectors are identical.
 * `vector.sort(v1, v2)`:
-- 
cgit v1.2.3