diff options
| author | Gowa2017 <33367355+Gowa2017@users.noreply.github.com> | 2022-11-12 00:57:59 +0800 |
|---|---|---|
| committer | Gowa2017 <33367355+Gowa2017@users.noreply.github.com> | 2022-11-12 00:57:59 +0800 |
| commit | e59af85bd27408582a4c6020979e85c26894f8aa (patch) | |
| tree | d64f7f8d6f1c25003c1df4053828fb10d4d8ac83 /meta | |
| parent | 9b8b14de03df10b04c365ff83dc2feec34fce834 (diff) | |
| parent | 5e41989b246954c44d377c96572046be339fea18 (diff) | |
| download | lua-language-server-e59af85bd27408582a4c6020979e85c26894f8aa.zip | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/3rd/lovr/library/lovr/filesystem.lua | 18 | ||||
| -rw-r--r-- | meta/3rd/lovr/library/lovr/graphics.lua | 1 | ||||
| -rw-r--r-- | meta/3rd/lovr/library/lovr/physics.lua | 4 |
3 files changed, 12 insertions, 11 deletions
diff --git a/meta/3rd/lovr/library/lovr/filesystem.lua b/meta/3rd/lovr/library/lovr/filesystem.lua index 4f8214db..6364ec63 100644 --- a/meta/3rd/lovr/library/lovr/filesystem.lua +++ b/meta/3rd/lovr/library/lovr/filesystem.lua @@ -17,12 +17,22 @@ --- <tr> --- <td>macOS</td> --- <td><code>/Users/<user>/Library/Application Support/LOVR/<identity></code></td> +--- </tr> +--- <tr> +--- <td>Linux</td> +--- <td><code>/home/<user>/.local/share/LOVR/<identity></code></td> +--- </tr> +--- <tr> +--- <td>Android</td> +--- <td><code>/sdcard/Android/data/<identity>/files</code></td> --- </tr> </table> --- ---`<identity>` should be a unique identifier for your app. --- ---It can be set either in `lovr.conf` or by using `lovr.filesystem.setIdentity`. --- +---On Android, the identity can not be changed and will always be the package id, like `org.lovr.app`. +--- ---All filenames are relative to either the save directory or the directory containing the project source. --- ---Files in the save directory take precedence over files in the project. @@ -279,14 +289,6 @@ function lovr.filesystem.setIdentity(identity) end function lovr.filesystem.setRequirePath(path) end --- ----Sets the location of the project's source. ---- ----This can only be done once, and is usually done internally. ---- ----@param identity string # The path containing the project's source. -function lovr.filesystem.setSource(identity) end - ---- ---Unmounts a directory or archive previously mounted with `lovr.filesystem.mount`. --- --- diff --git a/meta/3rd/lovr/library/lovr/graphics.lua b/meta/3rd/lovr/library/lovr/graphics.lua index 2ebe5dec..1c8db722 100644 --- a/meta/3rd/lovr/library/lovr/graphics.lua +++ b/meta/3rd/lovr/library/lovr/graphics.lua @@ -462,7 +462,6 @@ function lovr.graphics.newMaterial(properties) end --- ---- glTF: Morph targets are not supported. ---- glTF: Only the default scene is loaded. ----- glTF: Only the default scene is loaded. ---- glTF: Currently, each skin in a Model can have up to 256 joints. ---- glTF: Meshes can't appear multiple times in the node hierarchy with different skins, they need --- to use 1 skin consistently. diff --git a/meta/3rd/lovr/library/lovr/physics.lua b/meta/3rd/lovr/library/lovr/physics.lua index 5ec53ce6..4977380d 100644 --- a/meta/3rd/lovr/library/lovr/physics.lua +++ b/meta/3rd/lovr/library/lovr/physics.lua @@ -1411,8 +1411,8 @@ function World:getResponseTime() end --- ---The default step count is 20. --- ----@param steps number # The step count. -function World:getStepCount(steps) end +---@return number steps # The step count. +function World:getStepCount() end --- ---Returns the tightness of joints in the World. |