jvoisin
838785d5a3
Merge branch 'sworc' into 'master'
...
Make StartCombat a no-op for dead targets and don't always play attack lines
Closes #7769 and #5413
See merge request OpenMW/openmw!3803
2024-02-05 09:48:20 +00:00
Alexei Kotov
8b47381162
Merge branch 'more_move' into 'master'
...
Fix some Coverity Scan complaints
See merge request OpenMW/openmw!3829
2024-02-03 17:24:53 +00:00
Andrei Kortunov
225e834b88
Fix some Coverity Scan complaints
2024-02-02 09:28:19 +04:00
Mads Buvik Sandvei
a59981e3fa
Initialize mScripted again.
2024-02-01 20:00:10 +01:00
Alexei Kotov
c86ca0ef01
Merge branch 'cast-fix' into 'master'
...
Fix bad cast of loop count in animation bindings.
See merge request OpenMW/openmw!3819
2024-01-30 04:18:03 +00:00
Evil Eye
340d1423c6
Optimize AI package target comparisons
2024-01-29 22:25:39 +01:00
Evil Eye
8ed7a5319d
Exclude deleted actors, prevent copies, and try to avoid a second getActorsSidingWith call
2024-01-29 22:08:00 +01:00
Mads Buvik Sandvei
0ed94ead4e
Check that count is non-zero before decrementing it.
2024-01-28 17:34:22 +01:00
Mads Buvik Sandvei
24a0a0c3bf
size_t -> uint32_t
2024-01-28 16:34:44 +01:00
Mads Buvik Sandvei
993cea7d65
MR Comments
2024-01-28 16:31:01 +01:00
Mads Buvik Sandvei
36e1bdab10
Use a smaller integer type instead of dealing with casting issues.
2024-01-28 14:48:49 +01:00
Evil Eye
1d1ce2de7b
Use the correct id to absorb enchantments
2024-01-27 12:12:39 +01:00
Mads Buvik Sandvei
a94add741e
Lua: Animation bindings
2024-01-26 21:39:33 +00:00
Evil Eye
a8ee3dfae8
Move the caching getActorsSidingWith to its own type
2024-01-25 20:44:18 +01:00
Evil Eye
bdc6119b31
Bring attack voice lines in line with research
...
Only play them when starting combat when not in combat or not in combat
with one of the target's allies.
Don't play them when casting spells whose first effect isn't ranged.
2024-01-25 19:36:41 +01:00
Andrei Kortunov
9e55425b71
Use std::move() in /apps/openmw
2024-01-25 09:03:30 +04:00
Evil Eye
4dfe6078c8
Make StartCombat a no-op for dead targets and don't play an attack line when already in combat
2024-01-22 22:07:49 +01:00
psi29a
6b35ee68e1
Merge branch 'holdstill' into 'master'
...
Make scripted animations shut down pathfinding (bug #5065 )
Closes #5065
See merge request OpenMW/openmw!3711
2024-01-20 11:57:36 +00:00
Alexei Kotov
1a629cbf07
Play shield hit sound for the shield that was hit ( #7774 )
2024-01-14 10:33:21 +03:00
Alexei Kotov
01dcca3363
Make scripted animations shut down pathfinding (bug #5065 )
2024-01-07 04:55:49 +03:00
Alexei Kotov
c1c774e11d
Update the spells window when constant effects are added/removed (bug #7475 )
2024-01-07 04:55:29 +03:00
elsid
903299ce50
Avoid recomputing navigator flags when getting area costs
2024-01-06 02:39:42 +01:00
elsid
594bd6e136
Use walking speed for swimming actor with water walking for pathfinding
...
This will make them find shorter paths nearby shores.
2024-01-06 02:39:40 +01:00
Alexei Kotov
78459314bf
Merge branch 'impartialplayerbelike' into 'master'
...
Don't count the actor we're following as siding with us if we're in combat with them but they aren't in combat with us
Closes #7645
See merge request OpenMW/openmw!3650
2023-12-31 17:33:08 +00:00
Evil Eye
e63933efa6
Use NAM9 for stack count
2023-12-31 17:12:46 +00:00
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
Mads Buvik Sandvei
9d3ede7575
Revert "Merge branch 'skating-olympics' into 'master'"
...
This reverts merge request !3631
2023-12-27 19:11:49 +00: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
94c052dfef
Classify the damage passed to Class::onHit
2023-12-27 20:05:08 +03: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
Andrei Kortunov
ffffb427f5
Implement crime disposition modifier (bug 4683)
2023-12-26 14:04:23 +04:00
Evil Eye
af40d7ce80
End pursue package if the target doens't have a bounty
2023-12-23 15:50:36 +01:00
Alexei Kotov
f11c66794b
Merge branch 'advancedalchemy' into 'master'
...
Make ingredient order affect effect order
Closes #7676
See merge request OpenMW/openmw!3667
2023-12-22 08:25:24 +00:00
jvoisin
2873f971a6
Merge branch 'downsized' into 'master'
...
Remove explicitly sized reads
See merge request OpenMW/openmw!3663
2023-12-21 22:50:10 +00:00
Alexei Kotov
51cb3b08cb
Merge branch 'followthecrab' into 'master'
...
Stop combat when stacking a new AI package
Closes #7661
See merge request OpenMW/openmw!3665
2023-12-21 07:08:36 +00:00
Evil Eye
532a330aac
mac plz
2023-12-20 13:58:43 +01:00
Evil Eye
1223d12b29
Make ingredient order affect effect order
2023-12-20 11:56:12 +01:00
Alexei Kotov
78a8f9d692
Merge branch 'skating-olympics' into 'master'
...
De-jank stationary animations
Closes #3330
See merge request OpenMW/openmw!3631
2023-12-20 12:35:41 +03:00
Evil Eye
8a1ca870eb
Stop infighting when gaining new allies
2023-12-19 21:23:10 +01:00
Evil Eye
94b129cc62
Stop combat when stacking a new AI package
2023-12-18 22:18:26 +01:00
Evil Eye
77cf9284b7
Allow ModPCCrimeLevel to clear crimes and cap bounties
2023-12-18 21:52:17 +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
Alexei Kotov
82982bbc05
Outlaw vampires and werewolves (bugs #7723 , #7724 )
2023-12-15 23:46:10 +03:00
jvoisin
c969aa42b7
Merge branch 'aifollow' into 'master'
...
Base AiFollow activation range on follow distance (bug #7685 )
Closes #7685
See merge request OpenMW/openmw!3652
2023-12-14 20:14:20 +00:00
Alexei Kotov
5b02b77a39
Base AiFollow activation range on follow distance (bug #7685 )
2023-12-13 20:18:20 +03:00
Evil Eye
a0694d4134
Don't assert that spells have a school
2023-12-12 22:11:32 +01:00
Evil Eye
f80cd06256
Don't count the actor we're following as siding with us if we're in combat with them but they aren't in combat with us
2023-12-12 22:06:52 +01:00
Evil Eye
41dc409238
Don't consider empty effect lists exceptional
2023-12-09 18:20:10 +01:00
