1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-12-09 18:04:35 +00:00
Commit graph

843 commits

Author SHA1 Message Date
Evil Eye
e54decc830 Remove redundant is_automagicals 2024-03-01 12:24:36 +01:00
psi29a
03d5872a55 Merge branch 'drop_on_exit' into 'master'
Add a storage mode to drop section on game exit

See merge request OpenMW/openmw!3905
2024-02-28 20:36:40 +00:00
Evil Eye
0519e1215f Unify the creation of RefId tables 2024-02-28 17:20:46 +01:00
Evil Eye
cd118ee263 Expose races to Lua 2024-02-27 21:50:57 +01:00
Andrei Kortunov
ddd0945645 Add a storage mode to drop section on game exit 2024-02-27 23:26:22 +04:00
psi29a
f2039b35d0 Merge branch 'vfs_normalized_path_3' into 'master'
Use normalized path for correctSoundPath

See merge request OpenMW/openmw!3903
2024-02-26 11:21:33 +00:00
Alexei Kotov
01e0b25fd3 Merge branch 'coverity' into 'master'
Fix some Coverity complaints

See merge request OpenMW/openmw!3904
2024-02-24 20:25:58 +00:00
elsid
ec9c829021
Use normalized path for correctSoundPath 2024-02-24 12:42:36 +01:00
Andrei Kortunov
cf6b6020a0 Move local variables 2024-02-23 17:10:55 +04:00
Andrei Kortunov
1126f38a1e Do not copy the whole attributes store 2024-02-23 17:02:40 +04:00
Andrei Kortunov
7c4b42ab2a Add a Lua function to check if actor's death is finished 2024-02-22 19:06:15 +04:00
Zackhasacat
d73c1c8590 Merge branch 'master' of gitlab.com:openmw/openmw into lua_controller_cursor 2024-02-20 12:07:23 -06:00
Zackhasacat
873877795a Move gamepad controls to lua interface 2024-02-20 12:06:19 -06:00
Zackhasacat
fed62a8517 Remove unneeded line 2024-02-18 15:58:18 -06:00
Zackhasacat
92242a3d54 Simplify 2024-02-18 13:20:58 -06:00
Zackhasacat
731095831d Add missing function types.Item.isCarriable() 2024-02-18 13:15:56 -06:00
Alexei Kotov
c1b9beb763 Merge branch 'deadanimation' into 'master'
Remove dead code

See merge request OpenMW/openmw!3866
2024-02-15 00:57:59 +00:00
psi29a
ec1cf46ec7 Merge branch 'lua_keybinds' into 'master'
Lua Implement mouse input engine handlers, improve inputBinding renderer

See merge request OpenMW/openmw!3855
2024-02-14 08:30:38 +00:00
Evil Eye
8f88838ff5 Remove dead code 2024-02-13 19:30:32 +01:00
Cody Glassman
56b31ceaf5 add ignore list to raycasts 2024-02-12 07:52:47 -08:00
psi29a
e9c97b835e Merge branch 'acertainsign' into 'master'
Expose birth signs to Lua

See merge request OpenMW/openmw!3850
2024-02-12 14:11:29 +00:00
psi29a
a060a7297c Merge branch 'dehardcode-skillprogression' into 'master'
Lua: Dehardcode skill and level progression

See merge request OpenMW/openmw!3779
2024-02-12 14:10:51 +00:00
uramer
c68dee214e Mouse input engine handlers 2024-02-10 22:56:46 +01:00
Zackhasacat
86666761a3 Requested changes 2024-02-08 21:51:54 -06:00
Evil Eye
7586acc18b Remove Core from functions that aren't in openmw.core 2024-02-08 16:53:48 +01:00
Alexei Kotov
6be6f47503 Merge branch 'lua_enchantment_charge_nil' into 'master'
Lua Use nil instead of -1 for default enchantment charge

See merge request OpenMW/openmw!3845
2024-02-08 08:25:15 +00:00
Zackhasacat
4700fdcfc2 Merge branch 'master' of gitlab.com:openmw/openmw into fix_global_iteration 2024-02-07 22:06:34 -06:00
Evil Eye
5715e6428a Merge branch 'lua_separate_owner' into 'master'
Group owner bindings into a table

See merge request OpenMW/openmw!3841
2024-02-07 19:06:18 +00:00
Evil Eye
f114d409c8 Add get and set birth sign 2024-02-07 19:35:26 +01:00
Evil Eye
f7aa9f8d94 Expose birth signs to Lua 2024-02-07 18:08:06 +01:00
uramer
b1773d7e9f Use nil instead of -1 for default enchantment charge 2024-02-06 17:30:48 +01:00
Andrei Kortunov
a8c219f07c Move action argument 2024-02-06 14:18:08 +04:00
Zackhasacat
c8eaa5976a Merge branch 'master' of gitlab.com:openmw/openmw into fix_global_iteration 2024-02-05 15:01:59 -06:00
uramer
6792cf02b2 Group owner bindings into a table 2024-02-05 18:48:53 +01:00
psi29a
76842c3ba1 Merge branch 'more_move' into 'master'
Address Coverity Scan complaints left

See merge request OpenMW/openmw!3837
2024-02-05 13:22:14 +00:00
Alexei Kotov
a5d88d489b Merge branch 'menu_fixes' into 'master'
Follow up fixes for Lua Menu MR !3464

See merge request OpenMW/openmw!3834
2024-02-05 00:41:11 +00:00
uramer
02accd7a49 Fix statemanager cleanup setting game state to ended by accident 2024-02-04 11:12:12 +01:00
uramer
8c6a1ae8c0 Allow menu scripts to send global events while a game is loaded 2024-02-04 11:12:11 +01:00
Andrei Kortunov
292879d0fb Address Coverity Scan complaints left 2024-02-04 08:56:25 +04:00
Zackhasacat
5f9acbd0f0 Add function to replace duplicated code 2024-02-03 13:03:23 -06:00
Zackhasacat
97203f2706 Merge branch 'master' of gitlab.com:openmw/openmw into fix_global_iteration 2024-02-03 12:31:34 -06:00
Alexei Kotov
8b47381162 Merge branch 'more_move' into 'master'
Fix some Coverity Scan complaints

See merge request OpenMW/openmw!3829
2024-02-03 17:24:53 +00:00
Zackhasacat
9daf10c305 Remove comment 2024-02-03 10:45:24 -06:00
Zackhasacat
55285b5e57 Fix Global Iteration 2024-02-03 10:43:38 -06:00
Andrei Kortunov
69936f3537 Move TextureData 2024-02-02 09:45:42 +04:00
Andrei Kortunov
225e834b88 Fix some Coverity Scan complaints 2024-02-02 09:28:19 +04:00
uramer
b988db9bda Merge branch 'master' into menuscripts 2024-02-01 20:11:02 +01:00
uramer
47d5868e2c creationTime field in save info 2024-01-30 22:09:12 +01:00
Mads Buvik Sandvei
e0e968a082 rebase errors 2024-01-30 21:25:39 +01:00
Mads Buvik Sandvei
055e9a5055 clang'd 2024-01-30 21:25:39 +01:00
Mads Buvik Sandvei
9f15f3b431 Add engine handler for skill levelup, to dehardcode the book/trainer case. 2024-01-30 21:25:39 +01:00
Mads Buvik Sandvei
e1a22242d9 skillGain as a table 2024-01-30 21:25:38 +01:00
Mads Buvik Sandvei
80e9631abd Use ESM::Class::Specialization for parameters to npcstats 2024-01-30 21:25:38 +01:00
Mads Buvik Sandvei
011d9d6493 Dehardcode skill and level progression 2024-01-30 21:25:36 +01:00
uramer
76915ce6e9 Queue auto started scripts until next update 2024-01-30 18:58:34 +01:00
Alexei Kotov
9350222e1a Merge branch 'deserializeinventory' into 'master'
Use deserializeText for find and countOf

See merge request OpenMW/openmw!3817
2024-01-30 04:24:50 +00:00
Alexei Kotov
c86ca0ef01 Merge branch 'cast-fix' into 'master'
Fix bad cast of loop count in animation bindings.

See merge request OpenMW/openmw!3819
2024-01-30 04:18:03 +00:00
Mads Buvik Sandvei
36e1bdab10 Use a smaller integer type instead of dealing with casting issues. 2024-01-28 14:48:49 +01:00
Zackhasacat
4fcacd59aa Add model to NPC lua 2024-01-27 12:02:56 -06:00
Zackhasacat
c2782426fc Merge branch 'master' of gitlab.com:openmw/openmw into lua_controller_cursor 2024-01-27 10:25:05 -06:00
Evil Eye
1288ec5cea Use deserializeText for find and countOf 2024-01-27 16:49:20 +01:00
uramer
9cce2e39ba Merge branch 'master' into menuscripts 2024-01-27 15:45:31 +01:00
Alexei Kotov
093d86353f Merge branch 'lua_mwscript_nilvar' into 'master'
#7791: Require local variables to exist for lua mwscript local variables

Closes #7791

See merge request OpenMW/openmw!3811
2024-01-27 13:57:26 +00:00
Zackhasacat
cfd67f3ce7 #7791: Require local variables to exist for lua mwscript local variables 2024-01-27 13:57:26 +00:00
Mads Buvik Sandvei
a94add741e Lua: Animation bindings 2024-01-26 21:39:33 +00:00
Alexei Kotov
d1e79028e9 Merge branch 'lua-fix-active-spells-pairs-iterator-return' into 'master'
Lua: Fix return value for `Actor.ActiveSpells` iterator

See merge request OpenMW/openmw!3808
2024-01-26 20:38:13 +00:00
Alexei Kotov
30d637f5f6 Merge branch 'lua_water_level' into 'master'
Lua: Add water level to Core.Cell

See merge request OpenMW/openmw!3766
2024-01-26 20:37:04 +00:00
Zackhasacat
daa9c5f0e1 Lua: Add water level to Core.Cell 2024-01-26 20:37:04 +00:00
Pharis
3b0d654a3f Return active spell id from pairs 2024-01-25 18:10:10 -06:00
Andrei Kortunov
9e55425b71 Use std::move() in /apps/openmw 2024-01-25 09:03:30 +04:00
Zackhasacat
3ef2f71062 Merge branch 'master' of gitlab.com:openmw/openmw into lua_controller_cursor 2024-01-24 15:50:46 -06:00
jvoisin
ec6ac8058b Merge branch 'vfs_normalized_path' into 'master'
Add type for normalized VFS path and use for VFS::Manager file map key

See merge request OpenMW/openmw!3781
2024-01-23 20:42:48 +00:00
Mads Buvik Sandvei
1f416d7c8a Lua: Creature skill bindings 2024-01-20 11:56:36 +00:00
elsid
a2147d70cc
Use forward declaration for some VFS types
This will allow to save on preprocessed code size in the future changes.
2024-01-16 01:32:11 +01:00
uramer
0a2adfee16 SaveInfo.timePlayed field 2024-01-14 17:47:27 +01:00
Andrei Kortunov
14e6af8bea Add a table with fadeOut argument for streamMusic 2024-01-13 15:42:17 +04:00
uramer
b9afd7245c Create separate UI api tables for menu and player contexts 2024-01-13 10:13:13 +01:00
uramer
dd09c9b362 Don't save global storage if global scripts didn't run 2024-01-13 00:42:55 +01:00
Zackhasacat
f3229f8674 Merge branch 'master' of gitlab.com:openmw/openmw into lua_controller_cursor 2024-01-12 12:01:44 -06:00
uramer
dd6017e81e Avoid making engine handler methods public 2024-01-11 00:55:29 +01:00
uramer
4ed2af7666 Merge branch 'master' into menuscripts 2024-01-10 23:21:42 +01:00
uramer
1afc7ecd58 Test Lua widgets for text inputs correctly 2024-01-10 23:13:27 +01:00
uramer
79deb5f559 Remove settings pages in Lua 2024-01-10 23:13:27 +01:00
uramer
82a125fb6a Replace onUpdate with onFrame for menu scripts 2024-01-10 23:13:27 +01:00
uramer
2107bbc01d Reuse input engine handlers in menu scripts 2024-01-10 23:13:23 +01:00
uramer
962ecc4329 Allow menu scripts to read global sections while a game is loaded 2024-01-10 22:28:57 +01:00
Andrei Kortunov
e67d6c6ebf Refactor Lua properties 2024-01-10 12:37:14 +04:00
psi29a
a0c0509e3f Merge branch 'rm_unused_apps_includes' into 'master'
Use "" to quote apps/openmw includes and remove unused

See merge request OpenMW/openmw!3727
2024-01-09 08:59:23 +00:00
psi29a
5bd2020c23 Merge branch 'inactiveeffects' into 'master'
Make ActorActiveEffects:getEffect return an empty value and strip expired effects from __pairs

Closes #7440

See merge request OpenMW/openmw!3735
2024-01-09 08:58:42 +00:00
uramer
539dc1ee43 Remove confusing addPlayerQuestBindings method 2024-01-08 21:57:59 +01:00
uramer
a6e2ceebb8 Don't clear menu UI on game load 2024-01-07 23:29:20 +01:00
uramer
d1268acf95 Merge branch 'master' into menuscripts 2024-01-07 23:15:21 +01:00
elsid
067957f57b
Use "" to quote apps/openmw includes and remove unused
Using "" makes clangd to find unused includes which makes it quite easy to
remove them.
2024-01-07 17:57:11 +01:00
Andrei Kortunov
084fc80efd Use string_view for readonly string properties 2024-01-07 19:21:45 +04:00
Evil Eye
74a6c81d53 Make ActorActiveEffects:getEffect return an empty value and strip expired effects from __pairs 2024-01-06 14:14:29 +01:00
jvoisin
5837f97b99 Merge branch 'nonexclusivesettings' into 'master'
Downgrade Settings GUI mode to a modal (bug #6758)

Closes #6758

See merge request OpenMW/openmw!3720
2024-01-05 13:04:20 +00:00
Alexei Kotov
7310418984 Downgrade Settings GUI mode to a modal (bug #6758) 2024-01-02 22:32:52 +03:00
uramer
e9b48e35c0 Coverity defects 2024-01-02 13:54:02 +01:00
Evil Eye
e63933efa6 Use NAM9 for stack count 2023-12-31 17:12:46 +00:00
Alexei Kotov
7e162a0d7c Merge branch 'lua_real_frame_time' into 'master'
Pass real frame duration to onFrame

See merge request OpenMW/openmw!3621
2023-12-31 01:21:41 +00:00
psi29a
e9f3e5c6d1 Merge branch 'lua_actions_electric_boogaloo' into 'master'
Lua actions take 3

See merge request OpenMW/openmw!2628
2023-12-29 18:56:59 +00:00
uramer
0e2e386dc9 Lua actions take 3 2023-12-29 18:56:59 +00:00
Cody Glassman
8f85c9194d lua - add bindings to get frame duration 2023-12-26 09:15:55 -08:00
elsid
81a483fc7f
Remove unused vfs argument from correctMeshPath 2023-12-26 14:14:52 +01:00
elsid
1a39ef07c8
Fix build with Lua 5.4.6
/home/elsid/dev/openmw/apps/openmw/mwlua/luamanagerimp.cpp: In member function ‘void MWLua::LuaManager::update()’:
/home/elsid/dev/openmw/apps/openmw/mwlua/luamanagerimp.cpp:127:19: error: use of deleted function ‘Settings::SettingValue<T>::SettingValue(const Settings::SettingValue<T>&) [with T = int]’
  127 |             lua_gc(mLua.sol(), LUA_GCSTEP, Settings::lua().mGcStepsPerFrame);
      |             ~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In file included from /home/elsid/dev/openmw/components/settings/categories/camera.hpp:5,
                 from /home/elsid/dev/openmw/components/settings/values.hpp:4,
                 from /home/elsid/dev/openmw/apps/openmw/mwlua/luamanagerimp.cpp:16:
/home/elsid/dev/openmw/components/settings/settingvalue.hpp:355:9: note: declared here
  355 |         SettingValue(const SettingValue& other) = delete;
      |         ^~~~~~~~~~~~
2023-12-08 00:46:15 +01:00
Andrei Kortunov
6f68df9ac2 Avoid redundant copies 2023-12-06 23:45:25 +04:00
Evil Eye
efb819b9d2 Rename to Died 2023-12-04 17:50:18 +01:00
Evil Eye
ad68b7e18b Turn onDeath the engine handler into OnDeath the regular event 2023-12-04 17:32:38 +01:00
Evil Eye
8cf99822ed Add a death event to the Lua API 2023-12-04 17:11:51 +01:00
Alexei Kotov
98dfb68d4a Merge branch 'ejaansalah' into 'master'
Fix the spelling of expel in lua api

See merge request OpenMW/openmw!3608
2023-12-03 20:28:01 +00:00
Zackhasacat
162ac452cf Merge branch 'master' of gitlab.com:openmw/openmw into lua_controller_cursor 2023-11-30 20:49:35 -06:00
Evil Eye
76172c73f3 Merge branch 'fix_restocking_remove' into 'master'
Fix Lua remove interacting with restocking items

See merge request OpenMW/openmw!3615
2023-11-29 15:43:23 +00:00
Zackhasacat
4beac9035a Add bindings for controller cursor mode 2023-11-28 19:58:41 -06:00
uramer
1841341da2 Fix Lua remove interacting with restocking items 2023-11-25 17:39:00 +01:00
uramer
416fa331f1 Implement UI Element tostring 2023-11-24 20:36:45 +01:00
Zackhasacat
5623a5cf01 Merge branch 'lua_sgetcurrent_conditionofitem_itemdata_idea' into 'master'
Lua API to get/set item condition

See merge request OpenMW/openmw!3421
2023-11-23 23:10:39 +00:00
Zackhasacat
a38d17a918 Merge branch 'api_inconsistencies' into 'master'
Minor API inconsistencies

See merge request OpenMW/openmw!3601
2023-11-21 03:04:24 +00:00
uramer
c9eaeb47d5 Minor API inconsistencies 2023-11-21 03:04:24 +00:00
kuyondo
9ebbdc3a22 expell->expel 2023-11-20 15:59:11 +08:00
elsid
94b085af9e
Add Navigator and Lua API function to find nearest position on navmesh 2023-11-18 23:54:37 +01:00
Evil Eye
5a1a54b959 Merge branch 'lua_class_data' into 'master'
Add class records to lua

See merge request OpenMW/openmw!3515
2023-11-18 20:55:45 +00:00
Zackhasacat
3e3a39539c Reorder, remove comment 2023-11-17 14:51:19 -06:00
Zackhasacat
13deb0fba8 Merge branch 'imod' into 'master'
Fill out item modification records and add them to the scene

See merge request OpenMW/openmw!3540
2023-11-17 18:22:17 +00:00
Zackhasacat
35da9578ca Merge gitlab.com:openmw/openmw into lua_class_data 2023-11-16 11:33:44 -06:00
Zackhasacat
bc63737488 Update Formatting 2023-11-16 11:20:08 -06:00
uramer
6484e2e411 Merge branch 'serices_are_readonly' into 'master'
Make actor.providedServices read only

See merge request OpenMW/openmw!3570
2023-11-16 15:23:09 +00:00
Zackhasacat
cbfcd21d98 Make actor.providedServices read only 2023-11-16 15:23:09 +00:00
Zackhasacat
16f178b80e Remove character 2023-11-16 07:43:45 -06:00
Zackhasacat
10030a55e0 Merge branch 'master' of gitlab.com:openmw/openmw into lua_class_data 2023-11-16 07:37:03 -06:00
Zackhasacat
a2b47f44d2 Fix misspelling 2023-11-16 07:36:40 -06:00
Zackhasacat
ec81bd7f1b rename specilizationIndexToLuaId 2023-11-07 12:01:54 -06:00
Zackhasacat
cb705ff02a Revert redundant changes 2023-11-07 11:52:53 -06:00
Zackhasacat
ae4eafdfd4 Move classes to types.NPC 2023-11-07 11:50:09 -06:00
Zackhasacat
81da58478d Remove test use 2023-11-07 11:41:14 -06:00
Zackhasacat
76f872aaa2 use std:;array 2023-11-07 11:40:43 -06:00
Petr Mikheev
a60726ce35 Fix #7674 2023-11-05 21:32:18 +01:00
jvoisin
e4c5c1bc43 Merge branch 'govna' into 'master'
Expose governing attributes to Lua

See merge request OpenMW/openmw!3556
2023-11-05 16:35:27 +00:00
jvoisin
44dc29e675 Merge branch 'forurm' into 'master'
Add types.Actor.isDead

See merge request OpenMW/openmw!3557
2023-11-05 16:35:09 +00:00
Zackhasacat
c311caef9a Redo specialization field 2023-11-03 17:19:53 -05:00
Zackhasacat
dd87d01f06 Fix minor doc error, throw error when attempting to assign a value to a non-existing global variable in lua 2023-11-03 16:31:23 +00:00
Evil Eye
2d90176fe9 Add types.Actor.isDead 2023-11-02 19:29:26 +01:00
Zackhasacat
859b6c823f Fix includes 2023-11-02 12:21:59 -05:00
Zackhasacat
25fe42de10 Spacing 2023-11-02 12:17:55 -05:00
Zackhasacat
3c0c699e42 Do not use const 2023-11-02 12:15:48 -05:00
Zackhasacat
685c02bd73 Re-add missing line 2023-11-02 12:10:52 -05:00
Zackhasacat
e54eba7043 Formatting fixes 2023-11-02 12:08:07 -05:00
Evil Eye
a88f0ecc95 Expose governing attributes to Lua 2023-11-02 17:43:09 +01:00
Zackhasacat
67e74936ff Make classes Read Only 2023-11-01 13:23:32 -05:00
Zackhasacat
482d174ef2 Read only, add skill spec to docs 2023-11-01 13:21:14 -05:00
Zackhasacat
371eeddf85 Merge branch 'master' of gitlab.com:openmw/openmw into lua_class_data 2023-10-31 22:23:45 -05:00