mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 05:49:56 +00:00
Code Issues Releases Wiki Activity
24552 commits 38 branches 54 tags 122 MiB
Commit graph

24552 commits

This branch
This branch
All branches
Author SHA1 Message Date
fredzio
9bc687e209 Avoid a rare but possible deadlock around mCollisionWorldMutex. 
What happened is that the last handle to an Actor shared_ptr was a
promoted weak_ptr. When the shared_ptr goes out of scope, the Actor dtor
is invoked. That involves removing the Actor collision object after
exclusively locking mCollisionWorldMutex. In this case, the lock was
already held in the outter scope of the promoted weak_ptr.

Reduce the scope of the mCollisionWorldMutex to never encompass the
lifetime of a promoted weak_ptr.
 2021-01-09 21:10:29 +01:00
psi29a
dc82cb61f4 Merge branch 'nativeshapesdebug' into 'master' 
Unbreak physics debugger with projectiles' spherical shapes.

See merge request OpenMW/openmw!489
 2021-01-04 09:07:28 +00:00
Alexei Dobrohotov
bbd11cb14e Merge branch 'changelog' into 'master' 
Remove #5683 changelog entry

See merge request OpenMW/openmw!514
 2021-01-03 09:34:17 +00:00
Alexei Dobrohotov
701a5662b0 Remove #5683 changelog entry 2021-01-03 09:33:03 +00:00
Alexei Dobrohotov
c17e498465 Merge branch 'launchercleanup' into 'master' 
Remove deadcode from the launcher.

See merge request OpenMW/openmw!511
 2021-01-03 08:48:52 +00:00
fredzio
5215ffd964 The debug drawer rely on Bullet to determines the vertices of collision 
shapes. It doesn't work in the case of spheres (used by projectiles):
resulting shape is malformed. It can also leads to this error which
makes the debug drawer non-working till game restart:
CullVisitor::apply(Geode&) detected NaN,
    depth=nan, center=(nan nan nan),
    matrix={
       -0.265814 -0.0639702 0.9619 0
       0.964024 -0.0176387 0.265228 0
       -4.29769e-09 0.997796 0.0663574 0
       18178.6 -3550.91 42154.4 1
}

Avoid this issue by using osg::Sphere

While here, remove an unused function. We don't use Bullet's solver so
we never have any contact points (in Bullet parlance).
 2021-01-01 17:47:12 +01:00
fredzio
dbdd397716 Remove deadcode. 2021-01-01 16:54:45 +01:00
Alexei Dobrohotov
cdf0bc1d8d Merge branch 'protec' into 'master' 
Switch torches to shields for hostile NPCs

Closes #5300

See merge request OpenMW/openmw!501
 2020-12-29 01:40:31 +00:00
Evil Eye
e46472442a Switch torches to shields for hostile NPCs 2020-12-29 01:40:30 +00:00
psi29a
8c37817cf1 Merge branch 'viewingdistance' into 'master' 
Make min and max view distance accurate to vanilla

See merge request OpenMW/openmw!504
 2020-12-28 21:01:04 +00:00
Alexei Dobrohotov
e4e19bab1b Make min and max view distance accurate to vanilla 2020-12-28 21:46:18 +03:00
Alexei Dobrohotov
66e0a7ff02
Merge pull request #3038 from akortunov/master 
Fix defines names
 2020-12-28 20:29:14 +03:00
Alexei Dobrohotov
1c6c86a113 Merge branch 'changelog' into 'master' 
Fixed by 7cac7fa870

Closes #4039

See merge request OpenMW/openmw!502
 2020-12-28 17:17:38 +00:00
Andrei Kortunov
e80d34268c Fix defines names 2020-12-28 21:11:58 +04:00
Evil Eye
694b9c1505 Fixed by 7cac7fa870 2020-12-28 18:11:51 +01:00
Alexei Dobrohotov
a7cbe0b497
Merge pull request #3036 from akortunov/tooltip 
Enhance level-up tooltip
 2020-12-28 18:21:32 +03:00
Chris Djali
862de7a129
Merge pull request #3037 from akortunov/warnfix 
Fix build warnings
 2020-12-28 14:54:35 +00:00
Andrei Kortunov
ee2416017e Fix tag mismatch 2020-12-28 12:19:22 +04:00
Andrei Kortunov
66fee6dccb Enhance level-up tooltip 2020-12-28 12:13:09 +04: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
851a0245ac Merge branch 'movement2' into 'master' 
New Movement Solver Fixes

See merge request OpenMW/openmw!414
 2020-12-27 22:16:11 +00:00
wareya
18ef32ca82 values for this higher than sGroundOffset cause jittering on some surface; use safe-seeming value slightly less than sGroundOffset 2020-12-27 22:16:11 +00:00
Alexei Dobrohotov
ddbfa5410d Merge branch 'fixboats' into 'master' 
Apply waterwalking even when bypassing physics simulation

See merge request OpenMW/openmw!500
 2020-12-27 22:06:07 +00:00
fredzio
ebb564ad22 call moveObject() after applying waterwalking 
This unbreak abot's boat mods: they're continually teleporting
the boats (who is an actor with waterwalking effect). As such, the
physics simulation was never run and the boat never went to sea level.
 2020-12-27 17:31:55 +01:00
Evil Eye
7d8727b98e Merge branch 'books' into 'master' 
Only ignore plain text after the last EOL tag (#5627)

Closes #5627

See merge request OpenMW/openmw!492
 2020-12-27 14:25:57 +00:00
AnyOldName3
215b27cae5 Merge branch 'lighting' into 'master' 
Clean up shader lighting

See merge request OpenMW/openmw!484
 2020-12-27 02:02:06 +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
f981dd9916 update changelog 2020-12-25 23:58:23 +01: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
Alexei Dobrohotov
c57cb09bf2 Merge branch 'focus' into 'master' 
Don't restore focus to hidden/unrelated buttons

Closes #5757

See merge request OpenMW/openmw!497
 2020-12-25 19:50:11 +00:00
Evil Eye
d2a28d915a Don't consider a path completed unless we're close 2020-12-25 15:58:11 +01:00
Evil Eye
1f1755ae48 Add version checks 2020-12-25 13:05:41 +01:00
Evil Eye
bdcbb412a5 Don't restore focus to hidden/unrelated buttons 2020-12-25 13:03:09 +01:00
Alexei Dobrohotov
a4f6448f34 Merge branch 'movement_fix' into 'master' 
Fix minor bug: mSmoothedSpeed is not updating in first person mode

See merge request OpenMW/openmw!495
 2020-12-24 17:13:18 +00: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
fd77ef6b01 Only ignore plain text after the last EOL tag (#5627) 2020-12-23 03:33:34 +03:00
Alexei Dobrohotov
32cc14981e Don't move characters if their animation can't move them 2020-12-22 20:40:52 +03:00
Alexei Dobrohotov
fd5429ae56
Merge pull request #3034 from akortunov/master 
Update info about font-related settings
 2020-12-22 16:38:11 +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
Andrei Kortunov
f6ab2cd4a4 Update info about font-related settings 2020-12-22 14:34:09 +04:00
psi29a
d2b38c16a6 Merge branch 'package' into 'master' 
Fix AI sequence looping code (bug #5706)

Closes #5706

See merge request OpenMW/openmw!487
 2020-12-22 10:10:46 +00:00
Alexei Dobrohotov
eaa65ec60a Update changelog 2020-12-22 08:03:51 +03:00
Alexei Dobrohotov
22476281da Fix paralyze for swimming actors 2020-12-22 08:03:51 +03:00
Alexei Dobrohotov
218597b13d Fix paralyze for levitating actors 2020-12-22 06:33:19 +03:00
Alexei Dobrohotov
f5af09aed9 Fix AI sequence looping code (bug #5706) 2020-12-22 05:56:59 +03:00
Alexei Dobrohotov
09759c6620 Clean up shader lighting 2020-12-22 04:46:35 +03:00