1
0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-30 12:32:36 +00:00

1190 Commits

Author SHA1 Message Date
psi29a
7647af6e4e Merge branch 'friendlyhit' into 'master'
Correct friendly fire reaction for different damage sources (bug #7646)

Closes #7646

See merge request OpenMW/openmw!3694
2023-12-30 09:43:19 +00:00
Alexei Kotov
30cff6f6ee Avoid crashes upon Weapon::canBeEquipped attack check for the inventory doll 2023-12-28 01:49:18 +03:00
Alexei Kotov
f1782ad8df Merge branch 'rm_unused_vfs' into 'master'
Remove unused vfs argument from correctMeshPath

See merge request OpenMW/openmw!3691
2023-12-27 17:23:16 +00:00
Alexei Kotov
d5428b23d8 Disable voiced responses to magical friendly hits (bug #7646)
Disable ranged friendly fire
2023-12-27 20:05:08 +03:00
Alexei Kotov
94c052dfef Classify the damage passed to Class::onHit 2023-12-27 20:05:08 +03:00
elsid
13c8e04b27
Make traits and base data optional for ESM4 NPC
Fallout 3 is not fully supported and it causes failures to load NPCs. Log errors
and make sure there is no nullptr dereference.
2023-12-27 10:07:48 +01:00
Alexei Kotov
1834597361 Move friendly fire logic to onHit 2023-12-27 01:03:23 +03:00
elsid
81a483fc7f
Remove unused vfs argument from correctMeshPath 2023-12-26 14:14:52 +01:00
Evil Eye
37415b0382 Don't use getExact to read structs 2023-12-17 15:16:32 +01:00
Evil Eye
a9e6e63c4e Remove fixed size reads 2023-12-17 13:00:14 +01:00
Evil Eye
4062f0225b Use the right getContainerStore 2023-12-09 16:13:56 +01:00
Evil Eye
194bcb0187 Drop support for save game format 0 (pre 0.37) 2023-12-01 16:37:29 +01:00
Evil Eye
81b8328bdd Include UString 2023-11-23 19:52:18 +01:00
Evil Eye
da9b0c5119 Use MyGUI::UString's new string_view support 2023-11-22 22:02:06 +01: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
Alexei Kotov
410fc17159 Merge branch 'fo4_abc' into 'master'
Use correct template flags for FO4 NPCs

See merge request OpenMW/openmw!3544
2023-11-03 01:30:08 +00:00
jvoisin
d3ccc246c5 Apply 1 suggestion(s) to 1 file(s) 2023-11-01 12:03:49 +00:00
Petr Mikheev
6c01ce2672 Use correct template flags for FONV and FO4 NPCs 2023-10-31 23:48:29 +01:00
Alexei Kotov
03c3818229 Place ESM4::ItemMod into the scene 2023-10-31 00:54:44 +03:00
Alexei Kotov
2d38ca4c35 Improve invisibility breaking consistency (bug #7660)
- Break on recharge attempts
- Break on repair attempts
- Break on potion creation attempts
- Don't break on failed ingredient consuming
2023-10-30 15:30:01 +03:00
Alexei Kotov
84cad3de01 Don't show tooltips for unnamed ESM4Named 2023-10-27 22:53:40 +03:00
Alexei Kotov
3f4591eb3b Add movable static and ESM4 land texture stores 2023-10-27 22:53:40 +03:00
Alexei Kotov
ee5ca066fd Allow talking with fleeing creatures (bug #7631) 2023-10-22 16:18:52 +03: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
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
Evil Eye
0814ef5697 Allow creatures to use potions 2023-10-01 11:22:20 +02: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
Evil Eye
33b57d9134 Use moveToCell and init mwscript 2023-09-27 21:23:07 +02:00
Evil Eye
641f34a3c9 Treat teleportation out of the draft cell as object creation 2023-09-25 21:01:32 +02:00
Alexei Kotov
7e360df6c0 Place ESM4::Flora instances to the scene 2023-09-24 10:25:44 +03: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
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
Evil Eye
b59739a529 Replace more sized reads 2023-09-13 21:51:42 +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
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
elsid
ad509bb954
Use settings values for Models settings 2023-09-09 13:12:08 +02:00
Andrei Kortunov
7da8f388f5 More Coverity fixes 2023-09-01 16:49:39 +04:00
Petr Mikheev
55a9ab4f52 Add obj.parentContainer in Lua. Refactor ContainerStore::mPtr, ContainerStore::mActor. 2023-08-27 23:45:19 +02:00
Evil Eye
5a8d108852 Cast to size_t 2023-08-20 16:25:58 +02:00
Evil Eye
e660a9ca16 Assign StringRefIds to attributes 2023-08-20 10:28:46 +02:00
Zackhasacat
3e8a1cce7c Load ESM4 Terminal objects, add lua bindings for them 2023-08-15 06:23:38 +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
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
Petr Mikheev
9b511fdf7a Load ESM4 actors 2023-07-26 11:47:50 +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