madsbuvi
66d2912fcd
Merge remote-tracking branch 'remotes/origin/master' into openmw-vr
2021-02-07 19:17:43 +01:00
psi29a
e6607486f5
Merge branch 'jfmherokiller-master-patch-23743' into 'master'
...
Fix the regression involving Cure
See merge request OpenMW/openmw!582
2021-02-06 15:41:24 +00:00
Noah Gooder
e42b67ee50
Modified actors.cpp and Authors.md
2021-02-05 17:59:36 +00:00
Evil Eye
61e014a765
Allow negative values for ai stats
2021-02-04 21:25:38 +01:00
Jordan Francis Moran-Meyers
0d1c073cfa
Fix the regression involving Cure
2021-02-01 18:34:10 +00:00
madsbuvi
6c9df35725
Merge remote-tracking branch 'remotes/origin/master' into openmw-vr
2021-02-01 15:09:00 +01:00
Petr Mikheev
9590377f22
Don't ignore Z in path finding if actor can move by Z.
2021-01-29 22:30:20 +01:00
Petr Mikheev
642ca02e35
Shorten almost straight paths only if smooth movement is enabled; reduce angle limit for the shortening.
2021-01-29 22:30:01 +01:00
elsid
a3ab8dfbb4
Revert "Merge branch 'movement_fix2' into 'master'"
...
This reverts merge request !496
2021-01-28 12:48:19 +00:00
Petr Mikheev
bc2cec86e9
Fix bug: NPCs doesn't move if the target is exactly above or exactly below.
2021-01-26 00:05:28 +01:00
psi29a
c6f14cde20
Merge branch 'Show-level-multipliers-in-levelup-tooltip' into 'master'
...
Show level multipliers in levelup tooltip
Closes #5783
See merge request OpenMW/openmw!518
2021-01-25 10:01:39 +00:00
Cédric Mocquillon
3bb551a6f1
Show level multipliers in levelup tooltip
2021-01-25 10:01:39 +00:00
fredzio
1f4c85520f
Use convexSweepTest for projectile movement to solve any
...
imprecision issue with projectile collision detection.
Simplify the mechanics: manage hits in one spot.
Give magic projectiles a collision shape similar in size to their visible
model.
Rename the 2 convex result callback to clearly state their purpose.
2021-01-21 20:36:33 +01:00
Alexei Dobrohotov
4638fc36b4
Allow all creatures to float to the water surface
2021-01-12 15:46:19 +03:00
psi29a
29fdcb3fa1
Merge branch 'hardlanding' into 'master'
...
Init mJumpState based on saved fallheight (#5739 )
See merge request OpenMW/openmw!532
2021-01-11 20:46:42 +00:00
fredzio
3087ce9c70
Use saved fallheight to determine a character's jump state.
...
The jump state initial state is "none", and it is set after physics simulation.
If a save is done just above the ground, the character may land before
the first run of the simulation, effectively cancelling the effect of
falling.
2021-01-11 18:38:20 +01:00
Evil Eye
1ab4683dce
Tweak follow distance to be more like the original
2021-01-10 16:29:32 +01:00
Bret Curtis
a735bbe9a5
Merge pull request #3040 from akortunov/pvs
...
Fix some issues, found by PVS Studio
2021-01-10 12:58:17 +01:00
Evil Eye
e737bd00fa
Merge branch 'unused_param' into 'master'
...
Remove never used parameter from CharacterController::update()
See merge request OpenMW/openmw!523
2021-01-10 10:58:28 +00:00
fredzio
60f66f5e29
Remove never used parameter from CharacterController:update()
2021-01-09 21:28:27 +01:00
Andrei Kortunov
874348fb46
Remove redundant code
2021-01-09 19:19:38 +04:00
Andrei Kortunov
56666c60d4
Remove dead code
2021-01-09 14:17:59 +04:00
Andrei Kortunov
7fc4c9f3f6
Avoid dead code
2021-01-09 13:52:01 +04:00
Evil Eye
2a583e2337
consider empty paths as not constructed
2021-01-08 17:24:13 +01:00
Evil Eye
57c92673bc
Consider a path completed if it was non-empty
2020-12-30 16:09:12 +01:00
Evil Eye
e46472442a
Switch torches to shields for hostile NPCs
2020-12-29 01:40:30 +00:00
Andrei Kortunov
6a12c2b58b
Fix GCC build warnings
2020-12-28 12:06:41 +04:00
Alexei Dobrohotov
45f4e69a19
Merge branch 'skipanim' into 'master'
...
Don't move characters if their animation can't move them
Closes #5593
See merge request OpenMW/openmw!490
2020-12-28 01:25:22 +00:00
psi29a
a094269c46
Merge branch 'guardsguards' into 'master'
...
Don't consider a path completed unless we're close
Closes #5736
See merge request OpenMW/openmw!498
2020-12-26 23:10:53 +00:00
psi29a
3afa4e5869
Merge branch 'feels_good_guar' into 'master'
...
Make followers keep a distance dependant on the fattest party member
Closes #5423
See merge request OpenMW/openmw!499
2020-12-26 23:09:41 +00:00
Evil Eye
7cac7fa870
Make followers keep a distance dependant on the fattest party member
2020-12-25 23:57:01 +01:00
Alexei Dobrohotov
ad41546648
Merge branch 'fix_swimming' into 'master'
...
Fix #5743 where NPCs and creatures underwater may rotate to the upwards direction
Closes #5743
See merge request OpenMW/openmw!494
2020-12-25 21:33:35 +00:00
Evil Eye
d2a28d915a
Don't consider a path completed unless we're close
2020-12-25 15:58:11 +01:00
Petr Mikheev
8b3088a9e5
Fix #5743
2020-12-24 11:54:21 +01:00
Petr Mikheev
51d63a4152
Fix minor bug: mSmoothedSpeed is not updating in first person mode, that leads to an incorrect value after switching to first person mode and back.
...
Additional refactoring: move `setSideMovementAngle` from camera.cpp to character.cpp as this logic shouldn't belong to Camera.
2020-12-24 03:39:59 +01:00
Alexei Dobrohotov
32cc14981e
Don't move characters if their animation can't move them
2020-12-22 20:40:52 +03:00
psi29a
4f1361b5ea
Merge branch 'paralyze' into 'master'
...
Fix paralyze for swimming and levitating actors
Closes #5758
See merge request OpenMW/openmw!488
2020-12-22 10:49:24 +00:00
Alexei Dobrohotov
22476281da
Fix paralyze for swimming actors
2020-12-22 08:03:51 +03:00
Alexei Dobrohotov
f5af09aed9
Fix AI sequence looping code (bug #5706 )
2020-12-22 05:56:59 +03:00
Mads Buvik Sandvei
3e82cae500
Merge remote-tracking branch 'remotes/origin/master' into openxr_vr_geometryshader_feature_branch
2020-12-18 20:50:58 +01:00
psi29a
11eff02a1d
Merge branch 'Show-more-information-about-level-on-menu' into 'master'
...
Show more information about level on menu
See merge request OpenMW/openmw!437
2020-12-11 12:04:15 +00:00
Mads Buvik Sandvei
b98b4db4c1
Merge remote-tracking branch 'remotes/origin/multiview_test_branch' into openxr_vr_geometryshader_feature_branch
2020-12-09 21:11:53 +01:00
CedricMocquillon
6bfdf0e57f
Add more information on mouse over level
2020-12-07 14:57:25 +01:00
Mads Buvik Sandvei
85033bb647
Merge remote-tracking branch 'remotes/origin/master' into openxr_vr
2020-12-06 15:14:53 +01:00
Alexei Dobrohotov
84e1a29700
Make AI cast self-targeted spells at the ground (bug #5695 )
2020-12-04 00:41:21 +03:00
Andrei Kortunov
8084a336b5
Replace zeroes and nulls by nullptrs
2020-11-29 11:14:07 +04:00
Mads Buvik Sandvei
49e76fa077
Merge remote-tracking branch 'remotes/origin/master' into openxr_vr
2020-11-27 00:36:10 +01:00
Nelsson Huotari
f78a5d795c
Separate keyframes logic to provide basis for osgAnimation integration.
2020-11-18 22:48:47 +02:00
Alexei Dobrohotov
8a6d3d1b4f
Minor fixes
...
Fix extra semicolon
Disable collision avoidance if AI is disabled
2020-11-13 22:53:12 +03:00
Andrei Kortunov
0e971dccf0
Rework cure effects
2020-11-04 13:51:10 +04:00
