mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-23 00:53:56 +00:00
Code Issues Releases Wiki Activity
32588 commits 108 branches 66 tags 133 MiB
Commit graph

21288 commits

Author SHA1 Message Date
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
Alexei Kotov
f2a9ab52db Merge branch 'fix_crach_missing_content_file' into 'master' 
Fix crash if content file is not found (was caused by !3249)

See merge request OpenMW/openmw!3323
 2023-08-11 18:29:52 +00:00
Alexei Dobrohotov
9723912ee0 Evaluate the attack early for non-biped attacks with no hit key (#7524) 2023-08-11 01:27:55 +03:00
elsid
1c4b6a552f
Always enable fog of war in map window 2023-08-10 20:49:35 +02:00
Andrei Kortunov
e749461d06 More Coverity fixes 2023-08-09 15:50:44 +04:00
Petr Mikheev
b5f4cec725 Fix crash if content file is not found (was caused by !3249) 2023-08-09 10:32:35 +02:00
Petr Mikheev
87912065fd Rename MWLua::WorldView -> MWLua::ObjectLists 2023-08-08 22:57:28 +02:00
Petr Mikheev
6c4e1f4e8f Lua commands world.pause / world.unpause 2023-08-08 22:57:28 +02:00
Petr Mikheev
91c7585c8b Move some time-related function from World and WorldView to DateTimeManager 2023-08-08 22:57:28 +02:00
Petr Mikheev
1a53e9db5d [Lua] Accept GameObject as destination in obj:moveInto. 2023-08-08 22:56:42 +02:00
Petr Mikheev
ac9facabf5 [Lua] Add alias types.Container.inventory = types.Container.content 2023-08-08 22:56:16 +02:00
psi29a
84e71f4977 Merge branch 'hashtagcornyphrase' into 'master' 
Don't replace tags when dealing with console input

See merge request OpenMW/openmw!3291
 2023-08-08 08:54:23 +00:00
psi29a
3151452e25 Merge branch 'pandorasbox' into 'master' 
Launcher, content selector: support ESM4 files, allow using game files as addon files

See merge request OpenMW/openmw!3219
 2023-08-08 08:54:10 +00:00
psi29a
7b4f7b7f07 Merge branch 'adjust_refnum' into 'master' 
Adjust FormId in FormIdRefId and for items in containers when loading saves

See merge request OpenMW/openmw!3293
 2023-08-08 08:54:00 +00:00
Evil Eye
fb10014d6e Remove heal cooldown 2023-08-07 22:44:24 +02:00
Evil Eye
ee92ae7e34 Simplify restore magicka priority 2023-08-07 22:43:39 +02:00
Evil Eye
7c82405c9f Tweak AI rating to reduce healing spam 2023-08-07 22:43:35 +02:00
elsid
8e7fe44514
Support terrain sample size greater than cell size 2023-08-06 23:47:35 +02:00
elsid
2a49919b53
Move esm3terrain to esmterrain 2023-08-06 19:17:44 +02:00
psi29a
fadfffe22c Merge branch 'settings_values_map' into 'master' 
Use settings values for Map settings (#6876)

See merge request OpenMW/openmw!3284
 2023-08-06 16:14:09 +00:00
psi29a
0c5faf8fbb Merge branch 'save_apply_lua_actions' into 'master' 
Apply delayed Lua actions before making a save

See merge request OpenMW/openmw!3294
 2023-08-06 16:13:33 +00:00
psi29a
ba4298f36d Merge branch 'refactor_esm4' into 'master' 
Refactor components/esm4 to make it easier to load records to ESMStore

See merge request OpenMW/openmw!3301
 2023-08-06 16:13:07 +00:00
psi29a
8d1a19a6f4 [#7358] Make MyGui 3.4.2 required for 0.49 2023-08-06 16:05:59 +00:00
Petr Mikheev
957880d515 Add to ESMStore the records that are needed to render ESM4 actors; cleanup usage of records.hpp 2023-08-05 13:18:09 +02:00
Petr Mikheev
5d54ca6fdb Refactor components/esm4 2023-08-05 13:12:24 +02:00
psi29a
e6cffa5494 Merge branch '7248-Extend_console_search_with_regex_and_case_sensitivity' into 'master' 
Resolve "Extend searching in the console with regex and toggleable case-sensitivity"

Closes #7248

See merge request OpenMW/openmw!3248
 2023-08-05 10:02:08 +00:00
Chris Vigil
996f5fd7ad Resolve "Extend searching in the console with regex and toggleable case-sensitivity" 2023-08-05 10:02:07 +00:00
psi29a
2a4440e5b1 Merge branch 'theprojectileswereswords' into 'master' 
Fix price enchantment price calculation to use the correct item count

Closes #7472

See merge request OpenMW/openmw!3227
 2023-08-04 09:05:02 +00:00
psi29a
c290754077 Revert "Merge branch 'loadSSEAlchemyTable' into 'master'" 
This reverts merge request !3267
 2023-08-03 19:55:06 +00:00
psi29a
4aaffa72e5 Merge branch 'more_coverity_fixes' into 'master' 
More coverity fixes

See merge request OpenMW/openmw!3304
 2023-08-03 07:15:34 +00:00
Andrei Kortunov
b3a981e0fc Simplify strings construction 2023-08-02 17:59:40 +04:00
psi29a
5160fbc2a0 Merge branch 'fixedtimestamp' into 'master' 
Move TimeStamp to ESM3 and remove sized reads

See merge request OpenMW/openmw!3295
 2023-08-02 08:11:33 +00:00
psi29a
b643e58e71 Merge branch 'esm4_cell_description' into 'master' 
Always log something for loading and unloading ESM4 cell

See merge request OpenMW/openmw!3298
 2023-08-02 08:10:59 +00:00
psi29a
354798fc7f Merge branch 'terrain_fixes' into 'master' 
Do not copy QVectors twice

See merge request OpenMW/openmw!3308
 2023-08-02 08:10:32 +00:00
psi29a
4aafcf5fdc Merge branch 'rm_path_to_next_path_point' into 'master' 
Do not build path to next path point via navmesh

See merge request OpenMW/openmw!3306
 2023-08-02 07:53:01 +00:00
elsid
22981af2ea
Make sure ESM4 cell description is not empty 
To avoid logging empty cell descriptions on loading and unloading. Not all cells
have editor id but every has id and coordinates. Add world to distinguish cell
coordinates in different worldspaces.
 2023-08-01 14:42:53 +02:00
Andrei Kortunov
0723b44a65 Do not copy QVectors twice 2023-08-01 15:45:18 +04:00
psi29a
c86eecb2ea Merge branch 'movable_objects' into 'master' 
Move objects instead of copying where possible

See merge request OpenMW/openmw!3289
 2023-08-01 10:43:44 +00:00
psi29a
6ff2bb8aeb Merge branch 'more_esm4_fields' into 'master' 
Support ESM4 record FullName, CellFlags, X, Y fields by esmtool

See merge request OpenMW/openmw!3299
 2023-08-01 07:25:34 +00:00
psi29a
23671ced33 Merge branch 'fix_use_after_move' into 'master' 
Fix use after move in InfoOrder::insertInfo

See merge request OpenMW/openmw!3296
 2023-08-01 07:25:17 +00:00
elsid
fbeb3ab03a
Do not build path to next path point via navmesh 
To void a situation when next path point continuously changing making actor go
in circles.

This is unnecessary but also creates problems since pathgrid is used to build
path for AiWander.
 2023-07-31 22:02:21 +02:00
Andrei Kortunov
35561450f1 Do not copy osg::ref_ptr when possible 2023-07-31 20:43:46 +04:00
Andrei Kortunov
d3d7a663c6 Move some objects instead of copying 2023-07-31 20:43:46 +04:00
Andrei Kortunov
dee9ebd05e Fix operations order 2023-07-31 20:15:30 +04:00
Andrei Kortunov
b1c8a968ae Do not use invalid iterators 2023-07-31 17:53:33 +04:00
Andrei Kortunov
deba5b4d47 Catch unhandled exceptions 2023-07-31 16:35:31 +04:00
Andrei Kortunov
da06cd005e Init variables 2023-07-31 16:35:31 +04:00
Andrei Kortunov
c50769c8c5 Catch filesystem exceptions 2023-07-31 16:35:31 +04:00
psi29a
1d207ed318 Merge branch 'test_load_deleted_dialinfo' into 'master' 
Add test to ensure deleted DialInfos are removed

See merge request OpenMW/openmw!3297
 2023-07-31 10:50:07 +00:00
psi29a
4990f786eb Merge branch 'fix_esm4_exterior_cell' into 'master' 
Treat ESM4 exterior cells as exterior

See merge request OpenMW/openmw!3282
 2023-07-31 10:49:54 +00:00
psi29a
b2f669ca48 Merge branch 'fix_async_load' into 'master' 
Fix crash related to async content loading (#7508)

Closes #7508

See merge request OpenMW/openmw!3290
 2023-07-31 10:49:33 +00:00
Petr Mikheev
3814830e9f Fix build (missing include) 2023-07-31 09:32:52 +02:00
Petr Mikheev
0487bf95d1 Merge branch 'coverity49' into 'master' 
Fix some Coverity warnings

See merge request OpenMW/openmw!3286
 2023-07-31 00:09:14 +00:00
Petr Mikheev
e077ca5aa3 Merge branch 'clean_includes_4' into 'master' 
Cleanup includes

See merge request OpenMW/openmw!3288
 2023-07-31 00:04:18 +00:00
Petr Mikheev
abde92e207 Merge branch 'active-spells-rework' into 'master' 
Lua: active spell params and active spell effects

See merge request OpenMW/openmw!3179
 2023-07-31 00:02:05 +00:00
Mads Buvik Sandvei
c18a7801ed Lua: active spell params and active spell effects 2023-07-31 00:02:05 +00:00
Petr Mikheev
5702cb4b30 Merge branch 'effective-effect-indexing' into 'master' 
Lua: String overload for effects store index.

See merge request OpenMW/openmw!3285
 2023-07-30 23:55:19 +00:00
Mads Buvik Sandvei
edb7081ea6 Lua: String overload for effects store index. 2023-07-30 23:55:19 +00:00
elsid
798f3cc385
Support ESM4 record FullName, CellFlags, X, Y fields by esmtool 2023-07-30 18:20:10 +02:00
elsid
385dab3df3
Cache cell description 
It should not change over time and it's relatively small enough to trade some
CPU time for some memory.
 2023-07-30 17:13:50 +02:00
elsid
d59a993351
Treat ESM4 exterior cells as exterior 
Prevent adding exterior cells to WorldModel::mInteriors. Otherwise CellStore
might be created twice because it's not present in mExteriors but present in
mCells. This happens on teleport to a cell using its name (e.g. --start
"AnvilMainGate" flag).
 2023-07-30 16:50:50 +02:00
elsid
662991dda9
Add test to ensure deleted DialInfos are removed 2023-07-30 14:11:13 +02:00
elsid
66c5944ecf
Fix use after move in InfoOrder::insertInfo 
When it->second.mPosition->mPrev != value.mPrev value is first moved into
*mPosition and then used to get mPrev. Since mPrev is RefId and it's copy-only
type there is no real problem but coverity complains about it.

Also enforce contract of insertInfo to support move-only types by adding a test
for a value type with deleted copy constructors.
 2023-07-30 13:37:53 +02:00
Evil Eye
79b3855c5b Move TimeStamp to ESM3 and remove sized reads 2023-07-30 11:37:32 +02:00
Petr Mikheev
f344c26465 Apply delayed Lua actions before making a save 2023-07-30 02:50:22 +02:00
Petr Mikheev
9a9f9d7081 Adjust FormId in FormIdRefId and for items in containers when loading saves 2023-07-30 02:01:09 +02:00
Petr Mikheev
2b601eea6d Fix crash related to async content loading (#7508) 2023-07-29 21:13:57 +02:00
Evil Eye
c47489ef6e Don't replace tags when dealing with console input 2023-07-29 17:07:37 +02:00
elsid
dd54857610
Add missing array include 2023-07-29 00:29:03 +02:00
elsid
c9c32d9a0d
Cleanup includes 2023-07-29 00:16:43 +02:00
Andrei Kortunov
d8ec78d732 Fix some Coverity warnings 2023-07-28 20:58:18 +04:00
psi29a
81deb3796b Merge branch 'loadSSEAlchemyTable' into 'master' 
Load SSE alchemy table

See merge request OpenMW/openmw!3267
 2023-07-28 07:46:20 +00:00
alekulyn
d2896945e8 Load SSE alchemy table 2023-07-28 07:46:20 +00:00
psi29a
a6d6e16d48 Merge branch 'readsize' into 'master' 
Disallow implicitly sized reads of ESM structs

See merge request OpenMW/openmw!3100
 2023-07-28 07:01:32 +00:00
elsid
9acb93ab29
Use settings values for Map settings 2023-07-27 22:53:53 +02:00
psi29a
e76ce6b696 Merge branch 'fix_find_path' into 'master' 
Remove stepping from findSmoothPath and other tweaks (#7241 , #7485)

Closes #7485 and #7241

See merge request OpenMW/openmw!3264
 2023-07-27 09:34:50 +00:00
psi29a
3e16ef7445 Merge branch 'esm4_achr' into 'master' 
Load ESM4 actors (no rendering yet)

See merge request OpenMW/openmw!3278
 2023-07-27 09:34:28 +00:00
psi29a
f5677aa352 Merge branch 'settings_values_input' into 'master' 
Use settings values for Input settings (#6876)

See merge request OpenMW/openmw!3265
 2023-07-27 09:33:14 +00:00
psi29a
e073eab05e Merge branch 'more_evade_directions' into 'master' 
Use more evade directions and filter by supporting animation (#7450)

Closes #7450

See merge request OpenMW/openmw!3210
 2023-07-27 09:32:39 +00:00
psi29a
3032b340a2 Merge branch 'teleporting' into 'master' 
A few Lua changes related to teleporting

See merge request OpenMW/openmw!3246
 2023-07-27 09:32:28 +00:00
psi29a
cf8af70764 Merge branch 'fix_remove_from_inventory' into 'master' 
[Lua] Fix removing from inventory

See merge request OpenMW/openmw!3229
 2023-07-27 09:32:08 +00:00
Petr Mikheev
bc1d412aaa Merge branch 'fix-7503' into 'master' 
[#7503]: pass full count of coins to createGold() in moveToCell()

See merge request OpenMW/openmw!3279
 2023-07-27 09:31:24 +00:00
Petr Mikheev
9b511fdf7a Load ESM4 actors 2023-07-26 11:47:50 +02:00
Petr Mikheev
f99582e671 [Lua] Fix removing from inventory 2023-07-25 23:34:25 +02:00
psi29a
488657d9b4 Merge branch 'refnum-for-items-in-spellcast' into 'master' 
Use refnum instead of slot for items during spellcast

Closes #4508

See merge request OpenMW/openmw!3244
 2023-07-25 21:23:59 +00:00
Mads Buvik Sandvei
364f2a98e9 Use refnum instead of slot for items during spellcast 2023-07-25 21:23:59 +00:00
psi29a
94d8c50df2 Merge branch 'lua_activation' into 'master' 
Lua scripts can handle activation of mwscripted objects

See merge request OpenMW/openmw!3263
 2023-07-25 21:23:20 +00:00
jvoisin
090f823c17 Fix a coverity warning 2023-07-25 14:39:03 +02:00
Mads Buvik Sandvei
1162323e96 Do not redundantly take and set count in moveToCell(). moveToCell() should always be moving the full stack. 2023-07-25 14:22:00 +02:00
Mads Buvik Sandvei
8867e76fd7 pass full count of coins to createGold() in moveToCell() 2023-07-25 13:38:14 +02:00
psi29a
b9460afdfd Merge branch 'save-game-string-view' into 'master' 
Refactor saveGame to use string_view

See merge request OpenMW/openmw!3271
 2023-07-25 11:14:51 +00:00
psi29a
baf7ef2525 Merge branch 'copying' into 'master' 
Avoid unnecessary LiveCellRef copying; Fix potential use-after-free in WorldModel

See merge request OpenMW/openmw!3276
 2023-07-25 08:21:17 +00:00
AnyOldName3
6246b479ea Merge branch 'async_content_load' into 'master' 
Speedup loading - load content files during logo video playing

See merge request OpenMW/openmw!3249
 2023-07-24 23:42:46 +00:00
Petr Mikheev
4d004e4730 Avoid unnecessary LiveCellRef copying in a couple of places; change initialization order in WorldModel; 2023-07-24 23:36:24 +02:00
Christian Bouwense
4b5d64f9e5 inline asUTF8() instead of constructing a whole new string_view 2023-07-24 14:41:17 -04:00
psi29a
f9cb752b25 Merge branch 'resistanceisnotfutile' into 'master' 
Resist failed normal weapon hits (bug #7284)

Closes #7284

See merge request OpenMW/openmw!3220
 2023-07-24 11:24:14 +00:00
psi29a
7ead12e103 Merge branch 'dropit' into 'master' 
Drop empty stacks that aren't overriding anything

See merge request OpenMW/openmw!3268
 2023-07-24 09:11:08 +00:00
psi29a
09e1ff9a4b Merge branch 'fix_world_model' into 'master' 
Fix WorldModel (#7474)

Closes #7474

See merge request OpenMW/openmw!3270
 2023-07-24 09:10:06 +00:00
psi29a
b68ca259ae remove unused variables and commented out code 2023-07-23 22:43:28 +02:00
Christian Bouwense
7d0caf9eec refactor saveGame to use string_view instead of a const standard string reference 2023-07-23 14:45:01 -04:00
elsid
8ceb79caf5
Load present cell store when requested 2023-07-23 18:36:32 +02:00
elsid
1a7b4283e7
Avoid duplicated emplace for interior cell store 2023-07-23 18:35:49 +02:00
Evil Eye
c80574299d Drop non-carriable lights and empty stacks that aren't overriding anything 2023-07-23 14:51:58 +02:00
Petr Mikheev
59d17d3eb6 Fix #7491 2023-07-22 19:45:39 +02:00
elsid
6c18723bc7
Use settings values for Input settings 2023-07-22 18:27:53 +02:00
elsid
5a27ccacb7
Pass const float* to vanityRotateCamera 2023-07-22 18:24:55 +02:00
elsid
e00eb50587
Remove stepping from findSmoothPath 
This is not used anyway. There are features like smooth movement which remove
all redundant points.

Use single findStraightPath call instead of multiple.
 2023-07-22 18:08:40 +02:00
elsid
b4868c6094
Filter evade directions by supported animations 
To avoid trying those which will not lead to any actor movement due to absent
animation.
 2023-07-22 17:30:40 +02:00
elsid
80ae8ce116
Cache supported animations 2023-07-22 17:30:40 +02:00
elsid
579e533621
Add more evade directions and order them to make a circle 2023-07-22 17:30:38 +02:00
elsid
53a129a762
Include pathgrid to all AI packages paths 2023-07-22 17:24:50 +02:00
Petr Mikheev
2c212b18e4 Remove World::activate since all activation now goes trough LuaManager 2023-07-22 17:22:43 +02:00
Petr Mikheev
c5871a5a7a Allow to handle activation in Lua even for mwscripted objects 2023-07-22 16:57:39 +02:00
Petr Mikheev
9105a073fc Handle ESM4::Rec_Deleted and ESM4::Rec_Disabled flags. 2023-07-22 15:22:02 +02:00
psi29a
4973230b84 Merge branch 'settings_values_hud' into 'master' 
Use settings values for HUD settings (#6876)

See merge request OpenMW/openmw!3250
 2023-07-21 08:36:45 +00:00
psi29a
9410eed9e5 Merge branch 'bump-cmake-version' into 'master' 
Bump required CMake version to 3.16

See merge request OpenMW/openmw!3242
 2023-07-20 17:40:29 +00:00
Evil Eye
45ba05c0ed Disallow implicitly sized reads of ESM structs 2023-07-20 19:16:53 +02:00
psi29a
ec9b4c4563 Merge branch 'caius4friends' into 'master' 
Fix dialogue insertion again

See merge request OpenMW/openmw!3212
 2023-07-20 15:29:57 +00:00
psi29a
03dbe1c9f3 Merge branch 'stringrefidskills' into 'master' 
Assign StringRefIds to skills

See merge request OpenMW/openmw!3146
 2023-07-20 07:15:49 +00:00
Petr Mikheev
38f409e687 Fix #7446: Incorrect height after teleporting from one worldspace to another 2023-07-20 02:15:27 +02:00
AnyOldName3
34fcfb63cf Eliminate redundant version checks 2023-07-20 00:43:56 +01:00
Petr Mikheev
1bfe59e2fb Load content files during playing logo video 2023-07-20 01:22:01 +02:00
elsid
fac1927f5e
Use settings values for HUD settings 2023-07-19 22:53:35 +02:00
Petr Mikheev
f2edf05a55 Move camera update after teleporting from worldimp to camera.lua 2023-07-19 10:42:58 +02:00
Petr Mikheev
4016e8b383 Lua engine handler onTeleported 2023-07-19 10:42:58 +02:00
Petr Mikheev
086fdb1f37 Run onNewGame handler in LuaManager::synchronizedUpdate 2023-07-19 10:07:30 +02:00
psi29a
baa67893b6 Merge branch 'settings_values_gui' into 'master' 
Use settings values for GUI settings (#6876)

See merge request OpenMW/openmw!3238
 2023-07-18 10:25:36 +00:00
psi29a
5a31320d8d Merge branch 'preserve-refnum-on-drop' into 'master' 
Preserve refnum when dropping items from inventory to ground.

Closes #6148

See merge request OpenMW/openmw!3207
 2023-07-18 10:25:28 +00:00
psi29a
85822eca45 Merge branch 'darkmagic' into 'master' 
Implement the NegativeLight flag

Closes #7477

See merge request OpenMW/openmw!3240
 2023-07-18 10:25:19 +00:00
Alexei Kotov
7e1e43f9c6 Allow GMSTs with empty EDID 2023-07-17 22:51:25 +03:00
Mads Buvik Sandvei
61f1f4a013 signed/unsigned comparison warning. 2023-07-17 20:41:49 +02:00
Evil Eye
7573004efc Implement the NegativeLight flag 2023-07-17 18:00:15 +02:00
Mads Buvik Sandvei
fe0b640f85 Use copyItem() when not moving full stack. 2023-07-17 17:58:39 +02:00
Mads Buvik Sandvei
b8a9fcad68 fixes based on comments by ptmikheev 2023-07-17 17:06:28 +02:00
Mads Buvik Sandvei
e22eec0585 optimize moveItem() by unsetting refnum instead of calling unstackItem. 2023-07-17 15:15:27 +02:00
Petr Mikheev
b583aad14a Fix bug in LuaManager::reloadAllScripts 2023-07-17 02:21:46 +02:00
elsid
d113f0fc44
Use settings values for GUI settings 2023-07-16 20:46:54 +02:00
psi29a
98bb9fc125 Merge branch 'deserializedeez' into 'master' 
Make RefId::deserializeText return an empty RefId if no pre-existing StringRefId can be found

See merge request OpenMW/openmw!3226
 2023-07-16 08:46:48 +00:00
psi29a
f4295cf67a Merge branch 'fix_getall' into 'master' 
Fix argument validation in Lua command `cell:getAll`

See merge request OpenMW/openmw!3195
 2023-07-16 08:45:54 +00:00
psi29a
b383efabf5 Merge branch 'urinvalid' into 'master' 
Don't allow saves with an invalid last generated RefNum to load

Closes #7134

See merge request OpenMW/openmw!3233
 2023-07-16 08:45:41 +00:00
psi29a
abb71eeb53 Merge branch 'plannedobsolescence' into 'master' 
Allow compilation with MYGUI_DONT_USE_OBSOLETE

See merge request OpenMW/openmw!3232
 2023-07-16 08:44:59 +00:00
Alexei Kotov
80b7dec571 Prevent object paging from leaking Vvardenfell into other exteriors 2023-07-16 00:05:59 +03:00
Mads Buvik Sandvei
64e55b37ec Clang'd 2023-07-15 18:59:16 +02:00