psi29a
31f41836a1
Merge branch 'no_stuck_in_proj' into 'master'
...
Don't let projectiles push actors out of the world (#5802 )
See merge request OpenMW/openmw!595
2021-02-07 20:37:46 +00:00
fredzio
b78820de55
Ignore projectiles inside of MovementSolver::unstuck. It is normal for actors to be inside of a
...
projectile collision shape.
A side effect of moving actors outside of projectile collision shape is that if both the actor and the projectile are
near a wall, the actor could get moved outside of the world.
2021-02-07 18:32:03 +01:00
Evil Eye
af0f94f03e
Play damage sound when hurt by elemental shields
2021-02-07 12:55:10 +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
psi29a
f63af685c0
Merge branch 'bemorenegative' into 'master'
...
Allow negative values for ai stats
Closes #5835
See merge request OpenMW/openmw!586
2021-02-06 15:38:34 +00:00
Evil Eye
3007cb14a9
Also allow negative AI values in dialogue
2021-02-05 19:00:35 +01: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
AnyOldName3
0639f8b7c6
Make the dummy texture for the character preview shadow-friendly
2021-02-03 18:45:22 +00:00
Jordan Francis Moran-Meyers
0d1c073cfa
Fix the regression involving Cure
2021-02-01 18:34:10 +00:00
Petr Mikheev
94e8855c8c
Merge branch 'fix_5821' into 'master'
...
Fix #5821 : NPCs from mods getting removed if mod order was changed
Closes #5821
See merge request OpenMW/openmw!577
2021-01-31 09:34:26 +00:00
Petr Mikheev
157b14cdaa
Fix #5821 : NPCs from mods getting removed if mod order was changed
2021-01-29 22:53:02 +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
Andrei Kortunov
7b727e4d70
Revert "Remove physics dependency on basenode"
...
This reverts commit 165c731492
2021-01-29 16:51:13 +04:00
Andrei Kortunov
165af1c365
Revert "Some actors are supposed to spawn on a static object that belong to an adjacent cell."
...
This reverts commit f031a191b8
2021-01-29 16:51:05 +04:00
Andrei Kortunov
f8e8496d36
Revert "Revert a wrong change introduced in MR 546"
...
This reverts commit 23137d0c54
2021-01-29 16:50:39 +04:00
Andrei Kortunov
3b9f8b5fa2
Avoid null dereference for objects without cells
2021-01-28 18:37:47 +04:00
Andrei Kortunov
d984d13b1c
Merge branch 'animate_animated_objects' into 'master'
...
Unbreak animated objects (regression from !546 )
See merge request OpenMW/openmw!570
2021-01-28 14:12:24 +00:00
Andrei Kortunov
5382d38b9b
Merge branch 'hit_target_object' into 'master'
...
Unbreak targetted spell on objects (#5811 )
See merge request OpenMW/openmw!569
2021-01-28 14:09:45 +00:00
elsid
a3ab8dfbb4
Revert "Merge branch 'movement_fix2' into 'master'"
...
This reverts merge request !496
2021-01-28 12:48:19 +00:00
fredzio
23137d0c54
Revert a wrong change introduced in MR 546
...
A prerequisite to create physics objects for statics was to remove the
dependency on base node (since it doesn't yet exists) for object
position. It is still necessary for animation though.
Restore the basenode (and the associated FIXME) so that animated objects works properly.
2021-01-27 16:24:11 +01:00
Bret Curtis
b164f1aa17
Merge pull request #3023 from akortunov/grass_intsancing
...
Grass instancing
2021-01-27 12:21:24 +01:00
psi29a
699bd257ef
Merge branch 'camera_stats' into 'master'
...
Collect all available stats if OPENMW_OSG_STATS_FILE is set and point to a valid file.
See merge request OpenMW/openmw!526
2021-01-27 08:04:33 +00:00
Frederic Chardon
7cd7fa2f08
Collect all available stats if OPENMW_OSG_STATS_FILE is set and point to
...
a valid file.
2021-01-27 08:04:33 +00:00
fredzio
64475ebedb
Remove a brainfart from precise projectile handling: all non-actor
...
non-projectile objects were treated as ground.
2021-01-27 07:15:09 +01:00
Andrei Kortunov
f40e227686
Remove redundant formatting changes
2021-01-26 22:29:41 +04:00
Andrei Kortunov
b975f16e6b
Remove redundant check - groundcover is not present in the CellStore
2021-01-26 22:29:41 +04:00
Andrei Kortunov
d12a0fdcb3
Mark only instances from groundcover files as groundcover objects
2021-01-26 22:29:41 +04:00
Andrei Kortunov
8874e88ff1
Drop fading setting
2021-01-26 22:29:41 +04:00
Andrei Kortunov
1a6c06f7b5
Do not allow to set distance to non-positive values
2021-01-26 22:29:41 +04:00
Andrei Kortunov
859cd0fd0c
Do not use display lists for instanced meshes
2021-01-26 22:29:41 +04:00
Andrei Kortunov
a09f03c850
Drop groundcover materials - they are not used
2021-01-26 22:29:41 +04:00
Andrei Kortunov
14cf0ce1dc
Implement instanced groundcover
2021-01-26 22:29:41 +04: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
cadd1e7529
Merge branch 'daedric_fog' into 'master'
...
Don't nuke fog when bounds have changed
Closes #5469
See merge request OpenMW/openmw!522
2021-01-25 12:58:44 +00:00
psi29a
64b4472efa
Merge branch 'stand' into 'master'
...
Don't adjust actor position until all objects are loader (#5379 )
See merge request OpenMW/openmw!546
2021-01-25 12:12:43 +00: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
Evil Eye
59af819f97
Merge branch 'fix-mem-leak-2' into 'master'
...
Fix memory leak in MWInput
See merge request OpenMW/openmw!566
2021-01-24 16:05:30 +00:00
Gleb Mazovetskiy
fe815d3d8d
Fix memory leak in MWInput
...
mListener wasn't being cleaned up
2021-01-24 15:22:36 +00:00
Evil Eye
a2171875a0
Prevent nullptr access
2021-01-24 15:15:51 +01:00
fredzio
f031a191b8
Some actors are supposed to spawn on a static object that belong to an adjacent cell.
...
Since actors can be active in 3x3 grid around the player, we need to
first load all statics in a 5x5 grid around the player.
Split load and unloading in 2 phases. Add an mInactiveCells set into the
scene, which contains all cells inside the aforementioned 5x5 grid.
These cells contains only heightfields and physics objects of static
class.
2021-01-24 14:11:10 +01:00
fredzio
165c731492
Remove physics dependency on basenode
...
Necessary to be able to load physics objects from inactive cells.
2021-01-24 14:10:27 +01:00
psi29a
b28adafee4
Merge branch 'navcrash' into 'master'
...
Fix #5798
Closes #5798
See merge request OpenMW/openmw!554
2021-01-23 13:37:01 +00:00
Evil Eye
a401c517bf
Always unload height fields
...
loadCell always adds a height field, but unloadCell only removed it for
cells with height data. Reloading a cell overwrote the height field
added earlier (leading to its destruction) while the navigator retained
a reference to the now deleted collision shape, leading to a crash.
2021-01-23 00:56:46 +01:00
psi29a
0ec953380f
Merge branch 'opaque-character-preview-preprocessor' into 'master'
...
Always write opaque fragments instead of relying on blending being off for translucent RTT II: Daggerfall
Closes #5391
See merge request OpenMW/openmw!552
2021-01-22 10:33:16 +00:00
psi29a
d2c5de5211
Merge branch 'projectile_physics' into 'master'
...
Precise projectile physics (closes #4201 )
Closes #4201
See merge request OpenMW/openmw!550
2021-01-21 23:33:22 +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
elsid
cc24f13b39
Remove duplicated sound_buffer entry
2021-01-21 13:08:50 +01:00
