mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-31 22:15:35 +00:00
Code Issues Releases Wiki Activity
32645 commits 108 branches 66 tags 134 MiB
Commit graph

21330 commits

Author SHA1 Message Date
Alexei Kotov
4b4c46fa70 Merge branch 'settings_values_saves' into 'master' 
Use settings values for Saves settings (#6876)

See merge request OpenMW/openmw!3486
 2023-10-11 21:35:48 +00:00
Alexei Kotov
8c58ec9c32 Merge branch 'esm4actors' into 'master' 
Show ESM4 NPCs

See merge request OpenMW/openmw!3312
 2023-10-11 21:33:14 +00:00
elsid
1038a68fbf
Use settings values for Saves settings 2023-10-10 20:39:52 +02:00
psi29a
01ee448c61 Merge branch 'settings_values_navigator' into 'master' 
Use settings values for Navigator settings (#6876)

See merge request OpenMW/openmw!3468
 2023-10-10 03:24:33 +00:00
Petr Mikheev
15306c7d49 [Lua] Add CONTROL_SWITCH functions to types.Player and deprecate them in openmw.input 2023-10-10 01:15:09 +02:00
psi29a
fb9fc91710 Merge branch 'settings_values_post_processing' into 'master' 
Use settings values for Post Processing settings (#6876)

See merge request OpenMW/openmw!3480
 2023-10-09 11:35:53 +00:00
psi29a
9534130906 Merge branch 'settings_values_physics' into 'master' 
Use settings values for Physics settings (#6876)

See merge request OpenMW/openmw!3481
 2023-10-09 11:35:43 +00:00
psi29a
ab631fcd70 Merge branch 'whosabaddoggo' into 'master' 
Handle AllowWerewolfForceGreeting variable (bug #7609)

Closes #7609

See merge request OpenMW/openmw!3476
 2023-10-09 11:35:16 +00:00
Alexei Kotov
1bd388faf3 Fix creating archives in bsatool 2023-10-09 07:07:53 +03:00
elsid
4a7886816e
Use settings values for Physics settings 2023-10-08 12:19:02 +02:00
elsid
7b4b8763ff
Use settings values for Post Processing settings 2023-10-08 11:58:16 +02:00
psi29a
575f43876b Merge branch 'fixedpath' into 'master' 
Replace more sized reads and change path grid loading

See merge request OpenMW/openmw!3475
 2023-10-08 02:18:43 +00:00
Petr Mikheev
3882a5f25a update 2023-10-07 17:21:25 +02:00
Petr Mikheev
b4552d47f6 Don't use ESM4 mHeadFeamleParts; switch from manually adding "meshes\\" to correctMeshPath 2023-10-07 17:21:25 +02:00
Petr Mikheev
1acac873cf Use "setObjectRoot" in esm4npcanimation.cpp 2023-10-07 17:21:25 +02:00
Petr Mikheev
4beed29404 Changes required during review 2023-10-07 17:21:25 +02:00
Petr Mikheev
2900351777 Render ESM4 NPCs 2023-10-07 17:21:25 +02:00
psi29a
d43493dd4c Merge branch 'idlestorm' into 'master' 
Avoid redundant animation resets in updateIdleStormState

See merge request OpenMW/openmw!3473
 2023-10-07 01:41:36 +00:00
Alexei Kotov
cecb2b71ea Handle AllowWerewolfForceGreeting variable (bug #7609) 2023-10-06 23:17:32 +03:00
Evil Eye
b99f58613e Remove signed/unsigned conversions in pathgrid loading code and use meaningful member names 2023-10-06 16:46:09 +02:00
psi29a
2c81220cf7 Merge branch 'book' into 'master' 
Reading ESM4 books

See merge request OpenMW/openmw!3471
 2023-10-05 17:24:50 +00:00
Alexei Kotov
79bda2e694 Avoid redundant animation resets in updateIdleStormState 2023-10-04 22:26:52 +03:00
psi29a
d9f8757f33 Merge branch 'goblinsnacks' into 'master' 
Allow creatures to use potions

Closes #7604

See merge request OpenMW/openmw!3469
 2023-10-04 03:46:51 +00:00
Petr Mikheev
6161953106 Allow reading ESM4 books 2023-10-03 10:55:12 +02:00
Alexei Kotov
b6d2fa5f9d Merge branch 'initially_disabled' into 'master' 
Take into account "Enable Parent" subrecord and disable ESM4 objects that should be initially disabled

See merge request OpenMW/openmw!3461
 2023-10-02 18:28:29 +00:00
Evil Eye
0814ef5697 Allow creatures to use potions 2023-10-01 11:22:20 +02:00
elsid
68de5690ef
Use settings values for Navigator settings 2023-10-01 11:10:04 +02:00
elsid
b3c8a15af1
Parse navmesh render mode on reading settings 2023-10-01 11:09:59 +02:00
psi29a
08ff69f199 Merge branch 'menu_fix' into 'master' 
Update canvas size every frame when it is visible

See merge request OpenMW/openmw!3463
 2023-09-29 11:25:09 +00:00
Andrei Kortunov
1ac0a3b25b Update canvas size every frame when it is visible (bug 7603) 2023-09-29 13:34:04 +04:00
psi29a
df1063be5d Merge branch 'thedichotomyof4' into 'master' 
ESM4 upd8s: Fours and Worlds

Closes #7445

See merge request OpenMW/openmw!3454
 2023-09-29 08:16:30 +00:00
Petr Mikheev
02de5e82d8 Take into account "Enable Parent" subrecord and disable ESM4 objects that should be initially disabled. 2023-09-28 23:09:09 +02:00
psi29a
3ea14e904d Merge branch 'actors_range' into 'master' 
Handle actors processing range in Lua

See merge request OpenMW/openmw!3458
 2023-09-28 08:33:46 +00:00
psi29a
6c39e3f817 Merge branch 'draft' into 'master' 
Treat teleportation out of the draft cell as object creation

Closes #7588 and #7453

See merge request OpenMW/openmw!3455
 2023-09-28 08:33:10 +00:00
psi29a
f9bba096db Merge branch 'fix_editor_model' into 'master' 
Avoid using settings in components to get actor model (#7596)

Closes #7596

See merge request OpenMW/openmw!3460
 2023-09-28 08:32:52 +00:00
psi29a
bae8d585fe Merge branch 'lua/capacity_encum_bindings' into 'master' 
Add more lua bindings for encumbrance and capacity

See merge request OpenMW/openmw!3462
 2023-09-28 08:32:38 +00:00
glassmancody.info
9aa992eede add more lua bindings for encumbrance and capacity 2023-09-27 17:19:08 -07:00
Evil Eye
7594d94024 Prevent re-adding local scripts 2023-09-27 22:24:28 +02:00
Evil Eye
f6626e36cf Unbreak respawns and fix #7588 2023-09-27 22:07:55 +02:00
Evil Eye
33b57d9134 Use moveToCell and init mwscript 2023-09-27 21:23:07 +02:00
elsid
1d94527a19
Avoid using settings in components to get actor model 
Settings::Values are initialized only for engine. Accessing them from other
binaries leads to a crash.
 2023-09-27 21:00:46 +02:00
Andrei Kortunov
40c8783790 Handle actors processing range in Lua 2023-09-27 15:14:32 +04:00
psi29a
e090bc234b Merge branch 'simulation_fix' into 'master' 
Decouple rendering simulation time from Lua simulation time (bug 7576)

Closes #7576

See merge request OpenMW/openmw!3457
 2023-09-27 07:30:36 +00:00
Zackhasacat
cde2b49313 Fix recordDraft isScroll for types.book in lua 2023-09-27 07:30:27 +00:00
Andrei Kortunov
442c032373 Decouple rendering simulation time from Lua simulation time (bug 7576) 2023-09-26 14:39:38 +04:00
Evil Eye
641f34a3c9 Treat teleportation out of the draft cell as object creation 2023-09-25 21:01:32 +02:00
Alexei Kotov
8d655054f1 esmtool: Print human-readable ESM4 file format version 2023-09-25 21:40:14 +03:00
Alexei Kotov
9f8f2dd925 Use parent worldspace terrain when requested 2023-09-25 21:40:14 +03:00
Alexei Kotov
7e360df6c0 Place ESM4::Flora instances to the scene 2023-09-24 10:25:44 +03:00
psi29a
67075990bd Merge branch 'deprecations' into 'master' 
Remove numeric magic school ids and deprecate the enum

See merge request OpenMW/openmw!3440
 2023-09-23 11:59:22 +00:00
psi29a
6d32caa2d6 Merge branch 'somethinginparticlular' into 'master' 
Read even more NIF records

See merge request OpenMW/openmw!3442
 2023-09-23 11:59:06 +00:00
Alexei Kotov
c800152ca2 Diminish error marker prominence 
Don't render ESM4 actors or SpeedTree objects
 2023-09-22 01:01:19 +03:00
psi29a
84019e7998 Merge branch 'mobiusdoublereacharound' into 'master' 
Rewrite melee hit target selection (bug #3438)

Closes #3438

See merge request OpenMW/openmw!3274
 2023-09-21 20:31:18 +00:00
Evil Eye
90ca8a2f4e Remove ATTRIBUTE, SKILL, and SCHOOL enums 2023-09-21 19:34:13 +02:00
Evil Eye
6ed5cbb7d0 Remove numeric magic school ids and deprecate the enum 2023-09-20 19:51:29 +02:00
Alexei Kotov
440851ff48 Rewrite melee hit target selection (bug #3438) 2023-09-19 22:31:45 +03:00
Petr Mikheev
38f56cfcdd Fix #7453: wrong position of dynamically placed CreatureLevList 2023-09-19 11:22:58 +02:00
Petr Mikheev
95906a34b3 Fix #6146 (actor:setEquipment doesn't trigger mwscripts) 2023-09-19 10:59:20 +02:00
psi29a
38d0ece366 Merge branch 'titlefix' into 'master' 
Repeat title music only in main menu

See merge request OpenMW/openmw!3436
 2023-09-19 08:37:44 +00:00
psi29a
3ae189dda1 Merge branch 'nifcouriersix' into 'master' 
Modernize NIF loader, part 6

See merge request OpenMW/openmw!3435
 2023-09-19 08:37:23 +00:00
psi29a
1a5b63412a Merge branch 'fix-lua-layers' into 'master' 
Fix Lua UI Layer bindings

See merge request OpenMW/openmw!3433
 2023-09-18 08:37:29 +00:00
psi29a
1c8198242e Merge branch 'toggleai' into 'master' 
Add a way to toggle AI to Lua debug package

See merge request OpenMW/openmw!3429
 2023-09-18 08:37:19 +00:00
psi29a
eb688b603d Merge branch 'refnum_ref' into 'master' 
Replace `const ESM::RefNum&` -> `ESM::RefNum`

See merge request OpenMW/openmw!3432
 2023-09-18 08:35:45 +00:00
Andrei Kortunov
3ef9b850d7 Repeat title music only in main menu 2023-09-18 10:45:08 +04:00
Alexei Kotov
1b93e646b8 Rename Property->NiProperty 2023-09-18 06:44:44 +03:00
Alexei Kotov
1e3da5516a Fix BA2 handling in niftest 2023-09-17 19:30:30 +03:00
Alexei Kotov
9ae1077808 Update NIF property loading, first pass 
Revise all FO3+ shader properties (attempt reading FO4, FO76 and Starfield properties)
Use constants for most instances of property flags
Drop invalid usage of non-existent double-sided flag for BSShader
Make formatting more consistent, drop unnecessary comments
 2023-09-17 19:22:16 +03:00
psi29a
18b6eba709 Merge branch 'reloadlua' into 'master' 
safe reloadlua on top of !3362

See merge request OpenMW/openmw!3412
 2023-09-17 11:28:01 +00:00
Alexei Kotov
eb8242946a Improve node record consistency with NifTools 2023-09-16 19:17:40 +03:00
Alexei Kotov
bff9231c3b Refactor NiGeometry/BSTriShape 
Don't pass invalid geometry data links to the loaders
 2023-09-16 19:17:40 +03:00
uramer
cda5f12630 Fix Lua UI Layer bindings 2023-09-16 13:45:19 +02:00
Alexei Kotov
deb051639e Refactor NiBoundingVolume 2023-09-15 21:11:12 +03:00
Petr Mikheev
c67b866a11 Replace const ESM::RefNum& -> ESM::RefNum 2023-09-15 19:38:09 +02:00
Petr Mikheev
72b8ff82ff !3362 with safe reloadlua 2023-09-15 19:10:33 +02:00
Andrei Kortunov
56ea3e3879 Add a way to toggle AI to Lua debug package 2023-09-15 18:49:46 +04:00
psi29a
551f424c80 Merge branch 'silent_warning' into 'master' 
Silent coverity warning

See merge request OpenMW/openmw!3423
 2023-09-15 12:57:08 +00:00
Petr Mikheev
4fa8756791 Silent coverity warning 2023-09-15 11:05:40 +02:00
psi29a
12159d95f3 Merge branch 'music' into 'master' 
Rework music system

See merge request OpenMW/openmw!3372
 2023-09-15 07:11:31 +00:00
psi29a
ed022a6c14 Merge branch 'fix_use' into 'master' 
Fix regression added in  !3354: Set `force` to false when applying UseItem from inventory.

See merge request OpenMW/openmw!3422
 2023-09-15 07:03:34 +00:00
psi29a
59f8034442 Merge branch 'sizedreads' into 'master' 
Replace more sized reads

See merge request OpenMW/openmw!3425
 2023-09-15 07:03:18 +00:00
psi29a
64e4a33400 Merge branch 'nif' into 'master' 
Modernize NIF loader, part 4

See merge request OpenMW/openmw!3427
 2023-09-15 07:02:38 +00:00
Andrei Kortunov
db72a91180 Add a way to check if sound system is enabled 2023-09-14 13:02:20 +04:00
Andrei Kortunov
ebb75008f8 Do not use playlist for title music 2023-09-14 09:17:59 +04:00
Alexei Kotov
0fe095303f Rename Controller->NiTimeController, update NiTimeController and related code 2023-09-14 03:12:10 +03:00
Alexei Kotov
05d8975ed1 Revise various NIF controller records 
Mostly those that don't require external changes
 2023-09-14 01:44:41 +03:00
Evil Eye
b59739a529 Replace more sized reads 2023-09-13 21:51:42 +02:00
Andrei Kortunov
655c4442bc Implement isMusicPlaying 2023-09-13 17:48:49 +04:00
Bret Curtis
a285408212 small coverity fix 2023-09-13 12:28:38 +02:00
Andrei Kortunov
cbb4c1bb9a Fix music during a new game start 2023-09-13 09:11:07 +04:00
Andrei Kortunov
e25e867d77 Remove 'music' package 2023-09-13 09:11:07 +04:00
Andrei Kortunov
18fe6a8ae7 Remove default argument 2023-09-13 09:11:07 +04:00
Andrei Kortunov
e1cae5a029 Rework music system 2023-09-13 09:11:07 +04:00
psi29a
090da90302 Merge branch 'factions' into 'master' 
Implement Lua API for factions

See merge request OpenMW/openmw!3405
 2023-09-12 19:41:54 +00:00
psi29a
42b77342c5 Merge branch 'nif' into 'master' 
Modernize NIF loader, part 3

See merge request OpenMW/openmw!3418
 2023-09-12 08:34:46 +00:00
Andrei Kortunov
02dcf1fb31 Split setFactionRank to separate functions 2023-09-12 11:57:19 +04:00
Andrei Kortunov
6ee86dea82 Implement Lua API for factions (feature 7468) 2023-09-12 09:49:03 +04:00
Petr Mikheev
fb8ccf52d8 Add missing argument force in UseItem 2023-09-11 16:21:34 +02:00
psi29a
9d186ee2cd
Merge branch 'ptrindex' into 'master' 
Fix crash: PtrRegistry can contain pointers to already removed temporary ManualRefs

See merge request OpenMW/openmw!3411
 2023-09-11 06:57:36 +00:00
psi29a
d87db1dc5f
Merge branch 'drainfatigue' into 'master' 
Uncap Drain Fatigue again (bug #7573)

Closes #7573

See merge request OpenMW/openmw!3414
 2023-09-11 06:57:25 +00:00
psi29a
39a209cb78
Merge branch 'settings_values_models' into 'master' 
Use settings values for Models settings (#6876)

See merge request OpenMW/openmw!3413
 2023-09-11 06:55:17 +00:00
psi29a
9d3eb1a901
Merge branch 'fix_crash' into 'master' 
Fix crash on accessing cells settings from non engine binaries

Closes #7572

See merge request OpenMW/openmw!3415
 2023-09-10 15:23:57 +00:00
psi29a
4deb012edf
Merge branch 'centeroncell' into 'master' 
Reset the rotation for ESM3 door-based COC destinations again (#7471)

Closes #7471

See merge request OpenMW/openmw!3416
 2023-09-10 15:23:09 +00:00
Alexei Kotov
a7cc4e6ba6 Rename Node->NiAVObject and update everything directly related 
Update NiNode
Simplify RootCollisionNode handling in BulletNifLoader
 2023-09-10 07:18:39 +03:00
Alexei Kotov
6872c7144e Rename Transformation->NiTransform and update everything directly related 2023-09-10 07:18:39 +03:00
Alexei Kotov
ef896faa90 Rename Named->NiObjectNET and update everything directly related to it 
BulletNifLoader: properly check if the node has animation controllers
Flatten extra data linked list
 2023-09-10 07:18:39 +03:00
psi29a
9791fae2db
Merge branch 'statrecords' into 'master' 
Expose skill and attribute records to Lua and deprecate their enums

See merge request OpenMW/openmw!3407
 2023-09-09 20:39:45 +00:00
Petr Mikheev
892f6d1aee Make LiveCellRef to remove itself from PtrRegistry in destructor (to prevent potential use after free); Update ContainerStore::mPtr after copying container/actor. 2023-09-09 21:54:13 +02:00
Alexei Kotov
0f2e5f9db6 Uncap Drain effects again (bug #7573) 2023-09-09 22:46:11 +03:00
Alexei Kotov
817078cbea Reset the rotation for ESM3 door-based COC destinations again 2023-09-09 21:00:47 +03:00
elsid
053a3caf7b
Pass cache expiry delay to GenericResourceManager constructor 2023-09-09 19:35:20 +02:00
elsid
ad509bb954
Use settings values for Models settings 2023-09-09 13:12:08 +02:00
psi29a
bcc3365766
Merge branch 'fix_hidden_window' into 'master' 
Fix bug related to !3236

See merge request OpenMW/openmw!3406
 2023-09-09 08:06:47 +00:00
psi29a
0a47e927d5
Merge branch 'nif' into 'master' 
Modernize NIF loader, part 2

See merge request OpenMW/openmw!3404
 2023-09-09 08:06:32 +00:00
psi29a
45a211c098
Merge branch 'lua_nil' into 'master' 
Return nil when we try to use an invalid store index from Lua

Closes #7550

See merge request OpenMW/openmw!3410
 2023-09-09 08:06:19 +00:00
psi29a
cadb166b58
Merge branch 'companion_creatures' into 'master' 
Allow creatures to be companions again

See merge request OpenMW/openmw!3409
 2023-09-09 08:06:03 +00:00
Andrei Kortunov
5d211d3c93 Return nil when we try to use an invalid store index from Lua 2023-09-08 09:48:45 +04:00
Andrei Kortunov
7c5caec443 Allow creatures to be companions again 2023-09-08 08:30:06 +04:00
Evil Eye
cd0e612cb7 Expose skill and attribute records to Lua and deprecate their enums 2023-09-07 21:30:08 +02:00
Petr Mikheev
42f2ece8b3 Fix bug: UI modes that are added not through Lua don't show windows that were hidden by Lua in other mode. 2023-09-07 02:16:22 +02:00
Alexei Kotov
89774716fb Modernize NiGeometryData 2023-09-06 23:55:36 +03:00
Alexei Kotov
cfd37dbcc6 Modernize NiTriShapeData 2023-09-06 23:55:36 +03:00
Alexei Kotov
eba0ab444b Modernize NiTriStripsData 2023-09-06 23:55:35 +03:00
Alexei Kotov
5b07a78f2c Modernize skin instance records 2023-09-06 23:55:35 +03:00
psi29a
30f4cd972d
Merge branch 'unbind_control' into 'master' 
Ability to unbind controls in settings menu

See merge request OpenMW/openmw!3393
 2023-09-06 08:17:00 +00:00
psi29a
938c487684
Merge branch 'time' into 'master' 
[Lua] Ability to unpause the game when UI is opened.

See merge request OpenMW/openmw!3398
 2023-09-06 08:16:49 +00:00
psi29a
df31f947c6
Merge branch 'searchyourfeelingsyouknowittobetrue' into 'master' 
Replace find with search

Closes #7566

See merge request OpenMW/openmw!3403
 2023-09-06 08:15:52 +00:00
psi29a
5a0a04684a
Merge branch 'nocliffracerschooling' into 'master' 
Editor: Remove Training service for creatures

See merge request OpenMW/openmw!3396
 2023-09-06 08:14:00 +00:00
Petr Mikheev
0836680e36 Ability to unbind controls in settings menu 2023-09-05 23:09:51 +02:00
Evil Eye
6cec92223e Replace find with search 2023-09-05 16:38:34 +02:00
psi29a
690a237896
Merge branch 'init_field' into 'master' 
Init structs to make sure that we do not store a random data

See merge request OpenMW/openmw!3400
 2023-09-05 07:33:39 +00:00
Zackhasacat
f287b2f436 Merge branch 'master' of gitlab.com:openmw/openmw into lua_record_services 2023-09-04 10:49:51 -05:00
Zackhasacat
7df43f28ed Remove unused include 2023-09-04 10:47:47 -05:00
psi29a
1a4b29f014
Merge branch 'fix_terrain_cache' into 'master' 
Terrain cache fixes and optimizations

Closes #7557

See merge request OpenMW/openmw!3388
 2023-09-04 09:39:46 +00:00
Andrei Kortunov
5d51f3ea26 Init structs to make sure that we do not store a random data 2023-09-04 12:19:56 +04:00
psi29a
5faf56950b
Merge branch 'lua_files' into 'master' 
Implement Lua API for VFS

Closes #6864

See merge request OpenMW/openmw!3373
 2023-09-03 17:06:14 +00:00
Zackhasacat
208cd14cfe Use lua table, getESMStore 2023-09-03 11:26:10 -05:00
psi29a
ccc465db27
Merge branch 'nif' into 'master' 
Modernize NIF loader, part 1

See merge request OpenMW/openmw!3394
 2023-09-03 10:34:46 +00:00
psi29a
b79c40c11c
Merge branch 'more_coverity' into 'master' 
More Coverity fixes

See merge request OpenMW/openmw!3391
 2023-09-03 10:34:26 +00:00
Petr Mikheev
65cd518b44 Update camera logic related to paused game / opened UI 2023-09-03 04:21:18 +02:00
Petr Mikheev
23a7661d0b Control UI pause from Lua 2023-09-03 03:41:13 +02:00
Zackhasacat
ecc69b5479 Fix line 2023-09-02 15:33:06 -05:00
Zackhasacat
1db236b5fd Fix docs, dependancies 2023-09-02 15:30:02 -05:00
Zackhasacat
ee5983f64a Docs fixes 2023-09-02 15:21:03 -05:00
Zackhasacat
6c6885c394 Formatting 2023-09-02 15:17:14 -05:00
Zackhasacat
070c600a83 Formatting 2023-09-02 15:16:59 -05:00
Zackhasacat
e139135fdc Revert unneeded changes 2023-09-02 15:16:41 -05:00
Zackhasacat
40925fa912 Add line 2023-09-02 15:15:30 -05:00
Zackhasacat
bbe7702dbc Use string_view 2023-09-02 15:13:46 -05:00
Zackhasacat
7d0e140889 Merge branch 'master' of gitlab.com:openmw/openmw into lua_record_services 2023-09-02 14:55:57 -05:00
Zackhasacat
e50532691b Fix define endif 2023-09-02 14:55:04 -05:00
Zackhasacat
9c4ffa8256 Map by service name 2023-09-02 14:23:57 -05:00
Zackhasacat
44303ed8ca Move services to new HPP 2023-09-02 14:10:50 -05:00
psi29a
b818414d82
Merge branch 'activate_and_use' into 'master' 
Handle Use action in Lua in a similar way to Activate action

See merge request OpenMW/openmw!3354
 2023-09-02 15:11:43 +00:00
Alexei Kotov
16cc1ad59f Editor: Disable Training service for creatures 2023-09-02 17:52:15 +03:00
Andrei Kortunov
65109b3822 Simplify VFS index iteration 2023-09-02 17:40:14 +04:00
Andrei Kortunov
c04a0ca3a5 Implement Lua API for VFS 2023-09-02 08:47:46 +04:00
Zackhasacat
85d47dd715 Add return value 2023-09-01 17:53:28 -05:00
Zackhasacat
aba63c0145 Shorten, move to the correct place 2023-09-01 16:44:58 -05:00
Zackhasacat
9f80d68795 add servicesOffered to npc and creature records 2023-09-01 16:39:33 -05:00
psi29a
a1828eec29
Merge branch 'lua_spell_fix' into 'master' 
Clear selected enchanted item and/or spell with actor.clearSelectedCastable()

See merge request OpenMW/openmw!3315
 2023-09-01 20:33:42 +00:00
Zackhasacat
7113db8b97
Clear selected enchanted item and/or spell with actor.clearSelectedCastable() 2023-09-01 20:33:42 +00:00
Andrei Kortunov
7da8f388f5 More Coverity fixes 2023-09-01 16:49:39 +04:00
psi29a
3e99103beb
Merge branch 'rtd' into 'master' 
Show OpenMW version and Lua API revision in documentation

Closes #6149

See merge request OpenMW/openmw!3382
 2023-09-01 08:06:58 +00:00
Zackhasacat
86c28921ae
Add function to get current disposition, add baseDisposition to NPC record 2023-09-01 08:06:34 +00:00
Alexei Kotov
2edf3399e2 Modernize extra data records 2023-09-01 01:54:11 +03:00
psi29a
4fbf42b145
Merge branch 'no_dpad_movement' into 'master' 
Do not bind movement to the Controller DPad, but allow it to be rebound

See merge request OpenMW/openmw!3356
 2023-08-31 20:04:38 +00:00
Zackhasacat
ce1c78422b
Do not bind movement to the Controller DPad, but allow it to be rebound 2023-08-31 20:04:37 +00:00
Petr Mikheev
d39552962f Validate version of resources 2023-08-31 20:56:02 +02:00
Petr Mikheev
f260fa006e Show OpenMW version and Lua API revision in documentation. 2023-08-31 20:56:02 +02:00
psi29a
5ba13f7aae Merge branch 'lua_template_new' into 'master' 
Support 'template' field in createRecordDraft, to use an existing record as a base in lua

See merge request OpenMW/openmw!3387
 2023-08-31 08:02:50 +00:00
Petr Mikheev
ea8692a534 Add usehandlers.lua (same approach as activationhandlers.lua) 2023-08-30 22:48:51 +02:00
psi29a
58aeb81e46 Merge branch 'container_ptr' into 'master' 
Add `obj.parentContainer` in Lua. Refactor ContainerStore::mPtr, ContainerStore::mActor.

See merge request OpenMW/openmw!3381
 2023-08-30 10:19:16 +00:00
Zackhasacat
4b7bf62671 Fix weapon table, and docs 2023-08-29 16:37:32 -05:00
elsid
52ab47771c
Initialize expiry delay for all GenericResourceManager instances 2023-08-29 20:25:21 +02:00
Zackhasacat
0085fb923e Formatting fixes 2023-08-29 11:33:13 -05:00
Zackhasacat
45f25e3f14 Add in initial support 2023-08-29 11:19:11 -05:00
psi29a
a0d3313d8d Merge branch 'lua_restock' into 'master' 
Add isRestocking to types.Item

See merge request OpenMW/openmw!3383
 2023-08-29 07:07:06 +00:00
Zackhasacat
95c736d54e Remove gobjefct 2023-08-28 08:50:25 -05:00
Zackhasacat
5fdaee093a add isRestocking 2023-08-28 08:30:54 -05:00
psi29a
65a15ff0b1 Merge branch 'container_inventory' into 'master' 
[Lua] Add alias `types.Container.inventory` = `types.Container.content` for consistency with `types.Actor.inventory`

See merge request OpenMW/openmw!3314
 2023-08-28 11:32:16 +00:00
psi29a
15a24a5af6 Merge branch 'formid' into 'master' 
Change FormId::toString to be consistent with RefId. Remove FormIdRefId.

See merge request OpenMW/openmw!3378
 2023-08-28 11:32:04 +00:00
psi29a
07edabdc75 Merge branch 'optimize_get_land' into 'master' 
Optimize Storage::getLand calls

See merge request OpenMW/openmw!3379
 2023-08-28 07:01:46 +00:00
psi29a
b866483ca1 Merge branch 'fix_cellstore' into 'master' 
Fix bug in CellStore::writeReferences (#7542)

Closes #7542

See merge request OpenMW/openmw!3380
 2023-08-28 07:01:17 +00:00
Zackhasacat
84987450ee Add baseCount 2023-08-27 20:47:43 -05:00
Petr Mikheev
55a9ab4f52 Add obj.parentContainer in Lua. Refactor ContainerStore::mPtr, ContainerStore::mActor. 2023-08-27 23:45:19 +02:00
Petr Mikheev
1143efd46d Fix bug in CellStore::writeReferences (#7542) 2023-08-27 14:30:46 +02:00
Petr Mikheev
32f3a16db3 Change FormId::toString to be consistent with RefId. Remove FormIdRefId. 2023-08-27 09:55:06 +02:00
elsid
816d3772b9
Cache absent land object 
This allows to save on lookup in store.
 2023-08-27 01:32:36 +02:00
Evil Eye
8f10c8f84a Don't pass obsolete slot parameter to cast 2023-08-25 16:48:38 +02:00
psi29a
5b3e2fbf1c Merge branch 'clickbait' into 'master' 
Assign StringRefIds to attributes

See merge request OpenMW/openmw!3256
 2023-08-21 18:59:44 +00:00
psi29a
516108691d Merge branch 'record_gold' into 'master' 
Add baseGold to NPC and creature lua records

See merge request OpenMW/openmw!3369
 2023-08-21 11:33:11 +00:00
psi29a
86f15fa194 Merge branch 'ui' into 'master' 
Control GUI from Lua

See merge request OpenMW/openmw!3236
 2023-08-21 11:32:24 +00:00
psi29a
ef69ec4adf Merge branch 'sound_mapping' into 'master' 
Use a separate lookup for sound files

See merge request OpenMW/openmw!3358
 2023-08-21 11:31:35 +00:00
psi29a
5df5c37b18 Merge branch 'lua_check_initialized' into 'master' 
Fix #7540

Closes #7540

See merge request OpenMW/openmw!3355
 2023-08-21 09:30:16 +00:00
psi29a
bfb2ae7948 Merge branch 'fix_moveinto' into 'master' 
Fix incorrect validation in obj:moveInto

See merge request OpenMW/openmw!3359
 2023-08-21 09:29:46 +00:00
Andrei Kortunov
921375a06b Use a separate lookup for sound files 2023-08-21 08:34:51 +04:00
Zackhasacat
1320261eba Add baseGold to NPC and creature records 2023-08-20 14:55:23 -05:00
Petr Mikheev
c5ba289bc7 Handle UI modes open/close sounds in Lua 2023-08-20 17:49:56 +02:00
Petr Mikheev
36d22cff1c Improve GUI mode validation 2023-08-20 17:49:56 +02:00
Petr Mikheev
f1bcf64afb Dehardcode input.ACTION.Inventory, input.ACTION.Journal, input.ACTION.QuickKeysMenu 2023-08-20 17:49:56 +02:00
Petr Mikheev
87eacf774a Control GUI modes from Lua 2023-08-20 17:49:56 +02:00
Evil Eye
5a8d108852 Cast to size_t 2023-08-20 16:25:58 +02:00
Evil Eye
62f47acf6b Replace more explicitly sized reads and variable width integers 2023-08-20 11:34:05 +02:00
Evil Eye
e660a9ca16 Assign StringRefIds to attributes 2023-08-20 10:28:46 +02:00
Petr Mikheev
842e154d8a Fix incorrect validation in obj:moveInto 2023-08-19 13:08:30 +02:00
Petr Mikheev
5bbbeefee7 Fix #7540 2023-08-19 12:52:01 +02:00
psi29a
e5d5cbcdd1 Merge branch 'save_safeguard' into 'master' 
Add a safeguard to do not use uninitialized value

See merge request OpenMW/openmw!3349
 2023-08-19 09:31:00 +00:00
psi29a
ebf803a00b Merge branch 'anonymous_namespace' into 'master' 
Move some code to unnamed namespace

See merge request OpenMW/openmw!3351
 2023-08-19 09:30:09 +00:00
elsid
ba1b3ae962
Avoid duplicated addEntryToObjectCache call 2023-08-19 01:30:18 +02:00
elsid
b67ecb4e4f
Remove redundant else 2023-08-19 01:30:17 +02:00
elsid
9cebe78a51
Avoid implicit cast to bool for pointers 2023-08-19 01:30:17 +02:00
elsid
bda29819cf
Reduce include dependency for land records 2023-08-19 01:30:17 +02:00
elsid
955790dc31
Split ESM::Land::loadData 2023-08-19 01:30:17 +02:00
elsid
dc05e9adbb
Avoid redundant check for nullptr 2023-08-19 01:30:17 +02:00
elsid
28614730da
Pass land reference to LandObject constructor 2023-08-19 01:30:17 +02:00
elsid
7c7577a6bd
Do not recreate cache object 2023-08-19 01:30:16 +02:00
elsid
95a39b3281
Use sized types for land records members 2023-08-18 18:30:06 +02:00
psi29a
16628a766f Merge branch 'fallout4' into 'master' 
ESM4 Loader: initial Fallout 4 support

See merge request OpenMW/openmw!3347
 2023-08-18 16:22:40 +00:00
Andrei Kortunov
1c0ced15c6 Move some code to unnamed namespace 2023-08-18 19:43:50 +04:00
psi29a
a1b7c0c3d5 Merge branch 'fix_build' into 'master' 
Fix build

See merge request OpenMW/openmw!3350
 2023-08-18 15:42:53 +00:00
psi29a
42e7647508 Merge branch 'more_coverity' into 'master' 
More Coverity fixes

See merge request OpenMW/openmw!3326
 2023-08-18 12:19:10 +00:00
elsid
57bcb3e89d
Fix build 
apps/openmw/mwlua/soundbindings.cpp:166:78: error: member access into incomplete type 'MWBase::World'
        const SoundStore* soundStore = &MWBase::Environment::get().getWorld()->getStore().get<ESM::Sound>();
                                                                             ^
apps/openmw/mwlua/../mwbase/environment.hpp:27:11: note: forward declaration of 'MWBase::World'
    class World;
          ^
 2023-08-18 12:15:34 +02:00
Petr Mikheev
4211665ede Merge branch 'sounds' into 'master' 
Lua bindings for sound functions

See merge request OpenMW/openmw!3247
 2023-08-18 09:15:24 +00:00
Andrei Kortunov
88fe328de1 Add a safeguard to do not use uninitialized value 2023-08-18 13:13:00 +04:00
Andrei Kortunov
1555fd8b34 Add assert 2023-08-18 12:46:45 +04:00
psi29a
861b9b215c Merge branch 'moveinto' into 'master' 
[Lua] Accept GameObject as destination in obj:moveInto.

See merge request OpenMW/openmw!3318
 2023-08-18 08:23:20 +00:00
psi29a
adb5774aa9 Merge branch 'optimize_get_blendmaps' into 'master' 
Optimize land lookup on blendmaps sampling

See merge request OpenMW/openmw!3333
 2023-08-18 08:22:16 +00:00
psi29a
e21e3a0d46 Merge branch 'time' into 'master' 
Pause/resume the game in Lua scripts

See merge request OpenMW/openmw!3317
 2023-08-18 08:22:04 +00:00
psi29a
856262d4c0 Merge branch 'trainingwheels' into 'master' 
Use the correct skills for training again

Closes #7536

See merge request OpenMW/openmw!3339
 2023-08-18 08:21:55 +00:00
psi29a
f9910290e0 Merge branch 'fix_hand_model' into 'master' 
Fix #7506

Closes #7506

See merge request OpenMW/openmw!3335
 2023-08-18 08:21:11 +00:00
Andrei Kortunov
f053188247 Increase Lua API version 2023-08-18 11:18:35 +04:00
elsid
0d4833febb
Fix esmtool dump format 2023-08-17 11:22:05 +02:00
Alexei Kotov
9ec68e864c Load ESM4 idle animations correctly for every game 2023-08-17 04:33:01 +03:00
Alexei Kotov
5e5a25f901 Show BA2 files in the launcher 2023-08-17 02:12:31 +03:00
Andrei Kortunov
d9c91ff3d9 Add bindings for ESM::Sound records 2023-08-16 20:26:55 +04:00
Petr Mikheev
e2c5f4e766 Fix #7506 2023-08-16 17:14:08 +02:00
jvoisin
1489376951 Apply 1 suggestion(s) to 1 file(s) 2023-08-15 14:55:13 +00:00
Andrei Kortunov
7ce9fc25c5 Implement Lua bindings for sound system 2023-08-15 10:28:29 +04:00
Zackhasacat
3e8a1cce7c Load ESM4 Terminal objects, add lua bindings for them 2023-08-15 06:23:38 +00:00
jvoisin
4cf80cdac2 Merge branch 'fix_esm4_ai' into 'master' 
Fix AI in ESM4 cells

See merge request OpenMW/openmw!3338
 2023-08-14 22:00:24 +00:00
Evil Eye
f7edf24356 Use std::stable_sort 2023-08-13 20:26:59 +02:00
Alexei Kotov
995de00f58 Merge branch 'fix_errormsg' into 'master' 
Minor fix of error message in LuaManager::DealyedAction::apply

See merge request OpenMW/openmw!3334
 2023-08-13 18:24:58 +00:00
Evil Eye
3141cf9e28 Use the correct skills for training again 2023-08-13 16:10:19 +02:00
jvoisin
7d9f5f676a Merge branch 'angrydraugrs' into 'master' 
Evaluate the attack early for non-biped attacks with no hit key (#7524)

Closes #7524

See merge request OpenMW/openmw!3331
 2023-08-13 13:18:22 +00:00
elsid
eb77fd1813
Add height field to navigator in ESM4 cells 2023-08-13 02:26:45 +02:00
elsid
5abbc56bf2
Use proper cell size for ESM4 cells in CoordinateConverter 2023-08-13 02:24:22 +02:00
Petr Mikheev
efe2dfc056 Minor fix of error message in LuaManager::DealyedAction::apply 2023-08-12 11:08:19 +02:00
elsid
07c1177b0d
Optimize land lookup on blendmaps sampling 
Minimize number of getLand calls by grouping samples per cell.
 2023-08-12 02:57:16 +02:00
elsid
ce6ffba986
Move blendmap sampling logic into separate function 2023-08-12 02:45:09 +02:00
Alexei Kotov
04d54517b7 Always enable has water flag for TES3 exterior cells 2023-08-12 00:52:08 +03:00