1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-02-06 02:45:31 +00:00
Commit graph

23 commits

Author SHA1 Message Date
David Cernat
572b16af41 Add OpenMW 0.47 commits to OpenMW VR up to 4 Dec 2021
# Conflicts:
#   .gitlab-ci.yml
#   CI/before_script.msvc.sh
#   CI/install_debian_deps.sh
#   CMakeLists.txt
#   apps/openmw/mwrender/screenshotmanager.cpp
#   files/ui/advancedpage.ui
2021-12-07 21:49:20 +02:00
madsbuvi
d1aaa74193 Rewrite of tracking logic. 2021-05-20 22:40:48 +02:00
fredzio
4fa0972b2d Tone down actor's skip simulation flag to an optional skip collision
detection flag.
2021-05-01 14:22:30 +02:00
madsbuvi
f4e36f4be5 Merge remote-tracking branch 'remotes/origin/master' into openmw-vr 2021-04-24 21:14:51 +02:00
fredzio
ccd3cbc69a Use saved actor position instead of reading again RefData in unstuck. It
is a race condition to do so.
2021-03-26 23:49:31 +01:00
madsbuvi
1bee59c2b1 Merge remote-tracking branch 'remotes/origin/master' into openmw-vr 2021-03-26 17:59:23 +01:00
wareya
40265bf118 make unstucking slightly smarter (can turn itself off, also acts like flat ground) 2021-03-20 21:14:56 -04:00
madsbuvi
d598923421 Merge remote-tracking branch 'remotes/origin/master' into openmw-vr 2021-03-02 14:32:34 +01:00
madsbuvi
3347cdfe30 Fixed recentering adjusting the player's orientation. Cell changes should now retain the proper orientation. Added support for seated play. 2021-02-28 16:01:03 +01: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
madsbuvi
6c9df35725 Merge remote-tracking branch 'remotes/origin/master' into openmw-vr 2021-02-01 15:09:00 +01:00
Andrei Kortunov
6a12c2b58b Fix GCC build warnings 2020-12-28 12:06:41 +04: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
22476281da Fix paralyze for swimming actors 2020-12-22 08:03:51 +03:00
fredzio
8e084dea2e Don't cache Ptr, it can be updated while the simulation is running. 2020-12-18 22:22:37 +01:00
Christoph Haag
b54e77a667 fix openmw non-vr build
../apps/openmw/mwphysics/movementsolver.cpp: In static member function ‘static void MWPhysics::MovementSolver::move(MWPhysics::ActorFrameData&, float, const btCollisionWorld*, MWPhysics::WorldFrameData&)’:
../apps/openmw/mwphysics/movementsolver.cpp:98:52: error: ‘getPlayer’ is not a member of ‘MWMechanics’
   98 |         const bool isPlayer = (ptr == MWMechanics::getPlayer());
      |                                                    ^~~~~~~~~
2020-10-30 23:29:24 +00:00
Mads Buvik Sandvei
4f8f0cc8ac Merge branch 'master' of https://gitlab.com/madsbuvi/openmw into openxr_vr 2020-10-22 20:39:53 +02:00
Mads Buvik Sandvei
4c4fc0c69a Refactoring. Moved changes to MWRender::Camera into a new subclass MWVR::VRCamera. Moved head tracking code to VRCamera. 2020-10-21 21:34:47 +02:00
fredzio
91b3926a49 We need to update the collision world after each step.
Change order of traversal simulation step to make it rare enough to be parallelizable

Before:
for actor in actors:
    repeat numstep:
        solve(actor)
After:
repeat numstep:
    for actor in actors:
        solve(actor)

Introduce struct ActorFrameData to pack all data that is necessary for
the solver
2020-10-15 06:41:22 +02:00
Mads Buvik Sandvei
1cf97fd7ad lots of refactoring and some commenting 2020-06-21 23:40:07 +02:00
Mads Buvik Sandvei
480ce82217 Fixed performance issues related to xr synchronization as well as osg pipelining. Some code refactoring / cleanup. 2020-05-24 18:00:42 +02:00
Mads Buvik Sandvei
288530510d Some cleanup. Fixed problems arising from latest merge (refactoring). 2020-05-21 01:01:15 +02:00
Capostrophic
19010ec045 Separate MovementSolver 2020-03-31 00:38:34 +03:00