mirror of
https://gitlab.com/OpenMW/openmw.git
synced 2025-04-28 12:58:00 +03:00
Merge branch 'luadoc' into 'master'
Some checks are pending
Build and test / Ubuntu (push) Waiting to run
Build and test / MacOS (push) Waiting to run
Build and test / Read .env file and expose it as output (push) Waiting to run
Build and test / Windows (2019) (push) Blocked by required conditions
Build and test / Windows (2022) (push) Blocked by required conditions
Some checks are pending
Build and test / Ubuntu (push) Waiting to run
Build and test / MacOS (push) Waiting to run
Build and test / Read .env file and expose it as output (push) Waiting to run
Build and test / Windows (2019) (push) Blocked by required conditions
Build and test / Windows (2022) (push) Blocked by required conditions
Fix minor documentation errors See merge request OpenMW/openmw!4595
This commit is contained in:
commit
88c673de51
2 changed files with 2 additions and 2 deletions
|
@ -45,7 +45,7 @@
|
|||
-- @field [parent=#ActorControls] #boolean run true - run, false - walk
|
||||
-- @field [parent=#ActorControls] #boolean sneak If true - sneak
|
||||
-- @field [parent=#ActorControls] #boolean jump If true - initiate a jump
|
||||
-- @field [parent=#ActorControls] #ATTACK_TYPE use Activates the readied weapon/spell according to a provided value. For weapons, keeping this value modified will charge the attack until set to @{#ATTACK_TYPE.NoAttack}. If an @#ATTACK_TYPE} not appropriate for a currently equipped weapon provided - an appropriate @{#ATTACK_TYPE} will be used instead.
|
||||
-- @field [parent=#ActorControls] #ATTACK_TYPE use Activates the readied weapon/spell according to a provided value. For weapons, keeping this value modified will charge the attack until set to @{#ATTACK_TYPE.NoAttack}. If an @{#ATTACK_TYPE} not appropriate for a currently equipped weapon provided - an appropriate @{#ATTACK_TYPE} will be used instead.
|
||||
|
||||
---
|
||||
-- Enables or disables standard AI (enabled by default).
|
||||
|
|
|
@ -1123,7 +1123,7 @@
|
|||
-- @field #string id The record ID of the NPC
|
||||
-- @field #string name
|
||||
-- @field #string race
|
||||
-- @field #string class Name of the NPC's class (e. g. Acrobat)
|
||||
-- @field #string class ID of the NPC's class (e.g. acrobat)
|
||||
-- @field #string model Path to the model associated with this NPC, used for animations.
|
||||
-- @field #string mwscript MWScript on this NPC (can be nil)
|
||||
-- @field #string hair Path to the hair body part model
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue