1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-16 14:59:54 +00:00
Commit graph

21159 commits

Author SHA1 Message Date
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