mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-05 06:40:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'fix_teal_bindings' into 'master'

Browse Source 
Fix Teal bindings and documentation typos

See merge request OpenMW/openmw!3208
This commit is contained in:
psi29a 2023-07-08 19:11:55 +00:00
commit 5c9dbdaceb
5 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CI/teal_ci.sh
View File

@ -1,3 +1,5 @@
set -e
docs/source/install_luadocumentor_in_docker.sh docs/source/install_luadocumentor_in_docker.sh
PATH=$PATH:~/luarocks/bin PATH=$PATH:~/luarocks/bin

2
files/data/scripts/omw/activationhandlers.lua
View File

@ -71,7 +71,7 @@ return {
-- If `handler(object, actor)` returns false, other handlers for -- If `handler(object, actor)` returns false, other handlers for
-- the same object (including type handlers) will be skipped. -- the same object (including type handlers) will be skipped.
-- @function [parent=#Activation] addHandlerForType -- @function [parent=#Activation] addHandlerForType
-- @param #userdata type A type from the `openmw.types` package. -- @param #any type A type from the `openmw.types` package.
-- @param #function handler The handler. -- @param #function handler The handler.
addHandlerForType = function(type, handler) addHandlerForType = function(type, handler)
local handlers = handlersPerType[type] local handlers = handlersPerType[type]

2
files/lua_api/openmw/interfaces.lua
View File

@ -3,7 +3,7 @@
-- @usage local I = require('openmw.interfaces') -- @usage local I = require('openmw.interfaces')
--- ---
-- @field [parent=#interfaces] scripts.omw.ai#scripts.omw.activationhandlers Activation -- @field [parent=#interfaces] scripts.omw.activationhandlers#scripts.omw.activationhandlers Activation
--- ---
-- @field [parent=#interfaces] scripts.omw.ai#scripts.omw.ai AI -- @field [parent=#interfaces] scripts.omw.ai#scripts.omw.ai AI

4
files/lua_api/openmw/types.lua
View File

@ -944,7 +944,7 @@
-- @field #string icon VFS path to the icon -- @field #string icon VFS path to the icon
-- @field #number weight -- @field #number weight
-- @field #number value -- @field #number value
-- @field #list<openmw.core#MagicEffectWithParam> effects The effects (@{#list<openmw.core#MagicEffectWithParam>}) of the ingredient -- @field #list<openmw.core#MagicEffectWithParams> effects The effects (@{#list<openmw.core#MagicEffectWithParams>}) of the ingredient
--- @{#Lockable} functions --- @{#Lockable} functions
@ -1127,7 +1127,7 @@
-- @field #string icon VFS path to the icon -- @field #string icon VFS path to the icon
-- @field #number weight -- @field #number weight
-- @field #number value -- @field #number value
-- @field #list<openmw.core#MagicEffectWithParam> effects The effects (@{#list<openmw.core#MagicEffectWithParam>}) of the potion -- @field #list<openmw.core#MagicEffectWithParams> effects The effects (@{#list<openmw.core#MagicEffectWithParams>}) of the potion

4
files/lua_api/openmw/util.lua
View File

@ -407,14 +407,14 @@
--- ---
-- Creates a new Box with a given center and half sizes. Boxes are immutable and can not be changed after creation. -- Creates a new Box with a given center and half sizes. Boxes are immutable and can not be changed after creation.
-- @function [parent=#util] Box -- @function [parent=#util] box
-- @param #Vector3 center -- @param #Vector3 center
-- @param #Vector3 halfSize in each dimension (x, y, z) -- @param #Vector3 halfSize in each dimension (x, y, z)
-- @return #Box -- @return #Box
--- ---
-- Creates a new Box from a given transformation. Boxes are immutable and can not be changed after creation. -- Creates a new Box from a given transformation. Boxes are immutable and can not be changed after creation.
-- @function [parent=#util] Box -- @function [parent=#util] box
-- @param #Transform transform A transformation which encapsulates the boxes center pointer (translation), half sizes (scale), and rotation. -- @param #Transform transform A transformation which encapsulates the boxes center pointer (translation), half sizes (scale), and rotation.
-- @return #Box -- @return #Box
-- @usage -- @usage