1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-15 17:49:55 +00:00
Commit graph

16960 commits

Author SHA1 Message Date
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
AnyOldName3
b6e92c9c6d Use ShaderVisitor to skip translucent framebuffer specific stuff 2021-01-20 23:37:19 +00:00
AnyOldName3
8af8ad3840 Always write opaque fragments instead of relying on blending being off for translucent RTT 2021-01-20 01:17:16 +00:00
Alexei Dobrohotov
6d70a3f308 Merge branch 'jumpy' into 'master'
Don't run unstuck if there is no simulation running in async case (#5799)

See merge request OpenMW/openmw!548
2021-01-19 15:04:49 +00:00
Nelsson Huotari
9f0f3eaeb2 Add collada to supported formats 2021-01-18 19:22:01 +02:00
Nelsson Huotari
54ea8eb5c7 Fix string corruption with Qt on linux-systems 2021-01-18 19:21:02 +02:00
fredzio
e37e5d4d16 Don't run unstuck if there is no simulation running in async case.
In this case, the actor mPreviousPosition is not updated, so the actor
position is interpolated between an old (stucked) position and the new
(unstucked) position. The new position is most likely "stucked", so the
unstuck code strikes again, making the actor "vibrates".

That's exactly what the sync code path does, and it doesn't exhibit this
behavior.
2021-01-18 17:45:57 +01:00
psi29a
9eba086c34 Merge branch 'sound_buffer_pool_2' into 'master'
Separate sound buffer pool from sound manager

See merge request OpenMW/openmw!520
2021-01-17 12:11:11 +00:00
Bret Curtis
e68651e9a6
Merge pull request #3042 from akortunov/helpers
Refactoring pre-requisites for groundcover
2021-01-13 23:09:01 +01:00
Andrei Kortunov
0418e8e7a6 Add an API to get base wind speed (which is from openmw.cfg) 2021-01-13 14:25:25 +04:00
Andrei Kortunov
f175beb304 Define template ref classes in components 2021-01-13 14:25:21 +04:00
psi29a
fd602e2c31 Merge branch 'viewdist' into 'master'
Downgrade FOV-dependent view distance factor to a recommendation

See merge request OpenMW/openmw!531
2021-01-12 19:51:21 +00:00
Bret Curtis
d944f703e8 Merge branch 'master' of gitlab.com:OpenMW/openmw 2021-01-12 19:58:56 +01:00
Bret Curtis
73740013a3 mResourceSystem initialization reorder 2021-01-12 19:58:46 +01:00
psi29a
abdc4cde95 Merge branch 'float' into 'master'
Allow all creatures to float to the water surface (#5790, #5758)

Closes #5758 and #5790

See merge request OpenMW/openmw!534
2021-01-12 18:45:10 +00:00
Alexei Dobrohotov
4638fc36b4 Allow all creatures to float to the water surface 2021-01-12 15:46:19 +03:00
psi29a
3903142152 Update apps/openmw/mwbase/environment.cpp 2021-01-12 12:05:17 +00:00
psi29a
654238fd18 Merge branch 'no_bonus_points' into 'master'
Show mesh origin

Closes #5771

See merge request OpenMW/openmw!507
2021-01-11 21:21:47 +00: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
psi29a
acfd2cfd90 Merge branch 'dialogclonefix' into 'master'
[OpenMW-CS] Fix cloning in info records

See merge request OpenMW/openmw!524
2021-01-11 14:13:53 +00:00
Nelsson Huotari
93b1b444f2 Optimize CreateCommand and CloneCommand configuration 2021-01-11 12:53:34 +02:00
Alexei Dobrohotov
7be7af13d7 Downgrade FOV-dependent view distance factor to a recommendation 2021-01-11 06:53:23 +03:00
psi29a
6863c5a68f Merge branch 'raii' into 'master'
Make all physics object manage their own resources.

See merge request OpenMW/openmw!527
2021-01-10 20:50:55 +00:00
Nelsson Huotari
7196ad7455 Implement an override-value when cloning, use when cloning info records 2021-01-10 21:23:52 +02:00
Evil Eye
1ab4683dce Tweak follow distance to be more like the original 2021-01-10 16:29:32 +01:00
fredzio
d015f17a6c Make all physics object manage their own resources
Use smart pointer for heightfields and their members.
Move collision object addition inside of Object's ctor, as for Actors and HeightFields
2021-01-10 14:56:35 +01:00
elsid
8b7f3fe908 Merge branch 'nodeadlock' into 'master'
Avoid a rare but possible deadlock around mCollisionWorldMutex.

See merge request OpenMW/openmw!525
2021-01-10 13:41:31 +00:00
Bret Curtis
b3f3b29bbe
Merge pull request #3039 from akortunov/screenshotmanager
Move screenshots handling to the separate class
2021-01-10 12:59:45 +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
Alexei Dobrohotov
c3a952c133 Merge branch 'dorsbien' into 'master'
Don't update magic effects when unequipping items to equip something else

Closes #5687

See merge request OpenMW/openmw!509
2021-01-10 08:04:07 +00:00
Evil Eye
a257567b80 Don't update magic effects when unequipping items to equip something else 2021-01-10 08:04:06 +00:00
Nelsson Huotari
3045d20a97 Make sure that vector isn't empty, just in case 2021-01-10 01:25:40 +02:00
Nelsson Huotari
5f1d3e0e2f Use the Topic ID of the cloned target from topicinfos 2021-01-10 01:06:23 +02:00
psi29a
f7d7186c39 Merge branch 'instanceselectiontools' into 'master'
[OpenMW-CS] Cube and sphere instance selection

See merge request OpenMW/openmw!485
2021-01-09 21:35:07 +00:00
Nelsson Huotari
313e895912 [OpenMW-CS] Cube and sphere instance selection 2021-01-09 21:35:07 +00:00
fredzio
60f66f5e29 Remove never used parameter from CharacterController:update() 2021-01-09 21:28:27 +01:00
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
Andrei Kortunov
ad101de733 Merge declaration and initialization 2021-01-09 22:58:54 +04:00
Andrei Kortunov
1930f8f37d Fix copy-paste error 2021-01-09 20:03:12 +04:00
Andrei Kortunov
50e4600b16 Reduce code duplication 2021-01-09 20:00:51 +04:00
Andrei Kortunov
874348fb46 Remove redundant code 2021-01-09 19:19:38 +04:00
Mads Buvik Sandvei
a2d8a0b61a engine.cpp typos 2021-01-09 14:44:15 +00:00
Andrei Kortunov
80ee1b55ea Protect assignment operator from this == &src case 2021-01-09 18:28:26 +04:00